gentoo resync : 29.12.2022

3965 files changed, 44977 insertions, 51480 deletions

diff --git a/dev-python/APScheduler/APScheduler-3.8.1.ebuild b/dev-python/APScheduler/APScheduler-3.8.1.ebuild
deleted file mode 100644
index 470a0d39cdcf..000000000000
--- a/dev-python/APScheduler/APScheduler-3.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="In-process task scheduler with Cron-like capabilities"
-HOMEPAGE="https://github.com/agronholm/apscheduler"
-SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# disable test fixtures using external servers (mongodb, redis...)
-	# these fixtures are using markers in git master, so the patch
-	# should be no longer necessary with next major bump
-	"${FILESDIR}"/APScheduler-3.8.1-external-server-tests.patch
-)
-
-EPYTEST_DESELECT=(
-	tests/test_jobstores.py::test_repr_mongodbjobstore
-	tests/test_jobstores.py::test_repr_redisjobstore
-	tests/test_jobstores.py::test_repr_zookeeperjobstore
-)
-
-python_prepare_all() {
-	# suppress setuptools warning #797751
-	sed -e 's|^upload-dir|upload_dir|' -i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/APScheduler/APScheduler-3.9.0.ebuild b/dev-python/APScheduler/APScheduler-3.9.0.ebuild
deleted file mode 100644
index 6535d1243da6..000000000000
--- a/dev-python/APScheduler/APScheduler-3.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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
-
-DESCRIPTION="In-process task scheduler with Cron-like capabilities"
-HOMEPAGE="https://github.com/agronholm/apscheduler"
-SRC_URI="mirror://pypi/A/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# disable test fixtures using external servers (mongodb, redis...)
-	# these fixtures are using markers in git master, so the patch
-	# should be no longer necessary with next major bump
-	"${FILESDIR}"/APScheduler-3.8.1-external-server-tests.patch
-)
-
-EPYTEST_DESELECT=(
-	tests/test_jobstores.py::test_repr_mongodbjobstore
-	tests/test_jobstores.py::test_repr_redisjobstore
-	tests/test_jobstores.py::test_repr_zookeeperjobstore
-)
-
-python_prepare_all() {
-	# suppress setuptools warning #797751
-	sed -e 's|^upload-dir|upload_dir|' -i setup.cfg || die
-	sed -e '/addopts/d' -i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/APScheduler/Manifest b/dev-python/APScheduler/Manifest
index 1dc46351280b..1eb4f53e7d34 100644
--- a/dev-python/APScheduler/Manifest
+++ b/dev-python/APScheduler/Manifest
@@ -1,8 +1,4 @@
 AUX APScheduler-3.8.1-external-server-tests.patch 1424 BLAKE2B 20eced0b88b1141eb1317eed5d42e8eda8156808b28e15bf37403cc896326830ca906f66fd372e75861ca65f0061b809de31a8bbce2888628dcebc87536c0691 SHA512 e1ddcf95bd12f10cea7e19eb4d347b980c97c2600f4462a039b4b78788b9ab6ee6280da5168ac4f60fe79a58b48ffed599e8c924ea9cfdd5a0be0cc1b85f2236
-DIST APScheduler-3.8.1.tar.gz 98699 BLAKE2B 7a8320251670de29f76375387f8a3817b3a9c401befd4bfefba106817ec3d21fc0f60af9b7a7620f83c0e1c651bc3eb8c62036a17e01ff91bf5dcf492ff78911 SHA512 553af2532b32bcdc7dc3047bf4f51623e87dbee62dac40b7ca8c3e64881467ecf6c50df56c863d5a44c6b8a99eb02ae22ae008d76ee4836ba398afd280bed99b
-DIST APScheduler-3.9.0.tar.gz 100492 BLAKE2B c1d15dcbebf52034cad0a1317bca68cf567d5acbf6619a5905e1793702339a68cef0a639463f887bb71cb96f15762bea5e5521230fa957e2fbb2ae501ca3cb36 SHA512 40b180f0297b0be125dea89d518331c1f78b1468b6507651c8e9b06cbb44f700ef1f1c44be8bf08f562b67ac6e89ac5022598ad79081bdf0290c207063e0898a
 DIST APScheduler-3.9.1.tar.gz 100567 BLAKE2B a31e2591c47d451e95a982b4d85a70ee9a33bf2370a70e0e1ba2a8e31ae718d5853aad6242cbd8f90dc5bc6912af3ea96270e9f514c3903d041af450c1d8ead5 SHA512 901e04140dc9af3b67887cd3200131cc4121cad71b7ca4afe7cc0adf1a58cebb02eee5abed1f97fc95fe9fef843d00cd6611ab3fbff8ace9247894d6f0720dff
-EBUILD APScheduler-3.8.1.ebuild 1317 BLAKE2B 3c4f767e5183d0ff4564311640711c4bcfa06c6ea89cf573b73f90c0a0147c4df12cce2c21b0020d776c766ab819c58f05e22de65abd6754182c485e985ad60e SHA512 d9f2966530c1ac5f016a9c4fd0e384fb6eef4e42140224c86b319cea75ecb223290f8ed3aed4bf723a980d0e19c57f0d7d7e0c6e311df05f6cec4c7404dda6d4
-EBUILD APScheduler-3.9.0.ebuild 1358 BLAKE2B 46b65a7cc13f83f45406d31ff95e27bb6c5923e0916d477d6ad904b9e87c3f9c89ef1a724de18ae98298681d37c955ee36c5195d1706bab4cb9e165f31dcbb10 SHA512 b5dde0120085ece916c3030ce40cfa1f1940b47b9ca068ac2e8e351f3d9bec2313d610e5d12faa802924b7a511f72a69353da3c9e5c53ae38b668401c1690dc8
 EBUILD APScheduler-3.9.1.ebuild 1362 BLAKE2B 6b0242789bbca8c5195e8867a5ab5ca994fbf315befe41e10cb1e6930bfc0ee2fc98fd3356c9397a6849b55762e522a60d08b0212ec1232991bd610eb6bd56f9 SHA512 8d2304ad5d3ec820805b77b3515ef9ae9d7194d16bbe026b26672a72dc391e5ee3e80667a6557a0f8a44de4022e31ff81c7873f6ed9cb858aad50b7ee53a057e
-MISC metadata.xml 404 BLAKE2B 544a2f5d84a1ad486ebbbf5c3944dd5a2ec2bd2edeee4dd0e60559cc6e36deffcea2202f6c1ce7dbfcc2f57721302b3ceadf33921209015686a9a16d05cd1449 SHA512 4cd866b9f5639259f51d8ad52909bbebaed86bc4c7e590e940d5aae9d890ef9700f1cf17449eeaf784172449ebc4c9db6a8445513b13a037287af8ee058ba6eb
+MISC metadata.xml 505 BLAKE2B 514e61811ac55e4e276059e8b61d2704ceb4825f96c9503166f388a8432c7397dec9769bf606216b8a6121a101479fc4e60dcccc83e74f0d3135d0d102146aa6 SHA512 07d75dfa6887da2323a02cdb448ceedab77317b34745bb54539d0f3f63a789e9c48c2db26137729969b574632855df76793b4aba0d2f75fd82c57363f4dd0f28
diff --git a/dev-python/APScheduler/metadata.xml b/dev-python/APScheduler/metadata.xml
index cb021de3be4e..66820c357ef0 100644
--- a/dev-python/APScheduler/metadata.xml
+++ b/dev-python/APScheduler/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">APScheduler</remote-id>
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
index e6ef77af4e11..70c1ca40200a 100644
--- a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
+++ b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/Arpeggio/Manifest b/dev-python/Arpeggio/Manifest
index 4d0b429c7d57..b88ddca688ef 100644
--- a/dev-python/Arpeggio/Manifest
+++ b/dev-python/Arpeggio/Manifest
@@ -1,3 +1,3 @@
 DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
-EBUILD Arpeggio-2.0.0.ebuild 698 BLAKE2B 8b17b78f81e2ec09057be06642f98e1da7e0283ce750a3d966f80fbf2c042810bc77201734d819dae0f8e96dac9d50b1c0467f96488bc444085254f7341dab6b SHA512 5bd1ac658af799d99526e5d36e54919059e864cf577b62fa512e847fc944c007380bc4a8851614add0549a75ad8a7102569cec8f32fbf2909949a4d0ff6855b2
+EBUILD Arpeggio-2.0.0.ebuild 705 BLAKE2B e89379b2c92bfb408b0f41971c66f051f5d59b1f1de6f4ecb1b13b0c7a1ecf419f0a4c2982a6570f9ecab88124eaeec7bfaefb02f7926656e7482ad194b4e4b5 SHA512 9f9d5022ded6dc9bad99a37c47c9ce76b01dd40b47af07f72519b05ad1b5c92525ba43d26f6efa1490d976a5b93050a262e2a3f80482f024db4a35c61a201baa
 MISC metadata.xml 447 BLAKE2B f4b144e8b81282e3d6c737c94ab3a21c1c5e9c9c188c21bd8d7e421a12ead133f26c226edbfa26410abb34f32b238571ca59d18f6870ad6e4eec1e9e54a20fd6 SHA512 f46f964a5cd2c23e00a6553f7a56324eee55231678cefa8538d5c0f4bad073478e99d7087989bd4fe2644bbb649e29e6670dfd409902750aa59534cd0c9868af
diff --git a/dev-python/Babel/Babel-2.10.1.ebuild b/dev-python/Babel/Babel-2.10.1.ebuild
index 062b4d423df9..5ba05540f593 100644
--- a/dev-python/Babel/Babel-2.10.1.ebuild
+++ b/dev-python/Babel/Babel-2.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Babel/Babel-2.10.2.ebuild b/dev-python/Babel/Babel-2.10.2.ebuild
new file mode 100644
index 000000000000..02e77dc3bc66
--- /dev/null
+++ b/dev-python/Babel/Babel-2.10.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+# see scripts/download_import_cldr.py
+CLDR_PV=41.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Babel-2.10.3.ebuild b/dev-python/Babel/Babel-2.10.3.ebuild
new file mode 100644
index 000000000000..02e77dc3bc66
--- /dev/null
+++ b/dev-python/Babel/Babel-2.10.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+# see scripts/download_import_cldr.py
+CLDR_PV=41.0
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="
+	https://babel.pocoo.org/
+	https://pypi.org/project/Babel/
+	https://github.com/python-babel/babel/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
+BDEPEND="
+	app-arch/unzip
+	${RDEPEND}
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm babel/locale-data/*.dat || die
+	rm babel/global.dat || die
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	if [[ ! -f babel/global.dat ]]; then
+		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
+	fi
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
deleted file mode 100644
index 76244effd2f1..000000000000
--- a/dev-python/Babel/Babel-2.9.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_{7..8} pypy3)"
-BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	local -x TZ=UTC
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/messages/test_extract.py::ExtractPythonTestCase::test_extract_strip_comment_tags
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 957bef5b90d4..25d9ef7324f5 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,5 +1,8 @@
 DIST Babel-2.10.1.tar.gz 9342917 BLAKE2B fe9f4cff416a57b4964481afcf9cf154b3d9e2c0c88b2b97786cbede1cb068f9637a2168a819dd94770ce3a5836ee8096b2fe7131d2dff16eb0a31a924b9fae1 SHA512 d6f8876bc47d2ad88277f5a9512abb177518b79d4f477cdba11d1cd1af8fb92bfd033c2c05c7a6c32dbd087a28189288f8ac80f9b654027b3e026a06c4ade127
-DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
-EBUILD Babel-2.10.1.ebuild 918 BLAKE2B 78a30d96e991b452ef538371d087f6c7010ef2a2217585dacbcc084c91703e1409dc3240a47c2e5c24cbefcd5a6f7231b475e0975e5222830d54cb29e501ba05 SHA512 8c11ccd9a189fd4b15df72217c91328997421088959308eac2a44250f4a0eb53b2dc749fa3c55fc5ebc909a52c7e806de749b2423820afa1cd8fdd883ec77098
-EBUILD Babel-2.9.1.ebuild 1024 BLAKE2B f0439254f28c093148ae4bdabce565fa132a983ba0d4af8801f0da83ac42457130408e9f7f268898dcbfdd6172954eeb5c3da417cef2c6946cfa3039bbdcdf47 SHA512 22654e4c8622c4b957a54a50a1250cd55bc09fb6eade2aa628313a2bf36d3e02c22eb12d1317826626d836d574204eb7884d4a3ecbf9248c0a582197cc613a69
+DIST Babel-2.10.2.tar.gz 9346156 BLAKE2B f6d8c3ccc00c5384c52d98d9939e58a2ec6f16dafd89b5ae5b5a302db16ff1d773d5843d1aca6a4cede859aa7dfa33ebbe4c49bd06c2720e0aa916a097d26fdd SHA512 d292cd26e8eeeed699a8307540a10bb5521a118940928eecf56622d22c01fd566b1c22cd86b33d92c0c1fe3eaaf8c0d634636d288f74f18cb297137de6fdc842
+DIST Babel-2.10.3.tar.gz 9344140 BLAKE2B c21d1e33160de2c98ac26b6ac83102a6249cbaf4b4860cd86e19b461ee66fd815a2972fc3652b411e2030b201bf32db77144fde91efc4e9e6ba51a580cad93b7 SHA512 72a5759d2cfa239df56f3d2809b23367b9691e21de92535b30f9b3455d253682f6c18ca919f3fb039deed2663db9276307f6343cbbab56fca96ff1ac9c214fa7
+DIST cldr-common-41.0.zip 29364494 BLAKE2B 1960e860017c3e5f31d935d66a1ff551720975dca0af459adc72b8dc54100938fbd2d2ef00eb457f3fd04d4f1e90a4783229c350b125029dcda5c1e6903f9a54 SHA512 c64f3338e292962817b043dd11e9c47f533c9b70d432f83e80654e20f4937c72b37e66a60485df43f734b1ff94ebf0452547a063076917889303c9653b4d6ce5
+EBUILD Babel-2.10.1.ebuild 910 BLAKE2B 895df4bfb515d22b3cd49264846ad12a5a401faec5b036730abe4edba17c001ec2603db24cb7bee301466db9e7cdaea303bc2dd3b5cca42d46f4e3f68e8839cc SHA512 f596d31082076c89b37c7ce1388cc5d5abb544980147832c50c4cf53dd53f57379755535e6b9150e23bd9ae67dc14d771e38a4eec1627631548d418416a97ed5
+EBUILD Babel-2.10.2.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
+EBUILD Babel-2.10.3.ebuild 1372 BLAKE2B 38fafd6c6a00ab9f702b69c5c6f4db87e43bdaec25ccffe32e0464e2f8cf1719a01f3ec5cf061be8e54ce5f98f2ff746834fd5a605e0f17f54f37f6ece5dceea SHA512 3ee1db1f977a1466984106474140913481ad142bdce055759cdef7a31a8cb8c9ebd0c63e9aff206e9b10c0a24dfad50287a903af487e1c128a872479103b511c
 MISC metadata.xml 840 BLAKE2B b0f46186ca0a319d3e4e1a658007b2cc59fe3a3ea9ede567af5084593f907e88dbe714d2b70c6a882ec95a5f90d4c0e3620ea0a939ad6e52650e770de88a45ba SHA512 621b66293259fd20c94a62ecf64673f7afcd714c18f054c8c0afe2d14e6e98c8abbdf6b4c5cc0043b5d30e513acab292d85c5587a02a9ae99ca007a28720c921
diff --git a/dev-python/BitVector/BitVector-3.5.0.ebuild b/dev-python/BitVector/BitVector-3.5.0.ebuild
index f55f024cf238..15e2e2f9a775 100644
--- a/dev-python/BitVector/BitVector-3.5.0.ebuild
+++ b/dev-python/BitVector/BitVector-3.5.0.ebuild
@@ -1,8 +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..10} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python memory-efficient packed representation for bit arrays"
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index dcf666f9fa5c..136c138eb358 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,3 +1,3 @@
 DIST BitVector-3.5.0.tar.gz 161704 BLAKE2B 0144d690394f0b9300b6c53429e3062a97a2d04513cf282a6f738bcf721f758c285a739db0c90c4c46bedd382bbd14c910ed59bc660494660151447f11de56b0 SHA512 c303b77f0f6ea4fb80233afb09e0f830e0beb8cbe17d9bff242a4b6465ec34a5621b1003f5cb8e139460a27bb4fb897960e3dce92eb30b95bef55aa6aa5f0827
-EBUILD BitVector-3.5.0.ebuild 576 BLAKE2B 84d0bc3606433f698a2390971cb1f75d6d0fda30da0acf45a1c66f793a1f732ddd1fa41c5075aeca4627a11bfee172acbeef1f80c96a4f357a9a53fda3092c83 SHA512 06e93aedfddd99f543d35438a8d33cde1d4d682378722e0f3ec448557e61b678c777511bc847d3de58b740c73096469a49ed1a007f68636569c0368eab7d93b1
+EBUILD BitVector-3.5.0.ebuild 577 BLAKE2B 050e7b287c40fa07329f96ce1e5d5d5a25e0174769a5fb7408af01dcd71339bac3a447655a7788436ab52b6e4d291a8c8e44c40655cfff4373d708b861e8a1e7 SHA512 3df9744412a58c723c49813b12514aee62fc0de9b17c5f7e6e6d3a9a3ec00660a54d77fca875805ecefd5ec9c2b64b52cdea2dc27f59f2b7ad85665a6a7cca2f
 MISC metadata.xml 420 BLAKE2B 7a90ac1094999dd45b90e59c5ae52f6246ed0bd1e0bdca7cdf9e92d10b9c6cdf8fd72b385e5a5dc72964cb6f89389ea8bc85f456224ca40c75867a19ba1e2d16 SHA512 4712173737b4ed8378c5e707382dfc86a7bbbb71ef9b3ffe2772f6bf9a81185fe8f09840ae7b43dc7a3d102f0da2104fab4019d00c00b8439b5c69142dc7c712
diff --git a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
index ec77d48706e2..3b724023f8ae 100644
--- a/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
+++ b/dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
@@ -1,8 +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..10} )
+
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/CppHeaderParser/Manifest b/dev-python/CppHeaderParser/Manifest
index 1e0d6ba022c1..99941d2dfa57 100644
--- a/dev-python/CppHeaderParser/Manifest
+++ b/dev-python/CppHeaderParser/Manifest
@@ -1,3 +1,3 @@
 DIST CppHeaderParser-2.7.4.tar.gz 54445 BLAKE2B a089df97dcb9aed7821614bf354d0fcadd67dfb387bf5873c585683401d531e465bc05631147b4d5c5b47fe93eecbab1faa34fb517bb92bca6d6c39e07c316b9 SHA512 223550add1e391eb535d1b8be08a54b9d6fe97ca6dbfc54407cdc17a5530a91ef6be4ac920d6841b9f479bcbd6c823512b08565ad433f62a87e993cf393932a2
-EBUILD CppHeaderParser-2.7.4.ebuild 457 BLAKE2B afea87240cab2951805d5861923316b564913ed40d26b14679f3eec3169aa450ed862e90b30d4777663f8dab6ec430bd36292abb80f9584add2b2bd2ef40c764 SHA512 446788208e643a65ec6af7e673e85da01a240229a83fd2e8584657cc809799e4d163b86d906a38ffcbc6da287c8ed4bf537e938e800f9e28b583450023daffce
+EBUILD CppHeaderParser-2.7.4.ebuild 458 BLAKE2B 96857979669f977ac819acff2b57b2f5b8af5748a2c3b9407c912687fd3e4d5f7ac6cacf49da6d4eb4622f1f5976a1ccf887960776ea3b6374ff3729661b6d6e SHA512 4401ce5b013b28aea2698f3e8ba87568473610c3ff34ef0732022679fabb4d02da72251ef41e36de413a79bd0a1de9d7a90bc53856bc09868dcc1ea8154a608e
 MISC metadata.xml 586 BLAKE2B cdbcb728f3bae64f2ffa9c3a663ddf9c69d8170522372996a9b9eb3cc4a5887847d46842356349934dcf01924751d40509e5bc53e91bab8d947f34de20c38a87 SHA512 c421502625773e6abfb839e9e58415237eb1473b420f38e3ad89fd7c995068c1e28127c0f4c0e8a92b2e88e3a6ec89f5a0a5400087555b841695b3a00b950be2
diff --git a/dev-python/Faker/Faker-13.11.0.ebuild b/dev-python/Faker/Faker-13.11.0.ebuild
deleted file mode 100644
index e6e86886aeab..000000000000
--- a/dev-python/Faker/Faker-13.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.13.0.ebuild b/dev-python/Faker/Faker-13.13.0.ebuild
new file mode 100644
index 000000000000..d8e24e8d32e7
--- /dev/null
+++ b/dev-python/Faker/Faker-13.13.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.14.0.ebuild b/dev-python/Faker/Faker-13.14.0.ebuild
new file mode 100644
index 000000000000..d8e24e8d32e7
--- /dev/null
+++ b/dev-python/Faker/Faker-13.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.6.0.ebuild b/dev-python/Faker/Faker-13.6.0.ebuild
deleted file mode 100644
index 2b9827ae45ea..000000000000
--- a/dev-python/Faker/Faker-13.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-13.7.0.ebuild b/dev-python/Faker/Faker-13.7.0.ebuild
deleted file mode 100644
index e6e86886aeab..000000000000
--- a/dev-python/Faker/Faker-13.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/random2[${PYTHON_USEDEP}]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 821e63b65bb5..6b0bfe22e0cc 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,5 @@
-DIST Faker-13.11.0.tar.gz 1500499 BLAKE2B 41fdda0cbe46a82fca75d49894f4543ba6e2e0f727d581c1214daa2f6bfbab2c11c3489bdbb349047038583687e177295d8fa0690f288b9fe0878deeb55a012f SHA512 74acf9d05a769851217f8a05a3ef84ac95af2b5c4292f05ff7f8be2670de9815074dc3fddb8d88170568910c0c4f2764d4ee61ccba5743071d9cf48f52520216
-DIST Faker-13.6.0.tar.gz 1488090 BLAKE2B 9b4485fc97b0c22f9cce298a55e9dd91c05ea9a56514618c1355c420f3ce6beaa599caa51d909803e968ab918c4c841f459da3d06dd78fbfe984d22b323e2cbe SHA512 bcfb49777640f9b605e164b91380aee77206614f055a321b905ead1649219c081254e57ea80045dd692d061e53e69201ad356daaf6727655c87d65b16752c4cc
-DIST Faker-13.7.0.tar.gz 1489106 BLAKE2B 8b12782b836915f83d4a05cf735d0e00544d67af595239535822842bcd8a5b08ee43d6f0ab17a813cbda194874cfc3d5a983e018a6655dfe84f9a5151562db8f SHA512 84299a5a8f4fb01bad2eb337627878ad54a835a79e6573300435e19b1d9b6945a2e67260ea6c9a8db586657e11b4a4c5f25f83c170430162aeb37f87cc0f5f4c
-EBUILD Faker-13.11.0.ebuild 743 BLAKE2B c954188574c55e07e1737acf6558e83712dba7981040e05ed49864397a18e27217bcdb2da6d033f56553e9af826347302938035ed84d087d3b28b64a137a4b1b SHA512 71a025aa9e4571bd9e0a5d123ece8c128327653915730cc5ba1f6887258a348f339b4955ec01dc5ae88fe393e5699fba74354ca7bef0e83fbc4ca9c3c7c4182d
-EBUILD Faker-13.6.0.ebuild 744 BLAKE2B de9d69408dcf30f6197a48aa69f479e3167f433b262d33a0f99cdfb717650e0b57ee477ff0dc98f638f37adaa92312030d4afd6b4549f6b6e53a7a8ed2ae255e SHA512 7b6025f1664b2bd3c662dae386ae8ac4007cfec78a44b6e78cb98e43ed8b158febea0b96fbd8ecd954e6134b1509b9164ba5a1a717dcdcb8839a3274b2441e1a
-EBUILD Faker-13.7.0.ebuild 743 BLAKE2B c954188574c55e07e1737acf6558e83712dba7981040e05ed49864397a18e27217bcdb2da6d033f56553e9af826347302938035ed84d087d3b28b64a137a4b1b SHA512 71a025aa9e4571bd9e0a5d123ece8c128327653915730cc5ba1f6887258a348f339b4955ec01dc5ae88fe393e5699fba74354ca7bef0e83fbc4ca9c3c7c4182d
+DIST Faker-13.13.0.tar.gz 1528907 BLAKE2B be4593ba271330822f10590aa8e15c4658cd8a19333ab769d32178b72c15b504b8a5269443100250a863af25e40c582244e815cf612dbf8a57833f470ddeec09 SHA512 9e794bf95d40040dfa98439d0d9da19a90dd202905d4825c82453e202adad80bbea6da74ce0d36d8e205381d419a19b8b1fb60b32e20e97ee69b315f4f0c8eb9
+DIST Faker-13.14.0.tar.gz 1529502 BLAKE2B 57c5182742f4383bc0590f953dbf8de7075b331da8d9893b84149ce8d3004e545acccf9f113d94eb608b634d9ad42a466d813c5f0311e037d8977fa04eaf36af SHA512 05edbad684a89b0cb4df4965be63b43729047075eed98de9678d98383b28d2ae6d3c645c03ab86d7bc935160c1ab744494d608749213322e318b465c0d47e9c7
+EBUILD Faker-13.13.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
+EBUILD Faker-13.14.0.ebuild 743 BLAKE2B 5018d7828a83837233d7e23c875e4c710665e4322e79329a49cc426d97b630627f9aa64df85f92449f06d1e11f772e8e84064b389b586b9ef5214d7200ffa305 SHA512 a8de56e0b42bedd66f8f9b5a512ff79d30b29e728c5d6227f6c9b4f11c22b284941f342ec8c531345e4a89af15aade1192941fa0f4400b2d3e2efb3bc9f7e724
 MISC metadata.xml 474 BLAKE2B 337c8b17b4ca092edc2e59bd61dd847e4b9f2bd7e0651d07dad5b3e3eb4f311de9e27e6cad1f6a4835f618446cfa4cdb95e578a8af11498cf7bed1ec697990ce SHA512 35f4a2a50ad5589ba50e619670d1f1eac423fec920bb9c07b3f8bd7d7f2a0bb4e88dde286b062339b30ba304bd1a834bf3318c0b0ad0552ce9eb45fa72e5f44e
diff --git a/dev-python/GitPython/GitPython-3.1.27.ebuild b/dev-python/GitPython/GitPython-3.1.27.ebuild
index dd1783145b6a..8417e2e45d1d 100644
--- a/dev-python/GitPython/GitPython-3.1.27.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.27.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -24,7 +24,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"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 922afc161260..47c7a6d96289 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,5 +2,5 @@ DIST GitPython-3.1.27.gitbundle 9652508 BLAKE2B f81b6d94b302b1d4aec85096bb294df1
 DIST GitPython-3.1.27.tar.gz 192188 BLAKE2B 3cab995a17d8eca8d4301367b1ee7a2c3c0a46a217f6e6d89e1bb4e62b733d21cd6d9210faac49c3c905343067e819f8c37ac9cc69d9fc33ce948b63fd53714e SHA512 6f855bcfc380c1a83a97807ca8ddcc4dfe8258f3aba0790142ef41f28befff44847aec925e523eaac47fd6c0078eb6296f52bb4b7d2be7d59ad95bbeb930fe28
 DIST gitdb-4.0.9.gitbundle 1461448 BLAKE2B dad9efdc4e9711361c851f4745df2e3fa3b2360ab58cffea971a854429cf3e11862a267efb5afa3d9ff7668dc6d1bb7f11aa033172238bea61a6252d0488b746 SHA512 eb71e6dd380e67a96a9dcd50a3a3c82aab8c7f85b1ca4258a92202a5e4cb5a1535363599c94ab26884b4cd755ce30694c1b193a95e5cd5199b5d4e2cf8e72818
 DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
-EBUILD GitPython-3.1.27.ebuild 2194 BLAKE2B e3eb55cdd9eca9cd6134898ffbe5af4540195b9d624c8c5765c7406d4b9a66bc8875d7018d1133745561b57fc350540bc6fe25728deb9c756b13981d8917aa78 SHA512 de0b04ca8fc63ac37280bffc23d1fbbee251abc6ab32780f0236646672d9b504ccc270173c24d4764985aabed378af5273f15e210535399f0e6ac8be98adfae8
+EBUILD GitPython-3.1.27.ebuild 2200 BLAKE2B 56e801f92c86d7f52a85ac1a94717437cf33e344f92219c3ac81ce9684772540904d53e28a28a01fa1e2c6a02d0a78b8ee1617d76e2a8967cbb98ce628b8976d SHA512 4b489b3dad8c5c6b60a20f400bacea66a21f4a9e7f98856a005cb470e57f7ec923b659b5ed9af6762fc17545a144fecb50f714dbd09b69f978f5f188b4801f34
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
deleted file mode 100644
index 1abd9feeea58..000000000000
--- a/dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reading and writing of data on regular grids in Python"
-HOMEPAGE="https://pypi.org/project/GridDataFormats/ https://github.com/MDAnalysis/GridDataFormats"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/mrcfile[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild b/dev-python/GridDataFormats/GridDataFormats-1.0.1.ebuild
new file mode 100644
index 000000000000..430e043f76da
--- /dev/null
+++ b/dev-python/GridDataFormats/GridDataFormats-1.0.1.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Reading and writing of data on regular grids in Python"
+HOMEPAGE="
+	https://pypi.org/project/GridDataFormats/
+	https://github.com/MDAnalysis/GridDataFormats/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/mrcfile[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/GridDataFormats/Manifest b/dev-python/GridDataFormats/Manifest
index 95eb99fba311..3b4e535f3210 100644
--- a/dev-python/GridDataFormats/Manifest
+++ b/dev-python/GridDataFormats/Manifest
@@ -1,5 +1,5 @@
 DIST GridDataFormats-0.6.0.tar.gz 1984859 BLAKE2B b53e6a43a06fdcb42fbef4c10dbdb1b5740fc04fff468b666c687ba5a839b8129b49358d54c6d7e4229ebaa67af01d897fe960f87a868950657bbcbb85ec7487 SHA512 b876eacd7b1d3a7dd6fe35e2092783183fb0ffadf7fbf583773e6a3401bef51bd33ebb2e73f8b4ec9cd404c153c30ce09dfb75d5e4aacba53915d085f090d0ea
-DIST GridDataFormats-0.7.0.tar.gz 2159247 BLAKE2B 7969f80960b5a29c44a645725a53dc6eb7c99d02e4fe1369700aaff85e4b98f3c7636768340c95b4ac44f6971558ab2efc5dc4e4968fb410e90e2228635e19ee SHA512 333c7f77c9c65f6be788c58efb0822eb05580893e96522c0bef04d84d3c5deae5498c1721353ece2ecd4ed8785acb6413b43123c0d895a855f0ee59e44b1d310
+DIST GridDataFormats-1.0.1.tar.gz 2155370 BLAKE2B 8bf5ce65cefdcf490b75212bca8831957769118fbad7fdce42b5634ed67a1f5d4ac454f7429b984bafd89f5bc883fff1bca9dc71f529794cdd585e186e41e063 SHA512 2cfb8c50b4d17fa978924a0e65ae27f6e125bd1055bfdc9096ea35511f4c2a8a16f6bd9c652b9130fbdd66d4d464d8074b14f47c175f98df94c02fe973a0107b
 EBUILD GridDataFormats-0.6.0.ebuild 620 BLAKE2B 25c320580183c150d77c9e10a103dd425b1cf005749a8686676c1fa8c1a1cf747df6b437a62783e39f1764a82c73e5c00ca754a076c79231d2b39e0a2edcf078 SHA512 74e25dc0724e53585cc03d7c4726531c9169d86c79dfd2d01faaaf03ec320eab4712cc826aca7e8a02a88e0215484276776d45a1f94e982c5886c80afabb4201
-EBUILD GridDataFormats-0.7.0.ebuild 662 BLAKE2B 312cc77f8342a9afcc70336a45ceac36319594904dd66be392f68b861ee714dc69db07e96bc4fc654c86c755a446ead74df0013a59fa79b0b0d92ff514745e6a SHA512 4964bcea0ad4010e1cbfe288f8bb97b9f56a38beb45092d8b71e34877d86259b609c6c7f88913d2cdb4b976d19990fad3b1fccc5054db4cac029af3f729b8236
+EBUILD GridDataFormats-1.0.1.ebuild 667 BLAKE2B 353d752b55d881da2891855e0511b5fb69bbbf8be8bd4d81ce185ef79834ef4cab72b1d62d70646ce61b5b92d00ab0294ad13e00114100db5e9e92a15dcb7c2b SHA512 bf5d0c86d762ed9cd06ddaccab5a86d60233c44545434ce0efa69218fdf7935afdd5375398de560d589f4866a88eeefe2917574585035804db4ddd5c08eedf60
 MISC metadata.xml 608 BLAKE2B 25b3e613ce6776ecc00b7ab3e65ba253be7715f167b37d4fc4d625b035e8d24706cd56bc14f2f0cac2b3f4da6b84c8bcd2b219914490b9e3bc9fab0cbbc2ddfc SHA512 48ca119e78978f100a3212a59d716d49766e6bd523813c5395d05f705f1258e1899183d52faabfef95162b82ccfa08b5b771c1a00c53d7c42a54aaa97eb9ae52
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 88c9592e69cd..a5157674b1b9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index e9eb3fcc08be..4544f7c40ec8 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,3 +1,4 @@
 DIST MechanicalSoup-1.1.0.tar.gz 49270 BLAKE2B 947b35d819dc69508595adcfe5a0c8e6bd34888c995e9c3931613498ee1ca840ce16a14359aacbf9d40aa4f9ae59d45d14da5a150e3ce39ae7e72f587c94820e SHA512 26eaa54bcd1c0aac26504d7c482ed001830a1c79bf48a3055cef92348e9336887bef86cda68281911032159a3404a1f4ee8de9b6516d7d767cfd6b3b380c4ebe
+EBUILD MechanicalSoup-1.1.0-r1.ebuild 1132 BLAKE2B 33415f16f45e8c32e16b89c269d8ec1a0b89d5d89434f41d8d1ec1170de988a3ca51d20d145cdb5212e449b9b42fb38c66b5988b3a645f8d1622dac0b7c1d2cc SHA512 13966585060e578e0754c8ff58328ee7224301903ce7f421b1fc457ce5bf82228c5b7020f08864dd320ea0504798fa0c539309996619e8b0fb5cce9b9de4ba93
 EBUILD MechanicalSoup-1.1.0.ebuild 1100 BLAKE2B bc8e99ef28493fd75fa1f405af24cc9e51f4e35a1c9ded1b5d1ef44b4b3d1e3e4ba29f6ee8ac07a03015aad17fcd7f1b52c3814a6b917ec35a152dd4694fd60f SHA512 839815b56da7212cd15c803b2abc47611ed9dc0a8f1c6751a8a309d5a840dbcc4ba2160c6e995dd02324d87344247b9e6adcc9d2f191bed8c510e7d56234550b
 MISC metadata.xml 551 BLAKE2B dca0b67c8f618d76be9c14bd4123c1505ad167fc9852112da79d3db4dfc9824ff5dbbd88e250d945bbec08c12aa4cbd91ce87f6fbfe85764ad62ff575b82ed9c SHA512 2e9b6096a8e9824b0619bed3446d24499fd1a41521708c73a1e2c3788d4f924fa07ee9b00abb4b4b96f7d59d068c5e336a88a7c1951f7337bff12e600a49c4da
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0-r1.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..4c41e80353e7
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python library for automating interaction with websites"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/beautifulsoup4-4.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Override pytest options to skip coverage and flake8
+	sed -e '/^addopts =/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+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/Opcodes/Manifest b/dev-python/Opcodes/Manifest
new file mode 100644
index 000000000000..41f235381771
--- /dev/null
+++ b/dev-python/Opcodes/Manifest
@@ -0,0 +1,3 @@
+DIST Opcodes-0.3.14.tar.gz 236187 BLAKE2B 76e2f92a8860dc0306b5c48de9f64d6cd18e553af3936faac36e412bae129399ce7ff34ee2757b816a361aa29cdd45ac6b11e00bcaefd943e512ada6da0b70bc SHA512 bbdc08a75028c94def56b2afee0742db999acc8fe44aeeb6e8d8ac5e47e969a9daf0477e089ffff4c434be01c48b5e5ec5403bea86ba4e8674063a9f96fbeca8
+EBUILD Opcodes-0.3.14.ebuild 611 BLAKE2B 70bcc83489f78f85f6f6621e76eeb175a107378eb99bff0a7087a14ac806b1a1c0243b75c8741dba94a5d59cde201bb45bd8a071edd91ffac863d078e31e15ab SHA512 8628e299a1521e5fae17aa226a17915218023a0327ccc96372621a76afab087effdf705a828ae3cad711c008be4d9e064efb0b391dc76b4b73c83f60df3a6afb
+MISC metadata.xml 377 BLAKE2B 560ed27df5fc59502ce8a5615c37993a5153db90440da28e00583ca07d84348469fb6a0db2356b5877ea28aea580715ea89a7d38baffc2c402b75a7d5e23d84d SHA512 f66fea12702715a14713ceb94c9b47ff26392cde88c07d4c0a1579ecd12076be8503e8666f780de2c9493042231f09f015875c234bdb1a9bad3ee17692325ef1
diff --git a/dev-python/Opcodes/Opcodes-0.3.14.ebuild b/dev-python/Opcodes/Opcodes-0.3.14.ebuild
new file mode 100644
index 000000000000..991749a7c042
--- /dev/null
+++ b/dev-python/Opcodes/Opcodes-0.3.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+CommitId=0f7c7d63f5e13ce5a89d9acc3934f1b6e247ec1f
+
+DESCRIPTION="Opcodes Project"
+HOMEPAGE="
+	https://pypi.org/project/Opcodes/
+"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # depends on an old version of werkzeug
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+S="${WORKDIR}"/${PN}-${CommitId}
diff --git a/dev-python/Opcodes/metadata.xml b/dev-python/Opcodes/metadata.xml
new file mode 100644
index 000000000000..1613d33cc445
--- /dev/null
+++ b/dev-python/Opcodes/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">Opcodes</remote-id>
+		<remote-id type="github">Maratyszcza/Opcodes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PeachPy/Manifest b/dev-python/PeachPy/Manifest
new file mode 100644
index 000000000000..6a40b9420f1f
--- /dev/null
+++ b/dev-python/PeachPy/Manifest
@@ -0,0 +1,4 @@
+AUX PeachPy-2021.10.13-gentoo.patch 457 BLAKE2B 73fff8ade853b5a4e8d02bd129a5c8a18a1f5b5516cdc4a5ffa4d114b8deb07cf1cef450b63e2db7dd3888b2afbb81a541180a785af6944e79880be03d2a69e0 SHA512 64c4dc1ebe5ec4166bc225bec5d596ad59e2fa162cd7037e83e2d72bded38d79d0d69534d8163a92a9ad9d845d75f2396a53328a8287c5df34615902c7467c0c
+DIST PeachPy-2021.10.13.tar.gz 248855 BLAKE2B 5f8e7845dfa7327c62e6a953505260645ca29dc762dcb3ffd971a6a07c81f259776286c12c2147e980ae43f77d3ce060a87201e2189123290845f6543c74775f SHA512 c6370de8da9152e812702a3bb53592cba89ee24fdfbeaa87d49374bad7b2d79c60e54bac17a29d861f5881f4ce076f2fe96bff378ef31bdf3cbc6bc5093f6f3d
+EBUILD PeachPy-2021.10.13.ebuild 757 BLAKE2B 827ddf25f4a321904ed6df87bb2eb01f7cc17c2583c9ac24789f1091f7e3e6803892a17a66ca025398be590e869e84118cdee64a18d3eafb66eac0ca94f0d1b8 SHA512 cf5da1a02de94e9b680b6d31e99f489ca1b9665c57fd4ce9b6bc7e9f33fe8c7599fdb4c00947ed9549ad68f9d4b6887ea8ca957f1687c5142de27707c1e9e75c
+MISC metadata.xml 332 BLAKE2B ed80d3acf70efd7c986c87badb69b4dc0585c3f09711d36127394b0c3af596c98b732a1b7a6754ccb4f821b9a992031043cb55231716343bdcb834c5a993368e SHA512 81264cc007a6cefe59d64a3bc3b242e48820b8a00772885115b5432f8163533aaf7961cda5d6e34bcc1cae5c44c3d839507f241af611351e98303b5f1c7af676
diff --git a/dev-python/PeachPy/PeachPy-2021.10.13.ebuild b/dev-python/PeachPy/PeachPy-2021.10.13.ebuild
new file mode 100644
index 000000000000..5e09b4102df9
--- /dev/null
+++ b/dev-python/PeachPy/PeachPy-2021.10.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+CommitId=257881e0a7ce985c1cf96653db1264bf09adf510
+
+DESCRIPTION="Portable Efficient Assembly Code-generator in Higher-level Python"
+HOMEPAGE="https://pypi.org/project/PeachPy/"
+SRC_URI="https://github.com/Maratyszcza/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # depends on an old version of werkzeug
+
+RDEPEND="
+	dev-python/Opcodes[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
diff --git a/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch b/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch
new file mode 100644
index 000000000000..c5ecab041a76
--- /dev/null
+++ b/dev-python/PeachPy/files/PeachPy-2021.10.13-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2022-05-15 19:33:42.938456878 +0200
++++ b/setup.py	2022-05-15 19:33:57.869231488 +0200
+@@ -35,7 +35,7 @@
+     def run(self):
+         # package_dir may be None, in that case use the current directory.
+         import os
+-        if self.distribution.package_dir is None:
++        if not self.distribution.package_dir:
+             src_dir = os.getcwd()
+         else:
+             src_dir = os.path.abspath(self.distribution.package_dir[""])
diff --git a/dev-python/PeachPy/metadata.xml b/dev-python/PeachPy/metadata.xml
new file mode 100644
index 000000000000..c7def3ba0623
--- /dev/null
+++ b/dev-python/PeachPy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Maratyszcza/PeachPy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 6375a990aeb1..def5f7b82a3b 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,3 +1,3 @@
 DIST PyGithub-1.55.gh.tar.gz 3123996 BLAKE2B 58522db764b44286bb4b65cfa13fcce8fcaac99f1b71d62afe6cfda2bc8b13537de0b0db65e0cbc5c6e4a346cfdbf0084c0c8f4c13ed046d8bea33b10fa51382 SHA512 7ea9e67428e98330f90f1d78e5a003dbe1a6d5cd98b6c729f2030a73d21b4a72a7957382c888fac0b7bae4a409cfb53473a19e7e73df46b251df0327871e173a
-EBUILD PyGithub-1.55-r1.ebuild 809 BLAKE2B d1f070c089a44dc8e187a4bf36bd63f17ce05d7bbc4d2fbee899ace65d632dd99721f25584efedac0047db7c57a1b2c0b96dd671a7e56376cb853120c568eb0e SHA512 6ee25a123200eae9ebdea95f552471feee0497dd2f78424d4a4684472ea39266b0152e46b5b393a4f8d6554ee33eb7ec208a806b81cd1fcb80c3d6eb2c8f2a0d
+EBUILD PyGithub-1.55-r1.ebuild 809 BLAKE2B 252d65c209dff8bbd6833471abd4e55c717c8bec2a1033a023c0c0a26c3077276341f1af65ee86770f46cf5d6c3fd427692e459c43f46ee89626c63adf58e631 SHA512 7dada7cf74c539207cc3f03212a1653ce17e121e60b1b1a69ea55a639332b7240002c50ac3e2c0fb31a25ebfc681ef02600e6045d524bbe088c2eda55d6aaef3
 MISC metadata.xml 501 BLAKE2B 1692287021b81416f18386da2b1dffd1c358d4dbfa3aacf7d5f773db0889ba966408c35fdbb7ea7f741923d542ea4e825039ab124a64168ad2d5264d1718dc5b SHA512 e1f2c16e725e96e8d576ff6b87a79d39f1b8169c6f419eadcd18a8a266fd188dc08fc9efa236f2c696449a083b000086b153da559cd819fcb73ddf2518500813
diff --git a/dev-python/PyGithub/PyGithub-1.55-r1.ebuild b/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
index 30ea465aba97..26580b302ec9 100644
--- a/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.55-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 0c5ee140fcca..0d34dcdda805 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,16 +1,14 @@
-DIST PyPDF2-1.27.11.gh.tar.gz 3431028 BLAKE2B 4917d40f3b896e086ea1deac43b9a3d4391d758ff2eb4e2ab731d632d24478781ca862ceffd707b26ae7bb0295c922089ca9a9a90e0878d2e0aef466d1464346 SHA512 cd1578295fafd480016b838a865a658e8996c04a0e22817f8e45d8c00dbdf6dcac2e8c80a8de878e8db4a2984022382f74e8a56af5e305acfb8e3de5f965d207
-DIST PyPDF2-1.27.12.gh.tar.gz 3430850 BLAKE2B a0cb344f616d628b7c39dc360234057ce68595ffa554a8588990ef0a1239ade2db6415caefb84bc058d89067ed04ba66ba149f6f106bbf9a55a13f523dd826fc SHA512 ee00c975881b7e6716656b1cecb83c3e1f7bffa4ed9fb0d8c8be45c7d951b2b79f0be4f9098569bad783703fbc00f0797e73b970b02adad1ed3a4cf3b6ab7b73
-DIST PyPDF2-1.27.5.gh.tar.gz 2053469 BLAKE2B 1a01289145574a4551f1fa237e4c790dd866088787f5bc9afb529ea99424f4d211f1913737cf4a2c744ceae90568ca26612cc4956ff1eda5840624e41df76d78 SHA512 c1f77c7ea46e866da104cf05421ccf15870db07923ff5860a6b44c944d599b38e98d33d6042a155b0698ecd100d1c6f57aa7bb8904dd08e679f6560a578d4488
-DIST PyPDF2-1.27.6.gh.tar.gz 2092950 BLAKE2B 786d5102275d6c04628d76fd0225d453aa8f74cb0a6e135f3d56ed1143c114144aa9daef17e5971ce9e4c14cc01016125107717296d76cf7eb34c1cadbdd42cd SHA512 bf1c60453e6a98a50c382cf967fc7aa1fb8dffc14d426f97bc0e41c34a6534930849fe053c8debe585b3877eadca9f8b43f803b1f01586f6c693a1eefe43e3dd
-DIST PyPDF2-1.27.7.gh.tar.gz 2093013 BLAKE2B 5637094972228ad1a5790f36f71e3fd8a694c9fd99bad7874a03f299ca0bb6198064f6756552cac41127fd67a827ca191e6de56281b25c13629a99edcdac7685 SHA512 dbcb944f3bafb0c0e81842e92e8a72609c85c271eba83841ee5bc901119178a6a4ff503a4796014854a75137b9f8f25a245d55a550e770b9f78daf8e1e92dcba
-DIST PyPDF2-1.27.8.gh.tar.gz 2104282 BLAKE2B 849a801783b0e3990c3d8c68449b8f9717c2b2155fc78b9c4d07f99cf84ebc453e388192a361f06c8e6405fc5057e25fcd4158475266e6739fb1e91f35f9b1c1 SHA512 42406303f293962a43ac462d9cc7e5ce2fecf999bb7b37913970104f88298ff393f801c187b879b0bebd055a87c70d79a726be3c37c2a53fc872825112fdc98d
-DIST PyPDF2-1.27.9.gh.tar.gz 2124754 BLAKE2B 5b1279d84b949a33571950d7256c4ee7b319ff551b5d1c5fc78193048bf54ec3a835cf73a4def7c8fc4ff77f8edd8738062a9e76dc858e1708a21fafee0633cc SHA512 9cae31bb9410dd65746da955a4fc25f8e741fca5dd76181229e5af22d069641a7e8d92c23b117f16fb5a6ee635cd83dccb910fe4ff94a85222bbc856c2109127
-DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
-EBUILD PyPDF2-1.27.11.ebuild 1051 BLAKE2B e889328886573b476920b991701cde199ab9ac94bed45eb4b4005572197393759cd3ddccc6dcbaf490cabf44899eb9d2e5d9e6d1221f5bf6a2153a12e9778469 SHA512 1bf298b06ec2b2c9e221365a2de1dd4af9ff16f0ee89d1d1943a4e7d83558b89447bdaa641540f88acfbf9b01ca4e5b1f8a179052738523931e05a1d1ed2736c
-EBUILD PyPDF2-1.27.12.ebuild 1051 BLAKE2B e889328886573b476920b991701cde199ab9ac94bed45eb4b4005572197393759cd3ddccc6dcbaf490cabf44899eb9d2e5d9e6d1221f5bf6a2153a12e9778469 SHA512 1bf298b06ec2b2c9e221365a2de1dd4af9ff16f0ee89d1d1943a4e7d83558b89447bdaa641540f88acfbf9b01ca4e5b1f8a179052738523931e05a1d1ed2736c
-EBUILD PyPDF2-1.27.5.ebuild 565 BLAKE2B c8c17e25957f64b7ca3bf2e0ea52ef42582d27bd14666c144d31d2f8951792d0eb81d81a7bee82a6b00762c48ae46ab94eb3018ba714d4d53525f9fa443cdb39 SHA512 c294beae357ef788f37bdcfc7559dcf7c6907d9b271a7779fcf72cb653bab5faf6409e24de2cc98827f6472c7b9bc42620f75eee72620f4122a0d4a4468f0396
-EBUILD PyPDF2-1.27.6.ebuild 745 BLAKE2B f8704ee03b6554d1115382f47e7268134003789d06d569ef6c2d456251f6a3815fa2d090cf79f7bef74a48ab1003530643c3abc155fcc8d123cf9e0c13ee5740 SHA512 42a1e58c650fcbeb41f114d45f3122323e1e95fc67e8c80d4e129e0f3d786c53cf742b538d0834b499be4fa419e21de8b79863444d30b4fb11b8d700bc448f46
-EBUILD PyPDF2-1.27.7.ebuild 745 BLAKE2B f8704ee03b6554d1115382f47e7268134003789d06d569ef6c2d456251f6a3815fa2d090cf79f7bef74a48ab1003530643c3abc155fcc8d123cf9e0c13ee5740 SHA512 42a1e58c650fcbeb41f114d45f3122323e1e95fc67e8c80d4e129e0f3d786c53cf742b538d0834b499be4fa419e21de8b79863444d30b4fb11b8d700bc448f46
-EBUILD PyPDF2-1.27.8.ebuild 745 BLAKE2B f8704ee03b6554d1115382f47e7268134003789d06d569ef6c2d456251f6a3815fa2d090cf79f7bef74a48ab1003530643c3abc155fcc8d123cf9e0c13ee5740 SHA512 42a1e58c650fcbeb41f114d45f3122323e1e95fc67e8c80d4e129e0f3d786c53cf742b538d0834b499be4fa419e21de8b79863444d30b4fb11b8d700bc448f46
-EBUILD PyPDF2-1.27.9.ebuild 745 BLAKE2B f8704ee03b6554d1115382f47e7268134003789d06d569ef6c2d456251f6a3815fa2d090cf79f7bef74a48ab1003530643c3abc155fcc8d123cf9e0c13ee5740 SHA512 42a1e58c650fcbeb41f114d45f3122323e1e95fc67e8c80d4e129e0f3d786c53cf742b538d0834b499be4fa419e21de8b79863444d30b4fb11b8d700bc448f46
+DIST PyPDF2-2.0.0.gh.tar.gz 4574406 BLAKE2B 8554fdb7ab9ea1b9990ba72fb05ed02ef8732788b896013f3410f74bad482a95dfb42215cff247d411e6e84bd1afa3437af36f203b7aa45890c4c5681853dfb9 SHA512 8bdd9c2cdd20758a183696d8d33a207f9be9183e63b7757e09d281f4ae4a6a61714a49c940d5bd57df8a6074ad7498f17354b5d4984b1b2ad4bd119b62d93138
+DIST PyPDF2-2.1.0.gh.tar.gz 4728411 BLAKE2B 00949842da43136afc7ee3482dc0b61182a0bf3ee4479d8794891ecf0a7cac9ec92a94d480a2ab75d35be9f667b5c27cdf17c8e7ce76bb5355cf2c43c7fc814b SHA512 d82f05fe6e7f944f045600c1fd7d451181803769b38911a2d6e0553ae7b16cbfd6838883809c71fddcdfc386f62e0a5f5aaa6d947236a3c8cdedb5fe8f338a5f
+DIST PyPDF2-2.2.1.gh.tar.gz 5019240 BLAKE2B 31412cc136bebdf0288fcdf693540e2ae8b88c08f9d837ebeb17b8f8bfae289146028890f36b7b16c6012469908d4f6855169efcebce082d4c31f634b6410162 SHA512 669c41f477114bc38a214e8f4893c5eb59d40dfe07e3c436b71ede09738539e3f47d8f9293cf9c3012887d296c7a634ee93bf2542910c400c4765bd30495f0f6
+DIST PyPDF2-2.3.1.gh.tar.gz 5077679 BLAKE2B 36a70ef9e10ebb6d5c50b713f539aad56b8ccbd94d279aa0b0dc41e9ef1c682ac21b04b4612771e386e8655aa812e11bdbe04363ebaa074a96ffa7059f500e62 SHA512 885d6bab457be594c7a715345f0d4c6f5ba1e34f422e3de42822f4886c0021fc799682e9d253f3c3f48f8c45d387ef431843e2f2f9c7e54c1402ef31b975c511
+DIST PyPDF2-2.4.0.gh.tar.gz 5119230 BLAKE2B a396f1e36a4ad74396a549fa6a6dd76b4a24bee66c78e52bd01b9d3ffebbf15698c0b1b30372fbc7224a815733bfcdecc7e7caa275de32f1a25f44c0e8276c9b SHA512 664f57132c6fa9d2cba324559de985b2c4de4a1f9b5d1ca4539cc9ae35b4296a0b3dac1d15ad069e3f46cc01b2b55d530c0fd5f70e6c41ce5461dfd0ebdd4cdd
+DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
+DIST PyPDF2-sample-files-4d24ff93dcddf21d55d028d9675d5b5bf9d7a350.gh.tar.gz 5443819 BLAKE2B 6eb440a2db3b58f7e195b8f24438552b2b414296b887cf44d75b14bda367e37ffef75b870152ac3b38e20e5a6f2c6a4cf374087b70daa9036821dd3ebdce2128 SHA512 de631f650098b6fe15830e5a816158d7f352c7a25d0c743b9e4bdf146e1ef2e3a6ea1751ed5d68f34e9a339a793bfb9dc217934595c7a8dffb854c0a4111b963
+DIST PyPDF2-sample-files-d7ce88b71820fccaaa4738aa37cbace51f3ed3d9.gh.tar.gz 5406263 BLAKE2B 69673ec380941f567d3630459dc610b1c3a58d5f2956138776412683a96292549107294775d236d1304c054fb91b238f42942a169a7bc862c0b721de647ad191 SHA512 a245de88952de08b45e483f05a1ed42a70a67c4215dd8c32a9b5d70bb64b01acc58ebb1cee677ca178eee8380528dbfac50d3a1a022f19039fa3a47746ddc2a0
+EBUILD PyPDF2-2.0.0.ebuild 972 BLAKE2B 53e321d2e525f88ae0b031ae31cff55dfc35dd1bd3eaba9455b9d10f09fafafce7ff97dfe8fe41e3ebcd509fca5f388f0760c702745d88493ddde161d045a4bc SHA512 14fdd4a2e078e496f972c64031a5e22cb2fd13a470196abf9c07c01dd9974d2e985ce92200c4d170638bb8d6800404022004d8afe65928c072bd2b0275f11489
+EBUILD PyPDF2-2.1.0.ebuild 1259 BLAKE2B 00471ca66667bfd7a267706bb44d069a9b1a121da94cbfd9c669a20b988524552455e708b26d1179d7e7273de99827f5bcbd3dd899e73bcf1a11d61cc5b47719 SHA512 6bee3c31c5047c199ee42b670db0a45fdaac569d2dcf8a511082c3af0a93fb2a54f6ced80b2d8a7b296fc213d92408610bd479373f1fe79be5b362f565e96fbb
+EBUILD PyPDF2-2.2.1.ebuild 2770 BLAKE2B bc4cf142c90c09f025e2dee618cec6b8083be21ae01e6bfda29ac422ad542b280b328bb8a12f81d49a435904ba5bf3cf2965173484b526f79433d00cf4c51345 SHA512 cb8d418ddde3ffa236951955514b6edc60344e36046cfd4a0d24ee8990ccf8e440bb6dad7ff4c60c384ad9ac370612b864e6654f3b1d5ce7314e97260bdb4247
+EBUILD PyPDF2-2.3.1.ebuild 3380 BLAKE2B 6ae19d28b0d7f9e64c61fc8cd7ac83a55cbfc99e077b651e986a08e12d90d7f2690924760261a1a05c32e30e9986c74b9bd28fb1db688ccb7d131944e22021d5 SHA512 ae711b3bb63d056ce3b2ede12f82f6e09a7363b3a053ee21020f6531a07c297a79042715c1fa2d2102a40e6f14f362bad80db2d3443a072d6a836a8f7c6d6ef7
+EBUILD PyPDF2-2.4.0.ebuild 3419 BLAKE2B bca63e5bb8f9ad093509f8b44818e424960e7c8cc93b72cf0549ec0fd32ef5b4986f1c62a8067138b027bac3b606b882415319e9e614ef2d125409a9362b8698 SHA512 baabd692fcde63b42705983d8db030b2fb8df068cf41e4e441e6df347dbf3358a914f27702c0e32a94b6af4e28b1e4f396a946ecf5fd9760288785e116b1d43a
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.11.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.11.ebuild
deleted file mode 100644
index 0314e035bd9b..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.12.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.12.ebuild
deleted file mode 100644
index 0314e035bd9b..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
-	fi
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.5.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.5.ebuild
deleted file mode 100644
index bc5f5bcf3cd5..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.6.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.6.ebuild
deleted file mode 100644
index b644bee3ad2f..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.7.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.7.ebuild
deleted file mode 100644
index b644bee3ad2f..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.8.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.8.ebuild
deleted file mode 100644
index b644bee3ad2f..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild b/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild
deleted file mode 100644
index b644bee3ad2f..000000000000
--- a/dev-python/PyPDF2/PyPDF2-1.27.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/PyPDF2/
-	https://github.com/py-pdf/PyPDF2/
-"
-SRC_URI="
-	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc -r Sample_Code/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_src_install
-}
diff --git a/dev-python/PyPDF2/PyPDF2-2.0.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.0.0.ebuild
new file mode 100644
index 000000000000..910139d3b90a
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/PyPDF2/PyPDF2-2.1.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.1.0.ebuild
new file mode 100644
index 000000000000..0af1c36fdea7
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_workflows.py::test_extract_textbench
+	"tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]"
+	tests/test_reader.py::test_iss925
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/PyPDF2/PyPDF2-2.2.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.2.1.ebuild
new file mode 100644
index 000000000000..2f3370a78f0d
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=d7ce88b71820fccaaa4738aa37cbace51f3ed3d9
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_page.py::test_extract_text_single_quote_op
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_xmp.py::test_xmpmm
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_subject
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild b/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
new file mode 100644
index 000000000000..0e5972d80ce8
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.3.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=d7ce88b71820fccaaa4738aa37cbace51f3ed3d9
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_page.py::test_extract_text_single_quote_op
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_xmp.py::test_xmpmm
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_subject
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/PyPDF2/PyPDF2-2.4.0.ebuild b/dev-python/PyPDF2/PyPDF2-2.4.0.ebuild
new file mode 100644
index 000000000000..d277d78547da
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.4.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=4d24ff93dcddf21d55d028d9675d5b5bf9d7a350
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_cmap.py
+	tests/test_filters.py::test_decompress_zlib_error
+	tests/test_filters.py::test_lzw_decode_neg1
+	tests/test_generic.py::test_dict_read_from_stream
+	tests/test_generic.py::test_parse_content_stream_peek_percentage
+	tests/test_generic.py::test_read_inline_image_no_has_q
+	tests/test_generic.py::test_read_inline_image_loc_neg_1
+	tests/test_generic.py::test_text_string_write_to_stream
+	tests/test_generic.py::test_name_object_read_from_stream_unicode_error
+	tests/test_generic.py::test_bool_repr
+	tests/test_generic.py::test_issue_997
+	'tests/test_page.py::test_page_operations[https://arxiv.org/pdf/2201.00029.pdf-None]'
+	tests/test_merger.py::test_trim_outline_list
+	tests/test_merger.py::test_zoom
+	tests/test_merger.py::test_zoom_xyz_no_left
+	tests/test_merger.py::test_bookmark
+	tests/test_merger.py::test_trim_outline
+	tests/test_merger.py::test1
+	tests/test_merger.py::test_sweep_recursion1
+	tests/test_merger.py::test_sweep_recursion2
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_writer.py::test_sweep_indirect_references_nullobject_exception
+	tests/test_writer.py::test_write_bookmark_on_page_fitv
+	tests/test_page.py::test_extract_text_single_quote_op
+	tests/test_page.py::test_extract_text_page_pdf
+	tests/test_page.py::test_extract_text_page_pdf_impossible_decode_xform
+	tests/test_page.py::test_extract_text_operator_t_star
+	tests/test_reader.py::test_iss925
+	tests/test_reader.py::test_extract_text_xref_issue_2
+	tests/test_reader.py::test_extract_text_xref_issue_3
+	tests/test_reader.py::test_extract_text_pdf15
+	tests/test_reader.py::test_extract_text_xref_table_21_bytes_clrf
+	tests/test_reader.py::test_get_fields
+	tests/test_reader.py::test_get_fields_read_else_block
+	tests/test_reader.py::test_get_fields_read_else_block2
+	tests/test_reader.py::test_get_fields_read_else_block3
+	tests/test_reader.py::test_metadata_is_none
+	tests/test_reader.py::test_get_fields_read_write_report
+	tests/test_reader.py::test_unexpected_destination
+	tests/test_utils.py::test_deprecate_no_replacement
+	tests/test_workflows.py::test_extract_textbench
+	tests/test_xmp.py::test_xmpmm
+	tests/test_xmp.py::test_dc_description
+	tests/test_xmp.py::test_dc_creator
+	tests/test_xmp.py::test_custom_properties
+	tests/test_xmp.py::test_dc_subject
+
+	# Broken test
+	tests/test_utils.py::test_deprecate_no_replacement
+)
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index e535b91dd665..49afcbff88ec 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt-builder-1.12.2.tar.gz 5727071 BLAKE2B ca5d55989fec2a9a6f9d37abc307d4db7305bb06449cbf982aa3a2a3f210113319f7fb303ec0d77b513cce844b529e0e56f62c9d62ab3c51cf85a061ecd00c7a SHA512 022f2cd40c100543c4b442fc5b27bbf2ec853d94b531f8f6dc1d7f92b07bcc20e8f0a4eb64feb96d094ba0d5f01fddcc8aed23ddf67a61417e07983a73918230
-EBUILD PyQt-builder-1.12.2.ebuild 953 BLAKE2B 7a2c1f46e687a9976370fb51f40dec5d219ef62a4a48f745bd6369aa14b05c50f1637385b32889274a69ea899742a021985626f1787c5ff2e8b5bed929159ea5 SHA512 8081728f9de5be6ae861d17abd5bcef3a9903cb0548834db5df0bac2459abcf7a40d7768b17edcf6ccad0d025be245806b770e33ebace6bd1d35287f2c4bd878
+EBUILD PyQt-builder-1.12.2.ebuild 948 BLAKE2B 810b8c31490483f07174faa99c9cfb6066ac58d4e6f9e3d3f50df5181987413f0b2d279c7f12446b10642ecdcf41ea0abcf9db32c4aa682b50cfd9e6e50cbafd SHA512 498bd50d0bdc5e6a4a624180cfb52ce497e2a97578d46edc0421d49ce7088eb1c571a0ead21434ee6f0c776d08d310c34be8bc63e7dabad59e1f2c156ffe86d9
 MISC metadata.xml 666 BLAKE2B 2602886cadc8244466e26c92178552ac1f618ace1dcd6eca9ced2c3e0f7a7777c435f842f1581d93ea7642dbcc278a4aa59a84305f5a825f39edb736e7d29f69 SHA512 42746ac242170047e0a44389c8d2e8eb5be60fbff1f5f1908802e5c3a04a0c740fe338c9b3049fc03bdb45a4182b388aad9b89a573e87d440a9a833443a1470c
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
index f136447e373d..9b6bc50a1942 100644
--- a/dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.12.2.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="The PEP 517 compliant PyQt build system"
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index fec61926fd3d..31371ac55b06 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,5 @@
+DIST PyQt5_sip-12.10.1.tar.gz 121271 BLAKE2B 5f1720a85b8522f552259be990d1d27c0f40d8c0c3ca0395679da02851e73b45210a6390b66d899fc00cabfeeda57f2bac4c8d108cd05ebc179302343fbe0457 SHA512 a6336195d8d5a1b216a85461c5f7acf3563c6db2255079734e955a9412522cfdb82663dbff5d60574acc7bb29dd5ef11f98f2c0c3c3d3fcbf290b039cda31638
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
+EBUILD PyQt5-sip-12.10.1.ebuild 667 BLAKE2B a55a22ff82e4b46b044921f705121532e7474c37f338d2119dc48d6d4b603ef044b6fd54e6c4dd918e8d74764b7932084e13aae2aa5ec05765424aa862d07a2b SHA512 f879bd8a45092f114647d11de3783e10fd57a80381282739ccd1753c84316299130eb98cc90c9f1ee2b2a89958bb5a29b302b6a03cc0b250bf0ebd5fe71d6ea5
 EBUILD PyQt5-sip-12.9.0.ebuild 628 BLAKE2B 1f5a1e25a8cb4eb063dbcffa8ac00353cb546f919d6599693062ce3e99ae888eaab1c8a4bf045bbe224e8a5a9f723f8905b95437b43a3ffbcc7dd23a42ebdb27 SHA512 4adefcd59ab8bcc9bf9f1fa928d46c7a552b2770c82968dec832a818793b41daf52dad190cb8db79b479ca98d3a9d73423d65d2321292ee832a4d79d4bdcbf04
 MISC metadata.xml 649 BLAKE2B 0a6faee65b39f122f65965490284b17856ba6d86537f3f3780f8604366739c346b01e29e933a91c7edb5ff898e5d51a10e4bf288228d1943a1c9e9970eac4c86 SHA512 3af9be87db6da5cb071f4025cd6fc1964a4b0629ebe93239f6c5a3734d4ef8ef06e652abbac5c9bd86f882a6235bf3b1f0fec6f0035c77ea42571e47c6045e29
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.10.1.ebuild
new file mode 100644
index 000000000000..91c98f7ad6e1
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.10.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="sip extension module for PyQt5"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/PyQt5-sip/"
+
+MY_P=${PN/-/_}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 3ae68458b9f3..e110acbc5326 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 DIST PyQt5-5.15.6.tar.gz 3239505 BLAKE2B e98d6af85ae4586dbb1b7db1d4cb17ccdac917a36a304a7486d553a681be9a920e8750173e49e58e02d0129890a8a713702977e64efbb386ce831b8aaef2b0fd SHA512 65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7
 EBUILD PyQt5-5.15.4-r1.ebuild 5440 BLAKE2B e522d37ab31798598ea020e45ad8bce36f385b6bce30587689291b102bba95cd6f7e715b72da296d80667f5abaeb25723defe7e9754276a2c609cb2f52754838 SHA512 d1d332430103e1cbbed9536ad8f2c628a8f91aae4d91cbd98e7dbb05ce0e7c36b1891b879305b4936c3d2fc31c592b149853d29956081e9289806a7ad3e1796b
-EBUILD PyQt5-5.15.6.ebuild 5256 BLAKE2B f30c2dea666f026dff65ae0976319e28d5da7b9f81f9339cc89c41666162468709c693857e02d1637926e678e44c9ebe0f12a5b63f1f1b6b10a0ae6fc6a297b8 SHA512 5341dae4f0c00b1820ce704ac3c1c04d5f7d4d7266a2ffccfa953e435e846457915f350b9a29bdd9bf1e67a2b4dd30e69dbf7f68dcc6d3a7a1cef654451f7d61
+EBUILD PyQt5-5.15.6.ebuild 5251 BLAKE2B 00a45b75b52a19b22f3ac675783fd8b60275ce94358de52ec261d35b6527d93992b72c6f2441dc8fd09bfd6ed97a499f23719b054180a6e367d4d2636361392d SHA512 0d9cb47f9ddab94989371824030ef9fab99fc3daf86aba8ce27a3a4ef89991b6cb2c4d4e3477ebe857c814c3c97f364dbf271538c54c454229ccbcd2d432d96e
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.6.ebuild b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
index e7370b766973..f0138e797269 100644
--- a/dev-python/PyQt5/PyQt5-5.15.6.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.6.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for the Qt framework"
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index b3e7e3edd0a6..e013aeb09bcb 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 DIST PyQtWebEngine-5.15.5.tar.gz 48610 BLAKE2B ea266c09965a6ee62e33d3970b145068271c9e1eb87839782e0100b5db2e90a0c002fc4d6f3d22ef9a5cb8c42a067bb45008b0392a0d8557bc6c5c9d77e6b75a SHA512 20eecd479ea757e3bf9855c7dafe0bbbc0cbc61be26509605a5c9a8026e54bb6e362069ecf4be74733dcf6eec154f6ed13933e334e4455b080e687abfd2659fa
 EBUILD PyQtWebEngine-5.15.4.ebuild 1704 BLAKE2B fb1021ada58ea969b39bd795ad4b901baac3895ef7cb7b5feabad867fd27fd030da0ef7774a18afcd94431fdc1ec40c5a883bd914184d6c37d84f9dccc012c0f SHA512 190d4c1ad8798fb574cdbeacf83e5c5de9e5550fbecd4ad7a9db079f1beea16fb58f1e00adabc59cb0cb37eac9cef37d7f3b0a40777be2b4d751a3a67a07e117
-EBUILD PyQtWebEngine-5.15.5.ebuild 1700 BLAKE2B 9cc8caa57f486f5caad2e4b4ddd23635114100e6ea6d1b64ccd93f581e70807bb3a3ed6bf47eda1c7f11ad553c0469d3402d6ca5995218c2d7c4c6025c2e79ba SHA512 bd80088981b055f0954abe738fb56ef536f97401f45e574bee40ab1177ddc696b922caa8f3ce0615c7bab8326d496bd0a705deeb6e2bb4053671568b5c85ab8c
+EBUILD PyQtWebEngine-5.15.5.ebuild 1697 BLAKE2B f8be44eb1d52dc3ec97a49085596ff7846f6de2f771ea170b607c127aa3304a35b5ca8e7d9324635aab3c64f4ad05bb5e8c557d2ba1fe42d8760a2ca02174df3 SHA512 7b69cf98b52a2296ab616efdf412ee0bbac2e08611c022e8a75379d9955bee79a4c2fb71a516227b8c3304d3f073a34894132943443467921ca31242c598e9d1
 MISC metadata.xml 959 BLAKE2B 00163e3954184867c30d8e0bf102bf2fc68bcbbefb4169b2aad2521bdfe5f7e505c71f1e5ff82eaa20f0789b12c6d2812557809abf500c05527afc68ab66d38b SHA512 1d58825dbdb183fe56222b25844daa3d1d0fba14aa77674b8f6c3ec683e3c43f7f3173799b97d7aa3d2410e7f874d7386ebf23f9524b27710646ef5d7d1f8148
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
index 42ee3f90e56f..ce854a608d91 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.5.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-r1 qmake-utils
 
 DESCRIPTION="Python bindings for QtWebEngine"
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index 8c680636e7e0..6b1f066c4690 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
 EBUILD PyRSS2Gen-1.1-r2.ebuild 465 BLAKE2B b6f13bfbbfd9442de22561393ab3dbb7a75624239fdb313a8c11e6974927244bcb31bf53a7204c0f414909a454b074f4e78090ea1bb3fc1c4dfb159a7a8031cb SHA512 2fe2451820baa864cfa620b4909093bf453f73b91e1c302d33d1b94fa103c0cc85cef468d2912b98712d6bd6bb02321a26f2af36c63aee099ac0a222f210f523
-MISC metadata.xml 348 BLAKE2B 03db7aaa1d20fb6eadbe5106345624f7eb50d7b45d5adb3a8f4d15a86d3039caa9fbe2771256b1cd9ec2a7c2922ab2f4aaa0e36ed51d63daa620687dad876d66 SHA512 99437dcfe725fb9ee0657aaa499f1d9bf77cc7f21f15bce803dad2c2ebc17972154845a61c7e4ada3b499abcdf79688bc670843f5b595d636de5b77e255556e7
+MISC metadata.xml 264 BLAKE2B 2c92175e1be8e1d2d7773db20c42c584c2b9dab827b823bb6c41624b92f5378b8fe4b29fb4a37f775f34619baae31dea4d48a51995aab189b28620e8facf81fc SHA512 611f9d8679a1d8697e6bf6d7455736be342e048a5e3f4797bd0f3c6952aa0a2c13609e4e8ca2526eee9251f136476f5268590411baca77de243dc4e90fb49b79
diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index f1de17f81938..b612a87851b5 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyRSS2Gen</remote-id>
diff --git a/dev-python/PySDL2/Manifest b/dev-python/PySDL2/Manifest
index 7e216d907bc5..bb5b7d47a058 100644
--- a/dev-python/PySDL2/Manifest
+++ b/dev-python/PySDL2/Manifest
@@ -1,7 +1,3 @@
-DIST PySDL2-0.9.10.tar.gz 5228778 BLAKE2B 1aac6ac3a33dd5cb56aad7e9fdcfe5ec62f7b406b9779aa04f92ec4f051cbe5f03596de06aa2d5688724c811c86959edefe40dab1e39980a8410c6b09c10c5ab SHA512 86517734d356ba7685914ce6e4583c8131bc2e84bf2318f985119407d39794878aeb8fdb84464e1e35c3b4cc1569777239dedb16f4669169f9f0302dacd8689e
 DIST PySDL2-0.9.11.tar.gz 736026 BLAKE2B ebf5a98958681cc61155aeffdb67ca9d1aeef8143ca876b63772ce95b7bf23cc5708a01cfa83d3128d4fe20c2b714bf2f1e7dc64454c7d063590c55cfc236f24 SHA512 4e3383ef64f4f164d60a69a5a2c6ea153269b45661c9bba988d4c44a5cce7195cec0d29384d1855e9c9d507af2608bc808b9885449aea61c5ee51fc2d4f4af6f
-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.11.ebuild 1503 BLAKE2B 5e8fc6d90adb8ced5cc5237c123909ce86f358c26d8a7ef68cdb49fb024fc0ebe9df7d3c8ea63733085f96604ec2babc7792de7e4661ca81bdf630665714aa61 SHA512 c2a9bb46fcc806bf1f392c99cb9b4445b0b0cb09f5d9403b3aaacf9a394c81f4b9255fef6932d3052152cc1a84f14898b71dd1f0cfd829bd9fcc8d9f2c609bfa
-EBUILD PySDL2-0.9.9.ebuild 1470 BLAKE2B 7fc6e28e999dad910cc51c4ba37c016e983ffcd1f5c226b402f824bccde5aecdbee8fe9d446b9d145b2c0a6bd9415536a531f248fd6b7cb91f346aea41e10373 SHA512 d05ed9743dc77ca0c39cba979322c02090b9f5b4e8eb36ea1a7f954a97fe752426862f9f65ae70f6543d4a333bc31616b11e58d24068463932024c7da8c118de
-MISC metadata.xml 452 BLAKE2B af30151f34ac5bc3eb54885a9bc3d27f2a2aa382b4645304f75e7cae5fecba1861d792b351ebbd3728ab4de19be4dfb5783e70354fe055e0e86611c0a0a7ae16 SHA512 4a64c9e36268fdf570a1b5eb8362f1d3e6c6c9159bf4a7200b37491d6c37ea6da988f569440f53ed62d69efe4ec23d44ba6da0d341abe7457a8b259f089bc5c7
+EBUILD PySDL2-0.9.11.ebuild 1506 BLAKE2B 1184acac5ab3f83abf120f10dcd35b6c5dc4885cd2da3a4d035035a47e5ee0b2887e777abbf1ec43cc4335e45488811ecd485663b510f71358a77ec634d1bac0 SHA512 1f6b324a64caf9a709c6b69c3a100dcdc6f8539f777dbb2ddd5391ef69f60708ecca340847c3acbbddb824449d6e6aaa1709f0fa05f67388d3265f97d31b0071
+MISC metadata.xml 450 BLAKE2B f92f2f7529e3a09d18c88a51f78ed520d7b4756a99776d70bb7ad4e452ae6cd9a67560ebfaafcacbd73e945282fc28ecdb48d54b2c2eb5b18d3f944401650349 SHA512 de7f757b195170ee865e34dcc214d0a57912e50631291045c485f58ba05fa87b7fc57878333021c7b9d3f8609e9afa4190f4c4062fb7a8136498875aecee615c
diff --git a/dev-python/PySDL2/PySDL2-0.9.10.ebuild b/dev-python/PySDL2/PySDL2-0.9.10.ebuild
deleted file mode 100644
index 08911e560403..000000000000
--- a/dev-python/PySDL2/PySDL2-0.9.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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/PySDL2/PySDL2-0.9.11.ebuild b/dev-python/PySDL2/PySDL2-0.9.11.ebuild
index 4169764895e7..324c0960f1a4 100644
--- a/dev-python/PySDL2/PySDL2-0.9.11.ebuild
+++ b/dev-python/PySDL2/PySDL2-0.9.11.ebuild
@@ -9,7 +9,10 @@ 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/"
+HOMEPAGE="
+	https://github.com/py-sdl/py-sdl2/
+	https://pypi.org/project/PySDL2/
+"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( public-domain CC0-1.0 ZLIB )"
diff --git a/dev-python/PySDL2/PySDL2-0.9.9.ebuild b/dev-python/PySDL2/PySDL2-0.9.9.ebuild
deleted file mode 100644
index e3b42a45db2c..000000000000
--- a/dev-python/PySDL2/PySDL2-0.9.9.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="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/PySDL2/metadata.xml b/dev-python/PySDL2/metadata.xml
index c7909ded7a27..4f40190355c3 100644
--- a/dev-python/PySDL2/metadata.xml
+++ b/dev-python/PySDL2/metadata.xml
@@ -9,7 +9,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">marcusva/py-sdl2</remote-id>
+		<remote-id type="github">py-sdl/py-sdl2</remote-id>
 		<remote-id type="pypi">PySDL2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index 155cce2c7e4a..556d25be1f25 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,3 @@
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1-r1.ebuild 727 BLAKE2B cbe0438342b05e7183d002b0978b3257ff7995a73837cb587f3a6636d021f0b703af569f4d7f037c7a0825dabd9ef772943a15d634b8ac54eb37c054cdf3523e SHA512 6d2637fe3b2a20dc9ce8fd52949032a712b1cee51168771c88d4b84a2f0b1937a63372d398f8b0555ebc8d9e3c79216b382943a75aa4aca402b79c02da0a9e47
-EBUILD PySocks-1.7.1-r2.ebuild 767 BLAKE2B edb7bb033be34246dcce3006925d08418a07b4dea81cba2079d5c31bc53337ddb75add7044f5362fbfb97b8e1683fa9fbd682601c86ebd0be3fa2727164e0e06 SHA512 ef4a87761ff8943bd8dbf9a89651628d5cd72df7869ab1c345465b6f3f7e5585ec32c72e80a8332a9eabbf34c66f48c54819f09875ff1306d02e1409145d8a9f
+EBUILD PySocks-1.7.1-r2.ebuild 759 BLAKE2B cd09f2505f4c7ef75a63d3915fdb758dd8d0692bd6380e4da47f72e3c5a496f92b4eb96e5864e45947b7445b709a8efe8874df68c32e86983892bcfc41ec2fed SHA512 cbe3a6e707d442b4c03ffcefbbdd054f9f6acc45a4df9fb26ba8184ccd52fbaa991e4c987fb9d33cec203568e243412588db3c0b29585fb34332d058fdad0a7c
 MISC metadata.xml 525 BLAKE2B 61d1c3a217ae1912a20e326a6aa00b003a0b6bb2d6d93e3fa361f21d2669c3d1a893d4d23641c3492388e8b671dee87f7c6d07c2df618910214786b999df3e74 SHA512 ce38eb19999a7b9bfbd9751fee536850c9d668f1f9ea3320cf9169714443bd19ad2d4a63097a00b66d6d379807064e21acb8a9c09988fbdcb98abba8f50ac802
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
deleted file mode 100644
index 5c7528eeac5a..000000000000
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS client module"
-HOMEPAGE="https://github.com/Anorov/PySocks https://pypi.org/project/PySocks/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-# tests are broken beyond repair and the package is no longer maintained
-RESTRICT="test"
diff --git a/dev-python/PySocks/PySocks-1.7.1-r2.ebuild b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
index abceeceb002a..be109528685c 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 
 # tests are broken beyond repair and the package is no longer maintained
 RESTRICT="test"
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index fcc5a66b3ac7..9132602799d5 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,4 @@
-DIST QtPy-2.0.1.tar.gz 43047 BLAKE2B 66625852e75fbfcf0bf96e740754ca26b6d5226dd5450d0274cf6dc875cba18e5ed8e339c8c7ad084ffa9b135f19447e087b338690ec521205316c4f22f09197 SHA512 5d482b0a5bd2be67a0fabccf98a9dedf28ef328641c8c976e2274d4a5afb14b9fefce251e80496ed54425dcb3da24984c6c36308db0bfc810ea2142528ad88fd
 DIST QtPy-2.1.0.tar.gz 46470 BLAKE2B 2e032d141ad134444143cd59b8952957b226d9519925083aecce82adf62eebd3f58803cf548c4142fb1ece6f0e2340043a82a7aef056f6e4a9ac8b9caf72d80d SHA512 052cab4218d23d46162d11bf038dccfe6200b05c1c8647bd1f9dcbdaa7af50c23d4ae85829e065c7bae57630d149d562d76cc78202b4f448cbf6547010c746ff
-EBUILD QtPy-2.0.1.ebuild 5215 BLAKE2B 23261bb6e3a1818b8032c4bb87ee501a12aac8e9595c2aaf17cfa516d8db2f1fd6410af388601fed1a6f9daf8323300303deda7e434dfd7f152db4bed742ca77 SHA512 aca9dc14dd97d1ab4719f47e110fdd91ed12c97f3f83dae91f3d2888650af57917b251da3a85dbcfae6fbedc1dd270450ea0ce63cc2385e70d59b0f4f6b9ca4d
-EBUILD QtPy-2.1.0.ebuild 5006 BLAKE2B 31a8b946e69abcb0658db406f8c58158d7e0ee05e8cb6b15e96077dc78baa2f25b02124e2a530575c78b5ea15491f92d14c46b55da00ca854a333c1b5db02de7 SHA512 ebc7e15e6bc7183156548722161a81c9486410ce860fb1f95b76a361f950a7973df227b2350a05d4dfd3b425e057174992ef2e0ffe304b5876d7c60f0631cde9
+EBUILD QtPy-2.1.0-r1.ebuild 5166 BLAKE2B 1058583029d29a6575a198b2dc0085916fc2f3e8347ae308e41c8d35e14e3d56c478b96b3e22a42c464d242551880780e6ab260ca56642209092c3d56c1d711e SHA512 d10ee8366b3ffafd1af0011aa11cbe4b1c2dbf2a87079d901b79fe88bc206b850b9f8083229e378a42ab1c7bd8f8548b7b695d18bd0fcd487aa85b0ac740c66e
+EBUILD QtPy-2.1.0.ebuild 5003 BLAKE2B 60931695b10ab9f9bbabb0cb53025ac1a10412c82f1f51b2c828d266222fddefe5acad3bfc02542897366b48bb7738364cd50344e95d2eca61f9c96695f2f495 SHA512 082b96730ba1b6c138cb78cbcff47d7b882017c7133f8de4256cbbb213bddd709a7f9067a9590a79bc9ebda7528a823e3c7bbbdd8edb44d1a6490b109c1842ed
 MISC metadata.xml 2904 BLAKE2B f951ee9cfb1e57da9c1b528015cf56bf72e36fbcea6973f5bd237e86c8039d82d9700166ab76773b9bfbc8e499df492994e5dd73aee0bb2d35914d36bcf1bd78 SHA512 e6e13d0c24f16379ac03711f02c5201d1ab28bcbbddd7063f0487bbaaeda99e5a2ef87f00d8df834d822c9230a50ddead93b44affccf07b80bfc275140f4e9ff
diff --git a/dev-python/QtPy/QtPy-2.0.1.ebuild b/dev-python/QtPy/QtPy-2.0.1.ebuild
deleted file mode 100644
index 9fcfb7eab3c3..000000000000
--- a/dev-python/QtPy/QtPy-2.0.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-_IUSE_QT_MODULES="
-	declarative designer gui help location multimedia network opengl
-	positioning printsupport sensors serialport speech sql svg testlib
-	webchannel webengine websockets widgets x11extras xml xmlpatterns
-"
-IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
-unset _IUSE_QT_MODULES
-
-REQUIRED_USE="|| ( pyqt5 pyside2 )"
-
-# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
-# Disable them for now, please check periodically if this is still up to date.
-# 	bluetooth? ( pyqt5 )
-# 	dbus? ( pyqt5 )
-#
-# 	3d? ( pyside2 )
-# 	charts? ( pyside2 )
-# 	concurrent? ( pyside2 )
-# 	datavis? ( pyside2 )
-# 	scxml? ( pyside2 )
-# 	script? ( pyside2 )
-# 	scripttools? ( pyside2 )
-
-# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
-# to work. The package only checks whether PyQt5/pyside2 is installed, it does
-# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
-#
-# Webengine is a special case, because PyQt5 provides this in a separate package
-# while PySide2 ships it in the same package.
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
-# for qml and quick in one flag: declarative PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
-# added anyway with a (+) to make it future proof if the ebuild were to change
-# this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport support
-# unconditionally, the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	pyqt5? (
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
-		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
-		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
-		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
-		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
-		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
-	)
-	pyside2? (
-		dev-python/pyside2[${PYTHON_USEDEP}]
-		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
-		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
-		dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
-		dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
-		dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
-		declarative? ( dev-python/pyside2[qml,quick] )
-	)
-"
-
-# The QtPy testsuite skips tests for bindings that are not installed, so here we
-# ensure that everything is available and all tests are run. Note that not
-# all flags are available in PyQt5/PySide2, so some tests are still skipped.
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		pyqt5? (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
-			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
-			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
-			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		pyside2? (
-			dev-python/pyside2[${PYTHON_USEDEP}]
-			dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
-			dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
-			dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
-			dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
-			dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
-			dev-python/pyside2[xml,xmlpatterns]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	default
-	# Disale Qt for Python implementations that are not selected
-	if ! use pyqt5; then
-		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-	if ! use pyside2; then
-		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	fi
-
-	# Disable outdated PyQt4 and PySide
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide.QtCore import/raise ImportError #/" qtpy/__init__.py || die
-}
-
-python_test() {
-	if use pyqt5; then
-		QT_API="pyqt5" virtx epytest
-	fi
-	if use pyside2; then
-		QT_API="pyside2" virtx epytest
-	fi
-}
-
-pkg_postinst() {
-	if use pyqt5 && use pyside2; then
-		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
-		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
-	fi
-}
diff --git a/dev-python/QtPy/QtPy-2.1.0-r1.ebuild b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..41ec2ce12760
--- /dev/null
+++ b/dev-python/QtPy/QtPy-2.1.0-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="
+	https://github.com/spyder-ide/qtpy/
+	https://pypi.org/project/QtPy/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport speech sql svg testlib
+	webchannel webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	python_targets_python3_11? ( pyqt5 !pyside2 )
+"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work. The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,speech(-)?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+			dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+			dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+			dev-python/pyside2[sensors?,serialport(+)?,speech?,sql?,svg?]
+			dev-python/pyside2[testlib?,webchannel?,webengine?,websockets?]
+			dev-python/pyside2[widgets?,x11extras?,xml?,xmlpatterns?]
+			declarative? ( dev-python/pyside2[qml,quick] )
+		' python3_{8..10})
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		pyqt5? (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+			dev-python/PyQt5[multimedia,network,opengl,positioning,printsupport]
+			dev-python/PyQt5[sensors,serialport,speech(-),sql,svg,testlib,webchannel]
+			dev-python/PyQt5[websockets,widgets,x11extras,xml(+),xmlpatterns]
+			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		)
+		pyside2? (
+			$(python_gen_cond_dep '
+				dev-python/pyside2[${PYTHON_USEDEP}]
+				dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+				dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+				dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+				dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+				dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+				dev-python/pyside2[xml,xmlpatterns]
+			' python3_{8..10})
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die
+	# Disable Qt for Python implementations that are not selected
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+		sed -i -e "s/from PySide2.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+}
+
+python_test() {
+	if use pyqt5; then
+		QT_API="pyqt5" virtx epytest
+	fi
+	if use pyside2; then
+		QT_API="pyside2" virtx epytest
+	fi
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/QtPy/QtPy-2.1.0.ebuild b/dev-python/QtPy/QtPy-2.1.0.ebuild
index 80b2b816f117..42c74bba738e 100644
--- a/dev-python/QtPy/QtPy-2.1.0.ebuild
+++ b/dev-python/QtPy/QtPy-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index 2754d11562a8..819f5e128c42 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,5 @@
+DIST abseil-py-1.1.0.gh.tar.gz 219274 BLAKE2B 96848e3a738c295b3396b2eb45a6a2428f02ca7d325f24629d7ef8b87bdb19c8c2a33c95dcd716e286034f24d669bea27dc5470b92fcb3df437266e98a08ae6c SHA512 75e017399d28e38a5229b95b6372ad05b9d6067c3fef1cf7a64b5123399377025654dafaf6a1debc5664440efa8d26b76610629ad440e472faefd4f99b3bc685
 DIST absl-py-1.0.0.tar.gz 223739 BLAKE2B 958b95ac5d26aa9e3c2efc046b20eb6a143e81de3cde6f9e2478ec3abf4c0a2619db50271d4f0a57034b81dc1e6e09d58d18a4254d4551fa8a644d1558eba94f SHA512 41222ccd8e2eb65a266c88a047acae4c53cb00eb4f5678a11ebcf2b73e071bc4355f208b13697a0b9b71c4c96aa7d13eec9c5a90177f01c3cbabd0688a162aeb
 EBUILD absl-py-1.0.0.ebuild 554 BLAKE2B c7a9b6cd8ccee475f77ecbc673d16eba3dfcd685082707800f1ae799fa5c9bb145f27412de0ec6dbeae1c86977755ad8d43a8c0c30b86c29c8b09bea81bc48d6 SHA512 eb8bfdaba41026a0a09f67f3cb7876f43c80d8b93a2a941ceebfe122bbba1bf0520603bf8dcefcf16a5ea79fb9d54030a9af0021895a1afdad8decf7684972de
+EBUILD absl-py-1.1.0.ebuild 2538 BLAKE2B bdc4d3ec6c88cf9264568672f379fef81199709457a4286e45de3d8150c7fc6f77f5e837f041182509389521d9845f37184cd9dfd8efff79367622d001c2ccc1 SHA512 bee76c7c3aea0bfbe38e5856064e127fd6632b1b5d1ae7e0cf53dd697e694effe5e96532d68dd81a00c3357bf2ce2b86b0d52551ecbaa856b3cc9abd6a5e475e
 MISC metadata.xml 577 BLAKE2B dd0e02b24bdb42f24bd675cadf13e99f861a6dc9be2879f671b9bc4e9e078ef81759909e81e3063cb54c71ff71d6609624f0cf2645bf6ec055c643fbb0f3ab5c SHA512 7cfa86cac5d38b10aedacdb4bafc7acbd11cf4a98a873a2435ef5761d5186c5128171eb286b2d2568a1a353eb4de815303eae225cf5823a5292ac362633b67c7
diff --git a/dev-python/absl-py/absl-py-1.1.0.ebuild b/dev-python/absl-py/absl-py-1.1.0.ebuild
new file mode 100644
index 000000000000..562ee9e29750
--- /dev/null
+++ b/dev-python/absl-py/absl-py-1.1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=abseil-py-${PV}
+DESCRIPTION="Abseil Python Common Libraries"
+HOMEPAGE="
+	https://github.com/abseil/abseil-py/
+	https://pypi.org/project/absl-py/
+"
+SRC_URI="
+	https://github.com/abseil/abseil-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# what a nightmare... well, we could have called bazel but that would
+	# even worse
+	local helpers=(
+		absl/flags/tests/argparse_flags_test_helper.py:absl/flags/tests/argparse_flags_test_helper
+		absl/logging/tests/logging_functional_test_helper.py:absl/logging/tests/logging_functional_test_helper
+		absl/testing/tests/absltest_fail_fast_test_helper.py:absl/testing/tests/absltest_fail_fast_test_helper
+		absl/testing/tests/absltest_filtering_test_helper.py:absl/testing/tests/absltest_filtering_test_helper
+		absl/testing/tests/absltest_randomization_testcase.py:absl/testing/tests/absltest_randomization_testcase
+		absl/testing/tests/absltest_sharding_test_helper.py:absl/testing/tests/absltest_sharding_test_helper
+		absl/testing/tests/absltest_test_helper.py:absl/testing/tests/absltest_test_helper
+		absl/testing/tests/xml_reporter_helper_test.py:absl/testing/tests/xml_reporter_helper_test
+		absl/tests/app_test_helper.py:absl/tests/app_test_helper_pure_python
+	)
+
+	local x
+	for x in "${helpers[@]}"; do
+		local script=${x%:*}
+		local sym=${x#*:}
+		sed -i -e "1i#!/usr/bin/env python" "${script}" || die
+		chmod +x "${script}" || die
+		ln -s "${script##*/}" "${sym}" || die
+	done
+
+	# i don't wanna know how these pass for upstream with wrong helper names
+	sed -i -e 's:\(app_test_helper\)\.py:\1_pure_python:' \
+		absl/tests/app_test.py || die
+	sed -i -e 's:\(logging_functional_test_helper\)\.py:\1:' \
+		absl/logging/tests/logging_functional_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTHONPATH=.
+	local fails=0
+	while read -r -d '' x; do
+		ebegin "${x}"
+		"${EPYTHON}" "${x}"
+		eend ${?} || : "$(( fails += 1 ))"
+	done < <(find -name '*_test.py' -print0)
+
+	[[ ${fails} -ne 0 ]] && die "${fails} tests failed on ${EPYTHON}"
+
+	# we actually need to clean this up manually before running the test
+	# suite again...
+	chmod -R u+rwX "${T}"/absl_testing || die
+	rm -rf "${T}"/absl_testing || die
+}
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index ffb51a3ad696..0d3d8a78e290 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,5 +1,5 @@
 DIST adblock-0.4.3.crate 7700164 BLAKE2B 836e8b60366c0bb23702883a8d9aef7eaa54dff6996ebb6a82f39880d93edb23f93e23299085a1756bb22115633f4534cd7ba0379e1dcb1ff6b1880d3e5576f4 SHA512 3fe7e139a6376ab2becfef7db9f54c850442dcbb44a61e2a116a1be6a59ab214659293f513f3c6daf7855d677b761f19ce99cf3be444d8f03c1dae90aa915f98
-DIST adblock-0.5.2.tar.gz 24574 BLAKE2B 84efcd6c6bc60030aee76eaa80acf67640d97ec1b386dc18aaf92c79b8ff60b35f545b4cf8980a1ab55f558939541f31dc8889073f1b3fd68d90ba6221a1f284 SHA512 f69bbde5a510882cd71454153ed12f0697517e030f9fb6774c5b166daf0db9f754a965085fc5e612c7dd3d093a31e22c1a9c064b167429d2aae4e93e3ca7bf7e
+DIST adblock-0.5.2.gh.tar.gz 24574 BLAKE2B 84efcd6c6bc60030aee76eaa80acf67640d97ec1b386dc18aaf92c79b8ff60b35f545b4cf8980a1ab55f558939541f31dc8889073f1b3fd68d90ba6221a1f284 SHA512 f69bbde5a510882cd71454153ed12f0697517e030f9fb6774c5b166daf0db9f754a965085fc5e612c7dd3d093a31e22c1a9c064b167429d2aae4e93e3ca7bf7e
 DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
@@ -62,6 +62,5 @@ DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0
 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.2-r1.ebuild 2071 BLAKE2B 210d0b460aa10383bc0a31452dc9250385b7515df1cd172f56c7e7eaebbef2fa794de7e36cd01c78094786f150e94420a7917d712fb55f1eea2cebb5f42104fb SHA512 3178622f451f8e0f3e90e11a4142de059ae9e4c2875bb2c40605d9daad623364519ec08d8d0618e2b701c2e1939f7910710a922899c1981ab68424ba761ef6c1
-EBUILD adblock-0.5.2.ebuild 2280 BLAKE2B be395166166b36a270a3b66e599769766ff9cfe2d2946ffd1f3ca32c346e584235e14bb90719562642631a03de562660cf993d3315d0ea3bb089f3073776d1c9 SHA512 b55db2898c5b4e765f17fe1d3cbc74882a885c7beb6651de09907ceaea83d35e8b846f7dad19eb8c7c01bcc9207120160c59679ab65e32cb51ff31e8f36f71c7
-MISC metadata.xml 488 BLAKE2B c6813b6b4c00dc1282ab21a9e37b4c035c9d75cdd1c0bf0a2903e4f40d074eedf5ae972b68aac91f46146e339bcd3cf799c45b96c94e6209d100811c2254daff SHA512 3f62c544ec8f4b2da7f04e3af1a81a702d719a0957a187ace37e638c1f00e0d3dbc67728e6915a05a6cb0bcb46366670c2e0a5837734cd0a51b7c3b021d4ffae
+EBUILD adblock-0.5.2-r1.ebuild 2073 BLAKE2B a6b7e55196ecb26b3a6bf9f7793b11f6a4396706e21c97293cc8b4e8be0e6e4092837c59e0fc035f848e1dab529f4dfe1f243b3f2046789bbf39c70a68d51d14 SHA512 3d18a98f2fb9c94a6ab1589a0cc728a4389f20dcf228e70e9737671e3c86f646cd740d0da40d1fea82443ce56b3b93983e799f5f01d672f124ab33837f2e3f37
+MISC metadata.xml 488 BLAKE2B 8c58b29bbc160b2139fc54058c48da79ae48963e2cfbf97b6eb6c78678b6c57d7ff63c32d65dd082b3ceaffc383c0b03b27467e331738b086bfd6c5ee45c6cc0 SHA512 1a5fb02550400b8a25118982cd9b3651b2ac236208b8f933438786ca18cd8dabc17fe98a447379a0067004f8429439e1af9567e7e04c6ed13100bbe6c6321b04
diff --git a/dev-python/adblock/adblock-0.5.2-r1.ebuild b/dev-python/adblock/adblock-0.5.2-r1.ebuild
index 2e432744ce79..5042cc5a0039 100644
--- a/dev-python/adblock/adblock-0.5.2-r1.ebuild
+++ b/dev-python/adblock/adblock-0.5.2-r1.ebuild
@@ -68,19 +68,19 @@ CRATES="
 	winapi-i686-pc-windows-gnu-0.4.0
 	winapi-x86_64-pc-windows-gnu-0.4.0"
 DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cargo distutils-r1
 
 DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
 HOMEPAGE="https://github.com/ArniDagur/python-adblock"
 SRC_URI="
-	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
 	$(cargo_crate_uris)"
 S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/adblock/adblock-0.5.2.ebuild b/dev-python/adblock/adblock-0.5.2.ebuild
deleted file mode 100644
index d6c36e71b226..000000000000
--- a/dev-python/adblock/adblock-0.5.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adblock-0.4.3
-	addr-0.14.0
-	adler-1.0.2
-	aho-corasick-0.7.18
-	autocfg-1.1.0
-	base64-0.13.0
-	bitflags-1.3.2
-	byteorder-1.4.3
-	cfg-if-1.0.0
-	crc32fast-1.3.2
-	either-1.6.1
-	flate2-1.0.22
-	form_urlencoded-1.0.1
-	idna-0.2.3
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	itertools-0.10.3
-	libc-0.2.118
-	lock_api-0.4.6
-	matches-0.1.9
-	memchr-2.4.1
-	miniz_oxide-0.4.4
-	num-traits-0.2.14
-	once_cell-1.9.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	percent-encoding-2.1.0
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.36
-	psl-2.0.71
-	psl-types-2.0.10
-	pyo3-0.15.1
-	pyo3-build-config-0.15.1
-	pyo3-macros-0.15.1
-	pyo3-macros-backend-0.15.1
-	quote-1.0.15
-	redox_syscall-0.2.10
-	regex-1.5.4
-	regex-syntax-0.6.25
-	rmp-0.8.10
-	rmp-serde-0.13.7
-	rmp-serde-0.15.5
-	scopeguard-1.1.0
-	seahash-3.0.7
-	serde-1.0.136
-	serde_derive-1.0.136
-	smallvec-1.8.0
-	syn-1.0.86
-	tinyvec-1.5.1
-	tinyvec_macros-0.1.0
-	twoway-0.2.2
-	unchecked-index-0.2.2
-	unicode-bidi-0.3.7
-	unicode-normalization-0.1.19
-	unicode-xid-0.2.2
-	unindent-0.1.7
-	url-2.2.2
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cargo python-r1
-
-DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
-HOMEPAGE="https://github.com/ArniDagur/python-adblock"
-SRC_URI="
-	https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="Apache-2.0 BSD MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/maturin
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)"
-
-QA_FLAGS_IGNORED=".*/site-packages/${PN}/${PN}.abi3.so"
-
-src_compile() {
-	maturin build $(usev !debug --release) --no-sdist --skip-auditwheel || die
-
-	mv target/$(usex debug{,} release)/lib${PN}.so ${PN}/${PN}.abi3.so || die
-}
-
-src_test() {
-	python_foreach_impl epytest
-}
-
-src_install() {
-	python_foreach_impl python_domodule ${PN}
-
-	dodoc CHANGELOG.md README.md
-}
diff --git a/dev-python/adblock/metadata.xml b/dev-python/adblock/metadata.xml
index 64e24f8f95d2..d961806e1925 100644
--- a/dev-python/adblock/metadata.xml
+++ b/dev-python/adblock/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>steils@gentoo.org</email>
-		<name>Stefan Strogin</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ionen@gentoo.org</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ArniDagur/python-adblock</remote-id>
 		<remote-id type="pypi">adblock</remote-id>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 043dbb30cc57..b9f7765296d5 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,12 +1,10 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
-DIST aesara-rel-2.5.3.tar.gz 8191431 BLAKE2B 698bc3b6f7e84288be3318796989d13d7de92f72c66abfa83b14c08f6310f974f7381d729e712c2bd5e76f398d74a3c5dc03d7515a22254261312e586e3fd461 SHA512 5c1ad9d6ad1fb58be1477713d863f2b1371544ea8293d8e9e1a690860a0483b83c9558827856a2546498bab26360f141a5ee97d4c7f3f2aad773e84f9766a59b
-DIST aesara-rel-2.6.3.tar.gz 7845423 BLAKE2B 66b84a10337efc01e37d82793da56b61b1825829d982e24e0f93ebb67cd3c22e5bb2e37c71ab8bd9648b039efaf4c667dc53df2a9613ba9370c2138eb74ca400 SHA512 e0a804c0c3c1cd24753a237c386df9600d2b01cf4991aeca3d794df4068f584a9ab5341b72fa5695ccb9d06f1e4954f450436e3a7ebe4c2efc1354a5c2e5979d
-DIST aesara-rel-2.6.4.tar.gz 7845688 BLAKE2B bfd0222c2a8d8e22abb56b785b73a121032832417562046445b8e0b2f6461326ba760d1839fd1acac2215a1547ed48d613998cb4915a07521f4d976a32a811b9 SHA512 a9f47bb4718fab974a35d7eab1b2a5ab8ea7d911dd9d92a791763a659f96b52b9832532e5e13aad10ac8e2f0927d2cc3e97c09e84046fee125925b3ac2898893
-DIST aesara-rel-2.6.5.tar.gz 7849097 BLAKE2B 85bc1579cd22ccc35f727ede3b337d1bdb613924f7568ac403ca1d2da42e442006afdd80e8eaeed14e0c2bd7a550127b9474b9424ffe800426203e1e31e65256 SHA512 cb5ff0f8c5a475ab733000df9d96ea3410c5760f263bb8a8f1de093f47fca3d7428d37253ae114d61d925777e98ab0c8f698f7864615ea32fe20efe6fc5042a4
 DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb43859ec7b80612145ed490b31d6e7dc6b6818653396938124a22fa2f54f8d151c5039cc2e9c9070c88cce9cb1c5596 SHA512 028a208fc7e5921ce1df34dd23a42cf90d419e06f0192d9a006ebfb8c5f36e35e347214e53f53e688a1144063c7f4853a8cd44eef6fc205225147116839008de
-EBUILD aesara-2.5.3.ebuild 2220 BLAKE2B c63f083ffcfec83fe5e4be3376f8c802e14ec75971273bf08dfc9b557d4ae3e880ad9061e060fbd4d50c798aff10e8bc70035fa4897113e6f716285310c7dadd SHA512 316b85a504558d62b630be739ef8571848d11cd676ecff988bbd84cd18f2577c67b47d8fc2f6c25d4095a095d9323580e6daa86d40bf6091727a017708d02679
-EBUILD aesara-2.6.3.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b
-EBUILD aesara-2.6.4.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b
-EBUILD aesara-2.6.5.ebuild 2598 BLAKE2B ec2c9a5359c530f8a4a8a274c0439d65cb10c8d73bb55e364296a6b6268bee5077846a5ccbec83ae3bb65e9842c29a81882ce8ea8004961613666768e6fb3c9c SHA512 6405bb798d228e1b6d41a6739d8f0a596337596225ea0094fb54f0383bd9a4cd130d7d2e5041b80a77ccf337cc4912bb795faefad3f447ac892113112ed6ab16
-EBUILD aesara-2.6.6.ebuild 2598 BLAKE2B ec2c9a5359c530f8a4a8a274c0439d65cb10c8d73bb55e364296a6b6268bee5077846a5ccbec83ae3bb65e9842c29a81882ce8ea8004961613666768e6fb3c9c SHA512 6405bb798d228e1b6d41a6739d8f0a596337596225ea0094fb54f0383bd9a4cd130d7d2e5041b80a77ccf337cc4912bb795faefad3f447ac892113112ed6ab16
+DIST aesara-rel-2.7.0.gh.tar.gz 7854953 BLAKE2B 0daee9dcad9c39d1eddd469930cb540369f9463f947d706691fe1552b8e39340743aa8d8a809fe8b7943bba253ef1b93018738ca13be7147114ab6cf77a3ee37 SHA512 b03a182f366624b496bee46b86d43c68b94d840503317af74113bd5b1c6fefc31e4e4d96d6c5dd129212904729127da949cebf05c5a162711d3872e1747c93a8
+DIST aesara-rel-2.7.1.gh.tar.gz 7857341 BLAKE2B edc31030810ec4193901d258c8666080219befccca17bc6165968f959bd57661f92de86720561ab54266906e2be1a83e0fef3e81a62c2810f0b78cda1dbc5265 SHA512 85a4b24a5f58cbb95db448d01140ff64f9ea39242b204a49ddbb2ff8827a16d0ba454764ed3ce9d2b6ed58a7494c452cda39582ae89691d44d8f91ec43e1f50d
+DIST aesara-rel-2.7.3.gh.tar.gz 7918433 BLAKE2B 5f0eaa5cb241db3fb59bfd5fda0566811cb72e5dc902e15aaa269aa5fea35be1c5c51ef7515a386aa9cb20f769ad793a005e85e9b14d10b8be046788842ee496 SHA512 ffd1a830b69196537c62b21d6307f6d0f0a93f0a23fb0bacbf17934d2e5a454a93d72d33d0e28eec6b49e917770df5fc43134453e0bf1bd8433ee52ce22935be
+EBUILD aesara-2.6.6.ebuild 2596 BLAKE2B 8559deaccfe85f53d5889c98a2eac4d43c94862e1c24e13a3470057d6c4737f906e7b0351bc0cc2d8c61bbd1210d655dcf2c9c51cf2c8eb4a06f6aa2ca4cbdfc SHA512 37f6ea5bf1920441f3780dcb85129f73c3954413ca87929d6cda3c5d0bd928748f3143649ddee08dda109fe418c2ff0b6cf8ef55bd69f2569a44000770624225
+EBUILD aesara-2.7.0.ebuild 2601 BLAKE2B 004be043e44f1ae16fe8c502114ac47f7e5e818c1a705b8b0a0198fda0ad367ecba4a57aed86bd20b870d52e8d44ec69afb5f7e36f72342d77bc98aed53bd29e SHA512 7bc13b8cf04c7bda7feb91632a3b4126765d2c0b3fa750c69248cc4d4597cfee1753d9425d6c6044facb090e5f46030026a3735f6361871bda1655d806b06ef0
+EBUILD aesara-2.7.1.ebuild 2581 BLAKE2B 4f17dcfeda1e40e614b1df46fccea04e6342620b95624e8252e133cd9b777add9e915e9b1b37814f06967f70119c2da572b37b0f11caa3cefb4aae253bbddebe SHA512 869ce185fba22ccce6ead914f9246cc286c1a146fe3b74ea6b87521bcdc7dac90541d041f3d4f832fd1e9d301bf48bd563ceb8ee1283984aa3c88ff857e03b74
+EBUILD aesara-2.7.3.ebuild 2619 BLAKE2B 02da2de77c42a74b30e752dfede9e87ca023c5efa34f0088e6ba1b680addc342987a0a47be372ff9eab456074a4aeb0c509971ef12cc8c8701e8c5ac089a3bf9 SHA512 2e2caec60b3af8812367f7ab1538fd6ebdcb4e42d4492cf7e8128a840425203a4a9d3aa8c54f0b7fdae53394f3a7152d0b891edd645f88f64224c5e815691935
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.5.3.ebuild b/dev-python/aesara/aesara-2.5.3.ebuild
deleted file mode 100644
index 22962f0d5f3e..000000000000
--- a/dev-python/aesara/aesara-2.5.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/aesara-devs/aesara"
-SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.3.ebuild b/dev-python/aesara/aesara-2.6.3.ebuild
deleted file mode 100644
index 5bcb330fb0af..000000000000
--- a/dev-python/aesara/aesara-2.6.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.4.ebuild b/dev-python/aesara/aesara-2.6.4.ebuild
deleted file mode 100644
index 5bcb330fb0af..000000000000
--- a/dev-python/aesara/aesara-2.6.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.5.ebuild b/dev-python/aesara/aesara-2.6.5.ebuild
deleted file mode 100644
index 5010ebf96928..000000000000
--- a/dev-python/aesara/aesara-2.6.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
-)
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AESARA_FLAGS="cxx=${CXX}"
-	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
-	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
-
-	epytest -p xdist.plugin -n "$(makeopts_jobs)"
-	# clean up the compiledir, as it can grow pretty large
-	rm -r "${HOME}"/.aesara || die
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.6.ebuild b/dev-python/aesara/aesara-2.6.6.ebuild
index 5010ebf96928..5b5c46ed7213 100644
--- a/dev-python/aesara/aesara-2.6.6.ebuild
+++ b/dev-python/aesara/aesara-2.6.6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/aesara/aesara-2.7.0.ebuild b/dev-python/aesara/aesara-2.7.0.ebuild
new file mode 100644
index 000000000000..34529ae9b5f9
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	esetup.py build_py
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aesara/aesara-2.7.1.ebuild b/dev-python/aesara/aesara-2.7.1.ebuild
new file mode 100644
index 000000000000..2baff9130511
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aesara/aesara-2.7.3.ebuild b/dev-python/aesara/aesara-2.7.3.ebuild
new file mode 100644
index 000000000000..8a38a83b79a5
--- /dev/null
+++ b/dev-python/aesara/aesara-2.7.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="
+	https://github.com/aesara-devs/aesara/
+	https://pypi.org/project/aesara/
+"
+SRC_URI="
+	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/cons[${PYTHON_USEDEP}]
+	dev-python/etuples[${PYTHON_USEDEP}]
+	dev-python/logical-unification[${PYTHON_USEDEP}]
+	dev-python/minikanren[${PYTHON_USEDEP}]
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
+)
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+	local EPYTEST_IGNORE=(
+		# we do not package numba
+		tests/link/test_numba.py
+		tests/link/test_numba_performance.py
+		# ..or jax
+		tests/link/test_jax.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AESARA_FLAGS="cxx=${CXX}"
+	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
+	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
+
+	epytest -p xdist.plugin -n "$(makeopts_jobs)"
+	# clean up the compiledir, as it can grow pretty large
+	rm -r "${HOME}"/.aesara || die
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/agate-excel/Manifest b/dev-python/agate-excel/Manifest
index b1a8ce3cdb39..9b14d9706fc9 100644
--- a/dev-python/agate-excel/Manifest
+++ b/dev-python/agate-excel/Manifest
@@ -1,3 +1,3 @@
 DIST agate-excel-0.2.5.tar.gz 161131 BLAKE2B ed7306dabf8b5da722aec9005da9bdba74a9cc585ea72b429eecc4b1fcbdfed698af8e582c464081867c0d4a285b9bc892efc339f0a08c657d87e61fd1174496 SHA512 5686c3faf8b817589a62d9fac558bebe7f47124685be9f8146d74c206023530d0cec2ad88fa4ba7ac049516f5bec6783ce8f0ff47f8eb8b2ed8aad7316f1771b
 EBUILD agate-excel-0.2.5-r1.ebuild 727 BLAKE2B c41825d4e2f197a379768821ac07dd3429c5c0b48713dcde7861c0a90346b74b0969deb63a2bbfd88d28a8f6eea30341f12636a84d7a1024027ffffce23296fc SHA512 f9423ae4e4fc4bc149cba4029265f7ba963ceaaec134e2e7f0583cb02d1f061c6ba7cee8608caf9222665f4030b2bc00ffe297cf76efc521404cb4c2157702fe
-MISC metadata.xml 545 BLAKE2B 83924355d55c633174a7060cc13fe4d2d06043b3af6f31d63c53943ce6b0a003ef3951a8967a45caec0a416ce6f101334b011602cf3cb4837c696c5f0a698ef7 SHA512 4c3bb8734cd0f4c67a0ab97edfb06d998f10582ae4688c382c66bc0c6c25f5f5c4900f7dfe9abc037fddb380c4f039353b6c19e0a203f47c5f8e52f549a3c623
+MISC metadata.xml 646 BLAKE2B 5e94a191f3b80b83282d7f46fb79ec3f49d24aff665775387d60bd100c997ce2384598e497a836c93682133a3df5b6ea84d1a4706bc069760f1e8fb95200a49d SHA512 61f116294b6bfe310e98c6bfa4d9cdd87fc127b77954db4d7145f00a82e7779cdff4f52d3544e9e0deab1b493d70e7f498aed44e5d6486601885b218575da1b1
diff --git a/dev-python/agate-excel/metadata.xml b/dev-python/agate-excel/metadata.xml
index cfd4815e400b..15cb9e2955f1 100644
--- a/dev-python/agate-excel/metadata.xml
+++ b/dev-python/agate-excel/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate-excel/issues</bugs-to>
diff --git a/dev-python/agate/Manifest b/dev-python/agate/Manifest
index 7d4358a0bd5f..77db88922d39 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,3 +1,3 @@
 DIST agate-1.6.3.tar.gz 202102 BLAKE2B b1a5624b4744b8f3ed266470da580cef2f2e1cf6159e1b33fcd461e4abd235c5e3fe0da35408a42c92fd4abf14a1f841a1ab9eb6cd31545d826a5223e85b4904 SHA512 e83a03c5a3e4b7fa9997030ce0d33e7b59b397e2ae07ee6a723eb7fb708a7fa8b8c4322dd034f42bf664bf2911d89731fd060e4ff33a237f83114a83312ac5ed
 EBUILD agate-1.6.3-r2.ebuild 1282 BLAKE2B b1d322cde533e572fca11731bb6aa1597cc98010cf95317a26be049c1dd6862c32391ffcc0fc1f8c3b08ea78c29d362b1fc73acfc9110ed26daa251b942cb83b SHA512 c22457637c75799021b2309806ca274a6ce355da9328b0290df3627cffde3c4c39bea351a5cb67fd26b6f9e231453a120b2ceff736cec7eab2a3ab78dbffe892
-MISC metadata.xml 510 BLAKE2B e4f41aa63b508b2d2f0d5d064bb88dfeb8e335bb461d7c97bb4cb646526c3862c4ace62feb201bf8690627a8661d86e9eb3161d5018cc50adc3f19a5bc56a2ca SHA512 de2c8764bf315f86fb630d3d0a5a31a3f78430c47a6723af7c0bec4cb6216349456f062a3fd9ad7ecb400f144ba5b5450670c1edac2d3c85598cc610ecdf59d6
+MISC metadata.xml 611 BLAKE2B a288b63c7859d99467f9304b4d8b007b9df6b4345157e3b7363f23757797fa7f84420b8a515f754775de14893c2fba1ddd62fc3757f5b96f791f65b524db41f7 SHA512 3101db1d600b60da2704dd732b898db6d932ef2305a28dbfdc8b221fc7938a72309e1fd27af4567b4930a20f00490ad8d65bd962978df44cf401ddd058442f02
diff --git a/dev-python/agate/metadata.xml b/dev-python/agate/metadata.xml
index 6b89c8eb3eda..4bce6356a3b6 100644
--- a/dev-python/agate/metadata.xml
+++ b/dev-python/agate/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/agate/issues</bugs-to>
diff --git a/dev-python/aiodns/Manifest b/dev-python/aiodns/Manifest
index 57a1e20df737..eab8fe813e44 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,4 +1,4 @@
 AUX aiodns-3.0.0-py3.10-tests.patch 757 BLAKE2B 1b5040841b3ced3b83b330e0033f54ee6ee97a8d025f22d87674f5fca9858e48febbf25c6b3441ba5b27ef9cb15f841e65f25ed999b9f536559ec50e1f010bbc SHA512 85219c885ee70871fb43f53e2ec52c164b08b63e120ee5ca5bc4531ea71155b6d81f5a813f056eabf7f4da2b425b12df6b5649cc7a9ba98d0ca9473043ee1829
 DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
 EBUILD aiodns-3.0.0.ebuild 754 BLAKE2B 033e9b64c372f9de617da381d0fd005f5d5074dba184c0d1a20a293ba8972639c2501968411ed80aed6c4c48e07c67fdcc43ccab3bfaa0a02f3317e83aefa487 SHA512 38b21e170aa27d72b54f9ab84a91185231016d02bfab6f1b270c3f6cbe92eedaddc9ce3ff5d8b63adf64e84d942556b98d7cb2d21e038ae18c53dae739131fa5
-MISC metadata.xml 341 BLAKE2B 5f0589c2dddf4a0ff6d59db3b37ba3eb463c4cdbd820715f9ca65050eb1fbaf6ef078eae06283998560657c63a0ffdc8ebf9a59748ad21fc8b5f19acf686f67f SHA512 7326bb694fffe9df519ed8f5b9a9a101579e5ebc87142c7be07543b7c7fe7f36d4e27143851c38348f710a64e841e13d160becaff36e5e815f35802fc4d02fec
+MISC metadata.xml 442 BLAKE2B 077b8bbddaed2aefc1b3f94e2339a9b226c5c5e7c61bf3fafe890eb0432b87556312833236908c1dd1da1cc8344db63d5a8764f4487df4179a94d23bf9a34287 SHA512 0228d78702c35d00f1ffdfdab987492e2cf1be67c0eee92b62c62a483623d7a2e8580a6e3714a5cd581722bf297c3ee9c53843565090b1a138c55dd3afda081c
diff --git a/dev-python/aiodns/metadata.xml b/dev-python/aiodns/metadata.xml
index 713adf9e0d9a..038171b90df8 100644
--- a/dev-python/aiodns/metadata.xml
+++ b/dev-python/aiodns/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">aiodns</remote-id>
 		<remote-id type="github">saghul/aiodns</remote-id>
 	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index fce55626a59b..928e1b9e1b46 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,6 +1,3 @@
-DIST aiofiles-0.7.0.tar.gz 23245 BLAKE2B 5dcb743912555de9a4c58a37925ca08c4be7065ea78924854d548b32f31f93bdf1b231db840aa9ac822d467ffd8c7f57c506c5f6d550c662013008899da8b716 SHA512 75287266cd86c572db0795074d625dac8b3476c4d8ef9a193ce01ce80a423a4aa39f6e5ec5005fb441375ccb2a2ec84913634919ee5000bfb7623ac77a030b92
 DIST aiofiles-0.8.0.tar.gz 24139 BLAKE2B 0f113b75832219e63c0894e70ec613138db7e243ad032bc6d7bf715aab505b5246ab7a0add64b46a9b981801cf05885f7affa965cb625941dc57b805280f0ff1 SHA512 4f590baa0369d465a6139c0d4f50beeec60f8f213b607e0e41598f45f507a12edc67b29c77718b03eee7532f10ead8599f55aac3fcb78d0429435c25a58f6d2e
-EBUILD aiofiles-0.7.0.ebuild 530 BLAKE2B dcb7b80dfbb8cb5960640eb7ae0abaa8ff9aca1c3452338c3c225698f83bb5223b69cb6510a0e0640f427d04de3f5a59369b6457c43e72f8597ec7118b3610d1 SHA512 e31fd786d21709811ee7ad5fce311e35e23f7f8dad4cec3b0f4cd73ea93a2334e254e7836f7c8903c966d8c596d25389e040a439a14ac1d7709c61583f4e8768
-EBUILD aiofiles-0.8.0-r1.ebuild 518 BLAKE2B 58e576e96ab1d7268ab345acf4b075e773fb36d1110d33516d961775946a075913d781262831e24d4b942eedd08697545a95027366f10a8cecd72799a65c9644 SHA512 e00f93983ddeecafe5e58cd555c8ffd48b4ae066655ad482a0ba6f60be3b1e2b07a80d49ab15451be1d56b05f728b923363d42943700cfde3f1d53d6639ed19a
-EBUILD aiofiles-0.8.0.ebuild 530 BLAKE2B abcb607491ae534bc32706e8101176f4c316a316872b356e74f668454cd1f7ee1c2f7f90ceabd7bada1a05fe77ae2ce3c6806c706664d932439643d2ee720f1a SHA512 72f429e289e94ce5313c46c4a2b163a8ba3872a94a0fbe6b2688f48c6993b3fe91b3eeac404f072640aafb9d0d22f37abb3948f50424807da794f98edc90d77d
-MISC metadata.xml 611 BLAKE2B 3706fd736912187fc4b261626376983a001202c197bb57b8274cc6eb4c6ae46c736dcb8fe41cffbb67bc06f0fec4b11eb8967c9a2bd04d8093b1c6783639f4e7 SHA512 4148decc79697d55e08b8b57e179f07e376b96cc4ddc57bf49711b149719473ba1b31d49e1534009bdc052b8a8683ac064c54709f2d6da20e95de6c89d1e0f0c
+EBUILD aiofiles-0.8.0-r1.ebuild 518 BLAKE2B eafbbfeb5eba6e3df53c017a55b81e8a1b7f2eba528d43a196db80628ad136aae56bbaf9f3105bb9b30e4c36dd18d56865f23166a0aca2176ab3402e8fa1cb0c SHA512 c4657748f11995d7ba42721cf8e12d81f2b48af6a8a334d96699d0c2abb293d726f1a365727af9fdcebdb1857aef340202cd2242567f336c743fd8e3c4d89f98
+MISC metadata.xml 712 BLAKE2B 99425400a12f16885a65f3ec1b2bfa068d5fa2a20a075dbdd2e5a98543c25b2ff4c46ed435c3f6594d47e4265e5ebaab87e97c7f76f127b112fb883bcf26942a SHA512 235749ee35f86ee062ccaa682a3fb3872c1903f8c38e9bf8a9ed5be60d24526fe6007bf84764ca20347c87736549870b7f40d701f3a7c1936a9be1503e299b67
diff --git a/dev-python/aiofiles/aiofiles-0.7.0.ebuild b/dev-python/aiofiles/aiofiles-0.7.0.ebuild
deleted file mode 100644
index 21d2b385d7c5..000000000000
--- a/dev-python/aiofiles/aiofiles-0.7.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/aiofiles-0.8.0-r1.ebuild b/dev-python/aiofiles/aiofiles-0.8.0-r1.ebuild
index 40c222f025e7..47aa92a1c980 100644
--- a/dev-python/aiofiles/aiofiles-0.8.0-r1.ebuild
+++ b/dev-python/aiofiles/aiofiles-0.8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/aiofiles/aiofiles-0.8.0.ebuild b/dev-python/aiofiles/aiofiles-0.8.0.ebuild
deleted file mode 100644
index ea78ba811a39..000000000000
--- a/dev-python/aiofiles/aiofiles-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="File support for asyncio"
-HOMEPAGE="https://github.com/Tinche/aiofiles"
-SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
index e1eccb4ed73d..76c373236700 100644
--- a/dev-python/aiofiles/metadata.xml
+++ b/dev-python/aiofiles/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Tinche/aiofiles</remote-id>
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index e08046aeedb4..cc8682c37890 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,6 @@
+AUX aiohttp-cors-0.7.0-py3_11.patch 845 BLAKE2B 896c500c515b2eaea059ad9c071701062a06c26ae7b7907d9e34060bd5574c5b9a94e1d3c3e36e5e8e6548bad0af2001a12cf360c39524d03623c1ee69542583 SHA512 45562ff9471412c9ba2b5f0af51ba7d0535ffd05227a71edfd2864ff92766757fe186b0f2d68021d624c82177f18e723c248be917e4b4676ae8255896cd1309c
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r2.ebuild 959 BLAKE2B c6f3f46f7cb5a45710d19782f8cf363f6436074b22537ffc658dba28ae73e51c1dceac39beda032d543eb7e5c6d415639ba14f3188a6c1d1a9fc3db1dda71169 SHA512 32e07eb8f5fee418518a9dbfba7556908ca9e9500e80e47f61acd1b1a05efebdace9e88965ac2a2c8910d441a0deebdc72a7ed08f7d4e29d704d59488823b1cf
+EBUILD aiohttp-cors-0.7.0-r2.ebuild 1046 BLAKE2B c0bfd45b370d59fde44a9eb71a2cd725705e79b1c34bc88b22d0194ab5ac06d15cac002a859d7a04452459e300a8472b02b09d3e4cf62595931e60bea403b485 SHA512 e47ac631459f1e44e07fba8bd3f5ff9281d143198405c8f0535224cdd69d251f9d0f2ee73c91cc207f7e2970e729fa1ec2907d11658ab07605dc659388da508c
 MISC metadata.xml 558 BLAKE2B db98935b061e7553213d771c0293892bdb2db6209715121a775dec9eee3df6498addbdc64a5c8c9174e8ae7ebac0be3785645a97de238e4320f5724280a406b8 SHA512 4a97a4bb76eef1ce332b6df9d6d2dead19dfce48bbd9705a5ee8ad50c1e66a98b24f7d40425b81acf82347afb1e809d0b7ddd67419c039c3dd1e0a4d2c358de5
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
index 329aec1efb4f..b502e01bf456 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -28,10 +28,12 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
-# https://github.com/aio-libs/aiohttp-cors/pull/278
 PATCHES=(
+	# https://github.com/aio-libs/aiohttp-cors/pull/278
 	"${FILESDIR}/${P}-tests.patch"
 	"${FILESDIR}/${P}-py3_7.patch"
+	# https://github.com/aio-libs/aiohttp-cors/pull/412
+	"${FILESDIR}/${P}-py3_11.patch"
 )
 
 src_prepare() {
diff --git a/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_11.patch b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_11.patch
new file mode 100644
index 000000000000..2dd0df4b61e2
--- /dev/null
+++ b/dev-python/aiohttp-cors/files/aiohttp-cors-0.7.0-py3_11.patch
@@ -0,0 +1,27 @@
+From 1eb2226aaf664d0be746753a32f82ee2e04c2f0b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
+Date: Tue, 1 Mar 2022 15:31:54 +0100
+Subject: [PATCH] Replace @asyncio.coroutine decorator with async def
+
+In Python 3.11 @asyncio.coroutine decorator was removed and it should
+be replaced with async def call.
+
+Fixes: #280
+---
+ tests/unit/test_cors_config.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/tests/unit/test_cors_config.py b/tests/unit/test_cors_config.py
+index 817410e..9fe1052 100644
+--- a/tests/unit/test_cors_config.py
++++ b/tests/unit/test_cors_config.py
+@@ -29,8 +29,7 @@ async def _handler(request):
+ 
+ class _View(web.View, CorsViewMixin):
+ 
+-    @asyncio.coroutine
+-    def get(self):
++    async def get(self):
+         return web.Response(text="Done")
+ 
+ 
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index 8a28d431eaf4..f26b2f03e722 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-jinja2-1.5.tar.gz 54608 BLAKE2B 3271e159f1022023b3d9f96b0f534b04898e0774d6ceefa19bf8958a835d499a1598fd12cabab8206448a0e89a107816577d596bff0c45a4947fcb7289c35e5b SHA512 230fec6e54fa55e22be3bc09ae1896cd12834eda5721c1d698c8482f9529b443ccf13a4db24bd9ccd179c36b9cdc90abbb848f287e7ed79e621d6a2976b1fa32
 EBUILD aiohttp-jinja2-1.5.ebuild 837 BLAKE2B 740d658be6187f8c392c3af00da6e3e1d12d7099e88a28d4c2bd44b8c144d0e3e448613adadf73ea09d840ba034d64a9831024ea52cd61811e2643ae83685c96 SHA512 991159512eae0b51b42780d8c1bd5f6f2aa60faff0646645cd853f21acbdce99e88dfb11c0bc15d81576d3588380dc3eaebfe7e392ce4b7f89d5758b6f6dcce6
-MISC metadata.xml 409 BLAKE2B 5ffd3d811629e68c72570d84a056b4d48be892097bad6de3ea0af1531d566253a39bc05a2ffcb268d1021b21bfef2843926bb521f97180bf0cf3b6508ac5eeba SHA512 255887232ff8b4b77d91dbed8ab55350233eef180798be610550715d39c43ae9534c81ca33e70aa8d746c92e66eacb66e2607b63c752eafd3392c27a9e111f00
+MISC metadata.xml 510 BLAKE2B 457c273ba13d29037a79881015007652f8f9f3e5956dc997fcbc5e38294ae8ce7df81f0f8cd10a9bf97d371633d93cc59887067dbdaac5b9b6421b147ba332c6 SHA512 34398a5c6e57b87803ac705807c33b5080d87439288bd658a1191587662922e28755fe58fc39d42d4f4680fc890bfe6ddca6d17bf2472fe70446e1aa5e0c7456
diff --git a/dev-python/aiohttp-jinja2/metadata.xml b/dev-python/aiohttp-jinja2/metadata.xml
index d000a5c16d76..99353370c1be 100644
--- a/dev-python/aiohttp-jinja2/metadata.xml
+++ b/dev-python/aiohttp-jinja2/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aiohttp-jinja2</remote-id>
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 06224691be9c..648235b8c993 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,4 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
+EBUILD aiohttp-3.8.1-r1.ebuild 3655 BLAKE2B da35da9b2fad5c2d5460f1f0aacfbd025bf3bcc44c92c0a9065bb56cf03dac0a5d625ffdedf93336fbe17c4fd9ad128079a1d6a1283db312d57d3fa88c2fe501 SHA512 f9584dc24e952c3754f1e58297538fcb06e0befb096281673d377acb2208bf05a6701fab2a1162c00806b584072f8fedac7d90b1084448cfe67aebb6a8ff40b4
 EBUILD aiohttp-3.8.1.ebuild 2650 BLAKE2B 248a67aa42970a04d65b82bb7a75934ee97a75e401280ee1daca08f6b7d63a003d9cb2cb10e5d89474c065f030d5bf7770380b41f99d9a731c75215622cee805 SHA512 54c8399221adfae897b72d077a1f973a8f808daa24c744cb836b2cb3801c4805da34f28d52a9258f4b03e44174ac69ee6064c0651978a5810153336c1bcf44d6
 MISC metadata.xml 490 BLAKE2B 5233af0b5e2668b1eb62278b05b62f24f1ab90f6d05b20dd9f1c5b54b846919c3fa28b843df28f5bfa320996d46de0e74c7a28bd0bef02aaaca14b1cec52baba SHA512 9b701c5c5a22b6aa94977a67bc40f3dc9df8337556952658a2a17ecaaa471cd7f7b5b8bf3a0088208087677555f0cbb8760c091b03b96ee70affe3e2b84cf6d5
diff --git a/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..e0d71889aa44
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.8.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 multiprocessing
+
+LLHTTP_COMMIT=69d6db2008508489d19267a0dcab30602b16fc5b
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/async_timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) )
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/alabaster-0.6.2' \
+	'dev-python/sphinxcontrib-asyncio' \
+	'dev-python/sphinxcontrib-blockdiag' \
+	'dev-python/sphinxcontrib-newsfeed' \
+	'dev-python/sphinxcontrib-spelling' \
+	'dev-python/sphinx' \
+	'dev-python/sphinx-aiohttp-theme'
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
+
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+
+	# which(1)...
+	sed -i -e 's:which:command -v:' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir requirements tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# runtime warnings
+		'tests/test_client_functional.py::test_aiohttp_request_coroutine[pyloop]'
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# C extensions are not used on PyPy3
+				tests/test_http_parser.py::test_c_parser_loaded
+			)
+			;;
+		python3.11)
+			EPYTEST_DESELECT+=(
+				# known problem with tests, not code itself
+				'tests/test_client_functional.py::test_timeout_on_reading_headers[pyloop]'
+				'tests/test_client_functional.py::test_timeout_on_conn_reading_headers[pyloop]'
+				'tests/test_client_request.py::test_data_stream_exc_chain[pyloop]'
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_with_loop
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_example_without_explicit_loop
+				tests/test_test_utils.py::TestAioHTTPTestCase::test_inner_example_without_explicit_loop
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest -n "$(makeopts_jobs)" --forked
+}
diff --git a/dev-python/aioredis/Manifest b/dev-python/aioredis/Manifest
index 447374a53037..b6c7cc57b68d 100644
--- a/dev-python/aioredis/Manifest
+++ b/dev-python/aioredis/Manifest
@@ -1,3 +1,3 @@
 DIST aioredis-2.0.1.tar.gz 111047 BLAKE2B 56f520110bee1a5ef2c19171b6c4c5d6cd4ac440892d36edc4ebf274e7b4ac184fd9e090ad79922f609de4b1dc403a1caa38b271cb1f938357ab9f01ea3f8bfc SHA512 9c2c3fe3e4e4a91e9ca727f8ad78c7c4e6ce1109e4a3043d9ddb929606b6879b1522f3845a3b18d8586ed557a4ab0f6288f27f2b6b0e307343e113f9b9b5fd76
 EBUILD aioredis-2.0.1.ebuild 1276 BLAKE2B 3a0234462bb517f0a0c95226187da30fcc870010e2d9b1081568ce96a39823ca9fa53dce88c0b19421e5bcea899e256dd8b9d4b49a44f68e05640a241ed78107 SHA512 abfe9e53f6d4d75ff473e8f2360e309b24c7b0e5471cd41ce011636c240c6a853485c2505b1ab75562e1b71f8e286fdf871d04ff604147af7135394cbfa192bc
-MISC metadata.xml 406 BLAKE2B 71c02823f5035bf4117fc689fd0795ff0a431dc363bf9b630d7fd7fa7c22fcc9cd3681546ba8665faa65ddca7a7358d40dfd3899cc5ec978b46dcd0f001d2339 SHA512 73dfa8856695b682169ff7d930e14b30450e02d53e08c95612aef63315f05453ec0e98956cd645728fe3d7670686c307ca17944e3793706d5a8f83cd635a1a0e
+MISC metadata.xml 507 BLAKE2B a1b32c4ce1e73194670a7364c46ea8c6169c0ed1cc5232016d45259effb64a993ee40b16ce53306c696cb327f7bd9b1062bf662306933b8635ede5dffa9b4aa7 SHA512 78a7bc30d1a16147f9abdbbb05bba656c2f514e1f18ed601b3544ba1583a0c48c9aa2b7276b434518136ded7019b5d4d51a259fba8196aaabfa17e3511790ebb
diff --git a/dev-python/aioredis/metadata.xml b/dev-python/aioredis/metadata.xml
index 8206886d5a9f..093de31d3019 100644
--- a/dev-python/aioredis/metadata.xml
+++ b/dev-python/aioredis/metadata.xml
@@ -5,6 +5,10 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aio-libs/aioredis-py</remote-id>
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index a31116649769..111114803260 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,3 +1,3 @@
 DIST aioresponses-0.7.3.tar.gz 28895 BLAKE2B e948e25daef231b7984609ca475cde9ce026880953b395ebf1d5619fc951338614d1f56332c54467706f66275bc8aa1be9f04d3503295388f9dd4a213316d7c8 SHA512 9e2bdbf4fe5089928de9a7ddd54931d70ea137fbaba2bd22b32d248c9282f70d551a3aa2de270342bdf0c1acd0973b377f503d1194156aa545109ef3458278b5
-EBUILD aioresponses-0.7.3-r1.ebuild 891 BLAKE2B 7c35435ff5d4adbafffa1e78509db9661474adcd31f9beebb417553458f99037cde94013248c72813592c7e391e423deccb61f21777e18071c8bd79b076bf36f SHA512 132b956b942dc01f723d0266d7ce860b66f14ab1a6a231d54f6af0f209ec13f8b160a9b40372303818083e67aec93eec30167a6ca641fa3aa0f8f4e35709b662
+EBUILD aioresponses-0.7.3-r1.ebuild 935 BLAKE2B c7a3cead45bd41dfdd933bc59c2e7d531d52838ef479cdf9278111dda869cb0c6531edfd82ac1835ec5847ada9842dc42fd585eff26c3aa2fcfcd0046a99b886 SHA512 80afd9395aee61c26af306fe9d9ea7d3e227d58532e3d3302a330f0b93ed0019fca6c67f63574b8c8f115c57229c4e3a87c2b141136843c931f713f6081f8d17
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
index 9494709fa4ed..5f993f60c834 100644
--- a/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
+++ b/dev-python/aioresponses/aioresponses-0.7.3-r1.ebuild
@@ -9,7 +9,10 @@ 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"
+HOMEPAGE="
+	https://github.com/pnuckowski/aioresponses/
+	https://pypi.org/project/aioresponses/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/aiosignal/Manifest b/dev-python/aiosignal/Manifest
index 7595632b9231..cfc0bfaed227 100644
--- a/dev-python/aiosignal/Manifest
+++ b/dev-python/aiosignal/Manifest
@@ -1,3 +1,3 @@
 DIST aiosignal-1.2.0.gh.tar.gz 26171 BLAKE2B 02657c11f5ee96173c94ab889993f835904a79e3fee58121fb332583f8d81cb680087e667dc0f8e89cd9704bc338362f2878bef7080907a5a3f86bef7a30cac1 SHA512 e75df2fcaeeea7ff7688c20838600f6315bec25b82c48ed7a23b7853edd3d53d72f76a686ad9b0d856f43b0d476398196a8ce4eb98c8859234710ff008f8ba42
-EBUILD aiosignal-1.2.0.ebuild 709 BLAKE2B 6a1a2d0eebf70c48ca3fff0ef4e1c8c80907b37641f126e9101d1c888d8909091397cef4c776bee12f33549f459208cafff73855b111bb43406b3f9ddf484fd3 SHA512 a95422395161b8002524dda8047c88a1455299853518f3c5947fe0fd2fde6bb9f3c715190bc7dc5df7eb11d08fd1bbe53163d4869707621d7968a4139578d2a2
-MISC metadata.xml 349 BLAKE2B cd7189a76f846812aedf465d859340944989ebeafe01e68a9dc3949bfcb2d2af0d85e33f33b79503b608ed205690def79892756c06e74ba47c91f9d642fa314b SHA512 70ad9782948e862b0b1324e2efbc16470785f0e42a5959aa1120323d61abff857541d585d7e1411a3f998e58eb7dd3e2ed7022bef4675fb897904a076d7b613d
+EBUILD aiosignal-1.2.0-r1.ebuild 745 BLAKE2B 534cff054719187cb2e97bd71ad1be3c6aad90397ab8c7e5fb9252bc3fa947e833e4a17497ce15fbf1f8539822a24bac190a4bc03702ea675f5e178fb6129408 SHA512 bde5dd6bc1c08e1c2847e8fb5093ea03d3546064c652ab8f71e4aee32aeae56e5b7ba89ead194574b10fcbaa936a442feaa5a57138175f7601d3f4da582291bc
+MISC metadata.xml 373 BLAKE2B b209b111344a544f995cee1af49f03f317e0747f11ba9cd3b34720b48f944efb52b622dfeea2abea1fa0d95207b711a16ddd19a16d86ae6935f2c3095ac94cb1 SHA512 74dee89fde8e295c370ca51ba1f8c041539da01ab54849adc8e90d5b67c238c9c54f19b5f0608dfa52271a5f1880995a2c61f1d649aa34fea650ef5e0c6927fb
diff --git a/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild b/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..2961fee18787
--- /dev/null
+++ b/dev-python/aiosignal/aiosignal-1.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A list of registered asynchronous callbacks"
+HOMEPAGE="
+	https://pypi.org/project/aiosignal/
+	https://github.com/aio-libs/aiosignal/
+"
+SRC_URI="
+	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/aiosignal/aiosignal-1.2.0.ebuild b/dev-python/aiosignal/aiosignal-1.2.0.ebuild
deleted file mode 100644
index 0e0ac7e0e868..000000000000
--- a/dev-python/aiosignal/aiosignal-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021-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="A list of registered asynchronous callbacks"
-HOMEPAGE="
-	https://pypi.org/project/aiosignal/
-	https://github.com/aio-libs/aiosignal/"
-SRC_URI="
-	https://github.com/aio-libs/aiosignal/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/frozenlist-1.1.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/aiosignal/metadata.xml b/dev-python/aiosignal/metadata.xml
index 83e16614cbd5..d267902d0f80 100644
--- a/dev-python/aiosignal/metadata.xml
+++ b/dev-python/aiosignal/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">aiosignal</remote-id>
 		<remote-id type="github">aio-libs/aiosignal</remote-id>
diff --git a/dev-python/aiosmtpd/Manifest b/dev-python/aiosmtpd/Manifest
deleted file mode 100644
index b83f3671568e..000000000000
--- a/dev-python/aiosmtpd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aiosmtpd-1.4.2.tar.gz 140630 BLAKE2B 9a725d3aa28943afbb14fb6792e0115cf4bc257250da815183c9c9e6b293cf71ac836cc811f50e48bc450d3f629f74d1948aaef78d44852bc96fb3daf0398605 SHA512 b910ae4c00b52f59b9f2199b296a1b76caa7567cbcd2e27c73d4ec894e9b48cd8190090083ce33b87dc924c4394a6425506355951208af65b89a6c1abe371114
-EBUILD aiosmtpd-1.4.2.ebuild 750 BLAKE2B 66a6d103c69d91e59f27c2c54c5bfdeb8376be5a366602f9825971d0067a15b0c32b23ae283b99171eace58014fb50a3d0c407e3dc80da5c3d0c313eb6e89ab3 SHA512 9c06dda2aac6276db5abac43e97ca1848492512b195ac5c5a9577c3168c5e04eff1903514e01f6712ebf1723df2d994ceb39d3a242ebc83086e9e5a3a810e9d5
-MISC metadata.xml 508 BLAKE2B 5b79b0a6f58823d9a3a31b0db9c05d2b24cbcb8c3977b40c5a764666cac1f008222f1be10500cdd30f4a23d631093837993d6c21d77a6d0fc384303f7b507f21 SHA512 151f24e7d939f62360b979c9eeed10e6bddcafbafb6a30d86df8c8f844e25ecaaa8d731114f7744aac8a25d310489b21d26b9d890a6c5e9ca3147e485cd5f0bb
diff --git a/dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild b/dev-python/aiosmtpd/aiosmtpd-1.4.2.ebuild
deleted file mode 100644
index 3c32f8604a09..000000000000
--- a/dev-python/aiosmtpd/aiosmtpd-1.4.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=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="asyncio based SMTP server"
-HOMEPAGE="https://aiosmtpd.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-# TODO: run doctests using sphinx?
-distutils_enable_tests pytest
diff --git a/dev-python/aiosmtpd/metadata.xml b/dev-python/aiosmtpd/metadata.xml
deleted file mode 100644
index 147b82dfad6e..000000000000
--- a/dev-python/aiosmtpd/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">aio-libs/aiosmtpd</remote-id>
-		<remote-id type="pypi">aiosmtpd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ajsonrpc/Manifest b/dev-python/ajsonrpc/Manifest
index 9e4896a45542..3a626d9bd843 100644
--- a/dev-python/ajsonrpc/Manifest
+++ b/dev-python/ajsonrpc/Manifest
@@ -1,3 +1,3 @@
 DIST ajsonrpc-1.2.0.tar.gz 22108 BLAKE2B 1ba7ebd68713c0951bbd309638a3de71a64877bdcac82f53228f6fea7189239d6bab643343b8d2ddb8978e276ddc8205b81190a00f85a0e169ca7552e75ed30c SHA512 958300ff858f1997012591cfb47d2ee1b7ba2f0a9577cb8568817ce7b490e13a5b757ea79153b4e6cf3aaf54e58e4ff925e25513f46b06e483b04b882f626b49
-EBUILD ajsonrpc-1.2.0.ebuild 478 BLAKE2B a4c2a1a21064cc74be2ad86b1f3fa0001d825c88bc16d4b97ff0fc9a1f4fa2748190603a6531d2eafa143c00768d17eba42b84264a5ac79984f4a07d8b6883b7 SHA512 981fd0664595f52ec2d5a7fddd5837e383a33fdd08f7a8aae8951de6150e1197ae373186aa315cba2b2ae44bd9937b8f358c32b153897d3858d07e27f5ca0cbe
+EBUILD ajsonrpc-1.2.0.ebuild 509 BLAKE2B 34b6352130af250df92d2cae1d2e8cd32210f70cefb182aa5fd756639e06fc6411f2f63a9636f1bb09fa9338ae4f39fc2a9bc7d2e488044c943e6fcd56ba9725 SHA512 abf0bfac7a1be4754bbd5c05cea1fb2f2c01e685a32cf3c7a032e923694d20f567bc46693008af8e8a1c2f4e3e7cdf4e336c3a714812f81fd3512b156d630767
 MISC metadata.xml 371 BLAKE2B d54dc73d10fb658a0220cc153ea40637f0a1fcc66c5f53a7abdc1544a6d1e87b4cf196a29987f34114600f8345464b50c348b4ca3dee5a9fa00b2873f5aa9271 SHA512 1de86184645bee367b843cdec2a29f44cee00efd4685a53b8949d7b4fecf02e6dbe0232141426477dc4b86e3e5e48aa913f1ef37f825d3c0896b52bf553444ea
diff --git a/dev-python/ajsonrpc/ajsonrpc-1.2.0.ebuild b/dev-python/ajsonrpc/ajsonrpc-1.2.0.ebuild
index 8b0a83075bdb..f2e894750fbd 100644
--- a/dev-python/ajsonrpc/ajsonrpc-1.2.0.ebuild
+++ b/dev-python/ajsonrpc/ajsonrpc-1.2.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Async JSON-RPC 2.0 protocol + server powered by asyncio"
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 1a3de2186206..a885f9c79fac 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 471 BLAKE2B 60bd05b5e75c49c96f99685d782a44586defaa3f3ef0676533f6e04942e2b2e61a6bb5337024a281a2b779c5836ff6653512792fa9bb3c5d15883208dff8ff5e SHA512 e00b15edf74da77d107c65d86c1fddcf6b340928b5af23629379ca2c52f210a5312660eb9488e16e86e5bb8ec3c493256097bc66b26b3f9573fea21b70ba01ea
+EBUILD alabaster-0.7.12-r1.ebuild 503 BLAKE2B 5042f2462f8f8d377bbda1f0f9c6cfd9ce5ad328d4c4e6d478ac18bd26a158fa8578e0ca89d229c40f5221c8a86902ffc019989b740c49cb773dc7047a837211 SHA512 45540521fdc79bcde0d43f33a11d84f0f538c387c3b5a0f56d644e22da59b6585c65280a6c6cbd208b45dbe820edf07578097331eb3c8e7155d81b3b2a1226c1
 MISC metadata.xml 410 BLAKE2B 1419bfb66f3dbb231c8f106fd95012bd8a2e1c0c50d7eeac0620519b0e8246117f4c73d704dd55739f0a853e79321a08060299156050ca70b34a66e54447e3e4 SHA512 0265a6729c8c32a6ca98b04dd35fe569d8b800fe2a679b54e4c40cb79b2838e301e5a7edd59aa861aa12a55c525108b8b0f90d31a1d6d8488be88c14ad2f3541
diff --git a/dev-python/alabaster/alabaster-0.7.12-r1.ebuild b/dev-python/alabaster/alabaster-0.7.12-r1.ebuild
new file mode 100644
index 000000000000..473cfbe0ffde
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.12-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
deleted file mode 100644
index 6f239988481c..000000000000
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2022 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="A configurable sidebar-enabled Sphinx theme"
-HOMEPAGE="https://github.com/bitprophet/alabaster"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/alagitpull/Manifest b/dev-python/alagitpull/Manifest
index 3572455d8f8a..bfbf9d9dcca0 100644
--- a/dev-python/alagitpull/Manifest
+++ b/dev-python/alagitpull/Manifest
@@ -1,3 +1,5 @@
+DIST alagitpull-0.0.23.gh.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
 DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
 EBUILD alagitpull-0.0.23-r1.ebuild 552 BLAKE2B 7e19442f581ffbd6d11c5da8b0b7fc796b15400fecd77bcc2c57c0015132dadcd3d0a9ffdc8659d639dbfec3777441a6a68c78dbdf795c9d80f2e9937081f9c2 SHA512 e6836892d2f99b83d5d3588b87936dd23f2d62326184da2f89f4692dfff8892565afb2cfcaca90193d0648eb483e7233f27476057a2af7e84762905252b4d215
+EBUILD alagitpull-0.0.23-r2.ebuild 558 BLAKE2B 436c68e42a999604244cc8e1bc2ae9d4dac909491a7037263fa68ab45d4b0a8b7059d2ca847a2bf6c957de20a2504b8a74d4f79ff6d2dea88dac39bd0aa43ac6 SHA512 c8ac747c5dc0634707ac5a4911735b80839e6320f5ed53b5ad54a755d9168673c21c35baa36ec65a1d1b994c2b61b67fa904200480ff1d813915f3ca9ee19317
 MISC metadata.xml 347 BLAKE2B 7f394b6b5262adc148a746a72308a74d8b7ae3d9c0896c775779415c3a4119026593957a58ea08bdf621309865759a4856a63221d3925258a34e026c1fd61044 SHA512 a5b91da9672da28f77f1ce059f00965de86de54b3f7b45a580b5d5509d42a38f256cf6525cc87a52cf0203713fd81f8cef06fd4dc8a1febf6c7690d6db57dcb8
diff --git a/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild b/dev-python/alagitpull/alagitpull-0.0.23-r2.ebuild
new file mode 100644
index 000000000000..ce9528abbf6f
--- /dev/null
+++ b/dev-python/alagitpull/alagitpull-0.0.23-r2.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_{7..11} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="alabaster sub-theme used on git-pull docs"
+HOMEPAGE="https://github.com/git-pull/alagitpull"
+SRC_URI="https://github.com/git-pull/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+# no tests...
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index a0d26f4bb1c3..d73fa097e05e 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,3 +1,5 @@
 DIST alembic-1.7.7.tar.gz 1247590 BLAKE2B 9906a266b71d658bd66b00b237bc21bb092646077584ddb5c245f73709087f0e476e86eb022bf041e57a68e16ee89e5a3a047dc7ec2d43ffa941b2e803aef0fe SHA512 dcb4ba2faafc3ee789981931e0548f7328c1118938150789218e720f39386fd5e7e2543ab241838bcc1faaf36db07900fd065963496e68ced0896a5f4795d63d
+DIST alembic-1.8.0.tar.gz 1252636 BLAKE2B dfe6130a08a8bfcdeb10e02187a9f597bb55de8194c91909ab06d72f5daaaaf4c7154570a141a82be8568195d8f5f76db661f1dd192b92a5991434ade1a389ed SHA512 601366f21bcadaef1a5b7f7d4a1edfd9c146340f8a5d07b41e3b381e1e00866e79520d8393330e4a80369664b36b549c9d5ab3ea13ad7aa8010b165e73038bcd
 EBUILD alembic-1.7.7.ebuild 923 BLAKE2B edeacc8b0f178566fd2aa0d2dac803546333ac2075419163bb8eb263b4425775b45645b1c3269ff5b9d0fd863d4870353494c0e2d62cdd9de2edcd6c9fc4897b SHA512 c0a2850ebd134208a7a61bd7e2aa56f782f93e010e14927c2f35e639a816b7d729a3203af24a9468df8e5d302e976771174e28c471bdf2012cc41dc27de83a33
+EBUILD alembic-1.8.0.ebuild 925 BLAKE2B 59970ccde5f3fcf3646b5d507ca5388ae5083f903060c0c5d32f66c7844a0a6eaf85a4913763473af52e540b0e84e9c7ab90fc1e257a2eb3f8776ec147bcbbfb SHA512 df196708b8ea242cb6798f2c924aa1f26a78cea7f0ff9e7d1ae599d2c1a245a208d73e7456034b0bb45e8a5cc5c598a8038d6a327eb545a879340196ec009dc9
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.8.0.ebuild b/dev-python/alembic/alembic-1.8.0.ebuild
new file mode 100644
index 000000000000..6e1e5735a059
--- /dev/null
+++ b/dev-python/alembic/alembic-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/allpairspy/Manifest b/dev-python/allpairspy/Manifest
new file mode 100644
index 000000000000..c0dcc5e28c04
--- /dev/null
+++ b/dev-python/allpairspy/Manifest
@@ -0,0 +1,3 @@
+DIST allpairspy-2.5.0.tar.gz 10729 BLAKE2B 40fd71135ce3919d1aec90ea2d2b0f3439c96a1890533f747f541f03fb47f6583de121dcca73ab3262b2d2ceb2df9d33da073868c44a77194f77c50905841384 SHA512 57ebcadec52fce7353fecc8d47d44f85e577594e3e7fa8670350817a848a6cdcd62908f1f371ca37d3ca7e8a49682888f38032b27c2abf734367076b08e2b4b0
+EBUILD allpairspy-2.5.0.ebuild 440 BLAKE2B 07d6e4cae4ea480facf6b92e40f6a165965a761d77b32be24b5814d65b2ea3a3fb8f296bf8d433323d81eaac891921a0cb714f3557a7222d34a7d53547caad98 SHA512 88d08f8b28c69545e778aebc7a1b0e68830ce15dcefc1d5413aaa2eea54fcfdb54c19f6ec71563ea74da4b6f8e42a5e02ac56f42f087711db10e527fe3c11347
+MISC metadata.xml 376 BLAKE2B 476d5624b4b373540926aef4eb0522c5cdd148ee1205456eada59725888e9be5821a06f8d610c1487b4fdd11ff35a9613a79ed17c1d4e102e4821a817cefd31c SHA512 284dfa95a96cdca1d2ae37d5af74208fb0c86fc02956335bf17ec055c7e5e1cf78e9085671c055a13fbb9e364a3615ac41f41d131b414754e9376eb22f9e8519
diff --git a/dev-python/allpairspy/allpairspy-2.5.0.ebuild b/dev-python/allpairspy/allpairspy-2.5.0.ebuild
new file mode 100644
index 000000000000..ec2a06f185e8
--- /dev/null
+++ b/dev-python/allpairspy/allpairspy-2.5.0.ebuild
@@ -0,0 +1,19 @@
+# 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="Pairwise test combinations generator"
+HOMEPAGE="https://github.com/thombashi/allpairspy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/allpairspy/metadata.xml b/dev-python/allpairspy/metadata.xml
new file mode 100644
index 000000000000..0f008f25ef7d
--- /dev/null
+++ b/dev-python/allpairspy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">allpairspy</remote-id>
+		<remote-id type="github">thombashi/allpairspy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ament_package/Manifest b/dev-python/ament_package/Manifest
index d223869cacf6..05ca626e5a4e 100644
--- a/dev-python/ament_package/Manifest
+++ b/dev-python/ament_package/Manifest
@@ -1,3 +1,4 @@
 DIST ament_package-0.14.0.tar.gz 20636 BLAKE2B 5bd83bfacdb2a1ea8ed9649471ca4145a251035ba9a6420ce5474401de83766c8add17be741ea784eb33924b6f186f463361908588451f01b165f23c47ef4a09 SHA512 b3b451e30e22327495cb3e8b022a4f307af154f8943adf38f28e439c0b3df47e8dfc0f1cee89009147ae52d31a47f238a2850380fa2e0b17e41e276c194d6bfd
+EBUILD ament_package-0.14.0-r1.ebuild 543 BLAKE2B 32f7682a01234b8cb7626585d3ef02725e7e1db5e5bee802d580e955fec234ebcebb76204777b0d0bca9fa5b804398f2e4ff5ad4dbf62ebca21b8f2c61b0d86e SHA512 1add7f53bd4a11436b1dbe47e87c752a2ed714973d8b175efdeedd4e7386cfb83ee27674a9d76aac0a0728d405068ebbee1ac211c55697d4de7050d8b0f5fe50
 EBUILD ament_package-0.14.0.ebuild 511 BLAKE2B 9f22a7ddb969e6f19212be053dc9ba09e829f3fae5d0ede7ccb7052c152da41c04d3564870764190924b4fd1bf9fa4793e1256b9a2b4d86e3def235e63f57ef0 SHA512 9fa04a350976e9e52f8f6c5acd64143c54f6901730dd5b56c26edd759fc6eb8b40f5cfb67778dc97991bd0ed6d0bdca94fd4f296afe835da7779a5fb032bf4ab
 MISC metadata.xml 334 BLAKE2B 158b6f999da25babcc33a1d67f0be2ed6935fdabfad559ed76f9c3ff785af02adb6b2c002ebec00ac6150ea47fb936bc1aa5442825fc0e81f5206a6a4abb57c2 SHA512 9874b52eb41503321b06525c4b8746041d8f8260268b7c91d62995462b42ed865ada80e198da9eabc828b7728c0ed9f0a9310c4ba09e5bb5abc8b9aa2be1f4d3
diff --git a/dev-python/ament_package/ament_package-0.14.0-r1.ebuild b/dev-python/ament_package/ament_package-0.14.0-r1.ebuild
new file mode 100644
index 000000000000..ba2a9aff6953
--- /dev/null
+++ b/dev-python/ament_package/ament_package-0.14.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser for the manifest files in the ament buildsystem"
+HOMEPAGE="https://github.com/ament/ament_package"
+SRC_URI="https://github.com/ament/ament_package/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 82254867e522..9fd9a1217faa 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,3 +1,4 @@
 DIST amodem-1.15.3.tar.gz 30297 BLAKE2B 7ab9bce50eee0fbd788fc42ca668a187ac14e5c8e9c6d2a8c4fcddf24ec77a5e40c37edf21222d49f984d343adf46ad710973dc689e18e9065b470b4d1e3a5b6 SHA512 72e574bc4ddfbe949763427587ed2afe8baf153188cb2c6abda1c9f0e9e8f483bdda1edff9278519130b1b5d5487527d83cc9307e6f47a7a86404757199e0712
-EBUILD amodem-1.15.3.ebuild 525 BLAKE2B 4b3d4534a4ab01b983faaaefce4ee1ff01ed26e5f7a5aae802d44d88ef0f9f075e0af585708331425f16590833ae083d31cac55f06d482a6d1f2d0045d6a8998 SHA512 f722ee4da7f297c5cbe0215aa3ecfa6eec38fd3f33ff31772fe2e56b814cd74c8f24c0aaab9acb94e6d48bccf3af54c4ef7d5f3c909a994cfba0c9b60def4dea
-MISC metadata.xml 570 BLAKE2B 2929f80d0d17f63da0f4b7d6f06ad56ab76c8fcd9fa047bbb7850a1175d5e3d7aaee41ff79a40fff837ffdcb354ba3796e929fd6bb5b544e1b58a92e8ce76ec7 SHA512 ce16eb5ce31b4f909935b1946399a0990c8a383026530f5d2a73bb938c1cec1b3f178150e1f863cbc22b63794ee7c8fe477ed301069a79fdbf9555db8d14a643
+EBUILD amodem-1.15.3-r1.ebuild 617 BLAKE2B 04efc4b6bdc28a316e49c3d531afe922b9255331e5d63048713d1c8058e6181cc9b485720fd02421494da0c61a30e1ba5690d4354d4a570ff25d176ef33f0c58 SHA512 925c39f9f3019b0c19ad26930069ac4bc182d763ea3bdc392bc98ae01efb74b654569c153c7ad46ae315f175bac83935b397f7f4761e2562fc42c24a4f967ba3
+EBUILD amodem-1.15.3.ebuild 585 BLAKE2B c7babeddc702139110abacef78fcd3b92801254d7e349d55ec8571f515159b7e2449580d4667b1ff77486caae44f214016d12e89b1a3d4694e05498ef363a4e9 SHA512 cc0d8bc4727a45cf348ae8205c41444ce1fece99c707cbd316700ad030d305d7f695d051b55aea2f1d8dc1bd5484ccc50da71f4ce0e35b6e88c5abd40412ea07
+MISC metadata.xml 400 BLAKE2B 3e8a7cd5622a0930208a2da7a243cf1da7ce70f84c7f8e4d92e56a362ae534a73a6b4bdb1eb8cafae88f8e697e8407e2cf23e3eb647838c680cf70ff9cfe1bb4 SHA512 630d7c33cee5d690365563cac2fcf0d53eb8183ab1f07d8c36a014f9393e72b4b89daea0655e21fa418fd488e3126c523de4fb20fcb2cb407e35247f7bf179ef
diff --git a/dev-python/amodem/amodem-1.15.3-r1.ebuild b/dev-python/amodem/amodem-1.15.3-r1.ebuild
new file mode 100644
index 000000000000..ab43784b0f65
--- /dev/null
+++ b/dev-python/amodem/amodem-1.15.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/amodem/amodem-1.15.3.ebuild b/dev-python/amodem/amodem-1.15.3.ebuild
index f26ce2b39b7f..f69e8b501e11 100644
--- a/dev-python/amodem/amodem-1.15.3.ebuild
+++ b/dev-python/amodem/amodem-1.15.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
@@ -18,5 +18,10 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/amodem/metadata.xml b/dev-python/amodem/metadata.xml
index a1d661debedb..54b417ea7fe2 100644
--- a/dev-python/amodem/metadata.xml
+++ b/dev-python/amodem/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>luke-jr+gentoobugs@utopios.org</email>
-    <name>Luke Dashjr</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index cd4378295a98..fecd805bc8c1 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1,3 +1,3 @@
 DIST aniso8601-9.0.1.tar.gz 47345 BLAKE2B d8167bff8fdde88799e165c12aa0ea10a34d2edc91f8eeba93105e669dab52ab73e688467370927ef749395491baa128b55c984feb4f1d972e75242ec1c1efbc SHA512 a17c363a3a67b69a2fde50cc37b080b52615cebc453ef70090498ffce909775b0109c889b63e87381c795c2d8531efd6048542627c88e97297ac22ce81c10c8c
-EBUILD aniso8601-9.0.1.ebuild 520 BLAKE2B d4dfab8b34521dae2404eed6e9606d5fe0d0d8ebae9680c11f9a01ef85909aaaf75423ad4d7b69483f65000a071e6cf3051ba7eb549245f4888e2ea2e56299e8 SHA512 14e30eb783eae55ee80ec08936a1f7cb7ee4df506b992a9c242675cb1042aa4613d92aec3ae0f46e08690746d9691a061893ec5371b4cbe05ec0df15f596e61a
+EBUILD aniso8601-9.0.1-r1.ebuild 553 BLAKE2B 779402f2e85469ca4053c1ab3b32a5e21f300b8a5a35d984f10e7f96673ad951c1d1ea206746955e9e5eef36d941efb7bebda26490031b5d54e952ec88634c13 SHA512 901cedf2a7b9125cf55812a7f726dd2e567f5305bf7eaf3bc5e32e558da664cc9d83be838d99556f04b4a5986a59062cc9b330e2ed83de928fa3e9a672e646e9
 MISC metadata.xml 411 BLAKE2B 1429cbb43f307ea5ca139372735837f0438ce58494455e39c2b28f1596c1086a26a6d1e57b3e258af5f4faeb6f3b24b21db871f0275bf88bc888d2077debe4bc SHA512 0d95fb21f2cf130eb26df97f726f8af19cf936367f3858fa7ccb19d90dfaf27115f2742617e39cbe45747b3cfca83ea52728cf00b107278a861cb5a53af01fe1
diff --git a/dev-python/aniso8601/aniso8601-9.0.1-r1.ebuild b/dev-python/aniso8601/aniso8601-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..722562bcdce1
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-9.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/aniso8601/aniso8601-9.0.1.ebuild b/dev-python/aniso8601/aniso8601-9.0.1.ebuild
deleted file mode 100644
index baab0d65fe37..000000000000
--- a/dev-python/aniso8601/aniso8601-9.0.1.ebuild
+++ /dev/null
@@ -1,19 +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="A library for parsing ISO 8601 strings"
-HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/ansi/Manifest b/dev-python/ansi/Manifest
index 0f1619203407..df16105a61a5 100644
--- a/dev-python/ansi/Manifest
+++ b/dev-python/ansi/Manifest
@@ -1,3 +1,3 @@
 DIST ansi-0.3.6.tar.gz 6668 BLAKE2B a2bd492aa5c68041feeb04e798ce301ae50ba217c695f4500b033911a719a9e91dc6213d81361e36819a1d46ddeef82e4684ee0c395ec70fc93c6957e2a410b2 SHA512 6b7512013db18436f5982175d82c9f333eef7655eece12454f4731c7f2ed675ab39986e813560d1621b365b7541a5ca6c37d88f2ca5be4460f1ae86cb27d1911
-EBUILD ansi-0.3.6.ebuild 478 BLAKE2B 38a08dc72c705878e606aa115eb8ae2cc82b2ccaf55c7c8ac293481ee4ecae51a4a3e2b74b1d236cf28937f720ae0e9979ba1495b5413e3212c1e7421f6c41a4 SHA512 3e871235cc5b6befe70d786d8d2c99f5ac7042b19a3f8986ff7154c4a1fc101d10ab8de71b13a07e4f27f3a5025fa3e32b1dd9fa9aded20eb8b7d2fec219084c
-MISC metadata.xml 391 BLAKE2B 6bc19e1bcc5f7a607edffdee87f993d9c4cfa9e741e5d3f3d1b009279016f1771bb2a5ad0547c19d607b0247437fe92006c59ec10f260434f6eb55201deebe1d SHA512 acc12df2836c216cd40ad604f55664abd2d228018c1164006b05b74aefc3bf81967227dbcf414ed175fa8e07e10f0e0d6decb37c24a4aa8d58fac7407c63cc37
+EBUILD ansi-0.3.6.ebuild 478 BLAKE2B b380d4967321cc55ecd1482a8e5dbbcce1974565b02a1bae5b3d99f9005eda368b0eadb25a46595cfddc58ffc185e30af14a0d60f690ca9dca39d0e376e555ac SHA512 a7cb3dbaa0b0068246968f0e72fd7342fbd36c94c831946d0a1190f021577b7919f8e4276dbef1b53d339899d4531b11073b3789830a75f81a95ee9e2d440f71
+MISC metadata.xml 492 BLAKE2B a61fda2ccc6bd852c0159d50b64a28e9bf1c634d38fdc86b86ee9bc6d7dc34a69fec730899262cd36ba1e1b0d6389d41e5f9fdc01fbb332e8c274580fd23807c SHA512 7b51a1907c1a9c5942e65fd7e71e33703e6a3594ee851cbd6e32afe15cf2e43c259ea3efb2a1a2c6d60af2045ed477d0994a0f85d0649339cb3f17edadb80d57
diff --git a/dev-python/ansi/ansi-0.3.6.ebuild b/dev-python/ansi/ansi-0.3.6.ebuild
index 7d07c07986a1..0c20a07e3ff5 100644
--- a/dev-python/ansi/ansi-0.3.6.ebuild
+++ b/dev-python/ansi/ansi-0.3.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ansi/metadata.xml b/dev-python/ansi/metadata.xml
index 711957e97d6c..6524c4d7dfbd 100644
--- a/dev-python/ansi/metadata.xml
+++ b/dev-python/ansi/metadata.xml
@@ -5,6 +5,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">tehmaze/ansi</remote-id>
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index 7bb9469e7286..eedd6b7e3516 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,3 +1,3 @@
 DIST ansi2html-1.7.0.tar.gz 42189 BLAKE2B 91c7409b4f8b7503e719489b18e9d7267d80c5259b7481f127cb8d1e6429649249b0832746285efc3e8a4f90ca8f21b872b002634d47a4a54ddfdcc74df0f576 SHA512 bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977
-EBUILD ansi2html-1.7.0.ebuild 1218 BLAKE2B 1661c30cfaea5dd1e055ddb3b2a520accedcbf5d2132943e2a40782c89dfb3dae4d4b2be9a72402f36e8b3a6b1977fafb7570d2dd724d4ac3be057e68590275d SHA512 35c7ebd37c9e7661c4438487a39e87c57a29a46a2b00606b26e24d070936dcd74020a5cb60c40e924a95c70d232ec645fce1f5e1d70cacf82388f642b1c5d069
+EBUILD ansi2html-1.7.0.ebuild 1225 BLAKE2B 22da4cbc4407e2f8921fbc4ccf1f28c3e33e441dd129acad36000417b0f1088bb608a73c9a20123e833ba24acf21919b7f7605d682ff78e31359efdc1233bbbf SHA512 b428dc5cd02c81b8002f951becc68192320ad9c8adca1d77e8f0d9af5ec3899f9741b0d600ca3f793fde48a407a904c6b259cff4bf21d70823658b855001773e
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.7.0.ebuild b/dev-python/ansi2html/ansi2html-1.7.0.ebuild
index 64ae09c0f98d..a9e347c708c9 100644
--- a/dev-python/ansi2html/ansi2html-1.7.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 IUSE="doc"
 
 RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 9f0f9ae7e648..e4d5c3f3daa0 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,5 +1,3 @@
-DIST ansible-compat-2.0.2.tar.gz 35072 BLAKE2B 288baaa4bb535da5fc41ea6a700d4eaf969b466848a592f3c919cac55b237cc81b9bfcd800a429b89c82781b29e80dc6486ea9bf0621ae8a3f249139021030e2 SHA512 ae278498f58ac1eb663115215e7ef6bda7279ff02d4a1f09e8301b88681d8c46f13a620b765cbbbacfc3d1fe8b294d5258cddbf7fd2f2cb54f0bde85fc9af593
-DIST ansible-compat-2.0.3.tar.gz 35328 BLAKE2B cd5a476eb23de667381c9a6667d6bd781821fc50e1aec65ca47e8bb9d47beccbea0ee62f763ed421c18c95d9f1d1c14f5cc2a62bcc77d664213eb614ccd568e4 SHA512 0887e5da23041d02be0371bfd9569256252c586f80cd92ab855b32172328989c8160e57169aff6d72f1c3c89c9d3a00b56293e3badc0dc4aad135b1992d06599
-EBUILD ansible-compat-2.0.2.ebuild 1702 BLAKE2B 425593284f3679798c96fabae8b20f2307664b5b216dfde1513c3b5c0a64e24137d62278c90de17e79ed63d1a525d31b60144145abede9e0b93a2f20db39bb9c SHA512 676c9c05e3aa8726712159d66476b1170b96e21b87db102e9ed17f939dab9879b55d192935fb7bd4e814a286395470d0da258a86bbf6df47a0ff5d341ee56572
-EBUILD ansible-compat-2.0.3.ebuild 1752 BLAKE2B 0cd874164f298c45b39041a23c5b1de34398473eebd168cb48af5efcf777b4bf22c7afac88fed59d36d71c0ae3125df4de4f7aa32dd31c4360a10c6ca5540721 SHA512 0c9128bc5a377bf278b07981ee4404393e7164f1a1621d5f75b566f5b08ae8e189f276a21d146d306686727fba090455df37360c36ef4d82c8f18a125830a061
-MISC metadata.xml 409 BLAKE2B 60c2a2a8a80326a6fa9b375b3bdac4f8f609d071f5f06f76a0a80038bf9950c7c2cc377ae883abab3d93104fe2095a8c31c2bc3554b97f5e9e4a2cef8a8cec72 SHA512 900ba03ec907dcbba53f4eb6827485c5948300e04d7b00f9159d328f8bc507a5bc9f893593f0dcc7029b5f6c480a1129ddb541f9ddb40e3b389669bfb0d1f3f1
+DIST ansible-compat-2.1.0.tar.gz 37840 BLAKE2B 5ac74cdaef1c932094996f331ed94418836b3351cbd376ae35ef22046b68dad0a8ab68fd293015db9954e0a5e1df4b5c529b3845cee5778daed2bb207733ca4f SHA512 a85681aff3d34ef4a4cdad8f419017a174bf315034495bc032a7e33d586cbcf72de74d163b6faf3cd21988704e5dbb922872b83a23981891311dbb18e53797a3
+EBUILD ansible-compat-2.1.0.ebuild 1801 BLAKE2B 429e761c9a8dc220ef53274cba9f0da1a1647ee483e6afb0bf98fe14e25507d907b4515d4fc266ddbd53cc96cb105c172fc800c98c2a1becbc85c43900f64be6 SHA512 8c299014a4005e2a6e199e848e8829b792368c1862311c07b77d8df258ef6b16ec2bca27c2cf3a78f879052aa883267f37f91b2ac725a53787bb84923d1d7e62
+MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
deleted file mode 100644
index c1f62f805b15..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-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="
-	>=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
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild b/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
deleted file mode 100644
index 5b3828e761ae..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.0.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-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="
-	>=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
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
new file mode 100644
index 000000000000..7f566730059f
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/ansible-compat/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-base-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=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
+)
+
+distutils_enable_sphinx docs \
+	dev-python/ansible-pygments \
+	dev-python/myst_parser \
+	dev-python/sphinx_ansible_theme
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p pytest_markdown.plugin
+}
diff --git a/dev-python/ansible-compat/metadata.xml b/dev-python/ansible-compat/metadata.xml
index cc57cf6f5340..867cb86db2b4 100644
--- a/dev-python/ansible-compat/metadata.xml
+++ b/dev-python/ansible-compat/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ansible-compat</remote-id>
diff --git a/dev-python/ansible-runner/Manifest b/dev-python/ansible-runner/Manifest
index c3b20447cf01..83ff163cdc0e 100644
--- a/dev-python/ansible-runner/Manifest
+++ b/dev-python/ansible-runner/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-runner-1.4.7.tar.gz 47112 BLAKE2B 0e9ac2f63179dda44a403d90bd218f848929c2e46cc25fb5a6e34ace36db24619d3498b18319d7f49b078ea4a5d149c2eeef1671fdfe2a495cdd4cc61ca8209c SHA512 504d1e25abfe39fc5a7867f799accabe98c8a065eda06869f04a5ef2a5bb30058623497c761c8fa99d39372d1215046431484eebdaa2850f50de75a273b70ab3
-DIST ansible-runner-1.4.8.tar.gz 48040 BLAKE2B 9d8cd0fb9141a0cba4bd30a3c4c73ab143dc7b0a1d9c90aae9a901715de8795e735df04e88ecdaa25b35441ab25d38b2b33e61bdf67d80403e80bc127f6e40b3 SHA512 be4ef7e802bc2b70a0cfcd393a4bb3d4072bdd82c15510058b8d7caae8061ea7043b6ac6e3b9853e9fd292deefef69cf74e03ef8e483af7858e509607f0a88f0
 DIST ansible-runner-1.4.9.tar.gz 48022 BLAKE2B 9d413a3502450ad964301fb22c280e6474794604a4d8a2d3bbbc92a1d2e7568351feabce3e9e6790916032ffb72881812c0ef9456a589e7af7cab1dea3d3182c SHA512 198091472c74ab2641dd3a72afa90fcdb4b120c0a10518b55055933f3ae9934bfe229a6a006e84646ce491ce3eec828f9ffa692e6b215398e64aa55afbcb3bae
-EBUILD ansible-runner-1.4.7-r1.ebuild 836 BLAKE2B 001aba26225b0a15cf0a385e648ff1ac5bc450301c938d3b70584f415b6ef4a819d2ccf584cdebb5056a7ccff7d63914715f2b44395cf9aee618e29a510006fe SHA512 15d945886edf156ce58c24767728fd2e89759a6752d7dac8509c4ca1b53493f43a497b2fd3cfb4074962f93bab0a0450e79854bf3b588f6ca88b461428e8ea26
-EBUILD ansible-runner-1.4.8.ebuild 918 BLAKE2B 43b8b9902510b6a55228f40293c634e3980821c804f77e57f0255cebf05509d1335dd6dc71592978eefead5d1c332cb7b3e550153d4f77853bf141becbede479 SHA512 45513a5d1a66d0acdcb0ef03572e1faded8d0040d148d2b222022bd75d1fd2b6a9dd6a1b0bdd861d2d5ec186358936bb9fe45e90cb49e677f9010ceb3eed430f
 EBUILD ansible-runner-1.4.9.ebuild 921 BLAKE2B 47fae2a5335c092777f6f51db003daa0fc32e8cdd2345d32915bf75874f65340b1e0da57f182a0abc5356dadfa926f24eb3a192676ce5ab2c40967a009370132 SHA512 0adea4f2242fbc5aeb314a62fb1cdb27f1aae37f1cff783bd0fa321a3420c3d2520f80704ca2fce712a3538258ba0d8dc1c1cbb7f3c4743850f82a6d217767bc
-MISC metadata.xml 797 BLAKE2B 202bf8e59e0842979e526d544fefbe365142fa80b6d029773181ac434c434f17c8132b7c61780c1487c084b9834de0b95895eb4dde50bb08aec7b0e9e847ac98 SHA512 bd60aefc0a7aa9aeb89f7351b17a7e536c3c4764cdd99fd8cb8e464f33336a6e884195f33584b36b0a6d3ab813f28a84785854df5ba9920e9270b30d829590a8
+MISC metadata.xml 919 BLAKE2B 4f08236cc9aa2a45279ec971c60e5d4f0a8f3695bc5cf4fac42d704682026b30b2ab0a6b0b408e313b3614da94de873256d146c4602598a762c59072f3c44d27 SHA512 f632561c44dfff6767bad8a8273776efe86b45feb7900ea07be4413f8779bec5c9ea1950a2ca1ebdaf7d17230f6839aafbd3c5fcc54cd6df3085b7e392605a6b
diff --git a/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild b/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
deleted file mode 100644
index 9c9945831cec..000000000000
--- a/dev-python/ansible-runner/ansible-runner-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
-HOMEPAGE="https://github.com/ansible/ansible-runner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|find_packages()|find_packages(exclude=["test", "test.*"])|' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ansible-runner/ansible-runner-1.4.8.ebuild b/dev-python/ansible-runner/ansible-runner-1.4.8.ebuild
deleted file mode 100644
index edca3560bfe8..000000000000
--- a/dev-python/ansible-runner/ansible-runner-1.4.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool and python library that helps when interfacing with Ansible"
-HOMEPAGE="https://github.com/ansible/ansible-runner"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/python-daemon[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|find_packages()|find_packages(exclude=["test", "test.*"])|' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/ansible-runner/metadata.xml b/dev-python/ansible-runner/metadata.xml
index 156221a59045..19979f1c1c52 100644
--- a/dev-python/ansible-runner/metadata.xml
+++ b/dev-python/ansible-runner/metadata.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>zmedico@gentoo.org</email>
-	<name>Zac Medico</name>
-</maintainer>
-<upstream>
-	<remote-id type="pypi">ansible-runner</remote-id>
-	<remote-id type="github">ansible/ansible-runner</remote-id>
-	<bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
-</upstream>
-<longdescription lang="en">
-A tool and python library that helps when interfacing with Ansible
-directly or as part of another system whether that be through a
-container image interface, as a standalone tool, or as a Python module
-that can be imported. The goal is to provide a stable and consistent
-interface abstraction to Ansible.
-</longdescription>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ansible-runner</remote-id>
+		<remote-id type="github">ansible/ansible-runner</remote-id>
+		<bugs-to>https://github.com/ansible/ansible-runner/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		A tool and python library that helps when interfacing with Ansible
+		directly or as part of another system whether that be through a
+		container image interface, as a standalone tool, or as a Python module
+		that can be imported. The goal is to provide a stable and consistent
+		interface abstraction to Ansible.
+	</longdescription>
 </pkgmetadata>
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index 182e6b9d6a5c..50a8c9cc8c54 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,4 @@
 DIST ansicolor-0.3.2.gh.tar.gz 118221 BLAKE2B f3f621298858974522dd05665c66ffebfc335291b61c6f0e6f835aaddf099559412f12979ad2a43001690b430125c8e1a8fd5427ad3268393d75bd736353d598 SHA512 de1e1bc9d8a02accaa57a64e5d2ea1f510545b3ab83218c47c7a1861e8438862c222147c9dcab0fcb1ec4055dcee07d6cde6d7bfecfbf9ac55c3bb76ac0fb0ab
-EBUILD ansicolor-0.3.2.ebuild 508 BLAKE2B 45a8286dbccd031d483b1112b909f2c0b5b4e68f8d4788ee3cef2536ac34858d426804ec9497474713c1713f9fb322785a67de35bc8e901eed908956fcb24b65 SHA512 f37d1d0f039cf9a1b6bf1e09ec068a41f938f19594c293415821dd61aad5a26e77dd997612965bcd7f9c03633d557b8beb8d30e8d8017a18f7d147c364ffd014
-EBUILD ansicolor-9999.ebuild 709 BLAKE2B 073ee48e67d63ad8b23fe0d712c110861e8bd9b53eff897af34a705984aa8e483fe842122ea7b3c151224b1eaf0d940468db3b59d6d294f34fc7cae879a139b3 SHA512 4bb1371073e06468a3c6080ccea1fe54ef024d97cfd352a753d8943f979ebd7cfbcfdd0546d4a034cdd9dae76bb1d67be90c8093ce2bb12636cc73e21cd5c6c4
+EBUILD ansicolor-0.3.2-r1.ebuild 779 BLAKE2B e7748ebe6126b9005500cce0c64dcef029f304be7d74271763a31290f45cd8ac28760ef86a3f694b23b6b67c764acf29bc116d2d9620de8109dec76c32ef0375 SHA512 7884d70baffcb19197cc749eb25bf55152d38a72560d0e19743305b7118a48ed8e1489aacc376352037bbc65d1ace473dcb6f9adb91821038e48f17c9a97337e
+EBUILD ansicolor-9999.ebuild 781 BLAKE2B 1b0e20fff8bd21766c06eb258f5be4fc3a083dcfe0421b69c50f0407767f5305c2bb24a971a177228e7ee2f00b851ec91175024b79c8188c49b9d7bc98058a62 SHA512 cf71a943f013dc4188c4f0b96dd38a812a136f76e683944705f80066397e396d5952c0944d12df07ad67ac2ba187f1f146291a8089f960c05fd6c3a6a4380c36
 MISC metadata.xml 651 BLAKE2B 35a15ab72d6e81c682e4480b839b91854ed87bbb057e6977470d60a14208cb9da0ddee48bb959a75d5c5e665a322d9e56f6722ea37aa643c6e0c417fcd5246b0 SHA512 775b3298e84e89b35346e0a8f519e258a8b9af49a2bc879b54f80b6c4e696961b9a6a03794461620fdfdc83a163e54e5c37cfa505b52f9995fd2b9de44bf25ae
diff --git a/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild b/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..efd13944e8ac
--- /dev/null
+++ b/dev-python/ansicolor/ansicolor-0.3.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
+else
+	# pypi tars don't include tests and github repo is missing release tags,
+	# so only enabling tests for 9999 at this time
+	SRC_URI="
+	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
+HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ansicolor/ansicolor-0.3.2.ebuild b/dev-python/ansicolor/ansicolor-0.3.2.ebuild
deleted file mode 100644
index 6151096e6f14..000000000000
--- a/dev-python/ansicolor/ansicolor-0.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
-HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
-SRC_URI="
-	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index d678863551e3..ceb39bf7b7df 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -1,20 +1,22 @@
-# 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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
+else
 	# pypi tars don't include tests and github repo is missing release tags,
 	# so only enabling tests for 9999 at this time
-	distutils_enable_tests pytest
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="
+	https://github.com/numerodix/ansicolor/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -23,3 +25,5 @@ HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansico
 
 LICENSE="Apache-2.0"
 SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/antlr4-python3-runtime/Manifest b/dev-python/antlr4-python3-runtime/Manifest
index f8fefba482d0..7bd4821e9395 100644
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@@ -1,7 +1,3 @@
 DIST antlr-4.10.1.tar.gz 4599964 BLAKE2B 72688b3835350da11c015558a2840428fe69332a7b48992e118cb410005efce6ca5e02e8e5b1cf5edbf2cea506ec30fe516cce5061c52febbdb71f735c1c2cd1 SHA512 d950171d279b57b0fa977c77dd33e56848ca0aaf7f6ba40e5d49d69d5963e4c2e36fde5ee89e98c594064a909396d6fed9cc20129c3a1895d864eb889581e982
-DIST antlr-4.10.tar.gz 4599769 BLAKE2B 030a4cef752aec2199a816717e242b12245d869634e8c3b94825990f1ad99c000d8bc247c95b182b8146ae57f705a437b3a43fe91f9855958ed2f2115cdbef40 SHA512 af865442047ad8880172e62d17b7eb68d5eeda668ed55995b05cae69ee5e47a89d7a757ddd429ab8d93f5bad50269f0e3dc2e9cf121a9b3d6a87674787858309
-DIST antlr-4.9.3.tar.gz 4640242 BLAKE2B fb58f5e533051cb2c439c32f0462c1d463c99df862ba7e1a37a1c61378ab36a9edb9525c2a342de5b517da6f02d8291de5976c550932314f3464aad1a778afb9 SHA512 61452404c9639b5a0908cda16605f17c0fed0c9adfc3278c7408f9971420e9d1fe8f9e974e0826c2e3e780fdd83324094c0246cd5b28fa63f5686b094ea08127
 EBUILD antlr4-python3-runtime-4.10.1.ebuild 627 BLAKE2B 3379bd958c63490aff7c337b457401558c7e60ab5cc1959098b7b717c78bfd36712abba605b68c994bdb18eb334e5730204bc91c7fb355e3c66285d764b2e398 SHA512 04507c76a6de8f9dada63adada870c30344d742376eeeb1fe5a77464fffc1111942502e21e0f4c22265bba2f7c3a333410b71e10ad5a8aab5348c9baf1ba0e6e
-EBUILD antlr4-python3-runtime-4.10.ebuild 540 BLAKE2B 04881ad4a4fd8f3c32f909ff7418996dc098a40048f052f626785e884349e73ba051a8c89f29ea23c1542ee6802e2785c3ebee513a74d7d213dfba0f7da32443 SHA512 6946bc4502a74c7da3a5e5f9043d4f983518a6cc3cecc955a07c45714372afff65fee25ae226adf078baead318de3980bdc4c158a911c392096bc1d8a221007f
-EBUILD antlr4-python3-runtime-4.9.3.ebuild 534 BLAKE2B 13394f582021232d8a283bcb7cba8d0dc608d7200e95067c8d19a3a20c364ad60df42a7195af869e97a954f15f190c46816a6fdddbe47abf5c2b0fae2f90456a SHA512 64f383bfbfc4fc0fa2b8dae0e9f41d472183875cfcc078f8cd2b9be9e17cdcbd4718d874792286f91386fbff840e043ff10ec5722ff8605f4ce09400363c115c
 MISC metadata.xml 475 BLAKE2B 12dd34c09572017544a99c3985f6a7ad6c163f999f43fbc7ef4903456fe2d7fc59a8571fa3337ebe5a49eb6efab0a657a1b82b484b55887c799af11c0e64e716 SHA512 44ddd959d9f77d7beb97f84888db46ca468ed79ca844f89bbcac57366f42e1c2a1689497e2c25a659d2a63026b3c85f8348a43ee0213573d4a85cbf77fdfb993
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.ebuild
deleted file mode 100644
index 93aaa44d8c7c..000000000000
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 runtime for ANTLR"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="
-	https://github.com/antlr/antlr4/archive/${PV}.tar.gz
-		-> antlr-${PV}.tar.gz
-"
-S="${WORKDIR}/antlr4-${PV}/runtime/Python3"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.9.3.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.9.3.ebuild
deleted file mode 100644
index 36924c849be3..000000000000
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.9.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python 3 runtime for ANTLR"
-HOMEPAGE="https://www.antlr.org/"
-SRC_URI="https://github.com/antlr/antlr4/archive/${PV}.tar.gz -> antlr-${PV}.tar.gz"
-S="${WORKDIR}/antlr4-${PV}/runtime/Python3"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index ede044c28167..50711e1f46a3 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,4 +1,3 @@
-AUX anyio-3.5.0-pytest-7.patch 2624 BLAKE2B e9a1fd06838f2d8fd9c2a2a1e33f6d55d5d9b0edfbb3eb1cc703164a2c85e1f7c3a1a099b6b659826098b5710352b289dcb129b5248c1a6fa392efd26652f258 SHA512 207d7e4cd4b3be7399625874bfae47be94b7593e53a1fd61f84ee87810992c0a06a466ca47b1419858d81879c25ba6666e043015ce5271034186d77a506e290f
-DIST anyio-3.5.0.tar.gz 136934 BLAKE2B 422d604c23658844467926f42c09895e54debfd3ddf2f7fa561eccae0c9cbc225f51d663cb9f98a2455736ad7a81eb4ae40a6f3ad66f3d2f0b02d0a5157203e0 SHA512 b91124c95d194eb7e4542405a973895d21562a2636d9600d528465da52536d1ffedbf5a6fc3ea5b1ff3e83e7dca2b42f090bb2ff6b077e32f5a2c314f07d3206
-EBUILD anyio-3.5.0-r1.ebuild 1384 BLAKE2B f8e9e433032e988ddfea16c92c9958fa6e0361de2f16fa266fb90c281042accfd91325ffc8e82f5c2029ac6ec07f01768c1bf4e67e0ebfa3aef025d9afd1978f SHA512 1d76d8380944877dc4eea7faca809744fd3cf4d5debde055d6e396bf6bce4661c60dcd29e827995e8cc03eb19dfb95ed43096ec73374244752dd633ec658642e
-MISC metadata.xml 1321 BLAKE2B 22708116b3b04529a83c9e005e421dab21dd5b259df12c3c7e75c74cc3505510b828ebe9808a234ce91d0fc2f17476bf884050561efb18892eb13c35806bbfc1 SHA512 6c1333b6e58faacacf68cd1bd6544c5b28d55ebb75efba1702aa5e2d4f28c29ac86dbbfd45dbb8af1dc2bf69476667d52c7f14bc765d836133e0811c6f2c880e
+DIST anyio-3.6.1.tar.gz 140240 BLAKE2B 391892591bee88df8fd5c099b6670af8e01af0610f7659e2f2e717c2dfd94d6e5212260acf3acca6c8b149cab6781044fb665d579a63b322332bf87767374858 SHA512 99ae55eada2df971405a1592afd980ac964c80a4502465a2016423182409691d0c943280a3a7448efc78036e481614451585238b62ebea924709f0ba888f7604
+EBUILD anyio-3.6.1.ebuild 1300 BLAKE2B 42ceb4294e4567c3491dd6b82d5461d7b8ea8e335dc56fa727bb2374e94b392c45a682613024726230aa72e1bd8a39c8ad088e317f502ceea89e14f3bfb60289 SHA512 aa362a78e27a0340f21cdea392124841a17909e36cb859775c4f8b7045b20e11866054e972d23d562cefde81c1b69689bbe2cc056347a09dd89c35d6313a2c2e
+MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
diff --git a/dev-python/anyio/anyio-3.5.0-r1.ebuild b/dev-python/anyio/anyio-3.5.0-r1.ebuild
deleted file mode 100644
index a90f9a7309cb..000000000000
--- a/dev-python/anyio/anyio-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-7[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
-			' 'python*')
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinx-autodoc-typehints
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-7.patch
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-3.6.1.ebuild b/dev-python/anyio/anyio-3.6.1.ebuild
new file mode 100644
index 000000000000..1b5b39a19de0
--- /dev/null
+++ b/dev-python/anyio/anyio-3.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+# On amd64, let's get more test coverage by dragging in uvloop, but let's
+# not bother on other arches where uvloop may not be supported.
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		amd64? (
+			$(python_gen_cond_dep '
+				>=dev-python/uvloop-0.15[${PYTHON_USEDEP}]
+			' python3_{8..10})
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network'
+}
diff --git a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch b/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
deleted file mode 100644
index 858404632959..000000000000
--- a/dev-python/anyio/files/anyio-3.5.0-pytest-7.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From fed7cc4f95e196f68251bcb9253da3b143ea8e7e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Mon, 7 Feb 2022 00:16:18 +0200
-Subject: [PATCH] Upgraded pytest to 7.0
-
----
- setup.cfg                   |  2 +-
- tests/test_pytest_plugin.py | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test_pytest_plugin.py b/tests/test_pytest_plugin.py
-index 4255702..f3b0e0c 100644
---- a/tests/test_pytest_plugin.py
-+++ b/tests/test_pytest_plugin.py
-@@ -1,5 +1,5 @@
- import pytest
--from _pytest.pytester import Testdir
-+from _pytest.pytester import Pytester
- 
- from anyio import get_all_backends
- 
-@@ -9,7 +9,7 @@ pytestmark = pytest.mark.filterwarnings(
- pytest_args = '-v', '-p', 'anyio', '-p', 'no:asyncio'
- 
- 
--def test_plugin(testdir: Testdir) -> None:
-+def test_plugin(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import sniffio
-@@ -67,7 +67,7 @@ def test_plugin(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=3 * len(get_all_backends()), skipped=len(get_all_backends()))
- 
- 
--def test_asyncio(testdir: Testdir) -> None:
-+def test_asyncio(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import asyncio
-@@ -140,7 +140,7 @@ def test_asyncio(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=2, failed=1, errors=2)
- 
- 
--def test_autouse_async_fixture(testdir: Testdir) -> None:
-+def test_autouse_async_fixture(testdir: Pytester) -> None:
-     testdir.makeconftest(
-         """
-         import pytest
-@@ -177,7 +177,7 @@ def test_autouse_async_fixture(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()))
- 
- 
--def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
-+def test_cancel_scope_in_asyncgen_fixture(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
-@@ -204,7 +204,7 @@ def test_cancel_scope_in_asyncgen_fixture(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()))
- 
- 
--def test_hypothesis_module_mark(testdir: Testdir) -> None:
-+def test_hypothesis_module_mark(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
-@@ -235,7 +235,7 @@ def test_hypothesis_module_mark(testdir: Testdir) -> None:
-     result.assert_outcomes(passed=len(get_all_backends()) + 1, xfailed=len(get_all_backends()))
- 
- 
--def test_hypothesis_function_mark(testdir: Testdir) -> None:
-+def test_hypothesis_function_mark(testdir: Pytester) -> None:
-     testdir.makepyfile(
-         """
-         import pytest
--- 
-2.35.1
-
diff --git a/dev-python/anyio/metadata.xml b/dev-python/anyio/metadata.xml
index 76de23035d76..bfd9e087677c 100644
--- a/dev-python/anyio/metadata.xml
+++ b/dev-python/anyio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
 AnyIO is a asynchronous compatibility API that allows applications and libraries written against it to run unmodified on asyncio, curio and trio.
diff --git a/dev-python/anyqt/Manifest b/dev-python/anyqt/Manifest
index c886da63ba35..a2fa6351c8cb 100644
--- a/dev-python/anyqt/Manifest
+++ b/dev-python/anyqt/Manifest
@@ -1,5 +1,3 @@
-DIST anyqt-0.0.13.tar.gz 46677 BLAKE2B 1b6eeb4a3c0ca6a76504c919e41d749d042668e0c9392616518b3b1741d4db270e5a0f354971ba5757da8f906f46149e996895212dcad2d2614d62a3d53bf554 SHA512 33033c90a945524ea1659de557dff36be06cbdbf8f0b580e57e7c8f386dd3d3007465e236d3865b76af4178b9d83eba51405a3257d0226bd117f7d9804146e41
-DIST anyqt-0.0.14.gh.tar.gz 48200 BLAKE2B 15b17e2cb1067dd176d08a267b7fa0272dc9cdaa32c4cae3260053564df22c210a609dad8e4764c9cafeb0241dcabb93bbf8703e0a2ffef38c7f035e9f9f253b SHA512 e3a191cb5e94ee0287405ffff9261100400a78b261fce347268759352ff23a220e46b26882cfdd449be0191080d551d3b16c2feb0a411582ab0aaf1dc79e58cc
-EBUILD anyqt-0.0.13.ebuild 397 BLAKE2B aa255250f278718e0ef0a42ab17065d673e71dff296dfd165e026331557b015735f3c9fe3710fa140e0b8a152f84e6c3df0ad239d5938275a2aef002b28c76ed SHA512 0bfd7b9d03c53c5267fdd6885258be4c30c7c5cdf36e110d3d05b4d2936ae535cc0c4abb774656cd34bd5d44aeddb901aafbf07e8ff29c29f855788ad8cb3e03
-EBUILD anyqt-0.0.14.ebuild 438 BLAKE2B 6f250fed435be2118abbe2cab7828af55b87deb8493a1f82a2574b83e3be34b837e81962fd77291a1a3e606b994cc54395d9164b97d1091bf8115cf66bbbd700 SHA512 d35422f6120cf63f691176155947c5439c0e4051ef5814fe95ad819447068dfb8c8cc782e1d6317081c0aefce7d12369f6f4e0e44e97f943e0075e2cdf6f84c0
+DIST anyqt-0.1.1.gh.tar.gz 54461 BLAKE2B ec78ecf5d326412b953f95379203bc81c92f13ad7b11e44630cf43062a08b9cfa8436b7c18ef6762d43968c87cebc0eadb33b1cecd159c3278e65538cfb80967 SHA512 5e3f6784fe3826b3017365945bc7053a58c4d7db5745c664fa845780212bf89db2b136459afe90df00d63d1507b56fa5b4a579526d9a9f4169943e5d52e230c4
+EBUILD anyqt-0.1.1.ebuild 1131 BLAKE2B 55597d93bea192f212e3581105cf0fcb7535ba0a4b0a67bde02b48fc1f16c883c4066be43e3e09fb3d267809ed7d86b87777d3d4cef3a16319d03bce81b638e0 SHA512 00a6dac4d70f251545103d16bdc7f881fb74787f952edd31f503ded446176b0e26efa05d11110018895f8492298e661c91e6709ffb42db6bc911da83d66a6243
 MISC metadata.xml 286 BLAKE2B 0498e01030909d49b890a4174b0b198548a3cb324b4c85e3cb29108004bcfb71adf01ca64be576bd5a1ac9b36a09a6b600d799e6a0c29152018b4519f18f567b SHA512 0797b1c07ad778e31012eb93070599ddfd687dedf0a073f463c950dd1c213d417708d0a95b26dbf07d4aa11c66c24a22891d285896d87bc2a29728519e5f2cf2
diff --git a/dev-python/anyqt/anyqt-0.0.13.ebuild b/dev-python/anyqt/anyqt-0.0.13.ebuild
deleted file mode 100644
index 8890d4f53405..000000000000
--- a/dev-python/anyqt/anyqt-0.0.13.ebuild
+++ /dev/null
@@ -1,16 +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="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.0.14.ebuild b/dev-python/anyqt/anyqt-0.0.14.ebuild
deleted file mode 100644
index 73085a977eb7..000000000000
--- a/dev-python/anyqt/anyqt-0.0.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyQt4/PyQt5 compatibility layer"
-HOMEPAGE="https://github.com/ales-erjavec/anyqt"
-SRC_URI="
-	https://github.com/ales-erjavec/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/anyqt/anyqt-0.1.1.ebuild b/dev-python/anyqt/anyqt-0.1.1.ebuild
new file mode 100644
index 000000000000..66988862ec73
--- /dev/null
+++ b/dev-python/anyqt/anyqt-0.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="PyQt4/PyQt5 compatibility layer"
+HOMEPAGE="
+	https://github.com/ales-erjavec/anyqt/
+	https://pypi.org/project/AnyQt/
+"
+SRC_URI="
+	https://github.com/ales-erjavec/anyqt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x QT_API
+	# plugins may preload Qt modules
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	for QT_API in pyqt5 pyside2; do
+		local EPYTEST_IGNORE=()
+		[[ ${QT_API} == pyside2 ]] && EPYTEST_IGNORE+=(
+			tests/test_qaction_set_menu.py
+		)
+
+		einfo "Testing ${QT_API}"
+		nonfatal epytest tests ||
+			die "Tests failed with ${EPYTHON} / ${QT_API}"
+	done
+}
diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest
index 486fad28987d..268ba61f3f30 100644
--- a/dev-python/apipkg/Manifest
+++ b/dev-python/apipkg/Manifest
@@ -1,5 +1,5 @@
-DIST apipkg-2.1.0.gh.tar.gz 13489 BLAKE2B 2ad670c6971b3fd6f56e35d3dceed25cd3950efbd9fb562595ea4313d50e9711a6099458eba3720dd5405335bef0ad1932bb2ad1e6db65c93df9f3b57b5caf56 SHA512 af74217f283be6dd1a674e12a2fc95739f90d9783caa095eccdea814a1da70b3cc1f756c2e150e5e5e75d1207857071aff97aa10bb2eadc83e04c42954c47df5
 DIST apipkg-2.1.1.gh.tar.gz 13541 BLAKE2B bba34b21d967512e2b08a1726dd97dfb432c3f4083661fd9f237948e5c962ebacf7ddf73ef7a34b24ee0a8481d203496504146b5b7627b195f1654fad338061e SHA512 be403398361bd88e04a676346e92df51fb410340858ca446a6a50af565183f15a88efd3d3bdcaa4d042680db35633c780466f4e8b4c9523cd0956fd04f84947a
-EBUILD apipkg-2.1.0.ebuild 655 BLAKE2B 90893a142083e3b483f15c8f4de5edfee1bf393d9153085fa103e91394194c7f909cd74af8edd2e911ad2f1413dafc780a5bb48b64b6a49cd874e84fb229a2c6 SHA512 e097ef51e0c9249b8d4bdd8af4a3deea23ebdb69a4dad9567d2f91e367ac1daf41731b5701a41784b7dea98f47b839975dfe6798fc3d6ae53f78aec7af349ebc
-EBUILD apipkg-2.1.1.ebuild 740 BLAKE2B 699fc5b6b4798fe225959794bb46a00ddbd17ed25bacb687284337e33a88c6699cc0d089006e8ff3ba1eeb6cfea6f67f28dc43dfa4804f07c77ead2bb22e6012 SHA512 a0ec9bcebda87e826e710edb79613230b09de08ec3e440eabcdd320125d3e08db6b84849ae8fdbf1c9b340d27dbb7257044a87b3765dc29b37697e07afb3ca66
+DIST apipkg-3.0.1.gh.tar.gz 14026 BLAKE2B da16bea557cf870c96d44a383232344d10cfbb682c483468e20755dd378c64e64d72b379901eb59ed0df590b5c3b577c882beb882377f7d759b181cf1b672b50 SHA512 89251f02a49b5191879bcf6e35c6a8755d6b29f1ca1c6061eab004385b11433ec86e2968ab23994c6a74515d6a673e445b3bcf8cbdd21b2ec644fcef0d19b419
+EBUILD apipkg-2.1.1.ebuild 705 BLAKE2B 1403fab60cee9db5d4e445d5116cd7a78fff6e3458a3a18424f4478677b3045fb8e370ab30a8d36cd6ca9fbf13afcd3abda0d831336bebceb78b90fb92b2d812 SHA512 2999588e5c4d38c573bdad872d311a82a55e14a2b31c7c4d7ebfc868e06bd0e5b05bfcd46c66643bf0fd34fb99725a238db25767ceab58752da1b8234c385a82
+EBUILD apipkg-3.0.1.ebuild 707 BLAKE2B 25fa447a92b08572202e24cd9c71ffb1a05143d9847f41a701e88adc6c21bca5d65e8dd1698d9a913c22fb72433dcc6c79cf9f40b2ab31efa7e773ce4a6a37da SHA512 05cf6b7199b80e010f7190ba6bff2a598986a61a0154a2413485c0fc4e7ead63386750faaa550e3aa8d7eca437e3871cb8ffc47b4055c850a69cad93a276c45c
 MISC metadata.xml 334 BLAKE2B 7b3573186acb7b108054095d3cc12f73e1cafe1d4c9d7045a9ad7ee31f69b35991a5f958e745cb1561d373b8be441c037578c2954fdd2a4e6b9695477f91e026 SHA512 b397fd16a42820122aea8c0f4eae08d135eaf21bff99b7c0d5499505f03cad03d280a1b35770f54b2ec26388565a33d8762cbef879755dd81f00a2eff7f9f49d
diff --git a/dev-python/apipkg/apipkg-2.1.0.ebuild b/dev-python/apipkg/apipkg-2.1.0.ebuild
deleted file mode 100644
index 206dfdab2e08..000000000000
--- a/dev-python/apipkg/apipkg-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/_/}
-DESCRIPTION="Namespace control and lazy-import mechanism"
-HOMEPAGE="https://pypi.org/project/apipkg/"
-SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/apipkg/apipkg-2.1.1.ebuild b/dev-python/apipkg/apipkg-2.1.1.ebuild
index 3a05796a69c1..ac0bb3e00372 100644
--- a/dev-python/apipkg/apipkg-2.1.1.ebuild
+++ b/dev-python/apipkg/apipkg-2.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -15,14 +15,13 @@ HOMEPAGE="
 	https://pypi.org/project/apipkg/
 "
 SRC_URI="
-	https://github.com/pytest-dev/apipkg/archive/v${PV/_/}.tar.gz
-		-> ${MY_P}.gh.tar.gz
+	https://github.com/pytest-dev/apipkg/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
 "
-S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/apipkg/apipkg-3.0.1.ebuild b/dev-python/apipkg/apipkg-3.0.1.ebuild
new file mode 100644
index 000000000000..991e766a64d0
--- /dev/null
+++ b/dev-python/apipkg/apipkg-3.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_/}
+DESCRIPTION="Namespace control and lazy-import mechanism"
+HOMEPAGE="
+	https://github.com/pytest-dev/apipkg/
+	https://pypi.org/project/apipkg/
+"
+SRC_URI="
+	https://github.com/pytest-dev/apipkg/archive/v${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"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index efcd74e680e8..e8e65d5310a0 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,7 +1,3 @@
-DIST apispec-5.1.1.gh.tar.gz 70296 BLAKE2B 339706890d23c796ea73c23735c5655694315a8a8017eba8f69574ed4e85ddf9a65c3a26482a78f08a118afd19e3c9bbcc9d264bb770941d7affbf7cf85eb925 SHA512 4e0e2959699c735c5242aa1a954392d97ea4809aafbd8d091f608baf7397a31964852588c474acb84e8755a62849837d741eb1e5fdf1cd5304f46c852e346d03
-DIST apispec-5.2.0.gh.tar.gz 71284 BLAKE2B 554539790c58f88f475a7c638130ccdf24bcf80e024bc640919226b0a1408af97c3403ff294f47fb2cb478a26285bc6aacb021f6275eb211dc86fd31780f573a SHA512 6f36dcce8b503847a981c87ed1139b89bbb9be9e22db67402cd7e74be8a5ce58714329b33c8489b63f5aa56fe92d65fb5aea332c9bd2e8f140dfc92165432005
-DIST apispec-5.2.1.gh.tar.gz 71348 BLAKE2B c908fb3741e72d0e8a3dfd70c186255cb5862f7c51c32c5c54ea3cba38a7ce9e02143e029a505f30f284f7b5490946897fead535a9a8743549806aacd1c7791d SHA512 020d377e4dd9e2e3514cf48450bee9a5b957cb0d419f7fa4da35691b68cd108673b133d4ad07b908ca377b1418d087979eea409382ca743d350aec95b796f00f
-EBUILD apispec-5.1.1.ebuild 952 BLAKE2B 4b880d25bdca20d13d35dc89aad2ea5c0d97f7f68cb9a4c0171e000fdbc4633fe2fe1fe0e4444dbd6121b2d54475a8e438e277e6d3a9fa0a7f5132bc1c8208e9 SHA512 23e78073c556bc57b00d80a18622c5027c3d4f309591e42c6314b4f58e32a1a5eeab5f02d1badbcb0d0ec86bf994e72defb1994330216ad2f64b7fd904a75790
-EBUILD apispec-5.2.0.ebuild 1015 BLAKE2B ddd3b89deb36da9e1acab8c1d0be6cb40562442c1d792fd7247309a36a714b7f97e9d389830a4ca27e6f018697ebac4b49bdc632c6d19ce4f8448c7476efa792 SHA512 ea3e878b515abe0405c5b0dd31f360909a6b860ca7d01d2d9c7566e5a5687929aaddd709a17c8867a14e0f0799115b0e5519a2ca98d48c6463501e7393e29a8c
-EBUILD apispec-5.2.1.ebuild 1015 BLAKE2B ddd3b89deb36da9e1acab8c1d0be6cb40562442c1d792fd7247309a36a714b7f97e9d389830a4ca27e6f018697ebac4b49bdc632c6d19ce4f8448c7476efa792 SHA512 ea3e878b515abe0405c5b0dd31f360909a6b860ca7d01d2d9c7566e5a5687929aaddd709a17c8867a14e0f0799115b0e5519a2ca98d48c6463501e7393e29a8c
+DIST apispec-5.2.2.gh.tar.gz 71563 BLAKE2B 205c796ccee03000626538147d6cb26a72242ba8ffd6df47b6a7bdb82f0e2ee1d5421cb7da045fc177297acb838e7351ae996225a43c3c7a57a0a0d72e098bb1 SHA512 16c6229619853671403e81edaa50ce87c2575cdb6c606502e08c086aa33b25db0cef0cd455c2c74a55138eaf95667f7ffe9ac8045cbeb415df4b623878a8831c
+EBUILD apispec-5.2.2.ebuild 1015 BLAKE2B ddd3b89deb36da9e1acab8c1d0be6cb40562442c1d792fd7247309a36a714b7f97e9d389830a4ca27e6f018697ebac4b49bdc632c6d19ce4f8448c7476efa792 SHA512 ea3e878b515abe0405c5b0dd31f360909a6b860ca7d01d2d9c7566e5a5687929aaddd709a17c8867a14e0f0799115b0e5519a2ca98d48c6463501e7393e29a8c
 MISC metadata.xml 504 BLAKE2B d55ae521520ba60a139e83f23aacbb3df76c4c120a54f1b65b185018647c1f363bc88f354abc1810b7a9d9f3cfa264e0303d46cd23b8091dbb365bd84cc04815 SHA512 e0297e941c3c544cbb14044f02451c26cfdec81b2bd49cf225dc9f32d1ccb207e630d838d8928d28ccb35a3cf01493a87ceb2633cc5ede36b62a6d81f164ea32
diff --git a/dev-python/apispec/apispec-5.1.1.ebuild b/dev-python/apispec/apispec-5.1.1.ebuild
deleted file mode 100644
index cfb7ac6dc6b2..000000000000
--- a/dev-python/apispec/apispec-5.1.1.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
-
-DESCRIPTION="A pluggable API specification generator"
-HOMEPAGE="https://github.com/marshmallow-code/apispec/"
-SRC_URI="
-	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# requires unpackaged prance
-	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-)
diff --git a/dev-python/apispec/apispec-5.2.1.ebuild b/dev-python/apispec/apispec-5.2.1.ebuild
deleted file mode 100644
index e56c46d972d1..000000000000
--- a/dev-python/apispec/apispec-5.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pluggable API specification generator"
-HOMEPAGE="
-	https://github.com/marshmallow-code/apispec/
-	https://pypi.org/project/apispec/
-"
-SRC_URI="
-	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# requires unpackaged prance
-	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
-	tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
-)
diff --git a/dev-python/apispec/apispec-5.2.0.ebuild b/dev-python/apispec/apispec-5.2.2.ebuild
index e56c46d972d1..e56c46d972d1 100644
--- a/dev-python/apispec/apispec-5.2.0.ebuild
+++ b/dev-python/apispec/apispec-5.2.2.ebuild
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 53a8bd600f6d..9db8e1d9ee0c 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,7 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
-DIST apsw-3.35.4_p1.zip 685034 BLAKE2B 5845e5fcb286c587367955c33fbee9aa4b0687af666f1d50f35f5dec8e756a0fbcf0fdbd120dd3c7a78df1f05d8eae5a973a8a71fc8a6f4271fff7d83b399013 SHA512 f420560e5821bd6305705ee6c14174f1770f4811edcfe152cb1f2ceae4295f13c82552386a7ef42c5ce88165e88bd2080b4dc2809484598522914d99f2469135
 DIST apsw-3.38.1-r1.gh.tar.gz 338985 BLAKE2B aa0ef335bd3abc708b41a92959f98b4fd3961168feacb9ca6d382e0279c46d4227a8e09373721ae1361fcc38181376664130b3623b2f36e1596467b99959ecb8 SHA512 4d161641d7bf7f933507e7d7e71d437d9db95f7327e29cf34848d9b741e2711dafbefbf19cb34d78d83b4e69115acad855f924fdf80de1cea4c9d61fe0f2b670
-EBUILD apsw-3.35.4_p1.ebuild 1051 BLAKE2B 668a4051c5238535b4f267c6c1a6fed22db382ca1d8884f16216b0e98ffb6dc5fe34dca93082519e9941372acff79f2b05f024f4bd3c95cf6c7d06a8cdf3096e SHA512 ac359e50a625bc456e617808841a531b4760a8c19121dbd16b604cffd6bfcca0212a45cbb247db804a1712da1c74b1c20488043880f0c9417cc45bb13ea4c398
-EBUILD apsw-3.38.1_p1.ebuild 1077 BLAKE2B 76097082cb7e0e24ffc9054403f990c34c898677c7e6fe84e303f07072b5ce1a5c89b0e724d39613f446c667c1e8c81b8adb7276026b640e5e0e02a5bba61a3b SHA512 dd792554075a92af0447c46384d4b3fdaec847b712f35716abaf9c31c42009f5cd98729d8bbc89b1bf595dfb0edfc19bb2392f60a75ef7a5eef4e75b7ad66455
+DIST apsw-3.38.5-r1.gh.tar.gz 338186 BLAKE2B 145e38d4057be498f85a655ad7a437ec19a895769f58505b4b99093be30e67498faf9572494009db8e20e6700fa5e514605af131d045a4e8bb41587b828f5a88 SHA512 58331ca2db993f87316a55075ee9c440d4bd6e985e8ca11079391bd9cc2a907271ffe5c21d66840e336cd9e6568f6134c8b8fa5d28bbc7c77a1dddd48e8b99b7
+EBUILD apsw-3.38.1_p1.ebuild 1075 BLAKE2B ffb7fe5a7aa01bbf69ece10be3a391e76b0180154ed5270e7eb5750f243ebdd86daaeb9d04619cc18fd9472b941e1b8c9d1955c0be6df317f7fb4d3e28e914ee SHA512 12178823320582875c6bed5d9f7066638259283f129f0f1e76b51f29e4037d49c6af85dc0fd113f671539902052cfd6f83149c16a1d78714be10d576ebb744f2
+EBUILD apsw-3.38.5_p1-r1.ebuild 1003 BLAKE2B fe842d521d76bcf1df1bd4f33d75401bd6d810f15997e2cd21b7826f129aa0d0f17fca1c44ffa898a9c9e0c61736b2fe50316d16688de56e74bd2e47f656cf7e SHA512 660c9d97b3784498ef9336d4603ce3411e2c479aa1b62e0da8d437fb8313d8efeb92e9b1765e31bf8b98adcc86bb673ed77c68881d611946449869bf9c3d9fb4
+EBUILD apsw-3.38.5_p1.ebuild 897 BLAKE2B dc360c2a761d7b821b1da2ea3949d5cba6442c78f8a4e6f5bcaec5bd2a498fd1b6b4d0beb1cbaaa59c37587b2f2b3a430bf573b11fed65d41558fe402b6637e8 SHA512 bc094c55afcfe97342829a17952ab85fd71bf527d236abaf4ab57695960b1469931463fad535f7a69171d253be036eaba3f859b3f596fcd19f53e03d18995f8b
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.35.4_p1.ebuild b/dev-python/apsw/apsw-3.35.4_p1.ebuild
deleted file mode 100644
index a98b052e48b8..000000000000
--- a/dev-python/apsw/apsw-3.35.4_p1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_prepare_all() {
-	sed -e 's/"gcc/os.environ.get("CC", "gcc") + "/' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	esetup.py build_test_extension
-	"${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.38.1_p1.ebuild b/dev-python/apsw/apsw-3.38.1_p1.ebuild
index 64f34312b92b..7136184b609b 100644
--- a/dev-python/apsw/apsw-3.38.1_p1.ebuild
+++ b/dev-python/apsw/apsw-3.38.1_p1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/apsw/apsw-3.38.5_p1-r1.ebuild b/dev-python/apsw/apsw-3.38.5_p1-r1.ebuild
new file mode 100644
index 000000000000..f58c16a0974a
--- /dev/null
+++ b/dev-python/apsw/apsw-3.38.5_p1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%_p*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch"
+)
+
+python_compile() {
+	# Needed for e.g. bug #851741
+	distutils-r1_python_compile --enable=load_extension
+}
+
+python_test() {
+	esetup.py build_test_extension
+	"${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/apsw/apsw-3.38.5_p1.ebuild b/dev-python/apsw/apsw-3.38.5_p1.ebuild
new file mode 100644
index 000000000000..737f556a79f7
--- /dev/null
+++ b/dev-python/apsw/apsw-3.38.5_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%_p*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch"
+)
+
+python_test() {
+	esetup.py build_test_extension
+	"${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 46ae2a362d5b..5a8123749e7b 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,4 +1,3 @@
 DIST argcomplete-2.0.0.tar.gz 54164 BLAKE2B 77da149b07d4019f8d6f3dda8fd9bbe9953c25b8461ab0746e1c2eb4d1bb51a9007c1f046ad9dc41dc5f8f248fbdf18ad7d921cf644fbc7580661084fd1427a1 SHA512 ef2a551e1372ecf3739006fe2c020e9f7ec53c5809680dcd3d9d552290565d8d09ba22bcc989f40644120a129b101f8e2e8ed34723e947a7d8d7884e9b502c31
-EBUILD argcomplete-2.0.0-r1.ebuild 1097 BLAKE2B d14e8b41a0b7dadc9f7cacc7563eca8e2fceb8106c73501e7654b086708cf2ba1f7ae1e869f2953b122623cb7797dba2bcb02a994f5bbd4b8dda65c65391165f SHA512 e668bfcef11ae1328b8de5bb03379621da2b5f6525bf22fdcb2e76f742f42c89a60891d35f2c13394ee68c46d2d54e7c2ce57d1e973a3b83b50e9b0aec5a7ca2
-EBUILD argcomplete-2.0.0.ebuild 909 BLAKE2B e0d4de1a2d01d067428823e799cb959a0f2ff488c4ba641ff9bce4d59ac74e6311e6fe600c641dfa5a6668adc09da440ed3c4105f74cd892e2dad8d0450a7cae SHA512 5c8a6e5cb58481d41d3b994c58108f26c3b59c49599b5e5ffd3cc2dd5665a510593820c18e900779480f1db473036fe1fda9dcdcdbc314cb41dbcf1a79f89c9c
+EBUILD argcomplete-2.0.0-r1.ebuild 1089 BLAKE2B b1396d4ecf05b04f93acb18c4f128024af96a3b7c787bf0f94c9da87921e313ae7987d6f687079bd558563c50df54e973288871704705e952612bdcdca52a194 SHA512 c72352e7f0555d488fcdc5eba81b00b5d1c7c18407503c0dbb39ec894a466f4d3b9e9d018298665f13c962d20b552273eeb466b5dc0fff1c142ae1179590cf0b
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild b/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
index eb3ed8e3d886..2305dae7cb52 100644
--- a/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
@@ -17,7 +17,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argcomplete/argcomplete-2.0.0.ebuild b/dev-python/argcomplete/argcomplete-2.0.0.ebuild
deleted file mode 100644
index 39cb43367c2f..000000000000
--- a/dev-python/argcomplete/argcomplete-2.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 ~loong ~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/argh/Manifest b/dev-python/argh/Manifest
index e89f7129c8d9..d428b09697a7 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 AUX argh-0.26.2-fix-py3.9-msgs.patch 1135 BLAKE2B 4730066f38371dd5c8c0e7004ffb633077e3b246d204a24e07064a1e7ae0cdf2069c3495acee25e22f49297eea21bcc3893432093180e69b2f387a5d2d111d69 SHA512 0dbd6086af1cc4486d736142b8321c09f37d4e732a6f6b8e307f05fe461486d01c7def8cc2e36a0b6068ab8533b20ae6e5dce2b4d556a5181b65043c5e568ef3
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 599 BLAKE2B b6326b3a61936aa7cd46026728a5edd8459d052211066e671fccb1d5174f04a2e055a98703778f535ec83f72b2522393093254c6ded60a5447575dcd9df60254 SHA512 ac822e8f19ff6e8a5beb4d97f55b36682a40ab88a7a8bb3a3db8e5537171477e5ba4700db65880ddcd4600d752252b27620ea734ec8c3b4b06f140eab4415333
+EBUILD argh-0.26.2-r3.ebuild 631 BLAKE2B dda71b7473ea6be989fa1a04da7d3d009691723202a1de8fb113840b5670d19c1af35adfdac8ccd567312bef49db1ed2942b6c7479900554295e9461924315fa SHA512 24534b53c4080bd1a539c035bf2a368bfc9df20f504b8b237a2ba9d48683bb62b5c51a01b089df93f8c441ec246bcba43b1f33e56584a946b1bade0c9af34d7f
 MISC metadata.xml 385 BLAKE2B e1fc25e92c45fbd0183634cc645085fef5223a59975a5000557c1a2ef497c6f9ce017e462a9a881e61b4578c90859f51e5471d197ea884b7dc4ce90786a0987a SHA512 97719df6c0b48c7348bf25de9016dd1de373d6b9e1fd7f52d87eb6e0935608719c726aa3f4ca4aba8fa1211d1234c2b959dd821d241cd65b6cb47b1a06481df6
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
deleted file mode 100644
index 0855d02bd743..000000000000
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="A simple argparse wrapper"
-HOMEPAGE="https://pythonhosted.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.9-msgs.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.26.2-r3.ebuild b/dev-python/argh/argh-0.26.2-r3.ebuild
new file mode 100644
index 000000000000..c0c23d0c5c7f
--- /dev/null
+++ b/dev-python/argh/argh-0.26.2-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="https://pythonhosted.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+LICENSE="LGPL-3"
+
+BDEPEND="
+	test? (
+		dev-python/iocapture[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.9-msgs.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/argon2-cffi-bindings/Manifest b/dev-python/argon2-cffi-bindings/Manifest
index a7fe360c71d3..50037dab392f 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 941 BLAKE2B 2eb5530947982e5e6231c0067f8ae22b032bdd6a7ec52d5b2668b393d5854fc5d1f320480549cc443501adb255d8697412cd168e39fcf5d24893cef4bbcfa8b9 SHA512 61580954b1dff6d5fa800f3701e6ab9ecc27263305f133da5cfb682950e67efd60bf1d6dc3af58ef7e75d84cb615172dead1c06ca8740655e0875f899a297a9a
+EBUILD argon2-cffi-bindings-21.2.0-r1.ebuild 1064 BLAKE2B 99f4fccc30f8cb0b8f702f73fbff5781581c215e6f50f4f3cdae121bf85974145006bdf6892de0e373de512358170e6a109201ce2b6f61ce68781958aa288078 SHA512 d998ca5cf9fdfc174c2006fbb96ff3ac1a4fd0e57ad53b0c36116ce5a3ba7dbf78a2d4d54937f7c8981112ded8d69bc9af95f85117ce99b485e9c5c946b000b8
 MISC metadata.xml 684 BLAKE2B 80c3275f178c9972fe804e6965b62bda1caa24a3b4b66e985b372e6d587a6715821acedd63a06de10ac23b560bafe3b3c78a4fa78fcffabe55056b7429d74640 SHA512 e299e8d3f84c3d2c52508f182ba56ee350bd3b6d700c1fbe1fc87a13bf36a1b24b61b3f77e6f93c64e16312b306899460eb2cfcab0f972211ad6cc1791cecc39
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
new file mode 100644
index 000000000000..26a326d0d3ba
--- /dev/null
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level CFFI bindings for the Argon2 password hashing library"
+HOMEPAGE="
+	https://github.com/hynek/argon2-cffi-bindings/
+	https://pypi.org/project/argon2-cffi-bindings/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cpu_flags_x86_sse2"
+
+DEPEND="
+	app-crypt/argon2:=
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+	' 'python*')
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export ARGON2_CFFI_USE_SYSTEM=1
+	# We cannot call usex in global scope, so we invoke it in src_configure
+	export ARGON2_CFFI_USE_SSE2=$(usex cpu_flags_x86_sse2 1 0)
+	distutils-r1_src_configure
+}
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
deleted file mode 100644
index 117a0c622869..000000000000
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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="Low-level CFFI bindings for the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2-cffi-bindings"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2"
-
-DEPEND="app-crypt/argon2:="
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2[${PYTHON_USEDEP}]
-	virtual/python-cffi[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export ARGON2_CFFI_USE_SYSTEM=1
-	# We cannot call usex in global scope, so we invoke it in src_configure
-	export ARGON2_CFFI_USE_SSE2=$(usex cpu_flags_x86_sse2 1 0)
-	distutils-r1_src_configure
-}
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 9682c80bc3ad..9d9974c0bf82 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e
-EBUILD argon2-cffi-21.3.0-r2.ebuild 767 BLAKE2B 5ef95a7e86b62abce8607946ffea355bd5dd565ed875643e3b99a40e07f0af803a3a2ba106d16f88461a6077ece9bf53f33b89c6208ddecb23361c64a5d6a717 SHA512 6681209ee48b9621659767c9e2614305e6e939a9dd5e191726a0b032766414c97c07efc94e83d3d8e331ca996a65550a95aa618dd703b0e5c009a210e5890c61
+EBUILD argon2-cffi-21.3.0-r2.ebuild 814 BLAKE2B 2af5561ed070ba37c975b4b5fb4614279184f120e1064fea2e1664d88c54ba55528ce913ba7e4823cc51cc2978e3f4277c59dca6dad045ac4f6bb7cc4930fd8f SHA512 74fb29e94762c0e02413ffa79738106fb2c47b7fb1f1354ed7032dcfb3fef738815c96d281e2896a25590c2bc0cc552bce10d6ec17dca99c5cf408e74b84cc0b
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
index f263b7608a3e..dfdf08ce4462 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
@@ -4,18 +4,24 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="CFFI bindings to the Argon2 password hashing library"
-HOMEPAGE="https://github.com/hynek/argon2-cffi"
+HOMEPAGE="
+	https://github.com/hynek/argon2-cffi/
+	https://pypi.org/project/argon2-cffi/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
diff --git a/dev-python/argparse-manpage/Manifest b/dev-python/argparse-manpage/Manifest
index c01f11479375..133462f56cff 100644
--- a/dev-python/argparse-manpage/Manifest
+++ b/dev-python/argparse-manpage/Manifest
@@ -1,5 +1,3 @@
-DIST argparse-manpage-2.2.tar.gz 39963 BLAKE2B 3ba427653c51265be944309dbd94368b9e62f46ec9fa3315a9b7da2de1fc6ae3399408488b74fb1c62ed39f70034d6429f3825c0857b07b71c277922870fbc13 SHA512 1708d33633405f1c4b9c96acd78cdbc5e3465089c7de0c5d0654f9f70ac1b7176f3798fd8bd8e7c0f2163b28dcc6d41ea2b68f2e2b03652677af3ba945d14588
 DIST argparse-manpage-3.tar.gz 45091 BLAKE2B b2ab9d4863227eacaf566865cd47763b9a52f4fd445ae78cf8212b3762a14c1ceb7f9008d25b8828f5e5da23e120a7be6d48239bb300670e559000de1e75fd68 SHA512 96225cf71dc60c638bd312331622e5b60589d7e6baf59fdfca0d90d24cff2bb232696c754c440c4e239949ea1a6280699c4f0f7816c50ec62bf77474d0c48cf4
-EBUILD argparse-manpage-2.2.ebuild 656 BLAKE2B 4ca3a87024226ed7c0d64cb8cc81cf89af1e372a07b5f56d391389d917b54bd02d63ff1891a69106574ee2b793941f258bcbc9434084e7579f29bb40fd88667e SHA512 dc2c1632db91615463f50e25c18cc0755a336ae75377070a6e1c823f37d5185c09859816e2abf70c97628709691cfd64bc497b00ef2da71c65aaa4dc88b2be0f
-EBUILD argparse-manpage-3.ebuild 662 BLAKE2B 53ec27ad0064ff50e600e984ebdc7d74e1addc9190d96213915a6b03e72ad97217b8ea0df7b292188bbc38d4fe770ac868d3d581fd7a5ad669d0770d10101d29 SHA512 d349736d9fc42884cdff9785348abbcfb362bf86ee0c58648231478d90b91bfb6b02c6be40c271e9920155e6ada02c9fcac13474f22cd50f39f37cae49556507
-MISC metadata.xml 418 BLAKE2B 532dd384efcc880d73bd757b09aa98af767f74ca3f8a573d0897d2dbc86122db0de0b526834b87a5d76bf958f593a5f89bdad5bdf388e54d4fae227922b86485 SHA512 daabf95331a36e1d40065f7d544b3df75a68aad6a4bbe3bb3890db97898c47c9c0498cd77d62bd86684ee470b35aa68397097324ea83ffb4bdfd606bd786f3cc
+EBUILD argparse-manpage-3.ebuild 662 BLAKE2B cf4db3cf01e221648c3b92537e5f21e15bda7a54b7a236d839d36bde972f7989772b3278219383c09a4612ad76e0c90989c41e76ff74a5a0d508342156a0b717 SHA512 d79106c568919abde316eb10dd0f3ab9509391f1b9f6a88fbd933c812f3340b164a6e4232cb7be2d0079a95078b5efb187d3172d3376e2e8b1dce4a0e4690771
+MISC metadata.xml 519 BLAKE2B 00b4602e0a0c0b614c6f98133a0651ac75938c09fc19987fa86f725d05d6f94e91e3c7a2dfeab29f1875db096b34575d3ce628bfbcbaabc8d91f65ca83840b2c SHA512 bca860e8471e486b4fe3e3f003b02de5b93643fb916b7550372b5c46f310eb887999ee49beb6d3f3dd7c72f0b8ca7f5d2f62a25807cf54a224494f65497a9377
diff --git a/dev-python/argparse-manpage/argparse-manpage-2.2.ebuild b/dev-python/argparse-manpage/argparse-manpage-2.2.ebuild
deleted file mode 100644
index 52946bfbf5e1..000000000000
--- a/dev-python/argparse-manpage/argparse-manpage-2.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~arm64 ~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/argparse-manpage/argparse-manpage-3.ebuild b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
index 6a4098d8b5b0..3ba1a55f79b1 100644
--- a/dev-python/argparse-manpage/argparse-manpage-3.ebuild
+++ b/dev-python/argparse-manpage/argparse-manpage-3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Automatically build man-pages for your Python project"
diff --git a/dev-python/argparse-manpage/metadata.xml b/dev-python/argparse-manpage/metadata.xml
index 65ed42f26245..ce89e7860550 100644
--- a/dev-python/argparse-manpage/metadata.xml
+++ b/dev-python/argparse-manpage/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">argparse-manpage</remote-id>
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index e7d75344dc71..0bc19d6e8ffc 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,5 +1,3 @@
-DIST asgiref-3.5.0.tar.gz 31920 BLAKE2B 3471e799da0ba5cd8640612d0ff04e480d6c431a44c1e94419cdfc3a029c83ffe53aa561952fcf9c0df4a5ec71282afd8f4c665b49c408306f8f7026e0a0023c SHA512 3fa48002bffd953f3ff8bc33e5604955ee83fbfc09cae171b95d57773378ada554342f2af58a4a04025a070cd2ec5a6b1bd5a8b18a5c5b87b2b510bbb2036e57
-DIST asgiref-3.5.1.tar.gz 32027 BLAKE2B d3674a71bb75271a09f30aca8c99ae199ccaf119d7ee452b97f02ed4dd07c810ef1836ea8b5a66b8a4c2505a989cbea0bdef215c8a34813506f0f72bc12c21f6 SHA512 feafd896bf83902fe3f6a803a6e637d4c4474dc14faee43742929802355816971d2e8165eeb80aee6e4d5358a3dadab5f9199bd79698607ce0d0ad0b7151b5bb
-EBUILD asgiref-3.5.0.ebuild 605 BLAKE2B 6fafb5e45e6d86a6d158cc26178a444e44f7057fc618b655a4069486e94b16dbbbba9fb7459e689d66323703dff928bf1196a1434ee58a93b070e23f193aa799 SHA512 319cb9ba0b49b643e09cf548e18b91d9b167935f0085147979aacd0721ff5456ae5441258b93ece57c47ad4da69dc4c83ae280b5e1e5bbe094191ec07bb6d43e
-EBUILD asgiref-3.5.1.ebuild 657 BLAKE2B 9c29f6868a89a52e7dfb1b9262c028a98641c3d1b32b1387f14013b6b21bf0ab9ab281d9db73a4d62dd98fd3745181f2459dfbdcae5ac5c166b6271513022053 SHA512 3c7c2446377333df8467ff3e440874bf7b8199d3d5b60e5fa8431e540d267600b4fb995c9bed0d9018c7d5782c58e57f743200b2d3f6c7bd744016bc97241221
+DIST asgiref-3.5.2.tar.gz 32352 BLAKE2B 08d148948828cb2bf1f216c827d8fd35f66c88c6eec5ff77af85495fbd40144931d4dc2bf09db32d34be92d8ea9d923c87904d3554422d24f6e23cfcc428bdd8 SHA512 d5ed0275dc748674018b14d58941113c19e1e30c1fed63c40d3069a4a09d81a6cceb186e7a0ef26912a040df082ae71b2ca9198d67f0b786b53d3d4089530fbb
+EBUILD asgiref-3.5.2.ebuild 649 BLAKE2B 2b401ea222673b4188a3008b33a538d3e7e2700c96975619cc90d274b719e58b20981c2bf96d1da95629ffc1ade25822e9016cc6aa79bf2e4394e4b1d928c1b5 SHA512 018de46bd4afbb09febeff7f1ff9d8f76340d392ab3b030cd963cb0f64a4b7dfdf016b62a7bd3348bedd1ff6dc5f87306f15b033202a5c6c48ed24a43429424e
 MISC metadata.xml 389 BLAKE2B 312af34b9583dc413f5a5d69c9677ebc2d3fb1d10c192f2b537d8cd057122086009d9c6846f9177fa6b1b96b6fa7641a3d833f4db34ef74db93e73f19042eaa2 SHA512 d35649849ab02fc46837b408ef7de3e45057517c472198b86a1619911bdb451ffffadb26f8dae864f194a1e5c6f424cc904ba342a8f8e84c69fe9fe75286e867
diff --git a/dev-python/asgiref/asgiref-3.5.0.ebuild b/dev-python/asgiref/asgiref-3.5.0.ebuild
deleted file mode 100644
index 038b4bf874f6..000000000000
--- a/dev-python/asgiref/asgiref-3.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.5.1.ebuild b/dev-python/asgiref/asgiref-3.5.1.ebuild
deleted file mode 100644
index 9a7e6fc23da7..000000000000
--- a/dev-python/asgiref/asgiref-3.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.5.2.ebuild b/dev-python/asgiref/asgiref-3.5.2.ebuild
new file mode 100644
index 000000000000..068f138b8ea3
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 1bb6c82a523b..e6ca7d2f303d 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,3 +1,3 @@
 DIST asn1crypto-1.5.1.gh.tar.gz 686175 BLAKE2B 1e308ac17c36daaa9ca69fc48ccf0465e540b07d96c1a3e6977844994950e2c75061d7b88525b7e46b61e5c725ac4505ada8757d51ac67c72f11f86917fca54b SHA512 1bcb93d82a2602e3b5c66a180f5d16cd3a9731d86d89fbd44c1e23d735e708e9bf9bb6cbabc2a5d60619f51a7c38dfb1f7ed63820f422ccf42800a39f4637626
-EBUILD asn1crypto-1.5.1.ebuild 774 BLAKE2B 61a77338abde4860cc8c376d01d075518b3566b932ec28e214698097654f9d5fa271a5112352b9a563cab8bc8435ed1e872cef494bc1b9890ae69e673d3ee940 SHA512 f97eeebad4141706cc9bf5698db5fa26f078e659e9696a93541857e32fed2ba700fde5e69c7a6bebb0acc523933f4cd7a64e999998f59cd7fd5f8b6f4348b322
+EBUILD asn1crypto-1.5.1.ebuild 748 BLAKE2B 71a1db9ff6bb1583af6725115e9e4e32bbad8d377662ecc94197077a11f1ca8aad7a9fbf4360ae59f49dd1d2cd33bccd6b23661e32cbc80c8925aa163e384012 SHA512 3f0fd62334eedddea3a95c5334e671fdeb651c6a428e7802e793c193dbdbf82932a9f20cd7926f9efd55eeea5d5fb37551170085da8c8a73433031cfd3c09217
 MISC metadata.xml 394 BLAKE2B cb3902bf00ff0b7ad12e9e9354c399c86822f90d2bc92b52adfd45e04f3bdde21f803783ad8b69c518fd1b01e9e3d3d0a1a3c7753303cabb0905ec049e92f3ec SHA512 88d151e398b1ad0e0f2416a561bd0ec21c5fc65b9b62ebd2ede159123254d8bff2bdc49b0ca22da628a126602d9d2c94600855e403531cfb4124587c7913e93f
diff --git a/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild b/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
index 5c86d5eeda76..c8557a4efc04 100644
--- a/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
@@ -4,15 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="Python ASN.1 library with a focus on performance and a pythonic API"
-HOMEPAGE="https://github.com/wbond/asn1crypto/ https://pypi.org/project/asn1crypto/"
-# pypi tarball does not have tests
-SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/wbond/asn1crypto/
+	https://pypi.org/project/asn1crypto/
+"
+SRC_URI="
+	https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 25dbf7d6f359..9e137e7c2a51 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,3 @@
-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
+DIST asteval-0.9.27.tar.gz 41789 BLAKE2B 6db628dfc90479b605370e6cd4c3eb27a6fdabd2422016aab200ddb217fc5459df77ae99397145511600ae4a79e259c9e7c75c3be50bf5201e08915a76ca5571 SHA512 b56fb81f1055ab66868084edb89775ec87f40ee45563531bf4661ee65656e777b388856e691740af60b4a3891e872683768ac590a78fda2fed9173e613aa7263
+EBUILD asteval-0.9.27.ebuild 610 BLAKE2B cb14facf2eb312582fd5395da3514d891d1c45f3dc94db15918e746f5c4f56110fa47287353a1f95f68b48f783cec3434c75196964c174e0c3e9eb36ded0cbbd SHA512 4f10dbb6ed34ffc47f169e1bafe31508a95ff9425d6b7f35c37da19d2e19bfd979cd39c0e5a31a3ed8e85fde63d044da9527f5760232fe3b39ca3b93fe932112
 MISC metadata.xml 388 BLAKE2B 8167e3615c8fbf4fdbee5ac6aa354ed365c255ece5a3793a5a9b9db68206781230437f824360c5ff7223ee70c33da9f2c2be1d9b7c9d7f4413b9da82b1a96c2f SHA512 a4185b786faa55a63dedb33b0a2ec1900f2e9fca3887d1531963047be795271c4300c51238afeaab98f39778b1cdace3193b1fa4b3e400d83f7201392b09f221
diff --git a/dev-python/asteval/asteval-0.9.25.ebuild b/dev-python/asteval/asteval-0.9.25.ebuild
deleted file mode 100644
index e44fd6fbb180..000000000000
--- a/dev-python/asteval/asteval-0.9.25.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{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"
-IUSE=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/asteval/asteval-0.9.26.ebuild b/dev-python/asteval/asteval-0.9.26.ebuild
deleted file mode 100644
index ce77acf316e6..000000000000
--- a/dev-python/asteval/asteval-0.9.26.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/asteval/asteval-0.9.27.ebuild b/dev-python/asteval/asteval-0.9.27.ebuild
new file mode 100644
index 000000000000..d0a6c8b9f423
--- /dev/null
+++ b/dev-python/asteval/asteval-0.9.27.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Evaluator of Python expression using ast module"
+HOMEPAGE="
+	https://newville.github.io/asteval/
+	https://github.com/newville/asteval/
+	https://pypi.org/project/asteval/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 744b4774b215..57268da2d076 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,4 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
-EBUILD astor-0.8.1-r1.ebuild 536 BLAKE2B b49264693ef2e16aa984b571fb0ab878f732e81821c7a35b1cc9f2fdc423cce87a31105a98374a6dda00838bcb7574967612c4057b2c7861661cf40b7b34a40b SHA512 21999ee847e591a2756c3bad6baeb82d50dc49538310f047092f7117d19aa5f453a6312960367147f0453ca1c343b95c9aaf999389869d0afa201e5350ec26c8
-EBUILD astor-0.8.1.ebuild 475 BLAKE2B 088174a87c013b94e8a81cc90b1450818d2bca33b9925a1687ee8c85f437c5ba8e8c48b2423690ea5c516107c3373a212d310e0afec87afb414e5d298dcaa564 SHA512 364ca6f843157533460a33bf07efb78712a094edd89dafa34239b9593be1e8b8ccf18b65d0ac0ec161b120ca06869a62fd46bd16f25fe593a04b367869920d3c
-MISC metadata.xml 367 BLAKE2B c4400dae3db36ae716e1dd85aeb58b85c54bd7e27276b79fc0291f42e485b9804c7246f583eb40ff5081e2a44aba703f49fcdc1cfcc85b5bb75dee72217a3501 SHA512 7f7f5f3de928f5f89393d10df44a042231507f78a82d0869939cae5e3c12d5effa0606dcb70fc72c9e697deca16711159454bece3c7afe52d902c3881d7135ac
+EBUILD astor-0.8.1-r1.ebuild 528 BLAKE2B 85ecb62f4eeab6bfcfa9c0bf79e344b29912d1e7b0e3c60216fbc9f3a1598faae6f3a18959ef00b9eeeb6713fa384e52711df36199f103cc8f8afa4f55169935 SHA512 7fe878fe7c2d5b4220926112fb963d0cb5ad3b2438ece44aae7fa16a251b734d8bf194d09981ba674367870b420b5129d79c9c4d0e3969d6a934ff106de05f83
+MISC metadata.xml 391 BLAKE2B 484d2cd9e52afbc57c49df869d111c214de2a3f1914700a168554f5946b89522d48a613c37a3f2fa704fc8de585047304340148ec34c7a7d8e8097d7499eb507 SHA512 413a0cd6331515c0462f22bcdf7fa1c2693e282b84bc34efcb9ada65f5ca65c6808bd9d678b6c9d1e24c5230dc1c5f3417cda38ee79103a372997a30d68dc572
diff --git a/dev-python/astor/astor-0.8.1-r1.ebuild b/dev-python/astor/astor-0.8.1-r1.ebuild
index d7369b452c37..fb4f699a4cdf 100644
--- a/dev-python/astor/astor-0.8.1-r1.ebuild
+++ b/dev-python/astor/astor-0.8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://pypi.org/project/astor/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
deleted file mode 100644
index 7d8443b2ac12..000000000000
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 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="Read/rewrite/write Python ASTs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_rtrip.py
-)
diff --git a/dev-python/astor/metadata.xml b/dev-python/astor/metadata.xml
index 2381f076585d..4870a5e8d346 100644
--- a/dev-python/astor/metadata.xml
+++ b/dev-python/astor/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">astor</remote-id>
 		<remote-id type="github">berkerpeksag/astor</remote-id>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 9192f125fed4..42b73d327cc2 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,5 @@
-DIST astroid-2.11.2.tar.gz 412621 BLAKE2B e43be65b733a5de5d027920e8e4db0365a3af98614739f0a56dcf95ef6c1c3a9e104b52c1fad4477bccd460850cf6bab6f38014aaa6891e8d04720d4a52b79d8 SHA512 5b33cb3594513804c6933a888297ed54c42cb52274c7fe49060368e3fac62be8f3febcb822aa9267a5a0a99a32932912ebc4640a7d10288b7021955fe0277c0d
-DIST astroid-2.11.3.tar.gz 413237 BLAKE2B 0758e0a2069e969e1509d0935883f1deba6b3c55af0edcb3146be7dd39eab40e9a71ef517c5114c49c191f545da73340d074df1cc107094c6450f9d2448932db SHA512 ea215a4fee747ab49735d3b8a084500b9127c831f0a737d6610128211750920e68741dc888d8d799422636b7acb014e1a1f3f629db87c445781c4cfaf57dd062
-DIST astroid-2.11.4.tar.gz 414075 BLAKE2B 7bbe956b1ed577bf6be97f89ed3e1c5f3f516d549339010e711d43bf61f9f23e18e04c57165742e22e2bea9dce8766ba5b573749627eeeeda2a133610d73dfb5 SHA512 dbe0dd34008f56b117c12133a6f3b9f940f6cebd4d19019396efe0d060ac7f4a28e56193fa16d30748dfc316e8cda1b8fcad8574dfb2698430e0f1d3622681c4
-DIST astroid-2.9.3.tar.gz 409069 BLAKE2B 152dbe8ab2fee3964dc8cc714a5ba48c71b5994c77d1e20683bcf028483aca22d5be5772e72d056cfd3d1f59562b447366d61fc35a2b67d545f069a8f7975e84 SHA512 7bb3bf2d456c0d22325444e641961c34eaddcddf50c97ee9f5b5c8755232cf1b65a315258403b40bb7dcad15c4f9b6b73ab0eb607525a48a65f52406969eca04
-EBUILD astroid-2.11.2.ebuild 1383 BLAKE2B 09d3bb38ea7b42f3ccd55fb0e16eff8ab8d06e792f20b648d24aca478255869530aa22cd807849ae270f3b1d336c7f26f37d0a25e4e86044adfcb82b26c6d122 SHA512 5070407b621f0dafe23d3ebb9d0c6efb257535a3d91afc7f5b34a03809d33965e7f67bb9d04a1525aeccb22490be9fda782c22b6cd519cd54a23fac573a7fe94
-EBUILD astroid-2.11.3.ebuild 1391 BLAKE2B 026560b411056b47cdcd3c04ff8525c3d395ee381da86d317527126bf111cd56e21a154872f1beca9e2167c6f060a2b81972f3f296b01367cb06332d002f2975 SHA512 9332b9a912758389cd698a1f806c7f5412e3cdff3007fbba33823f509e6c9edb517612475951c306abaf10286756df6c7a491ce7bdf5938c3723a665d1355994
-EBUILD astroid-2.11.4.ebuild 1391 BLAKE2B 026560b411056b47cdcd3c04ff8525c3d395ee381da86d317527126bf111cd56e21a154872f1beca9e2167c6f060a2b81972f3f296b01367cb06332d002f2975 SHA512 9332b9a912758389cd698a1f806c7f5412e3cdff3007fbba33823f509e6c9edb517612475951c306abaf10286756df6c7a491ce7bdf5938c3723a665d1355994
-EBUILD astroid-2.9.3.ebuild 1305 BLAKE2B 8ed0e241b8c820dfce1228a811ab24f9e96898f61037c5d66c5db327218b1740a13f87078c60977e2a923c193ea59a9cbcb1197a35fabdcdb09e8b1370251e78 SHA512 f89e842c114311520ef5d55ffa00410986ed1c19b9eb132e1b1b527e74cb6e0605548704b6129013a3d2c11542902ba25ca1df1c0e65692cfb9939cc407e7ada
+DIST astroid-2.11.5.tar.gz 414503 BLAKE2B 3bdd93c8c958dc8ede9b5c4b0d01399578c1c8824c511aa6697e6653ef6caec2e2597a862e03a72fc0dc6d0bc63d327a0cf4b62b9632604e9b8485f84512b5b2 SHA512 6b6d1e35b95c68d7219534ceda6e2802cc6f2d9cd9bed6a880eaf0937dfb288d9fb58dac9be33072f4676a568f778eb26a78f447d4a44842a98d8677e151e1bb
+DIST astroid-2.11.6.gh.tar.gz 414842 BLAKE2B 3300037aad912be25d99cc20576f472b907c064c2cb434d9a40a9014df44749760cd8921411f3abdf8e08bd08e612cf6aec13d73ca38ec8ac31cd1ed007282bb SHA512 2276385d74d9bbfd0d99c786d2598105161b2c71c96ca73183b6e2672f8b61c31667c337a1d3967956ef5fdbb54392d604a84da5ac456354d04fb4ad37b11f61
+EBUILD astroid-2.11.5.ebuild 1783 BLAKE2B a1006a85d74f9412adcb9f57ab080b616e8e4dd33968c8c9aa0f4fc0402970eb2b21c1111f96302b41fa506357154e4c759429de4595d2547827f8874b7d477a SHA512 c5864ee70ddb96a53101bd4e759c1f5c3865be6c1c1d64fdd3c9d2959b5b6269b43d905c67359aeb0dc534ad22ef6556648af0ba93ca8c497abd014f56d846c7
+EBUILD astroid-2.11.6.ebuild 1794 BLAKE2B 79d94a97b10cc1410cbe8da6ca6b44f484fefb712a630bd7dde7d52f7c25cb4247d3e60594d605ec4844dbe210acbb59b19fefef51bc5b6609fbb0fcd3a8e2c2 SHA512 1273a20a8750416d73a5294131967c24c85ea0f2f017da9b0f07f712c311e82c74d8b65f9de65325f0cfbe84ae2364985a751b8dd72de51072b8ea2dd12d1ef3
 MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
diff --git a/dev-python/astroid/astroid-2.11.2.ebuild b/dev-python/astroid/astroid-2.11.2.ebuild
deleted file mode 100644
index 29d52081ad2f..000000000000
--- a/dev-python/astroid/astroid-2.11.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~s390 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.3.ebuild b/dev-python/astroid/astroid-2.11.3.ebuild
deleted file mode 100644
index 313a897a7376..000000000000
--- a/dev-python/astroid/astroid-2.11.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.4.ebuild b/dev-python/astroid/astroid-2.11.4.ebuild
deleted file mode 100644
index 313a897a7376..000000000000
--- a/dev-python/astroid/astroid-2.11.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~s390 ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.11.5.ebuild b/dev-python/astroid/astroid-2.11.5.ebuild
new file mode 100644
index 000000000000..6d1eaf86312b
--- /dev/null
+++ b/dev-python/astroid/astroid-2.11.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~s390 sparc x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/astroid/astroid-2.11.6.ebuild b/dev-python/astroid/astroid-2.11.6.ebuild
new file mode 100644
index 000000000000..feef28506480
--- /dev/null
+++ b/dev-python/astroid/astroid-2.11.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	<dev-python/wrapt-2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+		tests/unittest_brain_dataclasses.py::test_pydantic_field
+		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
+		# some problem with warnings (our options?)
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
+		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
+		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker
+}
diff --git a/dev-python/astroid/astroid-2.9.3.ebuild b/dev-python/astroid/astroid-2.9.3.ebuild
deleted file mode 100644
index 86e4c8eb5101..000000000000
--- a/dev-python/astroid/astroid-2.9.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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
-
-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 ~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/async-lru/Manifest b/dev-python/async-lru/Manifest
index 018da666aced..5d1655fa32d0 100644
--- a/dev-python/async-lru/Manifest
+++ b/dev-python/async-lru/Manifest
@@ -1,5 +1,3 @@
 DIST async-lru-1.0.3.gh.tar.gz 10709 BLAKE2B 437880c419d0d8df5c790ff9b93d0b608dacba1847fc0974d35f89ff97bdd07589edc5371c729889791cb05cd8ec684764ecedc6d0d36b05ee930f885570095c SHA512 530c6e1f7a1ecc8a78cac927ccb9dfc2e394498a6ed3f54e73e4e9af48ef26ddeaad56a056a50b3c3974324af69b393cd94b1f4d20e3a2944b217c03a6bd6394
-DIST async-lru-17a5d207f603c0c142f01a69fbf6f487b3fef5c4.tar.gz 10486 BLAKE2B 88831686b79ed742d28a202b1b303333c52b604f6e786cd0bccc4141a81d002a2b2daf3a264bf83d40e5218a3aa3209579d99b9e1b358da708ffada50bea2d3e SHA512 3c92b5c2fe149e53889f9c4adba9b88a03815d563b56d45363310c2527d4ebb800147fc8e38847f4b473d424692bfae55f96e482979009fb1a977850fb08b2f1
-EBUILD async-lru-1.0.2_p20201029.ebuild 878 BLAKE2B 63174b56a1331577fd9ccb3327e5edaf0c1c8d6371febb93d26bcd73c031d26b58825bdebc52e12f7a422db62d2efcb9d6d62913f67ddcb51d08c787a3fb24f0 SHA512 4b6ff2e0445b060db8ca195d65e8a1df8e94b2a2e51fa1e5c8e723a7b4df95957fee1df86df3844c80a4e5b8374528cd67124199500d7c46f017b0958e6cd1ac
-EBUILD async-lru-1.0.3.ebuild 808 BLAKE2B 90b7323a062421fda7dc6995713fcf1c979e63043ac53f71de94c461dc0abd5941ddf56f1120981de20740c3c122a3ba817390efbc87eb69a0afd4973fea278c SHA512 259f5001055eb9438eefa72e3d6eb1a6cf6c40d7f03015cefaeb6dc032deb444b139480c5efad9f3517360950f0f00bcede11a7e07e1b37251e776ce0437a776
+EBUILD async-lru-1.0.3.ebuild 808 BLAKE2B d6c23d483145bee1f5877e452a23fd9c17768e7600b597e2ee5f2b8ce8209b9528ec32e9da2bbd4f5e0e83f47890c67bcea247012b14537ad9e1d223dc07d4c1 SHA512 2992909061808dad37041be3fe98911c4dbc484f93c285064f471238b791a46a7a6e4b6a85766d4c6d19f7725fed9229a86fa12b8f348aa811f176eb4e6551b0
 MISC metadata.xml 373 BLAKE2B bb8b67d9df0a86ac3a7d834e79bbc8a907d467e567f353b29427c9a36b11cc79eaa4d1b6f8cef9a43e632f7d333af72dcc1bc579922a1aabfc47cdffc7bd922a SHA512 c6c089b381a5c572b6ecc2907f2e90ee2f581516ac66a6f901d32990db5c8086eefcc97f80a90c9b83504934489c3440cac86ebbc0cbd76801510fba1a9f0ed3
diff --git a/dev-python/async-lru/async-lru-1.0.2_p20201029.ebuild b/dev-python/async-lru/async-lru-1.0.2_p20201029.ebuild
deleted file mode 100644
index de9bb0e48e86..000000000000
--- a/dev-python/async-lru/async-lru-1.0.2_p20201029.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-EGIT_COMMIT=17a5d207f603c0c142f01a69fbf6f487b3fef5c4
-DESCRIPTION="Simple lru_cache for asyncio"
-HOMEPAGE="
-	https://github.com/aio-libs/async-lru/
-	https://pypi.org/project/async_lru/"
-SRC_URI="
-	https://github.com/aio-libs/async-lru/archive/${EGIT_COMMIT}.tar.gz
-		-> ${PN}-${EGIT_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--cache-clear::' \
-		-e 's:--no-cov-on-fail --cov=async_lru --cov-report=term --cov-report=html::' \
-		-i setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/async-lru/async-lru-1.0.3.ebuild b/dev-python/async-lru/async-lru-1.0.3.ebuild
index 7863461b3f70..712d7dbfc1a1 100644
--- a/dev-python/async-lru/async-lru-1.0.3.ebuild
+++ b/dev-python/async-lru/async-lru-1.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 8cf669d87a8a..b58244f3086e 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10-r1.ebuild 663 BLAKE2B d0b2297ef2eb4958bf977aed9842ea30bd4921759ec8e92b58bf84ceb0ef0e2d7cd48bfd1d273b5f76fb902f5062e47e0356677e35dfe0da1bd6143e27fce32c SHA512 e034f64906200519549ece13ceb41d2e69914a7a923996bff79973a50c138272d7e1b2e012e35dd5bf45baa340f8a23752b3b0bfd10f9370950b375740e0eeab
+EBUILD async_generator-1.10-r2.ebuild 694 BLAKE2B 39fe4e78928196c5cc061176b91790330bc53bae00987dcda5b22df15a54a209d1e492c66ddc458637e1eda11a6aa0792da8db31be8670fe1deb4e0c0271aecb SHA512 2b84e4f6123e665ac32262f2872c1ab978f34de954dc548ddcaa697bb1ea383cade5b3048a7f1027c36dc0969ceb5a51fbc8164d3be50f70ac74efac1851c15a
 MISC metadata.xml 467 BLAKE2B 15e6bd812ec1d295024c92b3b8ce29d38b04dfb727321bb21a709b2cc29be2ed92e50eb327b6acb90fb2f393531f1abe0bbcb632050aea5ee471e5b3cee6b526 SHA512 857311284927e0c1517174b0ded3fe800c42d6649d7c958044c97c72bf48d27ad2357c1b28682ae2c3c85e4ee7535b36a24f062ab0487ea07fbc9d00ac248135
diff --git a/dev-python/async_generator/async_generator-1.10-r1.ebuild b/dev-python/async_generator/async_generator-1.10-r1.ebuild
deleted file mode 100644
index bbf73500c2c5..000000000000
--- a/dev-python/async_generator/async_generator-1.10-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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="Making it easy to write async iterators in Python 3.5"
-HOMEPAGE="https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/async_generator/async_generator-1.10-r2.ebuild b/dev-python/async_generator/async_generator-1.10-r2.ebuild
new file mode 100644
index 000000000000..ab13ae244470
--- /dev/null
+++ b/dev-python/async_generator/async_generator-1.10-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Making it easy to write async iterators in Python 3.5"
+HOMEPAGE="https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 044536867377..150acf93c65f 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-4.0.2.tar.gz 8221 BLAKE2B ebcb2ef956590e265bbdecc223a877e7260750aecf5b631c6af1f335ce57b51579467901e2344bfa8495010eb1e6e7a39adfd4b6311483d63e0674221888d1f7 SHA512 e9884a525b99bc1a3a15c958a1dbb25a92cb286bb7360b03b0be3198e61685970628c8fef6dc478beba3f031e0ff6f03b1fcc3c2c34032d7fea6f8b65850ac38
-EBUILD async_timeout-4.0.2.ebuild 883 BLAKE2B 5eadc1bae073d228b62b2f17a4ab905bb1f24d1c1e7abc8759e18fca4f076e6b0e811b8104e3876e894dd3b11273318172c11ee97bb742876da25f6fc63894b9 SHA512 d44a1aa8b3b759ecde91904e99d1ec75e8815bba9c782de9f5333e633bb8a20953e515b835ec551c570c2761cd7beef4a87cabbd9a07330619530839c8d40e0a
+EBUILD async_timeout-4.0.2-r1.ebuild 916 BLAKE2B 9a5d557e8f8b2d89502dfa0da24a1a056c6735aa6d313653731ebccb3398b305f7ed9e9b1b07ae9a9e9eda5baf80472f18947b834e27164329709f15675415e0 SHA512 3808699b34b89dd50c4c627b0ea8e22a4a30a6ecf82454dc497f960063ce62cd121674a0325706577f58ba26a596da942da1ba3c87d98b3546489d15a9f095fd
 MISC metadata.xml 460 BLAKE2B 33594e2b78abaae89f7cb0c953a432ead4c468e01d005d4a65aeb846030fa01b1544d8df393e9d73cc4af6e557f106f8077c3fc4b0b35aacec20033352564083 SHA512 47b1f783f49a63c17abcabcc73d350582297f5bdd266a3d57079f1a50e4a6e88680b73993d9efa3609fe9820decf7a4ea4b5b87f9db6e99509695286c50aab1c
diff --git a/dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild b/dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..ba37e31e4c08
--- /dev/null
+++ b/dev-python/async_timeout/async_timeout-4.0.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${PN/_/-}-${PV}
+DESCRIPTION="Timeout context manager for asyncio programs"
+HOMEPAGE="
+	https://github.com/aio-libs/async-timeout/
+	https://pypi.org/project/async-timeout/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pointless dep on pytest-cov
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:aiohttp
+}
diff --git a/dev-python/async_timeout/async_timeout-4.0.2.ebuild b/dev-python/async_timeout/async_timeout-4.0.2.ebuild
deleted file mode 100644
index cb5cb2173588..000000000000
--- a/dev-python/async_timeout/async_timeout-4.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-
-MY_P=${PN/_/-}-${PV}
-DESCRIPTION="Timeout context manager for asyncio programs"
-HOMEPAGE="https://github.com/aio-libs/async-timeout"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pointless dep on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest -p no:aiohttp
-}
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index aabe842d377d..59f86f81f00a 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,8 +1,3 @@
-DIST asyncstdlib-3.10.2.gh.tar.gz 45697 BLAKE2B 8f9bbee8d2a4e9f6a60a5088ef00940f22c2aec79557070d1b13d8d7256179bddaf1130ace0393e95e06e077824dd862e27a6c5d644ae52dab2d80989bb08027 SHA512 be5a8cbb521b8082ad9898907bce1a888443eafb24e2030f9dfbb2dff293646376ad44ebbc53d12e539ad70af935d833f2f114e383171388b9d724f274eb8421
-DIST asyncstdlib-3.10.3.gh.tar.gz 50929 BLAKE2B 109c6bb7712c9d59a31f3993336fc35b6db0375a8705ec9996756ccb4f1f5982d193edd5907d1e1c4dee7e41fa41e59884a6dfda01b1594fa22b8354c6142515 SHA512 6c2f140495b806beb28a2cf56f71d35da1c15fad8da2727ce6e8dff40ff606c36c03370fab285d084cbf41dd675c9e40c199fa1384826b3f1aa84c2dadb7b1eb
-DIST asyncstdlib-3.10.4.gh.tar.gz 52905 BLAKE2B 7b71e816395ab9e33ad4bd3d78d62e8260b78d736ba8b70bb6c47d9d4bbcc431f4a54b8c604e4b520df11a5317a7ab1a70d765e40089b323f985217a943eb96b SHA512 ced64809f1a8d1f60ed045bef69ff6cef84fbcf1b4587c70421112cdc65d6344bb1fceeb55e64e17237a00672bbfff19d4627371b45e1e7659e405d506abf216
-EBUILD asyncstdlib-3.10.2-r1.ebuild 610 BLAKE2B 7e0b105ec6009fd2d0f56ce033bbefc84f3e0689b70ad66171688070318638baeca6bea4e7ed3e45c2b1e0824813dd587ef726dbdbffc87a98b90cc9a129eca1 SHA512 230e2b354e114d42b630cfe7cb955418e4b0eb76aa805bb19ab209e5898a27bcf30c3db1f11b7ea9bcf787e5febf159f1a9fc7fa5d1e8664cb68624338d673d6
-EBUILD asyncstdlib-3.10.2.ebuild 521 BLAKE2B 29f1d54b54ab23d5c364106db4c0bedadbea9a9c5336fc4d799fd1ecd8f55a59a940e832e5c4767290c5e320317d73e788dffee6bbe895bbfb9dec5574dd8a28 SHA512 673c9e2bab7be93ee4d35b2cfc1adbc2275bf9a1b5457f9a68d5df163328daac286887b2af0280e429cdf2a0f67c3475a694c1de3d9c5b526122dd50f322e4cc
-EBUILD asyncstdlib-3.10.3.ebuild 513 BLAKE2B d0836c2aade5fd89a2eec4b15c2e7debd09ee1632cfe4c6cc8dbb6eb3f8907dd7b18191656e2af336006b3a9a8ab221ead6fff4acda046acd5d84bb6f058220b SHA512 0c61b822c012e8d7751e7a331a92a004a8a1e7e01a6a1c5644bea6c1e966da139be54e66caf2120b995072f4c6290717505de875623da426ec80d546944b829e
-EBUILD asyncstdlib-3.10.4.ebuild 513 BLAKE2B d0836c2aade5fd89a2eec4b15c2e7debd09ee1632cfe4c6cc8dbb6eb3f8907dd7b18191656e2af336006b3a9a8ab221ead6fff4acda046acd5d84bb6f058220b SHA512 0c61b822c012e8d7751e7a331a92a004a8a1e7e01a6a1c5644bea6c1e966da139be54e66caf2120b995072f4c6290717505de875623da426ec80d546944b829e
+DIST asyncstdlib-3.10.5.gh.tar.gz 54697 BLAKE2B b8a99a83e97084c4e09ddac0402ca23a8d42921b72774c0658aa0b9a1aa0ac1329baae782f105a52a4b6d979d490d97814ea6eac0e7570a7ca27784a27fa5c4d SHA512 3dfa8d1e5e2ef02dbf52fe7094b68496066978cfa9839cad59222ace40e0871369b45d93c1caa87e0f029c328253f6d72d8377625a8ed182498280662fcb7545
+EBUILD asyncstdlib-3.10.5.ebuild 515 BLAKE2B 202c4c54d1b7fc4a5e751bae83d369fd6e3c4a4ede1e1253d6709bd841f5a1a2509c61b5029b6197ec1d5120236a3b49c62ad781c06437038721c56297c9e335 SHA512 59783834379683699095adbbd6255677067ddd4a20e1b59a945ea251e58b8639bfef37d53bbdb51e33afcc84f60ec334e02e7c9b3a396e93f65dee7376abbf98
 MISC metadata.xml 359 BLAKE2B 10bdbf5adba9cefa912d8e1f195f20d4040bc2e8e3efb3fdc6efcb8272bb58160c6d772de3fe9ad9c4cb43e2817139319ffece082c3c043f1d97cb36ed8ac7a8 SHA512 e56f712f7446a3e68137a945a1ab212f6254740ce2f962fc7ab0061f41cb0d314809ad4fe3317fd10d8ebb594fb20d690d06b0a73636b13b5fdb5184cde2e306
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.2-r1.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.2-r1.ebuild
deleted file mode 100644
index 64b97b2b04eb..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '2,3s:flit:&_core:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
deleted file mode 100644
index 10f7da0d6a0d..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 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="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild
deleted file mode 100644
index 91515a83ee60..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
deleted file mode 100644
index 91515a83ee60..000000000000
--- a/dev-python/asyncstdlib/asyncstdlib-3.10.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The missing async toolbox"
-HOMEPAGE="
-	https://github.com/maxfischer2781/asyncstdlib/
-	https://pypi.org/project/asyncstdlib/"
-SRC_URI="
-	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild
new file mode 100644
index 000000000000..c1603924e233
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.10.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/
+"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/atomicwrites/Manifest b/dev-python/atomicwrites/Manifest
index a6cf9a3fc305..2f5c50b006f7 100644
--- a/dev-python/atomicwrites/Manifest
+++ b/dev-python/atomicwrites/Manifest
@@ -1,4 +1,3 @@
 DIST atomicwrites-1.4.0.tar.gz 11790 BLAKE2B 98a262f46acdfb94f56175368bebe3dbd5d46c1bd694362f5c9211c7be2016821c9a833f1061f41f77adadb3a26b6c6d3ac1761a13bec1f9ac2c3c0a35a58ad2 SHA512 493fd15174880917650643db1fe85e2703add730189c23fcff11ceb87175f546b9251050ade506d0b48300e0f2a39ee5a4dcd4da8cb3e27680fd05553d6662cb
-EBUILD atomicwrites-1.4.0-r1.ebuild 590 BLAKE2B ba35fa4dbfb6db269710bfcf98a65f254193fd1febcce7ec815f1c8061705c30b8b89569a80ce305d22136c8774e0d2f7d3b4879fa0d3a4daaec375486d88a62 SHA512 8eb825649d4212c34d2f004eeba2d43651a265f8e201b96948354d8bedadc5ee24b97b8c5babedbc2bdeb2da073cb63510e8a7fbdfc704832899d9a1a677942e
-EBUILD atomicwrites-1.4.0-r2.ebuild 675 BLAKE2B 5526816eb2a42a50c9515e25fdb0444e5f0123339e5378cfd9287e00b7b731c156844337b4227dd724a66ff641ba3135ed2f5dee0822103d7d840b4271f2f329 SHA512 52e1a799d03d2b33a01ee3967f26da66c60d7278da859c6377ea764268aeda986cab12d53c15b012c2c65fbf756b461d58451e7de49c2421423a6bfc3fba0eb7
+EBUILD atomicwrites-1.4.0-r2.ebuild 667 BLAKE2B b85b6cb53c664ae9f99f4ad6c7b9f22330d91fcbf804745eefa935a2079e3acc127309f57a20669461aa5b19885793ccf1d53271d2a08b517781f44383feee65 SHA512 3fbed275474613475b69a86b581f5a29b5330506da2fcc9b5df7dc74b0f4f8ce9ef027500c920802e69ea068726002d60379605770641b1db7951282c49787b2
 MISC metadata.xml 564 BLAKE2B 9d6489b465beebebbe6105d545637321ab4dfb88353bf498f6f9f657097e521bbb7bc430681736301c42b0809cdf81e5d72fb30a51d46832bea2fba4acd58cb6 SHA512 ae0eb669d1b19924c4107fe4f23cc5a7f980496aa39cf9fbf70ff013bf0491440f4946a5a37a19919ee5148740f5c9abfefe3c59bfa3916b7dc9cc243484c3b0
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
deleted file mode 100644
index 0cb008b48826..000000000000
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 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="Atomic file writes"
-HOMEPAGE="https://github.com/untitaker/python-atomicwrites"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild b/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
index 50943bf6661e..e8171b1cb486 100644
--- a/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
+++ b/dev-python/atomicwrites/atomicwrites-1.4.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index b0b2fa569979..ec839bb62353 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,5 +1,3 @@
-DIST atpublic-2.3.tar.gz 16746 BLAKE2B 60d12db8c56f3e3ce45c2e300759334b662369980b3dc36bff1edbac2d4a13dcf1bd390725eac488969d5a80e5ee5bb598c80e31ed3667c2e7d4f1f88fd00f7c SHA512 88c140c7ca0cfe3db791fd43a97f9fc63de979191a026df4d9f7a34a347b657d7d7b6fb7e31a231ac3adbc5e5d014b8e3c3606b93515a6ad42ea3d101b480329
 DIST atpublic-3.0.1.tar.gz 14131 BLAKE2B 3912c23c5ee575d7bdec1b598f1f360c54296211600115a413d97c73751b5301b2f3d22152aa62d4d7ac6da9a6cf4202a2deba1de374407ede4358620ee97391 SHA512 02c4af8aa02040bba2f09b852e17a0a90c0a6dce8fdabc8362a67c2f326b68369bf5f12f91291f9ff3395685530592561b132f09f9869867516592bd092e0e38
-EBUILD atpublic-2.3.ebuild 569 BLAKE2B c8c14dca615c68c00f64f90f2d0a1aa5c4b0f3693cd2504e19bc072ab1b8975e12d7af1b90b4771a06d6a9477f8896718973c40d1a9d6708ef22c71f7440d8ee SHA512 bd2c2fc701b7476f757cf4b68823ce8802b224ef65d6feb6a881a8ed78eae136e096ee0837ef9ade8b68b5f344fa45a20f4829247d342561c57ab8a0afe57d26
 EBUILD atpublic-3.0.1.ebuild 638 BLAKE2B 0ceeb54dff809cd1f0200f18b5798f726a0d94620295ee0c7db5d2df73ca4a957d820e18fb31bf5259432692f5ada412225c58ab36034af2180eb3b4bb835600 SHA512 76ae8311e95eddac4a6c000ac721f75cebcad053fe7870f4e7dff1cb4476d825b763f33e9cd3ccd34634d92b080809a2d059505e7205afbd8fc2d752a6cfdbda
 MISC metadata.xml 504 BLAKE2B 3b732123bf02f2346619de1b3e68f451c58e1138868fd8c52a24f979188115d9abf9308c390d061d5e679cbcc9bfa5059414dfd69e6fdfdd052e4bb1e61d496c SHA512 5ccf87022bea4e77dc26275572a97530d340b70f1b428676a6d86a3f24666ab702756cb285216a7ce6e670973a2ff50d7ca3f848ebab24c318d39563ae01305b
diff --git a/dev-python/atpublic/atpublic-2.3.ebuild b/dev-python/atpublic/atpublic-2.3.ebuild
deleted file mode 100644
index fd115ed1769c..000000000000
--- a/dev-python/atpublic/atpublic-2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A decorator to populate __all__ and the module globals"
-HOMEPAGE="https://gitlab.com/warsaw/public"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=public::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 5cf256ac0d0c..017a324567ee 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,4 +1,3 @@
 DIST attrs-21.4.0.tar.gz 201839 BLAKE2B f8e9ca1385efe6f5b9bf468f622f0bf5390830c5f3c3526821446113146a61460b17e8750ea763f6da50221a8aa65f5f1ff98a6ddf69b1a87344508ca6495560 SHA512 5a52776eb505c8a354912fa037a9710e49830fa6ad37272cb6d8c3298f4179a5b237e36cd7db3b1c9af19fbf0194ad6b83c3db9a473f9349769180073273ba65
-EBUILD attrs-21.4.0-r1.ebuild 1856 BLAKE2B 674c04a1d762a5ee6757d09f3e39a47e8749d1350655c3761ad84393875f46aead915edc0c8bf46bd062f10afa8dc9abe7830abd14bf70eee4fab18681b7dbe4 SHA512 991d8679150a0b27e597e65101658e7c6c0e1efcd2066a25f8c5d13584575b7fce6babcb4a41b858dc01294c8969de8018a2a2b6264a62a1c6f81004b5745d55
-EBUILD attrs-21.4.0.ebuild 937 BLAKE2B 54a0b6abab149eaec87c951f880250709a9a2a1b7016c5958b8fd1d0858e3c6c32bf59d0209dcad67004cf78c6f2be762493e19e0305971312d2e6c8b2cfe836 SHA512 f397ecd027ffb4a1ea0abd99dbf870618642e51f115bbcee3ce421ef14589ca5c7582b61362b1f848468cf79dd113f34f0614c418150482863aa06de9672275b
+EBUILD attrs-21.4.0-r1.ebuild 1848 BLAKE2B 468fba46dc9ced05a124eda67ab30bc0a7ea8bf1c5a55de545c1cf96cf26a682b6d1e36b6bcbe9d88276c67dd5dccfcb85aef2c88ce753d8b6d760d979008a59 SHA512 bcef30cfb380189d1427302221d3a531e32390f4375c504ce38b360ad0adc0ede60d50ae1db0feef0735a2902f77d559ab98a4ac41db1cb6ecbfdeaa2b395d62
 MISC metadata.xml 521 BLAKE2B 566735fbcb7141b4e2bf3130847bdde2850c803d5fe981540f728273231484984e5ebf3fed549cf9485763a8d9b8d102ccf984660a34541286621341e8aea64d SHA512 1b4999c797e93fd228652d1b6bd52dfc1a5e7b0828d2e70cdcf8dc859641c2c15f5353e1b9cf1b1f19dee8af75c521b26e651a7f4709e7729425d7dcc45137f1
diff --git a/dev-python/attrs/attrs-21.4.0-r1.ebuild b/dev-python/attrs/attrs-21.4.0-r1.ebuild
index ee58a8f99423..e52886d51ba6 100644
--- a/dev-python/attrs/attrs-21.4.0-r1.ebuild
+++ b/dev-python/attrs/attrs-21.4.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]
diff --git a/dev-python/attrs/attrs-21.4.0.ebuild b/dev-python/attrs/attrs-21.4.0.ebuild
deleted file mode 100644
index 1f70e5e92f63..000000000000
--- a/dev-python/attrs/attrs-21.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		$(python_gen_cond_dep '
-			dev-python/cloudpickle[${PYTHON_USEDEP}]
-		' 'python*')
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/audioread/Manifest b/dev-python/audioread/Manifest
index 1d3f607ae062..da6df662cfde 100644
--- a/dev-python/audioread/Manifest
+++ b/dev-python/audioread/Manifest
@@ -1,3 +1,3 @@
 DIST audioread-2.1.9.tar.gz 377500 BLAKE2B a90d1d7531c265a8c2b7933ac0bfc00fbdf298546620fef3ccae0204fc1eedcc584bf2fdb79b1bbda81b29d03346abc236cd0234684ba3cc70642f837033ab99 SHA512 ad2260b6931cfeebb815d48221366a2a5d8095965ff18e94c5eb0809d9a1b02e650a62ad5e895b7f1e003771fa3babf56f59ce4538aca78b678566fd28327290
-EBUILD audioread-2.1.9-r1.ebuild 899 BLAKE2B a395d8d3210224b0142855b2e31787a3d59b1d3a93bc2bdd3daf548ba41cb05561a409b7ae701ca91579e1baecad5efee3ec7bd559cfd95d826860dcabd3b5b0 SHA512 0586c0c4749775159ad5c63b70c4082490b8e3404e15e0c78e5cf01b658bbdc35297079875ef8237534265ec360ceda06af605a133d4279698cf65bc05a412d7
+EBUILD audioread-2.1.9-r1.ebuild 898 BLAKE2B 0fb36459dbaa361a3e3903c4a9f473b16806a91a6a3a5bcb9a61cdfefa4f16a55f869e9828315f91c4ab6b2db2e3abc3de27e5433406bbd1c8c2d0d1428a61cb SHA512 12a78ccd68eeeec1296c05221f5278f10b85b69450f9e717ce706f054256cdd30d767900f78ddff1d7341e8c8323dbd3f0de4894111d2781af8f9dc339ca9d77
 MISC metadata.xml 639 BLAKE2B 13d77444ab3bb26d8fb4c96cd3155e4789a7426fbc5f107598758f299c8d6524730d9f52ec31c99cc2dfb5830f9eaabe7c0632e70a51b6948e1219a87099b39d SHA512 4236cc1a5995a3f38e0067e56d7d3ff35596ff9ca359b9ed06028585a6ca7b20140112b28bb3969fb9b8a4702b09b61ba11b61e168c65ca4fdd4d74cc79e28c0
diff --git a/dev-python/audioread/audioread-2.1.9-r1.ebuild b/dev-python/audioread/audioread-2.1.9-r1.ebuild
index 0ed7e9717019..dc3fcdfea8ba 100644
--- a/dev-python/audioread/audioread-2.1.9-r1.ebuild
+++ b/dev-python/audioread/audioread-2.1.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ffmpeg gstreamer mad"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
deleted file mode 100644
index 005ba2baf2c1..000000000000
--- a/dev-python/authheaders/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST authheaders-0.14.1.tar.gz 101412 BLAKE2B 5ab6ff508123ae6f58eb4297dcd04fe3518244c0f423ecbc292948c437eac4d7ade7eceeaf4f4165625904489d494331d37c18b9dd4052a01e22c799df6c47fe SHA512 842881a6d2c3d192664960a9d1954f6e2c267cc6b07d7567f019869d07c1e40fc12275c381e90ea94559bd43a9d2e183d35e80d0ee9a861e80519a98daf2a699
-DIST authheaders-0.15.0.tar.gz 106222 BLAKE2B 7c0fcf7a85fdadf357c7c69863362de59f7450150143e21177d64b564c7b169cfea63045ae4003472be62dbb6a739181a17022d033a0c417dcfc982953f7e6bc SHA512 9640ff127d42f63a34fb1fa3f8daf149b0968bf0b0d4976cf3b005345125f370a3d15e3c7ef26d276a932c2659f2eef52fa5b98936eb3caeef954b3a1f0b4fd7
-DIST authheaders-0.15.1.tar.gz 106363 BLAKE2B 0df25b2d092677e88b7abc5d1f47ec6260e691a9eb3e2049b08e30e173c90c990c0d7b2379982934b7191ad22099f45eee50fea637f6d69ac8b853c4da97eb40 SHA512 aca49d9085325482888f9d25f5b085aa489700b90f9b76fdf71aa7cfeb23be9d2a38f908c79a0b92b98de94161dbb98b80af72b042ab0a46455745331d977f37
-EBUILD authheaders-0.14.1.ebuild 649 BLAKE2B 95516e65be797ab5e8b32d82338cc549096cbc9da74335fbeb50679ee0a634421022186fe8380da19ea350b77835f01147eeb1a21291bc8849d17c6627c2b9af SHA512 8a98f377a2d34674fa8cf7401efa2b5b1ff7bb2e6cb01844d6c97410e5e509b3b22ecf60af7e163509906bf402b6de3dcca38caa443ffbacad40a774fe63afd8
-EBUILD authheaders-0.15.0.ebuild 725 BLAKE2B a5984bad35ebfcb12095a9162954e62c720b31a0f68cf100219bd2edf6e5f2673235657cffd15d9c00e7364631b0ffd2e25d7fb6bbeaa5f8bc11843cb1ea00db SHA512 2c20d6ba6293242a1d44fb4c5c69fc753f4bdfd4770f359083bd6903cf8047092ac694eb8228bb250c7bd542c228a938de184f5c03c9a1eaa1a6f576499884f7
-EBUILD authheaders-0.15.1.ebuild 725 BLAKE2B a5984bad35ebfcb12095a9162954e62c720b31a0f68cf100219bd2edf6e5f2673235657cffd15d9c00e7364631b0ffd2e25d7fb6bbeaa5f8bc11843cb1ea00db SHA512 2c20d6ba6293242a1d44fb4c5c69fc753f4bdfd4770f359083bd6903cf8047092ac694eb8228bb250c7bd542c228a938de184f5c03c9a1eaa1a6f576499884f7
-MISC metadata.xml 525 BLAKE2B 8022323b7ee89962b9da58b1fc3abd621866b75e6a02fbc52eff289f04a099297c87d979a4cc452ad8fb44fd4a373461a983e60e923d89242d22a86debb80d39 SHA512 ea0cd9010dc915a1a73c5429b4fbb4e68109105b51b7fea9320fade10cef25546a834c2ac4c22ea506455b098cc2c8e867addb2eae76ff7edfd550bc24660a92
diff --git a/dev-python/authheaders/authheaders-0.14.1.ebuild b/dev-python/authheaders/authheaders-0.14.1.ebuild
deleted file mode 100644
index 9156e15926bc..000000000000
--- a/dev-python/authheaders/authheaders-0.14.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A library wrapping email authentication header verification and generation"
-HOMEPAGE="https://github.com/ValiMail/authentication-headers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	dev-python/dkimpy[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/authheaders/authheaders-0.15.0.ebuild b/dev-python/authheaders/authheaders-0.15.0.ebuild
deleted file mode 100644
index 9f1121bd277a..000000000000
--- a/dev-python/authheaders/authheaders-0.15.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library wrapping email authentication header verification and generation"
-HOMEPAGE="
-	https://pypi.org/project/authheaders/
-	https://github.com/ValiMail/authentication-headers/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	dev-python/dkimpy[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/authheaders/authheaders-0.15.1.ebuild b/dev-python/authheaders/authheaders-0.15.1.ebuild
deleted file mode 100644
index 9f1121bd277a..000000000000
--- a/dev-python/authheaders/authheaders-0.15.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library wrapping email authentication header verification and generation"
-HOMEPAGE="
-	https://pypi.org/project/authheaders/
-	https://github.com/ValiMail/authentication-headers/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	dev-python/dkimpy[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
deleted file mode 100644
index c7dd066e7a0f..000000000000
--- a/dev-python/authheaders/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">authheaders</remote-id>
-		<remote-id type="github">ValiMail/authentication-headers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/authres/Manifest b/dev-python/authres/Manifest
index 41fa5dad6d79..33f2c5e8743e 100644
--- a/dev-python/authres/Manifest
+++ b/dev-python/authres/Manifest
@@ -1,4 +1,3 @@
 DIST authres-1.2.0.tar.gz 23226 BLAKE2B ecae8e08a72cfca48a8264ae8d93bc29a8a7afc080a120b08380fe29be1ac50bb68a74e6741dbf7ada2f9eb901d2da0b1567e8aa10b7a82ba4953cd32cc94f57 SHA512 b801b24127f90608c4e7870a3a15bfb6e350f7d8bbe7b7cd9e1c6d541fd360afb9bdd15f35e864f01f8ff2d33d65650e712c932c9402ab2affb86bc7536b63e1
-EBUILD authres-1.2.0-r1.ebuild 586 BLAKE2B cf00057b9b78b4276c16bc2a7bb0e016840ed33206075f1859944eb3c9787ccf5745ac87db0bb5fcd0e324b6afbe776a59f1cc6b2abc29076745869451dc3638 SHA512 4c0fa3712e26ddf7fbab1702410035737822b671eb08a932e578d0edfaca0a5222df8dc303121c84fd600e4bc16f435d350f8283d86478df44b239d9a996fc22
-EBUILD authres-1.2.0.ebuild 546 BLAKE2B b0d91da6e1744447675c74732e997596d177fa8a6cf17341050b35ccd6e91af702d1a538f3239e69014f802468809f161ade549f7c79f0ef4d5c42b87a2b7207 SHA512 1045bbb9e81ed1735c0872e7afee49e67c3bb9e9012167dfd71e3bf9aa31f3a9569200ebafef9141f6979dbf359d0afd3676b2d4fd6040e296c24965c7bd91fa
+EBUILD authres-1.2.0-r1.ebuild 583 BLAKE2B ec569e35db15b7907c976fe8c22dda5f9e6f619bcbbb6e01eee90ce8774fca5a3b352421f3c4d3d5a9a8acf5ea818499103821587a8ffa0a2d04a91543a3fac7 SHA512 7651b0613789dbe8a721fbea3e56ace61997d79686ae8d417e6131c937bf1bcc90523a28c4dc1320fe9a8dd894b2f22953be618729fe704f774ed172804a25de
 MISC metadata.xml 684 BLAKE2B 42c30f654a56951219acfbdde20fb17a13ba61f8206baf6e7f46727fc27c07f29b0ade7ed72c9a752055f96fe9f0b078cef689dab834a2b77f6c959944344e67 SHA512 237e59ab7f7ccced9743a8dbc8f0737845e120b8cf7a53fb91b41811db14c2cef93f913b5f873b150a05302dd17a45721cbe4795f63034c5524aafb5f82575f5
diff --git a/dev-python/authres/authres-1.2.0-r1.ebuild b/dev-python/authres/authres-1.2.0-r1.ebuild
index 274f78a74a92..c9278ab80d4c 100644
--- a/dev-python/authres/authres-1.2.0-r1.ebuild
+++ b/dev-python/authres/authres-1.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 SLOT="0"
 
 python_test() {
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
deleted file mode 100644
index 3eb7608b317a..000000000000
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse and generate Authentication-Results headers"
-HOMEPAGE="https://launchpad.net/authentication-results-python
-	https://pypi.org/project/authres/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-
-python_test() {
-	"${EPYTHON}" -m doctest -v authres/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 6d4844fd021a..77959b79fb93 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,5 +1,5 @@
-DIST autobahn-22.3.2.tar.gz 376020 BLAKE2B 5d7b776c24541b08363942ed1868d5e7a2ccb4f99edc1ad722d3d68417852f324e79afa5ec8cc0251499ba27c078087ba40be744d657b562f5f1c431492705b6 SHA512 a33619bb7624f56bf571a4c61d11290316554c5c5a23724c6d5624f1e8e673dfc6a8e12ea3b17f809306a14f45e982b3425a23efb123003b575b248718c9a299
 DIST autobahn-22.4.2.tar.gz 396061 BLAKE2B da51f53f138ff6935f55561305c9cb0b29dcfef27fa63f32beac867f8aec2149a681f2dcbea6f30423e5571bf0fbf18fe13604c11d1accf78629c714bcbbc754 SHA512 9d803a699dd370b25e6c1601e635fe60a8e24f33245008bfe271d34ba47e70b7fab8c555a2c68a5255515a51e56476a63bfb0c9d98ed3687b71317ab46efc5ec
-EBUILD autobahn-22.3.2.ebuild 3751 BLAKE2B 90a1aebc176b9bb0c4acbddbcd1a2ca0e986a1777e5e759b4a19999bac246664032223b5e85f68fac64de9ff272d769db207741378e6f357d9d501ecbae3ad41 SHA512 a212034378ecaf84ea5bc714e7daf339b3ce5b201316891fd17f4acc6ab8a07dd5d78393664b80edfc504d3207c1dc185d9cf0d46bb0fc01776861aa4fc052d2
-EBUILD autobahn-22.4.2.ebuild 3755 BLAKE2B c39c6f86301b4d595e5236755b05bacc4ecce3cac1eeb82d80eaded33d242a4c7ecd711bd97e8a1c3b2e7a323513e40d755537dcffdf2477e1f914ae44a69f0d SHA512 91ab857cc3483a66f1b44e06d8f80a486dc64abb325638746fd97a5467a595b345de9e2ce325ca0349eaad765e53845c8bf513a49d7692dd5d6ee18b592ac93a
+DIST autobahn-22.5.1.tar.gz 435571 BLAKE2B 5e596102b639228d95cea027a0e7187adc4f0910afbd3c5753c0408e070a37b911362eba64c79ce6201000e59381de0941619bef152ca2d784a2c19f1a67a36f SHA512 c27c0f1a782c53df7c152c8043a8e5502f19944e9d5a6ab4a95d02016dfbba70a770f1f4969b75995beed852191bde288d80d1336d56fba1eea190d6590ca642
+EBUILD autobahn-22.4.2.ebuild 3683 BLAKE2B 5f0f9de97ffb069ef5b02af03ecb8b3e752b74548e10051ac57670511a9627d4ac8edc0eaa5a4ad036e39f9f63bac6fa40a819181433dab5ad743f9ecc854eb3 SHA512 9699e16e5e344f12775c5e0d03a3bfab69dcf92f49cd3fd1da2f77c6a200491b4070640a240c476459518e11f9bd4ab450beaa2318bf995b937ef127fed199e4
+EBUILD autobahn-22.5.1-r1.ebuild 3685 BLAKE2B 38a2c5e862d2d284444ca0e7483914cd7dda97303580fc85c65e2c3f99596baa5208db8480f199681e02be6cebdd2d21f79369d3af9b5a61126a25b936b3a9e2 SHA512 8c729eb36a389c05c262181e6b2e49a43cbe7873172155a60cfd994ef13e9554c185095529bd8edda6cbfddba140686be7aebec7d7825f03eeb1c3f80ff9d262
 MISC metadata.xml 596 BLAKE2B 07cc4fbcb4c6fde6b1bb49a0a30fa8d2ef7ff4424397e29053a6ac89d87acd9fa7b1897c5381910d53f590192945a89a5b987fcdb9595e42f67f23333010a0ba SHA512 4d4cecf09593ec201711b13de1820e59f007f745b41611471ec737da4d679323787ac06a3a987cede9bf2c8dff71c9dbcb197e6a9c9109cf4d3a34d9247f9962
diff --git a/dev-python/autobahn/autobahn-22.3.2.ebuild b/dev-python/autobahn/autobahn-22.3.2.ebuild
deleted file mode 100644
index 6280c160e0bd..000000000000
--- a/dev-python/autobahn/autobahn-22.3.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="test xbr"
-RESTRICT="!test? ( test )"
-
-# The order of deps is based on their appearance in setup.py
-# All extra deps should be included in test and in optfeature
-RDEPEND="
-	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
-		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
-		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
-		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
-		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
-
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-
-	# avoid useless rust dependency
-	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e '/import/s:reactor:__importmustfail__:' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
-	unset USE_TWISTED
-
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
-	unset USE_ASYNCIO
-
-	rm -f twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
-	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
-	optfeature "accelerated WAMP serialization support" \
-		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
-	optfeature "TLS transport encryption" \
-		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/pyqrcode dev-python/service_identity"
-	optfeature "WAMP-SCRAM authentication" \
-		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
-	optfeature "native SIMD acceleration" "dev-python/cffi"
-
-	python_foreach_impl twisted-regen-cache
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache
-}
diff --git a/dev-python/autobahn/autobahn-22.4.2.ebuild b/dev-python/autobahn/autobahn-22.4.2.ebuild
index a15603075d58..230dbd5485c6 100644
--- a/dev-python/autobahn/autobahn-22.4.2.ebuild
+++ b/dev-python/autobahn/autobahn-22.4.2.ebuild
@@ -11,15 +11,17 @@ inherit distutils-r1 optfeature
 MY_P=${PN}-$(ver_rs 3 -)
 
 DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
+HOMEPAGE="
 	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="test xbr"
 RESTRICT="!test? ( test )"
 
@@ -47,7 +49,6 @@ BDEPEND="
 		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
 		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
 		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
 		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
 		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
@@ -82,15 +83,16 @@ python_prepare_all() {
 }
 
 python_test() {
+	rm -rf autobahn || die
+
 	einfo "Testing all, cryptosign using twisted"
 	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
 	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
 	unset USE_TWISTED
 
 	einfo "RE-testing cryptosign and component_aio using asyncio"
 	local -x USE_ASYNCIO=true
-	epytest autobahn/wamp/test/test_wamp_{cryptosign,component_aio}.py
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
 	unset USE_ASYNCIO
 
 	rm -f twisted/plugins/dropin.cache || die
diff --git a/dev-python/autobahn/autobahn-22.5.1-r1.ebuild b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
new file mode 100644
index 000000000000..1d5606fe61ec
--- /dev/null
+++ b/dev-python/autobahn/autobahn-22.5.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+MY_P=${PN}-$(ver_rs 3 -)
+
+DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
+HOMEPAGE="
+	https://crossbar.io/autobahn/
+	https://github.com/crossbario/autobahn-python/
+	https://pypi.org/project/autobahn/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="test xbr"
+RESTRICT="!test? ( test )"
+
+# The order of deps is based on their appearance in setup.py
+# All extra deps should be included in test and in optfeature
+RDEPEND="
+	>=dev-python/zope-interface-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.3.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/wsaccel-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/snappy-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/ujson-4.0.2[${PYTHON_USEDEP}]
+		>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/py-ubjson-0.16.1[${PYTHON_USEDEP}]
+		>=dev-python/flatbuffers-1.12[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-20.0.1[${PYTHON_USEDEP}]
+		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pynacl-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytrie-0.4[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.5[${PYTHON_USEDEP}]
+		>=dev-python/argon2-cffi-20.1.0[${PYTHON_USEDEP}]
+		>=dev-python/passlib-1.7.4[${PYTHON_USEDEP}]
+
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	if use xbr ; then
+		eerror "***************"
+		eerror "Required xbr dependencies are incomplete in Gentoo."
+		eerror "So this functionality will not yet work"
+		eerror "Please file a bug if this feature is needed"
+		eerror "***************"
+	else
+		# remove xbr components
+		export AUTOBAHN_STRIP_XBR="True"
+	fi
+
+	# avoid useless rust dependency
+	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
+
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e '/import/s:reactor:__importmustfail__:' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	rm -rf autobahn || die
+
+	einfo "Testing all, cryptosign using twisted"
+	local -x USE_TWISTED=true
+	"${EPYTHON}" -m twisted.trial autobahn || die "Tests failed with ${EPYTHON}"
+	unset USE_TWISTED
+
+	einfo "RE-testing cryptosign and component_aio using asyncio"
+	local -x USE_ASYNCIO=true
+	epytest --pyargs autobahn.wamp.test.test_wamp_{cryptosign,component_aio}
+	unset USE_ASYNCIO
+
+	rm -f twisted/plugins/dropin.cache || die
+}
+
+pkg_postinst() {
+	optfeature "C-based WebSocket acceleration" "dev-python/wsaccel"
+	optfeature "non-standard WebSocket compression support" "dev-python/snappy"
+	optfeature "accelerated WAMP serialization support" \
+		"dev-python/msgpack dev-python/ujson dev-python/cbor2 dev-python/flatbuffers dev-python/py-ubjson"
+	optfeature "TLS transport encryption" \
+		"dev-python/pyopenssl dev-python/pynacl dev-python/pytrie dev-python/qrcode dev-python/service_identity"
+	optfeature "WAMP-SCRAM authentication" \
+		"dev-python/cffi dev-python/argon2-cffi dev-python/passlib"
+	optfeature "native SIMD acceleration" "dev-python/cffi"
+
+	python_foreach_impl twisted-regen-cache
+}
+
+pkg_postrm() {
+	python_foreach_impl twisted-regen-cache
+}
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 00ae7f8e73b0..c7a112ae4d98 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,5 +1,6 @@
-AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
+AUX automat-20.2.0-ignore-m2r.patch 835 BLAKE2B 5ea7ced5d5dc65c0439ef3ada83359177f0625ef9b463148a63545784c0842cf2cfc24d04c58415ecb3071d88acf490aff4f774c163d3ca8e2e3bbdf0efa4e5d SHA512 f03ae46feb1d6e10b07168de5bf86cfbc07703e326c66606fca76bb077b9c547ad3356143e06842423255da72b191793734d5173fbb0d19b8a0c640cfad9f4af
+AUX automat-20.2.0-py311.patch 777 BLAKE2B fe26ab800644d6930a17690aa033c9b60ac9c50802c6fcab52bb13222dad34a356a1df03996e4b60c0b5af0d7a71668d8597c045bc7ea47129e25a1bef69b096 SHA512 0b06cee66e4193da7aed7caa007b2d89e1ab4bf6f29b22de5d85ada7e001f467847375a93a38a394d64d0dd716c696b403c5bafc4e84a1d7f0c75e4e8a7c8d6a
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-20.2.0.ebuild 1596 BLAKE2B 7de9091c2bfb442fac9992b87c8b3bd864445aee6ce1b3b53669c49c6225ebf01148dcbb268e5e5fa22bdd195d60a48ed86c6b60a1458e0ff83d65e81e1fb668 SHA512 04f83feef538da6f357d355d9093cc1a1257f2b4ea7ec4870cae124598805fecac34f25553ffb436cc1a760ef26b284e2526864df7301cf83af054b20169638d
+EBUILD automat-20.2.0-r1.ebuild 1411 BLAKE2B f88e012d28b2f22c178002b406b7b06301d3bb6c4a11f8a90981c5a1a6821ca30f8018a119eb8d9a02885688b5aa67e7515bdab52aa7eb0290f53d59003eda9e SHA512 8b0b6c4e3c7bee28bddfa2dcc2e9bc5bca455eb2f9a48a0aab16f53de35c47ccabc9f567940fbd3d82bf2887e62886c7a4104b8f4ee65210066491e7eafb5a05
 MISC metadata.xml 670 BLAKE2B a71e9da919b5a2d171c96df7f1de0f5ad0431fa6227d90fdf3a0ac47e5d0f9f56a4dbf7b247708c9f47a50756c5dfc78c90691ec38a6fbe543d4ce840c8c1ea6 SHA512 06362e4e337d503492b51d21164c858b071374cf8fe5a974bcf4b2f8bc870bfae21b1aa6e630f8b4c44ec5f900659b082b36a408e143e8d0e83916eb53f3ffd8
diff --git a/dev-python/automat/automat-20.2.0-r1.ebuild b/dev-python/automat/automat-20.2.0-r1.ebuild
new file mode 100644
index 000000000000..b80987fef5ec
--- /dev/null
+++ b/dev-python/automat/automat-20.2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
+	"${FILESDIR}/${P}-py311.patch"
+	"${FILESDIR}/${PN}-20.2.0-ignore-m2r.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	benchmark
+)
+
+src_prepare() {
+	# strip m2r dep
+	sed -i -e "/'m2r'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc docs/examples/*.py
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	einfo "For additional visualization functionality install both these optional dependencies"
+	einfo "    >=dev-python/twisted-16.1.1"
+	einfo "    media-gfx/graphviz[python]"
+}
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
deleted file mode 100644
index 465e6cabec42..000000000000
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="A${PN:1}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/m2r[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
-	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test ; then
-		# Remove since this is upstream benchmarking tests
-		rm -r benchmark || die "FAILED to remove benchmark tests"
-	fi
-
-	# avoid a setuptools_scm dependency
-	sed -r -i "s:use_scm_version=True:version='${PV}': ;
-		s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install both these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch b/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
deleted file mode 100644
index 161b219626da..000000000000
--- a/dev-python/automat/files/automat-0.8.0-no-setup-py-m2r-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d0dec04..7a85a6e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -4,14 +4,6 @@ Setup file for automat
- 
- from setuptools import setup, find_packages
- 
--try:
--    from m2r import parse_from_file
--    long_description = parse_from_file('README.md')
--except(IOError, ImportError):
--    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
--    import io
--    long_description = io.open('README.md', encoding="utf-8").read()
--
- setup(
-     name='Automat',
-     use_scm_version=True,
-@@ -19,7 +11,6 @@ setup(
-     description="""
-     Self-service finite-state machines for the programmer on the go.
-     """.strip(),
--    long_description=long_description,
-     packages=find_packages(exclude=[]),
-     package_dir={'automat': 'automat'},
-     setup_requires=[
diff --git a/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
new file mode 100644
index 000000000000..5e3ef39f33e1
--- /dev/null
+++ b/dev-python/automat/files/automat-20.2.0-ignore-m2r.patch
@@ -0,0 +1,25 @@
+Completely ignore m2r (which is now last-rited) so we can drop the hard-blocker
+which makes world upgrades a pain (installed m2r would break b/c of newer
+mistune, and would break automat build).
+
+https://github.com/miyakogi/m2r/issues/66
+https://bugs.gentoo.org/848900
+https://bugs.gentoo.org/847532
+--- a/setup.py
++++ b/setup.py
+@@ -4,13 +4,8 @@ Setup file for automat
+ 
+ from setuptools import setup, find_packages
+ 
+-try:
+-    from m2r import parse_from_file
+-    long_description = parse_from_file('README.md')
+-except(IOError, ImportError):
+-    print("\n\n!!! m2r not found, long_description is bad, don't upload this to PyPI !!!\n\n")
+-    import io
+-    long_description = io.open('README.md', encoding="utf-8").read()
++import io
++long_description = io.open('README.md', encoding="utf-8").read()
+ 
+ setup(
+     name='Automat',
diff --git a/dev-python/automat/files/automat-20.2.0-py311.patch b/dev-python/automat/files/automat-20.2.0-py311.patch
new file mode 100644
index 000000000000..14ca69e7235d
--- /dev/null
+++ b/dev-python/automat/files/automat-20.2.0-py311.patch
@@ -0,0 +1,23 @@
+https://github.com/glyph/automat/commit/d0c2845ead9b8f576042d42134bfb5c63086be39
+
+diff --git a/automat/_introspection.py b/automat/_introspection.py
+index 3f7307d..403cddb 100644
+--- a/automat/_introspection.py
++++ b/automat/_introspection.py
+@@ -6,6 +6,8 @@
+ 
+ 
+ def copycode(template, changes):
++    if hasattr(code, "replace"):
++        return template.replace(**{"co_" + k : v for k, v in changes.items()})
+     names = [
+         "argcount", "nlocals", "stacksize", "flags", "code", "consts",
+         "names", "varnames", "filename", "name", "firstlineno", "lnotab",
+@@ -23,7 +25,6 @@ def copycode(template, changes):
+     return code(*values)
+ 
+ 
+-
+ def copyfunction(template, funcchanges, codechanges):
+     names = [
+         "globals", "name", "defaults", "closure",
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index 151c3490ffe1..9d11345c7f3a 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,3 +1,3 @@
-DIST autopage-0.5.0.gh.tar.gz 21403 BLAKE2B 1c20123bd7ac9dcfc53d5531ea5cec5dcb2d4b8f4c433ab958b96b769540084989ee841f963d24d1b01c3c4deed9933ab213e3838a898a8fc3261096a272d83d SHA512 b40bf0c432a8ecf82f56cf9679191bf13e5fbf478f1236d197df05e29ac27a1d33bffbf3f66fedbf93548e7314ee1a8f1687fa7c696b35f944f8f5dfd2b2dd19
-EBUILD autopage-0.5.0.ebuild 693 BLAKE2B d96b147c11ab6171146efe85077ad01a009786321131971abf201fb997cff62941cf8621c7f04591719b7aad9135ca12a9833122750b1fd253117175b95c0649 SHA512 1547d199345f1069ed39913456b4252c0c9ec48780baafcbae8a43a98e8512c1b48dcb8230c3c382ee66148dba12c30e02d12984e747efd5b87cee7a4a523b45
+DIST autopage-0.5.1.gh.tar.gz 21406 BLAKE2B 45d67443fa882d6f824ea71a8f9d20eb1ae789a271d84dc566a2535de631b5ce644aa28f51c5be1db818194e39628b6526ac087cd6eccc425132f15fafda10e9 SHA512 3d6e10c222566fd5f5e07e3247ebe19ce7ffe3b4baf9948741ee9a8aaafbefb0fcfaf4b26f0a4a6392615e73c7e8539c9bcbff1112a291c193c0b653f33e8657
+EBUILD autopage-0.5.1.ebuild 707 BLAKE2B 28f1d505accbbcc04e95c6eeb1b9b36c2ed25fe6ecc73b3b4eb730e79c8c51f57f97cdc7e94076b5ebe8ae7eaeea11665548fdfb13c4bd04bdb5a55ce5073f9f SHA512 9a90054afe0f5c0ed904aa2e13a01b1930883eed4777df90ca8acf4c422a857c981972b7e15159b6b3bbd3797cbc92e3082e87ad4425fdb8e41ff9b0c7cedfaf
 MISC metadata.xml 390 BLAKE2B 6be679e40e58985a6ad622fcb85f130bcc6b8039accd14243e6dcba458a0af721eaf9e7928bfe0d29f62477df6e437143865b68a61820b88dfd61a6e760992ea SHA512 3d76be1ae51467569281305138475733f9ce9b89b7d2a41f496c69bebd86e205019d1e75d1de22267d36aa2822ebe8bf94f5722d46ec27a8a79f349e38dad3b4
diff --git a/dev-python/autopage/autopage-0.5.0.ebuild b/dev-python/autopage/autopage-0.5.0.ebuild
deleted file mode 100644
index d0b1df26cfa9..000000000000
--- a/dev-python/autopage/autopage-0.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="A library to provide automatic paging for console output"
-HOMEPAGE="
-	https://pypi.org/project/autopage/
-	https://github.com/zaneb/autopage/"
-SRC_URI="
-	https://github.com/zaneb/autopage/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
-
-BDEPEND="
-	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-python_test() {
-	unset LESS PAGER
-	eunittest
-}
diff --git a/dev-python/autopage/autopage-0.5.1.ebuild b/dev-python/autopage/autopage-0.5.1.ebuild
new file mode 100644
index 000000000000..586d120bf11c
--- /dev/null
+++ b/dev-python/autopage/autopage-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to provide automatic paging for console output"
+HOMEPAGE="
+	https://github.com/zaneb/autopage/
+	https://pypi.org/project/autopage/
+"
+SRC_URI="
+	https://github.com/zaneb/autopage/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	unset LESS PAGER
+	eunittest
+}
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 658067169f8a..4cffc8e0be93 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,4 @@
 DIST autopep8-1.6.0.tar.gz 122165 BLAKE2B 606ccf7ab51b52db95287384f9b19fd0f72da9e8fb4537bf395651622a95f88d782679550e61816d60dd3faa2fa096c979575d60cbd95476fa1cd7cf2c4f4180 SHA512 f4ffd564ceb48ff1f37d0a051aa8fefc60595a68709045c13561d8ab73de48dce99cc12acf40559e587ba4f6fddd4727dd2b40691ce43c991d60dda2c8b0d617
 EBUILD autopep8-1.6.0.ebuild 760 BLAKE2B 13b165f2deecbda14f999976b63f5d6f5486db9ca13313518109a626f8bd3985c3c1c0b160e3ff2fe518394e4f93247dfa3757af6900e63a56b4deee9748255c SHA512 a25a8449dc7c430b917c409cf7e52f6f1381bb1463e94bfebd28976e76a42a79ccf00e944511f3236acaf0896aa3b124f1b67af7ffb5efb8d7f236b48e5b1eb4
-EBUILD autopep8-9999.ebuild 764 BLAKE2B 58e548231ca3c7a4acefe00795638eee425965e66bd7abda154213f9014b2db7ef5cd749830fb3f0d26c8d292986adf618e7871296f2b5b772b8b2ce8318bc99 SHA512 bb924400c5bb108cd8dca18df54360f7362ced56179006e59f41e8113880a15737535fbc38d4c648c874b9f4bf2d13516fa10570c6ba9b9125944789cc91eddd
+EBUILD autopep8-9999.ebuild 796 BLAKE2B f268b10e32865c7e92de9b22d929c5f0a632044a9311d3a6cba736c00b9b65906b30afa0b30cf8e70fc756b60093146777b99b1486119537cdb77a37be5011e6 SHA512 96d829614ed05ae8574369d8dac5146a8e20e20eacfa4d50a580aae54a99369eb21b7f5d92862007fbe423379ae9a224b33dfdde5cd669918395ca235f5d99aa
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-9999.ebuild b/dev-python/autopep8/autopep8-9999.ebuild
index ad9d9361b236..91c5dbfceeba 100644
--- a/dev-python/autopep8/autopep8-9999.ebuild
+++ b/dev-python/autopep8/autopep8-9999.ebuild
@@ -1,9 +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
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -22,7 +23,7 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]"
 
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
diff --git a/dev-python/autoprop/Manifest b/dev-python/autoprop/Manifest
index d7e3b25ecae0..b7df050483df 100644
--- a/dev-python/autoprop/Manifest
+++ b/dev-python/autoprop/Manifest
@@ -1,3 +1,3 @@
-DIST autoprop-4.0.2.tar.gz 20050 BLAKE2B 06165a02dfee0755ccf375041487f015e632b56b24766ac3d4bd484caaf1c99a0506994f16ace753f5890b782690b640196ee0cd6fcce0078ef51f8addcfcfe6 SHA512 27c8578e8f023715b07ebe21f4f46e98e606c863d3257bb1c8c31d9f59551d2494ef99e24eed856b308c8c77e1a3276f9e370434aa3e61ebb0b32a9b44fceee7
-EBUILD autoprop-4.0.2-r1.ebuild 533 BLAKE2B c4ba075a1e6ab3a1cb17235693001a1af6d007094a312f4df9d5ea8d9f76bb63d2a9e641c5d97d7991fdb98f4e7b1fc85bc6302a4d8927550e222d1f038c9ee4 SHA512 cac7dd30bb26816c5a76eb6e4caae643434c0c1205e124d5b2cdfe89512131e198c3644b927a1ceca82f9ad0f13217461f797f1bd67fcc61fda882fab0c3e332
+DIST autoprop-4.1.0.tar.gz 20254 BLAKE2B 2229ac42ffaa8a874bc4ab8b0bd032b5898e4c93badfa8e8d7a6f93309cd6d922932e0c2a5753b048cf98caff802a9545a706a8d776a648af67cae95b42338f4 SHA512 be356ca41935d77719cfb51db397e48fca74663f00c65862cd0c776c9f5ac9f4af891951ae14a6006736493f3721dfc7edf195fe83e73ebfb486cd8f492bd778
+EBUILD autoprop-4.1.0.ebuild 535 BLAKE2B 78f61d60d1cf6d6974e548b7940ec2197796be5957e13d828dd34614cfb57e2b603ec96e86ad0b819523670a44871c96b58dbd18cc0da9339d4271a6f25d31ad SHA512 d73550c15a60b4036170c5ad27dc60fc74f14c563a4c9445057f26aa0564130c07a4b41ad302f79e93f9d9a03f428c839e7e74fbe0ab61de9809c3505f81d14e
 MISC metadata.xml 1376 BLAKE2B 4546775f81e9b3002d39733fceb5b0c505a909c8de9a81159ba6458147c1f7b632464fa55ab43b94c210ec1a2e07a8f4259bf5bd7a07ae3c5f0edee316741648 SHA512 76e109f6d16d5e8de55fa6d613ecaa0c47873ac46b5c5818b7569045eac6108ea6088031a5c9f1c2335dcc3f527cf90443bf5c6346443835c763e7dce07fbd18
diff --git a/dev-python/autoprop/autoprop-4.0.2-r1.ebuild b/dev-python/autoprop/autoprop-4.0.2-r1.ebuild
deleted file mode 100644
index aaa4275f756a..000000000000
--- a/dev-python/autoprop/autoprop-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Infer properties from accessor methods"
-HOMEPAGE="
-	https://github.com/kalekundert/autoprop/
-	https://pypi.org/project/autoprop/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/signature_dispatch-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autoprop/autoprop-4.1.0.ebuild b/dev-python/autoprop/autoprop-4.1.0.ebuild
new file mode 100644
index 000000000000..c852a7266451
--- /dev/null
+++ b/dev-python/autoprop/autoprop-4.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Infer properties from accessor methods"
+HOMEPAGE="
+	https://github.com/kalekundert/autoprop/
+	https://pypi.org/project/autoprop/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/signature_dispatch-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 4feeab46d58a..948850e9c806 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,3 +1,5 @@
 DIST aws-sam-translator-1.45.0.tar.gz 1053946 BLAKE2B b34c7417bd20fbd5907992e860ff7acaf1f6dea699d4385bda96467ff03965f30b068835af377d41dcd0ef210509d0b21a05b7e65394771981f8b499730acd41 SHA512 218eda9498fe0db9bab71cdd09d128403248e80936eb2a0e8afeff31f5f8e959aa9d70997ed565c05739ab40bc93d51d1fd84969ec9d7e48b8f10c062b2f74d1
+DIST aws-sam-translator-1.46.0.gh.tar.gz 1082378 BLAKE2B 915f09ab6ecdecca7cc149ebd93d7370a3cfd103cf7e222fe5f8aefe084a8f285606a7a18467d996d643c70b132014d7ebeeb6d313498b8879ad13d905f3afbb SHA512 c33edd6209d7051a0d8132cdb675953a691f371e4ce02207d047be03211aff4d4c491c0f8d0fb8776a0693ff702d24ffc338d005bc9c6f166658e8293e478731
 EBUILD aws-sam-translator-1.45.0.ebuild 1494 BLAKE2B 2110e6c192887f37553b4ec646eff9e4ff2a17f4e772d49c6ff2e2430bf15fa5c1715541af9cbc708919077cd786718748e42af4c4e1c586e660912d5b437bfc SHA512 fc0339cbc38b29980a8ba8bd3106a5484b8c1a33f2e385fe2a69ff159d7ffefc4d2a4f92ba8b408a5a35edc6531e7518bfcec46711bb4d2840a5c1fb1c936f35
+EBUILD aws-sam-translator-1.46.0.ebuild 2298 BLAKE2B 00b0c58231c5c470c4fa9c5a8a45f1d6328c96183af14b0ebd5f3050401df631704f76f35d71ece3a3853edbc10553edd2eb85505c5b5ca5efc515583ec51037 SHA512 7d2b130306f5c0a0abd8bc582b6a0cf451e28f7950d6c78bffc8c6c667f057a7e3c7e2baa49d3fef49f99d3adf2b4131a72b9e08d7ac168b12d3c6716fb5d002
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.46.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.46.0.ebuild
new file mode 100644
index 000000000000..50524b4a89f5
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.46.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/aws-xray-sdk-python/Manifest b/dev-python/aws-xray-sdk-python/Manifest
index 48641af8002d..2bf7b4a319e3 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,4 +1,4 @@
 AUX aws-xray-sdk-python-2.8.0-fix-py3.10-loops.patch 1533 BLAKE2B 709ffaa46c2934fda754745f918bd54444433d5d57c6bca65d8c9be5b940e7ec91f8de47e94a31262ecf7126bb2068ed453ad18a4d6a07fae42d2bf6e764a600 SHA512 fcea4f8e094d1c3354897349c8705e7268e264d9699ec61609796d451db865931b1c2fd4e273fb80427645c0968993756e685e688d303e7fbe7c0bdce88d968f
 DIST aws-xray-sdk-python-2.8.0.gh.tar.gz 267880 BLAKE2B 7a433a0b1b3ca38a100f3b23c79e9b0d7f84cb096f6d30832fdf16f171f9528aee8b81aaf3ba263a90d46f791de8b2f37a919651f9699e5fcf3073db83fc25b4 SHA512 e0fb3fb0bfbd963863714537ea12771df7ffa2857aaf4cdb6414d71ecdfc65c2623fa40a6a48c4eab30f4370d545a595db2762932133a6eba56121a4048502fb
 EBUILD aws-xray-sdk-python-2.8.0.ebuild 1903 BLAKE2B a100c485d032e3c80394222f7546112120a1c718098d3357ffc94c8c2e386a2499a5673926508c1ea94dcf1cd4e72ace16f68393e685d7a5c674f87111a57f6a SHA512 0bd8cdbb48b494eaf07ee0ea82a555d7b3e900fda2395580636d2379dd3d64fb1b7943ac6d17f56aafb91ecf8d33223f7e737c113703a0283315215e69a27e45
-MISC metadata.xml 478 BLAKE2B 963cbec10db90be7fe2d7beef8920049b56d349eea7cc5fe97f2d4f99499a270651639ed2fed053742bb158387039bf225138708ba42e0670e3e101844127415 SHA512 2d7c682a648cffc2d65d6a5f340cec835cd67bc1dc28395ca8ec87bcedc78b290f6101f0455b89260b9b7ab1eb208c56a1bd74d3feaba09845a834e1e2bc5bcb
+MISC metadata.xml 579 BLAKE2B 3f7aaed38bcceb97fb3597954ca9075ddf7a5718bcac69327be2b99d241c6d8cb0eefd369ca892c8d751703de9067c7eadf19f8c4445334ee8e4952b99fef69e SHA512 f3033cf16f60cae6727f80bd53944972f851579ffef8101cf6fda45e2575696183ec92ea8c994a77bbf3ffc8219be2ae2fae456faabe73a9896bcefddf3b5db5
diff --git a/dev-python/aws-xray-sdk-python/metadata.xml b/dev-python/aws-xray-sdk-python/metadata.xml
index 6089dcf55628..925c16c14d43 100644
--- a/dev-python/aws-xray-sdk-python/metadata.xml
+++ b/dev-python/aws-xray-sdk-python/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">aws/aws-xray-sdk-python</remote-id>
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index 5dbf4bdc4e7f..196b5374b18d 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -1,9 +1,5 @@
-DIST awxkit-19.4.0.tar.gz 95558 BLAKE2B fa8f408e310ba819e6d8a326e67dddac44ffe0fec2ff3018e8eeeda269c50257689b221785f27c897f526e6f5180c49aa506be6b85e01602b0d7d1dcd88a6987 SHA512 c6c6cf897128153fbb1dac77d50028a7649b97278394384bf5a549c1583b9c89b694f1ce2c850d0b072a4a7142a9b906edfba8d3a68cb446c73a13e3e33c0a61
-DIST awxkit-20.0.1.gh.tar.gz 15896876 BLAKE2B b1ad083e8aa5075b2acd03fe588223186e96f7a09451dec471f58fc463717079840368ad770c3bbcc819fdf7b148fcfdc098baa72dae923d3a3db514318c8a5e SHA512 caa6092bb2d47c9027fd20e42207f4e4fd431afaaec88afd498d0f535545f99dbd9186338e803d33e3cbaa3fcb4e44f29d6d7688b2c22f9393438aae3c9c6ed3
-DIST awxkit-20.1.0.gh.tar.gz 15917777 BLAKE2B da7f112472d55fa90fc2c92ac6c4fbce89928a24e861e18b04342039aae2ef467bbf5f8b67a0ad5a5e3a90d77f5363d6df742199d988aa7dd35ac1b00c3625ca SHA512 835053a7adabc96f21650e7ed2d4bfb088fbcdbf359572673904756d7bee4fe2b60fc42d1bdacf4c8ab5a1101e474cb8d6018ae67486b16d9675dbe69b9d056c
-DIST awxkit-21.0.0.gh.tar.gz 16493147 BLAKE2B 9b89f9f6f2e231efcde0edeb7d39a1b328b9b534a38663a2463f974028ce96aa13677d8e14d4b4a55fd3de252d5e53dbab2d104e018ad60eaca1ddb1b7bf937c SHA512 e100359eb9be184924c9b562473dd23dcfddf270e72f2f0fc1f71f8774dc1d3fbfce6b365f13ecffe20b25b116690fcca504d373663c497e74d2d1185b98f01f
-EBUILD awxkit-19.4.0.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
-EBUILD awxkit-20.0.1.ebuild 959 BLAKE2B 17f598b81c370c5b6411df38161151ae38ecf2a6aee95be4c3074baf639b1d6e5f7e4d0ff50dac74cdbb1dc7372837f49c240719abbdac1cf72888473583c84c SHA512 5a3b29db6b34c949698d0c62f861aefe97fe352113d21b340024c823ee33129e2841162d5eb92237605b421db99b834b47dbcb53473a507394459bb1398b5b19
-EBUILD awxkit-20.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
-EBUILD awxkit-21.0.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
+DIST awxkit-21.1.0.gh.tar.gz 16516204 BLAKE2B 2891244e7dcb0aef7b2053713c4479b94528a69f1225a77c46243cb293ebfa2e86d59939bc906223e598c34a322a726c9b3f5fb9aa7859191385f9c15bae57a0 SHA512 2e2ff1ae5a1893e3ba464ff0ab3c5e98b7d0711c3ba1512b8a8f89e55385ab85df9623b23d6a81b2a800b0b184de1ef82fd23a655173fcbcebb1160e9eef973c
+DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0e5ad3d7650feb98dfe018c89431bf9b4fdc8c6c1c76aa9a26fe0d7c8a438cfa209fbe16b7480c7295c60352e30e21e SHA512 d2be8ffacc5b82600ecac5d909450f9eef3d205075c9783849bc50030abcc84ca6cae3682baf20de8e0efb9f651aa03374941d59cf52f9d4cb4b7892d5c0353c
+EBUILD awxkit-21.1.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
+EBUILD awxkit-21.2.0.ebuild 960 BLAKE2B e05e602d0daf612c9b4818838600e71682202d4c87189c0c13797e80e958659b2b33c0f72bcc45bd9f961d6294597922c301ba82f27b2b10580500c4d9e5c62f SHA512 d374a109811987644fad287ddec4e83759de82e67d94435927d0d44f8b19e2f480eaaf08ac124317aaa77e6866b0f88bdbac7bb2c7123f6d510c6374f3d292f4
 MISC metadata.xml 512 BLAKE2B be7f98bdaff6b814e03c9f6c816a0f1f59dc2e8763298f8a48107ea50b0534eddb314bb6d8b8a0f8c1d7c89c381916031544eea4a06068fb9acab4d2c8c48a57 SHA512 7322d992e1d67ea200df0cbf144d08fd387d7cd6ccb72191fc94dd605c9aeecb4b8083917760e2203296d5514fccd7ca621133aef6622658d1ef2c33171c8b7d
diff --git a/dev-python/awxkit/awxkit-19.4.0.ebuild b/dev-python/awxkit/awxkit-19.4.0.ebuild
deleted file mode 100644
index 6a4107d47a51..000000000000
--- a/dev-python/awxkit/awxkit-19.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/awxkit/awxkit-20.0.1.ebuild b/dev-python/awxkit/awxkit-20.0.1.ebuild
deleted file mode 100644
index 3cf96536cbad..000000000000
--- a/dev-python/awxkit/awxkit-20.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for Ansible AWX"
-HOMEPAGE="https://github.com/ansible/awx"
-SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/awx-${PV}/awxkit"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
-		-e "/'clean'/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/awxkit/awxkit-20.1.0.ebuild b/dev-python/awxkit/awxkit-21.1.0.ebuild
index f63cc6bc217b..f63cc6bc217b 100644
--- a/dev-python/awxkit/awxkit-20.1.0.ebuild
+++ b/dev-python/awxkit/awxkit-21.1.0.ebuild
diff --git a/dev-python/awxkit/awxkit-21.0.0.ebuild b/dev-python/awxkit/awxkit-21.2.0.ebuild
index f63cc6bc217b..f63cc6bc217b 100644
--- a/dev-python/awxkit/awxkit-21.0.0.ebuild
+++ b/dev-python/awxkit/awxkit-21.2.0.ebuild
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index f3e77a1c4a14..c8997ad2268b 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,4 +1,4 @@
 DIST babelfish-0.6.0.gh.tar.gz 90886 BLAKE2B deee75aef23cbcb7c64f385c303310e5ce1ef0a3180729e47e59b8e85015ff36360a4be74ef32869421c6d90cf185ad427a7d55b9ef3cf20f551233dae3d425f SHA512 9d3309e67815c301578533fdaf8baae946ba87148b458f7b01315203d2d4356dd770c1a0b7a0ffbba14036b77f1463d67e3b5732efa6682cb6afdae1a8fd0a4b
-EBUILD babelfish-0.6.0-r1.ebuild 605 BLAKE2B 4c4eab53a6b43ba273f635eb0638492e7fbce4a8c00ac56e5b236877b382579e5bf7d851e4aeb6ccd626dd43971683b26a6b2deb5a11fa10feebed127cc88810 SHA512 2dea366bc2cdef1042b83bc90fd30ec2d353df2cc40840b0b9e77e0aed825a03aac586b0d483d7de796456c604f08fe24db2f85eeecdc668cb742dd5949cd9cb
-EBUILD babelfish-9999.ebuild 538 BLAKE2B 932b02753c51a35bc7f58ac62922a037d5e60cca52f61e2c1bf2fdffd438147790a4354421a13f2bf4d5668e44b5b90fa3ecb252a4cb1b0e72120978fc9e5a28 SHA512 92a65e161e90509cc7ffe3612b1884955ca44fefd94f9bc5f37bc7c00f8b07512c4b312cfb2a465bd8fcbd1bc1c441e3c9af4a074253fa5a1ef69f5a1b826ee0
-MISC metadata.xml 392 BLAKE2B 8e9836a0468f33555090d4f599f315d74a16d2eae96be0b57c7f2da8eb8c25cb9a40c7955035ff762ee9f7724794bd152641a46644572d12f938ab91c84af900 SHA512 4e969379d2c11505a8a1b59b3d7fb0380bc512059e5051f676c046521693089cec76d13888d266a75ffb2915ddc69a63e7c8e66c2a0b9c1c0d49dc249cb598da
+EBUILD babelfish-0.6.0-r2.ebuild 530 BLAKE2B 6966ef3055a02f18e3aae0c8b8402e2bfb9cd65d1b072b736a14661912957f4af8e0dc6474e4315cc71b52aac3efdd2543cccd734049a2e1114e37943bcbf90a SHA512 c326942467fc970dc2a092d0f354ae700c795cfc77860267a1edd9cdb66adfd5c77fa8ae5fa352dbb83e704ceb4d62ebbf4671b2ec6905230c458ec8adc12b35
+EBUILD babelfish-9999.ebuild 470 BLAKE2B 148d90a4fa6738863937266722ae5a765b86384a517aca8355025d17e226f63232392ddf602091e40eeb77bf0052ba669389359b68cbb84d261b380d2c521e81 SHA512 cfa53d43764ef92fdbcc169647ec86c4d2e0ce4c83b92a5110bc8ecfa702bd7a56b2d6b80f26fb4dfda045b6417e62fc7245ecb6f41dbba6bb149a2a9e726980
+MISC metadata.xml 493 BLAKE2B 7c767a8032b69f973e5c7d9d9a5f6ee9480c0b3d9aa4489a26f473b9921f4f6122808fc6299be18a1471a28adf5d0e70395b8b381893630588146e404fb987d2 SHA512 2b9d757a9ac159088dba070276cd16e12554af21c14c4e33417ff25d5fce551d2fcbb2ecc1a394e23e8d5ecf7e3ba1f0caadcaee297c1b10f8917be8efd8566e
diff --git a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild b/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
deleted file mode 100644
index 8b07786003de..000000000000
--- a/dev-python/babelfish/babelfish-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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="Python library to work with countries and languages"
-HOMEPAGE="
-	https://github.com/Diaoul/babelfish/
-	https://pypi.org/project/babelfish/"
-SRC_URI="
-	https://github.com/Diaoul/babelfish/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	>=dev-python/pyproject2setuppy-20[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/babelfish/babelfish-0.6.0-r2.ebuild b/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..a3db144a7230
--- /dev/null
+++ b/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with countries and languages"
+HOMEPAGE="
+	https://github.com/Diaoul/babelfish/
+	https://pypi.org/project/babelfish/
+"
+SRC_URI="
+	https://github.com/Diaoul/babelfish/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/babelfish/babelfish-9999.ebuild b/dev-python/babelfish/babelfish-9999.ebuild
index 8876693501c0..eca670f3ee7e 100644
--- a/dev-python/babelfish/babelfish-9999.ebuild
+++ b/dev-python/babelfish/babelfish-9999.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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} )
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="https://github.com/Diaoul/babelfish https://pypi.org/project/babelfish/"
-EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
+HOMEPAGE="
+	https://github.com/Diaoul/babelfish/
+	https://pypi.org/project/babelfish/
+"
+EGIT_REPO_URI="https://github.com/Diaoul/babelfish.git"
 
 LICENSE="BSD"
 SLOT="0"
 
-BDEPEND="
-	>=dev-python/pyproject2setuppy-20[${PYTHON_USEDEP}]"
-
 distutils_enable_tests pytest
diff --git a/dev-python/babelfish/metadata.xml b/dev-python/babelfish/metadata.xml
index 7ca30aab7a05..682936828d41 100644
--- a/dev-python/babelfish/metadata.xml
+++ b/dev-python/babelfish/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Diaoul/babelfish</remote-id>
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index 357370db5eef..69b68802c16a 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.2.0-r1.ebuild 535 BLAKE2B a15dfb42588f1cddb549b1b90e122f8c3ddd9876a5f427e2d1e78488583747fd1c55d0ad3fef66689e74a7e7649591d4eaa9a619e053808ccda029aaa78fd32b SHA512 9091e2c20e6014399dd2b5630ea4805e072f80f98accff3c1c45fb557d2c7f4bfd2aece743f9b215b48a2161c128c7bcaa83c3d7deefd5f43e0580fc09751697
+EBUILD backcall-0.2.0-r1.ebuild 535 BLAKE2B 9dd14fd3a37c77d1dd62a3254b893cc2050e67ed27d0dffadad6c91b4744c8f05b3d643f7ccd0f2bcaf65e9f7ad7f5700adc912198eed52d427e78183a7dee48 SHA512 1d0907c29f873a47488337eb419fc3ca838a9b79184416258835bc7cbbc186905b6a401971bfc6943127c22d883897a5195a847e2234ac452fef2cda8d863197
 MISC metadata.xml 336 BLAKE2B 68a24b9019b03bc28ae1ba63aa540019a73e1ecfaa894b047b527e91022888c4ec12473e99db840a877f919c2141b5de86c565b087a9341d8ef105e527f709d7 SHA512 7c5c1fa30436195a17bcc2f3b972db4a92a89585a4f2f73ba25c15143d283e7e7708c6f0ba579703ed1011f48052fd4ea0fe78d68eda46cd6e0303025ef5b99a
diff --git a/dev-python/backcall/backcall-0.2.0-r1.ebuild b/dev-python/backcall/backcall-0.2.0-r1.ebuild
index b4920b10ac21..cdd11a8d5655 100644
--- a/dev-python/backcall/backcall-0.2.0-r1.ebuild
+++ b/dev-python/backcall/backcall-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
index 4f82dd7d0a34..cafa9234cd9a 100644
--- a/dev-python/backoff/Manifest
+++ b/dev-python/backoff/Manifest
@@ -1,9 +1,7 @@
-DIST backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
-DIST backoff-1.11.1.gh.tar.gz 17581 BLAKE2B ca940270859ad78cd29d33cfd3c17605f5b42c2c745b7e7a41d53b2d6ef4bee78dd9e8f15c80387da31679aac6d30404c0988013a890ff34bd55e91716c0eff8 SHA512 7ba0e579d2a4a4bb5046ddc0d1f4b5b58ae2969a10a10a3c657e7dd9b8fd0cd6bc56fec18c28c8fb49101521b3840fe31c65e103977ea5f52f3671a07def97d4
-DIST backoff-2.0.0.gh.tar.gz 19327 BLAKE2B a53d97c8f27b05a2cf0fac9d7ffd5c964f7f58c8c1d6957bb495502c4dd2742fb3dc7c9a6e31f9aabc8982d548926a93e23aa1a60bada4cb3ac9f0968647face SHA512 34e37b3ff45e92311e7d040b05783e094cafc5d1d32c7e2cb8ef89cb9c0ca1a7ca2b16ba596c3b1c4a308d1780d790c9b077411eb8d48d6c5c86f2d6ea82f475
 DIST backoff-2.0.1.gh.tar.gz 19356 BLAKE2B 0d4867372763d59cf3d20e15ef5a9d01d314f9862170f55bcbbb5c29eb571dd672d4e0393f6b5b6d84b695264915d6c9a2649637b84a79062d4fe6a37b742cfb SHA512 bcec57466470ab419b04e5bdcad7dd6717fda1e27678a9c0e2cab9ce974d55c2057a73dc488105e71ec9a893acb32a907809a839490ff6442f20d9d3f41436d9
-EBUILD backoff-1.11.0.ebuild 587 BLAKE2B fc65fe2619f995e9f35f23a2d1d2969213f4587052f354065a1cd4b499d95330cfe3f5f577d6b9a37b8e042f30decfe4cd8e8c06405de88086d7cecb95b4c1dc SHA512 c7a9ed39694d6f21f1734d9b637d5b210f480ff83cb4fb5e9f6cc1039a4a1a226da9379edb78e9df4e5c6e70c6ccc02174ad7f0ff88cdfdfeef2e63442b938ab
-EBUILD backoff-1.11.1.ebuild 593 BLAKE2B 7c79ee8006416a85a75a489cf52124673ef74dc54587b1a19ee9539b3b62b3ab6ed2c24c172812613cb1e6fa3b40c64772475b30b58e6f8584a65ef359e7c45c SHA512 bb5ade4d044249eb24e6e4d269bfa3f294e1ab47251b90a42184a21acceda611de8d85e5d06d16a55376fb2bfe995c7b7e66a631088e9d4c83e10b48d08b5ff0
-EBUILD backoff-2.0.0.ebuild 674 BLAKE2B 1f55afb78979118cead44d4f0dbc51fcba7295551c276c2875bce2aaeedb5d81a13990bea4165934d95fbca823af48564ee72172ca1982d374d9dc39390ce303 SHA512 9bb7442e54f9ac737fae1436698d83eb268c2a9e2309533227d5b07d588cfa98cb98bf6b2f7e31af6ee0330246a2bde37fea50e1adb34d78741d2cc05c4e1b88
-EBUILD backoff-2.0.1.ebuild 674 BLAKE2B 1f55afb78979118cead44d4f0dbc51fcba7295551c276c2875bce2aaeedb5d81a13990bea4165934d95fbca823af48564ee72172ca1982d374d9dc39390ce303 SHA512 9bb7442e54f9ac737fae1436698d83eb268c2a9e2309533227d5b07d588cfa98cb98bf6b2f7e31af6ee0330246a2bde37fea50e1adb34d78741d2cc05c4e1b88
+DIST backoff-2.1.0.gh.tar.gz 19475 BLAKE2B bd38b589ee28ce5319b2c92c64cd9d33921519d1be3d2250c2c3e803a1784e2e88f884b87fa10d6452d9a332a6db6fed23a6d4d9f79e9fbcb294b0123160f3b3 SHA512 9c2f903f9cf2017116cb9f6a97a089b3b5199249d3c42c06fc797b643b2f095b134b2e7cb00d3ca816a4badfdb04c046ff653672a8ce5db1764485820c5d1c06
+DIST backoff-2.1.2.gh.tar.gz 19622 BLAKE2B 937dbdcf1bad5d3c68703aa08bfec46176a6021afb70d52b71bb52e744881832d9010e3db70112ec40beaf26155a9140fafb5b726b80f8fe1078d69ca011378e SHA512 e0a81def797007a342ca37af6657e6b8a0861a41cb4c78b325e8cbf58e93df3ff900763833c5d5ff97fb9d2e83521ef4f8652ac49bcc6cfb6c0fd92e44356996
+EBUILD backoff-2.0.1.ebuild 673 BLAKE2B f610104a4dbc494b7802b22dedc03a16047b9d6a8b7e835eb242c61bbd87cf8815df472769d801509e77491f430592c29e5e82337d90a8439f08b0868b2b52b3 SHA512 8c6bb90b06b73dbf4907ec59d4a2f3dc82f129b34c59e76223234bcf60d0f57ac142d58568a1df758415d4a271cd68d7b67be8b34189560a7b0052efa4c3921c
+EBUILD backoff-2.1.0.ebuild 674 BLAKE2B b869a7444b141e414524d6502d44de6038551ec110706c7b63c3c8f0338621e5f770a93c83f1bede0c837c1b0fea713f95cfb683886dad8faf9552e6e6a0de3f SHA512 cdc7f725187e73dc65fdb06dd781db37fce51319390396bf61d418a8e363d93c19c9ebe07c3d5f7886f478d6f86323cfa7b56aad44d83e341ab7d67659e048db
+EBUILD backoff-2.1.2.ebuild 674 BLAKE2B b869a7444b141e414524d6502d44de6038551ec110706c7b63c3c8f0338621e5f770a93c83f1bede0c837c1b0fea713f95cfb683886dad8faf9552e6e6a0de3f SHA512 cdc7f725187e73dc65fdb06dd781db37fce51319390396bf61d418a8e363d93c19c9ebe07c3d5f7886f478d6f86323cfa7b56aad44d83e341ab7d67659e048db
 MISC metadata.xml 387 BLAKE2B 4f92bcc32f0e26aa86b9f1968002d6c43a454ca27996158ca2a4b98b467c80d7ed6cd4a23e0807e813ae73ba2cb5ccae5fc8612c4d7292f2d4981374e9ab4f10 SHA512 52f3668afe9b067c240ad5db519b08a3e054e2864233eb6f079d339f704acd73cc66e239308c90eaadff09c630a6788886c978fb622f2e29b081a27c23525489
diff --git a/dev-python/backoff/backoff-1.11.0.ebuild b/dev-python/backoff/backoff-1.11.0.ebuild
deleted file mode 100644
index 50f63c524f6b..000000000000
--- a/dev-python/backoff/backoff-1.11.0.ebuild
+++ /dev/null
@@ -1,22 +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
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
-SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-1.11.1.ebuild b/dev-python/backoff/backoff-1.11.1.ebuild
deleted file mode 100644
index 30c7e50a72c6..000000000000
--- a/dev-python/backoff/backoff-1.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="
-	https://github.com/litl/backoff/
-	https://pypi.org/project/backoff/
-"
-SRC_URI="
-	https://github.com/litl/backoff/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-2.0.0.ebuild b/dev-python/backoff/backoff-2.0.0.ebuild
deleted file mode 100644
index 6e819a3cee44..000000000000
--- a/dev-python/backoff/backoff-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="
-	https://github.com/litl/backoff/
-	https://pypi.org/project/backoff/
-"
-SRC_URI="
-	https://github.com/litl/backoff/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-2.0.1.ebuild b/dev-python/backoff/backoff-2.0.1.ebuild
index 6e819a3cee44..009799e13fb7 100644
--- a/dev-python/backoff/backoff-2.0.1.ebuild
+++ b/dev-python/backoff/backoff-2.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/backoff/backoff-2.1.0.ebuild b/dev-python/backoff/backoff-2.1.0.ebuild
new file mode 100644
index 000000000000..dd3c03188281
--- /dev/null
+++ b/dev-python/backoff/backoff-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="
+	https://github.com/litl/backoff/
+	https://pypi.org/project/backoff/
+"
+SRC_URI="
+	https://github.com/litl/backoff/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-2.1.2.ebuild b/dev-python/backoff/backoff-2.1.2.ebuild
new file mode 100644
index 000000000000..dd3c03188281
--- /dev/null
+++ b/dev-python/backoff/backoff-2.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="
+	https://github.com/litl/backoff/
+	https://pypi.org/project/backoff/
+"
+SRC_URI="
+	https://github.com/litl/backoff/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.rst )
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
deleted file mode 100644
index e533f003f1f5..000000000000
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-DIST backports.entry_points_selectable-1.1.1.gh.tar.gz 7688 BLAKE2B d142a4c608b05c708b01487bf2810324fe2e5229de0d57844949a4596f710f736252a3111d67a602a84a70eb32b53752a3483edf39454272bb483c8555a46cbb SHA512 b811a473e13ebb3dafe94d726bfe98d7569a9d9a98ab77f1ed975b17deecf84e93e04a4ee263c3721b4e9fbbfae2f307b8c88a83441f792dd88511bb99f19c1d
-EBUILD backports-entry_points_selectable-1.1.0-r1.ebuild 714 BLAKE2B df5de5eb8575f277e04535e509602555445d820cf4966d7722a7b7528496f244fc0771101c6f93f5320c88e29c553b31439ffb98d5790df8f8c9f94f10f79b9c SHA512 ff38a0679136d32a7215befb70c1928335611dcd6a717a551430eb6c84a5f9a36fd90e426942bc2e365294c160657e14ca4d0d6af59ac43129a7e71c5cb999ce
-EBUILD backports-entry_points_selectable-1.1.1.ebuild 897 BLAKE2B 15f519def012eb47ec929a6afc4ec20cba1f67075bd957d07a0ce7def440d7d9f0ee571cfe222ae82347bcd8184f8ae63545b097f7c02a4ac1186f55ab2fb523 SHA512 1e22464fa0a269782a5163920534e9a884dce9d5524a04b80c2df1a3100a94dbaac4b9a27e6b506551d920471fc27cea21ae86d4a755290098bd95392ce7121c
-MISC metadata.xml 395 BLAKE2B f7a6fc7aacb144be55af934b829dc87b5ebbb0c1048e45ad281b3ee49b49c6e7c852b866746916b83161e6970f39b04557ceade2177de047890063169aa64111 SHA512 604a1dec0428db8ceff5d231ce00cc4e24a2b8461df6a01e76b3b2347dd41c5f0eb15b2584ca6cd972f9e62f3b97bbb22082f0751c7c8dbee6a49133833b8477
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
deleted file mode 100644
index ca8636dc12e6..000000000000
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Compatibility shim providing selectable entry points"
-HOMEPAGE="
-	https://github.com/jaraco/backports.entry_points_selectable/
-	https://pypi.org/project/backports.entry-points-selectable/"
-SRC_URI="
-	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild
deleted file mode 100644
index c10cde8dbe74..000000000000
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Compatibility shim providing selectable entry points"
-HOMEPAGE="
-	https://github.com/jaraco/backports.entry_points_selectable/
-	https://pypi.org/project/backports.entry-points-selectable/
-"
-SRC_URI="
-	https://github.com/jaraco/backports.entry_points_selectable/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_compile() {
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)"/backports/__init__.py || die
-}
diff --git a/dev-python/backports-entry_points_selectable/metadata.xml b/dev-python/backports-entry_points_selectable/metadata.xml
deleted file mode 100644
index 9de20ef619fd..000000000000
--- a/dev-python/backports-entry_points_selectable/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jaraco/backports.entry_points_selectable</remote-id>
-		<remote-id type="pypi">backports.entry-points-selectable</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 6ed9a44faf9b..4fe19ac0563d 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1,3 @@
-DIST backrefs-5.2.tar.gz 5220528 BLAKE2B b786df162f37406c36b99d9d4d36ed439837dae2f1d138238d5afc6e9ab108f1c4be1802606e14892ae08d7e3878f5c5068a6923de14d13ab89ef6749fd69b6e SHA512 fd68cd90deaf299a3bb21f70126db51f537e6dc1126fa38beda63901dccfe4db81842aea23eb20ac9311bfef74ff2339ebffdb8cdbcfed197c3ef0fd5b3e793b
-EBUILD backrefs-5.2.ebuild 1169 BLAKE2B 2e2746d47b56e5ee5b78fba441c1b4a80c7294fe25adb1d6dc7ad6bea2e394f8445fc599448e3b6fd5cb472ab205224b6582442917e87995b26ea52fe83e769b SHA512 73cec4cb682e1c6a2e8215178dbb8f699a7b679161616de888214f93f91258d6880f62b134347ac588ba8bb0350e4d071e7d984de482f68aba4c6df4aeca5fa6
-MISC metadata.xml 1128 BLAKE2B e1b795b1c9d935cd295c0008eaa06ec84d120535ceaa37533b2e94b77a56707244d86ce250295fcf2b1271e818e7e97811b351e7d2c1d94d0525135744954f37 SHA512 227c8c99acc6c8adcf26c681c004db2e992ace746a692e55622e88783332c9072afced044f058b54246112f0e741fe0151985391b94b4f23145b7c6bdda5b6c7
+DIST backrefs-5.3.gh.tar.gz 4291850 BLAKE2B d2d21dcb2d6a540ff6d06fbadb08c9a9ae6251c9bf78601b59611e80215f659cb46e8d535563c397ea28d014a67ffbc4d29a8f8632023ab9904b9630ac96602a SHA512 c42985a26605e3ab1f8b30943efdc554829d2a5951f32cff486959be1c7c1c61613adc947379aaebec74d8f574ae2c39e46e4682e2f78bb059beee2d9572f352
+EBUILD backrefs-5.3.ebuild 1212 BLAKE2B d5c0a3abff2d21771ac7829b4b8f6e800c4140b6df3a3b10cf12bae10a1ae9b11ff80f1a2d2a43279cdb7f8a7aae0b75e878dd2b2ba9a9e2add63bf73decc625 SHA512 491a78232866f22c59e2da6470ccab00340ec848a142b82b595430272d1e9226ca93d82126cd9d6fe69ae376ff34a4c51c89a3128c4e6c38130e899ce18e6e8d
+MISC metadata.xml 1229 BLAKE2B b5f27256eae1a190da3f69879ea07f7dfd8239e376665da86b8e881afd37bd49ebb8a7adcd95a4cdad9e68639def1c2fb93fe2aa36277c3b0e4fcd9710e327a0 SHA512 fd8e5658be271c220b30e1023eecd07e30e0fa6053e9e4dd4babd87a229710aead337c9958d6c26b8b8d681497836b47f773010504fbc0dba243a7048bf890e1
diff --git a/dev-python/backrefs/backrefs-5.2.ebuild b/dev-python/backrefs/backrefs-5.2.ebuild
deleted file mode 100644
index 4cf190eeb3eb..000000000000
--- a/dev-python/backrefs/backrefs-5.2.ebuild
+++ /dev/null
@@ -1,50 +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-git-revision-date-localized-plugin
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wrapper around re or regex that adds additional back references"
-HOMEPAGE="
-	https://github.com/facelessuser/backrefs/
-	https://pypi.org/project/backrefs/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# 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/backrefs/backrefs-5.3.ebuild b/dev-python/backrefs/backrefs-5.3.ebuild
new file mode 100644
index 000000000000..d230b992ae00
--- /dev/null
+++ b/dev-python/backrefs/backrefs-5.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs/
+	https://pypi.org/project/backrefs/
+"
+SRC_URI="
+	https://github.com/facelessuser/backrefs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# 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/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
index 7ab61b053729..5c2d652494c8 100644
--- a/dev-python/backrefs/metadata.xml
+++ b/dev-python/backrefs/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/backrefs</remote-id>
 		<remote-id type="pypi">backrefs</remote-id>
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 5a4575619760..c7c383eac4b3 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,3 +1,3 @@
 DIST bandit-1.7.4.tar.gz 495104 BLAKE2B 5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54 SHA512 93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
-EBUILD bandit-1.7.4.ebuild 998 BLAKE2B 49ab3b3e2c9b6aa3e2d1b41e4a17524f63dc2eecb56b73f0622e0cb21f24505bf1254b701cb1cd474e6dbad416dbe8add30b13ed78145f1c9990d9e06a494e78 SHA512 a990b91f6a468219e513f2b59af5e8d926876c1d4828057aeba39d68aac39258cd1354a541aaab9e9537c7014a87196a1c9ed40cfebdcbe1f7bb8cc34b815e0b
+EBUILD bandit-1.7.4.ebuild 1005 BLAKE2B 66e736cd32142e8dc37e427b458f928f039a8f94e4d01c60dd64cee99f31f6e453db3c136c6ace4ca0e678a92a6e1d597b2852d7daa72842131f187e8fd2a4e3 SHA512 708f6d9365c2ef6b68ac99e38010b1de7e7b6e2390ecdd1317abf6ad6e31febbd735f24f4ed3a0b3c67e1767f267e89bb38756e1d347e5cb345a9712a15ebf65
 MISC metadata.xml 709 BLAKE2B 845208c1e800577f159e34675344ce540c61888393dfcfc2f7c47e77ccfd4784cb3f1990b25b78f97d62c8b5c53feaadfdc894990333a09b7938a90be68b8815 SHA512 ba2c6de072973fcd891e4e161a43d52100df89f13243765cb5b2f2ccd7ef7a5266d8fd6e8d373859b53d6743c1de5b0733d5bb4f81b4a94d95843e0593e9dc8f
diff --git a/dev-python/bandit/bandit-1.7.4.ebuild b/dev-python/bandit/bandit-1.7.4.ebuild
index f75317ac605d..898f32bd880d 100644
--- a/dev-python/bandit/bandit-1.7.4.ebuild
+++ b/dev-python/bandit/bandit-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bareos/Manifest b/dev-python/bareos/Manifest
index 823004c13783..8daab80cbc3c 100644
--- a/dev-python/bareos/Manifest
+++ b/dev-python/bareos/Manifest
@@ -1,5 +1,3 @@
-DIST bareos-20.0.3.tar.gz 13335390 BLAKE2B c35ab9fd290377fc56ae8ff87f54b1cde5d1b7caa89b9c97e259da48da4e07fa85cba38c5a4d461b7ce170f9b14a69f78ad217584abb77ee15d3e85080cbe49b SHA512 3f9bf020e0d519da75221ebd200634713c791e2fdc90a13482ffb3294912d5e2ee28f8338dbef06ba6c98727bae447f6f8bb8d4a06520001f7cefa3614769082
-DIST bareos-21.0.0.tar.gz 11306618 BLAKE2B 0363465c40a8053bb5ec772c18ac0dc852f379979e3afc45dd29c79f8187238363c1f07e2f39d25613404b1b6e253700b33b274389ca2dc4655d201bc4888166 SHA512 0a57bccca0589f3ce8a5664afbeb1eb1b17ec7142722e2d0bb2a0bbd9007688725b39c6db59646c180ce096e55451c09934e6479a2b4deeb4d3ee738ab2c32cd
-EBUILD bareos-20.0.3.ebuild 461 BLAKE2B 55fd39e126d3e926fb0690a0a8542ffbe154f9cc783222c973bdf6c4055b0673cbdeed1ce1b18cd79bf9ef107b49f1b111d111218709f4cd3ee5b3476a1608b8 SHA512 cd04b782f9411691de7c4f4d8d0937e226fcf511631c0522865678a788d6343f05a5f3412d59eb8236dbef2d5f765ba982e020828997cd81d13ab566447060da
-EBUILD bareos-21.0.0.ebuild 477 BLAKE2B 34f64a479e4be9e69c4e2702a4491fb23a6150c30161bc15ef1a08c2a041d67c2fdc677be1d555ecf3ebe401a7bd0516fad0abc9380e250cc54652ff923ed76c SHA512 fe7da5d94554b7ebc42a35e5c5c33c681283c71466096cc0b470305e045747643624cfd7f9d63d35749017d502e305f6f38b1213fdb9129a5574572f432a4d69
+DIST bareos-21.1.2.tar.gz 11582588 BLAKE2B e7e02b3897d7e377cc79d9d0880da821f1b81d1f54891d89e704e78f51471cdf94b5a02ffe2f4ed54dec38bf37ccc757bf1641c3b678a04e401f48484ed3c941 SHA512 acdc787ff828add93c81b2b7d293dec90f2aa22aa3aee3002662bd30e88dc0dc58b753bb63ca7c111fac6c7eeea888938236c1169f92ed6cec27941036c7b6b1
+EBUILD bareos-21.1.2.ebuild 466 BLAKE2B 1a8bf6d7b3288b06a8fdab23d06e7197452aa9d5ca03ce7b5832c34e3d3f6bb525180ae392e0aecd4d66f7fc8f753ecb9be52ab01305686d8e3ec9832bba826b SHA512 5b36d6e654cd20670d72dfe30db1f4a0dcab7b2296c9b7883f244a62c94dedb95d9cdff29f24668de51747fa02e0f222801c333f309fabb09b47d972b6ebda30
 MISC metadata.xml 329 BLAKE2B 9e0fc3eff1f6e5e0b9529f5264b5e9aac303a2806f6276691728689df3e0f23d866a57e4df9794aa59be1008d736e073c9c854a88edd0c460bc5102a2f098848 SHA512 2325dddc4c62c5f0caba21e0419aea28cb556dd56664eabb2219cf7ea0b1b3177d5e142c6760a95c0a3aba6120f60d37241f6faf01759a00a6f76b12d4332e10
diff --git a/dev-python/bareos/bareos-20.0.3.ebuild b/dev-python/bareos/bareos-20.0.3.ebuild
deleted file mode 100644
index 8c10886711d7..000000000000
--- a/dev-python/bareos/bareos-20.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 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 bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/bareos/bareos-21.0.0.ebuild b/dev-python/bareos/bareos-21.0.0.ebuild
deleted file mode 100644
index c823e3bf2130..000000000000
--- a/dev-python/bareos/bareos-21.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 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 bindings for bareos network backup suite"
-HOMEPAGE="https://www.bareos.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
-RESTRICT="mirror"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
diff --git a/dev-python/bareos/bareos-21.1.2.ebuild b/dev-python/bareos/bareos-21.1.2.ebuild
new file mode 100644
index 000000000000..e67df5d90be7
--- /dev/null
+++ b/dev-python/bareos/bareos-21.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2022 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 bindings for bareos network backup suite"
+HOMEPAGE="https://www.bareos.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/Release/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-Release-${PV}/python-bareos
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror test"
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index a388b2179ab4..586268f821be 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,4 @@
 DIST bashate-2.1.0.tar.gz 34717 BLAKE2B 6d25c9fe35f976f5ef24d580cb7ee5a30eb79f68f05de2b6784b79ec93ae090ecbc2a2a09b0cabd4a6a997adef6ccb73f8f258044b0443fa231a403115591202 SHA512 6ef17da86113195d8dae093fddb7c17a365b4cd7816ef0ebb98ac6cda61f52526092f7da6c39c11fba9d709a124970e18e93e267f7d0fb38190e313208f66e98
+EBUILD bashate-2.1.0-r1.ebuild 581 BLAKE2B 738fe250001241cc064556db88b882d285cc83f7a7de9516b036ae4f296be6801570644fd05ded18be6e768af99490f24120f98cad1a0c82208b3cb8795b431c SHA512 b2a23c548d8337142e4846c107f62b1082a175e84b0508ead5dfd45943bbbe4038ce2f1a72d6d1e762473c5b8bce4f3759c82dfb4169cd5994481fae3a1720ff
 EBUILD bashate-2.1.0.ebuild 547 BLAKE2B 80026742c91d0204411efda36034e9be6b767443b120cbb8d5c619f8575057da0009ea1b7e937459dab81b4de5a6a72a7bce401832e7ff34933c20fe7bafc3e1 SHA512 e8ff4de79e70c12d7de8797bf670746c886cd5be47784bc303b74996432196d1fefcb77d6aa87cefa1a3f01022eabc67a38e2bc9d0c8c1ee37b3ed24a9f84906
 MISC metadata.xml 557 BLAKE2B fcbe8cb654adf3d748269b79f868dda3f6662fe0d2579ec2450e29e95d6a35ba2df0a470a387cc257c4df6af54420e7145562c739a0122fdf2f3963b300b1ed5 SHA512 204325d2ab7037d0425f2054b60f065fb998ca2757814966755ce106bd6e69f7e4844bd148ff619d6afb138359bb0567317c348debd391cf093bb52e29559a9c
diff --git a/dev-python/bashate/bashate-2.1.0-r1.ebuild b/dev-python/bashate/bashate-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..cd0df55538ec
--- /dev/null
+++ b/dev-python/bashate/bashate-2.1.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A pep8 equivalent for bash scripts"
+HOMEPAGE="https://pypi.org/project/bashate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 52a34eacb55b..9d6da826b3eb 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,7 +1,3 @@
-DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
-DIST bcrypt-3.2.1.tar.gz 42371 BLAKE2B b2157dbde3412cfc643bed9e847999bfc02a2d6f41b6527e85e52ddb04b462fdacd2fd40f2794fdfcdd6a7be6a153dfd98a50212bb78bfd870262a040b2de592 SHA512 16fdb1740d635eba11f6786cf02684cd9012899e4136347e95ec7944c41f838014dd8b5c73c47070bce50f475aa9ff3ba9078f68de4450d2d92a94761fb6de44
 DIST bcrypt-3.2.2.tar.gz 42455 BLAKE2B 01cfd126662b16bd9df782effd58cf8fa1bc518af95d814fb5a857ff8d8a4a9bc302241341e656247c49e0f39a7d69feb0d40dec9dd8463bc150b6ebdd165c2b SHA512 2f3b88bffaa9ff820aba6fb3143253b7936a1440ae93caff13cbdff58c1f8427f132cce60299cda523659b7026751a954b476857f2b9841cdd2a1a50c430a626
-EBUILD bcrypt-3.2.0.ebuild 740 BLAKE2B e74cfa916e2409c8a1b4146476261545da0e706efbb5dd5bc368314647fb4318b4aade305c97a01f7aa6f334ac504851da67656e4346bb07d47cc1a72bb4e176 SHA512 0197d5b61a519e94cc9b14a992371a78ac10c40c8ce3f07af49e0733de769a10a7c12a89f9bb2181ac3d1eeff0a5e01990ca194b2d70e7eff465d825c64ec827
-EBUILD bcrypt-3.2.1.ebuild 722 BLAKE2B 5d6c082aed0cd12b2ff1efa47de81385a929ab5f3fd2567f010a4188e9a5b511a7fd008bc58193fd0fa9a4c71801109028591a5d0fedbae552dc7047d5cfe74d SHA512 5e21f264946c9c9fa4980e9d9e3ce117e536d478cb5da0acb32d99d10ad67be5588f6354cfd369d2067a921fcccf6a3e7e7b020c62a1952e3ce2065bfd4c647c
-EBUILD bcrypt-3.2.2.ebuild 727 BLAKE2B 246431675ba9770c9b3ae4a745720f7e801c4852dc8397e5bae858a11f2e978ff569db0e85ab315bd1c37f9b0768f25aa77a89321a8eb3e801957c5f00fe0e6a SHA512 7b9a9f80de0f663240c65a5a398e9da27bfffe84d3d1d3598e5e605fc7c969a4f502c131fb134acfede107c3e001a8b40edae6dd36757f61a76db97fc6bd0018
+EBUILD bcrypt-3.2.2.ebuild 719 BLAKE2B dd033ccbf20e44b0856982e9194a8a73761c902bb8b71459aeacb89b53e1597fd684508c182a576d16040ad52931ce4d45c6f58a1c9c08874c6c7a04dd498659 SHA512 858ba2dfd8f85dad3eaac81ac2dc0b54dba0839d7c0670e92f7b52eee24003c57c5038ff39b03025048ba7485741255ca62ae008c6c94f1b45d96a3817e16cd6
 MISC metadata.xml 486 BLAKE2B 874ef427438f2a2adc0529010628dd40505fd2597e267b8e51641d95b4c3bd8dab28d0fcd86c23f24c3abc866bd049d5e44438b282a5a13b023320491303a5b5 SHA512 de2e0a2a60b83a660a7c51315816a2762d9ebdb031656b8968da641d4e3897e4f5eb7a3432f828182f733ee4ffd17f11e8fb97d9a72f1a7eec56bb2f46978293
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
deleted file mode 100644
index 704c71a5e59f..000000000000
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bcrypt/bcrypt-3.2.1.ebuild b/dev-python/bcrypt/bcrypt-3.2.1.ebuild
deleted file mode 100644
index 0af714cd7e24..000000000000
--- a/dev-python/bcrypt/bcrypt-3.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Modern password hashing for software and servers"
-HOMEPAGE="https://github.com/pyca/bcrypt/ https://pypi.org/project/bcrypt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bcrypt/bcrypt-3.2.2.ebuild b/dev-python/bcrypt/bcrypt-3.2.2.ebuild
index d17f2e90456a..56ff17dcc747 100644
--- a/dev-python/bcrypt/bcrypt-3.2.2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beautifulsoup4/Manifest b/dev-python/beautifulsoup4/Manifest
index 12b0b1189a78..385549f1e22b 100644
--- a/dev-python/beautifulsoup4/Manifest
+++ b/dev-python/beautifulsoup4/Manifest
@@ -1,5 +1,3 @@
-DIST beautifulsoup4-4.10.0.tar.gz 399890 BLAKE2B 61f044064a81e94b64a72fd49cca164faa05442bc76f897c8a7fa4481acca039bcb9e4f7a1853a7155504fa25e56c518806d8af016369bc37316ecb95b59d7d3 SHA512 92be99ed0fd479b86519395143516e28f7b80f54a8251223d6e7b88dc98f8dfca9585079f5f1d89bfe68f577de3dff433711642486303203f46bc76754959a18
 DIST beautifulsoup4-4.11.1.tar.gz 517113 BLAKE2B bc0cc8dbb1bffca2d3441a274147f201b79447f2147f7b4c329f05f6d230f9986eebd3709199d0b3c7dba8c15e4ce42e9dc75e290a2bfdfdae643f5dfe07e767 SHA512 7446be07cd55f23def929e6491f0d74a940cf50206ed520b8ae7b9d57bd19ecf6aa821f446ca4f26f1e08b43fcc71fb397886f51a3f0ec691f9e53dfdc7a0cf8
-EBUILD beautifulsoup4-4.10.0.ebuild 701 BLAKE2B bc8954ced5f76f0eaba96059a2741dd941efdd2d8ece17ef95e9817e6d6e06fa1194882549c2f4aaff72ac65ede2410c3b5376f3cf4f529fe93f00c0d2d9957a SHA512 34cbcc3d86bac3adf0e0d4c7ad5e19668f076efbd02d0d51cc9d61facdd1e1fd6233874b3cf7957cb13e9125e7fbb006c602ca5b079072ed67d1a521eb56f869
-EBUILD beautifulsoup4-4.11.1.ebuild 1031 BLAKE2B b5d7cee36a290ed5beddc24c13d3d522013122b5b0be8b47ff89c2505bd80fa9710522f5b8b85089a79dea9fabfc037e2496b7358cf361bdabe64ea0ce54a6d4 SHA512 2c8e4ed06e145c00bbf6440ebf55498412c23d478ece0d47ceeeec34ba0955c8bcd32cc21bc256e54689902546b5013a9db97796f97500cd128e3361d65b9227
+EBUILD beautifulsoup4-4.11.1.ebuild 1023 BLAKE2B 5628ae3ad280edf202cf624eb74dc37d1270af1087412110122a153c9956666cb9fc23fa8ed5838470b92d005137ade3bc8316047c17a710bb508af8d968d915 SHA512 ca7019aba32519b4642f1c72c065cf0f65ce51a81a63b4a7479db35085ceb56a155d96e59535721d2b61103c4972848e20af9eeebd8ee8dfeeb0f6a1cd8d25d8
 MISC metadata.xml 745 BLAKE2B 16e44221decda568bcfd7fc64384f3c10d6150801bd099fbee3abb0273fa53bc83494cd9a56d43b125e9b2d773f9e1dcd35820bcc26a28048beea287a9fc3e23 SHA512 b332203a23fbeef550ce75c70afcf6eb9decf4e3e0409899d556e4e12449608100e1e6af81f163a879937bea2726195524559aa1151f917cc9facdf2bde559e0
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
deleted file mode 100644
index a7ec018849e4..000000000000
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
-HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/soupsieve[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source
diff --git a/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild b/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
index 5d5d50bc1f75..6d51a91b9848 100644
--- a/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
+++ b/dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 9a5069a8c6a8..10ef0e76080b 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,3 @@
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
-EBUILD beniget-0.4.1.ebuild 592 BLAKE2B e9a6c78f4444226557fc7b06e9846114a64b5f542d44d406c7c371dd0bb5395e1b304dc3dd1ad0dc8f81180073bcf7e585d390a82cc4fe467b60f6f893d6ad86 SHA512 61cd72404ea03ea023778612e0a9cf8f2411020217185d6ef9f32c7a71d06e9aadafe935c9f6cac8537f9b63e497c8af9dd8e2bbf2b0e1a6896ca685959fcc12
-MISC metadata.xml 354 BLAKE2B 07c668c0a7fbbecdbb11f3a7b302ac589ad9af00e5ffca9b10f2542d9cdedf3f16cd5e9b8e04fe2b79a469f38a2083339b49503b90589b7322ec10cc867f9d61 SHA512 5dc1c04d0de4d6150797e91bd7f3224ec6fb5656bba3bcd48e332fcc5758c41b1e02bf74844a92eef5299af953ced75ffcc59cfee062c21c5c5ea6d83fd3472c
+EBUILD beniget-0.4.1-r1.ebuild 624 BLAKE2B 600a78a57e4420d2c427b3dc9ddbd816cc75d0052ccc87f48b95c0907de502223342dadee15777cf41381dd945e0ad3660e4612ceacf9ddaca9f8d3581db70cd SHA512 1022855f2473948449c86aaa1b0bfa4824e61fe67760496f85b5e553273bc8c9280a419b45b21f8fda2fd2a1a747179e493ed9eab529e53b084ede6e8ab1893b
+MISC metadata.xml 378 BLAKE2B eb443e862f02368c1521515425eb99835a1b9505ea959705f1fd4e5e02b764ad900dfeb96d849f3110bf154ae3d2bd0e5033e89edc1df0a7e18c085fab77e2c6 SHA512 87c1d109aceda4601ff65cf5f355c36e82a7e5ee7772d77bfac4277620f96644006186278bedffcadd5af75e692b0e22e0e6df76e8303c9218818a54aff06bb9
diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..91647c33dfe8
--- /dev/null
+++ b/dev-python/beniget/beniget-0.4.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Extract semantic information about static Python code"
+HOMEPAGE="
+	https://pypi.org/project/beniget/
+	https://github.com/serge-sans-paille/beniget/"
+SRC_URI="
+	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+
+RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/beniget/beniget-0.4.1.ebuild b/dev-python/beniget/beniget-0.4.1.ebuild
deleted file mode 100644
index 8d7b67ff331b..000000000000
--- a/dev-python/beniget/beniget-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extract semantic information about static Python code"
-HOMEPAGE="
-	https://pypi.org/project/beniget/
-	https://github.com/serge-sans-paille/beniget/"
-SRC_URI="
-	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/beniget/metadata.xml b/dev-python/beniget/metadata.xml
index 5527672e5ea1..60851ae7fdbf 100644
--- a/dev-python/beniget/metadata.xml
+++ b/dev-python/beniget/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">serge-sans-paille/beniget</remote-id>
 		<remote-id type="pypi">beniget</remote-id>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index a1f3fcc6d5e2..afb3b4b5c8f4 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
-AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
+AUX betamax-0.8.1-pytest.patch 1535 BLAKE2B b2a4d97fe2d1fad680e4037613bb3bcbe815902f79e975a768123a7017f53018cae0e18640a10d7fdf3afe59a33ea7ca02c9508f2341955ab9866c3f44411beb SHA512 258bd6729286dc9374829308c23cca73ea640c4597ca8747ebb8281bcf7723bba3dfee5b55cadff0459e8dc4511d85228d37911e981859dd0af55a3753ae9e22
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1097 BLAKE2B a8c95c301c5e2c63cf4207e0a769c97ecf6754df11c623800f5526ec5fee909c490fab0536416db86f168a5e96e57b21557002a47f8bf480c8e9029ff1c3d8cf SHA512 c093372f2e2b0c196fb7b257d6bc442a20e9fe76621ee2b8d20402e59cfd77eddbf543d296c872566e4e3bc3b15a64dac5b6dc536423308cf1ffbae964919aee
+EBUILD betamax-0.8.1-r1.ebuild 1270 BLAKE2B 3e5dc824a5bd90ee86a91ceac3a5f90b69d17c2315ea5cb13026aa44d84bf807d6c66adbda54ce09b2233e1e96240319a304368d8b09d554c956b81ef03a6033 SHA512 9f39457a9c912302883437e6a2eba511f4eabb463007d92630292765e343fe700400d9066bf0e36e9d4640eb00c5959c200a69d42ee35d786992a12359c0c645
 MISC metadata.xml 313 BLAKE2B 04211b989a66a623cac0e27b3f810fb0b102f334ce917764eacb193711cf7ded5eab1203d4da247ce6082072677c176c36bdb7fc8bf087ce9561874d7a63a6b0 SHA512 e07fa6058392a097412cdb49d86549b3cad79fb720818fd5110a0cad5e145ebd512d71132e25192386924454f850d6422e53db735b4533a6ed6f0d2c33148c7a
diff --git a/dev-python/betamax/betamax-0.8.1-r1.ebuild b/dev-python/betamax/betamax-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..e7791ecd78cc
--- /dev/null
+++ b/dev-python/betamax/betamax-0.8.1-r1.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..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="python-requests HTTP exchanges recorder"
+HOMEPAGE="
+	https://github.com/betamaxpy/betamax/
+	https://pypi.org/project/betamax/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+)
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/integration/test_hooks.py
+	tests/integration/test_placeholders.py
+	tests/integration/test_record_modes.py::TestRecordOnce::test_records_new_interaction
+	tests/integration/test_record_modes.py::TestRecordOnce::test_replays_response_from_cassette
+	tests/integration/test_record_modes.py::TestRecordNewEpisodes
+	tests/integration/test_record_modes.py::TestRecordNewEpisodesCreatesCassettes
+	tests/integration/test_record_modes.py::TestRecordAll
+	tests/integration/test_unicode.py
+	tests/regression/test_gzip_compression.py
+	tests/regression/test_requests_2_11_body_matcher.py
+)
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
deleted file mode 100644
index 2972a145cc33..000000000000
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="python-requests HTTP exchanges recorder"
-HOMEPAGE="https://github.com/betamaxpy/betamax"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}/betamax-0.8.1-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm tests/integration/test_hooks.py || die
-	rm tests/integration/test_placeholders.py || die
-	sed -e 's:test_records:_&:' \
-		-e 's:test_replaces:_&:' \
-		-e 's:test_replays:_&:' \
-		-e 's:test_creates:_&:' \
-		-i tests/integration/test_record_modes.py || die
-	rm tests/integration/test_unicode.py || die
-	rm tests/regression/test_gzip_compression.py || die
-	rm tests/regression/test_requests_2_11_body_matcher.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/betamax/files/betamax-0.8.1-pytest.patch b/dev-python/betamax/files/betamax-0.8.1-pytest.patch
new file mode 100644
index 000000000000..e3bfe39c81ca
--- /dev/null
+++ b/dev-python/betamax/files/betamax-0.8.1-pytest.patch
@@ -0,0 +1,38 @@
+From 165cc321f2b9839418269e9493b03eb2e43f7ddf Mon Sep 17 00:00:00 2001
+From: Jiri Kuncar <jiri.kuncar@gmail.com>
+Date: Mon, 9 Sep 2019 12:23:18 +0200
+Subject: [PATCH] tests: fix direct calls to PyTest fixtures
+
+https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly
+---
+ tests/unit/test_fixtures.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py
+index 387d9ce..41f33eb 100644
+--- a/tests/unit/test_fixtures.py
++++ b/tests/unit/test_fixtures.py
+@@ -27,9 +27,9 @@ def test_adds_stop_as_a_finalizer(self):
+         # Mock a pytest request object
+         request = mock.MagicMock()
+         request.cls = request.module = None
+-        request.function.__name__ = 'test'
++        request.node.name = request.function.__name__ = 'test'
+ 
+-        pytest_fixture.betamax_recorder(request)
++        pytest_fixture._betamax_recorder(request)
+         assert request.addfinalizer.called is True
+         request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop)
+ 
+@@ -37,9 +37,9 @@ def test_auto_starts_the_recorder(self):
+         # Mock a pytest request object
+         request = mock.MagicMock()
+         request.cls = request.module = None
+-        request.function.__name__ = 'test'
++        request.node.name = request.function.__name__ = 'test'
+ 
+-        pytest_fixture.betamax_recorder(request)
++        pytest_fixture._betamax_recorder(request)
+         self.mocked_betamax.start.assert_called_once_with()
+ 
+ 
diff --git a/dev-python/betamax/files/betamax-0.8.1-tests.patch b/dev-python/betamax/files/betamax-0.8.1-tests.patch
deleted file mode 100644
index 19da7d108efd..000000000000
--- a/dev-python/betamax/files/betamax-0.8.1-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py
-index 387d9ce..f0bdc3b 100644
---- a/tests/unit/test_fixtures.py
-+++ b/tests/unit/test_fixtures.py
-@@ -23,6 +23,7 @@ class TestPyTestFixture(unittest.TestCase):
-     def tearDown(self):
-         self.patched_betamax.stop()
- 
-+    @pytest.mark.skip(reason="broken with newer pytest version")
-     def test_adds_stop_as_a_finalizer(self):
-         # Mock a pytest request object
-         request = mock.MagicMock()
-@@ -33,6 +34,7 @@ class TestPyTestFixture(unittest.TestCase):
-         assert request.addfinalizer.called is True
-         request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop)
- 
-+    @pytest.mark.skip(reason="broken with newer pytest version")
-     def test_auto_starts_the_recorder(self):
-         # Mock a pytest request object
-         request = mock.MagicMock()
diff --git a/dev-python/bibtexparser/Manifest b/dev-python/bibtexparser/Manifest
index 0c65dbed9318..4f3c14950356 100644
--- a/dev-python/bibtexparser/Manifest
+++ b/dev-python/bibtexparser/Manifest
@@ -1,5 +1,3 @@
-DIST bibtexparser-1.1.0.tar.gz 88656 BLAKE2B e5285953fbf79558643e19ea39f6421394f93afbfc6820be9bee0583c1efa010b9fe3478c9f3e36bea0c64e35c9d5bcb8341f1ee784c4150883e160723b94119 SHA512 f984cb307bfb8ee8143499469c0a83a28b3e9f061b17e5b43b7f9aa730c91427f2b2c441e501d37ab62f99ce2b7dd1cd7dee40b21c9f1a8e8b2dddf8eac2e74b
 DIST bibtexparser-1.2.0.gh.tar.gz 88600 BLAKE2B f02fca0330f035b3d9051c04ab5da57232178c637d250839c3939780424d2be9afa619d7a7781cbc92917da12aeb5f35847a54f460823b46a2a717f4b0ca6f8e SHA512 c8775f17d963c6dc5cf3f9dda52c798b70c939cf4c7a90501194561abd7f2386d6681cc236615366a9d8917ad01238fc2e6a4299f98b50b594c74c99bdb3ecee
-EBUILD bibtexparser-1.1.0.ebuild 754 BLAKE2B a71827b9a9935c9b1332b13fcf698a71c5ee118feef195d69672bd5fb1d376e7a805253f7e9020eb5d37dee777af5d34054b388c7bd9971f93730f61f9809756 SHA512 5476178fc2f8b85f8e4488bd5084daf112e424e71922b4a325acd4d28d93eb8551654c23798c857dd4d824c02b491c5fa0ffd41df388d808bf18833a837100f5
-EBUILD bibtexparser-1.2.0.ebuild 751 BLAKE2B df35bc66a8e57314ea5bfdc3397049c0a56b954999680c3c185aa5135a3842f4ca6e9e30a06618bef143ca4fded392a9017736bfce4ecc13b2539cdbab899c69 SHA512 bdbd245fe0ab5099e77963221c94e08d25f6eb13466624979fbc8985fbf4915a960e49a249b60b8b0a88ca76eed1aa3166b594a98095bce3e419686977fae4e4
+EBUILD bibtexparser-1.2.0-r2.ebuild 906 BLAKE2B adedf9b1fce5b4f76b39c72e877ca75773e744a5fcc2e19dba72f25c51273421c53eaacd7094370c0d2462f47d3b1df6d95c3fa89ee07cab88a8ef62f8fadb8c SHA512 96582a7d9b69afc1677fde89d80443490c677034dfcd559b6c580be777dc71012aa2894b2342d7e3be973591053bce935362313569730d5b2df75effd51dae28
 MISC metadata.xml 420 BLAKE2B 931e6f1915be7d1b809bd2f59fec9f057fe3f6c6219ae3d5d8103a5e5155d13dc6decfbb5865d7a333247178371adae7f2712d12f0e001badb941d5fb2b8e6e7 SHA512 254ba66a5078b040ff86a77ae890c70f4d49374f2094b67c5046a8acc308901048fe8c46d1eb8d9716f13c0ac6a6c48625aa799837a1c586b2ce450a50704d33
diff --git a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
deleted file mode 100644
index 89963f80b88c..000000000000
--- a/dev-python/bibtexparser/bibtexparser-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 python-r1
-
-DESCRIPTION="A BibTeX parser written in python"
-HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
-SRC_URI="https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( BSD LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# fixed in upstream 5f98bac62e8ff3c8ab6b956f288f1c61b99c6a5d
-	sed -e 's:unittest2:unittest:' \
-		-i bibtexparser/tests/test_crossref_resolving.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bibtexparser/bibtexparser-1.2.0-r2.ebuild b/dev-python/bibtexparser/bibtexparser-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..656fb45a6c81
--- /dev/null
+++ b/dev-python/bibtexparser/bibtexparser-1.2.0-r2.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A BibTeX parser written in Python"
+HOMEPAGE="
+	https://github.com/sciunto-org/python-bibtexparser/
+	https://pypi.org/project/bibtexparser/
+"
+SRC_URI="
+	https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="|| ( BSD LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fixed in upstream 5f98bac62e8ff3c8ab6b956f288f1c61b99c6a5d
+	sed -e 's:unittest2:unittest:' \
+		-i bibtexparser/tests/test_crossref_resolving.py || die
+	# remove obsolete dep
+	sed -i -e "s:'future>=0.16.0'::" setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild b/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild
deleted file mode 100644
index d973deb63dd5..000000000000
--- a/dev-python/bibtexparser/bibtexparser-1.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 BibTeX parser written in python"
-HOMEPAGE="https://github.com/sciunto-org/python-bibtexparser"
-SRC_URI="
-	https://github.com/sciunto-org/python-bibtexparser/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="|| ( BSD LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# fixed in upstream 5f98bac62e8ff3c8ab6b956f288f1c61b99c6a5d
-	sed -e 's:unittest2:unittest:' \
-		-i bibtexparser/tests/test_crossref_resolving.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index da22388c7ba1..84b28f623219 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1,4 +1,4 @@
 AUX binaryornot-0.4.4-tests.patch 674 BLAKE2B f07730709f11bf0732b60b81603c40bea1fa6da2d8df545b088072e0f710a7e123e438b03d2390122b6000c14343e932b38d4b6f8956ea87b72e29deae1a4715 SHA512 8a0f1066a580f08778434ed7d30c2ebf2764dbfd746b561ffce2fb8dd8d77cafaf4a58b03504cf5b1e4d37e0a6ffe3038dcaa5611cdfd7d42ada86edd1e47f3f
 DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
-EBUILD binaryornot-0.4.4-r2.ebuild 805 BLAKE2B 1994dddc9f7e587ad4e88789d5f541589d7cdd25734901926c6d2e90cda6c3859ff2691a505656b96eab28a413f75663140807b29d855774468a8df0cd95e682 SHA512 981ec0e9e29ee6dc03891922b36c9ecb82ef52173f6c2b86749fe6ee41cdba76d25fc4d8c979dbc331c557be15fa11d2a87e919b117eebf130e4525cdb00dcbe
+EBUILD binaryornot-0.4.4-r2.ebuild 812 BLAKE2B 8a64a68859f16535cafc44eef4a48a5f3128d957d38128ce2efc221efacc1a1a3a345166a80b6b90fdd3f6b3c6165ff43d4fbb70d7b0610ba15eb1a03c6d8c1d SHA512 dcf8830049b85d677a2a5a79a219633d23876e9dac50663ee926afa303e5746e5d4f3db968c2de515cb7f64c78006df5b9b01d3fa4670d2822ccf03a4b10a8ab
 MISC metadata.xml 404 BLAKE2B ee81a7d43719ea7ca5819ca53ba0ee32d84372b08af7f3716f2dab221bd26c5d922d8da1956bd3aaefe292bdc3ee8a077c09ea93c0f8ca6d2270a6def5c0b6b3 SHA512 7bf005480a3bcd7d13d28735b73a13bdd96107b11da7bf06bfc2894f2f2c514a72f946bab4b8ff4cd8f8dad651b96ea68566e712b77aa506d258c11d5390d25b
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
index 9a9cc552b83d..621877a55687 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 8be91e134b61..6ab1190ce1c1 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,3 @@
-DIST bitarray-2.4.1.tar.gz 95300 BLAKE2B feee2339f66d0941719fca7bb9a43d3234d1043f894bb52346f89318e586397078d84afd386b027338b5186d609f0197d656288ac9f7f4bbd631e41056d7f24b SHA512 ba623e783bae879833ac7759599c085e86c2acb3c81780ce0df95e2b23764e494a33f1e27e52db8b634b6b04d02ebee693ce0186e7a2bb9bd73906856c19bade
-DIST bitarray-2.5.0.tar.gz 102225 BLAKE2B 7718579d20c4b0bbcdc6e10608564246c752966af15a580dd33a08808f0135b5d4d2c256ca56c84f73e3e011f26da3ccbd7a7e46ef2463d351f31a7881247f3d SHA512 1b70f41d2cb576be840114edfdd2b7d638051a8267170a55013aa3d997e216eb8889c474ba5bdf018b9fbeda7b6a0e55f2de5f51a573ce40798eff42536e2540
 DIST bitarray-2.5.1.tar.gz 102533 BLAKE2B 655bf2f01d99a60efb84115190397f24b8a9a907f68270a7b310b2f20685616c69c41995a4090c8f4643b844da71045f3bee4e0d48aab6230b4aff04f045a3a6 SHA512 76efa732bb33d34b5b990958ac03d0038e29677808e64c0c6585661ff1d7f6a9511c9337a7aa3adb119ac68dcc676df49b7765a7e38cdab90d8e68af3b83380d
-EBUILD bitarray-2.4.1.ebuild 563 BLAKE2B b4dccf93e0c28deb5c94f7639c33893fcb15892c1499e2cc332bfc40f4a10c82c7411cd736159b77cb0e6d81c011219796d36bcccdd8dc3a732ab26d916f7c54 SHA512 0f0c63060e1c549585429c3bc5dd13efd041cb26a78f5e79341f12832c812bd6d648385c1af8a67e71dd161fb58797b181d4a958c3a0ae235c1adbb633cdaa0e
-EBUILD bitarray-2.5.0.ebuild 565 BLAKE2B 29c4e27a474913cbc5ad733f50197ba664e0f013f8a1f9458acdbc41a3e0f388d6e61582c08a0611208464f65989012e6cc0c04adf54463c366ed2f04ba15876 SHA512 25a9855e44d8c73a1784384e171796c9801c63249dff4e739386bcb12b7591c539f69693e23c9f8e399251b393bc0f9e01750dc903a4775a56c1327c14c8ae5f
-EBUILD bitarray-2.5.1.ebuild 573 BLAKE2B b1a8b6d1b82b586f3c793aa8b0a0efea85be12fae579e265082c0a7fa77dd2e726a0bb06b9f534d4708e41fe8a0fd2a522550e5ec84027c2512a6a7359e31bb6 SHA512 144467a43cab10b1104df66713f4e254c7116598c7c7785d55202c0cc43bd17eafe9e62d8285fe5dd8eddbf5ef40ea5b1be703af3e97405da771a8344d488ba2
+EBUILD bitarray-2.5.1.ebuild 571 BLAKE2B 402619c838f7e57a9a210b3b5eb6b265f2448b0480136f039368cc06a61266282aacbc9cdeaa225e792fed3d9516b60e66f2fe202af974c2fc881d7c33624fd9 SHA512 2099c86f8dd2084594ef049313a270d721d9ff9073d8c28b5695dd860b1ca0cd1f893e425b54d20bd18e32020e8d1e69c1083a938b5b5659e3e653c3049ff515
 MISC metadata.xml 1195 BLAKE2B 4b6e3f2c8304d9a1af4382a876987ea116ae62c369b70468e9791a075c343a6901c0642ca76826577a8ba85480915e7297e1476aff0295188904c016cdeaa5cb SHA512 4943b61fa1dd60662510f27d3ff5d8ef135c327be620c1eb948e8a1e9e4ccbd5e386be7af7e5c7b04614ac9a11e7c14f4a0a8c35a9580d631b41df09b5033f19
diff --git a/dev-python/bitarray/bitarray-2.4.1.ebuild b/dev-python/bitarray/bitarray-2.4.1.ebuild
deleted file mode 100644
index 9d3d6abcb155..000000000000
--- a/dev-python/bitarray/bitarray-2.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.5.0.ebuild b/dev-python/bitarray/bitarray-2.5.0.ebuild
deleted file mode 100644
index 75035a316dcc..000000000000
--- a/dev-python/bitarray/bitarray-2.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/"
-SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.5.1.ebuild b/dev-python/bitarray/bitarray-2.5.1.ebuild
index aa55ad485325..7f20ddf0cdf8 100644
--- a/dev-python/bitarray/bitarray-2.5.1.ebuild
+++ b/dev-python/bitarray/bitarray-2.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 9011a37194d9..7623b67d860f 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,3 @@
 DIST bitstring-3.1.9.tar.gz 408443 BLAKE2B 747ce06fc33681cbe63d706c2dace5ebce314aea1ba45f8a5a9d65f849bcf253fa9354e39fd80731af4845993e418f27232ede47c940367b8cb425867ffee8c9 SHA512 6dc9c8d683e4415dfd685153b350bd5462117c49c7d8fcd9b2a066f927d82bb2bfae1cc5df543dd38c5e65b93d453ad13d2937f9523b77b007b1234b24ba7be1
-EBUILD bitstring-3.1.9.ebuild 580 BLAKE2B 57628c31489ab940c3c99fedfbb36e76b6c9cfcd12dc4566b6ad40555aa928246ebf3516aa71ec2f7039a08ff83d0943d88cd032ebebec36310252c1e06ea9aa SHA512 9a9194b04ee20f21ca5e6cc17c6dd8ce3c097fac7872108854773b78fc94c22424012b700d1bebbae655f3e953aa8d4c637a93912721141a778595ae81b5aaca
+EBUILD bitstring-3.1.9.ebuild 612 BLAKE2B 13ba84c205fdfccfc3aba19acf572d9e538ad9fde400132e6697d69fa688bb24d26656147dcf5d1b1a340a048d6573a591f0de6a40db3c5805ee6139ab14cd19 SHA512 3746d51c23eef4bd2115575f866c17e7d195bf10fc4a9ae37bc43aee6beb9c4abd4734fb33da6afde0199a9857139e511543520af96ad4fa8d569ab6906282fc
 MISC metadata.xml 733 BLAKE2B 5d978fb3a90e33422df3c35986386d83e38b7760a2cac0708894c8c58c41002b8c7e1fe16bc1e9c707d8009afd0613d4afccf459770d40ec7c9223ede6a34e05 SHA512 ba4a8fb544c13bce8b31eb1dc3c4c5f5beff5f883f922479ccf809d81532719353ef322a26cdf16a0ef499dcdfb300b4a3fd0812edcb62651f8b617f0e391930
diff --git a/dev-python/bitstring/bitstring-3.1.9.ebuild b/dev-python/bitstring/bitstring-3.1.9.ebuild
index eedb23302ceb..67df75980669 100644
--- a/dev-python/bitstring/bitstring-3.1.9.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.9.ebuild
@@ -1,9 +1,10 @@
-# 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..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python module for creation and analysis of binary data"
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index f0d6eb2be9bc..1db77ff3b7a3 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,5 +1,7 @@
 DIST black-22.1.0.tar.gz 1161720 BLAKE2B d74cbdd39dc1576583cee57089cb6d75a338f2d6640697adda79d38d02eeb51664049dca934d5014761d0fd4080ca2f40a3ea10c30e40bde9fe6af6c178b202c SHA512 9b97a3b32ecebebeb61ea581784a9b2215540c20533097fe87d5ef3c046dbe7c2ab8f2f21d1884cbe0ddd458434f17eb9b540764f955385873e6fdef86c3014c
 DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5ef5fb7e080f6b0031412381d7be121ce62ad252a67fa7930726243680a4bf183417611617be5af39722164289d SHA512 fc44576b93a6e158f625ad5444247f6a59a1ebcc7f0c73ed40d557a9a865457b297eabd492f01999e51ee3e5c3fa83f3d6e3c10937ecaa8c1d36f7541736d2e4
+DIST black-22.6.0.gh.tar.gz 1165070 BLAKE2B ce2eef529e230954a13913063dbb9000fa13f4debb2e5ed33605e8efe5c6d62fc1b3c0b7847c26ad931b9becae43fa23b15701a1672c1e056f729810020cc282 SHA512 72e4b4dfc69436e4dbee5a75ea72a1be69a26dc37a5e4d7edfb84d62736f0e0aba8d14420f3069798b568bd8ba916e8850f0c958afc9b6134ee8832e54d3dc4c
 EBUILD black-22.1.0.ebuild 1397 BLAKE2B 89116657e56fb1f9a08ebdfe35de2d5d9761f43c5dff5a2ecfb0c8cf5d68581223dada3d0accb3261bbaabf4c26861dec3e35c482c7afdd8279ee8ab3422418d SHA512 0ec829dc329fab2b7c892405d195e34be8d8e1dd0850940c3727bdec6cd520b4a8d977f6b1a13e97b4622b2d853f9f372a515f457d2161e0412ed6be843f06a3
 EBUILD black-22.3.0.ebuild 1417 BLAKE2B ac11791cabf7d046f6a9a632174ff214c42983a5d152d9be29e8653b192bd8b72ea8f399d2a43bc64ec7c65590ba284082783db81685508e055a9d476f3abc80 SHA512 08f7e446dedbbf21a62b55e10828761c1e3962ce48c2009fe8a7846364386d8b206489eec09c91fb515c83fc54ee2efad5ae13d66427670659b6bad6a3911966
+EBUILD black-22.6.0.ebuild 1426 BLAKE2B 2ebb1dd3fb8ec09ff3a4c541a6b71cc182c5a49133a302fba561a63fdc9fad9a5727bc551470cd6415cff9dff090d5452482b76ec34a7b3e456ae5b77248a2f8 SHA512 9f86c1727b2c1e51ee21fc694230d9c4976e6c536186f85c1768442f7f77810c7cafcfefc5656d57f28d6a3fcd90904b222b6f3b81af612497166e2a2ba81d3f
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.6.0.ebuild b/dev-python/black/black-22.6.0.ebuild
new file mode 100644
index 000000000000..2136bb8644c5
--- /dev/null
+++ b/dev-python/black/black-22.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+SRC_URI="
+	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 1daaa9f2a30f..707b8baba13c 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,6 @@
 AUX bleach-4.1.0-py39.patch 1216 BLAKE2B 15bd8b862610ca68b5a2d6d7569bb72a6293c85c0dd0a2b9dda58ab50a25c021fd8306219c47d851a738e57acee3e0ddd43a55dc5a30a789010a3d385cb8ba69 SHA512 10d2aff6c5f62a56589f8f129df1f5f3b514a57a8518669b909491b801d6994b548ec4f7f7c04f161bf06c82aee397a5610787682e07aa40e0d469242bd2c5bd
-DIST bleach-4.1.0.tar.gz 195798 BLAKE2B 68afd58aa099acb5c21f1ff76301c46834f326ea2aa4fe7a6f820c2cf31913e81dc72deecab4272b2a7ceab1ae01bec028a5cf5e6214cddef4cdec5ec05ea4c6 SHA512 34c522dde5126995789e23fd28f7938d025f56e97e30814dc326d33a772d40fc2ad2f25aed0b367fd4352b1e1e8f54b80282b931819203bf60448ffe2f120622
 DIST bleach-5.0.0.tar.gz 198789 BLAKE2B 0b2847e9342be1854a08679230b3ea0fcb1a514eaa6c11f344057e59310b6d769e2bee91272295a0f60fa0ed1c2e4503340276d99794d260b6a63e2c4ea76703 SHA512 5b8e0c94a7bd8270581719928ec869c5c3c91900be0a293adfb342acfc55df7e63211e95786e6a39b3661b3852e91a8b37ff805387fb3e6a286e8a5dce8e3655
-EBUILD bleach-4.1.0.ebuild 1060 BLAKE2B c4bf4ba0d613fb8c0052984ad23224fda6fe8b85eeb6db811ded2eb36d0607dae15d37debb8b3f9ee125ea64e323d56761f25cc6c36b8124d0e27f0d34082e1d SHA512 99f6d19b23d11ead8260ba799df38e11b1b44ddd2773d5bc4d41dac698da6a34dc8cf50db0abb9772d32ffcdff9c95e73eaf398f321663ef519fb436e5f37330
-EBUILD bleach-5.0.0.ebuild 1075 BLAKE2B 9d388e114c3700be091f1b1f7750e8d3243e33db9d828017c75d3ab5fbed7793f33dbefde88266708f0da9800b539ffd58f72b1db603cad14dfef5d8ae143600 SHA512 15febcc501c0bc34c8142c66f442ff231d16ae31155ade31086b513754cca0bb78b50f3621df77bdea427a062a1c09503cae62e4b25022cb2c9e21ee50c1da5a
+DIST bleach-5.0.1.tar.gz 199642 BLAKE2B 8d06dd38e89b91bf48f3481b5337b8d9700d8cc88faf3a260898b2b8f15ecf5c5160f96bff2c5ce02f361b773b0ce9a51322d9836dcc99b7878921846e8da182 SHA512 6c8e80eaf6db6f0e6d9066f3443192f44c489e079945b6d11b11e7eb270ea865011019e05d43c7896262dc11ca168e697630d9da8dca9f5bb48f0e2161fda6c8
+EBUILD bleach-5.0.0-r1.ebuild 1101 BLAKE2B 4e34d0f4918b39b3c29d260714008bcce5a84a65ad7e72b4aec08b9f3c74dde52e768ea748d750a4cff8e377cc4116cf02b700076fd8c04a0dc6928b0a2fcdf9 SHA512 c07586ab99178517c1f84d73b45e4c46018706d10ef60895527e58b522c93b4d0cc6dea21f8f99fea65ad0ee7236e77046d544f38fe346bd1e038f266b42cf40
+EBUILD bleach-5.0.1.ebuild 1127 BLAKE2B 3b7354ed825d4a51052d1406a248adedfac87ce16362b305b504df280de2c9b6215614a1a7cee7ebad41e78a92971e7af8f3e13bb4624e2fb2be6eb64fbc8bd4 SHA512 cc2b2e9180e5cd04a5faa467319df0e4a45bb4ec8bd9b4b2b87c255d2ca639e817c68a0e7eeb33aad574c8190509ebd0d5e56bdafdb19e493ab20d12ab24cbe6
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-4.1.0.ebuild b/dev-python/bleach/bleach-4.1.0.ebuild
deleted file mode 100644
index ee2ae8a64724..000000000000
--- a/dev-python/bleach/bleach-4.1.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=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-5.0.0-r1.ebuild b/dev-python/bleach/bleach-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..2fe9eb311b0e
--- /dev/null
+++ b/dev-python/bleach/bleach-5.0.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.1.0-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+	# indirect html5lib deps
+	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/bleach-5.0.0.ebuild b/dev-python/bleach/bleach-5.0.0.ebuild
deleted file mode 100644
index 4fa6c6bf98d7..000000000000
--- a/dev-python/bleach/bleach-5.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-py39.patch
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	sed -i -e '/import/s/parse/urllib.&/' bleach/sanitizer.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-5.0.1.ebuild b/dev-python/bleach/bleach-5.0.1.ebuild
new file mode 100644
index 000000000000..587c260240bf
--- /dev/null
+++ b/dev-python/bleach/bleach-5.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="
+	https://github.com/mozilla/bleach/
+	https://pypi.org/project/bleach/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/bleach-4.1.0-py39.patch
+)
+
+src_prepare() {
+	# unbundle unpatched broken html5lib
+	rm -r bleach/_vendor || die
+	sed -i -e 's:bleach\._vendor\.parse:urllib.parse:' \
+		bleach/parse_shim.py || die
+	sed -i -e 's:bleach\._vendor\.::' \
+		bleach/html5lib_shim.py \
+		bleach/sanitizer.py \
+		tests/test_clean.py || die
+	# indirect html5lib deps
+	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/blessed/Manifest b/dev-python/blessed/Manifest
index c2c5d6487d62..ccc2e5dcdb40 100644
--- a/dev-python/blessed/Manifest
+++ b/dev-python/blessed/Manifest
@@ -1,5 +1,3 @@
-DIST blessed-1.19.0.tar.gz 6653907 BLAKE2B ba9c1247562baed398d6570fa97deeaefc325c502e0aed5907ffaf9802978933e9a5bd6c08b4d4c4a449533272005e3272f70dac5852da1c45c6c9644aee9a56 SHA512 a64d8d542a1a12b710375592c17d06f28a7c68d76952479738873fb956013f7c65820e797116b6151c2a338cd27cfe91b4ad1a318365357060f38d1ec0adf91e
 DIST blessed-1.19.1.tar.gz 6653802 BLAKE2B 5755efde3c203ab21a8994e29c55cdaace1cca772c9cdee4343562bb8ee4f9ffdee97d9131646d8385ef7e46664d23723ba46a3807d85623d9512ca40c7c4002 SHA512 0d899c42d7c6246362081bdc5d7dd2fcb13209fe0cee7e5a4fa342bdaf16a5cc21ab7e402bc5287ab1239f7e3afb02381e0e57e2d6111b80fe3c52b92cfa0f84
-EBUILD blessed-1.19.0.ebuild 1269 BLAKE2B 0bb8627844503b12f8c120ccbbaf97d2b9b4c9aa3cd5d040928b3aa266a9c559d4853575535afe60483522d0899e1879b875cfd1e011d6b1d774f32148a52bf5 SHA512 d3557b0de43478038aad4a5dd1f6f35a73a97341048880555d97bd0f2ffe0e32de54243420531ef331da718dd121d795337c2e9cfd761cbe051a0f43ea8e9a18
-EBUILD blessed-1.19.1.ebuild 1301 BLAKE2B 6d11aba3a159743f4c9a47e9c5ad556a0989d4df8263e118fef0fb1084eb6b7587b7c5c866c3d830290ec68c9fd942ed54e1b641d885e8851aa116cfd5ddb854 SHA512 780ac1db6d23baf788332484fb448ec83965b5db6aafe3972cd8fbf8acb6c08c2e4b343a5be701126bf51c57d84ca1b761d897a8ee3a5faaea65fe07a8775f84
-MISC metadata.xml 456 BLAKE2B 32926c0735fd4995b1575de9f610628a1aae793ffab8bafe87c891747525802fe5ebf88f6f0056878a8abf642a2203a062a33b8bec1b820f3cc309eac4855485 SHA512 4c2cc6c7893b22c10314d794b180ebfecd0b977fbae4e5024a471540ed00d0fc1e6f5f91625043be2c99360e8488666ee7d1e9ef2223da6936c6e32792f8b18a
+EBUILD blessed-1.19.1.ebuild 1301 BLAKE2B 6bc54b5e248eb466ff8375f566521d890689209e5e8d46bc4c960109a5e0085ea837eaa2a0eae798f536e7efb4adc7c1678e3ff83e2afe365ffcd22cb3036fbf SHA512 fc20555949d245f218945be721f45287a5fdfc8496d3b6339c6b63fa81d4316345911aebf019afb800afafad587f3635ec71f42cbe51236476441f95e05bc039
+MISC metadata.xml 557 BLAKE2B dbfca7b52ee79a095475d591fb6fd4c151309e5e9c0c9e1e4dd031b66dc3128f9e0057eab3fa85d9fc875ba14b1229e81b8101626e341dccf597f0a6db97c42f SHA512 b0c74de041336d52276075ffc75f58827812a672016c30411888cd9ffc1e468120ef9a847ae16cf7eddd892e7176aafc4d9b635c1826d8ab98d7259d642cb6e3
diff --git a/dev-python/blessed/blessed-1.19.0.ebuild b/dev-python/blessed/blessed-1.19.0.ebuild
deleted file mode 100644
index 91051bcb02be..000000000000
--- a/dev-python/blessed/blessed-1.19.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
-HOMEPAGE="https://github.com/jquast/blessed"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Skip those extensions as they don't have a Gentoo package
-	# Remove calls to scripts that generate rst files because they
-	# are not present in the tarball
-	sed -e '/sphinxcontrib.manpage/d' -e '/sphinx_paramlinks/d' \
-		-e '/^for script in/,/runpy.run_path/d' \
-		-i docs/conf.py || die
-	# Requires pytest-xdist and has no value for us
-	sed -i '/^looponfailroots =/d' tox.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# COLORTERM must not be truecolor
-	# See https://github.com/jquast/blessed/issues/162
-	# Ignore coverage options
-	COLORTERM= epytest --override-ini="addopts="
-}
diff --git a/dev-python/blessed/blessed-1.19.1.ebuild b/dev-python/blessed/blessed-1.19.1.ebuild
index bae365cce1aa..237141e22f4b 100644
--- a/dev-python/blessed/blessed-1.19.1.ebuild
+++ b/dev-python/blessed/blessed-1.19.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
diff --git a/dev-python/blessed/metadata.xml b/dev-python/blessed/metadata.xml
index dfa29967f7b7..1f9611fd392e 100644
--- a/dev-python/blessed/metadata.xml
+++ b/dev-python/blessed/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">blessed</remote-id>
diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index 2b3ad722f948..57223dfb765f 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,3 +1,4 @@
+AUX blinker-1.4-pytest.patch 882 BLAKE2B 85cb6c2b7a3368f94b9c2df65b44bb070149a25b971050a50c9b310446878c1e4d8ff7acdb4f5cef4927af2ae219a83607ebaae204ef919b2ba41a4cd03c43f7 SHA512 95c786a217f97a4312620bd4c026fc2efe073e3ea9d7b601a848ba27a45c9e81e08cc356410e972d0d4de816e697ac591db62acfd2a51da2229f2039e6145383
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r2.ebuild 662 BLAKE2B 7a6c381416eaef7a25b01ebdd4a583ed7d28c40d2934d4ca4c19dd2fcc0948d1ab01585209ea172aabe540525ef6308e85687b5b971972f5d1c05c28966f4553 SHA512 d7eb2ba5d5adb668b0bb5f933ff016e96216d59ea72cef7becbba5c0066963c006111ca9f77cd95d0255b349920043e491d65d5217482aeed04dea5fcbf08e93
+EBUILD blinker-1.4-r3.ebuild 837 BLAKE2B 7c6a6668fc8be813ff809877036b59c0c7ef77bfd44218b7dce18beb39807d878390ac73565b6038346ec02e9edd0694105e1ebb45151a6f51c8545d65ac51d6 SHA512 6a19a2a7b0c4b29d8dff93fdbfa65c9bc185c03694c6f00d6783331acaec6c13d65d140d152033215c6cf88b4013d25c7e1dd8f7085e3cf89ee4d4de8de97d52
 MISC metadata.xml 335 BLAKE2B d244e170c8fd902544dc485af737730e99c77bf4004f638054e20a2c4a40979c30bfbe0a4b6d8cd6aa3101f27b4eb2a2d7197d8541aa0944601f501557c44b8e SHA512 b43703a1475f0bf2b9b17c2c5e87a3e700a72974a6ac72ed037e39e01ab0ee406b6e522b63e38d84911acd75df4f7a4686f1c30ba8d5673f48b47434907fd502
diff --git a/dev-python/blinker/blinker-1.4-r2.ebuild b/dev-python/blinker/blinker-1.4-r2.ebuild
deleted file mode 100644
index d6b698db83f7..000000000000
--- a/dev-python/blinker/blinker-1.4-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Fast, simple object-to-object and broadcast signaling"
-HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-distutils_enable_tests nose
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/blinker/blinker-1.4-r3.ebuild b/dev-python/blinker/blinker-1.4-r3.ebuild
new file mode 100644
index 000000000000..a7692210d62f
--- /dev/null
+++ b/dev-python/blinker/blinker-1.4-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
+HOMEPAGE="
+	https://pythonhosted.org/blinker/
+	https://github.com/pallets-eco/blinker/
+	https://pypi.org/project/blinker/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/pallets-eco/blinker/pull/60
+	"${FILESDIR}"/${P}-pytest.patch
+)
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/blinker/files/blinker-1.4-pytest.patch b/dev-python/blinker/files/blinker-1.4-pytest.patch
new file mode 100644
index 000000000000..e5c2b04998b5
--- /dev/null
+++ b/dev-python/blinker/files/blinker-1.4-pytest.patch
@@ -0,0 +1,31 @@
+From 8238e16c699ce7f99f5ff3f80d03d332d72015f8 Mon Sep 17 00:00:00 2001
+From: pgajdos <pgajdos@suse.cz>
+Date: Wed, 8 Jul 2020 15:22:19 +0200
+Subject: [PATCH] use pytest instead of deprecated nose
+
+---
+ tests/test_signals.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_signals.py b/tests/test_signals.py
+index 2d6a65a..e74db47 100644
+--- a/tests/test_signals.py
++++ b/tests/test_signals.py
+@@ -4,7 +4,7 @@
+ 
+ import blinker
+ 
+-from nose.tools import assert_raises
++import pytest
+ 
+ 
+ jython = sys.platform.startswith('java')
+@@ -227,7 +227,7 @@ def receiver(sender, **kw):
+         pass
+     sig = blinker.Signal()
+ 
+-    assert_raises(TypeError, sig.connect, receiver)
++    pytest.raises(TypeError, sig.connect, receiver)
+     assert not sig.receivers
+     assert not sig._by_receiver
+     assert sig._by_sender == {blinker.base.ANY_ID: set()}
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index abb0bee69bd9..a638ce5b2d2c 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,5 +1,3 @@
-DIST python-blosc-1.10.5.gh.tar.gz 1570462 BLAKE2B e2ee3cc3827e1df89afc97a0cdc3f07670368d2edfea9b6ae32ecbb74b464d5311bbd7b129b3b94fb91d20fd579425859412665de397facd4c119e429fbcd014 SHA512 75b91e50def65ecbbdd29f7b7aba65c6ca611eeeaa9e55583c0253eda5d1e1ab7d899d0c77c45ae999188f701205f20d8c8ed130a3865433edd87db3c0eeebb0
 DIST python-blosc-1.10.6.gh.tar.gz 1570504 BLAKE2B 44f444fa5050a6198e83649973fc82d6804eec50bf79c332ed6a974e417f2a58baf09480a9bb5c5b7abcef2a961cd7bc61f962c12db625b1a7c48799ace0b39a SHA512 e283b132ebb91e7ce362ec65a1d6760e3793046371ea545a9e842372084182bcc194c3a0e1cb20914de58554063995a238ea0a129214731689e8cd5f4203d3ed
-EBUILD blosc-1.10.5-r1.ebuild 967 BLAKE2B 46427100a1e846ce6067829fb17726c5879634efeda8ad53a61cdea1d853b3f63aa98918f78749e7f7076105f653191b7fc1db55796609463daa050fe0092c1b SHA512 93475018956bccb45c6c3e0f0dc0739bdadaf7047398fe21274de60ba9d9cd132009f5f2319acfafe17f31abe0813fa4a24ba36ed86ef13a3b945a64f80db942
-EBUILD blosc-1.10.6.ebuild 1048 BLAKE2B 2b1b0bc043f082bd33ca2e427bea127a32fe8f6a9e06fdd9f3fd23fd541ffb192cf94329e183049d1fba24ff46acb4e4b40676458a2a5323127ec8fed6773258 SHA512 1de7c42c1ae1ec11b8e75ed5c9d6bece784554f56ebb7ed18e61f25f2185ae67c1b349f00a193f5212c735d1bc992554b90a4ee00101b815139a9a821134ad15
+EBUILD blosc-1.10.6.ebuild 1042 BLAKE2B 2d3b7779dc3e9e7e79e3129bc8edd1257d780f44bb5881fc605a83a3aa3e6da06601647deb040d15c39449b5b5407805deb4e955f89bf74c522d459430ee3640 SHA512 d94ab6390fc8f9164743c21620d6a9f938cf5cad81c95ce066c0ccebafd9613e0c13d121dacb989f0bea37331de616e8c691e1047e0cce9638c6bf1ebcef0e4e
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.5-r1.ebuild b/dev-python/blosc/blosc-1.10.5-r1.ebuild
deleted file mode 100644
index 79ef5a1ac142..000000000000
--- a/dev-python/blosc/blosc-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-blosc-${PV}
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="
-	https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-
-src_configure() {
-	export USE_SYSTEM_BLOSC=1
-	export BLOSC_DIR="${EPREFIX}/usr"
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
diff --git a/dev-python/blosc/blosc-1.10.6.ebuild b/dev-python/blosc/blosc-1.10.6.ebuild
index 8ddbc8544d36..42cd0539a1e7 100644
--- a/dev-python/blosc/blosc-1.10.6.ebuild
+++ b/dev-python/blosc/blosc-1.10.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bluelet/Manifest b/dev-python/bluelet/Manifest
index 239747f18453..ef136ad795da 100644
--- a/dev-python/bluelet/Manifest
+++ b/dev-python/bluelet/Manifest
@@ -1,3 +1,3 @@
 DIST bluelet-0.2.0.tar.gz 14182 BLAKE2B c05560f4cd1b4aaf3f25d22bbf5eabfef695cb1686742ae274df9024786ca08a4604ec9a24ad185718ad8d8876f8b5fb12df0f45cdda5b61fb6fbdc8fb09bcaf SHA512 58bd8df4b61f23a53f9310b68e5754155c00d598c9bcb7724e90ef6722ee5d6017751c2e056eaaa64cca71b89c391d248c14477457f30ebf2b28841a3fdc98fa
-EBUILD bluelet-0.2.0-r1.ebuild 605 BLAKE2B 4728fb160fdda6214f65fbdff6f569ebf84b1169ec09ecf8d181ee04fce413742c776f4524397514b6bbb29fd1b35de5ab8082bd0544bfd4bbaea3c38d0acdca SHA512 edbce94d999ce089e7eaef1e817335391eca2413e4eb13ffe994230b41a970b437967449c82bd81a61087f92c0c21d3c6101aee05a0fb039a815bb289d68dd37
+EBUILD bluelet-0.2.0-r1.ebuild 605 BLAKE2B c9a4b89f7f5304ebfaa7c490f7fc0520c3a57d4fc2591d76ea69b2d3d78cb984385b81d02fad161a5afc934dadf7d2513d9ea3b030b2b93f2770a63affc7c1b8 SHA512 d4d433a9fa6d3e8afa0cd9627422834751f600c20b7da16f1eeacc5a242b5ed74e9b931aac72e1bba21cefd633b82c38ef6b5c5075bd56a342f60310b7494963
 MISC metadata.xml 1119 BLAKE2B 885b96dfe070abfd98d033d66135ee952aeb3dfdd012f491e943abd73b0b270eadbf005fa7e364a90e64b6a228a902dd2136f57de8412bbd40ea55857287ac59 SHA512 6c044e853a5786b8808e8d5f496a4230c284f497bbda8ebf369d49fbad684af9a22425a9ad879cf80535046129e294b388ac0045947a9438dc8234b344bd2f8c
diff --git a/dev-python/bluelet/bluelet-0.2.0-r1.ebuild b/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
index 71584a5d606d..b4ad976914d4 100644
--- a/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
+++ b/dev-python/bluelet/bluelet-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 6ae61de2005d..71f377137bef 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,6 +1,3 @@
-AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
-DIST blurb-1.0.8.tar.gz 21519 BLAKE2B 4e76fad58821662b0a97dbde63e0fe7f3e82676ea1f22a3effdc118a014fff2b17995252bca900f495d66df36712122e7a50e95b3ebfcff7d39f8d005ef8456d SHA512 63bba016cfc293923da1cf7cc5f64e8881bf28237faf9908a484d55ff435df71c30544a751e0f167ed82d1f363dca48f53be67a25adc3ebc728c88b31186abac
 DIST blurb-1.1.0.tar.gz 25064 BLAKE2B 4fbdd0d068cc7abb1ffa78dff70bd83feccc1bcfbf8ebb085c9f7e77e0f330d3759f10a94a5ca024b465c01f9d659496ae55162a52b7158a06caf2d114d36806 SHA512 9397173e7bf5babf02c96df27983462e7dd2a729e9eb0cacdf23ca3778336902d5c611ab5e2432bbc877344426d7c62ea8ae77719aa08da98f9b44365583b7ee
-EBUILD blurb-1.0.8.ebuild 677 BLAKE2B c71ba8d012890379828f40cf96d4b227b0f007fc3336d41e51174b762522d6e9797ad1c48bec3d7b88638894ca03b6fcb603c619066340b1baf593d4070158f3 SHA512 4b0861bd0f1d5705b383cf2ef5799b7ec6523af6bad55aa49b97fdd4befb4af30a616fe202eb93dc4e731ef1ba0380eeec3c0a9d760f7ad3bb050806d7448fa4
-EBUILD blurb-1.1.0.ebuild 646 BLAKE2B 443a7fc5e09ed795f738f256a028af17cc3f98c3a669ad34fd5dfecf85edf70f9e6d6522cf46dff5d9aed59e075bf1153eedb0455f64d6c3a2b44f1a597bb4c6 SHA512 c8c1dc61680ab59e96283905dea3dbb04dbcbca4bcc649239f08c7f08b21c123bd55a61533744b82255f92923ec45c39d8b588b4506b8fbc608a8bd16a2a9414
+EBUILD blurb-1.1.0.ebuild 646 BLAKE2B 4ca08b42f6025f1ee46413455a44b8a472b34059b04021c6d76a5128d0da60e2c054e49836d9bef3cc27a196cb9173935c3f5bd5da532b7ce991da2c81c475c8 SHA512 674c56c3ca1bbef7f612e3b84c901329e15125074ac5f23db77fe9a97930b461fda923da2c96a19319df954da83d028e53ff2202c6153c7a05631d43b2a6aa29
 MISC metadata.xml 1039 BLAKE2B e723b7324c373cc1f31235b331f2f7f76e549a8b4e335e7db7a624e1b59c7a664440a28348491f9d176b7138cc4899996d23d2206a82d7660b0c2875e6e74e47 SHA512 7781ff5848693ff7ffa750dfaee88b385ba970803399fd967e98f62544cb196e0fcc1a341ff86c989d6da362921ae364ee8aee1824d0d91412562b00ee23b1d1
diff --git a/dev-python/blurb/blurb-1.0.8.ebuild b/dev-python/blurb/blurb-1.0.8.ebuild
deleted file mode 100644
index 2d91f40572a3..000000000000
--- a/dev-python/blurb/blurb-1.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-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="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="https://github.com/python/core-workflow/tree/master/blurb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/blurb-setuptools.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Tests expect to be run from github repo, in which code is inside dir
-	ln -s . blurb || die
-}
-
-python_test() {
-	"${EPYTHON}" -m blurb test || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blurb/blurb-1.1.0.ebuild b/dev-python/blurb/blurb-1.1.0.ebuild
index 902953b276f7..87908ccc5df1 100644
--- a/dev-python/blurb/blurb-1.1.0.ebuild
+++ b/dev-python/blurb/blurb-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blurb/files/blurb-setuptools.patch b/dev-python/blurb/files/blurb-setuptools.patch
deleted file mode 100644
index 4845af98285a..000000000000
--- a/dev-python/blurb/files/blurb-setuptools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u blurb-1.0.7.orig/setup.py blurb-1.0.7/setup.py
---- blurb-1.0.7.orig/setup.py	1969-12-31 16:00:00.000000000 -0800
-+++ blurb-1.0.7/setup.py	2018-11-05 14:58:55.148518033 -0800
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- # setup.py generated by flit for tools that don't yet use PEP 517
- 
--from distutils.core import setup
-+from setuptools import setup
- 
- entry_points = \
- {'console_scripts': ['blurb = blurb:main']}
-Only in blurb-1.0.7: .setup.py.un~
-Common subdirectories: blurb-1.0.7.orig/tests and blurb-1.0.7/tests
diff --git a/dev-python/boltons/Manifest b/dev-python/boltons/Manifest
index a71ce6d86bd9..823fec368c34 100644
--- a/dev-python/boltons/Manifest
+++ b/dev-python/boltons/Manifest
@@ -1,4 +1,5 @@
 AUX boltons-21.0.0-python3.10.patch 3393 BLAKE2B 24d9bf2368a0716332e85222fcf8965b9633aa26967e9f9bac6f5ee31fbd8aa71dc2e24bfeeaa6ad766511f8f09a68a1b4288fa66b9ab7ec58f1e01453d5adae SHA512 3db60c0a2cd8680fc58151ad788838b6d795c16b5162326382aba883a7fe86a294cc1d490d40ff40ecd3eecb37e518c85bee0c67910938e8d3623f0dc5f6d6df
-DIST boltons-21.0.0.tar.gz 241010 BLAKE2B e8c7cba3aadc40fbf40b784c8060d7b4f9d89457a4416c8fe9c733c3a35cf292609b2cc4e43e20a1308add6b854c3e00cb55274328a14699b3c704b73c189318 SHA512 5f5d642ab8ce0bc26133f4bd5059071bc86ca8e6619ebac796d522a0e4c39b958176ccc9de9a56e0448b24bdcf569e73f51011d5a9fc875bdef12a363f106018
-EBUILD boltons-21.0.0.ebuild 707 BLAKE2B 06bc8e418eb9ab524ad7e8be140d3eae33890dadccece13a2e0bf8da4bd50a6ae1ac98f72f35242e35cdc03e7e1e80ee83a9d36523ee8587bb9fa142b5e6bc9d SHA512 28d8eef858a1614a41ec7858cc25e1cbc10147c7e721e4d21081179f42a8ed44a07d19729613f8504d193aba845dd7b3c82481a51815066d77b8f5a142ecb0da
+AUX boltons-21.0.0-python3.11-tests.patch 267 BLAKE2B 03af16f7f058094369f97aa4753833cfd43a0f0da7dbb6a423b3e4fb8b4f52692d993f22449232d8653075f1031d07a25d4a3a7f8d71268d62ba8a62562a1b81 SHA512 de99f35ed56c50122b531a9750225d5135d1b429fdb4a8312d04e4c1cb9cfffeaeec08fa718223d3e1952656f40dfb0698f40c855d09e9db63832c5be0ddcc04
+DIST boltons-21.0.0.gh.tar.gz 241010 BLAKE2B e8c7cba3aadc40fbf40b784c8060d7b4f9d89457a4416c8fe9c733c3a35cf292609b2cc4e43e20a1308add6b854c3e00cb55274328a14699b3c704b73c189318 SHA512 5f5d642ab8ce0bc26133f4bd5059071bc86ca8e6619ebac796d522a0e4c39b958176ccc9de9a56e0448b24bdcf569e73f51011d5a9fc875bdef12a363f106018
+EBUILD boltons-21.0.0-r1.ebuild 941 BLAKE2B dd8a96c2d2d1950613cd36b652597a0c74547ac9c73998deb4ceb31600c8351f39647025dd2b1e99b7623cd981014d491ccaed31ef6061d1acb31ba71674e575 SHA512 c65ebb94aa1a947f62a5d498ee96dd54371c8108d7b739c35a30ff65d1bbbe09d3c818371c268f7bfc8f999b9d7c6545af3098c7ec11bf470abfe437ae372f19
 MISC metadata.xml 395 BLAKE2B 6ed304f1dced75dfd795b9fe582ec669bf1c8ba5fefeb9e753b11aa20de8fc0966fc9a8a0ed40e460dd23a67ef0e5721a8dae27b3d799a4be629537bb18f54c9 SHA512 fb73041a95df230153dc686e21a88d91bb06367ae8c22a20777c4a0f13202cbaf59396f4ed2630265d331d6461a6da85f57ba62cc432c4d9105b8404753b383b
diff --git a/dev-python/boltons/boltons-21.0.0-r1.ebuild b/dev-python/boltons/boltons-21.0.0-r1.ebuild
new file mode 100644
index 000000000000..6ec093c9fd19
--- /dev/null
+++ b/dev-python/boltons/boltons-21.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-python utilities in the same spirit as the standard library"
+HOMEPAGE="https://boltons.readthedocs.io/"
+SRC_URI="https://github.com/mahmoud/boltons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+DOCS=( CHANGELOG.md README.md TODO.rst )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.10.patch
+	"${FILESDIR}"/${P}-python3.11-tests.patch
+)
+
+EPYTEST_DESELECT=(
+	# fails if there's any noise/differences in traceback text caused
+	# by e.g. pytest-qt noise or python3.11 adding ^^^^^^ markers
+	tests/test_tbutils.py::test_exception_info
+)
+
+python_test() {
+	epytest -p no:django
+}
diff --git a/dev-python/boltons/boltons-21.0.0.ebuild b/dev-python/boltons/boltons-21.0.0.ebuild
deleted file mode 100644
index 27fea4ce8935..000000000000
--- a/dev-python/boltons/boltons-21.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-python utilities in the same spirit as the standard library"
-HOMEPAGE="https://boltons.readthedocs.org/"
-SRC_URI="https://github.com/mahmoud/boltons/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-DOCS=( CHANGELOG.md README.md TODO.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python3.10.patch
-)
-
-python_test() {
-	# failure in test_exception_info with pytest-qt
-	epytest -p no:pytest-qt
-}
diff --git a/dev-python/boltons/files/boltons-21.0.0-python3.11-tests.patch b/dev-python/boltons/files/boltons-21.0.0-python3.11-tests.patch
new file mode 100644
index 000000000000..a54b2a4d0cf1
--- /dev/null
+++ b/dev-python/boltons/files/boltons-21.0.0-python3.11-tests.patch
@@ -0,0 +1,7 @@
+object.__getstate__ was added in 3.11 (bpo-26579) and the test is unaware
+--- a/tests/test_dictutils.py
++++ b/tests/test_dictutils.py
+@@ -476,2 +476,3 @@
+                        '__getitem__',
++                       '__getstate__',
+                        '__gt__',
diff --git a/dev-python/boolean-py/Manifest b/dev-python/boolean-py/Manifest
index 9b2183ccd218..8f01c9997065 100644
--- a/dev-python/boolean-py/Manifest
+++ b/dev-python/boolean-py/Manifest
@@ -1,5 +1,3 @@
-DIST boolean.py-3.8.gh.tar.gz 32063 BLAKE2B a0314852f9d914329476e80f7e11cbc7eb55412ef7c41dec620c2a21d522950fde7471f7e1d9042b2887b5a7462b226c2b6d08c9d3fd46192aa7d6d3426dae80 SHA512 d41ce9a05743342c116d68b88ea36be316ac9fc190a8451aca97b52fde60c58ec49d36d2dee071f83fb5f6ad49337da80bf9de1bf3d479b46386fd87e4cf2f14
 DIST boolean.py-4.0.gh.tar.gz 33855 BLAKE2B 68e183c670684d2f92ad94f2b88616c932c2a85db40fa1a2552bc60c9bf03999bb456e0a91623afba2af4f2c89ef6cacf0c6f0267ac55aadcf02e67c8324c8f6 SHA512 2c92188645c4949478b40c2879f02a0eb6f3f92c0781a910862fcccebaa3476b9f2668ef40a5faec9d5c3a9c7361043a8e1b92ed98e282d6ce89c56b8ac0c2ad
-EBUILD boolean-py-3.8.ebuild 582 BLAKE2B 730af296bb29ef4198e10b31c44eb108b56206be4247964ef4b03c1ea75a97d13f0e2f125328eea758f47090c309ff0a0927a9a0ed8ae6232d024a8d41212a89 SHA512 0edbe7ce6a9041430d73073293330443593228e0ca8d60b4b993545c105fbb18a5e05392b0169959c4ae24cb924fbed945d112c461a2bd53c74bdf4a4215f22f
-EBUILD boolean-py-4.0.ebuild 581 BLAKE2B 852d162767c55d1a075ad5bcb0c45f8c4d6c652ae70b6373e47ff8d747808680f52704285493e8fe941ce10f004d133c9b3fe7cf93c5353391424d61f06bfcd1 SHA512 09a2daf0ad4dbd3211763300e6c31cd174979e99d720f150d7022d96b00699d8e804d836c43015df8348931758d7e56db1330d36a4cf6eff941ea2961c97e40c
+EBUILD boolean-py-4.0.ebuild 588 BLAKE2B f5cc42824905f3d100c88a5398762477490c41f1fc69af2d20294596907a0c820fb32031842f35c48c408d04fd9327cc26a969f784a78dcee1cd3045cc07b12f SHA512 be70b422b05dd93aaa8a5f72a416ffb9202f51de6f608c862d79bbeba3e211052533edfbe28a7ef1dfabb5850b0dd6c4eb7ec7aa6ba2bc7a96b8ef9c6dbc0ece
 MISC metadata.xml 374 BLAKE2B 4dc485dc736f6d9e3e47ca111cb85e0770d8701bd7a10587f6aaa035723a66f225eecb633f2a127255051637c7f64d17f69d9f449a50f00b00cda766b88503c2 SHA512 940cc16f6dddb68c7154bab0be91f5c5639e4f3563a1efa2d56a4a17ec8dbe70f86f7e53be6cb082283d2c650edbfcddc406419a6acdfe2ebc8035a12b17c35f
diff --git a/dev-python/boolean-py/boolean-py-3.8.ebuild b/dev-python/boolean-py/boolean-py-3.8.ebuild
deleted file mode 100644
index 146402394e26..000000000000
--- a/dev-python/boolean-py/boolean-py-3.8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Define boolean algebras, create and parse boolean expressions"
-HOMEPAGE="
-	https://pypi.org/project/boolean.py/
-	https://github.com/bastikr/boolean.py/
-"
-SRC_URI="
-	https://github.com/bastikr/boolean.py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/boolean-py/boolean-py-4.0.ebuild b/dev-python/boolean-py/boolean-py-4.0.ebuild
index 05497a06a6f3..5b08c43bc615 100644
--- a/dev-python/boolean-py/boolean-py-4.0.ebuild
+++ b/dev-python/boolean-py/boolean-py-4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
index 524898fbafa9..a98ad2c6f26a 100644
--- a/dev-python/booleanOperations/Manifest
+++ b/dev-python/booleanOperations/Manifest
@@ -1,3 +1,3 @@
 DIST booleanOperations-0.9.0.tar.gz 165127 BLAKE2B 9f72246afa46c414e3ff9ad23b86da9665a90180fc058ca278b82c1281e798d9d913e496995ca8d45ff948aff5da8a6de26706afdb5e538dee64d7ffe96c7324 SHA512 a63dec9c3a8008825538498b162130624b4d2b9ca64980a23d631601928c5fc6eebdc8f03f19094b7923b008bde6a87b5f21518cb33c8df3fcd41fd84a8ddde9
-EBUILD booleanOperations-0.9.0-r1.ebuild 806 BLAKE2B dfba4c3fb77702e5a39cda5ee842875fdc08079e4651c8d86043d9d417f01df22529a2beaf10c22659c1bae434bda0b04d877b7ba3a5886df14152df228706b9 SHA512 025bd384ab82e784ba2c50eb8066f729124f026611d6ea1c34d6f844621c4e37f4dd4260076c85224ff8f966568a68c958b2d1ee2a3fc14229303d913e70e4a1
+EBUILD booleanOperations-0.9.0-r1.ebuild 813 BLAKE2B 51ac63a03fcc5207caf8b3cfc93a383e1b683804315e32def263405fbe4a27f867a431e7b3368e0ffa0249e38108ea26c5d1d0271acd09919a1652b381de242e SHA512 c20e7300963dc050d05203a3359424d6fd1deaedff6214de121b28b16fc1868fff9ab5780bfe9c3e45ba07538fd8c15c3a4b7d2dfa57e0470b4a7f54eaa22afa
 MISC metadata.xml 324 BLAKE2B 8f0f11c844fda3f4db2e295851bb0b6760ba6d6e7a455ab71a1a18e011fb9f657a84363b34b1354f1ea65ac45c20e0d1b4822ba871f7a37a1f7490f03f0766ed SHA512 76ac5a53bd3e884cecca19ba2d28e9fa4d7f8a71a3a946980bfd31e0771b192a75cc9dd84d05a0d8270ec7c36b82b78ad770d51b229edd25c6970a057774255b
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
index 21249085313e..856265c3e616 100644
--- a/dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
+++ b/dev-python/booleanOperations/booleanOperations-0.9.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/typemytype/booleanOperations/archive/${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index dcfda218f9df..c7fc6474cfdc 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,16 +1,20 @@
-DIST boto3-1.22.10.tar.gz 497369 BLAKE2B 448cb581fa31746083da4271436071b1ab5625207e5cc0560746beca9216a9748191206238a950a5a04cc178c20b744d19d3d99c1aefb775eaa79c5b96b75cbd SHA512 0e4ed0cf8f14997b4e61d926491fba05e4ec06dfae347e65ab3dceb48d61e24860e82fb922a7eac73e1e1322679418c96915c62f6279bad694685361d9970d7d
-DIST boto3-1.22.11.tar.gz 497893 BLAKE2B 07b757e4ab108eb70273dc3df082394dc730223417d1776f38c195831d2361578ed8722b107224b9e6c79685c7fedb02c386ea92c749d654a2f70b28d8de1e3e SHA512 f1367f66a93af59bcff2d29df6064440eac579e3aba4ab65083904de7a44b2c175fcfc2fd7836a8b0a425cf5519847c5e17075d42e82d46b2a0c4b46b7d5dabf
-DIST boto3-1.22.12.tar.gz 498085 BLAKE2B 650ebe35436fcbb087063ff0cbbda4a8d8643fa551e2061c27ec797b62daf6ad1b5ae4c5271bd73404f8c6cf11d2b4b6b066eb7cebde478f68db7ed8fbfc813a SHA512 db2479d5b7b0cedb063af34155d3e54bea507fc5526fbcacc5b1a2d20120c8d564d155d91ca3cf6753cf7ceafa7de2789a7547cfefde6ac290829c7c02fa2aa4
-DIST boto3-1.22.4.tar.gz 495554 BLAKE2B 4c06e2101bcc96e4fab7e088f8593c7b1cfd2b07431d4cd062666df6c1f5d55d9b7fb594268e9a86c4793d35bc3d8de2644244728cf62833dfefb62525eedbdc SHA512 26dbd9ed1af900f7466a1767ada3fb8ee86fa09ca21733f857e2748d98525661fc76e69d75440fe913260e75245cf30298493417d055399a242af0aedaffd349
-DIST boto3-1.22.7.tar.gz 496523 BLAKE2B 400370268e51b229bd3c465ccc43df93b713e3088baf76cbb7367cdc75b8374b787fee635cc921b431d5e1471a60a990d57a306d8ebdb14f0c462f211b323f99 SHA512 a7b56723a0fd692496a4e397ca29139f0813bfcea365877900441f01f38e5fd15d20a1642a5717940994bdfc840540d38b9a594e2510ab070ae62fadf9b4958b
-DIST boto3-1.22.8.tar.gz 496856 BLAKE2B c7707eae7a5966dbe04e86c35270674f532286d3fbed46580836729988e55cdeba872496de750af89de6a7afdc6b19bbe4f8b9025580dc9b825cd04a87530b21 SHA512 43498179a59c2a1c9401f0629fbf0f3ff1dd51d2208ade828ff283b44be28fd539af68d4fb274e5e8c6c01bd03699872cd1a81d006f4c929dcdbf7227f77416f
-DIST boto3-1.22.9.tar.gz 497262 BLAKE2B c3fad6d556c62403578347600f2781b5fbf34a5ba975b596878f892cd1981bd06e25e50e4c67e5b5b27d6a0fec3aa8af0ea6e30a38277dcf1ae157719d95b3c5 SHA512 f32d6b9b2a8f2d6fcf975446f2c3530a8ba29dc8a3d55ed7b675bc7fb68694c3e6e1f0c54c3f6a715923f9c10268c7db04d897b73add7098f0e43062d2f28775
-EBUILD boto3-1.22.10.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-1.22.11.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-1.22.12.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-1.22.4.ebuild 1601 BLAKE2B e4a166bd86a30c0d554d8d05c9e6c98935c6abbda53ceb3ee84316495714cbdce8c245cde97f1a9972a53b18cc3baed4f23d8ffdba989f53c2bb68e0f10ae06b SHA512 d14974fb810d1bcf2f790450d90d89a9d48f499fab278bf5b7ee74dbf1557b6af5cbd011ae8229a8787b449b47526332c3197d800e2104d96ff18bb0cbf110b9
-EBUILD boto3-1.22.7.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-1.22.8.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-1.22.9.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
-EBUILD boto3-9999.ebuild 1575 BLAKE2B 08276658a19682e71e83073a3f046ee84f555504a34b20fd93770f1297511400b9b04602ea1150e907db2a23c94b3c261a2fbe2085847b42ccff4b1b944802ed SHA512 271741fa3b8eefec375de0de8962ee72b0bbf57dd9bc7220f755604e08420ae0aaaba4082b5a76b20fb20febefeb7c03d52065bfaf17989b26185311503c69b0
+DIST boto3-1.24.12.gh.tar.gz 509573 BLAKE2B 5c9978cac1cbce0521dee6f2164652c4fca82b0bf20276e3f4e75960e0877ec0545ca50884daedde115bba117bea424da2ad2fe63e845a32a6f832a3ab5a5841 SHA512 dec940a6e97c51089933a66994b14882f31f2ed7959f966e1f9cd2e6a4a1bb40cc2c01d509ce7346ac345df30d0f164213034c0de97daf3053ba4ea51e5f7495
+DIST boto3-1.24.13.gh.tar.gz 510032 BLAKE2B 4d204f4b4e1dbe970d45e65eb04061193d1b21236b59f33994d03138e5a1f31fce2d27f7323d1a4da8b5f88d143e1dc51cdc73e19689e79722ae696453d314e3 SHA512 e8962339b1e5c72ace2d9980d7268bd09725b11b30425c32d649703089b32324ca442e597756a14a3d4be222c3628a8ccac4da2d7739cc237dfc29a8ea722818
+DIST boto3-1.24.14.gh.tar.gz 510393 BLAKE2B c5a3f28abdeb3deaf33620ab7278b5d14dce55297e37c8d17e58994348f7459598ea96c3d44cfa7cf4bfa760aee2ab09aea0d905d514cc2365b0beb12424ea49 SHA512 d357cfd4e1098a8aa7e59aad36f27427dbc43fe39bfd3628928879058ee396774ebbc2c270fd5422a125f447a7b64fcb34da5008fcf44a8d74ed344b81f65666
+DIST boto3-1.24.15.gh.tar.gz 510710 BLAKE2B 9640c037d6bc95225b9dbb9fc8b33d65a4253057b9a534c1dc2f33a5040796b25fe069a1842aee61851b0b5a75c15770564c5348b8937cc38cc8b898a5d01106 SHA512 07b8758afa9454d435a8935e90e7bfbe91ba266fecfd8413f81cb000c86101a8ad14cd9dd7e5ba620dd807da9501409896c36b532d243d68f26b4d0aa8574fbb
+DIST boto3-1.24.16.gh.tar.gz 511182 BLAKE2B 00180c2cee9499efb3093c517f776536a85972014c622ec87d327c0e1a628b1440a85ddb239431d7c647a459f8c55422136f61254cd192cd3ca8f68eb03270d9 SHA512 cc2d179ba3975fdfc1127565d352077529159cd97d120831629650af881600d022f8a55f4ccfb3c732be5814b58739178063042ca7a0e26f0163f47ba8dddb36
+DIST boto3-1.24.17.gh.tar.gz 511281 BLAKE2B 577efc0ebfb39957e55bcaf7aa678cdf072eed885ab1055b15fc8ca2295fedd6d56fd2fb919913beedcdd335ff26e452bc5434283c9ca9d8f0135080e2aa1312 SHA512 a843146951eb2a5ad7dd31159d833806ae403014abf3e9a617f6457e3ecec1a0dc4c6ce6a87079c9112513cbd6a2ccd26542e5736eeea6c5723c7e39c660befa
+DIST boto3-1.24.18.gh.tar.gz 511407 BLAKE2B a723c58db4cf11a982aa5b779cd27870c96fc63d08dc733f5c7c70bcd027c4ec542c5f988bdab6dd35d9c72bd985b21473b6bc58604ef4ae84b7993de42e754c SHA512 369200635e7c52761ea13f4755e8c105dca92259922e947d777b1400f69f8ed443ae6dae0df4f8c46cdf5493819be696ab4b200216d86285ac68ccc817ecd13e
+DIST boto3-1.24.19.gh.tar.gz 511808 BLAKE2B b59ddc7826f30833ca5b4ea5b71a2c1f19662cb108e93e4455908788d8357addf7edfdbe993b855fcd1ee063f4def7176376b08757d69745ff2ccaeea908f46d SHA512 007ca70cf4510c6069d80fb885e6b4d4eb8724b333765b60c2cc283f01d1771e9238f61469e303e853045544c6ae2409fa171a3e72e29659f1893fbb9731c98e
+DIST boto3-1.24.7.gh.tar.gz 508670 BLAKE2B d526f6a4dc4c6126c61ca7c9074b4341c742f84a6e95b38cd8a450fb74df379cee44513e1be6bc7cd0c8f728598d0ecfc06240120a8da71f75f86371498f5233 SHA512 4d57e38c18138b950f93a234132ac1d31c9a29ad00ca5e1298517d6b16ff2849802ce6cfeb8de390c2eb25086043d45e0276a7a563707595649ca1905367be52
+EBUILD boto3-1.24.12.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.13.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.14.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.15.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.16.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.17.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.18.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.19.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.24.7.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
+EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.22.10.ebuild b/dev-python/boto3/boto3-1.22.10.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.22.11.ebuild b/dev-python/boto3/boto3-1.22.11.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.22.12.ebuild b/dev-python/boto3/boto3-1.22.12.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.22.4.ebuild b/dev-python/boto3/boto3-1.22.4.ebuild
deleted file mode 100644
index d7c7cdc0e1fc..000000000000
--- a/dev-python/boto3/boto3-1.22.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/boto3/boto3-1.22.7.ebuild b/dev-python/boto3/boto3-1.22.7.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.22.8.ebuild b/dev-python/boto3/boto3-1.22.8.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.22.9.ebuild b/dev-python/boto3/boto3-1.22.9.ebuild
deleted file mode 100644
index fd6e0d8ebf01..000000000000
--- a/dev-python/boto3/boto3-1.22.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/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}]
-		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.24.12.ebuild b/dev-python/boto3/boto3-1.24.12.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.12.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.13.ebuild b/dev-python/boto3/boto3-1.24.13.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.14.ebuild b/dev-python/boto3/boto3-1.24.14.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.15.ebuild b/dev-python/boto3/boto3-1.24.15.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.15.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.16.ebuild b/dev-python/boto3/boto3-1.24.16.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.16.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.17.ebuild b/dev-python/boto3/boto3-1.24.17.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.17.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.18.ebuild b/dev-python/boto3/boto3-1.24.18.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.18.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.19.ebuild b/dev-python/boto3/boto3-1.24.19.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.19.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-1.24.7.ebuild b/dev-python/boto3/boto3-1.24.7.ebuild
new file mode 100644
index 000000000000..c93eb5e2d7c0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/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/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.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.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index fd6e0d8ebf01..6edcc751d54b 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -21,7 +21,10 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	BOTOCORE_PV=${PV}
 else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
@@ -31,7 +34,7 @@ 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}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 11f30e7db778..fb726c7febb0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,21 @@
-AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.25.10.tar.gz 8963726 BLAKE2B 9823581417f4ddbca840fec85421c01089987ae53fff3825463a79e2663c753d0aa00c2f3dc714d5bf62ee491b4521964869c8e39c5f88ebd562676267b35831 SHA512 6daaec14be1cafdf43bdb4b182a31649d88ee3a9b7e2a88409e3a9fc5279479f78800a0b49ec405936e6695ac4c1b672a62b31b2486049193734ade98f275a10
-DIST botocore-1.25.11.tar.gz 8965078 BLAKE2B 9303ea0c5bd298be3167a887bf8a5b66edbe0f2c82273841daabf975c1f78f18e80092252d0c9c79e05992039ea1048cfe36f4ecf9e5a941e2ad80f7a7ede314 SHA512 2afe95fc0ee2d50e87c6ffc8cbd189fea71f0a97ce508c01642f0a736cb2fe220531324366fddad3e725bc81ca4ef3ffdf2c281c3c89075cae5416f5722b1b1d
-DIST botocore-1.25.12.tar.gz 8964692 BLAKE2B f039aa570d74a2fb5cacfb4d43ab2e34c677f471a6d325fe02afa2aa7231960dd70f13b8b0c988fbf9c0dec2bda7b95ac2069b00233211c30aa2d9e0cf287747 SHA512 da88d66db527216f81101fe30a2c90cf423025bbe28d7fda227fc80b9a33696c63630a885e5809810688dc80eb274898301a3877855c904b8c8bd8b85edc12a3
-DIST botocore-1.25.4.tar.gz 8955210 BLAKE2B 50880e9d7f57e4f3b8662625a64e9470eaf8a984fdbcc34239bfe604544ccd3ac62e953d7be4e1b486fab4ad0d571361ffc9fdc43cb860cd37a95c33d7b824b2 SHA512 a04e03271d217ab1ef5488dcfedda2904b8e628dae969c74e284d004ae72f18d9734d3f7cf775235c8384b30f4d0fbfda7c0e5dcd687039ddb7b339330e63317
-DIST botocore-1.25.7.tar.gz 8961319 BLAKE2B 1d22e3cd625252f1e6c6b13b9317750b48765150006ca0b632fd15aa6f31079855a1b6c7201cbed0ebfc7147a87389e1a4445d0736829554f8063b68944107cf SHA512 a22a35a1de87aff2efa7b4b5f478e44be7ce2eadf0b7da43af2a0de9ba315a9b75ac59da29a8f10ed15bbf6ff4d76d904407f95a7f8f08049c546450bd6c7c4d
-DIST botocore-1.25.8.tar.gz 8961194 BLAKE2B 4a13f5b01352ff0cb8932431e9431229a73fe922c2719ee571fa26ed55faa0315e0bdd561dcf2069748d13c809c7c5b7e2a35051d5d8bbd498677658b69ff454 SHA512 bc78c24629308d4d8cb4190646b7f465713a5462c54ff0946fdbcfa8b87951fa337a2f8f97bbd27991a79da03d140b890f2b021f865c7550b791d2fbb95282a1
-DIST botocore-1.25.9.tar.gz 8962451 BLAKE2B 5930499f514d5e9b9f0fa0c87a2461071a0432bb3957779a4669448bd7b34e94a5339598703419f36c01e505c8487217a4f525ce63832bc97ad35ef584ef45f3 SHA512 533c5ff383e53aa2b00a83b182207e9dd2d40ea000c7a0f1e74e30989c6c15f54fd26eb67375ceeb90c1a6ab158bda7de75ac40fe6b14614209ebb7063b9e2a1
-EBUILD botocore-1.25.10.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-1.25.11.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-1.25.12.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-1.25.4.ebuild 1683 BLAKE2B e8712dc3f3372683dfdde06aa37a7d6ca1702499d6f58fe4ca0b4eb99c25a1ea6b7ee8600f4407c93d747f28fe1034af36540f80a1f884b561de84bec2c5713f SHA512 6c94b413dc118624ea507d86e8e19e4ff1c3f32e0d9ade7e4a280894cc3164b0823e41686d2ee504b96d69a4b8b1e68575dd46fd5c6d3f40a4f25cd1b9bfc499
-EBUILD botocore-1.25.7.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-1.25.8.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-1.25.9.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
-EBUILD botocore-9999.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+AUX botocore-1.26.0-py311.patch 2164 BLAKE2B bbe6b3db1a2369293894e8d7ef610301223e0e569b1b21d5ade581af42f09ac59a67a9b8e960140b81a184b4bc0962805c6cc352253f3cbeb411563bd3d1a74b SHA512 375589f268b37a9c92f816887356f1d1713d182126566dfa8abd370df605f77a55aca88a5562182fe8b1574f402409ce6bfe49b0c6705f7f06e441649ae5aa99
+DIST botocore-1.27.12.tar.gz 9132872 BLAKE2B 74b74b5a5745cfacac066d5e087974fb58be5a600c7cfb2077d243044b8c429b1396d19e6790c0f754e42931085b115f74039b8c93da39593512d28021d6314a SHA512 767defae44ffb3b54b55625fd0f8a20c22a4a5f209a1397b1a27cfc2e36ac9e03cfdd25bc77bebc944613c5744dd7651e1b574674e8a992f219e172eee9210f5
+DIST botocore-1.27.13.tar.gz 9134638 BLAKE2B 471a46a4c4f14082ceb7030495a121ea90a6f67b6f802cbeb1394624513ff86deb7b90e3aa3e568dff42cd3280ea038565752eff69577231250b6542e6586e1f SHA512 6becb7cd6d2ea3b09012f7b168dcf7fd3386c19ee6003a4e8f4059e3b1ad2b281f5fdaab7abaafe6c34bccd547c8f8ef1bc253f5190d3e91127b1239ec8e307a
+DIST botocore-1.27.14.tar.gz 9134503 BLAKE2B ca29a33c5363457053f8ac042279726a15d3dc5f72546558d11bbacd79e7641d94b1137b76e201ad00203ecff53274fd41abd9178e7abbc1c5a51fe388f7fa5e SHA512 3995918212559eab009f141f94e6e6496fc77f12438e1dd62ce3ee232009b90de3882d342d20e83eb11de5f35b7878f53eea884016874caacb9d2e3d167b4f1a
+DIST botocore-1.27.15.tar.gz 9134585 BLAKE2B 33fcf026334e0be28b7f20b78e072d4eed85e857438319dfe6a1aefb2aeb287aa7a4d6b5f40cd47b9ca5e904263bd7716e58fe2962a75fa64ffea8da383fd527 SHA512 15a65137b131220863fc7fb4c085d83b858a673ee49370bc8d5ce8433f2ee3c99dffd102830da10ed1c4fa4a6f5fdc5f543be4e88646f981409fb855ea100932
+DIST botocore-1.27.16.tar.gz 9138117 BLAKE2B ed636cd031445b14f57282326836616dca626c27ff912b5a2014df83c5574264f773d9ab8aae2f01b55bb810d00233f1a4cceb0f746767247b5954bb8739b7be SHA512 c4b1debe648cd3027fe409f4ec095a4b454050ec427e8a11e04bc1f82d452566d2168dd539d5dc687e46e612f3d47e218d99de9510156e19eac477ea3c0259d2
+DIST botocore-1.27.17.tar.gz 9130505 BLAKE2B 04c6b37f3b42a0f9fb696b5213338b004418a68c754f5027ad447119fb20556dc49bd53f40fd9560ea3f5bdcf2afbe151dba68e901079baec770f9f223b1a894 SHA512 b1a145d3c97adfd4df40639da99e1c34087508be189d5818ee7176f20454f2897a6f518a14b4bfbf41cb169a17188bec467337c10d0ad511e223f0c1ff5b64ee
+DIST botocore-1.27.18.tar.gz 9129942 BLAKE2B 61c06ec3ec8350cb9c43c5716faabe5035b74907fd4a94f9b007ec6e488ffb38a9d75d5b3372fcbbd26cb7f9599ba185cbcf2fb48f7e5900e0028832bef74187 SHA512 9eb700af06b1eca88df77ad46a54a73bbd198d36b055ea219c8948557bda7edd0307f48321c416c3128fe2baacc35aaea10f31c57b43511a512c6c7c46b0a6db
+DIST botocore-1.27.19.tar.gz 9132910 BLAKE2B a23d64ec934de03f7c31b1c89229d5054e689fd050a74db7467b31c79c38eb732286d4db747ca132fa9917be79abcac27b3423f9d0a0e9c9477f56c2ace3944e SHA512 28ab3d94c8f3763b42bd36c97787ce8f86bd8958cfc1b63fd445713fcea523ed1be615a699d0476a3fa8798eff791791c6a466845b63d1454a6aeee6bf9425a6
+DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
+EBUILD botocore-1.27.12.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.13.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.14.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.15.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.16.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.17.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.18.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.19.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.7.ebuild 1628 BLAKE2B d42a7b3e64fa2a66eb055490c1525faedaf9178fcfbb8aec42fa09841ddca13b276a8872699d7e5b2cea725fd2e835570a59c2eb9783a63bb728266499185321 SHA512 cacfaeb4cee9165055b59b287a2bcf73759c4d1291b3fd0831ca309ef6937347655be22c715328e212264c62e41bd03b024eed020826b07165f5518e52f4729a
+EBUILD botocore-9999.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.25.10.ebuild b/dev-python/botocore/botocore-1.25.10.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.25.11.ebuild b/dev-python/botocore/botocore-1.25.11.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.11.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.25.12.ebuild b/dev-python/botocore/botocore-1.25.12.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.12.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.25.4.ebuild b/dev-python/botocore/botocore-1.25.4.ebuild
deleted file mode 100644
index 6a12bd736d2e..000000000000
--- a/dev-python/botocore/botocore-1.25.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.25.7.ebuild b/dev-python/botocore/botocore-1.25.7.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.25.8.ebuild b/dev-python/botocore/botocore-1.25.8.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.25.9.ebuild b/dev-python/botocore/botocore-1.25.9.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${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
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.27.12.ebuild b/dev-python/botocore/botocore-1.27.12.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.13.ebuild b/dev-python/botocore/botocore-1.27.13.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.13.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.14.ebuild b/dev-python/botocore/botocore-1.27.14.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.15.ebuild b/dev-python/botocore/botocore-1.27.15.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.15.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.16.ebuild b/dev-python/botocore/botocore-1.27.16.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.17.ebuild b/dev-python/botocore/botocore-1.27.17.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.18.ebuild b/dev-python/botocore/botocore-1.27.18.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.19.ebuild b/dev-python/botocore/botocore-1.27.19.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.19.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.27.7.ebuild b/dev-python/botocore/botocore-1.27.7.ebuild
new file mode 100644
index 000000000000..c95d40f1e265
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/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-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index a1a5a4e1ea37..2fb86c59b25e 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -38,7 +38,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
 )
 
 distutils_enable_sphinx docs/source \
diff --git a/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch b/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch
deleted file mode 100644
index 49fd3adef376..000000000000
--- a/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 78077a5e80c9ad5f909037a48100481ddfedc6b2 Mon Sep 17 00:00:00 2001
-From: Andrey Utkin <andrey_utkin@gentoo.org>
-Date: Wed, 13 Dec 2017 01:50:03 +0000
-Subject: [PATCH] tests: pass all env vars to cmd-runner
-
-cmd-runner was started with no environment variables inherited.
-This breaks tests when run with custom PYTHONPATH, which is useful for
-testing botocore while not being installed in standard locations.
-
-One case when this is important is performing tests before installing
-the package in Gentoo Linux.
-
-Link: https://bugs.gentoo.org/640726
----
- tests/__init__.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/__init__.py b/tests/__init__.py
-index 74a2e4de..fa0b819b 100644
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -145,6 +145,7 @@ class BaseClientDriverTest(unittest.TestCase):
-         if self.INJECT_DUMMY_CREDS:
-             env = {'AWS_ACCESS_KEY_ID': 'foo',
-                    'AWS_SECRET_ACCESS_KEY': 'bar'}
-+        env.update(os.environ)
-         self.driver.start(env=env)
- 
-     def cmd(self, *args):
--- 
-2.15.1
-
diff --git a/dev-python/botocore/files/botocore-1.26.0-py311.patch b/dev-python/botocore/files/botocore-1.26.0-py311.patch
new file mode 100644
index 000000000000..8caa8765c008
--- /dev/null
+++ b/dev-python/botocore/files/botocore-1.26.0-py311.patch
@@ -0,0 +1,54 @@
+From 46a3d92e29a03f547d85861bb6e21281b6a42e60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 May 2022 19:38:23 +0200
+Subject: [PATCH] Replace deprecated inspect.formatargspec() with
+ inspect.signature()
+
+Originally submitted by Hugo van Kemenade as #2507.  Modified by me
+to remove the first positional parameter like the old code did.
+---
+ botocore/docs/method.py | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/botocore/docs/method.py b/botocore/docs/method.py
+index 0f7c60f6c..44c97d6e4 100644
+--- a/botocore/docs/method.py
++++ b/botocore/docs/method.py
+@@ -11,6 +11,7 @@
+ # ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ import inspect
++import types
+ 
+ from botocore.docs.example import (
+     RequestExampleDocumenter,
+@@ -101,14 +102,18 @@ def document_custom_signature(
+     :param exclude: The names of the parameters to exclude from
+         documentation.
+     """
+-    argspec = inspect.getfullargspec(method)
+-    signature_params = inspect.formatargspec(
+-        args=argspec.args[1:],
+-        varargs=argspec.varargs,
+-        varkw=argspec.varkw,
+-        defaults=argspec.defaults,
+-    )
+-    signature_params = signature_params.lstrip('(')
++    signature = inspect.signature(method)
++    # "raw" class methods are FunctionType and they include "self" param
++    # object methods are MethodType and they skip the "self" param
++    if isinstance(method, types.FunctionType):
++        self_param = next(iter(signature.parameters))
++        self_kind = signature.parameters[self_param].kind
++        # safety check that we got the right parameter
++        assert self_kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
++        new_params = signature.parameters.copy()
++        del new_params[self_param]
++        signature = signature.replace(parameters=new_params.values())
++    signature_params = str(signature).lstrip('(')
+     signature_params = signature_params.rstrip(')')
+     section.style.start_sphinx_py_method(name, signature_params)
+ 
+-- 
+2.35.1
+
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index c277783bd51d..f94a94e6f520 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,4 +1,5 @@
+AUX bottle-0.12.19-py311.patch 1606 BLAKE2B 78808f90cf5c32ad6ac4675c3f55b144cb3d6d4fb5299a7e78de785553de13d5c9e44da78a9444aa92f869cede8d8e75a52773c1d5bea5d5a29893d27d8edbc4 SHA512 584ef8a5a66175841c318596c63c6ffa702a4c5b0958c1465f8def98a89aa32c9e36ad6caaf361bfdcfed050f4b2361e58b32fbffa2490014bd51c29244bd39d
 AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
-DIST bottle-0.12.19.tar.gz 73142 BLAKE2B e59d7a507d3401869ba4953a48274062fc56226afa2f7aad596b4ef4352e4a79cea2d224dfe32d7ce014e4f4a3ba088d0e7a0886f64a84bb6b78571e953fa3c3 SHA512 e5d2f6a32d1b89ae3cc9607456c0614db2b58882c6d36273d695c51d3d77b1858cac4d914dbf19bca3b74be68c197aa6473f162e40d9b7ae2af3a084a28c2637
-EBUILD bottle-0.12.19.ebuild 1380 BLAKE2B f3b2dd740980f6e11b66a5ccfb75070a03b7449f605ca3b280165316292102df2c5ae805f8bf079e4dff8df829e8fd1a494076cf4127301b551feb29a44c05f5 SHA512 2e1fff641be3a3f377d0724db4cdf1f2d3d339ca968450c5fe388696bc6e72e7469655b042d6536dde989821007b8de3845edbaeaf83542a22b9c02dcdffb180
+DIST bottle-0.12.21.tar.gz 74229 BLAKE2B 88674389d2c087a7416443d031995ee923a98b790eb85d81b625f11b2fb0baee35d90a3ee2dba5b9d4744a343a34396a50edef0f85a2d6f4f0f4da95bae31b5b SHA512 3d621f6684f439a4a5718ad25e8b45eb0d1100cd565ec5b797adf67141e01d835cde671e687f5515cb6eab69bb465e9c7d004131634609266c2e1b69b0adbf43
+EBUILD bottle-0.12.21.ebuild 1417 BLAKE2B f5c8c1d9e0f9a45aef84a0a68b7117d955b31d78988a104a5b668f60c37c8c4e5b9c312cd6d92b83c4af6bbe9518df5432af76726fba05ed14c4a0b2e2b27a3e SHA512 b11d4a990ff0986af51d0b90513c41169f62c7af08b2af30a7762c70aa8b54b442ebf45d8424ac2a888caf16a30d634666bb36b99a3082d52ceaf52eec8add85
 MISC metadata.xml 345 BLAKE2B aef224dc08d75b22612e8f781673a84f4de7a50d2dd2af98c31286cbfbae19a1f4777f60c279b73a5291e7167581640c1bf9928884c95d8489f6f6c2045b9898 SHA512 62bdb54efd9580ecba9372b45973138202d7524bad742fd8752ef09149daa5f650c278aabaadec3de7c852595775ca7c858451a3dbf78a8f1f4df11379fe275e
diff --git a/dev-python/bottle/bottle-0.12.19.ebuild b/dev-python/bottle/bottle-0.12.19.ebuild
deleted file mode 100644
index 4a7ace2670ef..000000000000
--- a/dev-python/bottle/bottle-0.12.19.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
-)
-
-python_prepare_all() {
-	sed -i -e '/scripts/d' setup.py || die
-
-	# Remove test file requring connection to network
-	rm test/test_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# A few odd fails in the suite under pypy
-	# https://github.com/bottlepy/bottle/issues/714
-	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
-	elog "we do as most other distros and do not install the script anymore."
-	elog "If you do want/have to call it directly rather than through your app,"
-	elog "please use the following instead:"
-	elog '  `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.21.ebuild b/dev-python/bottle/bottle-0.12.21.ebuild
new file mode 100644
index 000000000000..5f1690c5bbf0
--- /dev/null
+++ b/dev-python/bottle/bottle-0.12.21.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A fast and simple micro-framework for small web-applications"
+HOMEPAGE="
+	https://bottlepy.org/
+	https://github.com/bottlepy/bottle/
+	https://pypi.org/project/bottle/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/bottle-0.12.8-py3.5-backport.patch
+	"${FILESDIR}"/bottle-0.12.19-py311.patch
+)
+
+python_prepare_all() {
+	sed -i -e '/scripts/d' setup.py || die
+
+	# Remove test file requring connection to network
+	rm test/test_server.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "Templating support" dev-python/mako
+	elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
+	elog "we do as most other distros and do not install the script anymore."
+	elog "If you do want/have to call it directly rather than through your app,"
+	elog "please use the following instead:"
+	elog '  `python -m bottle`'
+}
diff --git a/dev-python/bottle/files/bottle-0.12.19-py311.patch b/dev-python/bottle/files/bottle-0.12.19-py311.patch
new file mode 100644
index 000000000000..c7c36c3a37ee
--- /dev/null
+++ b/dev-python/bottle/files/bottle-0.12.19-py311.patch
@@ -0,0 +1,45 @@
+From 232f671fd0a28d435550afc4e2a9fde63c9e0db2 Mon Sep 17 00:00:00 2001
+From: Riley Banks <waultah@gmail.com>
+Date: Sun, 11 Oct 2015 10:21:43 +0100
+Subject: [PATCH] Implement getargspec using inspect.Signature
+
+---
+ bottle.py | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/bottle.py b/bottle.py
+index 9806efd..18ed730 100644
+--- a/bottle.py
++++ b/bottle.py
+@@ -41,9 +41,27 @@ import base64, cgi, email.utils, functools, hmac, itertools, mimetypes,\
+ from datetime import date as datedate, datetime, timedelta
+ from tempfile import TemporaryFile
+ from traceback import format_exc, print_exc
+-from inspect import getargspec
+ from unicodedata import normalize
+ 
++# inspect.getargspec was removed in Python 3.6, use
++# Signature-based version where we can (Python 3.3+)
++try:
++    from inspect import signature
++    def getargspec(func):
++        params = signature(func).parameters
++        args, varargs, keywords, defaults = [], None, None, []
++        for name, param in params.items():
++            if param.kind == param.VAR_POSITIONAL:
++                varargs = name
++            elif param.kind == param.VAR_KEYWORD:
++                keywords = name
++            else:
++                args.append(name)
++                if param.default is not param.empty:
++                    defaults.append(param.default)
++        return (args, varargs, keywords, tuple(defaults) or defaults)
++except ImportError:
++    from inspect import getargspec
+ 
+ try: from simplejson import dumps as json_dumps, loads as json_lds
+ except ImportError: # pragma: no cover
+-- 
+2.35.1
+
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 6d005c693e26..820cfee53070 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,4 +1,4 @@
 AUX bottleneck-1.3.4-install-test-data.patch 512 BLAKE2B 850df917f8b10b2c513c083863786072624c3e75c3dc81520f7325a3fe0b91d15b72fcf670b4fa047a56714ebcf7f101acd9b696c46cd0844105582cddd3ff7f SHA512 d1f27e5be6043b92372b1110b7705b3ca4fb01c4d62b9aefa9f5fe05b4d7cff9f8aef11d463785b55651b91b1c748851e1b571d801fc22d74c6d6e2ff52e9a09
 DIST bottleneck-1.3.4.gh.tar.gz 118739 BLAKE2B af4b32bf296f11538b12f364592553d407668762e1e2d94c814bf262bc9ef88f1338cd388ff1c02065f8266988fe6cad5f8461aed2a144a9bfaf98f8ae46eeae SHA512 0cb3837139f947a7da026bddc8ff6e8025ee0aac6aedf4046383eb8385789d1816158ae20438b15a28c7f0b6552c3570c18abdbb6ef265fa9f497edebae1d808
-EBUILD bottleneck-1.3.4.ebuild 874 BLAKE2B 929ac37335222284ff882080780fa3f08fd4a7a91277b8cfbb608c64d4b51a3f739331c96f249abaf5554018a9252a6abe27fa78ebaed22b486c8979bd13bfcf SHA512 bfd2aa09879f6c3ba430a86a9a5dc967210f68f4098716fdcd8d35ee8f965ee849d79c3f305726ae1a80714a59b3f12eb10e746412c398e50329bce5f0c8f9cb
+EBUILD bottleneck-1.3.4.ebuild 863 BLAKE2B 3dbc46bbfde6c6633b7c76f7ca68ebab0d53def686fba15929b0b56a4b2b01d49b5375149582d5789ec3399093e2e8ff95d8a9ebf27ae8de8c5b043294018012 SHA512 2df59b21d20e23f0e8fe3a5603a54a126903cdb0d247ac0f9d8ca78f095805b8c4ecc0061e80dffe98766a59ac8f09964d3c79fde6158eef3dac984b8860a216
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.4.ebuild b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
index b065a6e175b4..c53291d5bbf6 100644
--- a/dev-python/bottleneck/bottleneck-1.3.4.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.4.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="https://pypi.org/project/Bottleneck/"
+HOMEPAGE="
+	https://github.com/pydata/bottleneck/
+	https://pypi.org/project/Bottleneck/
+"
 SRC_URI="
 	https://github.com/pydata/bottleneck/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -23,9 +26,6 @@ RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
index 657a3d95a2bb..228d63f8c4b4 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
-DIST bracex-2.2.1.tar.gz 27642 BLAKE2B e9eb12dd70b3cf1c6abd8a59f19d8f77f8fc85e07efad02a2c0213266b93641406d05fa8454b2b4cd6870b7f866a22c0b2132d690444f1910a599c9b17594065 SHA512 cad9faf73258493581606bf5c8068d34a82fdcca338dd6a1d7da5dacfbee1932f48d04d6f295151d79f02495ddf89aa6a5d53d6596db7bd53ddb3cd23d59a71d
-EBUILD bracex-2.2.1.ebuild 1054 BLAKE2B 0a114d8e087a0eec3b2895efacebf5290a8242e0dac8a5d96027e278efa000bf0c5c561f37c26f98c821df5fa23c2009936f1ec3cee83e2d3bd4f125f2de9651 SHA512 fc34d8a24f61f44094e1613795c3e4793cf1c48de838929be607a372b01771160944bb0ae2d24afc8a57b68f2edb1addfe2ac1f34165e73cf871860b4d2948f0
-MISC metadata.xml 1252 BLAKE2B 4bb9a22d0a8a43a0c3ba1323ae61856d75f6457e14248f120ded6b26fa134ec9c74147944a8d313d7d4bfa0428c6bbd1f4ca954575f6feb50371eced46c80a70 SHA512 0ffdb28fc887afd29ab5c7948a41fb212d677413588bbc32343583ec31df042f75a5dda3c366ddfe78d4f42973bf2052e3226b118d71206d885d56cc5891ad0e
+DIST bracex-2.3_p1.tar.gz 27541 BLAKE2B a9e33e01f014c6b784b059a76da338a708a24ff88787c98c0916a6d13ac5497a1f4f14d711cab8bde1281a9968db68bdc8fdfbc23a531ef6c89adfa9974492b1 SHA512 3c5a8a81adb78c9d3d40b57328a6a47b3257bb0072be2685c8049cf8a91501993ce470dfd394a61d0a0fdcd082405b204e5e3e0666018978b5aa820b0d74b631
+EBUILD bracex-2.3_p1.ebuild 1154 BLAKE2B f5b70ab0cab296f4676af4d0545bdd71c00425542e603dde17104addb069bba565959cc319a6fdd34f9f2a2187b0eb1d0f5f36b9efc162e8b5600f7fdf52bce2 SHA512 4efcc3574ba688daf759236d33fdab7e1e95f8b1f6ddd790164dae7116af10b55b88aab9f8d9352fab0f55fcbb5901a9b1513c1e86d0d3016e031cac82fa37e5
+MISC metadata.xml 1353 BLAKE2B d6fd0602c7e79269273cea7837247e6f2a3bf4cb26a3abae6a70975792b12f83b8403faac84e8c4011bf236df34da5ff85904e13efd54a577f04b16ee0abd642 SHA512 74a14139c4a40c542680dfd94b2f227c7cb62981bac82e2b57b68c6c2e3be17e80222e01fd92e53b18fae2d8e33fb84f01f074e43e1ddb21e0f06bba13bda713
diff --git a/dev-python/bracex/bracex-2.2.1.ebuild b/dev-python/bracex/bracex-2.2.1.ebuild
deleted file mode 100644
index 60e4d11db697..000000000000
--- a/dev-python/bracex/bracex-2.2.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-material
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs_pymdownx_material_extras
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bash style brace expansion for Python"
-HOMEPAGE="
-	https://github.com/facelessuser/bracex/
-	https://pypi.org/project/bracex/
-"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="test? ( dev-vcs/git )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# 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/bracex/bracex-2.3_p1.ebuild b/dev-python/bracex/bracex-2.3_p1.ebuild
new file mode 100644
index 000000000000..8ac52e0eef59
--- /dev/null
+++ b/dev-python/bracex/bracex-2.3_p1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+MY_PV="${PV%_p1}.post1"
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex/
+	https://pypi.org/project/bracex/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${MY_PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# 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/bracex/metadata.xml b/dev-python/bracex/metadata.xml
index 101d10bde0ed..b1ed97104dd1 100644
--- a/dev-python/bracex/metadata.xml
+++ b/dev-python/bracex/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/bracex</remote-id>
 		<remote-id type="pypi">bracex</remote-id>
diff --git a/dev-python/braintree/Manifest b/dev-python/braintree/Manifest
index 95986212ce3f..73ec8ae2f82d 100644
--- a/dev-python/braintree/Manifest
+++ b/dev-python/braintree/Manifest
@@ -1,5 +1,3 @@
-DIST braintree-4.14.0-gh.tar.gz 206937 BLAKE2B 449a70c7f83e2ee3cb5c9e74624605387e0c12359e81aa18041c4dd2146c1bbb899cc97c9bcf6348ea1d0494d73d8a2366e41c05479e637d777a636cc1f0cec7 SHA512 d7d77d06c1a210200732e9e8fe4a55eb25f43ca7df9ab00fdbbbf077196c1605ed825976f691440e10b23bf4727b1e8200c5bd6b2cd9a66305110440cde0edce
 DIST braintree-4.15.2.gh.tar.gz 207089 BLAKE2B 5ed62e341c05e254cf3bec47f91704670bb57873be995352ce1e427e8075aee6193e11cbd863074b1ae39ddbf2c1a77f7c0207ffa9c8b7ca9335e2beeed42f29 SHA512 324823a078bc4068577793b169dd6b3d67e05d77850cebfe09602c0f6c3626ef1098f612c0ddfb7cc72b4b734d7319944c30297658f77edaf906334d27393f13
-EBUILD braintree-4.14.0-r1.ebuild 721 BLAKE2B e586c4a6e55ae204cd6559cda583852d4d56056f114fc33caeac2adffedac5416d8af670285ffa5ea9f505c64fdd0f39e1a78bc7ec553c35fad8cfc19eb47ee8 SHA512 79e79106427cde200cd30d5ffae38ac250a75c5fb80c3b1532132787a23b44513f24c2ef777c65ce652646f2e649ea678c76aa96bbdad90da5d535c6d53fbbe6
 EBUILD braintree-4.15.2.ebuild 716 BLAKE2B e8d1f98a5cbef751686ab49ca6633c9d79ddf0e930309a4f40df594547dd5d9f47dc58b42a75b78718f3077cf0ef59376effd691f5b12305f9b538868ef18f04 SHA512 f1bafa0905ab067b89e37f42db8f82c6a012cb7855695e4420754838385090631cc4d84f4ce1903e635c00d53f65842654ca0be9cb4620b5c99088b1046900e0
-MISC metadata.xml 383 BLAKE2B 70a8e7ca92990a7e46944543465ae8b4d57edcda29370e27b6d3efe6b2a08e8be51b79dc650b7c0250614104df37cf9f36083155da5c3aad0888bfeda8a411a2 SHA512 479ac40a800706fb70556a07f5097cd80886a9ad6778b2d71a457e2fd2be08578da90091bb87609fb66eef014ae2b7b84637fea4de20d1aca0c86e245abea5b4
+MISC metadata.xml 484 BLAKE2B 17a5993a7630126f55e88b92bf917ae068282c36813ea739407b65d91542d2a9977f3057889838bce776b38c5e64e4a17fabc3367ac01ae8512d06897de1a060 SHA512 c0f5406afc289683369998c79009defdd07735e6aaf60d777e524eee6c58dbaff4b936e990490cd15cd53f175accbfb3adbe55896511c79e9655f08bda24ba49
diff --git a/dev-python/braintree/braintree-4.14.0-r1.ebuild b/dev-python/braintree/braintree-4.14.0-r1.ebuild
deleted file mode 100644
index 6cdfcf182545..000000000000
--- a/dev-python/braintree/braintree-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Braintree Python Library"
-HOMEPAGE="https://developers.braintreepayments.com/python/sdk/server/overview"
-# PyPI tarballs don't contain tests
-SRC_URI="https://github.com/braintree/braintree_python/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/requests-0.11.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}_python-${PV}"
-DOCS=(README.md)
-
-distutils_enable_tests nose
-
-python_test() {
-	distutils-r1_python_test tests/unit
-}
diff --git a/dev-python/braintree/metadata.xml b/dev-python/braintree/metadata.xml
index 08260b0250fc..51d45abe1b56 100644
--- a/dev-python/braintree/metadata.xml
+++ b/dev-python/braintree/metadata.xml
@@ -5,6 +5,10 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">braintree</remote-id>
 		<remote-id type="github">braintree/braintree_python</remote-id>
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 007fdfc6444c..65f734bd01ec 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,5 @@
 DIST breathe-4.33.1.tar.gz 206013 BLAKE2B c0239dcf79752d3aa0bf72b2867b9e3b2e7c321758dba7a556abaf2296b69c1ae0745ec217857216938199a03fee9d9fa0338034fbd9c01f84ebd07fc15b5f80 SHA512 770c0fd8eaca798c84cbbf138b0b4b1a348e2010cedf5efec085fff348e8b0e548ccbe160ecb112709929ee0cf8fd0d977c5032ae03f74cd39f4bb2ae1d5f14b
-EBUILD breathe-4.33.1.ebuild 851 BLAKE2B 0a77a73101ac356bf436871dea67460c338bf668f3964b4be2a60e11825b5cf66752287dd8dd6a3edb6dc94307c70ad4de05715c168fd92c6858af348829c7da SHA512 2954a1bfd94d4cec3403a7aeb127c2461582f3f9b9f9c6f7846ec4b77e6e66ca8a6eeb80d527c2efe1914c07a4a74f4094e457ac11b1305857c344a7c74793a9
+DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
+EBUILD breathe-4.33.1.ebuild 851 BLAKE2B fdf0708193c0e2369c35c92fd69892ebbb033e2b5265aa0c3534421feb2e615aaa514b9574a111b8360eea21a1d951d190d23ca5b2a3fe7dd28dd01ae548e7be SHA512 a5a2179340c688545c7e2d0784f4334a9e5f7e670e4b6753ec71cdd3f72393403d5291eb0eb4705e2a69bead65020d8a87a233b868f4a614d9e677b60eb8d125
+EBUILD breathe-4.34.0.ebuild 867 BLAKE2B eaf394858738456e9db5220865a4c6a2217fef5196df75877b19752c09a104911dbb251fd27c087db0e1eead2f19ee44c8abc1450358b0d72311d6dc3ee8d775 SHA512 3581c555bfca0246d5bc1036b284acff1ffd3306337c1c3de9aff3bd0382cb8bd2893c377df84b904f4bb9d38dd9ae6336f94b938e27f98a092d4b5a7a8dd66f
 MISC metadata.xml 822 BLAKE2B a09a68e18fbcceb11eacf09d338bae8d49dd266e09fc6b622e0ababc35f626276b1d9aa7ffcc2724d036617cd3d81b4f6d8dfc04412cd35959a8468a3aa5118f SHA512 29da310d740a06aece98f36892d6f97c10f3f13de5bf8e70c238663a1b85bde5199766169242a786331d9cbe09a6f0207f186e18d6d13aa6e0b1fd9af5eeaa8f
diff --git a/dev-python/breathe/breathe-4.33.1.ebuild b/dev-python/breathe/breathe-4.33.1.ebuild
index cd78fa99b250..1fa5a75ced22 100644
--- a/dev-python/breathe/breathe-4.33.1.ebuild
+++ b/dev-python/breathe/breathe-4.33.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/breathe/breathe-4.34.0.ebuild b/dev-python/breathe/breathe-4.34.0.ebuild
new file mode 100644
index 000000000000..7af035cfb322
--- /dev/null
+++ b/dev-python/breathe/breathe-4.34.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/michaeljones/breathe/
+"
+SRC_URI="
+	https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 08add68877b4..a537d5b5ea92 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,5 +1,4 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
-EBUILD brotlicffi-1.0.9.2-r1.ebuild 1480 BLAKE2B 62e3d57f9fd0d90082e2c978e003fff84747f2e5f1c005b20e31cd205a4ca05f52c2bd8a16fd23191f6b654e5ac45a175ee575068a73b6ab2068f723e93fc8dc SHA512 4ce0c03e9cc3bf6a25e531f1e03c940c586a5b59f1d23d324f5b7c8769616286fac37269a71317567f288a72b2c2d9b3863924b213dbe2a3c805eac62960fd5e
-EBUILD brotlicffi-1.0.9.2.ebuild 1454 BLAKE2B 6589d0f4f6d33f85c763572b70cc3e69856ffa292eb0acc298876e08c5a70dc634d792980697c2492d31f15f5606ae2a92815a7d4a6b9a88304b21145b4788ec SHA512 b644f341362526fdd9ea5527f107eacae72d5f294dfaa39e66afb5f29312d5b684d7943beaa704f4de96ee83f918350ef6cf85d6409619dbcce5d24a98c5fcb6
+EBUILD brotlicffi-1.0.9.2-r1.ebuild 1472 BLAKE2B fad5c16ddbff176fc54d6fa14168ed546cac15dc64e2fc072cfb902f928ad30bf02801df13085daaf38eae4bf2d1f190c8c8e54ec4793f707e332d27551a926a SHA512 312ed9581a6bbda38c5a7f55b02f078b09e4146462d729edb0719b68e2770429a0c902b80d9803eb6fbd977836cf8236c8492217e1c4afb7134f360884b9c2b5
 MISC metadata.xml 377 BLAKE2B 13782cfbd514306140bb23753666679d94d15f89f0c2c84c13972151bd17d5c4ccd88930d60d732632f5e9a263d864b7aa5dcd741aae60508240e0f6d6f29230 SHA512 e440ae16d42ea9ab96317d26d88bf2955e0d8d5b4a6c41aca96a46c4f1e1c149d710d4cf52a569d6eb6d34ead71007fc2b2a7f67ff3c241e83d9573fe4d41e38
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
index fc75635dab17..4ea6fd766724 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.2-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
deleted file mode 100644
index 4f6adbdcb21e..000000000000
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-# Commit of the Brotli library bundled within brotlipy.
-BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
-
-DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="
-	https://github.com/python-hyper/brotlicffi/
-	https://pypi.org/project/brotlicffi/"
-SRC_URI="
-	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
-			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-	)"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli:=
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die
-	fi
-}
-
-src_configure() {
-	export USE_SHARED_BROTLI=1
-}
-
-python_test() {
-	local deselect=(
-		# incompatible with USE_SHARED_BROTLI=1
-		test/test_compatibility.py::test_brotli_version
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index d946c2795fab..2250f8e8b5cc 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,4 +1,4 @@
 DIST bsddb3-6.2.9-fix-py3.10.patch.gz 3153 BLAKE2B dfdd00e90c683557bafe7d5f0d5c9a6f944fb8495bf1baef8857f6e771cef58c8e5feac9b3d345ebf6403ba73ceaa7f9077f221ad6bad9916b756e6605b30d3d SHA512 3c6157110c94b842811301f4e48c0f1690d9c75379abe7a04bf76f7136d25decbf79673ca2940c5dbb97802acc8c7a9312a24a79e7dfcc3971f9dc250353d732
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.9.ebuild 1769 BLAKE2B 7a048ba94336331e37ec46b3eefb6e6661e735834c6925f6fed9f8aee076d52b186a91f527148eda78625bfa28ac33557674d6af0e38730ac4630dc175296b7e SHA512 17fa15d27d9fa5c0a10bf5b5496a2700d938eb865d168b74ff661e536168e9afac80ed256a50b40dead94b3f6f819f05edd5fe7749e2a0b296e5f019a0159776
+EBUILD bsddb3-6.2.9.ebuild 1769 BLAKE2B 85a541e092e9a60a31c56d1b38902d76155617eac26969e8982ef2fe8ccd9a7e5d6ae384a8485bca1ab3efdcca5f522bf11acfaa9560a4b4be3ebf763756147c SHA512 c41212e85553446c5f6fbe601391d1f348b0f6b948bc1d6b791484664f12318aeb48731c7a98003e54f21e4dbf30e5947aced0313ba90ac141f23320c0b0d05b
 MISC metadata.xml 310 BLAKE2B 060fc4b0a3a1821d830a1a5f8aa85e6c3485a8e9495f6dc53a9e0f79e2365249b84c2b5d3d92f9023c5ff6a6292d2a556cbf9706d652a7d33fddfc6cd929987d SHA512 4be1100a09d494b8ff85902a0352180ee978627cabd047c01a999b49f4ab2120050a9c4ce0e254df346dbb2ec78e2fce16b8664d755938a57e28bb16decaf5a6
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index cbbd749168b9..90b29c9b3175 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit db-use distutils-r1
diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest
index 0559be9f0b57..84dbe8339b6a 100644
--- a/dev-python/build/Manifest
+++ b/dev-python/build/Manifest
@@ -1,4 +1,3 @@
-DIST build-0.7.0.gh.tar.gz 37127 BLAKE2B b06ba16c154087046bd5efddb5fd6f60dad9ee79a204a0c1124fb4885d3692bcf4bd88b75c9665ade3f8457e12742d32e3cef40a0ffb5a894b049a6e942c09e3 SHA512 fd8410dc91333ba94c5141dd78f8052b66f947839752a5d0f401630f6bceed5be2e1f45eceaa2a98908c0e3ddb88a00e3ccca341a3890fa99202bc560ab6ff42
-EBUILD build-0.7.0-r1.ebuild 1954 BLAKE2B 58a291960cfe8aa133c3817c87f2de2fc2e08057bd34bbafc8485dadc55e063c1b83aa3461bdb8751c39b3bf2b601b130409a3cfc37e3ef68a6b04c6009d2fcf SHA512 87766068ccf69c4c4f6028c69ea1c79ed1243eaf73de570ad9ec9f852e34b76156a85d6c8ff2399cf6366e92e553737f13a2717d75d420fe4a73d529a174634c
-EBUILD build-0.7.0.ebuild 1727 BLAKE2B d8cdba74a33db197a2901a906ed81f891eaaf9c79706395fc5a8955528681ff3e77be3ea223c5f492511feaf6319406440b10b99db2f1927e3af2e7043c647b2 SHA512 f713734516587727f3874ccb6d0d1042cd84fde5adc0989963ca70858a819785fcc9a4ee3b84c3536ad10a969d4a2606b58ee714c2e3bf915f792276c71942b7
+DIST build-0.8.0.gh.tar.gz 40020 BLAKE2B 17422c8fe23d4103c78bd9d98702646f0863abfea4ff5df425942eb71aa905d8171567976228681afa90f453131ccce4701128b4f73b61acf4158ea2758c5c9e SHA512 62eaabef36fae592b06c41623f8f36750a029263a65c8fa21ad58b24ef30d4fa8eef7588237a68efb9a9784676f35605a8c9a6b2ed1bc6844c32924f9b5ec377
+EBUILD build-0.8.0.ebuild 2101 BLAKE2B 41059b2880d4716241cacbd696645111fc7bd1374541589c0253322f24afe3405424bc765cc86b81125e84de1dba7f9d2f44117f0d536a0848be8250d8122b5d SHA512 d5ec900c7ca060e6cca0abc8451e5d2336f58f08f0a3aeb1e28cdde1a4c099e3dc4c31fc8ab0bd203ccdc095e9e6f284f368f9a82f16da298d8f95ad99b532c3
 MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369
diff --git a/dev-python/build/build-0.7.0-r1.ebuild b/dev-python/build/build-0.7.0-r1.ebuild
deleted file mode 100644
index 049661a8726c..000000000000
--- a/dev-python/build/build-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} 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 ~loong ~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
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# fixed in git but the patch is large-ish
-		tests/test_env.py::test_executable_missing_post_creation
-	)
-
-	epytest -p no:flaky -n "$(makeopts_jobs)" \
-		-W"ignore:path is deprecated.:DeprecationWarning"
-}
diff --git a/dev-python/build/build-0.7.0.ebuild b/dev-python/build/build-0.7.0.ebuild
deleted file mode 100644
index 8555e5d4feb2..000000000000
--- a/dev-python/build/build-0.7.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 ~loong ~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/build-0.8.0.ebuild b/dev-python/build/build-0.8.0.ebuild
new file mode 100644
index 000000000000..0aadcca52b3a
--- /dev/null
+++ b/dev-python/build/build-0.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/packaging-19.0[${PYTHON_USEDEP}]
+	>=dev-python/pep517-0.9.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+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_self_packaging.py::test_build_sdist
+		tests/test_self_packaging.py::test_build_wheel
+		'tests/test_util.py::test_wheel_metadata[True]'
+		tests/test_util.py::test_with_get_requires
+		# we don't really have to test that fallback
+		# (requires dev-python/toml that we'd like to lastrite eventually)
+		tests/test_projectbuilder.py::test_toml_instead_of_tomli
+	)
+
+	epytest -p no:flaky -n "$(makeopts_jobs)" \
+		-W"ignore:path is deprecated.:DeprecationWarning"
+}
diff --git a/dev-python/cachecontrol/Manifest b/dev-python/cachecontrol/Manifest
index 1a163af2f6b6..6b06fc80863b 100644
--- a/dev-python/cachecontrol/Manifest
+++ b/dev-python/cachecontrol/Manifest
@@ -1,5 +1,3 @@
-DIST cachecontrol-0.12.10.gh.tar.gz 39944 BLAKE2B a760db75384a48a21506d7bcc9edc63dd5b8f7b09ba4ff7afb968c7df3a505a9c6e5eece6e275ec1c9d49763a36124f7221123739fe07695ac2b0bbfb62e948c SHA512 3374a2b0cd42d6f3975b42de46e7aaf92a15403b65aaf53ba14102d6ce68bad85dc4d8f0eaa294604b54ee3e2b1d7d3c56c1dac8e717de41cc7be6d880afc1e7
 DIST cachecontrol-0.12.11.gh.tar.gz 41338 BLAKE2B 09ce2336216b69dbe9796d658db9f5b0d378259484cba3a78ecd789843e19683adc2b1b90d579cea8700d07ed55a93ecc3a56e5da2c8ab025e5084d2847d4dbf SHA512 be1c91f58edda36192f1267a8fdfdc50685ff57da5d84f5348b608982327993333f18f5c318a20cf258b16d2bc83272ba58317e8c4c44a84d5d1f93b522dfc8b
-EBUILD cachecontrol-0.12.10.ebuild 754 BLAKE2B 840de1089b3c000475f56f4108775ffa37722b1718aa71938f241b0a88d727ded74ea052ea0080b2ef580a8f4dc760a0be4df7b4b49eaeed4b0ec0256bbb2d3b SHA512 1b46b230cbf2b5b67ebe657c8b7068f714a376646a8e508d435aadc1f47568d2d3214220b66addf79226df2111a8d8c7daa298937754f01296a341d906227050
 EBUILD cachecontrol-0.12.11.ebuild 755 BLAKE2B 4ab61172418eb3b6958d346c2a788f736baf7ec4cc1f1b04daed557428a35298dda82a836855be5d99fbc1aaa3bf8ac8241bf3eb7b10a6712b9c75816587e7a3 SHA512 780fe396777e6d539902c852f3dabc8b9d1f9402d4d33523f257f965b3c667797aaa8fa476aa5631024a9fa8de1d6eec45604fb5617666ac2eda3c60ecd75c40
 MISC metadata.xml 400 BLAKE2B 0a4de3dff77966722a153ca7d1b4e6531932fc2ae1c99bf4c7482fa83a35ccdc1bf647e3c7a9097ff2844e2127af90709a47ed4f6b47e38c1ca0f240896b270e SHA512 992efa678056928cfaeb04df9a6a7c5523bef32ea0665d86e06faf7b61decaf424cb1c8f813fe19bab74ab25427b5a70f3e106e61cfaab1cc3fa3a359f052e8c
diff --git a/dev-python/cachecontrol/cachecontrol-0.12.10.ebuild b/dev-python/cachecontrol/cachecontrol-0.12.10.ebuild
deleted file mode 100644
index 086e62651bb9..000000000000
--- a/dev-python/cachecontrol/cachecontrol-0.12.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="httplib2 caching for requests"
-HOMEPAGE="
-	https://pypi.org/project/CacheControl/
-	https://github.com/ionrock/cachecontrol/
-"
-SRC_URI="
-	https://github.com/ionrock/cachecontrol/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cached-property/Manifest b/dev-python/cached-property/Manifest
index 763e9f568172..e1397e98a9b4 100644
--- a/dev-python/cached-property/Manifest
+++ b/dev-python/cached-property/Manifest
@@ -1,4 +1,5 @@
 AUX cached-property-1.5.1-test-failure.patch 366 BLAKE2B 1df343e43fb74df2913c222d2a1f37e703de34480e325df68feee7575682005be6d0f41f34e553c3ec2cde11c6907b1d79a73e67ac88c5691e366b7bc64d6970 SHA512 bf005bbb986140dab7949e015ee9453081b72a9c377b6f330f8ffac10f73d7ec0e2a2e20c9d65879c3c18b3c4b2735b3329b30f48e1e4bd01ece475833f2a58c
+AUX cached-property-1.5.2-python311.patch 4479 BLAKE2B 8ca6e2240a63b1681e2eb4e900628db952270d7ce40065a52fd6cd590ce5ae16cd3895554d85d82749d31535057cb25885c8df88db04f89e87ea5cd7c365ca19 SHA512 f4539bc2fa26cbee77beb62bc517ef454f538660e9c1e15bcd9fbaa4deaf97c1d2a357f060e3bb0d7d772f8db3f05d8501188c5d3dc2ebbbeb737f9d44305c9c
 DIST cached-property-1.5.2.tar.gz 12244 BLAKE2B 26981dcfa51925741962c60ad8659a165af6d7f242f4abd392932aac20e966ad6c1763a25184bbabdeb5bd75f8063a430c41f0241afdee8013ffcb437b3ff7da SHA512 626d98a8891a70d858269859cf4e49416464c836d073c1331c21033a4cd9e0e47dc89b53bf393375439992f4993972517dc3cdcbb2cc6f8286f282d3c973e600
-EBUILD cached-property-1.5.2.ebuild 747 BLAKE2B 0940af2530973886eba2778518abf76de8a537a6e8bc6d6af8dfcdde317a63338415914593ceaa37e94620fd1db06bb767310fdd53c763f16cbe91ae758d2730 SHA512 db6e5cf1871f609fb3357846417d1206afdae1e9a7b35d07bbf012229b909d4a53b9e0ce3aac8de9c2153d98549635617d69b4020878a6e3fb9825aedea7d23a
+EBUILD cached-property-1.5.2-r1.ebuild 753 BLAKE2B dc60a3a1949b5c8709c0667e42001deda8c93aef5642bd7b45e69446a4227bebc005f2d6348e61ba3e427ef64e8d715c399b8d881ec62f7a002929cfcb49bca5 SHA512 e24e4b177d3656ea66024f1e99d086880de5812b0e9227b1e39de0fc6dfdd14e4ba9a2f1d82d00fac0576d73704a570c6a0c72a6acab8a4bfe7347f909a6dcae
 MISC metadata.xml 406 BLAKE2B 4c2879c4bc8a511a8646c11d560414dc55421e0e8761b0b1b40138ac19a5e4f6d1e13f96962eed8333791c53a09d611a959be7c8485561e030af43020abd6c2f SHA512 00f4ca0fd3ae8c2b6b7ee3f1b35f5b5a9d690d86ad2753f971c6d37c98fb95d66fbf3680a64cef44dca262e962cf5f53d2a34c44dc789f2ee6bad193280614e3
diff --git a/dev-python/cached-property/cached-property-1.5.2-r1.ebuild b/dev-python/cached-property/cached-property-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..7fa864416e1c
--- /dev/null
+++ b/dev-python/cached-property/cached-property-1.5.2-r1.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..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="A cached-property for decorating methods in classes"
+HOMEPAGE="https://github.com/pydanny/cached-property"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
+
+BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst )
+
+PATCHES=(
+	# bug 638250
+	"${FILESDIR}"/${PN}-1.5.1-test-failure.patch
+	# @asyncio.coroutine removed in py3.11
+	"${FILESDIR}"/${PN}-1.5.2-python311.patch
+)
diff --git a/dev-python/cached-property/cached-property-1.5.2.ebuild b/dev-python/cached-property/cached-property-1.5.2.ebuild
deleted file mode 100644
index 8a772ac7a3ed..000000000000
--- a/dev-python/cached-property/cached-property-1.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="A cached-property for decorating methods in classes"
-HOMEPAGE="https://github.com/pydanny/cached-property"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
-
-DEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# bug 638250
-	eapply "${FILESDIR}"/${PN}-1.5.1-test-failure.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	dodoc README.rst HISTORY.rst CONTRIBUTING.rst AUTHORS.rst
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cached-property/files/cached-property-1.5.2-python311.patch b/dev-python/cached-property/files/cached-property-1.5.2-python311.patch
new file mode 100644
index 000000000000..989033f20036
--- /dev/null
+++ b/dev-python/cached-property/files/cached-property-1.5.2-python311.patch
@@ -0,0 +1,142 @@
+From 297031687679762849dedeaf24aa3a19116f095b Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Thu, 2 Dec 2021 11:26:20 +0100
+Subject: [PATCH 1/2] Don't use asyncio.coroutinefunction if it's not available
+
+Python 3.11 drops the deprecated @asyncio.coroutine and
+asyncio.iscoroutinefunction.
+
+Using a wrapper with @asyncio.coroutine in __get__ wasn't
+necessary (the future from asyncio.ensure_future is awaitable,
+and the wrapper doesn't do anything asynchronous), so the
+logic can be simplified to just call asyncio.ensure_future
+(to schedule the task and store the result when it's
+available).
+
+Tests for @asyncio.coroutine are skipped on 3.11+.
+
+An unnecessary call to asyncio.coroutine in tests is
+removed: it's not necessary to call this for `async def`
+functions.
+---
+ cached_property.py                  | 24 +++++++++++-------------
+ conftest.py                         |  6 +++++-
+ tests/test_async_cached_property.py |  3 +--
+ 3 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/cached_property.py b/cached_property.py
+index 3135871..254739c 100644
+--- a/cached_property.py
++++ b/cached_property.py
+@@ -13,6 +13,12 @@
+     import asyncio
+ except (ImportError, SyntaxError):
+     asyncio = None
++try:
++    iscoroutinefunction = asyncio.iscoroutinefunction
++except AttributeError:
++    # Python 3.11: @asyncio.coroutine was removed
++    from inspect import iscoroutinefunction
++
+ 
+ 
+ class cached_property(object):
+@@ -30,22 +36,14 @@ def __get__(self, obj, cls):
+         if obj is None:
+             return self
+ 
+-        if asyncio and asyncio.iscoroutinefunction(self.func):
+-            return self._wrap_in_coroutine(obj)
++        if asyncio and iscoroutinefunction(self.func):
++            value = asyncio.ensure_future(self.func(obj))
++        else:
++            value = self.func(obj)
+ 
+-        value = obj.__dict__[self.func.__name__] = self.func(obj)
++        obj.__dict__[self.func.__name__] = value
+         return value
+ 
+-    def _wrap_in_coroutine(self, obj):
+-        @wraps(obj)
+-        @asyncio.coroutine
+-        def wrapper():
+-            future = asyncio.ensure_future(self.func(obj))
+-            obj.__dict__[self.func.__name__] = future
+-            return future
+-
+-        return wrapper()
+-
+ 
+ class threaded_cached_property(object):
+     """
+diff --git a/conftest.py b/conftest.py
+index 0563f64..1c4b618 100644
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,13 +7,17 @@
+ # Whether the async and await keywords work
+ has_async_await = sys.version_info[0] == 3 and sys.version_info[1] >= 5
+ 
++# Whether "from asyncio import coroutine" *fails*
++version_info = sys.version_info
++dropped_asyncio_coroutine = version_info[0] == 3 and version_info[1] >= 11
++
+ 
+ print("conftest.py", has_asyncio, has_async_await)
+ 
+ 
+ collect_ignore = []
+ 
+-if not has_asyncio:
++if not has_asyncio or dropped_asyncio_coroutine:
+     collect_ignore.append("tests/test_coroutine_cached_property.py")
+ 
+ if not has_async_await:
+diff --git a/tests/test_async_cached_property.py b/tests/test_async_cached_property.py
+index 4ba84f3..d61cc28 100644
+--- a/tests/test_async_cached_property.py
++++ b/tests/test_async_cached_property.py
+@@ -9,8 +9,7 @@
+ 
+ def unittest_run_loop(f):
+     def wrapper(*args, **kwargs):
+-        coro = asyncio.coroutine(f)
+-        future = coro(*args, **kwargs)
++        future = f(*args, **kwargs)
+         loop = asyncio.get_event_loop()
+         loop.run_until_complete(future)
+ 
+
+From 9b210d12fa73c91743378ba4a966417846e7ea9a Mon Sep 17 00:00:00 2001
+From: Petr Viktorin <encukou@gmail.com>
+Date: Thu, 2 Dec 2021 11:44:18 +0100
+Subject: [PATCH 2/2] Restore	compatibility with python 2.7
+
+This is	still necessary	according to the Contributing Guidelines.
+---
+ cached_property.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cached_property.py b/cached_property.py
+index 254739c..944e2f5 100644
+--- a/cached_property.py
++++ b/cached_property.py
+@@ -13,12 +13,12 @@
+     import asyncio
+ except (ImportError, SyntaxError):
+     asyncio = None
+-try:
+-    iscoroutinefunction = asyncio.iscoroutinefunction
+-except AttributeError:
+-    # Python 3.11: @asyncio.coroutine was removed
+-    from inspect import iscoroutinefunction
+-
++if asyncio:
++    try:
++        iscoroutinefunction = asyncio.iscoroutinefunction
++    except AttributeError:
++        # Python 3.11: @asyncio.coroutine was removed
++        from inspect import iscoroutinefunction
+ 
+ 
+ class cached_property(object):
diff --git a/dev-python/cachelib/Manifest b/dev-python/cachelib/Manifest
index e5ed2491c708..6dea505d4db7 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,7 @@
-DIST cachelib-0.6.0.tar.gz 21842 BLAKE2B a886e0d6558dd7b3e5cb70124ac48b1fd55de13bc15998da32111300505501252f96c419c2bf82f6101c51e70d2d98f5a49362554891513ea3d1c8522d17ab4c SHA512 a828b6a9e425efcfbae46c148f1f56fd6f4df2ce37ed72b90fc4c3ea9edec1273aa2f2e1f9ad59fad30d1b8e37d6794176b85a7b5afb2b65264bd992dfc5c4f6
-EBUILD cachelib-0.6.0.ebuild 790 BLAKE2B 0939bf9ab5d15a42d5c711d88e8477cf11a210317bc927db6c55e82777f6ef818b52d1207e5dfc8fe8ca70e2c2e82f926d27efec7b2320a90ef94cef644d4040 SHA512 a5e7d3161ee066961d70f9a7d64f80499b8aa1fd0e86d0d126e76790527d20dcf67cbef0b5f9de672240d9aaf973d30bd25c2341e38760724e88dbf6dbc68091
-MISC metadata.xml 506 BLAKE2B 42b11218d972652fbbd9ffb8548355105f98f666446667218efeb14dff0f215fef052399d77a9f49041b7d330a876324dfff25314b661d3c9f1d81b937c1a291 SHA512 dc8b59313b06accdff01d335db098b8b05a781f8d57c61c944152e2edf7a602dd1345228dd8df32decaddcf171b23a88ce8054f396809a245a2fcd6506ac2468
+DIST cachelib-0.7.0.tar.gz 20650 BLAKE2B 427101910200e4b13e1cc98582499d4f78066c5b904797ae1e9565c5bc6ea445a9ab8f9eed4e6a9a18dcf8aa0ce369ed455edf6f551ff5476a8101aa75cec192 SHA512 034bc14a2de2eb7a7fe52a51f5ff1f96c700c1d915430c0fae5f95bb045989fbbe82458c1dc17cd8ea54e016d014679628a7470e8564f43cd763480eb06d3153
+DIST cachelib-0.8.0.tar.gz 20532 BLAKE2B 5c9eea33f52fc1ddb4eb6c25be64f43e08ed9c17f8fe233b492f293adee022ad840107a9806654d9446d2f249a78ff18d3c85c8964229df8341e7ce499e8431f SHA512 da9ba99e9c6c70542883a183558561486f37098266c4eb38920494653229f78ac47c2c26499e660241231a606040940105434f260ee977599f605a42e9b3f802
+DIST cachelib-0.9.0.gh.tar.gz 26407 BLAKE2B 8b1b6c725f5869fda4752db64ab4ee9ee9c748f0ed7e73cb5a9967d18d461cc29779a1e3dc18fcf4b9152f9586ed342fb97e75b4a9b7cb6f5efdeee02f8cf13e SHA512 53b214ba95b0e368e48ddc1e9f904497055e4c37deb0d1946419c3b294eb0e999ea690f2b79bd4801ad80201fb823927bc2024cc493006e20f623955850bba71
+EBUILD cachelib-0.7.0.ebuild 800 BLAKE2B 70509990e6ef68f643862633f323e194b2893f1cec2c509acd1d0101027e48ab23f65d78ffc091bf74f8af9ab5d4e182c014e1c0c8442fd546ed7740a67e4fb5 SHA512 f1e37a1feee7cf795989d685b2502599efee74625181b882ce51ce51f356d38ea92a66c98cad38c165cbb8ddb818ff4328b73bbfe450fd7a37015e3f8a3aa1cf
+EBUILD cachelib-0.8.0.ebuild 802 BLAKE2B 326f568966b6ada58d635de4691708afe2888edabb87f2b197bcdaf9490336bf9806722383b7856a46a600cd0d47b3565cdc58ad614286757af2292ede6c2d4e SHA512 8d595c60ca5116866d65f49a12c503898a58a18ecceda4648239b7d556c5d10e6b4655097ed42907c8ba8ac3ff4326b34676248f6a80d6ab66b2317d7ac62d65
+EBUILD cachelib-0.9.0.ebuild 866 BLAKE2B a1c7dce15e20f4709370d57b33158bc29296403f7f2d4e804682aeae3c7e6c8763ed28cba057ba69744f8a773ed3453a233a38f5f2a45f69c15793d22e90c30d SHA512 aa59d9e9f99de6aa1fb45d0b2703cb5054ae75a82a2356f6728670f26940363e7968ab06154035b35e64a64237868c95db47b8d9212776da1e7eeb08ef7e045c
+MISC metadata.xml 510 BLAKE2B 456e0e3b13e50fe5fa9fb866ca2a20a63c180a55691d3cc5e63cea2d16e9e98c61d4f0f5d043f8cf73c2fa80f68eb1b29f182b5bec04356fe1c5965799ea4d7f SHA512 caef760fc497745b37e82a3603d360eb3ca173d1c6d1ee47d8cc358c28db2683446e5ce67a60e267f509e6f7688c9ee3aa5c499539752c014f0830af9896d3c6
diff --git a/dev-python/cachelib/cachelib-0.6.0.ebuild b/dev-python/cachelib/cachelib-0.6.0.ebuild
deleted file mode 100644
index 29b7473deca9..000000000000
--- a/dev-python/cachelib/cachelib-0.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis-py[${PYTHON_USEDEP}]
-		net-misc/memcached
-		www-servers/uwsgi[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# bug #818523
-	tests/test_redis_cache.py
-)
diff --git a/dev-python/cachelib/cachelib-0.7.0.ebuild b/dev-python/cachelib/cachelib-0.7.0.ebuild
new file mode 100644
index 000000000000..d18a01eb133e
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+BDEPEND="
+	test? (
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/cachelib/cachelib-0.8.0.ebuild b/dev-python/cachelib/cachelib-0.8.0.ebuild
new file mode 100644
index 000000000000..c3b5d4c04719
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/cachelib/cachelib-0.9.0.ebuild b/dev-python/cachelib/cachelib-0.9.0.ebuild
new file mode 100644
index 000000000000..cc5e50e1800a
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="
+	https://pypi.org/project/cachelib/
+	https://github.com/pallets-eco/cachelib/
+"
+SRC_URI="
+	https://github.com/pallets-eco/cachelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# bug #818523
+	tests/test_redis_cache.py
+)
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index c8213cd3fc6d..93b55ca7ecdf 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -12,6 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cachelib</remote-id>
-		<remote-id type="github">pallets/cachelib</remote-id>
+		<remote-id type="github">pallets-eco/cachelib</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index dc6c6ec484c4..3036774b30e4 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,5 +1,3 @@
-DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
-DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
-EBUILD cachetools-4.2.4.ebuild 419 BLAKE2B 0cb00cc291fba7a29b18af9b3e25202cd36891bc52f1d1d5ba9134e0fa5de557545b3572a835d0584ee8fa7ad77a08b3716c983e0335605438f6e6f63bd33338 SHA512 e52ebe03812ca4317222d0cb040f498d4f87fdb99cc624b5415ee171efab35f8ca9072fd913cfcf299d871a0a61a5a4703a9d7232962a28c3ec3c255b54a606e
-EBUILD cachetools-5.0.0.ebuild 426 BLAKE2B 2bb25e4179e8f1b91cbfdc665b1289004ec7743e6f52022579dd925bfb12b65cd2af25ba8bcff54661de31aa82114757a3b3fad2084bea80b07ebe9f3ee7dac9 SHA512 ee5d35d82477fb585959f3a5d0ef3d188ea641c4a4d1738fed6888d475fdc01f82f4c0a9868e07fbdc55b1140696649f7a4bbe77b0a75411558d1bbcfd60fc18
+DIST cachetools-5.2.0.tar.gz 27342 BLAKE2B 905986bca98996fbc74c74bc5710b429ae63b4bf6283a3910e83a92cac461ef4a0271b1691a694fe8ecacf38eeeb921d7345c9e015f1400705662081d5e29dbd SHA512 e12766aef1725091edcdd0ef3687b891242f711de069c0d0642680d61dcca79e645e6ecb5f2e22470f189aba59daa2b5a830dc76791256517368f8912a065eef
+EBUILD cachetools-5.2.0.ebuild 499 BLAKE2B be43a613a2131a511955a055556b393cb4ebb385f406e50a10f20d9401d6264ff29cb629007495af865a5634371ed861a12ba46d35b5fac017e4d088c88c55e7 SHA512 e6de3f33d885699b170f4069823107e8f47b99b8d0975c14ef1a6004bf2ab1b8daa40b821172b9f39041d72813122e8fa1971e3a11c68fd4e2ce1e37b8fce04f
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-4.2.4.ebuild b/dev-python/cachetools/cachetools-4.2.4.ebuild
deleted file mode 100644
index 9746966fa6e9..000000000000
--- a/dev-python/cachetools/cachetools-4.2.4.ebuild
+++ /dev/null
@@ -1,17 +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="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.0.0.ebuild b/dev-python/cachetools/cachetools-5.0.0.ebuild
deleted file mode 100644
index 913ab3eaa0fe..000000000000
--- a/dev-python/cachetools/cachetools-5.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="Extensible memoizing collections and decorators"
-HOMEPAGE="https://pypi.org/project/cachetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.2.0.ebuild b/dev-python/cachetools/cachetools-5.2.0.ebuild
new file mode 100644
index 000000000000..a6ee88f5bf22
--- /dev/null
+++ b/dev-python/cachetools/cachetools-5.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="
+	https://github.com/tkem/cachetools/
+	https://pypi.org/project/cachetools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index c859cb0f74cf..b815b6c85341 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,4 +1,4 @@
 AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
 DIST cairocffi-1.3.0.tar.gz 88784 BLAKE2B 022634825febd3d70a0115f0632e9b146719a2ab802583e0f57ebbd36c65c9e73f4547dbc5ea3651b8b38a043d519f000e908c34b77f3bf49e2ed5ded1a0ca02 SHA512 be459a5f4c1986cf339b7b15fdb7d3ac52476c8c31ff663b4708917ce8abd6fc66860d1966744b69aebf7aebca4415b32166df79505ad42f315ffd76d7163d7e
-EBUILD cairocffi-1.3.0.ebuild 937 BLAKE2B c020881bf5c3b0bfaa937de204f05de2a8cf18be2a348d2e86c3e71043605f426a4a8107e155a96baf8f31652a184b164c4cb2de0602fab86e5c222d2acb57b6 SHA512 4b00db13ef509cf84523c8e56f2d1931dcd88bce722e6895d31023c58c63f45525829a9e3b64b95b39abefbccbbefd93c8fb447c284e28e7219fb5e0af4db5ab
+EBUILD cairocffi-1.3.0.ebuild 937 BLAKE2B 1cf24a61eac110115d77194b2d22e6d747f415b066d73faaa8509c7cf941f8bb4a5b2562b10b139c9fa47713e6c844c210ed9d1c6313752ca729f104a9d6d8f5 SHA512 b5d253eafaef2725400374b741a44d243b341cfe0d74fb48724acffefc474f06c06ffc5ebaebbad29d4b2ec100545a67c44c419860ddcf8679113d246744cade
 MISC metadata.xml 380 BLAKE2B e489f8f463877335d35d1ccd7b04247ff92e5bddeffd36d42a4d8d45f3d48962d704c4a2701b8df91bb38182ada14e19ec6f97c58250f7a9881728cfa319ee15 SHA512 d64dde8aa97fa923c5b13f23539774ebcf02d5ea14b50e01e98c6a3e2f63316ab08a235613fe4bedfc496dd7ffacc2f6e41ea5a2fad310b341ad3ac254b2a522
diff --git a/dev-python/cairocffi/cairocffi-1.3.0.ebuild b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
index 125829d56cf8..38112b42afde 100644
--- a/dev-python/cairocffi/cairocffi-1.3.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
diff --git a/dev-python/calver/Manifest b/dev-python/calver/Manifest
new file mode 100644
index 000000000000..a474717abafa
--- /dev/null
+++ b/dev-python/calver/Manifest
@@ -0,0 +1,5 @@
+DIST calver-2021.7.30.gh.tar.gz 7058 BLAKE2B 90cb8568bce2afcf3e086e038dc237440c5d20c05cc19b7d6966d16b55854810a627120dc870d77975676ca166eac0922443d19b85aeffdb51f3cf435848ef5d SHA512 17c10b0f60ec4c8c582de660bd715d054c3478d8fdec88a6830396bad1d6147ce375a34c5ff57d244c8c2e337a6b382b6ee10673182a40bc14ad16a97405f181
+DIST calver-2022.06.26.gh.tar.gz 7601 BLAKE2B e4bea1dc8954b4f65003cb06dadebfa6a7ad0554d64c23e5339652955d2e4659ffc093b8d11d284e03bc74267059a10043a45dd1eb7717378fb22327d6409428 SHA512 4d436cead8930cae1a71eddef9f0ecd2881f8cb632c3814dc75390b061a909e7ca969a604a5fded1c66647947856d540e2180bd3ce4bed5087b4dbc9d5edb393
+EBUILD calver-2021.7.30.ebuild 757 BLAKE2B 6b8835d4fa15e47d7619b673788c91c6fa505a4f4c7795253405043a88fe9bc41841109a62d65bef39ab44431ec859774c2b6d4654f258a55f655f9896eda755 SHA512 c9fee97043203f8c6d619aeb7e2397bae529878085e97cc757921963abfe92be45ab85e00f481388ee59922a48d239a8b6fa6b5cd909e5c16eb28f1f542a1fe3
+EBUILD calver-2022.06.26.ebuild 571 BLAKE2B 508eb1b93bea505db20fdc34b069213fe6ea16c301ebf9c22afd6c80cf179bff67175a1df77b4d41edc32cbeca39cb2afc7dee2b709baa0837836a39dd1fa45c SHA512 4728e231157e5ab81f3504715ec73e73a04d5216eb9b81b8132d38300e2ffabc2d406e55e58da5252febe7c733b3423ea073fc3ee0374888e0b4b056106d122f
+MISC metadata.xml 337 BLAKE2B d1215a2b0ec479b37caa4b8474201c18ad555e344d49ce25ff7c2cab6f117ec3b2b3d14320e8d91706be93f6dfd09f87df4794a729512ac5f88cf70b4f158fd9 SHA512 d37ecb1686abb7257053e2ec74b26f00d9640c63f590776a3c43c440d7ec7ecf9733506f95ce096439f44030f172307d3624d5e9c825a776ee6d8d04c455a4c3
diff --git a/dev-python/calver/calver-2021.7.30.ebuild b/dev-python/calver/calver-2021.7.30.ebuild
new file mode 100644
index 000000000000..ee5748e2277a
--- /dev/null
+++ b/dev-python/calver/calver-2021.7.30.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools extension for CalVer package versions"
+HOMEPAGE="
+	https://github.com/di/calver/
+	https://pypi.org/project/calver/
+"
+SRC_URI="
+	https://github.com/di/calver/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# bootstrap workaround, until https://github.com/di/calver/pull/8
+	# is merged
+	cat > setup.cfg <<-EOF
+		[metadata]
+		version = ${PV}
+	EOF
+}
diff --git a/dev-python/calver/calver-2022.06.26.ebuild b/dev-python/calver/calver-2022.06.26.ebuild
new file mode 100644
index 000000000000..4ce266d2fb49
--- /dev/null
+++ b/dev-python/calver/calver-2022.06.26.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Setuptools extension for CalVer package versions"
+HOMEPAGE="
+	https://github.com/di/calver/
+	https://pypi.org/project/calver/
+"
+SRC_URI="
+	https://github.com/di/calver/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/calver/metadata.xml b/dev-python/calver/metadata.xml
new file mode 100644
index 000000000000..2acd1a33af2c
--- /dev/null
+++ b/dev-python/calver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">di/calver</remote-id>
+		<remote-id type="pypi">calver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index ec5c8741944a..01b468c5e4c0 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,5 +1,5 @@
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-DIST carbon-1.1.8.tar.gz 72452 BLAKE2B d76a281925645ebf6f74ff83f8ea6a52016f29ae0e35143e48e9aa0f2fcc267ceee1b5040ad756bbab8b2c1ffde5040231b8e0b581bd177bfb31ddf33fab7933 SHA512 b679d0329a5c8701af8aad3bdc51d64fbab7d05214c09368a218f1c925593002596a04b50fd2aadf26bd21ea7ef4b8262ae7f8169ef0d6ee40dccbc933539161
-EBUILD carbon-1.1.8-r1.ebuild 1980 BLAKE2B afe8b0c091f13cbe066ba42f0bd4633f33f5eb8355669df8eb014931a14d931f97cea636f5e01de7c933435ac9242b557520032aecb8f78892ec76a635ce4a74 SHA512 851fa45ccc3ef30811572b7cc7c94eb7d5d8fd839c3c2b5920eca463b8a0696e10c13e84c193cff07ebb9571980b2a7bb5dfe0c4f455cb2d302ea7d2ea7f2e08
+DIST carbon-1.1.10.tar.gz 77091 BLAKE2B 367beb81a4dcf4c5fff6bf9884c7accb8aea9daa88d6d890bb977c926268b7ae041c9ac8e4b537f07d08d6c970f536ccc87ae6b4caef555883aadeab155fedce SHA512 a5c8d730e311bb65682c701b79a5e3e02e35eec5c0d923fece3f63d7036ca1f85775100fba9a2090487f2cf75bae7708dae9580deccd8fc586f2820b03e14b4c
+EBUILD carbon-1.1.10.ebuild 1980 BLAKE2B ebc2f6abb82016b13c9e6085a047dd72245aa776422099af9b1b99a16077b672133bc29c5b30e0d1217159de10a24ca0f4df38a5bcb0396a6a53d9a8af6b8919 SHA512 a14d73197e7a89dce4f53ecdc9bff399f72f3cad4b137e9875240fb047631bc902613d7dca1c52d42a929f5f280cbdadc772af856532d899018316f8cf2ba26f
 MISC metadata.xml 442 BLAKE2B e3ab8eb53738bdacc8fb73e7514c28290609200a34d6d6fc0111e30bd44d7806f91a4c3906cf473f8dc58b6d8012ecdaf320d943f770d05e26f3b0b44d99a57f SHA512 0deb6d56a05c7b0ee70787dad985a0f250d8328c1edd54690092dceeab8ba90e96ec2ddb326202f01eeb702776e448b746a5c92392ea02cba1892155d3eb60ec
diff --git a/dev-python/carbon/carbon-1.1.10.ebuild b/dev-python/carbon/carbon-1.1.10.ebuild
new file mode 100644
index 000000000000..52f67e9dfa62
--- /dev/null
+++ b/dev-python/carbon/carbon-1.1.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="https://graphiteapp.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+RDEPEND="
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/cachetools[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Do not install the configuration and data files. We install them
+	# somewhere sensible by hand.
+	sed -i -e '/data_files=install_files,/d' setup.py || die
+	# We want FHS-style paths instead of /opt/graphite
+	export GRAPHITE_NO_PREFIX=yes
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /etc/carbon
+	doins conf/*
+
+	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
+	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
+
+	newconfd "${FILESDIR}"/carbon.confd carbon-cache
+	newconfd "${FILESDIR}"/carbon.confd carbon-relay
+	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
+}
+
+pkg_postinst() {
+	einfo 'This ebuild installs carbon into FHS-style paths.'
+	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
+	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
+	einfo '(see /etc/carbon/carbon.conf.example).'
+	einfo ' '
+	einfo 'OpenRC init script supports multiple instances !'
+	einfo 'Example to run an instance b of carbon-cache :'
+	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
+	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
+}
diff --git a/dev-python/carbon/carbon-1.1.8-r1.ebuild b/dev-python/carbon/carbon-1.1.8-r1.ebuild
deleted file mode 100644
index 599fbc318f06..000000000000
--- a/dev-python/carbon/carbon-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index ec0a7013ecf2..bc129f241459 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,5 +1,3 @@
-DIST cattrs-1.10.0.gh.tar.gz 100657 BLAKE2B b0475644bdd31e12dabf7b969e1890932309497e66b45a311e97d56062e99837af11677c24e33c6d1bed6ec2c6373eab6535874115960ed450f52804a6e5d73e SHA512 51cda84d30627f9d0eb6842c45f7c91dd2f3d9a21b1a635ad21d0648d409b576f52e6127392d60bdd1b6a803f8f897f970706b9cc64b703c06387bc85cd3740e
 DIST cattrs-22.1.0.gh.tar.gz 108033 BLAKE2B 823e3ab466fd73385a4aaefb547b3457ee9cd100f38b6778c26bbe3d93e23ed9a00f071d6a5d7626da91e6660e2a8118e70cfa53a5960d550b9038fffec58eef SHA512 db1effb8d632dc3843d38b18bcd439c35d8bae0e4379b075417eaedbc130f6426186c0d299bc5b5d68a7354d7c5e53927ba5e0e989d498841a73237c588febb8
-EBUILD cattrs-1.10.0-r1.ebuild 1307 BLAKE2B 7d3aaa43d7f068aae4829d6adf0e704717fa1ed45e5fe6fb1dc96f321c0bb3abe6f0d3c8f90b498f0942554c70013f550e205671cd4fa10bd4735d10f44b070f SHA512 c0f099114f06675582cbd107b75f15481841b95fd17debcd142ca17b32815876c93c14569dd4c8d58f6b280a7b200b20d3d9124ce6fe56515fba38f765c16d32
-EBUILD cattrs-22.1.0.ebuild 1246 BLAKE2B dd68a23ca6c061adf7f0df133b3027dcc3c96caacd3dcd76f55fce2a636b8efda29423b7105d2f5045c5d0ab8818397b960f732a427e44c6d9dc2e6b356f8d0a SHA512 ac21c5dc779ff7fcb33ba923589bec1e1538ce31d30b98c9023dadeaa99a9c52704cc3e5aeb5409ea41b06901b1703b3073a9c8aacd9f946e77a8abf7e7cfec6
+EBUILD cattrs-22.1.0.ebuild 1244 BLAKE2B 71e0c191ad6230fc545c7f699c8c988e9ee8fd4b192b745da79622d279bfadc13eda8c92896644b2a1f5e9b1d1af2cca46f98aaf9668d4d069d0aa60ddb03d55 SHA512 b965e2cbbe64412017238da2341134448355cd1a9577a84e7d704b4b228093a9e5984e4a56c51494792b664a1ec5ad203a399df87fe4a3c285eab0bd505baa1f
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-1.10.0-r1.ebuild b/dev-python/cattrs/cattrs-1.10.0-r1.ebuild
deleted file mode 100644
index 30f62de28d7f..000000000000
--- a/dev-python/cattrs/cattrs-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Composable complex class support for attrs and dataclasses"
-HOMEPAGE="
-	https://pypi.org/project/cattrs/
-	https://github.com/python-attrs/cattrs/"
-SRC_URI="
-	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/immutables[${PYTHON_USEDEP}]
-	)"
-# test_preconf:
-#		dev-python/bson[${PYTHON_USEDEP}]
-#		dev-python/msgpack[${PYTHON_USEDEP}]
-#		dev-python/orjson[${PYTHON_USEDEP}]
-#		dev-python/pyyaml[${PYTHON_USEDEP}]
-#		dev-python/tomlkit[${PYTHON_USEDEP}]
-#		dev-python/ujson[${PYTHON_USEDEP}]
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e 's:--benchmark.*::' \
-		-e '/addopts/d' \
-		-i pyproject.toml || die
-	# backport pyproject.toml fix (50ba769c8349f5891b157d2bb7f06602822ac0a3)
-	sed -e 's:group.dev.dependencies:dev-dependencies:' \
-		-i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# unpackaged deps, see above
-	epytest tests --ignore tests/test_preconf.py
-}
diff --git a/dev-python/cattrs/cattrs-22.1.0.ebuild b/dev-python/cattrs/cattrs-22.1.0.ebuild
index 333c5d6b2290..b7aab0ff36c4 100644
--- a/dev-python/cattrs/cattrs-22.1.0.ebuild
+++ b/dev-python/cattrs/cattrs-22.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 1e8e52a03166..15ff178c4724 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,7 +1,3 @@
-DIST cbor2-5.4.2.post1.tar.gz 85858 BLAKE2B 6d82ba6b99828615a3f93d8958f759fdc838a7c324ebbe82cda7d46ab8a450db95b626eac83df24d874725f99a141864d97e1077cdc9f2b177cc3d5019eab429 SHA512 48db9e58bf2209d19a89756d60e3d91c652edb6a0b0325aecde0250869c674b1759122aaab45c59d4ff8bffdca4a64a142871f5a88af66f238361d9d586cf78e
-DIST cbor2-5.4.2.tar.gz 85847 BLAKE2B 1ad8b7bf54343ad7e969c797a444653e9cf501139facb98f92727be4d31148acedff29885e99c1535a44bcc9add4e4a1890c8f4605c2b82c9975821ee029d7bb SHA512 86e79ae19120dc39e79aa410b1e75df1d82b40c0523865989310f2d7214bfd824bf86ba158b2f695542ef2f34c76c8c4d5b28dbbb9815ee923444b00e86940d4
 DIST cbor2-5.4.3.tar.gz 86499 BLAKE2B 0303ed49a1c468a3aa13e12a4bebef17479f106bc3f0a92e35c6029ff1bd86aea6a77f557ac0c8acb5e055ec0b56c82e5c95e9417d00715a1fb244bd94d0f60d SHA512 9527bec5a36464bb7dc9a8c0ece3ad72f1c6182272a7edf0526668b264c957b72bc031d2398dc6af38af09bb298219c316da194084fab410bae5f9100b22328b
-EBUILD cbor2-5.4.2.ebuild 676 BLAKE2B 5be645bfe7a0d4f2a5ce9e6308352f4f50e11b3ca10495e851d45065744d6f3b1d0ed366b5fb8726177f41fe217b392755136011a84e76595079cb545709a87b SHA512 5753259f9110a72348214a25bc06c6c7cad27090c931853cfff18bc7f02a859bf500edbc2da03b593e0cde0cac6e40760da79bb18ac5a454b2642a117cc43bac
-EBUILD cbor2-5.4.2_p1.ebuild 762 BLAKE2B 3c4821124d5b770005f71036dae9867627bcf7e64b3e1423d0fde3c6c3c42fa2bf385ebcaced19dcb5c394c617f98cc06a08d4df55e3b6759d29c8ea2a816ab3 SHA512 666aceae252743083ad0c40300584d85ffec94e39aa34dad41b8cca4209167c88d9f9c4bdfd1aeed015506c30076b8228c04cd5976d45821b2f38df5aac59f71
-EBUILD cbor2-5.4.3.ebuild 746 BLAKE2B 331e3f3b2e8dfc2b257fb8d25896830caf5fcab335497c3722c9ff53348638b208751669a19754189392c86c6b1fc1f04548be687c63c58b54aab137af32a454 SHA512 9432f31fb3562848ff9a3f2b03b415c6bcea35a6f5a1891de781ccd2e4bfd57a3ace3a6fae587de652b520fc7bd44b29afe10f9b948ffcf9ca66eac190b94cc9
+EBUILD cbor2-5.4.3.ebuild 742 BLAKE2B 66cef322f8f7232e5d3f8998a0dd3745b33312a7f49a0f6a84b32464a490f6a55b19af6bbbd1f2cc973dea98e525216adbcec3865d44b65ec8d9138dbb50b509 SHA512 381d9264ad334246a5d6705f0f3bee5b191fb569f570238c7b49ed206094bbacb04c70a0b1d1248e82f2ef1d1744022399b000bf6444fc503440a08b81bb00d6
 MISC metadata.xml 995 BLAKE2B 8b9c668c2628dc12eab5bc42ca90a5c7e1ed64405b3de54ccca8dca90a974e9e2274b8815bc800d5427c6128c2f369eb5fc1fe17b5f6dbcee242239966dcdb98 SHA512 12f4909783b90ac9eef2ef4141f6f0041c2faed7ccb3d08f64fc8cd4e36e5ad8a3a5068267f6dc02c8d2fca5213d26f28ce468ce4487a0b2d44cdb558d4882c8
diff --git a/dev-python/cbor2/cbor2-5.4.2.ebuild b/dev-python/cbor2/cbor2-5.4.2.ebuild
deleted file mode 100644
index 60b78041cf67..000000000000
--- a/dev-python/cbor2/cbor2-5.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.2_p1.ebuild b/dev-python/cbor2/cbor2-5.4.2_p1.ebuild
deleted file mode 100644
index 6c289191ab71..000000000000
--- a/dev-python/cbor2/cbor2-5.4.2_p1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cbor2/cbor2-5.4.3.ebuild b/dev-python/cbor2/cbor2-5.4.3.ebuild
index 8a4cc0a2d0bb..08c1044fdbc9 100644
--- a/dev-python/cbor2/cbor2-5.4.3.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
diff --git a/dev-python/cchardet/Manifest b/dev-python/cchardet/Manifest
index aefbb5150f31..96c4640c7f6b 100644
--- a/dev-python/cchardet/Manifest
+++ b/dev-python/cchardet/Manifest
@@ -1,3 +1,3 @@
 DIST cchardet-2.1.7.tar.gz 653617 BLAKE2B 0ca9becac01c67da191290c7de0dc52d5c8e6c2715f660811c8e67d9a06e74ac155a081de81af96ade74ccc4065093fc226f232a26f66236fafe9fc1b48a9c9e SHA512 43e663e30ec079b2a954862de5e8136a2e40f69e300d65eb4ce9d7ffa5d8c496dc7c0937b3306b4096cfad12a1d0617628f8f0115534ab6faf9eb39d2b3935a2
-EBUILD cchardet-2.1.7.ebuild 643 BLAKE2B ee09f1eaaf8d0692b378189fbca08aa9ccacc9c5bcebe5510a96574732542733f2cb96321dab6f112a7c548ad75aeb4a3509a09b973b6e59967c59ae2e06dbfb SHA512 25bde5663a3d1b8489776023f1b27c24b88891e10c0216a877395eb7148e934a870a8e5976aeeb5f443257941c01fd13e5d95900f92f039679c15c74c49e2c53
+EBUILD cchardet-2.1.7.ebuild 646 BLAKE2B 8648dd6bcb94fcfa5245df1c5cbe41e13844b44adf882c3bf27f5a65cd5cf2c88145a3ed032b276bccf8162bb15c66b527c6c6bcc7447303eefa63f178f5b207 SHA512 38da8f1dee07329aabc28efae0911ed6769c02e89e8a0facdb9dc6eed399a3b2988d3bd181f5d72660e13fb6164df927eed7e9857e861bbe7b60457d3188703e
 MISC metadata.xml 346 BLAKE2B 86fd035032c4a4223ca8b8b7db0b3593b60676376b17ebc0c2a02ccce6d4dd22f7bcc80350634378bfd9afb44640a4f8798dad5f479024510c90b0a2f9425eb9 SHA512 f33d9efa195ef267c11565d657fdbfdc6b11af571b812e7ce9885b41ab7e48c4e58422618ebf6809d7e1adab00977996d86ac7fe4f47b0db4267a34d16607805
diff --git a/dev-python/cchardet/cchardet-2.1.7.ebuild b/dev-python/cchardet/cchardet-2.1.7.ebuild
index 76ade5a80603..9ebaba14c5ee 100644
--- a/dev-python/cchardet/cchardet-2.1.7.ebuild
+++ b/dev-python/cchardet/cchardet-2.1.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=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cerberus/Manifest b/dev-python/cerberus/Manifest
index b8692d5c84cd..70ab147fcbce 100644
--- a/dev-python/cerberus/Manifest
+++ b/dev-python/cerberus/Manifest
@@ -3,5 +3,5 @@ AUX cerberus-1.3.4-raw_docstrings.patch 695 BLAKE2B af53c17d8b683e1d88e744330ff9
 DIST cerberus-1.3.2.tar.gz 149344 BLAKE2B ce65f3c4c612f87562c28f913cac95c1c7af9b2dfa72955bce3f0e0459e4ff9024a126ceea4587e2c72cf606be2a249046a090a2e2d5e908bfe4b700ba5e9b92 SHA512 e9cfef5a936783eb0576afd3d23397dab38d8c88b6b43f98de0ad7e20739e5ff983eaf4ac769206adb7fe9692c651583f6a5f2bab263b81b8de96f45707c84fb
 DIST cerberus-1.3.4.tar.gz 926258 BLAKE2B 6fabfcf32e26ee7f4881b64ce9c3098a27949d95fd0998e09b7adcc3b834033f904a07b6e9b2cadea218b952142f6c2bc6051d8c208a14d6e8172a0c3823c38b SHA512 c816b426ed1b32367d1e8f1c26d6ddd4b49c6578540e688baf693e3094a05800f645cfe879be6378c1e9be9899cad7bc2ad1ed9844d6762d2ef6e0cc54a7476a
 EBUILD cerberus-1.3.2.ebuild 555 BLAKE2B a2daf7c5987368b3c9c85ac67137f263200fa99819c204ecd89f7175a91a39a7415d9b567a944be7dc4e71d4adf0efb0c0faa97040eafde1772931c0f684b8fa SHA512 7be0b457e94d62f49d6b24c448ec98c07394a31c8f9f773aa0f8d0090664a23ac7d0b232d26a3b9546bf0d48ef8b7da9078b160026282388c3e8aefa5000afb1
-EBUILD cerberus-1.3.4.ebuild 753 BLAKE2B 31016b995d74d64f7bf2824a00db1feedb4b97784d39f3e57d1a90458c8da28a0b9f3f5466667091540c812d48684be88f8afab53baf0a8a213a082b1de6ed8d SHA512 c106b7fd42a01057014267b836ae494e46bdc7d30df74e2ccceea828d65de3171e9f60a637355fab89de2b761849757c68634ece94f0dc4d0b4675bce4d2a4c2
+EBUILD cerberus-1.3.4-r1.ebuild 829 BLAKE2B 2b999e11e120ead67f5ec33eedd71355eb6e5c56964135019ee2cada8af8b4792d437f1f5b0749ca9ebb46a5cb9b797a7987575535589a8bae2a281fa5812c48 SHA512 20cb0196ad4c661c1986f235fbcc05a8a71d070a4c81a2cb33812ac0e4c74dfb93d9e1a71f95caf459e0f788dcdc9635a1b19804d76e65264c7e6a8906755433
 MISC metadata.xml 395 BLAKE2B c9dc795ac8b1daba3bb10e3aef517b28be2e88b26f5e1192c380bca300ef929608e2b2bcef23adc710e01d41fcbc640c97429d6d8ee61fe4a78014aa181b528d SHA512 c1abc73709d977c4f7a3e989c335f0d1312d07dc843dd88faadc633e2dbfa3371c1cee566a481ebfaabdba60e0a8f00068ce8a83ce9b05ab091c35917b8c146a
diff --git a/dev-python/cerberus/cerberus-1.3.4-r1.ebuild b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..58798d203a59
--- /dev/null
+++ b/dev-python/cerberus/cerberus-1.3.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight and extensible data-validation library for Python"
+HOMEPAGE="
+	https://docs.python-cerberus.org/
+	https://github.com/pyeve/cerberus/
+	https://pypi.org/project/Cerberus/
+"
+SRC_URI="
+	https://github.com/pyeve/cerberus/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
+	"${FILESDIR}"/${PN}-1.3.4-raw_docstrings.patch
+)
+
+# Require currently unpackaged pytest-benchmark, more useful to developers than to end users.
+EPYTEST_DESELECT=(
+	cerberus/benchmarks/
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/cerberus/cerberus-1.3.4.ebuild b/dev-python/cerberus/cerberus-1.3.4.ebuild
deleted file mode 100644
index f9243673a7fe..000000000000
--- a/dev-python/cerberus/cerberus-1.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight and extensible data-validation library for Python"
-HOMEPAGE="https://docs.python-cerberus.org/"
-SRC_URI="https://github.com/pyeve/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2_no-pytest-runner.patch
-	"${FILESDIR}"/${PN}-1.3.4-raw_docstrings.patch
-)
-
-# Require currently unpackaged pytest-benchmark, more useful to developers than to end users.
-EPYTEST_DESELECT=(
-		cerberus/benchmarks/
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 15a4d4368a86..297928180fe9 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,5 +1,3 @@
-AUX certifi-3021.3.16-setuptools.patch 828 BLAKE2B 937861655700a4e988fb377e25ae3865c678655c51b16d6ffc3594d80106dd4ab0b45557639c233388a8f9268413c9344eb68f18e82d45a15f70b06c238b76d2 SHA512 d8a2952e6317d1d30948fe1e7f77fadba1b3a489fdd1732b644249f0c5d54802c253721c233d30f676673ed3dad3d1cc442c6222181f7257b9a743cde6bb02fe
 DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668
-EBUILD certifi-3021.3.16-r1.ebuild 1548 BLAKE2B 475498a5d5a47d0995f03eb4bd2b37d685711f80cc4f444ce7f0b766e884dc6a62aa7f1c632ae4320906b94d55c028aa0f926b1ac3ceac6619da45571c946d03 SHA512 ffa9e8ed8b033c58305f6bf42a9e01d82badca8e8de800d77841906b15d14bea26c377ae7f2810f3e4062080fdae667e4db513f9f7d0b2ce388a3e0d223b3e10
-EBUILD certifi-3021.3.16-r2.ebuild 1382 BLAKE2B 8fdecf54ec42554d681c55b486e0a1dfe173ab2adcb6cc1530025f776cabe67893ec08f0e50022bd1a4fbd5f28debb2cc676fed3e9ab50fd22232ea5eed5bc9d SHA512 bad39bd003266f5d0f1904f83ff772939d3b43e8f92420f717f76fd615f4a54529f8ab413747d6426a5e38a556b0f8698d2a0fac1701efc92eb7d9d4fb31bb7d
+EBUILD certifi-3021.3.16-r2.ebuild 1374 BLAKE2B d38b75478478579e47e2318722fc870be0d69327960a7cc7e4eb2db86ae2c6baf3c08b36c0144d3bdfad31326d62f044fc8207c8fb32788a1616e22e40538b20 SHA512 59de47ac00ae7ce9fc36021c1bf784a8aec1886c3f037a9f206bfcaa19147ca0c9e72ab61e5bacf4c0e2074eb322a25ad8316e2e0a32e5d413046dc6f8d46b99
 MISC metadata.xml 427 BLAKE2B 12dfba937658c8ecdf591eef8803d721aec4be7f4f78e819d8add5ea85b5b73a9c071ae8d79d7abcedf6876ea53ea5365a7fd9adffc1c04ac4738e9f05ef58af SHA512 b4a027b08e92241cd0eb000e3220eaa4008f3e7b49f52b00b4b6abeaf7d66cfc92597a9633e1e29ff98758f258678ae09c213d332614d3f94e003ff0e59ad74b
diff --git a/dev-python/certifi/certifi-3021.3.16-r1.ebuild b/dev-python/certifi/certifi-3021.3.16-r1.ebuild
deleted file mode 100644
index cc5fde7ec874..000000000000
--- a/dev-python/certifi/certifi-3021.3.16-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-MY_P=certifi-system-store-${PV}
-DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD"
-HOMEPAGE="
-	https://github.com/tiran/certifi-system-store/
-	https://pypi.org/project/certifi-system-store/"
-SRC_URI="
-	https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-misc/ca-certificates"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3021.3.16-setuptools.patch
-)
-
-EPYTEST_IGNORE=(
-	# requires Internet
-	tests/test_requests.py
-)
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die
-	distutils-r1_src_prepare
-}
-
-symlink_info() {
-	pushd "${1}" >/dev/null || die
-	local egginfo=( certifi_system_store*.egg-info )
-	[[ -d ${egginfo} ]] || die
-	ln -v -s "${egginfo}" "${egginfo/_system_store}" || die
-	popd >/dev/null || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	symlink_info "${TEST_DIR}"/lib
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	symlink_info "${D}$(python_get_sitedir)"
-}
diff --git a/dev-python/certifi/certifi-3021.3.16-r2.ebuild b/dev-python/certifi/certifi-3021.3.16-r2.ebuild
index a64adff0fb94..279faf00eb84 100644
--- a/dev-python/certifi/certifi-3021.3.16-r2.ebuild
+++ b/dev-python/certifi/certifi-3021.3.16-r2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-misc/ca-certificates
diff --git a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch b/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
deleted file mode 100644
index 57154fd0eed9..000000000000
--- a/dev-python/certifi/files/certifi-3021.3.16-setuptools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/tiran/certifi-system-store/pull/17
-https://bugs.gentoo.org/822777
-
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 23 Nov 2021 15:56:33 +0100
-Subject: [PATCH] Add missing install_requires on setuptools
-
-This package is using pkg_resources explicitly, it should therefore
-declare an explicit dependency on setuptools.  The missing dependency
-has lead me to actually miss the runtime dependency which caused issues
-for Gentoo users for whom setuptools were cleaned.
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -40,6 +40,7 @@ zip_safe = True
- setup_requires = setuptools
- # hack to prevent installation on unsupported platforms Windows and macOS
- install_requires =
-+    setuptools
-     certifi-system-store > 4000; sys_platform == "win32" or sys_platform == "darwin"
- python_requires = >=3.6
- 
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index fd00be28710e..ac3485d33f4e 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,5 +1,4 @@
 AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534df1b881058cf7efdfdecd9df063c27ebd26683edad43e3010e1c01d9d93c5d98785ffbe65a5e3317d96ebb6a3132aecdab SHA512 75335871b8f98223e0247defc3d08f1c10ebed58c79790826c4e39057e6757b8bdc07e2773ad25482ed17c13480b3e72b3667e48697a456ed0cc4a39e7d91b79
 DIST cffi-1.15.0.tar.gz 484058 BLAKE2B 0d2d470c7eb11b8a9526be816b153c4483a5cfb529d3d220a804842facae1f06e2a822aa2be9abb1b5648cb36a97033bffc1dd235d83bdf8c075d67a907aa7d9 SHA512 ee83efde6f77f4a0c5889088c4c208ed7b9071fe06dfc16a8d2396de07f78fe859e1e39866760198a9d700f3b7359e8715e8a3e4907feb81d3fc4b8dd0dbaca1
-EBUILD cffi-1.15.0-r1.ebuild 1757 BLAKE2B db958d9afc8af658fd2de624695f2a037d31d98efa95284a3e5cf90e44406d003e1b77d87f2b7f12bed4d0eceff69e3bf1e53f5ae683439c5c181ec2a12b4984 SHA512 814f78252d1e7dd8bf59740e2d73df978a0f33faadea855f8aa3b2eb992fed95544e9b120eeea02c4a52d54d1e1c5244db98c7ec2e12a4f5803ab8148b1a2c3d
-EBUILD cffi-1.15.0.ebuild 1485 BLAKE2B a9f8510152784def395016099cac7c46891542dd6b716fac8f083d186c6f23fb184604f1ae672e99d4bf027ae3a14ff1a32fc83efaea5160af9f15acefdeb0bc SHA512 580cf0213aef8c5a9629b1a72ce2d41c9e88c2d552e62a93fa50fcc92e5235ca7332ba292a8ca6d8c81b3b684bac67b4c4b226fe571dd3b7de6d6a50821568cd
+EBUILD cffi-1.15.0-r1.ebuild 1749 BLAKE2B c710a237cfe7792896a08d61896fc195ba5cc4f50a2a545dde4ed54dfed4a37baed202d5a94717805375caf853ed82ec68bae4abb81a995d2755c65f091b2b6c SHA512 3ede32681e8ce94d3988ac3d58e5788bb73f5bacc6c52c98df654aedae1f07b1377bd33ae133a7d79ee155bedce36a07bd46be7e4516423c77b93c70d932a12b
 MISC metadata.xml 318 BLAKE2B f914459fac4ae3d8ac9273fb721c52494513b932676f570f02cc4cfb2283705d8cfc761806ffed23c6f31c95a967398edee01c1536547c1830def5ca4144c003 SHA512 ec451f8c535f0d01dc7bcd248c002745947982cd469a02ac247d0d34f4d7a33374fa10c28d8f074932f0548dc500c3270b499dd08b18acbb9d308777bcc7e4f0
diff --git a/dev-python/cffi/cffi-1.15.0-r1.ebuild b/dev-python/cffi/cffi-1.15.0-r1.ebuild
index 2039fa2bc8f1..56c019e4c357 100644
--- a/dev-python/cffi/cffi-1.15.0-r1.ebuild
+++ b/dev-python/cffi/cffi-1.15.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 
 DEPEND="
 	dev-libs/libffi:=
diff --git a/dev-python/cffi/cffi-1.15.0.ebuild b/dev-python/cffi/cffi-1.15.0.ebuild
deleted file mode 100644
index e764edcc0b5d..000000000000
--- a/dev-python/cffi/cffi-1.15.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-DEPEND="dev-libs/libffi:="
-RDEPEND="${DEPEND}
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		# Don't obsessively try to find libffi
-		sed -i -e "s/.*\-iwithsysroot\/usr\/include\/ffi.*/\tpass/" setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these tests call pip
-		testing/cffi0/test_zintegration.py
-	)
-
-	"${EPYTHON}" -c "import _cffi_backend as backend" || die
-	epytest \
-		c/ testing/
-}
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 99da12ae7cf4..3bb43f7efb5b 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,3 @@
 DIST cfgv-3.3.1.tar.gz 10395 BLAKE2B 8727a9886334a1fe59aeb0554c4c53139ae7e1f66534102c67f005d66dc1f78cff5e5534468a10b85df645f7e8a2fc72ca6ca2e448d09cb7636d08e8b3843113 SHA512 59c358bab9f2b32a1ac6eb72bba67b76e8368e0cf78c32228a6add200a0205f698aa80d9bd1b1e8701fb699b9599c88a240f76e2c91a602a0c292a67693e6857
-EBUILD cfgv-3.3.1.ebuild 484 BLAKE2B ed55edec6ac310c09b3c1ce6225ba0a41e67c5688146e84aec0c93c0d23f5752ee8101746099350766b39ffd3308c7202a21cc4f66fb0ff7be1a33d4a3518c6d SHA512 877aedb77b3e6359aa5d4d99a5e6c829d7e27f18159d24f1d161198bf5e34e0fa729f734e8eea92eb26d13a3d0342e2dff34d1a5850b3d24f8fbe4bf93701fc9
+EBUILD cfgv-3.3.1.ebuild 484 BLAKE2B bb794b8d5f92ec4d474d573055c3c456eb621fcaf8c85f4aa658bba18dbe522f8ec2706f725c102020f6ba2f1152a8bbf1e052020d7de304d907f3704aa9d2b0 SHA512 1250a5e1a871a3be213dbb27a0d5dea272422a6953dda453a52b5b85bdf774121bddedf7a6d63cf1c22ae5f365a78499b801ccf5b15f3d25e98803653152cd1b
 MISC metadata.xml 491 BLAKE2B 8adc9313dd82bb837c84287063374dae8d9d851f8d515ac69e81cfc3d5b0b1369f709113bef6ce348329e0e6394de7c3b568fe86cd45081a546a3fb54f01642e SHA512 ef1c16ef95820a9eaaface09373366b62660b6e9a8fa05800c4ecc578d4b3e6c64ef3094c496dcda1c8449b9cfea7e427299ebb4750e5fb8ef49f78cdcbbe96c
diff --git a/dev-python/cfgv/cfgv-3.3.1.ebuild b/dev-python/cfgv/cfgv-3.3.1.ebuild
index c5062d91e2a3..adcc5d30d50b 100644
--- a/dev-python/cfgv/cfgv-3.3.1.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.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=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Validate configuration and produce human-readable error messages"
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index e1566618b1f9..7c406999c7c9 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,5 +1,7 @@
-DIST cfn-lint-0.59.0.tar.gz 9004743 BLAKE2B e778c1081e45dacc813f8a4ae7726eb929fabcdbfaafcbbc5f0d925cfe32773851366c9488363728ae42349cbe899a6cacd114940ee8d76dc284b30ea87fe19a SHA512 e8e9d0fb1f366c49f8a008000a808ec4b6c4299ff3c9650229619d8e48f1812709ecd54274163d8bd389c6823f20accd7d31f6147bec926ec233ede3ee51ee10
-DIST cfn-lint-0.59.1.tar.gz 9065067 BLAKE2B 63fc591f7ed60eed2ef7fa1e9ea212e3e8569cfd20dec8bb8505dbfb8e96ee8f8ab6136d88de58b2db8823675946dc99b38adeb3b5c784d165083e1353100b00 SHA512 a08b4bf4dc8e7ab41bb72eb9309ca4f03eed3b6f5c31b3876dc9d08610312377a7c229de883c287e7e5ed6597f8eada79a111882785888e43b0ff20160e39fe0
-EBUILD cfn-lint-0.59.0.ebuild 1630 BLAKE2B 8c005e2deb1e740d899bd49c2383d0b9cbc62d5d39590654e5bb4892cf2f0eb005b62f177e66c712dffa3f2248ef1a04212c5015492264eb40828bd3142c9852 SHA512 973419a030301b262d4161df6c8fea9fcd4c64d6c68c239f06f41c074b4925dfb37f80bb84a07aff71fc2044393ad95185cdae07087d5df32a44baff7a23bff4
-EBUILD cfn-lint-0.59.1.ebuild 1632 BLAKE2B 31a5925aa3f0a2df74957bbabc47da51c554c139337e49d22adafb11d451380b3897b5cce1afc9ae766190319f606aec09982e6e8b009654e3b496aad073d939 SHA512 66cd6902f519eb880df5a65a6acdf04c8ec920a4cb443770053adc1c250e9fbb262c715eb0f11409d4778edf72b153ef8ec14ec28d8f789f5d4994fabf6454c1
+DIST cfn-lint-0.60.1.tar.gz 9144208 BLAKE2B ff0cc155aee6fb0c72a3011a5fbaf147158d23ab8ed11426a9fc922971019cb276b74ca4e8972ddc2dbab7b1239ddb00b1d7a60281763a9773157b97ce5a8105 SHA512 8d023773a82b0b8486431e438d298e80812726d197017aafd925d6d9aa8272db99dc594f1b8f7582843ffaa9d421d6d9300f80c3bb6e932e705ae019d1cd8e21
+DIST cfn-lint-0.61.0.gh.tar.gz 9252192 BLAKE2B 08a5a8648e6de27eb86629bf27fd2a40700eaa84b101c2003a2acda61b48a6ec2795dbce4dcfaa9e42664c75ab932c9cd84836d7b61bc438a586203502123d9a SHA512 3e70e5ccdc2a9909cddf9a289c5ed0d292580ecc236a1d64088fdb9ecce913814de88739ddb5b6bde5b4091e0e1efca86860157fde6e6f94e992503e4c1f83be
+DIST cfn-lint-0.61.1.gh.tar.gz 9351410 BLAKE2B 442fa5957f8816dc501e91593873c28b1b2e39ec14870b82574d4ca351f321b94a813fd351cc09c7602a177a8451d09cf8459c8aa47b683b9938654c99476e19 SHA512 63071cd1df0115624341fb64bd12a51d7bd38fe4993229a790ca09011b370487cb49397d90916f4df42b5c978cd3832e2de4cec15660ac8668e994adc0e681c3
+EBUILD cfn-lint-0.60.1.ebuild 1635 BLAKE2B 5f9f61c84d5d13d6da06dbc8827fb6bf879a104e6e44464ae4d572e673297d392fd72caa719721c9bf93ef6ff0cda024d043f4d36f0de1e011a865b59daa8541 SHA512 bad6301002363d62962087cd42a7937abd6fdb6840cad9fee285fbb4b0c025ce52328e371b8d4d53596f50512b91397fb984ec941f91ad1f036b68e70c2a46c2
+EBUILD cfn-lint-0.61.0.ebuild 1640 BLAKE2B 1c8eb1a6a2321d09f163cffb42d2af24ea43571504519d9fb0c28063d2f5e2d7e8da4b38f814fd348a7cc2a317ddddfab7429376b852febddbfa9ff6c52bff2a SHA512 e13621a54e1eeec34bbf2d9997177d6c0af4a7917c13e13d36d32cc1b07e919012faa58e9599c585e25992fbeb11cc5f7aec85e20d0f54c69d647dc093ce38f2
+EBUILD cfn-lint-0.61.1.ebuild 1640 BLAKE2B 1c8eb1a6a2321d09f163cffb42d2af24ea43571504519d9fb0c28063d2f5e2d7e8da4b38f814fd348a7cc2a317ddddfab7429376b852febddbfa9ff6c52bff2a SHA512 e13621a54e1eeec34bbf2d9997177d6c0af4a7917c13e13d36d32cc1b07e919012faa58e9599c585e25992fbeb11cc5f7aec85e20d0f54c69d647dc093ce38f2
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
deleted file mode 100644
index 3af094e51db8..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.45.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}]
-"
-
-distutils_enable_tests 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/cfn-lint/cfn-lint-0.59.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.59.1.ebuild
deleted file mode 100644
index f3316978d184..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.59.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.45.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}]
-"
-
-distutils_enable_tests 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/cfn-lint/cfn-lint-0.60.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.60.1.ebuild
new file mode 100644
index 000000000000..b10e49314e21
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.60.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/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 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.45.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}]
+"
+
+distutils_enable_tests 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/cfn-lint/cfn-lint-0.61.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.0.ebuild
new file mode 100644
index 000000000000..8ec456de9b4f
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.45.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}]
+"
+
+distutils_enable_tests 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/cfn-lint/cfn-lint-0.61.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.61.1.ebuild
new file mode 100644
index 000000000000..8ec456de9b4f
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.61.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.45.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}]
+"
+
+distutils_enable_tests 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/cftime/Manifest b/dev-python/cftime/Manifest
index ed90336fb204..a748d61310ce 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,7 +1,3 @@
-DIST cftime-1.5.1.tar.gz 46036 BLAKE2B 64a4af4bc8bf29624812ca24a8fe0cdc8885f6f46fc63a69587125c88b968f6ab5d40ad332dd6bd6881fbef8b2067c2ff436efb32876b77ab74037ae2900f7f3 SHA512 d75673526d5c831fe32f4b432c943a289491cc2c3af3258c8aa91f9633055d5fe36f4c7b7c2fdb5bbfb02f3a9138b020316fe53509d07116481dee0663e82de7
-DIST cftime-1.5.2.tar.gz 46415 BLAKE2B d47d7483de2450a32d126cce3ed7be7926e91ac5138be6ad3efdc8b88ce088ffd195adc8faf538a7ddeda8427596f89245c9c7e485623066398e6a69aa686d5b SHA512 4fb23aef4dbf7f8f732f95120b992d822acb79cbfe5b23521ae33da891aa17a919b6f36555a522c3d5a4ed060f247919d74525262eecf48d4a5a3f072358e907
 DIST cftime-1.6.0.tar.gz 47633 BLAKE2B 5201afcd4ecc733511481ec7aa557953acd741d7b5f3126b94d23a0848b30ea1c65b0e965e3e5560581fb7e9b8d1acd144044e8b2cb6fe6ffed99094eb39bc32 SHA512 87f350155c1b875b002822424d8bb4916cc33dfff0c249c3ac7f008c0cf41ea03c1a1b187b79d4a15b935b88a5b2d217bd19f6d069e6255c7fab2ad2d69fe7f9
-EBUILD cftime-1.5.1.ebuild 649 BLAKE2B afecf99fc55296d1c537d83716dcf67549f1ad13714bbdfd84c67cd6dbab7650af8db388d6726837dd44502a08c6ed695b284f83da899c8ed3f96a30f333dca3 SHA512 8cb1eaab3fbfc190ba6dd013a0b3f04d19b9cf841e9cfaf98c4c056ce9b9f6ad76d9f8b5ad8e499c38d390b2f958a8f503478fe7018d130bc5bd2647790e0492
-EBUILD cftime-1.5.2.ebuild 699 BLAKE2B e66a17932b451c29516036624690a5351174b6e891d8e8e4a518c374473be16db7f34d33907c808b7a9b3fe0b4481d00185c3a75d0bfd106863b4efae79d8d5f SHA512 fd65a80f65ea50bf5cf8fd42deaee590bfd2beacd89bb9456e351e5e1d9f1af211c8c55a6be9f103b9064c97dab7e5d5f75da3761d724f86f23ca531e3ea3e31
 EBUILD cftime-1.6.0.ebuild 699 BLAKE2B b47a909deaf0c2e910efb44ce723e44b51d66584efc3fa82e30f1aff476d437fe4271548b494f3d00c0cc19b50c4f95e0ba00d63e0bbfe86858046247756e6f2 SHA512 19e8d97055de43b3491960600196fd532636d1ead216041addbd2145d60a1f53f3fc9f4476b3311d599f8c5ac546e2000e608c19db13aa626b1b4b77348272a1
 MISC metadata.xml 478 BLAKE2B 4999918d1667d93d5b8a38bc28b65255734bd11bcb9c56bcdd1920cfa7b3e1e9a5ce6751496e59dd914d1817bb3cf7fbb8a1c7a1a946c916f31dccb320c5a763 SHA512 af6b5275bb79ea316621108ce930d2a6aa3b7a42fa99b722573bcdae2c1488d3d2948c661dcf13cf50a35eb353ef125d47c387761ce1ea57cb6887349b5b0889
diff --git a/dev-python/cftime/cftime-1.5.1.ebuild b/dev-python/cftime/cftime-1.5.1.ebuild
deleted file mode 100644
index 3626bb7335d3..000000000000
--- a/dev-python/cftime/cftime-1.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cftime/cftime-1.5.2.ebuild b/dev-python/cftime/cftime-1.5.2.ebuild
deleted file mode 100644
index de898f499ddf..000000000000
--- a/dev-python/cftime/cftime-1.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Time-handling functionality from netcdf4-python"
-HOMEPAGE="https://pypi.org/project/cftime/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-DEPEND=">=dev-python/numpy-1.13.4[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-python/cython-0.26.2[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "/--cov/d" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index c9d71634eea6..efc3f9538580 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,5 +1,5 @@
 AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea4178cc8bfb55c4544f456fb657e901c00847ea0f53cb140c4acaa0b6cec1d8f0bfed993fb842c1d9bb7d08ab9459e2187fd31b SHA512 930c1513b79fd1bf81085bbfbb0bd1031fa61bf7e5cd227347f8976b930c441585c91003ff9345d43cd1fe7a7b8ba0d12b07536a7127fe0d9790ebfea7cbc7e3
 AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
-DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
-EBUILD cgroup-utils-0.8.ebuild 622 BLAKE2B 3a0ac4eb97648e6222c88a92e3af790a3ff1f9439609eeb6e10ad3134bb290e166937b7795af789be4722e34a16d54a37f4b9dbc7702b7970f84bd3b77eefaf9 SHA512 097370f66f6a58febd7526fc515970d5d101040304edd2e7b7345e7c08050b6d156ea582a6953d00efa2da9330a041a1ef3bbb51351005feb3e0f482d7f3b9b2
+DIST cgroup-utils-0.8.gh.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
+EBUILD cgroup-utils-0.8-r1.ebuild 657 BLAKE2B d98d7bb62ddab53975fcf7452f007c599b21c4bc76b134b1d0d0585f7ca1a2fdc53efb3aeeabdd5b64c9ef2d04ac3f77c16b8be4fc9efa9169532e8f13771d00 SHA512 6ae9697dac2094dc9ddb99a509a5ef34126a7058355261c939cfe0ad49c1b3770f6255df922ad44969ee7e0f9fc9cbb1dccedba35e72c76c06340b8dee8b2e5c
 MISC metadata.xml 486 BLAKE2B b15881b19a24abf60b9a8f92b5f43307faad1432f6fd0fac43bc18b265eac2a359cd9a4f7d130d6872aeaca23d7eb7d532380093d05ea2a8d480a2a2a26bf46b SHA512 46325fbefa6f1ccad0147d9b98761ff638fc250f35e92753bd60325f24a5c4bd741c2b30bf78020e6f1b84927fcde476968e4e28c9d676ef26e4c6199ca768e7
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
new file mode 100644
index 000000000000..ef958fcdcceb
--- /dev/null
+++ b/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Tools and libraries for control groups of Linux"
+HOMEPAGE="https://github.com/peo3/cgroup-utils"
+SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
+
+	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
+	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
+)
+
+python_test() {
+	sh ./test_all.sh || die
+}
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
deleted file mode 100644
index 86b5672a275f..000000000000
--- a/dev-python/cgroup-utils/cgroup-utils-0.8.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,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools and libraries for control groups of Linux"
-HOMEPAGE="https://github.com/peo3/cgroup-utils"
-SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
-
-	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
-	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
-)
-
-python_test() {
-	sh ./test_all.sh || die
-}
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 8c7e7e35789b..dd46a7594bd5 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,5 +1,3 @@
-DIST chameleon-3.10.0.gh.tar.gz 136996 BLAKE2B a622fa4d972dc0bea9532f0815b586e17d56fc4da94bad37f83fb29d2a94442da2a7d1ebd00fdfb0a877fcf9a2d269c2c3780ec9cf96ad772952b096a1ca1db2 SHA512 de59a4f1d0243beae91008f93741e9565831ea3b07c3f39e20e15ecc7220711a78bf475844fcaa9dc25f2376b0e937779ca28bd58f7c9b95fa2cf35cc7212117
-DIST chameleon-3.9.1.gh.tar.gz 136555 BLAKE2B 277df179cd26f1edc6513bc6a80d6f7a7f9f95b1562efa23f454d7055ffbeaf59d7a726bfe8969505b0839138c7f97fdb810754bb0342060a79b23abecb3ad36 SHA512 53b0aeeef89df7cacc299dad20e05023c638e708604876ce5269f22bab00e5001b640123920aef0ef9a0f554bbd37d151bedfdfe55ec161defe6b6f3781d841e
-EBUILD chameleon-3.10.0.ebuild 580 BLAKE2B 8881fa0ca9b91915b9bf265a029fa990c9a8bd8476ae40d11e0f771b6dce3e180e4da3a2ac1e118171f260c50c60443055820c27dac4d34e918243e7b7925427 SHA512 86b5c77e770fc489c3f3f44a68fce64ae1656aeeedcc57e0a21a4fd533e6fa9a8423a07fb206637aee4c268c59b8aa3d9377d2e03159b21124104a0cd693bde4
-EBUILD chameleon-3.9.1.ebuild 542 BLAKE2B 39056f329362d4f389bc07d241a336c9e86b7deb4e7a5d34e1f770f3b7f1722c0a5302f4cdb3f16383c27a50fc52807005a6b3e7ccd28c323e87e0632c786602 SHA512 3ad24608e422c76bf76e41ee974ee524a6ee83cb937de3072736d5593b74650650d1f9836a9de07178ad2db6b6bf9e191cf50aff82a5949672a7fca38862a096
+DIST chameleon-3.10.1.gh.tar.gz 137135 BLAKE2B c11520792a833bccc0997ea82e7876e309905ac0cdfd8701c4d83eee7befe1d152787f27b076df15c4ba299d2702ac6a262dc193d1ee7f6d44398e57af73772e SHA512 e79b261ce6f480358191ff3d23af325c0559e9c0b6be8b2c44d4bb3869fb7e09fa759906933d9b4d6f7107779f19bb225170add73ec3205ddf73b9bdb1bcfb9a
+EBUILD chameleon-3.10.1.ebuild 578 BLAKE2B eaffb4d8db42f4f88d7662c22e40eb4cf703b31ea2cdcc956db13aede81f3e5707b5a2faeb9ac86f2b53cace61bf85888e2a64564b73726bccc75ed752d2ea8e SHA512 b04946087d6f799bc26f5198529ae82414ea0707d51617e0f77227c22308abcda6ba56931d55eccaa10cec01762ca46a519ea3b058b3ee8a774aeb3785b71336
 MISC metadata.xml 393 BLAKE2B da75a225bf4e4b27bdcfeec93eb41d2e20b2498bd28624d5728bc0aaa915a312376e85252258f7195ef77f4d089b8a94097b5d5762472e8a686df8e8901c7d15 SHA512 715ba1cb0190a925747a0c8d5529aa5e61202fba701cb2238ebe16643607918560373d34079e7ccd3e097e988b1ce2f6e6bf5eb3d090fd3f384bc7e651cb331c
diff --git a/dev-python/chameleon/chameleon-3.10.0.ebuild b/dev-python/chameleon/chameleon-3.10.0.ebuild
deleted file mode 100644
index 1d224f95ca79..000000000000
--- a/dev-python/chameleon/chameleon-3.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="
-	https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/
-"
-SRC_URI="
-	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/chameleon/chameleon-3.10.1.ebuild b/dev-python/chameleon/chameleon-3.10.1.ebuild
new file mode 100644
index 000000000000..5a8173b11ab6
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="
+	https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/
+"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/chameleon/chameleon-3.9.1.ebuild b/dev-python/chameleon/chameleon-3.9.1.ebuild
deleted file mode 100644
index 37050fea5f72..000000000000
--- a/dev-python/chameleon/chameleon-3.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="https://github.com/malthe/chameleon/
-	https://pypi.org/project/Chameleon/"
-SRC_URI="
-	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd src || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 36a3f3a3dde9..f0964c69268e 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,4 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 687 BLAKE2B 4ac3a4baf1e7b45befaa78974907a5e53032da823ff00afb3090fc42ac5a6ee30b5df33673e1775b6405d5862866b9e8d891a938f42b03a70310c69ad7bc90b0 SHA512 31ff8ca30604c1b176ab053b202403c38adedc6ef45ee587964a7b45e772152ac3001da546b68a13b9bddbf1cf3aab5b84a4f919e8194fb6a33f3117a45192fa
-EBUILD characteristic-14.3.0-r4.ebuild 772 BLAKE2B 5d333b1bcdbb79a5f69b47ad4f7bf1d0058ed3c1d13a71bef1a95681f8950ebc59f02521340fe9e01d04f6b2415bafa85d98a5f3ef8489c777acc4b25c728eff SHA512 bd5a735fe3d7d52b2cc85830827ae55b1dd7fa86c410888ced374cdae3dba7caedbd7c78f3bd5f81f524935312dcd84c83195226a6a0917dec59516d1f63c846
+EBUILD characteristic-14.3.0-r4.ebuild 765 BLAKE2B eb062a54697acd1570e1ced6823447240c6c9bd434494552a4b6e59a171c2e0d12958b000b173a31ba48d20f7ca16a155883e0ecbdeadd97b5a6a12d6949b687 SHA512 56a8e84a5ffae9d6c9ee5a64e97013f3c2f1bc373dd646bf958c53fbdbcd6da6888e53182e7971ac6d019f7c2beb9267539f3f236d02b10e1398244109a263d4
 MISC metadata.xml 415 BLAKE2B 830fb6e7388a63f73de55b68518ce238c6d12e9a3298a57c75f6cbb5f33269a686064b53a006e9dbd6aaf7315c99c2fca1983d4c046aafdffdfd00c035e6fa8b SHA512 d09d6f15f87c6b870091b42b8788494096d11f4edf1eee0df28e58522c78fb600a167ea93f226230a0cb2123a57e35a0fbad9d24003453b058e7b7157e0002ad
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
deleted file mode 100644
index 5fb38c3a6d77..000000000000
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Python attributes without the boilerplate"
-HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	sed -e 's|\[pytest\]|\[tool:pytest\]|' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r4.ebuild b/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
index 2693b044991c..f52f4822a846 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 7dbaaf51465b..902840cc7f8b 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,5 @@
 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
-EBUILD chardet-4.0.0-r1.ebuild 713 BLAKE2B 974dadd27cd39dc091ebc8c998a67074e6a69026f80821f9df993c1c6521902e1c51fc91e9b3267a04da7fabc0943d330428b2a5d3e19a4c3de728aa3a4c689d SHA512 bca89fd4a01ce4f0aac433da1bfdc5e4f5ef0e3d3b07d208f537f0b54d53f20466a13bb8b36082c98ee02976d10e22ee633037c05293b7594d64b77c919f4bb5
-EBUILD chardet-4.0.0.ebuild 659 BLAKE2B fbe72d35cb021ecd92e7a3e026359d26653bda2110020a3f087d2e6306fdf9f230223ff8514db4f262f6f98f842fc1a0a55c5c88e3d25ff0f1337c029ed47428 SHA512 4117c08066efa4f926bbe57457c92879e4e6d4f035eebcbc81e59a642d630e8fd14e5aaa62d186846da680b6ab569bd1177d24b41044828b4783a28df7123992
+DIST chardet-5.0.0.gh.tar.gz 2016879 BLAKE2B 006992a4945840b3720e93f932618cf81debc094a3ae353bfdd4e56ecdc5a01e4a250bed15473d8d59108978fdbfb769081a9b87f672d35f4892d5ba04c2deb5 SHA512 d19413a4f1f571f3627ec3f55dcc6a69497f6a1d72fe972051713f4d7a473cd539cfbce2eb2c7a070295aa640c6ac2aec6fc0064751e465311935c0e4d88061a
+EBUILD chardet-4.0.0-r1.ebuild 705 BLAKE2B 33750d7b4c1f4263412a7628ed6e4babe14764c3d5ef262fcc0790115ab86dfdbbaf16e4affb3f1b212809f2384e9d47e134363c0a0162903590c268616af656 SHA512 fbbbda1edda3d54d35b25799742834f0ed28b2b9a0ac354ca174be288c1530ccf5ab10f0dbe51712408b6c7314364991e8bdb36f53da6f917e4ead68977dff7e
+EBUILD chardet-5.0.0.ebuild 794 BLAKE2B 6eb014cd669d2cc293b8d7ebff79e60844fa9252e94025091da8b85b64bf9ad2be35af4d1defe15fed1e0d696b88a1683c2b6a9cda5772322d0d55c9adcef65d SHA512 c04f3b25ac004d8c5b1356a1d7f699b6b3a2fb6942c561ce5611bb8784d784435a2164601ea7a6c573f203321008b04380f14fd784b1d89dd3a760f75e990a26
 MISC metadata.xml 403 BLAKE2B 90447dade87db87cbe60f8a0ff84e0617156551d74869306167a5c196e2f6da7746a9ae9a73624099ef7d593f1f36a476cf3b61251d3ca97daab1eccc963e08e SHA512 ed1030c49899c34998da5ed13f4c6dd297f75f5f9e0a06e51106c93579aeb0b4fe37fbea08e8e182d6480877d28a963f73f4a91402241412a22ee389179d8ef6
diff --git a/dev-python/chardet/chardet-4.0.0-r1.ebuild b/dev-python/chardet/chardet-4.0.0-r1.ebuild
index a8afdd4a6f64..26a8f949b152 100644
--- a/dev-python/chardet/chardet-4.0.0-r1.ebuild
+++ b/dev-python/chardet/chardet-4.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
deleted file mode 100644
index f69796f4d505..000000000000
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 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="Universal encoding detector"
-HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"
-SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/chardet/chardet-5.0.0.ebuild b/dev-python/chardet/chardet-5.0.0.ebuild
new file mode 100644
index 000000000000..1a0f32883fb2
--- /dev/null
+++ b/dev-python/chardet/chardet-5.0.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="
+	https://github.com/chardet/chardet/
+	https://pypi.org/project/chardet/
+"
+SRC_URI="
+	https://github.com/chardet/chardet/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# super flaky test
+	# https://github.com/chardet/chardet/issues/256
+	test.py::test_detect_all_and_detect_one_should_agree
+)
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index a99358b2650b..d317783867ad 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,5 @@
 DIST charset_normalizer-2.0.12.gh.tar.gz 83293 BLAKE2B f1e993fff311cd3a1081a68d545703f545d68712c18f3821368c144b6166a8790482711171254f2741117ecbc9e18ad0bd5c19165d5fa6aed24ba021ce08535d SHA512 c42c64a9e15b322da0dfb6afa19947683a31106fdd620c15c0d948593e95e21d0d9c4a94ace32d67a9cc0cd95aea8f40b8fd09807b214f4ae2e79164627da05d
+DIST charset_normalizer-2.1.0.gh.tar.gz 85498 BLAKE2B f18c491b7d2b32cfc3cd92b1dc074b89f562c11a1bdebb9d4ff7c230ac7c2394c6f7cb30caa8cde9d8da26f1ed527a01c28236099b793808274c1146f258546d SHA512 a14e9e1d58eb23c9c568e7e74ab88361f522a76575b5ddc30df392f33584c821cf4943029395d2535c641d8fe441256803e6d2212e52c6f4b0544db64bd73b7c
 EBUILD charset_normalizer-2.0.12.ebuild 848 BLAKE2B cb70cc788c7d9ac7e2eb4a0e27ae1f1a446f3c88d90b909f21ea1a456c7fd1b4ad6b7fe6525cd6edd8cd07951bc2b9860ce1ee6cb49f753c614c52653779ff8b SHA512 4559737ca7997e111cdc0efd2073d32fd0c808045b845742af52d9ac2d8f52d87e4b7b7d1a2122ab315d99139342bfc87f615e0f7ba170a3694d3e8001e27912
+EBUILD charset_normalizer-2.1.0.ebuild 841 BLAKE2B aabd2720ae445ee1d8e9fcc4b59b953cef45efa104f8089002129624ecec92fccc741fd31ae0acc93d02a4ce98c9459913a9175cb1dba581374bfaab53fb0fdf SHA512 55c6e3ad6111173a419731077220df32b8b04de5000d4b78a7c6338187b3ba39f651f1a30a0b121767010049cd9c2526087184e11d52524619a14999da1e9bf8
 MISC metadata.xml 389 BLAKE2B 3bbd21163c92f582c6f19a38c41a73b96adc3e3a3e84ecad87127fd4d77bc7b90f225f3fee8c0799b212881b5890717e65c23e1191cf1ce6a524887a747c4cec SHA512 51d4143d0e35df3d828b8d907cd5420518664c540d059e73c4f91692ca810bc36ee31083eb5d234318d2233348429422f31aa276b605eb74a9a1adcca7a72538
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
new file mode 100644
index 000000000000..0ecf8bd8c9ef
--- /dev/null
+++ b/dev-python/charset_normalizer/charset_normalizer-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The Real First Universal Charset Detector"
+HOMEPAGE="
+	https://pypi.org/project/charset-normalizer/
+	https://github.com/Ousret/charset_normalizer/
+"
+SRC_URI="
+	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/check-manifest/Manifest b/dev-python/check-manifest/Manifest
new file mode 100644
index 000000000000..0a5b0672ab54
--- /dev/null
+++ b/dev-python/check-manifest/Manifest
@@ -0,0 +1,3 @@
+DIST check-manifest-0.48.tar.gz 34732 BLAKE2B 9142ec4b4fb4ea96662ae5f1335127b2adb2c148e29d287384335e4b15f82597451bd7cfde856e80c485e00de20bd5591551b0e0a8446870c57d7ea3eb658708 SHA512 79df1ef54e2af669ce08b87d3ca9eb58bc02c6541687be11b270a30f83d89982583a470aff2c6bde0454476b27258c268cabfbb0f90c1188212375d0f95328d9
+EBUILD check-manifest-0.48.ebuild 777 BLAKE2B cf1476811dea42a6bad4ad0b5a8dab1936bfad6d82455ea476f6752f9634a6a0f209a6849580a12ea6a100197eb656a2c2720b6db661716c1076f48c32609a1c SHA512 fbae96a32d39542c578f39d9e5e1c1d9fd185fa6e6381e18478d1549d1106dff8fe32b0405d566900bdc3a749f2bb7f99e515d443644b01db37701346eacad1b
+MISC metadata.xml 638 BLAKE2B 14772337bfd69c8f030fbe8be11f9869a13c3af8195c8b9dd460c86a7e4d8aa89c6c9edfc7f03eeb560a289253fee937be75da41573b1cc732a6b96f5feed130 SHA512 508c5fcd062311ce972e152a6e956469c09c99f9b17d2e2da5f388eb644c11c3f0b2e0ca9e04f0db6f25a13cb4d18ce86e54da196d83ecd6410b0b564f380f5b
diff --git a/dev-python/check-manifest/check-manifest-0.48.ebuild b/dev-python/check-manifest/check-manifest-0.48.ebuild
new file mode 100644
index 000000000000..2b989bb74fbb
--- /dev/null
+++ b/dev-python/check-manifest/check-manifest-0.48.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Tool to check the completeness of MANIFEST.in for Python packages"
+HOMEPAGE="
+	https://github.com/mgedmin/check-manifest
+	https://pypi.org/project/check-manifest/
+"
+SRC_URI="https://github.com/mgedmin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/build[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# Need internet
+	tests.py::Tests::test_build_sdist_pep517_isolated
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/check-manifest/metadata.xml b/dev-python/check-manifest/metadata.xml
new file mode 100644
index 000000000000..2a0a893e69e1
--- /dev/null
+++ b/dev-python/check-manifest/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+  <upstream>
+    <remote-id type="github">mgedmin/check-manifest</remote-id>
+    <remote-id type="pypi">check-manifest</remote-id>
+  </upstream>
+  <longdescription lang="en">
+    Are you a Python developer? Have you uploaded packages to the Python Package Index? Have you accidentally uploaded broken packages with some files missing? If so, check-manifest is for you.
+  </longdescription>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 603e1f3bc52a..20b2b03f21e4 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,6 +1,3 @@
-AUX cheetah3-3.2.6-fix-py3.10-tests.patch 1082 BLAKE2B 5e418f22d9067208c038ddcbd35ef5942c09bc92a14a9a28c7ed996496c419b41b772d1fafd3ac01b524aea0dd70706ea69815db0f6fbb3de26abd95b416c3c4 SHA512 1adcc664bfd580fcd62156591b52375e3f01a5107a995ad6a8c01baf8e604c2114451be7cd13775bdf2bcc2d16998d86fd5d0db38c85d4ff6e52bd314fb3c264
 DIST cheetah3-3.2.6.post2.tar.gz 316291 BLAKE2B d5dfaa958bc0cc41097d4a75abfe092d51379efd644daa01caac6ba1b789c21334a662904166b6069a0204e302c1d9e7bea74aa9f11082b9c8fce1c1c509f888 SHA512 b10d2569ce92181029b8f95d23602ec7b002400c8fdf4f6bb095ff40201154b97418fec19c9920f2f212f545633571aa32dc50a16a9ba81a9427303ca7938f29
-DIST cheetah3-3.2.6.tar.gz 2481158 BLAKE2B cb8ad192ae9caf0d1284294b323cf4a918cd2fc951bae25867d69a3dd7933728056b76fbf52a22d34f290056a96cce7d9ccbeb2404f2f0bb782f8db8b7453e47 SHA512 abf74def695018a79cb1364f60e402e7e0095a4d2f069decfbddf42501d865b70451ebc7b52abc67aa23e57276d7a3b8c2894a9571876e15db43cd1358f74d31
-EBUILD cheetah3-3.2.6.ebuild 1139 BLAKE2B 4bf5c4cc0f85b4f7b4e46287055cd3b0e33f4fd69e162b514ff8bb96a8337f8b95ae81964f31e4332a93a214cbc4333530bb5c8c20d756a7b927ee4d0601d55b SHA512 1534d89a0e31a31f6b1027425bbaedcc8e14e1af91e319418ac6be6eccd001a364cdad0f103be82aeb8b018c41f603a70caeaae660776f2b6edf81e2b0d5e2f5
-EBUILD cheetah3-3.2.6_p2.ebuild 917 BLAKE2B 8df67aa52d0f1a93392328bb637ef4e654a7eb554f297f14285ed7e2a407b92e0dcd6b4215002b889324eaf6c93dd7d58be2f54d1aced6a4e0b75738c409febe SHA512 a9ac52e0d04b7fd066cc0cbeee8b0ebef0001ff9db71bc34a8d5e9a844bdbe092a1d4a06a190b0b96a1d5b9b8e7b21f6b6eb3f49a519ffb09bdbbe462be72a76
+EBUILD cheetah3-3.2.6_p2.ebuild 913 BLAKE2B 0b94462a6c57cf619d16e412aacc42f1da89e8444b8a53b4dc7384b5637cb6f359606e6bfd82b58c8759057d945a28104b56b09377d264f0a927d29bbc73f270 SHA512 1e823f237aaa564d3d7f96ea5d3dd5a33d62690719bc433d9efd7f80d35c7a8cffb828af54cb5eb3273a7bd26ba700c2936a7b03036d5eab15ebf307655593bd
 MISC metadata.xml 728 BLAKE2B eed475bf99f19abf5f934cc9e9f0ed10c3a29536767133a628dc3f23e95a37a0feaa82e4f080ac8f6d541cc6d802a084d670e64049149937b061e5f20bac317b SHA512 52b5eb46efb8d6e750823775ef459eec200e617e9232867cdfa229e2d7b6a41feee15441ac1a7c1ad2871f0fd19fb91fd6c36719eee2592c41e27ad8ec5fd162
diff --git a/dev-python/cheetah3/cheetah3-3.2.6.ebuild b/dev-python/cheetah3/cheetah3-3.2.6.ebuild
deleted file mode 100644
index 77379adab8a1..000000000000
--- a/dev-python/cheetah3/cheetah3-3.2.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
-
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="https://cheetahtemplate.org/ https://pypi.org/project/Cheetah3/"
-SRC_URI="https://github.com/CheetahTemplate3/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-SLOT="0"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-	!dev-python/cheetah
-"
-BDEPEND="${RDEPEND}"
-
-DOCS=( ANNOUNCE.rst README.rst TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
-)
-
-python_prepare_all() {
-	# Disable broken tests.
-	sed \
-		-e "/Unicode/d" \
-		-e "s/if not sys.platform.startswith('java'):/if False:/" \
-		-e "/results =/a\\    sys.exit(not results.wasSuccessful())" \
-		-i Cheetah/Tests/Test.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	cp -r "${S}/Cheetah/Tests/ImportHooksTemplates" \
-		"${BUILD_DIR}/lib/Cheetah/Tests/ImportHooksTemplates" || die
-
-	"${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild b/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
index a4c89574fcc1..bca8706b192f 100644
--- a/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.2.6_p2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch b/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
deleted file mode 100644
index 845520fb02ad..000000000000
--- a/dev-python/cheetah3/files/cheetah3-3.2.6-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 112dddd8fa5fb9c285fb8ef2818abfef99365070 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@python.org>
-Date: Tue, 19 Jan 2021 11:19:15 +0100
-Subject: [PATCH] Skip test_import_bootlocale() on Python 3.10
-
-The _bootlocale module has been removed from Python 3.10:
-https://github.com/python/cpython/commit/b62bdf71ea0cd52041d49691d8ae3dc645bd48e1
-https://bugs.python.org/issue42208
----
- Cheetah/Tests/ImportHooks.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Cheetah/Tests/ImportHooks.py b/Cheetah/Tests/ImportHooks.py
-index d7b5f5d..bc0239c 100644
---- a/Cheetah/Tests/ImportHooks.py
-+++ b/Cheetah/Tests/ImportHooks.py
-@@ -87,7 +87,9 @@ def test_import_builtin(self):
-                 return
-         raise self.fail("All builtin modules are imported")
- 
--    if not PY2:
-+    # _bootlocale was removed in Python 3.10:
-+    # https://bugs.python.org/issue42208
-+    if not PY2 and sys.version_info < (3, 10):
-         def test_import_bootlocale(self):
-             if '_bootlocale' in sys.modules:
-                 del sys.modules['_bootlocale']
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 248d78c1e300..1910b42c5dab 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,4 +1,4 @@
 AUX cheroot-8.6.0-remove-pypytools-dep.patch 2757 BLAKE2B 97628fd6590dbe41e34bf0b93bc1062c424097aeea26a86891e2d2fc049fb7ee7a990fc9b9d3dba9406bdd344e3c25cdd08907aaac11e64d78c73b3ccd9b3fa5 SHA512 ddc88d93c795ea25c56d0b2a1bfee1b0f9c900ec2594d69aa91c639575c86c1fb89accc95992587db76d5c4e438a34f2eceac480c60a5470aee5ecd996140e44
 DIST cheroot-8.6.0.tar.gz 134779 BLAKE2B 97d1a9bf0a8d72d3204972934aa3ac4c97246b413edebd9f38caa802a5343acc426f137addfdc0faec58f6af2d62bc22023e93b14e1b0b07f6be9ffb12e78306 SHA512 26e48c935fe32d4ce3cf6ae20b5b272416ca53bd8496527c2958ec2ebe87529c831f283ae900e13271b610e39531b682df0376935ecc3bcfcca11c299cd2a893
-EBUILD cheroot-8.6.0.ebuild 1904 BLAKE2B 85849f7216f607607857ca4a0055b5bc618ba6dd98e1d3fec45f1beff2bde329f27bc41202ee2f3e66e44f51db20cabfad7a17287d7a733e522526c19200129d SHA512 6506facf143da2ad138a0dee835e2f28762a76eb151118da535aede3448f31f29a8328aea54ad2214abe5a974507dd267a0d3852c45f82d9775160fd16a33404
+EBUILD cheroot-8.6.0-r1.ebuild 1832 BLAKE2B e2f2b5ea27b7d133a5e6f42d6a05149cf148316e19ad8a8563ab41c6a2c241b5649154714d6384c28ed1af6cfdc2ae81e32f8e8dad2b7e26a5d2d77708951993 SHA512 336eac3a709650b17df11ed5a4b031109bd145c6eb3866d0c970f8ad959a160b0a5b7b3ecf53fe48e7cc66311a3d4261c362425217eb94cfa6a1c35064ccee48
 MISC metadata.xml 391 BLAKE2B 1c9c2af2c1a8bcd3f1c426a87d1a2a97fb88a9a30f9c2f1802b8885329277fcfde1deadf635e419cd7f85a5685639709be33aa746d9f7a04c3ac7d832d084b42 SHA512 c194e8bed8d082ed4ce3f2a7f608085fdcf2ab8b7c730e5c6ad7438cf177ed1892565cdff0feda564681f59bf6aefc327e3d24da0a543c0f043934af27873e95
diff --git a/dev-python/cheroot/cheroot-8.6.0-r1.ebuild b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
new file mode 100644
index 000000000000..aae772bf949c
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.6.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy"
+HOMEPAGE="
+	https://cherrypy.dev/
+	https://pypi.org/project/cheroot/
+	https://github.com/cherrypy/cheroot/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-context[${PYTHON_USEDEP}]
+		dev-python/jaraco-text[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+		!ia64? (
+			dev-python/pyopenssl[${PYTHON_USEDEP}]
+			dev-python/trustme[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+PATCHES=(
+	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
+	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/--cov/d' \
+		-e '/--testmon/d' \
+		-e '/--numproc/d' \
+		-i pytest.ini || die
+
+	# broken
+	sed -e '/False.*localhost/d' \
+		-i cheroot/test/test_ssl.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=()
+	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
+		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
+	then
+		EPYTEST_IGNORE+=(
+			lib/cheroot/test/test_ssl.py
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/cheroot/cheroot-8.6.0.ebuild b/dev-python/cheroot/cheroot-8.6.0.ebuild
deleted file mode 100644
index af8d3eaf4567..000000000000
--- a/dev-python/cheroot/cheroot-8.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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="High-performance, pure-Python HTTP server used by CherryPy"
-HOMEPAGE="https://cherrypy.org/
-	https://pypi.org/project/cheroot/
-	https://github.com/cherrypy/cheroot/"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		!ia64? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	# Bad dep (upstream gone, only PyPi package, has py2 code, etc)
-	"${FILESDIR}/${PN}-8.6.0-remove-pypytools-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			lib/cheroot/test/test_ssl.py
-		)
-	fi
-
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 21137ca15d7d..51e15c29ff20 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,4 +1,5 @@
 AUX cherrypy-18.6.1-close-files.patch 15776 BLAKE2B 8205e3db173706e749d9adc83d4784f7af928c5cf22f3e044d7675861048d95093d97db2db42dd9f84681a33f0b95b782f1c273f7a06eb2000c832306a7375b1 SHA512 8d4b2ee002bff97a0b80d2b03089873ceb97a861a1133e97ce210de4a18ebbe73ebc82e7f261102caa13ad57cd25398b2f213d4ac29925ed86ad64a8ca09acc6
+AUX cherrypy-18.6.1-py311.patch 1078 BLAKE2B 7518be839f56493dc3960472bdf0fad663490382ebce956c3cf8f2917c93e6b6672bdd654afe162f447f4ce907b1d122d5fdd90b30a9c130564fae7419246cc6 SHA512 31d00c5bc29491f57d4e663211bcc6c2292ca1eaff41c7be6ee5b6af0802875cb82fcc110c16c852989acec40c4c5bbc6ae0bddecc5afbfde2e8c571a767846e
 DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
-EBUILD cherrypy-18.6.1.ebuild 1519 BLAKE2B 2bf70272fdca85f50497b07d796b03b3f9c3589ddf646f4426c6438efc1b0a06b188bf9cff5170df004ba49e5ebf883ae211a372caeb6e00e89f1d325949c062 SHA512 050e6e2c769a83d105dd4a79952f75f44bf3ccbb9a90c4b8bbab4b7dcf6f6f80d73027000b6c2a8ac7a51c89a012c4c587588e32474ffda603e912c54afa90f9
+EBUILD cherrypy-18.6.1-r1.ebuild 1950 BLAKE2B 1d40c7f6d31c9641ae503df5705e5465941befa8f6ce24adf0e976778dd023d73218902ab35d0c271e7cd9ee52cd5bfa57dbefaaa0b982623f6e2d74ec460ba3 SHA512 d6b60880219efb9eec875a01f4c8549c225edfb1c789a1fb2927b1d3d285a216f67400dfd4dd929ee9b9de52277dd1c5e08ef6eccbeb72f6207388812042bcb5
 MISC metadata.xml 347 BLAKE2B 7694118d09caebdeac890ee40fd8a79906637bb695f9ec44dc25e67378c8c7f06901e5c52e6f79dd498921ffa01b18b9762b102baeea34792a2ff730a1303c40 SHA512 29cbadf45008c3c422c47ca232634bd15efbd4bcdc6065d18cf1adcbc0c3bbb155a2b122eb4ce7180839fcdaf4acb5515486f191ebbfa63eaec8a14abbb1e3eb
diff --git a/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild
new file mode 100644
index 000000000000..e8c592b55252
--- /dev/null
+++ b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="CherryPy"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
+HOMEPAGE="
+	https://cherrypy.dev/
+	https://github.com/cherrypy/cherrypy/
+	https://pypi.org/project/CherryPy/
+"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
+IUSE="ssl test"
+
+RDEPEND="
+	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	ssl? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/routes[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+		dev-python/pytest-services[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/cherrypy/cherrypy/pull/1946
+		"${FILESDIR}"/${P}-close-files.patch
+		"${FILESDIR}"/${P}-py311.patch
+	)
+
+	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
+		-i setup.py || die
+
+	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
+		-e 's:--cov[[:graph:]]+::g' \
+		-e 's:--doctest[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# broken by changes in traceback output
+		cherrypy/test/test_request_obj.py::RequestObjectTests::testErrorHandling
+		cherrypy/test/test_tools.py::ToolTests::testHookErrors
+	)
+
+	epytest
+}
diff --git a/dev-python/cherrypy/cherrypy-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild
deleted file mode 100644
index d1177e6159ad..000000000000
--- a/dev-python/cherrypy/cherrypy-18.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
-
-MY_P="CherryPy-${PV}"
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="https://cherrypy.dev https://pypi.org/project/CherryPy/"
-SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
-IUSE="ssl test"
-
-RDEPEND="
-	>=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
-	>=dev-python/portend-2.1.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/routes[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/objgraph[${PYTHON_USEDEP}]
-		dev-python/path-py[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/pytest-services[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/cherrypy/cherrypy/pull/1946
-		"${FILESDIR}"/${P}-close-files.patch
-	)
-
-	sed -r -e '/(pytest-sugar|pytest-cov)/ d' \
-		-i setup.py || die
-
-	sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \
-		-e 's:--cov[[:graph:]]+::g' \
-		-e 's:--doctest[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch
new file mode 100644
index 000000000000..5d629dd8c333
--- /dev/null
+++ b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch
@@ -0,0 +1,32 @@
+From 8245a74aa4e090c40445535a9ce3997ed9904798 Mon Sep 17 00:00:00 2001
+From: Dominic Davis-Foster <dominic@davis-foster.co.uk>
+Date: Fri, 28 Jan 2022 23:11:52 +0000
+Subject: [PATCH] Switch from inspect.getargspec to inspect.getfullargspec
+
+inspect.getargspec has been deprecated since 3.0
+---
+ cherrypy/_cpdispatch.py | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/cherrypy/_cpdispatch.py b/cherrypy/_cpdispatch.py
+index 83eb79cb..5c506e99 100644
+--- a/cherrypy/_cpdispatch.py
++++ b/cherrypy/_cpdispatch.py
+@@ -206,12 +206,8 @@ except ImportError:
+     def test_callable_spec(callable, args, kwargs):  # noqa: F811
+         return None
+ else:
+-    getargspec = inspect.getargspec
+-    # Python 3 requires using getfullargspec if
+-    # keyword-only arguments are present
+-    if hasattr(inspect, 'getfullargspec'):
+-        def getargspec(callable):
+-            return inspect.getfullargspec(callable)[:4]
++    def getargspec(callable):
++        return inspect.getfullargspec(callable)[:4]
+ 
+ 
+ class LateParamPageHandler(PageHandler):
+-- 
+2.35.1
+
diff --git a/dev-python/chump/Manifest b/dev-python/chump/Manifest
index 902b9fd3661a..a633454e73b0 100644
--- a/dev-python/chump/Manifest
+++ b/dev-python/chump/Manifest
@@ -1,3 +1,3 @@
 DIST chump-1.6.0.tar.gz 15646 BLAKE2B 8cab76e633fd4084d349115fae925c152439d06acbe629d5c23c474f2dc0a3cb1b5b727b856a9d54a82e39698b3cfd7470086a976cfc6b4870f1af02bac71f87 SHA512 d219f1b9e28dd17f834dc807cd42a288adc4f5579bf97cf6b1833e63f339bd811953c3a74cafad9021beb05cd5fddb46cf49b62a4803c62ece62d037fe38a4ee
-EBUILD chump-1.6.0-r1.ebuild 514 BLAKE2B 61c3ccdfaaf0553289332c448e6c49fb27dfbe14966fe149d48a57c4f475b555716086b328970542c480f294353bb38a967d035a9e37dd60bdb3f0bbf88bee37 SHA512 49fad45d4146955096692db472d6913f743f41eb20268fd9842efa010838a3e237fce6460db64da851df7f087b86dc6feddfced15dcfaa3a262a892583f3f80a
+EBUILD chump-1.6.0-r2.ebuild 546 BLAKE2B 480e892e338092e3db64ba6a1e11fb03926c8171ce65b7fd3894509e3b8bc8305a37c1353d4a442a629ee3126d989abc5975db78b12bb4b936e6f3436e27cb45 SHA512 96b71933316aebf74344370d268d0d1f3a27516bbe8678bdbacba89bc10be8f4b208d0b143db66da5e082e9532aaa845db9155b3f983024c3cb0ae4777430c15
 MISC metadata.xml 519 BLAKE2B b2f62dec1353adb13bb15e1d292618290b14a2646fb8e4064530c2cae8373c10d2f0ea1d1a7bfed73eb200c161e596820f7e46fc09108563e7915a24bc5c5eb6 SHA512 11391903486d3953e979bce22542ba4e412dace7932f3319c228371d68754b6f78bb4843455ad71fab7136fee1f2b90f98b67685b7fc1681988f85182c83efff
diff --git a/dev-python/chump/chump-1.6.0-r1.ebuild b/dev-python/chump/chump-1.6.0-r1.ebuild
deleted file mode 100644
index 81de5ce4916a..000000000000
--- a/dev-python/chump/chump-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="API wrapper for Pushover"
-HOMEPAGE="https://github.com/karanlyons/chump"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# 'html_theme' is unset, meaning alabaster will be used
-# and sphinx depends on it
-distutils_enable_sphinx docs
-
-# The package has no test suite
diff --git a/dev-python/chump/chump-1.6.0-r2.ebuild b/dev-python/chump/chump-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..bbb1525cc7e3
--- /dev/null
+++ b/dev-python/chump/chump-1.6.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="API wrapper for Pushover"
+HOMEPAGE="https://github.com/karanlyons/chump"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# 'html_theme' is unset, meaning alabaster will be used
+# and sphinx depends on it
+distutils_enable_sphinx docs
+
+# The package has no test suite
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 5d797c48d176..3389fb31d5b7 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
-EBUILD cjkwrap-2.2-r1.ebuild 447 BLAKE2B e3d2939a7dc60a57fd4a08aaf8978d08aadd41f10f918da34b333b93f44552cbfb8b6597f7f9414c60ad5b93ceeff291141b170745958502a1e600065bd0d427 SHA512 ff085e30a422a4fb7af547f76f2c3b2f6da94beca4236b93a0ea5edef735ce80ca547c2beca205a2375a6482d027da3330cfc98b2007b567da08a7f2cd6108e5
-MISC metadata.xml 354 BLAKE2B ec546b322ec3aac2269a60c4d62c303a411535572746c207d6867958b9895459a21e9fb500e2dd950f6e8287b35018bb2ccf18319fba4a0a9ca3dfa8e2eb996b SHA512 49eb2ef162c718fd5255033ae6cebe496afb25ce0bd9917a83f7dcf96983930dd36f887de8e3e5b53c26949ecfe852f4452760fcbcde4d7e306f5df5c245e7dd
+EBUILD cjkwrap-2.2-r2.ebuild 478 BLAKE2B 24f52b57db2c84e0d436cca30a5eb3ecb78bea43d5b7f5804f18b9debacdf852fc237dcc0c027c5772a3bfa2a550c12457f048abcf4cb8fc24e413bec05616d8 SHA512 cdfd62fdcc5e4c90bfc7f45c2bcd9b5c423ca06ddcbb514f75ba7fb871bdb0fa601319b6e8d8bcc5ca49e7ac3fe6d5c4ba3c03ec43645e575fda314d1dcc63fe
+MISC metadata.xml 413 BLAKE2B 6ba9b74fece1e3cc8080bb2c7839338623e42f7eb642c2c8af87adc54b6f183e6bc7d5fad8e489759e06b1c6c65891d9202e04f60bd15cc1842c10273d5be978 SHA512 87750744c4564723a681ea6a66c9b2e1b54df404efd4d062ecb168c0475f59e42fd2d964fb8dc8f7961219de397e2acea74284838d1544b668b684ba697ad0f7
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
deleted file mode 100644
index 8673743ef0dc..000000000000
--- a/dev-python/cjkwrap/cjkwrap-2.2-r1.ebuild
+++ /dev/null
@@ -1,15 +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 library for wrapping and filling UTF-8 CJK text"
-HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
-SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
diff --git a/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
new file mode 100644
index 000000000000..31706393b115
--- /dev/null
+++ b/dev-python/cjkwrap/cjkwrap-2.2-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A library for wrapping and filling UTF-8 CJK text"
+HOMEPAGE="https://f.gallai.re/cjkwrap https://gitlab.com/fgallaire/cjkwrap"
+SRC_URI="https://github.com/fgallaire/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index a4bbbcf4f638..e1464e91fbc8 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">CJKwrap</remote-id>
+    <remote-id type="gitlab">fgallaire/cjkwrap</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b013d7806fb6..91d277e5f739 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,10 +1,18 @@
+DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
+DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.1.ebuild 927 BLAKE2B 2c35566372b28bb772b497e0b11728e6fa1dab90f31ea9a9d3b954c54d028cef8240c336570a9b3c5249d4c995160f1e618fce4c217557d4bdbd13aae3789f8b SHA512 09bce3ba304c6b7759823625b1e54f49d509bb2fbe523925cf3d2dfedd7f54dd87dd5ce1c4d6c7ce5b334c5be16c6723aff258c1d5813a817bd9fd4c6fe5f25a
 EBUILD clang-python-14.0.3.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
+EBUILD clang-python-14.0.4.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
+EBUILD clang-python-14.0.5.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
+EBUILD clang-python-14.0.6.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B 259d469221df0c360735c5c033f89523161f2bf19db811f390973b52229a50b82cb06f96c05230a9862986a77d42466d1b3bc95b5bd30578c96715b28831212a SHA512 a26fbbadeff6657cca7ef915d263bc9a1a4543116bb1f14282b889c5463a662d280ce8d7e7f674753c43b186fb0531062ea86462221adfb4a8b76a50c214aa1d
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-14.0.4.ebuild b/dev-python/clang-python/clang-python-14.0.4.ebuild
new file mode 100644
index 000000000000..414fb007ea1d
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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="amd64 ~arm arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-14.0.5.ebuild b/dev-python/clang-python/clang-python-14.0.5.ebuild
new file mode 100644
index 000000000000..0b7cef715981
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-14.0.6.ebuild b/dev-python/clang-python/clang-python-14.0.6.ebuild
new file mode 100644
index 000000000000..0b7cef715981
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+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/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index b51579ced131..e1abfe115947 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,4 @@
 DIST cli_helpers-2.2.1.tar.gz 34199 BLAKE2B 5fb5217321d92cd6c774337bdf444ad2a6120accfe32da08642a880a60f1bdb4c71f12657bd17c30f7b3f212216fad027ac9c786367563e01d58c54c15bf67b5 SHA512 4b4a8c3ab61ceeaa1986e5d9943b10351ff1b3339294a78ed740bff3bd555cace723e637d6627e26b832370583989aa2b0782f57949af2c1d504f93caceda2d8
-EBUILD cli_helpers-2.2.1.ebuild 638 BLAKE2B 5277de68a8c92247891724aa0e80b0ddb5d833859e4530d7748a6cf480790a6545d4d974cb33bf7460cf47257a2e088f5e67b24b19cf92d27fd637eaf971ed2e SHA512 3b3d78fa77ab56b8eae4336f08b3361b5d044568b6f74e3dca63b6d69b217218b1401462152fa2396b4874f593df17e310678c3ed2e61312d97fae25bfef4a03
-EBUILD cli_helpers-9999.ebuild 588 BLAKE2B abf6f583c85379da640a8b9a2075d2f59f1bd0134f2656d2e3be7b3ae9a63efc36df1b94f4e60af2d00fbe4822430c9519660049496ae1907e43d7ad96711f16 SHA512 1b8ffba1750845b4f236d50443d1dd9357a8edd8898c81c4563317761809faa111fbfc81922c53757906c6d43844f4da205bf116821842554020df807dec3a5d
+EBUILD cli_helpers-2.2.1.ebuild 638 BLAKE2B a1dc7356d75f48e3352b4774767277468af9511cc4827a461cff4b692617b1a0064fb2555e8fa53bdc29ffede1167e93d1892c73162d33ff9e4f048282a452a0 SHA512 b333293e30b6b16072b684d2b7c3ce00e40db1e2600cf57851c248ae1bd08108af74f2ecb69b352ea95a7a08d39abb6a2f8b503a11c6633132b5404e44d0b4f7
+EBUILD cli_helpers-9999.ebuild 588 BLAKE2B d34d8c66dbb944de18ca27c7f5e4639dd1a2f3c1aba776a29e5e3f21cd5071c217c79117c1058bf01e2d074a66a070054fb58546998a04dbda73f43e0c185aab SHA512 5e86f84e8a3ec667f7d32ca4fd461f1ef8f0accd9ddb211eab81978ced47c7135cf4923a2f40e353e60635816dd30c58f94f6107a7175e68e33bcc276006ab19
 MISC metadata.xml 457 BLAKE2B d80fc53c1c6b9f0124668ab396f114340809d469ccc61ffcc51de16d91b0d35a396ae192d413f44865759de57e342383d76ea2642a19bee794f189f4878b2807 SHA512 0493ddb20222eb69cfede50810063b9f9a2b44d0f46d31013268a6dc2bf611eedfe89806e771ed511ddda25a8d0f489bf8086f12c1ea4986e6b32193f3df7f94
diff --git a/dev-python/cli_helpers/cli_helpers-2.2.1.ebuild b/dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
index a5802f74b68d..c39af3248f56 100644
--- a/dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Python helpers for common CLI tasks"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index 58df205d42ff..bd04a525c0a0 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 EGIT_REPO_URI="https://github.com/dbcli/${PN}.git"
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 7a4a08a02383..e473adcca5c3 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,6 @@
+AUX click-default-group-1.2.2-tests-click-8.patch 712 BLAKE2B a317ee2d5e8846d29ecf170166c63128ce729d88abef8e96403f42002e016430dd889d5abaab2c457dcdfcbcc1eaf367f3768bde3319876ba37f6874130ab042 SHA512 16488c3ee5c8d4c009ca4683ddc4728e74ab81a238e6e4b4e75fe7a6619c23b19d2d8b405f9b5eea179e72f892670d02ffd8a6d5f1be1103975461a6903d7941
+DIST click-default-group-1.2.2.gh.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
+EBUILD click-default-group-1.2.2-r1.ebuild 712 BLAKE2B 3db6f23e5646d9aac5d94ea911e71f66889042ca0120ba1f1484cbb7c179a7ab0ce41905411ce3a6d5b53512f78758ddb7d33cf4982ba3f2ccb059087fc1676e SHA512 65574e1f3469fc253228d6f97d0926f014b27ac8ee640e104f5666089df09e2688bd139527a721cd838ed75a9120b399a2f9e486c1cdb0b5df09063754e79469
 EBUILD click-default-group-1.2.2.ebuild 609 BLAKE2B 0f1b9e248c44092906273dec4bc1a8169e9e65870d681915d61f3f9e714453f061d8c0dae58c7a8b4528ec6fcbedaba76b93c8d3bd71bdb790f95f71a58d50b6 SHA512 60c39412a3c9f975d8a4b22462f21378a648f62e42aedc9490ce355773013ed5bc9e0c15cc6e609a1729c29930d2e39296c14bcb791b73e8d869babdebb3a61d
 MISC metadata.xml 396 BLAKE2B a73e324ee4d19308cc34d6cf1656066b91a637e1babd9c2e5c3d799c05ff2ff5997591ec1ac745049bd31d957246028682c61fd706350fbd4708274f7b9f7a13 SHA512 498a32984da99f7338c9ba9a164fb2e410e3c2fb3da18e6c3f105f110fb393603dd459009c4204ba6409cb9f8b66cbb4d2c1493a535e54d1ad6c335adcdb2666
diff --git a/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild b/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..4e3a62d54460
--- /dev/null
+++ b/dev-python/click-default-group/click-default-group-1.2.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Extends click. Group to invoke a command without explicit subcommand name"
+HOMEPAGE="https://github.com/click-contrib/click-default-group"
+SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.2-tests-click-8.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch b/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch
new file mode 100644
index 000000000000..e2612704116d
--- /dev/null
+++ b/dev-python/click-default-group/files/click-default-group-1.2.2-tests-click-8.patch
@@ -0,0 +1,21 @@
+https://github.com/click-contrib/click-default-group/pull/18
+https://github.com/click-contrib/click-default-group/issues/16
+
+From 9415c77d05cf7d16876e7d70a49a41a6189983b4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
+Date: Sun, 20 Jun 2021 16:11:42 +0200
+Subject: [PATCH] make tests compatible with click 8
+
+It now outputs "No such option".
+--- a/test.py
++++ b/test.py
+@@ -30,7 +30,7 @@ def bar():
+ 
+ def test_default_command_with_arguments():
+     assert r.invoke(cli, ['--foo', 'foooo']).output == 'foooo\n'
+-    assert 'no such option' in r.invoke(cli, ['-x']).output
++    assert 'no such option' in r.invoke(cli, ['-x']).output.lower()
+ 
+ 
+ def test_group_arguments():
+
diff --git a/dev-python/click-help-colors/Manifest b/dev-python/click-help-colors/Manifest
index c8cdd454d360..817af70b5f83 100644
--- a/dev-python/click-help-colors/Manifest
+++ b/dev-python/click-help-colors/Manifest
@@ -1,3 +1,3 @@
 DIST click-help-colors-0.9.1.tar.gz 101042 BLAKE2B 0f40d6d15f8e0a4647212f57e071c49b66bcd2b3d7ef582bd7d8a14135e50028f3ceb07987b5b74a868d998c12886a711f40e1d85b541566c63dca39e43a907d SHA512 ac4ce56ab249f7b98f670a6624700109f20a7c666e006b891d5c9fd4977512a0c94d82f6b43915952179abc946899f85fa1d358cd3d59508ef341ba22d8fc745
-EBUILD click-help-colors-0.9.1.ebuild 602 BLAKE2B 20b54e68755c6201107ecce9f1b1515cd845ea534bc665b9099dfb7a5901f8102bafcbac37d46278c19d519cf54e3ef4825e92023cdccf9a6469d1311be3cdf0 SHA512 88dfb13846fa12889862e55f927d9fba42b2bb9a9e0a85c59bb416cdd737457922d7233b07e008a3dfa4ad19d16675f09783aa63f5b6fe8fac37c3f225738329
-MISC metadata.xml 421 BLAKE2B 34c01d517c076bf8009bdcab40a790e910dda2c31dd63ea3b8613b377e626f9d0fe9f1326bdc34f5c2412082ec3109b4cc96e4f8a78e2cf81b59952a8c578b71 SHA512 1ab3f8df4771d02581f42fb3da1f97dcbb2b608b5755230ec1b4cf423173bafaf50922e7d5779becd738e9e07ca28f60c2da267be8ae275c919e706b51e77c59
+EBUILD click-help-colors-0.9.1.ebuild 609 BLAKE2B 01bfe8babc18b7b0c7f18192baf3c89a4471c24dd63148b66630d97992f42961fa9ebf0f0727c654583046df6ab99ac75c98b83b7ae6f9cdb0def3ae749b6e28 SHA512 b59329ec93f14f02debb8fc76e3145177c236e3fa886d6511b024e8a48c96c783a2b26aed989be1508cd252ab58e2a0b48ae9988f123d2e149a1c9af4953b125
+MISC metadata.xml 522 BLAKE2B c281d2270d2e8389fcf83ece941af24a414107601d4c840731fbe952d73d71c32fd26276af21fa5ba4b2bdec0f35ef77a94a12a3239c1f053f50c9aff3e90d7e SHA512 45b82c348eea430dda7453b265e152f1d60d7a3aa17365b8d86ad57d17943ad7d44d5029504636e56c0b437a32e12f6e9c446d5fc6bb70fa72c72108b538f143
diff --git a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild b/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
index 251b5c3328a4..6c5ccf4edf31 100644
--- a/dev-python/click-help-colors/click-help-colors-0.9.1.ebuild
+++ b/dev-python/click-help-colors/click-help-colors-0.9.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="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
diff --git a/dev-python/click-help-colors/metadata.xml b/dev-python/click-help-colors/metadata.xml
index ba129f79ee7f..fe0a11d5b717 100644
--- a/dev-python/click-help-colors/metadata.xml
+++ b/dev-python/click-help-colors/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">click-contrib/click-help-colors</remote-id>
diff --git a/dev-python/click-log/Manifest b/dev-python/click-log/Manifest
index 856012448b0f..9ca8280cee2f 100644
--- a/dev-python/click-log/Manifest
+++ b/dev-python/click-log/Manifest
@@ -1,5 +1,3 @@
-DIST click-log-0.3.2.tar.gz 9523 BLAKE2B 212ac421b402fc0f32a9aec11a9e20c87a8148c461af87af78f8068ca95d60cab0c47bf24162aefd1c299ba783fb7a70e7e9dde01f0fc1f7c44a69fa8cb07121 SHA512 8ae5c43d739127367bbcdcf32bfd4b34b2ea1c377948df3b8588e4bfe2b0f5e7a61d1ccc6cb32c77045b15251222866daffa5a7bfb7a907487548784ba345351
 DIST click-log-0.4.0.tar.gz 9985 BLAKE2B 8a7ce0c2a7617253f08d011958bce158e987faa0008065c9dac382d46b905cc88cd5cb19d0d0859bf522da6448f7c9a20c0a8efe53b3feb5efc9ca3f64cfbc27 SHA512 95d3cb2fa9821e4f58b25072f39d34f21fe4a7600923f59f4b57b92dbcd9fa2584d710de1d4a1aa2a757c048398342aabbb1b5ab32cf4128ccecee10f9f15a5a
-EBUILD click-log-0.3.2.ebuild 539 BLAKE2B b16dbc750507bb0329ae146a81c104bb2e3f0a550a88d6850f4e2dbffde2c3bf2c7965a10822a57bf86b07e85d253d99a663943e8273345badb78b541158c0b8 SHA512 4f69ffedd2040330179185fd5e2dca4c3b837ae141f15b378dda770744e3c275d2184e7bd55ea25971561c7ebd4a0f0fba9732da9c1eec022843c2ae3fefb1b6
-EBUILD click-log-0.4.0.ebuild 578 BLAKE2B 00c0863fffdf6b569cbbdf3f0844dec88c277b4e979e6eb7e0a5286ec442c598829b8f7a540320d0b93db8b48a5a4a1281b15d7789f1e743d8656042af25b57c SHA512 57213a0938a353d211463de66b841237dea7ba7149dccf8b774b4c8e0ce4fd629b9e18e38ecd3a2a8925c252e72dbd04ea40ee47891aee2a256f05e7125fc9e0
-MISC metadata.xml 353 BLAKE2B ef355676f10011a5e227706dcf98782043db22d0aceb302ad050debe312e77b4a160ad0e4ffb43115d89e543e4d135f7939c10db384fdc7c623b5575d6c3da8c SHA512 2fc29e85273c3a01947ddbb54da4e49dfe403416ba7911b6b2cde06d642c895089de257ec132e7acda5a17e4d6bccea812c6d54792032852048a4574006479f4
+EBUILD click-log-0.4.0.ebuild 560 BLAKE2B 4737f0a1c9ddba2c0c5cd82e2a51dab54d42361b3662c72329cbcc7a38a9f0b94fc31a58b62d1cdf2cd9b023a438e4ea1f0994ac59d68cb49624b31e2329621f SHA512 de7c867ebe6bea45a6c6aa48993008889ee45606a922a90c25f2f8970f7d25d91e1874fbd43087a665ebdfec65cbbc12ab69a950203ab06f8a5da9804ef422ff
+MISC metadata.xml 454 BLAKE2B 65f660ce0ec54eeefdda3a03fb806c1d80213db10e3641b91a15bf0628d0099f05311113ab5531ea9a931014c21437b9fd42a3a8d811782e503617c8dda2fc63 SHA512 f5cd97058ff64333f1504497d38effe6d530e47632633ec341847944eafae050caff68ca6aca9e3bcd5517ed420da6e5ea06829b42f3f9300b52862514e23afa
diff --git a/dev-python/click-log/click-log-0.3.2.ebuild b/dev-python/click-log/click-log-0.3.2.ebuild
deleted file mode 100644
index 36b03d2523cc..000000000000
--- a/dev-python/click-log/click-log-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Logging integration for Click"
-HOMEPAGE="https://github.com/click-contrib/click-log https://pypi.org/project/click-log/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-log/click-log-0.4.0.ebuild b/dev-python/click-log/click-log-0.4.0.ebuild
index ecadf9a3a9f2..0d744fa4db1d 100644
--- a/dev-python/click-log/click-log-0.4.0.ebuild
+++ b/dev-python/click-log/click-log-0.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -19,8 +19,9 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/click-log/metadata.xml b/dev-python/click-log/metadata.xml
index 332c2be95167..69d087c69615 100644
--- a/dev-python/click-log/metadata.xml
+++ b/dev-python/click-log/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">click-contrib/click-log</remote-id>
 		<remote-id type="pypi">click-log</remote-id>
diff --git a/dev-python/click-threading/Manifest b/dev-python/click-threading/Manifest
index 4defba69dbbd..ab9a22d7ef83 100644
--- a/dev-python/click-threading/Manifest
+++ b/dev-python/click-threading/Manifest
@@ -1,3 +1,3 @@
 DIST click-threading-0.5.0.gh.tar.gz 9836 BLAKE2B 245c63476e58cd370ec49275a4a8ff8007d71386328c2631970a0bf9ac0b81c14150966a3cab54a7616dfc1fdd5e5b3f601fe1e08d1c9c65ec168b96b6b773d5 SHA512 134daf779a56a18cc36a94cd6818801896f171ad91f0b34995d92de5ccd62ea61b7a4fcb0afe2634e5fe80869a616263952e687c5d8d490f17d1d27d00ab3fe2
-EBUILD click-threading-0.5.0.ebuild 586 BLAKE2B 63b355977e635633b21d40c7ef366ee355caf92375abc6b55a208d367a9abfdb3891fee5585f30708d498d292f97685fbaac86a5b703cde7c3f4c0edf26d89ff SHA512 029447d478ef67d469074056d0924de7b74eb656db95bc3d2883bd1b70ecd814943a728bb638b13456c46328384a4402ded2bcbd0c687bc99c1ce78416e3b71d
-MISC metadata.xml 365 BLAKE2B fe300fb1f3cff5b85b4c3f49a6e227783ba0fe86c43ab0da15f2507606468b47aa603d62ed853ff2b2b9e92f262fd60fb4f1e39dbd9c4247f90ca3b74d763af0 SHA512 94a08fc688cda31d99e15cfaa3efb2d662875e69fbf018d66f00652c3b305224eaeac2c29a98d5488ff669eb2227560ffc531912b16fbba1f2784c6cc6c72db7
+EBUILD click-threading-0.5.0-r1.ebuild 624 BLAKE2B c448c03d5b7faa207c3ae8006f58aa664d25c36767b37bb80a9c5eb47dd6d222dd599a40ce6638a1820d224acaf3f98fafbf71f894efc4813ab25d1ff035613b SHA512 dbb8d590cfe6ceb79cd888f0df469e39ba5a8e3400d1f2e1212ae30341d89a2a6cfe162b63ad6bc6503ce5e59c20aba16481ef1d43527d7d6f9c15648a604d8c
+MISC metadata.xml 466 BLAKE2B 79ac7c235225c5ff71240a9d9d01ac9f478f7d6ef2a3671a4cc38eaa9a2cb59609b2432c3a470da45f14449302a09c88c2e1aeef7e0127df63f0af734ff1f35a SHA512 f68f7e49a579969c6f6e5dc5c37651ed3a1cf1a564a0e8a243f2874c05bd71a817e6bc02398852a6127022b8f36e4c09fae8b60d35c574e73915a040e1c63ac6
diff --git a/dev-python/click-threading/click-threading-0.5.0-r1.ebuild b/dev-python/click-threading/click-threading-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..0f0387f16e18
--- /dev/null
+++ b/dev-python/click-threading/click-threading-0.5.0-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Multithreaded Click apps made easy"
+HOMEPAGE="
+	https://github.com/click-contrib/click-threading/
+	https://pypi.org/project/click-threading/
+"
+SRC_URI="
+	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/click-threading/click-threading-0.5.0.ebuild b/dev-python/click-threading/click-threading-0.5.0.ebuild
deleted file mode 100644
index 937a499aa62a..000000000000
--- a/dev-python/click-threading/click-threading-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Multithreaded Click apps made easy"
-HOMEPAGE="
-	https://github.com/click-contrib/click-threading/
-	https://pypi.org/project/click-threading/"
-SRC_URI="
-	https://github.com/click-contrib/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND=">=dev-python/click-5.0[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/click-threading/metadata.xml b/dev-python/click-threading/metadata.xml
index bea54396e49f..5f14ee980050 100644
--- a/dev-python/click-threading/metadata.xml
+++ b/dev-python/click-threading/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">click-contrib/click-threading</remote-id>
 		<remote-id type="pypi">click-threading</remote-id>
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 8b32b65e1c6f..d950faac0138 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,5 +1,3 @@
-DIST click-8.1.2.gh.tar.gz 333755 BLAKE2B cf579db101e296a0626445e0823d8c72bc6cd40f0ec667c3179465050d0aa7d7a94ed1416d583f7c9afde8e5ea41738c26b000f87c95074a9d93837c039d687a SHA512 8781965212a0732990e47050db8ae5e37633986b23cd7895d74f06007c61993f8ea45183376761987931caf00dd68c22900bc8d3930d4416853374cfd170a0e5
 DIST click-8.1.3.gh.tar.gz 333961 BLAKE2B ed80d9be1e5740f1e4af62e97cd78488dc99d59da4a6dc9c99fb62b08c32ca2b889e3678a2841052922d102d8ac83df19e3e2d0ff41c46387e695d3718c7702d SHA512 29194ee3877e013a2fe1037870522c5b5a78136ca60da9109f29312a3e52c767867f5eec2d90ca385cd0508f77555b9d6ad8f5141dc31900ddc9307a2207a818
-EBUILD click-8.1.2.ebuild 908 BLAKE2B 20fb29574cfd1bfa227d8f5514a83cfd509a7652fd538cc85fe640661c147b49c31aa1b730e51f03af8222ca11ceefa2fcfd776a5a5f144011cb6a4e99c0d517 SHA512 e3e875ad82e64039a6ec9e75cb8b16f70a752d2d08fc9e663d4fdee7d47a06508f7fe0aed14733507f3235defe268d710e5a9fbc4b2719980199db6efc985dfe
-EBUILD click-8.1.3.ebuild 964 BLAKE2B 597d70636074b2155db6b0eda1deffcc977212bc986d4c979e68add51de04251fc5c3fb996600aadc3056c33a4210f34cb48146343cfc0eb42c49821880a4d89 SHA512 c81d26cb1665ab3687b68ab75efc7279de0f030065a23b6dd7ed877967929473e7dc0293d74a86c12d8bc0942f50569ae615695cd5e25391045a094571535271
+EBUILD click-8.1.3.ebuild 956 BLAKE2B 920a24dce39bdf18f5b7177343643776b744f537c90868715a51b06386485352e564b1be42903c108e1178c83bec2c5f80010f4fc6c7207efd231809db7ec008 SHA512 9d70a1275bb86196ad1d5676290a2b15996f8574a608a4fb7fd469d13091423101e7f2f061eb71c4115d374df19483a4acde6a8a60d6ae13c1e52f9b969a4942
 MISC metadata.xml 386 BLAKE2B e460c7d70bbd848cd239d9e1ba5dc234c7de2a2bc0c77bfefb6aed1fa6d954de18508d4db44e77495f90a141180fa2602b15d3699aaaa99a48520a7e37a098f4 SHA512 ef8dd0545e92bb8fdc107fd6170068d35f44abad698226ea4724c450aebc0f32c76eb90b9fc936f9c85b8a93637f6006e889796e2bb3b7da5f57c1419f6b3794
diff --git a/dev-python/click/click-8.1.2.ebuild b/dev-python/click/click-8.1.2.ebuild
deleted file mode 100644
index 8ce250854131..000000000000
--- a/dev-python/click/click-8.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-HOMEPAGE="
-	https://palletsprojects.com/p/click/
-	https://pypi.org/project/click/
-"
-SRC_URI="
-	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log_cabinet \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.1.3.ebuild b/dev-python/click/click-8.1.3.ebuild
index 73278467c1ba..c55edc5372a2 100644
--- a/dev-python/click/click-8.1.3.ebuild
+++ b/dev-python/click/click-8.1.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 1fe29ee2ccb5..ce418fa61f78 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.10.1.tar.gz 82764 BLAKE2B 88e8481d23f6ad35acac9fd17b1e4930f31ebc13211ad5bf1db441dbe4ad99faec023b6a46640d0fa3dbac4d76f4fd9d9fd3cd1e6c319cab390d502c9adff53c SHA512 2a1eb1f5311eb92ac481b35e0f703bb37171c9c7eee68a3d8322786a802d562d990ea8e3e52e924215b2ff8c3f14614f99ea403d94bfa2ea3794ab3556baa0c9
-EBUILD cliff-3.10.1.ebuild 1030 BLAKE2B e6ef060072f8b3023b98bb0784df647dfaedec1bcdced3412f2a5ec05ed60f3d2a6292e0e9a91384eb6c73b17a02d5421abb39e4f922fa9faf2dc42ba1c66db4 SHA512 958f7544cde454bffed6e6362a87b534a406c27a1489e41279230c6c2749f2c8040397af07549ae417e18c0f08f65113f5b7cd1e0b52db74ead041026a133f93
+EBUILD cliff-3.10.1.ebuild 1112 BLAKE2B 33776b3ea7488e5ea45d47eace9b5e58cb0d3e0431e7f4fc7f1f4d38f8b4acdb431110faad821dc9c3ce007e8310600311a9d34cdb5c984b61f69b71ff9b0ed1 SHA512 3759a0e561ca2ca0dc1e777d7338a0f9160c17ea127f65bdb01fbc2d9c80d8c4fa8994a4884ec6b8b215806954e4bd5f2480d4ac750f76405e470669b5ecd413
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.10.1.ebuild b/dev-python/cliff/cliff-3.10.1.ebuild
index 984a8675bd1d..8c1db180105b 100644
--- a/dev-python/cliff/cliff-3.10.1.ebuild
+++ b/dev-python/cliff/cliff-3.10.1.ebuild
@@ -4,17 +4,21 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
+HOMEPAGE="
+	https://opendev.org/openstack/cliff/
+	https://github.com/openstack/cliff/
+	https://pypi.org/project/cliff/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 4d851f0dd4a8..0e45adcdd88c 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
 EBUILD clikit-0.6.2.ebuild 851 BLAKE2B f088a0f346008b53ba0555496e5aab81158417bbfe82aa6e2d5af41a5fd4bb90fa597adf23cc834e2a35b597e6d9c2435b575009e7b936bfc6967bd6767f0166 SHA512 74b902ea215c672b3bc07163b4368880faab40ba7a4965154511fd007c68d9f2267918298baeba24dae5511a51b8ffae3c8f3ed180f178e6dbe6a36f0d5f9466
-MISC metadata.xml 412 BLAKE2B 79ae358d09fe2f24fa3a16de6caf873fe4d423e731605b0d5b7cb67915a1f1e879279ed8526f3c7e1d272c9a209c74f0d546d18f152a593337389bb0409fff91 SHA512 13b98a2040e30df09ccb0a44719c3f0d5ac4b603ba724408de045613c33eb8f8d4cda05e4d9641819d30574bc33d2a3de9f54469a662c2713520a4faad8362b4
+MISC metadata.xml 410 BLAKE2B d41047e98bdbd0345d6091af448d4c195b9d8858a8cfeba5bf8ed1cf2f999838672f12fe3210a237e4a2fb4dc274aff10cc12724e1d2a570deb8d4e8eb8728d6 SHA512 62374193aa556621d5e225d7121f770d871eb8a1f63c1576622101402426ee7ea4d77264d2b8290f1d2605d492224f6c4bd15ffdf4941a0e519db36836f76652
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index 58c30e5a789a..56a7414e444f 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/clikit</remote-id>
-    <remote-id type="github">clikit</remote-id>
+    <remote-id type="pypi">clikit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 9dd33ebcab31..d35b49b43438 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 820 BLAKE2B 5eaef866c9f30d6342230c6b8b0c2ab994be98939ad7616e5fb3bf212190b9455158332a582706a5206d84c1e23f7e02ae465cc0e69292fe478a68b94499d360 SHA512 820cee4c0eb96c45536b02984d52b6fb67899e96178d82a1f37cb318c40410f323d3d7b37530785d9719760ccd69f48370759e6ea754d79dd105ca6240cd7498
+DIST cloudpickle-2.1.0.tar.gz 60093 BLAKE2B b6d210f9da7c16be66f3538109207a652331fdb5389361acfccb414bf36865ecafea15fd57ab24741f9e01d362c188f2c246388688c38a4d09a670053b0f9c4f SHA512 c38bf1044e18e673a89676c78d2f49422a36f6ccbcd29719aa9adfd157210e38e84befcc44b4b6ffcd60537748fccd3e384ed52aa4e1b939d84d127c302e2bb1
+EBUILD cloudpickle-2.1.0.ebuild 855 BLAKE2B 3178e55834b0bac61b490a219f452ea24ec07a5b90190dfeda492ccf74f97fac8a4876b492bd0983e70cf2d97251b0b85e80d33930519b42e8cf7793030e9adb SHA512 b7b72edb1f442de3a516dc5a9456e3742d9adb0d8f77b3c3c68a2bb573f6093fb890e1ca385e072a21c7c534992d86b90c17cd06ad6597fddbe955512350a5d4
 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
deleted file mode 100644
index feaee0529a69..000000000000
--- a/dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="Extended pickling support for Python objects"
-HOMEPAGE="
-	https://pypi.org/project/cloudpickle/
-	https://github.com/cloudpipe/cloudpickle/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
-	# -s unbreaks some tests
-	# https://github.com/cloudpipe/cloudpickle/issues/252
-	epytest -s
-}
diff --git a/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild b/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
new file mode 100644
index 000000000000..8efdbfe094ac
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://github.com/cloudpipe/cloudpickle/
+	https://pypi.org/project/cloudpickle/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	epytest -s
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index db639f5c5560..7b574d144fd1 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,4 @@
-DIST cmd2-2.4.0.tar.gz 680118 BLAKE2B 09f4893db7587dce9fd59103f8a1ef54c2b61248dd4aed313a90a390bb50e8927ef7a11dc5ca3af90b5ccf36ce16e0e18f3b555cc961a8c6862f7b8131f190ae SHA512 4ecd4c71294bee86f02b39a588c42a7232309db54459c950f77734926dedc3ec273237b9615bab6ef8a499c65442e3d6f7d2e9f159ccca021db0b450435ffbc0
+AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
 DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
-EBUILD cmd2-2.4.0.ebuild 1480 BLAKE2B bfc6bc865af4ba2d333cfd54c765d5af146ef0cab8974408e29821168b24211c5593215211d4242c8021c2374b6b9721092f34d75c42490c089fe3539ae48c69 SHA512 872ff54658926538c30086fec4540ceb5d900a4553b053112f6906001a01087b6143e281cccd277c7e89f669fadc521aa8679d4f870dfea7ac7c122a2e798a03
-EBUILD cmd2-2.4.1.ebuild 1491 BLAKE2B feaa836826f429cff1402fea3418f05a82fc8ccbb4491b52b2ff03e8743b95581e52d31a5a161b095af7ce5f48df1f33557516ea11925f360c7d6c99f7f2e96d SHA512 77e05a4f02192d126b4cc6d337dc969670b50c1a43006bdca314564a27024f3e9252547aa3fa7d6d21adbe7b6dd3c844eb99f33cd50f1a1ed3a86c0a70839083
+EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.0.ebuild b/dev-python/cmd2/cmd2-2.4.0.ebuild
deleted file mode 100644
index ccb5d6207f86..000000000000
--- a/dev-python/cmd2/cmd2-2.4.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index b3c095fe347b..d14b273ef06b 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -4,17 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
+HOMEPAGE="
+	https://github.com/python-cmd2/cmd2/
+	https://pypi.org/project/cmd2/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -27,12 +30,11 @@ RDEPEND="
 # pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
 # klipper is known to be broken in Xvfb, and therefore causes test
 # failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
+# preferred to it is available (i.e. xclip or xsel).
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
 		|| (
 			x11-misc/xclip
 			x11-misc/xsel
@@ -42,6 +44,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py311.patch
+)
+
 src_prepare() {
 	distutils-r1_src_prepare
 	sed -i -e '/--cov/d' setup.cfg || die
diff --git a/dev-python/cmd2/files/cmd2-2.4.1-py311.patch b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
new file mode 100644
index 000000000000..c0e9da528a08
--- /dev/null
+++ b/dev-python/cmd2/files/cmd2-2.4.1-py311.patch
@@ -0,0 +1,26 @@
+From c02bb7dce587886fe380704a8c6a6009eb677a74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 21 May 2022 15:41:11 +0200
+Subject: [PATCH] Fixed duplicate subparser name in
+ test_add_parser_custom_completer
+
+If I'm not mistaken, the use of the same name for both subparsers was
+not intentional but a typo.  In Python 3.11, this is an error and causes
+the test to fail.
+
+Fixes #1228
+---
+ tests/test_argparse_completer.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_argparse_completer.py b/tests/test_argparse_completer.py
+index 135d3de4..14c8c1de 100644
+--- a/tests/test_argparse_completer.py
++++ b/tests/test_argparse_completer.py
+@@ -1371,5 +1371,5 @@ def test_add_parser_custom_completer():
+     no_custom_completer_parser = subparsers.add_parser(name="no_custom_completer")
+     assert no_custom_completer_parser.get_ap_completer_type() is None  # type: ignore[attr-defined]
+ 
+-    custom_completer_parser = subparsers.add_parser(name="no_custom_completer", ap_completer_type=CustomCompleter)
++    custom_completer_parser = subparsers.add_parser(name="custom_completer", ap_completer_type=CustomCompleter)
+     assert custom_completer_parser.get_ap_completer_type() is CustomCompleter  # type: ignore[attr-defined]
diff --git a/dev-python/colorama/Manifest b/dev-python/colorama/Manifest
index 0abd3e74028d..a926a5a5c9c4 100644
--- a/dev-python/colorama/Manifest
+++ b/dev-python/colorama/Manifest
@@ -1,4 +1,5 @@
 DIST colorama-0.4.4.github.tar.gz 109439 BLAKE2B cbf08d4bd26924e269fd8b2ae6f9c7ecec905907acb296ded52b6b9c473c1a3b88945563cf00d4ddbf01c5bbfc4244997da20b47051594ca86a632a33c29fed2 SHA512 35501915b79bfc5fe46a36f83790ecd79c82150d6b73a57cd55fbe6431ea5ed7a86676504af90147eeb3a963ffd16890e0220099df579a66f2d8f1f7494f862e
-EBUILD colorama-0.4.4-r1.ebuild 1240 BLAKE2B b155e5b1d84b4601bbbc8ff4ecce3f7f1cd0d6d035e9ad5ac0e87a50a9ccf59f397f6049946f0d49479995265bcba323ece0dc3c72de7ec70deee3f30f3f5a46 SHA512 a52ecbb86af00802013f9bc6058404c9c3bdb7d342647f29e8c818a98ffcb63a2f142314dd0700b8899be35bd3f87e879856ca0affc985e6ebec6a5bbfa66b47
-EBUILD colorama-0.4.4.ebuild 1142 BLAKE2B 3dc9f505a5625ab5e5660e11ca6e8027f56c999a14a4c126919ec313b7bbc1fa9c8c782078fc3728ccc0e4a22c5398f99b60162692969aa4eece08fc4fe392a1 SHA512 25d46bd1ec6b9c16702059e94b063cc536606f6cf67dbc3860d5cd196d46b5b599d99382ca1f30b6b9387fdc453977de471e38a7ae31dac6fe44c12d25eb52fb
+DIST colorama-0.4.5.gh.tar.gz 113373 BLAKE2B d7b071b1efa585c26c48f26af7a0df9bff25e3986f2615889fd25c34d785c256ac3c4655375f13e7d1bc6972f7fa64bd48a819d988160ceb75fda356d645876d SHA512 d4d3b2a4c6a0966b5c15a12cd789e4b68e5b632c4d745d93fcff5e250fe10e5d45dd2a8bd25f4399cca31a358aecf99f354aa3e1b74369ae382b51bd6c87644f
+EBUILD colorama-0.4.4-r1.ebuild 1232 BLAKE2B 51033f020974f97e46dfea112b5af38e34c2655cb245c091e717ae6a63b98e64fb165a0f9a02e68dc689ccf5db971ba264883f234995537e103b173649fd32f6 SHA512 66f10227db6dc88e2bda6c43b3077cdbc3effea45d672608d36dba919dfce8c244629d5ba54645203aa4fa0cdfc40556cd4f35b870f87715548890866d1b5589
+EBUILD colorama-0.4.5.ebuild 1158 BLAKE2B eec3ce96c4a4ab86c98dc8ea8c3e256009a9a7bddbfc4d5f290aed86f4964379cd97d9ee48cdd4d9aeb4f332006bc1e864f003c72afb583cfd30a17702312388 SHA512 aa86aeb94574d6be7e5a1d7827544fef12354f06e3ad758f024a92910190a4717e142b0e53d49bd7923d80f0c8dd4e374d33b68d09755430cceed5bebddda7a3
 MISC metadata.xml 526 BLAKE2B f8f74b3797df9f8b0ab5ea81b6318d099a041cc3aac741084802272fdc7aaffdabc1269025f5e2b819cfe4608391a0857d208c487cc8f018578610faaad9f401 SHA512 dee4a202781edd36049ee9738dc9e90ffa63aa3874b389b5d0285147fbf86a577c15d55a868c0714ef982f78a2054636f464d6609af0693639d2449ae3d2ea53
diff --git a/dev-python/colorama/colorama-0.4.4-r1.ebuild b/dev-python/colorama/colorama-0.4.4-r1.ebuild
index 491f54d8d0e1..10a12d133728 100644
--- a/dev-python/colorama/colorama-0.4.4-r1.ebuild
+++ b/dev-python/colorama/colorama-0.4.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/colorama/colorama-0.4.4.ebuild b/dev-python/colorama/colorama-0.4.4.ebuild
deleted file mode 100644
index dce031e2ab5b..000000000000
--- a/dev-python/colorama/colorama-0.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
-HOMEPAGE="
-	https://pypi.org/project/colorama/
-	https://github.com/tartley/colorama
-"
-# https://github.com/tartley/colorama/pull/183
-SRC_URI="https://github.com/tartley/${PN}/archive/${PV}.tar.gz -> ${P}.github.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r demos/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-python_test() {
-	# Some tests require stdout to be a TTY
-	# https://github.com/tartley/colorama/issues/169
-	script -eqc "pytest -vv -s" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/colorama/colorama-0.4.5.ebuild b/dev-python/colorama/colorama-0.4.5.ebuild
new file mode 100644
index 000000000000..643b99ccd355
--- /dev/null
+++ b/dev-python/colorama/colorama-0.4.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI escape character sequences for colored terminal text & cursor positioning"
+HOMEPAGE="
+	https://pypi.org/project/colorama/
+	https://github.com/tartley/colorama/
+"
+SRC_URI="
+	https://github.com/tartley/colorama/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Some tests require stdout to be a TTY
+	# https://github.com/tartley/colorama/issues/169
+	script -eqc "${EPYTHON} -m pytest -vv -s" /dev/null \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/colorclass/Manifest b/dev-python/colorclass/Manifest
index 5618163b1de6..c9e1503515a6 100644
--- a/dev-python/colorclass/Manifest
+++ b/dev-python/colorclass/Manifest
@@ -1,3 +1,3 @@
 DIST colorclass-2.2.2.gh.tar.gz 490884 BLAKE2B e03c1a7091c133cea67c595363029121083d9a9d70a27f5803b20bb810b105ea9cb95aa68114ba98526b8a3b0e8365eadd7b375443215a5e0b636f0bd4cce632 SHA512 c38b58d4122e794654a8ac71adb2be0fb679eb10bd70c9d8f5dee06b3c978c1530bb3fb8fd6530d88aa35311a46a2590b709e4dcc6e3a81d14b90bf8cb74ebc1
-EBUILD colorclass-2.2.2-r1.ebuild 775 BLAKE2B 90cca8f5b1363972a779ae6bae454e76656366f94b51dfaedb8b5a39a3ac04957970c62bc03e6bd9adc0094155a831e1eb8ef94143e6473503ba9f6c352dff34 SHA512 59157b731b4965ec3c14efc40374d1c1d5b189679b1580c1706e266f73baa23e06342cb384ffb8d45466657e717caa0257b575f2e79f726c62bd51ac9b5f053f
+EBUILD colorclass-2.2.2-r1.ebuild 779 BLAKE2B 69139dd4bea500ac4dfa8210f53913450a9083093f0d5bc172d8983fc2f517d87ebfa127caab35bd4d9d8bdc4077659e3e9305718397d6385c4535908b7955dc SHA512 f4805f6c7ebc84f598a6ebaffc8e52c557ad25a3d3e8f7615ad0b4f6c86f5f6ce0520142a75bcfc3f32a8c1d826d55efdad04d6db52a9f693dc0ec1f7cc862cc
 MISC metadata.xml 375 BLAKE2B 80d8bedbdd9260ff3c0113c3ea75df61ddc166fbc36033289531d0a9e704c04582ca1defa3107ee5f0d5c1bf0510b8739b19b28d00cba655988486c45bbfbce9 SHA512 27ad28c11c7b5114d0eadffe08ba4378bdd0e756dd3193e331e66dc4974c9543640b5530c4e344c263b5028bcde7ff87339a1627b87b9c715649bb6755e12d7c
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index cbb806d9b613..139455504c38 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -4,17 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Colorful worry-free console applications for multiple platforms"
 HOMEPAGE="
 	https://pypi.org/project/colorclass/
-	https://github.com/matthewdeanmartin/colorclass"
+	https://github.com/matthewdeanmartin/colorclass/
+"
 SRC_URI="
 	https://github.com/matthewdeanmartin/colorclass/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,7 +25,8 @@ KEYWORDS="amd64 ~arm64 x86"
 BDEPEND="
 	test? (
 		dev-python/docopt[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 6ae8f2c41c02..d0b1c11b31fd 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,3 +1,3 @@
 DIST colorlog-6.6.0.tar.gz 30712 BLAKE2B 21c297d08a53bb67184bdd40f9bfae859f0bfd8ae63a27df570b316f85aa4904b8323c78a9706abbceb36ae1b76aae66150f86e8e25612caa5fe0dd4df5f25d8 SHA512 8c8bdfcfe537dc34c145fbfb9ebd0399184e3a8ab0e4bccc2e61d52a323c1372c60757cac2b023c9d39eb3c9fcf191b50c8cd4d089941aa484b30170a3cd1389
-EBUILD colorlog-6.6.0.ebuild 450 BLAKE2B 71661ae6c9c1d613222b5ed972b3421af272a3eefc8a831804d1c97c8a63196d05d5fd6f41ffa3df8e8d45254cadeab57a71d1ea92ae50ffb7c6161a610827f6 SHA512 7b73e6fb3fa28e1de8d82edbad27d7081ceda018cacb3c7a36b86a711a7ab2715686a8114609922ef958f97f09ae23d4e86c253fb06426c04a8dc1c7e9a5c79d
+EBUILD colorlog-6.6.0-r1.ebuild 482 BLAKE2B 7f5e0e2d44f775cb270bcf893664b99f40df6ea9dfb95071106beb8a8d9a0386fbeb331021e3f30e3756d5321ebd81b33b727197612069220598d7dfe23f9443 SHA512 9eedf142cda76101f638dd96d8ea9c729e83669c8de4f12e95f21acf32bd43e4d0d2b4821768a24a8a0800a959c8c74fb580037d2114a17c7cc5bee310ed8c51
 MISC metadata.xml 415 BLAKE2B 4b7aecb1bfde4142a6d3f090e5aa93245e98a5ad63238e141666d1b4ea621a8cde4a9b642b44ff8792fa3bea6d50107b084bf07f9eeb41074f34746be934c0f0 SHA512 66bb051d87b620dc5f04dfacb5abc9a67b87bc28f9cb60f99ace58731c8e23576d061bc16a84942d4c69eb04563a3effa7a21f10392e58256bc73e3414ae798d
diff --git a/dev-python/colorlog/colorlog-6.6.0-r1.ebuild b/dev-python/colorlog/colorlog-6.6.0-r1.ebuild
new file mode 100644
index 000000000000..440cff7d948f
--- /dev/null
+++ b/dev-python/colorlog/colorlog-6.6.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/colorlog/colorlog-6.6.0.ebuild b/dev-python/colorlog/colorlog-6.6.0.ebuild
deleted file mode 100644
index 427a96dd30ba..000000000000
--- a/dev-python/colorlog/colorlog-6.6.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 5ad24c5d3e5a..592ee5f590d0 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,4 +1,3 @@
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.9.1-r1.ebuild 1115 BLAKE2B cd6f9e06d76496fe06d516479ba0877bc754ab86f7a730187deac91b84f6658c9841f86e00bc72bd555fed2870deb6e0cd34e4453389998c600ebc4e4bc95964 SHA512 47db8680326d1020e2987c322c5dc4bf9a0f4f0c9ad3b8a77374f9347f7df5179528ca7f8d10dfed05ef31bd0f8c481448ef89719527c211c4ca89e82a1941ed
-EBUILD commonmark-0.9.1.ebuild 1070 BLAKE2B 8053589cc826d8a8ceffab7101c6bf3a11af6a48ad83ca96c64e4ef2fded36c6ab076f13c82f58229ce8a069a5429b7fc6c4408683f47b0a67b222a47454bdbb SHA512 21bd7353a249956679a6b4ea41a91b51980b92bbfca2760fd5b372228d7d60a92d26ca3b12510d00a228bc64fde270c9fc83d46e4627390df9762963332d847a
-MISC metadata.xml 764 BLAKE2B 4cac2589118c2b971450bf7aaffb1acc288de1d5d7f34760eb49a2ccccb531e35cb2c8719ca81c49dae3221271d7340b1f238cf1cba20c35c9708438b68c4074 SHA512 9f2223a67f87c806f7beffb03454790ec828975d7bf58e5753733090713869fd10584c84c43db988b6d02eb1210c14239dec433a16353b530f128b3c31c7be0d
+EBUILD commonmark-0.9.1-r1.ebuild 1107 BLAKE2B 3516e67b3412d26522e455801198b806924e44acb240f628dc01fc15b9f8d934e0f76bb488d473429716bda8c92bb29559abd2057fdd86c6815d877288f56032 SHA512 03af932274288c647404f045baaf32eee86939bff7667a6ac90ee9dbf6afd6538aa983f0582b6b38a8e5fc6e3786d659632a357fff0d3808d040933489adb9a1
+MISC metadata.xml 789 BLAKE2B 284f31d9db570e7f0048992699ec7346d5b757bcf84ad032b2416a005653900c2a360518b6e9b3c9161d83267385259ba154ef2da5172752fb10bbff669cb8ee SHA512 aab165078ec84944fcf258b9ff9ba7187bbfc775af417687fb68eb65b8d4fd1d5b09db43cbc021cb5715dd2a9da399764687a7b1444736bd88ca995efa3eeaf6
diff --git a/dev-python/commonmark/commonmark-0.9.1-r1.ebuild b/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
index 331381d72437..7db774f1beef 100644
--- a/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
deleted file mode 100644
index ca4e537ead12..000000000000
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="Python parser for the CommonMark Markdown spec"
-HOMEPAGE="
-	https://pypi.org/project/commonmark/
-	https://github.com/readthedocs/commonmark.py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
-	local -x PYTHONIOENCODING='utf8'
-	distutils-r1_src_test
-}
-
-src_prepare() {
-	default
-	# Fix file collision with app-text/cmark, see bug #627034
-	sed -i -e "s:'cmark\( = commonmark.cmark\:main'\):'cmark.py\1:" \
-		setup.py || die
-}
-
-pkg_postinst() {
-	ewarn "/usr/bin/cmark has been renamed to /usr/bin/cmark.py due file"
-	ewarn "collision with app-text/cmark (see bug #627034)"
-}
diff --git a/dev-python/commonmark/metadata.xml b/dev-python/commonmark/metadata.xml
index 321cd37e5dcd..0bc252d05932 100644
--- a/dev-python/commonmark/metadata.xml
+++ b/dev-python/commonmark/metadata.xml
@@ -12,6 +12,7 @@
     are stable we will release the first 1.0 version and attempt to
     keep up to date with changes in commonmark.js.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">commonmark</remote-id>
     <remote-id type="github">readthedocs/commonmark.py</remote-id>
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 9081e20c6211..e3abb8b690d0 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,3 +1,3 @@
 DIST ConfigArgParse-1.5.3.gh.tar.gz 32732 BLAKE2B a9dec6b3ebbb7aed000651adf76ac76994b56d00236789a75f7da6ccc76e6b87e0dd292c260a768c0d402811b69e55d417b25032363429535cef4e09e0be5d00 SHA512 bdc0340bd92cfd5319743a4860af80fc2352f38b156031856c2b39b8c8ad59461281009030c4451dd464334a829b8143c765979cfc9b8ccbe9fbdcb0e08ac7b4
-EBUILD configargparse-1.5.3.ebuild 738 BLAKE2B c375451d21bd5bdfeac1889bc3040ff0bc4d313c3701e42fdf3cf22816032734d270f52a94dea39e6736f5660d9dbfa95707df0337186c72c25f76e85a9d8964 SHA512 e83dd1dfcd8fa06f2ad4e8f9cd059d9b93fc5b633f953ec157c797d92c3c2a79c1b9526832dc2dadf16e13f1566035a32fdb52fc3b327f19b2e8b19c0134f6dd
+EBUILD configargparse-1.5.3.ebuild 770 BLAKE2B a0863bd546f15c862da14aea8ffd04d48e7cf21e8b84e172d4b3d41852005ec79dea4b77e2622c47e35137f36277f425c5a367998b3d4f2d98a9fd61eddab30e SHA512 bd08881080dde1c6ca4c61bddb77ec0485963f4174581b887dbe3bf2eaf4ffd5a17103a6fe83b4982b945840e5b2f7e2676f957647b42f76c0ab65dd1dbc4780
 MISC metadata.xml 413 BLAKE2B 06bc019926862278b7c7a0f602f737f0ee20df1271bfd4ccd2e96e602b537403ae641f4196496ed0af92830a457af330def85f4d4b30ae2733510b82c0589310 SHA512 df63096d97d9835ee72b03ee144cb1cbed4f29644380c8711718b570938e0ed1dff9bca15b77c91df052f3f68e10633d1880d553cb8c8d7e1827714355dd8593
diff --git a/dev-python/configargparse/configargparse-1.5.3.ebuild b/dev-python/configargparse/configargparse-1.5.3.ebuild
index e3727ceb7ab1..715bdebb734a 100644
--- a/dev-python/configargparse/configargparse-1.5.3.ebuild
+++ b/dev-python/configargparse/configargparse-1.5.3.ebuild
@@ -1,9 +1,10 @@
-# 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..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_PN="ConfigArgParse"
diff --git a/dev-python/configclass/Manifest b/dev-python/configclass/Manifest
index 9ea4845d3aa5..44e5a15e116b 100644
--- a/dev-python/configclass/Manifest
+++ b/dev-python/configclass/Manifest
@@ -1,3 +1,3 @@
 DIST configclass-0.2.0.gh.tar.gz 4631 BLAKE2B 8e273e539a9f3cce70397ef0bcc420ba7d5b2b007de490bc4347412546b6af0bbea4950218e69590817f41c884044bd7d976c6a188f8665f2de0bc173f1e9c8e SHA512 7f22679d3470ede4106bdd99f1216bc49631c32452dc681fbd6a6b91735bbc82db1babed3cd94f93a0f9f2915d0866ee18704ffcfe477fd3134b6f18a094d192
-EBUILD configclass-0.2.0.ebuild 519 BLAKE2B d01e4ef82801326450c54e488b96534dc7cfcbd7885b7afb9c9f5db8647b98fcc0873c004d9f8464860fe3a3db5582d526a7c8994ae5c1266a233b57d22cc5f1 SHA512 946c0c62fcfad1465760a0346a565747a2c6c331863499a94a31286e6189728f2d47d62666cddb9ba20780c9c7076c9e4d024a034f02f4e3738e8bb6b1b8633d
+EBUILD configclass-0.2.0.ebuild 519 BLAKE2B c014fa87495d0f18e8e4202f44cd9e67e4d053c01c3d12c389aa999c0a7504747715b1c382a642d748c2ab9a15249efa86514d351f8735cbb52586666851bdc4 SHA512 542449bc9840d2b9d18d652881cfe307bf55602b73da2bd3f9b369c92ea468b19b83c3208ef51274ac4b545323b05eca361bb0849d6070993c8f66cd71805b1d
 MISC metadata.xml 402 BLAKE2B d65861f3cf818d5b95f2090b71c9c6995a70cdd9df6d3bce3c5321d3a0bc2ce6b3c7c09c03c8021a4801f56f0993f12a6b2b23534cf6ef35283996c335da94c9 SHA512 cc65aab1d9b14c4a48a81174c0b10df7e1c87670171cb923dddb2c28c0ad07b9c3dafb5423c6664784305b81c261f7a525da196e14c9900f84bba811334ec114
diff --git a/dev-python/configclass/configclass-0.2.0.ebuild b/dev-python/configclass/configclass-0.2.0.ebuild
index ed0d29263137..2f6057af4446 100644
--- a/dev-python/configclass/configclass-0.2.0.ebuild
+++ b/dev-python/configclass/configclass-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index a737dc468b97..90eec8dfd45b 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1,4 +1,4 @@
 AUX configobj-5.0.6-fix-py2-tests.patch 1494 BLAKE2B 5c52aca50d606c0fa3fef6d2fb184b3d21bb45ca39c4cb5893aa67b06e46954110b4a2109fb1592931a1947b56b12a80a575baa54ca7dfbeb1981bb1c610137f SHA512 ff87d2b54a47cddb9dd77d43a3028805f98c76e7a0c9529d40fa2d936c8b23ede24931f2066665d0b6ba30db6f62ac4871605c6b89c4842eb93847eb2d6e1e8c
 DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
-EBUILD configobj-5.0.6-r2.ebuild 752 BLAKE2B f1b39fb1cd466b822a92ba21b5198e826dd56adab04edcf0ba1cb42e0a0f9adfa161c3e6ca4eac1f51f470b69500780819fa31653a7ed84cfe904acbbe0971e1 SHA512 651b838dbf85f95d909c6bea8baef82c60db24dc341f33cce58239cc777c4cca93cd66d2e72f9d5624263f90f241c1875457080cb54857e769078731475519f5
+EBUILD configobj-5.0.6-r2.ebuild 752 BLAKE2B 05bbeaced3975ab6461765ed38fcf208be2272fcf15479998b76d5f84a0b173fa02c4ecc59a8965a36fe1fe2334c629173de95aa33f67990479cadf270705a88 SHA512 00b45aa27b70b1af38cf47f7adcf7895835f4ded05e880d0f8e99c83c860aa12377e2a66a6d709c318e0bb365e76b4e2df9d9e171d2d1b8330bb5c212df41631
 MISC metadata.xml 689 BLAKE2B 31ac4dc53da0324439d75df8d92df7dcc199ca6bf69f951c1f800ba517f6e979fa8a9c61071128b9892e5a663fba37b033ad3624faca15e4f810f83d65e52115 SHA512 2e73a89c8061ac8ffb810af418435e6b54050c77be37d879637b83274550d5cb2c8c0d3dda860f118e9dbf5acd647f92c02f54ce9d63370c65f267b36d895377
diff --git a/dev-python/configobj/configobj-5.0.6-r2.ebuild b/dev-python/configobj/configobj-5.0.6-r2.ebuild
index 29804cfe94a1..5966b1c2690f 100644
--- a/dev-python/configobj/configobj-5.0.6-r2.ebuild
+++ b/dev-python/configobj/configobj-5.0.6-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/configupdater/Manifest b/dev-python/configupdater/Manifest
new file mode 100644
index 000000000000..32ac277c2db1
--- /dev/null
+++ b/dev-python/configupdater/Manifest
@@ -0,0 +1,5 @@
+DIST configupdater-3.1.1.gh.tar.gz 138777 BLAKE2B 9fef5815bc41903a65c2c53c6b9ff3d00d1f4efe65008c725afda8d12694be4d18810cbfc03b291246789d736f1a2933061f2683bfc62e9e1d72e2e4f159d772 SHA512 1e499f87d0ac3d75f32aafe532d7c83b4b86fbaa204fcdbaf7a3dcb5262d936fe027ee0b21d169ef69a0590edbe965a872390b14be274fbb1c893f2d4695b92c
+DIST configupdater-3.1.gh.tar.gz 138671 BLAKE2B 48e349780e11ca26b4b15b44aa298058840cfcea47fc7b2e555f3ca743de1956a15255bfea2c5f96624e02e399bed99ae45f3422ab1660b8ae83087ddf6117e1 SHA512 89685a93f3bec907184d818b5adea4f87967df313fe4e4216aeef2c227fdf0b0f98757ec27da7f43adff6e2ee37020dd57b98569d5811c9dc7c3201852b27432
+EBUILD configupdater-3.1.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
+EBUILD configupdater-3.1.ebuild 693 BLAKE2B fd1c8b10619c7b2ff849c59a467687e53b653188b2395aadf47e4731eedb967fa93d203cecb8d1bbd00b309f977ad242a21658cdd371affbafe79b44e03d5cf9 SHA512 23745443f9fa98695eac44e41559300c0948ebfe099aa7ae41450239040685acaa10c97c600c48fefc046ec2fd3cb934c400c45819ddb191fc636c0206132b71
+MISC metadata.xml 359 BLAKE2B 59eca20050b8eb4620813ab2bc61abec0d905dba4c38d35806f135cc3f165634cf6f1df124d77e294dbcb3d196b521bbfaa005979e0c63164004d4942afe4717 SHA512 8ce147cc56b7c207125e40d9ce54f692f62f2ecff1944e74d661b2656e5d479e8072e41fbec7451e58976d3453c5dd0e4eff0726ff9f2b502b505926fd2d851f
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
new file mode 100644
index 000000000000..bb6d09e8a58f
--- /dev/null
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser like ConfigParser but for updating configuration files"
+HOMEPAGE="
+	https://github.com/pyscaffold/configupdater/
+	https://pypi.org/project/ConfigUpdater/
+"
+SRC_URI="
+	https://github.com/pyscaffold/configupdater/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT PSF-2 PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
diff --git a/dev-python/configupdater/configupdater-3.1.ebuild b/dev-python/configupdater/configupdater-3.1.ebuild
new file mode 100644
index 000000000000..bb6d09e8a58f
--- /dev/null
+++ b/dev-python/configupdater/configupdater-3.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parser like ConfigParser but for updating configuration files"
+HOMEPAGE="
+	https://github.com/pyscaffold/configupdater/
+	https://pypi.org/project/ConfigUpdater/
+"
+SRC_URI="
+	https://github.com/pyscaffold/configupdater/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT PSF-2 PYTHON"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e '/--cov/d' setup.cfg || die
+}
diff --git a/dev-python/configupdater/metadata.xml b/dev-python/configupdater/metadata.xml
new file mode 100644
index 000000000000..9fbb7c1b9718
--- /dev/null
+++ b/dev-python/configupdater/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pyscaffold/configupdater</remote-id>
+		<remote-id type="pypi">ConfigUpdater</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 77f306f8db6c..528e22ae87b2 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,6 +1,3 @@
-DIST confuse-1.6.0.tar.gz 44438 BLAKE2B 0a528cfa2a83cb8ffc47017d61571770a9486585308f5e42531ba1f6356f76b385517a4f3319d3365cd5df41ca49578559fb1ba47edd936d6114fc00a816c736 SHA512 e756771dd93987f9c4ba900a2d95b5d87e99b97789810f2f70aec1fe68a919bd11aff815ca0967b8073ad034ed9b927e55599f5fac590822a7897161869da89b
 DIST confuse-1.7.0.tar.gz 49171 BLAKE2B f102ed445d4fc259739305f745fea6c1fef90fe4d8eb7b77bb6c370d37929807478df86ad78ffc8fc2fb1d4cd7033d76e34d880d6dab6721b5fd6cc0e7f5d02a SHA512 0da6cb237aa31f63cf6d2df2e90eb27e7b1a81bd126546a4314425b9dc1d9f993232b4787815abaf7ef4b54ef03ac3286c321e6654fdf18f05f92aa69c3da78e
-EBUILD confuse-1.6.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
-EBUILD confuse-1.7.0-r1.ebuild 595 BLAKE2B e65b2a007278658287227637239aea2d03ed0748180aaf5b2220b0fe58e38655766680469717e679aa276c4a00a7bf40c6bcb01012933a755317ce570ec486c5 SHA512 1667941ce27408155e2a6c8441f93752f27d1e85b9af4e8d806d7abb57d6cc521b9bf6045e213c7f2a8792c73b37b1cb49f62830af6080ba63eb4c00b6746d01
-EBUILD confuse-1.7.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
+EBUILD confuse-1.7.0-r1.ebuild 594 BLAKE2B 8b0f7ba5a388353e522cec0d16935435d4aa52f4f2f88dae9a92673304e45d24b5594590b5ba368580fc417c68bfe8b9a3464ad904a1c87b59ff59e372e07378 SHA512 2065057b179a03fd8fc586dd825ff64d7ba499048e6bb92409feafb56dc652ef8dffc4779d809765cf03a39732f7fab7265c3ddc7a666fe4ac8632e3ec661193
 MISC metadata.xml 878 BLAKE2B 2c3a52104c43764bd91ab68c7706013373ab30fa0fdb447bd5401f986ac242b1935268ced5fb70657d44ae2539758b81f8956eddcb0656c7dee70be292e240f8 SHA512 64f959d0ce18e4fb412f482712101117f8f824f333c0befce184e736b52897dd105a0d9d71d65eea57bb21d724e2b69661f9efcaffa36536c61d9c6ae2d2a522
diff --git a/dev-python/confuse/confuse-1.6.0.ebuild b/dev-python/confuse/confuse-1.6.0.ebuild
deleted file mode 100644
index b55f3d873523..000000000000
--- a/dev-python/confuse/confuse-1.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/confuse/confuse-1.7.0-r1.ebuild b/dev-python/confuse/confuse-1.7.0-r1.ebuild
index e0d66868bacb..cd24c772bbc3 100644
--- a/dev-python/confuse/confuse-1.7.0-r1.ebuild
+++ b/dev-python/confuse/confuse-1.7.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/confuse/confuse-1.7.0.ebuild b/dev-python/confuse/confuse-1.7.0.ebuild
deleted file mode 100644
index b55f3d873523..000000000000
--- a/dev-python/confuse/confuse-1.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
-HOMEPAGE="https://github.com/beetbox/confuse"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/consonance/Manifest b/dev-python/consonance/Manifest
index ee3310b5927d..5188d66558a6 100644
--- a/dev-python/consonance/Manifest
+++ b/dev-python/consonance/Manifest
@@ -1,3 +1,3 @@
 DIST consonance-0.1.5.tar.gz 31225 BLAKE2B 049637747e0b9b027bfc9a064d4fe792a7d2cc42219d83662646120423af1ef18e4a8328a9deaa9e9d8d0f75065afceb6cc9c533fa5728b1e866c160811cce16 SHA512 3ab8a7a2dbca22d519c79a2903f90d79ce3b5709e0025667c9fbe0d5bfc8b3a4ab853403dd29b791bd2cf3101fdd2a3c806e694840256f373d1930daeea71509
 EBUILD consonance-0.1.5-r1.ebuild 906 BLAKE2B b4c67a87600be92246cef323488bb3c4809a3114ef20656d2a6f82edc2c927b20aecd9c4a6b3085149268b1f7295f31501e0360876dd5fe70283fa79db867afa SHA512 5b360bdf24cfc9e6194807ae33c906512fc2c3be7b371c5cc7bc70093b363dfb5f2ec4c6c45792cafde3a839f59fcdcffa0bd5cde446a1034c9f8a4c26f2ada8
-MISC metadata.xml 631 BLAKE2B 1a0cbaea43cebd4827640482c9b8d740b853266f7430579e9560c419c8ed83d25db425d45d3c6bfc8e672a84ff62fe817a4ee9404bcae8417a5197559f1cf507 SHA512 22051966ad03ce0741f556fd729115f572e9d73e639e59748027d4b2b5e57493f8ed63455e489987535699b2a031eb8681bd29bb22d075697ca56869d2077627
+MISC metadata.xml 732 BLAKE2B 8f246d000f8389e61e3137203bcffed69511386af3de6287983bc03d96c8c24939d4a517952fa964a253cfc80685222e0aa7ed3b2512241b9e92c7d54da82bdf SHA512 ff955f2a3fd51756507f0f893b68b4b4eef4764f75d7b3500622130027e30248231d5f77490a15818aafd40d84f2cac8be9cce7ee9584b174a0cae2f306a38a2
diff --git a/dev-python/consonance/metadata.xml b/dev-python/consonance/metadata.xml
index 4892b68c4167..1533152e67cf 100644
--- a/dev-python/consonance/metadata.xml
+++ b/dev-python/consonance/metadata.xml
@@ -5,6 +5,10 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Consonance implements WhatsApp's handshake process
 		which makes use of Noise Pipes with Curve25519, AES-GCM,
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index 03ae44285622..c371dc16a698 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
 DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r2.ebuild 713 BLAKE2B d0ddc4ef07b17a41b6b52af51d73a26143b65f3d2a33cab0757c8992e5f481e645ac8a8d04be2c7536b92ccadbb9b253642225dccaa138babc8d574421c42ddb SHA512 38e6cd72f794a4d2690b0309ca22932b3ffe0be232b9936300e2c68e476240a92eb2920dcaf95feb838b4a17a83ef09e26a6751688585227bd458b52e1eb3cff
+EBUILD constantly-15.1.0-r2.ebuild 713 BLAKE2B 998e71d19513a1857a0e3d34c705615b6d4c4a3083ab10372f5a0c5633c9e3409d21b2faca20b45f706537564d0d1283a421a0e637395f318f5b600225dff633 SHA512 3cb8fd1bb273bb7d5dbfd26773f7d2ede1216b738f45cf65183ede573cf1ef3ddf9f45edf1e9611ddabbac31cdcedbd9de05cffeca5a1cf372bfcfd53786fdd4
 MISC metadata.xml 762 BLAKE2B 9875a3eb5843bf6bf12053dec018f6613df587a09c15e789c8386fda56b9f992cecff183961d2ad6666c222897953afca84b3c16cea971ea51d59d85dd977d4a SHA512 2da01cbce721e0f9b411e6d34552bbe547d79dcf3c2bc0232b8addfcfc98a190eff1fef7ae09e451e4666a7854c83206cc5b905aa951b7ce9476124fc6f0023c
diff --git a/dev-python/constantly/constantly-15.1.0-r2.ebuild b/dev-python/constantly/constantly-15.1.0-r2.ebuild
index 898843572b1e..ec9532b87d12 100644
--- a/dev-python/constantly/constantly-15.1.0-r2.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index d670c5bd8170..db63d2ee8560 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 665 BLAKE2B 9c75046e0482bad609f5cbcd8488af7f7e353da84aaed42ec8e2626840adea10786d7015036df7cbefe4bfc40927803363fda634b93c6d6c6e92c82925b66647 SHA512 f39411c310db27a16a36d4b9dfa9ad32c8e0f4b3d8664d2a9fad31d20ef7232752038446e2324a04b8eaed811fefe3a950cea8e01f02981f82e8c16676fc6849
-MISC metadata.xml 311 BLAKE2B 7a85df041493c4715edcf9edb7494bc2257b5e3a204e9ca178aea1b3a8b8eacaee001a4cab9e2f6aef626d0128ac4c46d4b60aba4c1323185de46e12c9bb667f SHA512 508ac189b85e2fee0aa4f54b5df1815f78ba64f13e2ab2e58de1c278e6317334f5e70f39463d362038c98cb999ca8aed921de724acb023b034b9eac0d664eb34
+EBUILD cookies-2.2.1-r2.ebuild 697 BLAKE2B ba4d41d963983686f620d38b44512dab56d19fbe6e572553e5d553df42ab7f13222f36842a109a7a8084fd1e487ffadbe1d92604b4b070b653ca745ba2368567 SHA512 7754ce974abbf21ffc72780443330c6f693bcd45caa3d8313b15364f0156195d846d5b7358aff8e7b90401649f7dd5e6ba3142d1bc653d2b276209cfbfe6d1a8
+MISC metadata.xml 335 BLAKE2B 2944ac332c29a9eee7fd1ac6fcdccb1ee2b44d866995c4c27cdeff07ed3ef29145a06ccfe0850c703605e1f1ad368a7a030d24ef4347e8e14c3872a85499c1a1 SHA512 fdc6b3f32c17c0df4fd6f1541d8ff13e2a7bfadeabb67adb68db36639620fe049e805f4f1b285366f0d30aca7f87defca3b3045fd2d9f4c12f32f6587a8e892c
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
deleted file mode 100644
index 8c46a0eeb2fb..000000000000
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="Friendlier RFC 6265-compliant cookie parser/renderer"
-HOMEPAGE="https://gitlab.com/sashahart/cookies"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	# https://gitlab.com/sashahart/cookies/merge_requests/2
-	"${FILESDIR}/cookies-2.2.1-fix-warnings.patch"
-
-	"${FILESDIR}/cookies-2.2.1-tests.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/cookies/cookies-2.2.1-r2.ebuild b/dev-python/cookies/cookies-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..e3378cf99352
--- /dev/null
+++ b/dev-python/cookies/cookies-2.2.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Friendlier RFC 6265-compliant cookie parser/renderer"
+HOMEPAGE="https://gitlab.com/sashahart/cookies"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	# https://gitlab.com/sashahart/cookies/merge_requests/2
+	"${FILESDIR}/cookies-2.2.1-fix-warnings.patch"
+
+	"${FILESDIR}/cookies-2.2.1-tests.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/cookies/metadata.xml b/dev-python/cookies/metadata.xml
index d33209246a07..7ff355639eca 100644
--- a/dev-python/cookies/metadata.xml
+++ b/dev-python/cookies/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cookies</remote-id>
 	</upstream>
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index d3b5ed24543d..46511ca507ca 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,4 +1,3 @@
 DIST core-api-python-client-2.3.3.tar.gz 37470 BLAKE2B ce3f88e1608715eec06a50fa5df4cd331e90509d0b7e9ab275ccfb4b3b5216115539b7fcd70af64794f0ae50a5084873d2dbbd38c85cb8be3f319d6880f5993e SHA512 aeae3ace84c0ce61552236b83db28e47492f5ac17a0e216e1a8eeddaf67270b94127f7a40f8a37cc5051abe097555adfd690a7e6c8801524ca77c916bd451ab8
-EBUILD coreapi-2.3.3-r1.ebuild 663 BLAKE2B 2cf29a394cf12cec99cffb07c6eada9e767240b81b462689beb07c146821c8516fe382a4e4439509cf2abd059a855e1d55f5e065ccb777feed44879f8ca59017 SHA512 0d3f99dc03f633ba7fa2f0b8a762fe5462c199141b783fe350db7631913373bcca27812be04987c3ed78ee9f0e3d22a5ef817dd8f5c8b9c2f836c81a6bb5b8e8
 EBUILD coreapi-2.3.3-r2.ebuild 705 BLAKE2B 22054d5099c4b560500d80a2cfb46d44688caf3ca66302fa6c2e781e1e5fe0340e350e75ab326a4d83c549a525613cc67709d97e5a8743bf7d4794fe281a6635 SHA512 cebe38bb4200da6ae90e3d1e9a662cb7749abad9080fc5bf050ac9c95e5fa0bd9c3773fd67b0f62646b42f1254503b29304989fc596d49eaf62bd9d121e665d4
 MISC metadata.xml 311 BLAKE2B da7a7d5b0f01a9c0f1237c2e2a03e161d28446ebe8ec9625c9abf02b6565a584efec28367c1887230c80106ad5321efe8caa6374ee1ada30ffff9ecc9c2c085e SHA512 50f0c4044a7605f00e92c2514ae286862b99fbfd06ccec4e6281757ab5014297c139dd5caac631b3742b5e3bb4af3e18791d0b2b340c0af8ae6696a31e71529c
diff --git a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild b/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
deleted file mode 100644
index f1d85bb66162..000000000000
--- a/dev-python/coreapi/coreapi-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,26 +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=python-client-${PV}
-DESCRIPTION="Python client library for Core API"
-HOMEPAGE="https://github.com/core-api/python-client"
-SRC_URI="
-	https://github.com/core-api/python-client/archive/${PV}.tar.gz
-		-> core-api-${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/coreschema[${PYTHON_USEDEP}]
-	dev-python/itypes[${PYTHON_USEDEP}]
-	dev-python/uritemplate[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 0c5ba5c535aa..2def98d31584 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,4 +1,3 @@
 DIST python-coreschema-0.0.4.tar.gz 21905 BLAKE2B 1afe09038761809fa0e12d13fb89884760d4aff325a4bbdac104c03648856f8d50b562fc00a8509fcc75f962918f33d89017fae0a6d0335def4d6b77ee9aacd9 SHA512 28badbae07284fb4dbd3f01f613edda1202902115fb166bd95bbac549d398c9e02548b473524d3b530a42319a99d7e55e92bf54269827a9812249cfb285670c3
-EBUILD coreschema-0.0.4-r1.ebuild 550 BLAKE2B 721e70d1143face0d0f4fb8039c849ad6e83186ee8c5232c031300ca0936cf2ebc68fe0029c3754cf849b45760e8deab80869f6a653fe1d292cb352ffa9a50e0 SHA512 b5c640340545d6e202bea2a7c88fb732a50310716f13363979a0ee6965695477ed640aa3dad6abd7f9583b03c72b3c62f0e91694be967589f249706fc557422e
-EBUILD coreschema-0.0.4.ebuild 508 BLAKE2B c83350a487bbd5ca064d6e62220b6578f5f6e561dbff7f59c3ed1675304c911e3b0c0fb34d02dd91d3fc0ddbb66053734d0ac14dc0a7260c7ed471bb18ef0ccd SHA512 c9bcc681aedb67c8e986758d626577bdc92a93bd9b149cd06e6e8130fe1a5473f5e07d67ad0f165380e63095068e6f25a88d7dae2592a19814319511227fc526
+EBUILD coreschema-0.0.4-r1.ebuild 550 BLAKE2B e98fa7914c556079043f345cca4076c3749f4f1009517a3bbb4775abb869fdc22ab8227c92329f093b05b159cf9249edb5fc9828f8ea4df1c0fe19ed8bd22059 SHA512 d6d4a2aae27895bb664fbb6b985d13305808ff891d5b1349567b70edb8fc2a89a1c71dd2fe08b85a6c2df2c6685eceecfaf85e400ff8d9d7bd8a5c6dff2bb84b
 MISC metadata.xml 314 BLAKE2B 38f8027c2d6059bff47550f12813462ecb1219f334591bc6d0c49118edf10c850c5b67765c3c89a35dc875751aac63322fc10ba270d9ff9654efcc91d18972ab SHA512 38093041851f7063c9346e56bd3633a84546f9fb6602ce7aa775ad2fe0fd4818eac5cb321e936aae9ea1c7ad7bdd85c7b4d784724d18966962362e37df10c2f7
diff --git a/dev-python/coreschema/coreschema-0.0.4-r1.ebuild b/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
index 3236b029d8a7..2491132141bd 100644
--- a/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
+++ b/dev-python/coreschema/coreschema-0.0.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/coreschema/coreschema-0.0.4.ebuild b/dev-python/coreschema/coreschema-0.0.4.ebuild
deleted file mode 100644
index a4c0e7af886b..000000000000
--- a/dev-python/coreschema/coreschema-0.0.4.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
-
-MY_P=python-${P}
-DESCRIPTION="Core Schema"
-HOMEPAGE="https://github.com/core-api/python-coreschema"
-SRC_URI="
-	https://github.com/core-api/python-coreschema/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index cc40aa125ff5..572b27224ade 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,3 @@
-DIST coverage-6.3.2.tar.gz 709294 BLAKE2B 2da96731ee0065fb6139af7db073284a83efa135e7379d2a6d6e571cdf58c888cf72719fbddadb1bd8f62b0b155b8420a84377068c40e4c813533b3ad6b190a8 SHA512 d9ea3a93eefe2dbb723ed1eadb09dc1165c4f46e7186889ce3615411283baac1d80f04a3831208a164f99accea5d246d4613a7c2e909d2e63d3c714620432a16
-EBUILD coverage-6.3.2-r1.ebuild 1635 BLAKE2B f935c180220b93c732e8fe65a3b103632f4af5c7191fdcd9f3b2c4ba7c8ade58cc0e6a88e27d96b8f0e975b4c26f0cbfd2baa0b1955049177792f82c2fdb4deb SHA512 8d6a3bef51cc8873460a546dee206d91a394dc7aaf81250fcb6080585216fb211af64676ad9176d28e9d0e03f1bd050976c604659b634a4d9d2c7ee884203ebb
+DIST coverage-6.4.1.tar.gz 719971 BLAKE2B 047c57ffae092a9e04470a64d090ee7c3274c5ab60dd69d67c8151e85954b5cf2c34748f2e2641ac8229ed66a238e994d93b17f7ac4c92bce3eb919a5b7f1795 SHA512 d7b40bae4fee36c71befb490ee3341b023c0bff38ed2c97cf57a65e47be44b71685b130879640b1c8560359dbc31b0da523f5c363f3544ff666b804c7af122f0
+EBUILD coverage-6.4.1.ebuild 1678 BLAKE2B c7e457ab2b0d46e6550793f295ee6294b70f099aa0c6be6a3a3a8505cfd8dc8dce1270b550dd6a73c838d4aaea0c99d20c12c6fdab32bc05e62e45c902df6275 SHA512 a9a31b2d0883fb30bf389104f9d884313bb6906bc71f8093931021f7c9c5e441304ae536a33c2948c5df69a45532dad6ff9c531533ff23511853901d7d8ec224
 MISC metadata.xml 714 BLAKE2B c0d2641f795a21a80b6fa36206973f41421effe055e4c5e41bf752869759eb48e8fe42a0ab00af55b5d5111bfaccd330676d63e263013dc9bd3c344cb038a3a6 SHA512 412d70b7c9c2871bb93ae6ed6ae110a9f29c26957f6e1b24cc531c7d49f292ecb5206df10b409f2e44d2f814b119ef4ed973bca608df999026bda8df2156df24
diff --git a/dev-python/coverage/coverage-6.3.2-r1.ebuild b/dev-python/coverage/coverage-6.3.2-r1.ebuild
deleted file mode 100644
index ab6c7ce5e9a9..000000000000
--- a/dev-python/coverage/coverage-6.3.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-6.4.1.ebuild b/dev-python/coverage/coverage-6.4.1.ebuild
new file mode 100644
index 000000000000..46cfdde3d0d1
--- /dev/null
+++ b/dev-python/coverage/coverage-6.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/^addopts/s:-q -n auto::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_TEST_TRACER=${1}
+	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
+	epytest tests
+}
+
+python_test() {
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" \
+			coverage/ || die
+		test_tracer c
+		rm coverage/*.so || die
+	else
+		test_tracer py
+	fi
+}
diff --git a/dev-python/cppy/Manifest b/dev-python/cppy/Manifest
index 17bc9f52548a..fa5e7c02a67c 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,5 +1,3 @@
-DIST cppy-1.2.0.tar.gz 16701 BLAKE2B 0d77f742f5436145ef5923253c1e4949352b6dce904519d655943eb9e9293a47ef19471fde0aefd914309677db0aa5ca1ddb81a2b1e6541b2ff5724b734f8c5b SHA512 074496bc08b1e163610fcd8fc15225a6110ea874a1e1680ec85e449fb8de77dda548d170c631fc90c3cb81d8fa090d2e1d8f19c156e34b0fa1da2b1f20b531fa
 DIST cppy-1.2.1.tar.gz 18040 BLAKE2B f828fd6e7b401ea2f7672ade94acd8014e77890d68cf09c4f189f4c8776875130db185a7458016dd20f8b3eae536ad6794a79a0aab6894092b26ea341e73e309 SHA512 4215051ce848faccfabcfbd840a343bc81d1ef0321ff0837354560dc6208cc235a6a130bab96f8fe42d5f630d1dfc20795928c64f6204a49e8f04b3fda8f9c90
-EBUILD cppy-1.2.0-r1.ebuild 606 BLAKE2B 8597db909d4cec407deb1b0eedc395e92df668bd8a7f2e395c2482acb74b4da312263d6ff57c7eaa93d72506aa1d0ff0f5e37a7ee35ad29421d43585e0a5b592 SHA512 2c3d8a255b4a6ad9de84f59ed1d63a10e38fb3a879c78dd97094b00ba751d7c71359e7bdf93348b5e9b8860177400e7e6a2d9a0796ac6bda98713d7d0f1be26a
-EBUILD cppy-1.2.1-r1.ebuild 620 BLAKE2B 2e6eb2053ef84f9906309a55d0c2e70e20ac5ef32a1bbddb064c8fe4799e781f030199a1f20a39064dd48ef465b25429c8ebf516a32096a28d54950f98da8bb8 SHA512 585c6d78e7e7915dac72f3777ed9500d1ee77f5c45fbde6797bd9699e62495ca7fa998389fceb382d9807e47da06ee507a9632b59770ff19be845ea00c20a665
+EBUILD cppy-1.2.1-r1.ebuild 618 BLAKE2B 5a2ac3ac36e9d5df7d1a5663c2b644fdff636a3b737a809f467301598604961eabd4c52dc5de6f74733b88ec241c9d0bcab1afb9d2e1bf62dde7e9d58db47b03 SHA512 e46b08a6d527e8a59b924b1d2013fea4ed8f9eb4f14d443bebaa57b83a586e860fb3e1ed26a122f7c0d9470f7e2db3e4d2e90e8b99d7ac3596d25e424f6d5dd8
 MISC metadata.xml 602 BLAKE2B fc0deb89e55e63a036cc7eee611ded9481592777d978e9bdaec313b838574bbc7a21bd71e28f99121d2166f28fd2f0cc6d37786790a75344467708fc7203ab8e SHA512 61f35eb674dc1eef1258dcc8ebe128c004f3843bc17bdb828b83d5f719430746922518494686d13825c4e0644fbd4d0f907e78c1b6405e9547dab7ae2ed653c8
diff --git a/dev-python/cppy/cppy-1.2.0-r1.ebuild b/dev-python/cppy/cppy-1.2.0-r1.ebuild
deleted file mode 100644
index f55edd5bf13f..000000000000
--- a/dev-python/cppy/cppy-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="C++ header library which makes it easier to write Python extension modules"
-HOMEPAGE="https://pypi.org/project/cppy"
-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"
-
-# bug #842408 / bug #836600
-BDEPEND="<dev-python/setuptools-61[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild
index 61c6c30f40be..68ac52b3806c 100644
--- a/dev-python/cppy/cppy-1.2.1-r1.ebuild
+++ b/dev-python/cppy/cppy-1.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # bug #836765 for setuptools >= dep
 BDEPEND=">=dev-python/setuptools-61.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index a7f9f03717bf..e71a26c4610f 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
 DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
-EBUILD crashtest-0.3.1.ebuild 517 BLAKE2B d9f0c623c57e105147cd3f504ec1163142960bffb2b0cb40ae3f2ce706106c979918c1f4ecb3140d74963ff1dc396559341034fe716713ab9c377f511ec1ae31 SHA512 0110d1bb9993ef3dba24007eaf7ec0800c6e525d585d5834179e7d8dc80fd2d4a5965ed9fbe31f2c3e8737d5a80d52bd0897007bd196686847c88b93c7b37d26
+EBUILD crashtest-0.3.1-r1.ebuild 505 BLAKE2B adff71c8b2e7db59b5bc92da44cf33deec034b96c22eb55cfcf85d448be35a10011580ae45773853a4f5cd5e01e7100ae8fa91192f479211bccef068505d0279 SHA512 9a3ccd69086bc6c19932e3dc112b8ddf0373cfea8c90fa31f20f5aa92eb65d4c41ffabb2f0403113b5e262ca483922170fdc597442e32e381dc76aa3f85c2019
 MISC metadata.xml 416 BLAKE2B f6b8728929c04221908904b4e43f0fa00c480b193537b519558a1f9e83bd99ab131c3b28d03a624690c4891feee71b6b90bbed6fdc0aa89a4f14dabe282c8343 SHA512 55c2a10cf5611aad9461b1aef9ec28f699a46237a7616e1a834769d20a00f9e4477e2910cc3117a71acd7512ee9812b7658010234387560445c484ce3feabe84
diff --git a/dev-python/crashtest/crashtest-0.3.1-r1.ebuild b/dev-python/crashtest/crashtest-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..ce2e96887842
--- /dev/null
+++ b/dev-python/crashtest/crashtest-0.3.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python library that makes exceptions handling and inspection easier"
+HOMEPAGE="https://github.com/sdispater/crashtest"
+SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
deleted file mode 100644
index 865d0fd5a700..000000000000
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library that makes exceptions handling and inspection easier"
-HOMEPAGE="https://github.com/sdispater/crashtest"
-SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/crcmod/Manifest b/dev-python/crcmod/Manifest
index 3a1d5d28eded..05724bbee92e 100644
--- a/dev-python/crcmod/Manifest
+++ b/dev-python/crcmod/Manifest
@@ -1,3 +1,3 @@
 DIST crcmod-1.7.tar.gz 89670 BLAKE2B 542bdde18f4565f574a2746de5e1fcb10d015d5c89f3eba7a0c316a3e53eb5a895664e2f51e54dcbab7d2ee6f30055137f22498f44b6c27d40d0692ff9652813 SHA512 3c2f65004761c84f19d6ba95a0af74512108bad5007d9e20f8e684822e4196ce17073e58b47d2fa997e058e3d82782f3393458b6f0e86935418f38877d319a31
-EBUILD crcmod-1.7-r5.ebuild 550 BLAKE2B 932d27df0f0971ba81914b5699d17c3d3f9c8f812337e43e97bdf7128b4352274387a971bd9a12f626d8130963e7212267155b609f08e58d7e9d65d70372e221 SHA512 76f3202f49bee76193c7f7a9584c31d2099304d200b7ce88d5ec5f7eb56ae3c262dc8d0d594c4128fb77eeff87739948addcaa246a0146f188a66cdfd8ab7933
+EBUILD crcmod-1.7-r5.ebuild 550 BLAKE2B 154ce2fec5861c05513dbee0242f094a5d310f1e20c89ed43080573dd316000f0df17e0582722bef88600530723103b99b6dcbd77644c5fd5b3b395d1eb21a9b SHA512 278eb6fc851f88e3c71e8cf5a66981c414fd27a7c83de862ecfef13b7015a2c8a54a0087e1e7952ccd597473ee7a761b9726427934792ad66e4c0039d18d5052
 MISC metadata.xml 637 BLAKE2B 213c8e3713836358c5cebc7e5c208901842cd888c8e7ddfde57ab1ff2bb485cbd8610d92530acc641cac68897f5772e50aabcb054564123e43feea49c62bec54 SHA512 5b3d8e42a1fe6f30c7ff82ea0a478f41eea044c4dbdb3a64af067b927ffdfb3a13967cf5265bc6c49b2027366094fdb80f1e75df1ae194ba694065dce51b23b8
diff --git a/dev-python/crcmod/crcmod-1.7-r5.ebuild b/dev-python/crcmod/crcmod-1.7-r5.ebuild
index 6c811d05d424..196fbe612ae1 100644
--- a/dev-python/crcmod/crcmod-1.7-r5.ebuild
+++ b/dev-python/crcmod/crcmod-1.7-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 4e1422fe6b17..df096b31aa8d 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,3 @@
-DIST croniter-1.3.4.tar.gz 39351 BLAKE2B 38701e865b67a382e8c6f511ebf801c83e27aec31cc0f0636b9f8a7b13405a27531b3314523ac819d5193c3907f8aecfc6132901856a1565e6c986ea73dceed0 SHA512 aa55f8849abfa0c8ff24514051362e21fab821d2ffcde182d9e0f267b3b5e1706278710eae80df3ced82a1444323af44eff25cfc34ab92bd15fbb31d7d791037
-EBUILD croniter-1.3.4.ebuild 650 BLAKE2B 89cb525f6f3aa36302839450af0e53a556fb709904955ede69a2b640592f69d802ad43486d4c370c2b2be659fddb326a47e7ef1e7edf4380b4b4f43cf4c10a5f SHA512 c3260199ff52801817a92e16052dcf2330e26c9e1027cb61a141637716da99f01cc7645e245e1bd8222f5ebb2e9e549592b9a5031bcc0cbe655fe843b3cb9429
+DIST croniter-1.3.5.tar.gz 38606 BLAKE2B 45586ef4ef6622caca3611fd596818a875a451ade6353cf4a99219f38ab76e72656c885bd61238670a809203d487d78d884d700c5e2e4c6eb1bdf44dfc14a1c4 SHA512 9b59334f8537cd5b48e17be2c83fcb78f2c0a8c62b7c28091600c84cf202e6847d7d1d40ff5ebb57cac3a713013ca247620e348aa9f3a408483cf4110a88545f
+EBUILD croniter-1.3.5.ebuild 656 BLAKE2B 97a74e04cbb2025661b8a3becbadf2c677061c34fd68bcf9fa5fb7173f4e04d77fd60e3802443fef041509a133838d62c3742dbc605160076cd18a26d86bca7b SHA512 ff46fc214548e114a89e8058881110b5de3924c27e4c2a977df0c6bcfdacd36fa37d5ebae331e9a4e40ddcdc6c6580a30155aa72a11239278f7e6bee11c6ecef
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-1.3.4.ebuild b/dev-python/croniter/croniter-1.3.4.ebuild
deleted file mode 100644
index 0f8e9044d11b..000000000000
--- a/dev-python/croniter/croniter-1.3.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/croniter/croniter-1.3.5.ebuild b/dev-python/croniter/croniter-1.3.5.ebuild
new file mode 100644
index 000000000000..5fedffe476ce
--- /dev/null
+++ b/dev-python/croniter/croniter-1.3.5.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/cryptography/Manifest b/dev-python/cryptography/Manifest
index 809e3b8ebf64..667c92af10b0 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -9,13 +9,11 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
-DIST cryptography-37.0.0.tar.gz 584360 BLAKE2B d2ff4e0185ea5ab8a5d3d3a1a9f67a87aeca6b01777c074b51bb936b4c7c8f8e46fd39c7ab6cb56d7a887c4fd83157a9fa650059aff51577c5d948fbe743e6d0 SHA512 bc73a4e73cdfdb0379535551c524dfcd06ee9d11f91bc4a8e8d725a9997b3468973c37b90d40f21237b9c66de78a13caf396a5bff8779c651f8a244704afc5a2
-DIST cryptography-37.0.1.tar.gz 585248 BLAKE2B c25d62110e49b52849856fa04fc62a72f7f57d8f7b6237e68a5aed4af5b770819440d0980ff0b3535dca076856a6c7bcf546ada705270bba9f41266d267f76f5 SHA512 751029ecfb911e70cd402f7bf1573ec6b4e1dd98bed27723e8c48e918cb417b2327af84f173dd21c986fe1d39a5721df38ccaa37f8b5ed569290c66c5e42f34a
 DIST cryptography-37.0.2.tar.gz 585433 BLAKE2B fe70543d53b1cf5d6986a9d8f18394c1a32bbeb19e39bc9ce185cfb1f21a78a94beb228a078d7d74aa070d5899705a5a0dbf4b4b46ab6f43a4cece1bb6647ddc SHA512 28d8b52ca457dec0c854ffb798c9ecb4316c3f161ece5c304c7a5e0cdc86e8b567f1cea82f96f23b01af611e04f48fa310c0e78b3175f4b06e9175acc6a2de45
+DIST cryptography-37.0.3.tar.gz 585915 BLAKE2B a323ea941f34b6008604770d9a9a23acd78665dc6877e2e60087abf3d1495c0bb7fe8ac7d11d55c64006be62b27859ed0dbd4e1ac43f7784f8b187a91d708516 SHA512 ce5aefd6b855c32b75b566ffdcd38e6ba264f897e11edea865010e7d9f5fa72e517e042416109ab36e8558b5c4340e68b5ed654ec9485a5ab7f7fc11262e40d0
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-DIST cryptography_vectors-37.0.0.tar.gz 35240400 BLAKE2B 23d7e6212809a9e3269ae8f2d3714450032c774516e44f083a74ad6f0d500ce2500a20bf0f12b31abfc9ef774984a1d587019489743d2e04e983ae9842b66a1b SHA512 41f12f0593fe2c57f77bb76226d685c8bb0f7f8de0f0b32e0991d55571842f2639399d719855cc6800e29a85ec4f45a1b93a7b10d290ed66112f5b5d8ddc718c
-DIST cryptography_vectors-37.0.1.tar.gz 35240482 BLAKE2B 031587f4ab33348c366654a4717f18bf8a252d428309a94807cf57f7fc39858dd3f33376ad1d5112e14023370ae3d39939e9f0bba54306a55c643c94b66f9a0f SHA512 ed34add6fd9821412bd03214d197693d66d7e0507c5d9a1ce888c020052776952f1e9f2f3e4c1437198aa77cf459cedf9366f4c56f518211c7e4611760b9558d
 DIST cryptography_vectors-37.0.2.tar.gz 35240459 BLAKE2B d490cb95b4f32c508867fda059ddbdb5c1bbf46cad709f0e66148cdb5934fbbadd3078f361f4b5bf2e1e30b277252e3df7337fcd4e4694cd9e878c0b70fd71e0 SHA512 320a4c13f076d6d7bef0437b8b57a76496c51d0266c9958aaeadf73e9d07510e1219f3fa08aee1b30cb6122daf4c0b85538c5be95f1dbd450bacb8cbe464892b
+DIST cryptography_vectors-37.0.3.tar.gz 35242917 BLAKE2B 4eeaa7a3da89e950bc5547beae25d45760578b08246b8cf355a86649650abf23ddcbb0b7b6ac98ee6519044fa4a0cc027b612cc9853362e91b051e4b5ac2fefe SHA512 fc9cca105656fa1088b07379bd7c50af7c707ee13e25cf26c3d58f6c9aa571c7c14e676a237943fe98b47d7f398bc7ddfb8a0289b1dfc523a858f9b2ead796ee
 DIST indoc-0.3.6.crate 9663 BLAKE2B ca7a1f4d3cbedbee0ba0a3f19c4b3352ff90927eef744b7e4f1d60855d4dc4265202972e81e0fc06d1222d8d5fb322efc4ef669af7396b251248a1e45c91def2 SHA512 e900aa3b001df0fdbf1f543d8b679af317e85a1f95e26fc556213f2826a4f6c82d8c4f3f82de435e3591f8bc14e78eb22668d901dcbe2287f46740e0291afacd
 DIST indoc-impl-0.3.6.crate 7933 BLAKE2B 93e232e360e8f02943ef9a9cabf16bc863d792d8096b8d9a13a07f0b7b396db590abf83b5444f082317059dad7578ffae974dbc8a7e56fbdbab817b7d2534725 SHA512 18406587ee56a09dd2062cee456af697efa903343de42c0ff618a64ddf2bf7efed5da02e7220fed2636c555a6ae18059018f5c3c9b44ba8d3e5a34ea5b53c806
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
@@ -52,8 +50,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
 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 cryptography-3.4.7-r3.ebuild 2202 BLAKE2B 853647abd066d9f7bb5367d624b6ad18a74380266fe8a518b35afa8dd88989245799c60d845ded19afa437d949b8697fa692954452a9f894e9a39eac8d49f564 SHA512 550ae95db2efe4bfcd0089045f9da7a5931f4419562df0dc4becbe13b8bb4bd6d5ee3ecdae74832ce3019628cd01f7537251ebe573e24de95121abbee2ee428d
-EBUILD cryptography-37.0.0.ebuild 2973 BLAKE2B a0eea21097b963db84124b4bd5d461a8351dfc8b34a22769375dbdb7c5412c83da155c1826be9aa3819cb5849ff40b5d2aea37ce14f52c2558d19dc2f033c24d SHA512 d8d68d7944dcd63215331cfd34ae19acad8b9e79c585fb1d3967c3d102174458bf96e968093556b8747b0d768af1981258d6a832993c8dfb8ff1e4d2a3e758cf
-EBUILD cryptography-37.0.1.ebuild 2973 BLAKE2B a0eea21097b963db84124b4bd5d461a8351dfc8b34a22769375dbdb7c5412c83da155c1826be9aa3819cb5849ff40b5d2aea37ce14f52c2558d19dc2f033c24d SHA512 d8d68d7944dcd63215331cfd34ae19acad8b9e79c585fb1d3967c3d102174458bf96e968093556b8747b0d768af1981258d6a832993c8dfb8ff1e4d2a3e758cf
-EBUILD cryptography-37.0.2.ebuild 2944 BLAKE2B c2f7878a26f0997aa943ecb2fbae9f99bcb2c5b14e7cb1a1c3e60db1260efc86568b066283fd045cb797db1754cc1d49ac6b2790df009f475a087129b635e646 SHA512 9357eb9644a2298697bee08353350d64a875febb31e83d021ca8502352804dd224d7e7edb9cf9e7d52ae4fc24633264a40be23a78f3d86c854c138015689004e
+EBUILD cryptography-3.4.7-r3.ebuild 2202 BLAKE2B 3f4040d101798edd5c5cac511230db45149a71f22649682454d9a6ee4c7b77691b47890fd25a999e706109a9368594d9536aa4d694c312f4b151cbe93159d932 SHA512 e8e59094657f64585f4c1d3f126da221b542196e89da62891b114fcf4a7ca64680e8e188bd9a123f79892fd9223c86993efa56475f56cbe9e8b2d898f5ee39a1
+EBUILD cryptography-37.0.2-r1.ebuild 2944 BLAKE2B 9d1342b9bc50e963cfcbdc1d2212b80d7a778c408b0614e49cb417161ef3c5fb9c7e0fd452d47f4f1835ec4c6cd3759799992c812db90dc79021ca65c796c5f5 SHA512 8ab91ceff0dd803379be6f0623cb63dd33b7fe4c147b68c78f716ddacdfc58a4171d5351225dd2199915393ff336e4f2c8afa4779451ca668044ad54d68860b4
+EBUILD cryptography-37.0.3.ebuild 2957 BLAKE2B 8d4886736954913782e0f2e1bdf56cefd23ae1863c1413637f08d05fb5d4fad3c11fdcea4404a3b8c284428c1445382be8b6b34246a2761d2c644314e3d438bb SHA512 c0ac3a44867a489177704180ea53aa60b79083c0e9662388d668906785cc84235a6f2f7c4d61c1357314f77113b1875a23450a4fd8c0e80c850e6905020fab55
 MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
diff --git a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
index 50fb328f2117..d1488abb6878 100644
--- a/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 multiprocessing
diff --git a/dev-python/cryptography/cryptography-37.0.0.ebuild b/dev-python/cryptography/cryptography-37.0.0.ebuild
deleted file mode 100644
index 982405fb07d6..000000000000
--- a/dev-python/cryptography/cryptography-37.0.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector-0.11.4
-	aliasable-0.1.3
-	asn1-0.8.7
-	asn1_derive-0.8.7
-	autocfg-1.1.0
-	base64-0.13.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	chrono-0.4.19
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.10.0
-	ouroboros-0.15.0
-	ouroboros_macro-0.15.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	pem-1.0.2
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.37
-	pyo3-0.15.2
-	pyo3-build-config-0.15.2
-	pyo3-macros-0.15.2
-	pyo3-macros-backend-0.15.2
-	quote-1.0.18
-	redox_syscall-0.2.13
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	syn-1.0.91
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	version_check-0.9.4
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	test? (
-		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
-	)
-"
-
-# extra licenses come from Rust deps
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-"
-DEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	default
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cryptography/cryptography-37.0.1.ebuild b/dev-python/cryptography/cryptography-37.0.1.ebuild
deleted file mode 100644
index 982405fb07d6..000000000000
--- a/dev-python/cryptography/cryptography-37.0.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector-0.11.4
-	aliasable-0.1.3
-	asn1-0.8.7
-	asn1_derive-0.8.7
-	autocfg-1.1.0
-	base64-0.13.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	chrono-0.4.19
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.10.0
-	ouroboros-0.15.0
-	ouroboros_macro-0.15.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	pem-1.0.2
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.37
-	pyo3-0.15.2
-	pyo3-build-config-0.15.2
-	pyo3-macros-0.15.2
-	pyo3-macros-backend-0.15.2
-	quote-1.0.18
-	redox_syscall-0.2.13
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	syn-1.0.91
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	version_check-0.9.4
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	test? (
-		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
-	)
-"
-
-# extra licenses come from Rust deps
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-"
-DEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	default
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/cryptography/cryptography-37.0.2-r1.ebuild b/dev-python/cryptography/cryptography-37.0.2-r1.ebuild
new file mode 100644
index 000000000000..587f60001335
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.2-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector-0.11.4
+	aliasable-0.1.3
+	asn1-0.8.7
+	asn1_derive-0.8.7
+	autocfg-1.1.0
+	base64-0.13.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	chrono-0.4.19
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.12
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.10.0
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-impl-0.1.18
+	pem-1.0.2
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.37
+	pyo3-0.15.2
+	pyo3-build-config-0.15.2
+	pyo3-macros-0.15.2
+	pyo3-macros-backend-0.15.2
+	quote-1.0.18
+	redox_syscall-0.2.13
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	syn-1.0.91
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	version_check-0.9.4
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? (
+		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+	)
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cryptography/cryptography-37.0.2.ebuild b/dev-python/cryptography/cryptography-37.0.2.ebuild
deleted file mode 100644
index f4a88413656e..000000000000
--- a/dev-python/cryptography/cryptography-37.0.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CARGO_OPTIONAL=yes
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-CRATES="
-	Inflector-0.11.4
-	aliasable-0.1.3
-	asn1-0.8.7
-	asn1_derive-0.8.7
-	autocfg-1.1.0
-	base64-0.13.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	chrono-0.4.19
-	indoc-0.3.6
-	indoc-impl-0.3.6
-	instant-0.1.12
-	lazy_static-1.4.0
-	libc-0.2.124
-	lock_api-0.4.7
-	num-integer-0.1.44
-	num-traits-0.2.14
-	once_cell-1.10.0
-	ouroboros-0.15.0
-	ouroboros_macro-0.15.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	paste-0.1.18
-	paste-impl-0.1.18
-	pem-1.0.2
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	proc-macro2-1.0.37
-	pyo3-0.15.2
-	pyo3-build-config-0.15.2
-	pyo3-macros-0.15.2
-	pyo3-macros-backend-0.15.2
-	quote-1.0.18
-	redox_syscall-0.2.13
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	stable_deref_trait-1.2.0
-	syn-1.0.91
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	version_check-0.9.4
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-$(ver_cut 1-3)
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="
-	https://github.com/pyca/cryptography/
-	https://pypi.org/project/cryptography/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	test? (
-		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
-	)
-"
-
-# extra licenses come from Rust deps
-LICENSE="Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-"
-DEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-# Files built without CFLAGS/LDFLAGS, acceptable for rust
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	cargo_src_unpack
-}
-
-src_prepare() {
-	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
-
-	default
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
-	local EPYTEST_IGNORE=(
-		tests/bench
-	)
-	epytest -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/cryptography/cryptography-37.0.3.ebuild b/dev-python/cryptography/cryptography-37.0.3.ebuild
new file mode 100644
index 000000000000..0a6fca388dd7
--- /dev/null
+++ b/dev-python/cryptography/cryptography-37.0.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+CRATES="
+	Inflector-0.11.4
+	aliasable-0.1.3
+	asn1-0.8.7
+	asn1_derive-0.8.7
+	autocfg-1.1.0
+	base64-0.13.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	chrono-0.4.19
+	indoc-0.3.6
+	indoc-impl-0.3.6
+	instant-0.1.12
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	num-integer-0.1.44
+	num-traits-0.2.14
+	once_cell-1.10.0
+	ouroboros-0.15.0
+	ouroboros_macro-0.15.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	paste-0.1.18
+	paste-impl-0.1.18
+	pem-1.0.2
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.37
+	pyo3-0.15.2
+	pyo3-build-config-0.15.2
+	pyo3-macros-0.15.2
+	pyo3-macros-backend-0.15.2
+	quote-1.0.18
+	redox_syscall-0.2.13
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	syn-1.0.91
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	version_check-0.9.4
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	test? (
+		mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz
+	)
+"
+
+# extra licenses come from Rust deps
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2o-r6:0=
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	default
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/csscompressor/Manifest b/dev-python/csscompressor/Manifest
index a5330f7e3127..0bb354e06659 100644
--- a/dev-python/csscompressor/Manifest
+++ b/dev-python/csscompressor/Manifest
@@ -1,3 +1,3 @@
 DIST csscompressor-0.9.5.tar.gz 237808 BLAKE2B 26d9e433513577a2b76660eef2ee0fc0fd3b95d28bcfb06ccc38dfd6f524d63414ba9bda297c8e4622cbd663e4752051717af506064509bdee14f0360ffdc481 SHA512 aee16b5af8b1b780a0fef10d359864a5a21a90b7196740c8b7efef25d1ba4d8197e9fce03483d0e2331abc736290cc6b862e43ee65d1b76260310aea65fc6eb6
-EBUILD csscompressor-0.9.5.ebuild 451 BLAKE2B da6170daa0ab8092758b06bd0837b64ad5be58b9d09fc7675ff67e72af744b4e0bb170c61c0b2b581273c754179b1f787e588adba4a06954ff7f6c65b41c039f SHA512 7150c9b5b14b6779ab4b3357895735619d46c47aabe149d3e6d1771f3f8037764c93ac9b87075dd585823883c0974fc0a80aafe05e15d1bd9d66d5c6ccea0b78
+EBUILD csscompressor-0.9.5-r1.ebuild 451 BLAKE2B 563319f0eb51a78ed5e0b47e4b0565d7823d9e2001380a4b30c34316c152ff8e0a1aa874281154e4679111f4f5978d44ce3737a04b28597972ddfead04e64877 SHA512 7d2603a369639423aca73bccb4d3ad9447e0a513146ca3fb94c849dbe9fcaa82758489980de00acf6af567addbae0c0729987a29b441bbcc252dfef87ec780be
 MISC metadata.xml 402 BLAKE2B f1cc451a52cade36de3a7311417e31831d67ff14d9ab770dee735fbe12ac58d7431446a1c19ad93866732992257acc4737eb0a633f13b511b3595a7c6a3baa1e SHA512 04ecdec5f3d281f51faf5c4d399c21929947fb6eda5f0ba568f23c1690b6e146c5000ef9bdabbb06c2c7c0b464d3cb17164c768e18dab3ad68eb59ac0a3514a4
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..2258ba579ed7
--- /dev/null
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python port of YUI CSS Compressor"
+HOMEPAGE="
+	https://github.com/sprymix/csscompressor
+	https://pypi.org/project/csscompressor/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/csscompressor/csscompressor-0.9.5.ebuild b/dev-python/csscompressor/csscompressor-0.9.5.ebuild
deleted file mode 100644
index f9312fcde96f..000000000000
--- a/dev-python/csscompressor/csscompressor-0.9.5.ebuild
+++ /dev/null
@@ -1,21 +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 python port of YUI CSS Compressor"
-HOMEPAGE="
-	https://github.com/sprymix/csscompressor
-	https://pypi.org/project/csscompressor/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index a73177838c2e..bc7d303097f2 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,4 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0-r1.ebuild 708 BLAKE2B 58f6aba722d59c1052b39abe953ce38c41fa3e2ec350dd5508a8ae82c1573d4dbdcc4b220c7d9a907fb5143ba591aa55a2dc64a0bd58662358aff422f075149d SHA512 0eb46161fd672baec4769b3e3c8af35aac89a07b447685451aa762d287038cdb7b005eeb87e547484895a686c2aa1e9be7e04203d07597424d2d0074fbdf724f
-EBUILD cssselect-1.1.0-r2.ebuild 761 BLAKE2B c91f237c437a92137b3327e637f13bc77085a4c98f7e98b6985c95553b0c5a9a3608f3e326f9afb51d44b112a63200ef007931b8b2d291e206438022b04d6014 SHA512 80206ee362969d5ed3b3ad67729fa88604084e8f1a32df2a6e0758f7eb748f263b02444cd343576ec07c2326f8cc740f503172f52ef6383d3e402fb20c1a4b31
+EBUILD cssselect-1.1.0-r2.ebuild 753 BLAKE2B 85b7f4c0be08159de22d10f6439736581fe111704ad64d111769f6b9ae8b15f695d11bd9c93b17ac7b8c021e1c5a1381f205d5b0c64b09404b0e502f04ae05c5 SHA512 03b655fd3b7b5941257a9463eb4df80c0d9c3b4b47001863e3cb1e41fc2d40e49caf4d79b10cab84f311a90fc8826ca13ae8eef87ad494de36fc030857d5e97d
 MISC metadata.xml 393 BLAKE2B dceb62643e3249ad34ada4085344bd9cc2c23aa753826a1e4f89e2876123c7b38b4b88fd5b90520423dc4ca88b5e79900db0554f66586c6ad4327e73f6bb7711 SHA512 de723a2756f71733d018c97d6f8bce62f78f1817a7c8a9302e793914207564377a7b8f07dfc8c3dddef58791f0394791280da5055af0d4c499fe033e199b42b1
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
deleted file mode 100644
index bcfa22c1f08c..000000000000
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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="parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/
-	https://github.com/scrapy/cssselect"
-SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/cssselect/cssselect-1.1.0-r2.ebuild b/dev-python/cssselect/cssselect-1.1.0-r2.ebuild
index 97d73efdb230..87223c5a9901 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r2.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index b1993c1f5bd4..782a1427946a 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,5 +1,3 @@
-DIST cssselect2-0.5.0.tar.gz 34918 BLAKE2B 12ec30d42caa916e487674ccb910def00acca3f47b3d9e69f376614b997e68f4dae1632a852efd0b9d47c321534935d029fd96028dce9b11e391402b203fbdbd SHA512 869dbce3915db87727b09016c094b908b0055693db238a24c89b0482fed64d7e1811ad2db407faee32638566fd4e47402f05155dc2d8887e98f2107f9b8633c2
 DIST cssselect2-0.6.0.tar.gz 35442 BLAKE2B eb42c6abed531d9ece07ae5aa442be0c0ca926f982987ede1c5ba3e391950fcf88b1c322da5933842993ad5d98488e2a29aa714d1ca65b672cecbe425bac9bd7 SHA512 10cb55ebaaa16b755d85f1e511ae0281fb017d6937750392ae1da7f32d51ff944fb14c6d1c9ea5f42734450b719157ded116dc14ef471a9a20fcc43fb6682308
-EBUILD cssselect2-0.5.0.ebuild 733 BLAKE2B e9e9aad7d94d5a0215c787e3c3e2e9505ee90da41d33b4e3e536f8dc8d899059a7e0f70c2d11f27fbbfbf43e394d825fccba1a78e749f708f64a0b151d37c997 SHA512 15609aa8364a80ed0a3f1de2b68337e4d25e751e4b136ae6d589ba921e35df35fa7b45909e772c156ece50bd5dc1088bf06bd3e290f8ae899529f634f34cf80b
-EBUILD cssselect2-0.6.0.ebuild 734 BLAKE2B 5a843ff7e236b439f019299caa90b37074264a0225a7547a2e396642850aa324f4b558f2019d88fb9e3370f31be0a8f67381226d2b4da6d66b10a4320e2180d0 SHA512 17c63beb527e28ac2221a945c09a02f1bcccd6d18920eeb4d3a1fb74094b9fccab43e458db5a3de8951bd612420f8e89b048927b655df058b834d5232a1b1c9e
+EBUILD cssselect2-0.6.0.ebuild 737 BLAKE2B 31878e5b4c0ea50f469d162656a3a4b5734eb06678d37e71a249a283121137e217daac1d7de63448cd2daf9cc2c3e948427375d1b7fcde3776f064b6758aee81 SHA512 76d21bb2e1cc1f700ba58f0905667e3fc5a780794a2f824725d9cee360305d0dc7685825e86552db6d8cbdda034a51d45cab5e22c449d64cfe496cd9235118a4
 MISC metadata.xml 394 BLAKE2B 23a6ce3791a44c2a50b0a1853f1860ec76c15ca2a437e8406ef8459941921f8f92905933b59841ab9e3ef429a40435e2e480de38311f9bb078af747105d6eb41 SHA512 1c7692aebe1ec93fddf5e536af98a4be44c6610f8bfaff1f58ace0562916c24c5bc67db8455c1cc75eba3296b34a4fce3e72dd770abe4f51c1e83798ee9887eb
diff --git a/dev-python/cssselect2/cssselect2-0.5.0.ebuild b/dev-python/cssselect2/cssselect2-0.5.0.ebuild
deleted file mode 100644
index b33af5b1ff59..000000000000
--- a/dev-python/cssselect2/cssselect2-0.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="
-	https://cssselect2.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect2/
-	https://github.com/Kozea/cssselect2/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-	dev-python/webencodings[${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/cssselect2/cssselect2-0.6.0.ebuild b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
index 644210e36848..f5154b04c974 100644
--- a/dev-python/cssselect2/cssselect2-0.6.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.6.0.ebuild
@@ -4,12 +4,13 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
 HOMEPAGE="
-	https://cssselect2.readthedocs.io/en/latest/
+	https://doc.courtbouillon.org/cssselect2/stable/
 	https://pypi.org/project/cssselect2/
 	https://github.com/Kozea/cssselect2/
 "
@@ -17,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tinycss2[${PYTHON_USEDEP}]
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 884536918e0a..97ab3ae13f90 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,7 @@
 DIST cssutils-2.4.0.tar.gz 725986 BLAKE2B 2f8d0166288e3af1f838fec3443293b4166bab6e2e115e198f3e6f7a0ec0949262de77eaeebe7437b3cf27567780f988884ce1225b94c379cabddcae0fe10543 SHA512 53e18f9d06905dbda5382a3ed6ef1808571e8a32204864364b0a344e641c774f0998bf23ad0997b34ddbe9f04d3d2c7d622249cfeb0a9e846f7fb1530ae9b12b
+DIST cssutils-2.4.1.tar.gz 726348 BLAKE2B a6049a6326c9ffaf399b163a1819bff58445ab798a9c6b697abcadf29fcd00ef4812b516ad7b8c4bfdfd0df804a3ed9a1bbde192783600939b485de1d0b2da38 SHA512 f1107a761f20204c214a09647dde3d2e1900ccbe71ecca332049441f3c8916714efaece2b702167326fde016bd1817a76a4fffa6cd4fda9f91359d0a055fe7a3
+DIST cssutils-2.4.2.tar.gz 726519 BLAKE2B c087e06d25aa78cac35e936fe06d37ffc973b022a611a4a294683929b4c553adfbeb475330e8ce4b27b5aea3b9d4c89df6f52d02fef49236a81245505ab80d5b SHA512 0757fa73170c0287ee7be9c931103bb1781c93fba63870bb11e257797af7033e77e5417ed1c7aa219eeaff5c524a84c920ead0e2b8a4599ce499b17a83fdc8f7
 EBUILD cssutils-2.4.0.ebuild 908 BLAKE2B 9ab0f74daca9b3845b326459c6ccc760c28bf50441489901c05955ea5b10fb3bf238d17ea591a7e8d6022affa0b287c97d64de469ba7a86475b4678e6a0cb151 SHA512 44e411d5b60586331c623c4c827acc4f1b40d8420be5955cdceac41d5cdc8f415952a87d8b4103aabc598b8026bfbecd87487771199666ae6f1a2c129f11d715
+EBUILD cssutils-2.4.1.ebuild 925 BLAKE2B 25b889fcb417cd1a084d85665116a3a2914f591a674bd5252651aa00b729a0f2d06504835d9761a66cdfab0fbcd558cf41250628c33c00a29dfd1f8327afc5b7 SHA512 1c9324739623c0e2df3db857adb8f9c883637ca17c94980b89eae1536fe00cfa7a71fbbedba69579183ec557e3437cd9efa237a29d3b754928599551385506cc
+EBUILD cssutils-2.4.2.ebuild 974 BLAKE2B 9e98833018105a8dc6d092847e8e511482a075027e84296ee32c39016f8bbb5603be54ac5b42c079a00630eb263e5fddf548087bca350e85cfb8f35fda0562bf SHA512 b091be7c243b4bb3acb9bedcc9abc8057a97631a8a3e51229a15bbd8afb138387eb31b2401286b74d74a6b92728caf0a6ff7b4e068a0973d14d95bd5129f7a7d
 MISC metadata.xml 404 BLAKE2B 799ecc65093102f5dc56c272245253ad76e69ade2196953bc37547408cbec9c3259c05dd75838c23027cb6a348d03586d2e1d61d37713401ae3cbcfb330275e9 SHA512 b009e78386aee2e8405406ed455c5432e00d5990ca86b49e6ac5db4e3e06102fb968cdc7b55b824c3451156fe2501e3f1deed1f31b48cd1916f90ef515dd8e4e
diff --git a/dev-python/cssutils/cssutils-2.4.1.ebuild b/dev-python/cssutils/cssutils-2.4.1.ebuild
new file mode 100644
index 000000000000..cb097928cb94
--- /dev/null
+++ b/dev-python/cssutils/cssutils-2.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="
+	https://pypi.org/project/cssutils/
+	https://github.com/jaraco/cssutils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	encutils/__init__.py::encutils
+	cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
+	examples/website.py::website.logging
+)
diff --git a/dev-python/cssutils/cssutils-2.4.2.ebuild b/dev-python/cssutils/cssutils-2.4.2.ebuild
new file mode 100644
index 000000000000..272b19e506aa
--- /dev/null
+++ b/dev-python/cssutils/cssutils-2.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library"
+HOMEPAGE="
+	https://pypi.org/project/cssutils/
+	https://github.com/jaraco/cssutils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	encutils/__init__.py::encutils
+	cssutils/tests/test_parse.py::CSSParserTestCase::test_parseUrl
+	examples/website.py::website.logging
+)
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index 9295bbaf0056..63c7f65259dd 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,5 +1,3 @@
-DIST csvkit-1.0.6.tar.gz 3784737 BLAKE2B b1e4583443cbfc62f713d3b311bbe313cf4e69b7aa5aa13dc6970375a727a804ba1dbd176b25487027d3bc1a5696f2ce649a460c91ef7c5591c33bb3c6f48c33 SHA512 fb37404405f2f2c0bf803a1df8186aa9e3b11cbf3c4f6e1fe6dc06d53730aa91d462bebcca3917e9a451f1d81df053abd9ceedfaab085ab696f9ba701c873323
 DIST csvkit-1.0.7.tar.gz 3792335 BLAKE2B 6a9c5c1287648271eacf5f010a4b181f5e997a52d196ac4b73b95723e5ce2a3d90d0b51fe4f597b0b346292cefc16b7c283b02e9a8e56f26e10bca9b3f8622ea SHA512 c6275ed000639a1ddf15246eb1e0198787f832537a284900067e3ec65986be115709b3fd4aaf8e13a9b53160edd57ebb864ee1e73354712591c78297b6d293b7
-EBUILD csvkit-1.0.6-r1.ebuild 867 BLAKE2B e32dcab6f601367805c061b18e04a266a290a4b97547cfc6269eb9a18854712c8023ac306b3c7ea7bd17530f0917add6952488e81c6204fdcd90641a6a3f4f86 SHA512 23abcc1a4debf0cf7048c24078a8051d4b87f4aded65e9ba528f8054a6395e896cc1b8409ee0528f71e87f9d0d7378568ec01d1d9af71e04df99e3cd47715ae9
 EBUILD csvkit-1.0.7.ebuild 865 BLAKE2B 53cc6dc8796d508c340a267efa1e5634823dfc54912880f40fec5528bd5a74a9a774b853682bb4bd9db2315529ebf2ac66a04698bf216865b5dd715a1d5c5fe0 SHA512 b159f33d4b267248c2e6a2182e2140576580fa41ff109f71f73facf911da97b8855a9cefc8d38d74f96020a8f3d7e9657debeeaee0082f54329ffc7246c12378
-MISC metadata.xml 525 BLAKE2B 48931d7544ae9f2ded2274bd07764b352aefb1c89f3e8ea76230b002f8e91b12c9edb489bc960cdc8e883282de5d84f3fd73f38f6d3aab31ccb2648704de64a4 SHA512 f13fed558933dbdffcf2143d0bf23a1301d3511f2a4a989a83122e02e51c2e08a76b85734cfe6e2b0d67f439ce5133afffed4ab8a30491bce3ccce5beb6463a6
+MISC metadata.xml 626 BLAKE2B 181917319a1f5bfd6356b2fb06f91892d2432f9ae29a5586c9a6d9579747a676a42d3ee94c1601b53f8ba5c3fc9bbf162b6b3b419ccbc047ead3f1120c2bd056 SHA512 23194fc2a805904809e1df179572fe8e52344b58bda98f064a5221b3637f21f9f8f974e466e65353915b7eb9c66ae23464d1c79e92829147a7c64c6999963f56
diff --git a/dev-python/csvkit/csvkit-1.0.6-r1.ebuild b/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
deleted file mode 100644
index 33f8f4fe9e29..000000000000
--- a/dev-python/csvkit/csvkit-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A suite of utilities for converting to and working with CSV"
-HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/agate-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
-)
diff --git a/dev-python/csvkit/metadata.xml b/dev-python/csvkit/metadata.xml
index 6610659055ce..9b523bde421b 100644
--- a/dev-python/csvkit/metadata.xml
+++ b/dev-python/csvkit/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 22800564cc5c..b6174ad70ac1 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,6 +1,4 @@
 AUX cvxopt-1.3.0-versioneer-buildfix.patch 1302 BLAKE2B 40be5ad702350869162a9144504c37bae1af8375df08ca11197df2fae524876d43a37cf63566d3c3daf714034e17d5d64919e400b373b9e557907881e25d39dc SHA512 00ffcba4730e11a0860c91ae224a1c1731c2c41ebb5d3748107e17cb83fd5fef15d0568eff34901554a03666d9ecf2adc82251e455d7bf1c722be51cf28574ff
-DIST cvxopt-1.2.7.tar.gz 4115486 BLAKE2B 6db890b271d99709f433269190461291702a95874dd13b218d1529e02da80eee43385397c5dcc31099666441b51207557bc0a91c403c75aa11f04334358eefd4 SHA512 09b92e33eb69dccd4ce1ff8f63eb81973cce15804bbdede91c1f81d146d9a643d8a29315f324774f02fa0f0fed2edfd698ba9a1a7345aeae1f5a25d24b776274
 DIST cvxopt-1.3.0.tar.gz 4120085 BLAKE2B f4cb23146897d3f4b24e0fc4d59bd89e2c5b49c83aecdbec02297abbea8a16ecab85a02e9c187debbf3a03cc62e4c46128acefbec2af7ea20558e7fa1d1c0bd0 SHA512 b719100abb0b049765963dc4ca9f646b508a319b5f8390aa7a0578056d32a32573e195c136ffb907a57135e337887d2256c9a0883e63dad966dab43cad0bf58a
-EBUILD cvxopt-1.2.7.ebuild 5308 BLAKE2B 57fdbf06dff84baeaa6b252aa03df34c9b492e0320d78197c481127d42423d990c775e5a596c82b593fc811e714c5e8bcd04d5523a7e361ff2fe617b056d9948 SHA512 86b7a57500849deb727507c0f7be457861f5d85f016bca4705bad0dba81470e680a8f816e2c50744b697ccbd078fd5e8aee1f330ab0d8fb87bbf53a726c017ce
-EBUILD cvxopt-1.3.0.ebuild 5378 BLAKE2B 448a4e8ea0a53d96e10e2c94daef769ebafd939c1d57761c5ed88d6dda78f47714ae75c8bd478ad92e4d766a70e27ca97419f8dfab6ee215c004f4d09f39e0de SHA512 c77841649c095bdc8016366aa0a28604dc67e29f14d4af3dbcba1eabcb868e8264170c15c43e903e41ad5a0ab3a9de34c54d956b73c5bb135526b6059f70a4e6
-MISC metadata.xml 836 BLAKE2B fea994c2d1aefd2bef56407cb9a915820c11a118e7f876b016eb2b4e2c405030eeb7bdb20a6174e2144198f766757b321de042363931bd4216d04371431f6a66 SHA512 ce92cb1df5f4983953fd862e876970a39bbb2487d683868d3e9c9922238c53222e61e0f55376d332b33c61dd0d17ce272aa610c449155dd23263dbdffd3bf035
+EBUILD cvxopt-1.3.0.ebuild 5430 BLAKE2B dab7286f77b366f22b85903b036b7a6b51410a4d34a5294457cd2663cece5e64034919dd683269543d899f6cf9cce0db0c3d4506bfdcc4e99328158311cd7a82 SHA512 9aa6cb5929a9703d2d34f0f81d2427e6596b4d9a1a3d0b1eefcfd292bacb3d4135a63d3bab7f56eef02fd158fc8a41ca5e741799ea9dea2175b7e780a1c25281
+MISC metadata.xml 937 BLAKE2B 56df0383c4cf21f724c336398a7a78504cab6a838a5dd16a689c3c99b93645fe82bbb50def4c847b414fc16f7d2771e6c6889d4442f73e2e4b9be7769dd9676f SHA512 3ef4196f1ee00ed1831e9b4027c95b6fd2ccce0cfa7b8ec1a5e42397cb16f61992697357ace2b42835844844894207aa569250ec2992b39e27376da359de327e
diff --git a/dev-python/cvxopt/cvxopt-1.2.7.ebuild b/dev-python/cvxopt/cvxopt-1.2.7.ebuild
deleted file mode 100644
index 2f9c0c1b5b48..000000000000
--- a/dev-python/cvxopt/cvxopt-1.2.7.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+dsdp examples fftw +glpk gsl"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/blas
-	virtual/lapack
-	sci-libs/amd:0=
-	sci-libs/cholmod:0=
-	sci-libs/colamd:0=
-	sci-libs/suitesparseconfig:0=
-	sci-libs/umfpack:0=
-	dsdp? ( sci-libs/dsdp:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-distutils_enable_sphinx doc/source --no-autodoc
-distutils_enable_tests pytest
-
-# The BLAS_LIB and LAPACK_LIB variables (among others) in cvxopt's
-# setup.py are passed in as colon-delimited strings. So, for example,
-# if your blas "l" flags are "-lblas -lcblas", then cvxopt wants
-# "blas;cblas" for BLAS_LIB.
-#
-# The following function takes a flag type ("l", "L", or "I") as its
-# first argument and a list of packages as its remaining arguments. It
-# outputs a list of libraries, library paths, or include paths,
-# respectively, for the given packages, retrieved using pkg-config and
-# deduplicated, in the appropriate format.
-#
-cvxopt_output() {
-	local FLAGNAME="${1}"
-	shift
-	local PACKAGES="${@}"
-
-	local PKGCONFIG_MODE
-	case "${FLAGNAME}" in
-	l) PKGCONFIG_MODE="--libs-only-l";;
-	L) PKGCONFIG_MODE="--libs-only-L";;
-	I) PKGCONFIG_MODE="--cflags-only-I";;
-	*) echo "invalid flag name: ${FLAGNAME}"; exit 1;;
-	esac
-
-	local CVXOPT_OUTPUT=""
-	local PKGCONFIG_ITEM
-	for PKGCONFIG_ITEM in $($(tc-getPKG_CONFIG) ${PKGCONFIG_MODE} ${PACKAGES})
-	do
-	# First strip off the leading "-l", "-L", or "-I", and replace
-	# it with a semicolon...
-	PKGCONFIG_ITEM=";${PKGCONFIG_ITEM#-${FLAGNAME}}"
-
-	# Now check to see if this element is already present in the
-	# list, and skip it if it is. This eliminates multiple entries
-	# from winding up in the list when multiple package arguments are
-	# passed to this function.
-	if [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM}}" ]]
-	then
-		# It was already the last entry in the list, so skip it.
-		continue
-	elif [[ "${CVXOPT_OUTPUT}" != "${CVXOPT_OUTPUT%${PKGCONFIG_ITEM};*}" ]]
-	then
-		# It was an earlier entry in the list. These two cases are
-		# separate to ensure that we can e.g. find ";m" at the end
-		# of the list, but that we don't find ";metis" in the process.
-		continue
-	fi
-
-	# It isn't in the list yet, so append it.
-	CVXOPT_OUTPUT+="${PKGCONFIG_ITEM}"
-	done
-
-	# Strip the leading ";" from ";foo;bar" before output.
-	echo "${CVXOPT_OUTPUT#;}"
-}
-
-python_prepare_all() {
-	# Mandatory dependencies.
-	export CVXOPT_BLAS_LIB="$(cvxopt_output l blas)"
-	export CVXOPT_BLAS_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L blas)"
-	export CVXOPT_LAPACK_LIB="$(cvxopt_output l lapack)"
-	export CVXOPT_SUITESPARSE_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L umfpack cholmod amd colamd suitesparseconfig)"
-
-	# Most of these CVXOPT_* variables can be blank or have "empty"
-	# entries and the resulting command-line with e.g. "-L -L/some/path"
-	# won't hurt anything. The INC_DIR variables, however, cause
-	# problems, because at least gcc doesn't like a bare "-I". We
-	# pre-populate these variable with something safe so that setup.py
-	# doesn't look in the wrong place if pkg-config doesn't return any
-	# extra -I directories. This is
-	#
-	#  https://github.com/cvxopt/cvxopt/issues/167
-	#
-	CVXOPT_SUITESPARSE_INC_DIR="${EPREFIX}/usr/include"
-	local SUITESPARSE_LOCAL_INCS="$(cvxopt_output I umfpack cholmod amd colamd suitesparseconfig)"
-	if [[ -n "${SUITESPARSE_LOCAL_INCS}" ]]; then
-		CVXOPT_SUITESPARSE_INC_DIR+=";${SUITESPARSE_LOCAL_INCS}"
-	fi
-	export CVXOPT_SUITESPARSE_INC_DIR
-
-	# optional dependencies
-	if use dsdp; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_DSDP=1
-		export CVXOPT_DSDP_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_DSDP_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use fftw; then
-		export CVXOPT_BUILD_FFTW=1
-		export CVXOPT_FFTW_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L fftw3)"
-		CVXOPT_FFTW_INC_DIR="${EPREFIX}/usr/include"
-		FFTW_LOCAL_INCS="$(cvxopt_output I fftw3)"
-		if [[ -n "${FFTW_LOCAL_INCS}" ]]; then
-			CVXOPT_FFTW_INC_DIR+=";${FFTW_LOCAL_INCS}"
-		fi
-		export CVXOPT_FFTW_INC_DIR
-	fi
-
-	if use glpk; then
-		# no pkg-config file at the moment
-		export CVXOPT_BUILD_GLPK=1
-		export CVXOPT_GLPK_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		export CVXOPT_GLPK_INC_DIR="${EPREFIX}/usr/include"
-	fi
-
-	if use gsl; then
-		export CVXOPT_BUILD_GSL=1
-		export CVXOPT_GSL_LIB_DIR="${EPREFIX}/usr/$(get_libdir);$(cvxopt_output L gsl)"
-		CVXOPT_GSL_INC_DIR="${EPREFIX}/usr/include"
-		GSL_LOCAL_INCS="$(cvxopt_output I gsl)"
-		if [[ -n "${GSL_LOCAL_INCS}" ]]; then
-			CVXOPT_GSL_INC_DIR+=";${GSL_LOCAL_INCS}"
-		fi
-		export CVXOPT_GSL_INC_DIR
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x "/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/dev-python/cvxopt/cvxopt-1.3.0.ebuild b/dev-python/cvxopt/cvxopt-1.3.0.ebuild
index c9d48eb76775..f8f880b1f16e 100644
--- a/dev-python/cvxopt/cvxopt-1.3.0.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.3.0.ebuild
@@ -4,12 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Python package for convex optimization"
-HOMEPAGE="https://cvxopt.org/ https://github.com/cvxopt/cvxopt"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://cvxopt.org/
+	https://github.com/cvxopt/cvxopt/
+	https://pypi.org/project/cvxopt/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -27,9 +35,14 @@ DEPEND="
 	dsdp? ( sci-libs/dsdp:0= )
 	fftw? ( sci-libs/fftw:3.0= )
 	glpk? ( >=sci-mathematics/glpk-4.49:0= )
-	gsl? ( sci-libs/gsl:0= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+	gsl? ( sci-libs/gsl:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=( "${FILESDIR}/cvxopt-1.3.0-versioneer-buildfix.patch" )
 
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 767106a79904..1306175a8acd 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		CVXOPT is a software for convex optimization based on
 		the Python programming language. Its main purpose is to make the
diff --git a/dev-python/cwcwidth/Manifest b/dev-python/cwcwidth/Manifest
index 58ba9681ac39..bed0e3680fca 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -1,3 +1,3 @@
 DIST cwcwidth-0.1.6.gh.tar.gz 11563 BLAKE2B 014c1ae377005c704620fda7063e9891c014bb3f3f22160baf55cbef6e07084302a34ccea6bce2ca0f06d193ed3782006e308930a19c9a3c02bf181070eb5654 SHA512 0516fd49d625cd4bec26c27fd2fbbde55ca13a92bee3712018627a5c7f7a0c04aa06842ecce4c99d468f262a829f4ec5ff20bbc66232ad0fc037a7ade5845622
-EBUILD cwcwidth-0.1.6.ebuild 584 BLAKE2B a93459947bc79afe6ecbbaf57988eb9d1ae8c18c35414241f449ca1ecd20285e2a0acc29c79bd56cefa2a04145467923c9e93a4a0ca240f64ece2faf0158e45d SHA512 8faa2c1f7ec0f66991853e253fd6d2c93bd95d84ac0c711a1726a4e52a6afa91da3922f1309a6262b2cf618df29530a57cad0926fdc579ab60f51ce5d70736ee
+EBUILD cwcwidth-0.1.6-r1.ebuild 616 BLAKE2B 02de2b540ac876120fcaf6885328724248a7078182f1349fdeb4762ae51f7660203a01f1029740c64d95ce576cf0a0d4b24e37caeab5312f4894e1a517c87dca SHA512 c06bb527dda61e542d91f265b255e1d527b13c24fb3dbdbd9f1635caba1e269a9656c1bad25d72ab54c9859e968084ebe7dfb51026a6dd378bbefe37be0d0b75
 MISC metadata.xml 349 BLAKE2B e1564185d34e24bd6070ffe534ded26aee31004f72bdcb85e27b6d42d243e7db1a9db68e75a6678c9da59530457d34a8cf58be54d919d18ddc539461e03992bc SHA512 65af1da9bc2295a6395395a832288b493df2218a85d8289361c05f2b0ee1bba57a3d32edf09a6c29e691dc43e4a92b34bc8980d346e7b860c5562a238731c067
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.6-r1.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..c9ab823077da
--- /dev/null
+++ b/dev-python/cwcwidth/cwcwidth-0.1.6-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for wc(s)width"
+HOMEPAGE="
+	https://github.com/sebastinas/cwcwidth/
+	https://pypi.org/project/cwcwidth/"
+SRC_URI="
+	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild b/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
deleted file mode 100644
index 47ea6436124f..000000000000
--- a/dev-python/cwcwidth/cwcwidth-0.1.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2021-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 bindings for wc(s)width"
-HOMEPAGE="
-	https://github.com/sebastinas/cwcwidth/
-	https://pypi.org/project/cwcwidth/"
-SRC_URI="
-	https://github.com/sebastinas/cwcwidth/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 7d26c05822c7..232f55ecf55c 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,4 +1,8 @@
 AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f77b6693f92b8e236d71663a297f6d6d8629ab9c247b35dc80b3b455d643a25a4aec97c586a6c4580947e8edaa529721aed8 SHA512 accef4bdb6b7a986998cf13b356faa4825e19542e38623570c7f6fb1cdc60f6aca41ee03e84dd543a352bfd77eba227be29cacee60117aad54cd802b4309d169
+DIST cx_Freeze-6.11.0.gh.tar.gz 1307157 BLAKE2B 6897dcec37f606cf5440e8bc849dfc5c20f4cbd79099da973f855d99d8cc59845da526c36d3918dc85e5c2b279b089468c07cd7f3849b452f109205d9d4e4fc3 SHA512 f10556c9ca1222fcc4fc4a31588a57788067dc16c5ac365503e95e2df0729ae045b7b1ac6416736e9193759a054545e3966dac54136991094183dd0b93b2f47a
+DIST cx_Freeze-6.11.1.gh.tar.gz 1307368 BLAKE2B 7bfbe61274b29890ba35fda133d4c18708d3a04bc33c96633f6651fb9712fec4628f92e2044284ad1bfb992a76e4772669a29ada2f12f16741378d636701e4ad SHA512 37586365a901800fcd18ab6e3b0de9e3e9980c8d8b8b61aa1eddf0d01dc50b53cb1ffc77070f5a5ad40c9b7a020b09ced51d38f53688129b2444abe020a75237
 DIST cx_Freeze-6.9.gh.tar.gz 1273371 BLAKE2B d005fdf0e2ac49cb4f347256d3b643124694a0628e4abf6806c122c144bb973e14a2d9101b2d446394d50c6c0d9af7edca1e62b50bb4d76f63c96fabfda6cc7c SHA512 219f052cae05a757c2cd57c45e47c0b3e85662ace895a8b768e1571044e132b7db367af2a6293d175e022f79f87b02007dfdd8807eb39be04a89602b51cc0246
+EBUILD cx_Freeze-6.11.0.ebuild 1180 BLAKE2B 98311c7c77ff870ff12951f2a3825baa332eeeb7a09d04349f9f1b91362566ef723fb56fb4799f0426ec31e588dd686944643a7d88fa316e2aad8644bd666800 SHA512 7d80698195ed80838b129e57795bd4bf31b19460bf45ae4958a13c90e07bbabe70d01c5528891ef4db1780f8788f9135ed275c2a2762a0da5d10dc7f54b3b268
+EBUILD cx_Freeze-6.11.1.ebuild 1181 BLAKE2B 72c80585675b67af4758fe7d920ed789b4feac594dba1be89ad9e79b624167e8788fe74b0462c200db043f35ba0bdc9f74c549aa6ffb2d68b5f098bf0885fbd0 SHA512 383a7ac3e7efb2081a8cdc08a38de32e101eb979cfcd25802a435e54c0acd43b25979a9dcef791f01b78c33e8cd3573d5d4516189f01ab0aa9c38858f7f1d9bd
 EBUILD cx_Freeze-6.9.ebuild 1079 BLAKE2B c417889b9f271c28696e4a06374609dff880a3c2612fe9320280765a00080c29ecebacffdcf39486373fd77d373c629c0aae413fd066903dfdc7577bb56e9439 SHA512 cdd37584c6920cc0e0c39cf1f11305f8177dd082f24896fde04fe4b3875735fab36cdb2973a5bee128a09b0afbd2493a8e4f11b38e7cfe1f77f449ae737a1a9f
-MISC metadata.xml 384 BLAKE2B 3e1553ab02bce58de9d197935ff0fc6c709473af6b4a0d48c0ef8cd8eacf4b2134b8e725b633842f44a13705af6ab53893755b66e85e400c3e128e85625b6bcb SHA512 e93f9015b6c5097db33107455b92c2fe70f4bb8089ea29c5cf5b16788cd6096743203a4abc971bf97571eaed73a1428915988db72a8756eacdf26ef597a69abd
+MISC metadata.xml 485 BLAKE2B 622c1dd3d46998fd3d1efa840e0f3b9af105d889b77d7ed779d5caacb384238a54e94c262ff15f4e09db710a44590cee03de6b2a749c24584060acad6925c445 SHA512 b5e45e9a331ffdfd888d5c5daed5658fb156f00a6974466c1b7a865ec7f0a8b839e1d7e4ffdc39903bea68eb9375a608c0094081f62097a7b3f92a7d2e8e370c
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.11.0.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.11.0.ebuild
new file mode 100644
index 000000000000..81d66f5e8a4c
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.11.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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}]
+	' 3.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 pytest
+
+EPYTEST_DESELECT=(
+	# new setuptools?
+	tests/test_bdist_rpm.py::test_bdist_rpm
+)
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.11.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.11.1.ebuild
new file mode 100644
index 000000000000..11a6209600a1
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.11.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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/v${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}]
+	' 3.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 pytest
+
+EPYTEST_DESELECT=(
+	# new setuptools?
+	tests/test_bdist_rpm.py::test_bdist_rpm
+)
diff --git a/dev-python/cx_Freeze/metadata.xml b/dev-python/cx_Freeze/metadata.xml
index 42f837e8e71f..07d102cf6796 100644
--- a/dev-python/cx_Freeze/metadata.xml
+++ b/dev-python/cx_Freeze/metadata.xml
@@ -5,6 +5,10 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">marcelotduarte/cx_Freeze</remote-id>
 		<remote-id type="pypi">cx-Freeze</remote-id>
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 157274f85122..9055519644ac 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.11.0.gh.tar.gz 19028 BLAKE2B 7726067db988e40b833ebcef4a9122fd91753925af829a0023c08081ea7f315b84fd3a5d13731dba72d2820159da45698200ca8649b65b854d48e1a114e31d81 SHA512 cdf91b861d20710b3d77ad105e54668fafa4be69e566d6a09683c638a35aa423b542a141ca0bbffd7a6cd30c8e2a629d578be88648ab9f38a0c43405f2f39613
-EBUILD cycler-0.11.0.ebuild 599 BLAKE2B 433cfaa9a4843d4c0d702b0007212f67cff7803fdbda72a011cd5bad00df5aa423117adda0a1292fa8da16b09dad7f8107aacd7136966323bcc850476d94bf1d SHA512 98cd7a5f88ec5d2e48644ce170284076f765069c6f49680b8f67b9ee7073ad8cfac592afab4741bd768374cd7a2ed6d1756160484df9bbafce7d2030ced98258
+EBUILD cycler-0.11.0-r1.ebuild 631 BLAKE2B 7189623021c9d750d1e30b395f5990526ed7b6c729ac3db2257b54cded05254b6b0f176777bed1a3dc7b7815e929032807310725926fe337356db71aded3ea3c SHA512 6e6c3a86fa2c9f3db3114c43d10b6631de4c832e8581f9a60bb4fd653b17e0441d506581be0f1b0fbe63bc37d3912a7acf82893b8c7f7ca12d217896f8b43b4d
 MISC metadata.xml 391 BLAKE2B 087752331eded830e84cb7448a9cd8f76a2ddce5e2be49901fca0b9de609af343bf2d6387a49a5b8344f0d5ce79077e0ec4f5bfd5283a550a43f715abdb114da SHA512 8b0f74d46825b7ade0f76faf9539ef13cfff9e946e973c1371ed5ae4404563ca1339657804acdaad5bfbf3d6c5041f0e6bd95893f8d6d9e1b1db67431bc07a0b
diff --git a/dev-python/cycler/cycler-0.11.0-r1.ebuild b/dev-python/cycler/cycler-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..1bb286f39c25
--- /dev/null
+++ b/dev-python/cycler/cycler-0.11.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Composable style cycles"
+HOMEPAGE="
+	https://matplotlib.org/cycler/
+	https://pypi.org/project/cycler/
+	https://github.com/matplotlib/cycler"
+SRC_URI="
+	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cycler/cycler-0.11.0.ebuild b/dev-python/cycler/cycler-0.11.0.ebuild
deleted file mode 100644
index e62193743454..000000000000
--- a/dev-python/cycler/cycler-0.11.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="Composable style cycles"
-HOMEPAGE="
-	https://matplotlib.org/cycler/
-	https://pypi.org/project/cycler/
-	https://github.com/matplotlib/cycler"
-SRC_URI="
-	https://github.com/matplotlib/cycler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index c6fbfb354a6a..00b8b89a88f7 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.2.gh.tar.gz 4579 BLAKE2B da09ce49817ae40054ab996aa3fcfa45769736fb56cbc91ed183f73413b3298859ab0dbd6e6ddfae835411891c02c67a01194531cc4269663656af1529e81f0e SHA512 ad245eb87fe2d4d93d244b125d80f17fe6deeac86ae9a9129d211d9ff1738da39dc30d49a80f33d50a6fa52029403018c87a8637db9c21098ef8b0e3afe20ea7
-EBUILD cython-test-exception-raiser-1.0.2-r1.ebuild 684 BLAKE2B 1a5748314f35ab9a966fd3c91cdccc7e54b340ce9cc8f1635bfc75f5fa816ea827754b776baaa59df70b6845611fcec4ab4487a5234e701e7d62ad6b3a8757a4 SHA512 c9e5fd710de40932d9119e5e7963ed59fc2dda89deb5e06d6b5718ad6eee12544676c8f5e14d4094aa7d426b78771a1b11825d4233bd6976723ce887efa5c052
+EBUILD cython-test-exception-raiser-1.0.2-r1.ebuild 684 BLAKE2B e3a1486f6e6dd8ccae791d077d8eb66ee6835f58992e2891dc9ac01f2b03f3a01e809ac2fe51ed054942a9d03edf8e6f3fbee5d5696a435954526beb95f842ea SHA512 23fd19c4ed7b04aac8c2a0d14d41ae7aa6e040b9d055a8788635ea0589d976bb788a1468cb085c2fdf06361077d9c8a66e24f1074ac6e20c653ec82ac1bb6026
 MISC metadata.xml 386 BLAKE2B 40aa5d14853374cc959b299bf2c8c53fd84f4ea6e570210409f42eca706f1d098bc54dcb4b7ce743428ec361b3359284d564f04916d28cac7546fee2105051e5 SHA512 76f2c31745f906a444b40d4253a9215bcc7757aa26cfeaec19afb40794360c61d5b36e55278ca4adf6016cbc8121cd7ba627746f6f9423601aee1f5a5662b4ac
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
index 30e0030806a6..48f07cd71065 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 6a941621e194..9250f046fa55 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,7 +2,11 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 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
 DIST cython-0.29.28.gh.tar.gz 2101301 BLAKE2B 980c04545e935deb4b4b1653f167dcbc94b8e2b24bc8897b5cc996dfca977645f7475c32aa973251ffcbbb31e725e27693af61ceaf66f2332c9525b02653dc76 SHA512 52490d0b5355e13cbe586830f763173d7556cf3d79d79192ca75138b1190e7a4c1f3feeb0568349802ef3b97300c3805f54eef5ffd73a5180d68f023ac2a44cd
+DIST cython-0.29.29.gh.tar.gz 2105839 BLAKE2B ab7879ce70733cfd77b7aa42a2de717bfc1b9bf933754bfecc6548ee1d097ce4102daaee98a1902d957b50f18400b5ba58d6517edfe43c9332c5bb3ec45f9665 SHA512 db14813f6191445cc3d497d3c7d76cc8b55fbe8e6857d800f5e05052fe4b05e9c2a2e597bdc1891254a62ecef203780c1c495e8d28e831072ddd46992bfe6df4
+DIST cython-0.29.30.gh.tar.gz 2105561 BLAKE2B c995bc710d2c397b8d6e4edee0f989e43969a51efb29b83643149d8c4110ae0331a35b9cc2ec7a45a43fea19ab8d63f1ef934f92d451c62d057e0e04ec79a871 SHA512 f6b07adfa1ebe9d52dfb72857ffd40b35d8777914299de101c7b96ee2d64cdd85ac0374ed41b382881b1f3ce535a9af9419dfabee9a4781a3f818125292627d4
 DIST cython-74073417c4f7e616af0a139a55f790f1ec7fe728.gh.tar.gz 2106765 BLAKE2B c2686a1d49fd1b522dcdf89f16c52fbb34595aed72e5626c8d3697ecc9318751d108999db443cfefe08334155ab59d230fcbd8e74715e185a161399abad6ae35 SHA512 2454a364fdd33f0090ba052a0bfa0ffb464ef750253a91c20a63c4db0b513f743870e7b9fafd844b0bf1a6b66b9b639f830d3a8c2f64abac6e197e2ff2279a59
 EBUILD cython-0.29.28.ebuild 1884 BLAKE2B 6a96c180a690924a6ec689404146f19bf3ae96b3f8d71afe02624789c73c0e9377ce2839904ee09af9e6bfdeb5520bdfd2bb0a2aefade7132afc19c9dd0a433a SHA512 6c54d580e08fbca4c4ade822e66ef84883b9fe762b9edf2e54f1ad7588ac275ca142524b0d444f92e48264cb8c600759d4542351b96ab829fb45273a303c0b94
 EBUILD cython-0.29.28_p20220503.ebuild 2109 BLAKE2B 737da8f36474c52295e3ad2e9de530087273f48099216a635ac6b7018539131281bcb110e22da1852aaf80f9ca9d1b19c77ff69c656c7ef0f760d6bbc05594af SHA512 130dcf8eb8e2627d5d83e1747b4daa6b38d6b58cc1e9e73a7e7f00e9770f7965a44c630fdd7b20901ab9692552a81b189ca2dce84604aee71a82de3cb45e9a9c
+EBUILD cython-0.29.29.ebuild 1997 BLAKE2B 492efdda99a00989c1aa04b431ea6c8a5ca323a5ac493b1915204d682f097f1bc7a0ae421b4b96336267aa36b9f6d227260826e3dbfe978186da507da3fe8dc7 SHA512 278aa29f46e02782f01be6523adef658a42e5345cb77abc69d270095f90e686b1113462486fd28991dbe27b59765354e55880ce074c3bcbffea9efeddee80a43
+EBUILD cython-0.29.30.ebuild 1990 BLAKE2B 690bd957fd19036d3adeddee71009c10c2e87fb3232eb066cad772758e5eb0b2034b60d8b124d05ad35007856e9ae607b616bcc15cce0b2fce8cf4196a917139 SHA512 c297d736ebe26cf87c1866abb4af36b9bd0e2097e5dce194debc1de7fb804d9195f62dbabaf5bd411f47ef5d24875cb77eeb05defbc77e67f04506e64ceef088
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-0.29.29.ebuild b/dev-python/cython/cython-0.29.29.ebuild
new file mode 100644
index 000000000000..666f40d9818e
--- /dev/null
+++ b/dev-python/cython/cython-0.29.29.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/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 ~loong ~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_{8..10})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-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() {
+	if has "${EPYTHON}" pypy3 python3.11; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/cython/cython-0.29.30.ebuild b/dev-python/cython/cython-0.29.30.ebuild
new file mode 100644
index 000000000000..189c1e66f23b
--- /dev/null
+++ b/dev-python/cython/cython-0.29.30.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/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 ~loong ~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_{8..10})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-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() {
+	if has "${EPYTHON}" pypy3 python3.11; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/daemonize/Manifest b/dev-python/daemonize/Manifest
index 2c05ea9ed71d..6ea9a93479c2 100644
--- a/dev-python/daemonize/Manifest
+++ b/dev-python/daemonize/Manifest
@@ -1,3 +1,3 @@
-DIST daemonize-2.5.0.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
-EBUILD daemonize-2.5.0.ebuild 501 BLAKE2B 0f73c0d3893fdc7a3a5c4055cfec7b2d166a43e8e26a60994f7977b4a5f2ecaf98fb5ad89df444f427e2c5bbb0bb325f5053a0b6400dd185d5204ed08b36c10f SHA512 58f79b4193b91a9c07f7ae76267ca2f3b22f19258041828ea2947120286ba010f1665c6f2bed4d15080548e778c40acd54a3a58e61b6a5371ae0aa9d1c746922
+DIST daemonize-2.5.0.gh.tar.gz 10126 BLAKE2B 10e13f93825309d48ef67d0725ed53dcca2220b3940b3b81e1e7f29cf7b6d89af40f94488a2398bec74c0f6235ef8b1626871bda4fb33c233a872a9ccea47558 SHA512 c17a14c073e22fc98b3663da207238d183c12e95750f14cddcf90419c51c95ebc36251bb95d0bb4db84a2fb243499329473e7d14172d855d3ee204757a2a1a65
+EBUILD daemonize-2.5.0-r1.ebuild 586 BLAKE2B 5c1e17c98adc93fecb1184dcdbac44e2670c3052a3600cf0009237aafbc2bea8ea6279b59f322917fc0d2a9cdde07f00588a524e7160109e29bd6fb699f28c83 SHA512 9b5bdcf685e8c5135419ebfebb567a14b64ca6a738cdaa0eb45ea0c1440cf70fd43cf83553e790c4428ccd61fe54741a45c280ad3c41c3dea4c716da390c9230
 MISC metadata.xml 378 BLAKE2B 9dbc711651a817ecb3d38a5bc02976df91a9a87b477c2a88e63894590f1271f2e4b9838e06c5c54eafaeaf1b1bcb00f285317978fba26f564728ae88ed36366d SHA512 dc1bf98d261bb298722f2c9a7d0c4732161970664853e6849868c44370e7e9e9096cc2059eaf72b29323f3a7484e40b9aaa6fd2e1b2d9237c88f3f91374030c1
diff --git a/dev-python/daemonize/daemonize-2.5.0-r1.ebuild b/dev-python/daemonize/daemonize-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..a9b9724e7e9d
--- /dev/null
+++ b/dev-python/daemonize/daemonize-2.5.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for writing system daemons in Python"
+HOMEPAGE="
+	https://github.com/thesharp/daemonize/
+	https://pypi.org/project/daemonize/
+"
+SRC_URI="
+	https://github.com/thesharp/daemonize/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+python_test() {
+	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/daemonize/daemonize-2.5.0.ebuild b/dev-python/daemonize/daemonize-2.5.0.ebuild
deleted file mode 100644
index c284be800ff3..000000000000
--- a/dev-python/daemonize/daemonize-2.5.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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
-
-DESCRIPTION="Library for writing system daemons in Python"
-HOMEPAGE="https://github.com/thesharp/daemonize"
-SRC_URI="https://github.com/thesharp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-python_test() {
-	"${EPYTHON}" tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 7d95cc2f0397..53007854e680 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,7 @@
-DIST dask-2022.04.2.gh.tar.gz 8657501 BLAKE2B e0c78d91927d4f2391e377d10c93b87ebc8bed764be77e3e8afb55935819772442e9bd9eb6221b639eb8376de0107b361b43bd37ed85cbe548d4b0c99d5e5f68 SHA512 b252a19fb08e089153e31ea23bbb75d37cc9fbf96c530495e884b9e3768d23b7dfe71a16341a8c414c414298cc6958aa41f22af07cabb392816dc4590b86b278
-DIST dask-2022.05.0.gh.tar.gz 8658529 BLAKE2B 0b09ef38137d9c395384549fd8a3b0218ad1761ccb1816f8fc4f4af7328215716603e3f41b8cc3bf7044ff42b72eee277147b3bd03da48467cccc88f239bb2bd SHA512 15605321143f354ffb9c890823f5751131d942cc16c523b2d00bdcc752ddc5243525f7cda138091604c8f2f9c5b4a309b1efc95f483b753673df98cc8a81ce81
-EBUILD dask-2022.04.2.ebuild 1525 BLAKE2B e3a0a84144604df9d5a12ecfb37026b255e588c1b3a22d668338074f0af832ad66043aafd77576a962f69249624d318ea8372a0cfec55ed342bbd7a3651bed6f SHA512 546b309ee34fbdcd72eec139df6be0d87fd98a99f70e8a12dbebeeef844bf81084e3d38889f1f0109c20ad473ec785f42b6d5eb22f2f38b4080f98554092cc6d
-EBUILD dask-2022.05.0.ebuild 1526 BLAKE2B 4f46069ebe97edccd7c0384ebc75300e2cb19f2eb506f9ec5ece4a752c961c7568ca5326ef3b35513d15b3a3e8c315e96c1a8b50fee71e129897bf609226b8b4 SHA512 70a136b384844ade3c2307135604dd4e6c100cf0b7b5751ee3d91c86df00f058524c39e051af00cd64cb90fe5eeeac7bc81530def38173154c112d09e1d8a822
+DIST dask-2022.05.2.gh.tar.gz 8721528 BLAKE2B 42b83ca6fe58b014d3aa90cc99dc4b9b631d6b5bb3243a2a2bd1bcfc6f9ffe5d545b7bcc43edfd3299273e105f7355fbaa9490043a12a8c303773d0e08e63d8c SHA512 1d6ce8db1c83ac22f081beec8667f35acda48578263c637ee294934c729d16a7aca4259e0dde6fed6f2dc9924490589610fc3fc4225dfe07552b15b6af20d8d5
+DIST dask-2022.6.0.gh.tar.gz 8727952 BLAKE2B 060595de52ec64db83bf56d5b4c975ac22009fbe4efadd903ddafa80400e8b5706d60a47445b70f513a73cc915dc696b7ee17831f6c4aed4f55ca11bd8c4fcce SHA512 92619558dc8ed4808842cf45bad703443bfc38f2206fe15e65e5dc457040042eeefc9cd0fb16a8322c4a8972dd10b0b7250451d1883a148e2238f5bcb3f0555e
+DIST dask-2022.6.1.gh.tar.gz 8729249 BLAKE2B 211beeb3960569aa1cb68a4fd9b261a417297de5dc406d50bc54342239227ea01e2158b618bd889862a7eff8bb01bb43d098937bb3911f088250957caa672d04 SHA512 6e06b63dd5c7f1d7c6c7dce867ffa42b956023b313b25245a339f698b06bea17a03cc4ead9bd5aef8ddf081750cad4df4b6b2972038315c89585221382c9e95c
+EBUILD dask-2022.05.2.ebuild 1525 BLAKE2B e3a0a84144604df9d5a12ecfb37026b255e588c1b3a22d668338074f0af832ad66043aafd77576a962f69249624d318ea8372a0cfec55ed342bbd7a3651bed6f SHA512 546b309ee34fbdcd72eec139df6be0d87fd98a99f70e8a12dbebeeef844bf81084e3d38889f1f0109c20ad473ec785f42b6d5eb22f2f38b4080f98554092cc6d
+EBUILD dask-2022.6.0.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
+EBUILD dask-2022.6.1.ebuild 1530 BLAKE2B 891e358cd393bc2c162f180f340d3d1e235135d5d81c1332ef2eb47499d394c384536ce049f82cbd93930cba66306282c61f0240cdc08e64395be7c57bd077c1 SHA512 f2ffde23fdc7e4e95936fe135d13c305c321cf7794b6fc81bb238d5cae3b02d6735f14a1ccf315c0b627d779dd6fcc2efe41cd904701f183040a9d113da901f1
 MISC metadata.xml 722 BLAKE2B f5ef083408180a71a3f997ab61bba6770b08018e3d0737a17a99827edd486c2d10fc8bf17c70c8d5a431bc40bdd685d2a6ce6e8e1784a2c1d89152b167f51648 SHA512 1e1a79bf0d919a2a7a0840e77f239b3aa3bcd57666a06f18113c39c9b075d03e380b37c2e9c96dfe8ba864a94e98fe52fc0b6b16e69009364374020729b261ef
diff --git a/dev-python/dask/dask-2022.05.0.ebuild b/dev-python/dask/dask-2022.05.0.ebuild
deleted file mode 100644
index 63da90a7d5d0..000000000000
--- a/dev-python/dask/dask-2022.05.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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
-
-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
-	dask/tests/test_config.py::test__get_paths
-)
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2022.04.2.ebuild b/dev-python/dask/dask-2022.05.2.ebuild
index 11e5ccbb938b..11e5ccbb938b 100644
--- a/dev-python/dask/dask-2022.04.2.ebuild
+++ b/dev-python/dask/dask-2022.05.2.ebuild
diff --git a/dev-python/dask/dask-2022.6.0.ebuild b/dev-python/dask/dask-2022.6.0.ebuild
new file mode 100644
index 000000000000..ce906c8679d6
--- /dev/null
+++ b/dev-python/dask/dask-2022.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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
+
+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
+	dask/tests/test_config.py::test__get_paths
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dask/dask-2022.6.1.ebuild b/dev-python/dask/dask-2022.6.1.ebuild
new file mode 100644
index 000000000000..ce906c8679d6
--- /dev/null
+++ b/dev-python/dask/dask-2022.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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
+
+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
+	dask/tests/test_config.py::test__get_paths
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/dbfread/Manifest b/dev-python/dbfread/Manifest
index a59098cd96cd..25c45e2893e8 100644
--- a/dev-python/dbfread/Manifest
+++ b/dev-python/dbfread/Manifest
@@ -1,4 +1,5 @@
 DIST dbfread-2.0.7-src.tar.gz 33045 BLAKE2B 96798f00aba4c30e7e83b468f368ca6730a7e095c9fec5bf5515ac6a152022adbf5339cd9e68e85f4eccac211ed4e307b9abf22249ef6420d722fa213210d7d7 SHA512 cf591fa5800e5471025175a4bbbb54cb26dc2a83bf328776e4386860370d9421edd9edd62cb9e3d463794d526c561a0f4744bb67b5e376edd471dc95100bc2c7
 DIST dbfread-2.0.7.tar.gz 33212 BLAKE2B 03c9a0d93b13c7573b5bcec6c5af1ac43bd00ead2b3e83638f45344b2344062e86d764b095e699afdaea2405176ee15122c975a2f72b25bd167f5faaaf33043b SHA512 86c3a29e351b985984be67401a6dfe3e39cd92451a122788ade83d65313dde37a3706ce36c4365bd36ba1df62ee057b625f1e0f077aa4a248c7456258189f548
+EBUILD dbfread-2.0.7-r1.ebuild 766 BLAKE2B 8d7bb1adf845fa77649f4896b3d514387d3f687c809b9706508d863f4b3e6be863d8204de81a23436bbd44b16b1fad47884487beedb7f75fcaf51284949aca47 SHA512 835d0660c09db3b73bdd00fd87222f1cfe3f8078967622194545221f0396cf9ee03ea107cc170ee6144e60f130481f2157bd85b2d5ef3014d3ba20bf6b2fad86
 EBUILD dbfread-2.0.7.ebuild 946 BLAKE2B aeaecfbb95204ea2d8b300efbd46633463869e1ecaf962b5584b0fde8517423ebbd84ebab715053a643cc4e0ff9cb0418228308c8f7c178f392fa042bb94b632 SHA512 8e20a113ff61583fdd6bcbbab0fc29d18423627cc239c18714cb5655cf7e36754aa7e61909b0e5ddaeebb933c14edc7f6ff0f7fd2a9a5846bde24d0ee7e81e78
 MISC metadata.xml 476 BLAKE2B c296f538a4e52849b37574df1131e638ce48fc1b61b1af7d00e8988a786359642bfb49c471c9c47dbcc9b2239865827dba5316e89bb0fbfd3a0adb5d40812b27 SHA512 92c85633ee6274ae0a5e36b2a90deac20d56b2e49a4e1bcec016a079d6b21f4b9b8c9dfc2fdad9809703de126384023fcf547da8f64894b2205c45a139588181
diff --git a/dev-python/dbfread/dbfread-2.0.7-r1.ebuild b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..5d327e0b6ace
--- /dev/null
+++ b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read DBF Files with Python"
+HOMEPAGE="https://github.com/olemb/dbfread https://pypi.org/project/dbfread/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	dbfread/test_read_and_length.py::test_len
+	dbfread/test_read_and_length.py::test_list
+)
+
+python_prepare_all() {
+	sed -e 's|\[pytest\]|[tool:pytest]|' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dbus-next/Manifest b/dev-python/dbus-next/Manifest
new file mode 100644
index 000000000000..d10c15893a0a
--- /dev/null
+++ b/dev-python/dbus-next/Manifest
@@ -0,0 +1,4 @@
+AUX dbus-next-0.2.3-glib-crash.patch 1361 BLAKE2B 879f66971e1a4e341ff2b5f396c8e26bc02e4c1ee7af0e72a34e2f672f156f93d40590bd9aff8d0ea8ae0ea15449d504a3b971c7745962de3607c57bb8e16806 SHA512 b32795726021fe25e41e1ed453e2040f76619f28e316a0707cde35dafd68316647a20d6865a6bb7b3d2baf7e703c0524d164d82b56c731277fe0a1265f2b6419
+DIST dbus-next-0.2.3.gh.tar.gz 81711 BLAKE2B 6acc38a05511b3de7e13893d82dd1ecd55f9a6124b4d859574294602b921ff012776c12ddb02e1be437b258c7bd5120a3a9625fc5b06bbbe02915dcc4c14897b SHA512 7836d855c755c8ac6cbbb251ca0cbd2f4df9b573f31b1ea1cab480e47896d36b4cb0d479b2469b0bf0b5c700068361a18874b4a087f73020cdcb4e04a2d7dbe7
+EBUILD dbus-next-0.2.3-r1.ebuild 1244 BLAKE2B 00fd527fb39111e63bf576473ea760bc5c046a44ebcfec818ff789637057b937c0ee19e92b8068a3e9449504eae2c4db527bf4d7b48bb072ecdabec95dcd4432 SHA512 43a1083d143c9da13ff293666230f12c73c8b5bfad5732a7a7dc5f19a1040140674cf019af5d65665484079e5be6c06161c586394d0dce8e45defab275789732
+MISC metadata.xml 382 BLAKE2B 6974331ea2db5dfedbbd9667a4fb923bfc4ed5b5c0c940f30270e02c18f1c2a4763039d90454d74b8da4740545dd282527d7a73a0448af1ec38600eaa76858a1 SHA512 64e6df55127e43b249830ba06ac13b069cd4f1c236c424b2ea3ea32c7846c980c30b9d8170e26e4b4ebecde0abc596b93c2796b3812371f4a69356cb55a7386b
diff --git a/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..a5d78a017665
--- /dev/null
+++ b/dev-python/dbus-next/dbus-next-0.2.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="The next great DBus library for Python with asyncio support"
+HOMEPAGE="
+	https://python-dbus-next.readthedocs.io/en/latest/
+	https://github.com/altdesktop/python-dbus-next/
+	https://pypi.org/project/dbus-next/
+"
+SRC_URI="
+	https://github.com/altdesktop/python-dbus-next/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-glib-crash.patch
+)
+
+EPYTEST_IGNORE=(
+	# "interface not found on this object: org.freedesktop.DBus.Debug.Stats"
+	# Seems like we build dbus w/o this?
+	test/client/test_signals.py
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	local dbus_params=(
+		$(dbus-daemon --session --print-address --fork --print-pid)
+	)
+	local -x DBUS_SESSION_BUS_ADDRESS=${dbus_params[0]}
+
+	virtx distutils-r1_src_test
+
+	kill "${dbus_params[1]}" || die
+}
diff --git a/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch b/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch
new file mode 100644
index 000000000000..714d733f3689
--- /dev/null
+++ b/dev-python/dbus-next/files/dbus-next-0.2.3-glib-crash.patch
@@ -0,0 +1,33 @@
+https://github.com/altdesktop/python-dbus-next/pull/114
+https://github.com/altdesktop/python-dbus-next/issues/113
+https://gitlab.gnome.org/GNOME/pygobject/-/issues/525
+
+From 445bc2cd0df80e36154e45ea3c4f268b550890b5 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue, 22 Mar 2022 22:11:01 +1000
+Subject: [PATCH] glib: destroy the _AuthLineSource explicitly
+
+See https://gitlab.gnome.org/GNOME/pygobject/-/issues/525 for an
+explanation, the summary is: we need to explicitly call source.destroy()
+if dispatch returns GLib.SOURCE_REMOVE.
+
+Deleting the source by resetting it to None causes invalid memory
+accesses and eventual crashes.
+
+This can be reproduced with a basic call to
+    bus = dbus_next.glib.MessageBus(bus_type=dbus_next.BusType.SESSION).connect_sync()
+and a GLib.MainLoop() after this call. Run in valgrind --tool=memcheck.
+
+Fixes #113
+--- a/dbus_next/glib/message_bus.py
++++ b/dbus_next/glib/message_bus.py
+@@ -457,7 +457,7 @@ def line_notify(line):
+                 self._stream.write(Authenticator._format_line(resp))
+                 self._stream.flush()
+                 if resp == 'BEGIN':
+-                    self._readline_source = None
++                    self._readline_source.destroy()
+                     authenticate_notify(None)
+                     return True
+             except Exception as e:
+
diff --git a/dev-python/dbus-next/metadata.xml b/dev-python/dbus-next/metadata.xml
new file mode 100644
index 000000000000..3af5441c90aa
--- /dev/null
+++ b/dev-python/dbus-next/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="github">altdesktop/python-dbus-next</remote-id>
+		<remote-id type="pypi">dbus-next</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index e7b763f55113..9a52033d805b 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-python-1.2.18.tar.gz 578204 BLAKE2B 932a06f4b0145f7a47cf1ab6ea33c14eb4e36570ef548e7557d4aa5b780e49f2d284cdb51f0ec2d8a1cb286097fb9eabb2193d7cbeb387eaf43cbe209b7f11fa SHA512 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
-EBUILD dbus-python-1.2.18.ebuild 1925 BLAKE2B 1d64093c96d75a16615eb66656c733b0b059c46503b36231b464e498512c130e9f11eb6947f877b68e671d55ef1ec1351865c7bb82d4fae9fd7a9ea6c336cfd8 SHA512 bbc6c3ce463661c279f579d9ad55a561329f0d3b4383b9d3b3ccecf7a0ef8e8ff4661792d968d265b948ac159e23c1c053289741ff79c21bcbcaafbdd7e3f277
+EBUILD dbus-python-1.2.18.ebuild 1932 BLAKE2B 19dbd0f08bf6dfa618e263a778b42be62a01a5ae8a320a10ed5ab70984f96f4b8f8dc8923718a0fc405e71aa9d1fa86b9f279da879c6c431a815a227fe5d92ab SHA512 e37a2e107a06004d6c348d8d94973ce5df1d83db4a8a9767c20f71b614d11950292bed9d2ea41b88b416cc4a6c39e3b0c3734e2db12e42b3a1520b0b5f971bbf
 MISC metadata.xml 404 BLAKE2B 14fb120b562c66c35e57d6686f87d2515d6e7a33e4a3027e2edde743ca533d8be63c8c3c4596de913c86091b2d768c997a1c25282efa657cab08131090cec588 SHA512 7a22b8fccd4715f6d817d528eadff1eaf126158f02113b318a4cf99b5a9bf7a05e67ad0ef1258399a937599bec23cb52f8fb42652948313fb8c8ba63bc5d22b6
diff --git a/dev-python/dbus-python/dbus-python-1.2.18.ebuild b/dev-python/dbus-python/dbus-python-1.2.18.ebuild
index c057a0be9502..ef3e7164fa56 100644
--- a/dev-python/dbus-python/dbus-python-1.2.18.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.18.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit autotools python-r1
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="doc examples test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index 985ac5f295f1..1e728f6bb352 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -1,11 +1,3 @@
-DIST DBUtils-2.0.2.tar.gz 92119 BLAKE2B d53dc81000b426e2cfb8dace616d589ec622c7cdb10e1903163eb9901336d300598ef7f54e30aa1efbd5fa72e648f4f63c288a4d3ffcdf6fada89159e8fd3925 SHA512 650be54c4993f6277fc7a2d7cefcb658dec6c793d0ef8554e9e80d70a58c7fbbf69485e8e60684c2dfcb28780bdfa575796455fd12c0cff3b82d8951785d8ba0
-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
+EBUILD dbutils-3.0.2.ebuild 693 BLAKE2B c79534fb09d13653a77faa5341435717806d1cccdfb48868606e6dc9ec2a07e29042ca93ceb3b7c03c244e4139f47f42693f842cbe8d176377deafaf02d08f62 SHA512 fef76f65c056b1ed8198b48c400d3483e554280ea9a81c9cf519e2bd4425d4687b18535985e774983eb8eea85c3e372c2709503e37b04303c86d43ababfbb8e7
 MISC metadata.xml 1005 BLAKE2B e6d13ea0ffdc7d972db2bd8f5f0e2212937e36c1646e900f2eb76cf270ae840db7211d218e6900208bafab3fef0c5226128cebabeb52a51e8204b1981809683c SHA512 ba6884914df60365c4b085b56abcc3e927e780f4f8baa6e2cca745cdc53a1fb18917f1b1532d9e957e515a7d5b8e190d87e556547b98a094062f672b3a1b14cf
diff --git a/dev-python/dbutils/dbutils-2.0.2.ebuild b/dev-python/dbutils/dbutils-2.0.2.ebuild
deleted file mode 100644
index 2b1a11cde58d..000000000000
--- a/dev-python/dbutils/dbutils-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/dbutils/dbutils-2.0.3.ebuild b/dev-python/dbutils/dbutils-2.0.3.ebuild
deleted file mode 100644
index 2b1a11cde58d..000000000000
--- a/dev-python/dbutils/dbutils-2.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/dbutils/dbutils-3.0.0.ebuild b/dev-python/dbutils/dbutils-3.0.0.ebuild
deleted file mode 100644
index 2b1a11cde58d..000000000000
--- a/dev-python/dbutils/dbutils-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/dbutils/dbutils-3.0.1.ebuild b/dev-python/dbutils/dbutils-3.0.1.ebuild
deleted file mode 100644
index 2b1a11cde58d..000000000000
--- a/dev-python/dbutils/dbutils-3.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/dbutils/dbutils-3.0.2.ebuild b/dev-python/dbutils/dbutils-3.0.2.ebuild
index 1a02688b6c9e..56f1b8438672 100644
--- a/dev-python/dbutils/dbutils-3.0.2.ebuild
+++ b/dev-python/dbutils/dbutils-3.0.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="OSL-2.0"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index c96f7e587445..640cac82d92a 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 637 BLAKE2B dd8531676b92f0802db001d2b9fafba96b6cebb1d9e89a2a6991aa144de0940a891a28396950d1914f490ce04e2ac20e53cd6024da8cc6d56b530075270db1c7 SHA512 b038667f44054b3537e6f1b9a55bd4fcde5bb148e83008ac7e0df4115dc2e386990d3e67df5be8624a13dde7549d4a336e763ed486b728b0e9773b4353634d4f
+DIST ddt-1.5.0.tar.gz 19609 BLAKE2B 8986a7e3df8212dbd5ec6fd15e5cc73c5da65db56cf9234acd83649fc5fb988eccb9605a7fa09188ff9499e759c84ff076d86fbba2e3eeda054224acc8382626 SHA512 91faba2bed66df5cf366011343886e3f0059d4e0f44ca46ffcfed7288068ba43a94a426bd692717b3ea735437ee6c0339d42b5c15f75221386153c035597ae5c
+EBUILD ddt-1.5.0.ebuild 668 BLAKE2B 92a0a26887ff2edd73b0a22b61352ea017085e193775839a94a4b720bfc9edab45322a61cf2e1296d93cb35aa849672b8bdaab71e9ed4f0c92170f80836e5ff9 SHA512 6896314ece65c22752c586aee741f7ba8da3c781b26b206a233a479570931c0e746a8cce263224c0aa4c33dc23149fc047841d0ffeac8bd6e704fa7934800e45
 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
deleted file mode 100644
index b02e22877ba2..000000000000
--- a/dev-python/ddt/ddt-1.4.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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="A library to multiply test cases"
-HOMEPAGE="
-	https://pypi.org/project/ddt/
-	https://github.com/datadriventests/ddt/"
-SRC_URI="
-	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ddt/ddt-1.5.0.ebuild b/dev-python/ddt/ddt-1.5.0.ebuild
new file mode 100644
index 000000000000..e14ca98aa422
--- /dev/null
+++ b/dev-python/ddt/ddt-1.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Data-Driven/Decorated Tests"
+HOMEPAGE="
+	https://pypi.org/project/ddt/
+	https://github.com/datadriventests/ddt/
+"
+SRC_URI="
+	https://github.com/datadriventests/ddt/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 89ecd216d08c..694b9653f592 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-2.5.0.tar.gz 31334 BLAKE2B 1f06725ead19e36e6feda1c8666403e536d5f39f775d9a9929a06ea053be41e64575a4e4d28b3a0032610cdd7f68f35bf54ff2445543c4b8ec667732e1a8d5ea SHA512 3f1378c52994a0320b8abd997a1b240496f6f12d29e8b08612bb97c7c8d2993b23224be62cbe4eaa556dcd5a3c7a4a8f8ea4873688e1aad2f26bb5ba522c1d6a
-EBUILD debtcollector-2.5.0.ebuild 715 BLAKE2B 84f0b669fb3e6a6e55ad626d3950bc5730035f7f60b7f53f8ace68e15f927d348b35f567e9b0f13747682cb836ecf87e38592b91c78a94cf787e14507ae2cdab SHA512 44d1d11aaf4d27bc6ae0244fbf864c58af6f67bc9a84e26591d284a7f8f178294007756f427727b1dc173a439d82d4131bbb91cb7bf2c93f527abd74f5314045
-MISC metadata.xml 418 BLAKE2B 1f3466117ea254c0f63a9281e3051dd933446a82203153ab31427575948501914f9aa6a14e87331d21f1994079935d6ecf3238099e9cab7368bc0c2d44fe3350 SHA512 6bc03c4667e05f99c140707098339dd590da95fc36f2c0634cf4374b714bde1508558f9e0f5b6a98f05d2950ddc2df78d0732f84f2be47bc317a086ed29581b2
+EBUILD debtcollector-2.5.0.ebuild 790 BLAKE2B 97191e92e214378c2787172679507dc29fb6d45ea9d9977aab4107346b04e9925e5bf8d49ccc1200477ea1c816bd9f195966341630a153920c8f2a654ad6d114 SHA512 e85e80f4d728d80c5316ad59fd82b121d9bbd7c4ef5c5057a89c17e3d4dc3ae0edd9188aa81f794d6996903c156d6256a3be13514fab13676955c8af1a35df49
+MISC metadata.xml 519 BLAKE2B 16818df2a48b3549b714e96a622a995bede31e23887977d51a23dd6f5e81a73eb50a389b44e51cd154b0a477ec801333b75df43d6f6f9591b01f00aeed335eed SHA512 a1003939423b4a63e4a568456ebacbaca90ef5a3b21752c9c8bd893c15244eda2a2c624937c57343e9f94ba4f2e81b34d6068c987c5b3faaf8a58f834f749f6a
diff --git a/dev-python/debtcollector/debtcollector-2.5.0.ebuild b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
index 5d8a4d52f930..4f5658b2b5bf 100644
--- a/dev-python/debtcollector/debtcollector-2.5.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
@@ -4,17 +4,21 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
-HOMEPAGE="https://www.openstack.org/"
+HOMEPAGE="
+	https://opendev.org/openstack/debtcollector/
+	https://github.com/openstack/debtcollector/
+	https://pypi.org/project/debtcollector/
+"
 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 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
@@ -22,7 +26,6 @@ RDEPEND="
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	test? (
-		dev-python/subunit[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 		dev-python/fixtures[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/debtcollector/metadata.xml b/dev-python/debtcollector/metadata.xml
index d4aa3f95b190..c2d8a7088798 100644
--- a/dev-python/debtcollector/metadata.xml
+++ b/dev-python/debtcollector/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">debtcollector</remote-id>
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 415f12c4af02..836618946979 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,4 +1,7 @@
-AUX debugpy-1.4.2-unbundle-pydevd.patch 2452 BLAKE2B 44cebbf0b1bd07c1abb5d8ea6489ff241ddd3bab28e8697462466c1d70160a2d7a2a7f51bcb1747fb8129854b16adb8eda7d7598741fe0c72ea6f8217878e569 SHA512 ee7b5a6125e071fe414e481633224a3e77a5f8d0cbf3fcd855932db3154f4371a92058ecb730b8f69c97a4f01601425eaa271aeb04cda5f2ac5c867c90001b95
+AUX debugpy-1.4.2-unbundle-pydevd.patch 2530 BLAKE2B 6deba4e0d3b8f4f4ce7e133308bb6a2266e1bc679a0f8e4d8006407c291672198c700fe81c72c139c1ad76908c0523ae494e341ef82f66f189aa6511aba55de2 SHA512 a9eaf4170b3b32a1749e39b8f1f8753de55886348b5fad40fac71f3e31d37aee8849643d9fab3986121b0f7a90f013bd1f07ec5b454089dc3c095e300dee972b
+AUX debugpy-1.6.0-unbundle-pydevd.patch 3342 BLAKE2B 3a95507fa1c504a910edc43be562e73afa7ff551d608b0193828ad0f6c8bfc1d97aaa0b355afdc22e9925406f8f47badad5a506ea4a6f86d86dbd31307ce7007 SHA512 0c4b4888624558289623712239019144816f3f802668d3025e2cbb33301b84d6e8c08dceb67b619ed10d1193e0f0526202822685fa3aebdb219d0f3f733be66b
 DIST debugpy-1.5.1.gh.tar.gz 6675322 BLAKE2B a8e3a07d5dbd1b5ca39301e703b279514653606f98743a396693738c9a89403c73a6b6942e5dc368dd89eb8b74277e1808f9247573f330e3a94596c26af7e5be SHA512 93ee526ca7cb3d44b85106a33d8f930f4f2b307eb26ede3ab6b5653de986a101b10f545f5de12cd8ee6ff9e9a12c5e4b57c4c40b1b3003c2f555676bd34482ce
-EBUILD debugpy-1.5.1.ebuild 1105 BLAKE2B cb76f4423658ca38e7b4a6857080a827ea35a7d0ad83dabe879640fc7b69a343d76bc06771cd58df223904ed04e578d60adab6381f7157f768b5b80b0b93f557 SHA512 495d86a186e0eab7c75ff230da8f85dbe5df175d27d39a123a0d7e43e38ea5b2e318ff0ca8dc9112aedcd5775a3c5aafd6cad204af46063dda47e1156cd4ee25
+DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962
+EBUILD debugpy-1.5.1.ebuild 1105 BLAKE2B 443f52671ea9fa4f25ff0aebbe9e3efaeeb08f3f01480550a7debc59df9724c9b5e9d14a5f110e77a95b5d74ae6fcccd790cfa676493f3b21efd33ceb03c39bd SHA512 d67ec0188c85b933f97c9a54bc4e6f70cf2686364419b20cba0aa90dd42bb90ea126d58b4cbde7a6029baf1eabb6ac4a1c98d6729a58e85d174f26dbcaf85938
+EBUILD debugpy-1.6.0.ebuild 1110 BLAKE2B 95e21670128d1d8e71c011e3b841da14beb06be1d604433710a83d327907cf3555d0d2a6b692de02f455bbc3eeee166c7e305f6e51b4790a55c945c1367b005a SHA512 94d95ed31ea65c07a6816abe9c9d8ac9909e893f39ccd1a04bead45d2cd68a0f4668c2024a2750f9b65e8c435df3181cbf15fdffa61b1640766b05c77bdd3f78
 MISC metadata.xml 451 BLAKE2B 671153316362e0394ae59824e67f5ea897615d3853552aa92fb273d4a41a88916cfe03650ab42248ffee557cb95149b21160395e0fcb2f1fd69bb3bc2c97ea55 SHA512 393d4898c3555b425c34dad5f540f42fc8e281f6299360d1192d099e73486467c92ed16ca710e34d2868aec63fca2eab4775b86e95e6dea79b8721ff70e1db87
diff --git a/dev-python/debugpy/debugpy-1.5.1.ebuild b/dev-python/debugpy/debugpy-1.5.1.ebuild
index 8c11cbf4f6e0..ab764a291aae 100644
--- a/dev-python/debugpy/debugpy-1.5.1.ebuild
+++ b/dev-python/debugpy/debugpy-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild
new file mode 100644
index 000000000000..783b447c47b0
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.6.0.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# This is completely broken
+RESTRICT="test"
+
+RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-unbundle-pydevd.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
index 7047877ef279..3d60bcd18cbc 100644
--- a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
+++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch
@@ -1,78 +1,78 @@
-diff --git a/setup.py b/setup.py
-index ee5bbba..f69dc95 100644
---- a/setup.py
-+++ b/setup.py
-@@ -21,12 +21,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -36,27 +34,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -165,11 +140,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
-diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py
-index e6a1ad6..a79a86b 100644
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -3,7 +3,3 @@
- # for license information.
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
+diff --git a/setup.py b/setup.py

+index ee5bbba..f69dc95 100644

+--- a/setup.py

++++ b/setup.py

+@@ -21,12 +21,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -36,27 +34,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -165,11 +140,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index e6a1ad6..a79a86b 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

diff --git a/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
new file mode 100644
index 000000000000..41a0b8e39ba6
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.6.0-unbundle-pydevd.patch
@@ -0,0 +1,102 @@
+diff --git a/pyproject.toml b/pyproject.toml

+index 15ea7e1..d3a2764 100644

+--- a/pyproject.toml

++++ b/pyproject.toml

+@@ -8,7 +8,6 @@ exclude = '''

+ ( __pycache__

+ | ^/.tox

+ | ^/versioneer.py

+-| ^/src/debugpy/_vendored

+ | ^/src/debugpy/_version.py

+ )

+ '''

+diff --git a/setup.py b/setup.py

+index 2c0a2d6..7c22c0c 100644

+--- a/setup.py

++++ b/setup.py

+@@ -18,12 +18,10 @@ del sys.path[0]

+ 

+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))

+ import debugpy

+-import debugpy._vendored

+ 

+ del sys.path[0]

+ 

+ 

+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")

+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))

+ 

+ 

+@@ -33,27 +31,6 @@ def get_buildplatform():

+     return None

+ 

+ 

+-def cython_build():

+-    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")

+-    subprocess.call(

+-        [

+-            sys.executable,

+-            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),

+-            "build_ext",

+-            "-i",

+-        ]

+-    )

+-

+-

+-def iter_vendored_files():

+-    # Add pydevd files as data files for this package. They are not

+-    # treated as a package of their own, because we don't actually

+-    # want to provide pydevd - just use our own copy internally.

+-    for project in debugpy._vendored.list_all():

+-        for filename in debugpy._vendored.iter_packaging_files(project):

+-            yield filename

+-

+-

+ # bdist_wheel determines whether the package is pure or not based on ext_modules.

+ # However, all pydevd native modules are prebuilt and packaged as data, so they

+ # should not be in the list.

+@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:

+ 

+ 

+ if __name__ == "__main__":

+-    if not os.getenv("SKIP_CYTHON_BUILD"):

+-        cython_build()

+ 

+     extras = {}

+     platforms = get_buildplatform()

+@@ -179,11 +154,9 @@ if __name__ == "__main__":

+             "debugpy.common",

+             "debugpy.launcher",

+             "debugpy.server",

+-            "debugpy._vendored",

+         ],

+         package_data={

+             "debugpy": ["ThirdPartyNotices.txt"],

+-            "debugpy._vendored": list(iter_vendored_files()),

+         },

+         ext_modules=ExtModules(),

+         has_ext_modules=lambda: True,

+diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py

+index 642c776..947cd7d 100644

+--- a/src/debugpy/server/__init__.py

++++ b/src/debugpy/server/__init__.py

+@@ -3,7 +3,3 @@

+ # for license information.

+ 

+ from __future__ import absolute_import, division, print_function, unicode_literals

+-

+-# "force_pydevd" must be imported first to ensure (via side effects)

+-# that the debugpy-vendored copy of pydevd gets used.

+-import debugpy._vendored.force_pydevd  # noqa

+diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py

+index 6016545..9bd2e2c 100644

+--- a/src/debugpy/server/attach_pid_injected.py

++++ b/src/debugpy/server/attach_pid_injected.py

+@@ -33,7 +33,6 @@ def attach(setup):

+                 pydevd_attach_to_process_path = os.path.join(

+                     _debugpy_dir,

+                     "debugpy",

+-                    "_vendored",

+                     "pydevd",

+                     "pydevd_attach_to_process",

+                 )

diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 337b57dd63ec..a80e91642803 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,3 +1,3 @@
 DIST decorator-5.1.1.tar.gz 35016 BLAKE2B 0e38ee2dea6793d489f5c50692549022f1b252ab3a7b75da5b785f856b7f18faaf5570dde2c68f6936c11460599839063e9eb8a133789a00f683761393a5103d SHA512 584857ffb0c3e52344b473ceb9e28adfd7d789d480a528471f8ab37be055ebe5feb170f41077010e25350e1c311189d45b90773cf12f0043de98ea8ebcde20ab
-EBUILD decorator-5.1.1.ebuild 651 BLAKE2B 8a57114f972eddcab2d7d26883d7a99465bea189dda8702f69a65d15823b409b14ac1ec71d953856bd2ffa9b77d7bdbe8204e95eba8dda9b6e3e7095326afb49 SHA512 82c07fd8fe947cf1719a6d6cc0d99ed21ee81283d33ad5a2d5e386022d2b540c9125ba5908f27507dce18aa778cf63d3b8446c858c1c71174ba340ffebafe336
+EBUILD decorator-5.1.1-r1.ebuild 689 BLAKE2B afedc2c824b080ddc5f58b3c0da95a14d698c26145127d2ef3a2b199967fd791dd186ce2eb4c813c3874de42db11cc8194b7a39017f4141d38d15ab3bac404dd SHA512 9b0545db4d9436985f689f569a7020511be9f4e9c3db479b354bd68f4b3eda01d07cf10ac4d8ab8cc0fea57a68e5c9602ae550efe9ef0f01b900feb4dfd62883
 MISC metadata.xml 756 BLAKE2B 231d25578555eda8a5f6d5598dafdebbb3695656eff92178f664eb29eee5d9f18f82235c40d974c58959aa1f4692d4818edca6c640f146520186cf5390cd21d2 SHA512 a9d79d6dd55a349e41d861f1c4b2526c8bc71261fc5ea796675ebed8a9389b3945da86814acbd0a67edd4379dee36b4d99f2cf788fba5d2eadf77e87f6c0dde9
diff --git a/dev-python/decorator/decorator-5.1.1-r1.ebuild b/dev-python/decorator/decorator-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..973f23286924
--- /dev/null
+++ b/dev-python/decorator/decorator-5.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="
+	https://github.com/micheles/decorator/
+	https://pypi.org/project/decorator/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DOCS=( CHANGES.md )
+
+python_test() {
+	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/decorator/decorator-5.1.1.ebuild b/dev-python/decorator/decorator-5.1.1.ebuild
deleted file mode 100644
index 6a8b2349c2a6..000000000000
--- a/dev-python/decorator/decorator-5.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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
-
-DESCRIPTION="Simplifies the usage of decorators for the average programmer"
-HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DOCS=( CHANGES.md )
-
-python_test() {
-	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/deepmerge/Manifest b/dev-python/deepmerge/Manifest
index bf57ab81f708..5efa1ccf70e5 100644
--- a/dev-python/deepmerge/Manifest
+++ b/dev-python/deepmerge/Manifest
@@ -1,3 +1,3 @@
 DIST deepmerge-1.0.1.gh.tar.gz 15004 BLAKE2B bc1d972f40485d02665fb6cd53875fa0f35e387192a9b0cc65f092966dc760a3ccc7eae6515693f39e58d7bb0a071aaac970873738a99b6962561eed641ef48b SHA512 689c9cc99c3770e27ae131bff65486ca02555840ae3fbeec1e36d08e425842e50ac7005d63ccf053627806c39578b2c9fb84fb10ca76731d17136cea61b87bbd
-EBUILD deepmerge-1.0.1.ebuild 741 BLAKE2B bf7204facff76a94ddbca1d0608029d432714eed95532f1b1b66574bff2e582da99c35b8bf566ff652637bd45407c9ace0744853fb2b0d8a19508a26407306c5 SHA512 430cb83104979bf3d997632eb9655c2e3cf8c9228bbc2063d9c824355d4cd642b8622582a4cdd954a8fb2a1cf27dc4c850f38e547e54748a0372b94bd174bd37
+EBUILD deepmerge-1.0.1.ebuild 741 BLAKE2B dde49f26d06074d3c2e7fec238037a16b8ffbf5c63e11ed0f1791fbc85a7c978dd7320ebd5da77efe874ea18cd71af028db99ca0f018d50f8bda2d07c6c520a9 SHA512 19618c67c3b74f790d5c563a6563446caa59a2f0dd49f4133239de219e0c72a8e496141f63d94201e304074e0696c2d200e70cc0ec72e57a7df8f0cb493be5be
 MISC metadata.xml 337 BLAKE2B c9bffeb85e875d5beb45ed90ef00be6e559be49d8a7a8f437394b111d9a0d352b95ddb8925746a8de5fc68b27ddb72d382bf5fbdb25876efc4e2c657102d9d4b SHA512 5dd47098dff36f4b698b9ee5d1aeb2cd963bd099d4a256bc08ad7354967457310f4c316ccb3524576b751b0f26193752d8a7f31b67e70de1bfaed038d5ecacf5
diff --git a/dev-python/deepmerge/deepmerge-1.0.1.ebuild b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
index fd90d44d1e1e..53b0431ebc98 100644
--- a/dev-python/deepmerge/deepmerge-1.0.1.ebuild
+++ b/dev-python/deepmerge/deepmerge-1.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index a748099dfc12..86526e4380cc 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,5 +1,3 @@
-DIST defcon-0.10.0.tar.gz 426111 BLAKE2B 6750ac064677bd1b2a2b49d37792b4e35c923ddd239c521490dd3aa0c40f55a96dcdac156a2511c3bb40605505beb920c66053488bb2bc2508899d4a81f77ddb SHA512 69d48701bdf419080b7acafe2b92c1897358d969d6ea5b78330969b79b9e393a1c53cfb1a17b4d58719329c403ac3a52a4e12828d99b8793d8dd19ddda151c76
 DIST defcon-0.10.1.tar.gz 426234 BLAKE2B 0d4f0749c061860603d343bd8d0291699a64794ec8f3f1e6f1cff0af0f22cd0cfc4ae60d578c5f55131d1de694b3234017afd124a4266c972217b39d70071473 SHA512 12cb1512321b91676f8be380999dfb00942eb8355389db409ef896f7e7100fc97186a920c1c0a741b660e57134e880d068446e5ad00e2768221f80a26608819c
-EBUILD defcon-0.10.0-r1.ebuild 720 BLAKE2B 544665158c21e30346d8ae88de808927cde265723d91c1f1feed491b757f061921c092e5c83eab63e8214fc5b78220195862b23dafd7c73a59a7c6ce51877b87 SHA512 b0b0389b4a500f0d61a2ffbe461c157d6d2acd1931fb87c0a7cf5430991eef77979f1a5b21f5530601a580b60ead57b0d38025343ec7696a2b7db703fa8585b8
-EBUILD defcon-0.10.1.ebuild 723 BLAKE2B 3a4c0a37309f00028124b9ac296cdf628345d41c094773c5d2be85b957d118c0698e7104f732f1c7c5da060d8df4f6688981dd32bd9b93afb7a0b515fed16451 SHA512 432bc3f816544b4747b1ea92a4001a097d163c91fb9435948b3750ee1d3baf278282cd99a660b1c4e448749022865d12836aac90acf3be8bdb01f72b3eb3d6f2
-MISC metadata.xml 393 BLAKE2B 54f3c0643f3329d956636dc0d59a1396c65b082b7fb4d97fa0a3ffc494f04d19e5e0b7d84370a90825d67c82c0d7f5cd9d300fd5cc763250cc97e478e7a56423 SHA512 016cfb5ca7dc52255bded1027f1d1101707b78913562e81232ba7768d2ed2eb1060095a61744680bcd96ddefaf29569e0b164704d1e6fec1771c5fe129004f6e
+EBUILD defcon-0.10.1.ebuild 727 BLAKE2B a09734e16ce0002e9b75c238f1e8555b3ffc9dfbac325e4c2b73f04d4687b0f583fb737e12b393cd6bb18e004fdfc168f846cf35302dc3f46303c295bbdf9923 SHA512 b194f38777e85a0ce86a892da56589e1897c41d4611f214e31028672a985ddb8f02fdfb6a78b48c2e0b82e2f7aa8b7a90caa3cd50df9eed00660dcbed364d4ce
+MISC metadata.xml 494 BLAKE2B 9770fc2e1922d5caf6a2c8022f450e2ac3b6bdcb4da6ef77f1cfa66c2b96e32a2a4503e2404a2574fba9a41ff19f2255638eaa39c0bd367981b1bbe79945fc17 SHA512 02425eb4725a172ff8b869099bd6903ca62669687969be51f5dd3b072bd397e7192f0469bf38d0349e47b95586e34e531c05ed6b0b5f284eb3d521b8ca27b6d5
diff --git a/dev-python/defcon/defcon-0.10.0-r1.ebuild b/dev-python/defcon/defcon-0.10.0-r1.ebuild
deleted file mode 100644
index 2c7688d19ab6..000000000000
--- a/dev-python/defcon/defcon-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A set of UFO based objects for use in font editing applications"
-HOMEPAGE="https://github.com/robotools/defcon"
-SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/defcon/defcon-0.10.1.ebuild b/dev-python/defcon/defcon-0.10.1.ebuild
index ecf74aab0094..b233adb09855 100644
--- a/dev-python/defcon/defcon-0.10.1.ebuild
+++ b/dev-python/defcon/defcon-0.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/fonttools-4.28.5[${PYTHON_USEDEP}]
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
index 3bd61bab51f3..07df6f63671b 100644
--- a/dev-python/defcon/metadata.xml
+++ b/dev-python/defcon/metadata.xml
@@ -5,6 +5,10 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">robotools/defcon</remote-id>
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 767143c4cd71..0ba2d9ec6959 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,4 +1,3 @@
 DIST defusedxml-0.7.1.tar.gz 34709 BLAKE2B cfe69851e0ac6472cb9e66d1b577831eec37b0a01129dcb43cec151aa939029efc194220f3c7b481d306a77db710a639bdd56f3fd1f7ae46fa4ab8f308b8036f SHA512 4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864
-EBUILD defusedxml-0.7.1-r1.ebuild 921 BLAKE2B 31bcd13fca03b64de1b171cdd7d939a03037b0af3a6b31241c50b9403e76a552555d065a369d70c40c14ed18ebf7aa5e203ffab63f2e1fc4eb86bc824f1fbc83 SHA512 0713829daae6511036a484bd3f84f165634d49729379ec581879c4f992452635e6b4e767f7240900676d318613b55225dc81bdf5ef8caf9c622986b666062436
-EBUILD defusedxml-0.7.1.ebuild 778 BLAKE2B 622554549f672f5cff6a0c4c13635f4b7d6355fd3ff219c226474c6cb24b30717fbafca894bcf8ca179cde45a834cf2e61e578587e79b816e7811ef2bd41ceab SHA512 eafd9610083f16effb5b76ad4ceefa91016c68ef61e509692c0674919800d94fcb1d2d08ff74ab06c0ef48e7852d1cefae6377ed0fdf66445ee01b9720a8ae9f
+EBUILD defusedxml-0.7.1-r1.ebuild 913 BLAKE2B 1d5add914361ed1d4899ce471bd8770338043d4fb1cec3775a46aeabb0a50a149de4368f09f7beaf39987847ba57cddc8a100d92a56c71cfff0a34bc65605403 SHA512 cd6561a1684bc98b1fef0e9b8120521e5a10509588c93eec37148033480671d75c13263f5c8114a2b097e15f8759d54ea0e61b3826131e72b08252316c560eab
 MISC metadata.xml 407 BLAKE2B 7bdbcb75f81a2de2438c5fb0be0f3a5a634b4ba31b3e32eae6a4094bda9b00ada4c779b8c0884ab0442ff09d3f0ad27ea7de851adff94c320bb6e75c8a499f6b SHA512 a47ffd89a479f85548aa4ce42ea525cb0685acc7c0b83ba74ecaa16d1145912409a4cfe4473297a2923bf4875e567489d5c72a10ddf485e0258605d1c4109f0a
diff --git a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
index b48784799f81..c39a444647a8 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 src_prepare() {
diff --git a/dev-python/defusedxml/defusedxml-0.7.1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1.ebuild
deleted file mode 100644
index 467e26e24293..000000000000
--- a/dev-python/defusedxml/defusedxml-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
-HOMEPAGE="https://pypi.org/project/defusedxml/"
-SRC_URI="
-	https://github.com/tiran/defusedxml/archive/v${PV/_/.}.tar.gz
-		-> ${P/_/.}.tar.gz"
-S=${WORKDIR}/${P/_/.}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-
-	mv other examples || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples/
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 832a3472ddef..adb53e95a78a 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,7 +1,3 @@
-DIST denonavr-0.10.10.tar.gz 149803 BLAKE2B a2a034c05cee5b7c6eb51280f4064f41e1228e303043717bb7d4bf08a47230263eb0ab7a96f226ebedaeecd972c1f25f297a1ae3911c44d48949fd113e2e11a9 SHA512 219b04e64055c6d659db09229f895ea3acc90a9d6398d6d53d51753a14779603b8ff983b6c62aa6ce46c0945d11d9e48ff22ca9d9b36a81121cf5dfd4ffac21c
 DIST denonavr-0.10.11.tar.gz 157622 BLAKE2B aa311eff51dbba857f529aee1a1931b3456b7c42f4710d21aff0eb6cf21718d639795d8099e8b0ad297787ba887746b265f922c19afe692cc3317291023a2df3 SHA512 19a10196019067605a2565be4ee0dc56116d6f706ca97c6754e6dc63cccc8870ee657736fd17f1959753c1c24c878e0d7a721c33212e6753dc12b5fc7dae34e0
-DIST denonavr-0.10.9.tar.gz 152589 BLAKE2B c517e7d2fbdb23f4b684ffbb206528a641ec9d64e48f1d7aa8a4dd1247ca779bb2bda8a9deab1a985d713d275dc68fa6f961205e33b8bcc7749d9cb3c943f752 SHA512 134b940516a312afb03b2c5fa11a5fb68374c6e5d636332e8a7034ee6c94d2baf70b53e979c1c751eaaab6d31822de4450ceddeab12c42dfc9dd74b934593621
-EBUILD denonavr-0.10.10.ebuild 824 BLAKE2B a188c1fb162f6e3e397cdb00c133a2bc8365c77f51608f9e1eb9baf43916569834ca761f222272e0c379572ebbfbf4ecbc9da99028d453753f3ad9807fcd8cb6 SHA512 3538156b70d904a4ec68b008dc510efdd286689721c21d05f850b5741e59dc146f0bf18548d065e402e26f56a9ee173a40a8ce4e5e2ac34c2c0f8eaa2ec76a1c
-EBUILD denonavr-0.10.11.ebuild 870 BLAKE2B 1f168976272356758e09005aabd286bad1e3baefd24eab569cc4e9e4fc9699216fc45105a18d3c260ef5c6afa8702325807cf65bdac4009028d3329e794d8c94 SHA512 8f15d2ba5cfca04d58786c2f691022a7beab06ba43914d7862b2aba476e0571e559f388158a3e6b909cc88e4cbf5535c5a47617a04bb19810ae85b808e34cb6c
-EBUILD denonavr-0.10.9.ebuild 756 BLAKE2B 7f11f8e692a473c1b6eacbbc71d1b3db474b0703e4316de7d413887e4f2093e38e73497d493c6a0d80fff1d2f9ca6335ce902f276d15dca3625114916a06e557 SHA512 a1c1c586349818da04f152df8414c6427f8f4bb1d5ca4aaf681120aa084ac1c2be3d6d269fe2effc0a3f2b16b02f187ff8744e7d51379f5837fdf722c817d9bb
-MISC metadata.xml 550 BLAKE2B e7b828fe2f56fae95502d15f5fdfd8bf70d66aec26a082356d797c86ba31e1fb17e7c721e5920c69f4fd80f00af7b0251c497ebe1243e76b688d7a536e6ad79a SHA512 e4c69f9242520c58f3533e8d19d30c31a84856f2d2030643ead0a57094f07995626e15c2ab59756f505dd7849465a1c8e0bb00654a23a1bc8244e27db3e9efb8
+EBUILD denonavr-0.10.11.ebuild 904 BLAKE2B cf0e90af3c4687a08aea95fd5c6c03d5b38b18db0f6f678173f58ea2a336812e61ea6e5a4eb8b9d1227dfcb85d0807983dfd96f308e79545fd2ffcb0562bd49b SHA512 487baaf916687e307545add692741cf7a93ec7500302857b366c62b372dbe12e99e26ea476d8c1a85863b42af0354d2088795c986c0447880219e5fc139f9aec
+MISC metadata.xml 538 BLAKE2B 7f0ea063a1ebe7cfbab11a8e92b803606c6454ea9bf871bc804f048a58b35e0ab66eafbee64d8d4328e4e3cd5361a810527813c48aba212950f263da2b4454cf SHA512 3531537b37f09f4b0d27d124d1bc698d8b8eeb410a0f3504f315a8002a8443a886959706e437359796623f3462b3d12d89ad677fbde73ee6081c61ed01663ad4
diff --git a/dev-python/denonavr/denonavr-0.10.10.ebuild b/dev-python/denonavr/denonavr-0.10.10.ebuild
deleted file mode 100644
index abf79bb7064a..000000000000
--- a/dev-python/denonavr/denonavr-0.10.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/asyncstdlib-3.10.2[${PYTHON_USEDEP}]
-	>=dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.11.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/denonavr-0.10.11.ebuild b/dev-python/denonavr/denonavr-0.10.11.ebuild
index 586fe3818805..d22c10bd481e 100644
--- a/dev-python/denonavr/denonavr-0.10.11.ebuild
+++ b/dev-python/denonavr/denonavr-0.10.11.ebuild
@@ -10,7 +10,10 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
+HOMEPAGE="
+	https://github.com/ol-iver/denonavr/
+	https://pypi.org/project/denonavr/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/denonavr/denonavr-0.10.9.ebuild b/dev-python/denonavr/denonavr-0.10.9.ebuild
deleted file mode 100644
index a1f9035bd578..000000000000
--- a/dev-python/denonavr/denonavr-0.10.9.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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automation Library for Denon AVR receivers"
-HOMEPAGE="https://github.com/scarface-4711/denonavr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/asyncstdlib[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpx[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/denonavr/metadata.xml b/dev-python/denonavr/metadata.xml
index aba278a0e1eb..8b441a1bcc7a 100644
--- a/dev-python/denonavr/metadata.xml
+++ b/dev-python/denonavr/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">denonavr</remote-id>
-		<remote-id type="github">scarface-4711/denonavr</remote-id>
-		<bugs-to>https://github.com/scarface-4711/denonavr/issues</bugs-to>
+		<remote-id type="github">ol-iver/denonavr</remote-id>
+		<bugs-to>https://github.com/ol-iver/denonavr/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 7021b870ec60..16f9e0eac793 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,3 +1,3 @@
 DIST deprecated-1.2.13.gh.tar.gz 2971610 BLAKE2B 00c1fad34e869b143ad7cada2426f999f1d353d23e33076b0197a7ca6c87b0f2d240d7f4944b7c7669974c89304a6cf04f5d2b4c44e6fee22c27522ec2cc9711 SHA512 c170b086bc4e37462181a0f53edbe745aa4f4924c7fd64d9693de267e070392b74445f9cba935e85c878b755603ca6cada8b4130ac96ab071be284047aa35619
-EBUILD deprecated-1.2.13.ebuild 773 BLAKE2B 2ea600f88df3e7f2f8ca35478372f4a0945fb393ef79d4763ae48f43cbd01b12eb69913cb95c8becda7e2b99e8ece2f440e1b6b203b1096f64b897317c8aefef SHA512 87424dc9289778ea148e4ec0e23f15b7bbe78f6515796d7a7b6aa743fa7a0d6d40706c48e77cb785a6c079367fb0db1f173694f17e53b6015eb0c284d9c02eae
+EBUILD deprecated-1.2.13-r1.ebuild 852 BLAKE2B 42d4cb43ab5eb227c2e1d8ef7bda767b64dff205f0f04dad2d9b36210bd033c821c841128382558ef07fd31fcd3e71933b3bbaa90ade3a6d7c1792ed743921a4 SHA512 73b60c6af975cf46c2e8b5c567abdb9a522f46bd88993f7bef63d074d79fc253887d1b443f7cd40abfd3c932d3e579e899091c3b6f842aafee45e034cbec017d
 MISC metadata.xml 316 BLAKE2B 0275fd3fa62ad50251204b24fa83ede995c3b25ae8547fe507ae5b61812ad760db24cc2fba35d7af629b8e520e5c2c058c412ad0bd71554b3b350dc085f2f35a SHA512 c7237b466a2f0b791713cb36edf731ead6f37757faaf193fc4889ba17e2e25b5ef68ddbabcf0644c7948e23f13248023f84cda9f1c49723cb5221c603ffb1d5b
diff --git a/dev-python/deprecated/deprecated-1.2.13-r1.ebuild b/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
new file mode 100644
index 000000000000..7bf2c03296f6
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.13-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="
+	https://github.com/tantale/deprecated/
+	https://pypi.org/project/Deprecated/
+"
+SRC_URI="
+	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	dev-python/wrapt[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_deprecated.py::test_respect_global_filter
+		tests/test_deprecated_class.py::test_class_respect_global_filter
+	)
+
+	epytest
+}
diff --git a/dev-python/deprecated/deprecated-1.2.13.ebuild b/dev-python/deprecated/deprecated-1.2.13.ebuild
deleted file mode 100644
index 000465c10a44..000000000000
--- a/dev-python/deprecated/deprecated-1.2.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="Python @deprecated decorator to deprecate old API"
-HOMEPAGE="https://github.com/tantale/deprecated"
-SRC_URI="
-	https://github.com/tantale/deprecated/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="dev-python/wrapt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_deprecated.py::test_respect_global_filter
-		tests/test_deprecated_class.py::test_class_respect_global_filter
-	)
-
-	epytest
-}
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index d3c9b2d4eb0e..f19f28a31ad0 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 658 BLAKE2B 2de0381270ec6236464a653bc683c0af92e9588cb3b45df4dfab8b982652f2a38d206f3ff5bc332c123ea8aef4104c7386cb793eb6d51217e57694f2d9f69966 SHA512 cd5f8de23a45f6306c1b69ac80d057fbced6fb85e2e948753b379f445739d0a54edb378eda17a1bde175009620f0516cfbc13d91478234af4a9113e3a616070c
+EBUILD deprecation-2.1.0.ebuild 658 BLAKE2B d7b708f95b51aa53763d18dcadd7f577df5d3d9a284b90e8dc2824545b3d9d74f98443b916cd9050e38f455bc550e8f4c7ff400eecbc6415e390397da4a3039f SHA512 cf42b7118a75c0be28ada73fd3413e9b38f73a465aef1b12630b09cac03f7aecf0636939f82ea8dc33d8940d3d1b2e6e3c53bfd9247290c1c7df4cc68ed073ef
 MISC metadata.xml 566 BLAKE2B 5fab2937b6a3086ed28187e08d54df149979ad9fd6c89d4f633f041c03d1d728a58a1e384427b430e34eb497c099e164048217340d445958ea9901f7dc79c23d SHA512 b20327bd7416f7476959ae3fbb2d6ba6cc210ef0c702735322bb540bde7776d777fa4e84b2ec468d649d4ad424ee1a5f9c4b6ec2a8c798d8582ca60715e85dcb
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 529761e3008a..394eae93dbec 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A library to handle automated deprecations"
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 2443d6e5eb20..4700e2b8fb99 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,4 @@
 DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
+EBUILD dictdiffer-0.9.0-r1.ebuild 1005 BLAKE2B a8b48ceae95635273ed1d8826ed41ffd47dbcab09b2f304e7d010cb6d4a121db9166825c1e2ca1e8d63870b948f30e2cdb6d488f677e9f05df9a53244ca863e8 SHA512 f534d6d8930bb503dff2529587d637c8819be35fb1f3ef6330f650aee664262b33a97c6d1d368934cf1b02bae117746d456c16f075ffbbecdf641ddec5f36f49
 EBUILD dictdiffer-0.9.0.ebuild 966 BLAKE2B 1188855734ef53746fb227a1c6dd83293f7810c1181e76ba816b575e64fc29208542516c05a379e4f32714c86c3640f69f5948036a9b774e4220af03b9da9cd9 SHA512 7167a0715ec1a08f4fbbe86ba5682dee4a92c308ecbd987dce4a20af4246e5f6d87a0945ff2b93f176e2f6189ab401fdb037fecd914c8604c7c1a1a0959a2e27
 MISC metadata.xml 524 BLAKE2B 7ead1ecf64224d0d27ff4540f6042de5b61d423e826774ee954aa0134f2b7fa9e8823e93a57d02c9daebbab270e667423cb144d26041baf87decd7a8e5da6985 SHA512 bf6dea2186276619f0ff29b8f62b69609c3abf295f3fdefa7228ef3018d2d58dc279a1d70efcfc657b62c6b7a80b8b76935adbc040531a6bdb10803310c345bb
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..05b79b7c3c39
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Dictdiffer is a library that helps you to diff and patch dictionaries"
+HOMEPAGE="
+	https://github.com/inveniosoftware/dictdiffer/
+	https://pypi.org/project/dictdiffer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# Requires self to be already installed
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# remove dep on pytest-runner
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	# remove dep on pytest-pep8 and pytest-cov
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dictpath/Manifest b/dev-python/dictpath/Manifest
new file mode 100644
index 000000000000..647d768ff812
--- /dev/null
+++ b/dev-python/dictpath/Manifest
@@ -0,0 +1,3 @@
+DIST dictpath-0.1.3.gh.tar.gz 10823 BLAKE2B 4b9ef37810f9267790dbea8d858fd768c2bed7f7c1987a83bb2bd2ac81cc2c61b334a473c73dfa300adba77522d4d5c985a4278828a85c04fe330e94570a5dcc SHA512 bc5929856401854588b570a8b22cae66d4ea190d344ce1417f7406ab8a9859a10310a454d9f3d380eae1061ed93346a43f4ee6c19b1afedf6b5d8a1ba1431ed5
+EBUILD dictpath-0.1.3.ebuild 719 BLAKE2B f428b69f02f6fbec537b6dd59f915bef515aad85881a979870a7775628748d04acba2ebaf045808314457c2ea4f072efe768c2bf7ec3564b6848758cd9237bdd SHA512 a932dc53d0b7d51d22129f020e12b31e7d1341d2e683e19b97e6da5a09743717f10a47f2efd0b33e78e24187ebfc55178ffd4c04c91b6197101d1f4b38c02222
+MISC metadata.xml 290 BLAKE2B 5bebb5e4bce1eff9266cf5d839cf2f054bcf2087ff6bf691c0ddaea05db577e734f5d3a1d1a4d09b734d6f928dad346376469d4360e788e372235500d45df586 SHA512 4ac838ee9a65686d0f8d436bc8026c5316d50256255c311a6bd1867d63fb74a1f83b638bb9df74658e717741c5a771b7332906ffd870a2304f2ff86af2430bb2
diff --git a/dev-python/dictpath/dictpath-0.1.3.ebuild b/dev-python/dictpath/dictpath-0.1.3.ebuild
new file mode 100644
index 000000000000..fa916cb529cc
--- /dev/null
+++ b/dev-python/dictpath/dictpath-0.1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+# Upstream has renamed to pathable after v0.1.3
+DESCRIPTION="Object-oriented dictionary paths"
+HOMEPAGE="
+	https://pypi.org/project/dictpath/
+"
+SRC_URI="
+	https://github.com/p1c2u/pathable/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/pathable-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/dictpath/metadata.xml b/dev-python/dictpath/metadata.xml
new file mode 100644
index 000000000000..23a68e1b8dc2
--- /dev/null
+++ b/dev-python/dictpath/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+	<upstream>
+		<remote-id type="pypi">dictpath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/dicttoxml/Manifest b/dev-python/dicttoxml/Manifest
deleted file mode 100644
index c77d901c3a36..000000000000
--- a/dev-python/dicttoxml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dicttoxml-1.7.4-py3.10.patch 2064 BLAKE2B 3cf7ba808fe4f0a74281f29dd120304ff1b69e39d1a8cfaac930297fdc801acb11f13903ce3806ba823968ff1df6c5493a4e2672c37c4bb385e806c624c5bece SHA512 8813bdbe353eb54087946aba4cb6bad7893ad1ca9b92b449d2298fe6e4e4ec6881f712ffe2eb42154c6ddfce37e6fef3f7a6949a792e148c330dac5f9d99383c
-DIST dicttoxml-1.7.4.tar.gz 18190 BLAKE2B e8fd4974cbd9e83b72c25f28fa5595421be88ed5fbb1e64721280c4ead3003f95c98c7b4f12bced926f0c4af31b30dd76ddd49ddf297fa5f68eeb466d042ede6 SHA512 91abcf2b9b248717618e9fc1c8694e881b9deaa16438dd4674f94a22b4aabfdab3b13f95c3d44a60577d49eca82fb268f59b33d1312cf5388bdaf949a2865cbf
-EBUILD dicttoxml-1.7.4-r3.ebuild 598 BLAKE2B 2556b6b0e8f687b190d7dcad858cae56aa5547d564f7224b0f35978a1370efcc04e36a0f0ac8368984faf4d060dd1507bbe04a0f1c5a3a5012eb73e227f93c11 SHA512 5ac61ca03c9141ee923e122ecd9338e03d2a0454005e524bf8d9ce404cb3a017a47ab2a7aa6a0a4f5faa3c43ab5f42bc36b82f623c5d01e49507c86d8dfd0836
-MISC metadata.xml 529 BLAKE2B 93c04e13d026f7fbbef3515ea5d765622e1eedbe5deeb41486092e6cfc904e9f0f32e8136606c476e727774b0ce0966d052c9e1eff5c5a8bf8626eb755da7a82 SHA512 ab8f370659d31535ebc14dab9ffb423611e0e1a484b143d4dd6cf9096a3d52c91ff63ffae499f63f3a2c6b91fa53a7afc14fa52c16d5156dfdefdf11733bda30
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
deleted file mode 100644
index e9afd3ab5d7c..000000000000
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts a Python dictionary or other data type to a valid XML string"
-HOMEPAGE="https://github.com/quandyfactory/dicttoxml https://pypi.org/project/dicttoxml/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-PATCHES=(
-	# https://github.com/quandyfactory/dicttoxml/pull/73/files
-	"${FILESDIR}/${P}-py3.10.patch"
-)
diff --git a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch b/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
deleted file mode 100644
index 5b3fe172949e..000000000000
--- a/dev-python/dicttoxml/files/dicttoxml-1.7.4-py3.10.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2b7b4522b7255fbc8f1e04304d2e440d333909d5 Mon Sep 17 00:00:00 2001
-From: Kier von Konigslow <kvonkonigslow@gmail.com>
-Date: Sat, 28 Dec 2019 14:08:46 -0500
-Subject: [PATCH] Fix deprecation with collections abc
-
----
- dicttoxml.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dicttoxml.py b/dicttoxml.py
-index ae1384a..5d2dd54 100755
---- a/dicttoxml.py
-+++ b/dicttoxml.py
-@@ -15,7 +15,7 @@
- version = __version__
- 
- from random import randint
--import collections
-+import collections.abc
- import numbers
- import logging
- from xml.dom.minidom import parseString
-@@ -96,7 +96,7 @@ def get_xml_type(val):
-         return 'null'
-     if isinstance(val, dict):
-         return 'dict'
--    if isinstance(val, collections.Iterable):
-+    if isinstance(val, collections.abc.Iterable):
-         return 'list'
-     return type(val).__name__
- 
-@@ -188,7 +188,7 @@ def convert(obj, ids, attr_type, item_func, cdata, parent='root'):
-     if isinstance(obj, dict):
-         return convert_dict(obj, ids, parent, attr_type, item_func, cdata)
-         
--    if isinstance(obj, collections.Iterable):
-+    if isinstance(obj, collections.abc.Iterable):
-         return convert_list(obj, ids, parent, attr_type, item_func, cdata)
-         
-     raise TypeError('Unsupported data type: %s (%s)' % (obj, type(obj).__name__))
-@@ -232,7 +232,7 @@ def convert_dict(obj, ids, parent, attr_type, item_func, cdata):
-                 )
-             )
- 
--        elif isinstance(val, collections.Iterable):
-+        elif isinstance(val, collections.abc.Iterable):
-             if attr_type:
-                 attr['type'] = get_xml_type(val)
-             addline('<%s%s>%s</%s>' % (
-@@ -295,7 +295,7 @@ def convert_list(items, ids, parent, attr_type, item_func, cdata):
-                     )
-                 )
- 
--        elif isinstance(item, collections.Iterable):
-+        elif isinstance(item, collections.abc.Iterable):
-             if not attr_type:
-                 addline('<%s %s>%s</%s>' % (
-                     item_name, make_attrstring(attr), 
diff --git a/dev-python/dicttoxml/metadata.xml b/dev-python/dicttoxml/metadata.xml
deleted file mode 100644
index 7834b72e5bb3..000000000000
--- a/dev-python/dicttoxml/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">dicttoxml</remote-id>
-    <remote-id type="github">quandyfactory/dicttoxml</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 5d1b42a2d9b4..81118e515301 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,5 +1,5 @@
 DIST diff-match-patch-20181111.tar.gz 58554 BLAKE2B 2a74294bb9ac88447cdea794a9c3b44d705d93f7e0777d5e5ece4a306f43df47458a4ba0ec8b16624862a6e4540a605695c3a83ee7dad7749b22210ebe65705a SHA512 9b21726b9c0e350553533c14dd86cca823c6f98ab642e7166cf9348952a57b62bcb0576e3d6a3b76655ea1bcc8cef3fe7f33ffb068b5a4bfb4b4b521042484e6
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
 EBUILD diff-match-patch-20181111.ebuild 424 BLAKE2B 4990f7c457736e53112ea48de610f33f9c35cae974d33ef7ea8b36720c133e6dbe42fce9220ae19fd299bfd6f933a4bb0d95105f6f5beace28ad1522efde497e SHA512 f47f0304746e4f59310e33bcbf5fa338a86d8f6c44bca7ec02f5693982c59169f76c7926ce2f64aba3b885afa47c3295f0c1b520dae4f2485c5bf2291039aed7
-EBUILD diff-match-patch-20200713.ebuild 427 BLAKE2B d985cb2f086a350cee3a4727c7f68b71ffcb8ecfa5e4c65747bee0dc39b90831df777d8337c0319a0dd536fed466e604e93b6e908de30936fd9abcaaa77f5a76 SHA512 3a9b876fed72fcc952dab1dea495c3a4705b9374f24b7c10be6d4d4641baaaccea686049eaa6e3fd7b3dda28e2310e9e9457d1e43867d4ad51008489fa2ed2cb
+EBUILD diff-match-patch-20200713.ebuild 427 BLAKE2B aaa6f55afcaae74becd2a4d32da452496402992309825945adc145c1edd82ce277f2f1b54cfa35cdc2a69c4b0eac9876ff656f12ddc7b507a164a2d767802d62 SHA512 f114a385663f097d0cfb79d9b337e7a4d1484c8a08c3308a8c32c3d4f384fdc10f045d626d010a3d19897f385d83e052ec93c0944812119cf8b928083a215740
 MISC metadata.xml 1185 BLAKE2B f7be2dd5be0415434a378ab66383e4ea09bad3e6c4f4d90dd5aa06d00a0ccbcaec735489a2eaa9accb25a95203a7328895c76b98a15097971b921b9842548ed9 SHA512 c11a0ee2ec7ffeb30eb47050baeec4ac87681d31b2469446b9eca9387c278c716fcbd66e3d8807ba4ab6f070f26f02d0d6af87fb3857fd7df7ceb9da329cc851
diff --git a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild b/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
index ce23e3a1b04a..901b59113464 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20200713.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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 6f865839c133..dc64cd27d983 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,3 +1,3 @@
-DIST dill-0.3.4.gh.tar.gz 152875 BLAKE2B 61c638f0459b94f5cc0dabd9d5fd224c3c010ab6ccc9b7e47943922e7e139bd74c7a5173657febb028fc79632792f807586e271316ad87bb505520163f85a300 SHA512 1b1991909a9782382ecdb2ada13249c8b446d3558de69501280c816f7cd6c6728f9d3303c826461245ab9e42c43c02e4605142f25e09244bb7ccc9ca68a4b565
-EBUILD dill-0.3.4-r1.ebuild 721 BLAKE2B 10ec6652463e1536a5fd54b1df89d6fd5a156ee1687d9293ac41176de883bca74b201ea2870d8eb9cbfa447d1dbb4f1bbbd4342e23fc229bd4397d106b9c66a6 SHA512 e5429ae71bec3b01766364557bdbaf71112cd0e000582f7b5548a041b48eca3b5f0c583030435212eaf7d2ca9b44e1886d05ca7f88138501ddd98c627d495f0d
+DIST dill-0.3.5.1.gh.tar.gz 161203 BLAKE2B 2f778f3d2792d5606f8a5d7fd7d993490592da5ade701a38a270f756d129ad49f2aa44277fcb1f69a14779fe2541e2a720dc643ebd0fad258725d5d9452c048f SHA512 3dcf5e262110031412d9dfaee5548fed80bfc4d6b404cddbc2d9a6f65e2b80fae45a622ef73768e7996d2fc9e8d2757ac04e2a73f3700c526037dbabaa8adf15
+EBUILD dill-0.3.5.1.ebuild 769 BLAKE2B d853fb334f98d1bd785742d196532ce217bfdc24f34151015a8f4604fc54f8a455c407e37525be79ea147b7484d558d432d9a2165a2874a1f1aa4b6005b3d083 SHA512 1d88ac63f5d83e33ae72292bf4f651414ece386a9a9c608cfeb9a67bb3394f9f2b24f16d00ef68e97c182112ad2ef8111d4dca06aaf70b7e6d90e6b40e17d5a5
 MISC metadata.xml 997 BLAKE2B ae32cd96d7a4967a9886d4903e21720459c0a963a675d301c2bb651fdb15877d845100822c1e7a7b6184ccaa666cbb6dc58f939616de9c1c22554670d841bd19 SHA512 e3dc363382bea8ed76343b62377c139ad84011a6b804f64b65d93941a7c192c268c0da273c73d5ec1cece7320b15fa88bf5a2f20a628d8845efddab24f3acc5b
diff --git a/dev-python/dill/dill-0.3.4-r1.ebuild b/dev-python/dill/dill-0.3.4-r1.ebuild
deleted file mode 100644
index f734fa566ad3..000000000000
--- a/dev-python/dill/dill-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Serialize all of python (almost)"
-HOMEPAGE="https://pypi.org/project/dill/"
-SRC_URI="
-	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	local fail= t
-	for t in tests/test_*.py; do
-		ebegin "\t${t}"
-		"${EPYTHON}" "${t}"
-		eend ${?} || fail=1
-	done
-
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/dill/dill-0.3.5.1.ebuild b/dev-python/dill/dill-0.3.5.1.ebuild
new file mode 100644
index 000000000000..434de8bec1ad
--- /dev/null
+++ b/dev-python/dill/dill-0.3.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Serialize all of Python (almost)"
+HOMEPAGE="
+	https://github.com/uqfoundation/dill/
+	https://pypi.org/project/dill/
+"
+SRC_URI="
+	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	local fail= t
+	for t in tests/test_*.py; do
+		ebegin "\t${t}"
+		"${EPYTHON}" "${t}"
+		eend ${?} || fail=1
+	done
+
+	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/dirty-equals/Manifest b/dev-python/dirty-equals/Manifest
index 338a9e0b8b22..d33db6ea556e 100644
--- a/dev-python/dirty-equals/Manifest
+++ b/dev-python/dirty-equals/Manifest
@@ -1,5 +1,3 @@
-DIST dirty-equals-0.3.gh.tar.gz 41665 BLAKE2B af46fb9b7f0e0eb6aba09e682db73b8eef4ab9d73523cf81fb510c093cbaaa18f87c9666094aa05031eda1c32374113bc59b404ab987472821aa21ef135c038d SHA512 b6bf9a241abdbf9f74dec6efa48a23d3a665910d964947b4583127930e940001600b410d524ab1ac48c75a030f1a37528a8dbce30e982f09f913b2b3afca77f1
 DIST dirty-equals-0.4.gh.tar.gz 41864 BLAKE2B 0b916d37b323e9f587a977b46415432bc11367a6d0c95ac49e47fe604b3ee16c26eaecbbe74464076834c6186f5f0eecc049b211699a3f515ef7fdadc492537a SHA512 f98fa8c9850f26efc44dc2c5cc0ea6d687c07b49980c3eeaa71eaae78930e418c03bb35cb88aab065905443fa354b9b05d44a588458ed37d140d376b943c9da9
-EBUILD dirty-equals-0.3.ebuild 776 BLAKE2B f0d775faf58bac10a7dc9e1c6be44884a95c2ce2d052805ed4e26d738a46dc859859fec7e35b4f47684c649ff95ee7d3fd11974063050f34bafe8f68970aee1c SHA512 a583ccdb036e2dcd1613f2068e192e62b90c2abee979823c70881a4ccf969b498f89300317b2dce1665b09fcf3aa3c1314720ce03d81dc4a85118f871ca2c0a8
-EBUILD dirty-equals-0.4.ebuild 782 BLAKE2B 946e60ac2eeeb00f2d6cd7480d3ed4445f6364278cd8634301c6589664e53b0bbc92c31db6fc90354720542a5a883369e970f47718db83e50397e0f6c2f45592 SHA512 ab2d44c3aa6e631faa1a13e695649c50cf4c211afcd9f394e3a8e5657894120903ed1776c4125670212fe7a0fd58e49a1680f732fc453f3a323f9ce6723b6d0e
+EBUILD dirty-equals-0.4-r1.ebuild 888 BLAKE2B 71159fbda98b69938194f4e65467c6d3966160e4c5c1b97eb024fa53ec843ab93825ae23c201f4d7bdacf9ba474cfb46eee765d401c798681010484c5acc59c2 SHA512 28542bb7f97023905dd62d03eb320d2a6e04d32da7847795215e145a55374e22f5ed583fe62505177cd8758b44dc96d4b8df91969f978073bb6dc9c57962b76f
 MISC metadata.xml 359 BLAKE2B 120f82faf2460b2528927b708a41b2d105248a57af2f3f11966b102237731f9dab87962069728dd78327757c190790f01646c94c228d0e79bf60fbab82e1ca39 SHA512 fb17ee5e8483cd6c5ce840c2f070601c4506b0d62a8c6a80338e8748e57bfb49ee412faf7b95f21c16e5c5730efb9879d8d66fd4fd1c134ca459af3657994f98
diff --git a/dev-python/dirty-equals/dirty-equals-0.3.ebuild b/dev-python/dirty-equals/dirty-equals-0.3.ebuild
deleted file mode 100644
index eda6ad1e2ee0..000000000000
--- a/dev-python/dirty-equals/dirty-equals-0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Doing dirty (but extremely useful) things with equals"
-HOMEPAGE="
-	https://dirty-equals.helpmanual.io/
-	https://github.com/samuelcolvin/dirty-equals/
-	https://pypi.org/project/dirty-equals/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/dirty-equals/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
new file mode 100644
index 000000000000..a3764d74a643
--- /dev/null
+++ b/dev-python/dirty-equals/dirty-equals-0.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Doing dirty (but extremely useful) things with equals"
+HOMEPAGE="
+	https://dirty-equals.helpmanual.io/
+	https://github.com/samuelcolvin/dirty-equals/
+	https://pypi.org/project/dirty-equals/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/dirty-equals/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+
+RDEPEND="
+	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e "/version/s:0:${PV}:" pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/dirty-equals/dirty-equals-0.4.ebuild b/dev-python/dirty-equals/dirty-equals-0.4.ebuild
deleted file mode 100644
index 2f8a22f1ddcc..000000000000
--- a/dev-python/dirty-equals/dirty-equals-0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Doing dirty (but extremely useful) things with equals"
-HOMEPAGE="
-	https://dirty-equals.helpmanual.io/
-	https://github.com/samuelcolvin/dirty-equals/
-	https://pypi.org/project/dirty-equals/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/dirty-equals/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pytz-2021.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index 41bb912c7dec..851b4055db9d 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,8 +1,4 @@
-DIST discogs-client-2.3.12.tar.gz 32604 BLAKE2B 6c7960263d0158fc796edd76f6ccc549d582cbd96666cbf3ae10a3215eee6464c857e1b46c8e76ad2a48308ae9353c347a421189b3c754bd23a0f2ec455d9cfa SHA512 c14ea953e92f2d77909a7af8f840ee5a1df2416e16f6de0b7f0e988f6ef56a07fc04c75b247508dc0d1b5f7033faf6cce80196b610d1169a23350d3e816e2925
-DIST python3-discogs-client-2.3.13.tar.gz 34228 BLAKE2B 621e181bc07c48ca387638fd49bf1b92fc06e1f3b57428a13bdf93c634ceadb8c128dc9c48bebed4d2ef774d301ab70d43935efa903365a1df5ccb6991b689b3 SHA512 7fd3f98c1374173c54d3f4731fcb093548b85ca7c0d5d3396e40733e64306eb29e14b5de0d30269ad92cb0a0b8bbbfeb8b739454e251638472b8c7ffaff4d27e
-DIST python3-discogs-client-2.3.14.tar.gz 34461 BLAKE2B 7212e220e1ea68bf71e8ddf54ee5d820e7cb7203e1d34b34abf818227e1f842b6ea680101e7a761ae448d0dbc298e8c33ae9969c7c3d1c93ca912d92274d52c0 SHA512 356faf54025691a3af74d947589132d5c159176146669572d14490ece05a0e4546bf0a05bfee4669518c157957cc52eb7842008e7da5555347365236ae19b63d
-EBUILD discogs-client-2.3.12-r1.ebuild 831 BLAKE2B a2b7f9fa3faeafbfb0fe3c49f3835de84c2a62d3284a898231a041aa817f4bd500fae58addddc1030ce966613efaa64523777da9950e4af7f6667c552ccde607 SHA512 9b084c7869772ec6f24767fc1a4bf75f1f0f4ca8b5b0a90a167b52dfc529c29f00bfc8404c04a0e5e3af582d24fcf780f4249ddf0bdcb1909a35290934959c60
-EBUILD discogs-client-2.3.13.ebuild 804 BLAKE2B f5811b7fdf77bfb8413b91b961e7f2353209483482da500ceab2f58cc98d5a10d5d07d290ac78629cded94ebcbea4c4a9b3d8a90b81c108d210f8a6a2537d1af SHA512 d5951e8fcee30ea6d9d670e814d4fb866821a9fbcba9a3c5ba9e9964a9baf4f19ace5f5a21847df207abcf6c322852d24592bec0d05e7242446a560a38830989
-EBUILD discogs-client-2.3.14.ebuild 809 BLAKE2B 040db8a96b63c77736779a72a168a695f85602041914981fd9d354b9e195f701fc5da79733285724934b299bd75ca7b7d97ad0e14fd7f3375bec0dba0d2668a5 SHA512 3d44b6c6b4ee434648afe642745008c302c668412bc11b16684e76b5360a1a26fe2961037df3cb81fd82becf8d2ab4493df6b6f39d6a82eb48caf885781df839
-EBUILD discogs-client-9999.ebuild 804 BLAKE2B f5811b7fdf77bfb8413b91b961e7f2353209483482da500ceab2f58cc98d5a10d5d07d290ac78629cded94ebcbea4c4a9b3d8a90b81c108d210f8a6a2537d1af SHA512 d5951e8fcee30ea6d9d670e814d4fb866821a9fbcba9a3c5ba9e9964a9baf4f19ace5f5a21847df207abcf6c322852d24592bec0d05e7242446a560a38830989
+DIST python3-discogs-client-2.3.15.tar.gz 35059 BLAKE2B fe2b577b4810480fcad8a76c8f961809baa5b217c0d01c262f4a6a0a2993b2a6d2515edf90f276f7a104f6bdf0a1edb0f439c69e51507e3c0cf1ab927049e7f7 SHA512 8da52cc6c125cc4b3c5fb93626075ba32046798f71f72cc9f685fdf10a92a813fbd74b35625994cd4c6b7e394e36265ce01a33b52b607bf498a5f11f68d82ad9
+EBUILD discogs-client-2.3.15.ebuild 806 BLAKE2B 8dc5825187f3d7b01170b84cc5b08b1b4cbe8cc8132a5c008ad72517008aaeed8f49fb9664d80a38039cf8b059332235a72eab23ba85e710f1af2ffb055daccb SHA512 7b53a0f9862008acccee946f5330fc0c41c73a9d63bc7dfa52ae69afbbea840b7f47107a67507a6378ec811b81becf36a0c5c19f37b9c26acc60444f446668cc
+EBUILD discogs-client-9999.ebuild 807 BLAKE2B 614df884987c5cd638ed17ce6ecc0f9ffa6e39fee33acad8affaaa9e9a382b2e5adc5d3a9289a8dc26caffe43f6c9bbc4ba4af341de6f8d4a4a42bdcf248a42f SHA512 94ab655efc5c5086f58e01a3c569f41f94231dea8380f5fe1ff95f0e5d100371bfc02ab6c599b6442d38f46061e311e1d849e3c550ee9e9563bf8fb9363bda35
 MISC metadata.xml 674 BLAKE2B 5c0dd431ad4633cbc7ddaa97e54e9f5b3eb67ed28e07ac313f218fd055e0042365c270e83153627decd196aca49db12304da87f2c74f20bc454fd8e5b4b8fb46 SHA512 ad582419be3887c5fa3c0d630ad32575f378453dd4f7a8c33df91db31b495caa88707214f7e456d69027532540a474c41ad8336b40e90229f1f31cd3193d7f82
diff --git a/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild b/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild
deleted file mode 100644
index 36b9175dec97..000000000000
--- a/dev-python/discogs-client/discogs-client-2.3.12-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
-	inherit git-r3
-else
-	MY_PN='python3-discogs-client'
-	MY_P=${MY_PN}-${PV}
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Continuation of the official Python API client for Discogs"
-HOMEPAGE="https://github.com/joalla/discogs_client https://pypi.org/project/python3-discogs-client/"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/discogs-client/discogs-client-2.3.13.ebuild b/dev-python/discogs-client/discogs-client-2.3.13.ebuild
deleted file mode 100644
index 2ca0f4090ab6..000000000000
--- a/dev-python/discogs-client/discogs-client-2.3.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/python3-${P}"
-fi
-
-DESCRIPTION="Continuation of the official Python API client for Discogs"
-HOMEPAGE="https://github.com/joalla/discogs_client
-	https://pypi.org/project/python3-discogs-client/"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/discogs-client/discogs-client-2.3.14.ebuild b/dev-python/discogs-client/discogs-client-2.3.14.ebuild
deleted file mode 100644
index 741fec157b5d..000000000000
--- a/dev-python/discogs-client/discogs-client-2.3.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/python3-${P}"
-fi
-
-DESCRIPTION="Continuation of the official Python API client for Discogs"
-HOMEPAGE="
-	https://github.com/joalla/discogs_client/
-	https://pypi.org/project/python3-discogs-client/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/discogs-client/discogs-client-2.3.15.ebuild b/dev-python/discogs-client/discogs-client-2.3.15.ebuild
new file mode 100644
index 000000000000..ef9cbd796ca2
--- /dev/null
+++ b/dev-python/discogs-client/discogs-client-2.3.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/p/python3-${PN}/python3-${P}.tar.gz"
+	KEYWORDS="amd64 ~x86"
+	S="${WORKDIR}/python3-${P}"
+fi
+
+DESCRIPTION="Continuation of the official Python API client for Discogs"
+HOMEPAGE="
+	https://github.com/joalla/discogs_client/
+	https://pypi.org/project/python3-discogs-client/
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/discogs-client/discogs-client-9999.ebuild b/dev-python/discogs-client/discogs-client-9999.ebuild
index 2ca0f4090ab6..6e7748b475a9 100644
--- a/dev-python/discogs-client/discogs-client-9999.ebuild
+++ b/dev-python/discogs-client/discogs-client-9999.ebuild
@@ -5,9 +5,10 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/joalla/discogs_client.git"
 	inherit git-r3
 else
@@ -17,8 +18,10 @@ else
 fi
 
 DESCRIPTION="Continuation of the official Python API client for Discogs"
-HOMEPAGE="https://github.com/joalla/discogs_client
-	https://pypi.org/project/python3-discogs-client/"
+HOMEPAGE="
+	https://github.com/joalla/discogs_client/
+	https://pypi.org/project/python3-discogs-client/
+"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 423920c57e61..859f05dd304d 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1,5 +1,5 @@
 AUX distlib-0.3.2-system-pypiserver.py 1294 BLAKE2B 87d419e5d9bd90715e43a125617bf12a2eaf16d114557a56fa0c6afb0fa83468960dcfdba3a3eff2ff136c5ef12ec04e71cea2a77a886854181dcdc64aee954e SHA512 08ee2bdc55b30ba770179c97a8dc7f702d72588b6f8bfd65feb47847ee4b41b97c0f31d37e1c4cfc2cff35ccb189abfc07590a175b7d2fd592beda8eb4a8b040
 DIST distlib-0.3.4.tar.bz2 1169083 BLAKE2B f1b5e5ca7d0155d204db177d9844cdff4d593be3d927bd5f9e8ad07065b52383527d3990b66c5868bb8377703d031958c5c88a9daf4f0b238903ddbea3ef6cf0 SHA512 24f8d6f5012c881ffa6bbdae7887ee5a7608ac36a83e2a96cb8a337d1ab6c896a4078028d0383165ff44be6b735aa31f7d199845d89899813be74ed00e1680e8
 EBUILD distlib-0.3.4-r1.ebuild 1463 BLAKE2B 04c57c3b13b1403a51f26a5f14f25032d18332195f09934257d316b3911c6df2d3e55cd000bba03dd42c524e84d122b1c5ad665d5347b20db85f267ae20164b6 SHA512 d987dda00396f3049e427f79d2a455475c57598dd59e6da6c82d764a4ecf7a9f5ff27a632d6770313330b7d5cb3aa74547014df176c5a16d0c0c61342634ef32
-EBUILD distlib-0.3.4-r2.ebuild 1887 BLAKE2B 4c652f552ca9fd7267e7766c63116439f715aba8f1c78cc999311402097cd06f5bd9bb96d0257171e43f5033237ed945269363f46bddb012320fdf7ff61b2dab SHA512 b8f9c52fc9e05cef75f8e8305f3f57cf8e3dbcd9efb390afad7b4c1683ff300a83547b26c0993f53d6a6976a72fe7f0fbec1976af9df816c07ed063bc94808c0
+EBUILD distlib-0.3.4-r2.ebuild 1879 BLAKE2B 6999737ca6dd33e102019b37b08b81af6cda9b629ca42896e94dd6539cf8349d2b7500ca89ee9d0aab36b21030ab0d3bb1306cedce71a763dbbe506903383254 SHA512 fc613bc6ad21b8a736488e3bfaf40d43cbb7535d35a69501be0a8760e3debea850536a05edf392d6a889ff0ece7570fee7cbedec088a2ea268db62e964a95f6d
 MISC metadata.xml 313 BLAKE2B 794a344badc2cae807823fd404a78b050598fa4da29cd4d2e4e6a6303822744abb1c1bd6e60a823f9b545d851988b72300f22ed16e3d374a4dc1e251e4489dea SHA512 91ac7d65e443b8fafda593e262e198fb8dc9d38d16ef32e5b66987dfc6d3023fdca6bc06e15f766f14bbf69b9efc69a900a1876d8ca46749cd6981b2cb7567bb
diff --git a/dev-python/distlib/distlib-0.3.4-r2.ebuild b/dev-python/distlib/distlib-0.3.4-r2.ebuild
index 61b526013800..60f51ce70857 100644
--- a/dev-python/distlib/distlib-0.3.4-r2.ebuild
+++ b/dev-python/distlib/distlib-0.3.4-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 3b823212ee55..169c707f3105 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.7.0.tar.gz 58164 BLAKE2B 22bbd2daf9cac589530eac9a58767db6b9e389b77719516f7386a9377b49ba4c9b696165701acc42366b760b9a632c70a2243a58c12a367fef2a0a770a4aea44 SHA512 14516ecab33ee8c57c35a8279eb515fd699031fabac7d8886092ea98696797d55503179870aeb513a85e1a66c7e69f2f60bb6ea9fc935be975cb5135e1917ecc
-EBUILD distro-1.7.0.ebuild 605 BLAKE2B ee10ff627d07c2d5391c1e6db1f7943f79decd9bc037f11f2f76f6673c3abf5210c43038b69bee0c7e2bb2702b7f7c5cebf769d32ab906279e7c645c8ee39235 SHA512 7e495735a3028532d2878a57780dc4194e15af80d7f6868afc5457c7e0ef9f4741eece64d2211a806f48d3dbbb7b7639f08b543a61d35cdb8a62c962680c9242
+EBUILD distro-1.7.0.ebuild 604 BLAKE2B f6ea7544bbe89b785b12d3d5bd7ad1d753724fb9c3ecf8fe0838351cdb567a024424a1c6df11f563f55806ab87886e4615066308763f9a6e40d5921dbd56beda SHA512 735d94041569023a02fd97fd002cef38f647bd66e14f5a5f95f6e59db09aed82c34154c63774438e6a8bb85da5334d7b00a30c46b312b707ee66f18a43b0dc56
 MISC metadata.xml 847 BLAKE2B 62f2559f30efb777b18c61efdd9c957ca1855ed90bd35c93d492225369f1b293120a3c765412b00c2efde0d2a96b6e924ffb8f5d5a2a0bf305f142d29f88a6a0 SHA512 af4a1c5373c4d2b324859e736632349214c33a6f256e2e69be4ad6a8bedf3c8adb670c187dbe16fd9a546d347639e61ac117bcf2918438f290dc8c5cdb13f89c
diff --git a/dev-python/distro/distro-1.7.0.ebuild b/dev-python/distro/distro-1.7.0.ebuild
index e851bc91a0f8..74b41304a0fb 100644
--- a/dev-python/distro/distro-1.7.0.ebuild
+++ b/dev-python/distro/distro-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
@@ -15,6 +15,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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 92ea2a830729..2e604c9b908a 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,4 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
+EBUILD dj-database-url-0.5.0-r1.ebuild 604 BLAKE2B f4d15d3a6f0a5f6f76849fb77deb3f62373d95df831a6186f95dff4e6c8a63b8b2754baf1753c147c0e43928b09e9803d124053f26f24a90c0739bbba912d387 SHA512 d57c604f3919fb8d81465b335cbebfddf9890d9b07e3ac058d1a28d5f2ee8ba431eb002db5ca8d276e1cd81be6748880ee37dcd481635b4856afc852c40fbed2
 EBUILD dj-database-url-0.5.0.ebuild 565 BLAKE2B df312b685b2ea17b13176100e0601a4a4378422f67492a2e28efe93706b97c2453a9ab1bf72faff4b2f53f48f7726241a51c0a4c4d47cd54b01e689ca30909bf SHA512 ce6ea354ce091e5f5c8f71785861e2e6febe2b8edde348513d7c2009159ac505c09d59922afd5e2786bbd599585abd3bc20f1d8f3396fb9d315c382401d983c1
-MISC metadata.xml 407 BLAKE2B 902615bd88a43858b1a1177faa6e0200c6c9a657146fde0f2c43869c2e50a64a82d1778c1282fb0060310faa45385b8532764c84f0f384f582caad467ccabf43 SHA512 0bd15e0faf6eb5d05763c38bdc92d8f9330a0d3228a273380ea05ca46d1d675b099dd2026d9aeeed4375c9fa5cd46486c0c66927a0f5f847965b1040cbb24f83
+MISC metadata.xml 407 BLAKE2B 0a3736cc0034297f64b77b9b795e8cd339ed58c5b213e730f1d3dccabe7cde10570222626b2b520bc0e51a0195cd99baf4ebf7028cc73b7e507603874b1f4143 SHA512 ec842e583cd4e0b632731e395f6e70e519077bfeaeb58bb88b9ad297368443fc06a182c120635eeb1dedb76b166829c6f414925d3061e55d49d7053a72c739eb
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..90e270b08d17
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="
+	https://github.com/jazzband/dj-database-url/
+	https://pypi.org/project/dj-database-url/
+"
+SRC_URI="
+	https://github.com/jazzband/dj-database-url/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 98f104691e57..de6b57e3d247 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -8,6 +8,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">dj-database-url</remote-id>
-		<remote-id type="github">jacobian/dj-database-url</remote-id>
+		<remote-id type="github">jazzband/dj-database-url</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index 2bf724500f16..aae0f4a4e2ea 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.5.gh.tar.gz 7950 BLAKE2B 1d159023f9b49f3a13fba39c29c51bb06bb6dd9d3c5303a4d246ad9f72daec9a273c15d214ad94a219883c9c210955d84bacc5861f5411845e152fedc7ee6880 SHA512 7de79a4f1f7416634c5877bc45d290d20d841e5ec470bc40ea900f04531037e2337c81788792b8f70a11318633a42f86700a5b27e611fac466b373d2d3b7f355
-EBUILD dj-email-url-1.0.5.ebuild 591 BLAKE2B 93a5a026c462ecae9e489293071d53c554523e11092422fea2c52e887ddd9bc43cfd9448c69fb0aafb0ed5c9ab77c6b3cc7de79507a23aca6c9c4d4200c33d92 SHA512 36160fb7f4966493812f55180e8c480fdafa026b9cbc817221aa4dacbf41abea487c757fb535c8caf81f9bc1d82751464d619fd12cd0d3976175960b302a79b2
+EBUILD dj-email-url-1.0.5.ebuild 637 BLAKE2B fb7523bb42e18110a96fa88624e9c909d1cec1bbdd7079fc8eac936fbe004e367aee517496e87f387bbd58cbbfbbab9d6695f0c21ea951e600a13ede5e5d3f12 SHA512 ac53c75740823aac7ebe7f0d817ab2eaf93adcf22cefe3f7d0a6121e58d550ae9f957f1c104002c908708ad4383acfe030a4f48a3c4cf06cb54fe966e0442f21
 MISC metadata.xml 408 BLAKE2B 13c4c985a274eb0e762a0b20976081102ff640bf9b69f6ee54639476236aea5ba08696d17cce07835c7c3bc989d8474c051e6c3d24eb78aff29c8b43b5fa6b60 SHA512 73288f6d7e447be7c42dc5014a48bdf57755e9e38ccb165a33e535463468cdef0fd55f6bc7994add0e58a624881dc73594e6cf495bbf190a7cc0c1ab18678d12
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
index 7c3f053dfb94..1ff6406e19b6 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.5.ebuild
@@ -4,14 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Use an URL to configure email backend settings in your Django Application"
-HOMEPAGE="https://github.com/migonzalvar/dj-email-url"
+HOMEPAGE="
+	https://github.com/migonzalvar/dj-email-url/
+	https://pypi.org/project/dj-email-url/
+"
 SRC_URI="
 	https://github.com/migonzalvar/dj-email-url/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 36b535b9edd4..393757e7338f 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,4 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
+EBUILD dj-search-url-0.1-r1.ebuild 503 BLAKE2B 3841d8f6e459450aa17cbf16b5d0f00b1ff5447d6787c00e9ec2a0c5fc090b65d48fd72541403d1c480ae849c608e5c4ccb1c12b6ac3249ead76d0ec5c49f34c SHA512 c5a76a21e4ca68febb713974cbf6b1c5100a134a5cd09ede4a75cd77f8df6d809f50d534496cdc270eaf59cb4b91a453f649cb194dc8d5361789a56ec0805e8e
 EBUILD dj-search-url-0.1.ebuild 460 BLAKE2B 9144fb814241b607907c1d48a2eaed41c53bf065f85be67fc0d41b232b3674f549d58d8d281fe3355237c42dfea0c946c2a786652f750e88fd945367173599ec SHA512 c2f3aad09da9d9471af908db7d1d731e467de8252d43c53d3feaa411778873e64a558ba54b63311f34769aa7da26f701545064b49cfe20ecf4366685b17d00f0
 MISC metadata.xml 356 BLAKE2B a228b653ba8ae4238b7165c6d097e88f27a2823f2b3a1a800e11ed567784a342cdc3a82593ebe17b30a9caeb8ac547b8d71f0777a5f5d89ee5cd8f3006badc33 SHA512 ecbf4e29540c8fa424f985fae965e8174ff4da6742c55f6522b79fa4bb10c908975267f460e4e089ddc8bb343dfff48cdf5241d60439867a8408b2a7074f8025
diff --git a/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
new file mode 100644
index 000000000000..babaf034fa6e
--- /dev/null
+++ b/dev-python/dj-search-url/dj-search-url-0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Search URLs in your Django Haystack Application"
+HOMEPAGE="
+	https://github.com/dstufft/dj-search-url/
+	https://pypi.org/project/dj-search-url/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/django-allauth/Manifest b/dev-python/django-allauth/Manifest
deleted file mode 100644
index 1d95bea304c9..000000000000
--- a/dev-python/django-allauth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-allauth-0.49.0.tar.gz 702336 BLAKE2B 0f39ff98e8e6d18b80e2ce858dcc104a0bf41eded6d1211f157c158030a65494bfbdc522d37242247d260413d75bd73f4d50bc53e9993d3bd6517b062faccee8 SHA512 134c578c65c61da393cbdb2a2f3ea3fdc32479371af0106af8f97eb794315c3025a705fb659a81b11618924dc2968c57dbcf1fdc03cec023de14deb94307d8de
-DIST django-allauth-0.50.0.tar.gz 703083 BLAKE2B cb43eb09c5385020a581ecdc97acb74329d9c188f4365d91a46b8d2fe742d1d497bdd08d39cff36c93958e885fa1098a2b15218b296f1d9bf9211320aed247b6 SHA512 bf769e639ad37cfa150ed115b88d8802ae2f407461738a0dd2f39b055a4afc1468fe30d47a86e8f22697d2e67d4277078218c76f6c394a5cc685b7b21fa0a53a
-EBUILD django-allauth-0.49.0.ebuild 1172 BLAKE2B 68ea881e5c38d82c4eccf68bcf4c906516a7a4eccdf5be6770cb4226e236a943161cc27dc84863fe36bd1b1bf808ff01c9532ac04da79f6078e41c1be9abdc6f SHA512 121aab119362abda4dc883532441f8330f10c34f2ad024c8ab179702e47adde947d321590e83613658712f45f720700b1a5b27438c393af785b5d4559e6777c1
-EBUILD django-allauth-0.50.0.ebuild 1218 BLAKE2B f2317c811f9e7a7ab7ff9ca9d3f6cac4116b167d0e6886ce2775e65ae2a82cb9be609fb09eed24e7b9505f603a2929b884e70bde875e07ef4d26ded1b8350ee3 SHA512 6154fccc108d4239d135278def54649c04cc7a52f541020761d10548bfa4f9e62984db2ca8b108edbf5c06bf7a1d3ff7b351c5eee3f7d81eca5cb2948c095782
-MISC metadata.xml 405 BLAKE2B aadebaa1363c2a3acdd34c78ff2ec4385aee8a75f788957b8e298325e2f9bc10966903ac3762b2487971523241d653bfd95852fc3726807c97958f08ab6ae06a SHA512 24c11691847c031351bbc4a4f2de657eb166402b8aa054ee328dd865e637ecf06679ab7cd7cef0b36dcaed863a1b712664b991ed42a3f79951bc59603510d745
diff --git a/dev-python/django-allauth/django-allauth-0.49.0.ebuild b/dev-python/django-allauth/django-allauth-0.49.0.ebuild
deleted file mode 100644
index e44b2c123562..000000000000
--- a/dev-python/django-allauth/django-allauth-0.49.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django 3rd party (social) account authentication"
-HOMEPAGE="
-	https://www.intenct.nl/projects/django-allauth/
-	https://github.com/pennersr/django-allauth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/python3-openid[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-# cryptography via pyjwt[crypto]
-RDEPEND+="
-	dev-python/cryptography[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
-
-DOCS=( README.rst AUTHORS ChangeLog.rst )
-
-src_test() {
-	# cern provider tests require Internet
-	rm allauth/socialaccount/providers/cern/tests.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=test_settings
-	local -x PYTHONPATH=.
-	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-allauth/django-allauth-0.50.0.ebuild b/dev-python/django-allauth/django-allauth-0.50.0.ebuild
deleted file mode 100644
index 524cd84abddc..000000000000
--- a/dev-python/django-allauth/django-allauth-0.50.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django 3rd party (social) account authentication"
-HOMEPAGE="
-	https://www.intenct.nl/projects/django-allauth/
-	https://github.com/pennersr/django-allauth/
-	https://pypi.org/project/django-allauth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/python3-openid[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-# cryptography via pyjwt[crypto]
-RDEPEND+="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-DOCS=( README.rst AUTHORS ChangeLog.rst )
-
-src_test() {
-	# cern provider tests require Internet
-	rm allauth/socialaccount/providers/cern/tests.py || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=test_settings
-	local -x PYTHONPATH=.
-	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-allauth/metadata.xml b/dev-python/django-allauth/metadata.xml
deleted file mode 100644
index ab542e1c0f6a..000000000000
--- a/dev-python/django-allauth/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">django-allauth</remote-id>
-		<remote-id type="github">pennersr/django-allauth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-appconf/Manifest b/dev-python/django-appconf/Manifest
deleted file mode 100644
index 6e5c4c49a35b..000000000000
--- a/dev-python/django-appconf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-appconf-1.0.5.tar.gz 15891 BLAKE2B 4d031a229ab11d55d85887346cf208cbe1136e48b78a4c096ba6d67017d80031d634cbeef82783713e4e005fe8a19f1f8e12193450b04e968b8ea5a94290f2bc SHA512 9d1b01e3f8dac5a9a7f6f4f5c0e9fcf4a2a0177e7702e5f932f238379bd2bb065a698c86d27c2dbab7ba6480abdc25595c8a4f7c6f0524517aeb1c0e34f09864
-EBUILD django-appconf-1.0.5-r1.ebuild 620 BLAKE2B fab2ad983e128c0b8a56c48c65edc9387093b08a16ed14c00d25a3c02e814d176f09976489a55155595d3152c2d33e76c58a07664baade42f19bc6eee1dcebf1 SHA512 7c21b334bd75195e759eea9f2299390207fa466dc02f5b2c85d6fc105280904ebf6a4d9eb4651367eadd0c863eb28615b45ca533c2d3b0b411453b9b9493f802
-MISC metadata.xml 339 BLAKE2B 2f353d8cf2adbc3570b9559fcbd1a0321fccbb7556b5c4fbe4a1b4159cd9f342a1b0964ad587dd9e29cda86e55606e4f7848df5055e4aca1787bb388330e1a4e SHA512 b9de8d10f5d2ec5611b0f3fd0cafc4dccb673eb6f99f365f36a7c0edeee9305057137d326e64b23048d1804fb7c864319ca040666979699d56a0eb307dc69f52
diff --git a/dev-python/django-appconf/django-appconf-1.0.5-r1.ebuild b/dev-python/django-appconf/django-appconf-1.0.5-r1.ebuild
deleted file mode 100644
index 177aa0a9ff31..000000000000
--- a/dev-python/django-appconf/django-appconf-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A helper class for handling configuration defaults of packaged apps gracefully"
-HOMEPAGE="https://django-appconf.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.test_settings
-	local -x PYTHONPATH="${S}"
-	django-admin test -v 2 || die
-}
diff --git a/dev-python/django-appconf/metadata.xml b/dev-python/django-appconf/metadata.xml
deleted file mode 100644
index b338a0ffed45..000000000000
--- a/dev-python/django-appconf/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">django-appconf</remote-id>
-		<remote-id type="github">django-compressor/django-appconf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 3f0615102368..7e64c8ac6f1e 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,7 +1,3 @@
-DIST django-auth-ldap-3.0.0.tar.gz 52381 BLAKE2B 6964b36d72b365899d4dd3dc96f16b9c1f12c06ad95c7d387ec27ac6dbc38807e16fdb953e172fcde1a0d4042f318d276b780e474d9b810325e97cd601d070b7 SHA512 105885e62fd22aace2cbe291a107046109a91507ba77257b9b428e6d49fb74b6f47116f1d8325c3fc186590b00fb2b46507dc5b73333707e56d84e9a7b926d9e
-DIST django-auth-ldap-4.0.0.gh.tar.gz 48798 BLAKE2B 6371afa08bd532955e1d78c26470f9dc3a536de4f98afe615611947df26cb9a970f82f7772ba42062ffea6bcfc738bb0ff5e7ff148a7d5d6968c326cfbc70f38 SHA512 d9052227fd7d8c8343eb0c7117b86483ad72640e1e6b238e5b303475d45f25851689c6cac1343131bf6c127706e7ae2a040da840272288f3e0e99e2bf2f68afe
 DIST django-auth-ldap-4.1.0.gh.tar.gz 49533 BLAKE2B f99050c147d179a54fe052e72a9b2ded556819da788f5180225a6d5015d2b7b52dc6f6d65fac4d1b88dc28b3617f9caaac7df3e455d218e8a2c6af1391418b8e SHA512 d55710cf96916602d29b33e111eff7922011231c47f843660cf2adfdc226dd335d4e42e5c2933bd77a9ee5f816d044798e876c8d0de824dcf4a8a78e1bce3446
-EBUILD django-auth-ldap-3.0.0.ebuild 887 BLAKE2B db4174ad9b33b18e00dde7aa2585af706d5e6595f641d549b09db0da69a7781b30dcc628bef7360456195ae2bcafbcb0c2297ab104f02bcc2fb43b446fb4ce9c SHA512 c73097e2605732fc25137db7d0d26fa787f0cade8b7ddfd1bc16ca80636db651d195245d9bfbf457bc1757936e06563cca34fa65c3a7e36f781b20d524fa6970
-EBUILD django-auth-ldap-4.0.0.ebuild 1080 BLAKE2B dd031d391eaee4b65f12e5426f974aa4e015c6f4ab4b6e6e87b0944b469d0f997eca7992fc175f514954f00e82536b892f3197f6ad214a673c73094cebcedb6a SHA512 4b5d0e9ef980abb2a93f8691e4e2fbbb35bf4942c906cbb76101b1a9993c7249fbf97374c2d7d4bf0f44e451eb88dad6dfcb3d569dca169e4338ae47f09c0d6b
 EBUILD django-auth-ldap-4.1.0.ebuild 1080 BLAKE2B dd031d391eaee4b65f12e5426f974aa4e015c6f4ab4b6e6e87b0944b469d0f997eca7992fc175f514954f00e82536b892f3197f6ad214a673c73094cebcedb6a SHA512 4b5d0e9ef980abb2a93f8691e4e2fbbb35bf4942c906cbb76101b1a9993c7249fbf97374c2d7d4bf0f44e451eb88dad6dfcb3d569dca169e4338ae47f09c0d6b
 MISC metadata.xml 405 BLAKE2B e9d6f5ca53505cbfa7f9cd1cdc47bd58ba15ea972bdf342874c031ec151a053025b8f63a8d9c96de90ae0798e77d0db019a70d21e8746449543bfa5d91e3fec0 SHA512 453100976204f0b32042a1711d257ae76214452579d3008f403efc11cdf5e080e3663b43c1946b9da91086de580c0a8cf860fc99c00138c9d1bd4a01a5d1dcc3
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild
deleted file mode 100644
index 517daac5b399..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-3.0.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
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="https://github.com/django-auth-ldap/django-auth-ldap
-	https://pypi.org/project/django-auth-ldap/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		net-nds/openldap[-minimal]
-	)"
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# for slapd and slapdtest
-	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
-	django-admin test -v 2 --settings tests.settings ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-4.0.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-4.0.0.ebuild
deleted file mode 100644
index fb63e13a3d4d..000000000000
--- a/dev-python/django-auth-ldap/django-auth-ldap-4.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django LDAP authentication backend"
-HOMEPAGE="
-	https://github.com/django-auth-ldap/django-auth-ldap/
-	https://pypi.org/project/django-auth-ldap/
-"
-SRC_URI="
-	https://github.com/django-auth-ldap/django-auth-ldap/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD-2"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		net-nds/openldap[-minimal]
-	)
-"
-
-distutils_enable_sphinx docs --no-autodoc
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# for slapd and slapdtest
-	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
-	"${EPYTHON}" -m django test -v 2 --settings tests.settings ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 9134a896550f..26bdaebb8e69 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,5 @@
 DIST django-cache-url-3.4.0.tar.gz 8455 BLAKE2B 91780a053a90decbffd3d9a6fc0b9043dee74b6b6b265b9ef4b035c5679a4955582b3a3b831ff9670fceb89d5729b9ac607b6f318543d437eb35e7d1a1c1c638 SHA512 17fb8aff3b65f4860b2d2c7c765341f17c13a0f78453f627f62f40894d3e83281ecbde1d1ddcbeff7de8fe55189ce9504d03281353d227f9e7b1678af4c423ec
+DIST django-cache-url-3.4.2.gh.tar.gz 8664 BLAKE2B f97bfed1b4be0919d79304242baf7af0c092b440a1888f05c781e70cb4674a83c4f18077c1b3c9ce7dc99223ebe13527e5575af0993446d273cc387ed0e2d8d5 SHA512 7b12ff97c399cd52eef1465a504bf8edd7d422a76af5ead0157a3b52615501b7f152bf58f693255a3ccb81880123ec0efd2ec3590e07f38378e5e812c2ef3799
 EBUILD django-cache-url-3.4.0.ebuild 720 BLAKE2B 9f3753e9ce4d829e3ebb43215a3552ce13facd5b4aa7668dff545b0b5f59fa3a994d3a75cb465fdd0b1be7c1fb023dbace9745a71387293ba1c752460e0fd640 SHA512 40fe32f741ce0a6d796e00048caa86f3e458f64e03bbfe328fb0017a5e8b6b04c486ac6734c07f2cc6f9d6ce7a40be022c8feb41b2499cecc9ddd82e785e33ae
-MISC metadata.xml 414 BLAKE2B 94a9734c4ea049141ed04c202df485a2b682e849eec2b813e8cfbbfbed46b103553c79ef5d21af255b0efbc025cfe9adb73cac49009eb9ad1312bd0dd9645f48 SHA512 da0198561305aee121d292d9f89b88587a634477faf363f4faf547fc545aa4396b335f7eb206f422e47311bf410ba29c895dc6cba703403acf4c7ad989b3d298
+EBUILD django-cache-url-3.4.2.ebuild 774 BLAKE2B 9f3bdc2c8a0b26d9eaf7ac358509dfcfb12250ecc59f093309ecdfa667d2671512099df1e262efedafabb9d71e529afea19c95a6710fc6b863b68aa28883c09c SHA512 f8b5e202b8d40d5ccd746220612dff410508b6d7f4462c5afc308dfc6d5412ac82502148233d877ffc952c5e97cdd79792a7c0ad462709a0c5c627c2998674af
+MISC metadata.xml 515 BLAKE2B 0933720797d254031a1a8b134cbede61196f6f6bba8e09decb144c0db328e42faab7cbd3015dcc682711ce45cfe3466fb4c4ffa65bb18305be06937460e61822 SHA512 d6be30d34de3601f3c364094d23a3d322e3fed2f3badf28f132cc6464996bf7bda32cf970b397997554649232d72af747ebc1d4f4815397a6a32e2008438d18f
diff --git a/dev-python/django-cache-url/django-cache-url-3.4.2.ebuild b/dev-python/django-cache-url/django-cache-url-3.4.2.ebuild
new file mode 100644
index 000000000000..3dfcd498a3fa
--- /dev/null
+++ b/dev-python/django-cache-url/django-cache-url-3.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Cache URLs in your Django application"
+HOMEPAGE="
+	https://github.com/epicserve/django-cache-url/
+	https://pypi.org/project/django-cache-url/
+"
+SRC_URI="
+	https://github.com/epicserve/django-cache-url/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e '/--cov/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/django-cache-url/metadata.xml b/dev-python/django-cache-url/metadata.xml
index 2332703f3b7e..2f8e9dfaa812 100644
--- a/dev-python/django-cache-url/metadata.xml
+++ b/dev-python/django-cache-url/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-cache-url</remote-id>
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index c89da8fa501c..f119de058c03 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,3 @@
-DIST django-cacheops-6.0.tar.gz 70280 BLAKE2B 9efe5a10d86f9ad25ad67701005de962185d2c491305bb56920203718c2d5fd0b28d43f2463e28c7c00c7592a78a3adea66090b398a205d5e361dfbcf90ae887 SHA512 54ecec62ff255a867b382bb1157117c8d14d7185891aacaae33ea11283beeae2fae60659621699a52f86d536b5a582d31f24f3b00f16c2e81c1a78ea4079504e
-EBUILD django-cacheops-6.0.ebuild 1343 BLAKE2B 4fb0a485ebca18e0826ce6838cf11afb3712c13752537e95d6dc28bf4f13e20f772f940547b5babe38ce6214e7dfb29b6e07647f5bdc93156bd2a8ad279ce388 SHA512 901a88bbe46c43d767c0f68715c251c3df9b4a559f25f316da07598faaf73abc8b679c1b819611c3b5196ff397f3e0adf75f928b66eb576d6da024b1b9fe0d4e
+DIST django-cacheops-6.1.gh.tar.gz 52972 BLAKE2B bdcd045912100ebdfdfd9add23b0df634b029cc2ffe41c351176e327f1e21c90457cfca9e45348dddce60e39fee5c431428ff7f2c954194e4c06c8bc09d78945 SHA512 43dcd4f302afee1acf73125aae7c2e2eece560cc6f07f3374391ac54e0438fd59b80a24e65f52bd7aa4978fd8a428939a8d607c7aa4b25f47d68373cfc12772f
+EBUILD django-cacheops-6.1.ebuild 1524 BLAKE2B dc0dfcaaa531236a188f555a0dbe41d4ebe45827e8cc9591c2c8bc6806c5a84091a1519e0428d1cb6de4524090cfccfc3cada6bb826a6bb1d5d30b9ae8c1c931 SHA512 dd6c02284879258777c2d44423aa8d315406b1d5310ec56580f2a5fddade5dbf47ebee34331b3d0b55885b4c262e23a68a159b642a16cfe9e31abeb4d1f287ae
 MISC metadata.xml 381 BLAKE2B b8bf138d65b463c15b22be44750822bf6d49f1e651ecc6884dc008b9f1c93ff314967d8d3793825e129c8ac5d98348ac2726ec36ad43b8ec5d0829a78a16a26b SHA512 ad1f2ac5abcfc3705d70cc717bc076115d299a3b973852a542a7d41fabccc695b79ada0297a48cbe8f04815d66e696b437eca896e291c7da9682a85542d3e469
diff --git a/dev-python/django-cacheops/django-cacheops-6.0.ebuild b/dev-python/django-cacheops/django-cacheops-6.0.ebuild
deleted file mode 100644
index ecfd5010beb1..000000000000
--- a/dev-python/django-cacheops/django-cacheops-6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
-HOMEPAGE="https://github.com/Suor/django-cacheops"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
-	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-db/redis
-		dev-python/dill[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# Remove test dependent on unpackaged before_after
-	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.settings
-	django-admin test -v 2 || die
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/django-cacheops/django-cacheops-6.1.ebuild b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
new file mode 100644
index 000000000000..8efce8ba040e
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="
+	https://github.com/Suor/django-cacheops/
+	https://pypi.org/project/django-cacheops/
+"
+SRC_URI="
+	https://github.com/Suor/django-cacheops/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
deleted file mode 100644
index 96b55b3236f8..000000000000
--- a/dev-python/django-compressor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django_compressor-2.4.1.tar.gz 123800 BLAKE2B 455938c328c787e6ca48b3c413f005f9ba3cfc186587b821afb804c0de6259702060d4493e34f240bd721e547ce496a1b0de7a478eb8c9b7ac8e4ba49be755fa SHA512 d59fc8b97f9f87b26e53a9822a9b467df77449cc480a7145d7fedf020a85516dee6f3bc04519fc2e2b751134fb10ce4ddbd4ffe394b5817b973db8d90b9ccda7
-EBUILD django-compressor-2.4.1.ebuild 834 BLAKE2B 2bf9974093a1836d7c38d61a1079214511697c231b936bc14c69d677ee9df1aa27def5132f78301a300ddff0457713c70dff0870caa071e7a3294300e4e85755 SHA512 8942a0d99b74417475944c3167d04e2171c826fa765f9e17617428100d0b1db1ecddbc99048edf9daf0c4c94211423e107ca839a5591d7bd181e53cd7d180b6a
-MISC metadata.xml 246 BLAKE2B 97c2ea9df55e2fd808183ee96c223bbda2460c49adb8df7618a8af03b17280bfe32c1c2165118eefe0b3f308c5bf9f093e4370550f80ec26acd7a6514ad4e501 SHA512 80e98e51005c419fd1f60d258735f48691befda96630786f76a0b59f14be84114e6d7896d6f28641aa1b31ef95756c7822a84c2f2427eccbeb5592594918dd79
diff --git a/dev-python/django-compressor/django-compressor-2.4.1.ebuild b/dev-python/django-compressor/django-compressor-2.4.1.ebuild
deleted file mode 100644
index 11edcb4e0745..000000000000
--- a/dev-python/django-compressor/django-compressor-2.4.1.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..9} )
-inherit distutils-r1
-
-DESCRIPTION="Compresses linked and inline JavaScript or CSS into single cached files"
-HOMEPAGE="https://django-compressor.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-# missing test deps, package does not handle them gracefully, also seem
-# broken or whatever
-RESTRICT="test"
-
-RDEPEND="dev-python/django-appconf[${PYTHON_USEDEP}]
-	dev-python/rcssmin[${PYTHON_USEDEP}]
-	dev-python/rjsmin[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-python_test() {
-	django-admin.py test --settings=compressor.test_settings compressor ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-compressor/metadata.xml b/dev-python/django-compressor/metadata.xml
deleted file mode 100644
index ef2705aa7567..000000000000
--- a/dev-python/django-compressor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">django-compressor</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index dfe89bc9e570..787cbd29aa18 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,4 @@
+AUX django-configurations-2.3.2-test.patch 1858 BLAKE2B 20c6095f59747fa7e37759e39411877a88ac0b71b148f40c9e48f14c053d64203f342524469b63670fd6c6c90c79c6906cf4386717407a99de723166d0f37d79 SHA512 4b9eee16d0b0626b867ce3032165f63270dd56bf8ceb0f70008a136e7d45469a18dd7bba8c1b39fc57d4b03dbf0ab528659100b9be81bc203aac1c4d6c8a9ec8
 DIST django-configurations-2.3.2.gh.tar.gz 38475 BLAKE2B 2b3c583e665a08a46bc0ca0c52ae4326fbdfb794d102deecbd13f953e8b6f3fd39b3b747c591fc9717c6a0792258cdb9041de53e71db2034de1a31ddf5bfc0ea SHA512 4cb5a7b284a0025ba93b32e158fb65b57e66230938181b921a1b1264848113b697eb45ac6ad2fc4f26f3bc29ea5f77acbfd5307b20ef2d385e29c2c1746295b3
-EBUILD django-configurations-2.3.2.ebuild 1168 BLAKE2B c9710c2ad0cf1c28acc41e78cbbab8fc1960936ab8223e454c390e1fb969e2c5d3cb64ec2bc69ae64d4d8ac2b74f8819df8f7232196a988ddd0f2b0ee275a862 SHA512 bf09fac48715b15e0e4d5194ebae968cc430fd96d5eb3f0967fa00ac2447e4a87e1569683160d483938b125d9e3c5f64b1513219f9fca3b2b0c9787369e4d244
+EBUILD django-configurations-2.3.2.ebuild 1216 BLAKE2B ea041b72c26f414156463a3d383aa70acda08675277a1bd6d427cfa108f82bc80666a7a8984957c2a802ade83ff6ae3c5debbc23895d29d215a3120bd334b2d4 SHA512 e084e34301535a97a797cc22cb8bf80fb1be554e47daa8fe6d453162530cf3e29413db2611577469a3fd3c31739da6838c9ac456442aa51ba5a954d1840d5338
 MISC metadata.xml 397 BLAKE2B 704a6d38af3df4b99f24a394dce870ce4f3e1e16c2a30b87ab25ab4b3603451651db062d2aca6669b410bf5350b0edc7b4848ef55bc60c69edc3aedeb8a7c0fc SHA512 a37389a326e763452c7ea138da3eb33dad53bbce24fbd9229e58020063d4e726e68e482500c87238bc0c53b9ee335f93f2d89f39e7ce3e2a087175a2393c66e4
diff --git a/dev-python/django-configurations/django-configurations-2.3.2.ebuild b/dev-python/django-configurations/django-configurations-2.3.2.ebuild
index b8bbfbdabaea..65cfca8e9dc9 100644
--- a/dev-python/django-configurations/django-configurations-2.3.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,10 +12,12 @@ DESCRIPTION="A helper for organizing Django settings"
 HOMEPAGE="
 	https://pypi.org/project/django-configurations/
 	https://github.com/jazzband/django-configurations/
-	https://django-configurations.readthedocs.io/"
+	https://django-configurations.readthedocs.io/
+"
 SRC_URI="
 	https://github.com/jazzband/django-configurations/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +26,8 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]"
+	dev-python/django[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
@@ -32,10 +35,15 @@ BDEPEND="
 		dev-python/dj-database-url[${PYTHON_USEDEP}]
 		dev-python/dj-email-url[${PYTHON_USEDEP}]
 		dev-python/dj-search-url[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 python_test() {
 	local -x DJANGO_SETTINGS_MODULE=tests.settings.main
 	local -x DJANGO_CONFIGURATION=Test
diff --git a/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch b/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
new file mode 100644
index 000000000000..19787102920a
--- /dev/null
+++ b/dev-python/django-configurations/files/django-configurations-2.3.2-test.patch
@@ -0,0 +1,45 @@
+diff --git a/tests/test_values.py b/tests/test_values.py
+index 2547e50..2f1170b 100644
+--- a/tests/test_values.py
++++ b/tests/test_values.py
+@@ -2,6 +2,7 @@ import decimal
+ import os
+ from contextlib import contextmanager
+ 
++from django import VERSION as DJANGO_VERSION
+ from django.test import TestCase
+ from django.core.exceptions import ImproperlyConfigured
+ 
+@@ -411,6 +412,7 @@ class ValueTests(TestCase):
+                 'EMAIL_HOST_PASSWORD': 'password',
+                 'EMAIL_HOST_USER': 'user@domain.com',
+                 'EMAIL_PORT': 587,
++                'EMAIL_TIMEOUT': None,
+                 'EMAIL_USE_SSL': False,
+                 'EMAIL_USE_TLS': True})
+         with env(EMAIL_URL='console://'):
+@@ -421,6 +423,7 @@ class ValueTests(TestCase):
+                 'EMAIL_HOST_PASSWORD': None,
+                 'EMAIL_HOST_USER': None,
+                 'EMAIL_PORT': None,
++                'EMAIL_TIMEOUT': None,
+                 'EMAIL_USE_SSL': False,
+                 'EMAIL_USE_TLS': False})
+         with env(EMAIL_URL='smtps://user@domain.com:password@smtp.example.com:wrong'):  # noqa: E501
+@@ -429,7 +432,7 @@ class ValueTests(TestCase):
+     def test_cache_url_value(self):
+         cache_setting = {
+             'default': {
+-                'BACKEND': 'django_redis.cache.RedisCache',
++                'BACKEND': 'django_redis.cache.RedisCache' if DJANGO_VERSION[0] < 4 else 'django.core.cache.backends.redis.RedisCache',
+                 'LOCATION': 'redis://host:6379/1',
+             }
+         }
+@@ -503,6 +506,7 @@ class ValueTests(TestCase):
+                 'EMAIL_HOST_PASSWORD': 'password',
+                 'EMAIL_HOST_USER': 'user@domain.com',
+                 'EMAIL_PORT': 587,
++                'EMAIL_TIMEOUT': None,
+                 'EMAIL_USE_SSL': False,
+                 'EMAIL_USE_TLS': True
+             })
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index ffc16e6bdeda..cfbb14f762ce 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,5 +1,3 @@
-DIST django-cors-headers-3.10.1.gh.tar.gz 29478 BLAKE2B 935167699b8c63b4741ff095a0dcfb4a0875a424e6f452989b788eb1f97147be4792c8d0304cdf1cfc6f6c339cb27bc7f701c0ae1c379bfe573031c1a2d67c14 SHA512 7c5e94fd59ae4ae542386c9d307ed2628b2e3cb8bd5f48e004b3a84b311acd269a2ba2faf6d034c6cab5f7a0d6e781b4c7ee7c64da8a486a46610af723ee448c
-DIST django-cors-headers-3.12.0.gh.tar.gz 26638 BLAKE2B 7725f7db4e9a67d7cd7f4add74abb5bfd27bac4c65cf4120dee3ba412c27fd89d6e39502249ea4b253c6a7d7d0f5328296ed69ac8b3ceb337bbb89a04f93a6ce SHA512 16d1d03bf1f5336703168280ff585168eb239f454aaec1f1e9928a362c7e7da17b54e896d7428ecdc91657045bede0b3c239a7f2f271c58c1b7b265b2e52aef5
-EBUILD django-cors-headers-3.10.1-r1.ebuild 657 BLAKE2B 6b7452d37eb49b088e4fc8b8c7412a783766810b7becb9c4a8f52264c6a162a5c2e19877d849765137eb38e952b1fb8723b577267548091bfbbfb9955c860c74 SHA512 5aea7a987e4ea6906d95fd70d420d5c486b5ea3f6325012dbeeecb0e6a5cc0518d3bbbeb739475ac654700a23f78f647d5fe4799df93bc848de864b2b6d34885
-EBUILD django-cors-headers-3.12.0.ebuild 709 BLAKE2B 8ff4cbdff6cfdf3a4d423a67f96878239d88e6d1f318c4d2c99e2be8d526d843ca4f7f51d4462223906b70041b17bb7b3e567e9424cc207aa3735aed58e96340 SHA512 c76bc5a43cbae4cdb0a282a89496ed670c07c8df4fd3a962fdb624cd8b396569a65b81dfbf803d2165c35465cbc58b2e367fdd0fe6457d97e21baa2f69426560
-MISC metadata.xml 320 BLAKE2B f087ea8018f5302f24a73d32a3621ca22637f94810eb40914deb6a2de38a9522ae48be6485ff65d31c1b860b870120a95ff47e82fb53f5de3c7dd6bd067b1257 SHA512 e36e854a4af0bb40e3105826db61df2589783c03556a1d7f9854a7c920d448e2edf6d00a7a631ee688f6fad4ec672bf0a29d605816f4939a324ec7a1567b5d89
+DIST django-cors-headers-3.13.0.gh.tar.gz 27361 BLAKE2B 2d0729ae6f0e0ff7c572c5f25482fd88dfa03e8f03a7f640ba32f56208fccb91712cd3067bc3376428469cc7f03dd8003069b79e98dd438fad9e5f4b15cd9c71 SHA512 153ae0d2e0b1e390c72993ca629f7ed521fd907481bb2944ee2f805c0081a1db334fd72f0b3fdb77cbb57b3392691f32564bb646bfb8e388a942a8a3da138a8e
+EBUILD django-cors-headers-3.13.0.ebuild 709 BLAKE2B 8ff4cbdff6cfdf3a4d423a67f96878239d88e6d1f318c4d2c99e2be8d526d843ca4f7f51d4462223906b70041b17bb7b3e567e9424cc207aa3735aed58e96340 SHA512 c76bc5a43cbae4cdb0a282a89496ed670c07c8df4fd3a962fdb624cd8b396569a65b81dfbf803d2165c35465cbc58b2e367fdd0fe6457d97e21baa2f69426560
+MISC metadata.xml 393 BLAKE2B bfe5bf69a5cdf23648e6058016fa53d402db8141ebf97a8471b3335f13eb0adb3ac328c2a013bea02529ee012b00e77fbf43284500cc9e58937fae16d3a2d743 SHA512 b028f371bae9e3bb8e0e94890ee2a5a8c2d93a774eac7cccd6a1ff91886a82ed52ae4fb93442de89034cdbf4ca9d4186dad29b014b989690020db00c492fed04
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.10.1-r1.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.10.1-r1.ebuild
deleted file mode 100644
index 2c4e48a4ed9f..000000000000
--- a/dev-python/django-cors-headers/django-cors-headers-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Django App that adds CORS (Cross-Origin Resource Sharing) headers to responses"
-HOMEPAGE="https://github.com/adamchainz/django-cors-headers"
-SRC_URI="
-	https://github.com/adamchainz/django-cors-headers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild b/dev-python/django-cors-headers/django-cors-headers-3.13.0.ebuild
index 11302037f21b..11302037f21b 100644
--- a/dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild
+++ b/dev-python/django-cors-headers/django-cors-headers-3.13.0.ebuild
diff --git a/dev-python/django-cors-headers/metadata.xml b/dev-python/django-cors-headers/metadata.xml
index 31fd1b93dcdd..e79b7850cd58 100644
--- a/dev-python/django-cors-headers/metadata.xml
+++ b/dev-python/django-cors-headers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">adamchainz/django-cors-headers</remote-id>
 		<remote-id type="pypi">django-cors-headers</remote-id>
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
deleted file mode 100644
index 6087d7f8c59b..000000000000
--- a/dev-python/django-debug-toolbar/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST django-debug-toolbar-3.2.4.tar.gz 255283 BLAKE2B 8be7f569c7f1eab06c4a60fca19bce6c348594406cdfe6de7e6be50849272714e9f3b51db4803e7cd58e97fe44a7422b07b05b2208f4447a4d69e0b77c856cb4 SHA512 19d3ba91b8738ade108f7eaded2859ad3e4bcae7cd0115e2cf63698d1fef01773f09a05f6bc0af53f9c3d4a2a288635a5cb2d215a2eb9f8acd6c65175a1ccaef
-DIST django-debug-toolbar-3.3.tar.gz 259488 BLAKE2B ea69c02f95bc82690fbef6d826c0e48229e6ce27ec55f26cf9991736789c8e8bd0f4b180fbc1a36a3bc3f890798925e5ff2ef5bd09e6a743adb0770d53cf1e9b SHA512 e9f919f74f58345fec402d9595e739e3619cae90d03f8c5efe7b4c5c191b339e594efd4b9823b3952a3f50d3c5bb7257a0e9eb6a7e60059433a61a8f684a1b21
-DIST django-debug-toolbar-3.4.tar.gz 259964 BLAKE2B 3cd33e0cb7db9afca41961df6b3c7623c1ab698e5751a55a8e12b5339d95af9e44892465a81cdfb822054899a11430d371081243a48c09caf47e764c31243712 SHA512 c6ecc0e1304cc0f3db60670518dc9b0631606a786a2ea71db940dfc641865214c9d2b9a8f302232a4664663f1745996351f3ac9b3b5928a6323779bdb3dcc11e
-EBUILD django-debug-toolbar-3.2.4-r1.ebuild 1014 BLAKE2B b2c2e657142cce3a3f9cbb485bd5ec12084d0eac2328fcfc2b076efc033eb2ca10fbc800cee102af3d5e0e51e5b79caf95f1838ff79f0810dfeb47eb4da43cfc SHA512 2a6bb3b36053225c65d721fb10535a26a79317d181d12ea4cc55f7ca349a1517bcec5be6b579122c3ceb06acb1e57c3133c4bf1f37a5cf5dcf1a655d1ca854c6
-EBUILD django-debug-toolbar-3.2.4.ebuild 981 BLAKE2B 2f1284025104260aab12628d4c4439d5af244effd4ea4e8103535e99e5900ea90c23c0a369f98ae83e427259800568f4710f614ca43c93a2492460a44a49f7a4 SHA512 6866794d7e23eabd6222b8b262e0a562229a6ebe228aeb02da0fdcb8b3ca83dbda0f95eaae5658c4a8eaf54a0ede6f4d1f2c4f723272dcb1cc17875f39f513a0
-EBUILD django-debug-toolbar-3.3.ebuild 1016 BLAKE2B ade8d601f2eb1903656d9e77dd503111f36c88119d5550202358df55e9548a96905f8cc0f59813c1f2af9a0654ad7ca9ee64c1963f7861079a182653995beee2 SHA512 d9811ac1196e84e6ef14ea6a09146e7100f77a84541b7a884c7471afcef661c4257838d5ee4c44e760b452eabbc693ad9c294b684719121397fd978609f060c8
-EBUILD django-debug-toolbar-3.4.ebuild 1016 BLAKE2B ade8d601f2eb1903656d9e77dd503111f36c88119d5550202358df55e9548a96905f8cc0f59813c1f2af9a0654ad7ca9ee64c1963f7861079a182653995beee2 SHA512 d9811ac1196e84e6ef14ea6a09146e7100f77a84541b7a884c7471afcef661c4257838d5ee4c44e760b452eabbc693ad9c294b684719121397fd978609f060c8
-MISC metadata.xml 393 BLAKE2B b903eca6ed23f64829c0f7ada77c2cff44aad9031b311dc4a4d085327ff7f894a27144dcb6f8ffc1a60c16a4915871717acb090d5829abc2c030044037c1bb92 SHA512 730834a56e939efd02dcad6edb69ca62f7e9497ef33e9410b007fee00c2f9a61f44221aef97c40b60ffe1e7d462c1cdf6805ae638a58318822f054ebe7befd6b
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4-r1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4-r1.ebuild
deleted file mode 100644
index 415fa5669079..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/jazzband/django-debug-toolbar/"
-SRC_URI="
-	https://github.com/jazzband/django-debug-toolbar/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	emake TEST_ARGS='-v 2 tests' test
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4.ebuild
deleted file mode 100644
index f64d97c58419..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.2.4.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
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/jazzband/django-debug-toolbar/"
-SRC_URI="
-	https://github.com/jazzband/django-debug-toolbar/archive/${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.11[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	emake TEST_ARGS='-v 2 tests' test
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.3.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.3.ebuild
deleted file mode 100644
index 1d724aaa1b7b..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/jazzband/django-debug-toolbar/
-"
-SRC_URI="
-	https://github.com/jazzband/django-debug-toolbar/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-3.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	emake TEST_ARGS='-v 2 tests' test
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.4.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.4.ebuild
deleted file mode 100644
index 1d724aaa1b7b..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="
-	https://pypi.org/project/django-debug-toolbar/
-	https://github.com/jazzband/django-debug-toolbar/
-"
-SRC_URI="
-	https://github.com/jazzband/django-debug-toolbar/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-3.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	emake TEST_ARGS='-v 2 tests' test
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/metadata.xml b/dev-python/django-debug-toolbar/metadata.xml
deleted file mode 100644
index 52be90990150..000000000000
--- a/dev-python/django-debug-toolbar/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jazzband/django-debug-toolbar</remote-id>
-		<remote-id type="pypi">django-debug-toolbar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-extensions/Manifest b/dev-python/django-extensions/Manifest
deleted file mode 100644
index e3052e9ac3d5..000000000000
--- a/dev-python/django-extensions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-extensions-3.0.9.tar.gz 779297 BLAKE2B 9217d395662a8e7dbe09e691cfac7da05e3d8e8b67337c66be1bc7c8a03ddb76df267f38e2ec62c80ffb6be6cef005146ba34c215ab5e76009091ba4b7b05b9c SHA512 42f84fae63b6fbc99d1fc931a73cbfcdbe8cb8c6c7e9997c7571975b073de1132f2f2153ae9a851a4b144c317262b23669624c770d1785364253c295a384a862
-EBUILD django-extensions-3.0.9.ebuild 541 BLAKE2B 49a57395e68c7a1d6900fe37ec5f9955966772478aa373ac0111a6d01444af6e7c88a523ca2187ca1aafdbe203a3ae8347b3bbbad3026929dbb0298b3ac008e7 SHA512 20aa5413fda856dec03d20197551c05a58875865afd73e5867fbb6863be6ebd7627a1820360d3b8cde0677c741c8deb11567b393e8405423f1c91b6ac57d5c5f
-MISC metadata.xml 321 BLAKE2B c4e9295c2544daf51ccbe209b459bdbb8e61df55012540c52c1258a4d71296eb581566ff813f2649534e346a8ae12111657a0f1c32ed2be500c2ebb919d970c8 SHA512 62dc821301ab49659e0df08fc8757df6a3e0286f79709a0ce09743f3c2461d554ea8ebd3354fe1ce9c446cc6a9eefc8075078cd111b13b7cd18fb8eb1c0d3b2c
diff --git a/dev-python/django-extensions/django-extensions-3.0.9.ebuild b/dev-python/django-extensions/django-extensions-3.0.9.ebuild
deleted file mode 100644
index 379348d78882..000000000000
--- a/dev-python/django-extensions/django-extensions-3.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of custom extensions for the Django Framework"
-HOMEPAGE="https://github.com/django-extensions/django-extensions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst CHANGELOG.md )
diff --git a/dev-python/django-extensions/metadata.xml b/dev-python/django-extensions/metadata.xml
deleted file mode 100644
index fdd953b062b0..000000000000
--- a/dev-python/django-extensions/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">django-extensions</remote-id>
-		<remote-id type="github">django-extensions/django-extensions</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index 556789ff5641..3373e3d32124 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,4 +1,7 @@
 AUX django-filter-21.1-test-skipIf.patch 1054 BLAKE2B 96b9c5bfd9cb5f530dab0ad8bb5b80507596a5ce28f694a1f84bc954ca9de596063bf9c88850e6c5db2758b362463de0f9ae451d34023918d313617fdf2b2715 SHA512 bb0d05b7ee78ef8e4b95f51ceddde7bb3068688bb4fc6805f73787c6a23b38c4230fef5cbf591738b6069eb897840d791b6f414b1a74ad21f776226ef2bfda38
+AUX django-filter-22.1-test-skipIf.patch 978 BLAKE2B b2b04b8cba223b58834e35ec45261f5c5d6245f4d073eebc0f73577dbf94681f0d14668b9443bb96f51e03b2ebc36508102e24611dfd467611f41e0689bb6d50 SHA512 6ac98c2f1562709c18d276ca1c6ec39db9cb4fa5d73f0a7d6d5e704b115045f40b330478b3d9684d3cad5603c2cbe0ff196bc25a03f5bce5c1b0dfa3a4b46c42
 DIST django-filter-21.1.tar.gz 154188 BLAKE2B f0ae3119a1dfa466e6630f7da44db1531172991b137fe9420ed533a7b3d4177f689f07fed115566854bd40e5e23f4e9f2f73be32188af2c067a81a95fbccc5a3 SHA512 df2b02bfa93874d9684a26394778203b827c6459ab8cc8c581677e6ccfeedf1323085f53fb52cfc3e0e0a3d27f86de655366bcd4be361502ce86e65b4a4e84d0
+DIST django-filter-22.1.gh.tar.gz 132450 BLAKE2B 9ef9a4ee15ebd3d461803b4dbbdf9a415e7004ee6b9eaaa75c87f9b3993461e6e294621182478ba0ad06595937c9b98fe89d16e9c48e34ced7dd525f40dc926f SHA512 9db2e684815a69c8b28b512c994ad1845c7a3e53da5dc762e5833c1ee4d90c5e513aa5cb3e59d9033c509b44fe9c27ce4fe798842aec50e040c06d33cb18ec0a
 EBUILD django-filter-21.1-r2.ebuild 822 BLAKE2B a4b15f39261721eb5fb5f1940c98bfcda4b7ca25c6f43457f6a6cf3946f2aba2ddb8a8a5e70c1f87d766a050af15a2654baef212a47f8b6fe3124bf0a7d94f60 SHA512 75ddd3aa481df16325dee6d20a0bcb136852dcbad88525f216e35be7c073473bee393a34e3955a7d8290580f88323109aaf3145f6721a1220fa57c3c05bef227
+EBUILD django-filter-22.1.ebuild 963 BLAKE2B 7f18f6f115bc90e8842a4c5bc0373558bea0bd37d8a89baf6cc1d8ac4eaf32ce434787cc9cf2009c5ee6231b0acc34b2afeb89098201a7827e77ae587a86c649 SHA512 e7b187ea4094264f3b6de5b6e7097e2d65e08f40f68c99138f55130cdc29dfdb5610689d0b59c4eb9d27dff240e3077c1e0b178d17d75a37160ffd0287335438
 MISC metadata.xml 384 BLAKE2B d1de931c4e164f99bc55c099b97a44887f5907fa487bb165d5c386458ecca7f18a13803e7be0180cddbc17195c5d5fe3219524f49b30e6c81303d221d6f764b9 SHA512 c316163f5ef1a02754589764a5a585fefc60b9921775d56a558ffcc87896071764d55c6c5cb4dd436eee17b0fee87330a4cca38884cca76521f8098e9fe2e60b
diff --git a/dev-python/django-filter/django-filter-22.1.ebuild b/dev-python/django-filter/django-filter-22.1.ebuild
new file mode 100644
index 000000000000..55924feb2cce
--- /dev/null
+++ b/dev-python/django-filter/django-filter-22.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django app allowing declarative dynamic QuerySet filtering from URL parameters"
+HOMEPAGE="
+	https://github.com/carltongibson/django-filter/
+	https://pypi.org/project/django-filter/
+"
+SRC_URI="
+	https://github.com/carltongibson/django-filter/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/coreapi[${PYTHON_USEDEP}]
+		dev-python/djangorestframework[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-test-skipIf.patch
+)
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	"${EPYTHON}" -m django test -v 2 || die
+}
diff --git a/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch b/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch
new file mode 100644
index 000000000000..883700899175
--- /dev/null
+++ b/dev-python/django-filter/files/django-filter-22.1-test-skipIf.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/rest_framework/test_filterset.py b/tests/rest_framework/test_filterset.py
+index d1cb51a..b6f89cf 100644
+--- a/tests/rest_framework/test_filterset.py
++++ b/tests/rest_framework/test_filterset.py
+@@ -4,7 +4,7 @@ from django.conf import settings
+ from django.test import TestCase
+ from django.test.utils import override_settings
+ 
+-from django_filters.compat import is_crispy
++from django_filters.compat import crispy_forms
+ from django_filters.rest_framework import FilterSet, filters
+ from django_filters.widgets import BooleanWidget
+ 
+@@ -37,7 +37,7 @@ class FilterSetFilterForFieldTests(TestCase):
+         self.assertEqual(result.extra["widget"], BooleanWidget)
+ 
+ 
+-@skipIf(is_crispy(), "django_crispy_forms must be installed")
++@skipIf(crispy_forms is None, "django_crispy_forms must be installed")
+ @override_settings(INSTALLED_APPS=settings.INSTALLED_APPS + ("crispy_forms",))
+ class CrispyFormsCompatTests(TestCase):
+     def test_crispy_helper(self):
diff --git a/dev-python/django-gravatar2/Manifest b/dev-python/django-gravatar2/Manifest
deleted file mode 100644
index 18a56d51ff55..000000000000
--- a/dev-python/django-gravatar2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-gravatar2-1.4.4.tar.gz 8396 BLAKE2B 181aee58f6be4f8833a26674f020412e050387855a84d4c3b8b8f1c028eeb56caee7c95d4a09f301d7e974051b1519b90e1cff1e9789c860f74497da1ab88fe1 SHA512 999fe2a036b23f73ee8111cccde459aa72a5f90995d322e772776f85ba206281e791cdf7d4888b45c7f2ecf8baf6509ed44652396f5db158c484a2fb53439c99
-EBUILD django-gravatar2-1.4.4.ebuild 497 BLAKE2B 716969d45a6d309d84d48ec6d8e017a65c7ab06d5542bb77d2e5837b9f553384226278163bb10b17403a99879d97468b9b225b63adabc7412a79e1b2a56ba85a SHA512 e158940205dc0ddcd09ba33b88c194986a12980b160f62c929eb759375636741d73337d6709ea139b0b379849f36e1e08e2f37445cf486c7937df1c3d50ddc16
-MISC metadata.xml 312 BLAKE2B 03fd98b6403d6b57a48c0395d68bde5b7731f9a1c9ad0b1efe62da92e079951b54b43aae606e9147ed62d48bb38c89749c0e9dee52fe55883aa8550c94e66f91 SHA512 ddcb28fe7ab8fb140055c96b814bbcb9ef34655af3132ec3efc49e68261d06c4dea745c38181427fb0c46d9de1cae367863e515e5e8c7e51731dba01926ad1f9
diff --git a/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild b/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild
deleted file mode 100644
index 93327c923844..000000000000
--- a/dev-python/django-gravatar2/django-gravatar2-1.4.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Essential Gravatar support for Django"
-HOMEPAGE="https://github.com/twaddington/django-gravatar"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-
-DOCS="README.rst"
diff --git a/dev-python/django-gravatar2/metadata.xml b/dev-python/django-gravatar2/metadata.xml
deleted file mode 100644
index 7125bd4df9dd..000000000000
--- a/dev-python/django-gravatar2/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">django-gravatar2</remote-id>
-		<remote-id type="github">twaddington/django-gravatar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-haystack/Manifest b/dev-python/django-haystack/Manifest
deleted file mode 100644
index 5b94f3587a38..000000000000
--- a/dev-python/django-haystack/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-haystack-3.0.tar.gz 450713 BLAKE2B 0766711b127dfa1515583998058f588bea1619a792d6eef353da569a212b94c36683c0a743bdabee563c473f19f3197800bd585faf0b4eb39663b5ffbac6d6b8 SHA512 466ac18bbb6d6add1482d9debdffd195a2049c6c287cc4620e4db2ce4a702c97ca8ffb3ce048dc6c278dc50be701daab4f32b05a71c94ac67645890afb9f49bf
-DIST django-haystack-3.2.1.tar.gz 466580 BLAKE2B 6071ae9502a3bad885e95b79a1969b6ca6dd044a6d113726045d722168aa05d88b12047b0fbf7d7710936bd32158f2f9c27a6f29868e70e00f88ded1bc3b740a SHA512 60ce7297243ab5a43780b0aed6f25970ef0438aaadf8f7c92f89970e58c045d3f6ba7a5a635a275e21dc73b116fb33cad32a41991a677bd0a9c66aef4b7ff0c2
-EBUILD django-haystack-3.0.ebuild 743 BLAKE2B 8e4fd0865c0fc23404247be86aaa8b41cef5d38d718ad735464a6096abbffe1531f7d6a1c6c862795f1d4aaa2719479dd4b54974440feb481daa4161f707d4fb SHA512 2d33c30e23d46bba2f3ceeb489c4ad327bcc70dda2070733c9fc7bf1c2aeca98f2adb1f8132807000d91732b05655e648cf4509f634478511eabfdce2c4351b4
-EBUILD django-haystack-3.2.1.ebuild 536 BLAKE2B c4a19b54f1255bfcfef2007976422944552c382144316819905cfa990851cafe3e4eb52a2ce66f693446bdf814eda9b205be8de91bf8f7b79502d7008705460d SHA512 a036370454da53967ff5888b533ae5ced957ed71e03ac5ec79bff51245c4c91dd6d567c92316bfe0863b2e1659ee55f6d9d564e2aed86b529a23cb4dc8054149
-MISC metadata.xml 322 BLAKE2B 5aed43036731ca893fb0c8c858b92041e2d8b7c43f9ed979cbc3794df349c485d143a1cb409e221068ce84010e8e61eef05180fc1c7e12e8245d16a59ab07298 SHA512 07405f655b82ef2cf087b608974d131de3096ece60f742c5bf6091cc6a5645554c847501bee25cb38775d3b1b42e1d8c77e2c67bb424f47d81e4ee658e8d2031
diff --git a/dev-python/django-haystack/django-haystack-3.0.ebuild b/dev-python/django-haystack/django-haystack-3.0.ebuild
deleted file mode 100644
index 361da68342d2..000000000000
--- a/dev-python/django-haystack/django-haystack-3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pluggable search for Django"
-HOMEPAGE="https://haystacksearch.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	"
-
-# tests have too many dependencies to maintain
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-haystack/django-haystack-3.2.1.ebuild b/dev-python/django-haystack/django-haystack-3.2.1.ebuild
deleted file mode 100644
index 034ff7ba8f4c..000000000000
--- a/dev-python/django-haystack/django-haystack-3.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pluggable search for Django"
-HOMEPAGE="https://haystacksearch.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-2.2[${PYTHON_USEDEP}]"
-
-# tests have too many dependencies to maintain
-RESTRICT="test"
-
-distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django-haystack/metadata.xml b/dev-python/django-haystack/metadata.xml
deleted file mode 100644
index d777f195f301..000000000000
--- a/dev-python/django-haystack/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="pypi">django-haystack</remote-id>
-    <remote-id type="github">django-haystack/django-haystack</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index c33826bfd50d..9b3e68b6fd4c 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.13.4.gh.tar.gz 303688 BLAKE2B 66ae7a0e15a7ff281af2154f216970a6a9b249a713b3ae987f0fbdb60b95129fdfc96c05924c0285da33f11c59baf6e069830c3079c64164d838d9d34231a4a9 SHA512 86786763db060227b41e2e340df5d52062fb6e8c54f832611bc90d01102411d45dc217e8d84eece84ebbe4fc9727d06e7c368ae15c253aaf02117705dbae8c47
 EBUILD django-mptt-0.13.4.ebuild 658 BLAKE2B f05ee8adf40f746657035a38ffef630023b32146852b7fb88c07832fa4083cb44cb033e4a02019af92a4782cd248d7f40e021fc92fb861a109162eedd6b5fb99 SHA512 77693e3ed74466f22457a264720015c630e488ad9ae79e43c599dfc27c458381e0fbf616706ec4b3f3f37ad636b75a1228c57faaa7ac3540a5e85157c5ed84b2
-MISC metadata.xml 329 BLAKE2B f0e9abbf3abb9a574cd7f7ff80cee6b433471df5876a90dd533b0ae92f13669b68b74de21d3d1ba057ca5ccaf610fdfe5b0531a37de9313c6fd0cc56b98ea8db SHA512 4138c4c1604c6bf04316cfd0f31203d44ef40765846ddb60b1725046b9d3071d5017a1726497bdf5421104f00f492417487dee2945757f505b66567c62f9392e
+MISC metadata.xml 402 BLAKE2B 72c5dc1e76719489fd013527bdd115e06b501cd8553d4235581cbd3b76a6f4249dbfd83108eb48ee3e376690f42d952a7a5b0fc4707d9717c1f7ed05bb49d785 SHA512 455d5799930883238de0b64552fdbcaa233e9ceea31fb459e9eee382ef142ab7785bb6029287c8a2eb0ed288f60faa6bec7dc3015de6f52399c2c6e5e4b8cab7
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index 55dccc0b8ceb..d008d8dd5ff3 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-mptt</remote-id>
diff --git a/dev-python/django-otp/Manifest b/dev-python/django-otp/Manifest
index eb72e1b2db21..74c790ad99a5 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,4 +1,3 @@
 DIST django-otp-1.1.3.gh.tar.gz 72736 BLAKE2B 1dc0570d65f0ac8de417260ce2fb895dbae7f5f2cd106b0dd969bc04df207cd4aa9ccf8be2bfc74475bb3ec6abcd451b7fa1c32fd0f7f0d3b27afca212f3b8ed SHA512 4e8b38c393fe29b2fa91e3f1f70abd2cc671dcf760e2e2bf8f738e04fc43a6e7f54229f298f7f2611988dffc40b4450ed1ab910ce9e9995b205dff1b3c90a977
 EBUILD django-otp-1.1.3-r1.ebuild 927 BLAKE2B 4fc3ccfcc8b31eb1f6fa435895cda36e8aeeafa1d0de0442ea8832d81aed9d70bc8384243f4ffdf1e37254784be4d71ca85f29f8f2a55cab06067a516c7f7675 SHA512 f6d9aa031b4c11ce82d0403a59037f466850ce6011f22f3f0112da30752c4f857266889926e35ec8f3399e8751f9e4600c1ed351ae35a6adda812e75d799a949
-EBUILD django-otp-1.1.3.ebuild 879 BLAKE2B edbde8fe955a2916043dc00c3d60eaf329439b71e56aa1c3a6c125c23b83cfefbd2134187214ef543b66d5fd42ee2f6be08fa9b9738e89326b28c2ea78de3eeb SHA512 be93ae1001eba37a7ddbc772466a42d44956bd5357eff20a90d616e5ddab1c1f63e9012a876023c85fb0dcb4164c88433146c73bdf6d1a18b1923df091b6a4ef
 MISC metadata.xml 387 BLAKE2B f1be13d8af9a4926d7c82442cb939f1030a8234d4f18917cf8b2b8b204d763974b5f08f8597334238733d6446fc1165ba19d454e13105dc16afacf1fa3a98ea0 SHA512 d85060b9982c55057128a0c7b7fd1537e3eb613f9d44e6c40438283d76f6d65c92db78815005ce44b4096d57c62584659d5997491f003ca1ed8c36f88db8623c
diff --git a/dev-python/django-otp/django-otp-1.1.3.ebuild b/dev-python/django-otp/django-otp-1.1.3.ebuild
deleted file mode 100644
index 892604810582..000000000000
--- a/dev-python/django-otp/django-otp-1.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Django framework adding two-factor authentication using one-time passwords"
-HOMEPAGE="https://github.com/django-otp/django-otp/"
-SRC_URI="
-	https://github.com/django-otp/django-otp/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/qrcode[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-python_test() {
-	local -x PYTHONPATH=test:${PYTHONPATH}
-	local -x DJANGO_SETTINGS_MODULE=test_project.settings
-	django-admin test -v 2 django_otp || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-picklefield/Manifest b/dev-python/django-picklefield/Manifest
deleted file mode 100644
index f38d9af11448..000000000000
--- a/dev-python/django-picklefield/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-picklefield-3.0.1.gh.tar.gz 12168 BLAKE2B 44af271ce471b5a327d02312c2717c72dcdba8b2e959ada0793bab0962aa02e29d4eeb58857cf3495d7f161abe13595f0027b7624244b070d9978ab51a434d20 SHA512 0b8fe6cd0851d59b3997f328b977430985c0acf5728ff8cc1d0e2e41f145b7c6ce77de02a2d06b4545b43cd4c02e6277206660b8301eb744b8e3b8ea0aed90e5
-EBUILD django-picklefield-3.0.1-r1.ebuild 761 BLAKE2B 80bf2e395250bf674b78cdca3a15fb37cb6f9b739b886f79c8df513716aea9b0da909f5aaa6bf2857ec18b33ecc4751997a84cabe216f303006e4c512092b5fe SHA512 a0ceb02c80c39ee89ac217d8ad03d93c2c4a196fa69ebdf84dbd1010da916b0aab9c529a3176d30253af418cc02b2c532ab4a0260aed6ccc61d4212530b32174
-MISC metadata.xml 336 BLAKE2B 7444bb9ade6f9da57f616b050ba08585ee7e70a80ca631804858a89fa9adbd510019a62cab85aa86cd3bbac88b17731e8babe951b1c93b061f0d9d3b06a5cff5 SHA512 649786fb8985b185e911f5bee39aeaa48ff895192a5f44fa4df15fd776d18bdd120f9336a55dbe136371eb4d8e47f396d1364f40bdde7324be45fae014782cb3
diff --git a/dev-python/django-picklefield/django-picklefield-3.0.1-r1.ebuild b/dev-python/django-picklefield/django-picklefield-3.0.1-r1.ebuild
deleted file mode 100644
index 0d81a27463ee..000000000000
--- a/dev-python/django-picklefield/django-picklefield-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pickled object field for Django"
-HOMEPAGE="https://github.com/gintas/django-picklefield"
-SRC_URI="
-	https://github.com/gintas/django-picklefield/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/django[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Fix for >=django-3.2
-	echo "DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'" >> tests/settings.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m django test -v2 --settings=tests.settings || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/django-picklefield/metadata.xml b/dev-python/django-picklefield/metadata.xml
deleted file mode 100644
index 5b6b8ea1afd5..000000000000
--- a/dev-python/django-picklefield/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">django-picklefield</remote-id>
-		<remote-id type="github">gintas/django-picklefield</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index 5b96b3defc99..936b75a8369c 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST django-prometheus-2.2.0.tar.gz 24995 BLAKE2B db79cbed99d4d5cb7d9ce22dfee69914a63373417b176b4311406f9a1fdcada16447d6ec8cb19ebd14789f520aa1d5755aace824e5462611f81a0cc688566f19 SHA512 a72c8345f220799ad0709e0e73912229267b5e01fc67ae7f647e53ccf7c7e170ad2456c81070a002dc411e840b1129d55719a7aa891b4dabe262837c8c7b3db5
 EBUILD django-prometheus-2.2.0.ebuild 625 BLAKE2B 5e3806e02906ad4e44f06f8bbcb887dc4bcd8143eb6d1f5b43348ad16c6d6e9c2d559c4c4e5e83d9dc87233b76c076e004f6c5a29b8244afb7950aeedcacb930 SHA512 6790250345521663dde790fefb3e82c5cd1f21117ad6dbbfaa390b3f8d9806c65eec0f7450d278727d3473bc7b2a909775a91b8f50e660e2f2370593866c78d6
-MISC metadata.xml 337 BLAKE2B 3a16e167abdc7c361b2ae515b302b1476e90deb010d82cff7a3a9ec0b44ad3d41da3ca61ac290fefa9fc30069d05050ea6da170979afab18d7d22da0ccdb2e85 SHA512 608b835a108eb239a19da8de48b0a731c0ab881758e742b3b47e57fc4810dcef4f23ff53630b08ffde835d19ef9a3e2b10aede1f08d0b641c128afdb567e5490
+MISC metadata.xml 410 BLAKE2B 6b5b85e5b774a6d8d742adc093cf341ff11beff43974c0ba68c9c45cffccfba923e9358cb102b3e64e765a91d851bf7bfa51a1a2875909327a9056c6c1c5b805 SHA512 7a6fe4b02c4ac912f34bba301a723e4c16036236b4e9f3c5e1916512d6a49a4af7b2607e96a86a43d69a4ee4ba08b6db9595235250bc52da8c9147dff054370d
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index 3d385e04b5ba..46f5d0924156 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-prometheus</remote-id>
diff --git a/dev-python/django-q/Manifest b/dev-python/django-q/Manifest
deleted file mode 100644
index ea6c6a34743e..000000000000
--- a/dev-python/django-q/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-q-1.3.3.tar.gz 53997 BLAKE2B 5881fc5b49ef1a58973ca91f0aa3756393ff45714cc3c080292414337a950041563e075401b522726a4fe17e5535a9a428df82dee7bd52a88d4aa1dbdc5373d6 SHA512 469fe359c9c25d8e3d3a8141c7a4a23caaf0e3b127fc5d8b5c70cb2dbb6be5b8ddb0476773c3b919b1fae6f996ba3e423889830c364715edb87f37e2a69cde1b
-EBUILD django-q-1.3.3.ebuild 622 BLAKE2B de07b7e35e573e5dabe875893bf56ab049638856e667651f0043ed90e6a8377abd2f87cb416b6d704455eaa8c4ae4a823c268b5d47a1f3a2e0b70d619b95f5c6 SHA512 4146542668a0f005f160d935541bf2d591c528f53a2ef606aa61b58cced452b54a054b00f13dacd73ea552feaa37f4b97a0e3a54b64eabd25df7b571992f9f0d
-MISC metadata.xml 237 BLAKE2B 004b0488688cc146144d5197b188350ea624aee20c8d1ca7138daab8f707b45ca98d8aa433db4b0d81c606af6651be6c4677245e08b83c02fbcad31e29aaedf5 SHA512 75c0d8178a3db8699fab34293de47466549f71086c5819fe919bf8c17e577169f36114f7a1e18f19500ae09c0d65b7b81e322675cd079218182efe6870e67514
diff --git a/dev-python/django-q/django-q-1.3.3.ebuild b/dev-python/django-q/django-q-1.3.3.ebuild
deleted file mode 100644
index 198bbe26cb9b..000000000000
--- a/dev-python/django-q/django-q-1.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A multiprocessing distributed task queue for Django"
-HOMEPAGE="https://django-q.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	dev-python/django-picklefield[${PYTHON_USEDEP}]
-	dev-python/blessed[${PYTHON_USEDEP}]
-	dev-python/arrow[${PYTHON_USEDEP}]"
-
-DOCS=( README.rst )
diff --git a/dev-python/django-q/metadata.xml b/dev-python/django-q/metadata.xml
deleted file mode 100644
index 78a4566153f1..000000000000
--- a/dev-python/django-q/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">django-q</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-redis/Manifest b/dev-python/django-redis/Manifest
index 70966d6f3558..8be62ac540b8 100644
--- a/dev-python/django-redis/Manifest
+++ b/dev-python/django-redis/Manifest
@@ -1,7 +1,3 @@
-DIST django-redis-5.0.0.tar.gz 47508 BLAKE2B 67d87bcbde16730abd71945fe081d425c1047962ff2ca0c382f65d0588ef72103204f8febfeeda9ea382cf53a5c871c087a85ea817f04fac383961f69324557f SHA512 4516e30122845b49789f04fd079b5bc99a732e814d82deb817f14d105895069defa627f1852ce3fd8464de313a5f01ba81f87272f7a98830f7100dbb0c0bfb12
-DIST django-redis-5.1.0.tar.gz 44112 BLAKE2B 9b3b142b1817f4c206754ab42b4fc63dca33ac40013eca9fdbf5c797d4c55a745bfb290835904967443729f12dc0d07e0a0c89f81c7afa6173b2687fb72c4246 SHA512 eb552eafd2cedc7c550ce6ad1fc56af163a65795c05748a0fc0dc0642092910bbf5163a5ef27bd6c4a4e4bef159c9fb6ce4fb78e64c1964762b8a1330e23e9f7
 DIST django-redis-5.2.0.tar.gz 44132 BLAKE2B 5d9680e43bfff506924b90cdce4fcbf40883a732af6b599c2e36d8549ce2aedbd69540b187152dc8fdc0d2a93b21c5fd2724d6386772f9b4af8632e38414b577 SHA512 65d3dc6b1d72c8b90908cf368cb66ac2eb74bdd32d0b42c8a5288b4448bd7444b21320251262627bc950eaf0d1a1ef0c3014761b690122bea9e5e20f744dd433
-EBUILD django-redis-5.0.0.ebuild 1572 BLAKE2B 9ba0eb8f6914320f4e38727c9fffafc88fadbf00212a95436235209c5b7ca5cc75082db9d7573812d9cc3ef3971a851c496263c228de87e0a1b0716aa390331c SHA512 5bfb19cd2efa4c7b702dcc904a2d9fa7ac1735c5ebee385ed4504c7281be0abb890f0ce32860cc0dc16ea3276df7850ddcdadc29e7af2dfd729deada1e460bdb
-EBUILD django-redis-5.1.0.ebuild 1697 BLAKE2B ac00a897e3f120ce813770db739b5e08cfa2af2e008c8410f36910ae5df6f6785c903da8b58b9712ab0a264edd38444ee3d480fef022a2995f183e1c31e93429 SHA512 1584ff536a3b2881316f011dfbfc6e37b1ad543addc6343209bbe1e9ded35574a2cd21d5e8204e677107ae2a8109b4e81037ea47e17264d4e456ac8827d7c0d3
 EBUILD django-redis-5.2.0.ebuild 1697 BLAKE2B ac00a897e3f120ce813770db739b5e08cfa2af2e008c8410f36910ae5df6f6785c903da8b58b9712ab0a264edd38444ee3d480fef022a2995f183e1c31e93429 SHA512 1584ff536a3b2881316f011dfbfc6e37b1ad543addc6343209bbe1e9ded35574a2cd21d5e8204e677107ae2a8109b4e81037ea47e17264d4e456ac8827d7c0d3
-MISC metadata.xml 385 BLAKE2B ad211356e7d9bfe2fdb8e5ef04dc1813f4dbeef2bb6fa86e87f26f84efc3a8258a754e946ec74c1e6be2b3b55a48354fb1c4931f7c91e42a8f43ba53a9fbf3ed SHA512 b530500be0f15f7631c611739a4267505147fccd4705c9eca6dd97eba3cf52b75e1eb2cd14336fd6e7a618136e9974bb0e9e00383a21bac3d1d5607964ecf67e
+MISC metadata.xml 486 BLAKE2B 5bbffdb40a82538635cec1802d748bcf8c628390de12d19450486651f84f0c23ff7471354080aa51ae80790600d76f35a6fd37f720cb61cf410eab92bd15cbed SHA512 45cb2046312b95a3f9c87287e9a01015dc46b767de2dac060e79ee5457fa066f3229e815b313b4692128c88f6e13208f96048532ffe6554533427edc92286a2b
diff --git a/dev-python/django-redis/django-redis-5.0.0.ebuild b/dev-python/django-redis/django-redis-5.0.0.ebuild
deleted file mode 100644
index e7e938e20d1d..000000000000
--- a/dev-python/django-redis/django-redis-5.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Full featured redis cache backend for Django"
-HOMEPAGE="https://github.com/jazzband/django-redis/"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' -e '/--no-cov/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd tests || die
-	local setting_file settings=(
-		settings.sqlite
-		settings.sqlite_json
-		settings.sqlite_lz4
-		settings.sqlite_msgpack
-		settings.sqlite_sharding
-		settings.sqlite_zlib
-	)
-	for setting_file in "${settings[@]}"; do
-		einfo "Testing ${setting_file} configuration"
-		epytest "--ds=${setting_file}"
-	done
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/django-redis/django-redis-5.1.0.ebuild b/dev-python/django-redis/django-redis-5.1.0.ebuild
deleted file mode 100644
index cf93adbb66fe..000000000000
--- a/dev-python/django-redis/django-redis-5.1.0.ebuild
+++ /dev/null
@@ -1,79 +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="Full featured redis cache backend for Django"
-HOMEPAGE="https://github.com/jazzband/django-redis/"
-SRC_URI="mirror://pypi/${PN:0:1}"/${PN}/${P}.tar.gz
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/--cov/d' \
-		-e '/--no-cov/d' \
-		-e '/redis/s:,<4::' \
-		-i setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd tests || die
-	local setting_file settings=(
-		settings.sqlite
-		settings.sqlite_json
-		settings.sqlite_lz4
-		settings.sqlite_msgpack
-		settings.sqlite_sharding
-		settings.sqlite_zlib
-		# TODO: requires pyzstd
-#		settings.sqlite_zstd
-	)
-	for setting_file in "${settings[@]}"; do
-		einfo "Testing ${setting_file} configuration"
-		epytest "--ds=${setting_file}"
-	done
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/django-redis/metadata.xml b/dev-python/django-redis/metadata.xml
index bc485696dcbd..3e88aa426230 100644
--- a/dev-python/django-redis/metadata.xml
+++ b/dev-python/django-redis/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">jazzband/django-redis</remote-id>
 		<remote-id type="pypi">django-redis</remote-id>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
deleted file mode 100644
index 03a15c372d93..000000000000
--- a/dev-python/django-rq/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST django-rq-2.4.1.tar.gz 42558 BLAKE2B 8412db96dcc4b600ee7ca00e2a9aa5cfdb00ac517fb94ab256b3c132462f52f4de7408763eb98bc304bfe237fb0d7cb7991bdb9df20fd250780d52600b14df58 SHA512 44d8151847c18fd993242e5a5ff99e3964d5b9702d3dc8b574c3581617658ec0a9393c85b66211c273444f39688f92890a38802a8385bcf351a28d833eef5f19
-EBUILD django-rq-2.4.1-r1.ebuild 553 BLAKE2B 8f219cdfcfc5319e0785da9e3f085ada574cb6e6ce9f0b869b38b79c7eb25e0c051d7672423de308b257dc2d38421ec7043eb620aa663a796f59c49e1413fdd2 SHA512 576858622fbb01ae67b17428b912f1298e5e7cab04538fe79107c177e8d4471012b3db16070418ec68fb32fd875572675c49ab5b3f43253ee750e4dcc0759a27
-EBUILD django-rq-2.4.1.ebuild 525 BLAKE2B 410d29fd1dde1b228e73e56e9d4c654af9998312950028dac9b54e11016b5ee62e5bcec3ffb45362fd90abf00c431e857eb0dd62fb85b3cd46afd76495e0ebe2 SHA512 1a2edacbd65b88e357334ef74ccbfe6c17769394e8ac302ec6a9072b5ee0c24d19bba694473b5bed307d05045230e1799605d8ded32d4ddc9912c5a45fdc7880
-MISC metadata.xml 316 BLAKE2B f5387b05ac5d04367f7ebd083df1a6a3542e3e7db686acd586448ec9598225908969cb26f6da14da8de015b98e830642e5bc3aea509a72bb77cd86b11fcd8435 SHA512 45e25be4719c078c3e2720edbc7161dcf14be0a50461fd29369a09ffe641f13e82ebdba9e05bd061ef11d62cc3c322ba7872656fb1b0310d95c10f8bb2d9c072
diff --git a/dev-python/django-rq/django-rq-2.4.1-r1.ebuild b/dev-python/django-rq/django-rq-2.4.1-r1.ebuild
deleted file mode 100644
index d576009fbf4c..000000000000
--- a/dev-python/django-rq/django-rq-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_9 )
-
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-rq/django-rq-2.4.1.ebuild b/dev-python/django-rq/django-rq-2.4.1.ebuild
deleted file mode 100644
index 8efd37640f8e..000000000000
--- a/dev-python/django-rq/django-rq-2.4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="An app that provides django integration for RQ (Redis Queue)"
-HOMEPAGE="https://github.com/rq/django-rq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.0[${PYTHON_USEDEP}]
-	>=dev-python/rq-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
deleted file mode 100644
index 96cadc437a91..000000000000
--- a/dev-python/django-rq/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">rq/django-rq</remote-id>
-		<remote-id type="pypi">django-rq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
deleted file mode 100644
index 7804984a17d8..000000000000
--- a/dev-python/django-taggit-serializer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
-EBUILD django-taggit-serializer-0.1.7.ebuild 475 BLAKE2B 8cc261954fe7c362ff61e99ddfb4ea7d6f07d5c3b534af9fc6f8866d4edb87c23a42c319e79d5b7cbafd5068c1b500b6b11f4724f50b1f770290c73d10cf84ea SHA512 f81d45744e9f9b6f5652bbfda73a065069be243003e5c07e43551ab5b71403227e319d39104035748bb5fb6eb7abb6a017916aedaf816bf8d7ad2543b6d6d8e4
-MISC metadata.xml 331 BLAKE2B bbdecbb5a4184e6066b0ca27f031dd8511dc73f82d0c38e8cff9b31f13d639d7ac8c4ac3ad89263ac74b405dca978bd4ddd1d444c21ce91b5306bc03a2e69408 SHA512 4fd3b7737ffe99f0db54195bb11f7722553fa52face8cec9654c9cdba9eb19d28c0b1b8200f22e89fe45939aeb40d234abf2b05756cedb8b9923cdc401c17982
diff --git a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild b/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
deleted file mode 100644
index a424cceacb25..000000000000
--- a/dev-python/django-taggit-serializer/django-taggit-serializer-0.1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="the django taggit serializer for the django rest framework"
-HOMEPAGE="https://github.com/glemmaPaul/django-taggit-serializer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/django-taggit-serializer/metadata.xml b/dev-python/django-taggit-serializer/metadata.xml
deleted file mode 100644
index e83914b073d0..000000000000
--- a/dev-python/django-taggit-serializer/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">django-taggit-serializer</remote-id>
-		<remote-id type="github">glemmaPaul/django-taggit-serializer#</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 757c03c40d7d..7efe6e7ab8a1 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,5 +1,3 @@
-DIST django-taggit-2.1.0.tar.gz 55659 BLAKE2B 343176e910743924d7b84ef827b4a63e0bc4bc3db7d7c3ed8e7319b18713bc5cdb1e58f1a9f7356a01c1ae5c47daf561e9e68484f0bd40aaf03c780f8558b55c SHA512 64ac21574ba4b0e7dd8d52dee910350d7cfc2f821aaadf7767a4b74d4db7ab69d704558dac13dd68dc29e985ab593bc4189e1d064c0a0d4fe6fa7ab88038d353
 DIST django-taggit-3.0.0.tar.gz 57380 BLAKE2B 67ce6adde1bcba3a9fc8f11af4135dd1a2ee75892e26d4de9970f84111c1cf73f65bc58a2de45c75b98b0c5da9b8a6077af76d1e0561ce8a5e78828db8f40226 SHA512 e44a5f4f8293560cecb1ba39035241f209f21803521d3e2f3102e04add9778ebc15b0da6994f0a51b6c55274318b4cabce33805952f8bbaad16ecc3c03070e10
-EBUILD django-taggit-2.1.0.ebuild 682 BLAKE2B 011002bfc6f335f25a377ed251ca19b5c025b1fc6c2c309b668de0c0d669d962c5bf704edc4707a59d4bb30689f4f368b3e0a68ec0e4339cfceb16acfa1514e9 SHA512 fa5bbf803f19e69237c964449eb885a4997b5be059fa7eaf0c9dce14c3ec65a23438e6afc3d02f7b649850aa7042a3d3756a3b1c8dbf58e616ce396442ee1a00
 EBUILD django-taggit-3.0.0.ebuild 682 BLAKE2B 011002bfc6f335f25a377ed251ca19b5c025b1fc6c2c309b668de0c0d669d962c5bf704edc4707a59d4bb30689f4f368b3e0a68ec0e4339cfceb16acfa1514e9 SHA512 fa5bbf803f19e69237c964449eb885a4997b5be059fa7eaf0c9dce14c3ec65a23438e6afc3d02f7b649850aa7042a3d3756a3b1c8dbf58e616ce396442ee1a00
 MISC metadata.xml 341 BLAKE2B 4cd13e0c8330dc284424e011d573fc640a1af5804063c2a198b5eb95aecabba032936a477af38338f7edfefbc7e9fa3b2761c2bf7d132fa89202b36f24a64eb2 SHA512 6007ed469c39d331f190c107b3e9cff6ff6a80c9c7a7653410ad7b1fbf0f34d948b0a04ef00ff0ab51650d5d18a8dd277bac40c44354345d0f69e4ea45519d50
diff --git a/dev-python/django-taggit/django-taggit-2.1.0.ebuild b/dev-python/django-taggit/django-taggit-2.1.0.ebuild
deleted file mode 100644
index 11dbb8082eca..000000000000
--- a/dev-python/django-taggit/django-taggit-2.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Simple tagging for Django"
-HOMEPAGE="https://github.com/jazzband/django-taggit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/djangorestframework[${PYTHON_USEDEP}]"
-BDEPEND="test? ( ${RDEPEND} )"
-
-python_test() {
-	"${EPYTHON}" -m django test -v 2 --settings=tests.settings ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 712f6aa2b4b2..1f751437d4b1 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,7 +1,3 @@
-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
 DIST django-timezone-field-5.0.gh.tar.gz 33265 BLAKE2B 1d6c12ff6854463070dd6a5019cc2bfaf9514e5f6568057c684c7b061d28cc99416bac2796474fd2d884cd382e2c0e0a77883c35d4f7a7d2bb77a79255379268 SHA512 6fba9333463f1d68c0d5c6c85ad32b0106fa66be38c4e07e802222f25a0d0e024a77f36b17cb2644e89b76ea50ed667a324a9583b7b5dc0be7518ffa593335f8
-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
 EBUILD django-timezone-field-5.0.ebuild 919 BLAKE2B 346642d1c6f0a65b5bea81a59aaf0eed62f2165f177efc61ef75a3507e30a6cc0c7504d65a8c730428486fae75e7e7fa367e84c6ec84ec5731a5c1d157d5aa9e SHA512 e77820d3c1fd96955282eef3caeb8b8dc4ffb6cb62fbd4c3180459a0cde8f1a7d8aade67638620bd912805c418d2ff37369c580b3c83203c3821bd7347cc7e54
 MISC metadata.xml 325 BLAKE2B 481e3472db098df8d49a956b8771b6f32a7bfff8d0ab5a5d556a76c1dfbf4d393e566aed3bec7b8da37b72641f01ef34f1eeb4f5862bd7930facf517dff95875 SHA512 878eac6d1101f54284c6a33bc6458e6a9fa272dd3bc3c824f45e3c0b7b51835de2c9b80c312860e5d1dea0ca6fa1ad44b5e32d61cade7b818ffb4aa9427fed20
diff --git a/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild
deleted file mode 100644
index 0e61159b2c1e..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-4.2.1.ebuild
+++ /dev/null
@@ -1,36 +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 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/django-timezone-field/django-timezone-field-4.2.3.ebuild b/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
deleted file mode 100644
index 1f18eee3c76a..000000000000
--- a/dev-python/django-timezone-field/django-timezone-field-4.2.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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/django/Manifest b/dev-python/django/Manifest
index 3c5f1dbb617f..8f660b0714a9 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,17 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
+AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b059019787143dd8c2cb14b1a27d2fbf66464179c2f08381284340fccb4e6bc1c25a1e36291a0dd8cbd83c754ee1f78d220b8 SHA512 d48f29fa5fe9e434a4220825d1592a03a0667d956db4e6c4119e74f91524b8d02b295a5a600516a993adc2dd3e1f5ca4bde83acd8a6a8e0838382116d2703a28
 DIST Django-2.2.28.checksum.txt 2554 BLAKE2B 23421008f45040be56c417fb4d31ab8cb72d6d6fb59f12e53de1a7947ffed3a290908a49e7ce08bbb155380472daed93b33c2e90580d3bd0aa3d0d9190478bca SHA512 a7e4b2abf3f3ff79e6a0a55047afc6dcb97a2a27bdd6b25770ad60df3eaa4d260d332ef0b94e63971c500a313c2033127575510e871c5ec648bd045c04353aa1
 DIST Django-2.2.28.tar.gz 9187543 BLAKE2B da6ae04b84a858a678b9740694cf1b638128b783da1aa8443c0e85ea3d7f71104e433de043ff7264575e2df36b6fea7275874ff04391b41eb70ba6c7c78306dc SHA512 228aec6ee8619ff3d0397ff867bd59352900fb95557bd02cfea594b3bc3f813b5bcd13f488b451b0ee79a4d52deab19c5e97aa40f1075ba06db72542d119228e
 DIST Django-3.2.13.checksum.txt 2554 BLAKE2B 301d816685f6d97c4a18b4f9d015b063521a7e90a870f1c95ec37ebbc1d4e7311abfee7f7c4aafaa40932334d0eab68fc768dcf21acfffe1d098cabd71ea161a SHA512 ef4a5d0fb8e885cbc2854a4b9b2380dec1cec0e8f6d9bc54179354eb6170755bd6f02268ad5bdc81fdea9d30022422462b0b14894ccc0f37d2e7288aeda83abb
 DIST Django-3.2.13.tar.gz 9813985 BLAKE2B eb8319cc225491fc71f719d2eef6daa05114a97b1302093a0cf0f77bb2a51f398e7a034df7aa52c6a64e9796b9cc66b127fccee810cb38508506ba4cd121cfbf SHA512 08f056b18bc04b95d6705cf70c2ecc5be0c1324e0b38582991b907ed5977c4e3d35417ccf4ec06c2436a718e3aae007b015f0d40dd94ce5cfb129a54cceb6578
 DIST Django-4.0.4.checksum.txt 2545 BLAKE2B d82f7b01f49f2b37de3cfd9eb8738e4af69c8eda0c3ed2b6d80a5f876989f36a9335640c5cd5916dcc682fcbf5453c299cb8b3f52e05f2d29413a4c75d274cbc SHA512 9889e086f35192432084fd2ae1104c316e63fa2ab0d34f6954d5eb98b810b5f2e10861a4136c480b54178d2a5453a36f3b893c7720a92f35b44cd578902a8bf9
 DIST Django-4.0.4.tar.gz 10388499 BLAKE2B f839b343bf5c2f83810f2bb22e93a91b18ccc30754589fef2931ebdf29d4600a3bf5493f9e977a3b647097c3a379ea1ef4e0e25366efb54082bc0f43ed00485f SHA512 75ecf5991763237297b458f546d245a25f62272f7013364783aea19469586fa54ce94a16323ac9a6d6b81097f8e962ea7a20f26c7afd8acda842812409215bb1
+DIST Django-4.0.5.checksum.txt 2549 BLAKE2B e0aae25d6e9b15eddc9f6be566d611d03b3cd2aa97020b99372eebbc5183e2f04f27bfc9c1faa9f4b5ec0e4da453a5812a8c8afd7dbb61c10424c458c81bf453 SHA512 45c628253a530df210c94b7c2e8493faaa5eecd68c1f84c4d61936f0f85d590ddc96d64be0313a6353435bed884fde6f6cf0bd54dc04d361dac093f259c5927b
+DIST Django-4.0.5.tar.gz 10410720 BLAKE2B 43c8000a54829d639a63a7a17067368b3c6fbda483eae374d4e7f561a3bd3490b754de888e597514f706b1843c8dae2f78453f0efc8eb9a335874993eac44e8f SHA512 915dd5f853544dcd9f85e7d11f50d3f8c34eaf4a6819ec76178bec9466feaf2b386f044fdeebec6bd88366917b8feb6e2512d45b8996c8906326205d4f449f90
 EBUILD django-2.2.28.ebuild 2883 BLAKE2B 97d88776ac645e43e9a2d4055d723db2574578f177bef090c856fa75e4e86a17be92349319f511c1453717a4a2bbf58b8338420193403ec86d2c49d702e2b324 SHA512 836d41ece537fd64a773f41718c4aa4c5954da1aa8ac291418088d7970af05f812538be03f1dc7c29341c728c57ee3e73f5ad59aa50cc862a54e30abfe3b8e53
 EBUILD django-3.2.13.ebuild 3050 BLAKE2B da552703a81abf12dc9f104268237438fcc8b9003a9d4789706ee2c812799aef24e4476039cd64bb65c7821f844138e22220006ea14c1475cf3d1705babc6298 SHA512 59e9aa4a66d7b804578fab30b0db04ad2f07d482c07260bfdec986c921d321e4a79b03c046b877a2ffb7d0bc204f0799d4f2557abdc01560879db2c75d68f536
 EBUILD django-4.0.4.ebuild 2974 BLAKE2B 1462faba7a068fffa1aad96c8a0466121d69fe796642095701146b9fdc8e0944dc11ba51a86f7c83625297dad1d5c9809507e0bb565f394733fbfb16bec5c67d SHA512 9669c2ce74724c6a5c85e26f6c9214110baa7e9cff10521c258e5e7ec7dbd4721e250b67318637af27cecde4278acf6658d5f8c456047a332930d46ceee684f4
+EBUILD django-4.0.5.ebuild 3018 BLAKE2B e24afde03de90a8a8cb43d1eb44993502f8acb1142dd9d361dd681365d1edfc0d5eb5f41ab8d0fc9751c2143120e2c4fab296f410d57acd72f7b4b38d86841c0 SHA512 8d35e894c2aea6e344c6e1186d4f733e9528ca144a6d7ff650a001b162d0ec64c5925ec0b19188452bc7cd89dc66c3a9cad81204e4d0b45d61cff42a7f2b3150
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.0.5.ebuild b/dev-python/django/django-4.0.5.ebuild
new file mode 100644
index 000000000000..16e1a7824c10
--- /dev/null
+++ b/dev-python/django/django-4.0.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+	"${FILESDIR}"/django-4.0.5-py311.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+src_prepare() {
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-4.0.5-py311.patch b/dev-python/django/files/django-4.0.5-py311.patch
new file mode 100644
index 000000000000..d566db006574
--- /dev/null
+++ b/dev-python/django/files/django-4.0.5-py311.patch
@@ -0,0 +1,218 @@
+From 3d022e13bcc1de5162ba7198c856bf27c03d4f37 Mon Sep 17 00:00:00 2001
+From: David Smith <39445562+smithdc1@users.noreply.github.com>
+Date: Sat, 19 Feb 2022 19:36:01 +0000
+Subject: [PATCH 1/3] Refs #33173 -- Fixed MailTests.test_backend_arg() on
+ Windows and Python 3.11+.
+
+---
+ django/utils/version.py | 1 +
+ tests/mail/tests.py     | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/django/utils/version.py b/django/utils/version.py
+index 77f13833cb..8f4ab2bcfa 100644
+--- a/django/utils/version.py
++++ b/django/utils/version.py
+@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7)
+ PY38 = sys.version_info >= (3, 8)
+ PY39 = sys.version_info >= (3, 9)
+ PY310 = sys.version_info >= (3, 10)
++PY311 = sys.version_info >= (3, 11)
+ 
+ 
+ def get_version(version=None):
+diff --git a/tests/mail/tests.py b/tests/mail/tests.py
+index 51e26cc6be..183a0c0ab1 100644
+--- a/tests/mail/tests.py
++++ b/tests/mail/tests.py
+@@ -29,6 +29,7 @@ from django.core.mail.message import BadHeaderError, sanitize_address
+ from django.test import SimpleTestCase, override_settings
+ from django.test.utils import requires_tz_support
+ from django.utils.translation import gettext_lazy
++from django.utils.version import PY311
+ 
+ try:
+     from aiosmtpd.controller import Controller
+@@ -790,7 +791,7 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
+                 filebased.EmailBackend,
+             )
+ 
+-        if sys.platform == "win32":
++        if sys.platform == "win32" and not PY311:
+             msg = (
+                 "_getfullpathname: path should be string, bytes or os.PathLike, not "
+                 "object"
+-- 
+2.35.1
+
+From 4d548dce8fb280ed7be63e9818c316fe5f0ee154 Mon Sep 17 00:00:00 2001
+From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
+Date: Thu, 7 Apr 2022 07:02:21 +0200
+Subject: [PATCH 2/3] Refs #33173 -- Fixed test_runner/test_utils tests on
+ Python 3.11+.
+
+Python 3.11 uses fully qualified test name in unittest output. See
+https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9
+---
+ tests/test_runner/test_debug_sql.py | 14 +++++++++-----
+ tests/test_runner/test_parallel.py  |  5 ++++-
+ tests/test_utils/tests.py           | 13 +++++++++----
+ 3 files changed, 22 insertions(+), 10 deletions(-)
+
+diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py
+index 9957295f01..d45d8cb4ba 100644
+--- a/tests/test_runner/test_debug_sql.py
++++ b/tests/test_runner/test_debug_sql.py
+@@ -4,6 +4,7 @@ from io import StringIO
+ from django.db import connection
+ from django.test import TestCase
+ from django.test.runner import DiscoverRunner
++from django.utils.version import PY311
+ 
+ from .models import Person
+ 
+@@ -109,14 +110,17 @@ class TestDebugSQL(unittest.TestCase):
+         ),
+     ]
+ 
++    # Python 3.11 uses fully qualified test name in the output.
++    method_name = ".runTest" if PY311 else ""
++    test_class_path = "test_runner.test_debug_sql.TestDebugSQL"
+     verbose_expected_outputs = [
+-        "runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL",
+-        "runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR",
+-        "runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok",
++        f"runTest ({test_class_path}.FailingTest{method_name}) ... FAIL",
++        f"runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR",
++        f"runTest ({test_class_path}.PassingTest{method_name}) ... ok",
+         # If there are errors/failures in subtests but not in test itself,
+         # the status is not written. That behavior comes from Python.
+-        "runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...",
+-        "runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...",
++        f"runTest ({test_class_path}.FailingSubTest{method_name}) ...",
++        f"runTest ({test_class_path}.ErrorSubTest{method_name}) ...",
+         (
+             """SELECT COUNT(*) AS "__count" """
+             """FROM "test_runner_person" WHERE """
+diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py
+index ca208f6a48..a2f68d3512 100644
+--- a/tests/test_runner/test_parallel.py
++++ b/tests/test_runner/test_parallel.py
+@@ -4,6 +4,7 @@ import unittest
+ 
+ from django.test import SimpleTestCase
+ from django.test.runner import RemoteTestResult
++from django.utils.version import PY311
+ 
+ try:
+     import tblib.pickling_support
+@@ -125,7 +126,9 @@ class RemoteTestResultTest(SimpleTestCase):
+         self.assertEqual(event[0], "addSubTest")
+         self.assertEqual(
+             str(event[2]),
+-            "dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)",
++            "dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)"
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".dummy_test" if PY311 else ""),
+         )
+         self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1')")
+ 
+diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
+index b21c83585b..3b17da1c13 100644
+--- a/tests/test_utils/tests.py
++++ b/tests/test_utils/tests.py
+@@ -47,6 +47,7 @@ from django.test.utils import (
+ from django.urls import NoReverseMatch, path, reverse, reverse_lazy
+ from django.utils.deprecation import RemovedInDjango41Warning
+ from django.utils.log import DEFAULT_LOGGING
++from django.utils.version import PY311
+ 
+ from .models import Car, Person, PossessedCar
+ from .views import empty_response
+@@ -99,9 +100,11 @@ class SkippingTestCase(SimpleTestCase):
+             SkipTestCase("test_foo").test_foo,
+             ValueError,
+             "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests."
+-            "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase) "
++            "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) "
+             "as SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase "
+-            "doesn't allow queries against the 'default' database.",
++            "doesn't allow queries against the 'default' database."
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".test_foo" if PY311 else ""),
+         )
+ 
+     def test_skip_if_db_feature(self):
+@@ -144,9 +147,11 @@ class SkippingTestCase(SimpleTestCase):
+             SkipTestCase("test_foo").test_foo,
+             ValueError,
+             "skipIfDBFeature cannot be used on test_foo (test_utils.tests."
+-            "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase) "
++            "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase%s) "
+             "as SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase "
+-            "doesn't allow queries against the 'default' database.",
++            "doesn't allow queries against the 'default' database."
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".test_foo" if PY311 else ""),
+         )
+ 
+ 
+-- 
+2.35.1
+
+From 2037b6b40a4250daaf3fa85f489fab34536c4f3a Mon Sep 17 00:00:00 2001
+From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
+Date: Mon, 9 May 2022 10:38:11 +0200
+Subject: [PATCH 3/3] Refs #33173 -- Fixed test_dateparse tests on Python
+ 3.11+.
+
+date/datetime/time.fromisoformat() support any valid ISO 8601 format
+in Python 3.11+, see https://github.com/python/cpython/issues/80010.
+---
+ tests/utils_tests/test_dateparse.py | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py
+index 8683811636..3f04a8a49c 100644
+--- a/tests/utils_tests/test_dateparse.py
++++ b/tests/utils_tests/test_dateparse.py
+@@ -8,6 +8,7 @@ from django.utils.dateparse import (
+     parse_time,
+ )
+ from django.utils.timezone import get_fixed_timezone
++from django.utils.version import PY311
+ 
+ 
+ class DateParseTests(unittest.TestCase):
+@@ -15,14 +16,18 @@ class DateParseTests(unittest.TestCase):
+         # Valid inputs
+         self.assertEqual(parse_date("2012-04-23"), date(2012, 4, 23))
+         self.assertEqual(parse_date("2012-4-9"), date(2012, 4, 9))
++        if PY311:
++            self.assertEqual(parse_date("20120423"), date(2012, 4, 23))
+         # Invalid inputs
+-        self.assertIsNone(parse_date("20120423"))
++        self.assertIsNone(parse_date("2012423"))
+         with self.assertRaises(ValueError):
+             parse_date("2012-04-56")
+ 
+     def test_parse_time(self):
+         # Valid inputs
+         self.assertEqual(parse_time("09:15:00"), time(9, 15))
++        if PY311:
++            self.assertEqual(parse_time("091500"), time(9, 15))
+         self.assertEqual(parse_time("10:10"), time(10, 10))
+         self.assertEqual(parse_time("10:20:30.400"), time(10, 20, 30, 400000))
+         self.assertEqual(parse_time("10:20:30,400"), time(10, 20, 30, 400000))
+@@ -35,7 +40,7 @@ class DateParseTests(unittest.TestCase):
+         self.assertIsNone(parse_time("00:05:23+"))
+         self.assertIsNone(parse_time("00:05:23+25:00"))
+         self.assertIsNone(parse_time("4:18:101"))
+-        self.assertIsNone(parse_time("091500"))
++        self.assertIsNone(parse_time("91500"))
+         with self.assertRaises(ValueError):
+             parse_time("09:15:90")
+ 
+-- 
+2.35.1
+
diff --git a/dev-python/django_polymorphic/Manifest b/dev-python/django_polymorphic/Manifest
index 5f70c300f7a7..ae1ca2bc5ec2 100644
--- a/dev-python/django_polymorphic/Manifest
+++ b/dev-python/django_polymorphic/Manifest
@@ -1,5 +1,3 @@
-DIST django_polymorphic-3.0.0.tar.gz 103298 BLAKE2B f68e53de329a8b922fdf8b6daa212422cca8a0dcb31407e4423e8245fe4200c3d2986ca1c9b46013fcc3ae42cedd9fff006db64ca068f8ebff1e19dca2b45aa1 SHA512 7c7030a622d265db2a6d67c327df3044c6598d36ba9d6433f27171f9c07b34dad7a466372e0f7baefc9d2c344b96a2ff9aa28add1fa131c3869d61e4a4c46222
 DIST django_polymorphic-3.1.tar.gz 104090 BLAKE2B de2a2b38f338a10198d00e70d1813e541bf627e2ba2f5e29f0844c9ec7034badba39c077a195fc8c2f71105f1b4e546b91218b95d2ac47020f0dc2e3a5b0baa8 SHA512 730f617009007f94e935870941fdd8973d0cd5995060afbd138622345de77fa48bf2afe037bfa2ad476cef0a31e90cab1eb55109c470ae815a98e1facfa8f125
-EBUILD django_polymorphic-3.0.0.ebuild 755 BLAKE2B 259320936218ea19a291a00c17a9c8b94d35d89a6eef01e2a24acfbfb749a99aff7152e606a5cd1479ced20ae31601931fa1c9736a64dafba4f5d93f09e1107d SHA512 5699111b035bc7eb4f5091684204c5fd63c554d552894db11a4a9da4ced32c518a4f1c4850867f00733738eec43d0654ac7f1fa349f3993d126ce71c498468b9
 EBUILD django_polymorphic-3.1.ebuild 760 BLAKE2B 0d4a421b0242755609586c44d0ed3a2a01c33ebe842c6b320520f9d2159f118726eeae91ed24f48714fc36633dadbdd3afc268819d6b509b3da6a18c01f7ab4e SHA512 2fd357c9e3dfb8782ce71a220a93e9cbd55acba1631ff7e0d1f0a88482c75cf46cb7f5baf6c73357d97fe1c22d641cf8d5ab55666b18285b195d40b0775b5249
 MISC metadata.xml 399 BLAKE2B 18a1c290aa678f0731d92a7e0946da9aaaa17988453ed3a4ee0522a8ac19570da520e10acee8186eb4bd3e6dc9612f6fe4b305feef6d08887a7bd4da5e508fea SHA512 f2b1d1e24adb5cd180436f5ad212ffa25f21d05f98543c83c8bf9d918fbd6a46789b0e157f64ec60f256aca541552556f83f761e6d3f2dec6902bff19c94ecaa
diff --git a/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild b/dev-python/django_polymorphic/django_polymorphic-3.0.0.ebuild
deleted file mode 100644
index 53eef87e7fa5..000000000000
--- a/dev-python/django_polymorphic/django_polymorphic-3.0.0.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} )
-inherit distutils-r1
-
-DESCRIPTION="Seamless Polymorphic Inheritance for Django Models"
-HOMEPAGE="https://pypi.org/project/django-polymorphic/"
-SRC_URI="https://github.com/django-polymorphic/django-polymorphic/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//_/-}"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.1[$PYTHON_USEDEP]
-"
-
-DEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" runtests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 4c591a1c43bc..47f32c55cb51 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,4 +1,3 @@
 DIST django-rest-framework-3.13.1.gh.tar.gz 8868916 BLAKE2B 01a2e1c2459f99b1d3b38b62b305a57f3a3358d34a352ef2bbeb6b130c98f19fbbb83325d1013c28107f267a0a0227215646975de54542ab9ca6dfcf2bd88404 SHA512 a272cccf1f19b2cd09ef456a9588fb17ddc56ac3bd735cf7e130d85bb667ca87361d7de26c95b58a05d8cf693ab19c09d913b457f17ad63053ff9b516c13ec9b
 EBUILD djangorestframework-3.13.1-r1.ebuild 907 BLAKE2B 765e6ec4c1e0b4523c59f880789ea23fa58b8ca6ef521558b1509c08e1f46f8a358f8f4434cec1705698365199ac74ab99f8024c5be44d0279cf917da40e5e40 SHA512 eb16af85f3d1c814660f85d6b95f828406f9687768ebd866d3b4f20a0acc38af4ba88114c4568dbc1c6e7cd5151bc37e97daf7007ab35638d39c986db31e51ea
-EBUILD djangorestframework-3.13.1.ebuild 772 BLAKE2B 3437023900cbea6debb8d214596323e9033acdb2abf32a4a361e8e802e5c344c93eb075fa58c926e48da1bb52ea5f1220c0a1d95ce5f80e9ffc895920853f4a8 SHA512 48c95669eb06abb16537a9b2c7aa1d0f31670610d0f2150a7748a70953c0f8b7778c1b52fddf31eec80b32f16a58a218a6eb609da0b30a892599626eed35ef3a
 MISC metadata.xml 323 BLAKE2B 12b83c18a646ca1be9acf46d5d356ea87104edaca0a199c971fb44a26f385bea834603c9f5a8a4115e8239c3591cd9c5cb001fe365e19287fc00b2ebb07489b6 SHA512 d18e5df8d405716c16ed5d021d41d621b6f1f33c5c4fcda542a44f6a14544531709d7e0a093d40ec10802d2e3bf5ea534ce706d444af2a43b8845068bb1438cd
diff --git a/dev-python/djangorestframework/djangorestframework-3.13.1.ebuild b/dev-python/djangorestframework/djangorestframework-3.13.1.ebuild
deleted file mode 100644
index db2bbeb43bbe..000000000000
--- a/dev-python/djangorestframework/djangorestframework-3.13.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=django-rest-framework-${PV}
-DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org/"
-SRC_URI="
-	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/coreapi[${PYTHON_USEDEP}]
-		dev-python/coreschema[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 3099ca5507cf..8aee552734fd 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,4 +1,3 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
-EBUILD dkimpy-1.0.5-r1.ebuild 814 BLAKE2B daf90e964e55b66bbfc4d4b19bcd205cb42a618b6202972d39ee160adc22e9e07966051a1114bd3e485d9bc869a3b2cd87efeef5f80f5d945c29a95b87c83827 SHA512 d2e464963d2138f352287dd8274ca2e62e3021b1f59bbd7994ae2586a589269fc83a00d95f9ac4412c1916edbb0fbb6919d5073189b2a32d284c8d39f45a10f0
-EBUILD dkimpy-1.0.5.ebuild 738 BLAKE2B ee6ea20f1034dccc998277843c96cbc8a81a5c07193783bf237a3f513edf651662baf24b9b409bd77bb1ffdbb4a8d66c62d43b39b8ec7d304b681bed751a351d SHA512 e115f0e40c5a143850646c58bb253362be9de963919deece02614ef27bea00d7bddb8c6b9187f3729ddbf14391b968b7785223b127e4084a2e09a1ac7a91b88f
+EBUILD dkimpy-1.0.5-r1.ebuild 811 BLAKE2B 52ee9b0307d96e157f5ef430cfe1724985ca14eaff005e686508e572f67e67922fd2ae9231a12a5216464813e45a594ecf249baea87d43a3e93ec7aea1bb93cc SHA512 e7d2b292879ec0ad1f41dcb96195ab3d4c6a25d1fa1181337d69b6780004519aa40fed507785fb0b631e2e7ab2160420ad15ae0176857dda8e8d20c1d9f84dd9
 MISC metadata.xml 539 BLAKE2B 0fd5d17a7430726fe6729d412061d4e3a0d1f8a2e37853af16c9c44c4665158100575486567e06488cc94233ca84379449035354b47fdce1fcde4eb11f71bc6b SHA512 eb529614235a80d990bac7fc7417e7cc7a0c8f30888bce9cd2221170434c2f86af6ca01759d387000db3ad7de9516a22519333d1f5f3d7fe0c68f44836bbeb75
diff --git a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild b/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
index 29d068719bce..1b200393aedf 100644
--- a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
diff --git a/dev-python/dkimpy/dkimpy-1.0.5.ebuild b/dev-python/dkimpy/dkimpy-1.0.5.ebuild
deleted file mode 100644
index e598a8d6cb30..000000000000
--- a/dev-python/dkimpy/dkimpy-1.0.5.ebuild
+++ /dev/null
@@ -1,32 +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 optfeature
-
-DESCRIPTION="DKIM and ARC email signing and verification library"
-HOMEPAGE="https://launchpad.net/dkimpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/dnspython[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/authres[${PYTHON_USEDEP}]
-		dev-python/pynacl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "ARC support" dev-python/authres
-	optfeature "ed25519 capability" dev-python/pynacl
-	optfeature "asyncio support" dev-python/aiodns
-}
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index f67143fa4651..e0cdcdf47278 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,5 +1,5 @@
-DIST dns-lexicon-3.10.0.tar.gz 8394918 BLAKE2B 26e7b7f95b1daf5cd66536993f350301574765f4568a9b3dda4d5e555a3a1ca6a329566f8f5a57ae209d26dd092c851ab524df0488b6ca4f81cdc94011458d88 SHA512 76ede1b55ad388b8d6726d531a4346db5972e79c434db529fa54838b0f40c909cb67a544f3e74e67311c981b8acd4766ec51c67452143989daa9be39176f940a
-DIST dns-lexicon-3.11.0.tar.gz 8467979 BLAKE2B f0ee1b5977d373ad911d71283f64a946269e725616c40f93b9160cccae8c5993f5bd6fa0c5b0616fbde4e91e06be846f1df020c03d19f37b73d59145f06530f5 SHA512 dcf231908ca2869c0e729b114632ce9f53c7b8d524ea072533403e2f8428d8fda9763a4c73e822a2034abd78f46897009127e9e653fb71e0bc712a72a80da075
-EBUILD dns-lexicon-3.10.0.ebuild 1607 BLAKE2B f3519f43e1b2064948e3b68347767a0b1abd083d8f75299e90140bae4b3b0da10436085edd2c0c8add7a6d5987ef4dc170038d92b888aa9be09c255b4402ba5b SHA512 0292ea0b4b526d4781e7fcdbf1a022238f2a27b27e4c90d39ae51848afec717bbcbf43b9bd363d09bb093a5c78b5fa37280160a55b9eb8382c2dadeadcf659ae
-EBUILD dns-lexicon-3.11.0.ebuild 1686 BLAKE2B 0201070142787bb0d528451b8e661546a83e3504d89bcf220f4a92c52ff7fbc234745c3a0eef85178edba629d962d15c4fe29254586082a08f5084fdc3aebdf2 SHA512 31eee4ea5e066c78fa36708ca0d76b74f0a543d88aa98c829fbaca3282585dc73fb12f0de82fce88277d9c8b0899b0d6162ac4a548ad9590b54d512a949dd4c5
+DIST dns-lexicon-3.11.2.tar.gz 8479426 BLAKE2B aced03c62f809bbb22d2456da8d7a66c4b3cdfd47903a67cafd8a97cbc7cdbbe22fe7e79ad3eada716a569241def4e42cf7d910ba9837dfe05a31ce3f8ed2bdb SHA512 bf77cee4e483b36c8cc8cb176291f0170a1d611551246e27ddd91d9712e8750c9ee57863697e975065f6924c03fdfd636c5c7df29a620d37441b12dd0a1c597d
+DIST dns-lexicon-3.11.3.gh.tar.gz 8442678 BLAKE2B 3898e572b409f19c6c3064046adbbbbfefe0ef287caceb2495972c946bdab0b4bb484330e3ae98afdc8d65cc849c11ed199e6c1eeeeb1296f09063124c166b91 SHA512 770a3c052ecc26fb3a27ac49b8f14132b69ea6ca9dfc93caea1ac66c4e6a458e6484b8a8ab921eea97761216fa34d8ad0d95964cdcff30a5713de7189c1e987d
+EBUILD dns-lexicon-3.11.2.ebuild 1779 BLAKE2B 9ae8f9050f5d22d5da832cbb8d1bb8b4aaa89968f3d789f02712e703f3f8555e4b7ab4b64f041e8712dd202140d1b873ddf1775b8d03dbad640161089205887d SHA512 f922bc0862a22b8cfb14d22269d69287fed4fcb6c0c225181d4c3b058b1307110bb2dcafcb9917078c43d1a4046f78378a2bea18ed4125b33430b0ac3e0bfb33
+EBUILD dns-lexicon-3.11.3.ebuild 1782 BLAKE2B 11f3ea6b3a037c6a8ed45b0094a474335b0ef860f5096ee6159534b154237e190cfab56e604c1814b56944ba1954c9d8ff0349d39817036158f8e1991a0d6b0e SHA512 2a201b3edcc30c3efe7c11aef127d66cc571ac70176c4206e186999a98644fb28caaffc68724c191dbde17556bf3771563286028480e1e716d88e80b3ce8ac6c
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.10.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.10.0.ebuild
deleted file mode 100644
index 66eb3c517a29..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="
-	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/lexicon-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/zeep[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Requires the "localzone" module
-	lexicon/tests/providers/test_localzone.py
-	# Requires the "softlayer" module
-	lexicon/tests/providers/test_softlayer.py
-	# Requires the "transip" module
-	lexicon/tests/providers/test_transip.py
-	# Requires the "oci" module
-	lexicon/tests/providers/test_oci.py
-	# Uses tldextract which needs Internet access to download its database
-	lexicon/tests/providers/test_auto.py
-)
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature_header \
-			"Install the following packages to enable support for additional DNS providers:"
-		optfeature Gransy dev-python/zeep
-		optfeature Route53 dev-python/boto3
-		optfeature DDNS dev-python/dnspython
-	fi
-}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.0.ebuild
deleted file mode 100644
index bd75f1201713..000000000000
--- a/dev-python/dns-lexicon/dns-lexicon-3.11.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
-HOMEPAGE="https://pypi.org/project/dns-lexicon/"
-SRC_URI="
-	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-S="${WORKDIR}/lexicon-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tldextract[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/zeep[${PYTHON_USEDEP}]
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Requires the "localzone" module
-	lexicon/tests/providers/test_localzone.py
-	# Requires the "softlayer" module
-	lexicon/tests/providers/test_softlayer.py
-	# Requires the "transip" module
-	lexicon/tests/providers/test_transip.py
-	# Requires the "oci" module
-	lexicon/tests/providers/test_oci.py
-	# Uses tldextract which needs Internet access to download its database
-	lexicon/tests/providers/test_auto.py
-	# All recordings seem to be broken
-	lexicon/tests/providers/test_namecheap.py
-)
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		optfeature_header \
-			"Install the following packages to enable support for additional DNS providers:"
-		optfeature Gransy dev-python/zeep
-		optfeature Route53 dev-python/boto3
-		optfeature DDNS dev-python/dnspython
-	fi
-}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.2.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.2.ebuild
new file mode 100644
index 000000000000..b467cab6a220
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.2.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_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="
+	https://github.com/AnalogJ/lexicon/
+	https://pypi.org/project/dns-lexicon/
+"
+SRC_URI="
+	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+	# All recordings seem to be broken
+	lexicon/tests/providers/test_namecheap.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.3.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.3.ebuild
new file mode 100644
index 000000000000..c6c99ff85a56
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.3.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_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="
+	https://github.com/AnalogJ/lexicon/
+	https://pypi.org/project/dns-lexicon/
+"
+SRC_URI="
+	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+	# All recordings seem to be broken
+	lexicon/tests/providers/test_namecheap.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index a942a8e88dba..a4b1397bf1ce 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1,3 @@
 DIST dnspython-2.2.1.tar.gz 304861 BLAKE2B e6446b91579c6ec0a7266a354ceb58e2f881b55b7376648770ebc2c6104fd815214497516d305b75802e9211703d47a70d66745d872a43afb72f41e55a617652 SHA512 ec545468f604d6131f07259ca154c4f71d445d12c336ac1da0d2f025d6478ada76320a7235119312fed85da071ef309d2531e541d3c2340a50deaf3f4dd7b4eb
-EBUILD dnspython-2.2.1.ebuild 1008 BLAKE2B c043f787b2a8b15fc79380baa668a7976a775a69a45376acd966e29e98ce44933c2ea943e235a3c1f471d9618a348237770a3e3e0ef611bbd6d21c9f5f96597e SHA512 d9d0f0b40ddad0666744a5c1944f855c8d1b899eaeabd5a23d2dcf3b18c13c90a2d11ac1e58a3a376406a1b2259762f285143da13596709e7e5af84e558ce0d5
+EBUILD dnspython-2.2.1.ebuild 1058 BLAKE2B d588876aeaa59ace6b50965e56d3c5444eef87ab3865893423b57c79ff388ed83a2d6b2b5fadb211cc3f9b21acbfe50baf32c551fcf5982806d6a902d908cf6d SHA512 d7c991962b410c3fcd564c825add2c26acc75288c9595cbd94ccd78109376d844b37510c77211ab488f4b80275c242f7db0f936668dfa38c25482f66be903942
 MISC metadata.xml 1483 BLAKE2B c8506d4cb41157307b98f6976d05f6a504a89c3c0924e5135e060018bcd401589b4fbd932b1c61eb34d2823168170281fcee75f8fedda4053207b3844fae336d SHA512 e2b0132864d9a338193e9eed11e85981e48825c194fc35d8e17f9a72b19e04368140556c37a37061059451aaf1c6143030a54f43fb65ab734d2e9636e7e641d3
diff --git a/dev-python/dnspython/dnspython-2.2.1.ebuild b/dev-python/dnspython/dnspython-2.2.1.ebuild
index fd6c6844ee59..beb937eab99a 100644
--- a/dev-python/dnspython/dnspython-2.2.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.2.1.ebuild
@@ -4,13 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="https://www.dnspython.org/
-	https://pypi.org/project/dnspython/"
-SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://www.dnspython.org/
+	https://github.com/rthalley/dnspython/
+	https://pypi.org/project/dnspython/
+"
+SRC_URI="
+	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="ISC"
 SLOT="0"
@@ -19,7 +26,8 @@ IUSE="examples"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	<dev-python/idna-4.0[${PYTHON_USEDEP}]"
+	<dev-python/idna-4.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index ecd6a077291d..325516891d60 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,3 @@
-DIST doc8-0.11.1.tar.gz 25643 BLAKE2B 5f7eaa00b6fac123d02da41e02c7585c7c7160664766466a3bf06ba146411fda14b3720f8c8277f307f7b4985ded47707c836f9f6e6d7e4f89dc1af50111b87f SHA512 88b0882af3a671afc2a87d9dea0df5e7890895907545ff8fc02b40ae7f765c142bc715bff3e90685dd1d2358b701b8c6c30cac431fe3d6d0ec078b78added2f3
-EBUILD doc8-0.11.1.ebuild 871 BLAKE2B 36bac04c8208589d5566023b80ebe7f545b2f3915488aef0f97717facc08255c124d47868fa9d1e84c5baec65bfad85326fe529ca7cc19b95352ae53875fdcc4 SHA512 b3f963f80ace925deba13e00b05e5a0df673bad77c7ec826b05e2c532fe3ed3bd217b752961d1e6942ecfd256c747e209eb1ecc0f8f41a19019514c03977a4f1
+DIST doc8-0.11.2.tar.gz 25898 BLAKE2B 097c6d6b82fe4acf7cfc43ff7860334f0a53df3ca39def33de4b9f04553acab785fe339d8126dd5ae56a7d45c846c575b9c689eed47bc47302b89fd5bfabfe3a SHA512 f607251c3ae792b3210893b2074bb34aad866a54645c4244ef53e156a4c3af9cfb61ddb93617d153510cc6868be7f04409eac47f66f91d4d0b9400bb7aca0eb1
+EBUILD doc8-0.11.2.ebuild 832 BLAKE2B b08861a20be43f2ff1164e4b0c74f58abdc30308de47d84d20d6f6ad845110f0e720731d1b18872b8889328b2ca619615258707db797daed6388d1dd2c0038b4 SHA512 3084ec1911d0852a2191e4a09aa13108f218aa441299eb7a9abc07427b951b4ddab069b1b51007dad4b44d5e3da899809bc3505ae876f0cbcf294403ea302868
 MISC metadata.xml 447 BLAKE2B 8be26ccdf9fd1e34e05eccee3abb8182d95438b7eb0f6dda03757e1d4a0f2b1c34861f81b9e8bbbb6634f141dc7867ecdf83022b05df6abe322716d78eafc9a4 SHA512 824cb036e31a498764941d78ebd744d2edaa2cd7a3282dbd5f2c16cbcb0adab12a80b0200528c40e01fc6dde851d1abed5b3d5fc2b27577a02cdfad5fa90663d
diff --git a/dev-python/doc8/doc8-0.11.1.ebuild b/dev-python/doc8/doc8-0.11.1.ebuild
deleted file mode 100644
index 27a47eef87c1..000000000000
--- a/dev-python/doc8/doc8-0.11.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="
-	https://pypi.org/project/doc8/
-	https://github.com/pycqa/doc8/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s src
-}
diff --git a/dev-python/doc8/doc8-0.11.2.ebuild b/dev-python/doc8/doc8-0.11.2.ebuild
new file mode 100644
index 000000000000..7b24f1a2ba35
--- /dev/null
+++ b/dev-python/doc8/doc8-0.11.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="
+	https://pypi.org/project/doc8/
+	https://github.com/pycqa/doc8/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 27b49106b1e1..a54a0e7f5ae6 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,4 +1,4 @@
 AUX docopt-0.6.2-pytest_node_from_parent.patch 958 BLAKE2B 0fc4437f92f9410a47823a28b1b26057bfbc1687923ee56b0c69b4d921128b7b868fd793098b8399349906a4353aed9e2801ced0d458cf121af31b209df118e3 SHA512 74a384b1e62128df781c5c24bfa6a0f01de63610fadb51349f8f094375b84ab090209d86cde1a65116c735bb90eca61cabcef60e608297bb6976da2f5b510529
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r4.ebuild 620 BLAKE2B 3f8f07a1a6ba5885a904109b48c6a35e7ae74034260ee9f7ce179f7c558ed5237ef5bf1399d507acf41d6558202034a728c75a98e40a8ba27bf2994e96542706 SHA512 9b5da48ccb62f8b1d858db8ae286e318144388a4fae37a0656a2af5abff7adee677d6dd148ad954dda46009a0abc563082bd3e6daff6f531fd55e21be9db9f36
+EBUILD docopt-0.6.2-r5.ebuild 662 BLAKE2B 4c1dd63324c9de804f7284fdb97174101be5debc95a8af4c57c3cd1a5d82378273be308037e13e68030aec20a196d794db870e32574b18748467d8142b6b3d6e SHA512 11081c57afd660907d4be6e6238c8df0ec03f1fa510b5625590dd480d75fbdc7a26e543dc9812df183c08097c1e53afa0b9031f3e25876d25c9feeb4b4f63712
 MISC metadata.xml 387 BLAKE2B c190df1ef516cca0d259568bb7c371b007f0bdb34dfaeda4c9cf6fca58773ce5db43eeb526e4046797d8b7c367a8aab060c29ab042b51f0f3f7df4e0fc896345 SHA512 c65933341a2f83c779ec8c9557aa35676a04ee748aa007da93294154c8df2471194c2c03cd88a10edbfbc1255c9732ef1a3aad4208a917c095fd1a8ed8ef7843
diff --git a/dev-python/docopt/docopt-0.6.2-r4.ebuild b/dev-python/docopt/docopt-0.6.2-r4.ebuild
deleted file mode 100644
index 5a9806a1b324..000000000000
--- a/dev-python/docopt/docopt-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic argument parser, that will make you smile"
-HOMEPAGE="https://pypi.org/project/docopt/ https://github.com/docopt/docopt"
-SRC_URI="https://github.com/docopt/docopt/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
new file mode 100644
index 000000000000..3a0b8150ed9e
--- /dev/null
+++ b/dev-python/docopt/docopt-0.6.2-r5.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic argument parser, that will make you smile"
+HOMEPAGE="
+	https://github.com/docopt/docopt/
+	https://pypi.org/project/docopt/
+"
+SRC_URI="
+	https://github.com/docopt/docopt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 8f3d605664e9..fa1bcf3a8974 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,8 +1,6 @@
-AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
-DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
+AUX docutils-0.18.1-py311.patch 4637 BLAKE2B d103e5f4fa6b8c1ab06f2b07c33ee3f707f0c1224d9bfa6f57504c3f30177dcb46cb8ed32dcc03c413937a94212bc64a9963cc0cede766e50b81b1f73531fcef SHA512 7c7c97e150914ddc12948236f84314b3ce49d043a7e5245ae0defbbf1d0845a8e3b06ebd63fb466c92bc970305578243dc97103230d80a810fa3cd54528b70bd
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
-EBUILD docutils-0.17.1.ebuild 1755 BLAKE2B 80aedacfe801d0843e922db5c43cf0e0f2c3072c1340dae848c91cb3e152c645996eb472c5684bf7fdafbd00a70983a5c7b2c823657cc51dc79402d01fba3d57 SHA512 d668880f53ec2f3f3e449ce49851ad1b3f3f37d5cf2261caf5a1771ad078d1ee0da054a7cd3bbe9d7647bfaee45c778b0ecef3e65168bdf198e27c59f0d29e82
-EBUILD docutils-0.18.1.ebuild 1755 BLAKE2B 880ab3f863af75a8531b5b5d3f48beaa9eb09b011ce2c6e2fee496f8b160a8281ba486ed020c70ffc28ededa00dc6b0d195ab65b4a47543df34ca0f6723e5429 SHA512 ee54df064180c08ff4bba0583088e63cba7b802f706e04575952ae23d71ed9164ac23fd661864a3d7d97bcf437de38c2632b181c8cf45174effcfd1af469d4b8
+EBUILD docutils-0.17.1-r1.ebuild 1830 BLAKE2B d13ba2e4998192d440e02fa4832ce67862d01b3731db0eb10f0c8df1a1403e5e356487d56599ef56cd154cc24ec37ac5dfaf6d9eec7b9aa429e54d5fc8ba4c3e SHA512 6cc1a8a27d9bcd575f9b9ab92629869583a28ac78592d47257bec360169987aea1a3a9d167f72e0ba6c38cd0868ca109ec8f0da739823b1ae24b923ff19e9215
+EBUILD docutils-0.18.1-r1.ebuild 1819 BLAKE2B 3a9611e2f5d592d762eeae1b72ab8fa364f0c0fef173d8c93a8bc6f5959d43fb4b2cd28d6d29ec8da3a096e3e0b6684d96b442070c97d044637d5a82eb6f7cbd SHA512 b36683561ef5367b0e1937693b14a867408b4d051b6a6680804c8c748da8f6c0369013a4aa5de40797fdf306f72490edc5219dd41fa5f0bbc8920d6d0945ec6b
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
deleted file mode 100644
index 3e297d6f7519..000000000000
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ /dev/null
@@ -1,72 +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="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=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.17.1-r1.ebuild b/dev-python/docutils/docutils-0.17.1-r1.ebuild
new file mode 100644
index 000000000000..388cb8be2276
--- /dev/null
+++ b/dev-python/docutils/docutils-0.17.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
+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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/docutils-0.18.1-py311.patch"
+)
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/docutils-0.17.1.ebuild b/dev-python/docutils/docutils-0.17.1.ebuild
deleted file mode 100644
index 4f20978f653a..000000000000
--- a/dev-python/docutils/docutils-0.17.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 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="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 ~loong ~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/docutils/docutils-0.18.1-r1.ebuild b/dev-python/docutils/docutils-0.18.1-r1.ebuild
new file mode 100644
index 000000000000..d916deb851d3
--- /dev/null
+++ b/dev-python/docutils/docutils-0.18.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
+HOMEPAGE="
+	https://docutils.sourceforge.io/
+	https://pypi.org/project/docutils/
+"
+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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
+python_compile_all() {
+	# Generate html docs from reStructured text sources.
+
+	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+	cp docutils/writers/html4css1/html4css1.css . || die
+
+	cd tools || die
+	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+		--stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Install tools.
+	python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+	local doc="${1}"
+	local dir="txt/$(dirname ${doc})"
+	docinto "${dir}"
+	dodoc "${doc}"
+}
+
+python_install_all() {
+	local DOCS=( *.txt )
+	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+	distutils-r1_python_install_all
+
+	local doc
+	while IFS= read -r -d '' doc; do
+		install_txt_doc "${doc}"
+	done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1.ebuild
deleted file mode 100644
index ec09fc9ea24c..000000000000
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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="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 ~loong ~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/docutils/files/docutils-0.16-tests.patch b/dev-python/docutils/files/docutils-0.16-tests.patch
deleted file mode 100644
index 052578c727a4..000000000000
--- a/dev-python/docutils/files/docutils-0.16-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code.py	(working copy)
-@@ -107,7 +107,7 @@
- <document source="test data">
-     <literal_block classes="code python testclass" xml:space="preserve">
-          \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-@@ -167,7 +167,7 @@
-         <inline classes="ln">
-             12 \n\
-             \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py	(working copy)
-@@ -69,7 +69,7 @@
-         <inline classes="ln">
-             12 \n\
-             \n\
--        <inline classes="keyword">
-+        <inline classes="name builtin">
-             print
-         <inline classes="punctuation">
-             (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py	(working copy)
-@@ -45,10 +45,11 @@
- # some error messages changed in Python 3.3, CPython has backported to 2.7.4,
- # PyPy has not
- csv_eod_error_str = 'unexpected end of data'
--if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
-+if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy'
-+                                  and sys.version_info < (3,0)):
-     csv_eod_error_str = 'newline inside string'
- # pypy adds a line number
--if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy':
-+if platform.python_implementation() == 'PyPy':
-     csv_eod_error_str = 'line 1: ' + csv_eod_error_str
- csv_unknown_url = "'bogus.csv'"
- if sys.version_info < (3, 0):
-Index: docutils/test/test_parsers/test_rst/test_interpreted.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_interpreted.py	(revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_interpreted.py	(working copy)
-@@ -283,7 +283,7 @@
-     <paragraph>
-         Python code \n\
-         <literal classes="code testclass python">
--            <inline classes="keyword">
-+            <inline classes="name builtin">
-                 print
-             <inline classes="punctuation">
-                 (
diff --git a/dev-python/docutils/files/docutils-0.18.1-py311.patch b/dev-python/docutils/files/docutils-0.18.1-py311.patch
new file mode 100644
index 000000000000..878c6f1961db
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.18.1-py311.patch
@@ -0,0 +1,135 @@
+Combination of:
+http://svn.code.sf.net/p/docutils/code/trunk@8910
+http://svn.code.sf.net/p/docutils/code/trunk@8909
+
+diff --git a/test/DocutilsTestSupport.py b/test/DocutilsTestSupport.py
+index 592d3f9df..e1f33aa7a 100644
+--- a/test/DocutilsTestSupport.py
++++ b/test/DocutilsTestSupport.py
+@@ -819,6 +819,7 @@ def exception_data(func, *args, **kwds):
+     except Exception as detail:
+         return (detail, detail.args,
+                 '%s: %s' % (detail.__class__.__name__, detail))
++    return None, [], "No exception"
+ 
+ 
+ def _format_str(*args):
+diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
+index 07be0122f..73724ed7e 100755
+--- a/test/test_parsers/test_rst/test_directives/test_tables.py
++++ b/test/test_parsers/test_rst/test_directives/test_tables.py
+@@ -65,6 +65,92 @@ def null_bytes():
+     next(reader)
+ 
+ null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
++# Null bytes are valid in Python 3.11+:
++if null_bytes_exception is None:
++    bad_encoding_result = """\
++<document source="test data">
++    <table>
++        <title>
++            bad encoding
++        <tgroup cols="4">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <colspec colwidth="25">
++            <tbody>
++                <row>
++                    <entry>
++                        <paragraph>
++                            \xfe\xff"Treat"
++                    <entry>
++                        <paragraph>
++                            "Quantity"
++                    <entry>
++                        <paragraph>
++                            "Description"
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "Albatr\u00b0\u00df"
++                    <entry>
++                        <paragraph>
++                            2.99
++                    <entry>
++                        <paragraph>
++                            "\u00a1Ona\x03\xc3\x03\xc4\x03\xb9\x03\xba!"
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "CrunchyFrog"
++                    <entry>
++                        <paragraph>
++                            1.49
++                    <entry>
++                        <paragraph>
++                            "Ifwetooktheb\u00f6nesout
++                    <entry>
++                        <paragraph>
++                            itwouldn\x20\x19tbe
++                <row>
++                    <entry>
++                        <paragraph>
++                            crunchy
++                    <entry>
++                        <paragraph>
++                            nowwouldit?"
++                    <entry>
++                    <entry>
++                <row>
++                    <entry>
++                        <paragraph>
++                            "GannetRipple"
++                    <entry>
++                        <paragraph>
++                            1.99
++                    <entry>
++                        <paragraph>
++                            "\xbfOna\x03\xc3\x03\xc4\x03\xb9\x03\xba?"
++                    <entry>
++    <paragraph>
++        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
++"""
++else:
++    bad_encoding_result = """\
++<document source="test data">
++    <system_message level="3" line="1" source="test data" type="ERROR">
++        <paragraph>
++            Error with CSV data in "csv-table" directive:
++            %s
++        <literal_block xml:space="preserve">
++            .. csv-table:: bad encoding
++               :file: %s
++               :encoding: latin-1
++    <paragraph>
++        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
++""" % (null_bytes_exception, utf_16_csv)
++
+ 
+ totest = {}
+ 
+@@ -1031,19 +1117,8 @@ u"""\
+ 
+ (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+ """ % utf_16_csv,
+-"""\
+-<document source="test data">
+-    <system_message level="3" line="1" source="test data" type="ERROR">
+-        <paragraph>
+-            Error with CSV data in "csv-table" directive:
+-            %s
+-        <literal_block xml:space="preserve">
+-            .. csv-table:: bad encoding
+-               :file: %s
+-               :encoding: latin-1
+-    <paragraph>
+-        (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
+-""" % (null_bytes_exception, utf_16_csv)],
++bad_encoding_result
++],
+ ["""\
+ .. csv-table:: good encoding
+    :file: %s
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 91e6ea768fed..4e8a8f263931 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1,5 @@
 DIST dogpile.cache-1.1.5.tar.gz 392536 BLAKE2B 062392cda9b06da889f924bc04743faa133b978a908ffdbc1e9cc9a2a9a69db22ee26b27c7cb2ec2dedee20786cf90c6d02d163731224956091b2d3baa25774b SHA512 b6d453121ef8e58da60478e2e1e2db57804dfa3b17cceeace930ba75d159629dfba4b5d63c50fbbc2eafeadbfcd6e1e4cbe22c8da1f54c90473f8ee677d764f8
-EBUILD dogpile-cache-1.1.5.ebuild 757 BLAKE2B 879d7d4f43856cda3a935158cfdd91ccdb212cf312d5f1a8e3191f48237e5060f87c229439df9f9ddcfb2aed1b4e9506d59066956e3ed71f529ee22714ced4ea SHA512 874736ef61254fda9fe33dd67298941fa993c68a9264c6d57d04cfb5c73c4c3fa5955d57e5107e433f2773e9686a8faad57286834c30969976e23a9d8cbccada
+DIST dogpile.cache-1.1.6.tar.gz 393076 BLAKE2B 62c16ee7cc00608432d45fa7cb068300a4417a494e4580a2af5c3f7c5a0bf40a54e1b6f4924bbd7b40a0efc1cb9afb42f361811c257fa77eabcd64cc35fbcf51 SHA512 179246abf598675cdef988b463df4997c7eed8e7a110c22704052f905b65ad537b22ba28d7c96a28b2aa85b3e83ac42beb36843dc78ad503d41225ea1f9e7e77
+EBUILD dogpile-cache-1.1.5.ebuild 764 BLAKE2B eddcf9fc01c3942cc1292bd2dc4e5ab10abd6162a20824f4b6ddd8c6c26fe34f974750e5a6acd853fd36f039f8c70d9121cc08ac7125e45c4f43556996568e4c SHA512 029b30a4b8233841b577755fe1fd516161afc08900d2d8131ceb761e27237274ab206bd7ddaaa599bf9758fecf0641f8f1bd76fd01de2078f692be76fc92fc96
+EBUILD dogpile-cache-1.1.6.ebuild 767 BLAKE2B 8a10baf236407ea9d8adbbdd7186988b19975bf7936d5f9659979d8b08544b1afbe7e01fab23f7c11870c6379340fc82fe0108e3f841f35e3c089ceebfc7d797 SHA512 d127e8914e8ca20c90aaf4ab54a742ba91dbff71f10041d4591a447637d5186b8a02177fe6e4a5092868d9ff9f6df2d16fe473170cf564db03d1fa3d5df6be2b
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
index d962b2203d14..945f0f2ad5a4 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
new file mode 100644
index 000000000000..cebd949d705e
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index c0fca7e4a702..58738b034ac1 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,7 +1,3 @@
-DIST doit-0.34.2.tar.gz 1449767 BLAKE2B c7d81144da99147dbc6bf7d670b6f411879a8080e405866866bc97ae4701d9a47a3d4882db9672e2e36bc8af577ba9632da1fb4ed2c9f87717f719ac1cd53d34 SHA512 24afc8078fef42a446733554c6ab63298ee5bb734381fc2bfc9d623dc98394916a1f89a18bb28e7ef862da8c0449b5cf16d605295e8948a0ea6968a231a1c8e2
-DIST doit-0.35.0.tar.gz 1451502 BLAKE2B db0c1c9245897ca9c4ce4d3f5f43e5f2e5035c36cc4bd15e63d6fb9e69992b5068ca24839a02485680cdc75ba62cb95f139f6fd0ec24c1f26fd4c4b2e4fce27e SHA512 3eb3fc0284c4779db47c56c9e21bda16e31d053214f4a0272c1a26c9fd26bc0de7d00601bb08a79a3d0ed403464e773c03fe93d0fcd9ee59812c396e0f4ed7e6
 DIST doit-0.36.0.tar.gz 1448096 BLAKE2B 15558a39ccac031ddf3a429aa585bc6e1d49c2e7572df29979ca66d1025fa5d7a917f6cc5bcfd21f2749e4ed7e7885b0865ec67b6fa32817e1518d47da9ead97 SHA512 d4caa31701755c7f59213dde0f89fd3616c0c01b7f06245cbfd9f1a315d503e62f3556c3b86685cd0ebfcffcc9cae0987ca150f037aa7b3cd960439a1191be42
-EBUILD doit-0.34.2.ebuild 1340 BLAKE2B b5b5cf0fa9ad50fa1fae8ace420c6b02f3c486930350eaed8c6acb2d5b855577305df0126bfaa906c104a97a19e65ad2fe8ed60b3b44b803376d6b6f45cb6132 SHA512 b26083148144f940816fc29d7836687e78f1f413e0f662643fc750f3325c1719309139055f0a31facfd7406ca6b266bf8184cb2bed950d50a70054f32f24e213
-EBUILD doit-0.35.0.ebuild 1298 BLAKE2B 246f2ffa4f014927979dcb2630c7392f1720137260c7b5ecd79d107f7b1b29d21cc7a50f97c9e14bb4d50730f507c2a65e2a8bf69cd9b53292ca0ef796136f38 SHA512 ea121ef56d6305f16e067784c13c35b45617efcead0d6420c7e82846a12f389a61e5c9e736bacb2759f66fe059232e74b0395c750fe5ce94a26fec2f4807454c
-EBUILD doit-0.36.0.ebuild 1332 BLAKE2B 41ad8e5f03fb4b087ba8afe76bae952b95e69985d3f47d599494f4f6fe7e70569861ba637de81f11866a60f8e8f73aab0c4ccfb42c7a904c78026e9e2d6dd76f SHA512 738a3bcf25649190f8d9c05fd95100b098822284d68d3a29af22cfbf5b9b2a5a6ab72338241971f8e37b00fc84f36aa1f1d5060444d378ea00751577ae07536b
+EBUILD doit-0.36.0.ebuild 1330 BLAKE2B a631c3a8cd32f64266d4103ca76692f2852ffa6f44c4a9e017e8279df6712363027f805a079080b3d2ff3c2a7d3100b1b33bb46dd9f28cb603e8212a48905d1d SHA512 519f1d1b6e1e587f06e6122d8334a34096929fa4ab557e560cd516d8d1b3a8fd7eb5f2b3b8df1f189877a8e4acf45bed969b65861f1785045e32baec4778d13d
 MISC metadata.xml 568 BLAKE2B add52a6e7986bb88b9dc87d2f03c4ec3716ae7d5e2402556b7a3137b8267ca2cad0ae3324d628f3127afde36513414029c0f567a9683dd9b11b1a287ff5e3a7d SHA512 e772c9ccd8133fd73dcf04733facf60ef7c2f1559b83e5024faeea4d5fd7799c42a28be6c9b8676ea9b6d68969ca5be633320e8cb7dd8d1f0dca35e819eaebc7
diff --git a/dev-python/doit/doit-0.34.2.ebuild b/dev-python/doit/doit-0.34.2.ebuild
deleted file mode 100644
index 7e2072aec798..000000000000
--- a/dev-python/doit/doit-0.34.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	|| (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		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
-
-EPYTEST_DESELECT=(
-	# test failing due to impact on PATH run in a sandbox
-	tests/test_cmd_strace.py::TestCmdStrace::test_target
-)
-
-src_prepare() {
-	# Replace custom theme with builtin for documentation
-	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp bash_completion_doit ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins zsh_completion_doit _${PN}
-}
diff --git a/dev-python/doit/doit-0.35.0.ebuild b/dev-python/doit/doit-0.35.0.ebuild
deleted file mode 100644
index 23acc79d9cb6..000000000000
--- a/dev-python/doit/doit-0.35.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	|| (
-		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pyflakes[${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
-
-EPYTEST_DESELECT=(
-	# test failing due to impact on PATH run in a sandbox
-	tests/test_cmd_strace.py::TestCmdStrace::test_target
-)
-
-src_prepare() {
-	# Replace custom theme with builtin for documentation
-	sed -e '/html_theme/s/press/sphinx_rtd_theme/' -i doc/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp bash_completion_doit ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins zsh_completion_doit _${PN}
-}
diff --git a/dev-python/doit/doit-0.36.0.ebuild b/dev-python/doit/doit-0.36.0.ebuild
index e705518faed6..689baad9e7a2 100644
--- a/dev-python/doit/doit-0.36.0.ebuild
+++ b/dev-python/doit/doit-0.36.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 9860a702cd86..191528da9ccd 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,3 +1,4 @@
 DIST dominate-2.6.0.tar.gz 35034 BLAKE2B f3a7aba630e925874da7387a1eed7ca15c353cb6464971d73e86eb259cbabad8b7736a0240d5c1578f84dc828f1ad6cd2e404c323dab9c0305031115e450944e SHA512 1bb690d05a290753cabac045160500717eda8c7610ce88d2b88a490abaa64b2cdb07067c433fa6a27110ec6cb67d884d335663217391e61215ac8eb30003d8e6
+EBUILD dominate-2.6.0-r1.ebuild 477 BLAKE2B 22fcba4261adb0e532ab6269403a0b2026ba0b0e26630527eb16901f4a656052c01a0896e8146d6e106af0fc3b4fb1c195a9cf226aa69ed008a5fee703baf342 SHA512 c8a62e7ae75e7a6aff57eb6fd89e187bcb008ed674614c6dbcc813f288dcbaa8fe69f6941593053b0a28edc934185da5cdf50dae9244f191289b234858e094d4
 EBUILD dominate-2.6.0.ebuild 443 BLAKE2B ff5566b324d7313a2f4dcde6801edd582b2ad07e159b3fff357d15ec5c7b9108925967d815e6f152bf23dbbfbcee3be2a9e3b2626e6f2846e7a2f8bea602748c SHA512 4fc24d1f96394890b040e3329727059fd90bae8564efd83eb1aa7f27fc44e95936b843c79531b31cc778608f84eaf503afa19b1a5a985d7185d49ba118d05c28
 MISC metadata.xml 796 BLAKE2B a6b8a73d12e14552aed0f4b4f2a4b5ff282829d44da6a3e283a04575bc31069d5e83a0f475d184896c586b416882507fa22ccfb346aec90692a47f28ea54646c SHA512 9a018dd4858f7a89ac7cfd8b1814df9bb24ebe9e811f0f98e2fe52f047b14bf742648de9c0e4ce55ff69434755d8b365297bd41a5909c63697eed925e1a30b03
diff --git a/dev-python/dominate/dominate-2.6.0-r1.ebuild b/dev-python/dominate/dominate-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..a6f3d3645536
--- /dev/null
+++ b/dev-python/dominate/dominate-2.6.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for creating and manipulating HTML documents using an elegant DOM API"
+HOMEPAGE="https://github.com/Knio/dominate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
deleted file mode 100644
index ade892f61b27..000000000000
--- a/dev-python/drf-yasg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST drf-yasg-1.20.0.tar.gz 1800321 BLAKE2B 3db8b0b33c2919d4a331b06b1f6e324ce6e0e160c0454cb066e61cbf7bb580efadb5cd9624579492db3404edcc8e50753e63b6edae022842cd087b820779557d SHA512 b56cd00d7a09f197e95c0129e20e561ece783b4edb389b228027ab8768247ccba15db5768f52a3d5ac5a4c47faa7a447ed7eb9b22af2a21377a36dcb7e7b267f
-EBUILD drf-yasg-1.20.0.ebuild 946 BLAKE2B da0987843266c6da7b7f425f5e14cc5f70fe16ec254063879d10ada8b1e17343730ee0aea3d96ce94464c62b99046db1015213de7f2997c185f046d4db9658ee SHA512 69704ea4e7290e6d38a663598015991466af431b778aa38dc3b6ca0039eaab59955d17f84acce0e5a64cb6ffa76fc9838b97960c279de0572a1552527328c94d
-MISC metadata.xml 411 BLAKE2B a166990df10a1a15f98b3dc4ec418785154297056fb41d635c0778ba76ac6262ad913deb614a4cbb08cf79aa4c13cc57e0aadede509963e897ae822d1ac2ef30 SHA512 c25b4ac9e2690096b5c219329cb44147d8fd8631b39652456cb336d8d9b544855b8ec49407be9d15e7efb331341f5929653ef14a7d84bd808c5f62a03f46a0fa
diff --git a/dev-python/drf-yasg/drf-yasg-1.20.0.ebuild b/dev-python/drf-yasg/drf-yasg-1.20.0.ebuild
deleted file mode 100644
index d72f426f74b4..000000000000
--- a/dev-python/drf-yasg/drf-yasg-1.20.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Automated generation of Swagger/OpenAPI 2.0 schemas from Django Rest framework"
-HOMEPAGE="https://github.com/axnsan12/drf-yasg"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+validation"
-
-RDEPEND="
-	>=dev-python/coreapi-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/coreschema-0.0.4[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.34[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging
-	>=dev-python/djangorestframework-3.8[${PYTHON_USEDEP}]
-	>=dev-python/django-1.11.7[${PYTHON_USEDEP}]
-	validation? ( >=dev-python/swagger-spec-validator-2.1.0[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}"
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
deleted file mode 100644
index 872e1cf1181f..000000000000
--- a/dev-python/drf-yasg/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="validation">
-			Enable swagger spec validation using swagger-spec-validator
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">drf-yasg</remote-id>
-		<remote-id type="github">axnsan12/drf-yasg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 7a3b2f25e282..274fb986c6a4 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,3 +1,3 @@
-DIST dulwich-0.20.35.tar.gz 420972 BLAKE2B 97c877554199aa8f3abf2f95a43c350cbef784f6f71af6280c537a93297c89981190fe1f66914532641a99cc3dca82a33b43d09f864f2ddf370c0097fa28a5e0 SHA512 23c272153547e0ef25a0e7d2deb64987e5d503545775e7d6f438ae09366c0037686eba1027d38a9dbf042bd1553eeb25ccdc818bdd785a2edf2cd3688f0b1271
-EBUILD dulwich-0.20.35.ebuild 1643 BLAKE2B dcf392446c6417fc8d1b1951d311997dc601129346ed3a249348398778fd004dcadc22b55d75721843da31b9d057dc6ffca59464f16d5ec6f319e74b8b1d2bd3 SHA512 b634593517c849ba21a708bafdc8d3ef63931338ee14029cd54bc8c5484bb23987cf847bfba38b7e522b0e5eac8f672955e9bbe227f163d2221d9e11c7795db8
+DIST dulwich-0.20.43.tar.gz 423604 BLAKE2B e8f6b3fc22ac2289e6529d862f54d8c407725c8d22ba9ee7ddb0d700b4ea617f8b069b14168c43c25cccf6e84592e63f88d3402e58b15413952e5b139bda2c2b SHA512 68ef6e3928a202d76ab882d764d08f8948743825b3b07950a81bd86522c9db6865260c2c725a08b26365719e99343daa1c2a2d242bafe991be2552d06b2e3684
+EBUILD dulwich-0.20.43.ebuild 1644 BLAKE2B c27c433faf91999c3a52391cde1bd690c19edaf77b12f5b7fbccb9c5c9c52f2cd7ff0bb1ee162991738ff46d8ab892b10d4590c3b2f6f0aa653b04a2dcbfdd0a SHA512 bd78b84c26d625706bffcecd4fa3cb187746392df0366f4107262628034dbbe7095ea9a54fc9d826acaa8ce315c7c5ec33d62a5b7c2e85d58c77d75504caeea6
 MISC metadata.xml 556 BLAKE2B 240554ff522160e9508bf6debadafcc44b5ccc4074dd4c9d3ce82358963084c60a1afae9fafee6ab1e6e5d898940ccb4d1b524cebff155e61bf6707c9396b647 SHA512 a7cdca224a01d5bd26bf4a5adb0273977ddff61f75cd02f5642132656fd0c6608114617efcb068d834f107804666cf4fb3725967e804b73d2ddcb67342dc30de
diff --git a/dev-python/dulwich/dulwich-0.20.35.ebuild b/dev-python/dulwich/dulwich-0.20.35.ebuild
deleted file mode 100644
index 8679a9d972dd..000000000000
--- a/dev-python/dulwich/dulwich-0.20.35.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/jelmer/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 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? ( !s390? (
-			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/dulwich/dulwich-0.20.43.ebuild b/dev-python/dulwich/dulwich-0.20.43.ebuild
new file mode 100644
index 000000000000..8d39b956a1f3
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.20.43.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="
+	https://github.com/jelmer/dulwich/
+	https://pypi.org/project/dulwich/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 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? ( !s390? (
+			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/easy-thumbnails/Manifest b/dev-python/easy-thumbnails/Manifest
index 1f37d32fe9c5..386e06708c53 100644
--- a/dev-python/easy-thumbnails/Manifest
+++ b/dev-python/easy-thumbnails/Manifest
@@ -1,5 +1,3 @@
 DIST easy-thumbnails-2.8.1.tar.gz 76527 BLAKE2B 1db0b229c90546e162d9691c768d09133218604cb27a4472b017d286f776e2898be232f3b0750e8b833a2746111d22da732c981a8a72986611b0fcf8c0f41ad9 SHA512 26ab9d41d7fa6adbec1cf78b92371e70bf44d20bf2f164016551d6d1bcbcbb190550ecbd8f177e83f3ee677fb3d921e0a411b49fe4d85202b70b6f441d43d247
-DIST easy-thumbnails-2.8.tar.gz 77729 BLAKE2B 6e205acc0af9f962f08eb6ec61eeae38f7a90b7b87cdec9e111b877b3fbbe051e1cf7c2b212ffdd41e79e4ffd9f205a783f1fc13010f7cf737fe640e8b974003 SHA512 69f4805b7331236ed37ade1098f0aa6ef92c6664e84e09073efc4c8d761ac548540058cc4dde7f0bab362b7b3a372bd46119a053df9838821f62641baf6c39b8
 EBUILD easy-thumbnails-2.8.1.ebuild 857 BLAKE2B e52e81340fddf1fb54ba74896596321b38aa2366fb630878eda6b2ec811af0aceac7a9be41d41c0e04c7690cc2ae699dc439f069ba732e2338a7223162e70066 SHA512 26e6f3da2ebf3895d653607df33285dc7eb3237d4cc8d0f40206fd0f71c5ae2ee57425bfc1039aad1f7b57e7939beaf369879e5368aaee06a2f9d9bd2bbe4e97
-EBUILD easy-thumbnails-2.8.ebuild 857 BLAKE2B fe0b75fb496e57a9b8201ae90322dbf7171c4bfb416f672debd590f933f52c3bb0cc0e6c8b68b37bf2235d946376ed8148799eeba09c33693abe8ca298e426b6 SHA512 f7b1f6054ca8586a8455b736f0a44df23dc059565520614a29652eadb2f2a7b482b2419f6a81092b081524374175c03fb98d4fa3e3387ae6335a2c8cdfdfdc6e
 MISC metadata.xml 329 BLAKE2B 536a9dde0295ceaf8c41282c9ad7703fd44170d075ddcbfbbf291b4df19d3a5b5896e18f57e4dd9680fb3af7cb4a5c18b375d25eaab6c7a22a21b73de8d91df7 SHA512 19340ba2f684d03da8660d77f598873c7c8577590d09862ddd65c544b275030a3fdaa9ce3833627515ce4c9826f9f5eb4d3944b6532d5886da06fdb9ac89e6c2
diff --git a/dev-python/easy-thumbnails/easy-thumbnails-2.8.ebuild b/dev-python/easy-thumbnails/easy-thumbnails-2.8.ebuild
deleted file mode 100644
index f520e1f3eccd..000000000000
--- a/dev-python/easy-thumbnails/easy-thumbnails-2.8.ebuild
+++ /dev/null
@@ -1,37 +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="Easy thumbnails for Django"
-HOMEPAGE="https://pypi.org/project/easy-thumbnails/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/svglib[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=easy_thumbnails.tests.settings
-	local -x PYTHONPATH="${S}"
-	django-admin test -v 2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 17dda795261a..046c00820974 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,3 +1,4 @@
 DIST easyprocess-1.1.tar.gz 13755 BLAKE2B 1d1c0d66e34fbb3ea58736cf4750b5fa48dc6e97d07a568086129fc58ca910d26a383e032dd0030da78235695269da6b7886871e6ef0f0ce7a482275ff2aa0e6 SHA512 fd5d0453cab79bb93806ac0dcef97ba207171c087bc5232f30d6fa210fa479e0dff83bdd7bb5c59d71f65582dcb3dfbf5f25ea2e2ee162d8d5feb8ca8d223a68
+EBUILD easyprocess-1.1-r1.ebuild 878 BLAKE2B d7a85640915ffa7392d499539d648614ebbfda6d5b08ba6545470f4015f5a8c3d9e4956665910a0dc982f5276d5562557ace476c7ab32619937a6baddca09bee SHA512 2fcfb10b48d24ae16614ae05d7b957254f14ae516db29608113e5c7329f17acbd7a0d07a43d59a1939c96fb68f410a87cde5de6be5a5156f6cc90f3c1612a692
 EBUILD easyprocess-1.1.ebuild 845 BLAKE2B 345aabb6e8d4b64b64ebe04698ca81397fa45e4174c1b10d49dbcaaf341f7afc7c0ca1161b7793cd9bb7ef4d7d9d875ef1752a2a754d315df16bd56bc8eb5b7c SHA512 60bd11fc06a8e8ffeda3ef6ef285157dc0b5b19250957daef792b436435d3119fdd94f09594ac9dfb061076c10f25ef9319d13d5fe48cf0558d489975dc633aa
-MISC metadata.xml 414 BLAKE2B cc96af9a5eac716c510f429ee1f47437e23f9a7622975309ef8f6eed0160d12325166919e73af6f15f6af830bfc62b2dbc8a4580c14e001b1a3d305c6b0fedfa SHA512 aa063a7ec44450d83dbc43c6f804f06a04262d6bfe270d61e124c14dbe964c8b2bc926906f826997dcfff054f1d889d6fe8a63e3d653bb37a8287739cbafdbaf
+MISC metadata.xml 515 BLAKE2B 2a50e549d8469cc545b6e4907eb7fe0f8b7e343569c7c1ebea6d042243a032bc8db712c3c6a0d8c91ae8bfbd0138459dc84fefa8dbf280cf76d341b789ed6e6a SHA512 f4df1497cc7c73e2ed39bc5e3e9b253d7b5112ce0ea89614ef2e22961e29df73c3d201fc6258d9d1eb15b5a13b7908dd8412cda6f8f7d2a3e8d75a9cd4a597c9
diff --git a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
new file mode 100644
index 000000000000..c3fa0cf4c6a2
--- /dev/null
+++ b/dev-python/easyprocess/easyprocess-1.1-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+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/metadata.xml b/dev-python/easyprocess/metadata.xml
index d18683c73ca2..5c536274e068 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">EasyProcess</remote-id>
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 810d366435a3..664cd9902f70 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.17.0.tar.gz 158486 BLAKE2B 45a27aaf362853bd39052a78a7f86b6d2fd220c165724b088cc5285977013b354f5373bcf8295258e9121da2fe6a4b79625afbc097cca756c688afbd542f647c SHA512 23acf993ce4f7f832674a3b70ab870c20172816e27adc836d4c6a876e72a488a830895d63ab6af67cc7cbc83c71f7097d0d530bf67d24c84e69e9fa87031f6fd
-EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 0eb720629e5ead98e38863b4809476e78d420fdd047a20cfa76db9f22b5bd3a1cb46f7b5dc442976442e54990b0e83f38e8bcae8d0ebfc3a77f81cc072a87009 SHA512 5e1786dd9ceae6aa8ac90327a25edfb6d9d8e464a886635608029628a8703b985dc46b9a6eaa1305437ff0cb8375ef3b4d25592c0272f55e42c0f5bf16ab5cb8
+EBUILD ecdsa-0.17.0.ebuild 778 BLAKE2B 71ee14deaf7622086379397dd83681ddc8c6cbc86cc0192d9d13ebefeb7e2b130a307375e0a306bb0bf43491216d619c43718358b693caabdda4f2750a70500d SHA512 1cad3382bcba9be8424d0e69dbae70eeb78bb8e52d1e243eca13f725213c7cb768b1c5a470fd6cb6be0d85431d48d0e93fcb97d59f239756e16dedb4160e7670
 MISC metadata.xml 408 BLAKE2B c3ccca8cd48352945025d466f06c143e78923085d82bc219087e1015c3e8219ff5f397739420e588a57a47136da6c4adb905d12fad8d06803b2f33688150b1fc SHA512 12f542d7bf34cf1cd3334cb076490ed04b3a484f0aed3896fd02fd049f371a46f11e078253b3f8d4a3165c8893692e4fcc496b61a9aadbaad570e7f194bee22a
diff --git a/dev-python/ecdsa/ecdsa-0.17.0.ebuild b/dev-python/ecdsa/ecdsa-0.17.0.ebuild
index 783d0153a948..27229ea8df64 100644
--- a/dev-python/ecdsa/ecdsa-0.17.0.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.17.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=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/editables/Manifest b/dev-python/editables/Manifest
index 3eb0d2aa8493..a6bda24e4329 100644
--- a/dev-python/editables/Manifest
+++ b/dev-python/editables/Manifest
@@ -1,5 +1,3 @@
-DIST editables-0.2.gh.tar.gz 6488 BLAKE2B 02c3e0c352effa902306f5c5a7b6b96cae74c8d8f620dabb3fa4df2568c5d730ecf3a078bfdab8ef87bfa29cb95b24563587de361337a8617fa0776b890b35d2 SHA512 39adc72f9710c28853ffebc9c0757f779e948bed7fc32f78bf52bc26ef4a6a5b351bf011bbf9353fc68e6ef2506481927c3558f8fd6650d61ac7a09591566b74
 DIST editables-0.3.gh.tar.gz 12493 BLAKE2B 95e05e7553efa4856ee5bde2c18a2566f1e65318bfc46c8ecd732f4d6b42f10ce54cc3aecc4d53bcfc627e6938c4155d48a39ced5f64395dbafb9187cb009e4f SHA512 493f20d1e6b39f8ed6668adc208723d447a31ae3c3087f7db9a9a0de617958e8afebd3b3a1836638f749fb0ec911e51256b727deb4c0ce08327356238df0a3f3
-EBUILD editables-0.2.ebuild 568 BLAKE2B 51160c02b9a46214fff0a3dd91ddff0b1fefd36eebb2830039964723220f9b6e8e4f6a2bc56a357aec08be69f587268640f0e2ff72052eaae00e48a686a31e71 SHA512 51749b1b946693f1be07d9f1e7968730949f4fcca82779595c81d5b23ce2b7e70c9d4f795d9579dfbddb126261a715e40c34aed2f7f116c865bdf590f549c3a7
-EBUILD editables-0.3.ebuild 598 BLAKE2B 2e8e413e1793f76162de850af481d085645f3c69b1fbaa4c24c24ebd1cd7adf795fcb288b90c933b1cb0627ef4bc3ed1d7ff194fb729299b3f8a8039782f3216 SHA512 4de8dabe84c25fd0f32661f43e970b9eaf8a4bf6d3eb2d0345b00a238012a8301992aa0a07e17bf979b29891103ca66ce7bf6124a4ad0c8c3ece57d61a2aa1db
+EBUILD editables-0.3.ebuild 590 BLAKE2B 9d3b7b4fb4b83cafc3a89b1f3b8be75170d24bc5271e53814fa268c4e4d9143223740dde5383a1390d6d3f50f2eda230f97e42206545d046fd53921543720701 SHA512 ce121961b2e01df1e14d9200d3596808fc7bdd91f79d9b36c375e419b998f27732592b0d891eb32de4eef7e6f0bc3ec9b5c8e79d91b8b77a7503fab091759288
 MISC metadata.xml 348 BLAKE2B 6f17488b4dc6b5892f0826c49a22220cb85a739b7a9f85542af4c085d20322b3b38110c030471a96af9cbfeffe19061382ecaf506dddd394e3c2dd9304b1f8db SHA512 4f8cb5b90c329f8ba3bd9dee1c8195b96798a5d5106b870950aaf1597c8ea47b21a935de1b3af114015fde6c416db0883e4d039d90c5afccdd7346cdbc75a288
diff --git a/dev-python/editables/editables-0.2.ebuild b/dev-python/editables/editables-0.2.ebuild
deleted file mode 100644
index 461efde3e570..000000000000
--- a/dev-python/editables/editables-0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for creating 'editable wheels'"
-HOMEPAGE="
-	https://pypi.org/project/editables/
-	https://github.com/pfmoore/editables/
-"
-SRC_URI="
-	https://github.com/mgorny/editables/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-distutils_enable_tests pytest
diff --git a/dev-python/editables/editables-0.3.ebuild b/dev-python/editables/editables-0.3.ebuild
index a527215c94c5..74f78fae3d13 100644
--- a/dev-python/editables/editables-0.3.ebuild
+++ b/dev-python/editables/editables-0.3.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 1c49c0219a58..3449a0fc1b8c 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,3 @@
-DIST elementpath-2.5.0.gh.tar.gz 263680 BLAKE2B 50ecea0766ddad4239b9283b223e945ae12fabf51bc246bb672517d04912b07cc2d46c1f04ff74f7f6da44d7dc422cde0c38a1f25a1f61068390dbfcc5ad58c4 SHA512 bbc6ce6a6a3eb3312d53be6040b8f4676f460e76de9b476410a3170734410b7a3d61c53081633d39089def05c74446d26abe093f02b9686a595cdb6e10440047
-DIST elementpath-2.5.1.gh.tar.gz 263727 BLAKE2B adfc3727c8afe691ba09e143249779ca3f0cee2fd743963b013d790215b30650eecbe2c924a026c07f9018a23710a0ade6e83567103d8eeffd85a71d398b7c77 SHA512 35c272a9f3dc2ddb1ab6b1aaa67588c1e3fcc5765a2edfd4dae47346b7b45f209b38a501a24f0c37b5ca0d933928c13b8608f33a2aadc57e1e4eeb928a491ab8
-EBUILD elementpath-2.5.0.ebuild 726 BLAKE2B 96edd50198ab1a99a3f3869f11bed75367e43b5f98ee6f6a7ab6cd15cc4c905ae4bd2f7969c6fbd4559ad575432916aaf2b0851ff7840794270aec71957c772a SHA512 35a320f817107369f41e7c4f998b67dd680b255703b948651ed0f18bf3292ca87c37a8c7bc024e294407939de88d46a158db7af38c11f7218db43349f47554ad
-EBUILD elementpath-2.5.1.ebuild 887 BLAKE2B d6fdb266cd3ef53a0d87b7dc2234c0bb0c827705cb1d7616ee1d80aec2baf87c072963de71b365412e73f50d190eb21058bd3f8f58954c3a33b129fc9a9bb743 SHA512 92aedea0fedcc6bb46441ff00e9818d2664a88b614e5c9a3675709f5730f822346a669de9f32b46b77f8d0e9986771fbf039ed882ef0430f5b63b41bf76545b0
+DIST elementpath-2.5.3.gh.tar.gz 264387 BLAKE2B a0904e95675570783f2f8bf854490a3f424d6ce0fa85e3c2030483e9c31af4a5eaaf727db6423e17a402f55e7d42b0625a5183b543f886ec8b12426eb0e57a57 SHA512 da561446ac3a059c60480084648ebc1190d0ec1dc495dfa128dc2598d5762ae1067f39be36fc6bca466e6785aae80edf6dc1415a2885bfbb2d54b97ca6611572
+EBUILD elementpath-2.5.3.ebuild 879 BLAKE2B d492c16c74b8ec9c8742b458ceb1c1a13ef8ebec05ab47c9c52b180ffaab0839f1440157169a3c519f899487f40bc83777e65b3f90e49591548c6d6a1041ec03 SHA512 821006590374a1810988d1b0f3c1f18e5862c1803551ee6cb1167fc1d57d0553a1c946d43186367c889b891ce50236f290c269334b0f974c6a10969b802654ee
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-2.5.0.ebuild b/dev-python/elementpath/elementpath-2.5.0.ebuild
deleted file mode 100644
index d229211835c1..000000000000
--- a/dev-python/elementpath/elementpath-2.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/"
-SRC_URI="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.5.1.ebuild b/dev-python/elementpath/elementpath-2.5.1.ebuild
deleted file mode 100644
index 44481bdc806a..000000000000
--- a/dev-python/elementpath/elementpath-2.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="
-	https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/
-"
-SRC_URI="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fails for some reason, more fit for upstream testing anyway
-	rm tests/test_typing.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/elementpath/elementpath-2.5.3.ebuild b/dev-python/elementpath/elementpath-2.5.3.ebuild
new file mode 100644
index 000000000000..b2549ad77f12
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.5.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="
+	https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/
+"
+SRC_URI="
+	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fails for some reason, more fit for upstream testing anyway
+	rm tests/test_typing.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 0a28cca3037f..8cb01ef43cf3 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,5 +1,3 @@
-DIST emcee-3.1.1.tar.gz 2868516 BLAKE2B 62f3fa2a963a256a9b807d648ca370461f2dce1c186f0fc0f7c191dbd1e1a840c58ad17022c8ef4c80e925c20405ddd2ee87d9f448f20a6f2a3976c3b7584aa2 SHA512 f824831f7a6661d69af3be26a6cccc41d582ec5a9a6301d2bcb0622412832498c047738249087ba9686c430cc7b3d5a8a9c1db3bb78202f7d31ff6f5205f40a8
 DIST emcee-3.1.2.tar.gz 2868985 BLAKE2B 8da142b7be3d4c5f2ab93081d27d7105e312f2ca9702c0f57b8aaf6cf98e4dfae141fc24342bb9c30049d4de747b4d744f689dbb1be780519c426ef343d73485 SHA512 11e4e6f90a3f039c8459963217d0699a953f23aff2ffc67e7da3696926dcf915fdb1f4bd3781b88cbab6f664c38cec50b3470316aa6ec49b0e617218e2a7b95d
-EBUILD emcee-3.1.1.ebuild 794 BLAKE2B 6ceeb5a000b67096cf888209aa364ba0595c8e95eca54531784f8016115ce2be45e61c8addebd788dd0b3a33d19159c13bb3e298a8885664c30cac7823bb6de0 SHA512 0c2501b13335feef98db7348edeb57e4f87c10a0cd0ddad7720b6add080372ff13502c675b40e15ed346eee4ab4a27aaf86262ea991f14d58fc6c668217a3510
 EBUILD emcee-3.1.2.ebuild 896 BLAKE2B b7ce8e5a2e40888d38d0f0d7bbcb1da1308ce26a4801334417c1ef1812c05c14b3e30850c1c0fc7d82bcaf4662f721ebc9696c51b1f42a26b1bf5ec90caeeb94 SHA512 86ef4370aac141cef8fb5acda92deb0413a0db51cc5b0717c0970a96fd98101db3aa798b84a4d17129d3aba899324f10eea7019f835766f2bcff208d45839415
-MISC metadata.xml 866 BLAKE2B 3773058b1fe783e641ae4ab53204b5b5d2a89f3a4a6a544ee5ddcc128f5dca7f977d7815dc008348c644afa86d32118a1f28b25a18f88c44ac6fc2bf7bd70420 SHA512 62b43f5c9cbfd2d2cba76c5cacaefd16ea10239a9a681dc42fa90b796750afd6ff5e36b2bb1b054886a51953da7e200e50a12abdbb38cc76dbbe8f84da45db13
+MISC metadata.xml 973 BLAKE2B b8ddf2eed9f24b9b7b3f4f970e6e41702d53a71e78ecb5c3be381102a9948fedf0ce14fb75147a2de07f43b000c732512a9e2ed3d1179e666c3aa91c27ae553a SHA512 3fbb8aa55d96b2eea99805d037f280cb570324f0750895c206abe2c4d1120ffb8818cb302c61a1f44dc2566e3cd783a927a1f1200cf321622181232033f83e39
diff --git a/dev-python/emcee/emcee-3.1.1.ebuild b/dev-python/emcee/emcee-3.1.1.ebuild
deleted file mode 100644
index 36f8e19a6b26..000000000000
--- a/dev-python/emcee/emcee-3.1.1.ebuild
+++ /dev/null
@@ -1,37 +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 ensemble sampling toolkit for affine-invariant MCMC"
-HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS.rst README.rst )
-
-src_prepare() {
-	# unnecessary dep
-	sed -i -e '/wheel/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/emcee/metadata.xml b/dev-python/emcee/metadata.xml
index 1c34dce72737..c3638f37b6a6 100644
--- a/dev-python/emcee/metadata.xml
+++ b/dev-python/emcee/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   This provides a set of sparse matrix types for Python, with modules
   which implement:
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index e364a50852c8..9246110561dd 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,7 +1,3 @@
-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
 DIST emoji-1.7.0.gh.tar.gz 217487 BLAKE2B 8b78e73604769bb6d5d0882a44ae8d9b6ca9de0d5fe0d4b0077cbc4a89949d4ece578de19de5b2db18c6f630dfe0adb5d9554874ce382d5624d9cf95c024ebcc SHA512 837e97cb80c15e980329e25e9fe2960063bb59e410ceb564abf95b90f7f2251e37092b701524a5b14dd7c4bd530a08b69f77bc8e4b7e53c6b8c5898ec384fc5a
-EBUILD emoji-1.6.1.ebuild 414 BLAKE2B 0f4e67d25cba9bedc58c8d0f1dc2826452a693757bd52fd62627ead75714fb62e7fccb5d875c335c6b45506504373c7a750b91d0406d8b5f4a00d616dc799510 SHA512 691116ad35cb26b1b62f9aaebb704730becc6c4851982ddc9272697951e9e012a7654caec96a1d8693793afa4cb6f988cbd1549f43087d66e313cac7bc2a853b
-EBUILD emoji-1.6.3.ebuild 422 BLAKE2B 0ab5acfeee7a1a6d6ad834dcd61eb482b733cf3a5ecd8ab594ec190bd916526be2db717b090a04715c0a0177c6e9aea8fcd834da76897eff5f0922f91b0bbbfd SHA512 3502a9ea536c20a37569e828ad51bb02f64f9538029c2f5798c7e6f9cbccbde037f479cf2ad8a8837e4a77847687ea7c7b9dea20afa179ea3e725cc6a1838794
 EBUILD emoji-1.7.0.ebuild 454 BLAKE2B 73ee3840b074cde9f411631d89e1252a2b46ddfde9b0bd5168ef37976623b2d76fb833e8b124ff8f44a62b21e02c527966048948b99875822488da9958650d59 SHA512 94df76eb4aae38995fc38373253aa43d20c5aa4887a69445f6e242e8c0545aa88c36d7f30ac0ca29c526c420bac1dd3a7a1736d2ae1f2c9d24fb844e254c4c13
-MISC metadata.xml 396 BLAKE2B 65f441554017bf19380e2309b4fa34926968ae4734961ec9c0f551d64e801c2ff05ccf89a35125870df499b63dfb4d04d092f2f236bc91f01eecadc7d0a90f72 SHA512 0c4f1b15a3f1aa4394f7f5d6ee12e48fa10344fe9b97b6253437556e95bb9b938bcf3158e07193fd66d722d38c927cc2013eed4da0a7ea2d50076edbf439bb38
+MISC metadata.xml 497 BLAKE2B 9aed8cad26be7f372b19349aeae8e7916b75444e32f0d60e589ae27fb324d0cbab86cfb827ce6cfd1f9002338a7bed44f7ed297e64199af0a00c6d5e07fa992b SHA512 e938bbe18a83243acc1d2614100282b913115fa7f91ad30f05833fbe73f711ef80b14e974c8c0e0c03454c216145e8f7d10c4a952a609486a3da95cf72756208
diff --git a/dev-python/emoji/emoji-1.6.1.ebuild b/dev-python/emoji/emoji-1.6.1.ebuild
deleted file mode 100644
index d9c3bbe594f7..000000000000
--- a/dev-python/emoji/emoji-1.6.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="https://github.com/carpedm20/emoji/"
-SRC_URI="https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-1.6.3.ebuild b/dev-python/emoji/emoji-1.6.3.ebuild
deleted file mode 100644
index 8a6767f47b45..000000000000
--- a/dev-python/emoji/emoji-1.6.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/emoji/metadata.xml b/dev-python/emoji/metadata.xml
index ca78884512d6..111b1ea2a793 100644
--- a/dev-python/emoji/metadata.xml
+++ b/dev-python/emoji/metadata.xml
@@ -5,6 +5,10 @@
 		<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">emoji</remote-id>
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index dc2843ebc861..16a7819e6d93 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,3 +1,3 @@
 DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
-EBUILD empy-3.3.4-r1.ebuild 894 BLAKE2B 1f7072a5287c6a01cf02c4deea1ced7b0029938ce7a969731d18055fdf621b6bdffc126199832b256d29a590d6af2e7e5958b0fbee655f794116aa4baeffe948 SHA512 e2b78564e5aabe568f36928e0901a362afbfef39d6332a2b80ac6be71a5dd652d55066023c2759b7415406f6975d1f67e8cc6f3cd8fc120b06d8e3263a1b5c9f
+EBUILD empy-3.3.4-r1.ebuild 894 BLAKE2B 0c740966e3d56f8c1ebcd0553f20e3b1e173944bab2bf90e11453f42e690dc18c51eb571aca2509370f54eaf33497c18877fc41e4e73ed770f94c24976817ed8 SHA512 a4010af4704d1c2df917927c906475c9af3fa37c92343fac303e9ebfd9f46d060a94d14584bcfcf8db76a1621b853b5f38a1cd4d9e1776511ff38d593984aceb
 MISC metadata.xml 332 BLAKE2B 2235ddd41b38b6448ebc674a4575add6145e50d3f90d67047bf87db70ead40a03e1bc4579e337d644894a98eedd4321eb97c1c448d1b353570286a657b3e3e58 SHA512 9d0195de347c8711a56d77f3f0aa95cfb8078befe3a396250b6a56d83829e7948283d74170bcf78526ab6d00e514201b767af185ea77e7e82000c335b4ab1ce7
diff --git a/dev-python/empy/empy-3.3.4-r1.ebuild b/dev-python/empy/empy-3.3.4-r1.ebuild
index fd3154a6fae0..ba76d95d2b05 100644
--- a/dev-python/empy/empy-3.3.4-r1.ebuild
+++ b/dev-python/empy/empy-3.3.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest
index 10d352fdf9eb..c6edc4e17ffb 100644
--- a/dev-python/enrich/Manifest
+++ b/dev-python/enrich/Manifest
@@ -1,6 +1,3 @@
-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-r1.ebuild 580 BLAKE2B 1739d327f40151fbd2394cdd2b85da8f6e6872c8fe191d6afe1dadbfe96e93a27041fc63330644fde4557c4499237f651981b7e80bf43289f57412f0da5d5dd6 SHA512 06606011498267c343c603d672fb8720fc790774a7f03c56d32e0fe57de09db6c8febfe766f18a0e1cc1ce0c5f82abd22a1cd285a17f7e64068148d8cc610943
-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.6.ebuild b/dev-python/enrich/enrich-1.2.6.ebuild
deleted file mode 100644
index 14f0c9fa5034..000000000000
--- a/dev-python/enrich/enrich-1.2.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="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/enrich/enrich-1.2.7.ebuild b/dev-python/enrich/enrich-1.2.7.ebuild
deleted file mode 100644
index 73f0bf42970e..000000000000
--- a/dev-python/enrich/enrich-1.2.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 94a49697364b..2437d1779388 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,3 +1,7 @@
+AUX entrypoint2-1.0-python311.patch 466 BLAKE2B d76fa430c43bae2b9bcdca43fbb2e113aa5b6d98cc49d36d8054f75f60ab9d1b3ffe70c452aa1036aece49a20256d04993fabceaacf7d19d0b2a2091302fa0b6 SHA512 018d609dac2213de22f63dbeff2d4de5d6f30301ab867898cfa4ae1753d51bf56fd005cfb565dd855214dd50117abb83b3beeca86cf24173e8d53cdc16d044de
 DIST entrypoint2-1.0.tar.gz 15424 BLAKE2B 1270a35218cde90922fe8f675917545f4c43e5ec0effd632583cd0bd02200d6a453716787c222722cec633bcb108c1b8c26e284e9659e754d3bc6a77895a6042 SHA512 6580dbf19482af95cbccad61b6f6dc73c068ac78d166e2cea4fae54243921e577316d38e204ad5983f0f52d898d67a10f4c90332d4eeaff1ea713bfc82c70890
+DIST entrypoint2-1.1.gh.tar.gz 15480 BLAKE2B e9a834b863e624971266b78fed75ce2621511f7529f88e4950803c8978a1e27e81585751c25eab82aa1507b6abf8500b11e6ab7ec80052ccd31bec16bf3ed790 SHA512 807b8a53cc5c3e88de971c624dc69b3d526637d84856a0a67fdf2d15c51224cb5c48a7614eaa1942783ce2e954791a86f5ae6eb4dbf1a6e7928161e2cc8f293d
+EBUILD entrypoint2-1.0-r1.ebuild 643 BLAKE2B 348ae58117519fe3527e61658ef1ed01023d6323546bef605d52c4f8c8c42e3e29dda9f5c289f2a5e711c60e2febb535672b05ffbe78587ed05f2830055907e6 SHA512 7d672fb9fb326d943aeed998475dab878b7e6dcc2a1678103f1e557bb7f4d015d37c0281ac1eab41f8c1f926e956c5b4d0b9b7f7999fae678c2e63f2190f53d2
 EBUILD entrypoint2-1.0.ebuild 592 BLAKE2B 56774389749453c8dd3c6e5c9945ba1ead88d847c6109ebd48a279e6dc9376c4024c9de95d11c5cd0f500a0864d173606349da749e6caef374ccc1578dba3cb1 SHA512 247684b92b7fc39fbd875252c288c3d2ad86bc5cf1dfa78f6c7755f47315f38280d1545e2b73d9751c6348c65a37879982bfe185a4f6bce33a31d7a6aebb3eae
-MISC metadata.xml 414 BLAKE2B bea9fe2fb1b8a02da23f0595f6ab285004a4984bde5011194d303dedec9e81f0278d1cec0c52615c3d9d53e1c8f26021f57c6efc9b8c2ec7c305b45acb6a0374 SHA512 6bf3e973e157b5d1171029fe63298e22d3ad20d3d7fbc47d66eec28b47da56a307def11223ba8013e016fc3dc07a3f9325976b0c7b9a25ce61611279134445a4
+EBUILD entrypoint2-1.1.ebuild 602 BLAKE2B dc295648ca53fee2ded8714c623b9b8c3f3ea136bfa8b8f9daab82f36d2b8637ca0b23e1d112c064ac721591cdf9bc6c8b197db3219ef3b18298a8e0ecd67d77 SHA512 85acc53648a6abf9754dace0d5ca390dc9bce488feca3b7de1595b32aea55bd334a8b4a0c57d3dfa88988486b732402cbfab92812bf2d8b2458925f36a31202f
+MISC metadata.xml 515 BLAKE2B 279d972e521c49268b271ad35d6b80044d6c9d6a9c24e9085b324eb68da37d7f5c5b961c13c97faeb2c3ca8d70653ec9047fa6223e5ac00c2c957bd831999dd8 SHA512 9f98b97da54d43c97e892ed3731ac30d1d44007af0bc097c69303a297f55283f7a3d5c92f38161f4c5c9306b7b6dd996856d0fa009559b5f050f3e11009162e9
diff --git a/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild b/dev-python/entrypoint2/entrypoint2-1.0-r1.ebuild
new file mode 100644
index 000000000000..758a23521d24
--- /dev/null
+++ b/dev-python/entrypoint2/entrypoint2-1.0-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use command-line interface for python modules"
+HOMEPAGE="https://github.com/ponty/entrypoint2"
+SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/easyprocess[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python311.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/entrypoint2-1.1.ebuild b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
new file mode 100644
index 000000000000..0ad7d18b4367
--- /dev/null
+++ b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use command-line interface for python modules"
+HOMEPAGE="https://github.com/ponty/entrypoint2"
+SRC_URI="
+	https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/easyprocess[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch b/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
new file mode 100644
index 000000000000..95de1d3b689a
--- /dev/null
+++ b/dev-python/entrypoint2/files/entrypoint2-1.0-python311.patch
@@ -0,0 +1,13 @@
+diff --git a/entrypoint2/__init__.py b/entrypoint2/__init__.py
+index 63ab78b..a99a298 100644
+--- a/entrypoint2/__init__.py
++++ b/entrypoint2/__init__.py
+@@ -345,7 +345,7 @@ def _correct_args(func, kwargs):
+     Convert a dictionary of arguments including __argv into a list
+     for passing to the function.
+     """
+-    args = inspect.getargspec(func)[0]
++    args = inspect.getfullargspec(func)[0]
+     return [kwargs[arg] for arg in args] + kwargs["__args"]
+ 
+ 
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index e27b10d1465d..d8e5fc99b991 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">entrypoint2</remote-id>
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index dfe58e8bb1b2..65d4be48b76a 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,3 +1,3 @@
 DIST entrypoints-0.4.tar.gz 13974 BLAKE2B 95bfe3deeee183f000722be63114e7eafe12ce9994e3ad02fccde7ee8dca3d10cc491e438bc9330fe9e16dbe1664d7a9fd9ef5712ebca989e3304e1dee7a55ce SHA512 874858c240199b9a209e00bde609b33335d199d21a959e51bb875240e2a35ada036380097218e9cd50d5d1dbf9de52638a069cb605ea8e8952db4a5afa3ffd42
-EBUILD entrypoints-0.4.ebuild 532 BLAKE2B be883c91643a62e935e1cbea2f7b50b935697ba87cf12a2ae602cfedb274060bccbd0bf3d0ba47c07426a5f4633b7e78061f86c3d33dd7bce9a5f1f04e20f0ce SHA512 143857b04ded385bff71eda7cd93b25ecc420b91193cf32fe91a2a5eaa34756de3f247ef55d125ce6fdf3deff816a36daa5b12bc802005fb442955e3c61206e8
+EBUILD entrypoints-0.4.ebuild 532 BLAKE2B 2c7fca8ab10d3bdc324ad13962ba45283ace9fb554c523e310b95da5502cccbf5ff8f268dbea08628cb7e729f0b9413c39cd08e7a029f9489a912b55d8ebb675 SHA512 d35c6200c51d9022f851e84ac080def87c45f1cb3c96d8d9efafc6107872cd13312759cadc3cb3ebe6f4aa4b726ca85d2034440e75a0317a1e3845358cb264f3
 MISC metadata.xml 781 BLAKE2B 14fb94a93c936b00497738f5fc611de48f1d7ab9d95b4699540a0f4b834c9146bec5cb8707031ef39e2fd9d54ff6bf257b82d1a955f6b398b4b7f84df33e0d25 SHA512 52e25f1ff00804f9fd1ada26badfd7cefd1833d2d9f52c57ee713a4fec27560c8e6e8215775d985083eeea692f1947ebc3700a1b3c119a6a2b49d500dfd3aa30
diff --git a/dev-python/entrypoints/entrypoints-0.4.ebuild b/dev-python/entrypoints/entrypoints-0.4.ebuild
index 149c58f73e10..86f7a5cc5738 100644
--- a/dev-python/entrypoints/entrypoints-0.4.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/environs/Manifest b/dev-python/environs/Manifest
index 818dbaa16477..a2fc227a92d8 100644
--- a/dev-python/environs/Manifest
+++ b/dev-python/environs/Manifest
@@ -1,3 +1,3 @@
 DIST environs-9.5.0.gh.tar.gz 23614 BLAKE2B 118305f7d6d2906beff69aa028449f8a5f6eba7815ec63972593dd43930802b5d1bd60457edc9803ed8ad216ae8feaad0d77fc03cd21e9883c40dc6656b1102e SHA512 8a73f9f89efe4d72b9a7a5a48b21ccaafcf32d59a6153c7cfa1c91d90a3a8a75e6c05d0ff0fecb94f593008dfff4c3534195f258391cee8fb720ee93c4f42812
 EBUILD environs-9.5.0-r1.ebuild 790 BLAKE2B 02268634937bf269596eb5a16e026d07229c1d92b45ae1878ebef7c77901903fc46b73e341e5b8e40a104796c5568f24cf03caa8f2534edcf1c8d06d2b32bfa0 SHA512 05e49741e3c83286b1bd0d1a03a7a118bfcbf204a986b88316dacd409756ddb1fc52661d520936da757ab2e100d647bed07d9053b68ae4c168f91a3973fe462e
-MISC metadata.xml 395 BLAKE2B 42a7e36b4b63d3774325d380cf13f78b5eb19bb1a8f2a2395205e3a0f362eb76759e2c42e8d86b525036a34581e7dc09bbb17de25d5884c0cfb83316608f67af SHA512 d39d65f48d7db2727a5ce601e57b96dae9dc1f400cd3e43b287b42c2deb2735f17fc4cc49f0ec30a86459e2aec1367f989e748d34e20bb5b5842dff3a3c3088b
+MISC metadata.xml 496 BLAKE2B a44f919cfe291f826a91438c9170dff83d39a184a192cd6208cc91eb50596a739d94335345f7289b8afd667a24b491fea5c9387721dd160031deb6ad5cf1aa6e SHA512 a3744511fce7b1a29b682ea7d384eef72bf08ef599ae88f01c9b4485abb1abe89f5731c40cadbe724cf8ac63726199128bb51e88c5c770196ed6a4326233f520
diff --git a/dev-python/environs/metadata.xml b/dev-python/environs/metadata.xml
index 430ab09014e4..101b4a644038 100644
--- a/dev-python/environs/metadata.xml
+++ b/dev-python/environs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">environs</remote-id>
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index 78eb6de40d1a..309182b94e96 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,5 +1,5 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
 EBUILD enzyme-0.4.1-r2.ebuild 956 BLAKE2B c1f4265b3e113924111933307bb521af30d255b5c246feaa19816519cdcb78a7c438dc2c9ce5f4a986791d9de95ad38a956b8c08774f0b3811b89997c64f28ec SHA512 1bfb385dde5128a386f9609b9d013dbd8bbf92ea81f773e3cbdbcedf56090ee2d7ac462f131be08ab81b18637fb8c2971d7c949e0cc24130a41bae2bc5fe5e43
-EBUILD enzyme-9999.ebuild 993 BLAKE2B 4206d1c1f84fddcfcd9adb5b7cc4468d0c82cf9ede75b8bce3e224aa22f81e6b55d746acbc3bfe19b6a34d9b3b014b3e8526359f7a50e8929ec139790e24f94b SHA512 5b4cc0fdadae607fabd94b11c7b3923b6a364d63b9d7aba5579f96915120e78687f4997d0c59f88404bac5edbbce369d01106463a197335728a7f84498929a75
+EBUILD enzyme-0.4.1-r3.ebuild 990 BLAKE2B 860d0194f030caed0e418451dce9145744a10b8c75efaae5b3414dfccba6f82d6d9de6fc64191ac973b9cb38447e97f6ae941ef7a74e269f21a860543283af09 SHA512 88008ffbd4d3bf9a183d9ba90b3968d413534147cdba8f579208dd9d73074617e1afb9742a516d1f3babd657cd2660aa358eaea4ce124b304062ff013c74bfde
 MISC metadata.xml 367 BLAKE2B 4b9abc5ee78a58063b098996c637fe06c986298c01db8b868deaa3d6c3bbeac182818fb195897fa20498d3b362d3e9f5dbe5257724d75db596eb7c8cff4112a4 SHA512 468c7f140ed1f8a8d26ff9c2d30ce7715e31934486be010de6b8065f4bf9b2f43d4c563ee4130dc9b94d39b28ebb1a1f4a168d66c918661308be209652c2aade
diff --git a/dev-python/enzyme/enzyme-0.4.1-r3.ebuild b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
new file mode 100644
index 000000000000..bfd4cac2d90e
--- /dev/null
+++ b/dev-python/enzyme/enzyme-0.4.1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='xml(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Python video metadata parser"
+HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-arch/unzip
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	if use test; then
+		mkdir enzyme/tests/test_{mkv,parsers} || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_mkv/ || die
+		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_parsers/ || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
deleted file mode 100644
index 410fba02c43b..000000000000
--- a/dev-python/enzyme/enzyme-9999.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} )
-PYTHON_REQ_USE='xml(+)'
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Python video metadata parser"
-HOMEPAGE="https://github.com/Diaoul/enzyme https://pypi.org/project/enzyme/"
-EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"
-SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		app-arch/unzip
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_unpack() {
-	default_src_unpack
-	git-r3_src_unpack
-}
-
-python_prepare_all() {
-	if use test; then
-		mkdir enzyme/tests/test_{mkv,parsers} || die
-		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_mkv/ || die
-		ln -s "${WORKDIR}"/test*.mkv enzyme/tests/test_parsers/ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index cf7c800f3f39..b95b2c636838 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,5 +1,3 @@
-DIST eradicate-2.0.0.tar.gz 8390 BLAKE2B 22dced2414622138655be80d1c10b746519d313959c7620cb54c4dc27247b0c29b7607c54934fe1dc379bec2cb729213b7ffb1d27f3f7f9b9a9d186aa9402674 SHA512 947a3890ccb1dbb52e73b37e632ae5ba1eff732d9d0b0dc127fa8dc908412e864fcda3203274d5eb1645b22f6e97a90ebb13cd4363a2360d6591475d909bdb96
 DIST eradicate-2.1.0.tar.gz 8706 BLAKE2B 5b5cab1c465c8295157bec1e8e39f0e33dbe31957da01ec44bbabf54a2b19c519a35cd7d2b92217d5395ce7397b3ae70175766a83b66d05e723fc5b5a019eb40 SHA512 a9b06745bceff909a1bbe34348b8e4c17d7f1e0ab3b554206633f350725c34a9b7238b3af6a40516081bc06aa86cdd593b27b90efa083ac024b0226f7cfc4df3
-EBUILD eradicate-2.0.0-r1.ebuild 625 BLAKE2B 382b95a56f458c8067cc08d45e5c966488b487daaaaac28f9abe1a332daab8e90902945e61f81a860e9aa60798bf468ebbe46df9203adf17dd143445c09aa300 SHA512 0043335de7b1691f19264e14ab45c4fa727b46878e4e72490108db6068f63424da5d93e975d0d85ea3da6c934eafb2554386b13a5d8b057ce9e745be5bdd4a28
-EBUILD eradicate-2.1.0.ebuild 633 BLAKE2B f747ba9fd46ab4bbea4a956f9dc34bd6a1941d0b88dd7f2bb756c254e344be84a86e7aa8d374a3ae897a8dde4a312b5dbeea670096c6d325cfadde4ccb761ebe SHA512 fe867fc02285163680a938c5f573993450d9b6fe12c8f853dba539625928504fa3df4fb02f32928af7a0d94587d5a4c15ce0e1cd5ddb13f5185789d3a5ed29b3
-MISC metadata.xml 396 BLAKE2B fbd39a684f629b20e9553c911e5ce288863e35bb6a1a4fc7a16e9e114d9a70f0ee6bef0ea8cf34f091427ceaf743a5b280ff0b7b6ca6858b0c301fecf6535df5 SHA512 03886b745b7f3e2b99a39fdb0fe7864d4c1acdd529137b845d1700715b606fa02ec53bd8ed25ea20242857bd421869246f0165566dfe72098853203bf8fda21b
+EBUILD eradicate-2.1.0.ebuild 576 BLAKE2B fbdc78d5c1e55be97618b775d1d1611bb97e3ea072e69f37f314f5a824187dd288b7dd793f20448c487df9c789460b2bfb184dac3498e740da97fd50156e2ac7 SHA512 70b439ca3c377f0f3f6d740a96fa89aa221739cd5e921f4dfa2d16b779bd6e7cf65c8052f4053f799530ced8142106bb19e01bdf13618e350da58a35ee5ed7ed
+MISC metadata.xml 497 BLAKE2B 3f6b7e1b96a6c272dfdd7677361b33f356ae66b5420aa544ae960e7ab59488e6b2641bf9f63488faae4c62d5099611706c4b0454f2e26bde0f94676726e7644b SHA512 ca5c37c9a15d9b71e73f91e9175ce77f08d2df0ef345f06fbb09ab0c056e8eba1a2ee91c7ee109a278f5f4deb24e8a6f30686a7a41208b926b962d3240bb1224
diff --git a/dev-python/eradicate/eradicate-2.0.0-r1.ebuild b/dev-python/eradicate/eradicate-2.0.0-r1.ebuild
deleted file mode 100644
index 60768c15b4da..000000000000
--- a/dev-python/eradicate/eradicate-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-# TODO: revert to PyPI tarball once it includes tests
-# https://github.com/myint/eradicate/pull/28
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/eradicate/eradicate-2.1.0.ebuild b/dev-python/eradicate/eradicate-2.1.0.ebuild
index 3d56e702338b..c465febf2b37 100644
--- a/dev-python/eradicate/eradicate-2.1.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.1.0.ebuild
@@ -4,18 +4,22 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="https://github.com/myint/eradicate"
-# TODO: revert to PyPI tarball once it includes tests
-# https://github.com/myint/eradicate/pull/28
-SRC_URI="https://github.com/myint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/myint/eradicate/
+	https://pypi.org/project/eradicate/
+"
+SRC_URI="
+	https://github.com/myint/eradicate/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/eradicate/metadata.xml b/dev-python/eradicate/metadata.xml
index cef04ec9f4c3..49a7c25077f0 100644
--- a/dev-python/eradicate/metadata.xml
+++ b/dev-python/eradicate/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">eradicate</remote-id>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 82ed23819a50..d5b074ee2257 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.1.0-r1.ebuild 754 BLAKE2B 23633db01db812eba40b2bc65b51e574bbb2ba75992a0cef4756ac2227e047b24bde2c150239acec37fb02862604d09c756ff29e3f715a57b13962038e837af4 SHA512 2f5f755a386068dea80893ce0916e13e135564ef585232467c71205d53739fff88f8f1773b3360dba084eb4beb55e55454c4e1d39366bcc3d8cf6636c83ba6ac
+EBUILD et_xmlfile-1.1.0-r1.ebuild 759 BLAKE2B 541a204d5c5ff0180dbde7c3a66e3768dfbfc5ad38ece8b5be97bea4e1a5521c596ae63a2a2d7a3b9e9e9bb088d52ca4ae50154e95bf4a19b7eee7e15df1e0e0 SHA512 78f98e1af73350e70eff6f901d5d417979759fc9921cfb347b30017db013fc4d4610fa5ed663d4d116597cd15812ed0b0b806239165f2cf3fbff623a690b5458
 MISC metadata.xml 349 BLAKE2B 4f74359c66b9c0ae3dbce05a4b719a0f4498f66ae68d9fcfc9809253369d798006dff7d28f2cdf79335ece94314275eb1a16be9bc4419feea7d6d3123ff29dba SHA512 efdd054a65a9536d3da8b5cb4d065a1eb507e5ff5ce10242271cae34d6dc04fe12d17d07026f44c99504a18be9fdb42e064c07dfeafaf407713cf54cee445c61
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
index be0c19c8deb6..d6598285682c 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,16 +14,20 @@ MY_P=${PN}-${MY_PV}
 DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
 HOMEPAGE="
 	https://pypi.org/project/et-xmlfile/
-	https://foss.heptapod.net/openpyxl/et_xmlfile/"
+	https://foss.heptapod.net/openpyxl/et_xmlfile/
+"
 SRC_URI="
-	https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/${MY_PV}/${MY_P}.tar.gz"
+	https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/${MY_PV}/${MY_P}.tar.gz
+"
 S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 8fecf4c73f34..b90a0a34faa2 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -1,6 +1,6 @@
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f817404cd2ad6cd6378e0faaaac7c9721e0ac03d3becee1962f44df3edfe0c30c55d7eb92c66b4a01bc94468d4f1791e40eecc SHA512 3a4f6985c3880a85578591ccbdcc0e76f5dce7c4c8897489d2f2976faf3e73e7ab1d755c91ddfa4cf28b1019e730580ba45184179c0ceef6eee859a2bf6ae28e
 AUX eventlet-0.30.2-test-timeout.patch 1421 BLAKE2B 11730b1a5827d1b30537eaecb896d981b19875fdcbf874625057a838b5a48638bec45adecfb9445f68111d00075e81a13780f87f09a11ae332fd6f48748b7db9 SHA512 fa338488912b87bf4ae802ccfc0fcc6e1506ea3d47f82f86da1fced0d3928410a3d62588a9d14b39b6846b4b9539c37d9b678f575680432cbafd3dc3e07f9f82
-DIST eventlet-0.33.0.tar.gz 414929 BLAKE2B cfb2500d25ed56f5eb7b81968286b1d7d0286511e1658dca8ab4fcf07029390168aea1f95092b5f1b486bd6fb34a96b762c2087cd19f903d232f1da183508888 SHA512 52ef5c6997d0c8a3b55d5f6e969320e06950503984c90440b484020ba346d622ba99abf2bd389b962534849b0c70d80b06f110b2586417f27fb6dde725bfaef4
-EBUILD eventlet-0.33.0.ebuild 1277 BLAKE2B dff2f9505dbe912b27993c5e0bf0b08dee2d9bdc234fa1cd7bb4c9f6ea42c1828e7dcc203c41e82bbaa7431f93575dc75444f377b9ea2ccc205f8b9fe7617b9c SHA512 35af5ce16281c54817f5b188770e8fc75d36f711f13655162839732a7ee506617fcd07e94d288efbceb127b6e583ac8b03a6355fb3053bfd8388731df58ceea4
+DIST eventlet-0.33.1.tar.gz 415294 BLAKE2B 25efb9b9848a6e0db2040d111288447aa07ceb70d2cbd9b3d189a2ca58aadad6b6d64054f76f3329ff7ca832efccbabb780c839c4db6d95a5b623d80079b7da3 SHA512 c8ece6a26039631b13ecc188f480f348a42551267fb6135551899dec7a23d0cfd032c14728e114901e4d256bf580203bfbdb1795881abdd71e49a53f8ed58964
+EBUILD eventlet-0.33.1.ebuild 1321 BLAKE2B 009e00356dbe8ed24857151ee62ecc49784b3d2f5efa08c9542ebc39255d839a877c7ade74c3ce28c8609d6993fbafb727c2eda8217c651fb82498aebdc0c39a SHA512 591453b07c132da66473cffb9753252c23b8b734454520bf5653e56cd4cac334a561077f8283a207fd820f820e41caf95f6120917f235303920d93f2b29143e3
 MISC metadata.xml 381 BLAKE2B 13525cba2b71b496ca49573beacbd552a86320d40200747ce991163060aef7746dd568eaf572f19e990eb22ad3791f20a546264109c3a47687b03bbcf25a5115 SHA512 f7be09d2e34f1259e1e9ae685cb591e061452974789b0027878d7514e956a216068dcd139f4e3f57ed50530d828941caec12598e9f8d79e98e820c9683c71c05
diff --git a/dev-python/eventlet/eventlet-0.33.0.ebuild b/dev-python/eventlet/eventlet-0.33.0.ebuild
deleted file mode 100644
index 9c6eec9a44e0..000000000000
--- a/dev-python/eventlet/eventlet-0.33.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="Highly concurrent networking library"
-HOMEPAGE="https://pypi.org/project/eventlet/ https://github.com/eventlet/eventlet/"
-SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/eventlet-0.25.1-tests.patch"
-	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
-	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
-)
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# increase timeout - #791748
-	sed -e '/eventlet.sleep/s/0.1/5.0/' -i tests/isolated/patcher_fork_after_monkey_patch.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	unset PYTHONPATH
-	export TMPDIR="${T}"
-	nosetests -v -x || die
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/eventlet/eventlet-0.33.1.ebuild b/dev-python/eventlet/eventlet-0.33.1.ebuild
new file mode 100644
index 000000000000..3dc52c7dc551
--- /dev/null
+++ b/dev-python/eventlet/eventlet-0.33.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Highly concurrent networking library"
+HOMEPAGE="
+	https://pypi.org/project/eventlet/
+	https://github.com/eventlet/eventlet/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/eventlet-0.25.1-tests.patch"
+	"${FILESDIR}/eventlet-0.30.0-tests-socket.patch"
+	"${FILESDIR}/eventlet-0.30.2-test-timeout.patch"
+)
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# increase timeout - #791748
+	sed -e '/eventlet.sleep/s/0.1/5.0/' -i tests/isolated/patcher_fork_after_monkey_patch.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	unset PYTHONPATH
+	export TMPDIR="${T}"
+	nosetests -v -x || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index 1522105b48ce..b4ecd6cd2de9 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,5 +1,3 @@
-DIST exceptiongroup-1.0.0rc3.gh.tar.gz 15973 BLAKE2B de9e6e272beca083a6bfe4bd85f9a450e7ec379b903dade27b0ea358762431dfad62d845f5285ec37ebd4f5458105fa6c9be3e075fc6122613088f023d31b04b SHA512 c3f55aae05635aa3360dbf21fbe0005df64b32c9a9521ef7d6026f9746522e4bff485784114913777b828612c20d8385dab49e5d1ffb642999c1f8180b94b2c5
-DIST exceptiongroup-1.0.0rc5.gh.tar.gz 16454 BLAKE2B 55af4d2240e4a5567f5669d15e8507c454d47c1f7d8f72212afeecfa37e0c4a6b36f9176a87a48d3f9edf0628a8c99863670d24aca3770dd88abaa463784c731 SHA512 dd5ee895b4531524c4f0dfaedf818ac76a1b6fe74cd75bbce824b6a0d2b981673ffd6ba36f71b5dacf3e17c89d196a258400d04a64c71f28c221d7fb0f934ab7
-EBUILD exceptiongroup-1.0.0_rc3.ebuild 695 BLAKE2B 1d9de079da97cb77b753f96b59674c85c4c738d6e1feb342953639ecd25ca4ef952fb6ecf6fd66688f51fad080507f144db1836cbec7a5eb6403e04ba9cfa71e SHA512 45790a03b2225bd273c4544a18c7cd9f10eaece3fcf14099a70df0cd710e9dc8b01872d1b2d5bf907ff51234dbb0a079b58d76147a53573767952c0340ea0d86
-EBUILD exceptiongroup-1.0.0_rc5.ebuild 695 BLAKE2B 1d9de079da97cb77b753f96b59674c85c4c738d6e1feb342953639ecd25ca4ef952fb6ecf6fd66688f51fad080507f144db1836cbec7a5eb6403e04ba9cfa71e SHA512 45790a03b2225bd273c4544a18c7cd9f10eaece3fcf14099a70df0cd710e9dc8b01872d1b2d5bf907ff51234dbb0a079b58d76147a53573767952c0340ea0d86
+DIST exceptiongroup-1.0.0rc8.gh.tar.gz 17562 BLAKE2B 617e174e32f4c062f576b12c9dfe96e5495003097dc0da82e383019a65b2a043546d4b73181081defb641d453127e056be52e55e76fdf0ec0247513f5eb211ff SHA512 f7f1700403f345755a1e32c77eb43744b366b1f55446e1898dd960988d23396ad8334bef072ecc7ec5ac7075300f0f3e8e9a0d454d9dd80677ae55b4166fc6e4
+EBUILD exceptiongroup-1.0.0_rc8.ebuild 749 BLAKE2B 0d27d44d7bb110b16f200bf28444229322ccdca0c7403294cc3ac7f93da54f279fd360ad9c30aa312c65c9643f67bd2e862ebfb156db0a28762de2ba644ffe97 SHA512 a2af0da61a5cba69f21e84fb7e2916f38398bd011bdae48fedf1d0a42d7b6511e145396de0f7eb1711bcb22fe49dc87b860e06cc16010734ed8ba32a2e92dcfe
 MISC metadata.xml 360 BLAKE2B accdc2d9dc39a31238555b937189f135482f2094a570396a741ba6202a1243ad46c99003e829e59e4e5fd0db0a01b050cc0e385bf28b44892e3e3c5615351028 SHA512 d740125cf760309a4dc5de1981b5ad704e880c37588e8a0e17816709065d80ad2ffecb3b5e50725b5665a38594a53f9659c17b35eb34bffbb06d11b830d740cd
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild
deleted file mode 100644
index 2571619d98a3..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild
deleted file mode 100644
index 2571619d98a3..000000000000
--- a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit_scm
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="Backport of PEP 654 (exception groups)"
-HOMEPAGE="
-	https://github.com/agronholm/exceptiongroup/
-	https://pypi.org/project/exceptiongroup/
-"
-SRC_URI="
-	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
new file mode 100644
index 000000000000..166abea7261e
--- /dev/null
+++ b/dev-python/exceptiongroup/exceptiongroup-1.0.0_rc8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit_scm
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Backport of PEP 654 (exception groups)"
+HOMEPAGE="
+	https://github.com/agronholm/exceptiongroup/
+	https://pypi.org/project/exceptiongroup/
+"
+SRC_URI="
+	https://github.com/agronholm/exceptiongroup/archive/${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT PSF-2.4"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV/_}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index de4eb48cb530..697e544c493f 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,4 +1,3 @@
 DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
-EBUILD execnet-1.9.0-r1.ebuild 1271 BLAKE2B 6b7796a7592fa3ebbfd29ded0bcd69f9a541d5c04ebe1eea448643d5b33c91a430a1e654f72b59f6b39a992d5ae1fa2c5cc0995cbcc6cad9edcfa8b4bcd1fdf7 SHA512 81c4f95b434dffae6b9643c560b42b6790020715ae4440c4ee8d3f5e4375a69241ccca012e6e458ddd5585932c9f3ebb8708abfd4a30c9131e0c1b41c66be12b
-EBUILD execnet-1.9.0.ebuild 1293 BLAKE2B e5c18c78f8ec06f08786cd39bdc4cb2b3a333f4e2dda8cb020059f2b3ea80933fc312f4095c97f052a7d34f6c4677317f3c0d848312810ce974da4e41e1edd46 SHA512 fa55e9a65161674954e907a899997c6ba5a2cc8db207d01aff45a0d76b8868ce1f1251175d0f2cf6f4e795adb58bcf829584a090c0cd74922108c9a97c70d42f
+EBUILD execnet-1.9.0-r1.ebuild 1263 BLAKE2B 1080b249ad13d7ff6255075791d20d2cb4ae9677e1298017e14fa581d2b349a471801ffc8eb65ce586297c55870f2623399c21748b0265bebc8faa32be17323a SHA512 ba332a6b5b9da2ad9d668e5a3eee88fe50af09951ad7c7636fa66669a798f4280712f71a9cd3c80ad9713571dab65b6d14c3c9741ffb3df20bfb0406960e5bf1
 MISC metadata.xml 442 BLAKE2B 4f920c4eee254e4fc68e6ac69344dc0da43058d9e2920d17dbe9c2e17bc2fc5eb5b9fe5f65d8edee0a91158c380f4c2635aa6ed01d726d1a332fc39bb567dd9b SHA512 3d4070a50e199f18305638a485c2e0031e88a662b8fbd9025bf76f84a8e3db0603a217a13b1ea50be724f9162b2eb1ef4a2722832a4769a785d40bc4e8f01dc0
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
index 6d15b0446edc..1c7c068e0aeb 100644
--- a/dev-python/execnet/execnet-1.9.0-r1.ebuild
+++ b/dev-python/execnet/execnet-1.9.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/execnet/execnet-1.9.0.ebuild b/dev-python/execnet/execnet-1.9.0.ebuild
deleted file mode 100644
index 2b0686417857..000000000000
--- a/dev-python/execnet/execnet-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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="Rapid multi-Python deployment"
-HOMEPAGE="https://codespeak.net/execnet/
-	https://pypi.org/project/execnet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
-		testing/conftest.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# needs python2.7 with apipkg?
-		'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
-		# tries to run python2
-		testing/test_channel.py::TestStringCoerce::test_3to2
-		testing/test_gateway.py::TestStringCoerce::test_3to2
-		# does not like Gentoo defaults
-		testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
-		# almost all tests call py2, not worth filtering for the rest
-		testing/test_serializer.py
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index c07b04e216d9..3d2262ad941c 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 687 BLAKE2B 610943f7c9fb5db2d6b6746070ac1aa0dd41b3e39ce8b1486df707aa1aa9fd15186f469b3e4d187869301e081b3071fbcfa9813f2fd60e5faf62e48701fa431e SHA512 7527e149d684d43a7c0657a659ced29fb9bd4076363cec34866b0efd36d3a908205f8316e4d6f62403060afc01e5b657afd4cff07bc54ae691abb55171eebae7
-MISC metadata.xml 382 BLAKE2B d7851adbbf4aca83dac1de2f3415628606726cb1bc85d28b96cf8e21a3e8bddb7858ab9f988446364b31a7d686a91ee4523beff5fc0b30d75ae5494d5ae6779f SHA512 3a33d1a36e6de13164387e02a21e33baaa1282d8726e7ab2bdbb8185c9000e7f576b8989cb90e7711d507c24286286a4f5bd800bfb726dbde4afa4e5e08594b5
+EBUILD extras-1.0.0-r2.ebuild 655 BLAKE2B 639ec36d795421a3c89d7da04e8ccf61488a6f9ab60c13ecf65f0e8630988c484452601271925a7f32d2fe105e2d973bd61f93686ecd73ebc60fdfd18a7f9eef SHA512 8664621f4840b5772933e5dc4755f7f55a92670fac8aad5667084476160c506c7f5d94613f0892267c74d8a2dfbc74d3be97f75187979c3fbebde84842a2c173
+MISC metadata.xml 407 BLAKE2B 3b3fe284e5cc05732c66efe8c759025b3d5b1965e87316cbf33ed9533b41e6ac461ce428be7db25a4246b99bf0ec35de1f3d5a458617b6efdf16e95368fb246d SHA512 874b16dde8e0c9b4dadb7bd7bce6f6a1e0d6bf5b11063c7c1d61f9eaadeae3c2e792b4a57947f31d387e8d4ede79499884dc81657dc8bd041f19911d3acf7605
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
deleted file mode 100644
index f259b61cb5d6..000000000000
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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="Useful extra bits for Python that should be in the standard library"
-HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.org/project/extras/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
-
-python_test() {
-	"${EPYTHON}" ${PN}/tests/test_extras.py || die
-}
diff --git a/dev-python/extras/extras-1.0.0-r2.ebuild b/dev-python/extras/extras-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..58eadf4dd765
--- /dev/null
+++ b/dev-python/extras/extras-1.0.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful extra bits for Python that should be in the standard library"
+HOMEPAGE="
+	https://github.com/testing-cabal/extras/
+	https://pypi.org/project/extras/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/extras/metadata.xml b/dev-python/extras/metadata.xml
index 3946d4b081d8..5a15ffc23e50 100644
--- a/dev-python/extras/metadata.xml
+++ b/dev-python/extras/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">extras</remote-id>
     <remote-id type="github">testing-cabal/extras</remote-id>
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index e1ad36141ffd..19b6385c092d 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,5 @@
 DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
+EBUILD eyeD3-0.9.6-r1.ebuild 1265 BLAKE2B 961abb7caf088cb05bfc2c17dcfef365a8fcf102332ddaa7de9ce55d2cf0c46dd59284c82ba6617e3d38b4d0cd82a327f36e897b904b9bcdaab055f0fff95a2a SHA512 55757b6b2f4e7d5568b7cbcc9ea76be3f52106091f00682b72b4c338e9398744e43274bf4f3fbbabe87eedd0b13919094f25a1dd362b5df44f3e7e1d6fcd7e56
 EBUILD eyeD3-0.9.6.ebuild 1212 BLAKE2B 21e11372f54517eac40a3ffc0c09cc15a033391bc3ae5d8727b477df9e6f81354ab63cf55e5ee0bed1e8e5023733a9f234bb3e78bc47052b42b8c26eb490a615 SHA512 1e423697a112201dab0a842bb970c2607a3f1cc250b5f708a4ac7ccfa0dcdedf70f5f9006b5ca7f2e0247d99d89f95cb0f0f1f2a09fa2b06aed477f4555074ab
 MISC metadata.xml 499 BLAKE2B 0bd6552d10ad9f18cc93c65439b61f6de2b0e24ce1321e2172262ddd361573fa1891192c83556341c1f25805759bdea36b8d524204272dcdaf27fadb571df24b SHA512 77df82bbf9c8f11537a3a3a49e16d05a7cf558711b60af65fc646aa9cb52c3f463b808e9cff45758b823a30abd96404e0856057d92cffbc2f72d81b6c74fc19b
diff --git a/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild b/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..a29cbbbf2096
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.9.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="https://eyed3.nicfit.net/"
+SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/filetype[${PYTHON_USEDEP}]
+	|| (
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+# note: most of the deps are optional runtime deps / plugin deps
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pylast[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged factory-boy, doesn't seem to relevant
+	# to anything but eyeD3 usage with factory-boy
+	rm tests/test_factory.py || die
+	# requires unpackaged grako
+	rm tests/test_display_plugin.py || die
+
+	if use test; then
+		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
+	fi
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index f8eff28108d4..3623469d3cd7 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,7 @@
 DIST fakeredis-1.7.1.gh.tar.gz 71151 BLAKE2B 87877c94a4c03ad6ff4b55f307526f712daa860257374a97a8f7bd29440d171467e18e4041ca56bb6af30df30481a3d5b13c7d0657ba3eb7673a653664ffbe8a SHA512 f41d9393ae50bae9de064678948f4364fc47db06f489782e5b428f449828ad5813b08b2fb053bef878b2a1b500edbb0ea1881449dbd12c2b6e385f6a2fba4c59
-DIST fakeredis-py-1.7.4.gh.tar.gz 73024 BLAKE2B d3d18611d846a0dabb52d74ca53cad997b37e794ef320bc800ab5339f70710bc30f9e33c0820db941064fbf9dca0dde3e72c78298895b8c2510a93353898b355 SHA512 71c9ffe7c208453bc8f5e719b3647a9b9fc5406c5fe3856ef1dc42c019bd7128355d260be468b62dcb764a918a3510f193fb1aaf374bb3866e352c9c2bae90c6
+DIST fakeredis-py-1.8.1.gh.tar.gz 101586 BLAKE2B a1b123dd482b9b59f401a855ba95a08f2e744bff5ae4a4f0c12cde8b2a05971043ccb16e92d0adbfeedd3e071fab50f1328ed265c6ac19ecf6932d09bcacd549 SHA512 19e1636895206fa550844a776ba4835c3acbe2eac8fb774716e91d20e0f283b121f42ee11d876e20d798a6df0dcfcc29114c76c839c4946436102b8f83ed3d01
+DIST fakeredis-py-1.8.gh.tar.gz 101156 BLAKE2B e799b5636a89edd8795fdc79811689cd308f8a7dae55d7ac4045352f370f428d96fdfed7886598e856c203bcc44d58236a8bf5229ee49a9cec90324f0778ce78 SHA512 7bd553dc724b9d664ff1c403fd9a234ad7a8e95f81a3761eef28c7e6d919b7756040a70382e61d9ff54f8bd8f778130c035e9384707403ca9a4340051a4cf861
 EBUILD fakeredis-1.7.1.ebuild 1874 BLAKE2B 1bdfeabf7b64e17d6b328692d17fe9ec4df6ed413af01132bd813084c8864e4708c18b420455ad4202b5622f9d17209ab7c2471562ab9f8001f0a1e27e131532 SHA512 0f000b8bddb4dded8bf138270bd14053f7b5bb97cb7735fa3918d7a76580841229cd9375146e5e762e6975f382ba630f16f7d29205fc2a70bdb630b9ea1fcafe
-EBUILD fakeredis-1.7.4.ebuild 2120 BLAKE2B 0055f639ff97e1514176862fab473039d729532a42537f6d3f89e17fdf6474db9a85d15eb148501eb58dc94e6a759c6f2a77a2ad71bbeb459b2359f379ed742d SHA512 10d5fbaf60e6981bda102f7e0fbc396837d0c19af18bde1f770e3886851c82b812f68c3c98be360143931cd9230593be48a6c33606c70d15bdfe553c60b72781
-MISC metadata.xml 377 BLAKE2B 3d0193874a2947ae2ebf1d74b7f54ab8e8b9459e120413f1fd79883afbdf4222483d6d912831d244c4148856b6ca6f74f38f24d8460f617d00365777e572fe17 SHA512 73a67caf1f31ffcb1935dff9c02f777cb6ff011c06f3c2f262a3cfb37b292ebf1edf5f3332d771119d2a1b165dd390ed46b19a1896f120f238059925826f5997
+EBUILD fakeredis-1.8.1.ebuild 2109 BLAKE2B 7a77b390e27edc7d054327282cce2e346a3b251bdc9f21a6db7d88afe82a44c3713d677c043f89278e6230bc45353baaa0cd3c8d40fbc6a98fadbd738073eb19 SHA512 85d5026b3e867beba6e978749f462b5bfbddca278d686a0d0073b973d693be5d5960cb95eb1f39080bc60bebd131440685acc0f4b0af660b6962537fca9ad3f8
+EBUILD fakeredis-1.8.ebuild 2110 BLAKE2B 1ab9e4e18f6dc47b34ed28f510268ef83abec4afc89659e8d016a8d475cf1066a65ddef103ed776ece6111075a664c20d0db700464096bc1bb7e6b9cc65c436f SHA512 c70f0f28ca4b9e1e18794d892c069d96c41169bcf577bf2242e93d5648017dbcc057f80e7101385f7ca26a1b55e7783aed3c5d217a66953924dc13b7a599a684
+MISC metadata.xml 380 BLAKE2B a47afb846b4f7d2257f29d6d33ed6a00c8cbf147bc3a74202da79dbed75c0ab48969ff6d9d6a7d508d62aaab2a7e0049e4e38ae357b6c99844b6a78da1a851e9 SHA512 74bff19b3e0ff7e90137e0b90dbe5b2a04b5b2b0b2c621a19cd3c2773fae9ca6673d52628b4bf37c36fd3d7142197fad16e0f0b495b7650545523806234d17dc
diff --git a/dev-python/fakeredis/fakeredis-1.7.4.ebuild b/dev-python/fakeredis/fakeredis-1.7.4.ebuild
deleted file mode 100644
index 01803254b09c..000000000000
--- a/dev-python/fakeredis/fakeredis-1.7.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
-
-inherit distutils-r1 optfeature
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/dsoftwareinc/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/dsoftwareinc/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/aioredis[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin redis
-	sed -i -e '/redis/s:<=.*::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-pkg_postinst() {
-	optfeature "Mock aioredis" dev-python/aioredis
-}
diff --git a/dev-python/fakeredis/fakeredis-1.8.1.ebuild b/dev-python/fakeredis/fakeredis-1.8.1.ebuild
new file mode 100644
index 000000000000..c7d77b89b9a8
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.8.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/dsoftwareinc/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/dsoftwareinc/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+pkg_postinst() {
+	optfeature "Mock aioredis" dev-python/aioredis
+}
diff --git a/dev-python/fakeredis/fakeredis-1.8.ebuild b/dev-python/fakeredis/fakeredis-1.8.ebuild
new file mode 100644
index 000000000000..c1adeb1fb405
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1 optfeature
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/dsoftwareinc/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/dsoftwareinc/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/redis-py-4.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<=[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+pkg_postinst() {
+	optfeature "Mock aioredis" dev-python/aioredis
+}
diff --git a/dev-python/fakeredis/metadata.xml b/dev-python/fakeredis/metadata.xml
index 3d21e4768321..2b6b02ddf6fc 100644
--- a/dev-python/fakeredis/metadata.xml
+++ b/dev-python/fakeredis/metadata.xml
@@ -7,6 +7,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fakeredis</remote-id>
-		<remote-id type="github">dsoftwareinc/fakeredis</remote-id>
+		<remote-id type="github">dsoftwareinc/fakeredis-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
deleted file mode 100644
index afa47dcb73f9..000000000000
--- a/dev-python/falcon/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST falcon-3.0.1.tar.gz 1300689 BLAKE2B 76dd59d0274cc2e78052b800e6e5b4c4244e1f5e47169a424882cda5bb59c38cd69c1c0942d506867728da9ddaf5d35b88195a1b003ca5f66549248293b7006d SHA512 c6a5763264b497979129df26d83a04323f53861b6d453a2b642d22208d0dad2ec1fcb88b13a53c2cb2b2988a1c0d19b94021099b458e23d640984b4d03880edc
-DIST falcon-3.1.0.tar.gz 1319252 BLAKE2B 183623c8d7e8b86ed9915cbf3757fd526f7f3a8a97ae5fdf86294bcc65052c5c827d4a920d93e9fa0198a8d255c7b56ecff465a36d9b0ea31581abd87d55ccd0 SHA512 9da76dd92dfce1611ef681588d8e0e2fc7e906b5c0bc4b60a4620e2e9907564783763b7776c9cc2ccb296116c985e527b2f429520a1c601567cf4eb15e98f8cc
-EBUILD falcon-3.0.1-r1.ebuild 1198 BLAKE2B 3da77afa28ba721301f042e26846bcb8f4aa563395bdb57dcc42cdc678f2bfa813a8ab6ab6f71935b7a07a888f745b09b8e89c3b81bd872a5424ad245c23e261 SHA512 c66a86d1ca817b1ed9552b9e95edd579488cd65932cab5a9921b11a3e9d0ee0af758f1723f95003c8836aec211971d264259b2e871b05a98b02f1a33cc7cac74
-EBUILD falcon-3.1.0.ebuild 1674 BLAKE2B 15b380000749507ef98545f1ef6657cf0cf1a721bb4b6331cae3f60bd026f61398e8294693739bbdc2fe304dbd86317b24de18a01981fd4ddb5d101060962633 SHA512 222c52865306c496c7b5726b44514953e2b2dd38463942f64d40aa6627bfed40140346ffe0696f917a7bfc9171c7053cb390013be67b6a086d0623f568b801f4
-MISC metadata.xml 365 BLAKE2B 8dc08ffa6bcc9e64e2732ecb700dbbf6002e3e3c225baf98d1ec42d14abac3fce82f3cf546f07ff1fe1b0f74689e2d225e6f58c35d254afcc6d5bae2de314313 SHA512 24be56363b9bdbcf093a20ac9f5ec982830ae36c7ceb1305de7ad94ecbb5bc2a0397b38f3feb9588422e961b570459e97c259daef6bdeb7de6123760a69b619d
diff --git a/dev-python/falcon/falcon-3.0.1-r1.ebuild b/dev-python/falcon/falcon-3.0.1-r1.ebuild
deleted file mode 100644
index 3bd716866d67..000000000000
--- a/dev-python/falcon/falcon-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
-SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiofiles[${PYTHON_USEDEP}]
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not install 'examples'
-	sed -i -e "s:'tests':'examples', &:" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local deselect=(
-		# mujson is unpackaged, test-only dep
-		--ignore tests/test_media_handlers.py
-	)
-
-	cp -r tests "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest tests "${deselect[@]}"
-}
diff --git a/dev-python/falcon/falcon-3.1.0.ebuild b/dev-python/falcon/falcon-3.1.0.ebuild
deleted file mode 100644
index 121575f7c481..000000000000
--- a/dev-python/falcon/falcon-3.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A supersonic micro-framework for building cloud APIs"
-HOMEPAGE="
-	https://falconframework.org/
-	https://pypi.org/project/falcon/
-	https://github.com/falconry/falcon/
-"
-SRC_URI="
-	https://github.com/falconry/${PN}/archive/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiofiles[${PYTHON_USEDEP}]
-		dev-python/cbor2[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/msgpack[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# uwsgi seems to be broken/incompatible
-		'tests/test_wsgi_servers.py::TestWSGIServer::test_get[uwsgi]'
-		'tests/test_wsgi_servers.py::TestWSGIServer::test_get_deprecated[uwsgi]'
-		'tests/test_wsgi_servers.py::TestWSGIServer::test_post_multipart_form[uwsgi]'
-		'tests/test_wsgi_servers.py::TestWSGIServer::test_static_file[uwsgi]'
-		'tests/test_wsgi_servers.py::TestWSGIServer::test_static_file_byte_range[uwsgi-'
-	)
-
-	local EPYTEST_IGNORE=(
-		# mujson is unpackaged, test-only dep
-		tests/test_media_handlers.py
-	)
-
-	rm -rf falcon || die
-	# needed because servers are spawned via /usr/bin/python*
-	local -x PYTHONPATH=${BUILD_DIR}/install$(python_get_sitedir):${PYTHONPATH}
-	epytest tests
-}
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
deleted file mode 100644
index 654149b5c34b..000000000000
--- a/dev-python/falcon/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">falconry/falcon</remote-id>
-		<remote-id type="pypi">falcon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 2aa905ac1df7..e5a493ca4cd2 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,3 @@
 DIST fasteners-0.17.3.gh.tar.gz 29409 BLAKE2B b4cd5c2f5dcd87808b4edf42ba160eb6b0bf08df544cbe1cc96ab3dd43f8fee02342a56a8b9529354e102f8e4280f9375f89f58318e46f2e8d52fa49bdb0f5ac SHA512 bed890d674bbb8d0442cb0a36c81bd5d1b4e555534ce4451f1cf70dcf72e222d52ae98154d09ac0ad1e52d1a2026c532fd40df715fbbd6bc95f874a916911ec7
-EBUILD fasteners-0.17.3.ebuild 691 BLAKE2B eadf54124efb850d8f74413afd70db25bc6ad3b0ded9f841d7330a028c7868a7c7132c9cb293f0cecbb473e65606d77a00a0aecb8f6cbd220e7d9feffd17f050 SHA512 bb1f00869ce870605fd05e43c44fe5f96e5278977387bcbbdc12fc095e420eaedd05fb97388fb1edee0e88fb399ff28a7d46c62f0a38aca6d88cf1cbb9575727
+EBUILD fasteners-0.17.3.ebuild 698 BLAKE2B d9b40f82d806d0e39585d91f30c877ecda3b1a6e0ae71d7367325a3ef0a743580c1d3451b72c54dd521ece5d2459be6660e26dd5d0747c498ab59c8e85a4ecf0 SHA512 4549c8fd9bf6c46451eb9343321ca1d678980a7c9b087050aadc12dd1933b83b28c661aaa2a2c52004dc0fa3b8b68ba092374170d3a5196e0c0f942c87b2b752
 MISC metadata.xml 510 BLAKE2B 1431fe8c5a7c8f6eccb512ec7690ae53360275c13bc368af6b51d02c7684dd74cc6340b7ff53b2cda7877b8e8224bdb4d2194e93ed678a88e79f0ae8bd7268fd SHA512 f9b0a1c15a6bd818f1366004814908c538249cb16ef8f09d3fe905e8e0a15e7d70b80ee87966f0ed990c44ccee7ecc45cdbf3eaac668638202f640a55525478d
diff --git a/dev-python/fasteners/fasteners-0.17.3.ebuild b/dev-python/fasteners/fasteners-0.17.3.ebuild
index 8d920f7554b3..a4adf48d6251 100644
--- a/dev-python/fasteners/fasteners-0.17.3.ebuild
+++ b/dev-python/fasteners/fasteners-0.17.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fastimport/Manifest b/dev-python/fastimport/Manifest
index d027424394e7..42f131bb6645 100644
--- a/dev-python/fastimport/Manifest
+++ b/dev-python/fastimport/Manifest
@@ -1,5 +1,3 @@
-DIST fastimport-0.9.11.tar.gz 41764 BLAKE2B afb82878ea1996894ff71fe99edc5ca26d45f98eedf7a8a6e85af45949e1e81c2112de9fc2c026438306a8a0e89c484063954ba7d2ff9a80c6b71ab40174f8d4 SHA512 e1b7e4897542ef6f33af51e1018340a6807688e44424e4e7e482b3347264d58d4290678cc2cfa230af500a53cabdcf35c9e7b03c8ff0f1ec3e6e0a9e869a1455
 DIST fastimport-0.9.14.tar.gz 41791 BLAKE2B b0becb3de319c44e60cf8575afd9b19ad69ca8715d9eae8ced079136dccadda82ac340ad7e01f8a556bde07fbecfbbe6f9eb841909ee2e6b6bbe8e808f463e43 SHA512 cbf8f0bf5b66e847d4482b6af29ee26a69a2aadefe22c4a2f17d976a94fce86b016b61b17d0a7f4be82ceb7824d0bc12b509b8148c18f9dc8888304158a7c266
-EBUILD fastimport-0.9.11.ebuild 664 BLAKE2B ea96510fb3370df0e9767b51b4e53288fa38a674c59bcc40d6d864b600c9d41254a1e3bbd4e0ffd2bcc4ed1e3407a1e4a9c1241788fa1086142918e9c4014f1d SHA512 a55790e863752620562e8aba4c8cac5778c0c11f335153cf38c18e365e76193bd0199521fb7f41816cac9ad75fd5636d60ad390740d14ef426a4c0b7fc37407a
-EBUILD fastimport-0.9.14.ebuild 748 BLAKE2B 7baf816722419bb886212d1f8a7c21cb01d399bce53449344656c6e272afc8a6984d7e98a12fdc651d8f4700756db54901741f7758dd49e95e6f4c3c7509a747 SHA512 c7299f2a75020020122fb357f66413e24677c2bacf1e31e1ce602903675cf9d00671deff8687e4aae2444efb3260029cccb1348eff8fd693abde4c17649252e8
+EBUILD fastimport-0.9.14.ebuild 744 BLAKE2B 6fac364a7d842ac9b7a3e250c9b69e96e1f83e0c95bba392ff59932ce6096f46e3a481489412fce9254b027638cccaab4e323181c8d53b11d007d628658123ef SHA512 de460c066edb3f795c4baecda36690350132989fd6d8758a4201af58d4930353417d17709e26b2efb6418bf7ba5bd8dd54c996b104bed2cf0806b68aff2ea70a
 MISC metadata.xml 510 BLAKE2B 4a5fb1bbc975e2ea96ba006cee969224dc838dc670338210a95630dd61b3e4fda8e9d0da833ff0afbd68900f50a3cec06bd768f41c013f843ebad1e38ec9c095 SHA512 a7319e71da1dd95051e339715b4359e0a99ae1de246ce64094222013eb27cc2e04aee484629aae172ddc26e594b8dda717f8726e5c4ebcb46e351064169151a4
diff --git a/dev-python/fastimport/fastimport-0.9.11.ebuild b/dev-python/fastimport/fastimport-0.9.11.ebuild
deleted file mode 100644
index 59fa4261dccb..000000000000
--- a/dev-python/fastimport/fastimport-0.9.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index f785e8ef6c57..804e761483d8 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 29dae96dbc78..8aff13cf60a3 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1,3 @@
 DIST python-fastjsonschema-2.15.3.tar.gz 389350 BLAKE2B f9ab32666fce1ba44a11cb981f4f301d7d55260767ec71aefa54ad6bcdd5b8c3d246656908dcd50e909257b35bb9ee24eb34d5ce7fe0f91501127cad412a7e1d SHA512 59dfc513de46e9df790edaa1abc994decdf98d65bec8eb8a6ac7211d2277f4e15d521a308e45c6532a232321d8a4655f87b7a01f2d57b9de20246a4d6deeeb9b
-EBUILD fastjsonschema-2.15.3-r1.ebuild 674 BLAKE2B 6adb6cd1a8691b223d1cf1d1adb3e451a07979aee0aaf9b35a8867234f949ba514d3312af16c3dc213f5d40e8e2d4653e0702e7642506b9eac7dcbfc35b7c1af SHA512 92bc1cd5f8792c72c04f52260c900ad6e49ea4dc5a767dc54091152ea61a048bc6e60db8de142726990a281113121c549d6acad249e5b91700c2bdccd47ae957
+EBUILD fastjsonschema-2.15.3-r1.ebuild 674 BLAKE2B 3299d2762b7976de30b4964bc71b2142d504e58612a2d3d769486494a903d3559db49b20be3f2deb37279b5ab167cd2e48070cbecd4b2715ebfbe060cdb27db5 SHA512 28261c25d7dc334eb2eb82eb3e8bdddcecbfc52b2bdd1af3529847197e871cb340dd40fb3fd8f15b7eb581ca6b0adc9940e42cbe46a6c80d0824f7f77ab602ac
 MISC metadata.xml 320 BLAKE2B 6a243ee36316e1c8db01ec6da04593ee4edb8cf479e829291e74c5672b5dd419cf9a3528c13dbd540342377186130a49be652e3f8c1cf78feafd310dbbd3bc88 SHA512 0c0dff7e564b1c1176e05a49c0c028ce181497bd734a1c19e24d8af7169c16d8b5dccc73cc31379c28ce0e58d1eb142d131969719b1c8fe6df3b76c59b4f3a3e
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.15.3-r1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.15.3-r1.ebuild
index cb3ee11974f3..8998ccbecf1d 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.15.3-r1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.15.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index c914a3fc8e53..5721e555a67d 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,3 @@
 DIST feedgenerator-2.0.0.tar.gz 23093 BLAKE2B 9f8a597028303f86eaebc0e8e34454dda135a5d62000c4ff6b30fc5baf872b924c3bbf9a76d07817742255305d9a681a25693838992170068e4cd6af540840fb SHA512 1f53077e4c757059947a487a1aa7ca8cf28545bc86f1bf3c8fbe515615f83ac4c48de5c22dd020f28c21ec6549d7f9971513f3de450bad7d4efbe0a0e444b0fe
-EBUILD feedgenerator-2.0.0.ebuild 512 BLAKE2B 3be16300507333f0645fd6a424a68ebf658e7bf572b69b4076221edbf6e0c903f955facee6b175a195d2ab0926ff2fa7744097779c02e7872af167382e52f757 SHA512 9d197ac62e0ec416b475529bbb8085739ddeebaa8bfd48c690d9c9b2efdeae55f84a4849ba09417bc79aac0352c89d31e4be0ba9a6d23f3e1b72a5a0da397cf4
+EBUILD feedgenerator-2.0.0.ebuild 544 BLAKE2B c9633f8b761c5b2115ebf2da46ac11c87a86a6bec0de6a5d4f386e5f3f62ddadf290db9d41d93f09a5999dbeb84fb90265aa0e7fd06ac11034a2652c73bcc45a SHA512 762028195ebb600cba4ea2e9cc3f8800468fc2807502dee43c67e312a118dc35a3990b2e955276cef44390c97b2d191159c5207efce815c0d794f5524994807b
 MISC metadata.xml 477 BLAKE2B d167790f82aef2a2aec5ef6d351ef3e003d0c5db5e69a2ae78aa108ae4c8ec006f0983eda0d6855ccb11b91218b2dbe7abeebd1bc2428b8a79464eb96c9ba5d8 SHA512 2fa5b9046cb30943e4c511c220a302250355bd60b0285be7de6342cc7bd271df824e3fa73a62efa2998ee9cbbd08e45b2071214e56de053bd583f6d85c41460e
diff --git a/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild b/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
index cca9c910481b..bcf18ce3ac51 100644
--- a/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
+++ b/dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Standalone version of django.utils.feedgenerator"
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 55777e7620fa..bb979c8f4c36 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,4 +1,4 @@
 AUX feedparser-6.0.8-fix-py3.10.patch 555 BLAKE2B 20ff9ae0e540bc2dfbb2d336a12804c444f99f9249e4a4f4aff241cdb3e927aeb8c64ac5eb410b273f7628f5fa4bebd19dc26776ca0ad65a591e493197884c25 SHA512 6a663180a185e5ff915bf5f45220e08ef58c2bc8253e7d943cbb065c202b611dcd1cd6baeef26d9ea6487679d69b3449d2c5f7d6dcc6044e19df52650190c1f9
-DIST feedparser-6.0.8.tar.gz 252496 BLAKE2B 1a17ef6aa41e0782743d5d331ba26e2d1518475534adcd62457bc6fab00b93e24a3a3b03f4acf8358d321464b985c9d09383dc0373680577c10b742c5e1366fd SHA512 9de702dbebe28b379fd164afed8c408f46301f3ebf91d9f862f12de98a1bcee9f6d38a27c0b8a64e87bc0a20d0ad992ed78b190406649f775e2e8c9ca62b4d8c
-EBUILD feedparser-6.0.8.ebuild 983 BLAKE2B 2a47b43d6bcc59e1c5ce698a37a06b707d5290b0eea0147124e6704eb95b4c01081c622461e643daa046938ccc9ecc68b4d8b4ef8eacb7b45a96e25ddc77a19a SHA512 1d4dd599df9cdb48d064269c65d1b99c8b089d52cc32189a54dc78964b85fbc6a07a8e63254194d3f776a10c4c50781e7134d178661165ad66e082b8f304df77
+DIST feedparser-6.0.10.tar.gz 252872 BLAKE2B 5c3b32d264bd00225de20c56c664f369516ead06b33ed1f2ae4123002297b12cc78c2680366e125af1762e53cd4452f2070e5e726de2f0c9ccd71c78cc5ab3a2 SHA512 92f5608d1a12172bc1524d5c8caa75f1cc1a6d7d3456ecd585e6715209cdff469b775c677b8393e1d1e1a895b857fc3c048c36fb83b215308b707a1f71c6e9d3
+EBUILD feedparser-6.0.10.ebuild 1005 BLAKE2B d106e64b0c0675e81477507c2689eea5376213fc1b01dc833934fe803c5fe288682fe2e05722583b68bc11efb0313094a558df65c948b03703e501d04c424063 SHA512 d3ad898aecf9800689bf7864bd40f885033919431bf1952ac744a3f35665bd580a2a00494fbfeb757473d7bac74052bfcc7ef3a035b4e6b7d0c12f98c5555499
 MISC metadata.xml 468 BLAKE2B a0ae044ea5e9b15c43bea0cd38f3641522a2e911193fa8452cb2919e299b40d4410bc23f056a2070e23929610d3c4dedc2b20828e018a031e079281ced62f753 SHA512 a03a6e5a92cf9e18552c9c3a753f4560add583579c6c8bc912732f4c0679a417b195db56e5224927b086f84d9c7eacd8e16ee58f4017dc014f8a902d1a1ea2e7
diff --git a/dev-python/feedparser/feedparser-6.0.10.ebuild b/dev-python/feedparser/feedparser-6.0.10.ebuild
new file mode 100644
index 000000000000..4dd596ddabd1
--- /dev/null
+++ b/dev-python/feedparser/feedparser-6.0.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="
+	https://github.com/kurtmckee/feedparser/
+	https://pypi.org/project/feedparser/
+"
+SRC_URI="
+	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	dev-python/sgmllib3k[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/feedparser-6.0.8-fix-py3.10.patch"
+)
+
+src_prepare() {
+	# broken
+	rm \
+		tests/illformed/chardet/big5.xml \
+		tests/illformed/undeclared_namespace.xml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/runtests.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/feedparser/feedparser-6.0.8.ebuild b/dev-python/feedparser/feedparser-6.0.8.ebuild
deleted file mode 100644
index 9a502116bdff..000000000000
--- a/dev-python/feedparser/feedparser-6.0.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="Parse RSS and Atom feeds in Python"
-HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://pypi.org/project/feedparser/"
-SRC_URI="
-	https://github.com/kurtmckee/feedparser/archive/${MY_PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken
-	rm \
-		tests/illformed/chardet/big5.xml \
-		tests/illformed/undeclared_namespace.xml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/runtests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index a58b5caa8580..d10be1a0d988 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,5 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
+DIST fido2-1.0.0.tar.gz 245631 BLAKE2B e9ee319c19a9d4b687958ee2f9b2b809b8fa1d41bd278bbd7e26a5bbcab51791d6b8565dd6cdb6abf6804db4604f4b02e2d7e73cbbf2a237d72a0679c3ebcf49 SHA512 778128fb4fd459bd096eb440034a08c8883bfd29dbe834f3affb451032a5d5a22c79ca71be257b3c333a9d9890602558502848e83cd3efab4b6d6762e0622670
 EBUILD fido2-0.9.3.ebuild 1345 BLAKE2B 4c477249eede6dd1fd6cd1856af5766e95aac6d007e2de65c72688422ae1905e09afb5fb646a1ed78a5409990c127859f96aada6210212c53c723316f39ac133 SHA512 83975e9bb7f1d97b4142974fdb01e3d83fdd8fab874cf1b1a226e296f0976bcd35d7dc96bcf1c1d049e4ed478d037a3a4027f1c9ca0613b398e134ee94e83b82
+EBUILD fido2-1.0.0.ebuild 961 BLAKE2B 1d18b41fa0295b06a26e61e338b376c01f200299a0d212c58ce167fb00d157d750c822624603d3bde0579db20e9bf0d70e2abed029b764b21678fdf3b83c8c87 SHA512 9184ce099e83bced60aefb4c3bce99a9fe58143f759d96cd55e8caf20d402aab18a9947cda4ae52cc3f0d9f4d8583e5ba2cf302bf74629318bf9ed27897b7810
 MISC metadata.xml 820 BLAKE2B 092fc3aa0dc3e3a8998e7cef0a3229d5b8791983dc07df84c74ff6b7221afc879aa5a39a6ad58ff0bfe2836fa48b57d3445f20a0c78e2affc3bc47b73b81544b SHA512 f588e6637d75b668dabf80fc2c8e1133119a770d4f7fa5077025e0a478f8eb9c7f18eac1ce15395549485625bc4c82bdeebf07440087cd074e95d42a685eef53
diff --git a/dev-python/fido2/fido2-1.0.0.ebuild b/dev-python/fido2/fido2-1.0.0.ebuild
new file mode 100644
index 000000000000..a8edab7138a3
--- /dev/null
+++ b/dev-python/fido2/fido2-1.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..11} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0/1.0" # Bumped every time a backwards-incompatible version is released
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="<dev-python/cryptography-40[${PYTHON_USEDEP}]
+	<dev-python/pyscard-3[${PYTHON_USEDEP}]
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index fa81391995e2..852530d49fc4 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,4 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0-r2.ebuild 826 BLAKE2B 509808c9103227451d6e0e66308532a00e257cf260c6e85139b78d215c1eb5bdf0d22e7cc8fcd4e46910ad4c320210ff806a5fdb14ccd5541f03bab2ec4c9385 SHA512 c4f24aff4e2e638bc4852f8c8011993f2fa55c7695827674e207d4a6a42a4f93542a0f083ff8e92a11eacb5ebd2f94a266307564fa78d778601377638caeffbc
-EBUILD fields-5.0.0-r3.ebuild 905 BLAKE2B 25fca6fb38d9706dd3121c3519c59f7383b74b84f09e80b6a3a6957ae341c14d27ea94ad1f43226d17894738c1918cce56e3d77d0c0fbd9de6092bc0c140bffd SHA512 db740d66d5e5b70fd5f16bcb30cd289e6fe65dca3a9865bbe0c7a8de674334277092f268b9f5f64e4ddb7f5bc01c6083e35c0d78467211adc296bb252a2a8561
+EBUILD fields-5.0.0-r3.ebuild 898 BLAKE2B 4a8d4a78b9f8cd8355aad251857bb81d05bb3b1359e8228909a06ab19909f23626ccb8c7d1fd9b6cb25df4f801257b7d6fa3cbdb1c3409be7291fc65b0613831 SHA512 c13a5eb8068408f45db31388e332dde2baf3cd5aaead5ffd21762dd42b6a0bff1e98e20974678e6eea441b573c93ae1f1cde32c6b35100b3ed8063e3d8800e1c
 MISC metadata.xml 395 BLAKE2B 8c4172bfb3d5f625120ba446c998d4641bc8e6177c4fa91c6efd141facdc9a6f5519ebb991eb571946f51156b7095333a8262fcf12b2401108c8ef3e1f0aac9b SHA512 388901683dda3121cdbcabac4370d7b45d50ae5b8c64bd282855953c111e1f10aa8099a95007bf7e6f0a3d03ff26dbc20e1233b8741863f23057d62f8853fd36
diff --git a/dev-python/fields/fields-5.0.0-r2.ebuild b/dev-python/fields/fields-5.0.0-r2.ebuild
deleted file mode 100644
index 328f3eb4d776..000000000000
--- a/dev-python/fields/fields-5.0.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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="Container class boilerplate killer"
-HOMEPAGE="https://github.com/ionelmc/python-fields"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/characteristic[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -r \
-		-e "/--benchmark-disable/d" \
-		-e 's|\[pytest\]|\[tool:pytest\]|' \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest --ignore tests/test_perf.py tests
-}
diff --git a/dev-python/fields/fields-5.0.0-r3.ebuild b/dev-python/fields/fields-5.0.0-r3.ebuild
index e1b2cac8b857..00ebdac70580 100644
--- a/dev-python/fields/fields-5.0.0-r3.ebuild
+++ b/dev-python/fields/fields-5.0.0-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 23c4adde55ce..dc00fb097bd7 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,3 +1,3 @@
-DIST py-filelock-3.6.0.tar.gz 204238 BLAKE2B f65a6e8ca8645dbeaf5ebbad00a8001cd88065da997097ef2ce74b5eee4dabfaf44d53a240498e82905589943f045422b44776c3b8de3077656a3b9612396156 SHA512 f55ad90d79e90eb5a915afffecc632566456604a62b89fb13304c5812e05a34c508c863e76246a254acd98f55930d3179b0908a06d1e5a203d578a826a048ae2
-EBUILD filelock-3.6.0.ebuild 780 BLAKE2B 519660d5bbc19b0c7e2fab334d5c567f3c2093a73e0cd38dbac68bf462bff14f5544a389fefab07bf0685685dbf28a6f2e77a50810f2ac3d01b63302ae9a71af SHA512 85084da031422b1fb024dc11f7da1b57ff4e29092f06fc5cef8d1403ad9c5aa26e325ef5693556460045288602e0839917d33450d22afd4214074bbb2aa67a2d
+DIST py-filelock-3.7.1.gh.tar.gz 204373 BLAKE2B e3ef657488a68caf8dc8158d5060a07447b74b53b26a2ad05eb67211a5ae7ef5deadeb8527cb6cd95ce225e0fcd29a0ce2dd53b68b7e2cacde4c0f2242966b21 SHA512 66708398ae3c4dcd97a6031feca6a1b7d1010a5ee605c5adce29a9cfabe67c5464eefb3812c66e2c32c3547240fdc7acac6eec25cc8dfb2d5255079c5e6b44b4
+EBUILD filelock-3.7.1.ebuild 783 BLAKE2B 53160203c699d14062b0d0a4a504a15b1de07e02bcd881f2bb8ace6e39fd640c0af0caad548a9e5e21c11d5444bfa6e3958e938f60dc62013f4147d137172af7 SHA512 cb26dc32c6c44a1dbe237bc217d7ae0dc015e26b4e4716d5992930a29382c762f4aa59b6b374ad8cc1a374cb56d3a794bfdee123318f3f30f9ef2df573276feb
 MISC metadata.xml 373 BLAKE2B 8923cea15313a2a4cad1af3e5e6c5623ac9855d3de37b6e43ff5249504d2bf07e1e334ce6ea8d9c397e03e3a05585cec0233e841a0a9f6c30d43eaa26b488933 SHA512 c114595146c326243756d0053476677b8b8c7541a253a0c739827e9b0f93c2a695d7289ee5a17c4a1a79639c02bf1396d2df4d8e20aaac9402c9d80f55be2f7b
diff --git a/dev-python/filelock/filelock-3.6.0.ebuild b/dev-python/filelock/filelock-3.6.0.ebuild
deleted file mode 100644
index 618da9440f4e..000000000000
--- a/dev-python/filelock/filelock-3.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=py-filelock-${PV}
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/py-filelock/
-	https://pypi.org/project/filelock/
-"
-SRC_URI="
-	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filelock/filelock-3.7.1.ebuild b/dev-python/filelock/filelock-3.7.1.ebuild
new file mode 100644
index 000000000000..3ebc63a65960
--- /dev/null
+++ b/dev-python/filelock/filelock-3.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=py-filelock-${PV}
+DESCRIPTION="A platform independent file lock for Python"
+HOMEPAGE="
+	https://github.com/tox-dev/py-filelock/
+	https://pypi.org/project/filelock/
+"
+SRC_URI="
+	https://github.com/tox-dev/py-filelock/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 46cdd1b18b30..a0d599546b37 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,3 +1,3 @@
 DIST filetype-1.0.10.tar.gz 804374 BLAKE2B 51735e8810be7f4fe9aaac1ec5305ea85146b5c540a1aaad795a287a4570abb22d131a5fd1444c83e3e747424938242dc8733d2076019a963f6947e4f5981db7 SHA512 a6455b8d11ec56dd3d041b95e1226a5d0ecdee21ef590997e93611d10184ed29137c9f3bd578313a25455010da8f21950420b29ecd9e6ddb5e363051a9fbacc6
-EBUILD filetype-1.0.10.ebuild 519 BLAKE2B d7e6183fed85636268c68d7e91cb76953c7b1b5ec041ea489948acd9d84eaaab8f8fd543cbd4f3ab91e37fdd517fc5e4a37659645c1159b3e635c973e1a10e83 SHA512 c6e0696d17c62560612d033bd2f1759bd6b8c80c4d36b1c2bed0fe2c8ceb322e025459e4c1f1708487a1b27b3ea3bb97bdd50d710f860d0492df1e8c9e84c47e
+EBUILD filetype-1.0.10.ebuild 519 BLAKE2B c87754c71d4d0597e1e4f85d16d833d5782167a1cab998e2430e1506cf27947f9242fe8bde986ee3ffa1bdd7bad2b87887ac580cef2da727062ab6f54a124019 SHA512 91209956eb9f16e2a2e47eeb3b4307ea15a17b77526967dc2866fcbfec2ff24f248aa517034c0aa83079f703fe820feb5f86f5c643dd29b744189264b70e73f7
 MISC metadata.xml 502 BLAKE2B bd79ec6c9e78732f89f64aed99872f5b31a7e75ba4dae7dc184be3e38937e90ea5366cedbd348cb878fd3e604a255559069d33f060ad788d9ba4e3b3c11c2eb7 SHA512 56fd6f66510f365f4111813f64abe9c9bb63f0354ad6e5919ed7c6597665ab9c1ef42f08d207144d16c3c68ad2ad59db06acdce7f3473f6818162efdb0291c67
diff --git a/dev-python/filetype/filetype-1.0.10.ebuild b/dev-python/filetype/filetype-1.0.10.ebuild
index 1caa25aaa615..d4094edb6538 100644
--- a/dev-python/filetype/filetype-1.0.10.ebuild
+++ b/dev-python/filetype/filetype-1.0.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Small, dependency-free, fast Python package to infer binary file types checking"
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index 3bed61d6a221..af8a4fb3313a 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1,5 +1,3 @@
-DIST findimports-2.1.0.gh.tar.gz 34252 BLAKE2B 3433945b3c55f5607b5bd9e4694761b0d06c708d7873c8204d2b0bb14e15e0c60bf010e0dd30b336857891199d4ac5f1133a8ec6f3d4c37c1337f85674aa2704 SHA512 5a86d291e5888e15d612d06d4a94c0f08800a26d4ffdff4b485eb8cf1a10ed38883db2d79c6f73e6b2680cc1e5ffc51952c3405dfd4ff95716e0a2b2ac930a95
 DIST findimports-2.2.0.gh.tar.gz 36275 BLAKE2B e6a39620647434448d68f30e3cf212188bdc35993c1a2841614683273d41eb572b5a123ea42f1eff3730a2ba02055a2afdeb2607538dc0c3b55f38430e38581e SHA512 807d07b0cd5c1ba66d03121ef83a85291b84cf15b798074c39fc0858eeb7f36a77a787724b8072a9897186647dc92abca793ec6fa96f4448eb16709448364ec4
-EBUILD findimports-2.1.0.ebuild 443 BLAKE2B 6ae8ac13810f5fd3c89f3158ab0ec4498dd80e11c103819f5c0048ad45092f30dcfaca9749e958f673c55588222866fb630b3106f4d788c67df66a5a8944752b SHA512 0c1e87e492c370090fc409f5434c49fbb91507b0f33baa710d7758ae0248a0423cb86d8442b282cd79c0ce72f919f91daac6b0d98e0c1af9e698ff01bd02d001
-EBUILD findimports-2.2.0.ebuild 443 BLAKE2B 73a899a8a5f934a6249dee70c8d2555b78588011a41192a4fd62a6491dc3c5643483d83ecde49829b012bf5698b62892220e49a9dce56185e9e19bc0bd7273c0 SHA512 f2603d97632491fe9650f01f720dad78dca064ac45c3d92058ffba01077db980828bb14dc139198513b4a81f73140c203f27d99e591ac408507c24226533bab2
+EBUILD findimports-2.2.0-r1.ebuild 543 BLAKE2B 6c5ebbf9f9300c6682e00d6465ec2181b1b26f8fcbaaa55579e90f17d4fc6fe7457f25bff27d9a99666a341131ab55aaf6235b7caa827ac3694d0347e041fafc SHA512 a86d3ac2759b24a8c2732ed589a13c2ed81b6ddc2a60edcab58a5ba9c3f6b9f0643cdc33ed8775b7b0a77c7eb309438225bdffe6dc641142d92fe0a28a96eb33
 MISC metadata.xml 322 BLAKE2B fab9ee7b0dc462a2c034e3cdfc0f5d5b3d6486218515a0e18c8348491f89c5164f8fc7e7878bac35ef15a7aa0483b0064f467ab0bab9ff355f9c7996de97c400 SHA512 df594d456e3f7a5387ce1d3f018dc8467e38cb7820f30c64db7988499d1b35ccb301ad6798796dd7dd7123d1e598c8bea81e84f8fdef662fc8e025cf3cb2fa7f
diff --git a/dev-python/findimports/findimports-2.1.0.ebuild b/dev-python/findimports/findimports-2.1.0.ebuild
deleted file mode 100644
index af4535f46433..000000000000
--- a/dev-python/findimports/findimports-2.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module import analysis tool"
-HOMEPAGE="https://github.com/mgedmin/findimports"
-SRC_URI="
-	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/findimports/findimports-2.2.0-r1.ebuild b/dev-python/findimports/findimports-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..5515ad8014c3
--- /dev/null
+++ b/dev-python/findimports/findimports-2.2.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module import analysis tool"
+HOMEPAGE="
+	https://github.com/mgedmin/findimports/
+	https://pypi.org/project/findimports/
+"
+SRC_URI="
+	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" testsuite.py -v || die
+}
diff --git a/dev-python/findimports/findimports-2.2.0.ebuild b/dev-python/findimports/findimports-2.2.0.ebuild
deleted file mode 100644
index 396a6e44f8dc..000000000000
--- a/dev-python/findimports/findimports-2.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python module import analysis tool"
-HOMEPAGE="https://github.com/mgedmin/findimports"
-SRC_URI="
-	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 38aea580f3cd..d9c2ed42883c 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,6 +1,5 @@
+AUX fixtures-4.0.0-py311.patch 5084 BLAKE2B 6cf7ec50b13ed6a76dcfd4f6b4a3c5dfc0062bcc3895811e1c26d156d15045c307f4e3050c086c0bb71b772f16dcd4f135126a6a853d622a5bc24f0c67aa11dc SHA512 99b7e5e3c26f58ce07b308cf4a53e2f90294b3a2fb2748276e882d28fcf4cb6ea5b0406beb6d3a920e775bb982cd6708b2852429b4e7676b9d0e9bd4849c516a
 AUX fixtures-4.0.0-pypy39.patch 2158 BLAKE2B a46f4983224a28c9ec5c8cf40565fb9fb744b00435f68e632a0f95b447eed8fce2776e8f1639fa8b50d92eec3fc5a0550eaf30eaf99f082fbaf49def1475df40 SHA512 d94427b5c8d44295311849d9c93271edf829393a30ab98030e0e0270b6fcbc10467e000f50ba8dd863845e12fb1958405ea1bcc6d0ecdaa56f7ca0e628eb5013
-DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
 DIST fixtures-4.0.0.tar.gz 56786 BLAKE2B 7fa8916d3e384a47c967b51ffeebb81c50c4be7432601aa94f220b6ae32ed189f16750cb126c2925995c2e945684c48041014a97902145343527e8856125b61a SHA512 dcd67c3df9efc16f2a21b6d2917a5b7e45ecc09d1ddbd1de98a5b4b717ea7da0fc82e1054f494255b419a792e841145110c77a1772444f4019fc02e9917c5b80
-EBUILD fixtures-3.0.0-r1.ebuild 1152 BLAKE2B f5cf9e18f9fb9f77c9e2542e7e9d5f903ed5b2516df3ca6d3f85ea4396f79b36eeb3abdaf5e4047dbe31423b1ca09bb6511c7c943006d6f222eac053eccbdb86 SHA512 82c9bf8adafe1b3d0e3c1e74355924c2cc6db37c4afc2d9037440a428f25e147c3fe2ce662f19c88a7e559e35b0a9c5ab20b46a97bbcc184ec80d67d8154b4b9
-EBUILD fixtures-4.0.0.ebuild 862 BLAKE2B 5529b317a8dc6efc0ecf6a41fa14b45ec593d36fb22b64bd11b3e16910427806c553d08969471f75774fb238df9121f95a316f14c9772a9c90f29acdeb301de3 SHA512 193901ee3ebf565c88edb83e58bae3971a7de9b62cde4f1f525d48dc1f052265db1496c6a3f9d2261bdd7382c4891549a07e25f42045e09fe95ed3ec8615ee90
+EBUILD fixtures-4.0.0.ebuild 848 BLAKE2B 5937eee87567b573377df40ab2a7e6cda7f68b481a67a9b93153fdd4fb248b74882d37b2c6ee016d0e98c4c70711da49904c4eb98218d562c45c964c08a95083 SHA512 901a2eccb8ee1bd1f9fdbf449a1a9745ebe1efc88252591d2db8c8a523f1f3e1bd96e89a6789b0cdadc41bdae8434a8581a68d94d5a22129f29c35e875fed406
 MISC metadata.xml 914 BLAKE2B 402ef182133763f0b36e4653622cd9ef0bfa1871b05518aaf01701f1c57665ce358d002dc6e638ebd224225069a5b57877ff393567db7607dd0496a872edb2e5 SHA512 368e2a3587fa361618e5208f4c34a15a223bcdc2597dcbd25f5ba8ca74e67a0de4abb1f690f853ca8059df22eee61bf259e974aa92b1e8050435099d81a7a0db
diff --git a/dev-python/fixtures/files/fixtures-4.0.0-py311.patch b/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
new file mode 100644
index 000000000000..6cda1104afca
--- /dev/null
+++ b/dev-python/fixtures/files/fixtures-4.0.0-py311.patch
@@ -0,0 +1,116 @@
+From 54ef596952d459d605fcb40f13bed6d07ef93f4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 21 May 2022 12:15:21 +0200
+Subject: [PATCH 1/2] Update classmethod expectations (again) for Python 3.11
+
+It seems that the classmethod behavior in Python 3.11.0b1 is back
+to the one found in Python 3.8.  Adjust the test expectations again.
+This time around, we expect the "old-new" behavior in CPython 3.9
+and 3.10 only.
+---
+ fixtures/tests/_fixtures/test_monkeypatch.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
+index 08cd1c8..fa08b24 100644
+--- a/fixtures/tests/_fixtures/test_monkeypatch.py
++++ b/fixtures/tests/_fixtures/test_monkeypatch.py
+@@ -24,7 +24,8 @@ from fixtures import MonkeyPatch, TestWithFixtures
+ reference = 23
+ 
+ NEW_PY39_CLASSMETHOD = (
+-    sys.version_info >= (3, 9) and not hasattr(sys, "pypy_version_info"))
++    sys.version_info[:2] in ((3, 9), (3,10))
++    and not hasattr(sys, "pypy_version_info"))
+ 
+ class C(object):
+     def foo(self, arg):
+-- 
+2.35.1
+
+From 48d8626168a374c099fa891d7e734548e1e03683 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 21 May 2022 12:25:49 +0200
+Subject: [PATCH 2/2] Support Popen's process_group argument from Python 3.11
+
+---
+ fixtures/_fixtures/popen.py            |  9 +++++++--
+ fixtures/tests/_fixtures/test_popen.py | 14 ++++++++++++++
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/fixtures/_fixtures/popen.py b/fixtures/_fixtures/popen.py
+index ffa9bf4..a099854 100644
+--- a/fixtures/_fixtures/popen.py
++++ b/fixtures/_fixtures/popen.py
+@@ -131,7 +131,8 @@ class FakePopen(Fixture):
+         restore_signals=_unpassed, start_new_session=_unpassed,
+         pass_fds=_unpassed, *, group=_unpassed, extra_groups=_unpassed,
+         user=_unpassed, umask=_unpassed, encoding=_unpassed,
+-        errors=_unpassed, text=_unpassed, pipesize=_unpassed):
++        errors=_unpassed, text=_unpassed, pipesize=_unpassed,
++        process_group=_unpassed):
+         # Reject arguments introduced by newer versions of Python in older
+         # versions; this makes it harder to accidentally hide compatibility
+         # problems using test doubles.
+@@ -149,6 +150,10 @@ class FakePopen(Fixture):
+             raise TypeError(
+                 "FakePopen.__call__() got an unexpected keyword argument "
+                 "'pipesize'")
++        if sys.version_info < (3, 11) and process_group is not FakePopen._unpassed:
++            raise TypeError(
++                "FakePopen.__call__() got an unexpected keyword argument "
++                "'process_group'")
+ 
+         proc_args = dict(args=args)
+         local = locals()
+@@ -158,7 +163,7 @@ class FakePopen(Fixture):
+             "universal_newlines", "startupinfo", "creationflags",
+             "restore_signals", "start_new_session", "pass_fds", "group",
+             "extra_groups", "user", "umask", "encoding", "errors", "text",
+-            "pipesize"]:
++            "pipesize", "process_group"]:
+             if local[param] is not FakePopen._unpassed:
+                 proc_args[param] = local[param]
+         proc_info = self.get_info(proc_args)
+diff --git a/fixtures/tests/_fixtures/test_popen.py b/fixtures/tests/_fixtures/test_popen.py
+index c7bf1bd..e9ab074 100644
+--- a/fixtures/tests/_fixtures/test_popen.py
++++ b/fixtures/tests/_fixtures/test_popen.py
+@@ -74,6 +74,8 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
+             all_args["umask"] = "umask"
+         if sys.version_info >= (3, 10):
+             all_args["pipesize"] = "pipesize"
++        if sys.version_info >= (3, 11):
++            all_args["process_group"] = "process_group"
+ 
+         def get_info(proc_args):
+             self.assertEqual(all_args, proc_args)
+@@ -110,6 +112,15 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
+                 r".* got an unexpected keyword argument 'pipesize'"):
+             fixture(args="args", pipesize=1024)
+ 
++    @testtools.skipUnless(
++        sys.version_info < (3, 11), "only relevant on Python <3.11")
++    def test_rejects_3_11_args_on_older_versions(self):
++        fixture = self.useFixture(FakePopen(lambda proc_args: {}))
++        with testtools.ExpectedException(
++                TypeError,
++                r".* got an unexpected keyword argument 'process_group'"):
++            fixture(args="args", process_group=42)
++
+     def test_function_signature(self):
+         fake_signature = inspect.getfullargspec(FakePopen.__call__)
+         real_signature = inspect.getfullargspec(subprocess.Popen)
+@@ -130,6 +141,9 @@ class TestFakePopen(testtools.TestCase, TestWithFixtures):
+         fake_kwargs = set(fake_signature.kwonlyargs)
+         real_kwargs = set(real_signature.kwonlyargs)
+ 
++        if sys.version_info < (3, 11):
++            fake_kwargs.remove('process_group')
++
+         if sys.version_info < (3, 10):
+             fake_kwargs.remove('pipesize')
+ 
+-- 
+2.35.1
+
diff --git a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
deleted file mode 100644
index 2f2791853de5..000000000000
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="Fixtures, reusable state for writing clean tests and more"
-HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.org/project/fixtures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# nose not listed but provides coverage output of tests
-# run of test files by python lacks any output except on fail
-RDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	# broken on py3.9
-	# https://github.com/testing-cabal/fixtures/issues/44
-	sed -i -e 's:test_patch_classmethod_with:_&:' \
-		fixtures/tests/_fixtures/test_monkeypatch.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/fixtures/fixtures-4.0.0.ebuild b/dev-python/fixtures/fixtures-4.0.0.ebuild
index 25709bab8188..75916b42f6b4 100644
--- a/dev-python/fixtures/fixtures-4.0.0.ebuild
+++ b/dev-python/fixtures/fixtures-4.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=pbr
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-5.7.0[${PYTHON_USEDEP}]
@@ -31,10 +29,9 @@ BDEPEND="
 	)
 "
 
+distutils_enable_tests unittest
+
 PATCHES=(
 	"${FILESDIR}"/${P}-pypy39.patch
+	"${FILESDIR}"/${P}-py311.patch
 )
-
-python_test() {
-	emake check
-}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 6e7acf87b410..7d0c86b58eee 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,4 @@
-DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
+AUX flake8-4.0.1-upgrade-mccabe.patch 321 BLAKE2B 6febcff41b8064731f3a91bd9785516ce9534c5e6687404262df4eb984011dafe17ce8164a886d11ed0e4b795c475bdcc52e38db0b9e95ba3b36cecd4a0f452a SHA512 621771fd1976172caf2a6f1942821097ac50617c07cfa9a20f4d4b4ea24b8bcec0a41d81b6e49fce2405a6cca8b15dd513d6bbf41e186175b1aa21e30076b123
 DIST flake8-4.0.1.tar.gz 154905 BLAKE2B b93fea36236881da595ae924b056686e0cd35d2466c1858e3ee83262922df8bc38cf5cd40a910980d287d048572dc94eb8d7c8ee4b11ebd1b4a474dfca02490c SHA512 0bdbf0218ce893df1c3e61f51cd3f371a5c72bb49ef78fec39548b1684e49b024e91cf4e3dcea60ba1efc08727985ef485814c372461e062ff4f810da99a1796
-EBUILD flake8-3.9.2-r1.ebuild 1074 BLAKE2B f1e62693829de7cf5293bb2a437c1c9f4fba0b6732d4b96308bfa20f6e65d6e7ee0de4fc81b09de6058a1dc6395041c1e3c615f93a07e80d9673d74502c837db SHA512 c3ab57bf570bceb3d1060ddc7fb44dd528c1d12b56439f68d08bd6060a9566253fca54c2c6bb34e5d0e51850246449ce60a03c21c59146442ca15d1cba2f0988
-EBUILD flake8-4.0.1-r1.ebuild 1156 BLAKE2B 91bcc9eafde77ae2e650db55a9f27850439ab32715229480b591227375666e621e783f318a54005e6a29c64f50addab3463d93b0130c8e3bd13ed1e2de94a0d2 SHA512 3eafc8d9cba7f26d1c1158224b9b03427daddebe1e17d7564499e7ef48889043fc835ef65ef3f31557dc811cc0d72df367d1ec59215086c5d81d6a0e6aa86354
+EBUILD flake8-4.0.1-r2.ebuild 1233 BLAKE2B 8b22865d9d36db9a860b4132b71dcc9ce9a4de8d00312538fe7f5880d70763a4300151379222d10bfffcbcae965533581096fd47b0bcb0a2d89337cabc44c8dc SHA512 d99542c787c24d2ea3473b3acaa24f0debf53a9b038d5f14374932efc1f760c68f1aa066729b4f60c0a55e75e7b0f2d260ab4867f85652065d294d0399b8e340
 MISC metadata.xml 399 BLAKE2B 70701bbf00aac5f16ae5bb241b56a69c79abe02eea8695d5cdf71fb427e5ed1f1e19dca0e77904889a99e22026b39d64c309d4072dc4175f7660e414aec3736d SHA512 98ef1cc82925436bd40fe18876be4ba3b8b5aee42e62e73406b46ac49cdd2c689a69e4e685fb5f69f5ea7fbf6335797dc059817f4cf36f51c73404255830acf9
diff --git a/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch b/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
new file mode 100644
index 000000000000..5dab4af913fe
--- /dev/null
+++ b/dev-python/flake8/files/flake8-4.0.1-upgrade-mccabe.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.cfg b/setup.cfg
+index 9cbc9b3..732d6a2 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -35,7 +35,7 @@ packages = find:
+ package_dir = 
+ 	=src
+ install_requires = 
+-	mccabe>=0.6.0,<0.7.0
++	mccabe>=0.7.0,<0.8.0
+ 	pycodestyle>=2.8.0,<2.9.0
+ 	pyflakes>=2.4.0,<2.5.0
+ 	importlib-metadata<4.3;python_version<"3.8"
diff --git a/dev-python/flake8/flake8-3.9.2-r1.ebuild b/dev-python/flake8/flake8-3.9.2-r1.ebuild
deleted file mode 100644
index ba315d7ed262..000000000000
--- a/dev-python/flake8/flake8-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-4.0.1-r1.ebuild b/dev-python/flake8/flake8-4.0.1-r1.ebuild
deleted file mode 100644
index 9cd00e96c286..000000000000
--- a/dev-python/flake8/flake8-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	# remove version-limited dep
-	sed -i -e '/importlib-metadata/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flake8/flake8-4.0.1-r2.ebuild b/dev-python/flake8/flake8-4.0.1-r2.ebuild
new file mode 100644
index 000000000000..330b48a50e31
--- /dev/null
+++ b/dev-python/flake8/flake8-4.0.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.8.0[${PYTHON_USEDEP}]
+
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${PDEPEND}
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-upgrade-mccabe.patch"
+)
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove version-limited dep
+	sed -i -e '/importlib-metadata/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/flaky/Manifest b/dev-python/flaky/Manifest
index 64f51d58f100..d30cef8c6b92 100644
--- a/dev-python/flaky/Manifest
+++ b/dev-python/flaky/Manifest
@@ -1,4 +1,3 @@
 DIST flaky-3.7.0.tar.gz 29591 BLAKE2B 747fbda71055bba937abf3e7b97691c1f4b222f085069d1815d5a9eba669464d2ed5d6dcf1842ae82f1970de5cd5e3aea5b12476bfa2d9282549ad0cc62901e9 SHA512 b399f6e1323d6ca341803ac6f1eb318bf24dc37182d0b49b89bb81b9466dd36271ad6dbb9f48ea6fa4760ee631f1482bb6f49c64f4d4520c40634089c1b64f9a
-EBUILD flaky-3.7.0-r1.ebuild 1291 BLAKE2B ce938c1587e4cbec678d2fd529d47d8ab768040f28e4fc9a2cc4ebefca52f2e4f2c8ae95c06f6fcbc9f45840a6181b7ae861ae8d860e0c801063eb14cd12b8b4 SHA512 38b154e82887bc7884d9adf77599bbff17b9e43c2d5bb5c0dcdb63f930b30979aa469199949c2a496a3de0ad13e8d86da54c5bf388e992258c1b8c105d3974ef
-EBUILD flaky-3.7.0-r2.ebuild 1487 BLAKE2B 29fae1f4fea3e2654ebe8b2166be4dc573c738870671588449f3649cd83b82461c6af7067dd0a0d0a394a995f6cbf03f2f5594a4995d3c07bcfaf3da240fafc1 SHA512 f6efb5c6b6191b2f543053ff955750094d3db32db5e32eaba65db0a6e5e033564121fcd5f6afcc5b2814d76ed8d89f3d91bc468743788752bd1b56a951c1430c
+EBUILD flaky-3.7.0-r2.ebuild 1479 BLAKE2B 30a25d9b52fb9b2f2cbcafa29ca36ef6d5c662950470a455c2ead011b8992404900bfee84438cfdcdc30a466bdbcae381ea0ee99d49ed31619473ebb06a22eff SHA512 9c57dc6148c02b85f1ff4aca73d5ab293418eaf10a11d88ee3283ee35b24fe4bc6fbd4c0dbf991f97d04dbd3d8286d9a93bc7e5f8aa6e6e4a37272885bdd6893
 MISC metadata.xml 395 BLAKE2B 06158c93157879bd7b181e833d84ea33a315103214cfaa54a092f965900f05f705183b74738543ac6bb83beb62de562a59ef43b734a74c9f3d0d5d677e8e00d1 SHA512 2d237ebccf03db7fc42fac5370f1046834646bdfc5755e2298e9cac131363e47e496d9d0f0d00ad914764bcbc2deaee8b7182ae3c32e18f95766351da50028aa
diff --git a/dev-python/flaky/flaky-3.7.0-r1.ebuild b/dev-python/flaky/flaky-3.7.0-r1.ebuild
deleted file mode 100644
index b55ec43961a7..000000000000
--- a/dev-python/flaky/flaky-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Plugin for nose or py.test that automatically reruns flaky tests"
-HOMEPAGE="https://pypi.org/project/flaky/ https://github.com/box/flaky"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/genty[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-python_test() {
-	nosetests --with-flaky --exclude="test_nose_options_example" test/test_nose/ || die
-	pytest -k 'example and not options' --doctest-modules test/test_pytest/ || die
-	pytest -p no:flaky test/test_pytest/test_flaky_pytest_plugin.py || die
-	nosetests --with-flaky --force-flaky --max-runs 2 test/test_nose/test_nose_options_example.py || die
-	pytest --force-flaky --max-runs 2  test/test_pytest/test_pytest_options_example.py || die
-}
diff --git a/dev-python/flaky/flaky-3.7.0-r2.ebuild b/dev-python/flaky/flaky-3.7.0-r2.ebuild
index b5f07b9b77d0..bcaec222a35b 100644
--- a/dev-python/flaky/flaky-3.7.0-r2.ebuild
+++ b/dev-python/flaky/flaky-3.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index d0315b5086da..46bd22cc12b3 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.4.tar.gz 43423 BLAKE2B 9aa6223cd29cd1ce3de0d8c8b771980457fa0ee76b7fd361b9b6d8ae79f521b36096b4d912281b7fe671655ac8c7b04032c68fcc59463c5630af073f264f5815 SHA512 0deec4b481876f4c76cde398157cd2bdc564e9d1076a7accf1720be86b41912466435412ad5f7e5e8b06f17ad5363ea503191b159b30625d067e76a45eaba957
-EBUILD flask-babelex-0.9.4.ebuild 872 BLAKE2B 325c0721619624dd02eafe7a9c1acaa528f9fbb4e6c8d38a2e45ccdbccb5f12ef1b046a070de66d140c203204512bb84486f3e004941bcaaf8703251763e787d SHA512 d7641f0d061f587852e69941bb553b2de2099b028e06e8ee67b6a3c2431302c538c09e30d7b0111a98fcfe881d25cc567ec35e1738b51d18162bc516efcd3a83
+EBUILD flask-babelex-0.9.4-r1.ebuild 1045 BLAKE2B fd7886d64dd5ea062a900b7d653787b57d4f844e983f3549aa281e25ae5a0b3a702f67e8691d71dea07fb491220fecef7a9b01f849670c7da66576c991099a72 SHA512 83e9ca4b6ba6bf1c031e69c41e1a48a726c9716ec13a22132f548351619388209d6a673d91c3d869cb3c545936e23652529b6107ee70957b9735f1940b18b578
 MISC metadata.xml 414 BLAKE2B 549d851f0776852b25bc89147081615a3790a8a0ad03e3fd1705c20ef2ad6ddbee54166c4762a5813beeda8e4a81bc15418d81c9785a77e43b28d9d401968780 SHA512 a33f1d03323cdbdcc19c8cdc2de6b7ddc9169d082a5295b151ccde0c3bea012b669d2888544d36e4740afd8c37bedfd3606b0e65c2123d1201c8a72ef74dbc09
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..ae08fa04ef42
--- /dev/null
+++ b/dev-python/flask-babelex/flask-babelex-0.9.4-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="Flask-BabelEx"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Adds i18n/l10n support to Flask applications"
+HOMEPAGE="
+	https://github.com/mrjoes/flask-babelex/
+	https://pypi.org/project/Flask-BabelEx/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1[${PYTHON_USEDEP}]
+	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	dev-python/flask-sphinx-themes
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.3-tests-fix.patch"
+)
+
+src_prepare() {
+	# remove speaklater dep to allow speaklater3
+	sed -i -e '/speaklater/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	cd tests || die
+	eunittest
+}
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
deleted file mode 100644
index 2b2f5f347a35..000000000000
--- a/dev-python/flask-babelex/flask-babelex-0.9.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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
-
-MY_PN="Flask-BabelEx"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Adds i18n/l10n support to Flask applications"
-HOMEPAGE="https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/flask-sphinx-themes
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.3-tests-fix.patch" )
-
-python_test() {
-	cd tests || die
-	eunittest
-}
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index fbb6e981ef5e..7f841f5f46d2 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-Compress-1.11.tar.gz 12322 BLAKE2B c8d1096273a977512eabc9fe642a0fe240c21f10b5828db168dfe952ac5858377fd6906fa93dc3bfd8d888bf8bf70f541b1e5789f1de5e2d0f46565c55e0f9df SHA512 dd2ceca37eee968527f2008e9356f0ab89f2df46e6d874eff38b93a2cf326c9d24433f0adc8dfe7a7b72599a33f8d173f330aefcd4eea8650923a0466959d7fb
 DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5
-EBUILD flask-compress-1.11.ebuild 611 BLAKE2B c088bbe0efa41b3749cf100b673c843758fee2f0aa7e0f69e670b196084f01515003433ad8efc9b4219821167b3999228d530c1725a0dd472a6f16a77c98a1c9 SHA512 42e72cc5b599169e302d38ded58903eb6d9b30b1c6855baede12e91b9c2537a98993be1dec1b792af98d6ca044693dd2af529c509d44f67e78e1985174047abe
-EBUILD flask-compress-1.12.ebuild 668 BLAKE2B a634daf5e91161315669aefa78d26bdab1bc355ae150d896b2b3156f376c38014c0c8ab39ae43a841fb67080b5903180892348a9555a05d19b83db4a8b846751 SHA512 3f93e429111fffcccaa7cd823fceb2dd7e90b72d94efcbfdd4bb5e4aeffc203c1eb24e4fb81cd9a774a34b9352817248900a3e418fffd77ca4fc1615ae290ee6
+EBUILD flask-compress-1.12.ebuild 666 BLAKE2B 01d83678fcceed6cff6e41aa64952430231e114c7b8351947136e53f269cef4b2cf84c3b45b5bb09a12444dd4a953a200d746f387576b24c5407d5396451ff78 SHA512 241580442e571b962a4eeb0c04683ff23298bd5501adcb43a3c92e3ac5d74754daca47934c12d3ddb37dae15b8e842995e0c862625a216d23f1b9217346be108
 MISC metadata.xml 525 BLAKE2B 3d7d87c0c376b9fef9f88f976b29adb728c0c6dd8102e413de5f7c9d0116bc040b7dce813c945b9b25d62dee5054425b34264b432725201a828858f63d62eafb SHA512 39d1a786add6c53c2a86cbe41bfcc41490e22a094d0f5741368249f08618725efad2cd7edaa172bd0ee7648d9b320c453180ec77d3e9b88ea8573aea3d982cd5
diff --git a/dev-python/flask-compress/flask-compress-1.11.ebuild b/dev-python/flask-compress/flask-compress-1.11.ebuild
deleted file mode 100644
index b6f4a2e53fb0..000000000000
--- a/dev-python/flask-compress/flask-compress-1.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="Flask-Compress"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Compress responses in your Flask app with gzip"
-HOMEPAGE="https://pypi.org/project/Flask-Compress/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-arch/brotli[python,${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/flask-compress/flask-compress-1.12.ebuild b/dev-python/flask-compress/flask-compress-1.12.ebuild
index 42b2c07bd2dd..9d5901c77d5c 100644
--- a/dev-python/flask-compress/flask-compress-1.12.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-arch/brotli[python,${PYTHON_USEDEP}]
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index 92fe074e96f4..2b47b998e26d 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1,3 +1,3 @@
 DIST flask-cors-3.0.10.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
-EBUILD flask-cors-3.0.10.ebuild 832 BLAKE2B a9726942401f4cd013c3d7c5dccb33dc55c9f2c5b79465c9c48f2497ad290c118d175b0acabd547dc440bcd7577302f2605264eaf17379f3a08fde6a3919f5c0 SHA512 2107510cbb7b8fac7946bbad32055618cd510cb9f793c1ddc21e8a0dc20bd4e2dfa31adb97a40b86c2a0f1ecb2fa6bbd38bcb93139fc462b7b6cbe6460d1bdf7
-MISC metadata.xml 570 BLAKE2B 4603717fed7609290bfdd4e640b7dd9020127a5fd307a9db160946a0404a9401d08950e9401cbd6f2d2c84e42184ff9910e062742362ed6ed0fb550c79e17f49 SHA512 1a1f7914b6c46e2c861e4c80e8b356b8a42504c323ae2820dce945aa166c0146448499bbf8451a1898402eae896692a8b15ce925a4eb4034d82cb2235b3db40e
+EBUILD flask-cors-3.0.10-r1.ebuild 905 BLAKE2B 6ab3e0965e253195adcb3424f021363669f6c47f146f0aa0fb1ea1f66cf84cfe96c7e0779dcd10cc78fe4a641f7507044bf6a1036b78b552f2cf1c0437e028ed SHA512 a6bcb0cccc1ee96b513a8e18eb58c85caeb4909129a6c2036622d1cbddcb00ab17a97ec7b55f1cfe6e47d2990955ca90d2dbf6bf6d1bbb2acec27b589377cbc9
+MISC metadata.xml 677 BLAKE2B db48568022ca473f90da4939eaf8e1557745e724a8ec2ef56a51e796bcb4d5c019b88eb6c28094e78548be4469c9c1f16639d476df4aea17a6fb8c96d30daf77 SHA512 d69a5140191598dd057e47e552095e07a52b645f18f66830acfda7bf47f93cae1999b1399f28cfaf60c9b6dd693888f4728fb0e1949228817aaeae662c4c334a
diff --git a/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild b/dev-python/flask-cors/flask-cors-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..ffad8b8da3f4
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-3.0.10-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinxcontrib-httpdomain
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
deleted file mode 100644
index a53770f0384a..000000000000
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/wcdolphin/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
-HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.org/project/Flask-Cors/"
-
-LICENSE="MIT"
-SLOT="0"
-
-BDEPEND="test? ( dev-python/packaging[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
index a84ba6960630..2d6bf8b227d9 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Flask-Cors</remote-id>
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 51a53762572e..4f74e4bcca86 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,5 +1,3 @@
-DIST flask-login-0.6.0.gh.tar.gz 47368 BLAKE2B 799591ec0bd538e6cc467a80b3a8891a97ee60bbfcf01eb6ba7be1ab48e7ea9be22e8777801621b39bf089c00d7914f7b045e4e6617e45d623354276ba7e245b SHA512 0766ef5702105bc2cea7082b2b2a9bebed282a9166757adbc91a02c4adcc291d41a3217e8b9566b6bb4778db4a1d2453edb0b7a727c9bff2673833d27b69148e
 DIST flask-login-0.6.1.gh.tar.gz 48215 BLAKE2B eb1fa81aad9bd8cf663b3ea85649f90f39d7a91c4c771e697b0cb7d66c7e4a5994befbaad36a7deba6f5aea27e6f47ff616aa00cd073433851cf8a9248e4b3a3 SHA512 f220e24079923c669d1ce27fdbc7ff8e07e92bc947e2708034cb349176e33ae0adf36ef6c30e8328f592d9a3eb6d0796dc577033f07c33ef0bc48c13a11a942e
-EBUILD flask-login-0.6.0.ebuild 825 BLAKE2B 2303ce435ed7c4a91fe0007c656157ab5e18f31a1e63b9651838819c3a00eaa9c9f994ac937c991cad95a5723891e0e2566f5225a50e2a12ab681e34e1cdf46a SHA512 57374937efe72e75abb9acef48959923959403061033014ae797f782d534fbb3bc828685bfbc6a86e7e8834523b66d9b4499f608b229315c5552496fe2d87866
-EBUILD flask-login-0.6.1.ebuild 886 BLAKE2B 899ebfe1af6639db53506f058d8a559dff152b0b8383b274271641e3bad30ce581180951d581778edcf8656c43aaa3d6ebf7627e9538a14c53e23a686eb9f646 SHA512 49b34e20ffd57dc371148a65c13f5fa877aad69996924442f086c9f6e0c3b8aaa0a9eb6ffbf927f0ebda7e145dc4b740bbd614d47fb59521c72cfd3e9d794c41
+EBUILD flask-login-0.6.1.ebuild 882 BLAKE2B f4a096f3043834730dc33b5c501a78f326a20c60d1ed01687208334103a87539d385b9eac03e381bbecf8f6b2cb4220ed1f00e9ab23e0ea4c8120a1f370594dd SHA512 e7ac45b5c0758923ba80188cc014e1c538326bb4a78f8bc7ca995bd7db9b9e41dc0205f603a131311639fb3c8c4a7c89b94fe8c3128b7714dd6e1bc43116414e
 MISC metadata.xml 404 BLAKE2B 8f8070dd3be696102c88bf75e22511b75432dfd17d21f6f3ce084cbae8092bc91ce1cbb7e47d691c7ac502afd58882ccd0bd1ea732df9239a4ec1b70e8728f19 SHA512 0b32444d9f1508697be1a19a6eb57efa5cbff443baf35958c24161d0b716a55d96b0caf66936925970904642fde975d94f4360b8b96d018ebe0fad24216769a4
diff --git a/dev-python/flask-login/flask-login-0.6.0.ebuild b/dev-python/flask-login/flask-login-0.6.0.ebuild
deleted file mode 100644
index 7db16f6f14aa..000000000000
--- a/dev-python/flask-login/flask-login-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Login/"
-SRC_URI="
-	https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-1.0.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/asgiref[${PYTHON_USEDEP}]
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
diff --git a/dev-python/flask-login/flask-login-0.6.1.ebuild b/dev-python/flask-login/flask-login-0.6.1.ebuild
index 8ad7a727fcac..c17cb52faeab 100644
--- a/dev-python/flask-login/flask-login-0.6.1.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/flask-1.0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index afdefc4b9135..a33862f9cd7f 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 721 BLAKE2B 931d365e72c51335a3a04bc300da01e5f5e8a2dbd8d640ded0f48f5e3ac958125d113d899c228a277bd46b894a1927f3b3b33a073551e4e364c6c08eebed13bf SHA512 16b1356e8fd667dc2fbb40f535c00647c3429005e09ec758f55d8e1e3eb476fc0c61d429392f63e6c109ccd86a0d70a2653ebf9131d96abb5554274af3ff2fab
+EBUILD flask-mail-0.9.1-r2.ebuild 808 BLAKE2B 197b5f9783275e8da5e2872c1c8f677725e2a1e2fbce562cb74b349566642198dde5f5af837e039758ea0c4847e4d277a22ff47ca81584f51c088152d5002e23 SHA512 8ce6a84b795e75350ca4625186fc1da6c51e93555bc196274763d05e7acb70830a74796099cd968a2e7926141151841b1f52af5bd529efc8ba81ab0289e295d0
 MISC metadata.xml 400 BLAKE2B 3cf4871f8b6f956a5425ba37765b02edabae32d22b763f30335a835cdaca8f96ae394430e451236bc693ef42d2111c91794dde65dd74f5a6b5203e13c62cc97f SHA512 daebad69da41cab04a8ee4ca28cc22d801b6411e692d9db437d7ccd0b83a43fa1fe95c0aeae0c48439563bcc3dd841446b722072598d66c17694a2b4c61bd9b6
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
deleted file mode 100644
index 21b8d51f0240..000000000000
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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
-
-MY_PN="Flask-Mail"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flask extension for sending email"
-HOMEPAGE="https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/speaklater[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests nose
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..ce36895c47c5
--- /dev/null
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Mail"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Flask extension for sending email"
+HOMEPAGE="
+	https://pythonhosted.org/Flask-Mail/
+	https://github.com/mattupstate/flask-mail/
+	https://pypi.org/project/Flask-Mail/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/speaklater[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
deleted file mode 100644
index 6d45208f5faf..000000000000
--- a/dev-python/flask-mongoengine/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flask-mongoengine-1.0.0.gh.tar.gz 123516 BLAKE2B 5dd6cf1d774973ef1883d824bdf467b53306773eff5f7016f6440a7ec55648012755a1270b8fca0974aff00dfb189c0f3f7d6985a01c098729517c0018513c8b SHA512 bd95a8248a972a41c92dc2711f866420aabba56062322801e473e0b347c95ad47da39439992ba6cf23a0981c422ae84756af3af95d1171acd6b321f9cbc63085
-EBUILD flask-mongoengine-1.0.0.ebuild 1829 BLAKE2B 793b3758c52b7aefb64735b77c92ccb755afa0444cbc7cc5767da37b77dbef066e5a0c2168b8f94b3aad148601b1ba3a5bf1c62bf553ac3d4c9529ac6e729f2e SHA512 97c83aa2fe0e8556b80b90a1dc1446ffb2710f15427fedc3c28a6bfe0defca0233e2bb205f36583732abda67876203f2ad37b41b6324fd77a089009573791f1c
-MISC metadata.xml 427 BLAKE2B da29ab5947546ea948c499cb651476a87db66f22787937d352be99964a8a44fa9c8d60cc2ac4b653d514f3c709cf3af96db8158da60df9be28d6a37ea62d7106 SHA512 3346c432c264cccf1b13f43cec0e84c3db602997caa40f2ee37e243b11c8617cd04a487227f8e42069d55df9e8401ccdf59f55bb3744dc9ab9d8d6f3a358d03f
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
deleted file mode 100644
index ea5a729c1b49..000000000000
--- a/dev-python/flask-mongoengine/flask-mongoengine-1.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Flask support for MongoDB and with WTF model forms"
-HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
-SRC_URI="
-	https://github.com/MongoEngine/flask-mongoengine/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-	>=dev-python/mongoengine-0.20[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/mongodb
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails with mongomock installed
-		tests/test_connection.py::test_connection__should_parse_mongo_mock_uri__as_uri_and_as_settings
-	)
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-	local DB_PORT=27017
-
-	mkdir -p "${dbpath}" || die
-	ebegin "Trying to start mongod on port ${DB_PORT}"
-
-	LC_ALL=C \
-	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port ${DB_PORT} \
-		--unixSocketPrefix "${TMPDIR}" \
-		--logpath "${logpath}" --fork || die
-	sleep 2
-
-	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-		# yay!
-		eend 0
-	else
-		eend 1
-		eerror "Unable to start mongod for tests. Here is the server log:"
-		cat "${logpath}"
-		die "Unable to start mongod for tests."
-	fi
-
-	local failed
-	nonfatal epytest || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/flask-mongoengine/metadata.xml b/dev-python/flask-mongoengine/metadata.xml
deleted file mode 100644
index 38e4f9e9b7fb..000000000000
--- a/dev-python/flask-mongoengine/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">flask-mongoengine</remote-id>
-    <remote-id type="github">MongoEngine/flask-mongoengine</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index 9c778ec9258d..4cecccf2e353 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,7 +1,3 @@
-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-2021.10.26.ebuild b/dev-python/flask-paginate/flask-paginate-2021.10.26.ebuild
deleted file mode 100644
index 49d2d8c73c6e..000000000000
--- a/dev-python/flask-paginate/flask-paginate-2021.10.26.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} 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/flask-paginate/flask-paginate-2021.12.28.ebuild b/dev-python/flask-paginate/flask-paginate-2021.12.28.ebuild
deleted file mode 100644
index 49d2d8c73c6e..000000000000
--- a/dev-python/flask-paginate/flask-paginate-2021.12.28.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} 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/flask-security/Manifest b/dev-python/flask-security/Manifest
index e1ef6443eef6..f54137462786 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,8 +1,3 @@
-AUX flask-security-3.4.3-optional-deps.patch 2287 BLAKE2B 5cd174499a3fc22e0888850332ccd0798927a3127d6b84b19dae2ae1cbb8c998b6e8e5246a76eb84712d932f80c77316201834ee048c05c2de6e190bf9aafed6 SHA512 08b0ebfadbf126d1c4dfbc51d222f5da797c40bafc11c923eb2a98c3f65778f2f5400e0ced37c5fc6318a7941dd036ae780dbc958980620bd075f0212c0ea49d
-DIST flask-security-3.4.5.gh.tar.gz 348928 BLAKE2B 9890227e9775c4a28fc364affb0bf767407463d514f6dc3cd359dd8a026e8325d943a547f294f6363a276f9e7d97336c526dd45f4549c7cfaff2d6ef9ef0316a SHA512 f9ac7f46b2e1ab7dbb44ba925b01e16304e8f8d6d5d56f4e558d07b80dfffa59f04c2597e17c00a7d7ae11be3a97c78ccf8d79993b7451be4a7f75f85bc89f6f
-DIST flask-security-4.1.3.gh.tar.gz 408609 BLAKE2B ef4b270d62de75fdcf51d1247960df85deca1699fdbfb73592a5711f9bb56f71a2f2de12a8d8c0eccdaccfef11a578cf9bd9abbf52bdacfe4bfc10f9adda0acc SHA512 92a0e7fce95eb4eb04baa9a11ee88ab3b8e88952aa6300bf8245cecfcc90657c83bbe93e1c3b19d62642a346b30f5912dd424e59a81023637f3183a61e8cf91c
 DIST flask-security-4.1.4.gh.tar.gz 408532 BLAKE2B 5fd401da8a907ff56ab7fe1fc79ec586222c26d60d921534afea4743cbc6840098f8a1d231741f83f061e2a4f747c4937be848aa4bfee8b3cf4bc06a8928e437 SHA512 d9ec87d1d2baa11b00db437135060630ea06451d96057fc8712ced8bc433fb6779f7b2561ad1c96d8f192a43acdc93dddf7f44ec75f89297204fd1796dcad1df
-EBUILD flask-security-3.4.5.ebuild 2043 BLAKE2B 46b5e6f41ab2c371fb7db7a84d63f2bfd6a3f1052b076865ab40f64211b1715c54f0d084b0483a9fa6bc0c38919b9133eb8b5a5a7ee0959c2e7a4d896fadeb18 SHA512 6468ff9f277c24fcd9fd4dc76d8c70850e1c50b20e233b6509ee86060f39b08fe4cbc139f027770870f93fba42845eb71756f5564dc5c9e17003df88732e59ac
-EBUILD flask-security-4.1.3.ebuild 1994 BLAKE2B d82d70ed37dd3ddcbbeb9a3ce497a5c382aebfe9b9d209cc7acab193836f4f0cd86ed24cc6fffaf86063c8ef1c8a5cebadbd4f3e43c7bece08e1dd084d06e3f3 SHA512 ca21c520951d3a5de5bcea1c179b8def976f7703eb4a9dd3aa72d67791a68558a4a7154cc7d27d3c4144b8d35bd9a83bdba9ac3d4196627746e304e98faa6f31
-EBUILD flask-security-4.1.4.ebuild 1996 BLAKE2B 258192f7d8b955f998000677d05628a71bdbbf75a087a3de8b0d54935f1519ad44d7a4aee4d62512d5f03c6d20a7469a13464a7816b65371678431a0cdc3127b SHA512 27e585b528101ad25f65fc892625b54f18211118d0f1d6d70f888a53ef663be580b03f5bd20d0f5aa6c6e5acc870d89d3492a1d7395584e5b53ee24a1e5eebad
+EBUILD flask-security-4.1.4.ebuild 1994 BLAKE2B d82d70ed37dd3ddcbbeb9a3ce497a5c382aebfe9b9d209cc7acab193836f4f0cd86ed24cc6fffaf86063c8ef1c8a5cebadbd4f3e43c7bece08e1dd084d06e3f3 SHA512 ca21c520951d3a5de5bcea1c179b8def976f7703eb4a9dd3aa72d67791a68558a4a7154cc7d27d3c4144b8d35bd9a83bdba9ac3d4196627746e304e98faa6f31
 MISC metadata.xml 417 BLAKE2B d2c9497a88d513e360256445b7d144ab969c40cb11726477e2d9a3b850a7bcda909ba0a5d844a6079ddd597056b4628a6eb309bca8756e15864d151a54f1d1c0 SHA512 3aecbb252d4b6e3675ee221eb485fd80dbe52eabda6c4a6831dfb95110feab3284a6b6f4ea0d42aa6d6d7ced8ff0895ab40529ccabcdb5144481243b2bdf1653
diff --git a/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch b/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
deleted file mode 100644
index 484e816908f4..000000000000
--- a/dev-python/flask-security/files/flask-security-3.4.3-optional-deps.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8943f49c3e6064839bd1e3c2c73a750b2b476ae3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 15 Jul 2020 09:02:15 +0200
-Subject: [PATCH 1/2] tests: Skip tests requiring specific data backends if not
- available
-
-Skip tests that require a specific database backend if the respective
-package is not available.  This is mostly intended to make it possible
-to test flask-security on Python 3.9 since Pony does not support this
-Python version but there is no harm in extending it to other backends.
-
-Technically, Flask-SQLAlchemy is still required due to other tests.
----
- tests/conftest.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 3305d92..a48f480 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -218,6 +218,7 @@ def mongoengine_datastore(request, app, tmpdir, realdburl):
- 
- 
- def mongoengine_setup(request, app, tmpdir, realdburl):
-+    pytest.importorskip('flask_mongoengine')
-     from flask_mongoengine import MongoEngine
-     from mongoengine.fields import (
-         BooleanField,
-@@ -282,6 +283,7 @@ def sqlalchemy_datastore(request, app, tmpdir, realdburl):
- 
- 
- def sqlalchemy_setup(request, app, tmpdir, realdburl):
-+    pytest.importorskip('flask_sqlalchemy')
-     from flask_sqlalchemy import SQLAlchemy
-     from flask_security.models import fsqla_v2 as fsqla
- 
-@@ -326,6 +328,7 @@ def sqlalchemy_session_datastore(request, app, tmpdir, realdburl):
- 
- 
- def sqlalchemy_session_setup(request, app, tmpdir, realdburl):
-+    pytest.importorskip('sqlalchemy')
-     from sqlalchemy import create_engine
-     from sqlalchemy.orm import scoped_session, sessionmaker, relationship, backref
-     from sqlalchemy.ext.declarative import declarative_base
-@@ -426,6 +429,7 @@ def peewee_datastore(request, app, tmpdir, realdburl):
- 
- 
- def peewee_setup(request, app, tmpdir, realdburl):
-+    pytest.importorskip('peewee')
-     from peewee import (
-         TextField,
-         DateTimeField,
-@@ -522,6 +526,7 @@ def pony_datastore(request, app, tmpdir, realdburl):
- 
- def pony_setup(request, app, tmpdir, realdburl):
- 
-+    pytest.importorskip('pony')
-     from pony.orm import Database, Optional, Required, Set
-     from pony.orm.core import SetInstance
- 
--- 
-2.27.0
-
diff --git a/dev-python/flask-security/flask-security-3.4.5.ebuild b/dev-python/flask-security/flask-security-3.4.5.ebuild
deleted file mode 100644
index 29569ae89496..000000000000
--- a/dev-python/flask-security/flask-security-3.4.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.0.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.3-optional-deps.patch
-)
-
-src_prepare() {
-	sed -i -e '/setup_requires/d' setup.py || die
-	sed -e 's@--cov flask_security@-p no:httpbin@' \
-		-e 's:--cov-report term-missing::' \
-		-e 's:--black::' \
-		-e 's:--flake8::' \
-		-e 's:--cache-clear::' \
-		-i pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.1.3.ebuild b/dev-python/flask-security/flask-security-4.1.3.ebuild
deleted file mode 100644
index 80cde17b13c7..000000000000
--- a/dev-python/flask-security/flask-security-4.1.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple security for Flask apps"
-HOMEPAGE="
-	https://github.com/Flask-Middleware/flask-security/
-	https://pypi.org/project/Flask-Security-Too/"
-SRC_URI="
-	https://github.com/Flask-Middleware/flask-security/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/bleach-3.3.1[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-babelex-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-wtf-0.14.3[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/passlib-1.7.2[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/argon2-cffi-19.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bcrypt-3.1.5[${PYTHON_USEDEP}]
-		dev-python/bleach[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-sqlalchemy-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mongomock-3.19.0[${PYTHON_USEDEP}]
-		>=dev-python/peewee-3.11.2[${PYTHON_USEDEP}]
-		>=dev-python/phonenumbers-8.11.1[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.8.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.9.3[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.2[${PYTHON_USEDEP}]
-		>=dev-python/zxcvbn-4.4.28[${PYTHON_USEDEP}]
-		>=dev-python/pony-0.7.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's@--cache-clear@-p no:httpbin@' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	esetup.py compile_catalog
-}
diff --git a/dev-python/flask-security/flask-security-4.1.4.ebuild b/dev-python/flask-security/flask-security-4.1.4.ebuild
index 7461c5995d62..80cde17b13c7 100644
--- a/dev-python/flask-security/flask-security-4.1.4.ebuild
+++ b/dev-python/flask-security/flask-security-4.1.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bleach-3.3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 185658f75129..d175344cab2d 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -1,3 +1,4 @@
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
+EBUILD flask-sphinx-themes-1.0.2-r1.ebuild 584 BLAKE2B 7aefe292e6cd5eca16f8c75c7f97accf8044406adcfa79202fe8620da21f8392b97a01367f6c3c741495aa9515d59586a8af69816f5df98c44cbcaeed1cc740c SHA512 861759b89aabe3edb45e29a297d477c02eca8ba0d223a24b74a3cde245b16d38d279dd3a9684a1c430294e5c418725eb3cdba21400952b8576a3483b74a0cc51
 EBUILD flask-sphinx-themes-1.0.2.ebuild 549 BLAKE2B 32b2f7220cb8e762bbbb49feca26e25c2ae6da1e7c7c848a5c352cccf968162fcba4fa2a6b510fde66904f37c40a408410fdde4da62263d19ec0a8c070b3316a SHA512 a813813c81077a15ce88ffa2ab1f7b522433093286545cb00400ffb6048b0a2b5175890867aac88eb0e51b29031d15685bbad86c69f3bd0e986b024a05b6ab4d
 MISC metadata.xml 504 BLAKE2B 4fe3d61ba640b18462737907d7048d3f81a4378b946f9552e5e145ea77f94618b5d4b6e2582f7b8933ff4bd2093f12137bcc8f37db284e93fe1a50db7f0c312c SHA512 576cbb6cef7b45e3dac5f23f0684ff2dccde20237cd8c2449fa9f67b7265561507a8c5067022eb93e16b222941d6af70593d01d337fcf1a3df2c8992b3a4dc66
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..0bf6ea6f402c
--- /dev/null
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Flask-Sphinx-Themes"
+MY_P="${MY_PN}-${PV}"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
+HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 366a42d3fcfe..8d42b5fd568d 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
-EBUILD flask-sqlalchemy-2.5.1.ebuild 714 BLAKE2B 415d2d5698462189985abbe72c26f089b406abe8ae8e1213dc7f33605e6192aad9c6430c61380bd92c1d936ea6082c48ad3bc47735d3da067da00636458a793e SHA512 4b1fb343acef3a7d742c18a46457a48283f7aa224a4999cdb85b46a27bf21db60e78eca178491dc576e2e518937cfbc57486a7f2c137149da446d108cedc57f7
+EBUILD flask-sqlalchemy-2.5.1.ebuild 770 BLAKE2B d197db5d301949b5ccb7a911fdc40d9a69a993327517cc41c08b0c889b0d0c68865234ef8953557216c7996ad83a73463a87db6f2fc9beed655fa6f26234e089 SHA512 77f2e0076a57ec17ae06a36a3a7304ed6a9cf12c4e74b50589c8be62ea54c4455ea34dfe032bb07d0a47ee39afd5e6260dc6bd4403e2fd49b193aed62a0cde2b
 MISC metadata.xml 720 BLAKE2B 0b7ccbc3b323b0cd206c8c461018e901bb1c3386ba1f6ddd6f54c0fb42c485d262edd82c85ea24a07ee4bb40203cab301fc2ae0253326335ed9a80b09ba4c33b SHA512 1702e4420fe8cc018dfdeafeee3e863e8451b0bf7975e18a5632f520a30967f94420ee07c851c11f17a296b962978d5baaef048dd2af5b83ecac8a5a0fe25c01
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
index 4718a3bde73e..324394047caa 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 MY_PN="Flask-SQLAlchemy"
@@ -23,6 +23,10 @@ RDEPEND="
 	>=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}]
 "
 
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
 	dev-python/sphinx-issues
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 27283b57ca4a..36ec908f5fe0 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,5 +1,3 @@
-DIST Flask-2.1.1.tar.gz 630996 BLAKE2B 39b34a3f68111e4b58f4e1e63fc55077b839d42b9ab4f87bf96f22d1dbcf05c1a520e84d35af81d4ebad2535e4f22af2070c8354b3f7d885b4db304d374243a7 SHA512 492bd72e80b6ad8a5d91191b996252c05fee8d8b2f703855fe635755976e75ee7a93a30ebe4889c80cc959034c3fb8caca0dec8436657ad8096860b1b11dcb2e
 DIST Flask-2.1.2.tar.gz 631846 BLAKE2B 9024a12dd6fabeffcf5939e2852734b278f25fb99830bb165cf46a09e3fd67d0997558d1b06a0dec3425d9b750be25bde147341c937e874811fe2496224a1f3e SHA512 65ca756d63da05e74863fbfd2ae574d6e75d6fab683dd08ea97b22a9b27be4f9a03ce7be44312a1f2c6a802bdf77ede3899734f3f1546000dd8b9c592571deec
-EBUILD flask-2.1.1.ebuild 1418 BLAKE2B 37e99aa8214e750712568a7284a7f8d355bbe78d8fde19198373fb51348fbde09feea0c5127d28ebfaabeca57656e2630d832b3ecf2cb120bc1df8eeb12be892 SHA512 fd15b1789115ae77790c6c96352309d731b5e6e5d9b27e5e30ec8223805778c83f0e220b92f8f8f1d396602fd9e80c70b10a63032efdf47a941a588b448663d0
-EBUILD flask-2.1.2.ebuild 1520 BLAKE2B a1c5ffab5892777c5d6896d2a8f2118672dbd0029d2a23803365d622672a3c38d101d808e6a3da6bcae9c7c87a08d6ae20d907777f27c32f6700c3555a8d186d SHA512 696d72211a65675fc429c566e765ca87b1c52ed593fac5b281089375f8c15b375f4b30c58e3f8b516b7dc6380b0d31897ee0c7ca999ceb776fcd9ea8c3c966cd
+EBUILD flask-2.1.2.ebuild 1512 BLAKE2B 4c087e67a6aac823a44f27a9040ba4af1b3e1d083043be671a39bfccfc4369490e746a869aeea137877c229b50a77da4dcc1e56907c2b0fb0c1f3dd6550a8e52 SHA512 dc6b6ecc43fecf840ac2fff079f9b9fc8e9650fa0ad761c1b4b9726935038f4685084a782fae385212be01ae640404ad53e12af5bf9a10fe988200cad86425aa
 MISC metadata.xml 386 BLAKE2B b449c54b966bc8943f7b7b12d6126867a89a2759eb749c08f7ad53a174e93ecad07f09b5e30c8562c63ab05df75a82e2f48f550ea8cf3a546f5afc2eef5a896d SHA512 123334db31948046e47f3cdbe0237cdec3dc2207485c8243d1e34e065436995423b6a89909563a6158741a8cc62a7fdad95923870a7114cf69e58ef715e7ec5c
diff --git a/dev-python/flask/flask-2.1.1.ebuild b/dev-python/flask/flask-2.1.1.ebuild
deleted file mode 100644
index f3bf188f241a..000000000000
--- a/dev-python/flask/flask-2.1.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
-HOMEPAGE="https://github.com/pallets/flask/"
-MY_PN="Flask"
-MY_P="${MY_PN}-${PV}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/click-8.0[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
-		!!dev-python/shiboken2
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs \
-	dev-python/sphinxcontrib-log_cabinet
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:httpbin
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask/flask-2.1.2.ebuild b/dev-python/flask/flask-2.1.2.ebuild
index d3dc0490db0d..48df9fe3e438 100644
--- a/dev-python/flask/flask-2.1.2.ebuild
+++ b/dev-python/flask/flask-2.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index ef4fba0442db..999591778929 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,3 +1,3 @@
-DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
-EBUILD flatbuffers-2.0.ebuild 438 BLAKE2B 823902d864563527a1ae616ceabd17acb8aceb50c2306a510d2a6f0ad249b9dc0a9133d2ae95cf54331d46cc347a234f42b46844f163d6d1a945f299bab05f29 SHA512 c47f50c0804612b8e8486df0ec1cdf0f06cc3a0cacca924fc94ea70a498cd0c7f0fd9b3b13b33571d6c3c79933e8acaa51b73535318c0488d1e086381dafcfc6
+DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
+EBUILD flatbuffers-2.0.6.ebuild 530 BLAKE2B 211d748222b49fffc936c92ec0756b855e7306c55d541d76faf5a0c7a106e5bf87b4362fa51be729db412f5e8cf9236cc427e067d8f6fbd2d565e1a8e8e09f32 SHA512 3a798c1e090d0464814705591627ea9bebb25e61e8b41489ead78ec6b55e2b170133246c9175772ae6f87af7139ff58f0dc870cc6865d96483a0afe414ffa54a
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
new file mode 100644
index 000000000000..4eddf1fbaf28
--- /dev/null
+++ b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/google/flatbuffers/
+	https://pypi.org/project/flatbuffers/
+"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
+
+S=${WORKDIR}/${P}/python
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.ebuild
deleted file mode 100644
index 379965a982c7..000000000000
--- a/dev-python/flatbuffers/flatbuffers-2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="https://github.com/google/flatbuffers https://pypi.org/project/flatbuffers/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
diff --git a/dev-python/fleep/Manifest b/dev-python/fleep/Manifest
index a9de192b19df..fae3c8897d47 100644
--- a/dev-python/fleep/Manifest
+++ b/dev-python/fleep/Manifest
@@ -1,4 +1,4 @@
 DIST fleep-1.0.1.gh.tar.gz 197438 BLAKE2B cf099a941d63443a9ee314727966ae95e143acc2f33f7760fe34772d4a2d371af534c029ad207b7727d34e7472c9396b3fc1e9c82066d98ae248dd4f7bd430d7 SHA512 ea287b9cec0f88f378b6c2f248938417e7e51b004a03bb4421611f9cbdae7b97cf1c02b5096c491df934922d906812daadab02d46ae49e64dc2a2a880ab4d87e
-EBUILD fleep-1.0.1-r1.ebuild 863 BLAKE2B 9fe0f5c4a539c0f579d9e4f9bf5b38c449410c22a4c529efc63781463fc3023c31e4e594454fc03de2eba795e23d076c86800fb096a2562e96080b7f24f267cd SHA512 6e0aff23476bfa2fbee81b0c5143d8870fe5aa3cde02139b176caa8a25b88a636924819820d86324145ed2985d021b51b93bdbee3b604cdf0ee0506699c47e57
-EBUILD fleep-9999.ebuild 780 BLAKE2B 43fe8b1004891760053221129190333bdc524c89f21248cbf16b2352103ce82a32bf1d7123fcdfbf0427797ac477944c7fba957771aab151975e7b87ed31e7be SHA512 02e6655ef370e0d76672a46168d34cc04dfd70c7b0dd4743b8009698137bedeb86f0069489590a82bb32d686aca940b7046126592fc3ba1c7fc34416627cf215
+EBUILD fleep-1.0.1-r1.ebuild 814 BLAKE2B 8200306dc3b5d562d171c78f016ca10c3f2fff8fa0cf610966d5c7dd25fa623475c8c30a03d95ad53e3128b057fa7e4f127d973b9ffd4a0e1629fb18c1d14635 SHA512 1b70c3da9173cec5838a689fae858b03fda74251f559984aaf93d4bf46b2004264d16e77517b95d6889b918c98032970805cdabde2a43e2a98a691b9d4728d76
+EBUILD fleep-9999.ebuild 811 BLAKE2B 1fd73b4d1848ea25efefe035a1d072aebd672d61aa607eed38fc617b843e3441f71c08904aef8998a6ff1750cf9bad760b080ea26fcee59fd3df1d2e9cd76167 SHA512 931b50d3e1b02b7d289e949106e4964864edd2aad9b818ad3bfcbbc7557d91c3b2a91c4661857738b06c52065bb2bc66b904336826b3a10fa00d7ff323cc3fe4
 MISC metadata.xml 478 BLAKE2B 8b297fa598d70c13eb2f8d2cfd14029a28343c70eb25473dc18d14f868067253ec07ea894b18486234144c94a3e569b821f20a0868562dd506aea6ae7fbfc41c SHA512 5ee57a89ae197ec0b5d522314e08ed81c8f65c3ac49ff17264e9c75af63189834e66fe39e0f11c8401a2d5189a067f8514785174b2f849f39dd79edac3e4b847
diff --git a/dev-python/fleep/fleep-1.0.1-r1.ebuild b/dev-python/fleep/fleep-1.0.1-r1.ebuild
index cce82c31af2c..921df3ab8fe3 100644
--- a/dev-python/fleep/fleep-1.0.1-r1.ebuild
+++ b/dev-python/fleep/fleep-1.0.1-r1.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=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
@@ -13,7 +13,6 @@ if [[ ${PV} == 9999 ]]; then
 else
 	# upstream aren't tagging the releases, just as commit title
 	COMMIT="994bc2c274482d80ab13d89d8f7343eb316d3e44"
-	# Note: On next bump, remove gh suffix from SRC_URI - was added just for tests
 	SRC_URI="https://github.com/floyernick/fleep-py/archive/${COMMIT}.tar.gz
 		-> ${P}.gh.tar.gz"
 	S="${WORKDIR}/fleep-py-${COMMIT}"
diff --git a/dev-python/fleep/fleep-9999.ebuild b/dev-python/fleep/fleep-9999.ebuild
index 68f31790d687..3504702d9333 100644
--- a/dev-python/fleep/fleep-9999.ebuild
+++ b/dev-python/fleep/fleep-9999.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=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 6efb0b21f441..aeefbbd013e1 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,3 @@
 DIST flexmock-0.11.3.tar.gz 52509 BLAKE2B 5246cedb3cae7aeb4ddee9158bc365be13bf81443711456a84abd3dfb30c8ea7cbca8fbce618efe26d33bc8185a9d7a52f1532934f7aad5fa11296ef21731963 SHA512 38387529d8b7e359cf6e578c9be8ae028cd28929567267bce1bb7f44032c00480520335315bb1c510229728e1101aa379b809fb89aeddafd19590e38e7ebdcf2
-EBUILD flexmock-0.11.3.ebuild 671 BLAKE2B b1a36ab0a4d47e6ae83501e9b6ace2b2848637c43c1a7dbfd4f18ea013ee25367472d8367b9daa03332acf843ce80cdb29fbac03f76736d2603536029cebd843 SHA512 21ee555ceb6a3d1d52acf0355e1d647a6b898f4a66e53e0885f1ba0c5d735d8e261b61b8f2e66a352fc021c0bc6f2367b2cea62eab86fbda982575f60359e18a
-MISC metadata.xml 398 BLAKE2B ea4c3f435657d1dc5433b3793abad9fb8cc98140721427e90a4de20a3d3914b21d41f0d84c78f29fca8894a46d49cb1e62955edcad5f3e58e731fe1d55c8d2cf SHA512 61068ef6417b6b6be825054c2e96a7785d91a7cbb0335d04649afb3a98ecb4e8e96ac4185566341e930b731470b2271ed88fc488683ed2a9cbd8439b2cb4b81e
+EBUILD flexmock-0.11.3.ebuild 671 BLAKE2B ae1b03dbc7f688f6bdc8ed61228b7a142c677a0efc4602841bf014c7ebcc6acf2202d9259d062ab930c0e47024edc278a2417a73dd5bbeeb4b076f8cdd5bcc23 SHA512 1dc62ca55ffd9f89b968126fd0c6149bc25b4e2e685a1ce403d3a97660d7dbf51b13975624aa58346b6ca6f22d69f7fda95ff0f702e98d2d8b87830f9a8e5c8c
+MISC metadata.xml 499 BLAKE2B 233b9735fa88296bfaeaef1ec20d999cb9f1e7f91e2943ac14d818d2e0d2bd07b7fac2e3ce5659510d5ef830a83d841ccacf738761ac625ef2b124185b5c90f6 SHA512 889ce006fdf12b653a3444faebc8e443bd56b0870aecc40d86299d56375d12844b5e0b904e025141caef8e52543a94909cdb2163c2fcfc5f2660400e8d7559d9
diff --git a/dev-python/flexmock/flexmock-0.11.3.ebuild b/dev-python/flexmock/flexmock-0.11.3.ebuild
index 4121058ecb55..c890f8ca7300 100644
--- a/dev-python/flexmock/flexmock-0.11.3.ebuild
+++ b/dev-python/flexmock/flexmock-0.11.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/flexmock/metadata.xml b/dev-python/flexmock/metadata.xml
index 0a72e360dfd5..a8d9fae02cf4 100644
--- a/dev-python/flexmock/metadata.xml
+++ b/dev-python/flexmock/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">flexmock/flexmock</remote-id>
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index b42d1451e1ea..b5220756cf4f 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1,9 +1,3 @@
-AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
-DIST flit-3.5.1.tar.gz 122689 BLAKE2B 49be251df549783114c6758fa688d00fe18ed88d215f91783ce78eda722ee3d8578d83781a1a5c9ee61dd001c82df010c879dc742a1829c2ba8bcf5edb930556 SHA512 00e884774c7f59dfb54d6db09f65ac0ed47f1dd23872d6913f3a41de7242fb3829b2edacd03d08e080635c0a515521333aa74e6d26a2faa5fc02e56454b2b37a
-DIST flit-3.6.0.tar.gz 133365 BLAKE2B c4170eeded3c15a93c8e89b9483459247228136bc5ff32c6edb8cd9a4b5c3171fe381d0a1b4e325ed863457c2bce476efe3276455d5b9e4279a702dd35ed4512 SHA512 6506ecc73f9e0373e84b5b90a3d567f1edad6d95561886ff1f08f37addfc39006e75ab199c376a7d18452f6b8e2cbdd9e8f59a1fc96037702c3c682dc0b5a757
 DIST flit-3.7.1.tar.gz 136642 BLAKE2B b94f8bbe00c2c5fb28bddbdcf240255ed53ec3b24d2eab1a33e37261cf32a92a0171ea01ad1488384c15f46acbf84d47c4679b318932a3ee78f22c1d161156b0 SHA512 336e81b034da2f38d7decb32c8961ce62d30f6fd2cb4778b09c956eb400277673d4c94cd57cf08fa7f115f8836aadb0469197d0096f833da9317db8a4f75baed
-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 1147 BLAKE2B 2c7750bbb55dc8a2d57f2d70cdd367935f3c34e03fa264a5fdbae794cf87fe853e3c2f60077a01225b3b117bbbfa733c46b20e55273a49e6b78c7782afdd7291 SHA512 4bfa0e71e2daf9b026ffc277f6c3555b0f31aacc0ce64097de30b338869b02f7a93e69dc85c9b6ac9a42e3dd7fd12c2279336ba122aa97cbcdb3345636d6699f
 EBUILD flit-3.7.1.ebuild 1473 BLAKE2B 260fb336b5102e129b216efa6a5cba93c8d9cfac8c47918c03a3dafc05bc6dfe1b3e8703a0615edc65588666500c9579c8b11c91f06a4cf94047ca411d3a98e9 SHA512 5c67f919d8ca5817a3855394b165cb821eb996180bd81f8831f6935b21b249c46443909ab9c58eaf7f0a063935d664e110aa6b3c6f2318a99bb5b0aac1b4aa0d
 MISC metadata.xml 467 BLAKE2B 534a82783fa3ff1642fc8400689549e75223fa01b175f4ac164d4a636a4c9eaef5bdd9fdd339ffc30239436449788b4d01ebc5e3609034d440c01a5c699176ea SHA512 ad8f3f98a35aa88255bafa81ea9cb109e14b8a544b053cff3f1325dfda3c4c6343a5060353c43a08e030e80a60186eb7dae248d7f6739ea95a7e72e747b1b194
diff --git a/dev-python/flit/files/flit-3.2.0-tests.patch b/dev-python/flit/files/flit-3.2.0-tests.patch
deleted file mode 100644
index 7a0a4c5c7a72..000000000000
--- a/dev-python/flit/files/flit-3.2.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 214cd17..815005b 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -5,6 +5,7 @@ from flit.config import read_flit_config, ConfigError
- 
- samples_dir = Path(__file__).parent / 'samples'
- 
-+@pytest.mark.skip("Needs internet access")
- def test_invalid_classifier():
-     with pytest.raises(ConfigError):
-         read_flit_config(samples_dir / 'invalid_classifier.toml')
diff --git a/dev-python/flit/flit-3.5.1-r1.ebuild b/dev-python/flit/flit-3.5.1-r1.ebuild
deleted file mode 100644
index 13d3a2cf3055..000000000000
--- a/dev-python/flit/flit-3.5.1-r1.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/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/pip[${PYTHON_USEDEP}]
-		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.6.0-r1.ebuild b/dev-python/flit/flit-3.6.0-r1.ebuild
deleted file mode 100644
index d40edb3cf264..000000000000
--- a/dev-python/flit/flit-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,48 +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/pypa/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/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/pip[${PYTHON_USEDEP}]
-		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 \
-
-src_prepare() {
-	# make sure system install is used
-	rm -r flit_core || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flit/flit-3.6.0-r2.ebuild b/dev-python/flit/flit-3.6.0-r2.ebuild
deleted file mode 100644
index d47c41b8639e..000000000000
--- a/dev-python/flit/flit-3.6.0-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Simplified packaging of Python modules"
-HOMEPAGE="https://github.com/pypa/flit https://flit.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/flit_core-3.2.0[${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/pip[${PYTHON_USEDEP}]
-		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 \
-
-src_prepare() {
-	# make sure system install is used
-	rm -r flit_core || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index add620a89396..ac17ed8bb1ff 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,3 +1,3 @@
-DIST flit_scm-1.5.0.tar.bz2 3230 BLAKE2B f29f7c0cc341fe12d621d0a8f91b5d983f8f7e4259155a7119b07d8e159a12755ae60e007d1ace9054385104aa2a572454653ef9f92a3043777b1e631dfd5f20 SHA512 1b8d4a653dffb4685ad91843147ba6dc693b6d1d4f21e8766782d04edc1ec992e3ad4a3ce82d25e01a089816648f86228db75024e39a7a277b6fae9f8fc4567a
-EBUILD flit_scm-1.5.0.ebuild 842 BLAKE2B a412328e79664ac7aff0eebb168872645b0f46b2b13ab475440e39707a1711fb7d2e6d0807b9d80ec409a155a3e198e717e500e5173b34851b3fcd98e1e3626a SHA512 dcfc281145ba43110bd342d3f16c7e78c432fff99e5abf3e9794d70b1caa618369c19251270847e40d4dc0e85e5e8d756ba6a6bdd13c891003f6eacd6bd2afea
+DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
+EBUILD flit_scm-1.6.2.ebuild 896 BLAKE2B f7a704c2781bfa0ef0699c9e9c7946020daccfe6d47d58b6174345e439395dd171fc67979e1c1fd3c4806ed789c6b0f78dde1570ae4cc3bf24e90d3daa2f4222 SHA512 299b145e9c5768909d9f45f0f1657de98de9cb4e4401357e86c2adcab53c9c4a1f50442dd8a596055c4db4db90fffda28f398c9fdbeb16da56a95e1f3e99af16
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.5.0.ebuild b/dev-python/flit_scm/flit_scm-1.5.0.ebuild
deleted file mode 100644
index 98b5a9d1c60b..000000000000
--- a/dev-python/flit_scm/flit_scm-1.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
-HOMEPAGE="
-	https://gitlab.com/WillDaSilva/flit_scm/
-	https://pypi.org/project/flit-scm/
-"
-SRC_URI="
-	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
-	<dev-python/tomli-3[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:==[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
new file mode 100644
index 000000000000..1f20cae1f111
--- /dev/null
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
+HOMEPAGE="
+	https://gitlab.com/WillDaSilva/flit_scm/
+	https://pypi.org/project/flit-scm/
+"
+SRC_URI="
+	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
+	<dev-python/tomli-3[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:~=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
deleted file mode 100644
index 8120e56fb2a3..000000000000
--- a/dev-python/flufl-bounce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flufl.bounce-4.0.tar.gz 108623 BLAKE2B 00c9d69d0aab3a4ca6f781dbd32bcc00d33de59371a163589f8be1747144f6cb9f51da57152235cfbc08ded63894402669c0ba4745eeb3c7b60c95cccf6206c7 SHA512 c6dd8cf2f4f0ea7c8698054042dfc9da3bd1a2d9cae082e01a0be9c39018fefba07154e2c9c15b1a00c896e58bb0a6d2063a3c067bec6b464d201bb7b3220e9e
-EBUILD flufl-bounce-4.0.ebuild 656 BLAKE2B 15226b7ea6610a2fcd8473ed507a027d4b6bb098d9aaf6f82d80ee72756969a1e934f1c8241eaa0cf259952d37be4ad69d87e89369955a4599c6c02bea30d66b SHA512 26aafaf55d56b171c44c72e33721f9f1e3525ff6814a9bcd5ec49b30946ca80e59414fc4352073a2c3003b9a96db8dd95d3029ded8bade4d45b1fa8751491b0c
-MISC metadata.xml 492 BLAKE2B 93522ca100c9b57c8c4f3b3244e0759898f659686fd8cb4f821103ac6806a8b188e7d41614cc05753e5e96f4ed7a9d0e09ad0e0ae9566be0cbc7a4612cfa85c4 SHA512 271532a1ce8c7f12b2014a6371894113ff3c48a765095af389eff5770250a3c34d556d244a6ca6b20e685ec49faec22b8bf2da0db74c36f1e2ef2f4774238a98
diff --git a/dev-python/flufl-bounce/flufl-bounce-4.0.ebuild b/dev-python/flufl-bounce/flufl-bounce-4.0.ebuild
deleted file mode 100644
index f74b4722b665..000000000000
--- a/dev-python/flufl-bounce/flufl-bounce-4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Email bounce detectors"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.bounce"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/atpublic[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/flufl-bounce/metadata.xml b/dev-python/flufl-bounce/metadata.xml
deleted file mode 100644
index 5fe9d2317b28..000000000000
--- a/dev-python/flufl-bounce/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">flufl.bounce</remote-id>
-		<remote-id type="gitlab">warsaw/flufl.bounce</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
deleted file mode 100644
index 172aacef3172..000000000000
--- a/dev-python/flufl-i18n/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flufl.i18n-4.0.tar.gz 21119 BLAKE2B 6bd4a311c3df56b03a0d46164f7f1ee1eeeb257478a82515261894f4cdf3017b150f1e13ce95a08f50ed5e01cf736884c7ba05a96e3f6b90917418ed18462753 SHA512 03e953af7e406d24a64d334647008e222cf74e5e055865638a52d8ec7e25edae44046aa4dfa8766b5a1458b335e9e29bd8b3e89703d8c8b28ab777375da19712
-EBUILD flufl-i18n-4.0.ebuild 681 BLAKE2B 34ca2befc5ad76bd9463a8bfd44931a3587d82fa728289283d09a5f2575085e8740d33403bec73e0c76dbb14182d5001f3e017ca391a9c1104542fae165a9fd8 SHA512 bf134c57303c9f17b6999b787f7a8863ce63132136469d42fd0c4eea45303e28a73095ae7f7ad68039d02d559aa8ca959a42e4347a8c3bb1bbd0a88297f8e30b
-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
deleted file mode 100644
index 0072b51bcd7c..000000000000
--- a/dev-python/flufl-i18n/flufl-i18n-4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 ~x86"
-
-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-i18n/metadata.xml b/dev-python/flufl-i18n/metadata.xml
deleted file mode 100644
index 1a10d853e8ed..000000000000
--- a/dev-python/flufl-i18n/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">flufl.i18n</remote-id>
-		<remote-id type="gitlab">warsaw/flufl.i18n</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flufl-testing/Manifest b/dev-python/flufl-testing/Manifest
deleted file mode 100644
index a447411f6b80..000000000000
--- a/dev-python/flufl-testing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flufl.testing-0.8.tar.gz 8754 BLAKE2B 9465f3e1d98c324cac38b06b80d44d050a260d26dae9df5c59147284a0f0cf4c460a3d0048f834bf479c58eb7a631eefd4146a82d490552f6e46e7c9cd96fff2 SHA512 edf491db72cccafef58e08b810e4c29962d14716cda3318a892a3ca36095b95477e7564aa4fe8eb4f3bd7cd9e7896f82282dd2d3a67900932848f1dc265cea61
-EBUILD flufl-testing-0.8.ebuild 604 BLAKE2B 79e2e3a5470f715795f68d42e5dc377b41012366520064fd8754b85ffcf8552b69b1b9eb015b28cb20a9e95e51b7e0299e91f16f41b49c745787d2933960a8c2 SHA512 bd94e640a44132d2fab586ae4f65204fb45c64b22b68418b971adaad17e1fb1b6c5e6c203586d77d678946be5a33f8e2a7c448a1370422442831d32a34b9b8c5
-MISC metadata.xml 401 BLAKE2B a1f9f6ec9349ae83015fa3c44f87518eb5d39baebf3297588b436ef801691620feb2b952ecbad2b63af0fab2a3f799e84f7a26a1367c46f1d45a42415bfaf5b0 SHA512 a0db73e0e5862fd114f44165f5407c4c47498984e86e9cde0c357702518fbb04b77322111f721823206d2312acdc133c442993c43538bc4696fb347012335628
diff --git a/dev-python/flufl-testing/flufl-testing-0.8.ebuild b/dev-python/flufl-testing/flufl-testing-0.8.ebuild
deleted file mode 100644
index b2212bd8e62e..000000000000
--- a/dev-python/flufl-testing/flufl-testing-0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/-/.}
-
-DESCRIPTION="Small collection of test tool plugins"
-HOMEPAGE="https://gitlab.com/warsaw/flufl.testing https://pypi.org/project/flufl.testing/"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/nose2[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/flufl-testing/metadata.xml b/dev-python/flufl-testing/metadata.xml
deleted file mode 100644
index 27c3c91f4ce8..000000000000
--- a/dev-python/flufl-testing/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">flufl.testing</remote-id>
-		<remote-id type="gitlab">warsaw/flufl.testing</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 7cdeeac11614..7e4c6dcf6435 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,13 +1,3 @@
-DIST fonttools-4.31.2.tar.gz 2965796 BLAKE2B d776073e7a9358e67b8753dd4557e2b1b4c44d9662c8c728abe42d970bca1db1789a655df8865fef39eed3a32271749d2cb772e306f34efc87e737b7384c0b5d SHA512 50cc8bca9136675a413ac947b583f694d512872127cee129a78505d0259fe1cf6922f806558761af982758f72c7d95e1245b8de55b6ebd6ddd3bd7506d41abcf
-DIST fonttools-4.32.0.tar.gz 2966840 BLAKE2B 67a79c8c2e26f9f72fcf6ea4ab5ee3712d3541b47528a209221f9fcf82a5b5db589561200e4b6911a32102a4f4dc4b4e34c8271eb97b1cee18a81b3039efdf03 SHA512 a71a44601c7ec9f709ddc14da1c26d1248909fba8a0bfb7104ebe5f9b85949fe479c5eabdd2c94086d9999756035291e68bb7e861488d4123ccf667ac3ac2e03
-DIST fonttools-4.33.0.tar.gz 3525052 BLAKE2B 5ea275adbfbf6e01222f6eba8f5eef7afe533b9692e6a7a2fb644fb68dec632ab2962d6b7f6b4ff876676e8314aadbfc04a005ea7a389904e398723feaa756d0 SHA512 147f6d41d1a6b27ebe6973cb91a90384291ad8c7b75b71c3b814908012530066b79f4c39bdd6da9e98614ef61b1cc19803756aba73e4da7ce2e82147390f0023
-DIST fonttools-4.33.1.tar.gz 3526591 BLAKE2B c720e9159602168bc2f435f96e9b470e95a748e3e61aac717659e01e5998c8ead825056fe6114cb40be47ab1ebcd7dc6f3152cccd87aec5b49134147694aa3eb SHA512 14e4da0e146d4b88ab6375ad7c912f1ec6f437386e2d676bbffcd5a84be980151ed4f77f69bf618843b321106ca763af564cf05dfb6fa11888f02adfde7d74b2
-DIST fonttools-4.33.2.tar.gz 3526700 BLAKE2B faa8db2d5ba80a7cb2cd4fb82045aa821f72d296c3b0994f266c69bc1f38b9c46a24208612d539e3576d75371d95d49d9a103fed8ab7604ebf0df50ec8f25d2f SHA512 dd032f9f8d9167aa8d83137006062a5d293aeb4116cd2b24a9d5d3d750887876214a6b6e9fe54efd569cada64164c76f242b234569d86b45e5f279d6c1a5db95
 DIST fonttools-4.33.3.tar.gz 3526937 BLAKE2B 26539f76ac1919e572633695aca7a95f7f715ef18bd7d36de22e5491124ce36d3907f1e7b167d23685bca437f0bf7cf99159cd918ab2b1a450b716166d30fc37 SHA512 403e19cda46d67dea9f517e58c2e95ed04c53e6832919d85df9db4538431252e5ec4554e22410fd45cba634998de1576cf55d50f56de5ad497a108dcec4ed56a
-EBUILD fonttools-4.31.2.ebuild 1500 BLAKE2B ec68d09191d4dbed3cdd2cb5b4cf0cf2130f69fff3de3bf2656d6d179b90bd2bff078ac8d47ef87bbfc8d5cfbb13befa665b9c6025860b109eb468aa936faef3 SHA512 27d65f784809ed8d08a60c99d3c74fdb569181fd6865f985e1896dcfc0a521c5a879e59f8ca94743bf00d6e2184cbe60824e4391d77f944bb008801d706e4d56
-EBUILD fonttools-4.32.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
-EBUILD fonttools-4.33.0.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
-EBUILD fonttools-4.33.1.ebuild 1508 BLAKE2B cf5cf5a7b3fe8e4072306cfa26b7a88857d5ad42705053c0f2b19720dd0f3e8d2d62cc8f95aeba6265654aec4ba2abfa8878546d8928033a865e017b5e4500fe SHA512 895e925d66b9b740ef61909785d2c129b31ccbb6c85672414ef816cdd5b8a03a1579f8b276af84b2e06986f238b91460df540bc39d8bc3dcec920bf787fdfe52
-EBUILD fonttools-4.33.2.ebuild 1514 BLAKE2B 9db3544e230d5de25c1e4b8dd3601b6b9beaafbb50dc7ec866d429e5e29d4e8864cdde669d59cfde5d50cafd7327d99a44efaaf1bcd15f264cf48a62389102ed SHA512 a7119c478bec936b059733f5934f9da21227c6c9c592825adcbc951da0d84b6de8e9266cc1e8b034f8e5fc1ff8aa767a2ec3ec0fb1ada43cb7e3cc5cd4cb85aa
-EBUILD fonttools-4.33.3.ebuild 1521 BLAKE2B 5c5dc77621aa82f3a8699c19b37d92ce38074191fb2653e4770e29c8984661553b02055e17e8af6ae38cfcb928f9902eb594a8e78eef42516e39d11a7e741381 SHA512 4d69e6cdcc37d68ec4d805d13ae4b2bbd207e388f63372b28c606721a8e1b444e8d2a46dad6963ec8e4acf0fddaf408f1d4bb2169cc882ef70428263e4a763e3
+EBUILD fonttools-4.33.3.ebuild 1513 BLAKE2B d91bb21fb45c1a15aebf44456f9a1a860b61f88baa26527477398d8db388d95ca2f647c763dfce197a57ea9a353d3132356ea52b8f8c59a527937472a747cefb SHA512 181c674c497b3f99f407286585932cc99e061c573ba928f04b1016cb70d0df3961623e99ce2f42afb3ffaa506ec4af31f2d6214181abc30d5f378804fa606c35
 MISC metadata.xml 372 BLAKE2B 950ec78bf127250847c6513c22a5108b251afdb000d361068edf9d00d64a5baf6925ba4058bb889724febb28d92abc044c29af5936a48d8e8951b12314b64357 SHA512 03e76e28959bab83fe41c3ee4b55692ced9b1360e73e38a6e8f6e5c06fd1185dcbe0214aea2edff18d248abf252c1877d0d2c2b78b8e088e606c09c34e93e7ac
diff --git a/dev-python/fonttools/fonttools-4.31.2.ebuild b/dev-python/fonttools/fonttools-4.31.2.ebuild
deleted file mode 100644
index 0ca22fe5ef4b..000000000000
--- a/dev-python/fonttools/fonttools-4.31.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.32.0.ebuild b/dev-python/fonttools/fonttools-4.32.0.ebuild
deleted file mode 100644
index f0532d0a8742..000000000000
--- a/dev-python/fonttools/fonttools-4.32.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.33.0.ebuild b/dev-python/fonttools/fonttools-4.33.0.ebuild
deleted file mode 100644
index f0532d0a8742..000000000000
--- a/dev-python/fonttools/fonttools-4.33.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.33.1.ebuild b/dev-python/fonttools/fonttools-4.33.1.ebuild
deleted file mode 100644
index f0532d0a8742..000000000000
--- a/dev-python/fonttools/fonttools-4.33.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.33.2.ebuild b/dev-python/fonttools/fonttools-4.33.2.ebuild
deleted file mode 100644
index 1e5f5a109536..000000000000
--- a/dev-python/fonttools/fonttools-4.33.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/fonttools/fonttools/"
-SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		app-arch/zopfli
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# When dev-python/pytest-shutil is installed, we get weird import errors.
-	# This is due to incomplete nesting in the Tests/ tree:
-	#
-	#   Tests/feaLib/__init__.py
-	#   Tests/ufoLib/__init__.py
-	#   Tests/svgLib/path/__init__.py
-	#   Tests/otlLib/__init__.py
-	#   Tests/varLib/__init__.py
-	#
-	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
-	touch Tests/svgLib/__init__.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	export FONTTOOLS_WITH_CYTHON=1
-}
-
-src_test() {
-	# virtualx used when matplotlib is installed causing plot module tests to run
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest Tests fontTools || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fonttools/fonttools-4.33.3.ebuild b/dev-python/fonttools/fonttools-4.33.3.ebuild
index 812261317d74..804bd0d8369f 100644
--- a/dev-python/fonttools/fonttools-4.33.3.ebuild
+++ b/dev-python/fonttools/fonttools-4.33.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/fs-2.4.9[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 7ed20c7dd772..6d50a5a73c89 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,4 +1,3 @@
 DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
-EBUILD fqdn-1.5.1-r1.ebuild 554 BLAKE2B 8550015058c3fcf79dfe050c9e629de74e430cda308d88b6c7fb91edf033c64e7ee0898fa8da2dc3702e6a1949389afca6dc8ab0dba06fb677f2d53d8251660a SHA512 87c87170d3cad44ef2c76c4369be6f1c3a124972cffe736839857c327328b91053d97520c55db9c1c15b3247ee6bc943dbc3573ca826491e233304757567b342
-EBUILD fqdn-1.5.1-r2.ebuild 635 BLAKE2B a55d9ced77656b482054becb7468783fb7f9dbdbfb7c59db87d754ab40ed377fa8a856ed619c0f6066d29c1c76d595f1fd0499354949df87ac5e578eabcde843 SHA512 9694e2d98567dcdaef23c91a7711a7417ff0afa90679ddcb886b8adf177552ab72e873c3e880bb91a582f577d77e7b2298b413074723a5e9754f2dab81801917
-MISC metadata.xml 652 BLAKE2B 59a8160abd347e18ea95c04143def0b8c0aed88e48fec0383ff973048a3913f43d51b854348ab279a3ce321fcbc0844bff9506e213b8e3936085a49d5ba7943c SHA512 de3fa18cb8d162fdbbbdcab61f9395c2da6c83c004925621b0ead1067ba8ccca25cd72997b00505221c0e5a1c3fc20e0a1c04fc488321bf25b3cd77c91f822e8
+EBUILD fqdn-1.5.1-r2.ebuild 627 BLAKE2B 09d8919a25d4c7020fb5edd362c1505d23d924cb1d0557589dcf4925579bc6e79b430e152639f750e9a1aba935799995f1127db4611286c499b3b93dbf9c9d5c SHA512 f5cdb03036044541450dd01ab67e93f2f6fe7cede849c7b6a76e07536d55fe00c8e15576a8f9c8204b861a0a76fd236c4d0fb5c094829c771456bd31d569ccdc
+MISC metadata.xml 649 BLAKE2B aa89a7d8a014ec20e1f5a3b305bc3a87a7a74fe56f1541fb8bb7301d9c1af638108a1fa67c5bf1ab518d7343f768fa6462dfb76b646e44981bf1ff974147a20d SHA512 867ce1191e1067f098682866fc38afd59373646d90ccf68943ed83737048f822dc2690facc27f3f9933e3de28874d1fbc7b340dcbf09c6ae02a6a5ea40ab5597
diff --git a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild b/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
deleted file mode 100644
index 272401e8529a..000000000000
--- a/dev-python/fqdn/fqdn-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2018-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="RFC-compliant FQDN validation and manipulation for Python"
-HOMEPAGE="https://github.com/ypcrts/fqdn"
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/fqdn-1.5.1-r2.ebuild b/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
index c4e6e0cf917e..a8cd3548afce 100644
--- a/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.1-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/metadata.xml b/dev-python/fqdn/metadata.xml
index cd8d56ce8be3..21a6b71c2d5d 100644
--- a/dev-python/fqdn/metadata.xml
+++ b/dev-python/fqdn/metadata.xml
@@ -15,7 +15,7 @@
 	</longdescription>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">guyhughes/fqdn</remote-id>
+		<remote-id type="github">ypcrts/fqdn</remote-id>
 		<remote-id type="pypi">fqdn</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 06d01bbb3528..9b7f6e9b76c2 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,11 +1,3 @@
-DIST fritzconnection-1.7.1.tar.gz 77805 BLAKE2B 4012975205320cc1c65ace64f515e1a934da5e330e9f9090021f20989d300df38f042cc8defd794ab6d4f2935cc2973141b50b1aea74a472d42f2dd5c1b2da57 SHA512 f3ca91b41a6255a743a00d34733e4755f1f675c150414c794bce9c52da292cc267a60520d5bc4e6b0e5ba4dc1ce27b7083fa4e2c226bafa3ca39ee6d63c80ae2
-DIST fritzconnection-1.7.2.tar.gz 77880 BLAKE2B bb27d1cc8ccdce17a73ddc6a1f3fcb1187976dcaca28f773a6aad9c07f3dfa80be686d065d060fbf174b60b31bc589f26e6f48ae655a69b4a7ad2864d434156b SHA512 2ab6b010750e7dc7dd010fc51c3fa41ab2eee58c5f310f187e998183950a2ed2668a13a4a4a39bdb27fb1b0a8f69cfff47256ebd3b543128710368689551dc87
-DIST fritzconnection-1.8.0.tar.gz 77615 BLAKE2B aedcc3b116b6ce7ce14feb75714ee6e5a5ea667f7cb5e3124caa61e9b638e91e95a2520184869d088ceee7a6fd242c649660e7bb9ca81920f22954fc01ae3682 SHA512 4a65e715151fcd356ece60b9966560d80e4144d53f0684774af8f669fb83aa87124870ec1dfb29cbd381c73a711797f837b09abb620dfbb94722cba007fdf80c
-DIST fritzconnection-1.9.0.tar.gz 79389 BLAKE2B 58ffebd4451dea16ec4739d77f02e3e67cda4e332df94688cf6b293f6cb6d15277f4d7231805425782d3214f926f74f51da4b988e60cbea5d336bec7436f664c SHA512 cf6710dffa8e76ecd5217d592824735e2bbcd8e2860a333a64e75530fd18da2cf6578181173614a2169d81c4db17f657708809db6d67e092f740558b8b8fd3fd
 DIST fritzconnection-1.9.1.gh.tar.gz 79580 BLAKE2B 6972c92aabb9c516e2b4d3d18bea2daf8002a12c9939a5badd1ceb8f7539a243f99778a3ded0cd057850b54e9cb2a0ca9d2c31be688eaf81f4b279b74d10fc55 SHA512 55642cf1db581c62091d63fdfa9bf4fe36c545df686eae7d0f886b4ef8c186668e6f8fb7bc7786e13936764ea771e0dba79e62b57f19348dd562bf23a27d6369
-EBUILD fritzconnection-1.7.1.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
-EBUILD fritzconnection-1.7.2.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
-EBUILD fritzconnection-1.8.0.ebuild 709 BLAKE2B cef17e67cea0fa5d19d974311fdaac993e1c30993c47c718fca642350c8cddbfa83effd7696ad789243f58b48eb4724fa5b6f16b6bd0c9faced9b48fd35999ad SHA512 2c30c321a06ad5e52b18cb071736a144051bc074884d12f08e4f704ebacff7fef36a152cbf7070072eb7b04f10ffce8b91af56bba50fb9db96e464520eecedd5
-EBUILD fritzconnection-1.9.0.ebuild 709 BLAKE2B ca93c126c489aa8053ca5de9611b9561b0b863ba0a2a15b77809ed7cc7d6114f664ac28e8caeffbf065e9c59260483d4fe291d0d470f7198333619bda9096cef SHA512 f3ad894dade204cfc05ed4721a19779388cbb3c8e61e99457ffa05dafd31f9e099f7f8db2a3b53ba8fd66ed5ed48002ecf82fe74a7f4586e76d978084c438f80
 EBUILD fritzconnection-1.9.1.ebuild 720 BLAKE2B e99e847560c7bb83b7baab4d6c77bc5c8a454029df5a21edab8098fa7f5130515f6b68c84656981ceb8742d2ba12064fdc128d06169b4763bd76948bd5018e3f SHA512 45c8c729655481eac8b87cdec1a98c2b6f8ff5fcab1824abf74df3f563192112af4280d2872620a40011fb5920b262b88b11862eb2db272af6e03fe1a063300a
-MISC metadata.xml 480 BLAKE2B 10c80c3a12112c5cd0839bf870fdee79c53b8c4210fec3f79dadfcbb2377085a5997baa46c6963b78d996d1736cb654a0cba5ba421a6562f353437d3c89396a9 SHA512 ef252799d2d5b875694995334943ed42aad5e66cf97017f28712d14513b77acdebbe4e38214d2257cc3b9393fe09ab226d1c871db007f17225ba4349dc5cb2de
+MISC metadata.xml 469 BLAKE2B f180fca33d0ab2fc81dc87fd39db87cf8c8ff51777062968a3ace592c9ac63af311273fda2db88c6772204ae24c21b4f195d1b7bacbb3c23f677dc7e8e309f1d SHA512 9ab24725dc0bb5b0e40ce79520d19c0348b08c7d779b53064111aa53fefefadc164b6140310df0a367d460d2fbb46345bdb2b7b6a9cf1beba3bbab1f7d7e2697
diff --git a/dev-python/fritzconnection/fritzconnection-1.7.1.ebuild b/dev-python/fritzconnection/fritzconnection-1.7.1.ebuild
deleted file mode 100644
index 00eeb7787fd3..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.7.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/fritzconnection-1.7.2.ebuild b/dev-python/fritzconnection/fritzconnection-1.7.2.ebuild
deleted file mode 100644
index 00eeb7787fd3..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.7.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/fritzconnection-1.8.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.8.0.ebuild
deleted file mode 100644
index 00eeb7787fd3..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild b/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild
deleted file mode 100644
index a30f7148426d..000000000000
--- a/dev-python/fritzconnection/fritzconnection-1.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
-HOMEPAGE="https://github.com/kbr/fritzconnection"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND=">=dev-python/requests-2.22[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/fritzconnection/metadata.xml b/dev-python/fritzconnection/metadata.xml
index 39aa6d179042..80aadfcb4881 100644
--- a/dev-python/fritzconnection/metadata.xml
+++ b/dev-python/fritzconnection/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/frozenlist/Manifest b/dev-python/frozenlist/Manifest
index 8e4272285a7e..2c302ab0ebe7 100644
--- a/dev-python/frozenlist/Manifest
+++ b/dev-python/frozenlist/Manifest
@@ -1,3 +1,3 @@
 DIST frozenlist-1.3.0.gh.tar.gz 27669 BLAKE2B d09e18455893f7ede59c37a080e79ea5e085cc3362e53bc7016db64338b2cf26baf44e95ec0c691535527b0eef4a40ec1fbe814e5d4ae238300125438d21b467 SHA512 780f0ec0e1a701b009e5afcd7f62b2950eda5365140ad5842c09db85b0a3cf282ab70ff9ba752ea6dc7a97542fc7399023aaaca8fdd8ecbd5c26bf64f305f5f4
-EBUILD frozenlist-1.3.0.ebuild 947 BLAKE2B 430e3969bd3b9c00e1f7208306b4cad2944b8d0532f28703e761ada868ea3a69e03871ba831174d8ed44fc8338b52fa2e58b300697b90641d2f9c6861076c1ff SHA512 f51ecd7731036d2fde37832e7c987aa9505ee23950b873b3ba475f9d0aadb69f19852fb0afc5ea87c115ed0a088220bd252bab136deb1bc3256c00c25799aeeb
+EBUILD frozenlist-1.3.0.ebuild 951 BLAKE2B 34f0f1ccfea43960817d487f3db1b0a8e898ab2540da1603e63d502dd08ad773a03164ad625264a4eb927f8d5102aee16861bdb62dfd207432025f1f3bb26967 SHA512 481e569cd7f6694cab015085efa0ae9f87daa608c6f9f6aeae6887ede168461fa31383c30d3690beb9b02bc074bad9334b9cb009c6c0d65eeef446177cadb988
 MISC metadata.xml 351 BLAKE2B 354fa5d9789eb9f28cfe13a39e80f5ba41f4ef9f8daa3437cbab5f1fb61074baf9d1a196814cb459c0a1d3b3c1fbe806ee77580023d71b8b8c6314ad23405765 SHA512 a5b647914f9a7b2004bb3e1c02a6fe07dcaad58dda503cb6a41d6735dcfe80c4e60e4ca51ba83110557518e23f01a656f05266553a6b5acfe95a0560ecb2829e
diff --git a/dev-python/frozenlist/frozenlist-1.3.0.ebuild b/dev-python/frozenlist/frozenlist-1.3.0.ebuild
index 882946e9e6c9..941f0285c9b7 100644
--- a/dev-python/frozenlist/frozenlist-1.3.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.3.0.ebuild
@@ -4,16 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="A list-like structure which implements collections.abc.MutableSequence"
 HOMEPAGE="
 	https://pypi.org/project/frozenlist/
-	https://github.com/aio-libs/frozenlist/"
+	https://github.com/aio-libs/frozenlist/
+"
 SRC_URI="
 	https://github.com/aio-libs/frozenlist/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -22,7 +25,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc
 BDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
-	' 'python*')"
+	' 'python*')
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 6bbeb825adbc..a262ff58e321 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,5 +1,3 @@
 DIST fs-2.4.16.tar.gz 187441 BLAKE2B 5a59dd5bcaae19180a918ba0ceb99b598134d73e4c9ecad840b3cf3041613171367d878d147f045005a87636e8f2145451252d646dbffb8d0f3ae6ac254142ee SHA512 7d9a03b5a782cce048189a7ff527757e60ef6fbb99925713b0179dc9c483f63b54fb1911f39bf2230366c789c526a1b8927863ce93e13a0f71fd8734a7fdb9df
-DIST pyfilesystem2-2.4.15.tar.gz 181799 BLAKE2B 522d118dcee6aafe754d8eb571aa88f26cbbbafd7fedabbf7f4470e098dde01db42cb26b20ed28305daf8f32a22250da81c8a932d420ef4bdf825deb363a26a1 SHA512 7bb153dad5ea03eec7cb1af8d1b5a851845984e194f288687b0e737e1f32c74bf4c1a8d62a9105c8637cd5a29ab82810df9fc11055b894ab0df899cb20a4e1c1
-EBUILD fs-2.4.15.ebuild 1530 BLAKE2B 5fd1efa0be309ffdf72c582c1878d90f6c14bf4e1136cb210c1f1ea68139df9df9d834aeeba94c75bb9e057738c1fff880ac38f01d23cab830bb015882f49a91 SHA512 8ac60d1e7493f66a3d5694ead4835b19af02c8ad57b2d954272e8b98294f86bf3c9339fb13ce08a9626d84935c5cd8e329f1b8abbd968cbc8fc599f1c5dd6c02
-EBUILD fs-2.4.16.ebuild 1348 BLAKE2B 8281a0447a453ee7caf5b6fe0e2292f3e4d8193a49db99f3dc9a9c0c08fe555a84a91d036f2e390f57b7a5ea7bc26bae7f5d05df245b87ea7ef5fad70b465885 SHA512 fe765359b74892885f7fde111617714d4a4158f1a723d11cd1f23304037430b3aaf79371c5d44cecbb0324c496c6037de4b9a8aab86539376fa0241a255e0326
+EBUILD fs-2.4.16.ebuild 1364 BLAKE2B e01902c4c9172d9c2109463bd40b0092a2bd8869ac9ede63498bbe5e99b674eb5245d1b6f042c214aee76f155489a7a4fe0370a415ba136ade417785a9b0aed8 SHA512 8be8fec0a1aaa31ec7bb320137277caa301cb6565e7e342cb8c8339dde8946b85d01de6ef8a32a639b1b2d4f7744dd8eb53c2f2453d8c90383dfa767ac6d8da4
 MISC metadata.xml 581 BLAKE2B b3fa399e172b10606f13b3de4fb0afbe332e7234b3163ce198b30cea2d4c24967b0943d578085dfbaada503700f70015517d01e3f3a01ddcc4795e1821d1a5ce SHA512 3d3154db8e81f2764f99e2595a99a34061762a5cf16695926e25407859f20a59f4dbf60b0d8e18fb80d90c6342f70cc6a2c886841bf156ae06b17a670a4987c0
diff --git a/dev-python/fs/fs-2.4.15.ebuild b/dev-python/fs/fs-2.4.15.ebuild
deleted file mode 100644
index 21b560f51f43..000000000000
--- a/dev-python/fs/fs-2.4.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-MY_P=pyfilesystem2-${PV}
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/
-"
-# Tests from the PyPI tarball are broken
-# https://github.com/PyFilesystem/pyfilesystem2/issues/364
-SRC_URI="
-	https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-# NB: we skip tests requiring pyftpdlib
-BDEPEND="
-	test? (
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# TODO: fails at teardown due to unfreed resources
-		tests/test_ftpfs.py
-	)
-
-	# pytest-xvfb causes test failures due to a zombie Xvfb process
-	epytest -p no:xvfb
-}
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.16.ebuild b/dev-python/fs/fs-2.4.16.ebuild
index 14eb402a18d9..780dc3deb94f 100644
--- a/dev-python/fs/fs-2.4.16.ebuild
+++ b/dev-python/fs/fs-2.4.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Filesystem abstraction layer"
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
@@ -33,7 +33,7 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/recommonmark
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 8f25d474e736..9064b41b58a5 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,3 @@
-DIST filesystem_spec-2022.3.0.tar.gz 331768 BLAKE2B 8f4e75f839419f7445a9291e3b67914338b0371742f1d3a556962b6e5abb31379cfeba52e0101f7660fd69569dabb49190820323b7e067a0c33c2184422ba067 SHA512 7c793b506e93f727bc4533a778f6108f82c9ab9274a8d259ecf483e0acbbfc97e3c8b07735f772f996867053d7e1f9c22687865f4f64cae6eb4fb511de2e9220
-EBUILD fsspec-2022.3.0.ebuild 1295 BLAKE2B 2b32ba25448d9f566929572e1966bb0625f05e032978deed0dab3f4638eba9437e4d8bcf5e448ad005792e6b94ff7ed68f9d0cd6af77394dd5c2411f4b8910f5 SHA512 9cc1bb6e9d76ad35b0204ba10de4bad1d2f9392376a1927650bcd548a8e66758d7b9468e31753489b83fdae1ab139f7bc6d333a82086fcf6848dbe48733a97e3
+DIST filesystem_spec-2022.5.0.gh.tar.gz 337607 BLAKE2B 80f22e6c1ca0ec4194b41a85171d466792812c456129a05c286d8c46de950aeed4cd7a0ee01082e9dbfee5b89ca1a36441f961d7e61be816eb783cad8bca0979 SHA512 687dd0e7018e04d719f7c11e2238afe06f4e8d5eb7193e24dd000dbd79e5c52bed5fde919de47b0dab2d66e9ba93f28370a32f2458a6771e728b0ece68609504
+EBUILD fsspec-2022.5.0-r1.ebuild 1368 BLAKE2B 2ebce7153de30d870b270b903ca1b837bf437f97c804b0f69d104d920026de5a986ce9e8a62e4c33acc090d632c5da1d0d394c8555cc303bc87d6476d9690571 SHA512 e2f20c7c1eab0e5286f57f16654636b68599e7011caea8ce38a8152617bdcaac20220e9240cde7a266b6f5ee5968beb60998117c785aa97731e013e84a88e869
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.3.0.ebuild b/dev-python/fsspec/fsspec-2022.3.0.ebuild
deleted file mode 100644
index db0485f6ba02..000000000000
--- a/dev-python/fsspec/fsspec-2022.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${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/fsspec/fsspec-2022.5.0-r1.ebuild b/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
new file mode 100644
index 000000000000..dfe2219250f2
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2022.5.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+
+BDEPEND="
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tqdm[${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
+	# unhappy about dev-python/fuse-python (?)
+	fsspec/tests/test_fuse.py
+)
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 29436d9bd30d..f117d0da671c 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,9 +1,3 @@
 DIST funcparserlib-1.0.0.gh.tar.gz 66709 BLAKE2B 76229795e88b5b880667e41b2cd3d534649893019824e7206f41d188f44e7a67bc1cdb97b0cbcf731eb840ed128f29434d0748d0923a16ea0a3130b3ee10d206 SHA512 431d6b639c46dc84a0a12c8de976cb2c1369f0172a18d1eadbffba31aff12e9cfeded5ebec3ec63065384547000144d65d60003c55e2b23a1a40818d910aaef3
-DIST funcparserlib-1.0.0_alpha0.gh.tar.gz 68260 BLAKE2B e1a9a9a516142d683424df881a7c390a3999438905136fbd394f23856022f14390d22f1dd3914e680d2c188c819cce9cc4f7ff2e485478614dd4632701db4614 SHA512 02cac31d76bb888118a99367811a8cfac28a999ba113ce43f4bd6211cef815ce1793fc1767637dd019728f15d5c408e859d5bc8365a2c53804092f1d6f03e54e
-DIST funcparserlib-1.0.0_alpha1.gh.tar.gz 74033 BLAKE2B bf4ee5011f595c6b7ba7430c63e21243257ddc2e00cccea75bf5b16feca2a629becd28f196d657e024419010051a33e5f12fae29b6f8763b35cb8d1bb9144a6b SHA512 16dbf07edd5cad979c61396adc3ccce7dcedd46b3cf6394ecf35c9fd2b22cdf262bb609ffca9a4b6f9f0c236124a7b7cdd929166d65056ca71e73afa2f6b97e2
-DIST funcparserlib-1.0.0_alpha2.gh.tar.gz 66692 BLAKE2B 5d45b48c0efe6025b50cfd603f2eeac4341b5e41185fbbe1e0b948975ee778fcae05dc229a34bfde28b64f2723c21699ffadd243629244a067951cf17049abb3 SHA512 a7c1f4219bee2b203d5f3a1701e24f838b348965ca5bc090aa8f7af0407344af22ec5eb2e161212e6ece42491a775076f45a36f8e2b691d78a3c639ca4098af1
-EBUILD funcparserlib-1.0.0.ebuild 676 BLAKE2B c625b09da5282bee65646e8ef9f1bbdc12e917c439c3b254759967a76da45df254a4d2922ac9b23cc82938c5b6997487e7494417561b6de71b8943ae84fa4354 SHA512 b6d04efdcf2aa1ed205e7249b28f3a6c6c717fd03f9486ddaefafcee7b8be5fd2d0a95637afff5cc521c32a39c0aca17fd4bb2f339fdd2704bc4fccd856ad9f7
-EBUILD funcparserlib-1.0.0_alpha0-r1.ebuild 899 BLAKE2B 398dd8ee978ebc79b8ae0a8f20caf30d20f79a73b65882c9f468c4bc9f4997c83e3902fe4393b40118c62011c77175ccaac9f67947cf8a465c936572a3b5391a SHA512 b05b2f838771f953bfc69cbde48f15ea17f4334aab056f491d52d9c02b538085fc54446d70924fb94f103cd62c17efdda8d1e5ce8dff3409a3d8760e6f39188a
-EBUILD funcparserlib-1.0.0_alpha1.ebuild 772 BLAKE2B 9d982d2289bb4a5cf84df92663af51de036b15324020caa679d7848f78730096cc37f0e2a4c3137bf6556e81ab5699af53bd29dcbaa4abc80895e169280d3972 SHA512 627d7b2f423ddfdc753c43a48ad09ef473dd84ce7e690da43603fefa2b13b5565fbf7340258977b15b248929af533420d0bb9983ebf4934256c36592b86d10d7
-EBUILD funcparserlib-1.0.0_alpha2.ebuild 688 BLAKE2B 64d934a9dd0b848a681ad2261700c05874f23577e47ea0d506651f5b2091c8e60beb87072c283360479cf6d22df93535ae19cec3aa0bbef2ba156bc3991de862 SHA512 4fffa878ad7e410d022bc1a09fb4132e1486623051647a903cd1303a8e74e4d607425f0c43c6304a6fe6bc94c71d2182df434eb610513bb3332b689908f3c5e6
+EBUILD funcparserlib-1.0.0.ebuild 669 BLAKE2B aff216da08adbb2c1445ced33a3479a90c40d2274828576da8228839a361f7389674232a3e7ff3736e91acc8bbc3a75c2d7fb12e74e1a00efb21fb88a30688d3 SHA512 b07dd9975a716fafe570899f2f6e158c8f532776f87ae479ecabea16e5fc6df4ce2b113a08b0e21e809d89923c5006dd4cab80ae1b3527f6cd4fb0a81a316595
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
index 332f7b6a5ad9..2648fecf740c 100644
--- a/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
deleted file mode 100644
index eaa5d281e793..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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
-
-src_prepare() {
-	sed -e '/requires/s:poetry:&-core:' \
-		-e '/backend/s:poetry:&.core:' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
deleted file mode 100644
index 61cd5cd72023..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~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_alpha2.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild
deleted file mode 100644
index 5688b13e39c9..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index a3b3edf90e1c..bb972a49460f 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1,5 +1,3 @@
-DIST python-fuse-1.0.4.tar.gz 46571 BLAKE2B b839043343e5abda2725545c696afd4da847e33a77647d910bc7ea71d17480536770d99899ae8f949734304ea6b4b591934f34476ea84aad1adbe39ee5897fa7 SHA512 48fffc02aa7125df03cf2a5819449a5e10a772ecc737bc8a19199beca6a2f8181b98c91cf05fedd06fc258d846c8d67d073dc1e8620c336a3ae09320688dc389
 DIST python-fuse-1.0.5.tar.gz 46592 BLAKE2B 9d33cf508a57b1a08f6c257ecee89386826f5f6c9be223f33c36789930baccaacab112305e264aa5c412f30bfff0562c6701b8ec1f9632d9d2e5ff8ea6013073 SHA512 e0d0cc0f3dee9416eefe430119e8f2f5a9bbc88a214d36d1d23c7e1f7ce78cc977a173f6d22c05cb928715d5c657ba29738f60453323b25299dddc08d57595d2
-EBUILD fuse-python-1.0.4.ebuild 523 BLAKE2B 043eb3f7950725d51060aafd6b9a679405868e51d2a564c6e3ac613080d8ebef46cb79e62575b4e177b8ae1a5b37bc0af22e3524399e40cac2ac1b3d75c57fc3 SHA512 7f4477fceb918f1b978d2d2279e667b47357fabe8451911536539fa4e3f201f7d03613c5f633d0631d5f468e2ee142d0556787997d3730a0b6bec32febc87126
 EBUILD fuse-python-1.0.5.ebuild 556 BLAKE2B 1fc1bf4d23e8eae2aaaa1a00a6d4863dfa20600444ec712c2f34c206f02ec52348fd7b4b38e16623461282a2cfeab897bbb2fe6dccc90e4045565a11be7a6a1a SHA512 1c5526be881f0d7c9ba741836c4bdc95766a39ea07ed256593206d93fd96ae87de84a99cacbbe8a7241ec8a5367c1d85dec0c57bf6d461ca5a34d6672e69df3e
 MISC metadata.xml 364 BLAKE2B df4e5fba243a953fbe10107e8a35989d9ff0d1ef320cf256addf871f6656f04a4be967998db220e88c21e683958c86b8db86b8e535bc1c7123db8d11f3406ba9 SHA512 d553757cb1c8fcd852f2c2533086cb5fe89be481568ced00207e819056a66c10b738e072fef477bb4cbff78d8797fb2d89ffb6fe3beda73ab185c7c21f68af4e
diff --git a/dev-python/fuse-python/fuse-python-1.0.4.ebuild b/dev-python/fuse-python/fuse-python-1.0.4.ebuild
deleted file mode 100644
index 705b081a3d76..000000000000
--- a/dev-python/fuse-python/fuse-python-1.0.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-fuse-${PV}
-DESCRIPTION="Python FUSE bindings"
-HOMEPAGE="https://github.com/libfuse/python-fuse"
-SRC_URI="
-	https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-fs/fuse:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/fusepy/Manifest b/dev-python/fusepy/Manifest
deleted file mode 100644
index b9a93db90b58..000000000000
--- a/dev-python/fusepy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fusepy-3.0.1.tar.gz 11519 BLAKE2B c76319b0d0b64a8dc674b803551f32352fed9a1e6e050110963a159259c3fed8fefbb63cfe6dda689738f07cb796c6b9da14e3070c4a1cf5b70892a6ebe52cc2 SHA512 f913dfd9f29412daa8239548c8ad8bcc64f8fc7be1425bf34cd40a5c4d22faae67c5d5575c187395d911f64ad0dda186614ada598b38b9557e18794639d43767
-EBUILD fusepy-3.0.1.ebuild 455 BLAKE2B e180c6fbe523f6471d803551b6d4f52059fc03eb193f2f0d38ab2967407e38096ce6f85bdadd0e3c47c5e82daa798e6035ee7155659ee10311c5b3d4c701f609 SHA512 a08a87fcf77c6a2a1b719c834c256d41beda7cd1c3ac3899ee16433b016ab8d33885f6293dcba48f735a1e46d4d363e76c23dadf8bc5ae176994bceca03f40bc
-MISC metadata.xml 538 BLAKE2B 865676ca8082d138a13c7af38d914591b11a332bf25aab44ffd8c20d999442d551bfa876d4684f64548779a70dab6a2694388f28d71211886ed79d4e059de32b SHA512 b8572177cf37f6f0b9f374d70b68a99ae7f3bf6dba1441ec506e3ae8cbdf54348662c7d8714b617afb8292da2d571806f90c024fb2dbb3a1b13eb40b269ca3d7
diff --git a/dev-python/fusepy/fusepy-3.0.1.ebuild b/dev-python/fusepy/fusepy-3.0.1.ebuild
deleted file mode 100644
index d8801526d83e..000000000000
--- a/dev-python/fusepy/fusepy-3.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python FUSE bindings using ctypes"
-HOMEPAGE="https://github.com/fusepy/fusepy https://pypi.org/project/fusepy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=sys-fs/fuse-2.9.7:0
-	!dev-python/fuse-python
-"
diff --git a/dev-python/fusepy/metadata.xml b/dev-python/fusepy/metadata.xml
deleted file mode 100644
index d648eceddd2d..000000000000
--- a/dev-python/fusepy/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-		fusepy is a Python module that provides a simple interface to FUSE and
-		MacFUSE. It's just one file and is implemented using ctypes.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">fusepy/fusepy</remote-id>
-		<remote-id type="pypi">fusepy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 9f1ba7906b89..c7acfe429f5a 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -4,4 +4,5 @@ AUX future-0.18.2-py39.patch 2789 BLAKE2B db6c0cb0a030d166f01b95721e560d346f8a80
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
 EBUILD future-0.18.2-r1.ebuild 1112 BLAKE2B 490d02975c21c4b97260c54fb99cf4451781105fdf458989a4a389b5e2d48541be0e0a9088527e529f3e3ca1ed7a4b0d87d1067cfcbafe4d2f7b3a4eee844810 SHA512 8545772042747b907210f942255574af6e10c38014aac52fe315916ee92b42604dc821898d796b9068dc34c242a832d280a1cda10d22196e94659b2300c2951c
+EBUILD future-0.18.2-r2.ebuild 1151 BLAKE2B aa14e11830f1d3f2522ec0c3c13888ef154c9b9fa3e495d8ffefd09881eef749935f8dfc31f1cd071a172174e6947e96fa45b6e71de3d269c784c4bba27f65bc SHA512 efdbb96707fd8f561231a84c75b28e9c49426ba0a35624c300104c9f684841bcc2151eed8d617d757f58191b96c7beb40c0a59489b4c0611757ecf900d76631c
 MISC metadata.xml 402 BLAKE2B 84957a57a39c658794b57e41e2e683d826a6e5b7e1006f0430034a29b82d12f2983b021c63e9d519fe6ea21a90f30822b5561001c7e9283ea770fedb1d40ad9c SHA512 e1a2dfb08304d2cd0751dbde1e1410be0805493bf7624db17b3631dc10051fb443758a0c750ced2846a2769a3d33da752002ad7e92f95d88b4060f7a8be995bd
diff --git a/dev-python/future/future-0.18.2-r2.ebuild b/dev-python/future/future-0.18.2-r2.ebuild
new file mode 100644
index 000000000000..bf2783b8f06b
--- /dev/null
+++ b/dev-python/future/future-0.18.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="https://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+	"${FILESDIR}"/${P}-py39.patch
+	"${FILESDIR}"/${P}-py39-fileurl.patch
+	"${FILESDIR}"/${P}-py3.10.patch
+)
+
+EPYTEST_DESELECT=(
+	# tests requiring network access
+	tests/test_future/test_requests.py
+	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http
+	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http
+)
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 56858fd2c113..e7a1bc2f844d 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 573 BLAKE2B f23dd8c1808bbd586be852796de7b4071588abfc5446cff0095ee65bc60758bf97a731840cfc10502c928796949ae24fc5372c6212990d4535a14feeb5812814 SHA512 5442baeec11fd222ae972dc716f141fa275e69f7160ae42e7604720cd71cd8141a61635d1869511b80a6bd9bd54230fd39e8a7250adf1bf865c207adb7611a9f
+EBUILD fuzzywuzzy-0.18.0.ebuild 573 BLAKE2B a3e67727f104135e05d389be0755e7fd2f4c2d6ff054425ae155b3e9cebe87e69e8285784689e9f343bd05badc4660dd3fda776824f70bccc61912bc14c34d4d SHA512 7f372854049ef05b4e1fbd31a63d1ca9040643059786a531d5575415ca829c1488daac1b689e402b8261682e63dba83cc9f88acf163f610e529fc6e00990bb1f
 MISC metadata.xml 397 BLAKE2B 7d156fc2db4d42258707bbdd93f09ee48ad139d237413b3ef80e4618f614c1e1da4e4a60bfde43976e9cd8fb06bb38f15db086571b93f8eb0cd7c9e4a2d932a4 SHA512 fee9f0884d1a8b2d66e799d5f58402951be0d99c0660e4d378f31dc76fc7384f73d6600dea1270882ce23d35cb45248f123f2ecd91eaba04a63bfa0cf73c0127
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index 7005fdaf527b..4ccd97dca9b5 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 74a2d71eed77..186b201873c1 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,3 @@
 DIST gast-0.5.3.tar.gz 23455 BLAKE2B b7263e959178421a7ba1cdb41cb09edbe1c30680573e1ab3b4de114e0bd151d2278be799fcc1a01524bb5ee6f6d6764d9902dd0018e7cbe54ac7a3d1300bbeb1 SHA512 a836be76303591ca7c40596d98a29dbd53f281e277c8c23e3821b2003d4e8aaf4d806e7f532f27c0eadd4bdca5a28dc0a3902245505ab97497b9afbfee0c2e52
-EBUILD gast-0.5.3.ebuild 471 BLAKE2B fbabdad15673cd0c30c70dca16d22714997a486d741acf5302f26253cf12aef3ec56fd67ccc8fb6c7ba84575544bca5abfdeb153cb04fe651b7f29813e1a859a SHA512 54cd3099101646f0b8bbf131257bcf82a0e5b4f5ccf8f2bbe352070a8974eb58ef3db55e4bb35c82e694d63dc6348b6deab64a3b6ef7b583a30b9cbfe783f767
+EBUILD gast-0.5.3-r1.ebuild 503 BLAKE2B 748ff0237e02c5a688b90b4b07138c594367fba4b94bc8cc1cfc5cbd7c9fea0af169781067c0904fbc6ab3c6907f09585bb9c2bace4b1895e44cf4d247aa5f44 SHA512 6d4fec224af6dda68dd84ea49b94027c9621a9b00fa6757c97913df3b4ede6a9721a7d502b71ba03b5c3981ecbbbb7041b0083fde92ad8e8c6138b1ac95f28f7
 MISC metadata.xml 677 BLAKE2B 2c536c1a53fd3be71dae57488b28f71af9e27dadf2987ecf3967bd74e30ee688fcd598f995d7e0b1b74694668b92699036a8049c54698e389d71687a06df6587 SHA512 9330e92aebd0ca5ead979f70d86540c5b416b60580d45c6b7f8f02e4753bfab476d9b1a22dd7ba32f1167be5512983d275cfe07f57757c484aeb8619e836e13c
diff --git a/dev-python/gast/gast-0.5.3-r1.ebuild b/dev-python/gast/gast-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..49c418354b2a
--- /dev/null
+++ b/dev-python/gast/gast-0.5.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD PSF-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/gast/gast-0.5.3.ebuild b/dev-python/gast/gast-0.5.3.ebuild
deleted file mode 100644
index ade1601aea87..000000000000
--- a/dev-python/gast/gast-0.5.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
-HOMEPAGE="https://pypi.org/project/gast/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gcs-oauth2-boto-plugin/Manifest b/dev-python/gcs-oauth2-boto-plugin/Manifest
index ddfd8cc63642..c2060d7bb3b6 100644
--- a/dev-python/gcs-oauth2-boto-plugin/Manifest
+++ b/dev-python/gcs-oauth2-boto-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST gcs-oauth2-boto-plugin-2.7.tar.gz 20929 BLAKE2B 79db6c7bdf76320c2f74ab5edca0dd1cf7967bd38fb9a7a0a34c05fca3cab51317fb3ebd3e9ba195b42af2944cc951d150e3ee90cc93cdeab176f79d027a9800 SHA512 0ea8d4b01a2da79397e06de9dc0279594017e58e3874a2633b32007590efa2e8a29b5d2127d0218663cf7e63042adcc9801dbbb11bdfcb40d0c5d67c47267a09
+DIST gcs-oauth2-boto-plugin-3.0.tar.gz 20908 BLAKE2B 85c20d8b39dde8ed8a0bad887572040b8eb1eab91b41558c57ef7c190fff9cc5e0502579881a08ed514de87d5fe91a393779e2de071a53bb21e2371f8f13c047 SHA512 84cef64c2b0cc5e38685bb39b3939c54ceced2c0995a67787bf3541bf8a93b91ffec3da83094b7d6957d5afb60833c5ba4ffe7fb688ba8aa943c5f72c719e93b
 EBUILD gcs-oauth2-boto-plugin-2.7.ebuild 1211 BLAKE2B 20ec3d0636161344386f906867c25dacc57acb0628579708edf84d0b1c954a7db9b55517caccdd36899001c63c27c9e7eecb16bfe958d16d27675a9916298f6e SHA512 bc1af718b3f5ce71dbd6bf8679c4bfb587b82f65d30e3c131e2881dbf4cb5623a8553d3dd218517250ab4a60971101522c68ef98d021aecdcb8f10206faace61
+EBUILD gcs-oauth2-boto-plugin-3.0.ebuild 1212 BLAKE2B a79aff22f28422c09423bc89cc4dd232a56881561f7c81c7ce392df5b435c8e2b3632d0e841b07a7bcbd12aa29a3d31ee389a1aecac8069414e342c70924b52d SHA512 13eab01cbe763bf4a2e3a86a3ceb728fdc6741e5c620dd71dfc197810d6ce8558a073c3a9d39c065b3f1af3d38fa7cd06a9a80523408b373d9b237cb4a29bfdd
 MISC metadata.xml 456 BLAKE2B 5846fe15c17d14329e1f44eea25bd0528750cb92c5b0abb1c2413775f13e4a37470a0d03a8a96af4c05cee69d552e913746cef73c7379fb93511f9a1567e9294 SHA512 13c1f905b7e732be95f44268c176fe4e15c0a7b27d64f7581bafc4c0ce943f66d21f3d025b4001e7284404e354f61a6e08a1a2119295918981f7271cb6f04625
diff --git a/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.0.ebuild
new file mode 100644
index 000000000000..f81b7637e25f
--- /dev/null
+++ b/dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-3.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_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OAuth 2.0 plugin for Google Cloud Storage credentials in the Boto library"
+HOMEPAGE="https://pypi.org/project/gcs-oauth2-boto-plugin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Keep versions in sync with setup.py.
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/boto-2.29.1[${PYTHON_USEDEP}]
+	>=dev-python/google-reauth-python-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.18[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	# Make sure the unittests aren't installed.
+	mv gcs_oauth2_boto_plugin/test_oauth2_client.py ./ || die
+}
+
+python_test() {
+	"${EPYTHON}" "${S}"/test_oauth2_client.py -v \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index e89824627c40..f8c695ed09b2 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,5 +1,3 @@
-DIST Genshi-0.7.6.tar.gz 268913 BLAKE2B c54930023c4cd45e24f44baa62f3cc3fe887c5bfd5feb9f7c694cea9bd500cd8c0cea0ed7a60035fb58de9b933199f54ada2a14edff9f5a1b1f63203d10ac7c8 SHA512 a05e82b2b1b9321153a202e5926a26795ebc7c56ee13b8c6da197007a00711efcc7f8ebfb759446c4c2cb99e7e92a6f689576f9ef1f766aa42e0dab86fd5e335
 DIST Genshi-0.7.7.tar.gz 267206 BLAKE2B 0bad4b26fbfda27572e78f87af6093c87d738ad6fdf2beea5e8b0b21b3f5245a4e239bbfbad63e71e73f6588e7cae97f2b3bc7295fa30ad7a203a7ceff7074c9 SHA512 b0a3dee68523292f0672a180c5f2cfbdf48205d82286359b9fac9f668cbc2806c649d1e158d6fb8ead5b1cc5cd44eefe9d1cd79077f96925b8d24dd8e746b40f
-EBUILD genshi-0.7.6.ebuild 877 BLAKE2B 45ea1c9cba01dcee34fd3a5ffcde29bea2dcafc4b59ce2f583a6921870060b57ee1059b033e96c3bb59e2bf719f620813a7cd96c01d857c32b05588fec3cbbc4 SHA512 1cda1d5b91ac45c8c6a76864db04f29b428fc761e150cf9feda91af96df8244f7e85da416751075ddcf62170a6251be1396353ccc097c6b93c31cc89886f97cd
-EBUILD genshi-0.7.7.ebuild 925 BLAKE2B 40be3ec7166cbe120e0bc016835e32b8fc9fc8d6ff6ccc826be90e72dbd550f416e3d459eda3093c66ad1b593bf883ea3313764c982995f6e18333a321f70493 SHA512 2678d9ce430bc5b00af7c90b1a9b63173b4263c4f1bd8f63dfcc732b8c8b2230dea61aa3677a9b292581071e07b83888160ca7f3fc2c89bb1eba11961fde836e
+EBUILD genshi-0.7.7.ebuild 922 BLAKE2B caefe4517af6433406319d3490b0dd76544a5fcf6b4da76d91a61adb09941c218c3bbd1f8efae56e99968e760a80e2c325a1eebfb8853cedbf71e940a34f0fc8 SHA512 21ca8f92c9fdfd24a1d3fdecb08f192d8cd0f845bc5fda8472d09313d266f52675e42df41f9b205af05b6cce98cb177a1140f6b9bd1c7ace10939de16d5c86fe
 MISC metadata.xml 365 BLAKE2B c5f3b55444eb424fc0ec15f0f19eef39a31c2c5e900fab7a06fe7bade29893ddb59baf4fa7f60621017a400dc7004dc093d124e1d3366df2663c0b714e31c8cc SHA512 1914d0acf5d6c517ff0198c827f606acc4124e834c306312d49d42bb729bb82b80ae6c98f3ac0797178eba3beb2c437a10665a23a843d0d3efbd148250a189dd
diff --git a/dev-python/genshi/genshi-0.7.6.ebuild b/dev-python/genshi/genshi-0.7.6.ebuild
deleted file mode 100644
index 0672470e7184..000000000000
--- a/dev-python/genshi/genshi-0.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="https://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genshi/genshi-0.7.7.ebuild b/dev-python/genshi/genshi-0.7.7.ebuild
index 5b2d9b7bc0d6..faeb204e2307 100644
--- a/dev-python/genshi/genshi-0.7.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/genty/Manifest b/dev-python/genty/Manifest
index 8418cea6040b..bcaa483a3bef 100644
--- a/dev-python/genty/Manifest
+++ b/dev-python/genty/Manifest
@@ -1,4 +1,3 @@
 DIST genty-1.3.2.tar.gz 20818 BLAKE2B a3344869e63f4f6e564836fdcf5e36b3184f5df2a20994ded3a20ee0ff1360ea5e9db574bf6097f5b47673fc7db70bb9bfd3238075fb0a3b7b722a6461f09632 SHA512 cfe984dfe5af48ba9f4f959a1d0ab1d331d3c2fdb64c680572e5652b845e5c290097ec3ed2b4e472a563cd6ab79489124f6eb212902a05a2f1ce5ff254a82e13
-EBUILD genty-1.3.2-r1.ebuild 662 BLAKE2B 3d03c14fcb164541ad542c766e6b49ac68e137898c24373ebec3c6d166baefeea6d7b3ea890fefd6c2aeda57366d94f6adab53828222297653ffe5d161c0160c SHA512 e33bacd60701be7ae887091a84a935cdd4fbf13527695912c6a6617bc0fd62831b80b28a7cac3eebda4027df3335333f02398fb9a8becdc9aef5b301e4b9b9c9
-EBUILD genty-1.3.2-r2.ebuild 710 BLAKE2B 07ce9d651f68482e893b745e3e07cad1f6c561da5006d832dae4f0779b58287247039e0b5b9872789d49c085b197f211d0710026cf66c00b1f6a456de34cb76c SHA512 639b67bd7f6ba3a37161ad34bcfe1ddeedc62e8fa8f3662349eef8c80f143f46b3c61d51bf0d27cdd5b15bee4a519e9f00801a479e859a2e50f5b822f2808a44
+EBUILD genty-1.3.2-r2.ebuild 702 BLAKE2B 8ae5dc30e1cf607d03f20b94ab8a2d820d1b4c454f976237881efc76caa35b8b202246cc56e48045f4ed01b5afa9f33ee8aa5f63dc1df86797c2b1d1e047c7c1 SHA512 fd044231df326a382e0726bf3041e358a7c02b15f9486a1639cc4505b86b200750936228b5a4acd99baa23d7b5be7e49652bfce91055a46e27b05af868d17483
 MISC metadata.xml 382 BLAKE2B dc3dc87f3c25fdad2cec23a3e1e2bf87a458712c95b2f4899761f110622cc267daaec25e3b2c64355c91669317ce93b8a33d077f0708b9c3bb69b8a81cf1133b SHA512 b97a5b4f8fb65d0357ba5a24e53ad841cb7db237009e36af61e1803944293e40b765516d8ed8195c224ff7947394080ac06332b994f749fee86f13b71a33cf3c
diff --git a/dev-python/genty/genty-1.3.2-r1.ebuild b/dev-python/genty/genty-1.3.2-r1.ebuild
deleted file mode 100644
index c7ef076f92a7..000000000000
--- a/dev-python/genty/genty-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 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="Allows you to run a test with multiple data sets"
-HOMEPAGE="https://pypi.org/project/genty/ https://github.com/box/genty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/genty/genty-1.3.2-r2.ebuild b/dev-python/genty/genty-1.3.2-r2.ebuild
index e367e5608fe3..a801c1a8ad94 100644
--- a/dev-python/genty/genty-1.3.2-r2.ebuild
+++ b/dev-python/genty/genty-1.3.2-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/gevent-websocket/Manifest b/dev-python/gevent-websocket/Manifest
deleted file mode 100644
index 033735c5c032..000000000000
--- a/dev-python/gevent-websocket/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gevent-websocket-0.10.1.tar.gz 18366 BLAKE2B bf811eeabab247f97946c971aabd3e4a5cc6034f0874bdfcfbd83ebd08a276d72f70c97694da5fbbb96c988b288d45f55970949d9f4f75bbcb62c027f13aaed2 SHA512 4f25ec1646c223b89ddbb7cf4decae72cc4baa6e872443dc05994987f509068a806c8b5e135c433d631e35b3902227f0e4c89d8071aa74e24c06b0e543e8df93
-EBUILD gevent-websocket-0.10.1.ebuild 467 BLAKE2B 0a24b8636b75677549463e7a5bfeec266e74cdf94d2cb92f26a10151bc3916a09becbe243a298ea051a47884fc9920dd2d5d7e4e79855050ee556878f9976938 SHA512 a63448bb8301b1e8a6822db5071ca42e916a1f120e9d3e2194e28f90465c0974a1030dcc4a1dba94afdcbd44c2ba614d970f090a603154f1e13ecde617a1e7a0
-MISC metadata.xml 316 BLAKE2B a5b8c7872cb966255b373b6dc9f2e9d1cd7bfa01d4b7316bfe02a74670044a37a06744e63588ae7f26c06cf5cb6e2dc9a883e841d2fdc7ba34d237c8486e6256 SHA512 e47b69c28b10a52ed331234b363d322b210c3e995aee250ee72a956da1e178d96bf56039b808cab78e4b6b1a35d5f6bd58a9e6c5ef46eac43240b0e8926e04f3
diff --git a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild b/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
deleted file mode 100644
index 1a2f54a54eef..000000000000
--- a/dev-python/gevent-websocket/gevent-websocket-0.10.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Websocket handler for the gevent pywsgi server"
-HOMEPAGE="https://pypi.org/project/gevent-websocket/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/gevent[${PYTHON_USEDEP}]"
diff --git a/dev-python/gevent-websocket/metadata.xml b/dev-python/gevent-websocket/metadata.xml
deleted file mode 100644
index 717bd589e141..000000000000
--- a/dev-python/gevent-websocket/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
-</maintainer>
-<upstream>
-  <remote-id type="pypi">gevent-websocket</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index fd45003b9703..c36af1757d79 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,3 +1,7 @@
 DIST geventhttpclient-1.5.3.tar.gz 58447 BLAKE2B a1cf529c6d40ee81ebe17cb066f2d837cf3d5ce2511bb735c1a63503b612c98c17c91f08de99d604c9ff6ebfa7e6502c338e7fbbc86de954ae7e559966aa8006 SHA512 9a0ed907f73f7f5ff8675502ef6fc82bff7b543d0a2d22e1eca5aba3592675a87fe09c48981f496b7f63a660e7eab5f68801ae74da8c33ac9d9bf55a0425eed1
+DIST geventhttpclient-1.5.4.tar.gz 59551 BLAKE2B d1bda5315a92afeb408f33043c8ccf5911d6519dbe50266688f0b123fd92a95f1cb9cea449676117ea051af1400c656fe47d241b6e4e03803dc017806b5e0be4 SHA512 10d9ace4a555a5c39d8b737d96484041f9e704df41b8a3cca3b05b3c9ccb30d0490d154fa47a45edcad762a2e0807ca89425ed484275ee1b3098f0094fd6d166
+DIST geventhttpclient-1.5.5.tar.gz 59566 BLAKE2B f43ffe9880eefe77f19adc00bcef612df057f96e256f50ca4081658d7e0d01deca2473da3d2055dbc1cb98fc4f7f0a7442809fdcab635c43042792e2601efdb9 SHA512 89efe008099935ac8715ddf09c13e70c1a3552da50c495522b2a62e1ff51a407808e6b797f8fd3b0863a3a59e5b03e604bda8b1027c0326da75cb1fddb5d0fa3
 EBUILD geventhttpclient-1.5.3.ebuild 1497 BLAKE2B 500fba9aefe32214d5896c9ad01f6dfa60b5c6b317764f64177cc590a5179dbe2e1f822571e2e1983f5b66b562ed7dc88ae37eab8243cd268a8d7419bf746fc6 SHA512 ccb07a069c62871956206cc0c98e0378d75edad600ec449a715b459968c225ed442ffd8189c2fa03359daff0de89c11fc2eec2cc027205ac768d45e47174b32d
-MISC metadata.xml 556 BLAKE2B b8a8f2fd8ff23ea4bf828d0dbf673da0345f832124a526f533e4beb36ca168acb13bd4fd92e7842a5361c38d9437960322a0c29f4c11a79696ede0544148d2da SHA512 c7bec846363a0fb54edeb145718d0acf56e6c2d0c1b2eed68f24412a9f328dac86f78e39d636e0b234cd556c334fd413b810bb1e5689651a17e2cd31cae7bd8d
+EBUILD geventhttpclient-1.5.4.ebuild 1538 BLAKE2B f52d86da5a52c30297c0e0b9c5cf94ed592c270b56e6b310bf94c824947810dfbae8a95445d369d7f28be68d80c817ff08300955d0d45070708116250864e236 SHA512 8dfabf1db715be2d32eddda352755da6bee4ee9d4d4d81e9c01ef86cbf573daefd0e2a52b9c927ffba7adbeecc3378caa8c96f0e38c68e37b0c1e17a51070a9f
+EBUILD geventhttpclient-1.5.5.ebuild 1538 BLAKE2B f52d86da5a52c30297c0e0b9c5cf94ed592c270b56e6b310bf94c824947810dfbae8a95445d369d7f28be68d80c817ff08300955d0d45070708116250864e236 SHA512 8dfabf1db715be2d32eddda352755da6bee4ee9d4d4d81e9c01ef86cbf573daefd0e2a52b9c927ffba7adbeecc3378caa8c96f0e38c68e37b0c1e17a51070a9f
+MISC metadata.xml 580 BLAKE2B 24b9860ee1f361f1ced81967a404c4cf773e415c053ac83ff0b2bb97bcbbaa5cbba4e7faddcb615379d3057d2c3c28d59f9c8a0a36135edf9165615610ecce45 SHA512 5c3a892358d1fc3594d08c3551b441eaa2e38c60cd06952a62631a4ac687ab730be559ecfb17f9ab7878d0052b4ff7e03d6d49fd1a277bff71c1ef4fc369daf8
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.4.ebuild
new file mode 100644
index 000000000000..d4807ee44f57
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.4.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="
+	https://github.com/geventhttpclient/geventhttpclient/
+	https://pypi.org/project/geventhttpclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[events(+),${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Avoid ModuleNotFoundError for tests we skip later
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# These SNI tests require dpkt which is not in the tree
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Skip tests which require internet access
+	epytest -m "not online"
+}
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.5.5.ebuild
new file mode 100644
index 000000000000..d4807ee44f57
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.5.5.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="
+	https://github.com/geventhttpclient/geventhttpclient/
+	https://pypi.org/project/geventhttpclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[events(+),${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Avoid ModuleNotFoundError for tests we skip later
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# These SNI tests require dpkt which is not in the tree
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Skip tests which require internet access
+	epytest -m "not online"
+}
diff --git a/dev-python/geventhttpclient/metadata.xml b/dev-python/geventhttpclient/metadata.xml
index e16d44999f05..f7551c444a51 100644
--- a/dev-python/geventhttpclient/metadata.xml
+++ b/dev-python/geventhttpclient/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">geventhttpclient</remote-id>
-		<remote-id type="github">gwik/geventhttpclient</remote-id>
-		<bugs-to>https://github.com/gwik/geventhttpclient/issues</bugs-to>
+		<remote-id type="github">geventhttpclient/geventhttpclient</remote-id>
+		<bugs-to>https://github.com/geventhttpclient/geventhttpclient/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index 0b3a0a9807d8..fcd82ad86da4 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,5 +1,3 @@
-DIST ghp-import-2.0.2.tar.gz 10928 BLAKE2B 7479917284af9a8f8ac460f43d97c9d5fe29c4dc3663698e5b76e9ba1b0a7cdcd8d93fb1f112cdcfaa6689f70f280b4dc49c6f8e632784c11121f1fede1f8eaf SHA512 554c466f1275d905d7698539fe74b662f43c26b9497e83bc3615849ba2815dcbce6ae01fa14eb1c2245987ccc1b497afe175e3e0ddef3de561fc14ea24792d4e
 DIST ghp-import-2.1.0.tar.gz 10943 BLAKE2B bccff70a8ca6c58a3c768b143b0545a61080a577dbbef3021233134b8536df1788ec9a88aa8454865cfb83491b70fc6fb53caf04514af3d7845204cf2b893cad SHA512 10665a1a6392fe047d1e42d7f107511b1a31de02625200e7db1c637f33dc8dc41ec71c2db4f562c6e94a4efb4836efef8a29177d953d99fe17a889169074050c
-EBUILD ghp-import-2.0.2.ebuild 454 BLAKE2B 54859657f814e505e584b26b406dab58ea6b36d1836e4148af7388c1da0843f2f4ca74df75a7110c88aaafba8a9f90ee9e99777bb67229d86d9931bc64fd6448 SHA512 6b72c6d0f8cf8f4b6a8d5f4a7a2b4495b4599f48920b751f0f2f197b971731e76c62511a37e06e743576f732d7d92e6edd0c152c89a0f3d19a9b43cdcd5493c3
-EBUILD ghp-import-2.1.0.ebuild 456 BLAKE2B a7e1934feb733b4075439ee6257b57d8b0625a6745bd141bfb1c8370c2107ddd446bef18de419fe2890dbfb9e22ba716f5f8864ba14adefc98ae2f55f63a7fc0 SHA512 8a50c69d371269a0ed5956ae69c5ce1a1522913beb6c0db16e9ac3451beacdd9aa7dcfca223d458e954cc4855f0b43a6a87e2aca5e32b269ed1f12429e79853f
+EBUILD ghp-import-2.1.0-r1.ebuild 486 BLAKE2B 9dc5942e2a9935eb9ff76cc8ee14e29a85ebd42adc0e080dbe8842e1aacaca284bbf8fbd62e3906395d73602258fdb7c703eb9b97f74661f5ebb13f92d0f15ba SHA512 21c6283f4d64f45b7dbb09e5a27810c0f21b8f72d58432d6eb6fb3b57385418baabb635b4b61336c69c74ce4e8cd3ebd408089723b667bf428bfc59e3374d40e
 MISC metadata.xml 410 BLAKE2B 0caeb18e5be64053ac585560860e830d7f8cb78ea6898f29c71457469000a7bca01fc07f48ae0ef4224925d73ffd7f3149c812d37d4d7f5d0003b6adb1c4650b SHA512 8bfccec4ffea700f9094231fb0adbbeb2575d3dc329a6bea4df391ccf3294a6386898307f77e127c76c9ea85a07acee0ec7e79e9a7d3725e9cc7fbe73cad67d3
diff --git a/dev-python/ghp-import/ghp-import-2.0.2.ebuild b/dev-python/ghp-import/ghp-import-2.0.2.ebuild
deleted file mode 100644
index c61cf937e711..000000000000
--- a/dev-python/ghp-import/ghp-import-2.0.2.ebuild
+++ /dev/null
@@ -1,20 +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="Copy your docs directly to the gh-pages branch"
-HOMEPAGE="https://github.com/c-w/ghp-import"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..8181d4c960cc
--- /dev/null
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Copy your docs directly to the gh-pages branch"
+HOMEPAGE="https://github.com/c-w/ghp-import"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/ghp-import/ghp-import-2.1.0.ebuild b/dev-python/ghp-import/ghp-import-2.1.0.ebuild
deleted file mode 100644
index 75edd4b67f0b..000000000000
--- a/dev-python/ghp-import/ghp-import-2.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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="Copy your docs directly to the gh-pages branch"
-HOMEPAGE="https://github.com/c-w/ghp-import"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index 9ca5aa58a7fc..839e69268fde 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,6 +1,6 @@
-DIST git-review-2.2.0.tar.gz 64905 BLAKE2B a08b489bb4b53a9cc6510b11238bc947334a187e0ec7dad7e1240cf3efb110a5310cfe4f3278af9311108fcb0b915a9d1eabdd2aeabab3fed0a939cba9f88ae2 SHA512 9a33f6a1e60b0679b248db818a2a4559b4ee6a6b765f2e6a16fd566fd85587be363f837da2118e75bd3e6d54ba3dcc177d3d678d927d75cca6d8ad6ed4e8d4f7
 DIST git-review-2.3.0.tar.gz 66005 BLAKE2B b074811614093058525ec817770d9d1d0d0adc4f154ec7a8882406c1954672063e3cd58df28d0ce17735b5a135f0a6be97657207e16dbe8b7719e9b6f77aea28 SHA512 841ea039e73e2571ee01ba08781d82c5ee0c136be092d2f7ff44e59284f2e77d57537ef5aef3eaf24a0f93f63106fd2404e1ec89745a723386944b5e0b32faf0
-EBUILD git-review-2.2.0.ebuild 790 BLAKE2B f4e64e12b37ba704643ec5441aeee909271ad884492b3aee6852620c424716e9ff05f5c853312ca9f6a77d9a3a10a14d18399971d732dd104583d898aa62c444 SHA512 36863f3e68c2ccddb4f5dfcd2c921c842dc2738cdc0e86e59ad6a6cf8a216a825223e8f10b1d7ff88b955d33b25801df06b7e893315201a35885b9fe59909f40
-EBUILD git-review-2.3.0.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
+DIST git-review-2.3.1.tar.gz 66400 BLAKE2B 67b2bf60e91a127144995231b94a48eaa03cfe8cb8e27513183f21b4cae1fbe2eeaa00a23d21da2dd7258aa794ce4cb0ee06e91510d707116699da1702bbebac SHA512 b3fe0ab40c473c80da20c42b4104e82115c9ea02bda01580aedb69622e117d733160eb42027432eec12379250186ea7b6f9eb4cb86b128a591816243a0c0fadc
+EBUILD git-review-2.3.0.ebuild 782 BLAKE2B ff9255a07fcdcc81c3f17f4f9067ae19d7e717e1dd3fafb087e96066ca621350142027eda30cace90561a6d63dcdf9a09c4a5643cb71b30598f20c28675c72ab SHA512 d6314d81c5fe52d91684c2c313cf2969ad57001f6ad5f00d001d12fbbf70a8144bf9de9869579c150f558c1c359a4ee727a05c1628a9186374bb2d0445c29c7b
+EBUILD git-review-2.3.1.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
 EBUILD git-review-9999.ebuild 784 BLAKE2B c2d971221d2bb7a6d07c4d961505d2cf7cc03785ee94eacb7496fad6fd999ee2fa21971e302a0a25de533a9153d36f92405bfe575dabead70afff8afa11e9ca4 SHA512 7267baf2963f6338b961241af52af728af0b8c2d8430c99e139f8f7e1f20800380781abb90cf9cb3fbe44f2e43955321953bdad5d14ec0cd28799e9b63eee875
 MISC metadata.xml 338 BLAKE2B b891e2436716d179293d3a1844dc671cb2c4270887260921b04fa3674d999805d4845337b73d3e45a34b2105b900209c7630f85962ea59fa8b472946981b4b6d SHA512 b8e512c07502ddba83bd5012ca036fb364ecf433408e70f036290b4209f0f06bf085de7a7519f47f46f1e68df9e9c97349cc55454b48ccf9dbf57dddc1ec28fd
diff --git a/dev-python/git-review/git-review-2.2.0.ebuild b/dev-python/git-review/git-review-2.2.0.ebuild
deleted file mode 100644
index 0619801846cf..000000000000
--- a/dev-python/git-review/git-review-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=
-
-inherit distutils-r1
-
-DESCRIPTION="Tool to submit code to Gerrit"
-HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-python/pbr-4.1.0[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/requests-1.1[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i -e '/manpages/,+1d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/git-review/git-review-2.3.0.ebuild b/dev-python/git-review/git-review-2.3.0.ebuild
index 16e5454edee8..52acf643695f 100644
--- a/dev-python/git-review/git-review-2.3.0.ebuild
+++ b/dev-python/git-review/git-review-2.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/git-review/git-review-2.3.1.ebuild b/dev-python/git-review/git-review-2.3.1.ebuild
new file mode 100644
index 000000000000..16e5454edee8
--- /dev/null
+++ b/dev-python/git-review/git-review-2.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool to submit code to Gerrit"
+HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/opendev/${PN}.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	>=dev-python/pbr-4.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i -e '/manpages/,+1d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index da309b704fa2..a2484f637a69 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,4 @@
-DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
+AUX gitdb-4.0.9-nose-to-pytest.patch 2453 BLAKE2B 6c827808467f874d500bd6b15cefae6292d01ad9f104e8085e5038c92970a329847654c097b6be8e3a2edeb42ff0c2ebc708de9601f74cb90a4bbfdba31e1cf6 SHA512 d5878b74919cec9481b6f0012e35bb01e4fbfc42d053900f1ef1af3f1f4ebcc01c3a0a14a4e60519d24cafd5c51fb43174c58ac00f5bc7eceea10a8ec1f2f3bc
 DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109
-EBUILD gitdb-4.0.8.ebuild 1209 BLAKE2B 7e119209dcfae9a1103c0a53496ce5b36972e76a786340869707dd41a041a2acb672058fe55e0fb3ec627fb0dcafe2675fe2948ba4f44e09de41184df4184295 SHA512 1ee0583c19e3091f97f6e20779e1b14f7b4fd8e14be1ab32a25ea3915c170debd8359c224c51b38e89f66994289ce1e2c61ff9dfc5e3f0c99f17fcb92d02cb55
-EBUILD gitdb-4.0.9.ebuild 1254 BLAKE2B 0de9b98a7cbb256145d0142e7d5f4c169a5787bcf83f75b711bf546e98f21bb263bb9abd23e5aef70d20f52902fe7804ae977b58b2a303664d9d298629e05350 SHA512 2392ec273180f309bad7a9afcc543749cd4971efa34c1ef9796f8d53f6c63bff094abacf5c13761a9e9d726a6cadaaf3c7449d6c063a6e4f1dc4f30bf63e407e
+EBUILD gitdb-4.0.9-r1.ebuild 1267 BLAKE2B 22afdea4f7c6cce18b10019f72d2ef391236411d749078446b70231409bb1882140a2b00534d55649ca8521658204c147ec64b976b150f5555aed162b8f46cea SHA512 8a253957a94a0f4f58558dfa5e5804cede22f470a0a0596ed921e62ac962a0ea9aaaaa811a1e71fc76ec7ef5b09abc9459f97a475dfd74216666d5bc59b31c68
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
new file mode 100644
index 000000000000..fe38e8c613ee
--- /dev/null
+++ b/dev-python/gitdb/files/gitdb-4.0.9-nose-to-pytest.patch
@@ -0,0 +1,75 @@
+From a61910fde100fa1112ec57dd3e456719724997ef Mon Sep 17 00:00:00 2001
+From: Carl George <carl@george.computer>
+Date: Wed, 9 Feb 2022 17:15:39 -0600
+Subject: [PATCH] Switch from nose to pytest
+
+This is not a full rewrite to pytest style tests, it just changes the
+minimum to allow pytest to run the existing tests.
+
+Resolves #72
+---
+ .github/workflows/pythonpackage.yml | 6 +++---
+ Makefile                            | 3 +--
+ README.rst                          | 4 ++--
+ gitdb.pro.user                      | 3 +--
+ gitdb/test/db/test_pack.py          | 4 ++--
+ gitdb/test/lib.py                   | 4 ++--
+ gitdb/test/test_pack.py             | 4 ++--
+ 7 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/gitdb/test/db/test_pack.py b/gitdb/test/db/test_pack.py
+index ff96a58..4539f42 100644
+--- a/gitdb/test/db/test_pack.py
++++ b/gitdb/test/db/test_pack.py
+@@ -16,7 +16,7 @@
+ import random
+ import sys
+ 
+-from nose.plugins.skip import SkipTest
++import pytest
+ 
+ class TestPackDB(TestDBBase):
+ 
+@@ -24,7 +24,7 @@ class TestPackDB(TestDBBase):
+     @with_packs_rw
+     def test_writing(self, path):
+         if sys.platform == "win32":
+-            raise SkipTest("FIXME: Currently fail on windows")
++            pytest.skip("FIXME: Currently fail on windows")
+ 
+         pdb = PackedDB(path)
+ 
+diff --git a/gitdb/test/lib.py b/gitdb/test/lib.py
+index a04084f..abd4ad5 100644
+--- a/gitdb/test/lib.py
++++ b/gitdb/test/lib.py
+@@ -65,8 +65,8 @@ def skip_on_travis_ci(func):
+     @wraps(func)
+     def wrapper(self, *args, **kwargs):
+         if 'TRAVIS' in os.environ:
+-            import nose
+-            raise nose.SkipTest("Cannot run on travis-ci")
++            import pytest
++            pytest.skip("Cannot run on travis-ci")
+         # end check for travis ci
+         return func(self, *args, **kwargs)
+     # end wrapper
+diff --git a/gitdb/test/test_pack.py b/gitdb/test/test_pack.py
+index 4b01741..f946197 100644
+--- a/gitdb/test/test_pack.py
++++ b/gitdb/test/test_pack.py
+@@ -26,7 +26,7 @@
+ from gitdb.exc import UnsupportedOperation
+ from gitdb.util import to_bin_sha
+ 
+-from nose import SkipTest
++import pytest
+ 
+ import os
+ import tempfile
+@@ -246,4 +246,4 @@ def rewind_streams():
+     def test_pack_64(self):
+         # TODO: hex-edit a pack helping us to verify that we can handle 64 byte offsets
+         # of course without really needing such a huge pack
+-        raise SkipTest()
++        pytest.skip('not implemented')
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
deleted file mode 100644
index 8c146410de5a..000000000000
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)"
-
-distutils_enable_tests nose
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
new file mode 100644
index 000000000000..5eb050582e8b
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb/
+	https://pypi.org/project/gitdb/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-nose-to-pytest.patch"
+)
+
+distutils_enable_tests pytest
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	#TRAVIS=1 disables performance tests which rely on the gitdb repo
+	local -x TRAVIS=1
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	epytest
+}
diff --git a/dev-python/gitdb/gitdb-4.0.9.ebuild b/dev-python/gitdb/gitdb-4.0.9.ebuild
deleted file mode 100644
index 94184a149103..000000000000
--- a/dev-python/gitdb/gitdb-4.0.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests nose
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/github3/Manifest b/dev-python/github3/Manifest
index b2de8516bd31..5964ae14089d 100644
--- a/dev-python/github3/Manifest
+++ b/dev-python/github3/Manifest
@@ -1,11 +1,3 @@
-DIST github3-3.0.0.gh.tar.gz 35410027 BLAKE2B d5da6c7a4612879646af7bfe82ac899c3894c0ecba9d6bf2d467ff497431ddabbbb342a5895d55bee56a03a6ea4b12bb989a903bdef31998da4382619810a9bd SHA512 67b8d30ec44a38344117a2d28f4eed1d86ddc4ffda68e36da9d6540ef4fe57a544e9d793d278a289f61e8874271b3ee21da0d742d9a7463cceccd4f1384669d5
-DIST github3-3.1.0.gh.tar.gz 35518951 BLAKE2B f5e804f2e475cda88423a5ffaa36c1a1d92501dae9a7746f7cb1ef252b3a035db36f84929bfb9ea368a008aad8f5c08e70df9a63bc5e6b543d31ddd0e8549632 SHA512 6410f7e38c23ae654e5e8af3b3f2e4511960d19ce37f170283878e1f71349d0affb094b18b869cba79868666dc10e18a00d9182e2990f943c64814fbd3eea82c
-DIST github3-3.1.1.gh.tar.gz 35520342 BLAKE2B d06a5121bb034c9ac18c88e3affb9414d6802aba8dd69339c7c17ffb0897e18beac7a004dd3f328c7b4f4bfc91b9bf4e23c8cb33d145a2adbc961896659c8e27 SHA512 45c775c6070088a0e73ba353d6fc4d8c7f5e709884caf9116a10faa3de21d1e4e184d5563a741b2f8f60d16ac72304441d7004a5c81680b7ea2660d26fc3758d
-DIST github3-3.1.2.gh.tar.gz 35519407 BLAKE2B 392f34a6f74c6536113a8eb9511d38e40ce9c45ba078322d61fe8bdf9555ab5c440bccd6776c695d68034743d02eb0b80f3d84347c50b4753c7e50f982d08666 SHA512 ebb65229e82b3f3874fc556b2e323add81def711810725fd7e0ad991578de1ce1a0e38fee2bab54073079abae3ed666bbed5408ae26e9ca788a99704df4ab0af
 DIST github3-3.2.0.gh.tar.gz 35522134 BLAKE2B ef263dc7e97bb7acccddc538cf812abc8554395865832ac993fbd7f965fd008607d0a682b35be5bdfc1b46618dcb3391e924f57d841a30ab732df9b3c76774b3 SHA512 2b15524df9289d2139178b4a92914458276cf347ff7e41c55eb6b7b9ad705ced4a9f64eb025aa9334a38611b87147a8ed118a6958a9924f75ad272fc868d196f
-EBUILD github3-3.0.0.ebuild 839 BLAKE2B a048c9b3ca5c836abe5fb155cd88b70369131507c8e869e3d3705c63e5f7de5a24638f5ce6b0fdd70ffa94322c81424ba61425529628cc05a7aa71272842015e SHA512 1cc5c224cb89757b04007dedd0a687b9c4f6646b41c017c232490fd994cd9337efda67b4857503f328f7cee6d46736cb7022dd00031363dbb5059e609cfc7a3b
-EBUILD github3-3.1.0.ebuild 953 BLAKE2B da5c61c1c9159a8c07e52f37e9f7af4ed2159453b5b94aaeeecfb92daf6a1e88ca52aa3b0df658e77cd9200ecc262e7bd2d36dfbb4bab74a2ba5afa621cada68 SHA512 72aaf9d68c518e3e9e647ea797edcdcea96d3519295053af4c7bd0eec1c57d21abd4333618429ae69be07685d361994f4882655174bc8fa5dd89694dc7f1c0a7
-EBUILD github3-3.1.1-r1.ebuild 1037 BLAKE2B e6925ca70aa7c537958c39c2429e47fe4d4863f2832d9d0ea8b6de422c84f6157185ee6912ffead398b0e3d057bdddce5e1d21176c10272ac3c53dae1ad0b676 SHA512 37f8f409c77d5032710b6dab56ae7132cb52ce6aa2401e1169d92c94789aa7d925e4cf72fb191541135bd3e0498dc4fd46e1ff3cafe037a7eb0539f388c8b230
-EBUILD github3-3.1.2.ebuild 1037 BLAKE2B e6925ca70aa7c537958c39c2429e47fe4d4863f2832d9d0ea8b6de422c84f6157185ee6912ffead398b0e3d057bdddce5e1d21176c10272ac3c53dae1ad0b676 SHA512 37f8f409c77d5032710b6dab56ae7132cb52ce6aa2401e1169d92c94789aa7d925e4cf72fb191541135bd3e0498dc4fd46e1ff3cafe037a7eb0539f388c8b230
 EBUILD github3-3.2.0.ebuild 1037 BLAKE2B e6925ca70aa7c537958c39c2429e47fe4d4863f2832d9d0ea8b6de422c84f6157185ee6912ffead398b0e3d057bdddce5e1d21176c10272ac3c53dae1ad0b676 SHA512 37f8f409c77d5032710b6dab56ae7132cb52ce6aa2401e1169d92c94789aa7d925e4cf72fb191541135bd3e0498dc4fd46e1ff3cafe037a7eb0539f388c8b230
 MISC metadata.xml 675 BLAKE2B aa0bec874cc285c1d5eb57c128188c8690eb572191465ac193e8df40836b4b27b1994916ee419c2d03e7fd95ad6ee2882d5b603702939663bedc9a0a27f7aeb0 SHA512 cc6cceaf8fb98df0ff61aa8ed7e45af8054cc20ea7e6697ff30d103d2dc5b479486374ad6f99e4de46cc37214701fbfaa4d3fd1a74923b9e7d7dfddae08ebcf8
diff --git a/dev-python/github3/github3-3.0.0.ebuild b/dev-python/github3/github3-3.0.0.ebuild
deleted file mode 100644
index e782c17ddde1..000000000000
--- a/dev-python/github3/github3-3.0.0.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} )
-inherit distutils-r1
-
-DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
-SRC_URI="
-	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/jwcrypto-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/github3/github3-3.1.0.ebuild b/dev-python/github3/github3-3.1.0.ebuild
deleted file mode 100644
index 6a9122cb9366..000000000000
--- a/dev-python/github3/github3-3.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
-SRC_URI="
-	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.3.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/github3/github3-3.1.1-r1.ebuild b/dev-python/github3/github3-3.1.1-r1.ebuild
deleted file mode 100644
index 3619477f0fdb..000000000000
--- a/dev-python/github3/github3-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
-SRC_URI="
-	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.3.0[${PYTHON_USEDEP}]
-"
-# via PyJWT[crypto]
-RDEPEND+="
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/github3/github3-3.1.2.ebuild b/dev-python/github3/github3-3.1.2.ebuild
deleted file mode 100644
index 3619477f0fdb..000000000000
--- a/dev-python/github3/github3-3.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper for the GitHub API written in python"
-HOMEPAGE="https://github3py.readthedocs.io/en/master/"
-SRC_URI="
-	https://github.com/sigmavirus24/${PN}.py/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}.py-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.3.0[${PYTHON_USEDEP}]
-"
-# via PyJWT[crypto]
-RDEPEND+="
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/betamax-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/betamax-matchers-0.1.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/glob2/Manifest b/dev-python/glob2/Manifest
index 7776e3bee7ca..1dee5ddef42f 100644
--- a/dev-python/glob2/Manifest
+++ b/dev-python/glob2/Manifest
@@ -1,3 +1,3 @@
 DIST glob2-0.7.tar.gz 10697 BLAKE2B bbd813be6ff46d31de0e728d672897a934bd6e4c61b1f7dabf158d3e64021ca1fa1622878333ec70866796dac1d3e3eb1402eda541ed4d89873eddb367668e60 SHA512 6707c33782373cd71b1794ef3a143f6c0ceb5733bec944d16596eb4662df4c788328078b621bdda6096da95ec2f267256fca620dd7691eb02bf0ce940dd4150e
-EBUILD glob2-0.7.ebuild 442 BLAKE2B 35ada880cb194c5dae6cf5283fcf765469d5b81e61dc929464c2b50d293aafa97c43fd9963486ae291f58e4f39dcfb6a516838590d61905bd61d1dc73d89e349 SHA512 2ff830cc936c837f92985ebd22bee0d7783cf575d69ecc9408aeb9e8a0fc4298c3b6303a2ebbbe79ec4f6c1341983c22b29406cba3afc4c99f847788065448a4
+EBUILD glob2-0.7-r1.ebuild 479 BLAKE2B de40676db61d5ee9b476c11eef62541e62951e2ab518e3c5ee35108de7c2178003f45f06d76962ef1182668f9b806636e823f8d5b9ef0827882025315fdf283d SHA512 b10f33aea8ab0b9d8be0dc8c719b428a52ce69eb4be56fbee7b06c16c30b78a8dfbf96d3b3bafa5451ee96583271cd65bc81620700151fc5affb033966feda45
 MISC metadata.xml 400 BLAKE2B 8bb6dfc44d9fd44c28cd737cdeb426f2d3367bac00331094affc2be83a0f933c479d0c650a70f095461ef9613a711ec900a1313ad46f268b70ef776b964dce91 SHA512 d953ea0d4a10270abcd081660f723ebc46c114f5506828c561ca03608f1492795bf3670bce924dc46cc97103cca36667109fd78c80100688a882515498e6fbec
diff --git a/dev-python/glob2/glob2-0.7-r1.ebuild b/dev-python/glob2/glob2-0.7-r1.ebuild
new file mode 100644
index 000000000000..e80022b52137
--- /dev/null
+++ b/dev-python/glob2/glob2-0.7-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Extended version of Python's builtin glob module"
+HOMEPAGE="https://pypi.org/project/glob2/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest test.py
+}
diff --git a/dev-python/glob2/glob2-0.7.ebuild b/dev-python/glob2/glob2-0.7.ebuild
deleted file mode 100644
index d2e6f7bcc7ad..000000000000
--- a/dev-python/glob2/glob2-0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Extended version of Python's builtin glob module"
-HOMEPAGE="https://pypi.org/project/glob2/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest test.py
-}
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index e4bef18dee33..3ded9ce1ba81 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,4 +1,4 @@
 AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
 DIST gmpy2-2.1.2.tar.gz 258445 BLAKE2B 5fd89478bb7c48c317a7af74fd872e5a9c1141f8f23c110aba7298d1a325caa13e24f1a2e601d6b3c6f6af30d60505f9161a03def16df59dddabe611fb600ef4 SHA512 abfeb0d8a155235e3aa797ca7b34ab6947f0714273e9d381167a9f6273bad34689e1985c139080b146e072b5bfbb4fa2b937566a14f4b94cc09ed21b3f2082b7
-EBUILD gmpy-2.1.2.ebuild 932 BLAKE2B 6b5d52f62790efc52d1b797f138d33093a60365eb632807ccc9175804d9fb2877e34880e31b61cc0cbace5e1f092d36b1828153eefb661229029daa6190a4cb1 SHA512 f6211e3de0601687e5caa0c6d00af695db8e8a12640d8ca3c814911de32c8250b9b5898efce839b1b8206c4bf0aea9087fc5497ae4c66a7e27bce827fca03491
+EBUILD gmpy-2.1.2-r1.ebuild 1002 BLAKE2B 3b8d45c21d609863c26eba5c89c9812e81a4af24f860995419e1c9a4c2e326e286f4e597da4cd9b6ad66f8bc09864433b4dc3bdfa098a2564bea3d1e190c91ac SHA512 883b5b0bd6bad4035e881f98159dbd07d32416c468b40f3c5a612017e46f357ee0ddf63c3f3fe39ac82980a3d639b866e8b3c170b8bc217840b7b28e659f16ec
 MISC metadata.xml 687 BLAKE2B 9cf9e1c3dad11819000600a2ce28b5f140101cfa37553df7bf07edeb8513d7b8d80b15d561e37ca960a23d3470fc7f83608f9163d46b54fe7c41782302c53963 SHA512 eb1aacdf09d56ac73a1ce37d4562987c900f658bc517ccb6bd34cafefdf9a790d0e0d4318f70b57d68c5ec0c2832d0960b2bd619002fe690f484cd2702b77f79
diff --git a/dev-python/gmpy/gmpy-2.1.2-r1.ebuild b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..bd8745a9eae7
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.1.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/
+	https://pypi.org/project/gmpy2/
+"
+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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
+	dev-libs/gmp:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+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.2.ebuild b/dev-python/gmpy/gmpy-2.1.2.ebuild
deleted file mode 100644
index 1c17edfd29b2..000000000000
--- a/dev-python/gmpy/gmpy-2.1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="${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 ~loong ~m68k ~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/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index e65c2523f638..87589e0dce30 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,7 +1,5 @@
-DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
-DIST google-api-core-2.7.2.tar.gz 164017 BLAKE2B d2f1c690527c750a819718043542ce853be7f135660dfe661db2ba315213ef4a9756eeab6f1854275044d4f1fed50d119c2914eb00e043b7d5b085dad426a26f SHA512 1fb420a41d603d576030d2b324036de10831035ce1505ba94dedc9e58ce354d0f23e1d3df8a4f2f5082147a1be49d93e10c2209a1407f90ffedfa74815730e14
-DIST google-api-core-2.7.3.tar.gz 164219 BLAKE2B c394fd95bff3ac393174372e0c49f9a7974a006de6f14d07af7b15b4c531d6dae7af8c38e00263289a895cb9dae9ef23368d793f5ae3649b9b029337a72cc0ef SHA512 2bf49738216cd52dad2bdfb3367e370390c366b49a8c3c4f6f49a2a3f17b27120d99933b57c8eb8c9a1f0f25ef5ea6d876cf8c3c6c759d3585d625e57b1153f9
-EBUILD google-api-core-2.7.1-r2.ebuild 2292 BLAKE2B 20473aefcae801fc41b1207eea8d9f781ab330c5ca4b6f857773cff1bf8ab373f80fdb49052d33a69c4123e79610c09b895b98302216648139b864a223bf03c9 SHA512 8cf1ce44f00419ab30eeb71f4eb3fbd91ef198a2e22fcf97ae9c15b103d0229d6dc44aeae2f905d596d50003c097e56d971412c4b544c24a686e665bc7bab734
-EBUILD google-api-core-2.7.2-r1.ebuild 2035 BLAKE2B 8bdab82df068514cf5630211b0ae3653a5c65fc29a188e977e9d0842b5f8ebedb15affe28354c0d86c8a5abdb8bad13e7d546d897690f5b9685403e2e60381c6 SHA512 d6e1ddb9db77768041dcd76eb4aab27290a8101938c9fd4930cd30d77fd90ce521e7fc4bf55cd77442e5348e944689c5e2385d87ba90292c6a82426debf977af
-EBUILD google-api-core-2.7.3.ebuild 2035 BLAKE2B 8bdab82df068514cf5630211b0ae3653a5c65fc29a188e977e9d0842b5f8ebedb15affe28354c0d86c8a5abdb8bad13e7d546d897690f5b9685403e2e60381c6 SHA512 d6e1ddb9db77768041dcd76eb4aab27290a8101938c9fd4930cd30d77fd90ce521e7fc4bf55cd77442e5348e944689c5e2385d87ba90292c6a82426debf977af
+DIST python-api-core-2.8.1.gh.tar.gz 164630 BLAKE2B 88db73f210ae5ee4aa2e7382ea34ef59fb51f88e196622556327c130057b74594884bbe21719bf12cc6ddc9975cf12ac71fa24ac4dfde4681b4742af57702b5d SHA512 f3bfa476562428246203592b53c22e8e52af167af10b1fa68afb51fe6e8ca8090e9231e4c297847d12c201ca791aa80153bee07f72939bc65920260ec50b3d38
+DIST python-api-core-2.8.2.gh.tar.gz 164586 BLAKE2B bd62b20d1be52f0a2227d1663ee37ce31d991e0773ed793a3999b70c74e03a28ac188cc331027def0055a5b80e93378d9ec5baa389c65e7d2f183b37233be5ac SHA512 5844339cee71103650c446f002dcb13a632086d96dec1ed04a0ad5e4d3a61cc2a8e048da3e6445a50a0c009b0d25729f02865d28484bfee2a3427c829537e350
+EBUILD google-api-core-2.8.1.ebuild 2116 BLAKE2B 2de96b01871de23ecede06ab214e606d22fae01fb2f4f57a1ac1568f2a6044e898022df1c0311dd3e5b7a23af6c8a917b713e45de399914c1bb1573b2a54c880 SHA512 e203f44aa72c910a49ab836c45aa2766f428f89563333401169e181d4f273853512608c8938f949855a0bbfebe576b3965af5cf985b43ab360202c3a1a6f7112
+EBUILD google-api-core-2.8.2.ebuild 2118 BLAKE2B 2b8508a51da3bed4950e4e3c9066acbb1a8e3404415beb4108ac0cf8f72eb43ab367340093fdc377b83236a306a339e4d4cef26286da2fae8a44f60446179073 SHA512 7aee5143b8943ee5895244e40b68ba4fa31401eaa1909aeb79887c1ea338f678d292400a516c8f6981404b041766580b01813b0a837bd47640c7b2d7c7663637
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild b/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild
deleted file mode 100644
index 8b6705313d6d..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/proto-plus[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::Test_StreamingResponseIterator::test___next___w_rpc_error
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-	# TODO
-	tests/unit/test_operation.py::test_exception_with_error_code
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	rm -r google || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_write_namespace google
-	epytest -p no:aiohttp -p no:trio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild b/dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild
deleted file mode 100644
index a009e19f6f23..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/proto-plus[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	rm -r google || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_write_namespace google
-	epytest -p no:aiohttp -p no:trio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.7.3.ebuild b/dev-python/google-api-core/google-api-core-2.7.3.ebuild
deleted file mode 100644
index a009e19f6f23..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/proto-plus[${PYTHON_USEDEP}]
-		dev-python/rsa[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# failing due to missing grpcio-status
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
-	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
-	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
-	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-src_test() {
-	rm -r google || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_write_namespace google
-	epytest -p no:aiohttp -p no:trio tests
-}
diff --git a/dev-python/google-api-core/google-api-core-2.8.1.ebuild b/dev-python/google-api-core/google-api-core-2.8.1.ebuild
new file mode 100644
index 000000000000..668d75698795
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/google-api-core/google-api-core-2.8.2.ebuild b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
new file mode 100644
index 000000000000..2ddf9d7fb8e4
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-2.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=python-api-core-${PV}
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-core/
+	https://pypi.org/project/google-api-core/
+	https://googleapis.dev/python/google-api-core/latest/index.html
+"
+SRC_URI="
+	https://github.com/googleapis/python-api-core/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/googleapis-common-protos-1.56.2[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/proto-plus[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# failing due to missing grpcio-status
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_unary_errors
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_raised
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_read
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_aiter
+	tests/asyncio/test_grpc_helpers_async.py::test_wrap_stream_errors_write
+	tests/unit/test_grpc_helpers.py::test_wrap_unary_errors
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_invocation
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_iterator_initialization
+	tests/unit/test_grpc_helpers.py::test_wrap_stream_errors_during_iteration
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+src_test() {
+	rm -r google || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	distutils_write_namespace google
+	epytest -p no:aiohttp -p no:trio tests
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index a470ad8c7b53..9983ca7095ee 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,7 @@
-DIST google-api-python-client-2.44.0.tar.gz 29961288 BLAKE2B 3bb7d421c76180009c7105d693edc32c5f6af7d853cf9f70d18001976e854c343d6d9e03ad5210562a1c1c17c5127b6d96d2b12128997a8007bc027eb10c841d SHA512 8a12684117a1bdd6b72ec6fce2e7d1e48115e05788e39c8aaad8f6095e4bdc3245f6c471044e6b0e6983210f8cd0328bb9ef459f55c4c9b973a89a658a30677b
-DIST google-api-python-client-2.45.0.tar.gz 30011332 BLAKE2B e8a734a7aea1152ac92427de7059fa59216ba96c5fc68976b341fe0fcdd8851cbbcf1eb8e9cdc37cd18eec5cce0e8f87d3832b0df39c8795f3363f61c457a17e SHA512 b0adabae6ea29390fa7506cd7b846b8499591e49ecb247818b7304683c4ea3def25203a106b371ceff5e576c84f3ab207ffd428cb7b1b543b170c2ef0ea731d4
-DIST google-api-python-client-2.46.0.tar.gz 30051613 BLAKE2B c1ada6b9e59ec269e6584c6555af17b1e0561e9d3e273c56b554280ee32e3db9b0e96677fc6490990d2944d532d1eb908fa9c45e38faee942c80fa1c10a10bcb SHA512 fec085668fe9ad842c2b4ffc74165af459f99e91758580e83b3270cecd6c3faaba47f27113655859a2dd616ad42cd652541230eb515ed14ff759ae9891eed03b
-DIST google-api-python-client-2.47.0.gh.tar.gz 30118538 BLAKE2B 601a02ffdb76b9213c0259042ad5693b46bd72b6178a37d9d6a8fcc263e9a8c02f19c1ce9923c72f41270e960c675e4c71cefb4fbb4e54125bf000186a857ae2 SHA512 1da6660f085edf2562525b904def124398088afb0e9dbda82f0894cf5fc26c052dcd7a497f60ef18d281a16b46c5cfc6b145fca8fd4eb7d3f9225b9ff3ea2ac9
-EBUILD google-api-python-client-2.44.0.ebuild 1383 BLAKE2B e0d3b5e577052d1b0de4b6978e93dc55cc3557b1898b823667a64dba72aa2010d098fb8f1c7949fa345d9a386a581a2ace4a90e4e4b26b271b47e29e6a7a465d SHA512 b938a70d5f8a4dd2d6fd88183df52e3f1b0f8b699b9afdeefaaf1433799a390ed2d52b2c791000043a1b3237a1b8a753abe53035da2ca2478de782adec2de728
-EBUILD google-api-python-client-2.45.0.ebuild 1385 BLAKE2B 9513e20b8c3d7363ae1e6b1c794736718d29771800919094b95342bf25ab27d550b9349d6d7da9d1c7a5667e5fb138ecd2f831a586ebf2d0c0bc3f6e74fd4486 SHA512 adcddc960675f548fcc8f981399d2ff9582b4245a00eab7d113ea02fe3c1118c34c338fa70b367f049041427ca86cb6b0529ae8472025b9bec0114dd2e3fabc3
-EBUILD google-api-python-client-2.46.0.ebuild 1385 BLAKE2B 9513e20b8c3d7363ae1e6b1c794736718d29771800919094b95342bf25ab27d550b9349d6d7da9d1c7a5667e5fb138ecd2f831a586ebf2d0c0bc3f6e74fd4486 SHA512 adcddc960675f548fcc8f981399d2ff9582b4245a00eab7d113ea02fe3c1118c34c338fa70b367f049041427ca86cb6b0529ae8472025b9bec0114dd2e3fabc3
-EBUILD google-api-python-client-2.47.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+DIST google-api-python-client-2.50.0.gh.tar.gz 30751763 BLAKE2B 4fa967932d13fa03640970ba2b6b1756864d88e4953deb5c9cf89a4556bd2cb3f1083f2e141b89a08936a40ddea64e45d65b5d9afe4024edf94a56c5ccb32798 SHA512 8dcdb85f2f37d4c668924abba46f0012ad453dc0775b373dc9fc510020479b1dc8a22cd85980ab97bcd4e7bdff19c78d829b1d758e9105a71c3ac7aa0cb19946
+DIST google-api-python-client-2.51.0.gh.tar.gz 31181726 BLAKE2B 465cbc3beb870a543bb54b69342d1a4e75026fa3c83846a3641e048b922cfa14ccb56593a0e8feadf4bf30568425347b14f5f1dd081d5d74fa1112bb0d57caa3 SHA512 ea9e9424aa36e077f10922dba9d6bf43f376d5e059c5d0fc7a31ef919232eb7778a891104fe3a7328e841381d5cd2cd76cdfb1fb80458c979f83a935f8b1df5a
+DIST google-api-python-client-2.52.0.gh.tar.gz 31712232 BLAKE2B 573226a90617aaf2b0272393694759f2796cbaf26629f4d79ecb661424c6304689fafda7c2d60289840445f118dbae4cf0ffbd6444bc0c428ee4bb8879a57c92 SHA512 55fc06c50240b22ed51ecd84e797eebc4c57852da9c45ca8c0face7e961ab0debe06d6ac91fcc6ef81878fc4b851b8bec7a192a4e149f611fe9e4d8b15cccdc4
+EBUILD google-api-python-client-2.50.0.ebuild 1442 BLAKE2B f386901776c1845ec0815ba4254b5e6cdbeec0c7dab8a3928bb60a6259ef1140bd4e3ece4287fc3ea0e1833a69cb8432fa973447f83846e60b6a6b2038bfbb20 SHA512 828e71b82de37f6d50f980e897c0cf5a46df036dcfa005906aed6772455c8f5059c1fa6bcf0b2340fb9307df08df2789e6421e26b5c0ff28774844c3a36c828c
+EBUILD google-api-python-client-2.51.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
+EBUILD google-api-python-client-2.52.0.ebuild 1444 BLAKE2B 4bd33fb2b9ec7d091d0b8e5aadbc24c5c786d4adf497087e749364f74f54536db99cd9efc6ade89b333e60ac09220badf45e721fca040227a53f151ee197b131 SHA512 4a3be7d069bf83dba8a7911ce9ed5761e1fe2c78dacb94a921aea897a0ba201b5c58983de5a487f841f498501b7e2ea7a5bdefad29a518fd75e546ff3c10925e
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild
deleted file mode 100644
index d456e4f8e791..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.44.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.45.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.45.0.ebuild
deleted file mode 100644
index 9ffc1aa432ce..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.45.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.46.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.46.0.ebuild
deleted file mode 100644
index 9ffc1aa432ce..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.46.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="https://github.com/googleapis/google-api-python-client"
-SRC_URI="
-	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/oauth2client[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
new file mode 100644
index 000000000000..1c528a1a0c2d
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.50.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.47.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
index 7e8aaa05d6d4..7e8aaa05d6d4 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.47.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.51.0.ebuild
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.52.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.52.0.ebuild
new file mode 100644
index 000000000000..7e8aaa05d6d4
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.52.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index 6aa762f940d8..426d868b0469 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1,4 +1,4 @@
 AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
-DIST google-apitools-0.5.32.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
-EBUILD google-apitools-0.5.32.ebuild 903 BLAKE2B d0d67653d43f23a6d13098817c395fe27ea324f94e96069530abc98ee049e2fea78947bda75cd0ea04ca3d54f1abe8a8a3e5282859bc63a4818235b4da250bf1 SHA512 51dd15571ef5a6c4b2d6c4a03b23cfff683c59fb9bf8ca3c3931ebc4197e6a7856c07c1ed8620c0f3db257db946e8e3aab8695e3108958909cd279e9ebeefdb8
+DIST google-apitools-0.5.32.gh.tar.gz 365913 BLAKE2B e43b21e6ce8491c89955bd6c194a1f4076988be2f67280c1bfb8184e1b83a01c307077080d182877d1306814bc38aa0541d9d417cfb93afdd766ddb3c83e0ef5 SHA512 5996d80cb08fd7de3b2df5fbdbe56c885af5d85276a44f174762ac71407227e454d338007035ba2b3deef09384e7bd389f121ea5e19e5e302a054f1033c19b6f
+EBUILD google-apitools-0.5.32-r1.ebuild 930 BLAKE2B d5199fd4e5ec9631b7a53aa7644a9f8edf878034b6f0a2fc7e1b681bfc2cb959e4919f34a1e5b5aced1701ff72e7c0f8ac193b00a70130faea5244c0f69c6c45 SHA512 611349b90d95f4c65f00bcde28d0a03ef0db7d4b10a4545de5840023ec3ae204923be4f180c5446f3f54413321831fe805cc7c7a5995f7ed1506db2e205bfeb8
 MISC metadata.xml 374 BLAKE2B 7c5958972937c0faee293cb016f911f7b9514a0849251bdff06946061e5dfcc308c4016e4dc82ec84162127cdb69c6fb41136b19cac13b6c38c4e12a27728bd5 SHA512 df98a533627f967ecc240dcd839d9ef74445b07eafe15e1931481fd5b6a1521553f5b377c324cd1d8bf87db3d996b9cd5ddba362bc91450923a92b90c5be6fa8
diff --git a/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild b/dev-python/google-apitools/google-apitools-0.5.32-r1.ebuild
new file mode 100644
index 000000000000..c52af1b4a465
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.5.32-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${P#google-}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
+)
+
+distutils_enable_tests nose
diff --git a/dev-python/google-apitools/google-apitools-0.5.32.ebuild b/dev-python/google-apitools/google-apitools-0.5.32.ebuild
deleted file mode 100644
index 10bf2fec7dc6..000000000000
--- a/dev-python/google-apitools/google-apitools-0.5.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-COMMIT_HASH="7975c0cdbae1b9fc106553ce46e4a59cf0bea1e1"
-DESCRIPTION="Python library to manipulate Google APIs"
-HOMEPAGE="https://github.com/google/apitools"
-SRC_URI="
-	https://github.com/google/apitools/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-S="${WORKDIR}/${P#google-}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
-)
-
-distutils_enable_tests nose
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index ec515ebd7658..bef787fdaf11 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,7 +1,3 @@
-DIST google-auth-library-python-oauthlib-0.4.6.gh.tar.gz 50982 BLAKE2B 93980a69777089125bca9f583cae0b64f9facf699da3ac135561a9cf135122d9e22a6c0be3325d366dd77a2240fb16d5c63633a216cfee07b9fceb2239227c86 SHA512 a20a85c073a6208d72c8f6ceb34544241f599e716b1191bfc52bcc367797efc18d0e2b94d4e433cec692282b00428bcb4d7e73ed48a26e66d6005189d5dddb77
-DIST google-auth-library-python-oauthlib-0.5.0.gh.tar.gz 52118 BLAKE2B 596f9af156030b0dbc0a35c3946ab865370fa326176fc33b04d55aa5d99950718d275f69b399d9afe303ee84f9c5823571eb4c144353f17fe6a64bbca7a35e18 SHA512 7da0d1c5e8c20aee843798c317a2c1edd29caf98abaf8895e354e20279c45395de4a522e21f11dbbe9e67c3bd984ded101b0cde04519b9256d80bdc42501a71a
-DIST google-auth-library-python-oauthlib-0.5.1.gh.tar.gz 53101 BLAKE2B 2edaad7dbe42834d440bb30bcf836e01a575616160af045844da6c853f93a3a7a1c80367bbe58d47dbbdaf9e5b061abf780d9edd48f311e30d79025c934c3764 SHA512 628da0161739c9f0ba5963db6f21da71fde01ff81340d9242adcc74468c92c290693cfa4d98affed79556299621e74083992b54346c14940c1e88c5a5c683408
-EBUILD google-auth-oauthlib-0.4.6.ebuild 864 BLAKE2B 10b7813d88167227979f33417164a7b1dec78cc3f239a4ed5975d5057b2d39b94204d897ccd17eed81ee25656468ba5790dce531533d4099d7337b1e02dc59c5 SHA512 96e06c8be123e55b2dd9a0e26b70ea8edc9ecfb73b8e0550b209d1f46e819b06b4df4327ddd6a4b3d3f59441547bf88ce19cb5fcf6dfeb2b455df8c2f625c902
-EBUILD google-auth-oauthlib-0.5.0.ebuild 870 BLAKE2B 15490d4b6ea29d35ec776127502df685e10d4faef6f739349880ae046ede83aef28208c44b6090985e42aab170b077fd3ee9d9bfe81d2a312b05380951975bbf SHA512 dc7093ce0450448b8afefc9af564297ea3e538621512dd338181a2ec5d25071cdec073114dd6cc16f5ee71c5e77f4f38ceec57e3d8ccc36ae916703270025d1c
-EBUILD google-auth-oauthlib-0.5.1.ebuild 870 BLAKE2B 15490d4b6ea29d35ec776127502df685e10d4faef6f739349880ae046ede83aef28208c44b6090985e42aab170b077fd3ee9d9bfe81d2a312b05380951975bbf SHA512 dc7093ce0450448b8afefc9af564297ea3e538621512dd338181a2ec5d25071cdec073114dd6cc16f5ee71c5e77f4f38ceec57e3d8ccc36ae916703270025d1c
+DIST google-auth-library-python-oauthlib-0.5.2.gh.tar.gz 53842 BLAKE2B 7adcd9f339ec9a5528308fcc0fee1cbbe96440e1bfe5c7cc9c94808668e22801b612d291a2419333888194c3224838ac40f9d0656381825bd660067470f58910 SHA512 eaf296a0e0504e8249637a8db7531c10b120f28abeeab3e1fe8f366b4279c396509188e83f8a0ec56be85063430ceb691d6d926cee33d4f166bbcc4425e538db
+EBUILD google-auth-oauthlib-0.5.2.ebuild 876 BLAKE2B 97153977e671f5a8e24315290ce154c41bf478add7b9103141df177381631adfb7a4e7001888a8362ee09f11213c1d461b480436d649d59f9f089ff95c1a25db SHA512 eb04ca36f3939bf0f76b0118ba8c629e39b9bec056c5afd322a2d73b3d655d9af6c2786db17b16f0f7010e0e9f150c14f11cc56671b43e3f876e4477f8ed48b9
 MISC metadata.xml 410 BLAKE2B 23af42a2aa614f119e10cf5d57c3c37abb69ad8d9b1e16445fb92c9f00bdd78f6b1a6a51dff4ebb98bbb03e0002e73eb68cffcf857372dd94848187637c60219 SHA512 c19dd3af098644d5068ec677be51615885bb1267ba9bfb867609725e2a824a74934e2fe25909ea7406c91ca405d44e4c7191a14d3d1bc7b3a60c29445456d3d1
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.6.ebuild
deleted file mode 100644
index 93b3e546254e..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.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..9} )
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-DOCS=( LICENSE README.rst )
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.0.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.0.ebuild
deleted file mode 100644
index 4a1afbdaab4a..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
deleted file mode 100644
index 4a1afbdaab4a..000000000000
--- a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=google-auth-library-python-oauthlib-${PV}
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://pypi.org/project/google-auth-oauthlib/
-	https://github.com/googleapis/google-auth-library-python-oauthlib"
-SRC_URI="
-	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.2.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.2.ebuild
new file mode 100644
index 000000000000..9aa755ca297b
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/
+	https://pypi.org/project/google-auth-oauthlib/
+"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index e87de65ece3a..691d56453aed 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,9 @@
-DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
 DIST google-auth-2.6.6.tar.gz 189789 BLAKE2B 8adf725ac8678a07c6c35f641950c5da0f269e8556074b5832a08267cbb64237dda817c576b15fbb315fd0a018e30bca1fa1f5a0d1f85aaae4ab2bd58538b191 SHA512 bac6345bf142a8dc6acde0bec43a8fd78f76277740114a0557af88748a5ec2f509757e6099f570ed037b2265717f339fe319254a826793d0b16f1a7d227a6b09
-EBUILD google-auth-2.6.3-r2.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
-EBUILD google-auth-2.6.6-r1.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+DIST google-auth-2.7.0.tar.gz 195638 BLAKE2B 487047f75c3fabde929a451d009ebfcb89ef816cad07cd6fda7b436c69f6eedee6dad64780df743ea133b66aab72f75f0185263fd542eb1475d642d7a6e2e2b9 SHA512 ba506619b1392dcd85b71f9ea68dd3acadcb93c4017030d2d812d383c971e6917ed074e64b9a554db9879d61b229a1d35a041c487a517113652934a6849122e5
+DIST google-auth-2.8.0.tar.gz 199717 BLAKE2B 9814b2967336622ef043721a21a4d4334ed59cd743e75a41e67fdb87aec00094a30d89c49b73144bfb9b2e8e88e4bb7141081df7ea1abf317aa9f516c9657e9f SHA512 01096dfdf4ff59b95e32f8734771046ac11e12cadb72f2f4b9274c15c097aa951da3675660009ff23455c7814c4d7797e22b4b294c5d62c2dea5dd655855aec4
+DIST google-auth-2.9.0.tar.gz 205241 BLAKE2B 3e33b3c404d0fbd8b4c0b02c6187103c5715dad0f8850b895c91cecca81c2b2adce1b6426eccb8fa5c94948b53978b8530c54c59749e54af5b9513ce23497f6a SHA512 2bcdf7c80d588f8229808e35426cf07ff1e14e778deb315ed375cb2c17a7efcec848c3cd2aa1ab8cd9c8550cd1e79eba9345c84d44f513844dfe1928e42a189d
+EBUILD google-auth-2.6.6-r1.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
+EBUILD google-auth-2.7.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.8.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
+EBUILD google-auth-2.9.0.ebuild 1527 BLAKE2B 6a9c5ae6fe4de702e737e491d692c91e0b44ba3961a2f965489614220fd641cf0416ced1ee0bfd910730268c14406d27e12a224499004a9d2a41f258726c33b7 SHA512 e64349d2b54a4be4fc33d37faec791ac61459ae7cc4143758bc47b3d593f8c440ea4114dea463318f2706d1c597c6c248a81117908ab5b6f5304e0ea63ae521d
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.6.3-r2.ebuild b/dev-python/google-auth/google-auth-2.6.3-r2.ebuild
deleted file mode 100644
index 37c2ffef06a9..000000000000
--- a/dev-python/google-auth/google-auth-2.6.3-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.6.6-r1.ebuild b/dev-python/google-auth/google-auth-2.6.6-r1.ebuild
index de5188c8fdb8..37c2ffef06a9 100644
--- a/dev-python/google-auth/google-auth-2.6.6-r1.ebuild
+++ b/dev-python/google-auth/google-auth-2.6.6-r1.ebuild
@@ -17,7 +17,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/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-2.7.0.ebuild b/dev-python/google-auth/google-auth-2.7.0.ebuild
new file mode 100644
index 000000000000..de5188c8fdb8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/google-auth-2.8.0.ebuild b/dev-python/google-auth/google-auth-2.8.0.ebuild
new file mode 100644
index 000000000000..de5188c8fdb8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.8.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-auth/google-auth-2.9.0.ebuild b/dev-python/google-auth/google-auth-2.9.0.ebuild
new file mode 100644
index 000000000000..de5188c8fdb8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.9.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-reauth-python/Manifest b/dev-python/google-reauth-python/Manifest
index 7a9b44e7c5e2..6053ba4522ed 100644
--- a/dev-python/google-reauth-python/Manifest
+++ b/dev-python/google-reauth-python/Manifest
@@ -1,3 +1,3 @@
 DIST google-reauth-python-0.1.1.tar.gz 18302 BLAKE2B a21e174f7dffe48810679910bf8d6712fb4176e5608f2a068d575df3643c4db15a74dae92c15f4ffdc344d287c31a8eb58f94b0384e2d9fc808c072dc8f89043 SHA512 81705d4080b3d7fb0a73741f9f498f8014ec94aa165a5b112c8af8fddc8f040dc43809aff6df39354c8d975db0ee8d62d003c11b173bd56fcf9add1b01644930
-EBUILD google-reauth-python-0.1.1.ebuild 1083 BLAKE2B 3cb3b322ac286f50c2962d6bcc29ffd036753b0a4aa932990834ca6c64c89ba478aed20ebdc308d2614cc89e277b2c85ce43c6b863f9ff4b4736cfde96c4e0aa SHA512 1868081cc00f617e0d012357a3ee61a5ab5ddc528da1dd4f7cd5b67a82c5a371c4762409488ee854387952bf942c88be919f276439acf195671517f9c90aa62d
+EBUILD google-reauth-python-0.1.1.ebuild 1084 BLAKE2B 07e98f011589c43dd11331cb9a32718842fa59de995a1117e832e3fe13736e7f554e5b80ede240082f182201d9a950eb62e9123d93d386faeb7033d015d29d92 SHA512 506bcdd5ed9c047752778e3e506214a4934adad4c5171a91f891bcc2f8fb67eaae685bbf6e7fd02d8c474d87462f60c64ac40bb461055307a2e1e95d6da1535c
 MISC metadata.xml 388 BLAKE2B a75115224020407fcc3bed17a0148f5aac88944f0a575ca0b0889522d7548e1e7d0bc15c6cdb545ba931c46a7268662df5577096368366178577ed16f0445c4d SHA512 fb16d4f7b91aeb0598881749f529ca3ea289e5dd63d219fbe99942f557e262b2e3f2fc3a78b0fbe408c29eac2ad64e8024f44609c546c45deb0f1b567c1f6287
diff --git a/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild b/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
index ae794b24b60f..5cee05e0734a 100644
--- a/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
+++ b/dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
@@ -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/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index dbeac87d4a23..18ef8baf1237 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,5 @@
-DIST googleapis-common-protos-1.56.0.tar.gz 132706 BLAKE2B a0adf6527c24aaa30922800a80ef4af8abf3d83c4639c227a859c92e02d248f44b408f98820387a51b310dedf005872cb0fa7824bd27ac6309f31f85810edd40 SHA512 ef6ed067457aad3b46d81bacbb66abe3b36b0640290e0047ef7c6d612dfd8bf865dad47c77275f0d5a1e03cd4e5dca32d08f44c7a7bfe7b264ee59e5c5bb9a27
-EBUILD googleapis-common-protos-1.56.0-r2.ebuild 712 BLAKE2B 6d7d17cb834cbddbbf677521ff88884d86bc8789f8c81c7b6bc2238060e5c8fcee5bc621ff31b711567ceff2bfa62c7e3a9dafb5c2d492c8737f61266b05677f SHA512 540f88de455fe5f0838f35e553df801bc7d2bab50b68502c07bbbb6bd94c505ace076f7e49207d65c24953054a69a0e98febff6bc9ee5ddc231407727eeb5467
+DIST googleapis-common-protos-1.56.2.tar.gz 109718 BLAKE2B 6aeb43927f5c2b0332dbc478d47b06d49490b666158b35b5e58ccd3290939d903865f60ff11f396f9f329bb64382aa636d87ebd06cefcb66d465a0551843178f SHA512 814dddc95fa5bde437c124ff8b66c281f98cae6c0143d473b9194a1367ccaf7915c21450f79f372be5fdb3c4fb41c9d717e57244f2dbd1e819b927b8d86e8d2f
+DIST googleapis-common-protos-1.56.3.tar.gz 109601 BLAKE2B ac33ad2d9c737962bbc8c505ce03f57c9add2c9e9d7909371bac33651209bda8a6f85d00d9d93ca8f5bca5a88a3d148c6b0da210dd8330b2711cf3de027a307f SHA512 258f5408c3aae884ddcb13a606f369e80f56675296edb4fdfae1633bfdc707cae414920f87c21e210940667ede2989de7d80355a4b6551f5a9fc567a99fb64c6
+EBUILD googleapis-common-protos-1.56.2.ebuild 821 BLAKE2B 3692f07bb33fe1831f444290716690ce77bd7e9a0bacb745e5c2c9ed64c19bb190cce3e803d11d78e4b8959b1f6bc17eff83723c6ccae9af4b05dc1e2f07c7f8 SHA512 651a2b8fe712bcb4e48576dcabdfffde7343391f05cab80717f6b61c9b166aff107943cba085f7863c0ff5a249db676dfb230d8e857879c49e570dac444a1323
+EBUILD googleapis-common-protos-1.56.3.ebuild 823 BLAKE2B eb1a446f4779f4677c8b493b970ba178cb023d351013a8690c63a2e66eefe606146e8420616e4683ad3aacb4c788d7716288d90f0dede7909b8a516795d3aee6 SHA512 29aaf95b88310c3cad592abaf27473cec869ad7dc085264178cb6882c461346ea7b79599fd71860d1f4ea5ae85997c2ce440a379c89a23f678dc1680cd7fe0ad
 MISC metadata.xml 537 BLAKE2B 7b81f41f34a3c0fa53340ad298440f67727eb1830009899ffa10835485f66e727844735a88bed94b8a0bba14fa01a78d8a04f5ca3edf48a72781c7e1a797459e SHA512 6013da3540915e13a0cc60336bbefada12fbf71c04d4f40634f24015ada732d0d8b86600401bdadb2c7df2ea84f7097669f4efe6cf176ccca5efe46e9a3869d9
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
deleted file mode 100644
index e2cd62f960b1..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/protobuf-python-3.12.0[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
new file mode 100644
index 000000000000..c2d6a64bc69a
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	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/protobuf-python-4[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
new file mode 100644
index 000000000000..00d26d4c7744
--- /dev/null
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.56.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes generated from the common protos in the googleapis repository"
+HOMEPAGE="
+	https://github.com/googleapis/python-api-common-protos/
+	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/protobuf-python-4[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.15.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+# no tests as this is all generated code
diff --git a/dev-python/gpep517/Manifest b/dev-python/gpep517/Manifest
index d4deb08c55ff..92e240184911 100644
--- a/dev-python/gpep517/Manifest
+++ b/dev-python/gpep517/Manifest
@@ -1,7 +1,4 @@
-DIST gpep517-3.gh.tar.gz 7074 BLAKE2B 99a499ae13b6aac41e86d11735f0e49a5dc921881a1efa94bee19bfd779af6827707d05d6407ed15e4a3a6b518c8c0b3f50901e3b12df41081930f83b288e461 SHA512 90f756f5a1d783e9d402e098162a70b363a0a81e331e810e5c89c3302bb5839032603252bad1c98c176a7828b70adfac967e39ba455dcd3a20097e74923980c8
-DIST gpep517-5.gh.tar.gz 9568 BLAKE2B 7641ae7792a15be7241d9c02622b589a796a96c76894c29f37733e33820532042f6d5b8018ef021b487c299f3a28adf37949e96c38148d88c140ed6926e95f2b SHA512 3618f3d17cc367716c4813d75814ef295896f210ff32c13f1ef8ad8cde2120a30ba69705e14dbb1e5528bf5a348f9f8c5f5de8b416608cd496733e94afbeb2c6
 DIST gpep517-6.gh.tar.gz 9757 BLAKE2B f1b39f30b7d775330bddfd353610de7c26e34c5572cdaedbb078cc61c711e90e1c520b5e6e5532b0879ccc1eb7025a793c6f8d9745d93967eabbdd9edef69c6a SHA512 681108dab418d0d2d5b017f19bf8802479655f22eb6b72e9d78c6bbd2d08583751a465377c2006c507f0ea258d2d46bf9300865896af4458a763b56a86abe329
-EBUILD gpep517-3.ebuild 1135 BLAKE2B 0ed1877164f202f4cf5822e03bee83449f0acabda3ae6956ba0a135ce4b81928dad7db98648495b8664f04201b952f1d45eb3ccfa210a658fbdae1ba8ca551bb SHA512 fc820987658684408bd842d42ea079938d49d4b81a5f7efd99074b7ce6277dd6231aa45b88cabb11f47c89d9c2b50534c66ff66b2cd576b145813f142ab24c8c
-EBUILD gpep517-5.ebuild 1143 BLAKE2B d88ccd00409897f446f434d2aaec1810093f96778293ff9f90e49a2daba4955bbc4427631499794686fffdbc76e356d1a3cfa2cc566c523f549df2d17bc31fb0 SHA512 90f0c157647e0be7e59629f92d2e7e4855c8e4548a116770af14743b7a7fed2b7e2e5dc5c9825406d83f8697f7d7976e2473f165393a5ea2ab3ced194cf680c5
-EBUILD gpep517-6.ebuild 1143 BLAKE2B d88ccd00409897f446f434d2aaec1810093f96778293ff9f90e49a2daba4955bbc4427631499794686fffdbc76e356d1a3cfa2cc566c523f549df2d17bc31fb0 SHA512 90f0c157647e0be7e59629f92d2e7e4855c8e4548a116770af14743b7a7fed2b7e2e5dc5c9825406d83f8697f7d7976e2473f165393a5ea2ab3ced194cf680c5
+EBUILD gpep517-6-r1.ebuild 1057 BLAKE2B c7ac0dbeafce1f0a563b40ee1a743bdd859094e51de07154f2810079d5b766f324db29e1b8993b9889353eaf75d67c9c01634b9b2338d34811eae0a03bd365a2 SHA512 77b9bbb7fb487a3f1ca660c1f232fe10f8aec39916e86854a9789e8cd1d66b749984cec663e3b18459370d518b0c46482f713635943f4d1779fd8b17402e73db
+EBUILD gpep517-6.ebuild 1135 BLAKE2B 5141d573049a49bc8631f72380f4397c3e1fd5192080fa1dd1f81f6ee31e608e9e63bcbc6d25ecf228610a15602b202260b184ff659de06cd7fccd2695726954 SHA512 73ba576b4f6eba8b9a2cf6d873272db739f70fef7da001311b1fb111eb9c9258b9c6f1cf3f697c438db407b9521d07e7c5f5b6d802e322482c28a28950fe9602
 MISC metadata.xml 396 BLAKE2B a3f6d1cea383a38b4b6e5f80d2306ca320a66c0d3b0131601ef6f0ea48483757b9123d74ba99fe972dde06a998c15290cbc4243285c240493ae0293d2f8e1141 SHA512 8c584869f2fc7a0947b9e5ffa330652d8b6e61a6a472fcddf0422f1719422fb8d477cdf17d87e6d0e9f6994d608a77202c24e531dd146b0f8d731a047f80d14e
diff --git a/dev-python/gpep517/gpep517-3.ebuild b/dev-python/gpep517/gpep517-3.ebuild
deleted file mode 100644
index 768f7fdb313e..000000000000
--- a/dev-python/gpep517/gpep517-3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 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
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
-HOMEPAGE="
-	https://pypi.org/project/gpep517/
-	https://github.com/mgorny/gpep517/
-"
-SRC_URI="
-	https://github.com/mgorny/gpep517/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_install() {
-	python_domodule gpep517
-	python_newscript - gpep517 <<-EOF
-		#!${EPREFIX}/usr/bin/python
-		import sys
-		from gpep517.__main__ import main
-		sys.exit(main())
-	EOF
-}
diff --git a/dev-python/gpep517/gpep517-5.ebuild b/dev-python/gpep517/gpep517-5.ebuild
deleted file mode 100644
index 1c06fab5af2e..000000000000
--- a/dev-python/gpep517/gpep517-5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 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
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
-HOMEPAGE="
-	https://pypi.org/project/gpep517/
-	https://github.com/mgorny/gpep517/
-"
-SRC_URI="
-	https://github.com/mgorny/gpep517/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_install() {
-	python_domodule gpep517
-	python_newscript - gpep517 <<-EOF
-		#!${EPREFIX}/usr/bin/python
-		import sys
-		from gpep517.__main__ import main
-		sys.exit(main())
-	EOF
-}
diff --git a/dev-python/gpep517/gpep517-6-r1.ebuild b/dev-python/gpep517/gpep517-6-r1.ebuild
new file mode 100644
index 000000000000..ee64cb1d660f
--- /dev/null
+++ b/dev-python/gpep517/gpep517-6-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 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
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A backend script to aid installing Python packages in Gentoo"
+HOMEPAGE="
+	https://pypi.org/project/gpep517/
+	https://github.com/mgorny/gpep517/
+"
+SRC_URI="
+	https://github.com/mgorny/gpep517/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install() {
+	python_domodule gpep517
+	python_newscript - gpep517 <<-EOF
+		#!${EPREFIX}/usr/bin/python
+		import sys
+		from gpep517.__main__ import main
+		sys.exit(main())
+	EOF
+}
diff --git a/dev-python/gpep517/gpep517-6.ebuild b/dev-python/gpep517/gpep517-6.ebuild
index 1c06fab5af2e..8dfcfc0113db 100644
--- a/dev-python/gpep517/gpep517-6.ebuild
+++ b/dev-python/gpep517/gpep517-6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index 180aed07514e..98d68264359b 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,6 @@
 DIST graph-tool-2.44.tar.bz2 15149379 BLAKE2B d15413f4e8642b96f62d88631c216e600e24aa878b08a173f1a00f1700aa3c6f4b1b3f806956b811b209a2d42ec1178e2488946d96f056f528a046cbd6cc330a SHA512 b90dc541ec77f89fdbb64697ec5e200d9c7c4ec4b8849c75d008b83dab8f54c95bd230f5d72e32d656f86a201ab66eee25aa774b7983355f7af9304b52527e40
+DIST graph-tool-2.45.tar.bz2 15156784 BLAKE2B b9086e5545ace668f703bf06363a382fab734a63d5684d44b62407a06a0464df6a4a9c8c7ccd26e53118c1d24469ed2eb4670939dc0889fafe2f73a2c176101b SHA512 46a4a3a22033c74c69e0ba5ce8f0856d2f35934d52850ef4a542384c8fd327daf56341675a3299a8db87d4a227b5583f0564f8917ecf28081cb1dd4091563490
 EBUILD graph-tool-2.44-r1.ebuild 1785 BLAKE2B 1dae12b7f1db9969a4ec851a1c04d10106a517c5ff77ddbd5ae20a940fd682692909b7a23abc6d453c75f8cae27e639d18bfd8cf859895ceb896807602806113 SHA512 f9d462ade4e9fa59ac36ae2ae91581a6a8ec84603be356145a535bce8d24aba7bc1107710de80d64b33236bbe661400aed70de8d8083fc745bfefcddef58fcf9
+EBUILD graph-tool-2.45.ebuild 1785 BLAKE2B 1dae12b7f1db9969a4ec851a1c04d10106a517c5ff77ddbd5ae20a940fd682692909b7a23abc6d453c75f8cae27e639d18bfd8cf859895ceb896807602806113 SHA512 f9d462ade4e9fa59ac36ae2ae91581a6a8ec84603be356145a535bce8d24aba7bc1107710de80d64b33236bbe661400aed70de8d8083fc745bfefcddef58fcf9
 EBUILD graph-tool-9999.ebuild 1785 BLAKE2B 1dae12b7f1db9969a4ec851a1c04d10106a517c5ff77ddbd5ae20a940fd682692909b7a23abc6d453c75f8cae27e639d18bfd8cf859895ceb896807602806113 SHA512 f9d462ade4e9fa59ac36ae2ae91581a6a8ec84603be356145a535bce8d24aba7bc1107710de80d64b33236bbe661400aed70de8d8083fc745bfefcddef58fcf9
-MISC metadata.xml 437 BLAKE2B da394a6ff65e5104c8cad22c123355d6cce752578627e74eaccdbb4ac11ef44c131f2133bc7fb9a35016e47b09dbf5a60a88d5ba25be0a7c6b131747aa85c310 SHA512 460b62839edfaba3f15bcc80aac5900258e243dda4bb85dc3a77492077bf1a09aa308458d40831bc5efd785f40c4a643a7b8360c36045e977102302c03d5877f
+MISC metadata.xml 441 BLAKE2B ad80736b2b28a13828593d542c82b64a64f03a655faa1aeeed9b6f33f6625224bbf3bc6b33220cf994221a9bf9d384cdc45a5298112c8b225f38f0bdcca7b486 SHA512 4dc6ae46ce91eb7e9f3e0a7737a5bf0bc0d280936c5dbaaa14ff1d67225243a377e6cc6d8505c2f449c7d35c72ea85b01e83df207bf1ea151f87934c20e616d6
diff --git a/dev-python/graph-tool/graph-tool-2.45.ebuild b/dev-python/graph-tool/graph-tool-2.45.ebuild
new file mode 100644
index 000000000000..f45d24d4fbfe
--- /dev/null
+++ b/dev-python/graph-tool/graph-tool-2.45.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit check-reqs python-r1 toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.skewed.de/count0/graph-tool.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://downloads.skewed.de/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="An efficient python module for manipulation and statistical analysis of graphs"
+HOMEPAGE="https://graph-tool.skewed.de/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+cairo openmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
+	dev-libs/expat
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	sci-mathematics/cgal:=
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	cairo? (
+		dev-cpp/cairomm:0
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		x11-libs/cairo[X]
+	)"
+DEPEND="${RDEPEND}
+	dev-cpp/sparsehash"
+BDEPEND="virtual/pkgconfig"
+
+# bug 453544
+CHECKREQS_DISK_BUILD="6G"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	my_configure() {
+		econf \
+			--disable-static \
+			$(use_enable openmp) \
+			$(use_enable cairo) \
+			--with-boost-python="boost_${EPYTHON/./}"
+	}
+	python_foreach_impl run_in_build_dir my_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir emake
+}
+
+src_install() {
+	my_python_install() {
+		default
+		python_optimize
+	}
+	python_foreach_impl run_in_build_dir my_python_install
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index ad3821fd4c39..658ec6ce0349 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -1,9 +1,9 @@
 <?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 type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>gentoo@chymera.eu</email>
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 27e3fbe0be81..314abff1dfd4 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,7 +1,3 @@
-DIST graphviz-0.19.1.zip 247779 BLAKE2B c0b226c2ae66f8b583a30cf2842b8cfdecd926f0e7f32fbbfb4dae17ce14792d0af8d8cf6de53cc9a7facdeb8b0a4a078b962eabf64460e1fd42dd995e069428 SHA512 3aa078887458d7bcd173c46ee6e4d8dbdae0c9103755e61e5a027c18e5d8913990aa16a595e80228607c17db1aa9dffdb93e264cafafc8b6318bc3a87547bc5d
-DIST graphviz-0.19.2.zip 248057 BLAKE2B 40fbbeea1f347f3843898c088f3c1ee81eee321aeaaa4bf42d97343d6527a4d43a207bd2e6a5833b04aa50c8be2e58ba77ec99147dfcf22a9eefed733afc0cc8 SHA512 a1dc396bc0b0572a952365d7b22df46fc99a5f081ec02e774d0efa9113c4aa5ca5005855221554cdc96d90997d9efff43b80e1dd858622889afd26d44fbc3671
 DIST graphviz-0.20.zip 255452 BLAKE2B 0bafa3af9d712e30bd6777d55d54c5a8055f8ad4c6e6ee8c9f936a5abf6e025d7179b2b72e9e0926378ae30e9b655d08507e815c67944123c6c222ecbcd4939d SHA512 8b30ac09913ec5860cf26cfc9e008b0feeda8d61274e346ec305087468b655ace115ff28e0ab96eb47d97127410213729d1131dd635771dcaedfae0bae0ca178
-EBUILD graphviz-0.19.1-r1.ebuild 896 BLAKE2B 333c4c8c91c00d41a41792be40924859ef4a8357f95c56bf817dd90601ed1ee5183c154f70a3448069a64b17fd6a661e0421ce3ff6be663dd81ae13e3641d0af SHA512 e8a1fe619f5df8c0ecb3257e97dcf73b3c6fc387c5e0b86f3604dc935d87be54b0b69b6eaa095b3dcb6cc452491a85689f7c4d73f82233f9f01f5e2bf3ca8cc6
-EBUILD graphviz-0.19.2.ebuild 898 BLAKE2B 3dddeb7524daaf6bbd7bfa3f1757965bac5abd840cc318b5b5e8f763597ef20dcf0e945b06d71e903e3642ef9f9b7c759c59262cdae3a676d6e4d3cf20317f10 SHA512 62649e574b6ec47412b45eb2b1c360d9a0fdd5d5c9efd2b154bd1a0bbae875e6ec6d01493257124ad204ee159e60d9a0981bb4ea01061fb5b18005ea5c985511
-EBUILD graphviz-0.20.ebuild 898 BLAKE2B 3dddeb7524daaf6bbd7bfa3f1757965bac5abd840cc318b5b5e8f763597ef20dcf0e945b06d71e903e3642ef9f9b7c759c59262cdae3a676d6e4d3cf20317f10 SHA512 62649e574b6ec47412b45eb2b1c360d9a0fdd5d5c9efd2b154bd1a0bbae875e6ec6d01493257124ad204ee159e60d9a0981bb4ea01061fb5b18005ea5c985511
+EBUILD graphviz-0.20.ebuild 896 BLAKE2B 6dffb177f1edb1a18d6f8396552754e2ad163b8a7a4f20e71e786f09322dfa33d4ccc418596e801c75c3e1b1be425461f5318575d7c9cf0c56eff235fb575372 SHA512 35806a15b42e71cfec6f755dc692547c755f3345b7405a33949e5bb09529caa0bb7da022bbbc2b6ff0001fd09f1e432a12735ed55118d382ef68f8d13e4e7c3e
 MISC metadata.xml 553 BLAKE2B d974f24c488a83d7c1510825d5e157644a4df70113af1283224a847d1cce2535ff4cb0633833a8671f6508fdd38c9079bc21239fdc1d1e9ac85f2ad08ea3a297 SHA512 72d2ce4887aa23136d689bf51b94f17ea3c8803464f623b0f4380381b9639a15a34858f26f129d5db2025d2ccda82dc80f22f5984ef58cffdf4dfcd7b8c51127
diff --git a/dev-python/graphviz/graphviz-0.19.1-r1.ebuild b/dev-python/graphviz/graphviz-0.19.1-r1.ebuild
deleted file mode 100644
index af0ea7c0cb75..000000000000
--- a/dev-python/graphviz/graphviz-0.19.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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
-}
-
-python_test() {
-	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/graphviz/graphviz-0.19.2.ebuild b/dev-python/graphviz/graphviz-0.19.2.ebuild
deleted file mode 100644
index 2b0922565359..000000000000
--- a/dev-python/graphviz/graphviz-0.19.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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
-}
-
-python_test() {
-	"${EPYTHON}" run-tests.py -vv -ra -l -Wdefault -p no:xdoctest ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/graphviz/graphviz-0.20.ebuild b/dev-python/graphviz/graphviz-0.20.ebuild
index 2b0922565359..03c5a6d9544f 100644
--- a/dev-python/graphviz/graphviz-0.20.ebuild
+++ b/dev-python/graphviz/graphviz-0.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -13,7 +13,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="
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 1b1331ddd72f..eafa41ea259f 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,4 +1,3 @@
 DIST greenlet-1.1.2.tar.gz 91224 BLAKE2B 1430f96acfba3c184b9ac0f51acde7c48aa5d2e648a155cadf16399c878f527a4bafcb547d2b28835095ba2fd21c33096ee6fb51ce5feda0a8c5915be521b32a SHA512 e7bcc1bfffc80fcaee735ee69f6f53e8f68bd4d3ab8ad6ed813684ffad72340a347e4810f18cc32d9c3948b5c995aefc3a53ce4ae60324093dae12042d33183b
-EBUILD greenlet-1.1.2-r1.ebuild 754 BLAKE2B 63b958b744dfa4468f1ee2925d7b88439b9fa0df88a904eff2ca533bfc955f7e3e5eb478afec4bf33972a97e90588bff270abe9297d613928b5b5b9a94d024b4 SHA512 5ab0926f04e3e051d3f8863afa06f033353e66c4f0522a0b6c14307e042978ed5343faea8d4446d9b797141c4dca91d9efbc7eedc9b5590469d79bc6ccbbd042
-EBUILD greenlet-1.1.2.ebuild 622 BLAKE2B 700de911f44dcd2dd9eafb6b31841cf2bf529fa47737aacb24af4295b44ef6f5929f267fe4b71ade161a58f5ade977bd51d02ca5d17d9f2c8470e8eb7dd77346 SHA512 c92e6891472c4fd09c30f9aa8411e011fd31e4fcc22505bf434122d5aff9bf3a43183dd8ff46f9f1fad064ed9ea18607f6179ba8b9b10144fb366e7f1e022c09
+EBUILD greenlet-1.1.2-r1.ebuild 747 BLAKE2B b4178234b49813a346e72c12e5ce3e3964a6cfd4cb3b32b8adfb1d649d4666d28e2b7709a4cd02e1bac44780e0115ca7097581e2e967e340ab900b95a51311de SHA512 998ef9dfb0bbe6d1dd022960282ff09ac0dc9b8e28512faf1495fdafa14d97a132d324e8bed7d3c15be7179da367012de5fddfddb1102e2e4050d38da1ffc009
 MISC metadata.xml 322 BLAKE2B 57f3f966edd48a761d9ff80514dcd8e2439eb83fd79c1df2dd6610b9c03366a70be02134b6fa3e2d06ceeaafc1e5ed594efbcbcaea015043ff7bfdf54bd52e53 SHA512 2e119f8948096d416c6aa1db1203a37820a353dfe704f596243f805b5a6892498bb82a59b1fe59a51a1086d1b24c79a90de265bd06170e3b1bbd836bdee1915d
diff --git a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild b/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
index b29cf2360858..588dfd23e08c 100644
--- a/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
+++ b/dev-python/greenlet/greenlet-1.1.2-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/greenlet/greenlet-1.1.2.ebuild b/dev-python/greenlet/greenlet-1.1.2.ebuild
deleted file mode 100644
index 038e44263611..000000000000
--- a/dev-python/greenlet/greenlet-1.1.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Note: greenlet is built-in in pypy
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight in-process concurrent programming"
-HOMEPAGE="https://pypi.org/project/greenlet/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest greenlet.tests
-}
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index 7fcf022334d4..9b645ab5a447 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,3 +1,3 @@
 DIST greenstalk-2.0.0.gh.tar.gz 13280 BLAKE2B 510b84d7dd48e0f5c9fb46ec0158473623a9e4c570e1c72db45802fce7a61b99c8f15f87d6711fa7540e6e2b6d4a846194adc28e2696400c45dc6692747f41fb SHA512 4d338bccb09b7c17c0216ce9cc4c1c9c896d15327053adc248404140ded27df6969fc8f0807120ec9417676ead57395185fb9fc5d826f49a1a1ee473aabbb048
-EBUILD greenstalk-2.0.0.ebuild 572 BLAKE2B fd55589291337acbb066a4d5495e11526b6df81b44aa436441942773ffe5734b547b5b29b1fd277768fb69aa1dadef347ec114ea71865fe698817a89b0f377c7 SHA512 b3c0718cf7f82ff9cf234222e1ddb49943878890c0d988040897641aa83b8f0f50a1e226eee5550168601ecd6ecf56b2fad68f17d4ee3c533b05b95dafe24b63
-MISC metadata.xml 304 BLAKE2B a4936dc5aeb48116751086fa042ad14138d9bbfb287797207aae1a6b4a74369d3f372c81287c23496aeb03735b7845a249cd831b4c9a6d8df820f23ecccb7a2d SHA512 c983adc7e75af1a9d513c6a859fbedb8330fe1933898ef2ef9f19c54d6cc0719744b692b3920eae3db277c6a8f2f72b2597fb6595acc6b0f72558279d84999a9
+EBUILD greenstalk-2.0.0-r1.ebuild 604 BLAKE2B 5d36e5b29b0a6f7453fe7dd21454f2eae6ef3cea27d4b15b97b937c676778ae99fd1a4a0f021ce4ace250ae46e851838c2adee071f77a858a87093976168e81d SHA512 d899de009d825847179af4301f07944796ce153621b3be5d8a68680377a77e7d3c42288d93d03e340c7100c2908544f05dc363d464eb79ce282a774e1595b4c4
+MISC metadata.xml 328 BLAKE2B f299b714768a5868d4489a79e607349280bdb6888cf33031bacb0a34e1e8712445edb7dbe710ecddf2c5d81e75b11803b14875401a80f2a99769ce09aaaa0549 SHA512 cdfb1c1e3111e0391f098f2331527b72d8069786e93c2e32bf69211b97c8d754bbb8eb7facba100cc749f7fd1db50574b2ec1dfe7442316b18ff65e6497c7b60
diff --git a/dev-python/greenstalk/greenstalk-2.0.0-r1.ebuild b/dev-python/greenstalk/greenstalk-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..087cb38eb54b
--- /dev/null
+++ b/dev-python/greenstalk/greenstalk-2.0.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python 3 client for the beanstalkd work queue"
+HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
+SRC_URI="
+	https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( app-misc/beanstalkd )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/greenstalk/greenstalk-2.0.0.ebuild b/dev-python/greenstalk/greenstalk-2.0.0.ebuild
deleted file mode 100644
index a73826cc5bbc..000000000000
--- a/dev-python/greenstalk/greenstalk-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python 3 client for the beanstalkd work queue"
-HOMEPAGE="https://greenstalk.readthedocs.io/ https://github.com/justinmayhew/greenstalk"
-SRC_URI="
-	https://github.com/justinmayhew/greenstalk/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? ( app-misc/beanstalkd )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
index cb9eecb08f7a..501a5bf2a2cd 100644
--- a/dev-python/greenstalk/metadata.xml
+++ b/dev-python/greenstalk/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">greenstalk</remote-id>
 		<remote-id type="github">justinmayhew/greenstalk</remote-id>
diff --git a/dev-python/gsd/Manifest b/dev-python/gsd/Manifest
index 1c18c611d3e0..7154f590e7e7 100644
--- a/dev-python/gsd/Manifest
+++ b/dev-python/gsd/Manifest
@@ -1,5 +1,5 @@
-DIST gsd-v2.5.0.tar.gz 105537 BLAKE2B dbd9cef142405bae4e99c180f6b7c65cb60240fe45e200643b8efd388c72830a70d97c649fdb686afeed4eb44386cbe68165ed105bd67424f1cbd3657159c16a SHA512 f5eda751bdfa4d3eae980029fe5594fc5698d68265784f089b0997441c18f58d70d71cf52a0b4fd208708aba0162164d1f640440964b6e211db856f10c7c0c67
 DIST gsd-v2.5.2.tar.gz 105448 BLAKE2B 408e66a91ea056e8c863e23dae439009e5f802f38d5e2a3b89bbb07c574ad61827fa9c2767729c37dcc8fa7ecb1fc3be922755da0ac0dc922ead2a365ce66a10 SHA512 2a2afb56b9f836608523b2946a0d2ca94511457506d02038d496b374ccb96dc0daad6435f9ee63b0937837b725d6288325c066d75d2ac0b0c6d9da4beb9eb082
-EBUILD gsd-2.5.0.ebuild 680 BLAKE2B 4befac8eab2bdf587fb2b8fe1300ebbf4ed99f5376295399ea09689d73cca562724fc541d01d9d91376641dce1969a557b2751286fcbde0e83c0efb1c1e58617 SHA512 744cda773959368c4fc83ecda1bb68f29e3dec57525bf4144f5e1b5c0fcc58f763a8d23144bf2bbbffdb1d9c063f12693401cfae63445cd141af58d97c2b8428
+DIST gsd-v2.5.3.tar.gz 106104 BLAKE2B 39cadcca6a6660c736be8ce576b45d86a82a499bd21b6c818dcc6d307750940a8be85fdd63883d7aac9a416f5eddc55793ca2ab0da0b2373901c394d63ebe3f7 SHA512 3e3d5f8dece5553a4bc68b23aff8320b99169da5b995d1655da85c37e84a9e69d30f73ed3925e2e49b1c97dc875c594258dd15f3669337ca4c91914cab90d49c
 EBUILD gsd-2.5.2.ebuild 702 BLAKE2B d584680489300ed071995b1ddb30cc7db06943f17d62dfdfbf1d8e44915e8e4a8039b3148e454785c2f545e167db13f5b23982059be6b3ae9160729a60d85a14 SHA512 29c60485cc12a9f177581a4a0f0a238989025941ed9b93515fa927d129a9f1dfa900fbbf11a3f0e4c91a45ecd0e98168f4dc9efbd81a49294f36a50e0df98bd8
+EBUILD gsd-2.5.3.ebuild 750 BLAKE2B 7d862925dd039ef481f4105760f926a2f574411acde6710b1873770994eeaddc88fca7da26aca10c128d1221740903a0d2b6846bedfb6160a9d5a8a8cbb3c32a SHA512 261c3ceac73ef2fe4818fc838c1f3774e42670adc65490a04a78c713f7a6dc0519bea324a04c72e3a4b6246e9f38aeeb90532da7d05882d5f8df4521d42aaef2
 MISC metadata.xml 416 BLAKE2B ff2192a940eb2d265ce71841163a524658a8e59f8fe6f2d81fd01fcb0c45b8cb6da92fb178574f61838e22064a096084faafbd77f971753f480ab5d216dcf412 SHA512 81bcc244ebf91346602c1d0de769678fd1f359ca04178613a0473d18da884f210b8e873717db3605c1d74713240d6b1203e9dd1e3f4643bfe702a4015b5cbfd7
diff --git a/dev-python/gsd/gsd-2.5.0.ebuild b/dev-python/gsd/gsd-2.5.0.ebuild
deleted file mode 100644
index c74dbc1734f1..000000000000
--- a/dev-python/gsd/gsd-2.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="GSD - file format specification and a library to read and write it"
-HOMEPAGE="https://github.com/glotzerlab/gsd"
-SRC_URI="
-	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND=${DEPEND}
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	epytest gsd/test
-}
diff --git a/dev-python/gsd/gsd-2.5.3.ebuild b/dev-python/gsd/gsd-2.5.3.ebuild
new file mode 100644
index 000000000000..30df9f182655
--- /dev/null
+++ b/dev-python/gsd/gsd-2.5.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/-v}
+DESCRIPTION="GSD - file format specification and a library to read and write it"
+HOMEPAGE="
+	https://github.com/glotzerlab/gsd/
+	https://pypi.org/project/gsd/
+"
+SRC_URI="
+	https://github.com/glotzerlab/gsd/releases/download/v${PV}/${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gsd
+}
diff --git a/dev-python/gssapi/Manifest b/dev-python/gssapi/Manifest
index 0d56d8b6ef0f..fb11d38878bd 100644
--- a/dev-python/gssapi/Manifest
+++ b/dev-python/gssapi/Manifest
@@ -1,3 +1,5 @@
+DIST gssapi-1.7.3.gh.tar.gz 3830322 BLAKE2B ea3d633b9b88ab5105b5ba67dfd0ec138ac76e121be2ee82c43ca4f2a229c4592f5d417f5b9b0c8d2ce894bdcc35025361431280c4dc8a17782d1ea920390805 SHA512 8bb6346ef9dc5cb380bbe5e51931aa3470149d33a3eeef68a758ce0b2ef06785bdca9cb7ae809a8329ab2a05ac802ac3100f9d8e3d7d3034b4bbce1bc87b4268
 DIST gssapi-1.7.3.tar.gz 1260350 BLAKE2B 0db3c75e158b237ac72e15b01709451fd4004f318e2feb35bc0468cc2b1959e03e6edd50229fce8014da7c82a5dc4dd546b7208a94c70dba7911be3d6b696142 SHA512 ffdff3ee2a8b47d2606b891fb6300331055faaecbf285ab57b6af56ec4d63f95e2c9445248269a3e3974ed4c9ac9664d4265693b15f7a66d1dac328eebc81292
-EBUILD gssapi-1.7.3.ebuild 797 BLAKE2B 088d5fda51fd9ef643fc05409e2b00550d94a22daae8e7d5357f4115f05387c7b2df75b17e645259304769924e60e4ed5613df65ebfeb803f5da2229426d8ca4 SHA512 26838af931b5efc26f601e55f19264a9ec85cb5b6932816b4230fffd4617147329d5872ba00db27136544186cd8841c3984adb498210ec8b10f58d9a25a78ad8
-MISC metadata.xml 333 BLAKE2B 4a807f42e8fe14f9e5664ea5cbf471981a38f748aa61fa0d6258762860e6b647433b05961db0c9ee1a536a26f5f457ba2bca423f43434d5528dbaf78bd00dfb8 SHA512 a5f8e5f61b5c6217e741490c46adab7f00266fd423f1520fe20e48303934aa8b3ac8a84cbfa91ced6b42bedc3d5d8e8eecb6672b495500bd854acc7140ef122c
+EBUILD gssapi-1.7.3-r1.ebuild 986 BLAKE2B 72a3cf4d1580cccfb678c71c55ea6974f3f93f05263d92031a71d9d030b3dc126d7daadf39028f174e1c4c4fcd7feb4d2867d195505007f8a7abfabd86cb8219 SHA512 58953796e871d0290a66e5483048fe5e47b698c2b85c5149e33cc602e881bc60a3970c2651e84a05d0e40853c68fffe763f2c22583ae03d881f715409e663c8c
+EBUILD gssapi-1.7.3.ebuild 797 BLAKE2B e4fdbee72b8ea6b010a8fa12d00d4523abd7642c936e72ad7dc5574a3670c7e6f521564a1ac0b72aa838903301e186213f2118723b4ff012caa9b4a4c0161bc0 SHA512 ac2a393f3c7436bb8a6866352f11cba8a3c0dfca68b8d99389c62e414d3a8f4a31360bc384ff77a1bd5a9b749ac30efe89cff633e9cabe5558e4c93a7c3b47f6
+MISC metadata.xml 440 BLAKE2B cd8a5dda6f681a173b7b8202540f5eb592316a85a2297bd7a3748eec1aba634e71b7e5e5beb57a6b68d008e14bba9f1308a218b5cabff3c03af303e730d0c43d SHA512 c070e531fb50252078b85beaeab6eafb349301557dc0ee8460527691c7ee0035246318c4fa07e389c2c6e8857634c416c761db83ef8290f381baed6765f6b792
diff --git a/dev-python/gssapi/gssapi-1.7.3-r1.ebuild b/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..879a41c09de4
--- /dev/null
+++ b/dev-python/gssapi/gssapi-1.7.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low and high level wrappers around the GSSAPI C libraries"
+HOMEPAGE="https://github.com/pythongssapi/python-gssapi https://pypi.org/project/gssapi/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+# Needed to recythonise for Python 3.11
+SRC_URI="https://github.com/pythongssapi/python-gssapi/releases/download/v${PV}/python-${P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	virtual/krb5
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/krb5
+	test? (
+		dev-python/k5test[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+	epytest --pyargs gssapi
+}
diff --git a/dev-python/gssapi/gssapi-1.7.3.ebuild b/dev-python/gssapi/gssapi-1.7.3.ebuild
index 1fae79d16e7e..80a514fe763e 100644
--- a/dev-python/gssapi/gssapi-1.7.3.ebuild
+++ b/dev-python/gssapi/gssapi-1.7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/gssapi/metadata.xml b/dev-python/gssapi/metadata.xml
index cefacad217db..1f0e10673690 100644
--- a/dev-python/gssapi/metadata.xml
+++ b/dev-python/gssapi/metadata.xml
@@ -5,6 +5,10 @@
     <email>titanofold@gentoo.org</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">gssapi</remote-id>
   </upstream>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 3ed293b4efe8..860531fe1ea2 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,10 +1,3 @@
-AUX gst-python-1.18.4-avoid-treating-float-as-int.patch 2987 BLAKE2B af2c64dca7af01a70386edf864ebfbde499bdd086aa37e958571e532a2cfe1442c0e5792a07b22ca81ab24e7f53a9426dcea66ea94119aa1a4cb7d0dd9cce8b8 SHA512 d36fc52a7d9c787e88d0097819bb61780022cac589cf900f112f431441b3a650b301f099ea420a3d6e954b515f547e3cef6498699a0e9e027e8709b66c9339b0
-DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
-DIST gst-python-1.18.4.tar.xz 158252 BLAKE2B 2fd60d2d451ae572cee2f7e9158e9c06e82cdd56c4fc70d2731aa0a46a21e495321ec02c97ecd9a946278ce9b7290a290b9f2bc13184582c1f8ff19e874d0e3a SHA512 6b9df9e4faaeb030f0596c9e52262c0f82b8854faf821497a840a762913dccb005321c60565754ef571e34976fcda481a41aefbbd486c2932377a95121433bf5
-DIST gst-python-1.18.6.tar.xz 163648 BLAKE2B 2a72d323f3620b976f537d91ac579824c65a112cd7a599b75f8ee6859ea2dcfeaf327a0dd90e1072071d036b6e7a4bd14fbd737ea95e42a1dd8868f05e6a8936 SHA512 312a141bc57a00496c34445648f11c8d61800fde0d5aefcc51bd296f6aafb9556e3ebed71904d262be6134c4b20eda30e025badddc977fdceb65b72ab788497e
-DIST gst-python-1.20.1.tar.xz 151020 BLAKE2B 49d6730eeff90cc967e96fc1c9600f82690ff1136e46f65777d057880b239c65c6d88aa519a7558af94822f9ea57faf9b55a11c27bf9b8b567c1cea3fbbdfbf0 SHA512 16819b7b8c564af8d0cc5f3d5a64921c45523865d705d5f4580bf644aeaacf24fd1922f27c3729e8334e710d318646ee5250ac26045f863fedaf1c8481724750
-EBUILD gst-python-1.16.3.ebuild 1556 BLAKE2B 5a5f9dc90cdbc2262f226b00ee166afd8b8df17c64714694ddc73c87c96a06e537dac794a627d94a1f8874ec5adab74be1dc790e494a48b97f41c9e3134f5240 SHA512 d9663bb501c02dc98be963bb6ba6f4dc514154460084de9cb9d079da1af11daebe2b54f575461707024ed2627d6ea44f5897fb981c2463c3c8e07356fcfbd371
-EBUILD gst-python-1.18.4.ebuild 1698 BLAKE2B 0e59a331c3d541409d4cd30fd4222bd468f8931cd877d43801e90947774a5441391ed6b9e8d6750e6e45afb91108d77841251a7d0d3829f2c1164ddd7d284de3 SHA512 3255646772f025767c7e73159ccf06eb75e3421adf0f0c5bb3364f347516e4aedc230e7c35350d9588d6d8145e97d533e945d375aa5df116008047a9c7b253a8
-EBUILD gst-python-1.18.6.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
-EBUILD gst-python-1.20.1.ebuild 1637 BLAKE2B c58fbc16ef1dce5236e8a6dbb326cac3aac4be3d85a7faf349b5984e5545ce25e420533fbbfae582f60e3dfbf9be2d80462d0d5e85fc875a8204741a27ded058 SHA512 22afc8437c0627599779f923cad9c2f0f9e6b0a04f4a244b997f7f5e9166758b7f52d82ffb40e4e64f275f154d6d1ad6dc30300030bf5f17963d916cb5e44bef
+DIST gst-python-1.20.2.tar.xz 153428 BLAKE2B 051be5996530989b0e016662f4bf33ac01d576dff56ef779ae481f6f02143595cb3132b9a1ad56cd26f7de55c5df28d25cac448ef28f1b8595974f468252c6b5 SHA512 99af8bad76f930e6c11dcacac013ffe30670ad77259ebe96ee6059a9c359fd1a9c9b22188856f2f19f31469c152b3ad269ba821d06ef92f0c92b3b0fe0eac0d2
+EBUILD gst-python-1.20.2.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/dev-python/gst-python/files/gst-python-1.18.4-avoid-treating-float-as-int.patch b/dev-python/gst-python/files/gst-python-1.18.4-avoid-treating-float-as-int.patch
deleted file mode 100644
index d9cc6bca086b..000000000000
--- a/dev-python/gst-python/files/gst-python-1.18.4-avoid-treating-float-as-int.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier@igalia.com>
-Date: Tue, 16 Nov 2021 23:36:10 -0300
-Subject: [PATCH] python: Avoid treating float as int
-
-Since python 3.10 implicit conversion to integers using `__int__` as
-been completely removed (was deprecated behavior in 3.9) so we need
-to cleanly handle it now.
-
-See https://gitlab.gnome.org/GNOME/pitivi/-/issues/2589
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1358>
----
- .../gst-python/gi/overrides/gstmodule.c       | 54 ++++++++++++++++---
- 1 file changed, 47 insertions(+), 7 deletions(-)
-
-diff --git a/subprojects/gst-python/gi/overrides/gstmodule.c b/subprojects/gst-python/gi/overrides/gstmodule.c
-index 167a1c27539a..2308eb7dcde6 100644
---- a/gi/overrides/gstmodule.c
-+++ b/gi/overrides/gstmodule.c
-@@ -104,18 +104,58 @@ gi_gst_fraction_from_value (const GValue * value)
- static int
- gi_gst_fraction_to_value (GValue * value, PyObject * object)
- {
--  PyObject *numerator, *denominator;
-+  glong numerator, denominator;
-+  PyObject *numerator_obj, *denominator_obj, *is_integer;
- 
--  numerator = PyObject_GetAttrString (object, "num");
--  if (numerator == NULL)
-+  numerator_obj = PyObject_GetAttrString (object, "num");
-+  if (numerator_obj == NULL)
-     goto fail;
- 
--  denominator = PyObject_GetAttrString (object, "denom");
--  if (denominator == NULL)
-+  is_integer = PyObject_CallMethod (numerator_obj, "is_integer", NULL);
-+  if (is_integer != Py_True) {
-+    PyErr_Format (PyExc_TypeError,
-+        "numerator %f is not an integer.", PyFloat_AsDouble (numerator_obj));
-+    Py_DECREF (is_integer);
-+    goto fail;
-+  }
-+  Py_DECREF (is_integer);
-+
-+  numerator = PyFloat_AsDouble (numerator_obj);
-+  if (numerator < -G_MAXINT || numerator > G_MAXINT) {
-+    PyErr_Format (PyExc_ValueError,
-+        "numerator %" G_GINT64_FORMAT " is out of bound. [-%d - %d]",
-+        numerator, G_MAXINT, G_MAXINT);
-+    goto fail;
-+  }
-+
-+  denominator_obj = PyObject_GetAttrString (object, "denom");
-+  if (denominator_obj == NULL)
-     goto fail;
- 
--  gst_value_set_fraction (value,
--      PyLong_AsLong (numerator), PyLong_AsLong (denominator));
-+  is_integer = PyObject_CallMethod (denominator_obj, "is_integer", NULL);
-+  if (is_integer != Py_True) {
-+    PyErr_Format (PyExc_TypeError,
-+        "denominator %f is not an integer.",
-+        PyFloat_AsDouble (denominator_obj));
-+    Py_DECREF (is_integer);
-+    goto fail;
-+  }
-+  Py_DECREF (is_integer);
-+
-+  denominator = PyFloat_AsDouble (denominator_obj);
-+  if (denominator == 0) {
-+    PyErr_SetString (PyExc_ValueError, "denominator is 0.");
-+    goto fail;
-+  }
-+
-+  if (denominator < -G_MAXINT || denominator > G_MAXINT) {
-+    PyErr_Format (PyExc_ValueError,
-+        "denominator %" G_GINT64_FORMAT " is out of bound. [-%d - %d]",
-+        denominator, G_MAXINT, G_MAXINT);
-+    goto fail;
-+  }
-+
-+  gst_value_set_fraction (value, numerator, denominator);
- 
-   return 0;
- 
diff --git a/dev-python/gst-python/gst-python-1.16.3.ebuild b/dev-python/gst-python/gst-python-1.16.3.ebuild
deleted file mode 100644
index 1a50e1c044d2..000000000000
--- a/dev-python/gst-python/gst-python-1.16.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit meson python-r1 xdg-utils
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# Avoid building plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
-	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
-	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
-	sed -e '/subdir.*plugin/d' -i meson.build || die
-	xdg_environment_reset
-}
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython="${EPYTHON}"
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
diff --git a/dev-python/gst-python/gst-python-1.18.4.ebuild b/dev-python/gst-python/gst-python-1.18.4.ebuild
deleted file mode 100644
index 7b3a8d2265cd..000000000000
--- a/dev-python/gst-python/gst-python-1.18.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-r1 xdg-utils
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-avoid-treating-float-as-int.patch"
-)
-
-src_prepare() {
-	default
-
-	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
-	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
-	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
-	sed -e '/subdir.*plugin/d' -i meson.build || die
-	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython="${EPYTHON}"
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
diff --git a/dev-python/gst-python/gst-python-1.20.1.ebuild b/dev-python/gst-python/gst-python-1.20.1.ebuild
deleted file mode 100644
index 5df02dbb593b..000000000000
--- a/dev-python/gst-python/gst-python-1.20.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-r1 xdg-utils
-
-DESCRIPTION="A Python Interface to GStreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=media-libs/gstreamer-${PV}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
-	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
-	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
-	sed -e '/subdir.*plugin/d' -i meson.build || die
-	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			-Dpython="${EPYTHON}"
-	}
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-}
diff --git a/dev-python/gst-python/gst-python-1.18.6.ebuild b/dev-python/gst-python/gst-python-1.20.2.ebuild
index 911b008ead42..911b008ead42 100644
--- a/dev-python/gst-python/gst-python-1.18.6.ebuild
+++ b/dev-python/gst-python/gst-python-1.20.2.ebuild
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index 9f85b1fe562b..3e8c11e2eeaa 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,5 +1,3 @@
-DIST guessit-3.4.2.tar.gz 165996 BLAKE2B ccad7018ed54a49397ff008555650bb322f6884ece0608a26af89ec58d82e81125ca806b18a9936b578626a0b47f8b4fae3a3b9299cfebd67c29e88e05cc7785 SHA512 e969ed2d89e3b0eb1f70db3d8fe5258c39f4c9f86dfb7f943c2fc2c4d8f85580487921b7ee37e486bf1f8dfc067b3a2a75a54a2e72519b9687aae48ba7631c6e
 DIST guessit-3.4.3.tar.gz 166183 BLAKE2B 30b08719b12580ade5354a501217cf2b0547965d1ef8016ffce313d257a3ca80a0736e0c904b4e3f7f639d24919839afc3887d81e2912e6aafb37861f979766f SHA512 2719683487baa7bf0f212d4150486f3e673721683361004aa4397204fdc1a3414de86dd4b05b805dc91427d897cd391a7431e6c25e1576b0855f4cc3aabade7a
-EBUILD guessit-3.4.2.ebuild 1159 BLAKE2B eb3148524244cfc72d14ced3efa3c5a676312a335ead445ccc26feea6aff45bbae22fc0c0490b0fa2c42331b979f60a77fc34fc658959019216180d8502ce8bd SHA512 a629739133fe122e96b1f3e730971dedfbee1a6fbc43a4066fb3aa946c626aeb633f60c77a7714030cd2c595404822cec24d89b8b01ed6c9e61dfc9a04a64447
-EBUILD guessit-3.4.3.ebuild 966 BLAKE2B db15d747dea5c3286aeba9140ed85b228d5bd96481bd88001ff8def39af3cb9a76823063440d524357e8f6bf2ac0d562fa8814fa32f60aea0090695d7a6025ec SHA512 b389dbb50a3793d6e352b8b0fc4745c4e1ea71da19cc970d7157d86ce3d30df0d3af234a599e12ca5cb08aa44b51a4ab55d35d8caadf3a1f2c1ceb433e1c338a
+EBUILD guessit-3.4.3.ebuild 964 BLAKE2B b05f8d274bcb28c3e995f146375b2138a021ba8d2c0a55a77cf90874c82f26e54d545cd1ff352df6ec97a8ee25230a48c55c70adc29d4030fbc315e94505007c SHA512 7d8e2db95043c72e59993138fd900056a9a4c2af4ad0a0e7f94bb5fe38353fa81fd5a851fd3b4c94ef4219c487a0b4c62556924874e4ed280a9641f81c9d8b94
 MISC metadata.xml 393 BLAKE2B 6aaa0bb7a7cac0915e2aa2d65bbc311144f5ac04ace0abbf5591f94d7e4b50c80754d9ac5d92039fb0494ebaf4051fcd9d0de60f208fcad3fb4fec521503a7d5 SHA512 02502c60dec90c160d8bdb29223cf27bf0ea6e23d01b3feb336f747e13c0c830f788e1b42fede862706d7b45927f08f3c8bc124dd8bac7c94264a0659a9df9c9
diff --git a/dev-python/guessit/guessit-3.4.2.ebuild b/dev-python/guessit/guessit-3.4.2.ebuild
deleted file mode 100644
index e8b753e4f14a..000000000000
--- a/dev-python/guessit/guessit-3.4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for guessing information from video filenames"
-HOMEPAGE="https://github.com/guessit-io/guessit
-	https://pypi.org/project/guessit/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/rebulk-3[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_resources[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable benchmarks as they require unavailable pytest-benchmark.
-	rm guessit/test/test_benchmark.py || die
-	sed -i -e "s|'pytest-benchmark',||g" setup.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/guessit/guessit-3.4.3.ebuild b/dev-python/guessit/guessit-3.4.3.ebuild
index 316c4c14605e..74897219672d 100644
--- a/dev-python/guessit/guessit-3.4.3.ebuild
+++ b/dev-python/guessit/guessit-3.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index fdd49ea7b877..25a48ee1a882 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,4 +1,3 @@
 DIST h11-0.13.0.tar.gz 100165 BLAKE2B 6cb610afa474f5945151300e6ec6c2860e8b959b9ab0224b58fb047f3fa0b417499adb0119b7b7727b9ebfb4b60360fef78843fde41935616784bbf450605503 SHA512 c3a16dd66287ab6491b664aab9d72e14f1e61950c19182d60e195b81b2857e47157c38137b2ee2a9cd35d9d54997f554f768a3933051030895ddf7bc5b813e02
-EBUILD h11-0.13.0-r1.ebuild 561 BLAKE2B 74ab805ea29f22ea47f60cd5dbdf2cf406e2ece1776e523f7ea4a8e046cd4485a24c6b9016b0f76e4fcae761856ff721dbd720ce4299e2dfb69475a903283208 SHA512 fb42496600cd8d98a125704e07a6b637cabd10ef5b3ab142df4a5d1012a5a3c35b8ebb15ec2979be08bfde062ba6b2d1d9966322bf79a30f700810fd5b5684a0
-EBUILD h11-0.13.0.ebuild 527 BLAKE2B 64436c9f0099d96b3361f8c97747406e731f0a8944bf074cf7df90773d613dbf02472d97bb8d060fcf6eaf9a6852e973cb0d76147b3b7372b3b1bfc1a645911c SHA512 450c29d0ded2c345c31d9d2ef1486d13911c1f342aac1f274909fcb4a1bf3ae41450e63b78c729ae3b2bf73b448a82100613975d87b4c8350217a4d843d6d7dd
+EBUILD h11-0.13.0-r1.ebuild 596 BLAKE2B 84ab26b4b1f59409f44b905ae3bc704c7f746622a61539e15ac1f7eda40666b84722041252f630d87917d3a238dd2af9bc4ce0a469833b4428ed0eb17951e21b SHA512 835b5d1c5aabf260ad8e803535f713aeffc0f41e6c1657ee4180818d55d21a92c85fcaee8d4f2c3af04084f5c78f404b4a1a48134bd7ea79f787b109992dad2e
 MISC metadata.xml 387 BLAKE2B 8bae8408691691a5ce5f285d26e819ef0030c266972cf8acd88a221898d5812f8cd1772b6b4bf762e27306bedfa485f992b24dfb092cc2cb4818ec4a2a524d4a SHA512 573a967df1b9e058dd3cdfb700d72a05c239d8c669e4c0456b23061ccb0dbf97cf584fbed2b090e5811973ba38d429df0b27bc561c4f40a87107b6c16d5863ff
diff --git a/dev-python/h11/h11-0.13.0-r1.ebuild b/dev-python/h11/h11-0.13.0-r1.ebuild
index 5de6caf488f4..d3f2e63f8d2f 100644
--- a/dev-python/h11/h11-0.13.0-r1.ebuild
+++ b/dev-python/h11/h11-0.13.0-r1.ebuild
@@ -4,16 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
+HOMEPAGE="
+	https://h11.readthedocs.io/en/latest/
+	https://github.com/python-hyper/h11/
+	https://pypi.org/project/h11/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/h11/h11-0.13.0.ebuild b/dev-python/h11/h11-0.13.0.ebuild
deleted file mode 100644
index 9f95cd81ac8d..000000000000
--- a/dev-python/h11/h11-0.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USEPEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure-Python implementation of HTTP/1.1 inspired by hyper-h2"
-HOMEPAGE="https://github.com/python-hyper/h11/ https://pypi.org/project/h11/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/h2/Manifest b/dev-python/h2/Manifest
index 736aff74f748..eae15673875a 100644
--- a/dev-python/h2/Manifest
+++ b/dev-python/h2/Manifest
@@ -1,6 +1,7 @@
 AUX hyper-h2-3.2.0-failed-healthcheck.patch 3381 BLAKE2B 0eef97897e58ca0b580371e1cd8dfeb4c85d3e333aea4566121bbabd08cee5a46070360e3f40f244058082c5949f3fc1ed8c5a9d80bdc6f9c7ce741a9dfa915f SHA512 0e5e9a6f3380e3a2b54f63c9894e3fd5c5987b7e55834200b051e6d8ed13219f9784340275ff136ba273eb5b989b5bed80e85460bc7b25049974150f0340911e
 DIST h2-4.1.0.tar.gz 2143812 BLAKE2B b9d9a771340b4bde1675b9fd65c242732a1a262456f84a409662cf2b57326e24e0583160ba0531c0b105b79342578714127dddb560d2a27de58af34d1052c698 SHA512 4e9cf88b3ae702a8a42bded775ad337809787fe8172d501c230d55abbf1edd764acf3b227f2e58756d882499661ffcf6bbdd4812a4d938c04fac3f1aa2390b28
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
+EBUILD h2-3.2.0-r1.ebuild 1679 BLAKE2B b99e6d232b30f0ddd77f09b816b3ac97bf29adc9ff3922086e56e4a83ee989824073f43a08428517932913134abfbf90454c5c7391d9c01efa5a7fbdfa6f621c SHA512 15d16c1639212f74ba782e51941d82d99c14bc12feab97dd1d2692133aec5a7625931cfa0eb92fced81907114e75909a1892276d71771705089a38012ccf369a
 EBUILD h2-3.2.0.ebuild 1598 BLAKE2B bbb1bf40b9a8867e30d01445fbf84b21cc88ed08fcad635d43ab9bf41b1a69e031d762d14664c4b56c3886b850f7efb829d9453f580dca075f6c70b1a0ab0422 SHA512 2f8cc85700b3fb63f848db74eed1d893418179f9b7bcc989db48b5f206e16c40a088dd519a3ef6b903d80868b98845a853e8f2e3e57ade7938918e1c1f40e08c
-EBUILD h2-4.1.0-r1.ebuild 889 BLAKE2B 8ccb3149add276e155521e099b02ac02d9a4bdc4ffe861fe154f434d14866bf54991ef2826606250869bfce3b182bc5d8b8609e40c1a919640393da2f67a914a SHA512 9654f20c46815e0ef306a588bd470e7f3b95cf254d1fb31e0fba52392af8670c6d89a307d4482b81c0cf8cf9a2aa8ad13694bb123e3c3a67aba146e4df056351
+EBUILD h2-4.1.0-r1.ebuild 1293 BLAKE2B 103028d47b96ce622db5ca9ba314cd316da477a72b2f2c6ea32cea8380a6a1222f5a556f4acee593947981f3220b7749ad09cd621af5def2ab68b9dae08f8abe SHA512 51f695d21c215ae9bbeaa0de0d017e95d19f5d490ee3686074843c6a3f91fae29dbb9299e532afb58662fe8872f0b4730b94c8f6d63bb69eb7026d3d3e6b84ae
 MISC metadata.xml 694 BLAKE2B 8e3c231ed6263fd0feba3f8f3ef0d5cf0345e2de092e4a50de3d6b9dc3b009570b896dc5a7804f9b99e9ffd75ae6a8387d139f0db1dc3ce213c4e7bca63061e2 SHA512 713b15d6f84180c861d1487f2ee7a377acd9403876385e064bfb103b5961cc53655953602dfc809cef648444ea9e201991e2de00203d0ab5a36c3d13b1764e2a
diff --git a/dev-python/h2/h2-3.2.0-r1.ebuild b/dev-python/h2/h2-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..46613c45aa92
--- /dev/null
+++ b/dev-python/h2/h2-3.2.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=hyper-h2-${PV}
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="
+	https://python-hyper.org/projects/h2/en/stable/
+	https://github.com/python-hyper/h2/
+	https://pypi.org/project/h2/
+"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/hyperframe-5.2.0[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# From https://github.com/python-hyper/h2/pull/1248
+	# Disables some failing healthchecks
+	"${FILESDIR}/hyper-h2-3.2.0-failed-healthcheck.patch"
+)
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.1[01] ]] && EPYTEST_DESELECT+=(
+		# these rely on fixed string repr() and fail because enum repr
+		# changed in py3.10
+		test/test_basic_logic.py::TestBasicServer::test_stream_repr
+		test/test_events.py::TestEventReprs::test_remotesettingschanged_repr
+		test/test_events.py::TestEventReprs::test_streamreset_repr
+		test/test_events.py::TestEventReprs::test_settingsacknowledged_repr
+		test/test_events.py::TestEventReprs::test_connectionterminated_repr
+	)
+
+	epytest --hypothesis-profile=travis
+}
diff --git a/dev-python/h2/h2-4.1.0-r1.ebuild b/dev-python/h2/h2-4.1.0-r1.ebuild
index cb38a68436d4..2520745f3814 100644
--- a/dev-python/h2/h2-4.1.0-r1.ebuild
+++ b/dev-python/h2/h2-4.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,8 @@ DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
 HOMEPAGE="
 	https://python-hyper.org/projects/h2/en/stable/
 	https://github.com/python-hyper/h2/
-	https://pypi.org/project/h2/"
+	https://pypi.org/project/h2/
+"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -32,3 +33,17 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.11 ]]; then
+		EPYTEST_DESELECT+=(
+			test/test_events.py::TestEventReprs::test_remotesettingschanged_repr
+			test/test_events.py::TestEventReprs::test_streamreset_repr
+			test/test_events.py::TestEventReprs::test_settingsacknowledged_repr
+			test/test_events.py::TestEventReprs::test_connectionterminated_repr
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 0c8a3533ad28..97eeb3811f97 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,5 +1,3 @@
-DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
-DIST h5py-3.6.0.tar.gz 384160 BLAKE2B 354764bb002cd342623aa962de88a24ee45156c0a2d61088508017980e407e90f85e65da9d3e29a6745dbca754ba1708700fbea4f4123a10a620bc758cbaa3ae SHA512 f3a108d16578ced552fcac4fceb7f3180ee71a3c8f6caa8702fd9989728d8284afb9d85f1239648e10d14f3532c772f46d05f8306bb8b305d98b162d7604683b
-EBUILD h5py-3.3.0.ebuild 1356 BLAKE2B dcda3ffd431351c36778d5fa9fb1d9a4b7bc104de0e4d80ed01656f10b87c52b923441dc35d0b5ae05c920943c4c6f3774d205c4829210555361aeb224bda708 SHA512 4418c532c552cb3e1f168c272093ef4fef47781a1794698c3ba02ec7c5dbd9e65f873c6c5b12021822a8382481296def58af6c59ed6c980f041ff43c1d462699
-EBUILD h5py-3.6.0.ebuild 1466 BLAKE2B 6f6433f0726a575b606d004d83b575508acb5feb3dcb9e7b4b6280a8bf7581fb9427517e3003cd73f4a34a2a5597a4f5b54be1bbb9f84a5144a092f36f3e6dc9 SHA512 7380ab2f8cca1c9c8b691b1f71c3ac9373c5aff45a9426cac7b3b47981d90c34a9ce8191af7340df1181b011f15513cf949f1fb2d2717b557fd4b432358463fe
+DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
+EBUILD h5py-3.7.0.ebuild 1464 BLAKE2B e8cbf89396ce6be874c723ced64c1d08ed21c11c875e5fb7e2a84225915eb3c784b3a41693c54960f967c23108c8668b1e7c2019c6874ec4df6628a287d7c176 SHA512 95adbd8b245149d692d8e8712f4ac2e0dc6dd11b96b4424dc5bf12563735708db85a16ffe18d477e151a0d4c5bbce136fa1efbe6a8721f30dc3132464aeaf5e7
 MISC metadata.xml 1016 BLAKE2B ab015a188dadacae6ad496f541bb6d4df97631d5d1601e21396509675f03da4060dbce67588e77cbffea5a7b763344e95b61a7ab482d6b64a16b90b0f1484d0c SHA512 fc4debeec5b4fb1b22f1c1f23d9dc2bf090e88451f2e456b5c7c82d11abbce789ecc79993dff9520a4a407c94299a10e1eddce796a6d44e216fbc7702dc23dc9
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
deleted file mode 100644
index edb9f5089319..000000000000
--- a/dev-python/h5py/h5py-3.3.0.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="sci-libs/hdf5:=[hl(+)]"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	epytest -m "not mpi"
-	rm -rf .hypothesis .pytest_cache || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.6.0.ebuild b/dev-python/h5py/h5py-3.6.0.ebuild
deleted file mode 100644
index c6245c6d9fd4..000000000000
--- a/dev-python/h5py/h5py-3.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="
-	sci-libs/hdf5:=[hl(+)]
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)
-"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -m "not mpi"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.7.0.ebuild b/dev-python/h5py/h5py-3.7.0.ebuild
new file mode 100644
index 000000000000..bbfbfbcd2ca0
--- /dev/null
+++ b/dev-python/h5py/h5py-3.7.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple Python interface to HDF5 files"
+HOMEPAGE="
+	https://www.h5py.org/
+	https://github.com/h5py/h5py/
+	https://pypi.org/project/h5py/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+# disable mpi until mpi4py gets python3_8
+#IUSE="examples mpi"
+IUSE="examples"
+
+#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
+DEPEND="
+	sci-libs/hdf5:=[hl(+)]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+	)
+"
+#	mpi? ( virtual/mpi )
+#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+#pkg_setup() {
+#	use mpi && export CC=mpicc
+#}
+
+python_prepare_all() {
+	# avoid pytest-mpi dep, we do not use mpi anyway
+	sed -i -e 's:pytest-mpi::' pytest.ini || die
+	distutils-r1_python_prepare_all
+
+	export H5PY_SETUP_REQUIRES=0
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	epytest -m "not mpi"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/happybase/Manifest b/dev-python/happybase/Manifest
index a911458d2986..8f70ae973a23 100644
--- a/dev-python/happybase/Manifest
+++ b/dev-python/happybase/Manifest
@@ -1,3 +1,3 @@
-DIST happybase-0.9_p20210701.tar.gz 106551 BLAKE2B 66e39d8db10b8b7adbab5b77462560d50a2a494e1cd9b0411abd1c928cb4b630e42ca0cc6740c35cc9a3b65dab8e637df6ae6d4105665fa21fa7668324c82ec5 SHA512 b55028e6fe8b1087e835b01d373af6357ecc495e82badda6bd1641d1d7ef79d5ec72d3336ca7112b5b6886d28b4a6296336c96b83ce58740ea5802c4f11ab12e
-EBUILD happybase-0.9_p20210701.ebuild 841 BLAKE2B 83d7a461a15de5ed4767aa8a3590d57b9c9ec4a5ee9994c1eda73bda894be40c1c73459c1d35c3bdb3eef7e26b1af32f6e35d529cef15924ba0e6ceff74e506b SHA512 c0818a121b10f5451e159be568aae79c234b3d2bff9e9a84f10217ebe479b0a8853c8623cf3769c8c82fbbdb87f9159bd050330b0b14486001c18cda74d21237
+DIST happybase-1.2.0.gh.tar.gz 43753 BLAKE2B 17c7762ca6268bbcfd1c379463a1f370aab354a526db2606e133b19c6b225e30561a079e22bee9f0232d74006c534d4c38d00ea1d651c93d94577dad9f60b0fe SHA512 0a93e390b854bdb047df8528aa6c19b3e0444c3d317feee4e2e0b8025792ece252422674d7b1feeb601b53966fec10e52593f2ad5119ec7f5e06128ad38ac2f6
+EBUILD happybase-1.2.0.ebuild 727 BLAKE2B b99a09249f99b58e063dff1767ac3b89176346c33bbf9b7975dea23ea85aa0a8c18f5a50025ca85ae0fafe40655bd16009fd0447208d4731c69b9168d6b85dd3 SHA512 2d5440e518bc384abbb2f0324e4b392242943c50de9fa2478d19271d8af43590c7b427b0ae84c15505be91eeae0857aa4d0d9cae3351805cfd3d81fe867bf63f
 MISC metadata.xml 388 BLAKE2B 85dc7775215998419a74d9d0d7976cd8ae78c93f3ab69c9b7415b001a460ebc15080867be993a0913bd2452b44532d16a3f95ce375ef187c31ef8d548a868a1c SHA512 79e52204645084a783a5dd9c391774ce5f24b6adbfa78588755228f3fcef82d50f0f7b975a1ded10f62cf5f927678794d6216cec49a12b32468eb1d19783ed71
diff --git a/dev-python/happybase/happybase-0.9_p20210701.ebuild b/dev-python/happybase/happybase-0.9_p20210701.ebuild
deleted file mode 100644
index 0490d7a3842f..000000000000
--- a/dev-python/happybase/happybase-0.9_p20210701.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-COMMIT_HASH="f5b6d104140c2be93e4175c0c844aaf094eb43da"
-
-DESCRIPTION="A developer-friendly Python library to interact with Apache HBase"
-HOMEPAGE="https://github.com/python-happybase/happybase https://happybase.readthedocs.io/"
-SRC_URI="https://github.com/python-happybase/happybase/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/thriftpy2[${PYTHON_USEDEP}]
-"
-
-# tests require a running thrift server
-RESTRICT="test"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	rm pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/happybase/happybase-1.2.0.ebuild b/dev-python/happybase/happybase-1.2.0.ebuild
new file mode 100644
index 000000000000..cbe7c8b68a9d
--- /dev/null
+++ b/dev-python/happybase/happybase-1.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+COMMIT_HASH="f5b6d104140c2be93e4175c0c844aaf094eb43da"
+
+DESCRIPTION="A developer-friendly Python library to interact with Apache HBase"
+HOMEPAGE="https://github.com/python-happybase/happybase https://happybase.readthedocs.io/"
+SRC_URI="
+	https://github.com/python-happybase/happybase/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/thriftpy2[${PYTHON_USEDEP}]
+"
+
+# tests require a running thrift server
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hatch-vcs/Manifest b/dev-python/hatch-vcs/Manifest
index 376633782a82..1496d5fc8e28 100644
--- a/dev-python/hatch-vcs/Manifest
+++ b/dev-python/hatch-vcs/Manifest
@@ -1,3 +1,3 @@
 DIST hatch-vcs-0.2.0.gh.tar.gz 8192 BLAKE2B 69f24de91b947e695336ca30cf3f265edcfaf10fa49df93fa0f70e45d1179e70d1ef5584fc99f88f66ca3c4fd1866a681db81253280ce3f9221d19f04443a085 SHA512 1c3627240ef5b659b9d87a69c84dd71cac4c83758f5be676e808377400383e996209cf6eabb1222f5330c0a97f0d261ced1eb9dc40e1d5c2bb2fc708659360eb
-EBUILD hatch-vcs-0.2.0.ebuild 656 BLAKE2B c2f666141552eeb3e67624c088ae7d487182909a91c0a764d716c4bfefe71a95fdb9cd07a0c6e4bca93752b0f590e2725b3d2c4d5711140b090a482c68b69049 SHA512 f133ad58296a729126261ac5959fe630c490e42c9862d99726cd6133e89ceb3298c8a35c654e7aea9479e7ef43d31b60b4f24ba67fe718d08bbbded34b0db2a4
+EBUILD hatch-vcs-0.2.0.ebuild 648 BLAKE2B 8a06510af770b9cda86ef58ae1480729056074e7eb480d17f2a3802c37fec856c4379fde1f5bc5210f291598eba647cff5ec8cfbc4561caabd3251d7f9da2344 SHA512 605ec70b08916df10ee24b6360af59b0400d97dc8f78b9dcb419367eb4889ce03565d964996431a73b5e6842d58d2f8864ede7e7bbb3f9adfd2685839d9c8e4c
 MISC metadata.xml 345 BLAKE2B 9483d276fbf90793ada8e95e4131830e756ebd65b29ef730aedabb12b46a33a3237c4f9ba99ca660006506f9bdb3a0a6c1642786ac763d2b85df029e3d0df56e SHA512 79d44066c15d5159331473aa2770cca340e05ac6565ba567229ad77f59c5421aad2146c44517c45210dd739bfdab8fab227cc5ab40979c04abb3c65c846d5f63
diff --git a/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild b/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
index ff9ca3660636..07b53a07af44 100644
--- a/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
+++ b/dev-python/hatch-vcs/hatch-vcs-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/setuptools_scm-6.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index b934d387f037..9f26ab80a2ed 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,7 +1,3 @@
-DIST hatch-hatchling-v0.22.0.tar.gz 201590 BLAKE2B c75e48a19e10f04d9bb1d09beea0ec6598bded5dc9e595f363a076731b7708bae55169ee780931b548478c16db093053c65e30a5510f7b0136c1d339caf29d39 SHA512 cc532b66752d0494b62fb4ed88c8b7870d5618c991b301f46b644aa90b656cfe842efd2fa96797a6b96015deb3468ff8ff69058bd146133360de340d367a5489
-DIST hatch-hatchling-v0.23.0.tar.gz 212046 BLAKE2B 8cc73c68bc476cd282686dc69314fd401f5aac4d5d5df083a338aaf59125988aabc9d33f97ad556013d46886d43facef92e7951e7b0a7bc3fc1ab608a16fca11 SHA512 0666b95e68fcd6fbcdeda5fdce577a1178ca8a965226c58495cfc2699bac2aabe3f3bc162e8bb5b03c9c70ff7aa678be6aba5c343dd787600d2f5ee883685444
-DIST hatch-hatchling-v0.24.0.tar.gz 212154 BLAKE2B fc0fcdd20eb1a1040298a4c959911d291ca454cf82404b0a7a67a9d192e3af0b8ee5a50d169e803bd5602775cf3f9336fd56d83c6fa85aa8d9f805269205ed29 SHA512 f4a1764f129c6e3098d0b0c744dca4f0b499c43d53dcebffc7aa26e28e3f599a9370e0f1f8ee9b9130042f066e1c857e155ffbdcf86d2c18e32ff5bc9219c51e
-EBUILD hatchling-0.22.0.ebuild 1869 BLAKE2B 4af6f4522dafcfe81b0355bfb233740199fcce60f66a6d9c00c612151196c2e19ebc2cdad2a941333febcba074bfa39c917b47a9ded9e33fca1512b033663400 SHA512 ece79f54ee6ac9d24921b8adb93e35ee592268c7b90c910f4f3accf39051b054b006d6680e0b75f2b41602d5cc740457bc28dcada17af3f8f9ba1155b0821167
-EBUILD hatchling-0.23.0.ebuild 1869 BLAKE2B 4af6f4522dafcfe81b0355bfb233740199fcce60f66a6d9c00c612151196c2e19ebc2cdad2a941333febcba074bfa39c917b47a9ded9e33fca1512b033663400 SHA512 ece79f54ee6ac9d24921b8adb93e35ee592268c7b90c910f4f3accf39051b054b006d6680e0b75f2b41602d5cc740457bc28dcada17af3f8f9ba1155b0821167
-EBUILD hatchling-0.24.0.ebuild 1979 BLAKE2B cb1868e7c03e2f7dae9adf13758531514ad972875d6d4f4398d73cac3c480678632fcd5235a87f887cf9010621d1711acf0d1b69234bdc1f49a221d5a307d464 SHA512 0205bd136cb835d2b9a67b505954bcd3e53f906b46b3c08a8414ba99b83a3101e2282eb73cc10c204e0f877bf41ac853fc6e03a2bcd5df62ab4bbc0fc3f5af1b
-MISC metadata.xml 341 BLAKE2B f128c71f719361922549d50b2eb2fda23a0f35a6ffc8fdb143aff127490cff3c6d14a9b1e3dd1ef1a31d0154f37e402add3ab3c71492bed39b3b9b1e5fbc4e93 SHA512 0de9401effe9611102d8fc9ae2293bdcbb4f1ac9bf204187760dc1c8b92dcf10aa0a1be53adcda42fcc6ed4eb4f196c16eba1f075ea1dd806e5936d0de331535
+DIST hatch-hatchling-v1.3.1.gh.tar.gz 220023 BLAKE2B db336126d8c5235eab57ca53e2f8832b9590513f40215ff4b51d1b60c43b0d971b472dc4434cfcf77406143a4ed3172a2fcd95d4c7d11a6f39ccd937f9eff9e6 SHA512 21fa8bd4ffe0bec5ae9f8b9716ce3b7ece45c6a62bc74f0cd49f759baaa5b21343bcc9f2a8e505f0b724b7d73a4c1f84c863a29e064e95f4aa1a288098adc8d3
+EBUILD hatchling-1.3.1.ebuild 1980 BLAKE2B 0c537198ec4cead26561b0781f68f6062ba8845cc56e68ba482ebead4618ab86cb5418234524939c1fb69b09a44993fdf2bf222e75f254b0139c66669ca38d59 SHA512 6036e99f5bc40b79197476c7e3201b6b003fa36269d63b36a1f40db9f912dc1467b037a891292d586b36cc0c79a8999ce3bf7f3dc82cecbff0cb7d4d149be316
+MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-0.22.0.ebuild b/dev-python/hatchling/hatchling-0.22.0.ebuild
deleted file mode 100644
index 74fbe0e7a565..000000000000
--- a/dev-python/hatchling/hatchling-0.22.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/ofek/hatch/
-"
-SRC_URI="
-	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/platformdirs[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# TODO: remove this when gpep517 is the norm
-	local -x PYTHONPATH=src
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-0.23.0.ebuild b/dev-python/hatchling/hatchling-0.23.0.ebuild
deleted file mode 100644
index 74fbe0e7a565..000000000000
--- a/dev-python/hatchling/hatchling-0.23.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/ofek/hatch/
-"
-SRC_URI="
-	https://github.com/ofek/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~m68k ~ppc ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/platformdirs[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	# TODO: remove this when gpep517 is the norm
-	local -x PYTHONPATH=src
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-0.24.0.ebuild b/dev-python/hatchling/hatchling-0.24.0.ebuild
deleted file mode 100644
index c768e17f0e8e..000000000000
--- a/dev-python/hatchling/hatchling-0.24.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' pypy3 python3_{8..10}  # TODO: 3.11 when deps are ported
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON}" pypy3 python3.{8..10}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# these run pip to install stuff
-		tests/backend/dep/test_core.py::test_dependency_found
-		tests/backend/dep/test_core.py::test_extra_met
-		tests/backend/dep/test_core.py::test_extra_no_dependencies
-		tests/backend/dep/test_core.py::test_extra_unmet
-		tests/backend/dep/test_core.py::test_unknown_extra
-		tests/backend/dep/test_core.py::test_version_unmet
-	)
-
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-	epytest tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.3.1.ebuild b/dev-python/hatchling/hatchling-1.3.1.ebuild
new file mode 100644
index 000000000000..992dbe41ac5d
--- /dev/null
+++ b/dev-python/hatchling/hatchling-1.3.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( pypy3 python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+TAG=${P/-/-v}
+MY_P=hatch-${TAG}
+DESCRIPTION="Modern, extensible Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/hatchling/
+	https://github.com/pypa/hatch/
+"
+SRC_URI="
+	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/backend
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/editables-0.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/atomicwrites[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+			dev-python/httpx[${PYTHON_USEDEP}]
+			dev-python/platformdirs[${PYTHON_USEDEP}]
+			dev-python/rich[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x EPYTEST_DESELECT=(
+		# these run pip to install stuff
+		tests/backend/dep/test_core.py::test_dependency_found
+		tests/backend/dep/test_core.py::test_extra_met
+		tests/backend/dep/test_core.py::test_extra_no_dependencies
+		tests/backend/dep/test_core.py::test_extra_unmet
+		tests/backend/dep/test_core.py::test_unknown_extra
+		tests/backend/dep/test_core.py::test_version_unmet
+	)
+
+	# top-level "tests" directory contains tests both for hatch
+	# and hatchling
+	cd "${WORKDIR}/${MY_P}" || die
+	local -x PYTHONPATH="src:${PYTHONPATH}"
+	epytest tests/backend
+}
diff --git a/dev-python/hatchling/metadata.xml b/dev-python/hatchling/metadata.xml
index 585828baa4a2..89b4fe162ebf 100644
--- a/dev-python/hatchling/metadata.xml
+++ b/dev-python/hatchling/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pypa/hatch</remote-id>
 		<remote-id type="pypi">hatchling</remote-id>
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 1a48e6b2a1f6..0045314013fc 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
-EBUILD helpdev-0.7.1.ebuild 680 BLAKE2B 4ad5b974415b828a735aced83ae3db7ac878a35e8cafcd8272ef82d3ea0af415e76c20951ff827a6b36b5929873313f44bf15a1bc1915240e58649ebdcf14ca7 SHA512 78c677888ece353fa2f43ef879e14257fdf5b8f5fd60d69049cbdcf4ce83285b0a6846be5026f24dbfc90986019f30d039ec35bbfd5026fac996f09d65b9ba99
+EBUILD helpdev-0.7.1.ebuild 680 BLAKE2B 71502b7950106d39dcb2f964aa848c0064abb611c11a1d8935e5dcb32b6c5152cee0715fe34077f5309de21987673e19394b9821756c798ff301c20047d83e2f SHA512 44fcd4452a79530f6242c00603f90314b14348b18ead41b9637f4aa06a57862e3eea23cfaa0f049ab340a434235983f592f95f3e6d8981626adf71d04fe5c3d9
 MISC metadata.xml 353 BLAKE2B 3d959283a5aea52d6387e26f476e53bdca58e5414233dec3a9e8925ae9da0f99818b7a74f5e494cc1983f725ebdd98b7a16a87d3c65c614f716257dab4757a94 SHA512 16990f134dde3547be222021e39f32dd7d1710d02a19520a5048c4df8fa910d88c4d9ef598b2187914e466bebe0000c060f0474bf0ecd5f9cb04aeed64a1cad1
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
index 5f35f0d33cb6..c61710dc539e 100644
--- a/dev-python/helpdev/helpdev-0.7.1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 068d2296081f..7f3d34d26363 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,5 @@
 AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee267b0e5355093c872e582346130c3107e6cd109b8a266c68b79c00440f550f3a73c3c1c12d3cb3cd3c61fd22289532d5349 SHA512 7ad798620f7cfd62aad7d73568410f04001edd70ea2a3cfe26242b309f4dafb44dd78e9de399a050e12164ebbe8160ed324f594ec4d1cf44b5a7b5b70d27d9b3
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B c97141cb6ab01767a50843efbc02059bbfdf4ac7886a2b1a2213930f8e79e68abb3b8e48b987dbf2bfcfebc4191309f520bf1d507d3eaf99f5fb12a43ab4af83 SHA512 c147ca3c864d343f4785aaf5ccb971daabb8366f794d781f0d6da429d12811435727f8af42ff7639eeeec8f336bd7670342056193bd7204cb3425e830f00e4f0
+EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 4c916f9a98d6cc793ee8494beb6976040e65ddbc0c89dfdc34639f094a92dc3f9e6e7bac53f99e1638ed99afaf8e09ea9928d1ad3189adae0e84fe33bc5f4805 SHA512 8af5f3431878eea1d7964439ba06a63cfa6839c91f2ccd6959488c8e718122340c58fef02423092ac1d1d40946a7147f740804d767173340431bbd6c693532c8
 MISC metadata.xml 579 BLAKE2B a625bee5874cd1b4944638094c6f13b7c1aa6c55333e3d0de088e8c2e85c43f212c78ea495470d78e1f143bcd7f1be50c4bf16c616912fbacdcffb90e1cff992 SHA512 db00dee480df0e1c8c553e592c6ef5f931329247cc35842753dbd755a0d825cc6a14b67713fa133a6f3048326e039faede1fba290015f09df3e057ee3949f064
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
index 9d577aac4ee4..f20d2af1dcbb 100644
--- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python extension that wraps hiredis"
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index bf477cfb6977..b709f3d47c7b 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,7 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
+EBUILD hpack-3.0.0-r1.ebuild 1041 BLAKE2B e127e717dc32d8e18d2c4d762c336a55ac94ce62cc0ed0257ef716c25635401dd84edae9b3cac7351d586e369a25bb4a31e7c4ef257eb4f8dfc5525e9f72df77 SHA512 00f5c5cd262f24dea1f931b217be00275aa0640b9a309a55bf84baaae7a4cd053560ecf252096474351841194b008ac49f1d73cd355763c4974c226a3b6daa10
 EBUILD hpack-3.0.0.ebuild 993 BLAKE2B 4c6f6da194d4e32c5d42d4dc1f1b81b95f41f2d373e34d6e0f05b80d97f6f37ea2777c21fd3a38768b2e1859861d9566e64d3b6b642daf480b7e7039874de8f7 SHA512 d9cf189961bb5a738be7417512f0edc86678c96f034e5df81a1bacbc314a7ab90e56af7932efd58140e00ced11649bc9bc781a77c75a98ce051395f736ee1015
-EBUILD hpack-4.0.0-r1.ebuild 805 BLAKE2B 2c8dc497316f6367d5361dadc7991fd91e725f03b63c57b4c1ba2df231ca81626ec4f5d0cc510fe650e86e2e7dea527f1a68de492ffff90e9dc9b8392a6b07a6 SHA512 3ad5ed4a054b9c3b7b9eb70a60f0713b5ebc930e1c32a7cc6dc3bc564212077ad5459df1e9c0d2d075ae30e3b7a19955966987f4633e0efdfa64356044e3d81f
+EBUILD hpack-4.0.0-r1.ebuild 806 BLAKE2B f6acc34cb49c19c0c4df84655ad690f62cd61e8a757bc316058b8c0139e9c3ee4e8632183612a0f2fe8bbf276431557656303700a633e16881d344cc1c90aad2 SHA512 92e82c2c2ad4898c020a9f4a7e0868465952b9b67bf38af94501fb237441db201cab39c11e1f181acef4ce476cbb653ca11b3bc0f0fa1caa148a7584491436a0
 MISC metadata.xml 702 BLAKE2B 55737d2ecb2b628a787b16858cba8fe6a1b5a2a2b5243445284f523797aed25fc6972f978d4348d8974409792629f7a399994b0189781efc8fc212a3c2b84e1a SHA512 2b60f701fa7ab80396a94e48dbed33c72dab3e3539355a20fe387dc2d5ea378bce5e3868a092da7d93604d1ef6422a4ae22c5ddb68d3dfc938920251186bdd1e
diff --git a/dev-python/hpack/hpack-3.0.0-r1.ebuild b/dev-python/hpack/hpack-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..488e4cb833c9
--- /dev/null
+++ b/dev-python/hpack/hpack-3.0.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="
+	https://python-hyper.org/projects/hpack/en/latest/
+	https://github.com/python-hyper/hpack/
+	https://pypi.org/project/hpack/
+"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# dev-python/pytest-relaxed causes tests to fail
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+		!!dev-python/pytest-relaxed[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/hpack-3.0.0-hypothesis-healthcheck.patch
+)
+
+EPYTEST_DESELECT=(
+	# relies on outdated exception strings
+	test/test_table.py::TestHeaderTable::test_get_by_index_out_of_range
+)
+
+EPYTEST_IGNORE=(
+	bench
+)
diff --git a/dev-python/hpack/hpack-4.0.0-r1.ebuild b/dev-python/hpack/hpack-4.0.0-r1.ebuild
index e13be709b52f..5831a863b3ee 100644
--- a/dev-python/hpack/hpack-4.0.0-r1.ebuild
+++ b/dev-python/hpack/hpack-4.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,8 @@ DESCRIPTION="Pure-Python HPACK header compression"
 HOMEPAGE="
 	https://python-hyper.org/projects/hpack/en/latest/
 	https://github.com/python-hyper/hpack/
-	https://pypi.org/project/hpack/"
+	https://pypi.org/project/hpack/
+"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index c4f64120bc35..4835d63356cd 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.10.tar.gz 272814 BLAKE2B 5759c872e65080ea059b81e632ed70a94e6677ef01af1e50ab1822128cc75ccbd3361c9d4e5e94fc4cc78996b3dbde97ffe435f083c492df2815c67d929cabc7 SHA512 45accb891261e1b82185de1cb0e06915e0ff487fe2cfc81b79f5653c8e9d7b9848349ab94657f8fb5eb116311b1d2b0d19f504f841ee8af0cf4a23601a5000aa
 EBUILD html5-parser-0.4.10.ebuild 826 BLAKE2B ad7af266f23d032b3e6a3a54165dde7609e46297fd9d65998b13b4cb6f926f900e7021cd7f7f042d360e2f921de352ee74910cce59c1599af02f5f87e2ea52a0 SHA512 28f63774fb9812f2c0458c550a5bccf6bec22e60d581389b1eb392386f3c99f96ee9f5072cb9f50f953cbfa0ebf706e733e46c92f6e797bc28b1e2746ec7edde
-MISC metadata.xml 357 BLAKE2B 38bab117178aaaad1f63bd54054fa936d888f533dc4c7b0c765ec5549ae6daf7637d33d7b6f6b68272f48b566c33c07655f76eefad12650900276d6eec4bf1c7 SHA512 9dfba23fc0aeca1ddaa1cae84a40b552671c517d8901661dead4f5b1e48f6394322718dcabcac9be06414d291332e7f78be173df1894eb26416c87522f40ded6
+MISC metadata.xml 458 BLAKE2B 368218d3f5b16284b8d0bc3447efae89d833b7ac206f9b0719f88078f8e472a7b362a0843211189da3f273e0e689a40b5cda5d457ff4dedc51dc74b74960ec3e SHA512 40b3f0e265ac93e827eadc79a57f9b05a7b5adf9fb88d729613a7f2844fabc38e47d39843e039e27a412fd2d1aa1cc38345027a3c31c952873c5e38e899112b0
diff --git a/dev-python/html5-parser/metadata.xml b/dev-python/html5-parser/metadata.xml
index 87f4bd5beff0..1ee3181c0ebd 100644
--- a/dev-python/html5-parser/metadata.xml
+++ b/dev-python/html5-parser/metadata.xml
@@ -8,4 +8,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index cf1d26158f45..adeb0cb800d3 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,5 +1,4 @@
 AUX html5lib-1.1-pytest6.patch 7489 BLAKE2B 73117fe1e75647760d8ccaa7296b8726d88dc11252d1dd23f3dc60ce28d7fc86dd724b6ee1e6756f937eb78ea7f684a1be9ab0783621971d252fb1f4b8fbae75 SHA512 d1a8642381bafb00f7b682ae35a01168731893e44ae3509ac36d3bc1d65ea48e32099447de9c09113da4ba1d0b6f969260c199c056f145295caf1bf985dc8a54
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
-EBUILD html5lib-1.1-r1.ebuild 891 BLAKE2B df9c20fbe94056fe7a336f61a001e2ad72834163a3501c287f001d3c2d4375da3a5164b26d14930dd98f99696fcc5d8a58126a18c6be939012d5bca8009eea5c SHA512 410fecaff41dd622f030623eaf6fd99d572e09e9fe583cb0be84f2f817ae48ef52957ebf482d15ac67ca5b3e389fd3ff294a2c8fbef8b92fc73da817b7992b60
-EBUILD html5lib-1.1.ebuild 807 BLAKE2B 56d286728b74ef27b824899d8244816e676bbb954756d4ee8d2b138dfda8f4d34c671ab732f244dd71311927cf0a81545d14c299a24fed6f237b00e896a10eed SHA512 3e4c60803d424b2f7a78138db9014ebd7c0c1177b846117fd064e5472bb3634b6da42a5cdfddfc49fd41419693af63d38c69eb803a3cb85ba167bb9285a686a3
+EBUILD html5lib-1.1-r1.ebuild 883 BLAKE2B 1428e5aeb74b546466313b8d20da21d8ed1300d2da2ae6b77964e9f54cfbd93a7840fe52189cf2d4cebf689fbbfc817594339c0d4d10eb18b7cd9dad61c7ff0c SHA512 c090fc04180b9a7a8d51c823be0317132087ee7fc938f5ebe63ca2978173b6bc11beff48f79a81fb1e26da2da0f1e817977448eba1c82247e295783a24a29b5a
 MISC metadata.xml 615 BLAKE2B 534717ae2665116fbbac153e8fc0fbe00bdbfa85e499dd0b6ba904dd4f901e5b68260c560ca324668db56c5037c2a6fcb02736627445d1a9385a1304248ae5d2 SHA512 88059bef419527523f3e7d6a7ad12bc54cf45cbc4b634e73524bdd94afb7d4c3b6ef684cad8649975e4a705d52f382a3f0e9860bb0378fbcadc0024c30071ca1
diff --git a/dev-python/html5lib/html5lib-1.1-r1.ebuild b/dev-python/html5lib/html5lib-1.1-r1.ebuild
index aeddc5a97e76..37130736fdb9 100644
--- a/dev-python/html5lib/html5lib-1.1-r1.ebuild
+++ b/dev-python/html5lib/html5lib-1.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-pytest6.patch
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
deleted file mode 100644
index 06de5ac56d59..000000000000
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest6.patch
-)
-
-RDEPEND=">=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/httmock/Manifest b/dev-python/httmock/Manifest
index d6380f09c4d7..9a3df5257451 100644
--- a/dev-python/httmock/Manifest
+++ b/dev-python/httmock/Manifest
@@ -1,3 +1,3 @@
-DIST httmock-1.4.0.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
-EBUILD httmock-1.4.0.ebuild 482 BLAKE2B 84e1658b9c4003dbb1c61b638165843cec3bfe498198f8402d171f0d89a151245cd5ec24440953c0a9497034b96cd1b05b57a01eb28d7498507e4fd42fc588a0 SHA512 04279ca3b9a30f7ba4a2897acab52604bd88acc58a0310cb5dce4b2a869a44653517efc5463509180f3cfa18772cea181137dc739d7e59d2ec4b662dcdd627ce
+DIST httmock-1.4.0.gh.tar.gz 6439 BLAKE2B 68136f0dd3f1adb7f431893ade8037ce98de3870c5da094ec8a4dfde3eba07667989b71b957673e969548d7d5115455d02af2bcbb1eeb59dc0891e2ffac2c1ff SHA512 49dec760da7dc57a3fb0392c121ddbf9a430fa64c2a6f923ca62da2e697805a61941cde5cf35fc8af30de199227edd72d7f1985745ebd427b1f5d74807e3862c
+EBUILD httmock-1.4.0-r1.ebuild 517 BLAKE2B 78a76170179622752cd51ae9ea974461dace49e511b80febc7cd06898a23df298e2c9006fba3a70153c0064bbf080b2da120ce0ab247334bf021240771ca8af0 SHA512 9b4e777ccb1ae9e99fb1f220380ad87cbc68d0195bd0d12031175da72a49fecc26d3cea84bb8bd6257f032be52e02d3b548cdc9efcc6df43b22948afdf1006b4
 MISC metadata.xml 316 BLAKE2B 54b5450ed0b2b031f3d55b46ae2184375bfbb8e889bda2454851d0396e0ec52ea88cf434f379fb0d7bfaec73a360fab5b9b2d0ab11be4b33f21f862a59514486 SHA512 1fa20a0e53b24ba87583ad07016d7e62510a3bfd4169a79a61aa1ca5eb5f2e3f175b3a00b061ec7da8f1f2b3d42ea9d1f6b82e06691d32c5e3b9783d4fb58a34
diff --git a/dev-python/httmock/httmock-1.4.0-r1.ebuild b/dev-python/httmock/httmock-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..c6f1a1c6602a
--- /dev/null
+++ b/dev-python/httmock/httmock-1.4.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A mocking library for requests"
+HOMEPAGE="https://github.com/patrys/httmock"
+SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/httmock/httmock-1.4.0.ebuild b/dev-python/httmock/httmock-1.4.0.ebuild
deleted file mode 100644
index 526cd9c48a3a..000000000000
--- a/dev-python/httmock/httmock-1.4.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/http-parser/Manifest b/dev-python/http-parser/Manifest
index dadebec3273a..23f51445fe15 100644
--- a/dev-python/http-parser/Manifest
+++ b/dev-python/http-parser/Manifest
@@ -1,3 +1,4 @@
 DIST http-parser-0.9.0.gh.tar.gz 101174 BLAKE2B 92b74dffd2c35672bc383ccda59f93723c0f83ecb0fbf0470f5daacdd37f68d4d63de7d4ea53f86d2109349a793b7535cc864f014311dee6ac5e67d0ca751931 SHA512 75e51bef43d9d7698aad69f8bfe651e24784b97603cac55f33bf4c12c86792c8c71d6206f31847d052e4d8621a5ea65a7b34eca5bebdb8189f58e6d98d33139d
+EBUILD http-parser-0.9.0-r1.ebuild 890 BLAKE2B 33adef9ec732bfa93b663cfc54103951546d4e1c4a829e0cdf31f5a5ca53c4bb64d0852fb4a3235a4ca006b8cb4c32a7047fb5d236db4ba7e96fe317f3bf2c31 SHA512 702a7e0a7e7adf526cd7cedd63209ace6a8e30fce05ae36567db3ec9c9ac987e7167c7bdab804f82302209af62eaa7ec49a979eb823420afac4f6d591f7a5ca1
 EBUILD http-parser-0.9.0.ebuild 882 BLAKE2B 0d22312cda71a086751e2ef98caaf0139296a01c07ae01be1d09f0d65a23e4ae46ff91263976e428bb0e15fd98b6b00e4f2e1499d47c9a4eb54592a97e019877 SHA512 5607df8cbf9ade92104565db3dfa14b8f4f59f7f64b0560d9c02432f33d0c6d0236f6823963801aa7ef8258b50cff816e809b20544145aa629e6ecb983a03466
 MISC metadata.xml 386 BLAKE2B 219fa172d766a86094b7a37a8f5d47f6f503d14fe96ec42a7deb64e2a9865754eafcebe3514595718c54f7ad3224bd4ab227c0ff3eea9190052bf6b75712ed9a SHA512 1d6b4e4529ab169d2773199a10d994f92a638fd962bada0791c95c009ccb706a95089f9ea943e4851daa56a690319bf10cce3c77618fa1461c7c4606db2818f0
diff --git a/dev-python/http-parser/http-parser-0.9.0-r1.ebuild b/dev-python/http-parser/http-parser-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..c974834b7586
--- /dev/null
+++ b/dev-python/http-parser/http-parser-0.9.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP request/response parser for python in C"
+HOMEPAGE="
+	https://github.com/benoitc/http-parser/
+	https://pypi.org/project/http-parser/
+"
+SRC_URI="
+	https://github.com/benoitc/http-parser/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	cython -3 http_parser/parser.pyx || die
+}
+
+python_install_all() {
+	local DOCS=( README.rst )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 97f418012adf..828e9c35a3f3 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -3,5 +3,5 @@ AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b873
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 AUX httpbin-0.7.0-werkzeug-2.1.patch 1158 BLAKE2B 7343f4dbe9886fd54fc8187bc48ed8bd016c03057c4e5de81a46c2389b8d9fdd381f687855dc8ded1d8133a47fb8f09f4ec6c8eae739ca1c157945af97a633c5 SHA512 3d9ed7ab76dc0a33d69cf973e16be7358daa0af0a48d5ac24e0ad6ea8d73a68a796b4c8526ad764c0ed09997448f744f205b909261c32405ff166b359be1fb8b
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0-r5.ebuild 1560 BLAKE2B 2bbc04041ac1b653db32d12726679baf059399e0573e9ab4cb8d176f4242fdbb242c734172b28df6851d07d3053d07911305db2fb27bf98f0846ae678e865528 SHA512 15daee0e3597e4e4de27ff74f21f57b7a5639de8efa0ea70fd8ffd82bf287fa787e5f5f8a5d62b7399916bc28f9535b6ff177d661bf04a845185a796dc90743b
+EBUILD httpbin-0.7.0-r5.ebuild 1560 BLAKE2B 360800181d018c5db4107f4c9bc2a7684e98853c8047a18b780eca6f776bdf70202ca2e09a8db68112cfbbff50bac6b7251c1273934b1c607d46376d972c66c1 SHA512 80616899870cf002af1fdc4e4a733699f99477052e278de42bb137119eb85fc8699973955918976cbaa8234316e7142a38e505a4caad818eb81fb3e26738af40
 MISC metadata.xml 394 BLAKE2B 73c2d6f27f957cfeaddc8c69cc0d7a7bf68514f1d840a982de1eaf9a62be8cf066d7b77b4b5f69fc42806979934e26d497ddf9d66d8f18dcaa32168fd83f7a0e SHA512 70c529e2d1b716a1997773f999902547010bd9406cfde38408a5941a70400e13c949f1a8fb20a53e0f0da4da91742cc259910e97cce8917dc029f3cb84d72bdd
diff --git a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild b/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
index 4d92daa80f1d..2c08be9f1172 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 15629b187f9c..a79de314ab23 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1,3 @@
-DIST httpcore-0.14.7.gh.tar.gz 75844 BLAKE2B 50d5fac7f44996cc5a08b4f994c2109b173e5b9fea080c8740309b799421d012a70280a84fffe93e290bf425e5ee6eb1bfcb74aff81fa7e737c21f25019e6664 SHA512 6865e97f9b84846bb4e9304ea358b0a28d66fd2d1e244e8a2a439ee446a294ecbc68ac07d5a718fd1c3eceaa44a391d7a8f7f2ca659f1674eb17a90f39987d48
-EBUILD httpcore-0.14.7-r1.ebuild 1171 BLAKE2B 28fa9f5622c1d00aab3a7d2e02b3785ac3bbe597863d41ae9df98b57cc0cf492fd3102c922c3f04daa08a35c63d8a6448a474edd5fbd43f4757430492318d27a SHA512 50e90a98623b5b56e4af39b15de514808dcc8932080fef28176deb980ed2adafdb4a5228f371cec01bda4bf8f9101f3aa11425ad912c48367c12c626b0e76cae
+DIST httpcore-0.15.0.gh.tar.gz 76220 BLAKE2B e9a346d4f77cde82be5a3eb468123ae453753e57b54382f0b2c60b16afd3433cba173d9a796df20d76edbd8b5bcf2d61c32302bdd30c8d587036b3ac6f0425fd SHA512 3c25630d582448e3c7d46176c8862e4d92c6c4aac954bfe46b06e26297b32f996db2e002a87c7187accb5bf4ef86e82d7f9051404bee651ce5254119571d0c95
+EBUILD httpcore-0.15.0.ebuild 1251 BLAKE2B c00e6bc3e7650f8c485de280b612590cc141e91f732229d9657560780340bede351a7efde15121f179c206ef560e24e76b706ef1406fc7b2236c42621c8c63d0 SHA512 a4a7468d09059fa610d1617c779defc01a70aaf37f81295917c68904763fb2ec0cfb13d3efcc2dcead3c3366b047b748ade6a167bb23bb98a5939415cbea08d8
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild b/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
deleted file mode 100644
index 936a7044aed7..000000000000
--- a/dev-python/httpcore/httpcore-0.14.7-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="https://www.encode.io/httpcore/"
-SRC_URI="
-	https://github.com/encode/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.14[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/h11/s:,<0.13::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-0.15.0.ebuild b/dev-python/httpcore/httpcore-0.15.0.ebuild
new file mode 100644
index 000000000000..59a6824e51c5
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.15.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
+SRC_URI="
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.14[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/h11/s:,<0.13::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index e05010316928..ac8f202da975 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,4 +1,4 @@
 AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
 DIST httplib2-0.20.4.gh.tar.gz 371778 BLAKE2B 85e2dd0b6213cc5015d4f2f7f923209a61649f948f003eaf3c95c956cb08e6f5bf9dc4e40109c0ddea6a18ab47870a21c7d367ea1eeec2644507568f4e271005 SHA512 46396a9bb439e61939e481a2502567a6dc40686471267ea4c357f141ac138193107f90ac465db683e4ab71e5d92249b810657bff0cb74af7a37a9a23c8320741
-EBUILD httplib2-0.20.4.ebuild 1546 BLAKE2B 8e37a27490458756776938f00235a9e45020606cafa5ed56809ed3986010546b9b9f1390197d484143d2cab8d3f192bb7c5729919e3b76a091858149a108e10d SHA512 5b349a40a60d798fc7f18385fbaff37f9432d39f27556647c6b42a7bb0d845094812c04b1b7169ef807313cd8271f7c9ff6ae5b8350e35c0a2f694ee659c8332
+EBUILD httplib2-0.20.4.ebuild 1852 BLAKE2B 6608f583a6ce3aa68915ba0a663f1f0c08a97284d64894951f487f68d92dfe5cfcce9b3d5922eb02cbcf0bf23b165c377649e1f6d1746a42aa90ed8fcf7e58d8 SHA512 7f8a13de8acc2ba1880c5d343cb8f18fca81536bcb54ac0d4085699943bb56cf1acc115341a3286c19d329da4ddf98c9fe21a709ed8b374bc1d3fbf0dd23fb96
 MISC metadata.xml 406 BLAKE2B fcac2ef4d82fd109083a57097d0e8b99e1fbb3103a2e8ffa29cd77acc0300b0d91d30661a5721f25680b822a1e0f22e4e457fa05bd8948c68b0e3712146a3de6 SHA512 5a94811b95720f0bdb57c725e35313ecc5a15f12a8f75e39c9034440eed957cfb3dd9e86437c0c7b1df51f47602723a7e94ce2b62509dab4eaa4feac02e1558c
diff --git a/dev-python/httplib2/httplib2-0.20.4.ebuild b/dev-python/httplib2/httplib2-0.20.4.ebuild
index e88cb3072ace..afa4a1e94840 100644
--- a/dev-python/httplib2/httplib2-0.20.4.ebuild
+++ b/dev-python/httplib2/httplib2-0.20.4.ebuild
@@ -4,15 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A comprehensive HTTP client library"
-HOMEPAGE="https://pypi.org/project/httplib2/"
+HOMEPAGE="
+	https://pypi.org/project/httplib2/
+	https://github.com/httplib2/httplib2/
+"
 SRC_URI="
 	https://github.com/httplib2/httplib2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,12 +24,15 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~am
 
 RDEPEND="
 	app-misc/ca-certificates
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-libs/openssl
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
@@ -33,6 +40,8 @@ PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
 
 src_prepare() {
 	sed -i -e '/--cov/d' setup.cfg || die
+	# cryptography dep is entirely optional, and has a good fallback
+	sed -i -e 's:from cryptography.*:pass:' tests/__init__.py || die
 	distutils-r1_src_prepare
 }
 
@@ -50,6 +59,9 @@ python_test() {
 		# broken by recerting (TODO)
 		tests/test_https.py::test_min_tls_version
 		tests/test_https.py::test_max_tls_version
+
+		# new cryptography or openssl-3?
+		tests/test_https.py::test_client_cert_password_verified
 	)
 
 	# tests in python* are replaced by tests/
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 46ae0cbfb662..a0214f59c515 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,3 +1,4 @@
+AUX httpretty-1.1.4-pytest.patch 4970 BLAKE2B 396fd081c958616978b0f0fa476a0b6b1f3e530aee5bddc969fcd0b9471e094dfb7c2114940f86dea6e50222f4224321cf7ed449999c61eb7006c9d1cff3e7e6 SHA512 f9064a67d852a026a7398fc1593499d4d3c7e44d00d01d1ecb68d813b1114578858a2b2d11f56f44ce7284b618143098c590fef442c118f532b29503f135ab55
 DIST httpretty-1.1.4.tar.gz 442389 BLAKE2B 020a9fd2b5dc9790b53009caac37a3cf5a0e47102b9be05f4df255880f5daf5e7689714e0c0a8f223155d191c471cb5ff4f9b0d0d34b07bd5f377311ed56ba25 SHA512 4daceea4f30ce181e871167d304bd7af9d504364f55d42f8025770f2efe7e833d018aed681c8733d653d4de90db3433e999c56bccd4675f81e66d1cc4023e418
-EBUILD httpretty-1.1.4.ebuild 1169 BLAKE2B 24e27504292721d4a1e35b3c0f22789b2b201017ec81c5b43b659bcafed8a37f25037297715c702bfdb7dc71fe80315e0fb407229934251850eab2724c7271f8 SHA512 75887d111ec82c4ac978efaf3c0ba1f07c0d6ad7b1ed1bee209ea8016e67f975d2fe543eb2ad0b64e9931b59843d643a83c403859bddf342ee0c2ceb6b9254e9
+EBUILD httpretty-1.1.4-r1.ebuild 2108 BLAKE2B 539bf5ed92f4e182f13891346b51610b645b3595607a6511da6cd3755cf7722206b9c2eadea79c219bd7da2b6922282d4d75d08bd4f0fb6a309168da6060b5b2 SHA512 88633454d2c27e50b43226ab59e092cce50a8cd9bc395739b904d92f228ee446a4ebe610b893ae3325e0ee8c1877cf5398760aef0ee47e76ab6cc57c106a3d3c
 MISC metadata.xml 616 BLAKE2B 65eeaf117de44f4d836a207f29728912c57ea62ca6102334ab183beb5e48e4f9fe683b3356f39a8456e3981e7c9470f312d516f47a2b14b6c08befdbd777a778 SHA512 2ba0ba780ad8dba7c193d0c10eb4b993f93c8ca0e4c99d22a70d3bf86588e9b9df20f560a91edbaa72a95beead383386dfc96ae16299ef03936257d4e03a4b77
diff --git a/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch b/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch
new file mode 100644
index 000000000000..ccb465ce98ea
--- /dev/null
+++ b/dev-python/httpretty/files/httpretty-1.1.4-pytest.patch
@@ -0,0 +1,121 @@
+From 299d50c9cb0ba73343d1a88c202e17f6599fde54 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 May 2022 13:39:13 +0200
+Subject: [PATCH] Fix functional tests compatibility with pytest
+
+Provide a default value for test parameters provided by decorators
+in order to prevent pytest from recognizing them as fixtures.  This
+is the smaller change needed to run the complete test suite via pytest.
+
+Fixes #449
+---
+ tests/functional/test_bypass.py   |  8 ++++----
+ tests/functional/test_debug.py    | 10 +++++-----
+ tests/functional/test_requests.py |  2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/functional/test_bypass.py b/tests/functional/test_bypass.py
+index e85dfac..cf7e75d 100644
+--- a/tests/functional/test_bypass.py
++++ b/tests/functional/test_bypass.py
+@@ -88,7 +88,7 @@ def stop_tcp_server(context):
+ 
+ @httpretty.activate
+ @that_with_context(start_http_server, stop_http_server)
+-def test_httpretty_bypasses_when_disabled(context):
++def test_httpretty_bypasses_when_disabled(context=None):
+     "httpretty should bypass all requests by disabling it"
+ 
+     httpretty.register_uri(
+@@ -122,7 +122,7 @@ def test_httpretty_bypasses_when_disabled(context):
+ 
+ @httpretty.activate(verbose=True)
+ @that_with_context(start_http_server, stop_http_server)
+-def test_httpretty_bypasses_a_unregistered_request(context):
++def test_httpretty_bypasses_a_unregistered_request(context=None):
+     "httpretty should bypass a unregistered request by disabling it"
+ 
+     httpretty.register_uri(
+@@ -145,7 +145,7 @@ def test_httpretty_bypasses_a_unregistered_request(context):
+ 
+ @httpretty.activate(verbose=True)
+ @that_with_context(start_tcp_server, stop_tcp_server)
+-def test_using_httpretty_with_other_tcp_protocols(context):
++def test_using_httpretty_with_other_tcp_protocols(context=None):
+     "httpretty should work even when testing code that also use other TCP-based protocols"
+ 
+     httpretty.register_uri(
+@@ -163,7 +163,7 @@ def test_using_httpretty_with_other_tcp_protocols(context):
+ 
+ @httpretty.activate(allow_net_connect=False)
+ @that_with_context(start_http_server, stop_http_server)
+-def test_disallow_net_connect_1(context, verbose=True):
++def test_disallow_net_connect_1(context=None, verbose=True):
+     """
+     When allow_net_connect = False, a request that otherwise
+     would have worked results in UnmockedError.
+diff --git a/tests/functional/test_debug.py b/tests/functional/test_debug.py
+index 86bf09e..ee742f3 100644
+--- a/tests/functional/test_debug.py
++++ b/tests/functional/test_debug.py
+@@ -39,7 +39,7 @@ def create_socket(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_send(context):
++def test_httpretty_debugs_socket_send(context=None):
+     "HTTPretty should forward_and_trace socket.send"
+ 
+     expect(context.sock.send).when.called_with(b'data').to.throw(
+@@ -50,7 +50,7 @@ def test_httpretty_debugs_socket_send(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_sendto(context):
++def test_httpretty_debugs_socket_sendto(context=None):
+     "HTTPretty should forward_and_trace socket.sendto"
+ 
+     expect(context.sock.sendto).when.called.to.throw(
+@@ -61,7 +61,7 @@ def test_httpretty_debugs_socket_sendto(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recvfrom(context):
++def test_httpretty_debugs_socket_recvfrom(context=None):
+     "HTTPretty should forward_and_trace socket.recvfrom"
+ 
+     expect(context.sock.recvfrom).when.called.to.throw(
+@@ -72,7 +72,7 @@ def test_httpretty_debugs_socket_recvfrom(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recv_into(context):
++def test_httpretty_debugs_socket_recv_into(context=None):
+     "HTTPretty should forward_and_trace socket.recv_into"
+     buf = bytearray()
+     expect(context.sock.recv_into).when.called_with(buf).to.throw(
+@@ -83,7 +83,7 @@ def test_httpretty_debugs_socket_recv_into(context):
+ @skip('not currently supported')
+ @httprettified
+ @scenario(create_socket)
+-def test_httpretty_debugs_socket_recvfrom_into(context):
++def test_httpretty_debugs_socket_recvfrom_into(context=None):
+     "HTTPretty should forward_and_trace socket.recvfrom_into"
+ 
+     expect(context.sock.recvfrom_into).when.called.to.throw(
+diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py
+index 55aa109..04a5e80 100644
+--- a/tests/functional/test_requests.py
++++ b/tests/functional/test_requests.py
+@@ -768,7 +768,7 @@ def test_unicode_querystrings():
+ 
+ 
+ @use_tornado_server
+-def test_recording_calls(port):
++def test_recording_calls(port=None):
+     ("HTTPretty should be able to record calls")
+     # Given a destination path:
+     destination = FIXTURE_FILE("recording-1.json")
+-- 
+2.35.1
+
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..95b5b255ea26
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="
+	https://github.com/gabrielfalcao/httpretty/
+	https://pypi.org/project/httpretty/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+	)
+"
+# These are optional test deps, that are used to test compatibility
+# with various HTTP libs.  We prefer pulling them in whenever possible
+# to increase test coverage but we can live without them.
+# We're skipping redis entirely since it requires a running server.
+BDEPEND+="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+			dev-python/httplib2[${PYTHON_USEDEP}]
+			>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+		' python3_{8..11})
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/${P}-pytest.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# this seems to be a stress test
+		tests/bugfixes/pytest/test_426_mypy_segfault.py
+		# passthrough tests require Internet access
+		tests/functional/test_passthrough.py
+	)
+
+	local ignore_by_dep=(
+		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
+		dev-python/eventlet:tests/bugfixes/nosetests/test_eventlet.py
+		dev-python/httplib2:tests/functional/test_httplib2.py
+		dev-python/httpx:tests/bugfixes/nosetests/test_414_httpx.py
+		dev-python/pyopenssl:tests/bugfixes/nosetests/test_417_openssl.py
+	)
+
+	local x
+	for x in "${ignore_by_dep[@]}"; do
+		if ! has_version "${x%:*}[${PYTHON_USEDEP}]"; then
+			EPYTEST_IGNORE+=( "${x#*:}" )
+		fi
+	done
+
+	epytest
+}
diff --git a/dev-python/httpretty/httpretty-1.1.4.ebuild b/dev-python/httpretty/httpretty-1.1.4.ebuild
deleted file mode 100644
index ebb43b2a8e5d..000000000000
--- a/dev-python/httpretty/httpretty-1.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# eventlet is used only to test compat, and it doesn't support py3.10
-# redis skipped as it requires a redis server running
-BDEPEND="
-	test? (
-		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index ced28b926136..b6650a0114b8 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,3 +1,3 @@
-DIST httpx-0.22.0.gh.tar.gz 2157682 BLAKE2B bb08a7c4b72478d24264c0dca5630205ff386af73294dca66dcd12b646de602ad64e308feedaabd58742cb7a9d799fa23cd2f922e685e74f8181e1b5e9f1c4ee SHA512 a7360f5355f75f07425b42d49697e480319f3fe606d4601bb6d64b870c8a8fce6fad8bd857ef422fc48e6141201307ee94876d5bc54a68557c7dc32ce8f1451b
-EBUILD httpx-0.22.0-r2.ebuild 2378 BLAKE2B f8e1f9476ccb1b38e5c410be27e7c91814bc74645b94663e9afd5e9eb987706a8c446f3e0e369cd0e956b8131e5573c7c9623337b35922fe24cf5ce33be0bdaf SHA512 323fce968823d40ee3a352efa17e3f9ef304c99310b4c0728a8a900db0bb89457793765d138d3708af6c8dd3f99d0c1ff6b53d6346c917eccb40f8bf7b9bf2b8
+DIST httpx-0.23.0.gh.tar.gz 2160686 BLAKE2B 036c66b2c3f743cd069716297f331f0d75043a98180b9db3e156c5692ae8bf9c68d1db87169953a7f44aaf7ee8554d0166f70b508f77b7ff4b0ebc0500bc02ad SHA512 3cfdf2b3b2f15967a1eec0be05ed947c5e18a46576b68a9cbfd5147dfd4736cb7c389f5431732b93f3a11f3ec6c6f25f7cbb3d96d845f00b58e2b8dae047c1d5
+EBUILD httpx-0.23.0.ebuild 2188 BLAKE2B c7ec73ae670465bdeac0d1b81543aca3d7652f54bd92fe80be7a158bec35a817764c3cee406fa8aab50f98869ff59f8321a19c1141f1eff0512b3579fede6e87 SHA512 9d400fe37329144efee52f6ad9f23317e5290ce0a0489a9cbb8573a88decc9aaf5a1f30233a7f0ffb0d122c59d764070c0b19951ace5473a3bba1b3da9ba666a
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
diff --git a/dev-python/httpx/httpx-0.22.0-r2.ebuild b/dev-python/httpx/httpx-0.22.0-r2.ebuild
deleted file mode 100644
index 26e9b635b50c..000000000000
--- a/dev-python/httpx/httpx-0.22.0-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Docs builder mkdocs not keyworded on all these arches yet
-# DOCS_BUILDER="mkdocs"
-# DOCS_DEPEND="dev-python/mkdocs-material"
-# DOCS_AUTODOC=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1 optfeature # docs
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="https://www.python-httpx.org/"
-SRC_URI="
-	https://github.com/encode/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	=dev-python/httpcore-0.14*[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
-	<dev-python/rfc3986-2[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		<dev-python/rich-13[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/rich/s:==10[.][*]:<13:' setup.py || die
-	if ! use cli; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-
-		# Result change in charset-normalizer-2.0.7+
-		'tests/test_decoders.py::test_text_decoder[data3-iso-8859-1]'
-		'tests/models/test_responses.py::test_response_no_charset_with_iso_8859_1_content'
-	)
-	local EPYTEST_IGNORE=()
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.23.0.ebuild b/dev-python/httpx/httpx-0.23.0.ebuild
new file mode 100644
index 000000000000..f63c41c27f79
--- /dev/null
+++ b/dev-python/httpx/httpx-0.23.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Docs builder mkdocs not keyworded on all these arches yet
+# DOCS_BUILDER="mkdocs"
+# DOCS_DEPEND="dev-python/mkdocs-material"
+# DOCS_AUTODOC=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature # docs
+
+DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
+HOMEPAGE="
+	https://www.python-httpx.org/
+	https://github.com/encode/httpx/
+	https://pypi.org/project/httpx/
+"
+SRC_URI="
+	https://github.com/encode/httpx/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cli"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	=dev-python/httpcore-0.15*[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.3[${PYTHON_USEDEP}]
+	cli? (
+		=dev-python/click-8*[${PYTHON_USEDEP}]
+		=dev-python/pygments-2*[${PYTHON_USEDEP}]
+		<dev-python/rich-13[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/h2[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-trio[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/uvicorn[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:==[0-9.*]\+::' -e 's:,<[0-9.]\+::' setup.py || die
+	if ! use cli; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/client/test_proxies.py::test_async_proxy_close
+		tests/client/test_proxies.py::test_sync_proxy_close
+	)
+	local EPYTEST_IGNORE=()
+
+	use cli || EPYTEST_IGNORE+=(
+		tests/test_main.py
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "HTTP/2 support" dev-python/h2
+	optfeature "SOCKS proxy support" dev-python/socksio
+	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 0dcda099046d..188bed848691 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,5 +1,3 @@
-DIST huawei-lte-api-1.5.4.tar.gz 32433 BLAKE2B 36ba5729f7016c07955f87b85745314f683345e06e174efa90e2fdfd59a8a68c8425b549f8e25293dc2d65d0681a588feb062c3067b275d4e0ed2b56dc3ebbb6 SHA512 549373bf6d00aa1fb3f9f6443446520e068ec2c5412c84472b687102b2590cd22a742805f8c7fab67b7a4482e37cb3b03900aaf078ed777c3b1c111194e69da6
 DIST huawei-lte-api-1.6.tar.gz 32617 BLAKE2B 194d2d983e7bd5bd456d3557b16795cda350ea157545c1ce37aa6d4dd0bace8a8a0c724b9d0ae4315e6f95585598b147a03acb77d84837bf879fa9b83737cafc SHA512 62f70853bba0fbd863e07e2d91309fc15c41508857486d01a02ec30ed513567d0880551744eed5a61517cc33a2f56583df892d22cca45124e95e24605ab23678
-EBUILD huawei-lte-api-1.5.4-r1.ebuild 790 BLAKE2B e988b09c36f03198b5236e4407f370c510147b64dde9a7dd9dcfb475f2f0a84dfad470c067c12138b828188a3d22ddc3ba627587eddbdc0f9fd003abf09b6092 SHA512 b5f90e135f7785acc9695379ed06033ad7dc505d4d991aa4d8a7e553676bb69873caf9b1603f43269d3eef30d4268ed3c335bafa4da3b2ed6ba8e6ed3b645158
-EBUILD huawei-lte-api-1.6.ebuild 818 BLAKE2B fc4573bd6757dd0c0cefeced0ab991d589724238e8e856bc2164eb30613ade82ff0f6ac112d73fb6022641e6d2142bca35a5d25ba5679f7108133128d7399101 SHA512 5eaf1cf40bfdaef4f65cf7cdb48707ccff950e111f715f2ddf0ba36ad31da345ddbe4cb39931c4c3cf5773de0e30b72bb81b3ab0a676aee51320f3cb9158fc4d
+EBUILD huawei-lte-api-1.6.ebuild 869 BLAKE2B e3bab6beffb0e617b96619dd7233a0cd12f91933460d4c54463bff6b3e6c10edb5036d0493874a50e92fe879aa8ddae7da9bbcd229b0dabc7b1a4e67e50a16c3 SHA512 866e4bf8ce773ca9684db71e4591063ac7c23e3c41bc79997724e3b56c6addc4266177615125184012312e407abeb2e9b1403d013dac30e5f23e8b8c7f29d046
 MISC metadata.xml 487 BLAKE2B a4aa976286ea3cc4e02227109277faa4506f73a4b7f6c47ef9a318ae5d1c3fe61cc6eeb50ab99c0b10e5edb4ae02101d8e4d6267e7dc8f20520e9259b1d17fd2 SHA512 2ea5ccd73098a9c4d074340c9d6eb433bdaf4530d8fdb899f2a9632c097d2021d9162aa92fb9ffb54eaad2f41050d0323ddc68d0d29ec2f13060e5fe9e26f74d
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.5.4-r1.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.5.4-r1.ebuild
deleted file mode 100644
index e391e88edb3f..000000000000
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
-SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# make cryptodome-friendly
-	sed -i -e 's:pycryptodomex:pycryptodome:' setup.py || die
-	find -name '*.py' -exec \
-		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
index fc365b79c31f..cd6657cd97d2 100644
--- a/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.6.ebuild
@@ -4,13 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="API For huawei LAN/WAN LTE Modems"
-HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
-SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/Salamek/huawei-lte-api/
+	https://pypi.org/project/huawei-lte-api/
+"
+SRC_URI="
+	https://github.com/Salamek/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 498eee3f6bec..873a6519a272 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,9 @@
-DIST humanize-4.0.0.tar.gz 71028 BLAKE2B ef11ae45950a4dc7f55bbd380351aa6f6aaccb7410336f3c9187755d619131741cb2932917e9316c86e33f47e0640311cce278ce23046160aa0ffb4c1bdad1bc SHA512 71c528101b62c883de6474d3c31e97f7f54099c3389f7a88a328ef24b40f7a5667db879badd6154d76ce9bb1390a45404e177c50c7c26064c63b654936ba0514
 DIST humanize-4.1.0.tar.gz 73777 BLAKE2B fcbde90977ae9fcd706e423767b1d5617fd118ae8903283f4b307ee05a5adffb3bb68305e5d758b1860d37a37d22766127d84479d331a7ed05c83cd53e5b0829 SHA512 7e2d92ed44e773bd8a53d4b151e80949fda057d8f4a52003826efa9ec2a569360b76663d44c3d1239fd2ecdd5365357d3fac72a395d1c10d5207b4a27f248878
-EBUILD humanize-4.0.0.ebuild 536 BLAKE2B 6b1072a2b06eeac026252d12f7eb9ccef2711358a2679b433debda0cfde9b127b29d6876640ef6bb8b2908d3ff90a1d925333f1328a415ef5c4737deb35291f8 SHA512 ede64cfd87bacf15972b823230801d4d37c1537ac8f24978e61c20fe2e5a64439700c819b222793277152f58bc4d1829c7d73bd1ea373ac75d1ae79b54a63c6b
-EBUILD humanize-4.1.0.ebuild 588 BLAKE2B 2247dec8a4a64747deb2016e7e65b4446f65519a3c0cec08c49c88433f951b3d54d66a6ab6bb00d957ab48e55968bb5e29eb8702cf759a4d7bd0d0439d3137e1 SHA512 b286867e639e2704c6e7bd5bf191ef5a7f8a2e6a5d05b8eae50b2efc56b0e9300c23230cebf3394e79f27f5ae8e9cfacae56e35a1030084ec74c3326504a9a14
+DIST humanize-4.2.0.tar.gz 75169 BLAKE2B dc590d296362be20f607282686e18df73e1bb07aa37459431d7ec1f74ff6611497811da974b7eb62cd791536268018460d9171eb65ed958af6f12f668b3ae2a8 SHA512 ac0a067320d4dc236d97a69a3019cf01ce87efe2cb98e758f516f90986352fe87d03bfa497d66a2a75e61152a35fd8fac827bafd926d6bd84c8f0d2366e5beb7
+DIST humanize-4.2.1.tar.gz 75327 BLAKE2B 1c36002a2a5d103bc1dae444d9d8a70c3983c778674d5c6aa3a76aa82dc9bd3bf39faefd1c3dcf8d0726b151dfb4f8d8247bb88fdc9af765f703edfb08226b8a SHA512 c84f797b01bb8bcc2e036496f0b727f9c21fe88148a6d90f73ddacd25f73059a46bbc60ef8c3bb81554db0c75f1ab9aa1e551d8473aecb40761e51b59580092a
+DIST humanize-4.2.2.tar.gz 75336 BLAKE2B a95e9fe8536c9a2ecf5c4c40797810ac5825e99504386a8d55f8da0f7c16d4ac7f7aa36d8460e8357d05f34fd5fb6c30b15870b3ff792df7ba2d58080053ab3f SHA512 fa6606975629ef56a72528a543a3114acf17d65d684e868268fb9298f564aac8a1049b9318a4717c8b21f689570f1083fc32bc9eb17bc018c9c2e8e0ee06ec4f
+EBUILD humanize-4.1.0.ebuild 586 BLAKE2B f89d881fd19e60a8eb9c2ffd5d53e8b0e6ac16672c16f441b2bf8e776b81b7a20218af77eb61fb4a1d9ae744906e361fd953da37b7e94542fd5e2e0c3bd329e7 SHA512 3f7f0f0239a899ab1445277b7944da5763d5585e287ccad072a0aa6b86d8bc2c5e0557c255f7d8e29d630ce681b2c95985dfdbbb72127a886df1a6cd79a85e1c
+EBUILD humanize-4.2.0.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.2.1.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
+EBUILD humanize-4.2.2.ebuild 588 BLAKE2B 7ccbcefd9b985a2eb85773993629bec0fdab43f09a9f092c67a520b123639a8272f01296153b0ef38a9ae498032807af089e4536b2482adbc033a5a4468f6a97 SHA512 53444dd98c6898caf5158cc5e5a55355ba7269cf7e1d130a5788ae246c7f0e1af06e53d2c99b094985583e2f472d28027d724a47bfb0c57f18ee1e2daa0fb5f7
 MISC metadata.xml 506 BLAKE2B c00c304481f8bd5d2309a1fa72a19bd8405d2f8d55e68a9e688435dec5410db728537362d6fc090f448738fa462ad62d03cfdb82fda8702b91aced4ecd6c05d5 SHA512 71905cfb331f60723b2b3dc02b1a5cbc2712ea9a411692d8ce12e62ea90a4ebef41bb4806b90f9bc0706d8dfb6a3ebb69d23ef16f0177eaddcfbdf07612d8614
diff --git a/dev-python/humanize/humanize-4.0.0.ebuild b/dev-python/humanize/humanize-4.0.0.ebuild
deleted file mode 100644
index db3511b6c995..000000000000
--- a/dev-python/humanize/humanize-4.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/humanize/humanize-4.1.0.ebuild b/dev-python/humanize/humanize-4.1.0.ebuild
index 96de8ef7008b..5887ac380442 100644
--- a/dev-python/humanize/humanize-4.1.0.ebuild
+++ b/dev-python/humanize/humanize-4.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/humanize-4.2.0.ebuild b/dev-python/humanize/humanize-4.2.0.ebuild
new file mode 100644
index 000000000000..b471878fc311
--- /dev/null
+++ b/dev-python/humanize/humanize-4.2.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/humanize/humanize-4.2.1.ebuild b/dev-python/humanize/humanize-4.2.1.ebuild
new file mode 100644
index 000000000000..b471878fc311
--- /dev/null
+++ b/dev-python/humanize/humanize-4.2.1.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/humanize/humanize-4.2.2.ebuild b/dev-python/humanize/humanize-4.2.2.ebuild
new file mode 100644
index 000000000000..b471878fc311
--- /dev/null
+++ b/dev-python/humanize/humanize-4.2.2.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 07f561951f43..ead03a9e260a 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,6 @@
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
 DIST hyperframe-6.0.1.tar.gz 25008 BLAKE2B c5cea5b54fd9ecfc0d619c07c484cdd1e2813c656120faadf3f1b61739c608b43d19bd7527b221ad25ea824da05b5747d38f3a6e27d058c1030cce2c4069f10e SHA512 2a5101b2e91e047fe39b32f81a1a8b2240c371fed28a5e1581e743371418388a7dfb55bc819c46a45804e7f00a5231ca54c92aa1b5b41ffeb714b8cb3ac485ca
+EBUILD hyperframe-5.2.0-r1.ebuild 618 BLAKE2B 06f29c142f37dd3b9c17fda0e3474d144a949e5249b43a927c1748f60cac7eb05e17acb048928abdd3aad88e25be93ac40b0f6edd68d95c379eedf4f9b4f7834 SHA512 d85c576d942240d319f0db5c8509d003561f17f3458c81ec9544798fd1b7f0dd84c7afa76bcec53ecfc749efb5836539b0de5185b17edbedc074b0dd89c1d341
 EBUILD hyperframe-5.2.0.ebuild 553 BLAKE2B 8d6b2f2c4e07e14ac006e71b640599c54081801545fffbb385144bd14f96f8b151565d4ad7f57f9e790bf02535af23e3eb32871e0b82f50dc48d1e7eefe835fe SHA512 1814514c3cd15465970b3d79cdef03ffe7e5efa9817e78b1a17a42a0fdb6ae99748abf83489481328b8212261c84cf35460521eed1e803cb8f70e1de643e2fc8
-EBUILD hyperframe-6.0.1-r1.ebuild 607 BLAKE2B 403b87e50db3da2c3ba7d54df20f754a28caab3774cc1c02d1d7709f7081305e1368805fc702885ea581d872e31ea19d78722e6c8a3e9921febf3c3527c44234 SHA512 10c22aef494efaa8b3e27ca5356f359e1d8276f61ae2a14e2fede9c60d55861e43bcbd3cd5ae68e915d0b872fc2115acb5f47a1996b0f6af7434ac69b42d465f
+EBUILD hyperframe-6.0.1-r1.ebuild 610 BLAKE2B da126ae29c64c1cda35d5e7c80ccd932a1ac96408ff01769280487c9a94a131a06e810a9e2cf7a9aaf1b8842f63c298f994ae8654160f2d2e17d7be6aadf8077 SHA512 6de46ffbead89b28ee0149908eb0069c2ae82c63ab2d1b2507bad87b608641e4e7099b45c57cc7743d5ad922becf68081f4f5b32e266f3ff097925e68092c746
 MISC metadata.xml 712 BLAKE2B 832ee643d5486b78953ffa7cc70d4164a2f90cc5872008034a01c2e02f620d8137165661ef7c860efe49a2e25fa2254fec8ccec300a6162926f01cec244f8870 SHA512 89a9f58ef7da35d35b23b0d7e90ca2f36be4dc9c752c46e0caaf485b5ab1d2f45195e143edf9b5bba7b19e3f6fee8f2eb723c1d4f8eccde9cec633b72cdf3854
diff --git a/dev-python/hyperframe/hyperframe-5.2.0-r1.ebuild b/dev-python/hyperframe/hyperframe-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..4b9336c3c45b
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-5.2.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="
+	https://python-hyper.org/projects/hyperframe/en/latest/
+	https://pypi.org/project/hyperframe/
+	https://github.com/python-hyper/hyperframe/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild b/dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild
index cddde028b09b..a3c894fc5d7e 100644
--- a/dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.1-r1.ebuild
@@ -4,14 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/projects/hyperframe/en/latest/
+HOMEPAGE="
+	https://python-hyper.org/projects/hyperframe/en/latest/
 	https://pypi.org/project/hyperframe/
-	https://github.com/python-hyper/hyperframe/"
+	https://github.com/python-hyper/hyperframe/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index e67db272a825..11d76277766e 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,3 @@
 DIST hyperlink-21.0.0.tar.gz 140743 BLAKE2B d432692172dc5cbb4f7cc1dbbfaf87871f0d9b2519334d112841abf8d958232516249472611e986b20e6fd298f5013db38f214fa332e1b121bd80a420b4cc614 SHA512 9e0e9273dde1b0a41329a74fbb26c4f327b87f387ee64b9a2ab641ca5cc8b9ea0516884415e9adf1d4880ae9c053a5cba2c550fc508bb56fddb44a543d5da860
-EBUILD hyperlink-21.0.0-r1.ebuild 717 BLAKE2B 26188f5515d7ad8245cc57278c494dbf13c26287608532f45ce0b925d9fcb1c95d10af6d1383f0eb64e82626edb7b02849f5b4a2196f03cf34943196d11389d8 SHA512 fed3055b94ad579af53544a639590081db507992b6b4ae9d9fab0a8e8cde57ff761def61e25426d3f93f61bd8230f6422407f77baa1e1b5cb009ce6d9564bdb5
+EBUILD hyperlink-21.0.0-r1.ebuild 725 BLAKE2B 85e48d08e49e174b7032c55d7a41f73ecf721432d7a720599dcabd4989bb1a70bb3e8409cdac0ce758381adcf083da5085b3735da0b52fa0aab2a9c21d793c86 SHA512 0f219d8d4bd32587932041d60adc7be5e91c018a1fc1fe5d3d18f47a29288858f7aa0106719a3ce8619e935e62921b4f071ae420c07dd997418b935a96371494
 MISC metadata.xml 759 BLAKE2B db5e285020d61838ec66ed968fd1dd418ff9b10d01f7f7ed67503f9956c333d164c5c95786c5c6e845e2757c2047e44b522fb38ad2d6bad6fc4a18b04d9ec206 SHA512 c531e401294e3ddc5834fd8f7842edeff80ea3ce2126716b90bfeecfdbb2a4c573befef01a7aaf8bf27e9707b69ad665347eae7002a98745b72836a213be0b94
diff --git a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
index 4b4be9668000..bdab0cca4a9c 100644
--- a/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
+++ b/dev-python/hyperlink/hyperlink-21.0.0-r1.ebuild
@@ -4,19 +4,24 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
+HOMEPAGE="
+	https://github.com/python-hyper/hyperlink/
+	https://pypi.org/project/hyperlink/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 5d77b34870cc..f5f085d88ce2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,21 +1,19 @@
-DIST hypothesis-python-6.42.3.tar.gz 9187948 BLAKE2B 3303cea4e8f2776f14defd88dcc2578f11e30bd5842a2cddf96478e31505d38f801a92e031e76070684befb2a9d63713f44b73eea7152e0bdc6cc0d16e25c08c SHA512 869e81b46da7786cc4ca981da56c916922a73fd129dc1f156d062343e40a9b74888bdda17ef2c95e6c3102dc762f7cf587d1aad4ba3b8138060990d2987a0bd1
-DIST hypothesis-python-6.43.3.tar.gz 9189636 BLAKE2B d47e4b5f3016e32c8ba547eca7f3b6513609d6a84cf1f1b8db5e14282e75cf4ee1778fba1dcf801fac135a1ebfef2ce5f9306bd9be4c33f02b5f05d1690abba2 SHA512 1988efc630b63a2373f25813bd066a1da8576416a167d487f1b262825c49864ab622e84a6189d5016f8ca28b37819d5f035bc11779f906a447baf2f957fedfcc
-DIST hypothesis-python-6.44.0.tar.gz 9189825 BLAKE2B f6688f55a920b0dc65beab54d715c98869bf70d29ed4044f4ad15c88cb9b60cc5dee834f9d218e15d6cc9e02a8b25114660af2578ab07c9a353124cb95611e22 SHA512 8642d078f2e7e232baa100075dac530e4e7c358f8ea7bdb5fd1f3d29ceb291a1a00abfdd25596669010c230893c7d6fc29cc54be42340aabc2481a612e616684
-DIST hypothesis-python-6.45.0.tar.gz 9191348 BLAKE2B e607b21f0e24daec57b19be5e8c1b77c9d78abb724cd5b89dc7dff1351a066387f990d0d92bded39ccb4da4368c3b827a6f3117a24c251d8955be98d8338ba3a SHA512 01e4aea5ce71c476fbee52182ff07529126744eb8bb603175370d33d2e1ce49a367ef2c0ec7abf879ed2bfa25a31e1b2136e2b79bc68d4a4c200cc3159583c6c
-DIST hypothesis-python-6.45.1.tar.gz 9190980 BLAKE2B 61365d27603383cb76d62a0f0f4ca01ac09c779d90b8f028709fedb20dccabb8bb3d452d7bf87926a8bc30c334387378e1cc8e2b42c9bfa8834577e01b34d635 SHA512 a68eaf4b5012735027aba70eae8c244747a676e345b5ab6c6f7e08cab58ce3330410eba5eaa1ded89d1e15386bf644d3df9012b382d675e967781cd7b762fb21
-DIST hypothesis-python-6.45.3.tar.gz 9191554 BLAKE2B 0fc07224be3c0f9f852d86c70540f616ea5f2b081e8e784ade4af105597146fd16c8c5245ca8e4fcf681847e4214b13da36dd88f81be4a24411e516b313f428a SHA512 f103e45de796d9c6374dd51e16d05e3aab472ad86d9f78dba810ab4a034893aac3aebf944af279d850f3138a6205c56c91c6e861673fb777228a9fb5d3a5a59c
-DIST hypothesis-python-6.46.0.tar.gz 9192054 BLAKE2B acfb6136b43f29b62ebd843a8c1437955f2f6681af16293f0f0a0fb651c0a69fb06c15b67fac8f9f73ad2459e0a5a0e4292e5dae1eb0a49e14760849a3af944f SHA512 5fcfd72d17a69e0dcd23a0d5633c15507017750dce61ae2be457151e4099ea7aea66b7d8b0aad98615453763935bb353197b094191dea78ece3ff297c89cf71f
-DIST hypothesis-python-6.46.1.tar.gz 9192240 BLAKE2B cb38e1f7fdc4a9586c3920f2d9270a9ad08a77eab52ba493e4ae4fb8ab17780b49f0e4f52004bc330021836a1470feffb96554757495259d34cf52f4ae2b264f SHA512 b273e6c77251544314babdc891e8c2f3f9098b97ba25cfa7eee960773e4508840c27af2b993daa00546cb269eb58d74b6bbfefef2d8869e2d202622983af520a
-DIST hypothesis-python-6.46.2.tar.gz 9305176 BLAKE2B 7d0abe4fc055eeb4660efbba9900b43209cc5ef1fd7b2362545e0d4145837cb7779cdf96c96cdd3770c1605ec8104818ece5cd012a90b164ab8ab63709d1c911 SHA512 207b4202aa36a28891c8051009ee6b8b6a8f0823840db7e4fc6840ebe6455060340f16f7e2e25bc5ad2adca1ff7fd8b58668ec2ca355b4579ec03aac616e786d
-DIST hypothesis-python-6.46.3.tar.gz 9306685 BLAKE2B a26c08361a7a58d8de8d8458a73c5c3c57f04dd2008ab31e604f0addc18fb7a52a7f4a98318498b398cd1ac5d2d718fd722c4d17e0b6ef326e0457355fda7482 SHA512 d55c3c4a57d18aa7f6d876123b09bcab32d508f5aa40048f2db7f0cab3948ebb6fab5f12d291ae4740cdd1c61c2d612c1ce804028bb59914efc132404224d1ee
-EBUILD hypothesis-6.42.3.ebuild 1907 BLAKE2B 0ab829f4343a464e347b18f7ce19ea4261de32348190c9f5a5a4cd6a356771194f04b22acf53505a6a792237cda9dc7be852740b6fc1396ee24d5368d0847a20 SHA512 d9b41c232de58b4d00a47a41be0b5980f95a4f77f5d0211b5d6cc701aee820f5daa5c26655976aa35829cba61b77175ab80efc99c08d99c048a55ef7153825e9
-EBUILD hypothesis-6.43.3.ebuild 1915 BLAKE2B 8cc25174afaba87a3d7515cd5ee71fd447f3d109033e9ebcc0d1605a4642ddd51900b726887b8351a5894c63c96d7fa525a7788ced868d97aa0d331b446e0c92 SHA512 baa5ed8f44f392bd6abe858280d077f483c69907356b04698f8da3f82c0188ba288b50b884b0bd295b17add9feb99061ec7d6fff3b73204fb43dcd809998bc9d
-EBUILD hypothesis-6.44.0.ebuild 1915 BLAKE2B 8cc25174afaba87a3d7515cd5ee71fd447f3d109033e9ebcc0d1605a4642ddd51900b726887b8351a5894c63c96d7fa525a7788ced868d97aa0d331b446e0c92 SHA512 baa5ed8f44f392bd6abe858280d077f483c69907356b04698f8da3f82c0188ba288b50b884b0bd295b17add9feb99061ec7d6fff3b73204fb43dcd809998bc9d
-EBUILD hypothesis-6.45.0.ebuild 1915 BLAKE2B 8cc25174afaba87a3d7515cd5ee71fd447f3d109033e9ebcc0d1605a4642ddd51900b726887b8351a5894c63c96d7fa525a7788ced868d97aa0d331b446e0c92 SHA512 baa5ed8f44f392bd6abe858280d077f483c69907356b04698f8da3f82c0188ba288b50b884b0bd295b17add9feb99061ec7d6fff3b73204fb43dcd809998bc9d
-EBUILD hypothesis-6.45.1.ebuild 1922 BLAKE2B de080b3fcdf252cbb92c6a362ed076d74b86dcf93f0d17a6cf09a3a21717dc11e9dd2f540a6b180472afbf0c66c1d6686350a1ea32c7b3c03cf47e4d64eacc28 SHA512 c74250ef33922b20f6a89b7dcd7a6d17dce8672accd640031010be04f83cba46c4872ece9321a5b61e943a4d08f659f44577c73b4381db16ad6f769bf70e86cb
-EBUILD hypothesis-6.45.3.ebuild 1922 BLAKE2B de080b3fcdf252cbb92c6a362ed076d74b86dcf93f0d17a6cf09a3a21717dc11e9dd2f540a6b180472afbf0c66c1d6686350a1ea32c7b3c03cf47e4d64eacc28 SHA512 c74250ef33922b20f6a89b7dcd7a6d17dce8672accd640031010be04f83cba46c4872ece9321a5b61e943a4d08f659f44577c73b4381db16ad6f769bf70e86cb
-EBUILD hypothesis-6.46.0.ebuild 1922 BLAKE2B de080b3fcdf252cbb92c6a362ed076d74b86dcf93f0d17a6cf09a3a21717dc11e9dd2f540a6b180472afbf0c66c1d6686350a1ea32c7b3c03cf47e4d64eacc28 SHA512 c74250ef33922b20f6a89b7dcd7a6d17dce8672accd640031010be04f83cba46c4872ece9321a5b61e943a4d08f659f44577c73b4381db16ad6f769bf70e86cb
-EBUILD hypothesis-6.46.1.ebuild 1922 BLAKE2B de080b3fcdf252cbb92c6a362ed076d74b86dcf93f0d17a6cf09a3a21717dc11e9dd2f540a6b180472afbf0c66c1d6686350a1ea32c7b3c03cf47e4d64eacc28 SHA512 c74250ef33922b20f6a89b7dcd7a6d17dce8672accd640031010be04f83cba46c4872ece9321a5b61e943a4d08f659f44577c73b4381db16ad6f769bf70e86cb
-EBUILD hypothesis-6.46.2.ebuild 2020 BLAKE2B c3034476514f8f10bc1f01e634dde18f19c5a5e3dd07631bffef65df10519af84d4f4b8f99bf209feb1a288f70e32a60040231ee501608c96cdf1f33330029af SHA512 9de1eb4415ed02e937abb2398c0c0a2ade17174b6b7386ce1f053d711cdb4734a6f393fedbc6cd34301bb1bc5277c2d33951661e40cc2fd410043ce8d6c560ea
-EBUILD hypothesis-6.46.3.ebuild 1895 BLAKE2B 964b995019c3c3d18b5e5bbd56a03a9f6cad89f3db34a13445aa91554259a60c1b588458cf2a0eaa2bda6c82acc1d9ffb2e86c90a7d68bf3120a8b18e97895b8 SHA512 6a0f54713bb8611687022f491d8eac61af33a9857b833a439a9bc98b85fb6c625c53c10f0a6543d23869ed007ca65bba79fc711fe2de22ac47effe93f50d01a2
+DIST hypothesis-6.48.0.gh.tar.gz 9315489 BLAKE2B e9ddd05c867a83dd8677762178e9e1b9db794a4508d638e90b231d34562e73fc52dd12560b3d43735d06917935337e3a54059d58afe2b8611d4dbf08248b1ff0 SHA512 d6d6155c8a8a4b92772b5e2a398024372201c1228dc23aa8e87d211e3c9f85abbf39bcd3f47c9d165c396e3f4246821f7d51cfe9849cba21c1456f9e02ebe3ca
+DIST hypothesis-6.48.1.gh.tar.gz 9316595 BLAKE2B c20d575e9cfaf8d2b26df2861adb1dc1dfbb5a07f9c6cc5281984fc3f83c74b32f0a5ee9cf4fd0ec356f876f0dd1f4723cfb2ee29a7a99062139e45ea2bd5910 SHA512 bb3e5c961466841265aed355f7e0bab2175c8e7c634e2160736aef37a1d917057922023c4fb9cc4e224e453db276091bcf3599693109ecc8a008ce8d6d7344de
+DIST hypothesis-hypothesis-python-6.46.11.gh.tar.gz 9312248 BLAKE2B 78b5ca5bd38bd62d2fe50ab929df075e253c059aed329d6b52051fb01449f8de84ae340ba42a4af94ef592411139a45d34aad232fe4bb2d8412165730bbeca01 SHA512 6fdd54f28d275eb65a4f6e6919437d503eba6254c25e22298c34ac67e6de03cd99a5178b1a475b1da7f7afeed8406e89c20b4818436143f442222d26f0d94796
+DIST hypothesis-hypothesis-python-6.47.1.gh.tar.gz 9314265 BLAKE2B c2ad0120ab2cbd565f73d472f0a5a87e4b51ff9cf7c08d75dbc54223ad9fe60ed475577ca7dced64ab02d4cc1ee5d30525677c4acfe720af8251f804e72a3b00 SHA512 1aea9f949242d3a273584cd92e1829654d6ce385efcd631b412374f1f9252d3b759b8e216aaa9a49e26e0c3b12673348eac79d0189881f6a811f11daf14b0873
+DIST hypothesis-hypothesis-python-6.47.2.gh.tar.gz 9314053 BLAKE2B df607e7d81a280d916cc3946c71f6b2a6c7004263069e83d2647222730d11276b6c246fedbb07c5a4f3c526df38d6ea5c7999bdb416f0c86b0877d0231418c73 SHA512 b58835fac221353ea9beff227dda81f7776e2b50f6a765e536c83bea129d5c5a862551423d9df5abbc0cf294b358c6c537c62add69b3d5a1f38b22e179d2f83c
+DIST hypothesis-hypothesis-python-6.47.3.gh.tar.gz 9314739 BLAKE2B 282b012e020fc6494b628ba629c576f604db831c219878ab92539fbd1d980f3363e490ef35f888b68902661dd82e682393641d13a882c1177d8570ec232b217a SHA512 c7231ff06ae5846f718e76c48ed4bb8a1fc0f9aff80c7ddd1ff0ead219eb93dcc7f9d5c5e591390661e81a33bcac79773ea620cfe3f246210114635f0c089144
+DIST hypothesis-hypothesis-python-6.47.4.gh.tar.gz 9314838 BLAKE2B 183048d7d784f8e64bcac1f5bb53b6b9f945b38d555aebd84d0966bcf64178e952f767dcf63122d9b3e8d41d79034b4b11074335e5dbb7575b5f78e152d05c25 SHA512 17a7388ac03ea9029bc5a90f24aa85c3f825bd04ceee963ff7f144ff675b0465afdd22edc5608931f1fd60e83c59d10be24dd74ed64015f942c3f09956b652d7
+DIST hypothesis-hypothesis-python-6.47.5.gh.tar.gz 9315253 BLAKE2B f1b9829c2b0ba7f82dd49289feaf22100901674e0f394520c3c8d43d2eaab77669cc9d8f355455c1ea23210a17786c8ee6e982d7ca49067c51571491e3c7f43b SHA512 f08d1ac0237292fb3232e0ba11e81520a16f03d2c266f4d05495ffc3d1e801de7fbceee1973c73311f2b18e0cdc88988a2635968e1dd5c493f6887e5d63812fe
+DIST hypothesis-python-6.46.9.tar.gz 9311955 BLAKE2B f8cf7e216650401ea8a9b427311d10bc65a21b79eb231864c4ff429baea4600f8d84b05e4b94120551ebe17f1b4b99a65e76157efe9d0a133ad68c22b1c46452 SHA512 e4fed5210ba11977958d4d14f9fb32427b812ea7903f391bbf977ade7ae268770e846b0cd2193585f519a02681e4fabfead23eea5bcededaccc0e7a9857e98cf
+EBUILD hypothesis-6.46.11.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
+EBUILD hypothesis-6.46.9.ebuild 1942 BLAKE2B ce72baf06bedc78ce59e88b096996d01ea2eb5a3260d4b83797d0f26e1b667953b3fc4851d640137936d3b57d925d0e5e134d6ab2f4ca04cf116e232b0e515bf SHA512 0d922094e0ab799714de0378b55efb39e7e3af54f94ace4b3ef391730bff5d9823ff5477adec0ec6d4eb85969fcbfdf7e8dd86e5b9afec2f1781b22ecf728c71
+EBUILD hypothesis-6.47.1.ebuild 2013 BLAKE2B 942c16f7b0978033b8fcf199b3a57091deb236729cce7c7ed5178e0857ec96089788af2ac5f4ad500b1eac5b269c3d4e9f4aec65ed569b473dacd18b2d02b4b5 SHA512 cf708baf47e35232f06f322e81e1292a4b48640a81a27521d1adec845b76515670397f1059d3a922634569831e254b3a54cc975905aae6653dfe4e12b8bb244c
+EBUILD hypothesis-6.47.2.ebuild 2057 BLAKE2B 7def57b017aa81010a65b6fc7fc59db242d8277d72e1d0154caf10c1919a91463b8f899133c03d7ad0af21d45b274951d71ad378829eae3ab09a1298caa018ec SHA512 124270b45b0890964bcc4976b9d1e6ea2244e64bd8b7bd836cf9ab89fa85b2349fcbd0645b1de7cd5124d95bfc9a3b52bb01ec04da4d0d7099194a30277b0dcf
+EBUILD hypothesis-6.47.3.ebuild 2064 BLAKE2B 4e8a250a6353438d405124afe04499bee07c0a3e3169452c62b857369c2cfa0742fee6138f76d171aa6190c1c2d4c069cdb338e7654366f67a9a010efcce0058 SHA512 b6864899029f0b84778085a8d891a5ecacdf6570bfc6fa3960ea00043a4dc6568c8d6529f5920617c620b99feb1826865d1583393df33c1cb54f92ea6aad5b98
+EBUILD hypothesis-6.47.4.ebuild 2070 BLAKE2B 16d0140abad3a4a6c2d7f37c4110a4e596830e240de0199b08187d6fe96803dd26a9f65df3592b2c29e2a23186ad844e4cec6fe033bb3b07f7b84daad8173ba3 SHA512 f4842d5d84cb15749f6a951399629633a60932367389ecb6e14c94cc70524d83ea556c2690091efe55819568d609b5a6d292bd2c119ee284c6d0801ec6a314d4
+EBUILD hypothesis-6.47.5.ebuild 2070 BLAKE2B 16d0140abad3a4a6c2d7f37c4110a4e596830e240de0199b08187d6fe96803dd26a9f65df3592b2c29e2a23186ad844e4cec6fe033bb3b07f7b84daad8173ba3 SHA512 f4842d5d84cb15749f6a951399629633a60932367389ecb6e14c94cc70524d83ea556c2690091efe55819568d609b5a6d292bd2c119ee284c6d0801ec6a314d4
+EBUILD hypothesis-6.48.0.ebuild 2073 BLAKE2B 87031f36d65185c7bff6557d116ac6e5e008a42849e8dc68d645ba02142b903863035641562e54cb1f6429ddfe9b75513bcfa58e97c828642606a8a4bd651b12 SHA512 1814b2d0dec7807b2f6e0d5e67a55449eba87f4653855b9616c7bad989afbd1a3884f2affefa76830a167d16bc1f09602d30022df01f330b2d9c7f35f83a1f96
+EBUILD hypothesis-6.48.1.ebuild 2073 BLAKE2B 87031f36d65185c7bff6557d116ac6e5e008a42849e8dc68d645ba02142b903863035641562e54cb1f6429ddfe9b75513bcfa58e97c828642606a8a4bd651b12 SHA512 1814b2d0dec7807b2f6e0d5e67a55449eba87f4653855b9616c7bad989afbd1a3884f2affefa76830a167d16bc1f09602d30022df01f330b2d9c7f35f83a1f96
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.42.3.ebuild b/dev-python/hypothesis/hypothesis-6.42.3.ebuild
deleted file mode 100644
index 08284b2ec9e8..000000000000
--- a/dev-python/hypothesis/hypothesis-6.42.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.43.3.ebuild b/dev-python/hypothesis/hypothesis-6.43.3.ebuild
deleted file mode 100644
index 7eae997f3fdb..000000000000
--- a/dev-python/hypothesis/hypothesis-6.43.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.44.0.ebuild b/dev-python/hypothesis/hypothesis-6.44.0.ebuild
deleted file mode 100644
index 7eae997f3fdb..000000000000
--- a/dev-python/hypothesis/hypothesis-6.44.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.45.0.ebuild b/dev-python/hypothesis/hypothesis-6.45.0.ebuild
deleted file mode 100644
index 7eae997f3fdb..000000000000
--- a/dev-python/hypothesis/hypothesis-6.45.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.45.1.ebuild b/dev-python/hypothesis/hypothesis-6.45.1.ebuild
deleted file mode 100644
index 5b35c96c0a4d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.45.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.45.3.ebuild b/dev-python/hypothesis/hypothesis-6.45.3.ebuild
deleted file mode 100644
index 5b35c96c0a4d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.45.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.46.0.ebuild b/dev-python/hypothesis/hypothesis-6.46.0.ebuild
deleted file mode 100644
index 5b35c96c0a4d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.46.1.ebuild b/dev-python/hypothesis/hypothesis-6.46.1.ebuild
deleted file mode 100644
index 5b35c96c0a4d..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.46.11.ebuild b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
new file mode 100644
index 000000000000..3c1dd06d14a6
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.46.11.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.46.2.ebuild b/dev-python/hypothesis/hypothesis-6.46.2.ebuild
deleted file mode 100644
index 3ff800c6b0e1..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unblock py3.11 betas
-	sed -i -e '/release.*alpha/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-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
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.46.3.ebuild b/dev-python/hypothesis/hypothesis-6.46.3.ebuild
deleted file mode 100644
index 4d5a968020c8..000000000000
--- a/dev-python/hypothesis/hypothesis-6.46.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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
-
-	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" python3.{8..10}; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.46.9.ebuild b/dev-python/hypothesis/hypothesis-6.46.9.ebuild
new file mode 100644
index 000000000000..9435f6b2eaa4
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.46.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.47.1.ebuild b/dev-python/hypothesis/hypothesis-6.47.1.ebuild
new file mode 100644
index 000000000000..3c1dd06d14a6
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.47.2.ebuild b/dev-python/hypothesis/hypothesis-6.47.2.ebuild
new file mode 100644
index 000000000000..fc4586d5a3f4
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.47.3.ebuild b/dev-python/hypothesis/hypothesis-6.47.3.ebuild
new file mode 100644
index 000000000000..357dfa3b5ba6
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.47.4.ebuild b/dev-python/hypothesis/hypothesis-6.47.4.ebuild
new file mode 100644
index 000000000000..96342100a7e2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.47.5.ebuild b/dev-python/hypothesis/hypothesis-6.47.5.ebuild
new file mode 100644
index 000000000000..96342100a7e2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.47.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.48.0.ebuild b/dev-python/hypothesis/hypothesis-6.48.0.ebuild
new file mode 100644
index 000000000000..b6adc3d4e991
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.48.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-6.48.1.ebuild b/dev-python/hypothesis/hypothesis-6.48.1.ebuild
new file mode 100644
index 000000000000..b6adc3d4e991
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.48.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 9cb612fa521f..ecb5397535f0 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,3 @@
-DIST identify-2.4.12.gh.tar.gz 101366 BLAKE2B 55c1b7642d3f273beb415fabc683bfff46c1039fcf146d7c9c09f53b2beffab82e5e687849cbae6b7d2d9d0502a340e635ced730afa6610d20d75f0412943635 SHA512 8b9554a0a726e6fd25ca0fe1031b0a8a114fe98e13e41e73ad6549495a0dc02a2047c151f7717d8df705aba661e11ab1c0e48eff0bcf4d2a0dcff00f5ace1eec
-DIST identify-2.5.0.gh.tar.gz 101367 BLAKE2B f927861976aaa2c53e5bd131b84f299c7290111e18a167040298784ebc3b562180b69d4a22661c858e7e56abde69c2e0fd5048c023d0c84af069748a85ccc4fb SHA512 d7b9d7b31262fdb97fdb16caea01ae0e0e0cee2b5a10b0224b53b84842c3c1e0e1914829bc89439718ae25c68cfde23328f79780b847087d445bdbf3a64aef1b
-EBUILD identify-2.4.12.ebuild 545 BLAKE2B b240d1aa70624e42f11ebc81e94758fc81cdc0b72a33d987df7786db1bd2437346d9f4b905384f62212b285bb870359e78b0d481a9ffb586d9be4373e6428fe5 SHA512 5fc30558cde89257c795beb11e6e6f394089ce3ba86bb27ca5ec701f73517ab6f8856f151826a2e027e744a75f4caa93b38b5e2dd6712ba6b2b93a57fd4d2767
-EBUILD identify-2.5.0.ebuild 590 BLAKE2B 6f3ff57bce79bdb8170fadc7e82affbffe4721adda6d30edf7876e0aeeea4321700d6e8c1ca4bf7261e6f6c148285d4f7f7d700e4e9eed6f181d2706b8b839da SHA512 0a4b7f35a91ac8b8f7c127a0ff313406940a2ac1e75e4b6f430c33b0d05cd40ed1317b749849bd23cc0ee65db8d76f50e10ead86ae7aa83a74752cc0e1f939ca
+DIST identify-2.5.1.gh.tar.gz 101393 BLAKE2B 8586721838c427b00a7c70e842d2ab1a2f0437909d84d5cba6614aff3f8265f17b5137628bdd78e5f324fbf6a0fef8b5ca0246e6861af023c2d9a1a323cc43f6 SHA512 8b61dd03bcdb8908a1a7f3b13d66121bb4f4bb3aab57672bff55a84232dcff310214ed0a90cfcf79846da9abc111bff08761ec9dd40c8b9b183bfbbf365efac4
+EBUILD identify-2.5.1.ebuild 588 BLAKE2B eff914d7f68c76704a11dcdbfef21c51f52f0abcb6d29f669ba173106369d2eaedc818e9d89ed2d35e765184b07fe471c3d9c86db84f0093ebe87e46bf951152 SHA512 2ff5036390cf415ad56c87cc4bc7e1c2fbf0992ebf92ef3cbdf44ed40832a0326bb5f946e4fa432d4e429f8b224c7e6b37fb3ebac56d2388201df754205bd42e
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
diff --git a/dev-python/identify/identify-2.4.12.ebuild b/dev-python/identify/identify-2.4.12.ebuild
deleted file mode 100644
index 0ca6024f920e..000000000000
--- a/dev-python/identify/identify-2.4.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/v${PV}.tar.gz
-		-> ${P}.gh.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.5.0.ebuild b/dev-python/identify/identify-2.5.0.ebuild
deleted file mode 100644
index d1f325c14ca4..000000000000
--- a/dev-python/identify/identify-2.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.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.5.1.ebuild b/dev-python/identify/identify-2.5.1.ebuild
new file mode 100644
index 000000000000..e32e6d8d482f
--- /dev/null
+++ b/dev-python/identify/identify-2.5.1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.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/idna/Manifest b/dev-python/idna/Manifest
index 97c9e8ea2dd9..248e7c635748 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,4 +1,3 @@
 DIST idna-3.3.tar.gz 286689 BLAKE2B b804759b23157ff3d81fcd37f04baf83d7e522e98e8d842e3f228a242bbd9b1f9302ca28b8989a4221512bbbe92839cd593641830a0c6b2e12061b3501b1bd45 SHA512 70b7cc8718e7d7899c75cfe476f044eae5a2fa03801fc9c12e3a092627ca943ffc4a578f9b8a55e181a11564835e125cfaaa577c02a6461dbb97366e620e53ad
-EBUILD idna-3.3-r1.ebuild 741 BLAKE2B 1f4cd34a7748fa4570dd25df06894e48d6bf9d9a1b69e087f1d2118b4e36ddbaef22763912ef9ea77ee70dc81efa0f317ac7238bbe205dab22a3b51647d66428 SHA512 fff9af15e57313e2e6a91a5dc82b21f391600e3dff785000f41569fbae91fcb2e304c29fc27a396166c79065e4f93a3e339d1095a3f8bebbea975b63174248cc
-EBUILD idna-3.3.ebuild 696 BLAKE2B 4469ed573228f102e2b855ef484bd4e36601d820c384065faaaa7390029a64054239950a8c9ba09435d0dd6a1e9f4bfad9402aca760407cafd950e4df4f456d6 SHA512 010883dd20285a11957e1f46fd30e4942ed4e59ee80d5ba98710ba9544555b02544a4ecd867b07413ccfd4f11e5fbff208ad280d8c7127e781f8e14e9cbeb778
+EBUILD idna-3.3-r1.ebuild 733 BLAKE2B 3cdca635e5738932af0fae8d8e3cbf85295499a5877ac382bdfcccc4725e0a602cf7c408908765004eac01cf208abf1647dae38fde0dadb82b21d05de883ecd3 SHA512 744493755decc90394869b75c9040b2c4d9e1546c5312ffeb601adcd18d2e248f446956d23495f3f6731fa6666bbdb51e91a90c23a35b5e20d4358198aeb5473
 MISC metadata.xml 393 BLAKE2B b3d4476896bbd50dbf61021bb6ffd653b72ca62b58c034aeba5119189fce3ee331cd44aa95ef8e680a4ef5f82206cf8b0ca1b902d73b56931b509c10c2a18685 SHA512 bf8a9a9b4e0a7cb67b6d541291e5de201a8ba9e32addcc6be0b60fd2035485775a7862f0def6bca3ec0e24155170fbeb08f3d24f9c517fbb9bd2223d25904a3a
diff --git a/dev-python/idna/idna-3.3-r1.ebuild b/dev-python/idna/idna-3.3-r1.ebuild
index 5899e1effcdc..d162649d4b64 100644
--- a/dev-python/idna/idna-3.3-r1.ebuild
+++ b/dev-python/idna/idna-3.3-r1.ebuild
@@ -18,6 +18,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 
 distutils_enable_tests unittest
diff --git a/dev-python/idna/idna-3.3.ebuild b/dev-python/idna/idna-3.3.ebuild
deleted file mode 100644
index 5b904ff89cec..000000000000
--- a/dev-python/idna/idna-3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
-HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index 8b1df4841be4..f7f531a71f00 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,3 +1,5 @@
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
-EBUILD ifaddr-0.1.7.ebuild 450 BLAKE2B 3568e5c6cf89d6846a553ba1d4a9c6ced1b768213b5944469f1e878fd5dbc929f41131a64bcc43035798bab677c371127689c1ece41e32ce7f39ec6fe19d0b98 SHA512 ef377e27be137a980372da14ba947e185e94cfaeed461b7eea8e8b1d04dbb8feb40fd5c8a3827edba321df220882e35ffc53ff6b8031042222d65bd0e3e939d7
+DIST ifaddr-0.2.0.tar.gz 10485 BLAKE2B d59f34e75c4d27c365f7b169bdf62d9ac3f413275b86ae52677b08909e2811349ab0a6d2c613fc303d74b71c787b5e97e0741174c5a11b88a8f8400e123d1fdc SHA512 02597c0fda81addebbc52893d2f1f5a5f1e99820360202652c433b4869f751901c0931a9fcf8cf0b1b4f1a95c438f238e5b1cfc84511785e7a2a42d5f81bb0d6
+EBUILD ifaddr-0.1.7.ebuild 450 BLAKE2B 5310efcbc89eb17e5b59c71deada0ebd38cf94f6790d08469c7edb6ef0c95d4915c81af82daa21f287bcf95f3797fe4cb974b3eed86722fc4e3dc44a87941028 SHA512 d8a641eda90453b2710e8c59435283091da7aea7590099d0170f1753f92648c084262685fd0bf43fe96ea58eafc2980676f61a6157569b730b021e8f5979482f
+EBUILD ifaddr-0.2.0.ebuild 522 BLAKE2B e7f606c7caeb8d99740bb45c9c42931999657071cb77b9cfb97cf2f14775aa49694497928f433e495cf43e0510b4e268484e96a3d16474c9354c100e690ea9fa SHA512 a90fd82110068d67d766c5f0d8e7aa0189660e682b4e24f0c5e394586c40dc2707f5de28537a19b254bb4d81c54c770b477da2bdb62b7653aef47b6cec719dc5
 MISC metadata.xml 452 BLAKE2B 25e4267ab823386fc377c24137e740035935b9eb3d31aa2d47361cc60476b9f9c6a3489d4c189042a52221bd91b2b7ab5da15f827c4d05bc25eeda57154a85a9 SHA512 0a5f347281f5f6dc1009ef84825e60eb3cb61192cb18a0f42c616e878c94bbbbef120d1d0342e110a6b478cb34b1b1182b1b2274ec892ce0f7b007e56e29305e
diff --git a/dev-python/ifaddr/ifaddr-0.1.7.ebuild b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
index 770de466ee75..437dfc518f1c 100644
--- a/dev-python/ifaddr/ifaddr-0.1.7.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ifaddr/ifaddr-0.2.0.ebuild b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
new file mode 100644
index 000000000000..05222a04124e
--- /dev/null
+++ b/dev-python/ifaddr/ifaddr-0.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Enumerate IP addresses on the local network adapters"
+HOMEPAGE="
+	https://github.com/pydron/ifaddr/
+	https://pypi.org/project/ifaddr/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/imageio-ffmpeg/Manifest b/dev-python/imageio-ffmpeg/Manifest
index 6cf8600bb953..2462561a174a 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1,5 +1,3 @@
-DIST imageio-ffmpeg-0.4.5.gh.tar.gz 24065 BLAKE2B b960a54435628fdefc1ce21c7f3e75c6ce1ffa3b838537173a28173589c3d430d805a7f7eb2b091250cce3b29660edaa1b442e28cbae998728cb89067304e9ac SHA512 c4180903f7194cac880c3851b08e4563c6e12cb6336e321ca35a7baf92ec1de5a49880fd05db9c7c266327642d75830cac4060371cbdc76448fb0a2c21ab0c1c
 DIST imageio-ffmpeg-0.4.7.gh.tar.gz 26301 BLAKE2B b794c4c69e43304e089cbab61ff70f3d7d305a515163d0cd0ee4fca678fbec029f01dda1559d6e10e287e56937d6c8f9b52c816df99977034867997c1e392c06 SHA512 4e97bd1258aaa43304a3240460f34a0a4b98340c1dc57f673644af36724935f9f2905378b38626b766e7f609fcbda48d2c58402dc3ef9c48c596936a4bd2cc06
-EBUILD imageio-ffmpeg-0.4.5.ebuild 683 BLAKE2B 3c05aaf8e6ff217bb1140915f9684f76dd9b4638c86e45b7fd97152a34f9d66d2565c9bf91ae35a5c0fc5c3ade09cd31e5608410ed7abd533eabfdaae17e4e78 SHA512 f410252e05268da4db8ec8fd2abeecbf4cd32cdd0cb90036bc5e65aafe717080bc1d239d5bd4de37a761eebab8d206e795983bf98d352262dfa1767c54017f87
-EBUILD imageio-ffmpeg-0.4.7.ebuild 725 BLAKE2B f781063a01f83b2657e0734ac7a0cbdb68cae29909449e45d06345fdf47434749c74cb6c876cde66f238dc32071832399f5b590d442991122f1223355fc41dd9 SHA512 53a0ac3fa99517b276bdc998cff74b3476cec561a86f86e507edf0082b48892d58e50aa80875f7b0e8cd6724f823a5b38eab5670c0d00238aeeda46f1bd336db
+EBUILD imageio-ffmpeg-0.4.7.ebuild 737 BLAKE2B 001b822a0885d3108c762dca95b271e2e3d7d64d31cdf9434eea0868c66b6869af1bf6c2a6a3cd06da1e2fb9145379c47d64242d1d09cb83e8267a065697af45 SHA512 a19325f6bf365d42878bc48babf5bb1f906123ec1a991d6b21b5f59e0e8adca4d9bb923ecc41751449bfbaa71a73c996952bab3243d5b7dc9115568179e80146
 MISC metadata.xml 404 BLAKE2B 6edf3706d02cda22fe3f62df4c773035b0296721571683672ffe287059b3d5b12812538bd8deb4b26008bb28bef65de97feab3aad32b397f55a9d6c62fb95b52 SHA512 3b6ffbd42a85df5f03cb429aa8dd0b5dbe5585b4fd57af4739aa49a96408329bb77c8017eeca078ca2212bfc390099d06670bc70f968f8024a3d5621d1016ed3
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild
deleted file mode 100644
index b94a693e1559..000000000000
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="FFMPEG wrapper for Python"
-HOMEPAGE="https://pypi.org/project/imageio-ffmpeg/ https://github.com/imageio/imageio-ffmpeg"
-SRC_URI="
-	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# ffmpeg is used as executable during runtime
-RDEPEND="media-video/ffmpeg:*"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/setup_requires/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild
index 1ec434ff4fe6..f560bc2f9a3c 100644
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.7.ebuild
@@ -4,11 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="FFMPEG wrapper for Python"
-HOMEPAGE="https://pypi.org/project/imageio-ffmpeg/ https://github.com/imageio/imageio-ffmpeg"
+HOMEPAGE="
+	https://github.com/imageio/imageio-ffmpeg/
+	https://pypi.org/project/imageio-ffmpeg/
+"
 SRC_URI="
 	https://github.com/imageio/imageio-ffmpeg/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -20,8 +24,10 @@ KEYWORDS="~amd64 ~x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
-# ffmpeg is used as executable during runtime
-RDEPEND="media-video/ffmpeg:*"
+# ffmpeg is used as an executable during runtime
+RDEPEND="
+	media-video/ffmpeg:*
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 7c56ea37ea8b..be1b4353f922 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,7 +1,3 @@
-DIST imageio-2.18.0.gh.tar.gz 384312 BLAKE2B 5683ec01db358d9074c5e02c0006bf89e5978418d86b13ce93b1c0fb0800fb650b76d53bd4fdea94c69c185af3341e1e2e80c91815d0f74ebadcaa01ee497e5a SHA512 ddd7606f4b72e3a768b2f7f71d058d11df2bd6e48455240d17b2d93394808158c4f52289ea6f47b5c5655ec45e514aa4413248de0aff1806d28922723540aa50
-DIST imageio-2.19.0.gh.tar.gz 387467 BLAKE2B bd37ed1d8c147159a6e3dc951c512ddd1bdcc5c664ea1cae80d7eed4544b9329e92f711452442a459e776ec151db751d1d1c62a7d9e1165c18dcc5f0d05ec9c2 SHA512 effa3865259a1dab901a1ef2acf2cdbd57db96308b9edd8d489ff7421e51da0b2b8b8b93a7e3003bac43dd010c4f30aa683fd22236ea5d82af9d8d48b7b60db7
-DIST imageio-2.19.1.gh.tar.gz 388314 BLAKE2B 447c2a666d6337926964d977fe45ec30d7995f486b59e03e8a0a68491db2fbcbffbb73946d51080fde5d2627d70fde1f6260f98205ff447e54b7349abdc839fd SHA512 01df54a84c7522ff8ffbc0141fb0ee3416f7b0e04d131473e02c8e18adac384d8f6f2e3f3148229c1d16509465b4a4597e38707bfc8991c6288f4ea1758b4101
-EBUILD imageio-2.18.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.19.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.19.1.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
+EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.19.0.ebuild b/dev-python/imageio/imageio-2.19.0.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.19.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.19.1.ebuild b/dev-python/imageio/imageio-2.19.1.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.19.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
-	https://imageio.readthedocs.io/en/stable/
-	https://github.com/imageio/imageio/
-	https://pypi.org/project/imageio/
-"
-SRC_URI="
-	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
-	media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
-	test? (
-		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tifffile[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Fails because of system installed freeimage
-	tests/test_core.py::test_findlib2
-	# Tries to download ffmpeg binary ?!
-	tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.18.0.ebuild b/dev-python/imageio/imageio-2.19.3.ebuild
index 6770d9759db9..6770d9759db9 100644
--- a/dev-python/imageio/imageio-2.18.0.ebuild
+++ b/dev-python/imageio/imageio-2.19.3.ebuild
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index c34b59d742e5..364f290b4f97 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.3.0.tar.gz 1279535 BLAKE2B 926b90ad493b790db41941467dd2dd0385f86064fc1ce9547670a52f925965effc9b8b7f61057158a4452cac2223b65dbfaecc34a19ddaf52067a9057560b56a SHA512 3686e513f03cc16f5237ca206cd1bf131eea968015ee4906f620ab1c8932ed24d19881807225a02fa319d0465da4b01851ec0bd0a47146ef914053185bc0c755
-EBUILD imagesize-1.3.0.ebuild 623 BLAKE2B fb93785fcd27454fa01eb806637bcc4132aa7ea9bef53431814b8fab1428e110b80833a98621d1a8606e00d90b8d5e47a67f301bc528a1327db6abc641b7c69b SHA512 ff3bf033f2eac1eee8a35e7678f8222052391b003740ba2adb31897e4a150940d20bf0f97f361c087559ae294a6055d23c8176001c7cf13d7e929b0b2e289647
+EBUILD imagesize-1.3.0-r1.ebuild 655 BLAKE2B b9c7efdb5914b9ffaee8e02beee8df951ed967e5fa61dc2e6c0eba5d664a9e71a4e74b08b12b66679ece88572c04c9157e181338c6995101b13cd440a0805fb0 SHA512 a6df1d582c405958e4209d577a62296f85dd90c8c9e3d289c144b59362e82aa4df3d2c4d27548cebf4715a6763e8a161bfde9ccf6fdf889272504ce94785b792
 MISC metadata.xml 484 BLAKE2B 9edce43c0b06aab59a3094cbe36b90393bf5d0a0eeba9bcdea7ea7298e7d42c2cbfa19ce8bb544022e01124743d877646709b90329796d77e916283398aef3ac SHA512 85d73b13ce95d9647d1afcdee5979fe2802a04cea213468c7d7714b976e191dd59715a93fa522dcd2646d33fd27a43911146c28dc477d9d34cd56cf42cc3ebb6
diff --git a/dev-python/imagesize/imagesize-1.3.0-r1.ebuild b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..62cddd30227a
--- /dev/null
+++ b/dev-python/imagesize/imagesize-1.3.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
+HOMEPAGE="https://github.com/shibukawa/imagesize_py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires Internet
+	test/test_get_filelike.py::test_get_filelike
+)
diff --git a/dev-python/imagesize/imagesize-1.3.0.ebuild b/dev-python/imagesize/imagesize-1.3.0.ebuild
deleted file mode 100644
index a4ddc0d2c5a9..000000000000
--- a/dev-python/imagesize/imagesize-1.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires Internet
-	test/test_get_filelike.py::test_get_filelike
-)
diff --git a/dev-python/imapclient/Manifest b/dev-python/imapclient/Manifest
index 5c4bd2fbce49..e67d445aad03 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -1,3 +1,6 @@
+AUX imapclient-2.2.0-ssl-context.patch 456 BLAKE2B b8811608129f647cb53b298600f3b0055a9061706693d0180586248d187529010fe043aa4cd88800cddf03b4b7747e484ed624abaac15645c1d0b99a253082b7 SHA512 547ce1528a7d15f0e6fd829f847acfab87cfc7da9261864917ae69b1cdc3e091011d51b7e470c7098d8665703d25bf718b72b55992a49fafb044fd97773615b1
+DIST imapclient-2.2.0.gh.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
 DIST imapclient-2.2.0.tar.gz 89505 BLAKE2B 448e8c736cd80f261c50dd7d6fe88498bf988e475f8135bf7079021d0154904741ab8af28c0ede817ec1bd8c7bd329b1c891c24e37c3466d68287afa02d636c7 SHA512 ace8f55e0f7f4dbb9127b2bbf26cce4c12dce40357cf8127aa6e377321d5156f91f913bd4d4ca57bd5b7f0c86ae5d0b7fdf352b74a6edb7d607f46aa45a144a2
+EBUILD imapclient-2.2.0-r1.ebuild 696 BLAKE2B eeee1d0c99ee35a92c59c3e1cce7a2f1b38a0159563cae949cb0d940d91d2911462c349a9d11176384561654a6b373239216c2f0bc1c18a91bcc900fa88fcd98 SHA512 6df5c064f9a08608e80bad92bf3539ba8336142b852cfac48e8d2e3b16cc890fb7b38273115c3e32e3e8cbb4d93212ca3d3c1776b77e8d9e6c67caa1385c80c1
 EBUILD imapclient-2.2.0.ebuild 633 BLAKE2B 11abf82ddda57c9225f79db80412513a0673fca5e7dbdc28e9406fad7f33ccb2abf971f614f1276bf17ae1e0c2c621737ed0c5ba7ce8c724eae3a459a3a666e5 SHA512 8b773a53b14573047aa84c7dbccc9fa0377dbc038ac436ee139ac6a64b2c2b3b3ac6613fd0a18cfbe6d9ed83b84f5ac065c0ca4ea207b2014d0b1075507ae9d2
 MISC metadata.xml 392 BLAKE2B 2a2a97b3882d544680b05e74e12067be2df1b910a37a08316540cdd7682beb16bbef184cac7c71ed51ce209187dba7803e34dd13756daf6ccafed343734d40f4 SHA512 b223e769302a2277d2638e58cb9c7ccfc741f582cf0465d1f9a44e6822539e1458d96e93d6b5a32482fdcc945b74e44b5bfc66caa53a85f224d4f380c19c1325
diff --git a/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch b/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch
new file mode 100755
index 000000000000..b3a12823f6a5
--- /dev/null
+++ b/dev-python/imapclient/files/imapclient-2.2.0-ssl-context.patch
@@ -0,0 +1,13 @@
+https://github.com/mjs/imapclient/issues/466
+https://bugs.gentoo.org/835498
+--- a/imapclient/tls.py
++++ b/imapclient/tls.py
+@@ -27,7 +27,7 @@ def wrap_socket(sock, ssl_context, host):
+         return ssl.wrap_socket(sock)
+ 
+     if ssl_context is None:
+-        ssl_context = ssl.create_default_context()
++        ssl_context = ssl.create_default_context(purpose=ssl.Purpose.SERVER_AUTH)
+ 
+     return ssl_context.wrap_socket(sock, server_hostname=host)
+ 
diff --git a/dev-python/imapclient/imapclient-2.2.0-r1.ebuild b/dev-python/imapclient/imapclient-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..520ba497b462
--- /dev/null
+++ b/dev-python/imapclient/imapclient-2.2.0-r1.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..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="easy-to-use, pythonic, and complete IMAP client library"
+HOMEPAGE="https://github.com/mjs/imapclient"
+SRC_URI="https://github.com/mjs/imapclient/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-ssl-context.patch
+)
+
+distutils_enable_sphinx doc/src
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index 4e86bae717cb..4150d4e314e2 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,8 +1,5 @@
-DIST iminuit-2.10.0.tar.gz 408625 BLAKE2B 8876f4e94958a9154d517b91859d0c3a58ea919d53271f372eb4f648157567cf39e6639f5cdee7e137bb5a3011eadcfc28b52e3ba87333b2d7dafb0f8b58a7f1 SHA512 0f40a7f775ff814004d6fd5b331887eef2c9d389462b2c3585eca7568cd4babe5f83c85a002c6b47f047008a3ffc0a9e2c6f29cdc4acaf3d4c7208637a16d1e8
 DIST iminuit-2.11.2.tar.gz 411984 BLAKE2B 8fa47b24890f26718ebb8f053c2f908d982a7b6cc7f71f6523f387128ab0bd894bb851f18e2f8611ff5ab1c113651f526893445f465fbbfa10d487dc15effcbd SHA512 b60755f21ae38bd19860e0d711bab9c6e37dd361cc8cf43bdd1a583e8c06abca38e42ae0a6c4631be05c5082c9ab169bddb51e4d84397ce8f81833fd4c46cdd7
-DIST iminuit-2.9.0.tar.gz 408294 BLAKE2B d924d5ca5bef0e5b2dbc1fcfc12daab196c6937feff1badd73f9f8f20601989b21673165e758df7dabe072cb4a14cbda12823cfaf30fa5687de4184238465c50 SHA512 55d1d855b23862a4205b6c12ff53ddc088739945523670f3959edfe859abdbd3600da78cc219af6ed792156e2da7d8ae844e76e49ac759af433af875eab26714
-EBUILD iminuit-2.10.0.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
+DIST iminuit-2.12.0.tar.gz 420687 BLAKE2B 9d3761bd756f58a7c36a61f161e4667f8efbb6edef9bb1882fcd324efe46aaec126dbfb4b692a5b7f56a1f162cb292c9e58a0d3337ae04a019756455bc0df1e9 SHA512 1697c04722323506bbe43682befe1b6020656348c98fec0a877ea8403390e741ea106d61d95e31595d894b020025606b413b2f185fd747b2b7d733b729919fe1
 EBUILD iminuit-2.11.2.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
-EBUILD iminuit-2.9.0-r1.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
-EBUILD iminuit-2.9.0.ebuild 791 BLAKE2B 4ad5fa85546390f0ba4d56492ae8e5862fe0c980374bbf5c03342ef5e715be1e30e5640c85d2fa1085a03c7db906aaa823a6ad6c3a2b369f7d04f0ab02731fb2 SHA512 471a3c46bc369b9b6bc9e88aa713e6feb6f3a0d84806448b8802cac7e3a7b34633fae8e95d45d49e03cdf62f990787b161299fb8b5305ef841488a5e7e2e5845
+EBUILD iminuit-2.12.0.ebuild 905 BLAKE2B 2479a6ab793907917ba57ab1aab34e4701e53001450c1e2e3f3aa68eea555adb0650ecea26aa5ddb3ae12787ec6d32caba93af6dd44918f93353ba9029fb6fc1 SHA512 82e97833ccd58ca8675a2d6f06848d960c0797c0ec18e3a26880d473d49f0e99be1e6417888171178f4f0f9dc711eeede872b1294234be6bb5dfeb1bc9b7295a
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.10.0.ebuild b/dev-python/iminuit/iminuit-2.12.0.ebuild
index 3a700725da54..3a700725da54 100644
--- a/dev-python/iminuit/iminuit-2.10.0.ebuild
+++ b/dev-python/iminuit/iminuit-2.12.0.ebuild
diff --git a/dev-python/iminuit/iminuit-2.9.0-r1.ebuild b/dev-python/iminuit/iminuit-2.9.0-r1.ebuild
deleted file mode 100644
index 3a700725da54..000000000000
--- a/dev-python/iminuit/iminuit-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest -p no:pytest-describe || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/iminuit/iminuit-2.9.0.ebuild b/dev-python/iminuit/iminuit-2.9.0.ebuild
deleted file mode 100644
index 438c3d273a88..000000000000
--- a/dev-python/iminuit/iminuit-2.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/immutables/Manifest b/dev-python/immutables/Manifest
index 2c99f42b8dca..e487fb8c6d33 100644
--- a/dev-python/immutables/Manifest
+++ b/dev-python/immutables/Manifest
@@ -1,5 +1,3 @@
-DIST immutables-0.16.tar.gz 84916 BLAKE2B e699aaa1135fa9f7db9589276dc0801a67c5f98bd3c5b247913d8263f9baf02a8772d7715cc3eb2c9392694d48d3808d50f45e9fe8e66c4d507586d0e3fdc319 SHA512 5b883cfe43f8a042b617e719dccd3cbdded3b1d1df160ba26b6bb2f0816a7171698bdd2ba3d450e76f135b236e777052a22c09b8bd1a9183227f1ccc90617cf8
-DIST immutables-0.17.gh.tar.gz 84660 BLAKE2B 475042d6342e3ffe5b4aa68e2e8c27a438658214ec2aa6439e077d59d2e2257313f644f535ebfbdb171b0e7dac33cde590f8a84a8da9da717b249e5b2e11ca92 SHA512 d5853de6b7c6064c93b6dbf66819873c982dd2e155ddcbf6b5dd321475374e9f52eb683c853a6944c71ca15fb194ac9480ad2d444407c885ee574c244c4f081a
-EBUILD immutables-0.16.ebuild 808 BLAKE2B e44502bc80f8b03f2028fd527b99691634b2a46162d6985bbf472097155e4720909a508a8e9ba69d0b16cabd36cf28bbe1bc2e52d40c7635b27164915245244d SHA512 a2503b67bbb2d585c91f5aec43d5d984df29db6fd240e501db473b3416d676ef3c83a0eb1f59b5935ca110e5be975b17643a99a639bf61fb3059601d76d1d816
-EBUILD immutables-0.17.ebuild 758 BLAKE2B bf7a904c293767d31dcf56f39f375da291c4d26055e7fab58c97c4a89208e3cb4d905ac0b0619151ca6aed5e672b1b3ac85efb692797cd6c8c98ca4b59c12512 SHA512 d5fed44c4af9e3eb1ed257a074a2a9ebc582e73f02d4c95ff6eec132d1a056f1fecc6bfdcecbaa96192c1a3f6b49065c920ce8eec4c684ce3ff1df1fb0078a8c
+DIST immutables-0.18.gh.tar.gz 84891 BLAKE2B 2e800e1b7b354781ef221315b80877e57ef446753c4a42e411196379e2bc921f71918c5ecd5cc693ca54cb7c401bef31161e9d249407b705626fe95d0e4e9fcc SHA512 1477ff6d9a6c02c3619b209352096abefb913cf53d392748e0940160067ecdcf2b89ad9ce807161ededaa5062105a2e5c5a3303bd02752a5f07b5f68f1c1044c
+EBUILD immutables-0.18.ebuild 811 BLAKE2B 4fa65ad7440492d0113f3801a968af96840cfba36f24f45780c1ac3265184c82b0c3de2948b63886cdb9f63fe87ce18109bdd2eb6011c49a25984334393980af SHA512 d4156d40e6b4fa634d16781aad141b18bb3de8cc85bfcee0537369c76086024dc51dc6004f6dda9b6af0f8ec069c1db17784ff892eba87b997e78dd61787703b
 MISC metadata.xml 353 BLAKE2B 5ba3a63b6d65aa989535ec78a5e097fb15e6bcb392e846471fb01efd4a4b546a3ba861cc3829d13e71f1f5c31b582a99e1f5e4adf6b60c2b6fb17bdfb9265c99 SHA512 ede81f3aec8f6ee374c8d39d60f4193cfb701f2561858f2ddfadbe68d531849cec13fb8c13cc671e14d8ab1f18b08759d030c562cc496f959517c6ce67ac9781
diff --git a/dev-python/immutables/immutables-0.16.ebuild b/dev-python/immutables/immutables-0.16.ebuild
deleted file mode 100644
index bff5d2a27f79..000000000000
--- a/dev-python/immutables/immutables-0.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-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
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/mypy/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# force running from BUILD_DIR to get the C extension tested
-	cp -r tests "${BUILD_DIR}"/lib || die
-	cd "${BUILD_DIR}"/lib || die
-	epytest tests --ignore tests/test_mypy.py
-	rm -r tests || die
-}
diff --git a/dev-python/immutables/immutables-0.17.ebuild b/dev-python/immutables/immutables-0.17.ebuild
deleted file mode 100644
index 4e758bdef258..000000000000
--- a/dev-python/immutables/immutables-0.17.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A high-performance immutable mapping type for Python"
-HOMEPAGE="https://github.com/MagicStack/immutables"
-SRC_URI="
-	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/mypy/d' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd "${T}" || die
-	epytest "${S}"/tests --ignore "${S}"/tests/test_mypy.py
-}
diff --git a/dev-python/immutables/immutables-0.18.ebuild b/dev-python/immutables/immutables-0.18.ebuild
new file mode 100644
index 000000000000..e34f68e5dd8a
--- /dev/null
+++ b/dev-python/immutables/immutables-0.18.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high-performance immutable mapping type for Python"
+HOMEPAGE="
+	https://github.com/MagicStack/immutables/
+	https://pypi.org/project/immutables/
+"
+SRC_URI="
+	https://github.com/MagicStack/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/mypy/d' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local EPYTEST_IGNORE=(
+		tests/test_mypy.py
+	)
+
+	rm -r immutables || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index f8c98d9f7d9f..996d3cbb9393 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,3 +1,5 @@
-DIST importlib_metadata-4.11.3.tar.gz 43607 BLAKE2B 661f8ce68869540995dbee39c6be07d7b88e8339267d4d49744691f2347ab2bcc9ac33c4cafd6caed5fa9ce3d4a3640a816e4659eee9a59b5ccc1df2edd2f6aa SHA512 d33efa2abba5f6f770615f133c940a61948ce5091d59526ee2c7e3866aebd74d79ac464f72602404c2b56fe284a93a9cd1b0cac251ceea53666019485bdddf23
-EBUILD importlib_metadata-4.11.3.ebuild 1567 BLAKE2B 0829bdc01bf90c0ba3f56188f8ad6e4179c61d8664e63213f48470cc10c50aead13019283c1f43b34a6581ca1af3315e318f5d959cb510cc10c5831b60936589 SHA512 3929fd652ee41263cae8e2fe21bd8747273c114d1ee3f602cb28caa44b0fe5ee346dd75a520f0b998d8675fa5dbd7e38a702476f9587f1a143f9d4e1f6754b60
+DIST importlib_metadata-4.11.4.tar.gz 44160 BLAKE2B 83b39ac858c5d3b63becc19be1a62ce253ce873afba16e5dad085fed531c5dcefa173e1644de10bef6318965aa132331b5d037dd7c0c8a0908880d97764b645e SHA512 2b5a6b0788103f7f0245f172832576852f56316e1c05b32f194a56b5fbaccd987c0315971f7d32d1b225ab74c12dc9f1aa96eb2a9ed2ebfd7613a9b816398560
+DIST importlib_metadata-4.12.0.tar.gz 48153 BLAKE2B b12b61a02be6428f80de418b3932b917066f6e9396d85158f8f31fa1b800c9cbd3f7dfd7cec48b51cc6c4ad5e5532136cc6ad7ea688c70466621976b232d9ccb SHA512 a7e3b8876665880a42bab885014199eed90efafcb386b89fddf62f3a6dbf51b192a0b9d208a40fd1f8b6db9d1bf80cf6d6753c1073196daa54dffa22a627443f
+EBUILD importlib_metadata-4.11.4.ebuild 1488 BLAKE2B 16a21675ed83d39af765d032a32c2761b64e6e0f83282b8fa957e9ca4dfb4e51428ecb1b9ac0c2fd3470546b853b120bd7f5fa69908a5670845eb2a559b3731d SHA512 a0a9b7a61ca7c9002531562c1c783f4ac41774b14e5c91ae251a59b06ca3fa5de23fa6de42f6cff6c8c99aad3953dff7eaea304ad1c639caa6e6e98665bd7540
+EBUILD importlib_metadata-4.12.0.ebuild 1496 BLAKE2B 35ade448491fca4a82f483e4c6953f1faf17ec2c35f0d8822f4c66886a14f51a5e5a9022dc826e977c51130e9b86778f24e4fc9dc69b30b3b31c53a029b61d4b SHA512 c61a2badbbdf71dd60a7a66a7a89d55f356a19b4cba4bfcb77c02b831e7540715aba9c05a118faf5b9c20cff1d2f001b86d6ab189df03add5213ea46968e4155
 MISC metadata.xml 646 BLAKE2B c3f9ff98b5090d22a37a5a5b36b6c8523b4d1ee804c05c880bffe6a45ee482023d4c037b49332bfa93cb60cc5892d1178b486cf1d2e0d4c44d7da8d292e406d5 SHA512 e558c5ae62e98685a43bfafbff6fc5d5339965a9bf8c6bf0bd8cd5b542c94ae6ecaf0a04e5210b211a32abb65b37c5db6af64dc7d74ae79ec31075fcc659c9f4
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
deleted file mode 100644
index 89ca9284525a..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-4.11.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/importlib_resources[${PYTHON_USEDEP}]
-		' 3.8)
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
new file mode 100644
index 000000000000..49339f2d9da7
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.11.4.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild
new file mode 100644
index 000000000000..2441731aed0b
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.12.0.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' 3.8)
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 9662e04691b0..47d383f31c5f 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,9 +1,5 @@
-DIST importlib_resources-5.4.0.tar.gz 30554 BLAKE2B f5be47cb63813aea15f65d251115cf398f695041871fdf6e8885fee11d9a9d7a2fbfd07efd494bd7c91077f99ab871e06d45f49de9f7e501a1691601206bfb55 SHA512 9262c185bdf79fad0a11caabc5c5df836702a74e140a9f60ace857e3f6a60fdb091639b2fb7129b17bad5a46968f43dda7d176fe39af495370dd31f04891fb1b
-DIST importlib_resources-5.6.0.tar.gz 30846 BLAKE2B 9a83554cd65b7851c4a8c977509f3fc255de3c5927661764e702eeae142b7d0cc75f809fe2a438b6f3acdb2facbdc3dadbf3f9dfed5615643dc15e04545dcf8c SHA512 d3c88dd5f1877b205b4c53ab9c8d4180ae87be0ff9dd11483024de40c84fe7da359f70337aeacc5df3b6deca88b903bb01850da8a54fd057e4174806ae767deb
-DIST importlib_resources-5.7.0.tar.gz 31185 BLAKE2B eefdc2380b580c274391369eb7a0432f74987a140a9a2eab2c43756148c1982ffa6f91ddad69992b85f88efdb5d22a40f0f95abd4e12de06be7d3d9ecd237579 SHA512 671395701ab96b8a4985f33470cfe2eea58fb60ca04d9763307958f08c535cdfee62b6532c33e24aa851b872e61498d169b4882788b9b829ba9549c84554f6fb
 DIST importlib_resources-5.7.1.tar.gz 31272 BLAKE2B 3e30117ae4f18a9f2151b5435428f3853664ce291d2d4ce9490d1a3043ca5ce2e80cf04d7dcef71ebdaba8bbad17ee61bb47303637a8bee73a2263853b65293b SHA512 8fd89dfcea4112d26418bcfa522de36c2136a50d07470ac8de18f62bb7bb964a459534554802b1455996ae65796018bea806a592746c1d2717f1313608cf4918
-EBUILD importlib_resources-5.4.0-r3.ebuild 1356 BLAKE2B bcd93a64fea459fa5a31cfd0c58725dd57ac7d8c2997d0546ebff6127f6eed5957de915adc0acd8eaee1493324210fe1a04a4c9d854299f9d3f814895bbf7b9b SHA512 edc37725b572e6812b89489c8d8f731eafa47896f0aa79237b6510e5e08227d32ca6e6e80e12607667e25dff141a0943a96481c977d4cfab4c2c82275cfe4b7d
-EBUILD importlib_resources-5.6.0.ebuild 1272 BLAKE2B 12674e881c7ee44bc1e5fbcb5702c6c5c15461190ddfa27562f092a8106173f1780c05588a4cacbd5c7816082f250c806473db433be3543497a27a274ea68676 SHA512 8117800259a0bc0f52382e75f0845a7b81551b903a6de50b7a89acfbaf8d95a6f1f4be457e35e9e9b1b745739a865ed03b559c817eadf1d4e5d6fd5fc00b4c6b
-EBUILD importlib_resources-5.7.0.ebuild 1272 BLAKE2B 12674e881c7ee44bc1e5fbcb5702c6c5c15461190ddfa27562f092a8106173f1780c05588a4cacbd5c7816082f250c806473db433be3543497a27a274ea68676 SHA512 8117800259a0bc0f52382e75f0845a7b81551b903a6de50b7a89acfbaf8d95a6f1f4be457e35e9e9b1b745739a865ed03b559c817eadf1d4e5d6fd5fc00b4c6b
-EBUILD importlib_resources-5.7.1.ebuild 1279 BLAKE2B 1e434631c34c66b1ca4303a491b2b793e3e6e0e3a24e33803a55804b233cf8928f702455431430effbd61f4f1e640ca5d7ff73700a15a33e6585ccfab8f85594 SHA512 f317c6b9f6ccdc926630e46f5c15467971c05ddaf822029f3470fc417a4ebcbf090405d4c82a50af3bdef874ee55f1289790c4b3a161ab3b6652a4c63cf1067a
+DIST importlib_resources-5.8.0.tar.gz 31461 BLAKE2B ce6668520297cd7e06b944146277065cd1a0f5ae3f9e3bce24005f0f4a1181a41fa7f91f6b9ee9c0ef4caf7ca65c8efff748957c5c1a45c56778b30568970b36 SHA512 5c20a46a1832c7aaddfaa561a3986ea02dae59b94c06861757b6e5912f36624d564c65e184612af6e5930927a3172dc132ceb9846b0585de851d019c68cc8955
+EBUILD importlib_resources-5.7.1.ebuild 1192 BLAKE2B 416bfa64edc6b33cb3ba55247586e7009f73ebbe7d9b4a7ab9eb75d6d106d39d750951f4ef25d3ed24b92b0b7590bece96aea554a71e20009da18e42b5fa9aa8 SHA512 9e754a10fb2290f88be8b338caa7ce7935abb88b66c16955fc1057e7aca4a430ae00be0bc5ce269052d100e2f70a452e771f9ba26df9fd69526f989b58f43939
+EBUILD importlib_resources-5.8.0.ebuild 1252 BLAKE2B ad1610867a1fb86f021b08133560a2d974b9660cb0d97bee9378f22e59f844ba7d316791475dc35ee8b17377a7c4aa0f87a42f962e67845c1dd817345df3cec3 SHA512 8d567073f2c04d60bc742f581572a71faf1ad7952b952a2f9f4cc7383eb6cca64f5c951be100c4e21561e2799d5ee8823a819dcdcbdbc485def7e5f13747a62b
 MISC metadata.xml 945 BLAKE2B 130dc56a13a8416168baf91e804e1fdef0d65978641c3fca5eb663b8accb5b1adc066bc4033751f03a9c729e27d0448925a7b623431922056fb7d282db052734 SHA512 ccb23df48a89f69133469722fb37acf516127b207b946cdea240cf82e2ba5422ee4e2166d1a9419031408a7624a52256e322fe7e478a9a7b8214ab4bc5c9b92b
diff --git a/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild b/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild
deleted file mode 100644
index 8d55ed4b701a..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.4.0-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild
deleted file mode 100644
index c13797db40dd..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild
deleted file mode 100644
index c13797db40dd..000000000000
--- a/dev-python/importlib_resources/importlib_resources-5.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=flit
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_resources"
-		version = "${PV}"
-		description = "Read resources from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
index 9c3938137ce2..86b8123a2a88 100644
--- a/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-5.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -24,7 +24,6 @@ RDEPEND="
 	' 3.8 3.9)"
 
 distutils_enable_tests unittest
-distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
 
 src_configure() {
 	grep -q 'build-backend = "setuptools' pyproject.toml ||
diff --git a/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
new file mode 100644
index 000000000000..a35c250af9c3
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.8.0.ebuild
@@ -0,0 +1,46 @@
+# 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
+
+DISTUTILS_USE_PEP517=flit
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_resources/
+	https://pypi.org/project/importlib-resources/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.7.0-r1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_resources"
+		version = "${PV}"
+		description = "Read resources from Python packages"
+	EOF
+}
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 9c00e9437c29..6c35d65ecaac 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-21.3.0.tar.gz 17058 BLAKE2B a6c49d15eb73abbab129e675d937e795a47aca10f74a8d5fc80ebf6575ca996cc7dc16aac9ca02c7a206cf8f59b239f3fc04fc00b28827d0a3c76a88189dabf7 SHA512 b8b50151cd2467e552d9268decadbb839b047cf58a450b72e0437ffc5f9af7d78c20a24193c0668cf48dd6264b852d9cee68e59529018e0ca07825e0c185d1e8
-EBUILD incremental-21.3.0-r1.ebuild 871 BLAKE2B 4297842eb468e40991e37c5e4a8f969568d2f39be021bd106cfe593cd5da10cc4903bffa31c6c593128b970b2047c2595014011fb9a5aa333da92b42bb37a9e6 SHA512 3babe47309dac2d55e8fe035957d3548de68f34d084113feb7012043b15163e45c0c3cfc806bb1dc59343f210cc29280c141e1528fbd8228e469747ed70a519b
+EBUILD incremental-21.3.0-r1.ebuild 871 BLAKE2B dab0c91aff7a011352dabc9e3bf41406d60e5ad5e924c8aae5f35973feae497295fd796fc76321bd3d7c4c48e136c36c65b668b6d233f085a845d437934b6a4b SHA512 d348436bddd600283fb88a72d7858e9a1617544e0477748cdcc9cf001d9d7867e32232aa0fcc90c43f32fb4ae1572e7e628f757f099314c0198545e95eff33fd
 MISC metadata.xml 501 BLAKE2B b83d40e36b124d2aedb279a12ac7d1e4f43d4bf289211491fbf1b37232c651df27e38869269fc5bf1960f9a0f04524920839a1595a6b5a7beed5a50a5219b4c1 SHA512 ec1f4c5ee87bd2ad6c247fa182c2ea1d8d0f544308fe64afa925aada1200e0c0bb4955971e0d7a3a9a4eb25486b0693c499b64a6de1cefba2868c58e319967cc
diff --git a/dev-python/incremental/incremental-21.3.0-r1.ebuild b/dev-python/incremental/incremental-21.3.0-r1.ebuild
index c855ae05e785..314d735f88a9 100644
--- a/dev-python/incremental/incremental-21.3.0-r1.ebuild
+++ b/dev-python/incremental/incremental-21.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 82132625ddec..4ac13dcf4615 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,5 +1,3 @@
 DIST indexed_gzip-1.6.13.tar.gz 102730 BLAKE2B 8ab5490c3c830121ce3104c624fe36cb0064f6265b5e5f9ebd6efb0402c33e206b4d97c35803fa10fdbc25a7ccac61f19b2fd9bfb205e07acee40737d6404659 SHA512 de8a606f712a0bddf618cedac12d2b5613e14aaaacc93d1930352101bdeaca8bd5126dd67df36d691f31bc27d553a61901934bbb0b2514e4360c6cd49e395c41
-DIST indexed_gzip-1.6.4.tar.gz 101683 BLAKE2B 01d34b33f8d6a623f92bd3f6751303b32f3834e9fb7849b13b82080eeaa91bb29fa38e45287256b6946ecafae7fd000f0cd12f004662eb2e5ad9f31be7378505 SHA512 b7b804c99c560f939a165fdd6d4b881fab2dd2664cecf88f9d9dba46c389efa4839dfbffd19a1a30b801e2fde43580279ea2adab5fd0bbb379ad77c568f8d6b9
-EBUILD indexed_gzip-1.6.13.ebuild 1133 BLAKE2B b9ec105ddcbf6401588be1b259f1641571550973cfea54b4eb1abba58edf0a159998da3ac783f8a287b3247de6d2f215288e717f21ea7490cf9a3ed3fac89fb8 SHA512 4d6a4790995e4d6d27854e8d3b2b4d344661c98ceb272c6e4eb0dcdb5d36fbe7cccdb27e87e702e9af8cfdc284772e778e66eb61549dad0ef7c001f10e5dd16b
-EBUILD indexed_gzip-1.6.4.ebuild 876 BLAKE2B b061efb0eca30f75ae610e6590e723e80ffb53c446ce330450905ec0d92e7b42d80390e6da48181d05b3bbd8677ec2e0db525b51b8f3788534ed78510d5fb07e SHA512 9c1680c54fd50e211c8fc474dd3ecea4877cb07084d5b14254c7db771be9691734cd07979ce2e69533646baf0a8d3a30e339a78699dbb72c16e3d2fb829832ad
-MISC metadata.xml 1028 BLAKE2B b3e36bfabf9ab448f48ac4d6bba62967dc1c8a23d6922c5726996e5d50815278d7e5f5748203f464162f7ceb92136b0a46b1db6db8bf979d588298c872f16cac SHA512 c50c3e772dd871d8c708da75022e1802117c395ef6d86014b09dfff4b68e9447dfd7460190668af4613fdd427782914efd8f2447ff6e24d34b0a6ae67e381fb9
+EBUILD indexed_gzip-1.6.13.ebuild 1133 BLAKE2B fa60b491bf4c84cbd6119806db881f228effbf1bb23f2c6eaff40ecdfbc8b6566cd4e101761034f88734cac2d12d60be50074f96be717140b1ba545d33ac33fa SHA512 6baa8f0c3b2d40029a51930bd2c88982b5c9a45e63daae9b4403d22195ac7749f2df13ee20b9b8db756d2521cb01ee18dcb9374c46ab06e18aea9c981122e174
+MISC metadata.xml 1028 BLAKE2B 936137cbcbbee70168a4e3514fab4f41b27c7f244f905272bff8bd77f7ee1e9e45a1299f008257c944ef519cce09ced963fc14da02dcbbd9faae803dc5bf7672 SHA512 5e11938d84fc159a02713f357d616bb619881aaac8135cd454a45f9f9c6193ba99340c48c89a04b227a35ad12826d83aad3bb1a90f5e1cbb711fcf8d27d07f6f
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
index dff40b18267e..245f33e3925e 100644
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
+++ b/dev-python/indexed_gzip/indexed_gzip-1.6.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild b/dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild
deleted file mode 100644
index f2cf3667d4c1..000000000000
--- a/dev-python/indexed_gzip/indexed_gzip-1.6.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Fast random access of gzip files in Python"
-HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
-SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib:="
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov=indexed_gzip::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	if use test; then
-		export INDEXED_GZIP_TESTING=1
-	fi
-	distutils-r1_src_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib/indexed_gzip/tests || die
-	epytest
-}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index a452ad470e8d..bc43b287423a 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -21,7 +21,7 @@
 		compression standard), but will work with any GZIP file.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">pauldmccarthy/indexed-gzip</remote-id>
+		<remote-id type="github">pauldmccarthy/indexed_gzip</remote-id>
 		<remote-id type="pypi">indexed-gzip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 4f34f84c3f0f..41cd38fadcba 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,3 @@
-DIST inflect-5.4.0.tar.gz 68594 BLAKE2B 60898e019c04b9d86a1591c341f48e7e3093eaa4f93bb4f902f4d405f1151d705f902b792028ca97a85ed47ffe509bab758b3ec74878ec82f5dac3c953197ca0 SHA512 48b7d38faf41b3f682226b66ea5493b7d4ff58a8db52c9b90092fc329aee761b090791deeda24234b9f9fa47d8db9b499e1f4304367ef3637c441959e8b8d005
-DIST inflect-5.5.2.tar.gz 68843 BLAKE2B 60bfeedc6a106b5b2715aebe158670fe18c097f7b28a353b6225d71366723113ff247fc9d23d5e740385811dfa335f1c67fa1497712854e3140ff3b0a150459a SHA512 836ae6ec8dd450d6ffca5e69ac1b4889c631fa0caf9326716b571a56aec9feace33894a35cd87a56dadd7ecdd2586cde12345a6b06368ef485ef9ce2b117d137
 DIST inflect-5.6.0.tar.gz 69251 BLAKE2B 49ebba7149fb550a75818a18a47c6524a046855c330d924bbcad7751b09538902cd1f9075a77922defdda1b8d29dd4966569c7f8c1a2364518cef96799ed21cf SHA512 c7cdd57d84b40c2479637eaf37089b2c5c16d738feb28c71f4fbd3fa4e08f0683c8e1a1e47904fb89afb90404ec8652e48941cbd2f1643dfdfebeaaf307e56ac
-EBUILD inflect-5.4.0.ebuild 690 BLAKE2B 905ffa487fd40ac991687bde1991f21bc3af6b240ebdd6fcced4e19280354facce3e1b78e72ad292110c981e9e237f6197061c927854963b16c1e1c5f025b3b1 SHA512 4ca033179255a49e010ca3fc2f3d21dc24626deff10f0ddcab5a334c25c8f02b08486df8f12a1f8426c17b748283d7635d24e2247441fafff7c1508778b0429c
-EBUILD inflect-5.5.2.ebuild 625 BLAKE2B 5ec39e6173ec8483854439986819a2b22145ac2661f1491d9bedc4e4ed2991c89dd129a4b2188223aac4a4c3cafd53a7684ac1947e651ef44b4e4e56299ee154 SHA512 2566bd76f65f6d04a7b2066dc9a42c5f5769e0b61b68b4aea747ebebbfdef516d2c10655dc9ecca52f523550f6a74d8ac1f55acb4f834027e3a7f619d73b3c2f
-EBUILD inflect-5.6.0.ebuild 625 BLAKE2B 5ec39e6173ec8483854439986819a2b22145ac2661f1491d9bedc4e4ed2991c89dd129a4b2188223aac4a4c3cafd53a7684ac1947e651ef44b4e4e56299ee154 SHA512 2566bd76f65f6d04a7b2066dc9a42c5f5769e0b61b68b4aea747ebebbfdef516d2c10655dc9ecca52f523550f6a74d8ac1f55acb4f834027e3a7f619d73b3c2f
+EBUILD inflect-5.6.0.ebuild 617 BLAKE2B 9dc0fccb61e8cd8133edd89ad0b0fde7ad15783866cd06aadad9a84a3d7c75a715ca257210d24bfca8733a19dd722dfe36b3683e368a0175e06e6aba3a7ad0f5 SHA512 ae11ec54c11d6a463f8c965231f27af5f8efce904e8250f41ee0e06ed3f8d50e4083bc5e217ec7015fe67cb0a3bf7a75450def633669923868d4e9c15d2a7778
 MISC metadata.xml 557 BLAKE2B 1a327bb3ea2f7ecb0b3100d9f443c9c0c20a89f1e560eac79cef20a6f12855355dab9c71bab94881774e2be6fc2b4bd9530e1155caecdf687228db259ed34bba SHA512 d719ba7da2f6544cada37998dbc6b104cebb6419ab65bd164411928953c5898da2f5f2f789b72d41f7b46ee7a5570fc6646d331e0df39b34c1fa0685fb9165ab
diff --git a/dev-python/inflect/inflect-5.4.0.ebuild b/dev-python/inflect/inflect-5.4.0.ebuild
deleted file mode 100644
index d8c07dc94ed9..000000000000
--- a/dev-python/inflect/inflect-5.4.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jaraco/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-8.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-5.5.2.ebuild b/dev-python/inflect/inflect-5.5.2.ebuild
deleted file mode 100644
index cf1b33d924d6..000000000000
--- a/dev-python/inflect/inflect-5.5.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-5.6.0.ebuild b/dev-python/inflect/inflect-5.6.0.ebuild
index cf1b33d924d6..1eee83767dac 100644
--- a/dev-python/inflect/inflect-5.6.0.ebuild
+++ b/dev-python/inflect/inflect-5.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/inflection/Manifest b/dev-python/inflection/Manifest
index fa76e0a222ca..f5ab035ca5e2 100644
--- a/dev-python/inflection/Manifest
+++ b/dev-python/inflection/Manifest
@@ -1,3 +1,3 @@
 DIST inflection-0.5.1.tar.gz 15091 BLAKE2B f3db09d1010ce22b67dcd519f59f25f240f463872932fd6218209768b4c5e064776ef5300a8d7f9a6b9cb94392b05b46963f00b94c6de29fb325947df7b243cf SHA512 82f70e2b81fb166260191a464383f6674e3b21504a35ee605ac6ce4bb163c8f3bbe6d06379575178d7196701459506dd541f32e48f24b32f42d5cfb717158d50
-EBUILD inflection-0.5.1.ebuild 444 BLAKE2B f9bfd47b4bd41c511219da40627a6121894406bc53db6dcba3c2dce09a2bd8fbc7124e8b079643b6e58031e1277543855fd02ce9ca7c42941a1126ceb45b73ba SHA512 e2834b1384ca9886b0987ec8cd595dcafa799bea37f91e8714644021856a0e7abe70e53dd12e76f06408b10b74227da88b821435acc2e3d896cd66b8469a504e
+EBUILD inflection-0.5.1-r1.ebuild 475 BLAKE2B 65efd1136a2b66d20ccadfebeae83885146dbe2a832ab603a4d4c3cf5c946bbed3607fb4519ddeb87b1a548208abb5af79189a7480abdf4753448e7c27ba672e SHA512 21d21938e3e7e875a995724d79adbd3aac23054b10d63056b0ec8c10391268e0b02ffa6492303dba6e1e79d4fba06673273b79e517297b4485ce7d9d78806ebe
 MISC metadata.xml 445 BLAKE2B 54ea8efb9148eb2cf2c273976bda73ac7552460920d1ef99f545e2ed096d065bc7cb7ffb44f989bc8429677eacc68de97b9a7f64a6d25fe07f55ba5bda5097a6 SHA512 d32e48ed10db8276a5e9efa040b91869423bfc1ec0ef93d875e726eb4ce23d9ab7ad11deb6aee79cc29a063e4a2af64a8076352d1557cb59464c36496edd411b
diff --git a/dev-python/inflection/inflection-0.5.1-r1.ebuild b/dev-python/inflection/inflection-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..8feea6f41aa1
--- /dev/null
+++ b/dev-python/inflection/inflection-0.5.1-r1.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=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A port of Ruby on Rails' inflector to Python"
+HOMEPAGE="https://github.com/jpvanhal/inflection"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/inflection/inflection-0.5.1.ebuild b/dev-python/inflection/inflection-0.5.1.ebuild
deleted file mode 100644
index e3b7b12e03a9..000000000000
--- a/dev-python/inflection/inflection-0.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of Ruby on Rails' inflector to Python"
-HOMEPAGE="https://github.com/jpvanhal/inflection"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index c320eac04239..18a601d6e8c3 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,4 +1,7 @@
 AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
 DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
-EBUILD ini2toml-0.10.ebuild 1756 BLAKE2B 9a7cee9a18f67cb0d6f7fe57946dee8173a597f1da3b5e4d21a5d575bc8f21da08b982411574c259257717f923afdf31ead4b28dfea9cc6e623a484dedccfb33 SHA512 288288aefeba18d0b6303d5b28d93d8070ffdf2844540cf92e681c67a3bda3efb34da51b0e7ce5d65602b8a7dcec3b1fabf1171168fdf38882f917ef2d6cc466
+DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
+EBUILD ini2toml-0.10.ebuild 1755 BLAKE2B 4c7a421ba090d291b492c5284c77ab8d606d720e377f94e8b7da7a15188fea23694be7d1bae37f5d3c05fbe2e9a29a6111dde08c389456204faeb8446c4ab23f SHA512 0e1aae211ad3a54bfb2964b0a0e08572a5832ee351f40fc92019ce9c5f9ae3e36091f62ea94478076f97a381aa049fbc568df3ba190ba13224e7aa19500e617b
+EBUILD ini2toml-0.11-r1.ebuild 1132 BLAKE2B 66ff865c1eadc8c03713a42efdc4aab5aea87ce6d08896ed0856ea4335e8365b25850610a28102f0e2a6f3cfa142f30d430aad2e2636925cf62623a19966d465 SHA512 2689cb972d214a56501033ef7570af6a92aa9581f147640d323f2d893097763ad321be1c19d47c869536f24664fb4f29b6f14a4480fdd62c49d505882cc5df84
+EBUILD ini2toml-0.11.ebuild 1719 BLAKE2B 2e1c03d2c44d196372584a151063b5ad10ffacc89c6dba1ea9216c5bdce21799de25bb9d508362a255df0b8293e710edd33ec38a184f2a5ef1298b433fa4c2dd SHA512 470d4a9675fe624a7a15d7674a380ea514df4b5dbcc26b6d5f287450713018d5813213af3a23b9f2f23ac7970719a826efae3398f0c8a48b68f925ac494809cd
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
index f8366f951280..0e0c3b630fa1 100644
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
new file mode 100644
index 000000000000..71e549fccc36
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/configupdater[${PYTHON_USEDEP}]
+		dev-python/pyproject-fmt[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_IGNORE=(
+	# validate_pyproject is not packaged
+	tests/test_examples.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ini2toml/ini2toml-0.11.ebuild b/dev-python/ini2toml/ini2toml-0.11.ebuild
new file mode 100644
index 000000000000..de5aad955494
--- /dev/null
+++ b/dev-python/ini2toml/ini2toml-0.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
+HOMEPAGE="
+	https://pypi.org/project/ini2toml/
+	https://github.com/abravalheri/ini2toml/
+"
+SRC_URI="
+	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/tomli[${PYTHON_USEDEP}]
+		dev-python/tomlkit[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# pyproject_fmt is not packaged
+	tests/test_cli.py::test_auto_formatting
+
+	# fails on whitespace/comments/formatting
+	tests/test_translator.py::test_simple_example
+	tests/test_translator.py::test_parser_opts
+	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
+	tests/plugins/test_setuptools_pep621.py::test_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
+	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
+)
+
+EPYTEST_IGNORE=(
+	# configupdater is not packaged
+	tests/test_examples.py
+	tests/test_transformations.py
+	tests/drivers/test_configupdater.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 8b10463d24f2..0606887c215a 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,3 @@
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.1.1-r1.ebuild 724 BLAKE2B 49987544a8c21ac8eb7d1b9697d9e30852a4b8fbb70101301e306077742fb357869046bb717c7d909da11b5849014448a5a022a5ef3964df46587b7738168131 SHA512 82202a1e533f8867b970fb48948684a7f0d682897592a646208d02da491641e60e157c7030f2d30e046c4306940b5aed45ecca45b7cc87fbe4c1868c95b67faa
-EBUILD iniconfig-1.1.1.ebuild 646 BLAKE2B 1dd7d03d7d6d0dbf8d899547a56815bcd818857a73433a303db561e07c21e40756acb5ed1d9f9f6812cac6171f6996f3cba099640a1d5dd91cfae00ced889be3 SHA512 acb28cdf4107e6ed3095386efd6bf70e66c91f367bc44031015d55bdda8e72a78bc492d3c9de0d7fe430e9746bb6c425f15224bcf6a02eb0c76b69ea798471d2
+EBUILD iniconfig-1.1.1-r1.ebuild 716 BLAKE2B 1c2c1d6d996a20ae52a1c0270bb4acd0bec9b655df5264907f8b3ec42526d64bd9035f68ea915b556a8e66eff31be8d1d0e901a993d9276ba76720d3e4f26ae0 SHA512 b305659d7f64f1fa1e7432b7b55608895dc8f592f1aca4137bee71c12406fa6c84c3e6bd1f8793e41b27c86eb19b706f16d38ce4534e3d237c5c2f5d1079324b
 MISC metadata.xml 375 BLAKE2B 07a0e2560e140c553289626437b1fbc46653a33cf9937775d60e6324361387d8399dfa3298ed8702a9532e55e4383e7493e7530be6586abbd2c5804372206627 SHA512 24e5acfeedf11f59184106a7b09169222761ffcd960ef398bce23acc3e63291b4c30230804a7da6b96a9799dadea5032d7fda7e7705577e1c6e9f8728ed601d2
diff --git a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
index 6ff39b0ad7e5..eed3a00ab16f 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
deleted file mode 100644
index cfc7d6c52303..000000000000
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020-2022 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="Brain-dead simple config-ini parsing"
-HOMEPAGE="https://github.com/RonnyPfannschmidt/iniconfig"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iniparse/Manifest b/dev-python/iniparse/Manifest
index 3558ef728960..4ec0fecd5f81 100644
--- a/dev-python/iniparse/Manifest
+++ b/dev-python/iniparse/Manifest
@@ -1,3 +1,4 @@
 DIST iniparse-0.5.tar.gz 32233 BLAKE2B 3da99f9d828318f78ddb8789afe63a7fdec017eaf41df5f420b0f358a9724eb787f312c9964238d9e42ebecce143d37f72858c7935cafbcf0221229b89033026 SHA512 b3f10d1b36497c3c5c71cb0a1ac73d74d8944f4ad3b7acc4a4b0246c2f1a20c184d9af20bbb3cb8ec4f57fddfb5e103b92688847debb4200ef0583353d7f9556
+EBUILD iniparse-0.5-r1.ebuild 701 BLAKE2B 9c1dee9de1288e60b7830d28232ee6a7b781d2dab7ec7ef8feacc2e8a52a6d54c18156d59730cc216ec8c7a156fa2e18eed828a44eb6f8d5f42059a926cb27e7 SHA512 aff17349c4015ef084a63909aed93ef6b6a03d380f53815ff720b3b7054b877b6c7357fd6145bf5c47e03f78d293c07f9d605fef23e0d0756503e139912bc637
 EBUILD iniparse-0.5.ebuild 506 BLAKE2B 478ae4558779c9c63352145d0a707cdd9ad2911a0dc98cb8e3d9d5b2b01b2b66c70805d20087adc219e5850efcfbc4c138f62555e80112c4eeb67663644cf5b0 SHA512 af48c2c8fe961ed28a9382420e165d8909b87970593f912a9905a1621bb6c920c933298fcae7be3491280568abb7c023b722d554fe452e653bd1a5fa96a04ad6
 MISC metadata.xml 336 BLAKE2B dfe7c6dd67edf1dda2403035f6540398e5797b261d0cabe768365e3b51a6a1d0a3475aa6066f5fbb53d9ae2fd7de4e13d0f4754554f095cc758fae8ccce52305 SHA512 9a2b6d0733ac64106e9c376dca4b6832de44bea2ec4d96d68b9cf39fb1e13f28bad14065aef33e525d496c1c57a0ab3d31feb643ddb8caa2dc6cff125de2c679
diff --git a/dev-python/iniparse/iniparse-0.5-r1.ebuild b/dev-python/iniparse/iniparse-0.5-r1.ebuild
new file mode 100644
index 000000000000..3160dc7f5de9
--- /dev/null
+++ b/dev-python/iniparse/iniparse-0.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Better INI parser for Python"
+HOMEPAGE="
+	https://github.com/candlepin/python-iniparse/
+	https://pypi.org/project/iniparse/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+python_test() {
+	"${EPYTHON}" runtests.py || die
+}
+
+python_install_all() {
+	rm -rf "${ED}/usr/share/doc/${P}" || die
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
index fe10f96ad8bb..18500ce87961 100644
--- a/dev-python/installer/Manifest
+++ b/dev-python/installer/Manifest
@@ -1,7 +1,5 @@
-DIST installer-0.5.0-py3-none-any.whl.zip 452177 BLAKE2B 41bb5929c1bc42afa1e09f366356aa441eb92d258da40421d7f46ceb466ee4604ed96fef0969dcd2fe28e8f4b06c741ac3108000f69ea42b6bb194890102ad71 SHA512 470c4fec8888114af6769db8b8cefa09a376bfcdf0d78320f884a7453a4991765cdf0b9122c74d8e147d193e75ab3e12cc24c3b93c0668956c17f52443833c4e
-DIST installer-0.5.0.gh.tar.gz 468351 BLAKE2B 6c258bdaae3351e87a88675fb813bb70611d9188ba16a09ba03de4caa3d79fe32544e229f880338304d00343c2b3121b1948bbef2e27c7255d231a3d5665aa5f SHA512 8731bbf8a51b1094dc87f84575eec07a650988bdeddf205d04cf80a5088eac0d8b2927022864f4011a9562fcaae9f511747e5672f94ec3cce1dccdfa833c4fce
 DIST installer-0.5.1-py3-none-any.whl.zip 452220 BLAKE2B df2d2b351c3ca1e7d5991cebc77035bd8da980d0cd739b11532dac3e1fca4bcf58ebb746b4a3468978f765515ca22d3f777b279174715aaa2838231d4204028b SHA512 50f4778352393ad4d56ce5ccce2f5691df2114ef133b1a614e1c4ec2802261dd4de162fd359f47a51b4195b9b5594f5448591ee80356fd2ddb3221a2e602c797
 DIST installer-0.5.1.gh.tar.gz 468433 BLAKE2B 5ba76eb2a576209c2bdf80adfcbd8ea22b55394652640085cf8dd39ded06a0a33ab75f3e4ff73d5de2db028b8c4dac652d631c94e2c9401a825ee75e7b143c01 SHA512 0320c1795c98a593b5da46775465e26bdf8736f59835970517cb02f2756030a3744b9385a9342e8062362d0769d585ff6cce504fdf105e99d27d6ba40281842b
-EBUILD installer-0.5.0.ebuild 1164 BLAKE2B 2056582c7f5133bd4dbf155dd9bb436f5d5a9fe83e930e2491e2384378836036073e9247b365e0461d09eb2294e0402fc7ae26ab1a4b25bf1c22f4fdcc157ea1 SHA512 2922dc55236b6012e2198797006a22a8b26e808ed429595a0fe8bb761cb0aeefd098a72bef0faa33e3e81acdf8722af838e3536ba1772abed87c176294f64baf
-EBUILD installer-0.5.1.ebuild 1169 BLAKE2B baad3111a1380f65e24669efca515b30b720eda532618b92a2719ec7dc30365a7bf8103c9acc4eb852efd22dea8461efb8833f57387e5a7dc41a5342f1194d19 SHA512 5fb1ff040cb7be51029385def654ea0946352deb21efa591cb3af68e2b97e4487c364a03ab5fb1b112197ac7c199fe266ec3e56efc209a5e8f541e7816d9898d
+EBUILD installer-0.5.1-r1.ebuild 1031 BLAKE2B 807eda941b9a8376a8d806993514f1d67c05a894f025cf0f071a799f4c7cf2f6a57891c61de6b8c84300f1077f080a9660ae7ba7a95f501f19ed49dc69ba6f79 SHA512 7a3b1b5819fbe6325476180bde6a8bfbfee415e382cb415c21e91d7d4411db8dfda9a452a183252d4c3bd6d5b484f9bd1e7d320cbc0d4769d1b73d5a613e96ec
+EBUILD installer-0.5.1.ebuild 1161 BLAKE2B 2094b8f7e3224c6ce81fe003f06a378baaa82e50002a07fcc343e9db69b4af7faf609319410464f2a36ab852ab67403f0850fc610aed5dd5742497a1ea58c879 SHA512 7e8f5b964849412f6270e3319c450df8861bff3bc99ae00694e3d27e9f31267febe30c2dbc1e6a47c22a798a774f0110f2dbd57aa8277271ad5df0431d48bc33
 MISC metadata.xml 391 BLAKE2B 4dd6c80628cb652a95e1c779b87ccd3503197411b2bbd2bb64b964d57f6af4a60d5ef7f58b0c20a9842f9124e5c2129211a52dbdaa1192c98157de65aea64bd2 SHA512 2c2757ea4c6676a8282983f5b941d9ad6100228b0008bad2b216ade9f5489092c6337de3e43b4930e79c5fb548669eb337861a6cb7aec651986597202b4d1c6e
diff --git a/dev-python/installer/installer-0.5.0.ebuild b/dev-python/installer/installer-0.5.0.ebuild
deleted file mode 100644
index eaf0e45936ad..000000000000
--- a/dev-python/installer/installer-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 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
-
-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/py3/${PN::1}/${PN}/${P%_p*}-py3-none-any.whl
-		-> ${P%_p*}-py3-none-any.whl.zip
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-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.5.1-r1.ebuild b/dev-python/installer/installer-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..4f89e7433018
--- /dev/null
+++ b/dev-python/installer/installer-0.5.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 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
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for installing Python wheels"
+HOMEPAGE="
+	https://pypi.org/project/installer/
+	https://github.com/pypa/installer/
+	https://installer.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/pypa/installer/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P%_p*}-py3-none-any.whl
+		-> ${P%_p*}-py3-none-any.whl.zip
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	python_domodule src/installer "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/installer/installer-0.5.1.ebuild b/dev-python/installer/installer-0.5.1.ebuild
index ce5ec797e91d..f0e3c54a4d5b 100644
--- a/dev-python/installer/installer-0.5.1.ebuild
+++ b/dev-python/installer/installer-0.5.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	app-arch/unzip
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index 10817a4ac0df..c54d860c74ab 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,4 @@
 DIST intelhex-2.3.0.tar.gz 44513 BLAKE2B 935fb6d5c27231c4b09f7fbe624df07adfdb9eecdd99b17cbbb4994dc74e0c7a141546a663229b0598ddd3884b8d17dd7244f770319a594387de074e7591aea8 SHA512 41b50feb7505474d74a2b6293d755d118b6dfd23a5c9b995791e7dcb7a97fc6f39d8f804b72f6372ba8e136684f9c979c7ce9ef2ff9796b6202eefc9d18f4424
+EBUILD intelhex-2.3.0-r1.ebuild 509 BLAKE2B 6f311166a0b9fe5bc670fd7c5b823500d6b84bfae7cd3307f4072fab490e6de98cfcdec877d1b154b0bdbef264217feab23752d39c1462ee97dac1f1515fe282 SHA512 4b5b19f48bf51c2e78b8a55f243d534769f4b91a676d4996be95a97939b927801a35aacbfc10597d76d9ebd73c531c8b4cc42b743d64bc693f5ed97129fc08d7
 EBUILD intelhex-2.3.0.ebuild 467 BLAKE2B 6420a92abdfea42ef33d3dd516b6fe054a62e2e08567f1828b02694f52e597133d231def4ecdc83c8139df77f1752ae4b077050e80ec8db44a3c38a020018b6d SHA512 369ec24eab6c2eda1e8f91aeace1975af027031ae065d2501219a9fb4f2d3b664bb4cb619a17728c46d602c1eadc4d8e014ab37f4017b51089cf570a8de8b699
-MISC metadata.xml 368 BLAKE2B 071c39c4ffceda56913602f053d864f4950c74ca7a83de1fa8d43c8e00551561ee8125f9995cf7a06df1dce090bdf4f97567cdc1deaa4fe6143742c36392c2a8 SHA512 edb043b4fce8ac148346382063d01e8e174d8eb431b111bc541d5b871326a139bed5de3019f0c41442ae3289ae02b73285c969b7e0a79adcfd99b5a00a4e673c
+MISC metadata.xml 368 BLAKE2B bfcc62fc30d07cfbf68c85cfe04d5a463f2495d692d903a09bfc7e64a2133de5fc9dac5a0acf6b8e361f94280b3640205121fc037b74dd9a2af515176ec17770 SHA512 064025d5665bf23868bd3d76a1acf4d93fa55063f89c96631642433922820db01ef8174dd05272ab17acab081eee54d6af411885089dd6b43546d4372dd8c61d
diff --git a/dev-python/intelhex/intelhex-2.3.0-r1.ebuild b/dev-python/intelhex/intelhex-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..9cfe2d0e8d60
--- /dev/null
+++ b/dev-python/intelhex/intelhex-2.3.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for Intel HEX files manipulations"
+HOMEPAGE="
+	https://github.com/python-intelhex/intelhex/
+	https://pypi.org/project/intelhex/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~riscv ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
index 48b4cdc3cb08..c519bc041175 100644
--- a/dev-python/intelhex/metadata.xml
+++ b/dev-python/intelhex/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Python</name>
 </maintainer>
 <upstream>
-	<remote-id type="pypi">IntelHex</remote-id>
+	<remote-id type="pypi">intelhex</remote-id>
 	<remote-id type="github">python-intelhex/intelhex</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-python/intervaltree/Manifest b/dev-python/intervaltree/Manifest
index e4985876cd6b..800d1bcd1768 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,3 +1,3 @@
 DIST intervaltree-3.1.0.tar.gz 32861 BLAKE2B 311b7937526495ff0d5d85b4e6a01744d585714c119e6b128ae47740a50234bfe32395728e55c1c9d0670c92b4e815901dbf26c9a83bbe8271875967e9f11f1b SHA512 adb49726912ad6e9cf6c0985b4fb94df91b4ef54aa2eb327186d7f15bc992745d81654d49f1dd2ce95f7173683ba2a072787ef1e8b389cd9b7e23b9ae743906a
-EBUILD intervaltree-3.1.0.ebuild 482 BLAKE2B 2ef3ef6974aa0db491ac11cdac9591ae2c8743f3d62cc73ccdd0c49fa6ce20bbd0b06b22f006429f95bb1a70289a65aab3ee18815faefafa36f562b766f67e95 SHA512 8f519d1b3a50dd81556a7336d13007dda631893527847cd6c6fb17fc81c2659416231191d0144b7c148e52f3466ef0ce8771b19232fa1e280c7b9fa63b377012
+EBUILD intervaltree-3.1.0.ebuild 482 BLAKE2B 044d6db84faf0e8509aeca23dc6f31512586bc17b735c382ed1fc5cfd658ece4be704c4c06f6128f1b55197f358d5abeb28e61c26cea8a4b7bb05c1c7174e036 SHA512 46addcaa0d62bf3308147a891c40fd4b9ca957dbf2fa204f6aec056e6abef9d68121ed5e3a3aebfe261afb47882cee62c5c236c71a373bc8ce318dbaea7b41d4
 MISC metadata.xml 361 BLAKE2B 3ffaba82a393221d1fc74e6db19560dfabb92c1597c95dd4c2249238e465832f666dd05bb9fb3a8ba15b5224ca347165633a5ab2eab4461c366eb09ff3c712c6 SHA512 1885dd8b3cc203d7056e8a639bcd5c50775898016650556dc04cbb505d1e45d24e686e46ce836b5f9429f09c4d56af3a9d7af4855956d13167d0256a00e81459
diff --git a/dev-python/intervaltree/intervaltree-3.1.0.ebuild b/dev-python/intervaltree/intervaltree-3.1.0.ebuild
index 6e6e9bf04d0d..9f2e5cf3cf3b 100644
--- a/dev-python/intervaltree/intervaltree-3.1.0.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.1.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=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Editable interval tree data structure for Python 2 and 3"
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index 09c343417a8c..2060613ee8d7 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 547 BLAKE2B 5ce521a699bd61153d8f688906d0be412859823a2ea5201d0c57863b1beb56292fa63098194adad79f862bdcd18c67cbb7147734a802fe9a9ea234a740015d56 SHA512 ea074ab4568ab7493524319e3bea66a7e67be97ecbbf75cd18ea0ad426eed89af393ca41c25bf6bf605b995ad021ac0859710dd54ab8bdc7bea490f9cbade3d1
-EBUILD iocapture-0.1.2-r3.ebuild 586 BLAKE2B 7cdd2e5d7396eeabf40005ea127789ac09b739c7c4e655f95368d1914c9dd0b85f283db540d9fcb4285b483001685051ed3acfe3ec274895ea019699e680e53e SHA512 280be5bcf21a69c70b69059d65d20629f83d3a3c69a87d2060322615a5f03f8e68198cee57a4860524c3caeccd9ba227fa8434c577dbb21bc8c7597f61342067
+EBUILD iocapture-0.1.2-r3.ebuild 578 BLAKE2B 9489ad0e9ecab09f86a268afe5133324f6548c089b555dbecc6e114648f9c7255a909267bad515f64877936b67dcd1366b8ddd802db702b19ceaaa62b297df0d SHA512 26af3be86847ea8a6ca6014f90e96095d8081d0030de12efedf36c782bf6c3f4ceacca083b118e85cf4a701710d4c2feeff9ce576ac5c6c0cb1f00f507e3bd2e
 MISC metadata.xml 393 BLAKE2B f51ed7ca07648d82aeab28f5bae52ffe4d6322f78ecc989ce6d9b1d1ee937e4deff757677767d6bcb8b44d5c7c2a2f497ec187197e945a8587dc173b8d4dc800 SHA512 43dcd281489f6ae05bd80959f3841a483f52c1d190f0fa110d2169c3911d97807f6ab32c2dd07263f602979d2ea7e6a941f9419acccee701cac89609fab400a1
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
deleted file mode 100644
index 6dc853838191..000000000000
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 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="Capture stdout, stderr easily"
-HOMEPAGE="https://pypi.org/project/iocapture/"
-SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="MIT"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/iocapture/iocapture-0.1.2-r3.ebuild b/dev-python/iocapture/iocapture-0.1.2-r3.ebuild
index f3de73379f07..640e6891a0d5 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r3.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~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"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/ioflo/Manifest b/dev-python/ioflo/Manifest
index 375afbdd4e24..bce2cc2eaf3d 100644
--- a/dev-python/ioflo/Manifest
+++ b/dev-python/ioflo/Manifest
@@ -3,5 +3,5 @@ AUX ioflo-2.0.2-py310.patch 2520 BLAKE2B fbb1b8b5d1d2d135abb21f7f2ff094d4c85bf4d
 AUX ioflo-2.0.2-python39.patch 3813 BLAKE2B a21f5829b5a2fd4200350949d66d4fd77f5ba2b21d5fdb95c7754745fc2cf41f18640d4c79f5e1037fc0d4ca016c7dac062567aa8662b0e41e702e4dd0a94931 SHA512 b588703d653848401fb8e13be949f6de4ff41143eae669ccdcae8edaaac1883be0a684112dacfdf11fa3f2842dbde0dce2b47a7680cb87761d30ffa4018569e8
 AUX ioflo-2.0.2-tests.patch 1059 BLAKE2B a093cf0db0e00c4f06f0eeda76acee4515951e0dca1a77688e2cd4ccc33a3b10402228d76aa25f787cbfa8771d12f0613fe62e5fa38e09b6d8238870c2b25951 SHA512 5642963e6c29941c2803c6833d229b9fab62f60e7534fb6bfd7a101746eff1704dcfe3bdbbc72bfb466317562d995ede5a70a8ffc83ae9e76ab2d9c01bcab349
 DIST ioflo-2.0.2.tar.gz 837382 BLAKE2B 1fe878c8a9a47a9be5083e392e15256f1a566433b4341e2ee234e84332bb72af0c426d04c77ccace33cfb05664745caaa63e910913c3d63bbb2e5d8360a1ec90 SHA512 7485924ce329889afb1c3e0555b54fdbfb11eafce48fb0ac15bacd229fea512c44fcc118bbc4368ebc7c770d62129ee6b895b982f73a269de7131ea37daac02b
-EBUILD ioflo-2.0.2-r2.ebuild 964 BLAKE2B a5f53f312da2bd99ad0847872d5d02185200078da15ce46418158d45eba8d6266c3b7d56202a913546bdbe52360338de94cf3bb7848a2fb929119cbb5247c5b8 SHA512 2a360b87845ba219aa7623d9ca04d680d993a79737a51222473f1d612688b6316207414ed886968d48a849dc6f235e4439439c6fd61324c878995eed63726f72
+EBUILD ioflo-2.0.2-r2.ebuild 971 BLAKE2B 207fbdb926dc712dc361f96d44cd24da63375455203793e8011582ea6998c97b5bd6af7cf119a7128f83da4d27bbafb274026d0dfcd6fb7d005a5c4c5a94b4d6 SHA512 07bacfb51186f0f3f1410b97fc04c503f14b1197179690f076c15f4dc0ab5d9323e0bfea7ad5c806e742e5ae5949d3b0592ebec819acdb986fe4c7f1c21a6cc5
 MISC metadata.xml 494 BLAKE2B dc398c0ee508c0c1cf9ee17712efcbf7f994ed053416da6bdd236fe80402b80ce251272824bebbdcc7ea79cf98b6b5dd812de11fca55eb625bf19e5cf93228e3 SHA512 7364c6b7a37dd8ed762fc7d609e71ff93cd3321f6f94f88d795bd0a3082749571644cbdfd3c9d63a916249122fdfb47ff5377907159782ddf5744c5ea4a13f39
diff --git a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
index 729a90285f1f..8ccb0926edde 100644
--- a/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
+++ b/dev-python/ioflo/ioflo-2.0.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index a2a9279745fd..e809373e1061 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0-r2.ebuild 622 BLAKE2B 59c65db3688cf6a4c71ab1f6035156d47ed42f575eabd04d3552d5998a20f7943c995626351cf2b65f4529096f76375990dc09f20c4c96f4056a9dc98c384007 SHA512 9f231ad375958749b02ee2161a95136cdb827843d79ebb4bb2554bb41f7587e3b2915dec11cc417c0ef881c59797e33bb0923f6fcb08fa57e3ff7c0fb28b791f
+EBUILD ipaddr-2.2.0-r2.ebuild 622 BLAKE2B 31cb22d4335436907e5446d2d08aa8aeef1360988c886a748e43c5b371324371fa6989e4051d71717799af3908e010cd4c061b611cc4798f46daf8f15efa0145 SHA512 822a7248941659389cf43782ee0ebc132b109a39b4ceaec6334fb35ef99b3f9ec648364917f67a2eff6f36e6bea98dcd4df9570565abe8ff4de4ba856035f384
 MISC metadata.xml 403 BLAKE2B 20388c02656f1a87e0032c284161f913a30bda5716879339249c0f34956e57574c9e7af29a814d38da42f3094916e3505665999f6fa0b03201e1b0191d908303 SHA512 d94c229859ea52aab215372b43023c55542437f16614acc0866cf02af5b349b44527a6733431090e731ae5fdb1e128ef0cd5b6ef3b7fa4a826e19eec7665f119
diff --git a/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
index f0e1f7480d7c..b6744340a86f 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index 6e3cf88c41aa..024110678bae 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,3 +1,4 @@
 DIST ipdb-0.13.9.tar.gz 16820 BLAKE2B d028fff2c4273fd4a57c3338093f0065868856b4f7b2b95aa0db3c2b1e7c5906fc17b5b55b79b3a3809465214bd91ac1891cefc1604ed866edaa2811380175f6 SHA512 da0ac6d8a7451e90cf433ab2a0d4e43fff76be03082da5cf31b83fdc56174fde7f0256009ad9a407d805c0bf12da5fa2f081e1aa0e0ce73ca648262acd385671
 EBUILD ipdb-0.13.9-r1.ebuild 547 BLAKE2B caee8dd4189e5862bd3bb9aee74f68381766f7dec7a7ad7672f48d7b4f3082b4c12eeb50162fc186fe2c1938a12c2563b9b2c33875715a5c482a5d4c00e02a94 SHA512 be07f143710649401d6c9a4a7db532c0c52a0dd3f2157605364f28ee083dc4992892ac13ef4246fbee668404fd4b56062a7d0f2aba582368918253f25ef471df
+EBUILD ipdb-0.13.9-r2.ebuild 700 BLAKE2B 3e866c37a1f6245a6496b0dc88fb58c657d43ebf58bf94982df98dbf5bb26a8050e93e1585fd52d86679ab58916532363199216ebac722b02d0d403b0c2e0fac SHA512 d4cad234005a8da42bd6708a98786403342bfb5c94283964525087a1ff20f2cdc3fbe2976ce3312e1fd376b89f3b243d383e0271fc81b5b8b52d6d04ef360213
 MISC metadata.xml 332 BLAKE2B 3cb1465ff0559029739d49dc1bbc06a6d99bafc7fdf63adfe7130529791d9091e8835f13e4d37ef7b3fc1e8b5bd66578e0f18963ec30552cfa2cd8df556c420e SHA512 7e2965f3534c46964709a62f8065f63cc03e7d1bb47efc26553d8f240fe7fd6e56e161a3ef242c2a1ede1800aade4142d16e8792104fa126eca49e1e178d8905
diff --git a/dev-python/ipdb/ipdb-0.13.9-r2.ebuild b/dev-python/ipdb/ipdb-0.13.9-r2.ebuild
new file mode 100644
index 000000000000..8737b984f926
--- /dev/null
+++ b/dev-python/ipdb/ipdb-0.13.9-r2.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} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature
+
+DESCRIPTION="IPython-enabled pdb"
+HOMEPAGE="https://pypi.org/project/ipdb/ https://github.com/gotcha/ipdb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/ipython-7.17[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS HISTORY.txt README.rst )
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "pyproject.toml support" dev-python/toml
+}
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index 1deba342bd5c..d761e769a441 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,3 +1,3 @@
 DIST IPy-1.01.tar.gz 33641 BLAKE2B 10d5ac5c3df00a562393ee762e9ad0f458ecf4745f894ab23e686b7112842adcbb3f25064c0010630745273fa72280ba5ef92a951d687d0f46f341acd6c041ad SHA512 f0983254523025a1819d543877d9651fb6a9e39dabd3b043488495f681b02e43b544a0121658a0430a418a1c39b360a59db1699af87a75a16a2bdc29fcb2b74c
-EBUILD ipy-1.01-r1.ebuild 918 BLAKE2B 024720ffcf2d41a68620d749d2d64db1ad7db910e3a5e109d990049b9a7102e7f777aaf06eae8d8bc108432ff5368ecda2fc0fca8502e57aa87df15164fb174b SHA512 f134ff9ed6a4c1e9b2e82af6bfdbe8e5b19b5d6e4843a6e480de16366010f8840cd622fcbb168f8f1bed3da0a3b559d7f7ba62109fb7005142abd44009666fae
+EBUILD ipy-1.01-r1.ebuild 918 BLAKE2B 97c06688debe82fe6d8806cf9fb9f5934b5ce9a7d8647893a1999b7e5d606993932915cb48f7e6d3d17cd11d5b1b47c659f07261eaef189a4655d42c73228b94 SHA512 9b71ea6b34532126fe216c4b053baf6d3cf517aa97e65e67900a5c451fae0bda0cb49015414d77ecf231c7242b27561c5c327f4eabd839ea5558c18ba2523728
 MISC metadata.xml 404 BLAKE2B 9b453bad2b9cc6b6f7b6bca5bd69afbc1c8181f8250d5889b8a192f6a242e94b546b650d0ca05acd7668cee160642d519d2eaa3f3d8755ffa228b43efbd3a6a0 SHA512 fb2d4c33ea00c87f1106ebf2ea4150476c62acd544f9c94cf28d5113cd272179df4710595135f5edd26cded036977fb7253e77c83d34ae362bd4b35eebbe356c
diff --git a/dev-python/ipy/ipy-1.01-r1.ebuild b/dev-python/ipy/ipy-1.01-r1.ebuild
index af1a4e860184..c22c927a15dc 100644
--- a/dev-python/ipy/ipy-1.01-r1.ebuild
+++ b/dev-python/ipy/ipy-1.01-r1.ebuild
@@ -4,14 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 MY_PN="IPy"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
+HOMEPAGE="
+	https://github.com/autocracy/python-ipy/
+	https://pypi.org/project/IPy/
+"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 5e11f6b971c8..8991289553b4 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,9 @@
 DIST ipykernel-6.13.0.tar.gz 131331 BLAKE2B 95a662b5ff6062fd8f6712a214b2bdcb227064acec145ebbb2ff7dfc0647ee9c486bbb560502e8ab6c5f74bb44c7715a1ee16f4b8cd2661b7a6e77206be7ab67 SHA512 6025a540d7ae08f637d2cc9a022805df54c11844c93d989be73a3a800fb0985ec56f2ce5d8ee940a5ce51d41b4d1f632131b25c1f5847cb51623c285c4944f39
+DIST ipykernel-6.13.1.tar.gz 134356 BLAKE2B 212449f5e49f05052e36b60abc94ccfd81dcf6c13948d2ba32373ffab59f009ac28c251f6b9a9f5412b3d9a0f1347a2352f2e61b831d5efd8d45663ca43b4fdf SHA512 be0f5cf4eab8cf38f20a96e6e59971988bfc03105525694787d4dbbd092e22efb5b955ef622e0c8bc87fb43f29b0f4dc8affa89b81cd2eb7b4d9c93f7b9c68e5
+DIST ipykernel-6.14.0.tar.gz 134614 BLAKE2B 41c2d9179aae12aad207ff76f1451dd42beb4fa12123146a7ccbde2aaf12b52f374bd8d4e7c88bc26fed6e7a5b06629ce1e91ba87cf61e16d3de1bbd50edfac9 SHA512 cecefaf7221a640c5066b5bf77cb21750ddac78262aba6e0449e42f3db124624f87d88fe44351c6943753ee08d7b9a3780bcbb84dc7338e8e26d15c3ad6b1eea
+DIST ipykernel-6.15.0.tar.gz 134691 BLAKE2B ba3eefde9f1023ccf83c63a35dd99fdfebc0bda0d4f73e6477a098564c0a9fb7c0082413ae31dc8cf423339c3e44887bcf5253355c13630619f44b18d19e9913 SHA512 a6533f094d18d32a02e8de5638fdabb9f647edc9a512e609de3bb1d80f5592acef4e930d879bf79bde7a0ca23945d9eb112d841f2305204fac9f4c672b5315ac
 EBUILD ipykernel-6.13.0.ebuild 2019 BLAKE2B 31d026ca92036bdcdad7a1afd3d0ab6fb4e5fd924608f7196a6102169b2fe1a62f1bc155aeff2cfa9497ec6100ec8ba82d906e4bb1cb86ba16f4976323fd82e1 SHA512 df4d02205e9c0efd5a65a32730e0e2139ab94f713c6590431c303b0bbc3c2ae4a01c48cfb69ae6cb7c9253854cf2131601c35155ca91bd734df7ec7d84a699c7
+EBUILD ipykernel-6.13.1.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
+EBUILD ipykernel-6.14.0.ebuild 2026 BLAKE2B f5b2222a8d8015dcbac50880e2b47b81de8996cd55129ee5d0bda498893d033cbe9d9a056bed1d1883c4cd9aa768e1539d1c804291c60650e4e15471831412bb SHA512 7cf4f2f3fd005e1393cf80bf4aee5e8942d482616cdb19a2b51ecbe191781fc99f93433530d1c858ab06d039261f2b4656072e2583d98079c97cadc6773c2b33
+EBUILD ipykernel-6.15.0.ebuild 2067 BLAKE2B ed9a3b3a53035fdfa4847f57c5ee5dd4098ec24d967bed912eb4e7b9604f840d6fa901f0f08ae4c4b8faf77e63ff2457ed29fbfc1de527156c078e58b3f49dfb SHA512 945e1122d13b7b94b541d07252ba037d321379c1232f0c464fe31a775d0570249d46054a5a3a15970ae1db4e21fde7cc7543549058ee46ae106df00eefd4e76d
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.13.1.ebuild b/dev-python/ipykernel/ipykernel-6.13.1.ebuild
new file mode 100644
index 000000000000..06e969aa4a9d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.13.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+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="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.14.0.ebuild b/dev-python/ipykernel/ipykernel-6.14.0.ebuild
new file mode 100644
index 000000000000..06e969aa4a9d
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.14.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+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="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipykernel/ipykernel-6.15.0.ebuild b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
new file mode 100644
index 000000000000..5526cde6276c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.15.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+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="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 905b862091ae..80857799fc5b 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,15 +1,20 @@
 AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
+AUX ipyparallel-8.3.0-additional-test-timeouts.patch 1707 BLAKE2B c3dc45f6b05fa7abf551d3b8a950e078a42a709a74d8fe8c45b88ab6afb7996f822550eadf46c54da18cb7596e25cc7ffc84b46e033803a665e323273669e0fe SHA512 9b7581e02571e498155a73ac573b8a994ed414f462cfdedc5a96d9d30dbdb7c44f9c1827f86232f2a0dc273f34901a46aa40a8822ebb11a74e0890660f2f77f4
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
 DIST ipyparallel-7.1.0.tar.gz 4029033 BLAKE2B badf4bdad0dca0898e62abee3e5a48b06460160bd1f2ae096bc05beb00dbd6dc2b52681aa699d69a76f5a51e4cd3f0bb107fa6b1d20109e76bc78da8f08b69f9 SHA512 9a629bd92176dbace1724efe0a5a698b2d684128567513f8809fd25e4901227d1c7fc7b02427fd3c14b3743b47956ff8387098a1cc8759d8987aa5e3d8ca60d5
 DIST ipyparallel-8.1.0.tar.gz 9365732 BLAKE2B 847931de17f61b537a6350358a1fcc8e629b843e1216fcc0f60333f7baf42b0739f864bd1a02daefb839b90cfb4c65b6101de3271e89d529dd8493513b686ced SHA512 21e1d3d9e04c7567889e923ff0f1b140251518efd331dd2180a42142eedbb4c92eaeafce17bf2287e1d36ef4e5951f2f50021d9b9a96c266e4e94e1a3ac34347
 DIST ipyparallel-8.2.0.tar.gz 9367069 BLAKE2B e4e881f774422ead72778d40d85e5732d7da8e8e66107c06d65557c6701c94bd5c2592cea2def8b2ad405db78fe70c87944e4b89eb9fe3a4bcf38464b008979a SHA512 f6e62eaa86fa63ef1417e850de3eaf5ba228a1ad1da99c66b64b371010b57ba805201f18c97485ded24899afe7b22edbec23ca0e21344e9c2c2eacfcd6fd8adf
 DIST ipyparallel-8.2.1.tar.gz 9367709 BLAKE2B 5be16c1060a31295e6b1908cfa3530d7ade6337de78ee057f595ab94ed5dc6c4c49b08f39ded0e8b6aa11ee7eda788f27b2f57bad851908f805d681e0b98efc3 SHA512 d06d1e272e27c0941f0fd6799cc78bbaf188ba1fb22f03016925ffbbf6b3e273eb8c372d7c0509b2f044ccfbfe3f35071547712e79a26a802e673340021921ac
 DIST ipyparallel-8.3.0.tar.gz 6862893 BLAKE2B 9009f0fa06422b4dcd9e920d6a568030ff9b20695f3a9eab0f730b48c08465bba7682929c139bac3ef65739be2152224ca922faa6a02b6d73be2f3fb572afa26 SHA512 01ae448cd3274aa752abb033706e77584bc164c7cad626970269e516d33dda949fc0bab9a5cc3f018b2aaac60ee55078780c02ba3c9a2079f12036a869a1f339
+DIST ipyparallel-8.4.0.tar.gz 6842960 BLAKE2B e39c37759e3f6fcf12cb052aac0774435c8f7443c518b834d8d9e91a34549c8a612e603c2b541b79f8001babffc82469a4029eaa9fbda2b889fe06453b1c94d3 SHA512 ac3ef5bb733f8879dc76277bcc5be2e614000241045567ba4f23793641a523620ff8c246fd8785c81fa380c98f536cf8ef56b3bda7850b5db68d7232714b3a1b
+DIST ipyparallel-8.4.1.tar.gz 6843301 BLAKE2B 1ca0056cfa6827f5eb145584ea634d224119a485f1139964988b07bcd164fe392bb032794098bccdf67b31f74030e62e917c0a451809e0d14fae323308b2b0ab SHA512 640489b3920b91e1b2f83def00a06e8ec45c61bd7ebe33a3e4a30560e2b0acdbe0a98a685d868dd7bce4c65920d378ab69efca75cf0ae7f164ee792c870a297e
 EBUILD ipyparallel-6.3.0-r1.ebuild 2305 BLAKE2B 80b0818f788962604a564ce9c74068b27c8740e59b84405c297f314e65d7d459f6e638885570babbff88d861f5e48e8353c6ce30f4ae698f5213dd285104f0af SHA512 c6e4d5005fb46c79f5a19f00bfa60cafd8e57ce98f5083aa2d975710ec05678fe8319f66722dfe065d27bba4ae38984da0f5cfb51ce64c5d21671bce35226c19
 EBUILD ipyparallel-7.1.0.ebuild 2913 BLAKE2B 409329a470efa0b9e6996925ff3d57084c1aeede7fcf9e588d7d7131633a83db3528d701a31d1cd3b39cc45ad7f2c89d41e775c91eade506e34a0bf99d9609e0 SHA512 4baf3ffad4747bd01ecfd498b4ac30dfc33765c8f441ec5016fe3985de2671c1e0cedc9a180554690e4ee5e4587f4f20b9fdc14b3f508320967e83fc0ecd97cf
 EBUILD ipyparallel-8.1.0-r1.ebuild 2947 BLAKE2B 07bf5ed3bbe999930722dadfb936cc2433a8e46a90bb07d5669a70e9482be045d4fd2c1e640e8c3c58be9cb7d39f45a0b600cc1e682f43320ad5cd0098e2b37c SHA512 d8b38eb7115f9452fd379f8196a97d2d37acac28565eb6108eb0e546da10a6b2a5418790a0b56ab60aa9b1e0cf10d93ad3fc7ba471ea35a62a1311f9647dc99e
 EBUILD ipyparallel-8.1.0.ebuild 2921 BLAKE2B 43a62f3289899d1eed402d15a6393a8be916cebfd459e30ca98d7a37015dad7e8de44a0b309de2a18af8a9f20e08c343a740294406890c742ce8228d937bca3e SHA512 3bb9008ce9355d4282b196b67d8fe0fa5aa70850bd7b1e2ab6bc256893ab8947617e0fdfb784d772d1cb4a2b2c86b1b63c184f940393107f93be383228f7fbdb
 EBUILD ipyparallel-8.2.0.ebuild 3032 BLAKE2B ec5ec16a1c5f0d8d430fcc3f8832775e2d08651717454f8866d0b9ed7156a9c53ae804eb148d084afe1f10045b037828023a051f3da92fe98f9e3a3e8b5d0810 SHA512 a5ebf9bb1b97ddfa2f0b5006bd685b7291f1e50025a103541b89c298b6756f9295ad7bfda7f06e9ebad4bbd70b6a01cd4984b9f3de15528e053557ade50ca717
 EBUILD ipyparallel-8.2.1.ebuild 3027 BLAKE2B 94de8d77abcfd534fa4406e442aeffe46e4c819cc1b220322a2f2d9afd47938c0bd9a162145a2670bc780b51626cc69f30d55e55ca9b9a8669a9f55576b55e2b SHA512 85f0a6fc5e9062b970f01ec01094df0b5d72989b1e22c58e3d5019b6952aeb1925ecd8b2b9b37efe586379a35adbf08ca28cbd7e671200bf323b634ddcfb473e
-EBUILD ipyparallel-8.3.0.ebuild 2651 BLAKE2B 8c29e3fa944cd8c0b533edb275b6137e68ef8531a16ee999e65e29ee50dcc67608783255ae83b5d4081c326f7492e5f79af9d28806b76a75281cff99ddb4636b SHA512 566a7c06a8dd5b225d95075e10d00d5a12ca628e3c9438595aaa539a222a5d8ba32ad6393bb93005f72e25b112d118e6e06d14d92d1a2f837204a32140254be4
+EBUILD ipyparallel-8.3.0.ebuild 2704 BLAKE2B 8c9ad02107d45a942225dad205dfb640011d099d35875892b8305261fe313f9dbec667f0d993e1094cdbd86d7c1ce6444d19829e6720e36072e2eeef28f8ab6a SHA512 72b0532ea3a11995c4ba3cbf7894e23cd60eb08ad7bb05eaee1c6862938b1cd4414afce688a282974ba79092d805b8b21186c5e26ce2fdb6ad6ed4934b0517b6
+EBUILD ipyparallel-8.4.0.ebuild 2791 BLAKE2B fdbdf8ee6076d451e8d8859cdd1072ad4a82d9da8a64d73f2f07f7a6cd4758df0c2d29fd37f1186feed1839c585fbc9052accd89c9f7678c029cc3e06a6df2c4 SHA512 caffc933b045f63c7510a40a01432048a772bc17e37f076bd8cbfd22298d5113e0d384ba37b8918252692efc32105a3df667c5317931a1b78191b890e6ffc64f
+EBUILD ipyparallel-8.4.1.ebuild 2791 BLAKE2B fdbdf8ee6076d451e8d8859cdd1072ad4a82d9da8a64d73f2f07f7a6cd4758df0c2d29fd37f1186feed1839c585fbc9052accd89c9f7678c029cc3e06a6df2c4 SHA512 caffc933b045f63c7510a40a01432048a772bc17e37f076bd8cbfd22298d5113e0d384ba37b8918252692efc32105a3df667c5317931a1b78191b890e6ffc64f
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/files/ipyparallel-8.3.0-additional-test-timeouts.patch b/dev-python/ipyparallel/files/ipyparallel-8.3.0-additional-test-timeouts.patch
new file mode 100644
index 000000000000..22b2910d4d10
--- /dev/null
+++ b/dev-python/ipyparallel/files/ipyparallel-8.3.0-additional-test-timeouts.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/834198
+
+diff --git a/ipyparallel/tests/test_view.py b/ipyparallel/tests/test_view.py
+index 5b5ca41..4c04d02 100644
+--- a/ipyparallel/tests/test_view.py
++++ b/ipyparallel/tests/test_view.py
+@@ -628,7 +628,7 @@ class TestView(ClusterTestCase):
+         """exceptions in execute requests raise appropriately"""
+         view = self.client[-1]
+         ar = view.execute("1/0")
+-        self.assertRaisesRemote(ZeroDivisionError, ar.get, 2)
++        self.assertRaisesRemote(ZeroDivisionError, ar.get, 20)
+ 
+     def test_remoteerror_render_exception(self):
+         """RemoteErrors get nice tracebacks"""
+@@ -637,7 +637,7 @@ class TestView(ClusterTestCase):
+         ip = get_ipython()
+         ip.user_ns['ar'] = ar
+         with capture_output() as io:
+-            ip.run_cell("ar.get(2)")
++            ip.run_cell("ar.get(20)")
+ 
+         self.assertTrue('ZeroDivisionError' in io.stdout, io.stdout)
+ 
+@@ -649,7 +649,7 @@ class TestView(ClusterTestCase):
+         ip.user_ns['ar'] = ar
+ 
+         with capture_output() as io:
+-            ip.run_cell("ar.get(2)")
++            ip.run_cell("ar.get(20)")
+ 
+         count = min(error.CompositeError.tb_limit, len(view))
+ 
+@@ -689,10 +689,10 @@ class TestView(ClusterTestCase):
+         view = self.client[-1]
+         ar = view.execute("%pylab inline")
+         # at least check if this raised:
+-        reply = ar.get(5)
++        reply = ar.get(50)
+         # include imports, in case user config
+         ar = view.execute("plot(rand(100))", silent=False)
+-        reply = ar.get(5)
++        reply = ar.get(50)
+         assert ar.wait_for_output(5)
+         self.assertEqual(len(reply.outputs), 1)
+         output = reply.outputs[0]
diff --git a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
index 32d94ac90340..e4607ceb0e1f 100644
--- a/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
@@ -15,7 +15,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="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
@@ -48,6 +48,7 @@ distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+	"${FILESDIR}"/${PN}-8.3.0-additional-test-timeouts.patch
 )
 
 src_configure() {
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.0.ebuild
new file mode 100644
index 000000000000..238bb4888e55
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-8.4.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="
+	https://ipyparallel.readthedocs.io/
+	https://github.com/ipython/ipyparallel/
+	https://pypi.org/project/ipyparallel/
+"
+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/entrypoints[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/flit_core[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+# TODO: package myst_parser
+# distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+	"${FILESDIR}"/${PN}-8.3.0-additional-test-timeouts.patch
+)
+
+src_configure() {
+	export IPP_DISABLE_JS=1
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# we don't run a mongo instance for tests
+		ipyparallel/tests/test_mongodb.py::TestMongoBackend
+		# TODO
+		ipyparallel/tests/test_util.py::test_disambiguate_ip
+		# Gets upset that a timeout _doesn't_ occur, presumably because
+		# we're cranking up too many test timeouts. Oh well.
+		# bug #823458#c3
+		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
+		# We could patch the timeout for these too but they're going to be inherently
+		# fragile anyway based on what they do.
+		ipyparallel/tests/test_client.py::TestClient::test_activate
+		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
+		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# failing due to irrelevant warnings
+		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
+	)
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
new file mode 100644
index 000000000000..238bb4888e55
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-8.4.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="
+	https://ipyparallel.readthedocs.io/
+	https://github.com/ipython/ipyparallel/
+	https://pypi.org/project/ipyparallel/
+"
+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/entrypoints[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-18[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-4.4[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/flit_core[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-tornado[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+# TODO: package myst_parser
+# distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.1.0-test-timeouts.patch
+	"${FILESDIR}"/${PN}-8.3.0-additional-test-timeouts.patch
+)
+
+src_configure() {
+	export IPP_DISABLE_JS=1
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# we don't run a mongo instance for tests
+		ipyparallel/tests/test_mongodb.py::TestMongoBackend
+		# TODO
+		ipyparallel/tests/test_util.py::test_disambiguate_ip
+		# Gets upset that a timeout _doesn't_ occur, presumably because
+		# we're cranking up too many test timeouts. Oh well.
+		# bug #823458#c3
+		ipyparallel/tests/test_asyncresult.py::AsyncResultTest::test_wait_for_send
+		# We could patch the timeout for these too but they're going to be inherently
+		# fragile anyway based on what they do.
+		ipyparallel/tests/test_client.py::TestClient::test_activate
+		ipyparallel/tests/test_client.py::TestClient::test_lazy_all_targets
+		ipyparallel/tests/test_client.py::TestClient::test_wait_for_engines
+	)
+	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
+		# failing due to irrelevant warnings
+		ipyparallel/tests/test_client.py::TestClient::test_local_ip_true_doesnt_trigger_warning
+	)
+	epytest
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0049b436679a..4210779151b7 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.31.1.tar.gz 5156314 BLAKE2B e6528c9d3920078918180c4c2fae5d0ac20cd377e012691fee4c0cfa6c3056c739efc1ab9cc6231f55034d70619e501ff30e31b929bd5f1f623c89075abfb02d SHA512 7bd1378f7b2bd2146d8c2cf15c958b08f286b0163ca3e267bcd92c3f988d2d20cf48fd6e3c185eed6d30baceb195aeb0170280900e587c898d0812c4ffdee3a0
-DIST ipython-8.2.0.tar.gz 5400583 BLAKE2B 6af50e671823005b035a8463e65463b06dacb3bf4d43c4d3bd9720d1747ebda8abe3d73a49f59ae0e6e2651035db20bcfa1e82dbb0a73e40b4e2507e63118921 SHA512 0bf93527bcafe5dfbfe034b901dff2f002e0fc732159073f0371263e23784f45eb6c9e3f7f2cb9567e93ea4ee313773f836157afe9d23256e71bc4b2fcac15af
 DIST ipython-8.3.0.tar.gz 5314400 BLAKE2B 8f06dcaf32cea70ba9f19fb218d4ea6ca3e42651da065521133b1c7163f80324244f59b3c4d85039f1aa5ed363acad0dae11615ae4927d6c9a24197cc9640349 SHA512 95a3d50a5cffe9d4ed3f072c7fa8920c96beccdb15a7437836daa5f38f1ba228b4ebc4c3313d4c5016b77ed7d6f3787af727487ea379c9dc3b3de90eafa4d1c3
-EBUILD ipython-7.31.1.ebuild 4651 BLAKE2B ebe9ec2ae2f606efb76fed9ca1e3e04c78a13c8d86ec3223d02c980289e215bec65f01714d7758b707784c98f59fb7c934ff6f207cfe8943c9c0712217457637 SHA512 27e831552e274196810f5e88fbd7242dfdd8a233f60e8767c040d70557f0389f973105905eae473d8136d10b4f566ef3245afeb286065156d0b87ed3d451267d
-EBUILD ipython-8.2.0.ebuild 4534 BLAKE2B d7b8576e1f7dd95b2c6e7d5fca8fddb3438835447a3c9c48f6a5bcb495fb01ee18fe535834f1ccade71270f592dbe8698aee316b142678bccc2ef6357bc7d3e9 SHA512 2cdac89d6ec11bc21c5c2131c4b461c543d755760d8a9a3e10420f781bf1e7133569df4bc0a6a3e4b8886e1e36957150bc2fe7e0a692bf37d3455a3590d4eb43
-EBUILD ipython-8.3.0-r1.ebuild 4529 BLAKE2B d83840ca04cb890d4defb7b7343ad978c58544be975e1595aba52e97e958352979a55071c8e5d3782ba97fc883f60653630088e8b5698681efdfc675cb042182 SHA512 a3e28a4f412449d8122152b4e04a620b508afc39aeec8614b26618b644ba9d28e4225900dc174f47251e3fd5c76d5847fa193fb42c04ebe4ddd862ed5f70dc90
+DIST ipython-8.4.0.tar.gz 5314601 BLAKE2B 4a5804ad115b45568ddbc0b8fcd181ae0088690ae2d7dda8580588d1e1caa087582a279449142e0144568815270b3a9476893525c0e90320f9ec580a06126d1d SHA512 975915ee64ce6f3fc9bcda383c784759dd8b19151428b10ef92020097718c6e2a9804a00fe02bd541b845eca146c63a672f25ad4f00ec5302b3c61ae0c6935ce
+EBUILD ipython-8.3.0-r1.ebuild 4686 BLAKE2B 84112b5bba8125ff42312c46fa63f479970ea910623e96deb9c14cc946c2329ee69127e462f6dc8e99fbcc472ae44c50f5ef30a70e291fead15506a25ba695b7 SHA512 644837453f1d96c2d6dcac69d1908ff20cc10b7a6d960467b51f8bb571f0fb9c621a9766466e42ea471f8d368e122c1398aaccbb13563fdcd1e20f3a152b5dc0
+EBUILD ipython-8.4.0.ebuild 5030 BLAKE2B 2dcb2ee47d0415822903a004872b53c8dcbcfb212f2855b03dd687a2f24b296a12a1571ea64c5fbbeb5e67c44b4c228341f63e98ae72dc3519c9263687159882 SHA512 d9fb1383eadeb995c96a6a42c658ca91f7e1423dfc760110874c5ceca90ef6060ecdbc0fa062d0e0da0e6437be309b16433dc0c6c8ea5a6e82388f3541b1876c
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.31.1.ebuild b/dev-python/ipython/ipython-7.31.1.ebuild
deleted file mode 100644
index afbb895bd2ba..000000000000
--- a/dev-python/ipython/ipython-7.31.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		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
-		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
-	)
-	virtx epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.2.0.ebuild b/dev-python/ipython/ipython-8.2.0.ebuild
deleted file mode 100644
index 4d3f9a00ccde..000000000000
--- a/dev-python/ipython/ipython-8.2.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/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-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${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 )
-
-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
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# Internet
-		IPython/core/display.py::IPython.core.display.Image.__init__
-		# TODO: looks to be a regression due to a newer dep
-		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
-	)
-	epytest || die "Tests failed with ${EPYTHON}"
-}
-
-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 "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.3.0-r1.ebuild b/dev-python/ipython/ipython-8.3.0-r1.ebuild
index aaa7a7ae63a3..7d34496fedfa 100644
--- a/dev-python/ipython/ipython-8.3.0-r1.ebuild
+++ b/dev-python/ipython/ipython-8.3.0-r1.ebuild
@@ -15,7 +15,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"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
@@ -89,6 +89,10 @@ python_prepare_all() {
 	# https://github.com/ipython/ipython/issues/12892
 	mv IPython/extensions/{,ipython_}tests || die
 
+	# remove pyproject.toml that specifies incorrect backend; since
+	# the package actually requires the legacy backend, force it implicitly
+	rm pyproject.toml || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/ipython/ipython-8.4.0.ebuild b/dev-python/ipython/ipython-8.4.0.ebuild
new file mode 100644
index 000000000000..867a05be8b5c
--- /dev/null
+++ b/dev-python/ipython/ipython-8.4.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${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-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${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 )
+
+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
+
+	if ! grep -q __legacy__ pyproject.toml; then
+		die "pyproject.toml changed, please recheck"
+	fi
+
+	# remove pyproject.toml that specifies incorrect backend; since
+	# the package actually requires the legacy backend, force it implicitly
+	rm pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
+	local EPYTEST_DESELECT=(
+		# Internet
+		IPython/core/display.py::IPython.core.display.Image.__init__
+		# TODO: looks to be a regression due to a newer dep
+		IPython/core/tests/test_oinspect.py::test_class_signature
+		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		# TODO
+		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_aimport
+		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_autoreload
+	)
+	[[ ${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
+	)
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
+}
+
+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 "code formatting" dev-python/black
+	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/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index eb7630898a0d..8f601da64954 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,3 +1,5 @@
 DIST ipywidgets-7.7.0.tar.gz 4074763 BLAKE2B cff338dd635c57943161c78708e6a69abccaa46878e0bedb11ead76590b858ba57ce4dcfa8052533a4849da0dc9d5472987a7918fd2043462a21a908105d7910 SHA512 038da040912e6701762fb66fb3b6996ce0a59706afb05405b5932c02d34733842b227426f0b29eea115196bab384617425b0553c5db13a9dc832bddef63dfb92
+DIST ipywidgets-7.7.1.tar.gz 4075672 BLAKE2B 1e52d3b3b9380f42f67ad658f6e8579a61220e7160c10b1569437c1fd74ce962fbe746f3a6a3e302b5417812f69807deddc0ae3fe255b8e2f213d65103d55362 SHA512 ed6bf1a59a511714a3af96cc66e7665b9b264f56862ca4ea02d943137fcc6018da8fcb8dff4a8f9157bfb46cc19b7d58ceaff028e84f2f8d18ee16e57ce7fb96
 EBUILD ipywidgets-7.7.0.ebuild 990 BLAKE2B db29723bd37454ce6bb52d34ba08d00f1098970651fd53fc892532cecbce6591704130047860230e67e66f2c0dab785383f4b8de1387582f8065d2d71db7962e SHA512 23d1814f143bf6c54be421bb4a53fc38046dff9f0ea48332d4587d8942bc655b7d1fbf706ea51c115e0379c7a9802f42c6cbe6cb2a504ee301ed4539da3609f3
+EBUILD ipywidgets-7.7.1.ebuild 1040 BLAKE2B b6d51cb14e0ed73120ad2a327e19dfb41d9b45ab281cf69a1761379da9dd2073a144a8ac7842f6089808404967313313fda47f8f9cf33a0c8a2c87ac64f80083 SHA512 b35f317acc83fd88e62c6a00b21bbd254578b9b6da0a050869a17a9d2a8a00accec8cf001425eb6d70df3ee958e2b0c73c56596e516592e4e2fe06ec6e551494
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
new file mode 100644
index 000000000000..8f080eed2ecd
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.7.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipywidgets.readthedocs.io/
+	https://github.com/jupyter-widgets/ipywidgets/
+	https://pypi.org/project/ipywidgets/
+"
+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 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.6.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream hack to autoconfigure ipywidgets in jupyter
+	# we don't have jupyterlab_widgets packaged
+	sed -i -e '/jupyterlab_widgets/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index df3b01fa1334..04196a612b28 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1,3 @@
 DIST irc-20.0.0.tar.gz 88662 BLAKE2B 627354a051964e53322484c8a2c28487e25738b21c485121589af331e2da59b80c5704ef4268ff0bac3e84d26f77af031ba6ce0064a46496e846c7160462a5f9 SHA512 cd54e20075e97d7c8259275514741f9bb2f93712b1cc8628399fb7d4b37ff7d1d6515be14f5326fa30e59f49cfb853b954f4f095b4d3cac870a63a9946cfbed2
-EBUILD irc-20.0.0-r1.ebuild 1186 BLAKE2B 134db04a066bed02b0f10504157218fda012296afd75c9891dfd6304bf47bc9ea9ea73b4fa466151ba26b04fa34f82e94e2d8bf4871d5f2b7a5f5e65fc1b0fc3 SHA512 e35c64afd33e66f48f5b31561b71b678950b60588a1af5a849fa98218fc5ba26832fc054a6b11eeba073e7de7e3a9ad384197a5dc592b571e79c60cb7cf64b4c
+EBUILD irc-20.0.0-r1.ebuild 1123 BLAKE2B 39800e4d1b9d6b8ef6aad057db63161a9f94bab7b49ca114ec9246ff83a09f87220ec0b7b7e8d5a462aa1d56a5252bde5a8670b9f4e420634c2cc5bd38dffc59 SHA512 91592ad238452fcaa68fc585755e0d44c8efd89bbefc850a6bff950891086972af4e503003c6f9e99dc909e7a88678b2f0055b1bf494b68dbb29ceaae879bccd
 MISC metadata.xml 816 BLAKE2B 8390d70debcbbd36f9d4cf9e7bf204f108a3aa04bab4b1b7166e807899c402b94e4aca435df16c80feebe73caffe180846ae4116132111377951663dedd64b68 SHA512 04478d5d9ab60c09105e6594a19957e1aa059489f389918baed7ebd185f31cbe513ebf7816f565e40d42d27477842e2bd92ca17ba845a4a4de2e7a4f71df42a1
diff --git a/dev-python/irc/irc-20.0.0-r1.ebuild b/dev-python/irc/irc-20.0.0-r1.ebuild
index 9e1600a8771c..e8d85bf4facf 100644
--- a/dev-python/irc/irc-20.0.0-r1.ebuild
+++ b/dev-python/irc/irc-20.0.0-r1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="IRC client framework written in Python"
-HOMEPAGE="https://github.com/jaraco/irc"
+HOMEPAGE="
+	https://github.com/jaraco/irc/
+	https://pypi.org/project/irc/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -32,8 +35,6 @@ BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
 distutils_enable_tests pytest
 
 python_install_all() {
diff --git a/dev-python/iso8601/Manifest b/dev-python/iso8601/Manifest
index c0eebe96c611..76199f54b292 100644
--- a/dev-python/iso8601/Manifest
+++ b/dev-python/iso8601/Manifest
@@ -1,3 +1,3 @@
 DIST iso8601-1.0.2.tar.gz 12653 BLAKE2B c7dbbe680f2828050b2ff32765da009b5f6dafdbc5182d5136f951f8604d7ff579b85050dbefae47d2b28ce88515b9dd73a8abf73b3419b4cdc4a4dd275b7228 SHA512 f28fbfe82c25575ad73a92df144c108ef3cf4e1a5a9af8362187014904073f26daa3b77dde689a23cfd87cdbf86196b241e925dd8cf5fd81728f0dbeee4836b7
-EBUILD iso8601-1.0.2-r1.ebuild 681 BLAKE2B 24e92ebbe5d3b8cf55b1bb72bd01e5a84f264adce5b64630c8eafca3baf3ae00baa81418e40ba339f5268d9464f9c30237229bf4bb4ea7eb28e5b9880c3d8e26 SHA512 9c6232e41d43a7b152105482c970cee289de729e6f56106ac4dc3798f5e0c894d6e18b9f89a15dfd754476bff38fc946bb1d9e59a60628de9d84bd2fc1c06f64
+EBUILD iso8601-1.0.2-r1.ebuild 727 BLAKE2B 1d06064b290ac037450137dcf94cf1dace81f4d1349460ac819171c98f8025b0ea7b44de4781e51b5c702720e036463ec4ec757f61b9045a2a2374daa26d5616 SHA512 dc13a23c275204ff4db012a0d22ae57ca4899224e106734d86e7f9acfe09549f7140c5c3a03197a4d7b8f53ef9463254868f7d2af0219a2cab27bcbf177dbac6
 MISC metadata.xml 395 BLAKE2B 5333ae06825218414b6d4dcd4b340a4592be494df7ccb94e12a4eae5b19554c1bd79acc859bcde3647c12888501e8a2bb59dad3796cda8d83dbb57ff8800c975 SHA512 fbfde32b4ac97150ac24ece6f1238bf9a11d0dee53353bbc6b08269e8dd87c3fc833f37af5b2d5939d394c738a0f175949affb0873e62c2523d9667256a3a6ae
diff --git a/dev-python/iso8601/iso8601-1.0.2-r1.ebuild b/dev-python/iso8601/iso8601-1.0.2-r1.ebuild
index 9a6cd312e2e6..47aa6c695505 100644
--- a/dev-python/iso8601/iso8601-1.0.2-r1.ebuild
+++ b/dev-python/iso8601/iso8601-1.0.2-r1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Simple module to parse ISO 8601 dates"
-HOMEPAGE="https://pypi.org/project/iso8601/"
+HOMEPAGE="
+	https://github.com/micktwomey/pyiso8601/
+	https://pypi.org/project/iso8601/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -20,6 +23,7 @@ BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index d016cc95a4e2..d3bddd12026e 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,4 +1,3 @@
 DIST isodate-0.6.1.tar.gz 28443 BLAKE2B 2b451e4dd9a9979feb930090cf045b21c984e962222edc59eff6f08a448258833ac5c368701ed2a703d48c1238122cbe7f628d136124920730bbd96fa04519dc SHA512 437e420ec7ee68dedded825f30d3289eeb0da526208443e5a8e50fe70f12309515e1285b21132d26e6d4c1683f90dfa1d401582042b5e4381fe7ab0e34af26b6
-EBUILD isodate-0.6.1-r1.ebuild 724 BLAKE2B 51ae6bca67c762a8bbd344f9dd5a9ececa809c627b69a3c6e0cf66db576def0ef36820d9693e641ee4ba62df2969cb688ea79af9142223479a42e41f63122aca SHA512 81279c46ae499a3edfa4f5b73c6f46cc2b8e7f0f70cd8e7abd9b789084f6c26dfedfe7431ed10a2d9b3c3fffd3f33d4d643fac5d9963068cd3a9523a61c3026b
-EBUILD isodate-0.6.1.ebuild 609 BLAKE2B a2ea9e1920e8af1d778e1454f88a39ad49cdcbcf603e5bfad45009ea6fb937171d5fbecb5e7d35d8e2159a9e9d16051496e3be87b36f485297712a0add85be2c SHA512 b278dba1b33e928dfcb432c64825a509c6ccb42732560f00d251c5dac79ea29d58b6fb40b37b4983ed32daf303dcf5b53f7e5eb5fc3ea24d6b0a47f6824e24b0
-MISC metadata.xml 1176 BLAKE2B 559d17eb8968603df379f3ae23b313b69bd64d246c912f33f2911a65d53f3914da6893635c023d4f72095807e26334dc2e3750d31986c2175006ed436587bb86 SHA512 b7697a229b5b31cfbd6991c3e07f1a44f2d20c0c65badee9b0a1b6e9bcbe6f7bb7ba3fa6a48ccab5a4e2a385f83453f371275fe1770bed6cd14e101c1c470be2
+EBUILD isodate-0.6.1-r1.ebuild 716 BLAKE2B 59608b750c59353d48e0822e001da2680105bb0c06629a690974cd3a348027660d4372daa5e76372ae4a978d3c9310ae1a258140ec5cba20b761b80621eb7a2e SHA512 5f8e2477b6fc777ff3579e2cde1d2e6a3c60d9e5c81ae298902dc46b5f919b31241b62ae982b686afdb1d9d37f7beab82cb82130c2a025953c445971b0e600eb
+MISC metadata.xml 1201 BLAKE2B 87c3b69e97e429e10a840601443e3419c11991ecd49aa1fd1b017f4beccacad769bab1e4433dce73308a610544ba4fdfdfcff146b0d7056fb051b7a5d2944ba4 SHA512 c21cefbe301c88c4bc882cc5c3566a6d882d6419bd6d565889274b73edd196530084449f2a7134e65c1aad7b968089a5a0063d64fd83c1e07daaeff108d83053
diff --git a/dev-python/isodate/isodate-0.6.1-r1.ebuild b/dev-python/isodate/isodate-0.6.1-r1.ebuild
index e5156bc35610..091e746daf9b 100644
--- a/dev-python/isodate/isodate-0.6.1-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/isodate/isodate-0.6.1.ebuild b/dev-python/isodate/isodate-0.6.1.ebuild
deleted file mode 100644
index 44b88555a069..000000000000
--- a/dev-python/isodate/isodate-0.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s "${BUILD_DIR}/lib"
-}
diff --git a/dev-python/isodate/metadata.xml b/dev-python/isodate/metadata.xml
index 464717726b5f..3d7d5c87b59b 100644
--- a/dev-python/isodate/metadata.xml
+++ b/dev-python/isodate/metadata.xml
@@ -18,6 +18,7 @@
     fractional seconds are limited to microseconds. That means if the parser
     finds for instance nanoseconds it will round it to microseconds.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">isodate</remote-id>
     <remote-id type="github">gweis/isodate</remote-id>
diff --git a/dev-python/isoduration/Manifest b/dev-python/isoduration/Manifest
index 6648aa8de21a..802d41c8f0c7 100644
--- a/dev-python/isoduration/Manifest
+++ b/dev-python/isoduration/Manifest
@@ -1,4 +1,3 @@
 DIST isoduration-20.11.0.gh.tar.gz 15909 BLAKE2B fb5c3c383aa000c4650490b701fc091c740e45cf782aa929824e3f3e5601d4de82a68a9430f450b42da3658105c87cb293a98b94c77fdf03a1702e6d103a257a SHA512 9b3dd5cc540bba35a73aab01bf1f0274871b93b03ff72f8cc63fa0d2ec43e1f54deb95bad2323aa4cb8066b1b5401f426175792c062cf46449c087601dbe0420
-EBUILD isoduration-20.11.0-r1.ebuild 811 BLAKE2B 97e23ba46a11a7e16e9a2d5ca3ae6f74158a68fd6ea2a6cace3734f9e644e902d9d2a94986bdc00018a832eb2b456440dbb751cac7ebc3891c2b599fb69607f4 SHA512 df7c713cb3b6dfd2bc52036a654c32456731c0bec2a33b141c7a6121d5edc305bb72c8cfa9285c5cf52cfe563b486d2cfdc5b38802f19780e7cbea290b89a32a
-EBUILD isoduration-20.11.0.ebuild 764 BLAKE2B 944b3d6d1ba7a994f133e7689e73305078c6e9a4221d7a8085bffe3b2c884a52f40dd9d532b5991bddbc05c7f2edaaab7bdf5f5607b9af39dd906bf706b5040f SHA512 a71d2f4593a754b9e414d5f8080f34ce25b0d2ed0c56d1d40c678f0e13f061e9e685407eb0fa0da25179a3f6a6b92bab6f41051d6add093ad32aaba6d8c28694
+EBUILD isoduration-20.11.0-r1.ebuild 803 BLAKE2B 91851ccaf64a63ed87f7a9de6c4de29d90d14cf207a2e1c84270b3e13db0bfe3dacec42df74133f1c38658952c85848d88249bc1d78f17aefe0672791351f6d4 SHA512 e4148b3d2fb0ceda75f4c643457df5000d083b4e7bb290699a248794ea83d4fefe96e7b2dbf891f6d78c7b359a4ef4706186345fd822b53e48c7052bf0917b50
 MISC metadata.xml 398 BLAKE2B 85871d69b3b16257b3a62cbdb3c00a56bbff15dd62d11ec1bed8071fb802d4063f4b4a31e27f47470a76c200b2da5d0c8cc8e1996a2297ce5e23bceb9ad0b5fe SHA512 884dbc5a230ea3c07a62407d5d5c0c1d4a1be0f2339067d3340b90606ad3e3fbb773c5e55668eebf5a9f1381c3033b0687219d301e9dff402fff5e031cbc3e98
diff --git a/dev-python/isoduration/isoduration-20.11.0-r1.ebuild b/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
index 110a21977b9a..2c1b820c24ac 100644
--- a/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
+++ b/dev-python/isoduration/isoduration-20.11.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]
diff --git a/dev-python/isoduration/isoduration-20.11.0.ebuild b/dev-python/isoduration/isoduration-20.11.0.ebuild
deleted file mode 100644
index 982e97e18a2e..000000000000
--- a/dev-python/isoduration/isoduration-20.11.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-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="Operations with ISO 8601 durations"
-HOMEPAGE="
-	https://pypi.org/project/isoduration/
-	https://github.com/bolsote/isoduration/"
-SRC_URI="
-	https://github.com/bolsote/isoduration/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=">=dev-python/arrow-0.15.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_benchmark.py
-)
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 969943b8d313..4a7552eed30c 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,5 +1,3 @@
-DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
 DIST itsdangerous-2.1.2.tar.gz 56143 BLAKE2B 4c36cb26bcc6b6821b92b88b0254711ebe00bfda2193cecf0a7eb1fd514806f366fc0b4dc587a383003ec1272a2bc732418a46b44fa711beaedc06c379635ddc SHA512 e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259
-EBUILD itsdangerous-1.1.0-r1.ebuild 645 BLAKE2B 687fe2d1170956390af9295f8dd795d9427df893ce91e279e7cbb073eb4d61ae78cc86faea0adaa5c38d39299332bbfe192544eb2754ffb1d455ee34feb7ac11 SHA512 fa6d71b62c656868ebaf2ad451bde2ce9967ba2983a63871bc58be31903dde7969a551d84c918d6241385fe4328163301a3446582918e071536828f326009dc1
-EBUILD itsdangerous-2.1.2.ebuild 687 BLAKE2B bbbd049693f81439183642722370849ea562d18bef2e40bac44190f263133b65ecce3aa1c3f211e2c96ad3346ae97885c6c22c46e40906a12fb12a9dfba18eac SHA512 caed22840351e17b965896fd696340deb9fdb9888e1c83a6772dc57fbef4e1d6f48f08dfacf597e8137d72febaeab7955d06c58f2f70fba2159b63ce7c81632b
+EBUILD itsdangerous-2.1.2.ebuild 738 BLAKE2B cd359de78f665c61734bf66367f9da68e94353e504864e96961cb6efd44d7ffd3ffc0996027c721912c3e03b0b4175a4a9adf6ede361aaeaf8b37d568474ac51 SHA512 b5dd9269a1facb14772dc760ec1125c51073a27bad871581421fddb446a765e5be20668f77618c13ccb060dcc8e24560ca9eccadc4f071e7b12fa7982e64022e
 MISC metadata.xml 413 BLAKE2B ad79fd7ab99377da744c95b7c63f70259d48b1c4ebee05d86f0c8a9118d2b640234b1e7375382779963218c6e54a1408cb1a5e2597ab82488823228c5e38445c SHA512 0ab4fb52051951fc2ba0cf6d825405b14e71f5793c0a81508e977caf55f1c47718303153cf5ba41e3009fe157ab0be96143ded4df2959196af334545c1601e44
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
deleted file mode 100644
index 21a98fda91fb..000000000000
--- a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
index 01ebcb4e4732..cdc1c410951f 100644
--- a/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-2.1.2.ebuild
@@ -4,12 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
-HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
+HOMEPAGE="
+	https://palletsprojects.com/p/itsdangerous/
+	https://github.com/pallets/itsdangerous/
+	https://pypi.org/project/itsdangerous/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index f1e2901dbf75..f25fde5b197a 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,4 +1,3 @@
 DIST itypes-1.2.0.gh.tar.gz 5578 BLAKE2B c4025c2ad54203c4f3bbcd6f369fc6a86d21bd54a63c42acd68a98b6b44404340c3242e3c7a896483860eaa7f3df156fec79a71974e3cbb7b984fd83aa631eb2 SHA512 94421fa3f9ec7d18989332ca518607f09bd9d674e80bbca4a3c7324c20c3ae4e0679457e6a328e50ffe3d94c6db733f092798293133d42c1f07d959e0f837891
-EBUILD itypes-1.2.0-r1.ebuild 522 BLAKE2B 6717e0d4a033fe30a981a1683a1a343555690b5bec1aacb308d36522e1c3149d358cb8343a4c41ec10b31eb5ec4ecc5f3b2c8fcb2c13927f585e199daa471ae5 SHA512 a47c04630b9aeb1f4860937ac9e52e26028537db292fd2a7efb8ccd39b1cf26b4cceeeda5a88558cf554523bf5396c13043a00387e9b3d1da57c72404191411d
-EBUILD itypes-1.2.0.ebuild 483 BLAKE2B ca1de2729b94940a034d84c697338130273b136311fc30a050bafcf12c17fc1569fffbf063826b4c3f3c4b37831f7ddf868e2c0c762c1057400d0992db8c51d2 SHA512 6f584b66342e08b3def1674b89fc748eaf4ee89c55c14e3a28cc656d666d8dbdf5050c9a5f218c63efa18bcd371ac67bfefc995f2b27478bc732c7965a384449
+EBUILD itypes-1.2.0-r1.ebuild 522 BLAKE2B 685da67e7b91e8bc5439b5734135ae2e964e8b17d9c7d8a2cea1519f1ae74efaf83e4be7cdeec3fa7ef67021460b6bb4ba19ed074f458de4b06648d5d525ead9 SHA512 b5f02ac8055ffa0030f642797639c9973d0397f57a5b314a9478a30aa43ad4356291343b361829cccf4ddb0b7d08aaa5aab0ba0e29d6739f1fca2e5f1d9254a2
 MISC metadata.xml 371 BLAKE2B f7c9f8281df4a02f1183af152addcfe7edb8dc47470912f9a7edf8efcb09c6996c50baedf013a3c4a0d584a302f72ccc394ddcf6bf7bb4632837e768b22c5c3d SHA512 ae181140183bafd453515b087688891763ca93f9db436a93de72ad27c1460136993c5963bb9996454f9bde4f87751db61f80f9024914a9f07304c2ad0f2b9241
diff --git a/dev-python/itypes/itypes-1.2.0-r1.ebuild b/dev-python/itypes/itypes-1.2.0-r1.ebuild
index bee7b6e67991..9a44e8d0681c 100644
--- a/dev-python/itypes/itypes-1.2.0-r1.ebuild
+++ b/dev-python/itypes/itypes-1.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/itypes/itypes-1.2.0.ebuild b/dev-python/itypes/itypes-1.2.0.ebuild
deleted file mode 100644
index 56c99da99047..000000000000
--- a/dev-python/itypes/itypes-1.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="basic immutable container types for python"
-HOMEPAGE="https://github.com/PavanTatikonda/itypes/"
-SRC_URI="
-	https://github.com/PavanTatikonda/itypes/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 2545c424d143..cb634c293091 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,4 +1,3 @@
 DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
-EBUILD jaraco-classes-3.2.1-r1.ebuild 791 BLAKE2B cf03935c196889f35d10f836c26dc932e3d2ecdbd23caa0d4ddb6b0a1252b56bde648154efad878944abe010de7bd4934174323f4cec59a4123135ecfb196d7b SHA512 936e82828c30d72d2783e52b4c3e0ac827952a897d86b96eb306b60984ddb5f1b1eb8b5c928e734e6aae75aafa6fd7d2a918ba0ce7f016353e2714ed9f19223d
-EBUILD jaraco-classes-3.2.1.ebuild 705 BLAKE2B 5e14a4b6b5cc109cf93b5b42523af99195cdf0378566c7366bc28e6d281d99092ac74176abc6e0b9d01051fb26b15466e6ff4259695020b374339d0408c4deed SHA512 11211de84b4f804ade63bc1434eb58e06fc4b309712b99e19b082894e6652e3b17761fa7a9858ec5b5df15da8dfe259ddf04bff9d3027b7b474e482d3dbd1297
+EBUILD jaraco-classes-3.2.1-r1.ebuild 783 BLAKE2B 5df93dd0dbd56881feed62aaf777c7e46250954ec6ecfee280cfd8816f48e0d88d7bbfd8c7c5a7b7b1543b4f24e365f9f4abf383e7caebf27cfa2bdd7c460c8a SHA512 4bef970d6ff6b6c75a341ef12eee6a3e6fb1f9a47d26cf2973586f4b32b8550807f06fb857eac9e28d09af244d40992707df8004c95643d9f6bd3f7aafd325dc
 MISC metadata.xml 578 BLAKE2B bba68eea8ac49fd7afab6d8a05c723c01ecc82b9392a97e26754edbe6400f0351539aad572d125398eaf0b53ed1d25d44e0348a6307a9c8893eacd20bd9f7386 SHA512 3c521b902ac46722c873ca7c696414c7dc66419ce0764de4c30924c92d135956822c3f86d6e17926fcc87e0c0f82f93443fcd2303aab248566cd047ec5202e36
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
index b2df39d160e7..6335ace7194b 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
deleted file mode 100644
index fb2de4f4973a..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="${P/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 818c1cd3a69f..08743f55ff49 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.collections-3.5.1.tar.gz 15053 BLAKE2B afba813636464b6776f244eab31a0cd86418410f313e171cff1c8ac64e5d902f4a6c2f88d87c61d55292baa338aee45866d3a459c5b5b73fd4e751278b869316 SHA512 2918be537296ca81e5f78a3966a47451dc9dc2d233d997c3f01461c489b44051c497dab55496f85883ac1b91a28850a9d77ff154a3f5e074da1ed07f3259c246
-EBUILD jaraco-collections-3.5.1.ebuild 798 BLAKE2B d86e97424bb56793f282c4368021386f23bfd340fd9d210ea75cdf53f558a6ebb6a06ca430f079024e721c8cc01f0688f98f11f99ef4edf94e4cf18c8dc2b45a SHA512 3138c7679b01023275dbe4ecd0467902d0779450656cab07fe88ebc5768b9553d8dfa07752df83594adc0358faecf380b7101776c9f51aff0b5b58a289ca0f1a
+EBUILD jaraco-collections-3.5.1-r1.ebuild 830 BLAKE2B ed63ed5db17077393886ff83d189fd99293486799371ae4bb22a2f9c0b5697b4c8c1fb2ac3a3bf2137299f703492b268487712ef460ea3b3da1a069dbb8e54f2 SHA512 16e92d64d3b62c250fe557aaa3961026be6c8c19e72e372cb02fe7f542976a94a05d653ea5eef01d51dd15e4523388c5aee96c6de3f87da27671312dbe541529
 MISC metadata.xml 684 BLAKE2B 2da0cbb4ee979b83d045c4c402ff420db27d1a4176c7009bf56027b9b3a7df9395e67f881dce945849870955998e65dcd13c4e77926a8e2e7d1084b475a71ddc SHA512 30743b4d3616dc141a9ce814262304d21ac20475fa70414679dd5f028dcf83021c4cf9b39b3817957f5feb623076f94df1e7a951b0ab6cf57cf635b7eaf3ef8e
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..3962c5c51519
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.5.1-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
deleted file mode 100644
index d7d76c693654..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-3.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 08503aba490b..cad0264960e2 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.envs-2.3.0.tar.gz 6939 BLAKE2B 6cbdc2dff26d29c6985175851072278cdec1f4811ef609017870d133547ab69f3e98e6cf09bf6f9770b2cadd62281b806ddbd6d1cab3f5793ec185aa019edd8f SHA512 c0f1e8e515d18d1f5c181c1072fe72b3f99ad06971ec420e3aae6631daa734e0fef05e720cb7770e37de07d65c02578f9be916354d0507761a5fde749c7cb643
 DIST jaraco.envs-2.4.0.tar.gz 7101 BLAKE2B 0858732706a71ac359b97c0a841c5370f35011968ee76364a06aa67231992bd04e200362d245c3fe8d035b7018be15bdc4117a76e86ac35bb0fff8958af9a0f6 SHA512 d4da2a3f8ec9add63a0b2f754523da5b6593d869537e38c33ea86e59105c4be0cea15546897d70b869cf81be709d9b3fa2cfa35bbefcb9ab32a373ea620553aa
-EBUILD jaraco-envs-2.3.0.ebuild 851 BLAKE2B 8e3ac441e0336aefe455e1115edf6f964a72b83bcdf390f61dc5540ae19a516b0c0135b23ac7de4eee19e1cb7adee2cc409386f225174202527a19f3e8476d63 SHA512 b07ef33164a7278cad0483b8c079aeea266f24857e4d1075f7179418bfd62f7717c7b66837dec7af01454d5cbf0870c1c7d5247aae21c07692660c66fab119c2
-EBUILD jaraco-envs-2.4.0.ebuild 866 BLAKE2B 32530350cc24b8a585a5ee6d4d9033bea3d26b70b04bb193679fabfb1489bb25d342834c4b7de7c1851ab1160658c938b394c3ac060c0777c57b2ba2e83d53b9 SHA512 704bae18aa26cefbe9a6a840d4a51cfd3dee63e94be36069a5055da3a0bcfc3e614102579be3c913432d8959c311372a37ea187df0f770ab462ee5b0dd5f5e8f
+EBUILD jaraco-envs-2.4.0.ebuild 858 BLAKE2B d93205c1575b2b18d1737f0df7482bbeab2e28f9d00885e1c003a81adfcc21679114a98ddc1d76d93a4963e1166e4683987d83f627b1b6c043d34e5db7966b9b SHA512 01bc8d61fa821054c671adaec49d081e0b75d1b0ed8b6f6bc106fae027297cf0d7ed7d2bc8f6fdae6db9a42b161ed860086dec5fe90965e23592579cc7946d3c
 MISC metadata.xml 397 BLAKE2B cbc21ddb91498528ec05a5e31285357c633b9646bcbf517229c9ae206f26f50152ea8f709bc19ede09952e2eea715de4586914021d61714108f853fafc5b2742 SHA512 8f1646816b5e3a753963acd82aa950465e2c14f80ce7305b07a67d366882b19b54d80cbd85b988ce84f08fe24a31c8d6aa604a0e4f7da52886ccfada36b226c6
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
deleted file mode 100644
index 03d3f5c600c0..000000000000
--- a/dev-python/jaraco-envs/jaraco-envs-2.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Classes for orchestrating Python (virtual) environments"
-HOMEPAGE="https://github.com/jaraco/jaraco.envs"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/path-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-# there are no actual tests, just flake8 etc
-RESTRICT="test"
-
-src_prepare() {
-	# optional runtime dep, not used by anything in ::gentoo
-	sed -i -e '/tox/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
index 0da02f1f944a..0e3dc7f841ea 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index f50ed5daeec6..80470b92d84d 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.itertools-6.2.1.tar.gz 16813 BLAKE2B 7bf4b3818bcf66ad49643aaa1c606953d8d920c970fa4a4159796c042a1d5b77e53240e8a260b24b337cd65398758d2392fe2a5f73cf784aeeac9b4d0a128181 SHA512 7b4c27143848d899472a9ce207819062719adbef2cf038754c9236fee7da39f62238b85f8d83bdc41bf5a37e8d102e79dd4afbc6efa46c2d7c7ca04c032c67d3
-EBUILD jaraco-itertools-6.2.1.ebuild 1171 BLAKE2B 791254cb0f66b9a1b0b5b1746610c0e14c8ac3ee2807589c78408975ceaa0738fe75f0fa82f251ed38f1f5428cef83230a67178d8f13178e8e346c12ac2bdfcc SHA512 8c40637738bc32af877307b65d77a71d99a651ea8ec7ecb7a431a1e003a404f2653925fda71cb217a6d116bc76d28b4b33cd3f626d800b0c492a52be5663059b
+EBUILD jaraco-itertools-6.2.1.ebuild 1073 BLAKE2B fbd482d2afb3210ae1f9a07155d4788fa4b9c771caeb8449ab8003b12eb83f3512d58d38edea840034454113a0b1a8ed28aae6975a13723e7b38622335664156 SHA512 52a93a47f540c60cd4950bf662929465dd79b2f5b7b106bad5116bead998b696639e4bbb06ccf0437c7e91c36ef36b8854082a17de1d6db0c4388800848c9726
 MISC metadata.xml 676 BLAKE2B aa1f30b4b95c523489d737b2fc5898b28c9e38f8561b2045f3cb402d8b7038559d1400319a870f69f1a189ef962635f826855edeb1af91589a6d2aaedf147840 SHA512 18af0202da0a17600ddd66eba2a5ba673241fd6566878229d197228a9f7ffd6f629bbdb47cd26ce7d204d787b7d4933cf09007e81abf244a2f6a4b7788232879
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
index 6cd785496c07..e464c3ab08d9 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -26,8 +26,6 @@ BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
 distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index b1e733e86a3d..16a65d1d7d7a 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,4 +1,3 @@
 DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
-EBUILD jaraco-logging-3.1.0-r1.ebuild 882 BLAKE2B 990f70aa6b19dcd88f42a263609d9abb0256c42cdb4d2f4e04296b37ff3dc6e03a62ccb9e5c74119d6f8807a60bd1bcb4ace59e26f994e5aa21eeb5f3242a720 SHA512 ba588ef60c003a1c25d3fee9e0b3b155d641eabd34d49a5e1f51289233075ef256f07de3c2f8313c28f48234014ec4dab4e9ef1fda7447a272c89399d8648719
-EBUILD jaraco-logging-3.1.0.ebuild 1132 BLAKE2B 4779589275390675aace6120b60c5cc2037b0a87f1bf592e91560d83a7731c6801ae9b4bf465f2f2074df88498d56d021365fed25c2d72fcdf4de11a110c58e2 SHA512 1eaa8c30526cf1ed1c911c22deaab4c87f6e651bfccd428880476f934de9eb0c5c470450801305102965d7e0c5d83ef5820194903fa42227ac9d41cebf888ac8
-MISC metadata.xml 477 BLAKE2B 80a8d13614d491f26aab4b2c061c59632368d4749d4df2e1ba2346367b4b49410b26fdafc2e7f18c6d3f45290e887ee537e46f82977951b7189d400c291decaa SHA512 a5c2ad40d7ccb6d1c70ea541c57b0320dcb53f40edff344a9358f6d5867d560aa5898dccd681967ccef790844c1934fb91e6de4a520399e59b9125bd23377fb8
+EBUILD jaraco-logging-3.1.0-r1.ebuild 880 BLAKE2B fada073312b4879907072a0d50f8a501270b2f74af659a58774035b47df604db81505c479e47077ec96ad2a8333de29aad5f264582437cc1605f83081a821cc7 SHA512 64f87d268fccc8af8568e41c86fdf1e5a6b53915e28fa1da6e47116d158d8f2e30f05ee698482cbc355ca9a45f2136e40211d393f6a621a5ef4814474cc9b7a2
+MISC metadata.xml 578 BLAKE2B 1d5b2ffc158ad19270346831bfad35fb36b8cdbd73d6175b0e007ab4dcc7872f09acca21897f9261669a7bb5633abbb2b19fa4018960bf094018f4e31e20f05e SHA512 387e591d4ea4dbb900d7e06f67a8cbf95d99adaa80da80620751eba04ac28ba8b0c5695ce9f7e246b3ebb03a855cc2ba86c8793acbabacb95403255fb8d03905
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
index dd1c0eab47f0..70cb1e6c3b0e 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tempora[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
deleted file mode 100644
index 9a25e08b7941..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	local -x PYTHONPATH=.
-	epytest --override-ini="addopts=--doctest-modules"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-logging/metadata.xml b/dev-python/jaraco-logging/metadata.xml
index 1b9363eb70ee..66d80c3d099a 100644
--- a/dev-python/jaraco-logging/metadata.xml
+++ b/dev-python/jaraco-logging/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.logging</remote-id>
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 71d5fa5936d6..2839679f06ea 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.packaging-8.2.1.tar.gz 15393 BLAKE2B 8e30dcbb6c5dacf55fc62041e14c18ec852e39761ff5e00202bde89f6224eda8fbc090272d9470129be6014d8777b134908280dde10a0fce712b29167b122bb5 SHA512 3235756833bb4b0aff8dc832adb6e269bda622c5458493a302c6d487547ce224865aa367773f42bd456553c69cf451944d9b50d148761a40a775f59a398ec02c
-EBUILD jaraco-packaging-8.2.1-r1.ebuild 1023 BLAKE2B 0bb95427b7575f93fbdf0bc356fa887e0a033d519cea7736f629e6734d3f047d87efa822e21e13d2812d5973d3c88aae5e2989fb6f873b9077968770ba4bcb86 SHA512 72b144c394138777441edc5e16e598923d150ae530052e34353d13d6e264375956329969446ac9888101ec0b919e193be6d10b391df10ede4b43e2da4939fa84
+EBUILD jaraco-packaging-8.2.1-r1.ebuild 1023 BLAKE2B b21642fbf5a260484d8e996ef2dd5168ed570be635c39abfcc3cbaad9d4f56f358dcb763e10cf5978e1e7b8e9d1c81064c192c7e053d359c07d8a723b5a5119f SHA512 4b6ba1bfff3780ad852d0bf8bc09e1a666d06e1862ccc063c984c316597b43b405856279a2e32ac8421996271ffab95dfde2e62aa82a3c177cf746c8c84ccafb
 MISC metadata.xml 676 BLAKE2B b69baa3c0a88cedebf56ff7fd8082a2f289ba13bc46b08c31f3e7682656886515c2541adf15ef861bb4bb677b4835c3cb70f1d5ea006df78886340c79f674f19 SHA512 181b961d488e6c124d0147b8945b724cd3db7f8afef39202d84d9b2a3100505936772ae20616b8a2d18c486591b199ea2a93b2b90a2a511fe4b3bda8dbb6c8dd
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
index 802e6482201d..a9d4d19e6c0f 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 0175c9c6584d..c612aebc92b0 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
 DIST jaraco.path-3.4.0.tar.gz 9574 BLAKE2B 41c7b65be0f7f8ae93b2137f1527145ac91acde2a2d4e338cd68e35f7e5233e6a8dcfe9a0c07f36ae9cd2a00946031eb6b692cfaf1a299bf7a451f25b39cc8cc SHA512 00a853bffdde4a931938b1d193898c039e253018f06ca9d102ee8e07f797b4c9dac33eb50243f714e3f3e151b6ce2fed7d47e1b82ab18d3e8715525b57040a6a
-EBUILD jaraco-path-3.3.1.ebuild 907 BLAKE2B 5b0c3f38b6ef122b0dacab1e9e2f3c8225d8ad4725f9f1cc47994612cd5ed15be913a14b5d3eee9afa1b50ba3f86ec8643dfb3bb79a272783f46a9d10cf56efb SHA512 daf4a17353ed63e92399ca866d7242aecd8166910ba080fbc63510829ba56612ca8934a5494e609c9b6b428b0ce30ad35c1a0474fb5c7e965cbfae310af29f4a
-EBUILD jaraco-path-3.4.0.ebuild 802 BLAKE2B 068a5bbee615bac95665ef3af0351c00ac10127f842fa811e831d17dcaa90baa96f15c55393146cc7783ed9839895341ca88b1ac5ac4bb2f7d59a5e70a298665 SHA512 e62d3fe864a0b5a16e9ec75ddf1010fd24a286dfdce722dbf597255ab0f809b47d30277ad9896ab60807c08ca9b9a2b19d57189aa97e76976246c8c9bf538887
+EBUILD jaraco-path-3.4.0.ebuild 693 BLAKE2B c0504ea3e51b375dc8ea325c7be25af8d27f0993e19e4c0219e3ce11ba798fe53f3b462c25010dfc83d00c4bd15f4428e317a421a6053c26b499e410fc95deb6 SHA512 15d076c706612c9600b840a4076e488f6c25d9f92061f5f11202c02b5bae04e5b2bd0d220744b949fce350e0262989fa6dd9c1e9bc547843054cca167c59f362
 MISC metadata.xml 397 BLAKE2B 899056eaa6d393d9c624e20ff93a644bd93f39505f701a085f22d4216154a3c1b19bb879bcbe45f077fba7d91ad5e34617283b10f535305b322c580712df10fc SHA512 104c1a8d8a2613ed4355b6537ce0733b36e915d98ad69204d2a7763dd6e7bbdf74c2cc2e66f34000426e04e79f19a84ca1d8a57e504c62adaa4386f372d34dda
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
deleted file mode 100644
index cde818faceaf..000000000000
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-
-MY_P="${P/-/.}"
-DESCRIPTION="Miscellaneous path functions"
-HOMEPAGE="https://github.com/jaraco/jaraco.path/"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-8.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
-
-src_prepare() {
-	# use the py3.7+ built-in
-	sed -i -e '/singledispatch/d' setup.cfg || die
-	sed -i -e 's:from singledispatch:from functools:' jaraco/path.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests
-}
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
index e69564f41dd6..0eb0de8bf5ec 100644
--- a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
@@ -19,15 +19,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-8.2" \
-	">=dev-python/rst-linker-1.9"
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/jaraco-stream/Manifest b/dev-python/jaraco-stream/Manifest
index 9b09da54e20c..18a9a8e1a489 100644
--- a/dev-python/jaraco-stream/Manifest
+++ b/dev-python/jaraco-stream/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.stream-3.0.3.tar.gz 8877 BLAKE2B 85289efe8e04e93cbceb0053f5025cad3d073deeb113806e25ca06fb88a9b082de6805305de85d1f17b77f61d2d0f4683b2b21f670102b03112b8f7a3fdafd91 SHA512 fe50c21b26e734c9c2d0b7cf8a1c8cc8bab80417adf073a4ae213ba4067aa33e2f6c8886aac996971d2f98aacd295d9999aa3ac7dba24dd952cc27d15bef22e2
-EBUILD jaraco-stream-3.0.3.ebuild 681 BLAKE2B 92d752b0dd0eb84ce2f8f7583c460bf1ecf512f097c87d86a4edf3928dc3fc7161566956b8ca17cbaaafb10803e8e648f10eee537b23ffaea315b4fb1eedfedf SHA512 5efeede7df83b6a8490d84ad52ed2a17bd26873c4f662b488a8e5db6bf61cfe3a754d2c6b695900a42f41747b34012e8d275ba000d21f1f46f90eb0c54db59ec
-MISC metadata.xml 627 BLAKE2B d7df9690741346d8a29c40010368b230b29fcafc7be80971615ead75459146b385db8a2c1e8aa2dbfbeda0a9d74ddcd18030a3cc541685dc161201fc26d2207b SHA512 5d92fae956277e67da1f399fa0058421a5ae39f3f633ab4ecaf80f8303303e8da2fcd0ba07edeb833784936c580033e3ca614fe5899d459717ce29fcecefd531
+EBUILD jaraco-stream-3.0.3-r1.ebuild 713 BLAKE2B 0d4dc91e0023b2cfbb11bc6951df8304a46013bbb9ad789bddf66ae661d0328d90da6a04d39d659d4b1f7324b7aa488f9e504714da5cab06fa972e42f6e1c703 SHA512 593cb5f3fff022d69f2494ee476b1172a34e5192f4a4e3dcc16176e0cd4abd4ea57e7450b042ac6c13cea50019025017277b9761c04c32d41e2cff61e4333471
+MISC metadata.xml 728 BLAKE2B ecdead614a239a87e72e8d4c15e722c51b15f40b84085c00722285ed4b843872bbd4d15296f43080a59a7438450772799d440dc7b4560fff8c3057213f7d6fc3 SHA512 680f40bf2134a7aa0a91424aeb2cbc0de3ecaf1a388da0f8c4a98ece63e8258d26dba276b89bfd73a2901e473da26d429904acb206a2fba2e67595c6c0ab946a
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..9cbc7b4c46e2
--- /dev/null
+++ b/dev-python/jaraco-stream/jaraco-stream-3.0.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Routines for handling streaming data"
+HOMEPAGE="https://github.com/jaraco/jaraco.stream"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild b/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
deleted file mode 100644
index 661225b1f833..000000000000
--- a/dev-python/jaraco-stream/jaraco-stream-3.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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_P=${P/-/.}
-DESCRIPTION="Routines for handling streaming data"
-HOMEPAGE="https://github.com/jaraco/jaraco.stream"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-stream/metadata.xml b/dev-python/jaraco-stream/metadata.xml
index 11fd94e39567..c8fed0930ca3 100644
--- a/dev-python/jaraco-stream/metadata.xml
+++ b/dev-python/jaraco-stream/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.stream</remote-id>
diff --git a/dev-python/jaraco-test/Manifest b/dev-python/jaraco-test/Manifest
new file mode 100644
index 000000000000..202973253181
--- /dev/null
+++ b/dev-python/jaraco-test/Manifest
@@ -0,0 +1,3 @@
+DIST jaraco.test-5.1.0.tar.gz 6700 BLAKE2B 69ac08ab7e1c8aeff45d25483f2bb2648ad57a5977dbff8aab844f114a15f054b782ad5b424d9baa805ab80fc7483362dc97320965ef0abe86573b1e7f40b97b SHA512 d1d93eab85068fcba94530df50da9221b7f574e58b2c4ed519c8c4dec7231aa982d588e29137418226f23e0f94bd98f47c0859cf14d7a58c1683ac8ccc24d900
+EBUILD jaraco-test-5.1.0.ebuild 758 BLAKE2B 2c570885d3a1d085d127856c4fa21ff4997122516424b8f4d90ff484c39bc6ffffe3d7a71e38ece40d191c2c2c0f4f702e9046f16e27703792e2de90fed39f62 SHA512 e91394642e18bae7dd654321b3e95da2b54bc9a068d260d5c5adcb744783b56e2cacf66995168d254da920aeef696abbd546ad75502e8efb384152d8fba21cfd
+MISC metadata.xml 397 BLAKE2B 24c07f0efc966e9d4445968ba639a5476a24a0885051e4eab17075ea9b7b6369fe9ed919ccdc0b51a1e667c8d327428caac2196c2a3e087d8b36176e7b4b2c81 SHA512 4fce74bc524dc018611c219b86b87b7643fe5d133309a00dd5ade217895165f85cfbe26b686c79fc4dd8b1e016b07c83c25afa1c015fc240ffa0ac75e4c17159
diff --git a/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild b/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
new file mode 100644
index 000000000000..17f5cf9d9c60
--- /dev/null
+++ b/dev-python/jaraco-test/jaraco-test-5.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Testing support by jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.test/
+	https://pypi.org/project/jaraco.test/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	dev-python/jaraco-context[${PYTHON_USEDEP}]
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jaraco-test/metadata.xml b/dev-python/jaraco-test/metadata.xml
new file mode 100644
index 000000000000..4e41c7489006
--- /dev/null
+++ b/dev-python/jaraco-test/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">jaraco.test</remote-id>
+		<remote-id type="github">jaraco/jaraco.test</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index de3d8cabb794..ef6223d76119 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.7.0.tar.gz 12054 BLAKE2B 54528808695e2f1f04165e3de42d1715bb3e3ee1450ee8d8759814d209ba98c181d1746a916816dd50703e5a4e26ad7986f389619324ffbabaa89be90fd3908c SHA512 559dc5ed0f2c0b46dd0cbbc112ab01bbdb68bc12923cff8f745a5e233696ca9f50cef6dbf60116df5121f4761457574deebea142c2a23ca6c4664d7395b5607e
+DIST jaraco.text-3.8.0.tar.gz 13078 BLAKE2B 0c081fea1bc20150347636c46b489d4c09ab0c553d44b9f68c4e2d7b3ca35574801a740d4b907f03956a6817ba0ecc07945809c1619248563bb29974b0448577 SHA512 3526f1371d8f2e7c79dff61941b1b4ead3d0f4b5144f0e22dbd098ec244b9ffddba4bbeaa0d817a80ff422fa5c7ae11d0959d3f56044d7c5f95d8c8a5de8ad2f
 EBUILD jaraco-text-3.7.0-r2.ebuild 1695 BLAKE2B 49d95eb0407a7e85bb8f2a7629698729d51a7d926988278c5db375cf211dbee981f689bb25efa3ac9100d7d1690e15181f08a3959cf42636374c5919c49cbca3 SHA512 44b751a72abad4e964136b504e4734da518fbd2854b9ea3c0b7be8fe5480e8b8564024cef91cd7b95f5a41a0e29b9d18a1a1d7f50a8dea26f274ab6547bc11ae
+EBUILD jaraco-text-3.8.0.ebuild 1734 BLAKE2B 0bc14806e87d40f0b8b479404bb15e17a303ba3b63b7ba6af2543702e3a17f330660f47ac59b1de0be8aa65a35fe3b167bfe47ee9a62922d8f63d66d2d8af4c8 SHA512 7e7abd9bb5a873af6fde42547b0a01c32d138f9c922c811ecc602f1bbf9154295fe5348de15b1c8ba9675c729a6c1acc39fe7d6dbdd9bc31cf4a1b0cfb8a6d39
 MISC metadata.xml 656 BLAKE2B 0a887f3b936ada76caabedd24bcfc8d1d53047705761370fdf5c2cbe204b4d7c8449813268e9a45b48409f713e038f5742db12029bb3974b703317e7c3eaa28c SHA512 c8dc08d4347fec9076d6c23899ccb6fadbeee43d64875d8ea727ce20c2c5429a2683d162d602b763ef740c8eeb213762b17b2c964132923a647b769e2372763c
diff --git a/dev-python/jaraco-text/jaraco-text-3.8.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.8.0.ebuild
new file mode 100644
index 000000000000..0a28f2d6bd8d
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.8.0.ebuild
@@ -0,0 +1,59 @@
+# 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
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.text/
+	https://pypi.org/project/jaraco.text/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.5.0-r1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.text"
+		version = "${PV}"
+		description = "Module for text manipulation"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}text-${PV}.dist-info || die
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index 1e85993efa7e..044d7a820461 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,5 +1,3 @@
-DIST jc-1.18.7.tar.gz 8106032 BLAKE2B 05c069d0c00c1c789d253419dfc1e2caee656a848618b761664e7d46f87705f945955164c4fc213f7e8f19840b529d02ab52bc439384db122f3d464226c2b4b4 SHA512 c5ce538d4565f29a0d5fb1e39eda80a84481ad74c7ea4ce9339ec7881f2888a105af5c77c8adaf0b6174830e2f7cd1bf9628e5b9bb87d9c7b17e567251645ca9
-DIST jc-1.18.8.tar.gz 8103065 BLAKE2B 77713dda97a4228ed4715f123f2b8c1609496767aabcd38b0e80981959af5308b4296b0e1a76afed42f57517d2dadc773b00e8877324f2e1473f9f4457ea7dfd SHA512 2ed8d6946bc2230f4caaf3ef4fcf80ebb64d1fb5e3d42fddbd306bd84b6f4d4e3e84213ae479267293adb4defb443cb94828f55c74c82782eab8b4b192f792c7
-EBUILD jc-1.18.7.ebuild 671 BLAKE2B 11272a70d7bc2841c92bd16fefcfebd7ee7ac67180269b4f9f424920f07e7445d281d1260f52b26e7360e924ea676679b23e3c956f47a6dac66eddca8e2949a2 SHA512 0144a422a4e87c37cf8b5a1961043e31013a300b5e70612300ea17d0a1a237cbf71066bd204623f787ea90f52e5916b92c4259f647b7097f7a0fa52cdc0ed9dd
-EBUILD jc-1.18.8.ebuild 671 BLAKE2B 11272a70d7bc2841c92bd16fefcfebd7ee7ac67180269b4f9f424920f07e7445d281d1260f52b26e7360e924ea676679b23e3c956f47a6dac66eddca8e2949a2 SHA512 0144a422a4e87c37cf8b5a1961043e31013a300b5e70612300ea17d0a1a237cbf71066bd204623f787ea90f52e5916b92c4259f647b7097f7a0fa52cdc0ed9dd
-MISC metadata.xml 391 BLAKE2B 7ae27439328a8823bbc95bbd4877e91d858db314b7ad708b10abec19d8bfa818a0dfa6821aee0825497353e071771bac4ddbeddb78749ca841d882c6a5f5493c SHA512 7d4760729571e0b5e055248a89dec389682cc4da6dfbd117d5a42ec016d4ea3c1f8fbd99118c3b62fd32195c6cae6aedab956678da48d61d6a0cee801a2ccf04
+DIST jc-1.20.1.gh.tar.gz 10342360 BLAKE2B fe7eb94e53a78e6d2c1f13403ac529e4e0c0251a9e5f8270e88a94c7d086b7b1eca5cf8bd51ab6b514923ac2de95b7365b8ee29eeae5a1bb861e911f70be81d8 SHA512 d066b30089fce8bb7aff6db0b278f258a91bbef73bc49abb0b086b1cce5253a0ba07efa9e3680ee6ee333ea4a2b6afcfe4028eee58d0ec16411f7c257a54a9b5
+EBUILD jc-1.20.1.ebuild 674 BLAKE2B 4cb873aab7d621f36a62bb1d4a25be0d981dbc3c80cfddf795a47a0ddda6e962091f8aa46166cbf88b32d5372879cd9f8329036d27fa99bbbedceba47f4877de SHA512 6bf52b03223276c5b94ddfbc3a28822246bcfdaf9c75840570f36cb63b45a05b01995e09a4ff3cd22f9f5d10b8660b31e115e70e2826c5d7bf2614566d4aa7ba
+MISC metadata.xml 492 BLAKE2B 100e7421c33b90fb9180a3412206cdc2355b26dcacf988f1157a725ca8ee6eff44288ec12f8274360f086272ad3bd06e9df6a93288edeb9102551c65256a47f4 SHA512 cb0abbd0c1b02b1fd4c74034e1f41a53ed0b7f297dcfad4e9f6b2a4960e16790b5d879f407ab18f73c81684d3a0436327949bd628a1d1d146958f01e34206688
diff --git a/dev-python/jc/jc-1.18.7.ebuild b/dev-python/jc/jc-1.18.7.ebuild
deleted file mode 100644
index 989dcb9e4a0b..000000000000
--- a/dev-python/jc/jc-1.18.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-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/jc/jc-1.18.8.ebuild b/dev-python/jc/jc-1.18.8.ebuild
deleted file mode 100644
index 989dcb9e4a0b..000000000000
--- a/dev-python/jc/jc-1.18.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/
-	https://pypi.org/project/jc/
-"
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-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/jc/jc-1.20.1.ebuild b/dev-python/jc/jc-1.20.1.ebuild
new file mode 100644
index 000000000000..7b7bbfc30991
--- /dev/null
+++ b/dev-python/jc/jc-1.20.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
+HOMEPAGE="
+	https://github.com/kellyjonbrazil/jc/
+	https://pypi.org/project/jc/
+"
+SRC_URI="
+	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+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/jc/metadata.xml b/dev-python/jc/metadata.xml
index fd40a0b819c8..d22a71ee92d7 100644
--- a/dev-python/jc/metadata.xml
+++ b/dev-python/jc/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">kellyjonbrazil/jc</remote-id>
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index bd18e551a0c1..37b79a88844b 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,3 +1,3 @@
 DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
-EBUILD jdcal-1.4.1.ebuild 453 BLAKE2B ecd394ed310acf8448a8701e9756eddf9ed78413e5ba215aeafc90814c11dfda0955239ccd1f462732eafc0465b1225fc0ee41f89a2a5e990f168dde5223f691 SHA512 cc67027304f0eba46bc28f7d4a32e39bdc023dd5e0bc3fdd093d99f83ec7a45e8075b65bc5537a08f5ce4194dcfc5725f655497c9c9b0c6837c309fadbe2e352
+EBUILD jdcal-1.4.1-r1.ebuild 485 BLAKE2B a512549ac4d42b8083dfd80c7de6bea659c68c8ba146a94b8103aab4f041cc642336ee324bcd7bc49c58ea5772538c5c914a4118daeaa01af7847af25b06b6ee SHA512 9799b306ed0b4385b87c1e9da25ecdd05346c3742e9e9f4a1857af216720c191f7278c3c979d4eaf1eafe60f524da26f04d7f3a36807753deb748752b3585ca3
 MISC metadata.xml 395 BLAKE2B 10f34373c8b55215959ff4361a6ac0ddc4b92dbfd47ab4249f87b25d12cdf46dfdf9e581064a26ca78e5c51f503c1541f9ba17e18d2bb5d2f3696b37e0f53091 SHA512 d769283844d2dda47d732dd3b9d2b2a72b372581b75cd5348fc62952b258e1571b982c9bdb8b47db861054f7a0b566cb7df644a0b69fafe5568776769f5bd9b0
diff --git a/dev-python/jdcal/jdcal-1.4.1-r1.ebuild b/dev-python/jdcal/jdcal-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..838d795a91c3
--- /dev/null
+++ b/dev-python/jdcal/jdcal-1.4.1-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
+HOMEPAGE="https://github.com/phn/jdcal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
deleted file mode 100644
index 85a8ab2e8613..000000000000
--- a/dev-python/jdcal/jdcal-1.4.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Julian dates from proleptic Gregorian and Julian calendars"
-HOMEPAGE="https://github.com/phn/jdcal"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index d2aae3690069..0e517e227470 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,9 +1,5 @@
-DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
 DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1
-DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST jedi-0.18.1.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25
 DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa
-DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.18.0.ebuild 2481 BLAKE2B 30334950169a5fadec676f806dab2560f77c30613a892814adf7bcfad81cb8ea70fa73ba5ab545b50dbd7c0ddae10940cbb2f3a780d6d18e5f3a6e111dc048f9 SHA512 807a4df4b642123e99ab87578a7089dc561dc0429e3ed9714da25ad95a6dbc3a69afee37d882fce4be793ddcd0433a33f010f99dea25b5fb38f4385f6eb0e94b
-EBUILD jedi-0.18.1.ebuild 2209 BLAKE2B 4ec2d97467890a32af6def8b55521d0d689cc7912209b7b2c4a455f2643806b742733663d5b38443849745961fb25a298c508ad02793002e902a7047fe544f1f SHA512 119a1d21372df1cd15ff36f7fcec63cdc7d19a5a5ee47881502414bfb160bd0daa318e875362b78e53574be2cc520997d8652b207c2b3833e4e5b00931f8716b
+EBUILD jedi-0.18.1.ebuild 2201 BLAKE2B bed3608a18bdc8c1390eec43612bfb987839196798e0a708ca94b46ef1d082d49490ecb3886209f18aeaff01e7c5bc5e3e1b179196d0d9da50a4bbc1fe9469b6 SHA512 883ab512dc50f7400e0252ea182da65d3ede3e8e71441ecfb3c7a7e365815afc20d08ed93109da7f5d13313ab40594c2240e978cf4eb5addd9031d100ea87157
 MISC metadata.xml 401 BLAKE2B c540d55ee88ab5a7be9ec902059a766a754da42ba5c1836c990d0d64edfec91fa33e8a745b9a15ce4a97831259150e0298fe2a5ed4c21993be73d9fd7af3d865 SHA512 6af98463225428333ec509b334014bd307569ce852f640a1f1c1e18f7551185d8db9b7c80822012c14f3c6ca1cf79ff24f289df3cd42803759d012a1a73ac07c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
deleted file mode 100644
index 59d2c1396385..000000000000
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="
-	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
-		-> ${TYPESHED_P}.tar.gz
-	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.tar.gz"
-
-LICENSE="MIT
-	test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
-
-# RDEPEND needed because of an import jedi inside conf.py
-distutils_enable_sphinx docs \
-	dev-python/parso \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes these as submodules ...
-	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
-	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
-		"${S}/jedi/third_party/django-stubs" || die
-	mv "${WORKDIR}/${TYPESHED_P}" \
-		"${S}/jedi/third_party/typeshed" || die
-
-	# don't run doctests, don't depend on colorama
-	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
-	sed -i "s: --doctest-modules::" pytest.ini || die
-
-	# test_complete_expanduser relies on $HOME not being empty
-	> "${HOME}"/somefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'test/test_integration.py::test_completion[stdlib:155]'
-		'test/test_integration.py::test_completion[on_import:29]'
-		# pytest?
-		'test/test_integration.py::test_completion[conftest:27]'
-		# assume pristine virtualenv
-		test/test_utils.py::TestSetupReadline::test_local_import
-		test/test_inference/test_imports.py::test_os_issues
-		# fragile
-		test/test_speed.py
-	)
-	[[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		'test/test_integration.py::test_completion[lambdas:112]'
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# new features increased the match count again
-		test/test_utils.py::TestSetupReadline::test_import
-
-	)
-
-	# some plugin breaks case-insensitivity on completions
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# django and pytest tests are very version dependent
-	epytest -k "not django and not pytest"
-}
diff --git a/dev-python/jedi/jedi-0.18.1.ebuild b/dev-python/jedi/jedi-0.18.1.ebuild
index 695103134ebb..6ae29b6d32a2 100644
--- a/dev-python/jedi/jedi-0.18.1.ebuild
+++ b/dev-python/jedi/jedi-0.18.1.ebuild
@@ -30,7 +30,7 @@ LICENSE="
 	test? ( 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 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	=dev-python/parso-0.8*[${PYTHON_USEDEP}]
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 1403e189c707..fa754927e8b4 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.8.0.tar.gz 106005 BLAKE2B 23dbd876915ca364202b6e1888d5b6892c56020a492f9dbdd22c1e04f40c2627bfb90ce209c69be000e176cc6b144b6c2232a21ce1ab089971911ffa2c22cd2c SHA512 823675f262c2c9778ccf9c1083601d936cca534fc0d2d9309b52aa6beeb7f73d225a37c5f18f6b0683c4829a93b1299a2cb4f8f341e55b92bedf58c8dce0aa75
-EBUILD jeepney-0.8.0.ebuild 1439 BLAKE2B 95ddb6f5350c12ceac8e11a70bbc86b3e2f10ccfe4ffbd76b903a8d90f894e528b0b3bf630404887d4b04a54e176cf045a1b1fee0b52408201b753893d6eb604 SHA512 73353a5a72e7d0f8b171238bcb2ce6cb82e1a074a83a287cac8a651544313be8339d5c8889c47f34ce15b04f794ebfe7dc600c2a7965d9d35a3bab24af31a1cb
+EBUILD jeepney-0.8.0.ebuild 1439 BLAKE2B a1e7c8c6b0ef3da68677b047a772d62d3ba5c757eb8bb6dc428ea7c36f1a59a6518385fc0a893fd305e387acc7d050a632e55c9b368d1856e18e00b67b575552 SHA512 26f5f8fd9ac6681f2c3d7d1ee60d931b3b6598b73051fe83212378a02fe31c0665a92ac4f98377e60bef5311a7c9603d7e7fcf00701e8f117e3c053e636035f4
 MISC metadata.xml 457 BLAKE2B 8128c212049aa1ed733a297b9b0d36ada9bf76f6e88fdd87207f3f8c7b71b96733bc080746795088e30a8238f6381951e0be72af28ce82bf4b99e41275c71d7b SHA512 2ce1e347f419b0047615eed4be61962c18b325c75a7ee98feac55b8372ffbc04a9290ca7d1426b5fdf8286f3130ac9712277d510b1a4a35471e3b6542bd5c2b9
diff --git a/dev-python/jeepney/jeepney-0.8.0.ebuild b/dev-python/jeepney/jeepney-0.8.0.ebuild
index ecdd6c9d5fcd..36a4c43e75e3 100644
--- a/dev-python/jeepney/jeepney-0.8.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index c49ed6b43d87..f9e8a278e490 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
 DIST jellyfish-0.9.0.tar.gz 132588 BLAKE2B e7490da91d1a53b775ef145151c6dba5b16c938f59773e205b5cf01e1a262d36bb07a49d8c5d823fa722e2d244fc8af1bf9a603911411461a97b155cfdd0ce83 SHA512 1faa3ea03ec8b26085b5db34339f0aea061d3e4897f29235eca56995bea36ae8c152ae0ab0c67279dab4844d92d89293e2de2126c1d449407652b77da258e9f0
-EBUILD jellyfish-0.9.0-r1.ebuild 690 BLAKE2B 358576e1266c34eb930478a5953488451dce401965e409ca55c210ae550c9ae4728e0051c49b16f5c7a8e0beb5592f0a6ad599f89aaf7930116e492d0aed2177 SHA512 90b47ace416a04a3c355ed2bd2c394a452a0bf4bbb0f50fe52909ffe183de1b0bb1a7b4099956972d9a4f857209d70694bb3fce4060b24920b8451b001664820
+EBUILD jellyfish-0.9.0-r1.ebuild 623 BLAKE2B 344d18811123fc838cf5878d68600b19c606508c52d05d7ee9a84fc374f0a397ea60cf9dc8c3bf737012eea70fcd18c125d72d334596ca8cf847eecc3e8c752f SHA512 cb52253aefb85196e3e82ac3c43d0ce1bb105758cb7e124a1f5d1d5d91ed6305febff43e9d36d5974f7994b4bad06fa678baaf75a8bd1a0f5fdb158ee5e9b4c9
 MISC metadata.xml 504 BLAKE2B 65ba00e0a27d233e6850c5606eac6eacf7d1684bfeb64155c52cee5a196e54a0454465df8c310a91cf30d696b4812fa23014e3a8a483b197e8955a4ad751ee61 SHA512 51396a920abaed74a87aca55c00ee46404b4ed1773a4443eebe19b2e7b64b258b5b526a97bd4afc7e7aa495d7989192e3658105b69efba0bf280f57b52299738
diff --git a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild b/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
index 96c83af25bc8..c1ec210d8b08 100644
--- a/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -16,12 +16,6 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ~riscv x86"
 
-BDEPEND="
-	test? (
-		dev-python/unicodecsv[${PYTHON_USEDEP}]
-	)
-"
-
 distutils_enable_tests pytest
 
 src_test() {
diff --git a/dev-python/jikanpy/Manifest b/dev-python/jikanpy/Manifest
index 89b871c36615..171c59c015ca 100644
--- a/dev-python/jikanpy/Manifest
+++ b/dev-python/jikanpy/Manifest
@@ -1,3 +1,3 @@
-DIST jikanpy-4.3.2.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
-EBUILD jikanpy-4.3.2.ebuild 707 BLAKE2B 8a042fb83bc39291e59a636594f020c0b4eef40496c89fb24020633bea3c8632168e48a39943abf8973f8cc595eeda1f41c7e48fb944ea7593d85c1fa7b1a27f SHA512 e3283c6ecfe2040f2c46348995d28130930134f1e862e2fb12ac5f9df5def92678658a9f20b4e0aa556338598ae6d57211a6e861ebeb86d01065083403cd0b87
-MISC metadata.xml 403 BLAKE2B 75ecf66a566e7c250152681708f0c6f7151376979228c0e8da2a653ac769529c99621c4cceb9b4d8ec3162bf5ea636ea5b7ff0192d0b4f3d5e84d3830376a988 SHA512 1c3300afc78056a75cccef0a2c954069753bf804f91031c6e2d7a1b67effa6265e0d652b0686d38fa7e258112d1b2d9cbc557dac20aba43f408b8ffe32d9d3b8
+DIST jikanpy-4.3.2.gh.tar.gz 726102 BLAKE2B 754a174a5c67852701e94d817ab84462cbd1aff9f18737cdf5c7a1e20c91ca325d7c34dfd9467ff337d24fd7d3896880137f0695afeff5a436b0d40a96d4c89d SHA512 48dcf154f5b438b9381eb7d37a5a603d77793c2e2a7f17b4315e3f44a735c83bec076ee44969002a5ad2cbdd6b5cf83287b961f5d96603ddbd6c534db78ee3a1
+EBUILD jikanpy-4.3.2-r1.ebuild 799 BLAKE2B ee54c4622ce2746655396fd1675ed97537e88a08b5f9dfe8147eba0bd7a33f0ea8719543de9b146ed7b6a6111aa30c474cfaae1278e09ea892e88df8e0781383 SHA512 ce762f56fe50da3290ad0d9eece12dc4e6cf6b052760e0e2d46bd1d6fbf5674741bf1b74f2dc31921937d7a3a7d1378bdb690d8a93dfcc710185ef83dcc01e29
+MISC metadata.xml 506 BLAKE2B 7c1fccc2fd123f9acab51228679c37af16d73681ba87a95faf44841ea1db83914fe77891d8d2843d59702998bcdf191067c65e6896eaf965449b362a7dee4443 SHA512 3e8f0c36635591e3947e5f8ab5f85c7dd89a00cf3aa58c5e4913ecf017bd60971b6b7fbdc158f0aee104025de2e7751db2feffe3695c7f2c7be5b0557e89f878
diff --git a/dev-python/jikanpy/jikanpy-4.3.2-r1.ebuild b/dev-python/jikanpy/jikanpy-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..89b98bf4c72b
--- /dev/null
+++ b/dev-python/jikanpy/jikanpy-4.3.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for jikan.moe API"
+HOMEPAGE="
+	https://github.com/abhinavk99/jikanpy/
+	https://pypi.org/project/jikanpy/
+"
+SRC_URI="
+	https://github.com/abhinavk99/jikanpy/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/simplejson[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
diff --git a/dev-python/jikanpy/jikanpy-4.3.2.ebuild b/dev-python/jikanpy/jikanpy-4.3.2.ebuild
deleted file mode 100644
index 7183986671a8..000000000000
--- a/dev-python/jikanpy/jikanpy-4.3.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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for jikan.moe API"
-HOMEPAGE="https://pypi.org/project/jikanpy/"
-SRC_URI="https://github.com/abhinavk99/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-BDEPEND="test? (
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	dev-python/vcrpy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
diff --git a/dev-python/jikanpy/metadata.xml b/dev-python/jikanpy/metadata.xml
index 794b3b845a0c..ec00f14a40e4 100644
--- a/dev-python/jikanpy/metadata.xml
+++ b/dev-python/jikanpy/metadata.xml
@@ -5,9 +5,13 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">AWConant/jikanpy</remote-id>
+		<remote-id type="github">abhinavk99/jikanpy</remote-id>
 		<remote-id type="pypi">jikanpy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 1fcd50058dc3..af5c9901c527 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,5 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.1.1.tar.gz 272001 BLAKE2B 4787ee89d7e10cea24d3bf2810e391d5c17c00ffee8fd2f9244a9e24b219bc126e4111cc6b788107cbc07dd96732a2d1fc51dd87506545dc8beb7fdce5cd89b1 SHA512 285b3a2e09fbf891ce1d18e2692e400a9fe9d8968a36be50229972d9bdbb590bbea099cd26443de0fbe5ed7a2c6419eb211bfdac15c27a61b8db903e88855478
 DIST jinja-3.1.2.gh.tar.gz 272546 BLAKE2B dc4bc81900c07e7816ff63259073409650f1f679e00d76b9574aaba301b36a7037aaf77a87cc1c160ea2aa2272ceb67e2fd20fbd74bb9850880fb909babded8e SHA512 50feebc7eed4c8b5bb0c2951784c1c115e3ee1c0e0c91bbf1884551b1312ef8fce24804a2ca1dfd8c543406529afe4817567c39e7cfd15028b54049853623144
 EBUILD jinja-2.11.3-r1.ebuild 1460 BLAKE2B b2d08f495cec01d2d02143638b19e8848a80b822c3fca915771c3762580d779df413bb7f9b1160fdbeec0fb62dd4ae172e4c90e69245a848cb7f4bf66e35a2e6 SHA512 5a8ea50157dbacf032b3e7c13cc654a425bd12d38d662c0d040adc38e2fa61e4cdbc0bec7e01c9da4006230c17bc35a96dce158853026de5aec22b9799822a58
-EBUILD jinja-3.1.1.ebuild 1291 BLAKE2B feb44af59f727da6800a96860cc0efe1a11afd70476f0b70c631b73a77da6e0dd7e0c5b66d349e26cae8f398c809f98099ff8d159445940836a0cf8c80e9c5c6 SHA512 5d1dcc9935461e4eaf55517c809b56be769e6cde95093b3cad2e6ad8dcbc21d9dcde84b72aba67b4ea0a1371fbe020c1b483a538f46bb0fc3a9d78fc1f1ca72f
-EBUILD jinja-3.1.2.ebuild 1355 BLAKE2B ac92bf52f6517a5d9ac846b810d0954473dfc85f376f99ffb986d30b9fe974b0e23871d83a646cd9957bcf4b7b61ecdca9e3081182130f0af1dcc1c1fcd8171d SHA512 db54b1f2ca37596f9bb9e5736ba333453c427bb1603894f0494d9577247cbe189b04c79813cf552fd2d5bbb646a38d9ca79799c20223a5d3bfe4f01c71c24d97
+EBUILD jinja-3.1.2.ebuild 1347 BLAKE2B cba0d0a2bf0db8fd7c15bd845faa056c4e6d8cf3d658c3a7a11ab04c4fe395648ec1dacbde63aa8075e0e01d9364c0164226f50eba76f35e3347d2445af7f746 SHA512 da442900a26148206f16920a7b2f9d18fbc06b403a38b47332d74ba595e074f3d8e57224283bc05997732377641344daee3c16c34438e3e33933b684961c2b6c
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja/jinja-3.1.1.ebuild b/dev-python/jinja/jinja-3.1.1.ebuild
deleted file mode 100644
index abae5016c7d6..000000000000
--- a/dev-python/jinja/jinja-3.1.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-3.1.2.ebuild b/dev-python/jinja/jinja-3.1.2.ebuild
index ab9b51576290..a4337e8d38c7 100644
--- a/dev-python/jinja/jinja-3.1.2.ebuild
+++ b/dev-python/jinja/jinja-3.1.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jinja2-time/Manifest b/dev-python/jinja2-time/Manifest
index 38d348748de6..33fd9fd1a7ab 100644
--- a/dev-python/jinja2-time/Manifest
+++ b/dev-python/jinja2-time/Manifest
@@ -1,4 +1,4 @@
 AUX jinja2-time-0.2.0-arrow-compat.patch 1655 BLAKE2B 7285125450d338d4e4c927761b5eb93778f51bd5b260fcdf1ac720006d61faaee2b928a869337cd6f9e7905140810ebe6047fd3c954501c86e1185f85f1517d3 SHA512 0286a608702bb445cf29da7900ec04f5b1f64d1e9658b84f9a90018adf5fce5cc959832abff73fa017afcaf0a0f6be85060e52a79038bf770b8b37d8c96a5e7d
 DIST jinja2-time-0.2.0.tar.gz 5701 BLAKE2B 370318000b1c91bc3460861d389da667f6d7e840c4f9d9d1661491c9bf1b422b8ecff12d1da2467e7a9596d12832790e314c3298672d70b38b92a53198df0156 SHA512 8ac4686312cde689f7a431001833d5d477030c4f5e9470d949bd07a40fcb9521f6ddcde37a72468093121ff9451e352a0bb43d20a796d7a204cf94e8a7545f2c
-EBUILD jinja2-time-0.2.0.ebuild 600 BLAKE2B 1a5188463061179913db44bd78979f03df6e37f249c52a509eee6c474946d0da9b9b71d6f0494c3d0e2274a14fe63b24820e6f15bbf055cf6e31326807fac391 SHA512 469afe59a8632a7d6eea6177a756b187b40d5fb867727a29858fe4e4dc82b2f9f0edc2ba95a5e4e734cc8cdf5114fd53f973e2bd84c42d610499751ddd8a2901
+EBUILD jinja2-time-0.2.0-r1.ebuild 692 BLAKE2B 20f72bd8f676b403eeda5993bda4c598e4d093729dffd4e3ad4aa81ef40b348bb03a344d5cc270350db5965034198b49f030f778d29cc301b8d27acee60d750c SHA512 d42f222d9ba54c78625c988eb47fce215ae3584b98f5daeb95a77ad0cffcc33ab9e238fe9e9bbdea390fe5b97638a63fe2f059ad4fc5977b002dd879045355ec
 MISC metadata.xml 400 BLAKE2B 1b41d34e0d32e03e8a012358f02460f7090d0f70fab1be6af4f91e55a22a35deceac8078d5f2723676171b4641594ea4fe58b614948dd9b7bf60bf6889b68ab3 SHA512 decfcdeeb4705a9f62c6fdd9a249b5a7363988faffc5758d9cd50da9db909bf792da78ba044bfbada5b6429a6a8139c833b12ccb8e0d7cb7bfbae4f8d16664c1
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..56f417f76e9c
--- /dev/null
+++ b/dev-python/jinja2-time/jinja2-time-0.2.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 Extension for Dates and Times"
+HOMEPAGE="
+	https://github.com/hackebrot/jinja2-time/
+	https://pypi.org/project/jinja2-time/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	dev-python/arrow[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-arrow-compat.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild b/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
deleted file mode 100644
index 744a7e89d786..000000000000
--- a/dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
-
-DESCRIPTION="Jinja2 Extension for Dates and Times"
-HOMEPAGE="https://github.com/hackebrot/jinja2-time"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="dev-python/arrow[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-arrow-compat.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jinja2_pluralize/Manifest b/dev-python/jinja2_pluralize/Manifest
index 955466020412..dff37a4060a5 100644
--- a/dev-python/jinja2_pluralize/Manifest
+++ b/dev-python/jinja2_pluralize/Manifest
@@ -1,3 +1,3 @@
 DIST jinja2_pluralize-0.3.0.tar.gz 12638 BLAKE2B bb7399d287cf0d1bfed5398c0ad7e6994dfe1d8e942d82190570d0b40d8bec4939d497cb2d9d4415c913f3f3f9c11b017035941755219effa8d92a6ef188dac9 SHA512 8830c01ff82befa353302cadc305147a950038fdf3808632f22dfce9a564a6ba7967781f579a2d94fecb1b5bb01f80d2a53ff082332b94c6e6e3f5f4106e7313
-EBUILD jinja2_pluralize-0.3.0.ebuild 490 BLAKE2B b363767a4de1b861b646c83ef9fca770547012234e2e7b54b389a7d5f6d45b238237f527c0c95107fb0609ee64b76b92826d94a06fc2b32ec986bfb249387c2c SHA512 01f749b9887df207360edfa512488e96416614cb64cf07ce1057d8b93c9d4ef147c6ef348e4f68e786d6bfdb8be9a2a267f1b654de6cef72769265b8c3bfd234
-MISC metadata.xml 388 BLAKE2B 2596cd0b3fd109dbf9e6c941e3a73567ee777347299b35780e99075baba42db440d7e7c2f0613fbb6109f34b262dfcd13c317afc26a9547cc0bc8c4ed8438f25 SHA512 04178db1a187e9ebdf91cfe894e0db506097d00d32d6179fb603bac61fb246b155b247f13cd908effcfbf7529a4d47b61f4ecdac02352b032442575b58a63d56
+EBUILD jinja2_pluralize-0.3.0-r1.ebuild 570 BLAKE2B 5ba18a6e44917c176824a9fb2019915ebf1c624d52dacf36666a234cabd4ab60e436476e6e23a12965ba06a84620636dcecb25d9f25ed7d90638e506ed2e79b4 SHA512 a4748b9ea9d16af05142c9683b935cf44c1b9088cdb340419f3ee5694300b2be822af9018de6a9dedd6d37a042d3051744963d429e1aecca5524548769fd7fdd
+MISC metadata.xml 495 BLAKE2B 92432500add47e3e65573cf3d6ce69f97ed5765c16190fb102d77829e34cec938c8e587b39fcc95dee157fa8b8048eae0708147ad79431eb9bc3aa0214b926c0 SHA512 7bd616c66dcd43150b63203ff1b069b216eb721222103df46ddb459ecf521c342820c4dde2d386d2b0621d4c17e64c7c0b8edb9509b87cc032010ced34752252
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..370e631c8d08
--- /dev/null
+++ b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jinja2 pluralize filters"
+HOMEPAGE="
+	https://github.com/audreyfeldroy/jinja2_pluralize/
+	https://pypi.org/project/jinja2_pluralize/
+"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/inflect[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild b/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
deleted file mode 100644
index 00bbd09ea45e..000000000000
--- a/dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jinja2 pluralize filters"
-HOMEPAGE="https://github.com/audreyr/jinja2_pluralize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/inflect[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/jinja2_pluralize/metadata.xml b/dev-python/jinja2_pluralize/metadata.xml
index fb5c41c82609..b0b0cb2c3394 100644
--- a/dev-python/jinja2_pluralize/metadata.xml
+++ b/dev-python/jinja2_pluralize/metadata.xml
@@ -5,8 +5,12 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">jinja2_pluralize</remote-id>
-		<remote-id type="github">audreyr/jinja2_pluralize</remote-id>
+		<remote-id type="github">audreyfeldroy/jinja2_pluralize</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 679cbf3008d6..f9722eee2406 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,6 @@
+AUX jmespath-1.0.0-py311.patch 857 BLAKE2B 8cd99015c73adad7855c6d7f6aa171dd2a0ad44300a37d7eb0710e5a696c31dc785632a69bc3a961d7d141058baca7325593d4cc4589c99735b0e050ca090e0b SHA512 f6c140589ff6a9049021437f846b1cdc8a6afcd0078679f04ba1e29e3d8cddc0c88e1b147c101d137f730c028f622c45054c8db7e30e5b898d3ff9940fa3a943
 DIST jmespath.py-1.0.0.gh.tar.gz 80829 BLAKE2B dcd5e61ef846c5bcd9ac59480f909b05310dbe785c21e97c81981db90d104d17a3319f766b8926e8c8e3ae8b0e2164051d5312c74fa9c16979d802aafd286654 SHA512 d55ea1c4041e1a5043b3e3b7efcd1e561b92a394e3facbe96b069ff6a9a11c20553e62cfbc5fea966670c71376f9f9ccc24d8905f253e0f1d96dd7a588cc3e44
-EBUILD jmespath-1.0.0.ebuild 797 BLAKE2B 3b253c909ef4c8c944896709e79fbd22037c2362adbbd271909a7e1cad13822b457952722ed5abc340b447e2c28a547b50064eb5cc5aa68800372dbebd577fd2 SHA512 e1c3cce5c62177502f49f876557f6c75bbd9b2b97e7127b03c71cb3f00b2aea0c4ef0d2a8779762151d60ea39b3d35c37b2e7c7e9fdd35db9e3ca2138bc26a70
+DIST jmespath.py-1.0.1.gh.tar.gz 80936 BLAKE2B 9dfcdf4a8359d0e7c5f333e349d12e5c438693cf81b64df1a8a3b7211304ee228e9579be528a9b35ee0e4289539a5b4e214fcb9cb42d2b3fdbdd2e1a83975bc2 SHA512 c1676a4b7565d25c2948569005c503a0ca33908de6ed16536767da2c00c634e4ee345bcaf88a01bf6cd2996aaf722faaedff80061ab65ee77e5bc0f494f86a70
+EBUILD jmespath-1.0.0.ebuild 842 BLAKE2B 875c2eac8288ceef5d863e764b27be3db5d2ddda2e7c40001feff2bf01f0788cf0baeb0880ebf6a524af1dac261c5cf33b658271fbc588ad1954d0f95ac165e9 SHA512 8feedd4bfd68a5938f4fe03d3bed8ee892ce23c33cc7de4028ba3526c35434182cd66d30b9fa847e1f61724eef9d43795b933aab9d97a4c16434cc0d4c1f8fcc
+EBUILD jmespath-1.0.1.ebuild 702 BLAKE2B a9920494665680744737703a0994f387fd1bd3be0aa49bcb98556ea0088064e7aa03779791618c67cad56d36f1c41dfa79a992deba99b8c43043081b70da6fa8 SHA512 996de1ba4ff49484c3734b92b42f5bf4e4f7176f7f81985d018451d5f4460566e87b92f07e2e43ef8afa1e16f39d7c277972d3e983c6f298ddce0064c4590f4a
 MISC metadata.xml 409 BLAKE2B 7adc2c326ae16f921adb5958e2f80b3309c4b4321c529e11225a7db22dbdb441335a1f35132147ad651c747075078263870ace4e1472398e833fbffd8e90ffd1 SHA512 a4009dc996e7c9df5b5bc31d7504af2d315ec57326edad640ce075f232c435d2dcfe400a7cb10cc33bafc142651a712df570efbfb2592361c078942c1e9a59bb
diff --git a/dev-python/jmespath/files/jmespath-1.0.0-py311.patch b/dev-python/jmespath/files/jmespath-1.0.0-py311.patch
new file mode 100644
index 000000000000..90c7bef9beee
--- /dev/null
+++ b/dev-python/jmespath/files/jmespath-1.0.0-py311.patch
@@ -0,0 +1,26 @@
+From 325d8111a924a951d8778c9fc1dbce30be267435 Mon Sep 17 00:00:00 2001
+From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date: Wed, 10 Mar 2021 14:15:36 +0000
+Subject: [PATCH] Use list for random.sample since using a set has been
+ deprecated since Python 3.9
+
+---
+ jmespath/parser.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/jmespath/parser.py b/jmespath/parser.py
+index eeac38f..4706688 100644
+--- a/jmespath/parser.py
++++ b/jmespath/parser.py
+@@ -489,7 +489,7 @@ class Parser(object):
+             lex_position, actual_value, actual_type, message)
+ 
+     def _free_cache_entries(self):
+-        for key in random.sample(self._CACHE.keys(), int(self._MAX_SIZE / 2)):
++        for key in random.sample(list(self._CACHE.keys()), int(self._MAX_SIZE / 2)):
+             self._CACHE.pop(key, None)
+ 
+     @classmethod
+-- 
+2.35.1
+
diff --git a/dev-python/jmespath/jmespath-1.0.0.ebuild b/dev-python/jmespath/jmespath-1.0.0.ebuild
index 18253469abc7..7d281153bda1 100644
--- a/dev-python/jmespath/jmespath-1.0.0.ebuild
+++ b/dev-python/jmespath/jmespath-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -32,6 +32,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
 src_prepare() {
 	# leftover import
 	sed -i -e '/nose/d' extra/test_hypothesis.py || die
diff --git a/dev-python/jmespath/jmespath-1.0.1.ebuild b/dev-python/jmespath/jmespath-1.0.1.ebuild
new file mode 100644
index 000000000000..194bb64200d5
--- /dev/null
+++ b/dev-python/jmespath/jmespath-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=jmespath.py-${PV}
+DESCRIPTION="JSON Matching Expressions"
+HOMEPAGE="
+	https://github.com/jmespath/jmespath.py/
+	https://pypi.org/project/jmespath/
+"
+SRC_URI="
+	https://github.com/jmespath/jmespath.py/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+EPYTEST_IGNORE=(
+	# fuzzing tests, they take forever
+	extra/test_hypothesis.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 8978f32e6686..2499816c27bf 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,3 +1,3 @@
 DIST joblib-1.1.0.tar.gz 350428 BLAKE2B 6b9b449e012752e561b267c8e27475252fee8d56406430bc570abc6da22b913bb09b7ad8708c29c7d7c338e4f541144b4514976a9f4ce017c3764b4d717eaba8 SHA512 5efcf9fc6dd4e2cf30599dc50373e40580be38fa15c2295519eb8c3b94a07b0fe2d1a9960ec4a67846aa3176335a2634b21107664032966166b973dcbded0cea
-EBUILD joblib-1.1.0.ebuild 1172 BLAKE2B 31b9955285921c40e7fca248d8d43bf9b7a400f6327bdee203c7fe02f74068c85f19fcfe448f2c711e9a6d18afa8365af06718ad85533dbded0bd2d104cbfdfc SHA512 c26e1f0ce7bb48101a42c7744511e23a4a866e4278cc170b6f35924c85a3b3423c6ad42526149c8f587f93919d40c109f6632a2bb6b01069094d661eb5c502a9
+EBUILD joblib-1.1.0-r1.ebuild 1204 BLAKE2B e23500958ac02e2b05875e25fd51444f9f5f8313c3005102e57ffc5b8e7c3f1613e0349ada451af79cebe582f2cbff46ea896b7d2b78ba61ee59a91f8e8946bc SHA512 d5ee07f6e15a21d2ceff091f6635f374894cacde70d2649fe531944fe16f8c46832215e72f9f1a16537a1211bfd618280d48745cddf80678b791106e1b12f7ca
 MISC metadata.xml 858 BLAKE2B e141cefc3f64a2d853994352590d9edb2dfcf8406e64de688b5ee077e7577ec255f214134ff04cccdd90bb08410495ca0c39081b9f530763735c12214e66c871 SHA512 4938b0a8200be169056c19816c9f6753fb19e2d89a5799de9ee9e04e48d815aec84049c480a0844e391aef1647af8b3ea70186d5a6b10be1b3dbffc13711d3ba
diff --git a/dev-python/joblib/joblib-1.1.0-r1.ebuild b/dev-python/joblib/joblib-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..65f022536590
--- /dev/null
+++ b/dev-python/joblib/joblib-1.1.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+# joblib is imported by setup.py so we need ${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	# https://github.com/joblib/joblib/issues/1115
+	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
+		-i joblib/test/test_memory.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/joblib/joblib-1.1.0.ebuild b/dev-python/joblib/joblib-1.1.0.ebuild
deleted file mode 100644
index b21627ed4cbe..000000000000
--- a/dev-python/joblib/joblib-1.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Tools to provide lightweight pipelining in Python"
-HOMEPAGE="https://joblib.readthedocs.io/en/latest/
-	https://github.com/joblib/joblib"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/loky[${PYTHON_USEDEP}]
-"
-# joblib is imported by setup.py so we need ${RDEPEND}
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/threadpoolctl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# unbundle
-	rm -r joblib/externals || die
-	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
-	find -name '*.py' -exec \
-		sed -e 's:\(joblib\)\?\.externals\.::' \
-			-e 's:from \.externals ::' \
-			-i {} + || die
-
-	# https://github.com/joblib/joblib/issues/1115
-	sed -e 's:test_parallel_call_cached_function_defined_in_jupyter:_&:' \
-		-i joblib/test/test_memory.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 487fef28f7ab..c1a7413ac263 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,3 +1,3 @@
 DIST josepy-1.13.0.tar.gz 59045 BLAKE2B e4f3caed3be0775a49d6a9c38bf6e2b61ecc50b4e3804afa9e597b741821ab63a27fe95d1592531fee7152e2076760d838f4efa50ab8b3e2f1e129c9d7457f8c SHA512 fb91946ac4bbb2a81195d200e4fdf06d40865b345005ab4ee328fd72545da2345b44c5b9ffb3115b16ffed65ab3a0c01d5b20d0d2ff3c2c2af30537a6a4721df
-EBUILD josepy-1.13.0.ebuild 716 BLAKE2B d92bfd3fee93b30432a47b46e95676b8b6a280a65bc72952989e34161117b42d1eaf69c8f6a4323578a6389f7136bf4f72c8d3fd1d8781e28f94352b1d6b1206 SHA512 c50c201f51e785be6a1f3d650a53d9e50c86bc87cdd8893f4ef06a39c746afc988eefa0b26b0e51a02d42ebe841ff40af777b221add4e486bb802ed153bfd5f6
+EBUILD josepy-1.13.0.ebuild 754 BLAKE2B cfc0428c97129a649448e180d3d19a5d2cb293d68c3c9971491e40de11e5814ebb124b8ad7d465c540f57eb5100d41581df6e313b80f5b3fc24438d4eb48de24 SHA512 ee3b4960bcf4d41f49557e47da1569ba2ada9b47f1b3f8ca57a2e01df9737f1609435175ce54dcc6514b2d47fc1466883583e9a7e12ac2b46f3de8d26781547b
 MISC metadata.xml 720 BLAKE2B bfe4668c6be6fcd57f41af649d31ebe5e4d96db8a0d851ca9c8365f42f1752e820f7dcd04da9ab974f8e9c99ab443bc7b516005ca510f4dac9390616b9135269 SHA512 be0b55bee1d51c91cda3893a2751ac9e8440b61c106daa9223ac6ecb3cd20e06b41dbad892e0e647e899a7a1eef1e985f29ea9a355a8c0d50524f599aec3cc88
diff --git a/dev-python/josepy/josepy-1.13.0.ebuild b/dev-python/josepy/josepy-1.13.0.ebuild
index 01bdbe48359a..7802a4731dab 100644
--- a/dev-python/josepy/josepy-1.13.0.ebuild
+++ b/dev-python/josepy/josepy-1.13.0.ebuild
@@ -4,11 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="JOSE protocol implementation in Python"
-HOMEPAGE="https://github.com/certbot/josepy"
+HOMEPAGE="
+	https://github.com/certbot/josepy/
+	https://pypi.org/project/josepy/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/js2py/Manifest b/dev-python/js2py/Manifest
index 42756773ed5d..b1d17badc323 100644
--- a/dev-python/js2py/Manifest
+++ b/dev-python/js2py/Manifest
@@ -1,3 +1,5 @@
 DIST Js2Py-0.71.tar.gz 1969618 BLAKE2B 293a830f4188e66927b23900e8c376bf1a4bfdfa8726e33aa5aa75dcdf735cde89ce463741c142fc7e487ae89c7c11421e459d2fdd09ba88edfe953e4e087e42 SHA512 75bae61619d4766117f3c163d36427f3019825ecb08b745aee7c3b6f2d33a4ea8507ca180b63c0a8e575a5f9491eb64d6963acbb912edc7b934a676b38814597
+DIST Js2Py-0.71_p20210918.tar.gz 1970784 BLAKE2B 4ea446b306e858c2acb192a699b4c098cca1a334fd97246d3149186795a013fa1ff9cf45ecc5cd9bed241b13b3eb003ebf272f5af4ed24a608564fd4709e4ff1 SHA512 810363e4b0716e324e6deb5f373968c9c57e7ecf120710c064601ad46ca2f24bc8da52f779f861296dd506de06d664be86b3c0d72bcb811892fe4e6c22ad7a6d
 EBUILD js2py-0.71.ebuild 1157 BLAKE2B 516469da33f8585b37dc0103bbdd0e106d97f04a0e3eb23ce1aebf7ff84886143eedd9877075880e62e9b6939246d47722d8e7c6d15f41800760182b671f98a8 SHA512 b298e699f7117c93e73fac3154eafa35794511f720ed125ba31f051e8908ccd8f404952ee3018973af30031fcc735b7091aae693add03da91a34e3a84b41d376
+EBUILD js2py-0.71_p20210918.ebuild 1130 BLAKE2B fc81ce12cf14c0e7a638ed468e1e72e63cb7a86d6e604b67ed9573339236a4ea7d4aa83e71ecf939ede70334a4f44ac1f2cba2df1d407a0de6b54730f7150805 SHA512 ead3fc7fee3a183353dce2954c49a97bec9ce355e2828159b4b139a6cd6d81c1d8774d40e9384d304843f2fe4c93a4e13338cee808023f03edc5254e6163df0d
 MISC metadata.xml 385 BLAKE2B 145afe58273b407d1ba1f3859de0d79a3bdd4307575d043a8b574a8bac26c2d577efec841c6c3a9424ca7970dac33517df48c0f287c18bf4e1cc5faa5125ba6e SHA512 7e48c836578bcbb4abf0d99f0f2b870ab15158f05d5c402e2d84c9f9de7d2c994127eba26897e406b6c7d77c962867d39a37bf7ce78ca09d39b78d64f9d8d68d
diff --git a/dev-python/js2py/js2py-0.71_p20210918.ebuild b/dev-python/js2py/js2py-0.71_p20210918.ebuild
new file mode 100644
index 000000000000..7f94a9dd666c
--- /dev/null
+++ b/dev-python/js2py/js2py-0.71_p20210918.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=b16d7ce90ac9c03358010c1599c3e87698c9993f
+MY_PN=Js2Py
+MY_P=${MY_PN}-${PV}
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript to Python Translator & JavaScript interpreter in Python"
+HOMEPAGE=" http://piter.io/projects/js2py/
+	https://github.com/PiotrDabkowski/Js2Py/
+	https://pypi.org/project/Js2Py/"
+SRC_URI="https://github.com/PiotrDabkowski/${MY_PN}/archive/${H}.tar.gz
+			-> ${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${H}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyjsparser-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pushd ./tests >/dev/null || die
+
+	# Tests require "node_failed.txt" file where the logs are kept
+	if [[ -f ./node_failed.txt ]] ; then
+		rm ./node_failed.txt || die
+	fi
+
+	touch ./node_failed.txt || die
+	"${EPYTHON}" ./run.py || die "tests failed with ${EPYTHON}"
+
+	popd >/dev/null || die
+}
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index eccfcba9e8c4..ad85de493902 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,3 @@
 DIST jsmin-3.0.1.tar.gz 13925 BLAKE2B bfce2368f622cfcc34e716f09638850c773d2381c539fb72a2aaf45830bb7eaf152dd7111f36815b0a067778f617fcec434ac19d7c5278bc963d94ea9d195285 SHA512 f65ead107ffcda67bbea1aea2070d1012139043cd1094d95c0393b1370e2e11a6c6e09af2f3af6f32ab0acc35fd702431954175d930a1898a142808fc3d57b71
-EBUILD jsmin-3.0.1.ebuild 448 BLAKE2B 410a66deb9989a2f3f07eb25169832f95efb140568184e6b211b9ea9625a514fba46e85fd53a506a6da7874f878e69efdd471cd093ed6eb46895209bec3169e4 SHA512 5f4714d5218e833b1984268d95cba0a44d2aa0f6b089611c3fe31875c299dc62bb3b4cee9efa6219387137dda8c3d94f87ae9195b4690f5ac3f757804df2b36d
+EBUILD jsmin-3.0.1.ebuild 448 BLAKE2B ba583e62a2f9bd0b1b98032b96d73432ddc101e1cfd1721659dd221c6cdf0da3a3c3dcc106022a4011e7d128866a4b77c458605d50f44121c492bd669ac5656e SHA512 04ca4b81606c1aaa99954553cbc52a8690a3d4625933d83f5103bc863f63cd302f61aa1bce221a70d869b44a585a1360b17e0154e62c7f58084544b83c2893ea
 MISC metadata.xml 398 BLAKE2B 93a4b03ba0d137ea56bec7154a9313bca465b2ea839a446d1d6ec2a9e9b2254d5dc832374438edcebfe211c7579050319acb9552633c4de82432c760ecb91100 SHA512 dae9577169fcbea94ed427a6218e0b41a8abe17f01e5870e246760381b3d355b75b4985728cce4d88474bef222ca2fb6dd30b84264f7e10fbe077736698e30cd
diff --git a/dev-python/jsmin/jsmin-3.0.1.ebuild b/dev-python/jsmin/jsmin-3.0.1.ebuild
index 2007f662d697..7a815c37fcc4 100644
--- a/dev-python/jsmin/jsmin-3.0.1.ebuild
+++ b/dev-python/jsmin/jsmin-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="JavaScript minifier"
diff --git a/dev-python/json-rpc/Manifest b/dev-python/json-rpc/Manifest
index 1a72b734c632..842f5e6f7256 100644
--- a/dev-python/json-rpc/Manifest
+++ b/dev-python/json-rpc/Manifest
@@ -1,3 +1,3 @@
 DIST json-rpc-1.13.0.tar.gz 31089 BLAKE2B f2058bf78cf1924aff7bf7882aa693cbbb5419624bf3e3508a344754265985907cb16456de611b9be23afd701bd2f664ccb05f954622e543bd9db0ab8be52101 SHA512 76cd320b29c32a79fcafbd415cea8d4ca98a349b22b29c379aa06a89a76cd2b5bcba2e0883d8cad75ee43c4a979759a6af513d3cfb30076965de08e1ee801b9e
-EBUILD json-rpc-1.13.0.ebuild 504 BLAKE2B 99913c39cf633b0b86829ac88d70acbcbcfa989f02bc6dfb56c73875da94fab2b3a886e0658a2a7652da147f1f09071ceeafc0954003e807d79bf6b470c8feaa SHA512 06ddc43d53aec0e3fb6eabbcb44fcbf962dcb6f5ac6d5ed7be831311314beb4c03733576cd4244ae0cd739dd4461231aac6f1d54294c7844e3e2712d1714ec03
+EBUILD json-rpc-1.13.0-r1.ebuild 536 BLAKE2B db4ff80c6bb662e737c32ba2b9e0591e5a8f5c589fa237c0dbb6675195a77522028993fd6da7f5080eff933ce309c823a5f337c1619b38a0f5354e078d0118af SHA512 9c26f10452ff6fb404865ac18a63ddc895a9a9398e1c4e2bcd3cbdb71aad89f196494289db13676d08370ca471fdecfc6bb2fc458901e930d35b3e2f311dcfaf
 MISC metadata.xml 916 BLAKE2B bee73f8c0f26ed4c50a326b3e6749a2ee92ec53dea630292ff860fee9d7e309c61f607f713aaf0fc4eef425141dda9d06c8b16ce75be4a5a6f43377a452e2cb8 SHA512 92c778d4429409a80c80ec8302df97777baa4c541653ebcc63e9d0d0180bccb8cdb98158a2bcddc626d7e677062f4baa8cb2eb267a0874582bd33765fd1ec25a
diff --git a/dev-python/json-rpc/json-rpc-1.13.0-r1.ebuild b/dev-python/json-rpc/json-rpc-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..52bd15fa4550
--- /dev/null
+++ b/dev-python/json-rpc/json-rpc-1.13.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON-RPC transport implementation for python"
+HOMEPAGE="https://github.com/pavlov99/json-rpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? ( dev-python/flask[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/json-rpc/json-rpc-1.13.0.ebuild b/dev-python/json-rpc/json-rpc-1.13.0.ebuild
deleted file mode 100644
index ce9b58b6cc5b..000000000000
--- a/dev-python/json-rpc/json-rpc-1.13.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="JSON-RPC transport implementation for python"
-HOMEPAGE="https://github.com/pavlov99/json-rpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? ( dev-python/flask[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index 3a2b3ba43579..43bb6e79deec 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,7 +1,3 @@
-DIST json5-0.9.6.tar.gz 109927 BLAKE2B 91e01250a6a4bb3f2f8baa6a425b0721fac3888366c36de7aeed3f82123a48d91b06a1fb7458ef93f99a9bbf9f6b81e7d665a64f52652c495df99bb7af0d5cfd SHA512 6e1d8bc602ab7a13e4b495dc27df438b55f7474284af3a828f3fcae51f4b595e5a7d3be9693cdea4930721e2205db966392ba154d7b80ba7b9b6c9a7c0e7f7af
-DIST pyjson5-0.9.7.gh.tar.gz 110326 BLAKE2B 5d6da6654db8b902b211119d20be56dd3d8171100af3924c9dfe03f3bbae3581f0253e18985cf6ad8742d5b3454862ae39c56dee23bf7c1e849851755d71410e SHA512 625d1954105fdb358dafe4d1216201485ae47d3fb3c75c5a7b896899ecd5c59d92f675ff3d3349a7dc69d1dafa395b10d4a7c71f9dbd43d962965e03e5e799ac
 DIST pyjson5-0.9.8.gh.tar.gz 110629 BLAKE2B 7a2acfbf1228e8f143a19775750e6d020376d63b2b036eac75be032b7baed1e6b93ea3ee842b0c200db6f44dc0f16f3c6c2f18cb165b24918334a48f237f2a9f SHA512 e1fb7a7457bdc68c33e2d73ddae8913aeec6f001e25a70234f7233d8d28b8eee8dd023c76e26dec0d0a2051e8e2cd731044dbe7dc15af9ec95f0ce806fabac72
-EBUILD json5-0.9.6.ebuild 473 BLAKE2B 1fca0455414137b16316d50699a0aa008647958d3967a953da016da6ba6995425878a66ec068af666af63c848f2136b8ddbd32e0431175657f984c3142f5bdef SHA512 2cdce64582dc9068a6dcaac3469b3ea6e849f9beb9bc3dd2f8aa2595d5d61b915251ef703154258937311a42f071fb250327529b54fbd4c414673e18af796eef
-EBUILD json5-0.9.7.ebuild 571 BLAKE2B d8dd460f3cb35524875f0d02fc237e93c15822bd73bae14a10d0d5ecc115a20a84efdd87f9bd90c2fe024abc1b88f26beba45cabac28f905ea6b9dcab7da8395 SHA512 1083e706617c29d8e7be7ee6141ae45ec5b96ef9226f171d88fb127518e4c95720339f1c38ed3e44a98ebfe584fa733d58f95e7c435b3af60f4450efb865616d
-EBUILD json5-0.9.8.ebuild 571 BLAKE2B d8dd460f3cb35524875f0d02fc237e93c15822bd73bae14a10d0d5ecc115a20a84efdd87f9bd90c2fe024abc1b88f26beba45cabac28f905ea6b9dcab7da8395 SHA512 1083e706617c29d8e7be7ee6141ae45ec5b96ef9226f171d88fb127518e4c95720339f1c38ed3e44a98ebfe584fa733d58f95e7c435b3af60f4450efb865616d
-MISC metadata.xml 401 BLAKE2B f649166d283a90747bfde8907b3abc906d090f0725e7fa61cbb6bac78806dd1286da7a3ef52e9c39077a36681ee5eacbaed5d9ff9697c9d50f1c71dc9f23a2a0 SHA512 3b72503d00856242480bf81cb568ee0c9908a741f33e53ed202f8e39fb08f567fb977fb4e8df484ec9592a661326183bd51d27f3c1e5d42ba029ed7573f3caec
+EBUILD json5-0.9.8.ebuild 571 BLAKE2B 226bf2601231bb5babc121964ebb5284763f601aa56b2745e4de598c427517a4f957daa457dd6f0d18669a34b00b77dea6c3617fdd6750603bf0b02420b11c42 SHA512 45dbc8e285fce034b1ac5ce65d9809c215100009174de06c253263d1282073f31082055bdf2125e279a1d64bdb32f58d7d72afa28f579ce0cefece89ed63aaab
+MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
diff --git a/dev-python/json5/json5-0.9.6.ebuild b/dev-python/json5/json5-0.9.6.ebuild
deleted file mode 100644
index 80f247d89250..000000000000
--- a/dev-python/json5/json5-0.9.6.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="A Python implementation of the JSON5 data format"
-HOMEPAGE="https://github.com/dpranke/pyjson5"
-SRC_URI="https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/py${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.7.ebuild b/dev-python/json5/json5-0.9.7.ebuild
deleted file mode 100644
index f32c70f5016e..000000000000
--- a/dev-python/json5/json5-0.9.7.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=pyjson5-${PV}
-DESCRIPTION="A Python implementation of the JSON5 data format"
-HOMEPAGE="
-	https://github.com/dpranke/pyjson5/
-	https://pypi.org/project/json5/
-"
-SRC_URI="
-	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.8.ebuild b/dev-python/json5/json5-0.9.8.ebuild
index f32c70f5016e..0a10cb1d1bee 100644
--- a/dev-python/json5/json5-0.9.8.ebuild
+++ b/dev-python/json5/json5-0.9.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/json5/metadata.xml b/dev-python/json5/metadata.xml
index 1a3e3394c5a9..c312488136d2 100644
--- a/dev-python/json5/metadata.xml
+++ b/dev-python/json5/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">json5</remote-id>
diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index f9001f20938c..1d2b12d0899b 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1,5 +1,3 @@
-DIST jsondiff-1.3.1.gh.tar.gz 15457 BLAKE2B f3896c85b601ac32859e59f2a5a29b51f124a1dd27fa2b0da40e44c4b776bbba933043fb7334e5ec20833eea25143d40cc7988a8308f56eff20510db982688b0 SHA512 cbbed17bf00f1757d81477e02435c3f5a9a3246774f3fd9a433be31de1617525acfe33d6790be33dcf9b5da5ef3d6910d13958fb7b8ea4fbd802c74485a9dc6f
 DIST jsondiff-2.0.0.gh.tar.gz 15405 BLAKE2B d69e5a9316e8ce32c6fd3e62162b609a471ff57bacb77f47a192b85352e77135a37c964d0ade5df4b4e37fe7d996eab13649dd4c6a3bc3fc0479294f840c82f9 SHA512 ca266040294c064b499763174613628125a9d426f37eddb8f63806d5774ce8828d514ca30ea4b42f6e2529aa34344c601ece05b6c1b42dcedd71c7b62ed0afba
-EBUILD jsondiff-1.3.1.ebuild 794 BLAKE2B 05e0cae5fec0e4686d2c781d337deb53e0b1c47a8783160cd494d46e8de77ad564a61dc9d6e17b8e9f8e6fc0c8dc22e16a0190fb3b800e123d2fa12626f9d085 SHA512 e49ad77fb53f24e718503f3671db9cee86bb8435e5f24a4f6a7e89eb9c01004f7222480d2a321e77930883facdec29ad2ffb9ccb66ee05e985be08f1be9486b0
-EBUILD jsondiff-2.0.0.ebuild 799 BLAKE2B 9a824cbffb550b4b543c525dff8e56f2bffb61f426e9255d67512cfaacb5e2d229339f40772c042c4995123bf373356fc38db384fc6af7b3b1224234c6d4bbc0 SHA512 79afdc04ff9c41c3882778b77134bb3b3ec6bfd6e85d02fea4c0dd23d0efc1ed9946f422d4159b7f5ac22e72d82c4d34383a88cdabad37234b20dadbd065a977
+EBUILD jsondiff-2.0.0.ebuild 797 BLAKE2B 8c42986621fd214308b98d2a1b7fe19880a6c2eedc03843cd15c256c3ae69a31d0476a20f1d62f597e825404f139cc2e8455c1700ad6d4aa6e913d2368579f71 SHA512 6d4c2837390fd10e334d0b1fb80720c5412a13d0447447b56d29e359604a277c4e85f0b7ca223640dbc8c3e6207b0fa4a2707d3a99412ab4ffdbe38bedbb9ad6
 MISC metadata.xml 561 BLAKE2B f11baa5f35a81e4fd69adde15b5a39d728e8137a112ef7c794e8d008d5de829ab5a333fcfdc2e1dd2156d91bb779db204a21c73eaad424e983c7865b33a81785 SHA512 238d5cedd70a0fd887f6007cbee0e11faf4b574b346fa91c66ee6d93e06571364fb80a0fbc13fe347f34e217e7589f5b61984c5ab0ead465d5e725d1792af4c5
diff --git a/dev-python/jsondiff/jsondiff-1.3.1.ebuild b/dev-python/jsondiff/jsondiff-1.3.1.ebuild
deleted file mode 100644
index f4a91de10499..000000000000
--- a/dev-python/jsondiff/jsondiff-1.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Diff JSON and JSON-like structures in Python"
-HOMEPAGE="
-	https://github.com/xlwings/jsondiff/
-	https://pypi.org/project/jsondiff/"
-SRC_URI="
-	https://github.com/xlwings/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		dev-python/nose-random[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Avoid file collision with jsonpatch's jsondiff cli.
-	sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jsondiff/jsondiff-2.0.0.ebuild b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
index 901fc3049256..831c1a974609 100644
--- a/dev-python/jsondiff/jsondiff-2.0.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-2.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/jsonext/Manifest b/dev-python/jsonext/Manifest
index decdddca4475..1a5b914369cc 100644
--- a/dev-python/jsonext/Manifest
+++ b/dev-python/jsonext/Manifest
@@ -1,3 +1,4 @@
 DIST jsonext-0.4.2.tar.gz 9574 BLAKE2B cba417bc116e572f383a6d396d33fab0f6b63534ae89c402b6cfc0297a0c2fce336bf63464252fe9c87a9617f7f00ed82fe9de9d4e95356b60ae555963d4951b SHA512 2b47b48b529ad8f3b9662ce19f6ea9250648e17cb94e4a59a52ab6a9aabf64abb74f3c76a1edf274fe1e52863352456c0f95c5cd7406c44ca917b6addd09a2a7
+EBUILD jsonext-0.4.2-r1.ebuild 651 BLAKE2B fa951ce71ae1e671e5035767e0685905f0c1849324e9641c2340647051f5049b1ea9bbdbd89361dc6cd69d3f9e1c954797839943d6c7444a3b7c566542f88e91 SHA512 0aece89198153faf78beb688ab8b386e39893abf8067c0459e0daadb2b7ac7ff694f31d4a62adbc786f4e0115c77416c9f55492612e44fa23f78bae0efcbe576
 EBUILD jsonext-0.4.2.ebuild 492 BLAKE2B af183454a8fefe2a3541c55f6531ce8bcaf58d075e8b2bc44f34d9b312b6b784575396b567bdb6445c3754596a910c5c111595e6b0c2c6c960e20f4f52bb28d7 SHA512 3a0355778768f8fd7fa9c45a6c6d45d5959f7c7d0233b57c2901a6222c805babe7c10ce9737e0fdb03fc3006a29453f8a6a2a2938ad9747e68d02ea140fa7249
 MISC metadata.xml 479 BLAKE2B 27ae299c717103796af60e26db6c5ca2ae874f4bcbd4a0c69998f1788b7566ca4fda77ab1135a04a1fb49ac7069b817e41a8f87851fd03618ec00311a5866752 SHA512 a05a510cfb4092995a4768830fd35b6de9a40bffcb8a8e5d39e3a1291f33fd067274005049a2e001a952cf7f59d4ba2612174ac35b2ef19fd75686eeb9608341
diff --git a/dev-python/jsonext/jsonext-0.4.2-r1.ebuild b/dev-python/jsonext/jsonext-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..b7d4974d19c0
--- /dev/null
+++ b/dev-python/jsonext/jsonext-0.4.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Well-structured helpers for serializing commonly encountered structures to JSON"
+HOMEPAGE="
+	https://github.com/mbr/jsonext/
+	https://pypi.org/project/jsonext/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/arrow[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules jsonext
+}
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index 5665d80181b0..a3e4155a579c 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,3 +1,3 @@
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
-EBUILD jsonmerge-1.8.0.ebuild 483 BLAKE2B 85a780ce7263ef37eeaac972701ee5e256acdac30ebc23047112664659ecef75b8dec70d8185ab842d93632a6173e37eb73869f30d6ab3763d4858831830e68d SHA512 8a74e746f502e13ca3de0496bdbd7500d4bc8e004bfb9be84c17032178b1fb63e079d28e2bdcabeefe89dcffbd96c05719102d838c70b132edffcbb66b8e9410
+EBUILD jsonmerge-1.8.0-r1.ebuild 515 BLAKE2B 8064cd6ac06f5da9698129f939bb8521e070d911ce1176c80b2aba2d7720ee20b33f4525c78aaa0be8c593d8a6858cfcec395149beac466821f331c3c6dc3423 SHA512 ab45da0bfa4cb3df1e668f2fe9508c4254ae4344c117b0c30bf902ee0479aa9f0dbdcbbd182dd51557d0c5c9cb4ffa0339808f644bf0ef1cbb78aaf7854e5c40
 MISC metadata.xml 474 BLAKE2B 327d36cf4218fec42a42872bfea7ce268423df751aef57dba5ec92eb80a5e72a66462f5161df26ca7d58193db8f0c79406b98d572968cacf15ee8052b6fbc3d4 SHA512 a1f9f14e6804a1b74f278e1e72659e1e32c8e60c31c42db186d1e51f9979c16697b1714b7ed6e6fb7a591d68e0408cf3071d4dd29b9a938071c42d7f32dfa09e
diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..99a77c5d342c
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.8.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Merge a series of JSON documents"
+HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild b/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
deleted file mode 100644
index 77669b0333dd..000000000000
--- a/dev-python/jsonmerge/jsonmerge-1.8.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Merge a series of JSON documents"
-HOMEPAGE="https://github.com/avian2/jsonmerge/ https://pypi.org/project/jsonmerge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/jsonschema[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 1bf45a203976..7bc36660de29 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpatch-1.32.tar.gz 27988 BLAKE2B b60dc7607f644f1ffd095486c237e3bb537b465132725e98fc8799a42a92dcbb43e1e41d281fbc2ce2c4efec327ad681d7740129be55d94c51321e620d084d95 SHA512 4e2978555dd506e09553014d426c4e3a6c6d5c865428f11450952704007c8a0b2060b945cf1fa33a128151427e1c66919891466e095e96fff4316304f0b3ad1d
-EBUILD jsonpatch-1.32.ebuild 849 BLAKE2B 426c96ebe065b50ac4b64f6a8b61c1111b718fc4e7946d94db5d85ba107bb5bc375df552ca4df7789168bc66c2e8ea80b01507775c6282b40627da74444c510a SHA512 c43c9ce80fdb331857f9f7fee0c9c0045bd58c0c0403c23b461061ec50090d6260364b366e83bcce9c32dd86ac8ce25908aff41dabf4a9e56b22410d226ad188
+EBUILD jsonpatch-1.32.ebuild 849 BLAKE2B 704723f9f4355b93b71f5fc64ad0709f6839273a9109925df0a318d384a532504dfa85930e88555fd71511f36f87d30d86e6489572a7c470d521e9278ffba010 SHA512 45cd4432cbc999fbb150d4e08ab06dc359e929e00295710e501e62848414ef73ea0019e024b3b5e96627babb459e535daaed95a664af739b15930183a9a2c81d
 MISC metadata.xml 705 BLAKE2B 4c59d56bf1f2eee88fd6a9284f13055ff97cc9c787ad3e03b983b8ba0c995fd34148e9a6ceb0f3f4cd1226aff0e60c6f7bc23e26e8da375d3527148ed49766ed SHA512 0323b39edf87ff697dc30deefd0568706e8318e54fb072902d5b60a31be65c39966d727f441f524715ce4c3a0958b9264d82ace03210c9550115a5b3fda2edac
diff --git a/dev-python/jsonpatch/jsonpatch-1.32.ebuild b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
index ca8996d5e05c..4f3894a984da 100644
--- a/dev-python/jsonpatch/jsonpatch-1.32.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.32.ebuild
@@ -1,8 +1,8 @@
-# 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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 59c5ecd3718f..d034a02c570f 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpickle-2.1.0.tar.gz 186799 BLAKE2B a9e82a046fc77e1a4d5e7b1f13fc34f07e0e42e34922258bb0bd5aa4557bfec2b5fc06e450a0391522ae27380306111001204eb4f5429c2ad1f908fc4dec40a0 SHA512 46e8bcc2e24616da43b87bf8371ec9b39de1e8e33380684c05b7d7c6695f17bcc21150848c3306d235f89c5d74c69b6fda79e93fc823665d72cc88d9d89d8484
 DIST jsonpickle-2.2.0.tar.gz 189866 BLAKE2B d8fcd0e8b71947b734c59240d9fa4f0b35b9b0ac2e2940a9baf05c160771db0eae5f011b61e3b1c0bc746a740ac2e137a392931e270fea3acf4884578133283e SHA512 b6cb35316e32f38875cbfa3784a3930f669d4ea730ead6117242070590647987383e9f933c193b8c246c40dba87ad56600a65db89c45c18a790b3c1f9232b245
-EBUILD jsonpickle-2.1.0.ebuild 1548 BLAKE2B 0eb883cc66012426460d9f0817a6bb55e0d770f927ee06303b13be7331c37dbb3d94227210a03c0e1dbf3837a4e6e8bd11a03c64664573389954cc9d18cac1f6 SHA512 a81b01d27fbe4f9ed94d06b874fffcf3c21682575eb2f2e65d2c85c6218a75ecd2c60819239be1628f50af3ecdd9683608aff7926b5d2df634217e8c1062e51f
-EBUILD jsonpickle-2.2.0.ebuild 1580 BLAKE2B 72b3aa768fca978bd56d3d7549b04d5dd644bef169da49c1594f0b00c221e97f0a4043277b00f0ed955820a6a3355501141b11438cef9380003622fb6a172620 SHA512 2d3a55b73fd97fe433e22356f04bd6f14ec44391381e2f97be239ae27fef4b8a6733da02e2ba7fbcacd033949c8e492b0c5191d0ed0e230b10f85d9039d687e4
+EBUILD jsonpickle-2.2.0.ebuild 1578 BLAKE2B 39d842372cdf7bd6a86b57f8b0cee9744732f3d4ddf3bae0b29211564976418369b4b3a8bea718e3c06ee172eebc1a1a4bac6eb54f046606f0f77c3fdac84366 SHA512 2cc3d983f8a524ea61a3044b2d14135b745f9405e3e5c02cc1f42df369ed1d74938818041f654300a23ddcc6b9ea187d1e3c65158f34e6527de6353464e53875
 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
deleted file mode 100644
index 12e12c24f3b8..000000000000
--- a/dev-python/jsonpickle/jsonpickle-2.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 ~ppc64 ~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/jsonpickle/jsonpickle-2.2.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
index 0b1bb08720e9..7edc0a633a62 100644
--- a/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index e20db2fe2050..3f5043753f88 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,5 +1,3 @@
-DIST jsonpointer-2.2.tar.gz 8292 BLAKE2B 837c6c8a87e0d19cbeed07769afb29fa56ddfb629f05d0f2de94f4e94af916358f71892e085c7c18b9c711ac8e604a0ff7d1fa7dfbf52836edb1a600e5ed390b SHA512 ce680e3915ea9db915095c4106e58acf7cc2148bdc67944e03e225a33b882964ed0c154fdbe8415f787c5aa5bfa007b9e1fd2a31689dcadc88b1560931ca6a6d
 DIST jsonpointer-2.3.tar.gz 9295 BLAKE2B 8a33c8ce21721b6c402a44d3d1572a767e3b7485fa1dd80baf98120c9822412841cc21e3bc2d6b7e058793ab4ade5993712c689631cb4a1237afc1d7f36e6bdf SHA512 e04da474a5ec376d1cd2c764c2d7a11ac296450df199449994cb1dedf02a49df3ae3a4e75b2963370dba1da166464602b849a79609f7a98d8246dab0b342c819
-EBUILD jsonpointer-2.2.ebuild 624 BLAKE2B bb9b72396f6e6554ccbbf043e2b84747dd28357ede583c7a5d8608fedbd974720aab716fc5e430d13f8f593ca1a6fa6e8304ed3e8acaf96515d2b52d05c2a1c6 SHA512 141d3009671f827cd95e41d059fdf1824a7068f5a49730abe2513e91f7418c1bfca8040b5da74153ef04041c158d8415e7f3c51433913c1061ac2c39af33e026
-EBUILD jsonpointer-2.3.ebuild 677 BLAKE2B edebe7fb2cb6326771177980cdd27e385e07c14e390ba46a3598565076e5752b29b52bff67d0a3be0ba4be9e49be69c4b19c043d5bc039b3403e71a52bede89c SHA512 42851b07f8549bcf850d3150a445f94271690ef75c2d0d7daaa29904ddbc68f16076a6ca89080020a009b01030d487dab8bf65c86d0938323b62814eb3ffda19
+EBUILD jsonpointer-2.3.ebuild 669 BLAKE2B f04a60e97f1bdc5e8006684f3aa8f80634454ad4b81d33bd325913642e0217ab34562fe9acac0d2ba2cfaf5392b6440c2f8ee06339318602dee492de436af4c2 SHA512 29730cfe505e14334e0b8c3f47134081489984c445881c7e24af944f3f2b64ba3ddaebc37aee7dfdbc1a4402182eeb5dee446824ff9bdc69a169ed1658dfa9f6
 MISC metadata.xml 728 BLAKE2B f14151531af31af82ca130caa61b9c9af6cded41678899d5413f076d7fb6da93e2c4aad3ff27e66f64ba56b8ccc70c065763157312438f32ccf2573766ee160d SHA512 6b19c6b90a5d151d4837d8be641b52ffc4e7eb3be956760d1cffbb2af03258c5a2b81a9074daee9b667fcb5df7223836130729cd5ea4130d2b7f3c7415e62569
diff --git a/dev-python/jsonpointer/jsonpointer-2.2.ebuild b/dev-python/jsonpointer/jsonpointer-2.2.ebuild
deleted file mode 100644
index 6bef314ba9dc..000000000000
--- a/dev-python/jsonpointer/jsonpointer-2.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="https://github.com/stefankoegl/python-json-pointer https://pypi.org/project/jsonpointer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpointer/jsonpointer-2.3.ebuild b/dev-python/jsonpointer/jsonpointer-2.3.ebuild
index 20d42d1a36cc..91175a6b7226 100644
--- a/dev-python/jsonpointer/jsonpointer-2.3.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonref/Manifest b/dev-python/jsonref/Manifest
index 07cce603f92c..3b6363c14e01 100644
--- a/dev-python/jsonref/Manifest
+++ b/dev-python/jsonref/Manifest
@@ -1,5 +1,3 @@
-DIST jsonref-0.1.tar.gz 12296 BLAKE2B cab2b4778b8a0184989ed6ff520ed6f12a68e9109a92aa0fd5521b69ea14cd5b6301ce61bf98f0d0d4d44fb016f7d6bd99fc804975bddf1c350bc4b46d62f77f SHA512 9900601feab0c20c902a6d5575fd411898af126a650d0c9ff955f50f5bd1f5da8e5a071ca86cac31ce3c5fb35a516f849cbb70098cac2cfdc910ba33a1f7411b
 DIST jsonref-0.2.tar.gz 13032 BLAKE2B 0db36904f6914c889d608ac6a368cc8a80b0f81b6bf9f77bb229042c484084c6a06f31099440a48f49f5efea248e0e4f498269bdf89e240be8e149a0f221747d SHA512 415eaefcaf2c7a02bf70749522fef0d96f1e0cc5772edd50ca016a564258df21dd3eb178b7a33ee61e606125fb802a29b0cb8855a81c6116baf6393208927b0f
-EBUILD jsonref-0.1-r1.ebuild 509 BLAKE2B c7ad24fc9290f43ff5eec8a18431b106b894255fa010be3c2986019e4ad536d94ea39d0c5f9b4a5d1555776e956b5a8b974103484eb7631e056792f18df91282 SHA512 6ebff5e004b907b0684b8290d02d57792e54211b4fe362f5d4de2ab530c4ebc5966a9574d1fba8d3df93459c10b4ac1827c94ebe5ed0636e852c006a8fde702e
-EBUILD jsonref-0.2.ebuild 514 BLAKE2B fa2b671afe7efa8c1ce12c59be4e04796ce360934de4a2ffcdd3e6d1644638e90fcea133d0ccdfb26fa7d21d95ed68ab6deed77e6dc5c47e266af26bcfe79ccc SHA512 fb91d0ba8f5e94e188ee27970d411c5d329fac3e0a0c569f8e053141af66e0791166c50daadd74cfca64af03b5ba882f1df3b92ab7ccfe18d55872271a6ea4a6
+EBUILD jsonref-0.2.ebuild 514 BLAKE2B f5860e65f0ae599d799b6d82078c6f556053c76e43ec3703f71bd68ade0f6ed4c521ab7f42febc5fbe15f38878d7fc604d88a258776d6d3792e12bacd264ac29 SHA512 9bcc6b9d5f52e10cf02981fe2b25fd4df07689e1f5e58431186a190b5010a4f57db33730665d317dae25f3c232b8095984eea3758fd1caa8775c46170d231e5b
 MISC metadata.xml 797 BLAKE2B 4afca797d34cb036eefde373c1c02ac9619153670c8f3d9612b5687f248639942a51cb23e18119f61e3cb3dada9566113334662514a89bc6bb2de9ec9f49b4a4 SHA512 803607e8f9a7391f97aa104a4f3997023d341772eac6af0934bea84cbe45dfc1aff59928d8d45116ef52a4b86edc3ff3e28d3547b2f4ceaf37eeb7f2fde0ea7a
diff --git a/dev-python/jsonref/jsonref-0.1-r1.ebuild b/dev-python/jsonref/jsonref-0.1-r1.ebuild
deleted file mode 100644
index a5ab5203605d..000000000000
--- a/dev-python/jsonref/jsonref-0.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON Reference for Python"
-HOMEPAGE="https://github.com/gazpachoking/jsonref https://pypi.org/project/jsonref/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/jsonref/jsonref-0.2.ebuild b/dev-python/jsonref/jsonref-0.2.ebuild
index 84fdd34cbed9..4afc569fb7c1 100644
--- a/dev-python/jsonref/jsonref-0.2.ebuild
+++ b/dev-python/jsonref/jsonref-0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index a2ca6ffd093a..f4d9500fcab8 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,4 @@
-DIST jsonrpclib-0.4.2.tar.gz 59590 BLAKE2B 4201d62c9be469d7016943acfc84dca56606f17383ac26e86f574c34927ee6131c5c1a9bc5c3934b8324049ac35b1ff5e4e49ca7ef850251ebdf9a42a53e59a4 SHA512 8d9e5ebe8de960272a1ea0a194544d41851f96c5bc16b9eb6984ac4e48ec1aeaee8e4c3846cfe747a737612934d43a3df72bb1267f0608b1cd2d6faba2acc7b2
 DIST jsonrpclib-0.4.3.2.gh.tar.gz 63127 BLAKE2B 4301f23a981f00e78f88f78a8f5e8d776985fcd5d268373430b308cd9e2b07d5e1aaae9fa514640275439f4269ecf9ac5a2e42d5c96b870b72e37e4faea7c790 SHA512 718b9a8a49b6f936635ea8e500d16b8d3f42a28e44c4d0bb2bf1e648063ab1107edca93b4f178600a0b36d2e0584cf531f6e9721f5ed6967ea9a160c923103f3
-EBUILD jsonrpclib-0.4.2.ebuild 647 BLAKE2B f85e37f63b23befc98c2434e8ba08a251f936d4d8c1ae0e320d727e152890006e0d3ec1239cd0b3fab3dbdf02aa33b1972b53bf37f1521c455b206d8f364e2ca SHA512 cbb3f7f47aa10da80afd42346f03865f7b2dbab1d9874f3e5b95b29782ed50ec3ff149b6af7ae92dbde90a90c60381061e3574652422f05ad6c0a031727f00e7
-EBUILD jsonrpclib-0.4.3.2.ebuild 1099 BLAKE2B 08dfea38db0923043be3703c1c7832bb84eff0bd462c5e4cccbcd89e4e81fb82df83c8686bdf99d921be74f9cc7e2ab1e6b2e12338a424fd6106fad4ec27cdb9 SHA512 4bcb4dfc966e171d96202bbe15743ce9d24e78f272947dbe72954288bf6dfe3d2266c22cdf5b1024074ab5cf6543a2957d6301626019248877bc668012eb5976
+EBUILD jsonrpclib-0.4.3.2.ebuild 1095 BLAKE2B f04f66faef6db4574bf5983030b06cb1827119067d8dec4d380a6523531bb8250fbaa175cab10c0fe1f734008bb71db28e6048bd91a1cdf8e82670c3334b817e SHA512 cbd8242688fb334f57aa5134b01a71ecdc4dc08925df336e5a7e671c8a785ad38193be561a78c03ea481c17a718a35a1c56ee391beef952f1613ed97f913ecc5
 EBUILD jsonrpclib-9999.ebuild 644 BLAKE2B 0e81f1181199c604535c494930ac364f87bb1ef0fe18ad12c573f683a1006d74d2bd6c7f15a456779a5541354a1564338b8377735f1acbf9d325bc05f2a26ae0 SHA512 8c21ce7f83bbdf9521854978c5c559c8f553e08015a9d5fe3e3fbb099e27ea75851f1253b3e3a5720b18ca4a5c68d7b485237ecea102856c6ee9c726a4a9fe8d
 MISC metadata.xml 510 BLAKE2B 2840baacca04a26e797175b0e0caebf2aa18c9abcc20572a2ac81fe8c633c037c35b9f4e90825f903cd2ed81d6cff9946dd70c8a484192d1b3e815a0722ca4ba SHA512 36c616ff00e2a3a2d9748c6c4e3848a281e14202671abfa342047166cdf382b551460b875b23e53f57eade308d6a683cc5a0cb94132af5b8af9855db334dd808
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
deleted file mode 100644
index 8081f1f1e35e..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~mips x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
index afe4f32dda97..72515e12f724 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ else
 		https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 1889946ef944..037fe5f09977 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,5 +1,7 @@
-DIST jsonschema-4.4.0.tar.gz 313519 BLAKE2B 6339c4ac9e99b55e41c133861baacb6644e04d15e915d3199955512530c946973ca6d5348746688660ea7392d53102754dba3f3380fc8aa3a4ab284a9dcde684 SHA512 8e5c138f4debf7540e2cd131f3f208d1778927ac9036f5fa67bcf5db8c62fe1bb454c7818ee61acef64e856ea4b498ef6ab08be314a3c6b1e461e0bb44db41c7
 DIST jsonschema-4.5.1.tar.gz 282414 BLAKE2B 5b1d4e591e48c760e89a438b3bf9ea6b27b0959030be4558d5a863ceea218bdc4db19d09e2783724026fc2e10eeb6c969a939f4d1a5b44c16dbf7ff39c61a743 SHA512 3866a649ece45c1c69d3d5e9810cfdb094f1af82fcc08a186f9babd7516ad311c4bffa52f61f013bc84e7ab1be06605c5fab738c1c920ff8ce85a73429d9efde
-EBUILD jsonschema-4.4.0-r2.ebuild 1404 BLAKE2B 80c0fe36c7b38137408205ec87319a9a1b045c46571d81c6c00e066400d598fa0b15584d6badf5300bddafeb8cd4c231b07191bb6d881b6f96f39f038b556241 SHA512 fab5de763245b4a0dab0c5c683b1cc62425ddad0b7df561c1a72a8a278fb4847f989ecf383429b1bb104e89814efe47384656814b39d82ea28ab619a0d8aee64
-EBUILD jsonschema-4.5.1.ebuild 1418 BLAKE2B c27e0f5c78b214a2bb464c5524bf0b6086ae65234c669ac3bc1d7feaef9bb1b4b6464b04b4aa05ea84e2c3beafee4bc834390f6fbac376eca46d10cba2ba364e SHA512 e68de84c71add4e6b462a3407ac73a1eb0d2f9b25d8a4e7062752be245979af4670208b39c1202472371df3a2077ad1726cec1041ce287713c1d023901aac722
+DIST jsonschema-4.6.0.tar.gz 269939 BLAKE2B f214f65fbb908029f221789ab3857db9cbc1a7bb355f04a46bc7798514ba73ac3ba6f78cc3eaf985c19b16607ea6cf38bf46c9a8e19b1b1aef0138ef74239a4c SHA512 82d9e0c7de867c4a53b67b9dc79a38a76e384f5d41c66b52c57d407e03eb97faf8ebf41370ef08b30966f13eca210f94916b6a40347a2a75088e33017ccc2f5f
+DIST jsonschema-4.6.1.tar.gz 278452 BLAKE2B 0b5c90b790cf7430bfbea4b38f90acec6fc256bf521d9552b463489751da3f889b43021e9d94c3ed4bd7704c462141d73d25273eea1331c85a0d2d04d5c9ad18 SHA512 5c0e2806915ef4545092b0bffe4cc1207d9a6f2a6920c10894d5b7b2a9ed665093b7a9a68114d1a05528869e7d8aed902e7569800db4393fa810c0f6853f713d
+EBUILD jsonschema-4.5.1.ebuild 1410 BLAKE2B 5c78177b301681e1cf706ef5b5acf0164922771ddd79ceb59a63ea3954fa05db9378a3cce67c4f0e9f99beaeabe2762d87d9c688985733683d881f704da5f2ad SHA512 6dbd27b6169d82ba2cb09ba4d84148e1ba76b145910e49bf111f2777e877642531b78455cd188cec5a1179d52b782c354d70bbdb08036fc7717f1d91bfbf0b2f
+EBUILD jsonschema-4.6.0.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
+EBUILD jsonschema-4.6.1.ebuild 1478 BLAKE2B ca4c9fc3507787d0880ead2ac0b3c02029921dfb886988359b914df10ce43b2c8c197bb55c8174425304f7dc6487a19209816f766e1b8c3b8bea531527fd4bb7 SHA512 39e4857634efcb651dc31e69bb56ed96242416262af07a6898c08647e5cc9f6fa2001e84942e4e3793b0596d89b02e5d89c9e60077e29707e559bd00edb834ee
 MISC metadata.xml 703 BLAKE2B 240a82a967bf7e2c200a2359dc691cbfa119fbc415f41c594c981a0da551a779b9d6afd6f8aadc7daab074579d6964455cf8bc8de36f01e986d344d1082095c5 SHA512 88cf98273ec371942846bba05ec8cc38939b1ff1a4f35e16f5764d09e67830e6f86b741ccb11ca487071eef205d193f5d0ca5ab156eb429c89d10c90778594b4
diff --git a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild b/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
deleted file mode 100644
index 082367846f5c..000000000000
--- a/dev-python/jsonschema/jsonschema-4.4.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k 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}]
-	' 3.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/uri_template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${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/jsonschema/jsonschema-4.5.1.ebuild b/dev-python/jsonschema/jsonschema-4.5.1.ebuild
index ed05d5f3961b..e989e373864f 100644
--- a/dev-python/jsonschema/jsonschema-4.5.1.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/jsonschema-4.6.0.ebuild b/dev-python/jsonschema/jsonschema-4.6.0.ebuild
new file mode 100644
index 000000000000..fb6400dc457c
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+# 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/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${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/jsonschema/jsonschema-4.6.1.ebuild b/dev-python/jsonschema/jsonschema-4.6.1.ebuild
new file mode 100644
index 000000000000..fb6400dc457c
--- /dev/null
+++ b/dev-python/jsonschema/jsonschema-4.6.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of JSON-Schema validation for Python"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema/
+	https://github.com/python-jsonschema/jsonschema/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyrsistent-0.18.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.4.0[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+# 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/uri_template[${PYTHON_USEDEP}]
+	>=dev-python/webcolors-1.11[${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/jsonxs/Manifest b/dev-python/jsonxs/Manifest
index b827048c6648..62f13bbd8ba3 100644
--- a/dev-python/jsonxs/Manifest
+++ b/dev-python/jsonxs/Manifest
@@ -1,3 +1,3 @@
 DIST jsonxs-0.6.tar.gz 4071 BLAKE2B b19e6049be686abfcd0ce4dfd70b15c7367addf80ade80d3cdc3b3521885d15d92a3c5f71e80bb34de5a51fe8effdce3f6caa05ea5f7b60fc2ada536d98d34e4 SHA512 6dd5cb58b3f5ed00166bae175ef8daa4a4c18970c44afcc197bcc502433b164d5e3a6dfbd2f21f944a9339c257aac8af7bf1df8b3f1c2b12cf17777fc99e2272
-EBUILD jsonxs-0.6.ebuild 469 BLAKE2B 1389a7f6d6c3076d331b5bda76d9d65eacf035a70e4aae9e17c9421db7e42735ac9f97a082cb3ecac771270e096767ba8f50d48be0e4b60e5e27b02a60931374 SHA512 fd983ed33f5a61a4fcd25502f36e6876afdfdba18335bc470f0f650fe782f9e8a99dffbd05b54acb73a689d366c5814d34a2dedcfb6d824e638b154408549172
+EBUILD jsonxs-0.6-r1.ebuild 501 BLAKE2B 0e798a7f44c207a9c97568c17e1f537375a3f31537656d4791cdab6052372318e4dd899ba6540e89b407606b587ffbbe6baf72ec66e8b3829a0ce244f2c5e694 SHA512 97c285d2127fb54fc93d1318d36cf3dac3afdb1b8f2385220c84581938f457bd13183a3fffc084621fdb40bf6b79ad8fa88f462ad0f4504f9b7315ed17a03f1b
 MISC metadata.xml 389 BLAKE2B f320a1866050de0e3054e271e545a6aa0052d6fa1c6918c6150efe3a28b8979d731508ca3833e953258e90fe3a77b4e42f99716aa32a34f690efd7234b1fdbfb SHA512 0940b81296f260a18c7ad4e0d655bb3b1e100ec0241389868cb21d8c57c3eee40e966e266fcbaba3ee5f2dff00970df2f8c9afbf2ec949e5259c399ab8bbf496
diff --git a/dev-python/jsonxs/jsonxs-0.6-r1.ebuild b/dev-python/jsonxs/jsonxs-0.6-r1.ebuild
new file mode 100644
index 000000000000..8a367653e9a4
--- /dev/null
+++ b/dev-python/jsonxs/jsonxs-0.6-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Get/set values in JSON and Python datastructures"
+HOMEPAGE="https://github.com/fboender/jsonxs"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" jsonxs/jsonxs.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jsonxs/jsonxs-0.6.ebuild b/dev-python/jsonxs/jsonxs-0.6.ebuild
deleted file mode 100644
index df1168c837b6..000000000000
--- a/dev-python/jsonxs/jsonxs-0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get/set values in JSON and Python datastructures"
-HOMEPAGE="https://github.com/fboender/jsonxs"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_test() {
-	"${EPYTHON}" jsonxs/jsonxs.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/junit-xml/Manifest b/dev-python/junit-xml/Manifest
index deaceb09f995..d9b0bf56e818 100644
--- a/dev-python/junit-xml/Manifest
+++ b/dev-python/junit-xml/Manifest
@@ -1,3 +1,3 @@
 DIST junit-xml-1.9.tar.gz 11111 BLAKE2B e40914263421e7021d6bd697a03ae74b596d915479f24e8227d8b0b0bda51529df58f7aa54b27e981bb1df0aa36d7876f4f30fff8924188143bc4dd6b1d80b17 SHA512 73d5245f4a324485370e91d0d4d9a754133e0f90e5ad9ae7070bbb7aad29bee5fda4103548483358d536834c5fee9c8bd5fef79c4b66f905a2aeb0823ef02d22
-EBUILD junit-xml-1.9.ebuild 828 BLAKE2B 69b175fc472786b94b5f427784c347c1ae92f72f912495428fcb9aff09ff41b7848e1b762805aa17e08b0fcb684dad1b2dcf8b8e778c6796179123381dec8215 SHA512 961f42bc5ac6a77413b448eb4e603c4315dfcffdd3aa01928aa4b07add44d189160ec855d9458908e14e537ad6466409785a93d26b7dcc706e31d5a1143ba9f3
+EBUILD junit-xml-1.9.ebuild 828 BLAKE2B 9a22b6ad0d8a0e5a0640453ca412fd66e2119da76ebed4fd6c1a2358d4f20abf60706d416b661df0562eeea07e042afb23995aeab80bd16843760fb70e55c8b4 SHA512 f7b1d85dd6b349386e7f92b49a352ff8cc185b2ed49d6c6146206f00e2d7be3f84cd85b36361ea6de7a8d9fd1ebbd573a53614bfc10da25e883b09bdb6994ef4
 MISC metadata.xml 353 BLAKE2B dc100f962e8cf0654d7d917805d6fe1b0031104c8739f42b98863c4263fb8cb8488ecd921f0d39b198f369997fa6b20955e672a6b6790991523486e56dc8efe2 SHA512 11ca84b0cbb8acc5847c047018ee2b30bc97b308f1609eaf5f01f9c302ad13d557ce4b7d2cbaff17d10e58e3cc13c9c8cb36c8dea4d80290654318c76479605a
diff --git a/dev-python/junit-xml/junit-xml-1.9.ebuild b/dev-python/junit-xml/junit-xml-1.9.ebuild
index d883b87107da..1105e65ff90e 100644
--- a/dev-python/junit-xml/junit-xml-1.9.ebuild
+++ b/dev-python/junit-xml/junit-xml-1.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Create JUnit XML test result documents"
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 5bab38ad558f..3ab295050931 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,8 +1,6 @@
 AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b832bb82fa19c746dae8bfa839fd16056076e9a905218201d2cfe8896c4e826a09424656657d109b12893d21fee0d8e6b6952d55ae3 SHA512 66d57b9efae86bc2531d35634f35a5d74de6d467329aaea7a487b010b582440cdb8a91e318a3c6ce7f26d9fdae6aff7adff3a59c57d053695076b9f1c092fbf1
-DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
-DIST jupyter_client-7.3.0.tar.gz 328515 BLAKE2B a5e0ad2f44c2171d75848f057c3d582e66b308d0d0fb8d7c8c7266e51009f2281a1ff5b0f92b7a5491709a43dccd6aa69f45681cfb6b79008082f5a955212b61 SHA512 5edf711afe9799fadee901de404ffed5b152618ccab960777a5f17cdb5adc6b945b189502f1dc7b2728fc0abceb668e54f9543eb952738d02500f109df6fa913
 DIST jupyter_client-7.3.1.tar.gz 328697 BLAKE2B 9bdca39d974c21e1674f58a7aaa51a6b96e4dc307f918aacc403146827df5ad7a867243dd2df95e717ab7ebd62367817e4f43cae562f47147b4271d72240600e SHA512 86a98288f1be5321b8495d78770501ca45fe3139a482ec41606253eef69eaf4d3f284d1c373d9df64efe28428f32cd1a3b19842a7331b3ac200d780e7a786407
-EBUILD jupyter_client-7.1.2.ebuild 1387 BLAKE2B 1e2aafece99bb7e7933846a18baa7b27391123f0434cf38409992f53bdda1351816f395965ee02d405a52185bcf1c33db9cbb930cd421cb7598fd53f9e44a4e6 SHA512 dc9a1c8ad7b2fa51d292df61468fed638fa41afdbd1585b710e4ce120b39e7d9049bbc7f28775b71175c9e183a39b7c0cd7b26c0d2fdadfb3ab34b00c97508f4
-EBUILD jupyter_client-7.3.0.ebuild 1231 BLAKE2B 527ea26ccaf61ba58ff6bdddffca1d88da17cfe3396da2855515959e1bf49f52624d285e07671febbee1e069a80341f6edf47bb63df1677298267e0746776126 SHA512 3faa1caac4959332be7660cb988bd8b24a658f5a792cf1528d59f85b45dccc12cbc2b6e25ada86d2bf66fc27988791b3f43bf4503c0c5c549f70fae7bf979cbd
-EBUILD jupyter_client-7.3.1.ebuild 1231 BLAKE2B 527ea26ccaf61ba58ff6bdddffca1d88da17cfe3396da2855515959e1bf49f52624d285e07671febbee1e069a80341f6edf47bb63df1677298267e0746776126 SHA512 3faa1caac4959332be7660cb988bd8b24a658f5a792cf1528d59f85b45dccc12cbc2b6e25ada86d2bf66fc27988791b3f43bf4503c0c5c549f70fae7bf979cbd
-MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
+DIST jupyter_client-7.3.4.tar.gz 329871 BLAKE2B 34f4cc01ced39e30f81e0c7524ada9319f7bea6fb0f941dad85ac3f969de71b68bde22359a9d343df84432e320994a8c4c4aa9ebd390b841e4b18042ac6f0b14 SHA512 3bb1fd7c93e16c03db0c249810fe48428dc9c1fa24ae885a3d30b4ac2d2e980f48edc06c2c6065b3e8f91610bf5bc7500854986f55c18bd9f695f192aa470beb
+EBUILD jupyter_client-7.3.1.ebuild 1223 BLAKE2B 1f496ce6cb37ddff806e283d510314d79528f9daddc99dc693401d46ca82518716fc156976cd18cca41cc6a5bc8523260107b398c8ead3669c70b85a2c644f1a SHA512 04c4483b2fd3bb788da7bb2474f8a079f3bddee9818b6aa3a307b106bc712f28cdda525b33846a75fdc5a7bf4e05d522432d0f7df517247aac48dee1b383eaaf
+EBUILD jupyter_client-7.3.4.ebuild 1210 BLAKE2B 1dd9017817afee9f187a0751b4b227ae919e44a093f538e46ce1533edde7f28f608ea1f4b67a99040e48c95f25b1cf14a66e9859aa5f0fb7c5707b7a8df22b82 SHA512 05fb1637fab8cd863d47a2da148d9b97eb8d5dd2c95a4389ddf2ebbe68b6c10ac02e2758e084d30f0345ce2f066ef1ac18bd805a32ce1fc71a79f7185fd7256d
+MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
deleted file mode 100644
index 57c632a5c3bb..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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(+)"
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
deleted file mode 100644
index 2c0770e6eb96..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# relax pyzmq dep
-	sed -i -e '/pyzmq/s:>=.*::' requirements.txt || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
index 2c0770e6eb96..a35f732a5e43 100644
--- a/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
@@ -15,7 +15,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="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
new file mode 100644
index 000000000000..8b28df440476
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-7.3.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter_client/
+	https://pypi.org/project/jupyter-client/
+"
+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/entrypoints[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index f90149726621..a41692a7eeae 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -17,6 +17,7 @@
   </longdescription>
   <stabilize-allarches/>
   <upstream>
+    <remote-id type="github">jupyter/jupyter_client</remote-id>
     <remote-id type="pypi">jupyter-client</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 8ce29f9bd7c6..70b9430b9f82 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_console-6.4.3.tar.gz 35432 BLAKE2B 57af0ccba4730e445972a937e9e103695dc33387c5aa15239416c280f79259963119a3485526d00beb92b7b11c579f68542dcbac39e0d625b3a592a82e8bdcbb SHA512 6b8f9be62efdac9d8a17367e169f8f73c3d7ee2783692ea380853a886d228957cad03095a2aa165a1ace3440c340e2939c1044c85fa3f5e1e2d1f48919e562da
+DIST jupyter_console-6.4.4.tar.gz 35145 BLAKE2B d37190c30eceba79c0d37ad60d88c9e691759aaccb29a64a9482b7c3cf3315efa3c902ac2244c2139ef2f94a77450115124227768f8291f73512796aaff1214a SHA512 1f06591ed2a0fcf56e783d4e9f2a7c3f58a4f566cfb63b3367edac23c7709aa1af7bf6639c7358227a987049804da90658144fa5ad38db120c0816e78ed465ef
 EBUILD jupyter_console-6.4.3.ebuild 875 BLAKE2B 5b35b10226583c3fcfa2cf2bc5a0d4d9877f0547d80b5a37bca351f5088e8f185f9cc398518cb695d744e853bcae72f525a9d506d8e443ebd4dff2d901461020 SHA512 2874b76aa8358f2bfa6918b28d0788862a4b6fea0a6d6657a36bcdd3c208cec6f654e432c456878ceb05fcf571a2c93a15affca63aa80eb46de88ddca291e256
+EBUILD jupyter_console-6.4.4.ebuild 880 BLAKE2B ea18dbd89cc95eb0016b19776f5501ba1b875857d8bb603d0cfe8ad997b89afedc83ae5e3692a15610075c268a6e14d73accae6c087f7840023ada9216e9e5e8 SHA512 0c480fa1f17049619a803cf1d9209ea2c2c8c298a25ea6e60c0d050fa1ffbf1c84c1850cead0d10cc15e0b75fb9756d876d2e3396af226487ef5fd3f156b41f7
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
diff --git a/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
new file mode 100644
index 000000000000..6f70ca03cce9
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.4.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1.0[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]"
+# util-linux provides script(1)
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-apps/util-linux
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
index 230ad3c21b29..c5ac476fefc7 100644
--- a/dev-python/jupyter_core/Manifest
+++ b/dev-python/jupyter_core/Manifest
@@ -1,5 +1,3 @@
 DIST jupyter_core-4.10.0.tar.gz 76535 BLAKE2B d224b39397fd1ee430a758b02f8c5f2116480f00b4f7c485ccbb71556522275f7aaedeaebebf7bbfb782e3fff4677b38d5d7d0ddb4d3a24b5741dccd2b43edcb SHA512 b11257aa6239d2cc51b63c4ae696b5e2862fd824f662875a9e2b663a84b86aec14aa21baae6e5c720155f2be37fd40925b913503e002401eee442d6d3258704d
-DIST jupyter_core-4.9.2.tar.gz 74912 BLAKE2B 9a20e7982d1bda6a203f094aca6ebaa2b96d0482d728527b1b085b1242c94fb407d7f9da3e82c3e2af473c725bc7bebe701d493a201d8804c3d7aae9f80f9c11 SHA512 2779d7857b3efb979df29f65e5db0a625e4c96b1bbed017aa7bdaa7d23d7cb202d745c92db663a183bdcdc5f55133aa32bc6c982d5a9d36decceb9a348e7754b
-EBUILD jupyter_core-4.10.0.ebuild 707 BLAKE2B 9291c73aeaf178e21ad84e8ebd65b0423b5d20c06be4741eb8c70adb91420e261204a0fb913966bf6b03434df5a9ef465899dc9fcb2c0239bf08c01e0ae7f647 SHA512 c54ea256fdde95691797cd2c674e77798dc043a7564f239a1cacdaa51f5bc311e1b1432355d9271bf2332666bb4d673a44877b32d30dd48a6accae45cda1c17a
-EBUILD jupyter_core-4.9.2.ebuild 695 BLAKE2B ff6d8fb9dcf2c9d89726d715e88c18b128f6438f4cc64d935afc12c995763ba5baa5b6e495b1a3e3da8c1bc697a0dab5b98e049cf2ecbaab26c1b143e385a859 SHA512 a55f28992dca9737ccf5ecb3abba1995dadbde703eaa7e272c4c428785a6688f4b0fa0b509e3ac5f6b1185adf8ac0496fb1e627be32e3f46044cc8257dd3392a
+EBUILD jupyter_core-4.10.0.ebuild 699 BLAKE2B 3e8c3f9c3c9f18cd45a6b4c29a9d97320d6563c502c28603d4150b8efc4123ae845e4ef69a3b4a39b29ae15a682e7d42f37c5d671bdcc1d88417e021c92b26c4 SHA512 dd2662c46606b2ac3b74e013403cfe22eb7898b0ea43b591c84cf5d059c8c0f3ec63e6228b23151ff600cd1f3c8bbb88c453e60ce47fe031330fdf00c0d25800
 MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-4.10.0.ebuild b/dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
index 3bc31c65bc0e..f834334f98b8 100644
--- a/dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
+++ b/dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/traitlets[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/jupyter_core-4.9.2.ebuild b/dev-python/jupyter_core/jupyter_core-4.9.2.ebuild
deleted file mode 100644
index acebf0ec95dc..000000000000
--- a/dev-python/jupyter_core/jupyter_core-4.9.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinxcontrib-github-alt
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 635f9c291d28..5029709016a4 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,5 +1,7 @@
-DIST jupyter_packaging-0.11.1.tar.gz 21715 BLAKE2B 68cde8becbe10710bc68912da43877db2704f59bbde5247bc2f27553b90cce47f16665326650e3cc2d1de8008d82ff22b8d485b0d2c782ecbb732e7bd059038c SHA512 1027e909222f9dbe9d317030fa07d7a71a91ef9de961681e6842e486e5e12cda03f998e0a7c2c0fc52e9c3ec3f527bf9643bc1640fa94b16b20b500fc69eff42
 DIST jupyter_packaging-0.12.0.tar.gz 25258 BLAKE2B 1e8897297e6d1e592a5e3d934f850a9fadc27b7fd97484c6ef3dda9ae5d6da0c48116846e0f3fe7757c3c4794a7a8e2e3eaa69b3fe3a68f73cc952707fa27ec1 SHA512 2a34b64a34f6931b7ba0578a9c1c270285a970043136f65c4a7afbc8e9a5e70feb1bffdc00f682d1fa49fe1f5f91bd3a093437f0f05232e6a57c97eda7f1fc29
-EBUILD jupyter_packaging-0.11.1.ebuild 1114 BLAKE2B 7bfbf351121df796e515b80000d631735f1d4f1b7a210ce9c6e31a959176289b43f717d1c62c1dfdc0b07419363d5c506f008aed72186796527f28fa892d734f SHA512 5cf4c216e3d08c3c6f647f8c20014cefe2e4819d99bb0157f7799af32b84f26cdaac4c1dcb5fe87d9fdc2036713cf395d3eb42b8a21344c771b9947828bd5a74
-EBUILD jupyter_packaging-0.12.0-r1.ebuild 1127 BLAKE2B f42fb1c47235807a71bd1062904e9e9597046550b19734c615f50ec63d22530e07d47ee46aaaf85ba83005d514eaf67ce53ff86fb2a2d10d8a5b7dbfe76b896d SHA512 8f11e9a617ab40b71a4e0886a18012f693295e803f3a17b3d468c76ecf8f5159981d53c2496c3455069b839fc72a1f99e47407ea28a39d7a14e22b714eb9abb2
-MISC metadata.xml 436 BLAKE2B f17433d8ea516577cca652a0bb111cc9879ab5de87e056bb2cf28b3440858c92d8a942672f1d9e8be219c0aa7cbc255ccd603eef1920660366384b642c04430f SHA512 f7bd149e6c92e1164a5fc424a99bf44a1e15fcde8000171ad5d35828221ab38bedafb9460969bdde5151013f80a5197c1c1940d8434fe950104f149e9e8c449d
+DIST jupyter_packaging-0.12.1.tar.gz 27813 BLAKE2B 8b36d672bfd30734239486fc048f4f6f591511ec4009a9707a44ee12e71e06edc4944ff72e6e63206731705aca092efaa7ef185cf0c216ebfbe4f940ca3d7a27 SHA512 d1216c6b4b65f7e2706bf28d19110e3f8bc6c01d5821d3c3b6bdbbfeb6ebda40f893ef596bf67d87d157e9db436acc751640ea518880063eb387dda8cd78ef15
+DIST jupyter_packaging-0.12.2.tar.gz 27990 BLAKE2B 0cd07fa760fe0bd4529e8430bd52863034cc4c78d8f906f55530a6825c496b8a1bf2fff76da3f4e963ee43c80fc19347edbaf20d16fbfe51584b040b0ab4d3ed SHA512 f4167c7beb3188d2e4b0fa8601fb8cdede8b20dc8c16e0bccbcf9e317e75e24ea1469a9d904bb35b2d81dec351caf49526ef35e5d91460a099a8e4ed6974e1b1
+EBUILD jupyter_packaging-0.12.0-r1.ebuild 1119 BLAKE2B 1da3e895fae9230e78ee196a0330376f33fc8ab7b66f827c1098e7406d5f3c5eb5e205380928e285aaf75cf4dc329f4a9c2044bd390493a9e1ed2db1721321c3 SHA512 f0308674ce92f2a50f27c85963db18ae1849c3ff485d0288759da70ddf24d0344a6793dd3726ff9583ede6957b32ca6d77bf621abc0afdb89af5daa4dde13715
+EBUILD jupyter_packaging-0.12.1.ebuild 949 BLAKE2B fb2d4bb2af914ddc3c6fcc3a43df404c6bf3f8a84b56559956063b1d568667e7befb0a235c8481a43114777d349d809778bdc3705263412423527746bd62b183 SHA512 b2334e811169d9151a251540fd5f2eeb1c66c4d9817b023d9e10fa2eb1628e48bb51ff330cd3de617d0cd445a0a91ddc04b6ecc7f67c622c605b1c30c4bf82cb
+EBUILD jupyter_packaging-0.12.2.ebuild 1044 BLAKE2B da3689ecc34d35f9260c0bf53be9161d8637a30ecfeaeffd6af4b340bcf0371419d7200e15d3e918611cd30fe60ccf379a4d4232dd10feb367cc88e78c738480 SHA512 8383b60b04010967608208556aee03294356aa91f6b390aa67dd97a319517440745edf0ff9bdda0a89aeb0f87808de288406afff497954a7d2646548525ec4e1
+MISC metadata.xml 543 BLAKE2B f22c42fcc55d0a26966abd01c5e4fe480edff112a2e34ecf0214a2f1b50c120f937a6d377a544136e1cd55e89216efc0a9788ed6aeef8403e4e30a15d9d9af12 SHA512 3243614660159c0c7afed90cc084e4c0c7d85d71628f437ee1ecfa84c9a080f27cff92c5a40a134e579e03b93a1777232add591c7f36262d5bb3e7ec83b6441d
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild
deleted file mode 100644
index abe5f246bfc9..000000000000
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.11.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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="Tools to help build and install Jupyter Python packages"
-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-python/packaging[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/deprecation[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package "build"
-		tests/test_build_api.py::test_build_package
-		tests/test_build_api.py::test_deprecated_metadata
-
-		# broken by Gentoo pip patch
-		# TODO: retry when we finally make the patch less intrusive
-		tests/test_datafiles_install.py
-		tests/test_install.py
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
index d8cc89dc942a..424417f76895 100644
--- a/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
new file mode 100644
index 000000000000..c7bae7e74312
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+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-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# require Internet
+	tests/test_build_api.py::test_build_package
+	tests/test_build_api.py::test_deprecated_metadata
+)
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
new file mode 100644
index 000000000000..60f174880fc1
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/jupyter-packaging/
+	https://pypi.org/project/jupyter-packaging/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-60.2.0[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# require Internet
+	tests/test_build_api.py::test_build_package
+	tests/test_build_api.py::test_deprecated_metadata
+)
diff --git a/dev-python/jupyter_packaging/metadata.xml b/dev-python/jupyter_packaging/metadata.xml
index 681469981ea9..0160fed9fded 100644
--- a/dev-python/jupyter_packaging/metadata.xml
+++ b/dev-python/jupyter_packaging/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter-packaging</remote-id>
diff --git a/dev-python/jupyter_server/Manifest b/dev-python/jupyter_server/Manifest
index c5e65c55e80e..a7cdca7fe754 100644
--- a/dev-python/jupyter_server/Manifest
+++ b/dev-python/jupyter_server/Manifest
@@ -1,5 +1,7 @@
-DIST jupyter_server-1.15.6.tar.gz 440539 BLAKE2B 11a090495fa9cf8fd59bc7c1b1149bb16e1e2e0b78a54e0ba827e5012fcc5910d90498c572c1f96cd4c73b5232f0e91c23f4296bddc7e63b006df034ad8fde3d SHA512 b967165c5509e724cb75dfbad0647e7c69fb4fa981bffd3475d480264c52de3d58e2504b01d7096091579dc065646eda11554c2b1ba9d5b6bc840cbcfb484f53
 DIST jupyter_server-1.17.0.tar.gz 445648 BLAKE2B d7e19804b6b4cccb72c0a24febe8702829c2a32768e916a9da09ee9f55a08e360cf2a81c3c4bc535ff342c916155bc0b7933a9b5b49645db2b5f9a58ec02ab3a SHA512 d99d4036698d6f8d5e1258de214e3cbc6239b978314af4af7e722789c950edb1f261b98e666cffb46efdfe97a23c001784cfd29d7bf75c02dae53c2c07476b7f
-EBUILD jupyter_server-1.15.6.ebuild 1942 BLAKE2B 624ee3273f0e9cef2793180eaa5c4dc645636cd1ed909e96b6ced19e9f4de33555be36f5a1f9ccef5ec7d62f2e1b78b9f40a703f2a94febc828d8c7c434e5633 SHA512 8a87f675a0e28f2a050f18a26019fba5959fd45a9220345676c565e3dc096fdf8528647a2096db1475011d124cc5856aa0db6855309a99e147c683c21cb97466
-EBUILD jupyter_server-1.17.0.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
-MISC metadata.xml 437 BLAKE2B 8c156ef827979c733d2cc253fb4683f45630c8a94d5c3b0f402ec9f140a4c1295a6cc5d5a51887c73775c6162d616374c6da350ee38af52621a368f2757a2c02 SHA512 6b14cae4ef6d1c7b1b06a3735b87975e7ec4991437829ccfc32706b0d4e531c7c78d02d5d0e754cdb42149eaa09b73f2fdf5d651bd3f444d767654e6ecac4200
+DIST jupyter_server-1.17.1.tar.gz 449682 BLAKE2B ca7a8b57c50a552c20e3c2a6a1318357df87027770bb0f37ee5c6c8db1a99116429ace7f7a28fca9f62728ba8469ce9875dc6f3a4cdf0a447ea8df616dff936f SHA512 bf37188a796e590340589414361e04c8e0f5f81d0e03cf55ad12ef7b59f35708996664da27727824424dadc038b44259a66e55f99c2da4270e727eae615f4e26
+DIST jupyter_server-1.18.0.tar.gz 450132 BLAKE2B a378ba3bfdc629d05478c33365b2d6df893b9ce1dc3ce26c78efcbd69b42441ff730ca58a83fb87446d073f849ce5a6c725784a15953fe9bdae119e529fe30c8 SHA512 5a194a9811162774990b125020d75c134ca32ab916c046cf0345a3959868ab7b293c0659bd54c2da91ef5e8bbb9b433f9a6c16d829277d0f34e924c6332fa6c0
+EBUILD jupyter_server-1.17.0.ebuild 2278 BLAKE2B eaeeac1afbee14c94ea5449af306a73c1b66f2e6d2fef2da8715063ca56763699d6a2a5a0870bac069c9a297fdeb79ab425973c1d2a494b7d8c3ab695f3461e2 SHA512 2fab27241cb236e6ee15e26b94010eedf3c27388216f928d21a80656523ff99a5bbab3cce75f2943be15b2b696ef0ed4b74e7415b4fe2368ef59e8f6d391d6dc
+EBUILD jupyter_server-1.17.1.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+EBUILD jupyter_server-1.18.0.ebuild 2284 BLAKE2B bc12a7e86bcc8c5cb2e3da9ce7a4446b4fefb396f6f269bbd58bf7b7c860baf9076d2de92f30165c6dcd5b63735269f6b6f5122a2242d77529ae596de82241cb SHA512 c4f9b09bb07f2ce436144a48fb6aace74a922f0eb50310facc328efc399d4d385227779e8c0a039103043bc6d6f86a33e0e14b97157c5a7ffa80866c71a37cac
+MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild b/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
deleted file mode 100644
index 31abbffb1de9..000000000000
--- a/dev-python/jupyter_server/jupyter_server-1.15.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
-
-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-5.2.0[${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-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-	dev-python/pydata-sphinx-theme \
-	dev-python/myst_parser \
-	dev-python/ipython \
-	dev-python/sphinxemoji \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-openapi
-distutils_enable_tests --install pytest
-
-EPYTEST_DESELECT=(
-	# This fails if your terminal is zsh (and maybe other non-bash as well?)
-	tests/test_terminal.py::test_terminal_create_with_cwd
-	tests/test_terminal.py::test_culling
-)
diff --git a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
index 7d41175712ea..e42e420e2751 100644
--- a/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
+++ b/dev-python/jupyter_server/jupyter_server-1.17.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="
 	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server/jupyter_server-1.17.1.ebuild b/dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
new file mode 100644
index 000000000000..7d41175712ea
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.17.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
diff --git a/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
new file mode 100644
index 000000000000..7d41175712ea
--- /dev/null
+++ b/dev-python/jupyter_server/jupyter_server-1.18.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=jupyter
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	<dev-python/anyio-4[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.2.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/pydata-sphinx-theme \
+	dev-python/myst_parser \
+	dev-python/ipython \
+	dev-python/sphinxemoji \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/sphinxcontrib-openapi
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# This fails if your terminal is zsh (and maybe other non-bash as well?)
+	tests/test_terminal.py::test_culling
+	tests/test_terminal.py::test_terminal_create_with_cwd
+	tests/test_terminal.py::test_terminal_create_with_relative_cwd
+)
+
+src_prepare() {
+	# disable npm use
+	sed -i -e '/\[tool\.jupyter-packaging\.builder\]/,+1d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
diff --git a/dev-python/jupyter_server/metadata.xml b/dev-python/jupyter_server/metadata.xml
index a49ed0dc1ccd..7e3ab0d6de84 100644
--- a/dev-python/jupyter_server/metadata.xml
+++ b/dev-python/jupyter_server/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jupyter-server</remote-id>
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 747358f1d834..b1cdf65e62d5 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,3 +1,3 @@
-DIST jupyterlab-3.3.4.tar.gz 17147292 BLAKE2B 0ae9895a96deaa81f5da9f6ddc74c9127c579722a8275df82e10a0da849552369d34259877acbf6c1ae5de4519fbce96c8923437db913d44cc8b8db4ff5433ea SHA512 d5002e86c4d84664271e735069db2bdaa8ab3a567861433793ca388a601e6f582bf884680992e0c2238f3bc2880a05c3a1ffd4e95aa0f7df91c4bed58f7692b6
-EBUILD jupyterlab-3.3.4.ebuild 1142 BLAKE2B c08e2f6811653a47237867783aa3db70af167751fd631e913daa3ae37e45483f50ff65188c06214a60a86919f3f388fcd6a0dbb2a7814d03f2f0d5169063278c SHA512 54e5738694d60fd5897b2764d01bbc96d46a27f7f569cdee2504226ea54bd4a6d3b70d8b3a737daf32eef271a719a527d25268bf4cad7f210199461e137fc087
+DIST jupyterlab-3.4.3.tar.gz 17074198 BLAKE2B 08a0aa4ddaeb6b48a742ef78e1b8cefb95fbf89ec077a1f3687c4498b7c4dbdd50e1773194c4f3c2e21d36a2010dcbcf2be0141df9383b2d05159bcb7f99ab9c SHA512 27c8d6b6636e14ea9a500764ea97b6ef16a1580728077264b662cc23b0e34ac0fd9eebe1eb5a79a64b18a2d93acc996553a6152fa135e2688b5eae21d184da57
+EBUILD jupyterlab-3.4.3.ebuild 2451 BLAKE2B ad9d7ec075273150ae2d72faa47e15b450554ea63f89b83557e738106f4be406601d94376f8bf3ab0a420c58a5637068a98dbfa7ac9220e252cfd99092e61542 SHA512 6f37117b68a7d48eaef436aa63efba4e876c32fb70900a6929e2dfee0a9cd5265ae3cf31bd70c17d514e18d30ff066b4055725715ccd2251e267b297b6f74594
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild b/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
deleted file mode 100644
index 6c225e088e5c..000000000000
--- a/dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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_PEP517=jupyter
-inherit distutils-r1
-
-DESCRIPTION="JupyterLab computational environment"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT GPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.4[${PYTHON_USEDEP}]
-	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
-	net-libs/nodejs
-"
-
-distutils_enable_tests pytest
-# TODO: package sphinx_copybutton
-#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
new file mode 100644
index 000000000000..81758028c37a
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-3.4.3.ebuild
@@ -0,0 +1,68 @@
+# 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_PEP517=jupyter
+inherit distutils-r1
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="https://jupyter.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-python/jupyter_packaging[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab_server-2.10[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.16[${PYTHON_USEDEP}]
+	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="test? (
+	dev-python/check-manifest[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/myst_parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index 1e82e9a31b04..3e426d6aceca 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,9 +1,3 @@
-DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
-DIST jupyterlab_pygments-0.2.0.tar.gz 132386 BLAKE2B db2b1677227fc1817769aaabd7f9e559871b13a9f937e76f5912a6e99fd186b19ce136712a01c8cd6db2b246fd2e7176b897164c9084781a59eb5f72c21577a1 SHA512 0ac05c3f31e554c51e889c4bf4af6ba3f787ef152a7a7e1862ff9dc46d89418bc3567c57e42b30f3134f1b56cc9c31a6d96ef76905fdb6ee39decfa8cf388ca6
-DIST jupyterlab_pygments-0.2.1.tar.gz 144325 BLAKE2B ee3f9d9789652ee7226cff550505113a7e5f779bbf58405d699bad44455e7448b16cdf607515528f7240dbb5008b0a3b8502c23caa842bf731b5e6a54bbcf7c7 SHA512 746b490cffba3fce133d09e209939f45d7080b778d9c78feeaeb4ca4e7ba34668499bdc7ab4c70a972caa1ed4b53e0e5d788802478c6047d93b577e618214027
 DIST jupyterlab_pygments-0.2.2.tar.gz 132378 BLAKE2B a9db4c3bfea9e8e6f357c90e9b1861cf2bcb796fe5d7ea9a0f02677773b18dd5a02966d8555cd17e8314b283056ac9423948077d6cdc127985f34a5faf892ec1 SHA512 59d328522b11ecae6ae67ef8f9eb7168b0e4241cc6a68765096bf0ad26a20489f302179d50e7e46efd5b9de711520e2c67ab1e634cc583416277a98a5f663daa
-EBUILD jupyterlab_pygments-0.1.2.ebuild 538 BLAKE2B 52d8ae69cebc1fab07403bc2c66d2571981c4683865f42c6b03f961042ea8f8001b814d37fe4aa9e9ec4b67bd50043aaff97683ed39ddb8a68fdde10838a85bb SHA512 4e5d83865a9854bfc58923173b38bbc35b603520457485351e9f7a06dde6756ebe19aa01f48dce1f0c255bb76f4221ee4cbbe5e874726e01d6ce7759268585c0
-EBUILD jupyterlab_pygments-0.2.0.ebuild 585 BLAKE2B d53f3ecf9cbf3ff6641fe24fc7766ef6881962c2b2794e0a1f30a6d5ba0132ae3f1767494dcb7e4cc71370250fe82e0163ddca91e55b6ab5324ea6e2e389a3cc SHA512 c2223cf755c47d22f2da10016f6545074cc9bf3bf3684d7c3e746fb4730157fefb353146e20a93e5f67adcd8a38d3a9193686670384677f55e406a12e856d751
-EBUILD jupyterlab_pygments-0.2.1.ebuild 585 BLAKE2B d53f3ecf9cbf3ff6641fe24fc7766ef6881962c2b2794e0a1f30a6d5ba0132ae3f1767494dcb7e4cc71370250fe82e0163ddca91e55b6ab5324ea6e2e389a3cc SHA512 c2223cf755c47d22f2da10016f6545074cc9bf3bf3684d7c3e746fb4730157fefb353146e20a93e5f67adcd8a38d3a9193686670384677f55e406a12e856d751
-EBUILD jupyterlab_pygments-0.2.2.ebuild 585 BLAKE2B d53f3ecf9cbf3ff6641fe24fc7766ef6881962c2b2794e0a1f30a6d5ba0132ae3f1767494dcb7e4cc71370250fe82e0163ddca91e55b6ab5324ea6e2e389a3cc SHA512 c2223cf755c47d22f2da10016f6545074cc9bf3bf3684d7c3e746fb4730157fefb353146e20a93e5f67adcd8a38d3a9193686670384677f55e406a12e856d751
-MISC metadata.xml 431 BLAKE2B 13dd273598e4e2c98b6677bb28b61f2941e6e5b5c3996edb8b3b4585e79abc13b1ad401e2b25295ed28e3a47e097adb2303717bc630290416b114c968c7590c8 SHA512 554d1f5b5f0493b750655060daaf6a03f1ac71b55eab1aaa51355afcf51643a864c466ad5c0cbf095826e6398727b2a3d452d536ac459ca9dc567526e7630094
+EBUILD jupyterlab_pygments-0.2.2.ebuild 577 BLAKE2B 77d5da381285de43091e968484eb13828a672ff44dd5b8be80cb130b3dce13b1702e28e65f3e4a2b2c85f9fce05e76da47c79e298160b9c671a449fa23440dd9 SHA512 2925c2d6693c86a8f656847af07a462efc4d0739c9fb2156776075f97604c765535ccc03d283c76a674debffb4ea56d41c96d73a2b1f1755e05113bc291049a8
+MISC metadata.xml 395 BLAKE2B 61c5b49ef1984252b5be03231c068df3c46d4326368f3d5166d416e20fc29e6fe8356d6e6f3767f61a05154d42f86407ebab060ebf01a742fd082e62d65469b0 SHA512 9eac2fc382341fec3e344fdfc8365e022b9890739419e8f63bdee313293acc18fe75e40234c26b649396f1e164c32e1a7cd43ea26216c24b610bf495db0c5318
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
deleted file mode 100644
index b41820e23caf..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="https://github.com/jupyterlab/jupyterlab_pygments"
-SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild
deleted file mode 100644
index 797c67662623..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="
-	https://pypi.org/project/jupyterlab-pygments/
-	https://github.com/jupyterlab/jupyterlab_pygments/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild
deleted file mode 100644
index 797c67662623..000000000000
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
-HOMEPAGE="
-	https://pypi.org/project/jupyterlab-pygments/
-	https://github.com/jupyterlab/jupyterlab_pygments/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
index 797c67662623..27b5ac17d089 100644
--- a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::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="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab_pygments/metadata.xml
index 9c3129cf4f6c..6e6dcc6948ee 100644
--- a/dev-python/jupyterlab_pygments/metadata.xml
+++ b/dev-python/jupyterlab_pygments/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
-		<description>Python</description>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/jupyterlab_server/Manifest b/dev-python/jupyterlab_server/Manifest
index 916e12a72cd1..683f7ff03b8b 100644
--- a/dev-python/jupyterlab_server/Manifest
+++ b/dev-python/jupyterlab_server/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab_server-2.11.2.tar.gz 62113 BLAKE2B b5c7e9062e3419d643d22980804c608ce3e274f9f213f184fb44131dc21ed192b46de61b97c55785dc88e7ce9e3145e1d6319316cc743b4de849be81fa43261e SHA512 c3b6a3455841ba7b2b2613987eec41ffe1c6023685ae46755980cbef4fab8b98ab4d47bf02345852941c8f6e15107f79ebf981b68e3ce47d5ead14ccc81cbdfe
-DIST jupyterlab_server-2.13.0.tar.gz 63896 BLAKE2B 4dd1f643cc68c9676ebab347a6ea01a58176a35d45262174e66c2e5b49881b21aa24692996d0622b96d0453793d04164f6eba710c2d7a31420ce12e52ac2c7fd SHA512 b7243c77765c811bce8ba82a612c034da22aa8ac7bc889a5d246a7db283bca29bf555f4ca849b8615c28d3d4cab57fbf08b0a15e08e045e9032792805cee59f8
-EBUILD jupyterlab_server-2.11.2.ebuild 1102 BLAKE2B d7171ce996a25db6905bd90eea5dadf87bc32a8be702ea1196c212c6262ecb0df41cf6d260fed21a2e91434cfd94de7e0df70b5117c2ced08e74665218a8400c SHA512 39784ee2d000c2009f0772bfb30d8ae2ce2e51e982a80afd333a5e83f8578ed7d952a95ca69e4aa6779b25ad01ba5b183d63fcc3202874967131884f939e833d
-EBUILD jupyterlab_server-2.13.0.ebuild 1155 BLAKE2B be0de110beecf885c6a1befe1482caad910d8570df7ba507fa3d48e184a9f14dee9d0c287ab5495c632db01120cbc10bdc4e9acf04addda5ee111e28a1de8b5e SHA512 7d703c5ec45fc06c5f35e3c1ce9aba8bef9686121c2f7de7163f0881d67e29aabc5013c4cac75a86133bc0f5ffdeb147cf180f57729c470731c8767d4a92731c
+DIST jupyterlab_server-2.14.0.tar.gz 62704 BLAKE2B 93277a6880a9395622e6c0ec1da9522c5e30e7a8144c8629de89f45845964008f0a435ec84289efe56043c8ebb998ea65df1d09f3da72096f255fcafa29fab53 SHA512 21ecf749879663378d865bd06161fb3e331f3675038917e405df0cb77d4a4cec55340a35d6511676fa4d91ecaedcd1e7f8aec3a13ad3a39298d10911ab215cc6
+EBUILD jupyterlab_server-2.14.0.ebuild 1639 BLAKE2B 0d0e407d1cc7a23dc4695b1c02e26ee44245852312925557c26f982e158950cc874e8b71146b0099a1c174c176f609aa07a4c60701dc67a795b7c48b9f42f7c8 SHA512 3177bebf38b63510accbcad54965e0fb9ebb3cbaaa18c611d49c7b8fbca3ed44fd94d5412faf9d3eefd86a036b965a3e5976e26cc5ac83c5ba4b64e1cd84a422
 MISC metadata.xml 426 BLAKE2B 98083ff6255b6c5b4ebe7eb67f4e9716f52397646df275cce4cae2f78b0fbb5dda8d6240e1546b4bac6f13ef3f3f1e6f176b2062e066070d595e5cd93c02708e SHA512 9755e74547fb74a4720c9b755449d913dbfd949bad920ecd3903df91182236ad46712c358b3db8180ddf478a6cc6c2a57c6d1a939a9911ffc7ccb39672f5868e
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild
deleted file mode 100644
index 6d4c939cbb10..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
deleted file mode 100644
index 17950b25e18c..000000000000
--- a/dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Server components for JupyterLab and JupyterLab like applications"
-HOMEPAGE="https://jupyter.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package openapi et al
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
-	dev-python/json5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
-	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-# TODO: package autodoc_traits
-#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
-
-python_prepare_all() {
-	# Do not depend on pytest-cov
-	sed -i -e '/addopts/d' pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.ebuild
new file mode 100644
index 000000000000..ec49d91d6512
--- /dev/null
+++ b/dev-python/jupyterlab_server/jupyterlab_server-2.14.0.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} )
+DISTUTILS_USE_PEP517=hatchling
+inherit distutils-r1
+
+DESCRIPTION="Server components for JupyterLab and JupyterLab like 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/Babel[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/json5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_server-1.8[${PYTHON_USEDEP}]
+	<dev-python/jupyter_server-2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/openapi-core[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+	dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+# TODO: package autodoc_traits
+#distutils_enable_sphinx docs/source dev-python/pydata-sphinx-theme dev-python/myst_parser
+
+python_prepare_all() {
+	# This seems to not work for us, can only find english
+	rm tests/test_translation_api.py || die
+
+	# Do not depend on pytest-cov
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index 10e980a35559..987cc7c7a09d 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,7 +1,3 @@
-DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
-DIST jwcrypto-1.1.0.gh.tar.gz 87344 BLAKE2B 4bc72c01e6d49d68ff8e3c89a09758a5e8a634c308926ed2b750fdc373006b30710a841df4e26e1ce3287be6e4b509674887a0b01cc3b225bc87d97588f5b7a6 SHA512 c7530f68d74247f23ad2d76def257f4f0091203a22d39f248f4a15363b17bdf79699b96775cfb7f909b5b0a99ed1dd73ff5ae30ca8bc41662f1be38933c9f3c1
-DIST jwcrypto-1.2.0.gh.tar.gz 88369 BLAKE2B c2f03cef2130884e8a27faa5a7e204ee448ef0a2b56da414f10df34821a67898a0ed2768201d00e2dc7d14b5a3cad3e73c0bd5707910dd2cb1082d1a20a14c04 SHA512 df9073b0561b43cd92f7f1861f9b517bc736d0846f8ef1c7496a48aa5dec49755e5915285ae659c5e2bb18cd51912cd782d799c41c5c6399330f688348096fa5
-EBUILD jwcrypto-1.0.0.ebuild 791 BLAKE2B a90451bb2d10e6983575167d8856d12b5b83cfd8f283fd1c240cb17c1345ca1769857f450e2a78598de12d06f73b6bf5cbdb75d71988ba43234224285a75de8b SHA512 6cdcc65ce1b10407181d0464bf7d39d5d40c9b53569e3e0082a6483d69549947e64bd7e41150ffe0b95c1a902a8abc215dbe483a65465a058397c6b069ff9f56
-EBUILD jwcrypto-1.1.0.ebuild 844 BLAKE2B ea60933ebd51e71e1158cebb57e94471425897ea1a51586ff1e7304fa9705cfb89c54bef24cc13668b3d1849a75d2ab8adcf4855f16720ed3d6175b7bfe4d60e SHA512 ef6aa367b683de4da0bb0f8c8b59c51cc124055da0d8767966ab26deeb8f6067a7d4002c77432c20f4f511627cf88b89d842f1ad27a00dc6b756ebe450dc134b
-EBUILD jwcrypto-1.2.0.ebuild 844 BLAKE2B ea60933ebd51e71e1158cebb57e94471425897ea1a51586ff1e7304fa9705cfb89c54bef24cc13668b3d1849a75d2ab8adcf4855f16720ed3d6175b7bfe4d60e SHA512 ef6aa367b683de4da0bb0f8c8b59c51cc124055da0d8767966ab26deeb8f6067a7d4002c77432c20f4f511627cf88b89d842f1ad27a00dc6b756ebe450dc134b
+DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
+EBUILD jwcrypto-1.3.1.ebuild 842 BLAKE2B d81c732703a83443f1bab3668256170a4c3a44691c891d6dcf06c68c1fa7283268bba5a5005fca7db7ca9af3785bc5ad056282fed4c3e6fd23a135b3f3a8d126 SHA512 9f8f2f49bbb7704f477a4a7eb9bed40e63261348c0d972e91d7b991ed5da168955c10787ea85865032bb033f81d983046fc15da8060dde557dab52b8a201b42e
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
deleted file mode 100644
index 782b19d68aaf..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
deleted file mode 100644
index b57976ef02c6..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
deleted file mode 100644
index b57976ef02c6..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
new file mode 100644
index 000000000000..6517479a9113
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+HOMEPAGE="
+	https://github.com/latchset/jwcrypto/
+	https://pypi.org/project/jwcrypto/
+"
+SRC_URI="
+	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	dev-python/deprecated[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -i "/data_files/d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index ae89833d328b..741d9de34986 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,3 +1,3 @@
 DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
-EBUILD k5test-0.10.1.ebuild 442 BLAKE2B 40e2b62ff561d427ac51b06c65e71996d3f70cb593fb394274c7c49c98aa1050a14f2ad51f0725558974b70d3efb5d2e9c4a459e3175e34fc44bd120ba495c53 SHA512 0dedd33a5e8156c69caf51ba82f9cdb8cbca70df1547172e67c9c87119d40ed48538e39d562287c734ad7eb4f47346414ae752a01772867c4e66d23f985e0898
+EBUILD k5test-0.10.1-r1.ebuild 479 BLAKE2B 01ae8e651203cf165a4dc7f7a163ce5036a00aaf0d2638533feb7b9353d8c0ff7ca10c86770f2315d21d56a7d8cf41a8ed5ed9b5bbcd6df093a2aeac8d15317c SHA512 de3422fb304b01735cc2d26bd1d6fa44e29e20f1b6475809881abaa17fc6aa56697caf47377efdfe2ef7d2dcba0fbe75c85e93a146e3296414fe66a6811de0e4
 MISC metadata.xml 393 BLAKE2B dc1fec37db82ae2baa97fe324533b9105879142442ac6072b20721dc5233981d726fa56dbefaa0d51b85917ba64110395c2f7c57a9d8e88cb8ecb5bd9d116996 SHA512 b8dd2d38e1d2d95d9fac8a77be33973457a64afc771f3122f161db721b2b1ed71a9e569e498bd85494e498dba340e9a7d3137ea1c239d9ba8d8c19332ebfb1be
diff --git a/dev-python/k5test/k5test-0.10.1-r1.ebuild b/dev-python/k5test/k5test-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..cd681b4fed98
--- /dev/null
+++ b/dev-python/k5test/k5test-0.10.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
+HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/k5test/k5test-0.10.1.ebuild b/dev-python/k5test/k5test-0.10.1.ebuild
deleted file mode 100644
index ac58bbff8dda..000000000000
--- a/dev-python/k5test/k5test-0.10.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
-HOMEPAGE="https://pypi.org/project/k5test/ https://github.com/pythongssapi/k5test"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
diff --git a/dev-python/kaitaistruct/Manifest b/dev-python/kaitaistruct/Manifest
index 999b43c42f23..e84b8a3fe07f 100644
--- a/dev-python/kaitaistruct/Manifest
+++ b/dev-python/kaitaistruct/Manifest
@@ -1,3 +1,3 @@
 DIST kaitaistruct-0.9.tar.gz 5497 BLAKE2B c3f4dae4269b8bf5102a120aa8792ab710607efd854d01e1239e0269fe696d38183f82a4d93838756d5283cbaa36bd137ddc8b0ea6c91bc474eb89dfba4a76e5 SHA512 4654f18d72f31745f27eed035899231e69f9539a8e8322055b0dd99ad701dbd4d484357d0bc42f5a1953abc6947a90fc5ec9da80aeb862077c175c1295549682
-EBUILD kaitaistruct-0.9.ebuild 352 BLAKE2B 42d08cf0eef556fd31dadb85c12b19bd8cb3d4bb9da2f7274921577acf3561d0dfbf367ba11d223edd7ed3e8f48a31f2efa54a305718412110558b9529708264 SHA512 fff86ab09eb4a6a96a94d3a27e75eda7c61cc49c90391acae40020a3f82e8e2ce2c3aa2190b916a19ae656366333143ec7e98832ec7748ee47e35f5b86f0066c
+EBUILD kaitaistruct-0.9-r1.ebuild 390 BLAKE2B f8b622eb667227fd3ffbba734c9f29480f920ddf10e00753e2bcc1fe0afa7b3a02ed9d35bd6ce9f1a4ae390489f8b79922883560d63dd16a186b7a81b27d2e72 SHA512 67267819325d8ebcf457a40e2974a01fbc122596cb484d7556f24daf47739f72ea9aea0c0cf2d1fa270158be9c809d3c4cac20febb8643148c20a2ff0b4702c5
 MISC metadata.xml 666 BLAKE2B 181ab1c55ef3e407cecb2e140d0a33955f2499a91daf0fbc8856b7faa28a142ab706f05d9eae9ed1043d7d7b148b435f98a4afb635df234559f2996e8f3f75bd SHA512 e29651517b39fc0be833c92edbe1e83d5591c1cbdc0a40019353b82a154c303dd08f87e1d36436ad4ff9c67cda95aec6c6ecaad62bc18d61c949054960d2d764
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
new file mode 100644
index 000000000000..6595a568b926
--- /dev/null
+++ b/dev-python/kaitaistruct/kaitaistruct-0.9-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Kaitai Struct runtime for Python"
+HOMEPAGE="https://kaitai.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
diff --git a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild b/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
deleted file mode 100644
index 9a4b488a8388..000000000000
--- a/dev-python/kaitaistruct/kaitaistruct-0.9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kaitai Struct runtime for Python"
-HOMEPAGE="https://kaitai.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
diff --git a/dev-python/kaptan/Manifest b/dev-python/kaptan/Manifest
index 75c3e8bc9965..126b74470c70 100644
--- a/dev-python/kaptan/Manifest
+++ b/dev-python/kaptan/Manifest
@@ -1,3 +1,3 @@
 DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
-EBUILD kaptan-0.5.12-r1.ebuild 469 BLAKE2B 996fc72346d5d71aaf2c02b797e8e72e44123cf509e469fa9b31138ad24b5a8ada13fb636899065bb31918bd594bde482deabcda4ec1e29aee0928950345f873 SHA512 8e5ef52e6f096918e6e00eb0270dc064a321ac139ed54731019cb81c25c78ee9c5a3fc680fb55ca90aa6eaea70c355ea6d31c52b31a1ed20970894c14732c4bd
-MISC metadata.xml 319 BLAKE2B e862d2ea909e842396c61e9086d4a15bd4b43923c57e2c945a612cc128116a118cb35d8d375241cc54496e1a8b387eb44eda8b628bb2f224e750ca550ebafc99 SHA512 90059632d10f616892a720d5453c5c3a690df0857bc723cdf920e07e87f694ce0a5c32c24659ecaa15a13db2d4ba1e5fe1545625bd198b441f85baa20202cd6e
+EBUILD kaptan-0.5.12-r2.ebuild 469 BLAKE2B 4ba2fe7ccf5814f151ae5d15bd07cebb23dba6cd0d27720ff80d712356040a0b66e1fe50e2fb24659a5d6307bb8a98baa8bc43c822cfdb7ec5c1c52a090137c3 SHA512 a6bc09d4e59d5d2b2d5d3fd9abd57a4c4d635ba305374a746d1339e164f93c805fae60de1699dbe233a185371e55feb7debc5e2ec1094f5a7af0f5ac88e13541
+MISC metadata.xml 420 BLAKE2B c948340212ccafdf7b04e6d524e9775c5cf8bc937e51358e6d04353bc7b97ec6e68a2ddd3662fb185969ba2bfc234ca657602a0bb59059a2e2d2cace54f6fd84 SHA512 73b63cd4d2eea4c615052cfb5385383db2a85ce9cf1722bac5e5459e2ba1f7e777d1162c27a531ecc0bd41a187c2ea121e1fd9c1eb9534bae2f1f05c82296b9a
diff --git a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild b/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
deleted file mode 100644
index 03d94f339712..000000000000
--- a/dev-python/kaptan/kaptan-0.5.12-r1.ebuild
+++ /dev/null
@@ -1,19 +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="Configuration manager in your pocket"
-HOMEPAGE="https://github.com/emre/kaptan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/kaptan/kaptan-0.5.12-r2.ebuild b/dev-python/kaptan/kaptan-0.5.12-r2.ebuild
new file mode 100644
index 000000000000..58d0a031e890
--- /dev/null
+++ b/dev-python/kaptan/kaptan-0.5.12-r2.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_{7..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Configuration manager in your pocket"
+HOMEPAGE="https://github.com/emre/kaptan"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+RDEPEND=">=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/kaptan/metadata.xml b/dev-python/kaptan/metadata.xml
index 60691425951f..6b48fa9b48bc 100644
--- a/dev-python/kaptan/metadata.xml
+++ b/dev-python/kaptan/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">kaptan</remote-id>
 	</upstream>
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 7d77469ca716..69d079162b87 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,3 +1,3 @@
 DIST kazoo-2.8.0.tar.gz 170037 BLAKE2B feded24671d6f4f5f7973b76048e5b8416e4b56aabdd9d32a8ff27283b5e8578545cee62a385f764202ffb4e58cf083bd2c182dff9bf255e69dd1de83e88db43 SHA512 ae244a70356274d6259d255e60a5dff00eb22bcf16d5b25f9d9a03178619dacb57414905b473801347b4ec1a19e5600be6c7040a5e53b67b81b440c304c95cc0
-EBUILD kazoo-2.8.0.ebuild 1265 BLAKE2B 48f43c57dd73a1b9af2b6b50a6c2df6ede86f3933be833c25a377356054ab51547fb8617ba2baaa11ac84bce1f2438fb7b641af8fc216c081bc7874e7cf36d48 SHA512 345ee44abe6deeca475a3ff183343b3da0db7ce5e9de9a3c0894bf335ab2d2dad718ddb751ed172672eada0e272cde9694021e97d93ee9c4cfb985fe570ada50
+EBUILD kazoo-2.8.0.ebuild 1266 BLAKE2B cffbc27206f30e5d2cb29b7be17d8a1520664fc3d61b3d3a8daf76fb07452623406b30a1485dde24d79edf172b80d127b6cfd77e10e1ad2a4be2df266a118548 SHA512 618512b5291836763750890baf5166d414aa44bc09efd032b1fe08ebc010e36c94a0f8c6074a1d864b65920724a3f0dd5e46e80cb283c7cdc3d18bb9a5b736a2
 MISC metadata.xml 487 BLAKE2B bb53eeb54d4a02e6bde67193985d5e4186871110105c98ddcb98f9b2231b3f74e6b561f3ce224f211c35d33f28d0bbd90f5e9e518cdce28d62d514110f300245 SHA512 cfa782225c67af846976728365b3ac4f80117c6be9e3bb3bab89ed6b3455cf6cbeec05eb256e6fd2d81ec405e6123a0e4c4f10ce8b1ab15f0b00399a4bc62228
diff --git a/dev-python/kazoo/kazoo-2.8.0.ebuild b/dev-python/kazoo/kazoo-2.8.0.ebuild
index 7387d7b7a075..d39da87a6cfa 100644
--- a/dev-python/kazoo/kazoo-2.8.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.8.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_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 78015324b142..f89ea7f9aad4 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,3 @@
 DIST kconfiglib-14.1.0.tar.gz 182990 BLAKE2B 1e5a5f7e6d1003f4fa005b2b08abfa17cbf9f6837d9320f313b23f19c6e9e7aa7c8fddf5ff38871634257ea050390b279becec0c4e0638cdb53182347217e937 SHA512 929a75f9b9f74ad7d4190c15d7178b94ee0a6d1fb71d85e2942935e3a9370a4f2483d8b49123d41d6610841ad9efde1dc4c14fc5231a08379d438a486ed3f97c
-EBUILD kconfiglib-14.1.0.ebuild 918 BLAKE2B 608cf749a9aab552db7cdddc429ee8b2ce2bd6a8f8aa23244282ac2e271493f0bd2f238126e7a7d98ab77b6661bcd4cad60d5d3b68742dbb0de66dfcfcdc46be SHA512 7e0f40d0451a0ddb30d4f8d4cda0430f54ff22a4ace328153933d15bbe7861f62bae26a565cb7593ea99a624afd2b649127da3f170b5ae29fc89604b9e17930a
+EBUILD kconfiglib-14.1.0-r1.ebuild 861 BLAKE2B e486384ab44423763aac64b2d94cee96beec773401d7fe5b5d15490b339ee44e9906e792da409334529d9dcb426886c1235a11450125b55220822d4d121af685 SHA512 ea2d61f7ecab8576329bf68633807c54f137cfd5adc811910a8a1adb9b9c99564ff0fe1aefaf9fccafd7f171189af3032799d58bbcb9a4646ab11bf974fb9621
 MISC metadata.xml 301 BLAKE2B d9fc1a3adf69d0bcf74b420437d336cfef4577d7d9c39234c12e3b0c4c40b9a28d4c410388793bb9ad86e08d9086dc90023f308e8fbca62afc1a920ea8859ae0 SHA512 7d6a492b50519f9328d7260e9e034a0fe5ed0beeb5d291889617a5c7aae3d4c039eb4c4836f3c91bf785148733753240b0346e364eee367762d9dca2af24d73b
diff --git a/dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild b/dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
new file mode 100644
index 000000000000..b6274ae5e1ff
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-14.1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# hacks to run tests
+	mkdir Kconfiglib || die
+	ln -s ../tests Kconfiglib || die
+	# don't run kernel Kconfig compat tests
+	sed -e 's/run_compatibility_tests()$/#\0/' -i testsuite.py || die
+}
+
+python_test() {
+	"${EPYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild b/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
deleted file mode 100644
index ef454e60acfa..000000000000
--- a/dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="A flexible Python Kconfig implementation"
-HOMEPAGE="https://github.com/ulfalizer/Kconfiglib https://pypi.org/project/kconfiglib/"
-SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P^}
-# pypi tarballs don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# hacks to run tests
-	mkdir Kconfiglib || die
-	ln -s ../tests Kconfiglib || die
-	# don't run kernel Kconfig compat tests
-	sed -e 's/run_compatibility_tests()$/#\0/' -i testsuite.py || die
-}
-
-python_test() {
-	"${EPYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index d25c70626619..fe8e03875627 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,3 +1,3 @@
 DIST keep-2.10.1.tar.gz 13044 BLAKE2B 178207ccad7f0feec2d9a57f0e5345e0ef9853bedd3f8efc8afac5f81c35e74ee6d3dab66b75ceeac4a3d76f2297ec645bae61f2f1e78218e910a2537984f4cd SHA512 d4144bd7f6f623b1c9c9468f5596818f47cba8a9bc80e75ebaf75f147823a01da53ef84c76b9f24240a8d0fbdb770c5cdf108c276ecdcd882ac9db0c1608480f
-EBUILD keep-2.10.1.ebuild 624 BLAKE2B 71b63bb00343bdadd30fe67a72e0ba24cb1a98a6aa45a16d86a3050883aff14c8c1c4299276bbc3ee41fdfc8e64f141949be93662fd4b82822d8d7298e7746ad SHA512 2c3561ecb11bca2eda34c78bf2ca927df661db333e9dd28147e2f3b6649688d520059eb8d5d54e2efe9308b38ec5b33446be0e2985b53adc2baf5b9c441dc987
+EBUILD keep-2.10.1-r1.ebuild 612 BLAKE2B d70ad0cdf4e87dcab0619f1a8c3dbf835c3ddb92b2ef26b872d4f4b8c556b2ab6e902da36c96dbc1f51b75ec1819e83567df82e2658cbdfa90d41ff81a68b6c3 SHA512 bd68403cc8c62c88863ed3f310aabaa62dcdb9dc25a1c76429cf8c4c79c7a70b026b89542d405b2e191c3b019b1583d98c405c217b9ad1f2462ee3550f12168d
 MISC metadata.xml 400 BLAKE2B 62327dcf8653077772b2af0a0c3ca33cb4e3ddc06f53803a01a257611ea828ca8536bd2e6b6ed6f0d86010580f590ced0931d09e8cf9aa9a79aff8def238cd43 SHA512 87ed56a0bfb1fc56de91e0b59a1dd0b8ec08b90d5b2746a27195d3a100856bde29dbda8594eb3fb301a64c58f3a9edb0d4a739c96e30e8ac19aebd6b1c8fed2d
diff --git a/dev-python/keep/keep-2.10.1-r1.ebuild b/dev-python/keep/keep-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..7f84ecd0cf58
--- /dev/null
+++ b/dev-python/keep/keep-2.10.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Personal shell command keeper and snippets manager"
+HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/PyGithub[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/terminaltables[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/keep/keep-2.10.1.ebuild b/dev-python/keep/keep-2.10.1.ebuild
deleted file mode 100644
index b6873ec74c68..000000000000
--- a/dev-python/keep/keep-2.10.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Personal shell command keeper and snippets manager"
-HOMEPAGE="https://pypi.org/project/keep/ https://github.com/orkohunter/keep"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/PyGithub[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/terminaltables[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 569802348b18..5c77a972cee1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,3 @@
-DIST keyring-23.5.0.tar.gz 44586 BLAKE2B 70179f8353147679f03c888b1af00d2461264e7a7062eb7b1372615ae883f43352999ce57e24f3378ac66d5e74a81df66702bf380eb32d6d3554777e9ca63dfe SHA512 639d1cdece5dac854053818f3a4751b30fb9f13a2b3abb0090ba0cb519b50604858673678fe6205c2ec10be863e5f3d63cc7891424beabe2482d35b820a60da1
-EBUILD keyring-23.5.0.ebuild 1376 BLAKE2B d6c9379a6f646e17f423f52e275ba816c866779ab177b29abc2882612c556c5a4f0eb4326e14300ff57d6811c62bd4111a2513be399afa6026e668a65f8deb8e SHA512 b8482785ac275c565d4fc709cf6c8de94d7449823b9f3251ead415ac5a62db16f6723ddae17f18707899d1ebe46f80550d4e5367930840c522cf341fc8107805
+DIST keyring-23.6.0.gh.tar.gz 45236 BLAKE2B 98ea183760da39512fcebd93b182b10f031853ee88d4e93add119a760851d9552d830fe599c57937d84a23df67b6a6ca9e33a5623a034da2fc8b28c0216a6aaf SHA512 dc196914389ad12f89652614ea00b2ca17cf22471f1bd41ed3cb58519b1ca9b8ad7f497707d77c31d1354c12d73b9881d4f5511c61a6dc562ec358f3009a0c70
+EBUILD keyring-23.6.0.ebuild 1221 BLAKE2B a3596ec3f62fc95ecdc6cfe5b2d6a30d272e38c3c53f9825018c35b5383254d49f94d3156ec3efb84fed037f4591fefb528aee14ae3f98acdbb325fd57e923f0 SHA512 c9f9531593f9c9be4a881aa2849c135017a26bdab441fa9fe69b566edf511677c8b6a50b0f19dcc007bf6305c4b1d8e39d20ff1a811c7c7848b58577b52c55b1
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.5.0.ebuild b/dev-python/keyring/keyring-23.5.0.ebuild
deleted file mode 100644
index a4719564f632..000000000000
--- a/dev-python/keyring/keyring-23.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
-
-src_prepare() {
-	# remove jaraco.tidelift dependency from docs, quite useless
-	sed -e '/tidelift/d' -i docs/conf.py docs/index.rst || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/keyring/keyring-23.6.0.ebuild b/dev-python/keyring/keyring-23.6.0.ebuild
new file mode 100644
index 000000000000..fd91c4904577
--- /dev/null
+++ b/dev-python/keyring/keyring-23.6.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index b0e285643cf1..ce77a7e4d700 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,3 +1,3 @@
-DIST keystoneauth1-4.5.0.tar.gz 266418 BLAKE2B cd56e6d62e185ded667b2e9a53478e65fdea7eea203e3598193b34137297a5b75e315433882a08d16f360936208eb55c6d4e5c80e64161f1ce00db2633e59d7a SHA512 eebf9f15624d4544351b26e80af4023dab3a60ad2848b14c1cf6ab4deab50d2c9812747f3e737aacd9e49eacaff3960d8cb1432067d2648d7d2552fdad907457
-EBUILD keystoneauth-4.5.0.ebuild 1792 BLAKE2B 8d6e3f459551b0c39eb6b262f247385671cdfa6bedf68ae7fe05f0f72ab7c2a12ec148b37a876a0973adbf09d011c2ad7317429dccc1134940b615a7860559db SHA512 c3b0c4d2ad7e9f7fc855a792d40b8efa8dfbc5074f1ad27e6dbd3df76001f02d3f2425e0ef73aec232feab45307cde4ac2576a3cd342f381051b32d7995ed1d3
+DIST keystoneauth1-4.6.0.tar.gz 267019 BLAKE2B ad1df2ce6f88ca03f1c9cde6bd84014fc7afedb3fb2375bc95461bab466f82464393e20919e4e506bce2cdbf1283ef53777c7ab3e92e2195b21d95459814f408 SHA512 fe6fbb0e47fb3608b0653362da0d19bdcb7055f9d043c776d487a2f6af76bda1cc1d8a2b87a771cafb54d0cd349695618428ed7dd93aba273d3d455b4175cbc8
+EBUILD keystoneauth-4.6.0.ebuild 1799 BLAKE2B 4f0a3ad166e37d431ef552e2d700c7d2f863eea003ec5681ef19ef63b8d228d931ec77ffd2562920247426a8d645bdb37be6384212e921b46075b09c118f9bde SHA512 430009f0927c4981e71e1f42b2b3d05c500640d1e6e00e37a11abe236363c3f20089575a6879e26ae4fee7e3f100a8155e90d26dcd3ad5ac18b27a13315442f0
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
deleted file mode 100644
index af58d970b6dd..000000000000
--- a/dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# relies on specific test runner name
-	sed -i -e 's:run\.py:unittest_or_fail.py:' \
-		keystoneauth1/tests/unit/test_session.py || die
-	# remove the test that requires hacking
-	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
new file mode 100644
index 000000000000..642b81d5869f
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud"
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+S="${WORKDIR}/${PN}1-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+CDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/betamax-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+		>=dev-python/requests-kerberos-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relies on specific test runner name
+	sed -i -e 's:run\.py:unittest_or_fail.py:' \
+		keystoneauth1/tests/unit/test_session.py || die
+	# remove the test that requires hacking
+	rm keystoneauth1/tests/unit/test_hacking_checks.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/kgb/Manifest b/dev-python/kgb/Manifest
new file mode 100644
index 000000000000..08e7903e6517
--- /dev/null
+++ b/dev-python/kgb/Manifest
@@ -0,0 +1,3 @@
+DIST kgb-release-7.0.tar.gz 54742 BLAKE2B 22193a573c797221382f5f6117f67dd5fbc00322e43d67079882a251fd3fd361672fbbadb523bcb14e8671b274789cc39dd591ee0b20f3b28649c8f39b58711c SHA512 571f077b4c4be10044d05ab1f88d75315afe4ebf7661851daff68e2782fd408dcf994c6db2bd620f38a56ffd89c1f52f41139defc30f05ec792663ae5f351364
+EBUILD kgb-7.0-r1.ebuild 687 BLAKE2B a055e3a10ec4bc41a2b2fb3dd00e21932d57cf98a5456b2e121cfacbc2442a8608b9727cf6cf9fc81e4b78a918d22fea3f7203539534a6836164a72c00c03bf3 SHA512 7d1e603b1248753a1db47187c0b314779925a3b5219864729c208e3409b3a4550e8f2b9c7c1bc34a665a018ac9be32efa2cd20d573b7201e8443b925a13eb10f
+MISC metadata.xml 385 BLAKE2B a36cb8262ed3d2fd3114e8c84bdd732dbbb661b8fea7a9705ff329f56659c020e5b9e00756a9e9dbbf073b894ddf5f811367b8c4d9b11dddd7c866588987e96e SHA512 5ee33147dec8e3fee8dc4856ca8a363674cd1854f36e9a01559751ec6799d8f8c995c8d0f82dcf794161b1f91acec387d7a18d7cdee2638fddbc177f0a069c81
diff --git a/dev-python/kgb/kgb-7.0-r1.ebuild b/dev-python/kgb/kgb-7.0-r1.ebuild
new file mode 100644
index 000000000000..843408951a14
--- /dev/null
+++ b/dev-python/kgb/kgb-7.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${PN}-release-${PV}
+DESCRIPTION="Python function spy support for unit tests"
+HOMEPAGE="
+	https://github.com/beanbaginc/kgb/
+	https://pypi.org/project/kgb/
+"
+SRC_URI="
+	https://github.com/beanbaginc/kgb/archive/release-${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove .dev tag that breaks revdeps
+	sed -i -e '/tag_build/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/kgb/metadata.xml b/dev-python/kgb/metadata.xml
new file mode 100644
index 000000000000..a731373a8ba7
--- /dev/null
+++ b/dev-python/kgb/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="github">beanbaginc/kgb</remote-id>
+		<remote-id type="pypi">kgb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 69ad431f3f3f..e71978408e20 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,3 +1,3 @@
-DIST kiwi-1.4.2.tar.gz 91150 BLAKE2B 8441d52267b3b436d9f05baabbd3beafc51d2f257fc982f1cf90b6296ccdbc24511de6b55b6201eb1df37ec9487282cc40142e9083cf4c1e925976a098927e1a SHA512 e7726ac7985bea1020fd3a26bf54b941acfffffb1f47b462c74f9829c5a89e7abd0732b5a11685b20d6a17ac9625178c68ea71052e852f91491a308d07111b01
-EBUILD kiwisolver-1.4.2.ebuild 825 BLAKE2B 9896b9ae28d62014d98f1f150a56721fce23284b3b2f344222f49ce293d96d6566adad2767affb5b3b6a5ca26aa659ba10ab8d50de943ecc3ab6be54af707b65 SHA512 10f7dfc28226bcde9bf10c28bc09bec3b52d9495ba9b83ccac1caa5bd9e82d5dfa2b05b2566054e540fd08acd1025aa06ec1728714c335db3f22f053a2abcaef
+DIST kiwi-1.4.3.gh.tar.gz 91238 BLAKE2B bdd6164eb428e6769ae7de2a8e689a3944e13e81aef9a839d9f68459deb7e7c0840b0eb59e70932e5c1d835444c515c8cb66fa47f40d8fc6244de47852be57d6 SHA512 04205555da46e772f2d25a481c4d966dc7bab8a541434a7c183e1b4f41ccd6e06aec564f2a95dae649585d337c1bf818a7cf24727460ad14669a3b3d74c74274
+EBUILD kiwisolver-1.4.3.ebuild 828 BLAKE2B 9723e16905b4d74ed5036eae21019a412263764522e50851317ead1287520f57cd288b90f2542b56ec18a1dbbbe4ffb2385f35e53ebcfa037eb2db7b345028fa SHA512 a7fce21852cdd18559b7de5ed80e48d2640ca573b4594b907fdac75138ea723de5d4af98c0ac07c59f1c2b4f866fab897a59424c982875616c00c0d867c37986
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
deleted file mode 100644
index 4af89d268f08..000000000000
--- a/dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=kiwi-${PV}
-DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
-HOMEPAGE="https://github.com/nucleic/kiwi/"
-SRC_URI="
-	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Clear-BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-COMMON_DEPEND="
-	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
new file mode 100644
index 000000000000..611d0160aa2c
--- /dev/null
+++ b/dev-python/kiwisolver/kiwisolver-1.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=kiwi-${PV}
+DESCRIPTION="An efficient C++ implementation of the Cassowary constraint solving algorithm"
+HOMEPAGE="https://github.com/nucleic/kiwi/"
+SRC_URI="
+	https://github.com/nucleic/kiwi/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Clear-BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+COMMON_DEPEND="
+	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/setuptools_scm-3.4.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 6b01afe9f240..a777dd838a16 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1,7 +1,3 @@
-DIST kombu-5.2.1.tar.gz 420402 BLAKE2B 00ddc4418f31c2ddc9d154aed2d4c0cb8555cdf143d08c969f8e79aa7aa44f60c0bfe40d92a4dfa2f6c2a60b9e4f0590468e2016bd0a84e255cb57c570597904 SHA512 12fc3480651475ce8476424665ccf692a5bf1cbf4cd31c35eaa24419c316dc380357cfab0ca5d58ea275e870fa703d3ac258cb84f04886f9342e730aaaba6bf5
-DIST kombu-5.2.3.tar.gz 421943 BLAKE2B f5b8f27e2b1e79d7dc7c92716f90f260454508769e52c0d78ebe94dd0da150cdd6121cc2db30c80cb290c15fc7d94de37973ac180635498b53f171ac8d884c1d SHA512 0e882063e89a25d324ccdf8745f11e1ea51443cc9a80b215e7f31c85053411cf1d5f26b5ffcd52165a15827ee036300a69a8a192af60d975a495a5a0b5ce3954
 DIST kombu-5.2.4.tar.gz 423450 BLAKE2B d0a180a4644876594eacea51706ca74fa4a95729ba965f69694da9694c2a91641ccf05aa1aec8a64f9d8c2260477d00bc2664d0a50143562b46524c98e4159b1 SHA512 695813bee71d627649e772b45b25494784a6a81bcad92331160705e34d8b2268fa90629983ebcfd04ec23208508d422f1834cc56895532911602d58ec0090a03
-EBUILD kombu-5.2.1.ebuild 2329 BLAKE2B d63b2b3652df40e48293362bf121bfcbef45e78cd5f17c329b2d38425b517ca6263047834db12bc54935b5d9bba710ff3027caa6bf99b6852525593e308cafb7 SHA512 e00b2c6cbd181d353994b04000a89afa4bb6fafd57647655f748d03f562eeb0afbfb3f22f0827cd6b4d8ebfc4adb7eaef4150c13d6fcfac8203cdc8337db5cba
-EBUILD kombu-5.2.3-r1.ebuild 2329 BLAKE2B c0a3f21efcfc1f50722b1d1261f09d238db2a7cd75dce84b4de736dcac040da41fb4478e2406beae5e76c2626bf7029300a33247fb46dcdd01916e6163b60039 SHA512 9f733d7ed97293bea40450ee0a4ac526d4795a7877c8065bd3e627a683bb8b85e9352be05e1db99fde84a678545d01a77d10e7b3992932c38126c79f0d901c0b
 EBUILD kombu-5.2.4.ebuild 2362 BLAKE2B 0328f6274c3d90c37e843120c26fedffffbe6d70b9442710f621d700d889c6f0320a000646bd4a35cef2bb304fe60a281255ed9cfe81b51f426b5f99c6881145 SHA512 3ed1ddeba6ba310ac628db4b51dea68d88459a61537027d3d6842d4c1db5f8948f65beffe84b0c02e6ee7ee6473fe30228e79b1b48c118c6f5a819c7538b49ce
 MISC metadata.xml 385 BLAKE2B 174062695338558e56601db5b6ced5eff3f6e22c1b840f1fe3d9046d6bc5f810fe1d3c73a3e7f009dae9129050dcb6824aca48ca86c006ecbd53f069884e60ef SHA512 eba10417212f73894b7bf749962c055c44ca10afbbff80f57e36f74edd016097c4854625a94e5a3522b3adf638c2c150e357f163f1617a79dd7fb54c234a1435
diff --git a/dev-python/kombu/kombu-5.2.1.ebuild b/dev-python/kombu/kombu-5.2.1.ebuild
deleted file mode 100644
index 22dee35e6bf5..000000000000
--- a/dev-python/kombu/kombu-5.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1 optfeature
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/py-amqp-5.0.6[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
-	dev-python/vine[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/kazoo[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
-		dev-python/Pyro4[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_celery
-
-EPYTEST_IGNORE=(
-	# Unpackaged azure-servicebus
-	t/unit/transport/test_azureservicebus.py
-	# Unpackaged librabbitmq
-	t/unit/transport/test_librabbitmq.py
-	# Unpackaged python-consul
-	t/unit/transport/test_consul.py
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	t/unit/transport/test_etcd.py
-)
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
-	optfeature "Etcd backend" dev-python/python-etcd
-	optfeature "MongoDB backend" dev-python/pymongo
-	optfeature "Pyro 4 backend" dev-python/Pyro4
-	optfeature "Redis backend" dev-python/redis-py
-	optfeature "sqlalchemy backend" dev-python/sqlalchemy
-	optfeature "yaml backend" dev-python/pyyaml
-	optfeature "Zookeeper backend" dev-python/kazoo
-	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
-	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
-}
diff --git a/dev-python/kombu/kombu-5.2.3-r1.ebuild b/dev-python/kombu/kombu-5.2.3-r1.ebuild
deleted file mode 100644
index 73c428029253..000000000000
--- a/dev-python/kombu/kombu-5.2.3-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 optfeature
-
-DESCRIPTION="AMQP Messaging Framework for Python"
-HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/py-amqp-5.0.9[${PYTHON_USEDEP}]
-	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
-	dev-python/vine[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-arch/brotli[python,${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.4.4[${PYTHON_USEDEP}]
-		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
-		dev-python/kazoo[${PYTHON_USEDEP}]
-		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3.3.0[${PYTHON_USEDEP}]
-		dev-python/Pyro4[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_celery
-
-EPYTEST_IGNORE=(
-	# Unpackaged azure-servicebus
-	t/unit/transport/test_azureservicebus.py
-	# Unpackaged librabbitmq
-	t/unit/transport/test_librabbitmq.py
-	# Unpackaged python-consul
-	t/unit/transport/test_consul.py
-	# AttributeError: test_Etcd instance has no attribute 'patch'
-	t/unit/transport/test_etcd.py
-)
-
-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
-}
-
-pkg_postinst() {
-	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
-	optfeature "Etcd backend" dev-python/python-etcd
-	optfeature "MongoDB backend" dev-python/pymongo
-	optfeature "Pyro 4 backend" dev-python/Pyro4
-	optfeature "Redis backend" dev-python/redis-py
-	optfeature "sqlalchemy backend" dev-python/sqlalchemy
-	optfeature "yaml backend" dev-python/pyyaml
-	optfeature "Zookeeper backend" dev-python/kazoo
-	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
-	optfeature "brotli compression" "app-arch/brotli[python]"
-	optfeature "zstd compression" dev-python/zstandard
-}
diff --git a/dev-python/krb5/Manifest b/dev-python/krb5/Manifest
index bb64f115b633..91100cabf2b0 100644
--- a/dev-python/krb5/Manifest
+++ b/dev-python/krb5/Manifest
@@ -1,3 +1,4 @@
 DIST krb5-0.3.0.tar.gz 1707212 BLAKE2B 0fa7a60372876f28cdbc2865fbd898c717aaaf22837bfd123008611973a0d6907ea9e5941d5da4ef707161d6aadd883fdef1faab81d307153eb4e115defe32a6 SHA512 5074cecfcd82c8f525d77c2faba5b34d6cdc593b15124741df1adec64cdde59fec2f17a02c04f78484ab4b82f7f37f5c1a4d856a2040c8d11c7e4a1b74307b27
+EBUILD krb5-0.3.0-r1.ebuild 751 BLAKE2B 5568f065aba21fc5e6ac1c75080b278866d7efcd60424da4c78411c07a47f46c4e02f14b982a00abf07b23a01b1a95480781a0cdd2362b28d8bbf385bd5f4afb SHA512 5f559430a300c1bf089260a3e54a1ee8d633b6d8d28f7c623e8136e2fdb211fee5e110f7a968f639a85e9fff40be84fec94edc8f9bcaa90bf685747a535065ba
 EBUILD krb5-0.3.0.ebuild 558 BLAKE2B 2075ba961f7be1f29b06cefb4f96daa10f250352e1cc587a73294069a6d65225f2af7e8e6d6bec6bec2f5eea15fe3b4b1fd69c259e1cef35bca188a8728a34f5 SHA512 2d85368f8b1c3553b2d04fc5a2a71737f0a8c8f18c41152ea3d29a9e0c8fb0d9f398e916327607fb46911c14c20c6cacfd88c15f8cdecf7db653be650680db93
 MISC metadata.xml 364 BLAKE2B e69a14082c08f32db33234a5738190f54374c13a2f114d65e26a8e224c96f23be90e0cf602830b757fdadfaa058d723ab2cd51e6980f08fb090ca7b014416935 SHA512 f65eb368468d221f55e0701f8ae3790dbf083be2d3f210e9688b27db892b6d3e566a0cea3912d45a4e1e6da7aa092bc82eb6a4b861b459bb8decf914c5192d6a
diff --git a/dev-python/krb5/krb5-0.3.0-r1.ebuild b/dev-python/krb5/krb5-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..235f1e541e46
--- /dev/null
+++ b/dev-python/krb5/krb5-0.3.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kerberos API bindings for Python"
+HOMEPAGE="https://pypi.org/project/krb5/ https://github.com/jborean93/pykrb5"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	virtual/krb5
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/k5test[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# Needed for Python 3.11, can drop in next release (after 0.3.0)
+	cd src/krb5 || die
+	rm _*.c || die
+	cythonize -f -3 *.pyx || die
+}
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 358a2aaff723..99cdd82705a3 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,5 +1,3 @@
 DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c8c6f5cba6bbe9e03486b5598f55fa7c6f4d77798ed070decd902d01faa4df62039031fe21d392d29122125 SHA512 fc797c263410f461e1ef28fbbba526472b9c4d8dbb296b309e59daa5945fdcc0c2f9347b3b4bf78e189c6a3d8f1333c74a5f3d80b82ee54867181b84ba263c00
-DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
-EBUILD lark-0.11.3-r1.ebuild 791 BLAKE2B 52472cd0e01845abb9529baad9a1d2bad5ad92e0ac87cda74b7cc91a9d6a4409c5c725f76bd089812c43b2574eb2739c511956cd9e1b3d210d5b18bae2f59f17 SHA512 d085cca68608cf4988ed78fb9faff1bfe55c63e8aa489f0ce2c49cd930dfd9c17ce5d98035047a027c572c6daeac2efa20ff1e96a743f3db912df1e28d26d1e8
-EBUILD lark-1.1.2.ebuild 788 BLAKE2B e03b82650760ed40a86090bd30451f8fe15e57b76573ead802f30965bae9b203f8551c41b9751ff83ec2758d781f6186c9db144ad2740963a151de249e5538ec SHA512 023b3048c03e2e5ad60160119affb1b275b8e017fc6e0c91bc1a44f9980070bdfae4bbca0cdc4a0a0209f75b2a8ed85f14444192597f5e237784f4d213f3d3d2
+EBUILD lark-1.1.2.ebuild 1044 BLAKE2B 37651f4ac118748c27f1ba76db1cf0400957dcd8e348023295306f86b88c7e864dfebf80a273a0fbc515c6a536f9fa3d1010172df4682c35a7097254ec75b841 SHA512 e5b8c6d42e4af12bf07d2c6efe3d330f99da1f5cdac46a0ead309707f812489ef43a91cd54d61249e6c13cc21a4fff3352a0ea2987182af60b73f658801462df
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-0.11.3-r1.ebuild b/dev-python/lark/lark-0.11.3-r1.ebuild
deleted file mode 100644
index 1b17ebf7368b..000000000000
--- a/dev-python/lark/lark-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=lark-parser-${PV}
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="https://github.com/lark-parser/lark"
-SRC_URI="mirror://pypi/${PN:0:1}/lark-parser/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lark/lark-1.1.2.ebuild b/dev-python/lark/lark-1.1.2.ebuild
index 8c13517ad359..a74107bac7a7 100644
--- a/dev-python/lark/lark-1.1.2.ebuild
+++ b/dev-python/lark/lark-1.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -17,9 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
@@ -28,6 +26,19 @@ BDEPEND="
 	)
 "
 
+distutils_enable_tests pytest
+
 python_test() {
-	"${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# require dev-python/js2py which is a really bad quality package
+		tests/test_nearley/test_nearley.py
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/lark-parser/lark/issues/1146
+		tests/test_trees.py::TestTrees::test_smart_decorator
+	)
+
+	epytest
 }
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index be2ec6985cd2..ec66d15c8144 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,3 +1,3 @@
 DIST latexcodec-2.0.1.tar.gz 30131 BLAKE2B 8af9cf81a1e0a8b72bf4eb1be206d2f2029598372872f1c43d8abe5e69efeba957d610102f44a5da552325f5525e1668e52ba2cc6c9a2d3f4b7c59c375f040e0 SHA512 e7f23b91904e0bd4a3f052f5f201b125e84c1f94a247b869e14c8f45ee8bc2c478e8887a792efa8c9b6d2b7fefed43fc66e797206b6e40aedaedc68ce7865cab
-EBUILD latexcodec-2.0.1.ebuild 499 BLAKE2B 42aa6d37556f3b5128c228bbfdc36a0c3f5a7ebd9f27c0091d21234745b1809d759d8468af5a25a6139b75c332b0ca725f8320a90d279c1e39854b6b28e84fcf SHA512 ea7cd16be8932e3a54639443e2a8c3c36e40c058053bdeaeeb5b5166926070397aeba549106877472851a060199f32f8c1f5aa66cca60a84df249ec2e015b10d
+EBUILD latexcodec-2.0.1.ebuild 499 BLAKE2B 198538246c12833ac0b1cdb0fa2d3ebf2d2b35d68b38afb229811d58811b904d626e9611461d1cccf6f3cecf1f15a8f2aa863434c3455b003fe2c36c2e9232a3 SHA512 f9e749b48ac389ba24553c0f11a89dd6477a7cf8293384da93f4c48773448ac28ae4f14532f775e41d4460c8393f1c452bcb0756a1de61aa39b92fd2a2fbcbde
 MISC metadata.xml 1161 BLAKE2B aaba4e38c221087bb7791bd6afaccd9572ca187a9f4d4152b6efca8fdd8583c1fcefc230a954844b209aed88a4b10c2f3fc292d53bdffba04c75ca4f442f8d63 SHA512 4e0774571e647311671f34da5ad6bca06f9d9eba89f5c5ffb8462c71ed4cff0be9156cc5266d2a16d1d492c2481ed4f2990cd962a86e839a3a51fe5201117cab
diff --git a/dev-python/latexcodec/latexcodec-2.0.1.ebuild b/dev-python/latexcodec/latexcodec-2.0.1.ebuild
index 3fac1b0162d1..ed4e886f4063 100644
--- a/dev-python/latexcodec/latexcodec-2.0.1.ebuild
+++ b/dev-python/latexcodec/latexcodec-2.0.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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
deleted file mode 100644
index c52611476038..000000000000
--- a/dev-python/lazr-config/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lazr-config-2.2.3.tar.gz 34213 BLAKE2B 029bdec3ac4f937f439f833f51e44a58f4604f337979c9f06695e7a243b2cde0af39a46139af5e88052e8585d2729c1b328df89979c9ff100338ec557e841b71 SHA512 cd8edc29a811b658045f314b2de4317bd750a701c2596d89912948fe0e58bdc39ad3d22cdf34bb7e46658af7ac6d32249e454c35bdcf72bc5053094343cd37bb
-EBUILD lazr-config-2.2.3-r2.ebuild 1021 BLAKE2B 4ffc5a376598c5c9997f212a2d551122764d8eb9b94660610aad051cba2a38c586bd6aed1a580fc851a6b3025ff4875fa6e811fc82c698b9ac37baf1828100df SHA512 97429541b4243a0ec724a991927893f4970c72547f0927ffe9680ad9b3c12128a0f72cecde22f1eccb9ae4081cfe8accebb2a9f6259d2adc44ebc4a8adcfd6d7
-MISC metadata.xml 432 BLAKE2B 72841fb121bea81e762cb15c526c93b7a33830a179211b95e8925ed5a9dadbf1db2260957e4b15f9ff1b8b6996e1a48b3161d56822b86ad9cac787da67430994 SHA512 b40fa15d3b6e551f12c367cf07e1fac5c4d2e4c4e22c220b2028d264df6a7d54c5fdb7ae565e82950642f1a395daa2a08cb410d586d64b81a039222e4e1e9370
diff --git a/dev-python/lazr-config/lazr-config-2.2.3-r2.ebuild b/dev-python/lazr-config/lazr-config-2.2.3-r2.ebuild
deleted file mode 100644
index e8bc47b43685..000000000000
--- a/dev-python/lazr-config/lazr-config-2.2.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Create configuration schemas, and process and validate configurations"
-HOMEPAGE="https://code.launchpad.net/lazr.config"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/lazr-delegates[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	!dev-python/namespace-lazr
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip rdep specific to namespaces
-	sed -i -e "/'setuptools'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	distutils_write_namespace lazr
-	epytest
-}
diff --git a/dev-python/lazr-config/metadata.xml b/dev-python/lazr-config/metadata.xml
deleted file mode 100644
index 7bef018c788b..000000000000
--- a/dev-python/lazr-config/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">lazr.config</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
deleted file mode 100644
index 7cc3f68ebd33..000000000000
--- a/dev-python/lazr-delegates/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
-EBUILD lazr-delegates-2.0.4-r2.ebuild 838 BLAKE2B 8f3d3e0f49200cce1f95042725873cde8cb7e9fc5b5e3e974c7eba37800b5d81573a67bfa0ba192089f580597781549960a8ff6f970aa3c7d19624764fe89a1f SHA512 8b43f6f9500db4e47d3c3a7e49d1cb69b7778f1408730de3cb27c8b513d2a60b3b2a78347ff74ee0dffe934d2ae412c0cf8ca2796e6110aff244ca3f08f43f50
-MISC metadata.xml 435 BLAKE2B ab9b18e35d73d4c460fe0470cc54588c461686b95fe69ef394fba867d05f236ac5fe57978b2e0e9192d9803142adde1852afca1d51d3a625e83c60c87fc3d8ee SHA512 9a9001816862b997f7c7c2b304a344c9a41e45639676df2d58e9c9092f6e448a9cbe452509d62257607693a02b965e7b73e36bfec808d423301e8d79bedb6645
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4-r2.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4-r2.ebuild
deleted file mode 100644
index 5177c54c258a..000000000000
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Easily write objects that delegate behavior"
-HOMEPAGE="https://code.launchpad.net/lazr.delegates"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	!dev-python/namespace-lazr
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unused rdeps
-	sed -i -e "/'setuptools'/d" -e "/'nose'/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/lazr-delegates/metadata.xml b/dev-python/lazr-delegates/metadata.xml
deleted file mode 100644
index d1111620a738..000000000000
--- a/dev-python/lazr-delegates/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">lazr.delegates</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index b79cf2601bbc..896f43efea27 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.7.1.tar.gz 41995 BLAKE2B f3945b3ddc8335be184542e23eb823effe83262a80f048e92441d60bee2ace2f0c9b09fc00a7d356e91a66676361979bc10555dc24ac65e2fdbdfa9ba0cf9e02 SHA512 cf80f2e43795cef09c0a6dde32276d54f5d66a2cf017d3e815868ec9925d989f7256bbf3e416c4445d13e0c9241733029d9a99f2556258f59c2c5267b3c35391
-EBUILD lazy-object-proxy-1.7.1.ebuild 885 BLAKE2B 6ee6c08c880a9c46249615bf15933e497293355f6705d5d62134e213218643fc2d8e16e28995f0a25b867e190cfea6eb15d1f3a4b407745e109736282d948248 SHA512 6948df4c6218533cb90ad5f47d738c39c0d8033a3ac301c357aa8e3a3d278b60c8ca9dc79d8963af8680fb345403076273162059460ac838610eaee42087caf9
+EBUILD lazy-object-proxy-1.7.1-r1.ebuild 917 BLAKE2B a5d7d7a3b70920d3341d38f72d5f70717042fec8e95ed7fc216d59a55881fd550e3fcaa75d6d7f4a94f5ef11c759eff8c6a90401715215ce9548de92129d2f41 SHA512 39e561b930fe378b9f8f2ee166b0821ff8bfeb6b0aaedc1d1f4637dbae22c221d846b6dccdd837aaf4770190f25924423f9da0da21c1b5e9cf8b16b5f5139254
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..df4af16bb32a
--- /dev/null
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A fast and thorough lazy object proxy"
+HOMEPAGE="
+	https://github.com/ionelmc/python-lazy-object-proxy/
+	https://pypi.org/project/lazy-object-proxy/
+	https://python-lazy-object-proxy.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# No need to benchmark
+	sed \
+		-e '/benchmark/s:test_:_&:g' \
+		-e '/pytest.mark.benchmark/d' \
+		-i tests/test_lazy_object_proxy.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
deleted file mode 100644
index a4c35aa127f6..000000000000
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="A fast and thorough lazy object proxy"
-HOMEPAGE="
-	https://github.com/ionelmc/python-lazy-object-proxy
-	https://pypi.org/project/lazy-object-proxy/
-	https://python-lazy-object-proxy.readthedocs.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No need to benchmark
-	sed \
-		-e '/benchmark/s:test_:_&:g' \
-		-e '/pytest.mark.benchmark/d' \
-		-i tests/test_lazy_object_proxy.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index cfd1f09eda39..1d90b7562661 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-4.0.gh.tar.gz 47743 BLAKE2B c6246b35a9a389c6cd999b32412436f8134737a4cba1c0bf8a905e3ba6e1653c515956f43a580901dd4278cbc00b783ecfa7a4306f0fc7ca2d2666b3af500cb8 SHA512 787b049a5f06d7370369a6bb2d9ebab6e4e5eda0a4f839906e205a7e19a00f9f7e350d4c42e3434e345063dd0ea44e5b0b4c0524033b05a6d8f15758757c5c36
-EBUILD libarchive-c-4.0.ebuild 638 BLAKE2B fc1e1a95aab27e3dc5d08661d091c5ee727f8e26c9217c8e2f73e876cfe507e78bdcc6a86855183d6814b56d11cb0b605daaf41aceb43bbd7c3c2d99dcba4c66 SHA512 f84349e4c440056991395bb4c60ae4ba42f368ed09e8f1645ed39fa6f1038b64df1e7027be2a8e7c616b1100713f227b445c4dc581e610b29e6da6702cd84c54
+EBUILD libarchive-c-4.0.ebuild 638 BLAKE2B e3358172192cefe3b80817d1803d4d4c11663af5d99a7d54c0984226157ab309c18bd96e3a00afeff1707ccc18028010aea169df7697b24677b91ffb256056d9 SHA512 3cab85464bdcbb6bfbb2eacd372d09b93b0368ede8f44cd9dee3dd8eab6ce2eaca709f60aea11f099ced25d58af05a0dd467902ea23b7794164e9455ce294ae2
 MISC metadata.xml 562 BLAKE2B 5b9cebc30209b517fc5ed60eea8e340dd36b16fb1c593bb857a05bc6a8cba3b6ac45a54891c72429a775b15afcd7f56b453ae628aa61d029db1df633e764518b SHA512 200c3fd7789d21103719ba2693f8298a8be1842535ff086ad487a66e9d4ae39f6dd1b2435d60fc0443add133923cf047f37c2de17f581fd66f786f935e203c43
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
index 58a8bcd5595f..60ae1296caf4 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A Python interface to libarchive"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index 1f583169867c..1e7e505f2693 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,3 @@
-DIST apache-libcloud-3.5.1.tar.bz2 1859270 BLAKE2B c2e49a79ac4feccb5285d9bf55a4a6e8486d32968216b68e8c8f5b049ef5fa8caae853b4e4cc31ec2c323aedf3de275ab79758b1a055d7f20bbde994c58ba882 SHA512 22d6facf344687bfcfd32e53ede12227882f55bf54ffcf75d5584652c4cd257905c56e359d9c6b050635faa2305c344a6dfdc17007eb41143ccff772bd31d91e
-EBUILD libcloud-3.5.1.ebuild 1556 BLAKE2B 9387cd43339f7ce4ede8fe0d423a51abef5aceb996064e8326dab6f5fcad1c5e9b5f2c3350121549d16e3cb85e354d248aef7955d523fb36e02b26b222e0ccd9 SHA512 08a9138bbdf960a87c6ee4b5af259b7cadf5988ec652b339c22901c6695a1e9af6132808119b811d515aeb25916854af42084217695ba807b4622f5b8f388da4
+DIST apache-libcloud-3.6.0.tar.bz2 1873596 BLAKE2B 7ca67d0a84d1af9a216882efb35ff48f4a795eacf34132b78429e0158b1093b3eec316541a52673e61edfc5bfcb326052ee874fe59b1e4a65b407bdaccf38774 SHA512 3a4b4ecf35194e70b6cb70f0619238e1c0140891c08438d4b1ef308fffc9dfb973a5c1534b6ee7864797925b7f7be77eb79a2c4d621627d8042da3927b3f2ff4
+EBUILD libcloud-3.6.0.ebuild 1527 BLAKE2B b42b5f55fc210428a08b42afcef047c7da46895ca671c7650719ea450d63571d249a8dd0590c2dfad22691673e1dd5da6cbd6ea50786c6e2b2a5fb62eae2aef5 SHA512 4103a7ba8e147797e6f21b5ae6bac1dcbd8a5b4c1d753b378f20aaac58ba039d7fb7017f3c0acee5477d9bb1d21659bfb592000f59681d494c370e6684d0dec2
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/libcloud/libcloud-3.5.1.ebuild b/dev-python/libcloud/libcloud-3.5.1.ebuild
deleted file mode 100644
index 914b340c5756..000000000000
--- a/dev-python/libcloud/libcloud-3.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unified Interface to the Cloud - python support libs"
-HOMEPAGE="https://libcloud.apache.org/"
-SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
-S="${WORKDIR}/apache-${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
-	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
-	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
-	# TODO
-	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
-)
-
-src_prepare() {
-	if use examples; then
-		mkdir examples || die
-		mv example_*.py examples || die
-	fi
-
-	# needed for tests
-	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	use examples && dodoc -r examples
-	distutils-r1_src_install
-}
diff --git a/dev-python/libcloud/libcloud-3.6.0.ebuild b/dev-python/libcloud/libcloud-3.6.0.ebuild
new file mode 100644
index 000000000000..07010b5ebe29
--- /dev/null
+++ b/dev-python/libcloud/libcloud-3.6.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="https://libcloud.apache.org/"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+S="${WORKDIR}/apache-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	libcloud/test/compute/test_ovh.py::OvhTests::test_list_nodes_invalid_region
+	libcloud/test/test_connection.py::BaseConnectionClassTestCase::test_connection_timeout_raised
+	libcloud/test/test_connection.py::ConnectionClassTestCase::test_retry_on_all_default_retry_exception_classes
+	# TODO
+	libcloud/test/compute/test_ssh_client.py::ParamikoSSHClientTests::test_key_file_non_pem_format_error
+)
+
+src_prepare() {
+	if use examples; then
+		mkdir examples || die
+		mv example_*.py examples || die
+	fi
+
+	# needed for tests
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	use examples && dodoc -r examples
+	distutils-r1_src_install
+}
diff --git a/dev-python/liblarch/Manifest b/dev-python/liblarch/Manifest
index 64cd35f63f59..e43a2173395a 100644
--- a/dev-python/liblarch/Manifest
+++ b/dev-python/liblarch/Manifest
@@ -1,3 +1,3 @@
 DIST liblarch-3.1.0.tar.gz 55727 BLAKE2B 531602b43f7729f59f59394aa1dd6d3ee4ad653d4ef8802de2074c9a9746d43da1638941c1e8f2075d9092810ba680f2e01bee360c55b0826bb725d6515b31df SHA512 042a763dd12612d6630c064b5af84011f1fb908626f17f866e103743cdaabb4983f922290287b0138938488a7c9bff33680ef8157f8bbcbc166e4f4f2d008951
-EBUILD liblarch-3.1.0-r1.ebuild 648 BLAKE2B ab3ad9a16022abcd91fcba42bb26dca3700182e582bdec3832c09a7083c110aab7dd296179453b74a18d3bcedf12a6d72fe8d1698d54c5a8a59728b7ce5e7b47 SHA512 c2696aa75faac4392e42babac3aa58380cd033021e8e70198fe39506675781df2563ef471694a1356b174d019dfaf6f2fdab582f6399c46be6a8293732485b57
+EBUILD liblarch-3.1.0-r1.ebuild 656 BLAKE2B 720f73923fd61b81a13734c0e0b9e0a5326738d44c98dbc54dbf256191758baf999be8c675fcdc2bd56d6bb0c29abde7ce37a037d95589f7c10f239fdfd6336f SHA512 e48f9bbc44e2fd39868ef61f7770c646c4c7c46c8f44bb93a93e199db81d76414cae9bbda90a316ddcd6632ae4dc0bcb4a5a17857d309c959a152425e83d4d5d
 MISC metadata.xml 817 BLAKE2B cb4a3bf8595de2a98b53b5086eff0623e6eb7639515c13ac236d3b52ea0d6c31e51454d6d92a242e132ac333265a414da29f2ef3a547ca2790819e7440b1a069 SHA512 ed7203c3ab4682a42f52b1ddf5f03a129d7991bc7783545b03399e63c13d0b8a131252212c4a051aaf13a8e914015f68bfbb881035243ac91de32138c9c99eb2
diff --git a/dev-python/liblarch/liblarch-3.1.0-r1.ebuild b/dev-python/liblarch/liblarch-3.1.0-r1.ebuild
index f8416684bb73..3f1af0d09dc0 100644
--- a/dev-python/liblarch/liblarch-3.1.0-r1.ebuild
+++ b/dev-python/liblarch/liblarch-3.1.0-r1.ebuild
@@ -4,13 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Library to handle directed acyclic graphs"
 HOMEPAGE="https://wiki.gnome.org/Projects/liblarch"
-SRC_URI="https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/getting-things-gnome/liblarch/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="LGPL-3+"
 SLOT="0"
@@ -20,7 +23,9 @@ DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="
+	${DEPEND}
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 70667019beae..06491a95e975 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,4 +1,3 @@
-AUX libnacl-1.7.2-32bit.patch 890 BLAKE2B 40afbe3e71b550da59b9c26c2834ea72b151d847605572bec3b149edf714125698014a8e30c2e8d9c49cca489564ccf5fbdf0f7033caea528ee588716e222a2b SHA512 8ee93b8dcb23228b3f294a947a54f49afd9fc4dc9207fe999ca7349868cfc05741ea8cab004087c3f0544436fb445ea3f513b574076f6350b2390415a3be7426
-DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
-EBUILD libnacl-1.7.2-r1.ebuild 640 BLAKE2B 6ae693e843c14124d826936beb862e66c762fd1868b7eb37e09d9b68c964ee1f44366135f12d9d41fbc57a24a4a845c425711f5d38c4cbb1267c5e678ffe81bc SHA512 f1c8d48884817127620180bbd16c9ed001976343d52e94781d0e2a9f8f07a0952c22feeb65c2643f8b11c6528cc5dea1a82a3ad307980536431ad196fcc7f5ce
+DIST libnacl-1.8.0.gh.tar.gz 43351 BLAKE2B 4ba0ebcb50755d80418ffe7238c65d9309954cb2a0eac61937c488144b56093f3fcd87f0bf22a290c7b415c70cb781fbf7a2c608863d43694230fe34b3ad418e SHA512 7a39d646083591782691c4d58fd4d743b385ee553bcc4c4741707a237fa3b1213629b5070390526175bdfe8436859aa7711779ff8b22a981227edb30b94e82d6
+EBUILD libnacl-1.8.0.ebuild 782 BLAKE2B 85b0d6f3fde620c45258129e8612074071179d1115c51b42db9c8765ab97100826009fb0c6e25386a75a7abfeeb2e1fef1228f29e61057072063c4eb5a614946 SHA512 5da125ad6b158dc480438f5196b278b678cea8606e7b83c3a643a30a98ca409b0e70760a5497c7fda05c3500e992cfdbf1ca87ff0ed90157a8d20ac8c6f1c3f7
 MISC metadata.xml 496 BLAKE2B a01f3bd084333c8a79bae53afa580adbdde4154656a6a88d6a4b0714e0c752a9ec73677151e1f940abd040426f69dd30214909fc5c318fd13bc29087c6d36113 SHA512 56b52d188839a79fcdf0a341d18e7d0625fd05c48f2b376b164483999198ffd3b51328191462dc81ea29644cfa0025c00a7c8091041e16b1347cdab16b2b78ca
diff --git a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch b/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
deleted file mode 100644
index f8a06d27949a..000000000000
--- a/dev-python/libnacl/files/libnacl-1.7.2-32bit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f1567460f2d07822f2125778a55bf90b74ef807f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 12 Apr 2021 15:10:09 +0200
-Subject: [PATCH] Fix crypto_kdf_derive_from_key() on 32-bit platforms
-
----
- libnacl/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libnacl/__init__.py b/libnacl/__init__.py
-index 1aa722a..7649013 100644
---- a/libnacl/__init__.py
-+++ b/libnacl/__init__.py
-@@ -1180,7 +1180,7 @@ def crypto_kdf_derive_from_key(subkey_size, subkey_id, context, master_key):
-     '''
-     size = int(subkey_size)
-     buf = ctypes.create_string_buffer(size)
--    nacl.crypto_kdf_derive_from_key(buf, subkey_size, subkey_id, context, master_key)
-+    nacl.crypto_kdf_derive_from_key(buf, subkey_size, ctypes.c_ulonglong(subkey_id), context, master_key)
-     return buf.raw
- 
- # Key Exchange API
--- 
-2.31.1
-
diff --git a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild b/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
deleted file mode 100644
index e5cc5e684c1e..000000000000
--- a/dev-python/libnacl/libnacl-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-DESCRIPTION="Python ctypes wrapper for libsodium"
-HOMEPAGE="https://libnacl.readthedocs.org/"
-SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="dev-libs/libsodium"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libnacl-1.7.2-32bit.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p 'test_*.py' tests/ || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/libnacl/libnacl-1.8.0.ebuild b/dev-python/libnacl/libnacl-1.8.0.ebuild
new file mode 100644
index 000000000000..60d2cdba745a
--- /dev/null
+++ b/dev-python/libnacl/libnacl-1.8.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python ctypes wrapper for libsodium"
+HOMEPAGE="
+	https://libnacl.readthedocs.io/
+	https://github.com/saltstack/libnacl/
+	https://pypi.org/project/libnacl/
+"
+# forked because upstream didn't push the tag for almost a year now
+SRC_URI="
+	https://github.com/mgorny/libnacl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	dev-libs/libsodium
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -p 'test_*.py' tests/ ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 9f9dca8cc16d..59dc451909b1 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,5 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-python-0.21.0.gh.tar.gz 55774 BLAKE2B 3c584ff3b6c09bc768554a3a4f7ef28ecea0726f59206da8540f9c1b4db74ab1235695074dd6b95db74f174066bb856c9854026525da82e7763f341920f0bd53 SHA512 d5b7a1bf0dc736a6a38e2e609f0a213306de31d5ad84cfdcd96f9ff72a1c38f15bad3cf25a1cec6dca5a9f3b00a8509afff2b4ea5e4db80e218e3ae603d55856
+EBUILD libsass-0.21.0-r1.ebuild 1563 BLAKE2B b2b7fe434d2331513e329975d273b0c6df94af9319f6ab0ab6b9a371bd48769d34a0c16c37fb94389b424b4c8837caa8076eb1c5c833078560f67df392cb217c SHA512 c9b49058081f3822ebd208c22b3a510501074d762165cf986033c50b49ae2f0aab95190f4a12d766236d17b7cc599490345a193086a17e8b47e0e2aeb09d3af7
 EBUILD libsass-0.21.0.ebuild 1527 BLAKE2B 1524db6af9b9d8f38626da41ae7f0362bb91d8514f368d920c4bb3dc1467f0771fb27cc704ed8c2167f90e020ff58f72d78ada6a7468824f52f5c7f56771c372 SHA512 4162ec08c68a798d489ea436e4ddf317d7d6ba8e75f89aa7fdc672cc5a097b6e688392de3a7b633d60556f7f28e2f6f8ef6db95c951c3233ad65c416b70da8fd
-MISC metadata.xml 329 BLAKE2B 2a87d59708e093407a70f5d94e1dad9c2014c0f33898d87c1e6f67809193654438cb878934252a5c98d66bcdb827880b0dc822cd0eaf44cd64f722542d3a1e1d SHA512 e9632e6f0343901a94f6e7b032760b13f67f81bd2bad97a139957f34b4f0c01632e7d1b337361af41dcb732390e2a5a096183016127d1922f0dd957a23906059
+MISC metadata.xml 430 BLAKE2B 6d9f1d6a435110869d11d460136c6e1ede1119110111de1fd737caa92f52688a305645478542efc9a33f30f5534b55421ab63470db342a781b5f8f008048ba3f SHA512 b6dc1c8363dc915ad1ee1d6d1ec4f7599625648c0d75d4b159215069716a8e60f0efc72ad846cf59f7cf2736d083f4e37784c818d287b38e06b066b997c2f3ae
diff --git a/dev-python/libsass/libsass-0.21.0-r1.ebuild b/dev-python/libsass/libsass-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..e762d9eb658b
--- /dev/null
+++ b/dev-python/libsass/libsass-0.21.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 toolchain-funcs
+
+MY_P="libsass-python-${PV}"
+DESCRIPTION="A straightforward binding of libsass for Python"
+HOMEPAGE="https://github.com/sass/libsass-python/"
+SRC_URI="
+	https://github.com/sass/libsass-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libsass-3.6.5"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+
+# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
+# This avoids a file collision with dev-lang/sassc
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0_rename_sassc.patch )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	echo "${PV}" > .libsass-upstream-version || die
+	distutils-r1_src_prepare
+	export SYSTEM_SASS=1
+	# https://bugs.gentoo.org/730244
+	if tc-is-clang; then
+		sed -i -e 's/-std=gnu++0x//g' setup.py || die
+	fi
+}
+
+python_test() {
+	local deselect=(
+		# probably broken by removal of sassc
+		sasstests.py::SasscTestCase::test_sassc_stdout
+		# skip the pip tests because they need an internet connection
+		# not relevant for gentoo anyway
+		sasstests.py::DistutilsTestCase::test_build_sass
+		sasstests.py::DistutilsTestCase::test_output_style
+	)
+
+	epytest sasstests.py ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index b8e0062f34a2..0c2334d8a4a5 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">libsass</remote-id>
 	</upstream>
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 5ac5587e8ebd..e189e32d08b0 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,7 +1,5 @@
 DIST libtmux-v0.10.3.tar.gz 225258 BLAKE2B 40d591ee1f8a6068947b61416d6247b2475cc99031a67c167dc527631e50075f18c46fe6fc16193867d83a1a735b0a23fbfbc77f4539f788f05375f1f68b77d2 SHA512 2c8f28ce8c313404caffa42e5fd4a1dfa5d48bdc48203f8db595cb97b44886d63608771f23d62d76a56513b7e4578e48a31cacd224eca92425f110efd0a5db69
-DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
-DIST libtmux-v0.9.0.tar.gz 215649 BLAKE2B fdf6f424ce8eead5f0f19cb53bfd438e9cd7b5326e57e676281f74cedac6e1bcd7cded27e4ef226d2fc3bc09bbb57ff0e63aaa7d901ab910b6a890275c7fe63d SHA512 d47078300614b2a286eab6063c9492baa115787b917d2fb2e4188032ce580f495f0e7f4a14383407c61063a77d640092d117ba43974524f18da024dfc687c8a5
+DIST libtmux-v0.11.0.tar.gz 234278 BLAKE2B 4939d38894fd6a1492ff282c98243b2d5b3b6f787691031c74337629aed710d3caebeb3bfce571e8f38fe07ecc341b6b3f8aa0bc42979fa362f5f0679aabf21e SHA512 e09749ce4cf7cf7756e4e40e50c6eb0a00435f2b00c8436667b6b77a94078e9c380a811107f8129ea0d347355f3ce8bb213b8fb36de2becf3cf1a2dbebd97867
 EBUILD libtmux-0.10.3.ebuild 905 BLAKE2B 63b12c494a018b8ccbb0d25fe97a5c67c8ebc7b5df0cc9d92c254fa245409f4f08fb8d45875a3595b81faace65d3b37b40eaca939768f4910781625cb5ccc2e6 SHA512 ab794fc256e2a17ffbfd3e2fca12cf69f804cd1abee07ffeaab1dfbd80b189da8b3f8633dfa755d026d4c8b5ec5444aca9350ab33384d75e03d08d01a3cea198
-EBUILD libtmux-0.8.5.ebuild 824 BLAKE2B 566e684154bb0b634e4d4de4985e5db159b0829909a757b9dc7f7b65ac049f1571889abd67a9db31817cb276d83db527f8d736fbb020ea25c8fdf8b8365eb428 SHA512 16c659d73bfc74aac9671cc09700e207312a8f03ed12e90a3923cbc433224d834b153bf44faa8c66937034be08a412076440dabdce40f73ff5a7ff1c08dc775d
-EBUILD libtmux-0.9.0.ebuild 864 BLAKE2B d17a5d98c59580f729c47f8a22b8cf78d59d9b8cd225d9103e17cdcfb6fc601001574d1ceb0ac0b2777d73d15d3229a1bfa7300e6562d71baebba7f676e606a3 SHA512 09a750acf79824c427c558208e6ca0210e1c9a7ca34de3bffc3073974d17c28d24a50caf0c4a862e0f1c7408c0474aaf72f7186fdd7117f1253753f1d97a415e
+EBUILD libtmux-0.11.0.ebuild 893 BLAKE2B 78bc71ad81e503f26119b443e82d83b99c63d55cf07186f831cb881bce838b040158b438b94f59b833aa58e5e7eff143ef64ece236bfb7df87f71f14dc20b2ed SHA512 63c6488f01a2f4a8fec27b6ee383f5d1493ccbd7e54522a951f2d6613247009364194e381c9f0698337d7b19a20907191bce49eeae232bcd934d3a659a6f4152
 MISC metadata.xml 344 BLAKE2B 08a7a60065c53319e73c36fc0f43bd3a98e02970588c2a83de3a429c82d68950f37b151d66c6adbdfa16f638e80ea6e8221d927e02cc6180fa40a6b0952b9ec0 SHA512 2d73a227ab73d3fce031c68e8c7f700f29ffe2ad1b0efba89afa854737de70e91d4fc9efae6a87459e420703c893a90d97b537f745f43df1181ccf26430d0a95
diff --git a/dev-python/libtmux/libtmux-0.11.0.ebuild b/dev-python/libtmux/libtmux-0.11.0.ebuild
new file mode 100644
index 000000000000..4ec1b4d3e99f
--- /dev/null
+++ b/dev-python/libtmux/libtmux-0.11.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..11} pypy3 )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1
+
+DESCRIPTION="python api for tmux"
+HOMEPAGE="https://libtmux.git-pull.com/"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local issues="https://github.com/tmux-python/libtmux/issues/"
+	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
+	rm requirements/doc.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/libtmux/libtmux-0.8.5.ebuild b/dev-python/libtmux/libtmux-0.8.5.ebuild
deleted file mode 100644
index 3dc2f9cca237..000000000000
--- a/dev-python/libtmux/libtmux-0.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libtmux/libtmux-0.9.0.ebuild b/dev-python/libtmux/libtmux-0.9.0.ebuild
deleted file mode 100644
index b1ce5d801450..000000000000
--- a/dev-python/libtmux/libtmux-0.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="python api for tmux"
-HOMEPAGE="https://libtmux.git-pull.com/"
-SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=app-misc/tmux-3.0a"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
-	rm requirements/doc.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index a6c593aaf60c..4753cd4deff6 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -8,10 +8,16 @@ DIST libvirt-python-8.1.0.tar.gz 221567 BLAKE2B aaf296f60c991c2877a2bb4ed47f1f2c
 DIST libvirt-python-8.1.0.tar.gz.asc 833 BLAKE2B a4fb10816ee50c1979926db87fa85e838e6caf74d086b612f07fb37730003030c16ce9f538fa8765a705b9a51d398e0284410a53aed31ac3452af4a4e5aae30e SHA512 2ca4bf7393f60267e0d7d32dcc50219847a86dbde76e1a83a9723c07133ff90d930dde32f454631c474fd36ac3837ccf94629576ddfb93288dfdb2490ce20724
 DIST libvirt-python-8.2.0.tar.gz 223589 BLAKE2B 6c8d39e6af1167aa24a1c0710177188aa0a73e54d9dbd6015d6a3b60726b78c45442fc756e68c61d54352a5fa9466f538ff986712e775bc54d46c885bcbcc8da SHA512 8d3eceb36651dbb903f51ec198dcf6bcd4dc3d3b31ce6a41df10928bbbf43b32a2f80c006c1fb9fc3e1cf2d7ffed95efc1209e0d20018135fb32c50876987d58
 DIST libvirt-python-8.2.0.tar.gz.asc 833 BLAKE2B 262a8072b58b19f871a72ed81d8dcab907130ce6f25f6478c72e6f3e7d8d51226fda1844a37baf82667d2f35ef3e64e84e47de1d33217a356ea1d78fec6aa548 SHA512 11ea846816a3300940b9792a5a778c633bb2d9e0523f442588ae82f8fb46ecc0256267b2efece655331112e3912c9bfcf46247555e48d1861999d1363f6034b1
+DIST libvirt-python-8.3.0.tar.gz 231579 BLAKE2B 0bd169b66f490e100eab95f94f412d27836a302d57c4771a35154995122fa23a4b9f8c836b622bbb1d7790664ab5c8c25f7158b2c11dcbfcf48ebf6bb6dc32db SHA512 8b50e4142f14e60bc50065bb3708bb04deb3f72061b056492cca52b866bf86f0b7b47e2f8de39d4f8898cf860f7247d0cb243eb2ad6a9329b27fc890f727ebd8
+DIST libvirt-python-8.3.0.tar.gz.asc 833 BLAKE2B bb19bef914e39d04b6580dcce1813bc21c5213a2b4c88d44686eeecc9ffc9383db3bab62d46840138a9a9e80d6429662aec43d586dddc041bca4543ff49c465b SHA512 65d417a6849614f94a59dca94cb258b7de487fbc409cd2cfc8c3e9cbdc76ae83c6c2c40a0cf4c12877d2fa78bbcf371512ca6f71973466d2151be690a8b4422c
+DIST libvirt-python-8.4.0.tar.gz 231985 BLAKE2B 64d37074e04cdb02332987dc46e6dd7b38dbc8fa4de0e6e1cbde1caba370f5eed650c4a135f6101c355f189a91fbba82dcac3d50f8c0d0678ce4def448a4b168 SHA512 6c831ae45549ab0c4d720826e2f5cb219eaab0943b8c71fe70c02fd49097fb5565ee6f651b19e34f72d6b0133bf3b4bb8bfe56b37723b24eaf336f65ab0a5865
+DIST libvirt-python-8.4.0.tar.gz.asc 833 BLAKE2B fa6f5e10ca3e06c017e9988e676dd2beca2bcb88f4d55d7a1740d42b4ea56ff0cdb4fd7698392ce1eead7a81fafcc1475eb6270329f56e191a4a4551120e982b SHA512 855869856ff41338c4ed1b707db4a0ace97a60e51d19183a0c1f904695b8a367249ae6266a45d79449443325cc85485db89dc73b09ac318c206cc03ab36ef179
 EBUILD libvirt-python-7.10.0.ebuild 1206 BLAKE2B 3760bb8f2fc8f0a97e12f650674955db6a6281bb5530b2a9caa4aff864e4ccaab19d42a3bc3ced123cb8df70e0709a4ae351254ec0068246ed46706234c4a56c SHA512 937b9fa13db6ffe188c73271fdf8c0e0a8ec19dcb0debb1b1952b2189f03a35289e8542f3f42ccd1913a100ae8ef0bf10d47bfe82ad15b4a54d2f8161feb79b4
 EBUILD libvirt-python-7.7.0.ebuild 1204 BLAKE2B eb29010dcf2599840ad832c909cdceb84a28394454cef6ed237e8d15053f09c75cb823a8b9bb4e1a9c68ad95780402e8cfb0e3cadc2a1b7cca5b27d34e3c1a8b SHA512 011fe53e40d9e563269b8a141cf0f50f14030938b4b8a39aff69824275895f11182b1f10c6d49d18b1bcc62aa8249a3fabe0a6b75903fe8ea204187dc523de8a
 EBUILD libvirt-python-8.0.0.ebuild 1206 BLAKE2B d40e5ad4f0bc0b5d29f590713ad09d7657cc74c16588022a3294f9e0d73a6103ad3198ef5196f9c88ccfc91115b6740eb91e6ee13513e85ab076d980fa96ad76 SHA512 1f47d02f05b4303e6d17b70387178b30856c8e993d807a49083be35fc437f9c2ee67bb87aa71fec25d84009d79d366ed3b962a951ebb3efb0b08ab67ee2cdb43
 EBUILD libvirt-python-8.1.0.ebuild 1249 BLAKE2B a6ff9e65f24e40ca5ce1657c72f8537306e4b27fc8e8f1d2ed70f4217e6bdee1bbe64ca508cd3e083b8f5c320ee79e4d3313aa25169bc9eb291afeaffeb46262 SHA512 713ad435529d28998e564c0afab383fcfad61c8926239226b360ada632ddd35b89697a42ee2eec941799e5d7c0f72d1e06d9f2cb0ca80c82a5aedb02b1e337c4
 EBUILD libvirt-python-8.2.0.ebuild 1249 BLAKE2B 2b4e677abb22a6ca57c891521f656b35e665bd59544d8a9037e8022292cb363b3a18acc45fd6e7741cab637bc7e5972822587589a54b155deec24987d2378f44 SHA512 70e95c825302e5f1200f2f46fb93567e9a8d5978b9705595f0e94f851424245988afda510d86eda9e2d879fc3a843cdf26a9cd72ecba25f8777bdd24d0833161
-EBUILD libvirt-python-9999.ebuild 1251 BLAKE2B 94dadcd723e88005a2aeaf28671d66ccf267d64c4aac6cb60635600d2117bb3523d0278a0a4124b44e9cf7cefea34c41267ec2927c85578eece1154dda7cf860 SHA512 e6bb041858081043dee36f1c8267928ff413d09a72df14c23c9c21f1319907294de10559717fb0bbb4e1bacb4a5fd29b32bb38e70da7778f0035f866a2d953fb
+EBUILD libvirt-python-8.3.0.ebuild 1347 BLAKE2B 58de01db89da655531f6eba901f5494c9d4c2bfaf4b616fe8791494673ffb48a1fe255d5468ac669560d4ce2cee52361b871b77f28e0c1633a6812f29150b0f1 SHA512 cf42d828162d773a95e3c13157d54abf7f442b500159c0f6d35394d92c35b14f91b4c35384c663115678aa040301323314e36e22bcc9e3bd99741c78fa0a8d79
+EBUILD libvirt-python-8.4.0.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
+EBUILD libvirt-python-9999.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
 MISC metadata.xml 581 BLAKE2B b0ce75afc6b03055de71b4903b3d8ea2198790873051f4aaa5e15a2c3e77b50f320ec3d9fb7f379194889e771296f81c65f2826ca2283ba4d4a9a5ccc8af932f SHA512 a123b9833c1154c96842d234f5c8b729bd6be5a987a5d09035109261a27b0c6f2b26c3bed5865f4cc3b5b262e8a3d2c69908550fb804da15ea47d297ed9e39c8
diff --git a/dev-python/libvirt-python/libvirt-python-8.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.3.0.ebuild
new file mode 100644
index 000000000000..cd3ceb1cc71e
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-8.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.4.0.ebuild
new file mode 100644
index 000000000000..59818c6c51d9
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-8.4.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+MY_P="${P/_rc/-rc}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( sec-keys/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index d88122f6fa4f..59818c6c51d9 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# Please bump with app-emulation/libvirt!
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
 
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 MY_P="${P/_rc/-rc}"
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
 inherit distutils-r1 verify-sig
@@ -35,12 +40,11 @@ BDEPEND="
 	virtual/pkgconfig
 	test? (
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 	verify-sig? ( sec-keys/openpgp-keys-libvirt )
 "
 
-distutils_enable_tests setup.py
+distutils_enable_tests pytest
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 0695e3488fb5..0eb81aab947d 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,5 +1,3 @@
-DIST license-expression-21.6.14.gh.tar.gz 107788 BLAKE2B 18e123be256df2de289b00f292782fd5010333f692ba56caea448bf9a5102d2a11868a3c85787b5cd8129a9d3f9728e0776fa7658d00efe79c124a40f2263683 SHA512 12c4333a53f30c73f123434c9e50ee50163a3bad5831e756cc1350c14daa062b939e8382f4bcf2fef11020f8bec5185f71302f3c68ae88cd59b8da9a5f2964f4
 DIST license-expression-30.0.0.gh.tar.gz 153630 BLAKE2B 4231bf14e69705fbf40cc4af5f17a1070c780d595db5ab0098b318eeb7289740b86319c683e61aaf844a1cc5b8598d832f14e4eeac354aff37f7b82e5437df1d SHA512 ce6e3a48c1e035e98c3831180bdafb1d70afe94b1d0148c47941129a8223b8b39e11af9407b255ed7a3d1247873c18848f8236c0a805e9b2333c6d59506aad12
-EBUILD license-expression-21.6.14.ebuild 729 BLAKE2B 1e54003125c3a54db550699c29d3d6dff4e566a946d9c779d852b070c817b97b9a1647f35529528d447f39ef8c2025c62ce8af0b46673a536c8d827754e12b7d SHA512 8e88a52228dc5061be4bfbb91e23e90cc68ffd927af241b03a1781b50bdb83f6e399c51f75bec9a0b7a51e34437fe180d15fdc99e019ecd24bf968bffda66e22
-EBUILD license-expression-30.0.0.ebuild 728 BLAKE2B a0a1ea85d180a3c122f3d72c509927112681d5138a0cba9b8e756e49b0c0c7e25c2dbc6fe4cac4a29d351ecd19461922beb9d8a19edfd9a30a40c3f5b085c4fa SHA512 5d82bfd885310c656bee26de4435a6ddbe5cfaf7fde798565c652a1391d994cb57687c77c1d4d299fd7e71e4cc94bbad94ee180a4386c791c29082a7ed9d6bbc
+EBUILD license-expression-30.0.0.ebuild 736 BLAKE2B 6934b19bc7c9ed647ed3c5c79a47b5e0d57b86801e7f1e5acdd551d6fcc48d908c716177fb8e580024b1eebd34e99fc3e9e359876682f9d246be5630ac2c36fd SHA512 0268fec1067f44144c2b645c6faa968fbfc0d0c7cd47c3422b8d8fe9f322e0e0042e5bded79a4d0d963ded804c1e3a8e74470168cdab6ed4c56705b686e41105
 MISC metadata.xml 387 BLAKE2B 52d862f7ede77b8ab90dbd9ed2949f1c4a2b289458cff0f2e7042bf43be07b7d7e63ff94f0a10aa1db41027b3441be721656def8d59ba54155d3226e4bd30b57 SHA512 7ba89c3d94ef921fad190a85655d032a7e3a0c5794d0957c3a30ff73c75b717e87517f5f2547408426479d646ac3d157f7e659d66a18d4081689b6b41136b268
diff --git a/dev-python/license-expression/license-expression-21.6.14.ebuild b/dev-python/license-expression/license-expression-21.6.14.ebuild
deleted file mode 100644
index 96779c8f4a70..000000000000
--- a/dev-python/license-expression/license-expression-21.6.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Parse, compare, simplify and normalize license expressions"
-HOMEPAGE="
-	https://pypi.org/project/license-expression/
-	https://github.com/nexB/license-expression/
-"
-SRC_URI="
-	https://github.com/nexB/license-expression/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/boolean-py-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/license-expression/license-expression-30.0.0.ebuild b/dev-python/license-expression/license-expression-30.0.0.ebuild
index 5d75eaf15fe9..ecfd97d0a33e 100644
--- a/dev-python/license-expression/license-expression-30.0.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.0.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Parse, compare, simplify and normalize license expressions"
@@ -19,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 7c54761e0cef..e1830a29f962 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,9 +1,3 @@
-DIST line_profiler-3.3.1.gh.tar.gz 56700 BLAKE2B 030c0fc742a6773ebb55a54a3c21d3d5e5d6d5d258a2c3cd2071ff93917411b65e100bfc6549d9c60d9a7c361c53b291d8b81538acaf5b83665c04129d25bc02 SHA512 8a3704a6df2abe71283cb2da23b738932c6f4b42aedcdefda0d318fd4b894d56831a855c4be4430657308530a04d1e96b0e15a60edca06621bdd5370c0bf9911
-DIST line_profiler-3.4.0.gh.tar.gz 49076 BLAKE2B 1fa2d7462913b21b5c3d69be64492fd5002d10c6c454cb3129860e4156cf04fbbd839b140f229b586ff9f0b195baae435bc461c4bab1405c38da49bf348827c3 SHA512 79a6e71ec083aacbc95fab5e044a2a38119bced505e5b9720288e32103773dc64a8bbbf6c2c7913b7b5057420cb31c3943cc1dce2d7d029df82b6b59e451c357
-DIST line_profiler-3.5.0.gh.tar.gz 51142 BLAKE2B 1dade129a8913f6fe42fcd646c1f8850b5a948bad476755dd54bf04815e293508d77b9160157623a6060a864722c81466690722b79a603bba9b7651ba3e7e25d SHA512 4c797bb9990e77a5ef8cb38113fe28c4925a631ca8f034f33fe2aeeeb77bf9b24cfc1fb6217ddec07b767a2dec325f388e402ca38da43790f58c644a4a147a75
 DIST line_profiler-3.5.1.gh.tar.gz 51241 BLAKE2B a3f3cceab9d34062a0b96ce772941bb945f96f7e88f59bb72d08a09fb96db3d9354ce33b0c0088065df5aeb7349c7da37d8697654d9f5130d8bd0b7997306d13 SHA512 4618e57e52b7d7d5ece034735a4ce38dd3a8af57e5b897790be4c8e1ee1757d822d7c1bb76d3c7248432c49c13708bffb9bebbbbf61442de98c5a6ec657cbd57
-EBUILD line_profiler-3.3.1.ebuild 1072 BLAKE2B 6b412fbfd938cf1a646c17aed4cf97a308e8d5af97791ffed24ecdabb3b93e3fdf5f7da2b866cb2023dda6bfeddada7bbf79c9f7d408f5369f383b4924926f48 SHA512 12d0eb3477bd386b3394ad9acb65c5dd120fa67fc8928072aa5da84758a72dd4e11e2c7e3dd69873d6a45a2748709cadcd875c7b92747997d8ca18e7367b8a62
-EBUILD line_profiler-3.4.0.ebuild 1073 BLAKE2B 171915773afd9869541a1be2f2e32136d30012501fcc264ced89f882d4898e4d65f013277a75c409c42d469fba5e3e957dee496122fd7d6d72025355e729d6bf SHA512 f450adefc1c623201ee85cb3beac0a877cd1b30706dd829cf3b5452e5457a18e3fcf9bf1729d4ca7e3a9e7d516fd7bf4ba17cbe9b2f56448a4ec9a0da34ba0be
-EBUILD line_profiler-3.5.0.ebuild 1004 BLAKE2B 3ae5eb967e59fa65ad0b2d7e7c17f0d6a20f1e768d80eeeb817474e1d3f9095370fa8b48c78d1c05c8c195748d87202094c58eb805dc6bfdc10a4da384610d46 SHA512 bbc8f218be66e5c0d8dc7f206901892aa516d37fdf14b301c3b335d5ac0f3041eaa092642223b1b143544f4bb59aebcbf98a6515faa249023726734ed763585b
-EBUILD line_profiler-3.5.1.ebuild 1004 BLAKE2B 3ae5eb967e59fa65ad0b2d7e7c17f0d6a20f1e768d80eeeb817474e1d3f9095370fa8b48c78d1c05c8c195748d87202094c58eb805dc6bfdc10a4da384610d46 SHA512 bbc8f218be66e5c0d8dc7f206901892aa516d37fdf14b301c3b335d5ac0f3041eaa092642223b1b143544f4bb59aebcbf98a6515faa249023726734ed763585b
-MISC metadata.xml 775 BLAKE2B 6d817146b4f2379141f3def2ab8cb2d69f40e1e7645e714c09ad30a425d14c85c50749ffe2c4d6dec9bf146e294caaf8a1647d2a15d672667932ca7543d0df59 SHA512 745e91051af76df1a7344923dfdfad748fc11bf663c60f3c83a5d434ebfeb218ccc91a314244008bf6a39a4be77b3b3c5457739e1102ba188ddf7c8203b75695
+EBUILD line_profiler-3.5.1.ebuild 1045 BLAKE2B 717e12474d45a4fa76a7b0fc69306f10eb2875cbcbe4bd5454109bc8d8b2aaa3d9dd9ee91181b618433028b260addd3a36cead6f4309358c0ca3398694ba0bba SHA512 d7837c050e9100d104880f548382309988badeb9ec79cca03327840c0114f8ebf1ed2b2794f8d963863a22d4727c1cd0ad8419ab7a25c890cd4717ba47675bbc
+MISC metadata.xml 775 BLAKE2B de65859e8267b3385a49550fa47ee33d0f428e5833a59d8224aa4eb2b0251841c58acc1ca446ef1b13d258c5b861045f042f7ca13e8a27db7253f4202753c607 SHA512 22a65b06d81651455ecd9690bc5c6d4c87858bf912eb491dde16650a3692408ca95a1d42d82204e67509f4e685651b5b2b2537b5db0891b7ca6933bddd616d16
diff --git a/dev-python/line_profiler/line_profiler-3.3.1.ebuild b/dev-python/line_profiler/line_profiler-3.3.1.ebuild
deleted file mode 100644
index 5bbfce251694..000000000000
--- a/dev-python/line_profiler/line_profiler-3.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.4.0.ebuild b/dev-python/line_profiler/line_profiler-3.4.0.ebuild
deleted file mode 100644
index ec2f97295311..000000000000
--- a/dev-python/line_profiler/line_profiler-3.4.0.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/pyutils/line_profiler/"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
diff --git a/dev-python/line_profiler/line_profiler-3.5.0.ebuild b/dev-python/line_profiler/line_profiler-3.5.0.ebuild
deleted file mode 100644
index a631bb642adf..000000000000
--- a/dev-python/line_profiler/line_profiler-3.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-# force it to match scikit-build
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit cmake distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="
-	https://github.com/pyutils/line_profiler/
-"
-SRC_URI="
-	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-"
-# technically, the package claims to support non-scikit-build build
-# but it's clearly unmaintained and broken at the moment
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/ubelt[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	cmake_src_prepare
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cd tests || die
-	epytest
-}
diff --git a/dev-python/line_profiler/line_profiler-3.5.1.ebuild b/dev-python/line_profiler/line_profiler-3.5.1.ebuild
index a631bb642adf..d367af0ab0f5 100644
--- a/dev-python/line_profiler/line_profiler-3.5.1.ebuild
+++ b/dev-python/line_profiler/line_profiler-3.5.1.ebuild
@@ -13,6 +13,7 @@ inherit cmake distutils-r1
 DESCRIPTION="Line-by-line profiler"
 HOMEPAGE="
 	https://github.com/pyutils/line_profiler/
+	https://pypi.org/project/line-profiler/
 "
 SRC_URI="
 	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index b11f3065bf6c..1b582c391cb4 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -15,7 +15,7 @@
     modules, depending on what is available.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">line_profiler</remote-id>
+    <remote-id type="pypi">line-profiler</remote-id>
     <remote-id type="github">pyutils/line_profiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1b201b1134df..0c268c6d72b5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,10 +1,18 @@
+DIST llvm-project-14.0.5.src.tar.xz 105617748 BLAKE2B a68a6eb58302702f560d1204eb97d34b695eb5df417ccefb50117dbd641ba3c3dda9e64c04506e646dd40c1151eb60b12843e206996ef74b35b2841b8dabafda SHA512 db5a7ea1149988c2aab4ed634f14e00bb9a8042089350b811f875e295ced7b5add80a11b91cad80ba0ba9801261502644a720021506483c14dfb1bc24a7f54d5
+DIST llvm-project-14.0.5.src.tar.xz.sig 566 BLAKE2B ecf66df5d0acb382c9d441aee053404254fa4087d57130b04bb496af9cbb71c59e82f0938f44953d7fd777524781d13d1327b6c64065cf45b177bc3ea0e5c3f2 SHA512 a785e38f11863a46de8766ff4495a73173479cdbd95dc539804b0381a7a834a409713dbaf441272a9cc2963a3c7015c95dc6f0dcfa745e8d6047b1ad5feacff7
+DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
+DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.1.ebuild 919 BLAKE2B c579f3fca21b5f18b4a286c3ad73fc3120f3548c8bc3d0560a571d2537e7aed432a5590270e0756ad5be2a8c2a9ab076ddb1eb15111fb9dff39797c47090c645 SHA512 657aac1832e2d9082a79a8cc5aab2bf5ac7d2dc396682411f917edcb43ea1d80aacd1025b9878afed8a215017020cd0d0af15844f7a3fd7ee9a75b3e02cabeef
 EBUILD lit-14.0.3.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
+EBUILD lit-14.0.4.ebuild 916 BLAKE2B 27b024b5199193c6401411fe1b437678599a8f4b2870a0d2e25e2bd9936fb1907d94e99dc1c5329a483390808bdbc14fa62be432b4279caf08c5001fd2b6bd2e SHA512 001afdab1e0f3c3f52dbbe5f4204d92be4f09ad8fee4c4b727f9e2a198fb3e7265e3864e9defe9011ffaa79d28eac75e1ffc9f923a2b18e4e7796af798ec08d3
+EBUILD lit-14.0.5.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
+EBUILD lit-14.0.6.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 7637fa92b7d8e5b7c87bd1cc7e8941357b48064795ca297050fcbd83f0e2a9a2a36bc1916d2cff19e95fff353250c5cfc82d2eb052c36b8bb9cb9398df19e3c0 SHA512 d049fceece84c0a07332d664a7f9b98b3c5ef81e69f24394f3e81e733977b64a523eb9b15a149e82bacd54c9a262f988ea777ee7af7c3ad48007be62f529c103
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-14.0.4.ebuild b/dev-python/lit/lit-14.0.4.ebuild
new file mode 100644
index 000000000000..68e5e3f335a7
--- /dev/null
+++ b/dev-python/lit/lit-14.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-14.0.5.ebuild b/dev-python/lit/lit-14.0.5.ebuild
new file mode 100644
index 000000000000..638a94fc8e55
--- /dev/null
+++ b/dev-python/lit/lit-14.0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lit/lit-14.0.6.ebuild b/dev-python/lit/lit-14.0.6.ebuild
new file mode 100644
index 000000000000..638a94fc8e55
--- /dev/null
+++ b/dev-python/lit/lit-14.0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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
index 2d6ed8238f83..89c5065045ed 100644
--- a/dev-python/littleutils/Manifest
+++ b/dev-python/littleutils/Manifest
@@ -1,3 +1,3 @@
 DIST littleutils-0.2.2.tar.gz 6579 BLAKE2B 80aec2c133e39eb0e18c948b15d475e60842689fd0e758c43511a8b014648d7c9e843182e2a87c0b3f9933f748340f2059653f0885cf416edbc5a60457c70629 SHA512 ce0b3af4ef5db634ce0dbb916deb767260f66418abbdca2b289386ecd4c2e44602cb95d568c70588ef9a40e3d700f33cbc5bcdbf859f5030795f79f11871a6ff
-EBUILD littleutils-0.2.2.ebuild 539 BLAKE2B 71c9587ac82c2ba7ef89e1753371a302fe663a275078a95ce498c2808a22ccbd832884634a576c9185a95fbd71c9a3f3544afd6da17a9b6e70ba9dbf6f4dae09 SHA512 6d4876abb40f2534ab6615430d209eb821f871557d9b183985a6b051a95a9aaf767bf159ac1706b4384f8777259fb37ae96325d87be38540f9886de801ccb016
+EBUILD littleutils-0.2.2.ebuild 539 BLAKE2B 22a8c2b5c94e52cd72722403520a5cc240feb5c8ba94e2fc44001d10f3ec430ecaf846c65159b6eb8741b221805354fd15a73d722dbdc97580eb35f2d211cc9a SHA512 987023e6c9cf6c6191cc90a294652e77b46570079a62133e6120f5b7d3a1e38fe1d8f3c64460e68b0ac565f4aded7e75ffd3d2c1b52f5f6f197ee1502e828e84
 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
index 01803426c502..646fdf9b9636 100644
--- a/dev-python/littleutils/littleutils-0.2.2.ebuild
+++ b/dev-python/littleutils/littleutils-0.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 6070e1471e57..01f6a03e30a5 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,3 +1,3 @@
 DIST livereload-2.6.3.tar.gz 29407 BLAKE2B 39f030dbc21bec1b132fd9d43f9072f4c35d23ccdca56819e2c6b35277e9eac9caeeff7052fc766359e34bf415319f809ebd45927bd2cc223be7ac88594feef7 SHA512 ccccb17cb4d835eb9e812f8076f871164f6afb2fdc1aee9e35c5ef2d75be2c0403cee51d4eb30b029d7b35522f357ee8c3e9df926fd93511ba7d010ed2a69e8e
-EBUILD livereload-2.6.3.ebuild 1095 BLAKE2B ea3e231fe76a9f2f313429942d36c343c26b44f083f5eb97d60701dddfbb44631fc6d3ebde3e49f96db5c5d68a4ac798ded6c348a186c943cfc77ef1e8d3f47b SHA512 e22c57084fc1ea532e15c5a457d57b82ba79535871e56cb2bce091d2d0852adf6fab3687d8536d9620617e72376b3d251e898cb4c29cf0fd5fddb4eeff05c2c8
+EBUILD livereload-2.6.3.ebuild 1095 BLAKE2B fc1e8973bb081ca54c2811377b2bbfe26367b3bc66156ac961ac65d44d86da7d38ec19b72d71d2fef7055ebac7af9245d9f14f0fe954b2fa77ec229c3d9733f0 SHA512 d0762a0bdd81e9fb1a85a1de3e22e78b18c2a588849ca56ae9cdefa98128eab3e65b0799266331c67332ff0eae8a57a1eb84ace931f74566d0dcd0d9e37c72ae
 MISC metadata.xml 421 BLAKE2B 412b6e0e710670d2d047b99270127012c272790031b861561910f6d67934336c6062c48937ba43281eccc625b5a140b5e25bb257d1fa26e6e29ed1ee4479ea8d SHA512 38416e8bcf25d765ae36a6bcf060bddad507d72c88c15a3cf807dbec6bc49a5a33e6feba5e47615867a12e773315e16db8293a19992c711c8f89b1535ba9a1ff
diff --git a/dev-python/livereload/livereload-2.6.3.ebuild b/dev-python/livereload/livereload-2.6.3.ebuild
index 84dd00bc4ebd..276ed7291d94 100644
--- a/dev-python/livereload/livereload-2.6.3.ebuild
+++ b/dev-python/livereload/livereload-2.6.3.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index d224bacd671c..d6185f7e3dc2 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,4 +1,6 @@
 AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea733d07d879e6f58dd62003f30812cb4320e41484797cae4f113d271dc8c8625fe847270cae7e35085c2ae67a357 SHA512 f66c13ddee81acc63cb65c09f2836c9a2409f24bebc5b7e3b5fea3f7e626aa52e5d19798ef5ab281d0dd31c3efbc4378003bd93461cfda36fcc726fc871aadf4
 DIST llfuse-1.4.1.tar.gz 774540 BLAKE2B f135ff3cde6effe72f5adf1b9ed58566183775ad45acbd1906db1f5c60a38ab74f0c7b6cda949b3ff2c4b46f036c91e16f9231ede1c78359c87758e6abde9ea4 SHA512 e94045018e9d78b7b16355dd499a27694a77a70d61102d05938223b99686e4b9d90b5e14745d92a187ac8e34aa593a12d99bff1baccb19d4236d54eb66ec3e4f
+DIST llfuse-1.4.2.tar.gz 834763 BLAKE2B 60bdfdd4567de4aa6ab5ea6692f48e6d68572bc13976e30fa9850c96b8a2c8a77638d3750df549b827a2bba0cc2dfa2a3f2cac3c4729278515a2703ecde446a1 SHA512 6a368af9e49f8537bbea396dfcd9fc024f8b93b161d3c6167d13c4ffb0ab20b6c8393447e71b5c147c82d4d1ee590ae08c512c93ccb28df78a06ab6833ac3705
 EBUILD llfuse-1.4.1.ebuild 797 BLAKE2B de7cd0e6cd513c2b47eafca035da4dfa97b4ae3cc21bcafd4653476906878047ae7cc74898e102ee6343e14f03e6abccde0556343c72ac8752b0f41e5764d062 SHA512 9507cb950d0ab7746e5c45493700c1b3a8498bd7633628c30e31c1bf433a060ad332495820b9565011680921dd5ee794ca8d28787e52f4e23f0a5a3f56c50ad9
+EBUILD llfuse-1.4.2.ebuild 1071 BLAKE2B da4b8ba1730d7da7c9a89a6ed5ec97cda744c7ea29ab7f8bc600d70f8d2a50b456ce0d7281bce8ad6c77036ef1d72bf47c1e15bb958090aa98f70cdad95f5f6c SHA512 0527cf4495f72a57740522b503a4e48a9ac115a495f20b091f4d7fa4a168378f4dd60a86e6695ac9ac013942ece09870d1fed23e96020fc7c234796d2926ae3f
 MISC metadata.xml 377 BLAKE2B 8e7aa00ada5481ed2fc9fedf47334ec81ca26e7788ee5f7c6965151cf6f42e305c33d2b1f1a697094d11668ea5939de99e9ae00de7fbe95b75bbc9577adcff9b SHA512 70eaac052525ddf94287b100e7dc6d4429499d49b6aac109659757cf6ca41f6aac220a1b931e4fb196e322b259e9884b1ecf49947b48b1f76c8350434f811aa7
diff --git a/dev-python/llfuse/llfuse-1.4.2.ebuild b/dev-python/llfuse/llfuse-1.4.2.ebuild
new file mode 100644
index 000000000000..4abb93eee3b9
--- /dev/null
+++ b/dev-python/llfuse/llfuse-1.4.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the low-level FUSE API"
+HOMEPAGE="
+	https://github.com/python-llfuse/python-llfuse/
+	https://pypi.org/project/llfuse/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+	>=sys-fs/fuse-2.8.0:0
+"
+DEPEND="
+	${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# force regen
+	rm src/llfuse.c || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ! -f src/llfuse.c ]]; then
+		esetup.py build_cython
+	fi
+	distutils-r1_python_compile
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 52367b43fac8..79351b584595 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,3 +1,3 @@
 DIST lmdb-1.3.0.tar.gz 881422 BLAKE2B ad864956d44ec55e36a856125dd21b8e51af37a274f8b546edc68cd2025b19b97cb60f49f51558345b32922f7c968f442e15cdda84e9416280069adc7371a033 SHA512 31a821641e398087a9b8e76341d693c3be48089ffa5b5624043b276d5acb4d7fa25cbbd156dff39a82bf678402eb64d8ca922252a594ecc098946a67cc4d4cf1
-EBUILD lmdb-1.3.0.ebuild 857 BLAKE2B a93df5cfd5815655e90e790916925fa0396b0828c7a93bf5bf500f00cbedae289c1f2118ece5df15764be583430752e52ac418bb3a62dff0a7eeb62d643b8a87 SHA512 b0bbbe33d552461233079f9b61d18184fd1bdafa51d0fca68f2772c496c39f8f6de5d55eadc6539636af179ce431e1fcb7e82e0e60f3ce3dde5d48dc1cab679c
+EBUILD lmdb-1.3.0.ebuild 857 BLAKE2B 93fcce5d6829eea0c8a07ee40fe85b6a996fb3b5670feeac47e1d71f1fee8ecf409878a437ae7cee8c95f1d4874dee22c674e01116315407d0faa86cdff9196e SHA512 ce0c23ed59e7c595385be4b0de1008484205367f712735a80fadab0b12e08a2344ddc49ecfd2eb21bb5d5f6eff2d0ac044431c39d663d2eee12e10acd7b9dedf
 MISC metadata.xml 420 BLAKE2B c7f006e40fdf4c8c02e7fdd80aadbad12209b9539f73999c2edc7ec28abc7b31342df66b775fd413b8be6e6afb6980be1060db42a0497ae8710ab863da3f4e3f SHA512 e858fb0d95373a865da1f1367427f62fe91c4b0703dedcb7e114c4bf38437a9ea00f6593ffb7286df45836626d83b3e7d64e10df53f61820c4d52b37e51c45b9
diff --git a/dev-python/lmdb/lmdb-1.3.0.ebuild b/dev-python/lmdb/lmdb-1.3.0.ebuild
index 123fbcbe3355..531cacd55a1b 100644
--- a/dev-python/lmdb/lmdb-1.3.0.ebuild
+++ b/dev-python/lmdb/lmdb-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/locket/Manifest b/dev-python/locket/Manifest
index 0ad43d354908..5d6f4435389f 100644
--- a/dev-python/locket/Manifest
+++ b/dev-python/locket/Manifest
@@ -1,5 +1,3 @@
-DIST locket.py-0.2.1.gh.tar.gz 5988 BLAKE2B e50ef1794a49494434c730580510a4283685e924f6f3efb95067db7d566fa4808409fc339f3c8e3276ddf09f622cb165e9dde90094f764f662558ea32f85516e SHA512 517c580a3420283f945d28607fc765c571edb2c0fab52d5c76f24226d2ec85727d1ffe0c03c5f87f6ce6204e7db4d3c8f6e408d767a389bd93d34cc0de3e8bf7
 DIST locket.py-1.0.0.gh.tar.gz 6541 BLAKE2B 334314c6e9149b7c9d87474c478afe497fe976afdae9e7e885a9f1c5cb7190bbf44be132bb84de2a378bd011844a05b12ee3643aefa70ba04b8d6f645e1882e6 SHA512 7b8da1ba395613fb5913fc90db982a74c1355e5b98910b5fccdaf28a326f2465409751f2e4efaa86749961dc4e95959640067c76485477187a462f52d8497c9f
-EBUILD locket-0.2.1.ebuild 583 BLAKE2B d7007303160008f0c2ccfa55cda9cd752188685d8b9baa6b17746e771a5b2cefd20f8f1d2765ce64406f783fa128f3d61bc929f15118192286016a154234f7f2 SHA512 a1352c9d7fd79d84a9382d083e825b05cd394be1008c89be49bf6b38f5648be695e23322fbb876dcf592c4908866f9593efa87545ae6c83fa786169b0ff39e9e
-EBUILD locket-1.0.0.ebuild 660 BLAKE2B bce4dac0ade3f41fc2ad5f2908887e72b0ccc550a775643cc9cc3f2e356e4004d3123b56dff90f4c6f146de6a92d43689ff3e82f358f9e33b77f4ddc64774b12 SHA512 4348dc0359f52eb86e001df9147c36404e6402db37252d82beb39f865b96921c575e6b024f06425b8190d10114b20f76aeaeaecaa27b9ac938af8abe722f5f12
+EBUILD locket-1.0.0.ebuild 658 BLAKE2B 7dfce1406a90f759fcfe520864b1e6ef3910e316ee2f7a6eb98e8e17ebc91b66d7a9d44cc7aed85fc8f86cc829c2378bfeca0d6a12e0d1f6372f30c20a3ab66e SHA512 ba8a905d609cc57d670901426ed8c6f75ba87be9791335f73eb599e87f45abe597b544c77b96cae3b09a3b7aaed8422bbfa659be5d3effce46408677154088f2
 MISC metadata.xml 408 BLAKE2B 3336a065a48ac13afdd55512bc48a5303e2b5981683e266a7e1bd8225dd55d045b8f42b470344f5f762bcbdbd31f7685c34c9355231ed66f88d1e59101b34d54 SHA512 6fcdaa2acf461d0fa447b911405610b9ab8047996c79d132e445a984da7f462a1f43b81a18b781cf2c3302bea3ef088957a94cdf3459802c9922f9a6a96097e9
diff --git a/dev-python/locket/locket-0.2.1.ebuild b/dev-python/locket/locket-0.2.1.ebuild
deleted file mode 100644
index 6e5a28894792..000000000000
--- a/dev-python/locket/locket-0.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-
-MY_P=locket.py-${PV}
-DESCRIPTION="File-based locks for Python"
-HOMEPAGE="https://github.com/mwilliamson/locket.py"
-SRC_URI="
-	https://github.com/mwilliamson/locket.py/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? ( dev-python/spur[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests nose
diff --git a/dev-python/locket/locket-1.0.0.ebuild b/dev-python/locket/locket-1.0.0.ebuild
index d49c9df6effd..89a030b3840e 100644
--- a/dev-python/locket/locket-1.0.0.ebuild
+++ b/dev-python/locket/locket-1.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? ( dev-python/spur[${PYTHON_USEDEP}] )
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index d3ed00d96eea..829992484ddd 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,4 @@
+AUX lockfile-0.12.2-pytest.patch 741 BLAKE2B c27fcf7080c09556ab94831243a3301b10fd5ae26bc5b03351120642c610b12a8ab76f34bd9ed66a06139db21ec58e421a7e6c70bad219aa402f38eb7ac855eb SHA512 3ff3074c40935a6cb5e813cb29ef48656086d1396f21e55be1100f98da293d86256f4e9ce1b31c27000c82421f3d1dbf2699b7a830205de5b95683a2667a64b3
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 604 BLAKE2B 62be6c81752a789814ef9484d5366cfe6eb5aa2785b07b68262b63ffdadd96d0ac65309f8c5bdb6759dea8cf76d539a87b8f0c9370f529981e6baa721adb5cee SHA512 e82a2397cb8c51db5f52ed768f41299076a43bce83471278bc8e83a55b24411227f98efc3847010dfd0295dcf020bad2d42feb092fe1bbae8b1b10f842713f8a
+EBUILD lockfile-0.12.2-r3.ebuild 692 BLAKE2B 1384f4ab368d9a74e2ca505b43ef7b3811c72e9a3c60bccfcf0ff492744ab5e1386c7b91cd76b7e58b5b613d51277409224dbbc60742b44f1ebe2ffab53128ca SHA512 2bf0b1cc0e39bff93764847ee9741f086a79008264b0decaaf8b5eb6ea68212d2e78ae0735a4f4d0489a970e444a2cc9a67661d123df01b091dc8f338ef6198c
 MISC metadata.xml 389 BLAKE2B 00c71a4c10b51971e512ff1c19e18566370966282421bf8cf108c1950fb76c9e01a56b6ead6b5fe6102ca6375365a18466b4c887458914fecd7fa67b438d4d84 SHA512 2d558396239b2e3b9c4e79bbc89a6bd510554d76e875ba91b3a0192085b62974d278fcc6d16724d05e007e28931bef38b95246f80b74166ef151f50e62b6211f
diff --git a/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch b/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch
new file mode 100644
index 000000000000..47362a4de6a0
--- /dev/null
+++ b/dev-python/lockfile/files/lockfile-0.12.2-pytest.patch
@@ -0,0 +1,20 @@
+diff -dup -r lockfile-0.12.2/test/compliancetest.py lockfile-0.12.2.new/test/compliancetest.py
+--- lockfile-0.12.2/test/compliancetest.py	2015-11-25 19:29:13.000000000 +0100
++++ lockfile-0.12.2.new/test/compliancetest.py	2022-05-27 07:55:43.720523461 +0200
+@@ -6,15 +6,13 @@ import lockfile
+ 
+ 
+ class ComplianceTest(object):
+-    def __init__(self):
+-        self.saved_class = lockfile.LockFile
+-
+     def _testfile(self):
+         """Return platform-appropriate file.  Helper for tests."""
+         import tempfile
+         return os.path.join(tempfile.gettempdir(), 'trash-%s' % os.getpid())
+ 
+     def setup(self):
++        self.saved_class = lockfile.LockFile
+         lockfile.LockFile = self.class_to_test
+ 
+     def teardown(self):
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
deleted file mode 100644
index 1d9b54e15ac9..000000000000
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="Platform-independent file locking module"
-HOMEPAGE="https://launchpad.net/pylockfile https://pypi.org/project/lockfile/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-distutils_enable_sphinx doc/source --no-autodoc
diff --git a/dev-python/lockfile/lockfile-0.12.2-r3.ebuild b/dev-python/lockfile/lockfile-0.12.2-r3.ebuild
new file mode 100644
index 000000000000..23f6213dad63
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.12.2-r3.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="
+	https://launchpad.net/pylockfile/
+	https://pypi.org/project/lockfile/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	>dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source --no-autodoc
diff --git a/dev-python/loguru/Manifest b/dev-python/loguru/Manifest
index 2dade522e7e5..bbf59595cfa5 100644
--- a/dev-python/loguru/Manifest
+++ b/dev-python/loguru/Manifest
@@ -1,6 +1,4 @@
 AUX 0.6.0-typos.patch 2236 BLAKE2B 8eafa371eec73761664e8f92a6abbc6df011f4ab8a9afafddd19b804611936c95d2cc05af97f1e709dff62baedbc16f10ce7326fa3450e8ca45c0011ab2f0ed9 SHA512 0c5e6d225eabeda3b791679c426bf8393b034cce797462264d4d39ccbc630641db978f0cd8f7844b0fb5b983bc5be8a4c8174f9da703936f3d5b4f9b55911677
-DIST loguru-0.5.3.tar.gz 413858 BLAKE2B 995df880138e09ae80c33c1c96aea36acc635c8915687ca708b708eb4a92722908da4c5c4b03e8dd01ef1a3be560c072821405010f03e131781c4f3dbb7bd9cf SHA512 d26e9fcc79b6eb3437b53a03b8200679bdda8de2bced7710fb252ff3c19622fea48c20c8258a62bcd625bd18bfee080ed0a182876d91f34e1f2ef3524ac9bb46
 DIST loguru-0.6.0.tar.gz 417660 BLAKE2B a7b7d95ffcf652769503db3423768ff85a4fa4898f0e2b155d96ce0c42fa7f24255f9dc49ba62e8a4f19bb3b7cc8b374580fe0965c9683b14d9bcea9866e71a5 SHA512 6ca7087cde3b4ce11255e31af988e5e118a7ebfbb338b97ebd6e7e4af716f0301c0180a59b18c879fd799c25802b428411b868290b7593212f06d70bcbd6a9ca
-EBUILD loguru-0.5.3.ebuild 674 BLAKE2B a375e15b823e44f0d2dac5dcd46203455553b1d7371ebec26be7b713f3aea7f219a5aa4fb5cd75145d63f33e74c28a20ebb4adede239d787d0616b7ff350639a SHA512 2a681fbb7fbacef1e2c0d211c28ec1acc55f40de257d91ff0b441938c8a7e7ffd9d972afbab0ae601e329ebd7c9280b904313f2cc4e34ff96e7f7b7924225ec8
 EBUILD loguru-0.6.0.ebuild 719 BLAKE2B 0235615f5279b390fcd0c84f06b2f35178ad6c9e225abb3348112b96111c761da1bfc4b9b3dc6275c21f96dbe37aa7ae09b7d53579e1f3233f63906eddba8757 SHA512 48893e1cfe4632f75ae1175aa1e7be8fa5f73a96b5256000aa05cba16e505faf8d84d04daa2e257cf8a72fc288fd3a5e42ca07faea7335e815b3333d9b7cb52f
 MISC metadata.xml 684 BLAKE2B 983bdc7e62a6532def7c1f368fee4e9e6cac5357a5de859c181775b02d7e3fa2c0b035d7fb7eb4126cddcbab24d01d8721d89baaade8d328fb1b600c689695ec SHA512 bbd545f9f8d643ee8a402ef97178191c67aed817f765eb45e3cda90c6f765a4a32837098becfb9af6fa9d704107676d5b5f2ed7e00630ef0c98b2b1b689c6cc0
diff --git a/dev-python/loguru/loguru-0.5.3.ebuild b/dev-python/loguru/loguru-0.5.3.ebuild
deleted file mode 100644
index 6edc46844dde..000000000000
--- a/dev-python/loguru/loguru-0.5.3.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,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python logging made (stupidly) simple"
-HOMEPAGE="https://github.com/Delgan/loguru"
-SRC_URI="https://github.com/Delgan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="$(python_gen_cond_dep 'dev-python/aiocontextvars[${PYTHON_USEDEP}]' 'python3_6')"
-BDEPEND="test? ( >=dev-python/colorama-0.3.4[${PYTHON_USEDEP}] )"
-# filesystem buffering tests may fail
-# on tmpfs with 64k PAGESZ, but pass fine on ext4
-distutils_enable_tests pytest
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index c31a51deff9e..f61af536724c 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,3 @@
 DIST loky-3.1.0.tar.gz 139211 BLAKE2B 32e95312c40d6f8d8f9fc8daf5a1e85f1b874cbb902a4885621983d84a5fa9da42f05ff7d5d6bf58cf04a320c04c6e698ff0105cdad9ddd3248a109cc71c9883 SHA512 8bf6b032bb4f770d89c8de93d95c5805fa90dae34f2754f14c3a9fe7860230e8ce8ea97e1b09fa2cdf67f8aecdbd6d1e47ae4fb746fb1c6912d2dd65033f5b6f
-EBUILD loky-3.1.0.ebuild 1033 BLAKE2B f79794b101f8d44370fb2737704cc0a5a1c041609511ae00377d211f2d47f2fbc08095d63977a953ad196e49ee95c34b580660b8ba2beea102724f0e82968ec9 SHA512 c25fef6ea4878ebaf8143f02136d6ceb642993947af976e465d23355e60fbad088dd3e5fe2773f4326d85097b9bf04264da7a2fccee17388338f7d0e446ff132
+EBUILD loky-3.1.0.ebuild 1033 BLAKE2B 0cbbad49c4feb2fbcf690f111c59b07e9c99c6fe98c0b724c9250b7f4b5f9e0d8355a4898f881a43fe2ac86578f20c30217294a2d8b1e756b91dd10d9c6bcc9c SHA512 7538dac834d8eb1bb09370fe7e159ac4ba1dbf4cbe2232c5feeb730ea380914f55e6a5062372325a19cd98135629c6990d23dc0910a88a184cd09e9e0c3af71b
 MISC metadata.xml 383 BLAKE2B 9d990e2f5b4fbf959925d9d7c1f03ecb3acddcc8564c9362f14741d531d79f3e4c6d98a8c84695d8b1f761fa11a80e768b8e8b48ff8be314732d7f574d767223 SHA512 89d9a1f5c253bf99992d16b974d81175d1ae0d17649ffe1a485430735bec38f45e8e1a35c9ba2d99cb1610db3b200adb5af847b2a161c348e29f0cfa89f8076f
diff --git a/dev-python/loky/loky-3.1.0.ebuild b/dev-python/loky/loky-3.1.0.ebuild
index 5444599a1da2..7d1bdf178dce 100644
--- a/dev-python/loky/loky-3.1.0.ebuild
+++ b/dev-python/loky/loky-3.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 9723c34a925a..3e36c0f933af 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,6 @@
 AUX lxml-4.6.0-tests-pypy.patch 18051 BLAKE2B 99d97fa2e874c9bec4a866c3303b54ea2ab1e6abddf148d142cb66ee035b1eab1e05eed924d34451c5db38dc37f77104539cbfc2fe45815c17445b6359dcb857 SHA512 f6c6c2b00a49e6ca19d8b9123c364003a682c2e8df0c42d8600085d1cb094ba5cedd162bfc794e7d9acfff93aac771953dca5a879c3b957af1e2e8bd1db05515
 DIST lxml-4.8.0.tar.gz 959376 BLAKE2B a40be5e058153e1dc3f8501b645b0211f4498928ed71b161df54a67501356e9968064401b6d17e17dc8d62223b29e794eaa2bee7ff78ffee203d9f9a22f3e1c2 SHA512 bbcd8ea001cfa2820dcac4e00de6ded81700b2f0bd4a58bcdd4da05a19a107f57cd56280c4838fe19ee7ecd6be105878bf8c2f1c0e5111899c4ad1a2ba03537f
+DIST lxml-4.9.0.gh.tar.gz 960537 BLAKE2B c1ffa82f74ae1876c39d94fe248ab0278d30b805081fef92b9cc9ccf28dc10d239a3ee1861a5603deda1f1ae2c4eb288a66019281010459f6320b1000bea1955 SHA512 fb88b2e9d92972de69c1f8b54529ea00364b8b72475a2a88c9c509e4fb8cfbf0ced1bc093f96ae60c1d275ee9a8e5a5d2f51472ecce3d706a1cb1299789f9495
 EBUILD lxml-4.8.0-r1.ebuild 2779 BLAKE2B 53bcfb8ec92a529731f799df34db14fd6325713ed0c5a9344a279e50a9d60a8637f69177b17475389f04f351f9c7a82b0315735ca416a528420b9c8309529e09 SHA512 a376d6a2db158925d818b8360ebfdcaef5b59bb02e8fdedffad59043a7dbb4c8bbd747892e744ace4366101fb164afac194cb3d892bf432a4dff244e6d102a68
+EBUILD lxml-4.9.0-r1.ebuild 2829 BLAKE2B c4f82273f321415e367c98bad500c13a183e8bc7e2d99e55be01b994f10830a02ea8d872d2742b0316d9a8e065f9414615c1e2880f03b72508aba566bf1b5786 SHA512 51a5f9cfeb62a6e6d0ba09357e2f118f0e39a411ec6bfc1ea69dcfb67a8c5837aee0a4b69b5e5d7984ab4bf2ebdfa689ec65516c12a82533cbf358aaa0d1a923
 MISC metadata.xml 410 BLAKE2B 3e45012300d43f9a7169f47a5778a7e6eb87511166f8769bdeb3397672747924f64fbcb64ef532df6665acd139311fb265f050ae44e51eda53716aa126d28cf1 SHA512 c84744f005bfdc76280d50aca4903fe8c2584bb272dbb56c588722e55a765f5f8b232ed634a6553c82de959909e809773a9f1d992a5f7f54fe5b21ead1f2934d
diff --git a/dev-python/lxml/lxml-4.9.0-r1.ebuild b/dev-python/lxml/lxml-4.9.0-r1.ebuild
new file mode 100644
index 000000000000..230896cacca2
--- /dev/null
+++ b/dev-python/lxml/lxml-4.9.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} 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 -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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.
+DEPEND="
+	>=dev-libs/libxml2-2.9.12-r2
+	>=dev-libs/libxslt-1.1.28"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+	>=dev-python/cython-0.29.29[${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}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_check_deps() {
+	use doc || return 0
+	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pygments[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+	has_version -b "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() {
+	local dir=${BUILD_DIR}/test$(python_get_sitedir)/lxml
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	cp -al "${BUILD_DIR}"/{install,test} || die
+	cp -al src/lxml/tests "${dir}/" || die
+	cp -al src/lxml/html/tests "${dir}/html/" || die
+	ln -rs "${S}"/doc "${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/lz4/Manifest b/dev-python/lz4/Manifest
index 993599b0f02c..339484b2d922 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -1,3 +1,3 @@
-DIST lz4-4.0.0.tar.gz 163729 BLAKE2B ce617f2aea3f45cf9fb0bf642599a1d872d9532ab465d32602b63987081a7e78ab4ac4373a41c6a97ec50eb6f2debc078288554966390651325ba166faa79c0d SHA512 885d215dd4caadc84d1e2a9575be9972a33a43af089f0788192c9f4f53382c0937f9d67aac412e2860c9ba393ee3bb15dfe273865acb6a3cf8aecdce8292ecc9
-EBUILD lz4-4.0.0.ebuild 838 BLAKE2B 07baa1b0680bee036885ec11c7316ce7556a0e90e88ea1fd5542d2f908e151c8f87b74c8596ef5f14739f76e1cbbf6e40e827d2b1ce42dd3cff0b4f46760fc99 SHA512 5f54a5694057fa88202b67f193703ff37bce72b335d3b02eb11d2e694d0696caa3335880087b1fcd10c8d25dea3f5485aa285dd23a69f200a83982aef108b35d
+DIST lz4-4.0.1.tar.gz 164309 BLAKE2B 6338c2d74dedf1dc92f455378ef87c691291fdd16faebff8992aa927bf95c707b346af6bb35c512d8095b60a1878615d1081ba64f99c083e580eeacfb5cf11a5 SHA512 caa08a8a531ca2887ce7e596b7a3d9d8f8f2b93c6ea48c3fb0f8bbe6e6f2a18fb6b3c055e57841f8ce74f70367738a28dbb5fb1f07cbf785434642e6034b558e
+EBUILD lz4-4.0.1.ebuild 845 BLAKE2B 29d2fb2769362cfabf157882f7c75e790f0ad390a9d1b6c1d51ea7e6421aebe73419a366bc20f717e364d86e4c0854029c31c619e3947f8afcee673c78e9df9c SHA512 e5574d41eae03b184952862dff8cc36b14684358b5ce4a6d30c45449ddd6e499f45e536625b1f04c5ea105b522df87187c37132e29e3561f32fbe2e7330f2a60
 MISC metadata.xml 454 BLAKE2B b02d4acc9eb7d4fb35bf36371cb660d099c77f807fc08fc351b7e0e1d2e0199fdab82d83bb6bc31a56bfdb9a5b020b2f57aa9b89b59a7e5c22fcce554b6b0859 SHA512 a1b61eb4d3ce636b10abcff25ee3315bf5ecb3bdee58e1c45ff99f0b40717b13e3a8ec33c9abcb926bd716990a31749b1bf6729d8137b7859857318c386a8ec7
diff --git a/dev-python/lz4/lz4-4.0.0.ebuild b/dev-python/lz4/lz4-4.0.0.ebuild
deleted file mode 100644
index 601952c145b8..000000000000
--- a/dev-python/lz4/lz4-4.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="LZ4 Bindings for Python"
-HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="app-arch/lz4:="
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# lz4.stream is not officially supported and not installed by default
-	# (we do not support installing it at the moment)
-	tests/stream
-)
diff --git a/dev-python/lz4/lz4-4.0.1.ebuild b/dev-python/lz4/lz4-4.0.1.ebuild
new file mode 100644
index 000000000000..10c11eec6203
--- /dev/null
+++ b/dev-python/lz4/lz4-4.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="LZ4 Bindings for Python"
+HOMEPAGE="https://pypi.org/project/lz4/ https://github.com/python-lz4/python-lz4"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	app-arch/lz4:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# lz4.stream is not officially supported and not installed by default
+	# (we do not support installing it at the moment)
+	tests/stream
+)
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 41806a20073e..1b35d2d31382 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,3 +1,3 @@
 DIST M2Crypto-0.38.0.tar.gz 1241269 BLAKE2B 95433090e08ff72cd2b0779491dc38b89eca159b26812e763b5b8973e3d27249a96d5a2c983b59f414184f64beb8e455dc26979310378db89dd2081741d4d17d SHA512 b1e24e3101ce0dd9f17be4cabeddc2ec0f1228b270d74ef2fb38bae8807c5025b031d0743185f06370786a3dd5c3f42129720534dcff07ea4de3c727613f8d20
-EBUILD m2crypto-0.38.0.ebuild 1787 BLAKE2B d223f6bce5c42fe5d06a5bc33694e5f749f8e584c76b99ed8a82bb36d6e0b794c9a98e5125c8ce8a4f624fe982d0c91cb086c1b9e7e0098e3ba921bacad1b55f SHA512 da038b568ca61c33272c7247932a1dd3c8dfd9ec988fdcf0a60bb295a1515f2a96d7b3d6cbc18320c1422a31aed19baf5a014393fc4cc4e0580b2bb1fbd9f3d6
+EBUILD m2crypto-0.38.0.ebuild 1787 BLAKE2B af9a3e233f1c60b7d6a6d1648f45717598e04a463fb784a393de3d38acc006eba9e5b701e422d6b2118a1b381d387211a9ddaee09f6a887d5e01b77d61136338 SHA512 9227bcb0126a79d1880aac55ad81ed551a5ba2bf4f0ceb4e25422028db08bbe292c42dbe5e7c4464d0382bb804dff3856399c845344b2dee25d9d0ff80a18599
 MISC metadata.xml 381 BLAKE2B 9581f2ef53dd3b8bfff3724e91e36733892f9c4331376861ec25cee892d63f69f4f1846e46c40bc5a5045963d91aadcc2cdf70b574bf519557afe72cffab256b SHA512 95cfd7f65c912a520f371f236a49f41b711101f5997b14fa81f027cbcabe4bf6361d1a6f647d0de6e6b7756a2c662f2336c6dea5779d00372aa5b05f0566663d
diff --git a/dev-python/m2crypto/m2crypto-0.38.0.ebuild b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
index b0c9ae49d745..c53d59ced1a0 100644
--- a/dev-python/m2crypto/m2crypto-0.38.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.38.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
deleted file mode 100644
index 741ca2c88895..000000000000
--- a/dev-python/m2r/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX m2r-0.2.1-tests-network.patch 1019 BLAKE2B ef091cd10f528e2f592490749517d88c9e7375bba7d37fa9415ec30a6ae33e4163388823b3cf810fadb3578f6ecda564157360bf6d7e96b7e549472de0ac62f4 SHA512 fce454ce19d6a97d03fc8c5ecce235665bf5bf165a87dbc02389d2a899ea758aa710d47c9dfe405238953fa27eafb5c2da016dfa36e989d562db8382f43263d4
-AUX m2r-0.2.1-tests.patch 2190 BLAKE2B 8e98fff491b0b18800386e42d05959b89f4312c28b2b4193eb41e73d2d7b30e9ef92ed9cb25ddee522534b5830cc870762b4fab9bcd2f957c2538054957465cf SHA512 54cbe2539d3a7c774fb71ae3c36eddabe41b341be185a11478a0dd5bb94b23d35c690a0bbc9b7517ef5d4cc4af56d695bc40cc7c313fad6cf871f667229c5697
-AUX m2r-0.2.1-upstream-fix.patch 641 BLAKE2B 4d75137a8bc0e5ba9363d72b611b83933c714b62265198e6c2183e5c74de1297bc090f110641cb58734b3b1ba7520687efb01d440704fc5acd24a45797263900 SHA512 9722565d577329f1afac4331bbc2114f562f208f2b36472d9b9bf9d83274731c8efdd466a3e2a8a87a61ffa781b5bdeda7d4144f37323eed8c8413582963729f
-AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab45d4b86adbe4306d39a705509f7c4597d9f0ef37cd61af035d59871e04596f6cbdc10c5 SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99
-AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
-AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
-DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1585 BLAKE2B df95e2457f9ae097bd580fb8bcc13dcacb6392a77d18c5522f1207a92284b5f2740a3958db7c31ca8ea4b85905cf5b6bd7a1d98b94ced1ea99677b05ad97aafc SHA512 91d1f777e54fbdc0235d6456803f5f90a060507618298401b64363e80dde32cd0ec844b8b0d0c223e2bedc83cd4ceff664869756768ef7defff323f827a8e015
-MISC metadata.xml 485 BLAKE2B f68c3b410c1f07f3f844a95c2e7b749f124a8ace55a492ac7536b3a62753aef023e591030e0c6913d6a9e8d2685c304d5541d041602e4be36dc12d716c51d97d SHA512 1ea5e8481e9a089dcb8b907f72a9c3810d509ed671fd2ec746543b913e4a8b85c1ec75a5d6ee1b69919fcb575eb133e1d4a1d21a3a06e597bd63a969690365c9
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch b/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
deleted file mode 100644
index 74f3a0ca7a6a..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests-network.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/tests/test_cli.py b/tests/test_cli.py
-index e53e209..4dff652 100644
---- a/tests/test_cli.py
-+++ b/tests/test_cli.py
-@@ -5,6 +5,7 @@ from __future__ import print_function, unicode_literals
- 
- import sys
- import os
-+import unittest
- from os import path
- from copy import copy
- from unittest import TestCase
-@@ -127,6 +128,7 @@ class TestConvert(TestCase):
-         self.assertIn('__content__', m.call_args[0][0])
-         self.assertNotIn('**content**', m.call_args[0][0])
- 
-+    @unittest.skip("needs internet access")
-     def test_anonymous_reference_option(self):
-         sys.argv = [
-             sys.argv[0], '--anonymous-references', '--dry-run', test_md]
-@@ -135,6 +137,7 @@ class TestConvert(TestCase):
-         self.assertIn("`A link to GitHub <http://github.com/>`__",
-                       m.call_args[0][0])
- 
-+    @unittest.skip("test seems to be broken")
-     def test_disable_inline_math(self):
-         sys.argv = [
-             sys.argv[0], '--disable-inline-math', '--dry-run', test_md]
diff --git a/dev-python/m2r/files/m2r-0.2.1-tests.patch b/dev-python/m2r/files/m2r-0.2.1-tests.patch
deleted file mode 100644
index 9c70bbc5b49d..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-tests.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 77968c4574cb121737a2017b936870603664be39 Mon Sep 17 00:00:00 2001
-From: miyakogi <miyako.dev@gmail.com>
-Date: Tue, 4 Jun 2019 19:13:26 +0900
-Subject: [PATCH] Fix test
-
----
- tests/test_renderer.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tests/test_renderer.py b/tests/test_renderer.py
-index 5c6f915..4c7ebba 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -43,6 +43,7 @@ def check_rst(self, rst):
- class TestBasic(RendererTestBase):
-     def test_fail_rst(self):
-         with self.assertRaises(AssertionError):
-+            # This check should be failed and report warning
-             self.check_rst('```')
- 
-     def test_simple_paragraph(self):
-@@ -709,7 +710,6 @@ def test_footnote(self):
-             '',
-             '.. [#a] note rst',  # one empty line inserted...
-             '',
--            '',
-             '.. [#fn-1] note 1',
-             '.. [#fn-2] note 2',
-             '.. [#fn-ref] note ref',
-@@ -719,22 +719,22 @@ def test_footnote(self):
-     def test_sphinx_ref(self):
-         src = 'This is a sphinx [ref]_ global ref.\n\n.. [ref] ref text'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + src + '\n')
-+        self.assertEqual(out, '\n' + src)
- 
- 
- class TestDirective(RendererTestBase):
-     def test_comment_oneline(self):
-         src = '.. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n.. a\n')
-+        self.assertEqual(out, '\n.. a')
- 
-     def test_comment_indented(self):
-         src = '    .. a'
-         out = self.conv(src)
--        self.assertEqual(out, '\n    .. a\n')
-+        self.assertEqual(out, '\n    .. a')
- 
-     def test_comment_newline(self):
--        src = '..\n\n   comment\nnewline'
-+        src = '..\n\n   comment\n\nnewline'
-         out = self.conv(src)
-         self.assertEqual(out, '\n..\n\n   comment\n\nnewline\n')
- 
-@@ -748,7 +748,7 @@ def test_comment_multiline(self):
-             '\n\n')
-         src = comment + '`eoc`'
-         out = self.conv(src)
--        self.assertEqual(out, '\n' + comment + '\n``eoc``\n')
-+        self.assertEqual(out, '\n' + comment + '``eoc``\n')
- 
- 
- class TestRestCode(RendererTestBase):
diff --git a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch b/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
deleted file mode 100644
index 7060c33e78dd..000000000000
--- a/dev-python/m2r/files/m2r-0.2.1-upstream-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c78db2aa91787df6973ad6400208707c7ecf4b12 Mon Sep 17 00:00:00 2001
-From: "Ethan \"Soron\" Kaminski" <ethan.kaminski@gmail.com>
-Date: Thu, 25 Apr 2019 12:56:14 +0800
-Subject: [PATCH] Remove a trailing newline after `.rst` directives (fix issue
- #35)
-
----
- m2r.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m2r.py b/m2r.py
-index 897338d..74c8c98 100644
---- a/m2r.py
-+++ b/m2r.py
-@@ -507,7 +507,7 @@ def eol_literal_marker(self, marker):
-         return marker
- 
-     def directive(self, text):
--        return '\n' + text + '\n'
-+        return '\n' + text
- 
-     def rest_code_block(self):
-         return '\n\n'
diff --git a/dev-python/m2r/files/m2r.1 b/dev-python/m2r/files/m2r.1
deleted file mode 100644
index 1a6c10b48a90..000000000000
--- a/dev-python/m2r/files/m2r.1
+++ /dev/null
@@ -1,515 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH "M2R" "1" "Mar 30, 2017" "0.1.5" "M2R"
-.SH NAME
-m2r \- M2R Documentation
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\n[an-margin]
-level \\n[rst2man-indent-level]
-level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
--
-\\n[rst2man-indent0]
-\\n[rst2man-indent1]
-\\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\n[an-margin]
-.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
-.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
-..
-\fI\%PyPI\fP\fI\%PyPI version\fP\fI\%Build Status\fP\fI\%codecov\fP
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.sp
-M2R converts a markdown file including reST markups to a valid reST format.
-.SH WHY ANOTHER CONVERTER?
-.sp
-I wanted to write sphinx document in markdown, since it\(aqs widely used now and
-easy to write code blocks and lists. However, converters using pandoc or
-recommonmark do not support many reST markups and sphinx extensions. For
-example, reST\(aqs reference link like \fBsee \(garef\(ga_\fP (this is very convenient in
-long document in which same link appears multiple times) will be converted to
-a code block in HTML like \fBsee <code>ref</code>_\fP, which is not expected.
-.SH FEATURES
-.INDENT 0.0
-.IP \(bu 2
-Basic markdown and some extensions (see below)
-.INDENT 2.0
-.IP \(bu 2
-inline/block\-level raw html
-.IP \(bu 2
-fenced\-code block
-.IP \(bu 2
-tables
-.IP \(bu 2
-footnotes (\fB[^1]\fP)
-.UNINDENT
-.IP \(bu 2
-Inline\- and Block\-level reST markups
-.INDENT 2.0
-.IP \(bu 2
-single\- and multi\-line directives (\fB\&.. directive::\fP)
-.IP \(bu 2
-inline\-roles (\fB:code:\(gaprint(1)\(ga ...\fP)
-.IP \(bu 2
-ref\-link (\fBsee \(garef\(ga_\fP)
-.IP \(bu 2
-footnotes (\fB[#fn]_\fP)
-.IP \(bu 2
-math extension inspired by \fI\%recommonmark\fP
-.UNINDENT
-.IP \(bu 2
-Sphinx extension
-.INDENT 2.0
-.IP \(bu 2
-add markdown support for sphinx
-.IP \(bu 2
-\fBmdinclude\fP directive to include markdown from md or reST files
-.UNINDENT
-.UNINDENT
-.SH INSTALLATION
-.sp
-Python 2.7 or Python 3.3+ is required.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install m2r
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SH USAGE
-.SS Command Line
-.sp
-\fBm2r\fP command converts markdown file to reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-m2r your_document.md [your_document2.md ...]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Then you will find \fByour_document.rst\fP in the same directory.
-.SS Programmatic Use
-.sp
-Instantiate \fBM2R\fP class and call with markdown text. Then it will return converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import M2R
-m2r = M2R()
-rest = m2r(\(aq# Title\en\enSentence.\(aq)
-print(rest)
-# Title
-# =====
-#
-# Sentence.
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Or, use \fBparse_from_file\fP function to load markdown file and obtain converted text.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-from m2r import parse_from_file
-output = parse_from_file(\(aqmarkdown_file.md\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-This is an example of setup.py to write README in markdown, and publish it to PyPI as reST format.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), \(aqREADME.md\(aq)
-try:
-    from m2r import parse_from_file
-    readme = parse_from_file(readme_file)
-except ImportError:
-    # m2r may not be installed in user environment
-    with open(readme_file) as f:
-        readme = f.read()
-setup(
-    ...,
-    long_description=readme,
-    ...,
-)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Sphinx Integration
-.sp
-In your conf.py, add the following lines.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-extensions = [
-    ...,
-    \(aqm2r\(aq,
-]
-
-# source_suffix = \(aq.rst\(aq
-source_suffix = [\(aq.rst\(aq, \(aq.md\(aq]
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Write index.md and run \fBmake html\fP\&.
-.sp
-When \fBm2r\fP extension is enabled on sphinx and \fB\&.md\fP file is loaded, m2r
-converts to reST and pass to sphinx, not making new \fB\&.rst\fP file.
-.SS mdinclude directive
-.sp
-Like \fB\&.. include:: file\fP directive, \fB\&.. mdinclude:: file\fP directive inserts
-markdown file at the line.
-.sp
-Note: do not use \fB\&.. include:: file\fP directive to include markdown file even if
-in the markdown file, please use \fB\&.. mdinclude:: file\fP instead.
-.SH RESTRICTIONS
-.INDENT 0.0
-.IP \(bu 2
-In the reST\(aqs directives, markdown is not available. Please write in reST.
-.IP \(bu 2
-Column alignment of tables is not supported. (reST does not support this feature)
-.IP \(bu 2
-Heading with overline\-and\-underline is not supported.
-.INDENT 2.0
-.IP \(bu 2
-Heading with underline is OK
-.UNINDENT
-.UNINDENT
-.sp
-If you find any bug or unexpected behaviour, please report it to
-\fI\%Issues\fP\&.
-.SH EXAMPLE
-.sp
-See \fI\%example document\fP and \fI\%its
-source code\fP\&.
-.sp
-I\(aqm using m2r for writing user guide of \fI\%WDOM\fP\&.
-So you can see it as another example. Its \fI\%HTML is
-here\fP, and \fI\%its
-source code is here\fP\&.
-.SH ACKNOWLEDGEMENT
-.sp
-m2r is written as an extension of
-\fI\%mistune\fP, which is highly extensible
-pure\-python markdown parser.
-Without the mistune, I couldn\(aqt write this. Thank you!
-.SH LICENCE
-.sp
-\fI\%MIT\fP
-.SH CONTENTS
-.SS Example
-.sp
-This page is written in mixed markdown and reST.
-Source code is \fI\%here\fP\&.
-.SS Basic Markups (inline)
-.sp
-A \fBstrong\fP, \fIemphasis\fP, , \fBcode with single\-backtick\fP,
-\fBcode with two\-backticks\fP, ,
-\fBreST\(aqs code role\fP, and delete.
-.SS Link
-.sp
-Auto link to \fI\%http://example.com/\fP\&.
-.sp
-Link to \fI\%example.com\fP in markdown.
-.sp
-Link to \fI\%example.com\fP in reST.
-.sp
-Link to \fI\%example\fP in reST_ref.
-.SS Basic Markups (block)
-.sp
-This is a simple sentence.
-.nf
-sentence with
-newlines
-(reST)
-.fi
-.sp
-.sp
-Sentence with
-hard\-wrap (markdown, trailing two spaces)
-.INDENT 0.0
-.INDENT 3.5
-block quote
-second line
-.INDENT 0.0
-.INDENT 3.5
-nested quote
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.UNINDENT
-
-.sp
-.ce
-----
-
-.ce 0
-.sp
-.INDENT 0.0
-.INDENT 3.5
-Block quote after raw\-html directive
-.UNINDENT
-.UNINDENT
-.SS List
-.SS Unordered list
-.INDENT 0.0
-.IP \(bu 2
-unordered list
-new line
-.IP \(bu 2
-next item
-.INDENT 2.0
-.IP \(bu 2
-nested list
-with new line
-.IP \(bu 2
-nested list item 2
-.UNINDENT
-.IP \(bu 2
-original depth
-.INDENT 2.0
-.IP 1. 3
-ordered list item
-.IP 2. 3
-second
-with new line
-.UNINDENT
-.IP \(bu 2
-original depth again
-.UNINDENT
-.SS Ordered list
-.INDENT 0.0
-.IP 1. 3
-ordered list
-in new line
-.IP 2. 3
-second item
-.INDENT 3.0
-.IP \(bu 2
-nested unordered list
-.IP \(bu 2
-second item
-with new line
-.UNINDENT
-.IP 3. 3
-original depth
-.INDENT 3.0
-.IP 1. 3
-nested ordered list
-with new line
-.IP 2. 3
-again
-.UNINDENT
-.IP 4. 3
-original depth again
-.UNINDENT
-.SS Code Block
-.sp
-Simple, indented code block
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-pip install sphinx
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Code block with triple backticks and language.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Triple\-tildes (\fB~~~\fP) are also available.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-def a(n: int) \-> None:
-    for i in range(n):
-        print(i)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Here is reST style code block.
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-if True:
-    print(\(aq\en\(aq)
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.SS Extensions
-.SS Table (Markdown\-Style)
-.sp
-(cell\-alignment is not supported currently)
-.TS
-center;
-|l|l|l|.
-_
-T{
-Table Header 1
-T}	T{
-Table Header 2
-T}	T{
-Table Header 3
-T}
-_
-T{
-normal
-T}	T{
-\fIitalic\fP
-T}	T{
-\fBbold\fP
-T}
-_
-T{
-\fBcode\fP
-T}	T{
-T}	T{
-T}
-_
-.TE
-.SS Math
-.sp
-This is E = mc^2 inline math.
-.sp
-The below is math\-block (markdown\-style).
-.sp
-.ce
-
-.ce 0
-.sp
-The below is reST\-style math\-block.
-.sp
-.ce
-
-.ce 0
-.SS Footnote
-.sp
-Footnote[2] and footnote[3] with markdown.
-.sp
-Footnote with reST[1]\&.
-.sp
-
-.IP [1] 5
-reST footnote
-.IP [2] 5
-footnote 1
-.IP [3] 5
-footnote key
-.SS Change Log
-.SS Version 0.2
-.sp
-(next version)
-.SS Version 0.1.5 (2016\-06\-21)
-.INDENT 0.0
-.IP \(bu 2
-Support multiple backticks in inline code, like: 
-.UNINDENT
-.SS Version 0.1.4 (2016\-06\-08)
-.INDENT 0.0
-.IP \(bu 2
-Support indented directives/reST\-comments
-.IP \(bu 2
-Support role\-name after backticks (\fB\(gatext\(ga:role: style\fP)
-.UNINDENT
-.SS Version 0.1.3 (2016\-06\-02)
-.INDENT 0.0
-.IP \(bu 2
-Remove extra escaped\-spaces (\(aq\(aq)
-.INDENT 2.0
-.IP \(bu 2
-before and after normal spaces
-.IP \(bu 2
-at the beginning of lines
-.IP \(bu 2
-before dots
-.UNINDENT
-.UNINDENT
-.SS Version 0.1.2 (2016\-06\-01)
-.INDENT 0.0
-.IP \(bu 2
-Add reST\(aqs \fB::\fP marker support
-.IP \(bu 2
-Add options to disable emphasis by underscore (\fB_\fP or \fB__\fP)
-.UNINDENT
-.SS Version 0.1.1 (2016\-05\-30)
-.INDENT 0.0
-.IP \(bu 2
-Fix Bug: when code or link is placed at the end of line, spaces to the next word is disappeared
-.UNINDENT
-.SS Version 0.1 (2016\-05\-30)
-.sp
-First public release.
-.INDENT 0.0
-.IP \(bu 2
-genindex
-.IP \(bu 2
-modindex
-.IP \(bu 2
-search
-.UNINDENT
-.SH AUTHOR
-Hiroyuki Takagi
-.SH COPYRIGHT
-2016, Hiroyuki Takagi
-.\" Generated by docutils manpage writer.
-.
diff --git a/dev-python/m2r/files/test.md b/dev-python/m2r/files/test.md
deleted file mode 100644
index e54ac950e527..000000000000
--- a/dev-python/m2r/files/test.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Title
-
-## SubTitle
-
-__content__
diff --git a/dev-python/m2r/files/test.rst b/dev-python/m2r/files/test.rst
deleted file mode 100644
index f45558879567..000000000000
--- a/dev-python/m2r/files/test.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Title
-=====
-
-SubTitle
---------
-
-**content**
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
deleted file mode 100644
index cd8709ae16d6..000000000000
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 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="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	<dev-python/mistune-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-	${RDEPEND}
-"
-
-PATCHES=(
-	# pulled from upstream git
-	"${FILESDIR}/m2r-0.2.1-upstream-fix.patch"
-	"${FILESDIR}/m2r-0.2.1-tests.patch"
-	# skip tests that need internet
-	"${FILESDIR}/m2r-0.2.1-tests-network.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 "${S}" || die
-
-	# in python 3.10, the text changed from "optional arguments" to "options".
-	# the test matches on the concrete string, make it match on the part that is shared
-	# by both versions
-	sed -e 's/optional arguments:/option/' -i tests/test_cli.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/metadata.xml b/dev-python/m2r/metadata.xml
deleted file mode 100644
index 5d31d72e555d..000000000000
--- a/dev-python/m2r/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<maintainer>
-			<email>miyako.dev@gmail.com</email>
-			<name>Hiroyuki Takagi</name>
-		</maintainer>
-		<remote-id type="pypi">m2r</remote-id>
-		<remote-id type="github">miyakogi/m2r</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index ec74b3cf6a18..d37776846d17 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,4 +1,6 @@
 AUX makefun-1.13.1-no_pytest-runner.patch 184 BLAKE2B 663db5f0d235f5117a066fff19bbb940c3a2b7d7cfbe2c2b07430d85d33e0a62800aa89c38530526eeae76611a6619eee765f5fdd69d9ab38d39458d85cb104d SHA512 179e9db22717ec79d0c4ae9dc53ceee26d542eb4e3a957bb4ae4689ba808476894a8276e536214c9923140ee8307393d96b417ea8477d393e399ca4c953dfdd4
 DIST makefun-1.13.1.tar.gz 72170 BLAKE2B b1b5e76277e742ef51bcdf2bf6f1d1e761010d75bc3f20d7a8c079b368972b90775bd3bb23cf1787911a8d858549d72d4a2c9379675e59f359486bf1c49566e2 SHA512 ae103d3827673c4124d051e3c76d3d0d126c783ac7a1ea09de3801fd695439eaa549c297bd5c262184a3ee6fdf7b046065081fa3183642778148c2134d7bfc06
-EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 84ee1a780585bfc5b53f575a50c01ad6de218039ae3b851bf631c9880b0db3b5902070798748dc389d2aa0dfdac30cd69f029d994a5989ccf19bc01dc1433b22 SHA512 e96b200831c021ad0ba9d0a7440930756c8dfeb93d5ae753e91074171913988ab4c266abdf9555b62f75ce4cbf291859ee6f16f28078fcfd814387e8becf6fd5
+DIST makefun-1.14.0.tar.gz 73792 BLAKE2B 8a3f947d53787efc1be6d76c4c817063a21d0e135815d196988aa2c6d1e0998344010dfd1e2f33f31c0d47fcad8b7e4c0c7c9e408bdd3ea60f668c3ec8ae09dd SHA512 49b239a559e0ec5e28c29c210161c3530e1d89b39a22f16382f0569a47a6d696917d86c9abefb7ac6dc59f904276f8a853a2dc09b1d9c2332e422757f6eb9a08
+EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 07d6c59a1faea0879c792c37752a1e4edfad0f1f575199b4fb22794e5dad32cac11f846f21d722f81e6c5e23a9a24be424e65ce59a6626095a05cceec7403bf3 SHA512 d08ac35b8b5425d17dfb3c7f98716345ac26cf60003c33a694e962422d4964b1c4e6cce08ca7a5d68c44538b0db26cc9154cbc91abbb273e80617a32d52f7184
+EBUILD makefun-1.14.0.ebuild 661 BLAKE2B 928a7fb505e8de7cc77d743d4e96bc9c68b26af3ef33dc99aac66f3388e3a023dc56a7637572078eaea72e6b2a7fd6975747d55362260f15cb6a30ed0e62e793 SHA512 1fb0b141add49f07005ea6d583ae0192b7c0890387841130424f1049bd607f069aea6db5cce3c1d8a0234c94f62cab2650415ad8fc6f13cbce7d75209d82afdb
 MISC metadata.xml 401 BLAKE2B 0657deb821edfdf648e5bb0a95255b87df0c090c6e719a5ad94a6d3f6e2e64f36d4093a2bfddb5e8592d3d38741e8d0251c8331133113766ef2fc4caa48e88ad SHA512 cda21fbaa9b62896ba3389cf281ae35bd9a59fb0d0604e61fb3b046061de47a2535d7a98d335b66f44483ae43deadf05abde0a2285902c1c3fab2762b080dbad
diff --git a/dev-python/makefun/makefun-1.13.1.ebuild b/dev-python/makefun/makefun-1.13.1.ebuild
index eb2656703a7e..c95083f79b0b 100644
--- a/dev-python/makefun/makefun-1.13.1.ebuild
+++ b/dev-python/makefun/makefun-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/dev-python/makefun/makefun-1.14.0.ebuild b/dev-python/makefun/makefun-1.14.0.ebuild
new file mode 100644
index 000000000000..56106e410e5e
--- /dev/null
+++ b/dev-python/makefun/makefun-1.14.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Small library to dynamically create Python functions"
+HOMEPAGE="
+	https://pypi.org/project/makefun/
+	https://github.com/smarie/python-makefun/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 661e68fe6367..656b606249ac 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,3 +1,3 @@
 DIST Mako-1.2.0.tar.gz 488603 BLAKE2B 30ef597e2dd500d52d02118e0ec8a40cfeeff00604eb9fec887df4aff794aed7d6a1d78b2defb6f985947f9429d912a083b9941ee30b1e53ef32890d19e94158 SHA512 ad608016d7785a735a28ea18f697be4882da747e3da32e4a7c7be4bf846d37e4d3374d78e62ef85607ae9f3f73ee35dc78b473347e4110c059a504be2c497c6e
-EBUILD mako-1.2.0.ebuild 1154 BLAKE2B ab79ed2aff34992ab303ddc993a016c35e44758a62777a270fee9d31742ea4b14cc7d946fe6d2b48911a3349a47b26be9a9ce25793b9ae0fa0ae6621f99e7541 SHA512 a6a4a740b094d552a5aca57ce45459ac90989aef9ae035ded0a5f7584623c218f86ef0244648148a3e398ba1ce05493c8289b8c7ea682985ba395c96a50bf87a
+EBUILD mako-1.2.0.ebuild 1593 BLAKE2B e1e87bc2dd0ca3e55f799123a9a6543839ec76a0851ee465573cc5bd2b4c313f685c996b1e27852f13379c84a0c15d33a27cc974a26b0074a7d25c844288d88c SHA512 4a6358eb6f6937b8ae135dae83efd5d7f33a7f768c009886d8ae2aae014a7b1893e79bee38da7327647fa2c415e86377185e86cbd1bed2bc56546625efa682c9
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
index f42ab071d63c..16fca49e82f0 100644
--- a/dev-python/mako/mako-1.2.0.ebuild
+++ b/dev-python/mako/mako-1.2.0.ebuild
@@ -4,13 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 MY_P=${P^}
 DESCRIPTION="A Python templating language"
-HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+HOMEPAGE="
+	https://www.makotemplates.org/
+	https://github.com/sqlalchemy/mako/
+	https://pypi.org/project/Mako/
+"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
@@ -22,14 +26,27 @@ IUSE="doc"
 RDEPEND="
 	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
 
 python_test() {
-	local EPYTEST_DESELECT=()
+	local EPYTEST_DESELECT=(
+		# change in pygments
+		test/test_exceptions.py::ExceptionsTest::test_format_exceptions_pygments
+	)
 	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
 	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# py3.11 changed tracebacks
+		test/test_exceptions.py::ExceptionsTest::test_tback_no_trace_from_py_file
+		test/test_exceptions.py::ExceptionsTest::test_tback_trace_from_py_file
+	)
 	local EPYTEST_IGNORE=(
 		# lingua is not packaged in Gentoo and the skip is currently broken
 		# https://github.com/sqlalchemy/mako/pull/357
diff --git a/dev-python/mamba/Manifest b/dev-python/mamba/Manifest
index 29c431b5389b..4055ec9a0fba 100644
--- a/dev-python/mamba/Manifest
+++ b/dev-python/mamba/Manifest
@@ -1,3 +1,3 @@
 DIST mamba-0.11.2.tar.gz 37370 BLAKE2B 90228aa9668c5c79161aee79d92a9409e5df5d9d71b94f2ae8401ec5eea32ed45cf1b1a72eb596b6e24f140bf053bca4cec848830ae83c24b108ddb4a2bcd148 SHA512 8ca6207c9df7b3388db8ecabd13456e54d8811c24f695ccc638c90bb2c975268f9e803533808f9b099651ee4744376fad3b58eaa84a6c97605631368f979915c
-EBUILD mamba-0.11.2.ebuild 856 BLAKE2B c7214adfb14f1fedfe04889db43f32c84ac69a1b6177db004b173e6977008adefb6427adffaa33e61a4b72037e6c26b48e3d28c1b6abd6c8e11523c62731c685 SHA512 9f7d40724d80dab83bcb74a705c85d96ef8d0301f5c17a66ebdadbd51e8d128791738f7c7306c949f537c3aa36552d1c96d44cb235a5e50997ed428597db6041
+EBUILD mamba-0.11.2.ebuild 851 BLAKE2B cfa1c2a3e1e009ec6bf16f0b27f01c75e2e42e9dc83dc0dfecd538e1ced8af8802dab2ec570088a4ac2fc88431e87f88a52ad52121aba743fa7b1062e3e3cdb4 SHA512 6a41d6a2d2c995d60283cf01cd525b08744f8a7061c863e8ab9a7836986dd22782422fb93cf574c50540dcb9ad3539fa237c87771c458869490527365accc677
 MISC metadata.xml 300 BLAKE2B 890c49024db1a2ad04de3245e808924edce1e5007108c80523a1518318d92c5043945fb65324016853b583faff3a8cb03ab64a4d1aa421d3034ef54dd4f71a33 SHA512 0e1dc6cfd109165e1061f7156ddb366ec19a75e0bf5859970bb29eb3ed6dca659e9105975f27f086ce644bcf6342d7e53ef704545312c93f5de5af8fc45867e1
diff --git a/dev-python/mamba/mamba-0.11.2.ebuild b/dev-python/mamba/mamba-0.11.2.ebuild
index 890b56f6e002..07a9ac4016a6 100644
--- a/dev-python/mamba/mamba-0.11.2.ebuild
+++ b/dev-python/mamba/mamba-0.11.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
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python test runner born under the banner of Behavior Driven Development"
-HOMEPAGE="https://nestorsalceda.github.io/mamba"
+HOMEPAGE="https://nestorsalceda.com/mamba/"
 SRC_URI="https://github.com/nestorsalceda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/mando/Manifest b/dev-python/mando/Manifest
index 0c56a85c72be..e64f8729ab31 100644
--- a/dev-python/mando/Manifest
+++ b/dev-python/mando/Manifest
@@ -1,3 +1,3 @@
 DIST mando-0.7.1.gh.tar.gz 37802 BLAKE2B 1caf437248f1b1397888674fff0171680fd1d2cffd1d3394869edce4fef0d214fb52fc0eb7435ef162722f128f129f8d19385e65661914c51f78108b64f8db38 SHA512 a25dfd57e833416cbd64933ca3970712d28c2e2ed172091a0d0c082f486c707d0061afb071e3973e7e42b654d1a6e70f4909b1254fdef493471dc0ae9d3eb62b
-EBUILD mando-0.7.1.ebuild 800 BLAKE2B b49fe78b12095471f8336585ca01dcfa9e6bd413b9f3c20a9952f7226612f83d25dd5734edd9fd4757b5370be75ad7ab52aea1a83a087e47a892044171e756d0 SHA512 7e9ef108165fed7a8e849a757a6a9f8b98055f5f3f71b45ae2c18b8f5a15a1cd0ce43bc3d4cdce3f210a43d3de2a987e9e306c60f73678a304d2ec9c0c799448
+EBUILD mando-0.7.1.ebuild 846 BLAKE2B 97bd2ee4a13b684da0a8de20a9008ef5f2a8669fc7af5dfd3e1bf2673060497ccc331d2766a61bb9cbd6ad05035674679014b333d8137bbc2c8aa3119cbd6e1d SHA512 ca963ab0408992d286a9f19ab59127364de5e92d1f9122f2f2c1cee73a12cc1015a1b9721deb4113c92790fa303432c64636f12033a15aa8575036eb8e7c88f0
 MISC metadata.xml 285 BLAKE2B 3f0f1cbd9283919ed3b4fb89de7ce5a23a535844ca1d04dd416f2a9d7d64ebcd84a8f89736c56452418014c4574bc4cb75156038f100eb87b5f7ad663be5ca38 SHA512 78b7d0ede36474cdd7d887cc2d74b69ff28f4c2ddf3f8dd449396b454dd48308e1ac912331b8f03aff18ebcd0168f656dc1affdda0f88dbcfb39dd14ba2a7d42
diff --git a/dev-python/mando/mando-0.7.1.ebuild b/dev-python/mando/mando-0.7.1.ebuild
index 79d654424d5b..c86ae3090eb8 100644
--- a/dev-python/mando/mando-0.7.1.ebuild
+++ b/dev-python/mando/mando-0.7.1.ebuild
@@ -4,19 +4,29 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Create Python CLI apps with little to no effort at all!"
-HOMEPAGE="https://mando.readthedocs.io/ https://github.com/rubik/mando/"
-SRC_URI="https://github.com/rubik/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://mando.readthedocs.io/
+	https://github.com/rubik/mando/
+	https://pypi.org/project/mando/
+"
+SRC_URI="
+	https://github.com/rubik/mando/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/manuel/Manifest b/dev-python/manuel/Manifest
index 7308071ea3c4..c7eb8faeaa00 100644
--- a/dev-python/manuel/Manifest
+++ b/dev-python/manuel/Manifest
@@ -1,4 +1,5 @@
-DIST manuel-1.10.1.tar.gz 42142 BLAKE2B 91d23d804b3f5a2c6f696a8c7a8701f09ae6e881ac9a1c76004be301ab77f58596d0bdae4b11f484e495ea581d66d55d5bed05f5b36d81951d35923c8bfc163d SHA512 39376852e2ecb8a19b2f565464e53f475577edf68e89b3d267f94374a444714ed38ef63da638a02dcec2df851869d57c0d256dca4b436b37ff36b6b3a822710b
-EBUILD manuel-1.10.1-r1.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
-EBUILD manuel-1.10.1.ebuild 638 BLAKE2B 29b86c1aad17cbf13d4fb4bfa0a165a40c1dd52e681ade2ee7b86be7370f42f9e37c20cb06f524d769ad364ed8b4d02c4b66591952e8f586cddddbe752a2a162 SHA512 484a9c1f6d9ea0b38b8e9402919531625457091a4bd134cd7dbbcf09cf9c22a96a193c6b89f3e743df8b62739ee63d138c4ab422538105bdff2b5cc04eb10bea
+DIST manuel-1.11.2.tar.gz 51846 BLAKE2B 0650c9db757a7e8bd0ba12dcdfda8ff071107d460fab7d24715796e477960ebe41375a10cd83a1c7881c76e6fa1e7cdd5cda383be75adffeea7e1cd6d763df13 SHA512 bbfd3ca58ccb0fb40ecbf54a5be0e73989e93ec026b8c686a7ef4e746c650ffed6f2fc5f119fe58e7c13a4a13cacb8c568384a69b1068413ab6bd6f01664a72f
+DIST manuel-1.12.4.tar.gz 45369 BLAKE2B e15f9261854fbad8ee1e1dc8645ec286a212c460a78fff1576b6886d8bf462ffe9a5484338fd9efc2bf053a7689e16b08de55f763ae319e66a363c5c28cf2a60 SHA512 cd65307f2ca94e66d88bc0c7c75702d49f505b358ebb812fd20906036ba10f2d1d11d2d69404b88c5f10b584dea05a988b5dc8ba07210b9d20ebd8a11b701633
+EBUILD manuel-1.11.2.ebuild 752 BLAKE2B 44a49f6ec888b5fe8ed11a5c566310f2fd3336e92453cf4422958a2e17b929221ede214bca9bbc7b931bd7a7fcc730c4e31abc21f1dda1faf91b317f0a016ec3 SHA512 3e47afbe1e22476e9119fa2e045c76630976feea3e4217922460602ed55ff42d645a7602c355ee520721eb73db45880d0eb02132abf3b704455f861b0c8d42ac
+EBUILD manuel-1.12.4.ebuild 755 BLAKE2B 4d9ae0e77ec12519e44d3c22392d6aeeda9650a14ddb581fb16b660b231fb214506c2cbf6d4bdd7e7b0807ddf45bc75fe6d47debf35ea898dfcaf8d7b1e57ca5 SHA512 9b6f63427b60d972fefbf0cba68d82e32a1275e05cc08556d5a6185b2b2749c280918a669639ac23af1ae6d08c9941b2091149fed95fd71df843e58df151ace2
 MISC metadata.xml 391 BLAKE2B 6b95f9d29d8df2b9f0cfd85012a7d751f443c3bc67f6254c376f8cd3c1c66e2972bc165edc8db6b5ef2851edf3e870cc2ca76d3f6f3c06daeb247ee349407f45 SHA512 ace493867fc08487876a55331b619a62b01e269d7b5307b2ae9e016d75ee9058f2e1354bd2e3243ef1b0cfff30cc3f8f661675e03c1ac07fb805f443b31c64ad
diff --git a/dev-python/manuel/manuel-1.10.1.ebuild b/dev-python/manuel/manuel-1.10.1.ebuild
deleted file mode 100644
index 75e78a5b5b82..000000000000
--- a/dev-python/manuel/manuel-1.10.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
-HOMEPAGE="https://github.com/benji-york/manuel/ https://pypi.org/project/manuel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/manuel/manuel-1.10.1-r1.ebuild b/dev-python/manuel/manuel-1.11.2.ebuild
index 174420a9eaf2..174420a9eaf2 100644
--- a/dev-python/manuel/manuel-1.10.1-r1.ebuild
+++ b/dev-python/manuel/manuel-1.11.2.ebuild
diff --git a/dev-python/manuel/manuel-1.12.4.ebuild b/dev-python/manuel/manuel-1.12.4.ebuild
new file mode 100644
index 000000000000..735e15d14dfe
--- /dev/null
+++ b/dev-python/manuel/manuel-1.12.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lets you mix and match traditional doctests with custom test syntax"
+HOMEPAGE="
+	https://github.com/benji-york/manuel/
+	https://pypi.org/project/manuel/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# unused rdep
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 805ea70667d9..9e70ba01aa63 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,5 +1,3 @@
-DIST markdown-it-py-2.0.1.gh.tar.gz 265850 BLAKE2B fe61608f14b22dffb81bb943df75967300e8366ff1b1c252b35974414efa6b2daac223b09f40ff6d7feab70c5b033b0eee35a4ee5f8523325f12311f4cbeef57 SHA512 fccf00de7e94986a29047da948d6ebb6304ae3645e79bbad480366c3aadbd417b95d96489d167a532eee3c2e17b67e22777224290564c7bcc17d72fec29b08df
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
-EBUILD markdown-it-py-2.0.1.ebuild 969 BLAKE2B b2a51e74ee4b29b4cc1ae82aaaa661c902a57f9486a3d29a218d946f113cc9efb2970baadbbb9ee7d9eebd4cf3672d57db45a6f63f155eb033dbfd42e4a9e730 SHA512 fa812a8b68adc07a48aa2f8441e74abed72853d5ee33dc0dd104fbd130f00bfd67a2149c40898fcffd03a7c72147d11466de0c96df2991b5a519da7cb0deb5ef
-EBUILD markdown-it-py-2.1.0.ebuild 971 BLAKE2B 79c7a87b050ce63e5adc08a4fefd986a72770983567634d6688d87021512c350ddec8691b79aec020a061af2444481a2a85b340a9839f8f874d46fae6bd252f4 SHA512 7b1e90d262f3e522ddf484853a02016cd5fefe5973537e05e86e41ca087cf0b250012a5624927f86a96e8030cfdcc68091e1e9a4cfca9a8fca9133c4349c0ae3
+EBUILD markdown-it-py-2.1.0.ebuild 974 BLAKE2B 1f04950da848baf028195f185d8edc0b6a9208901c46048a8ba8d061789aa06471693007a1bfe2cb6d229a72fc7b4c522fa57506ae00fdcb73a4f39cbd2aac30 SHA512 fc4f27ac9c6e77a963e4db2bfffc9d46ea4a32f58463b73a7b87c9440f81a5e62b732b15d43ed1fd19ecc40011849222d65ded7ea91efd94312a8e255bd6561c
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild
deleted file mode 100644
index 9b5ba78147b0..000000000000
--- a/dev-python/markdown-it-py/markdown-it-py-2.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py"
-SRC_URI="
-	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/attrs-22[${PYTHON_USEDEP}]
-	dev-python/mdurl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Unimportant tests needing a new dep linkify
-	tests/test_linkify.py::test_token_levels
-	tests/test_port/test_fixtures.py::test_linkify
-)
-
-EPYTEST_IGNORE=(
-	# No need to benchmark
-	benchmarking/
-)
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
index aa68ea704662..91f1413b7a38 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py"
+HOMEPAGE="
+	https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py/
+"
 SRC_URI="
 	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -17,7 +20,7 @@ SRC_URI="
 
 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/attrs-22[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 0bf951a02f96..8c286e74f8a4 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,3 @@
-DIST Markdown-3.3.6.tar.gz 323584 BLAKE2B 5d21a6e8c52bd7dcc61c68ddf3f07527d234e15f711beed34ecbd424c7a5a650aba5f5ade7d793095b769c02d66c9c2e4ecc9e398730fbdc6e6aa920fbd0a243 SHA512 7c425470781becae981980a35ef6c609e0c2c76689ba81344607e94d362ae437ac33070c52d2818e90172dc09294185b9ca4eb5f0a50171b55dfac09d634ccb2
 DIST Markdown-3.3.7.tar.gz 324130 BLAKE2B 4ecf804b81181a9895e15d2f54881544648939f2bb772b036aa84dc8bf57b7976c6ebdf8549041b39a303bd7c68c16df3c126463a8da19b3c92f99b420e9ffb9 SHA512 39b9f45939be9e842e90470307c3aeec88d1389439b0c7a0c5b39f6e203b51d3a52ce431c4d5c278f399552c4218fc1a619b0efc56883de50a9f300f42120f4e
-EBUILD markdown-3.3.6.ebuild 983 BLAKE2B ed3f9d4a6f21beca66359ee8c858358b3626e34a5b51693ab62c323c1407305490722fcbf3a7d64f523307a5ba505a11806461d470829c5e96eba798e2a1f66f SHA512 0dee4ad70f6a67575fdea0135d8ffb509721953d6aaaaacb262250eaf504cde96f1900fe6d964bd83c924855af3f456c8b3831e1f2a6cc01197d0f8228acb4c5
-EBUILD markdown-3.3.7.ebuild 1011 BLAKE2B 4486a40ade97c04d6eacb75b7b9d3ed751ed6df445724636993dbd273d8b3805216111c8970b84e421f35f7b65a577648ca38a45340dc4416f04f85518d053c3 SHA512 bb4548eff7da30c0a0d01e1d875ac88ad87de210d6ebd7c70bb669aa667064b7cd6e0a1b9b7e3b91ec2d50019157d7761686e8f2d489ec54f0edab3e3573ee03
+EBUILD markdown-3.3.7.ebuild 1010 BLAKE2B 04abb0f2d38eedacf1af71cf3d508e3ef0bc08d4505c86c677fc6a40d0a56c7abd3c0c568b277142af767b63ea91807403bd96dbd37b60cda9aae32b2392a0c7 SHA512 ddc5fc1148d82715ae083992d8d3f15ad514b9ff1515660bda5725d8594c42baf6543d1b76c5e6126601fc4cd0b7251ed8719e28a77d814cdefdc4c098c411fe
 MISC metadata.xml 400 BLAKE2B 325197e9e700565d94ac477c4acefb1ccad5fea759bcb9bb980122f2a8fd0b7509fbf54768948b28a180392154d26d9a9068b996661a35ec79bb03998ae538f5 SHA512 68bb4ebfe231af6e30c3f8a9fafdab8f1b90fb67d942605d0366bfe504de0ae482da8c4e45279cf7bfae857ed9ccb0729a36f6ea1b18bd459e0dc3e1e3a9f6bf
diff --git a/dev-python/markdown/markdown-3.3.6.ebuild b/dev-python/markdown/markdown-3.3.6.ebuild
deleted file mode 100644
index 4f161f58b702..000000000000
--- a/dev-python/markdown/markdown-3.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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="Python implementation of the markdown markup language"
-HOMEPAGE="
-	https://python-markdown.github.io/
-	https://pypi.org/project/Markdown/
-	https://github.com/Python-Markdown/markdown"
-SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)"
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pytidylib[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && dodoc -r docs/
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/markdown/markdown-3.3.7.ebuild b/dev-python/markdown/markdown-3.3.7.ebuild
index c0225145e00b..ab927ec51b5c 100644
--- a/dev-python/markdown/markdown-3.3.7.ebuild
+++ b/dev-python/markdown/markdown-3.3.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the markdown markup language"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P^}"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 3e825fff4118..ce18138afcff 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,5 +1,3 @@
-DIST markdown2-2.4.2.tar.gz 96270 BLAKE2B 63808f2b6e8af25eca047e7b24a7ab7ce7afc35fa10aff57b93952cefae765ae8746300f6e93033be87aa73607249198cdfd4fa6e3b3aed711e80d9dc7a006ab SHA512 8c41617213ae8a2d02a986489756d511ee7e1ae970eef348f68808439feaef099ef935ea0a2c31cb9e9abe39899a24fd981a29b7c90d1f8096ba999506121e60
 DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
-EBUILD markdown2-2.4.2.ebuild 657 BLAKE2B e98cf6a720af82dba5b58fc157bb23068d29f2e9c53e5bbd58cf0d219d4507765f833461f7a8c4a3be3bce2c2b985a6398dfb00f1a7df6a96144a63387cb6518 SHA512 0985726470e92ba923c86613253615571fad519905ae09cfb2d1a0d6e9f22948239294ed18fc1d4457d2def7dd9eb6042794fb2b148702b38b334bb817ca4001
-EBUILD markdown2-2.4.3.ebuild 699 BLAKE2B b35556814f6779bd4cabb2960dbc0ffc3d1e83d72a3d663664f00ee317f07282d405ac5855690f930062c0dc3848819fd7b4f99c8d5f2b3aa2fa15a3b2fbd6b4 SHA512 b08780947c663e683e0d23fd69d4d3ad548e3cba13ad5a501304e86dd8a329e03d5aabf419136c5b901e30f8f9034d7479ec3f05b750fc12032d30ce5066168b
+EBUILD markdown2-2.4.3.ebuild 695 BLAKE2B 74b22100d1710ac46b0608ffc8e3d319fb074aa28ca861eff3031a14dee6856eb8c48111c6baf542d1056124e85c179dd7d6828caf5315cada0b80996b63ad9f SHA512 e899f1614f394328fb04daf2145fcafbbec589e0e98cc81cae253cb52a1fb3137c4495d7fb284762f72804426285a6a3c6e912d9d88233305581e098fd1c83c7
 MISC metadata.xml 551 BLAKE2B 293046752073df3a0fe72acea3165d62ae78297f82aa72e40edeaab6bb6021ccbeaa8cc145341aa05dd3fe87c2f89e88f2281ca95ead33d99bbfc5ba53573ca1 SHA512 9d30d896754f1379f4fae79f86bec966cc3639a42e5e7bcc7e8d2e94881ee8a75b7e3ddedbc1573f1eb3c429aea636512efdb887f2827dc1b1aaa4caaa44e413
diff --git a/dev-python/markdown2/markdown2-2.4.2.ebuild b/dev-python/markdown2/markdown2-2.4.2.ebuild
deleted file mode 100644
index 08b6ceab23ac..000000000000
--- a/dev-python/markdown2/markdown2-2.4.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=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python Markdown language reimplementation"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://github.com/trentm/python-markdown2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest test_markdown2.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/markdown2/markdown2-2.4.3.ebuild b/dev-python/markdown2/markdown2-2.4.3.ebuild
index 9bf9f43c0072..6ee542b38514 100644
--- a/dev-python/markdown2/markdown2-2.4.3.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 7845ad18678a..b19856fb782e 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,5 +1,5 @@
-DIST marshmallow-3.14.0.tar.gz 175637 BLAKE2B 003bd5ee17d4c3db63fabcd75838f5455576eb8a741a0f1daba8c629ade145593538ba15d3ecd47d5b3cce65573f4ecd765c9badb0dd077c44b6d04537a1332f SHA512 3eed3cb7ba063c6a3503091b46443c6ad96f82e6c21e7ceb047b379dddad4429e59a8e5c828be258433b2743a8231bb338ef96f21767f17ed75fe44138bb0d64
-DIST marshmallow-3.15.0.tar.gz 179483 BLAKE2B 5cd660f4b1bf3ffb775e06659adce2f0da8bf46bd5376eb4407793925de60fce48ac633baced399314d9cef1faaf00f2643e56404cdc2c44e51b5b0c42ab533d SHA512 9d688466b9dfce7cd3307538aadb68c8297d3ee026a7a61953d361a9e52acafd00da81f48ab26771dba74bf8024117d53292763ab98cb78e2bbd7b5604bee4f1
-EBUILD marshmallow-3.14.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
-EBUILD marshmallow-3.15.0.ebuild 680 BLAKE2B 91ca8eda12e9cd00c5624a134139922f09b1533aae29e7d7c9a5863d8e113aa689e4b4fc802ae53dc10aee72644cc6ab8a9525c59c2a6416a6e376bffb060764 SHA512 6a81faca248de16f1723c11df27e3cc6d66fa39dc960341cfe6d1e384b00c40e657f5e6a44f3295b38dff20d82bf35e5d6641b332e0efda841162840a019bb93
+DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
+DIST marshmallow-3.17.0.gh.tar.gz 180037 BLAKE2B 17fa577a969d82555312b362b41e6c61c209566ba418c9aa14ef1195b7317477a9e7c7d669e5643bee0d12454fee79bcf35a9eb625ad499347299e6727afb6bc SHA512 3fceb6dcb3df7339d0c002ac90ed9960bdcc174b29ad0fc3222a435d3980b892ae07c1080483b7a5a71455a475ae1086869432cefab898a1008ad33c7efc1f99
+EBUILD marshmallow-3.16.0.ebuild 687 BLAKE2B da59e69f7fe2a95e6d582589da2c1b1cc2791761e0f08a78312a2aff1cf34ff8a3ca5e64235bec0a780e6adede7137a34690a2c36c8cde0740cec6aa19366dd5 SHA512 63fc50025e89c1f9e455e094dd08556b35149cca8f61d6bed612f4a52a4c50fd638871741d15a13352eab250a30182ff3d9896f210d9709133896a176dbcbdac
+EBUILD marshmallow-3.17.0.ebuild 779 BLAKE2B 13352f11149753711f397bac48d55156afbed1d60ccbb513c08890ea5ccd4cff4041d3670fd9c1d0b112425d0f1c9cff860ffb95182d6290d92af5e28595eb41 SHA512 a9bb50b6608da42e5ffb869f7e028a99a33bcdd0a91a29a9365c797e96c39a62db61cc95ac528f8a68989adadb563aa188d5b4ccdb1572aed37f53a1c685b239
 MISC metadata.xml 462 BLAKE2B 8092c0a0e4a28fdedd16131788e41c7133a7d114b6603c859a7b75a3e2c1519e51450c6ecd8b8bb42b16feee2b187d61a3241c4af6a4decebe85cd011944271d SHA512 bc243259fe7e0cf4892a8e9d5bc9792cdf9166400e6c5a2bb00dda58a1a4eae672c9b5c9723ba662f583bf47b994134943d6879141472e9ca4395d8700649997
diff --git a/dev-python/marshmallow/marshmallow-3.14.0.ebuild b/dev-python/marshmallow/marshmallow-3.14.0.ebuild
deleted file mode 100644
index 7d3435061f3f..000000000000
--- a/dev-python/marshmallow/marshmallow-3.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.15.0.ebuild b/dev-python/marshmallow/marshmallow-3.15.0.ebuild
deleted file mode 100644
index f26c074cbd82..000000000000
--- a/dev-python/marshmallow/marshmallow-3.15.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for converting to and from native Python datatypes"
-HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.16.0.ebuild b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
new file mode 100644
index 000000000000..98fb29348702
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/marshmallow/marshmallow-3.17.0.ebuild b/dev-python/marshmallow/marshmallow-3.17.0.ebuild
new file mode 100644
index 000000000000..f924d3b5509e
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.17.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 23f0bd5c197e..a1028a1d338e 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,14 +1,9 @@
 AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
-AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a
-AUX matplotlib-3.4.3-test-extra.patch 1470 BLAKE2B ff284d58282a4e82bf46d1d6234db4d8a45826e2868de8dcbf40e527a4d10e1114c9a04046ad2d5aa065b18809d42be124c37c63cc104cfd62a5d22c5f9fd739 SHA512 ce332fbbfe4283f8eb90fbd3ab994ce4140f13d5ea648a9c5bc68fce3758f7fd23df2bdc33b44554b7de76bcf89d5b21c8cccbcb71e451297fb8721d60fc5052
 AUX matplotlib-3.5.0-test.patch 10430 BLAKE2B 26f07224ad540c6fdaeec05d901ddb70c55bc3c8ba21e71fe2739e109cfad513f5a4231e99dcf65a00bbbe626b8966b46be1f4a53f80e03a7fd1ca8d3ed87b0a SHA512 560653a1a2ab311e3041e872cb9d1e82125fe4b98208160ddedfd3f6f26a9488714039736ebbf256d190307354a7a513609ea5e9b8876d8c6afef8bde034d3f9
 AUX matplotlib-3.5.2-test.patch 10981 BLAKE2B cd7406a1452b22d5782ef293b10e1fbed819c0fd832a7e4d5104020250f207bb87186a95815e2357379b2dc3bc87ae2f37387c7c423bdf41122ec330712ad53f SHA512 551d3ec3fb2bb14ccecee8056d78511e9b739af8b00f41d60be9a840b661725ff2eb4b22d72d8a9ccafa22e61c99db8dff216d7fb8ce537446a95056abea4d93
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
-DIST matplotlib-3.4.3.tar.gz 37850796 BLAKE2B 15b40da8f6973ece4a91fffb5caf249cb8642263bfc2a784ec482bfaad250b6d3beffb9d2ba8a03e5fa10abab02b0e35728a8499ccb870aca06df57c5c1f91f4 SHA512 c2fe54e7517a1417aa8e55596e83edd090534c07f22882634d6ba0a07196441b5bbdd15958473805d8e8871b1b73380487aff3224294d472cd6122490c783145
 DIST matplotlib-3.5.1.tar.gz 35320470 BLAKE2B ebf69b62ac587c61ecf8442abaab302019f63a3c9d8db6f7f7fb32f4d14da554fd8305ea6dfed2ff86a5af4e7e4d2b81f14802692fe50c986f7da8545bd26c00 SHA512 a317dbd748e5fc1fafcf80020cb6d38a8888431487beded97acd59d759e67e54f59506b642e4a03d4351c1ac050d15e3f2e2b5443433debc78ddad52881c8d82
 DIST matplotlib-3.5.2.tar.gz 35210006 BLAKE2B e3f90a0cf1d28f041a8cdd6920a8a4efe16169bb4acf85f7b2562196db306eeb692218728ea33c7b62214e7894e83a104954cbef38c45ccbb4f630bd35c0c36b SHA512 32844dfa85dbc43360c1773d748a58d2ab089111c51c825da62956c778a0eeaf10ca33a5c6c094295388a80d5873a2e1b17484e02b653e9e8e5ba98659329974
-EBUILD matplotlib-3.4.3-r1.ebuild 7033 BLAKE2B b16bc0dc5a6fb128df02429b5c38f36561a63ff4cee752a208bdfe157ea3d5e1f8624b6b2e07d5a0e40350e646f7738a24c03e25870a61b58ce1b40e2ca4ccb4 SHA512 572b3031cee03a9315a5f923309aa90d053be70345d2fffe2763df684c22756e55a9a332d84c9443a6534d0229b6742dae084470573a289ba8f9b25612f1ff2e
-EBUILD matplotlib-3.5.1.ebuild 7181 BLAKE2B dc0d05908ebdbf8c970c111678a499c947030a5e7227745f3f2ce8654e49ba6ed4705da68cdad4904693b362546cf10884a04658bedd6f13a12c101e988b8a0a SHA512 f64abe65bedbd7e955e109cdd77c8a5920b8ebd33d137bf0870c99a4c4f6293dd5ca9d9f90998050a218996d7e2e422f52e5445652ea974f68ede203f2ef6027
-EBUILD matplotlib-3.5.2-r1.ebuild 6948 BLAKE2B cb64bfd6e100cb42a102536dd2f82c9088fdb237158d4c490f9c7819f9bb397d8ba5b85291e6fea8884c597635a911ae0bbeccbf2ac435c722b0e6e7fef2da0c SHA512 fcdb3eefdf4c17bb5c6032543f8f60dad3152fafc5bd607f4e3a987f81cf75ed6e0a9640efa3a75dd4cfb6adc75b1fbe44f22eec5aca38709b4db49fdbbc6781
-EBUILD matplotlib-3.5.2.ebuild 7250 BLAKE2B 5ac0bf5e4fa104f6aba31b29d93d05e0f4e9f69f62903712b16310bfc9c57f08120733a8fb8ab1bfc2b92fe7da599c66b19b2f9cb3726ea3930a7b719325d61d SHA512 5bbf7b7db0efd4eb6b6f8a76c63ee9ca475320ea63f022486c681f3d60c5a70237c61a1ed9314a946a2a330b85ec8614487e4073178cdd7b4a0c3ff6fec57ae3
+EBUILD matplotlib-3.5.1-r2.ebuild 7232 BLAKE2B 38969ec1fd4c035afe1be859825105203abe9ecc0c9ef409a64fe4e041d87324205e58c8085c628bf80a11550f453351ef518807c4f5365092bfc6f9498b213a SHA512 8c7424c236d0348d23c117d0433316c92d85fcd1902d436b418bc2c0602d648cfa8d24f8ddfb3ada0b8d9e68feda3e9526c93cf9dcf6569db516e2596581a886
+EBUILD matplotlib-3.5.2-r3.ebuild 6997 BLAKE2B e8a4d3335cc9eee119a79619f02e17974fe68590ba942aec57da41bcb40ac775d4745947885d231ca614598bd5043c8127716872e98e27756856b161c24357a1 SHA512 ccc6d038bc5da66389018b8da7c0ce74a9905aab15918f2186b4ee3d577d59c6aa703d8089ef64f2192f9a6a3c0b7b171235c3bff045528a28b3012e3c17ef48
 MISC metadata.xml 1075 BLAKE2B 6e2f62f6788e5a673bd54e375e6c7e8fb32d4dd181a48cf62582b93f78ef7a0e513417d24e940844188d5ab38bb2946c09e80d40706c207648c95eeac672a796 SHA512 38d935eed141df3a8d675b51a547135c9a357ab2058292640a9e98a07e3e3cc70348011d8c4f7f9f0ddece9531b56a1b2dfb2245cf1dfe065d43dc834ca78748
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch
deleted file mode 100644
index 3cedaba4ffc3..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.4.0-test.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From d44a24b3744b568fc12209ede6be782babb847b7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 26 Mar 2021 13:42:49 +0100
-Subject: [PATCH] Increase image comparison limits
-
-Most of the tests require exact match which apparently doesn't always
-happen in non-pristine environments.  Some of them have very big
-differences due to texlive font rendering changes.
----
- lib/matplotlib/tests/test_arrow_patches.py                | 6 +++---
- lib/matplotlib/tests/test_axes.py                         | 4 ++--
- lib/matplotlib/tests/test_backend_pgf.py                  | 8 +++++---
- lib/matplotlib/tests/test_figure.py                       | 5 +++--
- lib/matplotlib/tests/test_legend.py                       | 6 +++---
- lib/matplotlib/tests/test_units.py                        | 4 ++--
- lib/matplotlib/tests/test_usetex.py                       | 3 ++-
- lib/mpl_toolkits/tests/test_axes_grid1.py                 | 2 +-
- .../tests/test_axisartist_grid_helper_curvelinear.py      | 2 +-
- lib/mpl_toolkits/tests/test_mplot3d.py                    | 2 +-
- 10 files changed, 23 insertions(+), 19 deletions(-)
-
-diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 3c95535e0..c4fad3486 100644
---- a/lib/matplotlib/tests/test_arrow_patches.py
-+++ b/lib/matplotlib/tests/test_arrow_patches.py
-@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=100))
- def test_fancyarrow_dpi_cor_100dpi():
-     """
-@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi():
- 
- 
- @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02,
-+                  tol=0.018 if platform.machine() == 'x86_64' else 0.02,
-                   savefig_kwarg=dict(dpi=200))
- def test_fancyarrow_dpi_cor_200dpi():
-     """
-@@ -115,7 +115,7 @@ def test_fancyarrow_dash():
- 
- 
- @image_comparison(['arrow_styles.png'], style='mpl20', remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.005)
-+                  tol=0.005)
- def test_arrow_styles():
-     styles = mpatches.ArrowStyle.get_styles()
- 
-diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index ed76af576..772f96177 100644
---- a/lib/matplotlib/tests/test_axes.py
-+++ b/lib/matplotlib/tests/test_axes.py
-@@ -3807,7 +3807,7 @@ def test_hist_labels():
-     assert bars[0].get_label() == '00'
- 
- 
--@image_comparison(['transparent_markers'], remove_text=True)
-+@image_comparison(['transparent_markers'], remove_text=True, tol=5)
- def test_transparent_markers():
-     np.random.seed(0)
-     data = np.random.random(50)
-@@ -4083,7 +4083,7 @@ def test_vertex_markers():
- 
- 
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.015 if platform.machine() == 'x86_64' else 0.02)
- def test_eb_line_zorder():
-     x = list(range(10))
- 
-diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index 75f50ecbf..6973a9681 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -91,7 +91,8 @@ def test_xelatex():
- @needs_pdflatex
- @pytest.mark.skipif(not _has_tex_package('ucs'), reason='needs ucs.sty')
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_pdflatex.pdf'], style='default')
-+@image_comparison(['pgf_pdflatex.pdf'], style='default',
-+                  tol=11.669)
- def test_pdflatex():
-     if os.environ.get('APPVEYOR'):
-         pytest.xfail("pdflatex test does not work on appveyor due to missing "
-@@ -127,7 +128,7 @@ def test_rcupdate():
-                 'pgf.preamble': ('\\usepackage[utf8x]{inputenc}'
-                                  '\\usepackage[T1]{fontenc}'
-                                  '\\usepackage{sfmath}')}]
--    tol = [6, 0]
-+    tol = [6, 14]
-     for i, rc_set in enumerate(rc_sets):
-         with mpl.rc_context(rc_set):
-             for substring, pkg in [('sfmath', 'sfmath'), ('utf8x', 'ucs')]:
-@@ -153,7 +154,8 @@ def test_pathclip():
- # test mixed mode rendering
- @needs_xelatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_mixedmode.pdf'], style='default')
-+@image_comparison(['pgf_mixedmode.pdf'], style='default',
-+                  tol=1.086)
- def test_mixedmode():
-     mpl.rcParams.update({'font.family': 'serif', 'pgf.rcfonts': False})
-     Y, X = np.ogrid[-1:1:40j, -1:1:40j]
-diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 15f084fc1..14fc6b191 100644
---- a/lib/matplotlib/tests/test_figure.py
-+++ b/lib/matplotlib/tests/test_figure.py
-@@ -21,7 +21,7 @@ import pytest
- 
- 
- @image_comparison(['figure_align_labels'], extensions=['png', 'svg'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_align_labels():
-     fig = plt.figure(tight_layout=True)
-     gs = gridspec.GridSpec(3, 3)
-@@ -902,7 +902,8 @@ def test_subfigure():
- 
- @image_comparison(['test_subfigure_ss.png'], style='mpl20',
-                   savefig_kwarg={'facecolor': 'teal'},
--                  remove_text=False)
-+                  remove_text=False,
-+                  tol=0.013)
- def test_subfigure_ss():
-     # test assigning the subfigure via subplotspec
-     np.random.seed(19680801)
-diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index cebf26ea0..d7a5c3a88 100644
---- a/lib/matplotlib/tests/test_legend.py
-+++ b/lib/matplotlib/tests/test_legend.py
-@@ -100,7 +100,7 @@ def test_multiple_keys():
- 
- 
- @image_comparison(['rgba_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_alpha_rgba():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -109,7 +109,7 @@ def test_alpha_rgba():
- 
- 
- @image_comparison(['rcparam_alpha.png'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_alpha_rcparam():
-     fig, ax = plt.subplots()
-     ax.plot(range(10), lw=5)
-@@ -135,7 +135,7 @@ def test_fancy():
- 
- 
- @image_comparison(['framealpha'], remove_text=True,
--                  tol=0 if platform.machine() == 'x86_64' else 0.02)
-+                  tol=0.02)
- def test_framealpha():
-     x = np.linspace(1, 100, 100)
-     y = x
-diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index 3f40a99a2..059a9f9a5 100644
---- a/lib/matplotlib/tests/test_units.py
-+++ b/lib/matplotlib/tests/test_units.py
-@@ -75,7 +75,7 @@ def quantity_converter():
- # Tests that the conversion machinery works properly for classes that
- # work as a facade over numpy arrays (like pint)
- @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.002 if platform.machine() == 'x86_64' else 0.01)
- def test_numpy_facade(quantity_converter):
-     # use former defaults to match existing baseline image
-     plt.rcParams['axes.formatter.limits'] = -7, 7
-@@ -102,7 +102,7 @@ def test_numpy_facade(quantity_converter):
- 
- # Tests gh-8908
- @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_plot_masked_units():
-     data = np.linspace(-5, 5)
-     data_masked = np.ma.array(data, mask=(data > -2) & (data < 2))
-diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py
-index 2d79e155e..cc46fe00c 100644
---- a/lib/matplotlib/tests/test_usetex.py
-+++ b/lib/matplotlib/tests/test_usetex.py
-@@ -14,7 +14,8 @@ if not mpl.checkdep_usetex(True):
- @image_comparison(
-     baseline_images=['test_usetex'],
-     extensions=['pdf', 'png'],
--    style="mpl20")
-+    style="mpl20",
-+    tol=21)
- def test_usetex():
-     mpl.rcParams['text.usetex'] = True
-     fig, ax = plt.subplots()
-diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
-index 0e1602e81..6a54b0d43 100644
---- a/lib/mpl_toolkits/tests/test_axes_grid1.py
-+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py
-@@ -323,7 +323,7 @@ def test_zooming_with_inverted_axes():
- 
- 
- @image_comparison(['anchored_direction_arrows.png'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01)
-+                  tol=0.02)
- def test_anchored_direction_arrows():
-     fig, ax = plt.subplots()
-     ax.imshow(np.zeros((10, 10)), interpolation='nearest')
-diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-index 9a78a2676..09300adac 100644
---- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py
-@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \
- 
- 
- @image_comparison(['custom_transform.png'], style='default',
--                  tol=0.03 if platform.machine() == 'x86_64' else 0.04)
-+                  tol=0.039)
- def test_custom_transform():
-     class MyTransform(Transform):
-         input_dims = output_dims = 2
-diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py
-index f55edaa4a..60687be5b 100644
---- a/lib/mpl_toolkits/tests/test_mplot3d.py
-+++ b/lib/mpl_toolkits/tests/test_mplot3d.py
-@@ -1269,7 +1269,7 @@ def test_errorbar3d():
- 
- 
- @image_comparison(['stem3d.png'], style='mpl20',
--                  tol=0.0 if platform.machine() == 'x86_64' else 0.003)
-+                  tol=0.003)
- def test_stem3d():
-     fig, axs = plt.subplots(2, 3, figsize=(8, 6),
-                             constrained_layout=True,
--- 
-2.31.0
-
diff --git a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
deleted file mode 100644
index cf641ff753ef..000000000000
--- a/dev-python/matplotlib/files/matplotlib-3.4.3-test-extra.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d73dd52edf7ec106cf2f6c0ffc79dcda31102ecd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 20 Jun 2021 15:07:56 +0200
-Subject: [PATCH] increase test_backend_pgf.py::test_xelatex[pdf] tol
-
----
- lib/matplotlib/tests/test_backend_pgf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py
-index 55e375311..684f38fb7 100644
---- a/lib/matplotlib/tests/test_backend_pgf.py
-+++ b/lib/matplotlib/tests/test_backend_pgf.py
-@@ -80,7 +80,7 @@ def test_common_texification(plain_text, escaped_text):
- # test compiling a figure to pdf with xelatex
- @needs_xelatex
- @pytest.mark.backend('pgf')
--@image_comparison(['pgf_xelatex.pdf'], style='default')
-+@image_comparison(['pgf_xelatex.pdf'], style='default', tol=0.8)
- def test_xelatex():
-     rc_xelatex = {'font.family': 'serif',
-                   'pgf.rcfonts': False}
--- 
-2.32.0
-
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index c635564..4352942 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -872,7 +872,7 @@ def test_imshow_endianess():
- 
- 
- @image_comparison(['imshow_masked_interpolation'],
--                  tol=0 if platform.machine() == 'x86_64' else 0.01,
-+                  tol=0.01,
-                   remove_text=True, style='mpl20')
- def test_imshow_masked_interpolation():
- 
diff --git a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
deleted file mode 100644
index c408acbf67fb..000000000000
--- a/dev-python/matplotlib/matplotlib-3.4.3-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# 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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.4.0-test.patch
-		"${FILESDIR}"/matplotlib-3.4.3-test-extra.patch
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
new file mode 100644
index 000000000000..ce449939b282
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.5.1-r2.ebuild
@@ -0,0 +1,289 @@
+# 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='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_supported() {
+	case ${1} in
+		wxwidgets)
+			[[ ${EPYTHON} == python3.[678] ]]
+			;;
+	esac
+
+	return 0
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use_supported "${1}" && use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.5.0-test.patch
+	)
+
+	# requires jupyter-nbconvert
+	rm lib/matplotlib/tests/test_backend_nbagg.py || die
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
+		-i lib/matplotlib/tests/test_*.py || die
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
+	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.5.1.ebuild b/dev-python/matplotlib/matplotlib-3.5.1.ebuild
deleted file mode 100644
index 457d1fb406bb..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# 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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="https://matplotlib.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-# A few C++ source files are written to srcdir.
-# Other than that, the ebuild shall be fit for out-of-source build.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_supported() {
-	case ${1} in
-		wxwidgets)
-			[[ ${EPYTHON} == python3.[678] ]]
-			;;
-	esac
-
-	return 0
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use_supported "${1}" && use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.5.0-test.patch
-	)
-
-	# requires jupyter-nbconvert
-	rm lib/matplotlib/tests/test_backend_nbagg.py || die
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \
-		-i lib/matplotlib/tests/test_*.py || die
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	"${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r1.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r1.ebuild
deleted file mode 100644
index b1639b00cc3c..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
-	virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.5.2-test.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-
-	unset DISPLAY # bug #278524
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = True
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	mkdir build || die
-	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-	)
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-
-	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p xdist.plugin -n "$(makeopts_jobs)" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
new file mode 100644
index 000000000000..eb371d6af08c
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-3.5.2-r3.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
+	virtualx
+
+FT_PV=2.6.1
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="
+	https://matplotlib.org/
+	https://github.com/matplotlib/matplotlib/
+	https://pypi.org/project/matplotlib/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? (
+		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
+	)
+"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
+	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	media-fonts/dejavu
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013:=
+	virtual/imagemagick-tools[jpeg,tiff]
+	cairo? (
+		dev-python/cairocffi[${PYTHON_USEDEP}]
+	)
+	excel? (
+		dev-python/xlwt[${PYTHON_USEDEP}]
+	)
+	gtk3? (
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+	latex? (
+		virtual/latex-base
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+	)
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	webagg? (
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+	)
+	wxwidgets? (
+		dev-python/wxpython:*[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		>=app-text/dvipng-1.15-r1
+		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-luatex
+		dev-texlive/texlive-xetex
+		>=media-gfx/graphviz-2.42.3[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
+		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection]
+	)
+"
+
+distutils_enable_tests pytest
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use "${1}"; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	# Affects installed _version.py, bug #854600
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	local PATCHES=(
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
+		"${FILESDIR}"/matplotlib-3.5.2-test.patch
+	)
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	rm -rf libqhull || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+
+	unset DISPLAY # bug #278524
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[libs]
+		system_freetype = True
+		system_qhull = True
+		[packages]
+		tests = True
+		[gui_support]
+		agg = True
+		gtk = False
+		gtkagg = False
+		macosx = False
+		pyside = False
+		pysideagg = False
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup qt5)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+}
+
+wrap_setup() {
+	local MAKEOPTS=-j1
+	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+src_test() {
+	mkdir build || die
+	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken by -Wdefault
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
+		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
+		tests/test_testing.py::test_warn_to_fail
+	)
+
+	# we need to rebuild mpl against bundled freetype, otherwise
+	# over 1000 tests will fail because of mismatched font rendering
+	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
+		> "${BUILD_DIR}"/test-setup.cfg || die
+	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
+
+	esetup.py build -j1 --build-lib="${BUILD_DIR}"/test-lib
+	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
+
+	# speed tests up
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest --pyargs matplotlib -m "not network" \
+		-p xdist.plugin -n "$(makeopts_jobs)" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib/matplotlib-3.5.2.ebuild b/dev-python/matplotlib/matplotlib-3.5.2.ebuild
deleted file mode 100644
index 4616acff9433..000000000000
--- a/dev-python/matplotlib/matplotlib-3.5.2.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# 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='tk?,threads(+)'
-
-inherit distutils-r1 flag-o-matic multiprocessing prefix toolchain-funcs \
-	virtualx
-
-FT_PV=2.6.1
-DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="
-	https://matplotlib.org/
-	https://github.com/matplotlib/matplotlib/
-	https://pypi.org/project/matplotlib/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? (
-		https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz
-	)
-"
-
-# Main license: matplotlib
-# Some modules: BSD
-# matplotlib/backends/qt4_editor: MIT
-# Fonts: BitstreamVera, OFL-1.1
-LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
-
-# internal copy of pycxx highly patched
-#	dev-python/pycxx
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.22.0[${PYTHON_USEDEP}]
-	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	media-fonts/stix-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=media-libs/qhull-2013:=
-	virtual/imagemagick-tools[jpeg,tiff]
-	cairo? (
-		dev-python/cairocffi[${PYTHON_USEDEP}]
-	)
-	excel? (
-		dev-python/xlwt[${PYTHON_USEDEP}]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-	latex? (
-		virtual/latex-base
-		app-text/dvipng
-		app-text/ghostscript-gpl
-		app-text/poppler[utils]
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-	)
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	webagg? (
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-	)
-	wxwidgets? (
-		dev-python/wxpython:*[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-text/dvipng-1.15-r1
-		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-luatex
-		dev-texlive/texlive-xetex
-		>=media-gfx/graphviz-2.42.3[cairo]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3.40.1-r1:3[cairo?,${PYTHON_USEDEP}]
-		>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	unset DISPLAY # bug #278524
-}
-
-use_setup() {
-	local uword="${2:-${1}}"
-	if use "${1}"; then
-		echo "${uword} = True"
-		echo "${uword}agg = True"
-	else
-		echo "${uword} = False"
-		echo "${uword}agg = False"
-	fi
-}
-
-python_prepare_all() {
-# Generates test failures, but fedora does it
-#	local PATCHES=(
-#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
-#		"${FILESDIR}"/${P}-unbundle-agg.patch
-#	)
-#	rm -r agg24 CXX || die
-#	rm -r agg24 || die
-
-#	cat > lib/${PN}/externals/six.py <<-EOF
-#	from __future__ import absolute_import
-#	from six import *
-#	EOF
-
-	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
-		"${FILESDIR}"/matplotlib-3.5.2-test.patch
-	)
-
-	sed \
-		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
-		|| die "sed pyparsing failed"
-
-	hprefixify setupext.py
-
-	rm -rf libqhull || die
-
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-	append-cppflags -DNDEBUG  # or get old trying to do triangulation
-	tc-export PKG_CONFIG
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-
-	# create setup.cfg (see setup.cfg.template for any changes).
-
-	# common switches.
-	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
-		[directories]
-		basedirlist = ${EPREFIX}/usr
-		[provide_packages]
-		pytz = False
-		dateutil = False
-		[libs]
-		system_freetype = True
-		system_qhull = True
-		[packages]
-		tests = $(usex test True False)
-		[gui_support]
-		agg = True
-		gtk = False
-		gtkagg = False
-		macosx = False
-		pyside = False
-		pysideagg = False
-		qt4 = False
-		qt4agg = False
-		$(use_setup cairo)
-		$(use_setup gtk3)
-		$(use_setup qt5)
-		$(use_setup tk)
-		$(use_setup wxwidgets wx)
-	EOF
-
-	if use gtk3 && use cairo; then
-		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
-	else
-		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
-	fi
-}
-
-wrap_setup() {
-	local MAKEOPTS=-j1
-	local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg
-	"$@"
-}
-
-python_compile() {
-	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
-}
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-
-		# necessary for in-source build
-		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
-
-		VARTEXFONTS="${T}"/fonts \
-		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
-	fi
-}
-
-src_test() {
-	mkdir build || die
-	ln -s "${WORKDIR}/freetype-${FT_PV}" build/ || die
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken by -Wdefault
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg6-MatplotlibDeprecationWarning]"
-		"tests/test_rcparams.py::test_validator_invalid[validate_strlist-arg7-MatplotlibDeprecationWarning]"
-		tests/test_testing.py::test_warn_to_fail
-	)
-
-	# we need to rebuild mpl against bundled freetype, otherwise
-	# over 1000 tests will fail because of mismatched font rendering
-	grep -v system_freetype "${BUILD_DIR}"/setup.cfg \
-		> "${BUILD_DIR}"/test-setup.cfg || die
-	local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg
-	distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib
-	local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH}
-
-	# speed tests up
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest --pyargs matplotlib -m "not network" \
-		-p xdist.plugin -n "$(makeopts_jobs)" || die
-}
-
-python_install() {
-	wrap_setup distutils-r1_python_install
-
-	# mpl_toolkits namespace
-	python_moduleinto mpl_toolkits
-	python_domodule lib/mpl_toolkits/__init__.py
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 0a9e23fc073d..ce01e53aa396 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -1,3 +1,4 @@
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
 EBUILD matterhook-0.2-r1.ebuild 494 BLAKE2B e7d5c30f28ba26b199da11e21004d4c8dac395ed523fc067352bcf7a6368d989f38ad9ba59236bbdbd9d67483534b72809ec5e757927bc7bdac4d19fbadfd603 SHA512 2382ddeddb83ea3019ea64307afd7dc1b33884b491f279020e63e43bb7c460fde51f474223d76e8cb599717c3c562ef16e2d97585b86e3cabae7162af846e4c3
+EBUILD matterhook-0.2-r2.ebuild 464 BLAKE2B d6c9044eff34155ad1ce318ea76b16f91ca6212fd22c694037e1aeaef86a0079492d3b03cff7f1a1551954a139fdd52d5bf7140fcc135a6ebffcb5892f8161db SHA512 b3cf36e6cef3ec704f9f904bd2003da5ccb4d7e976598d86f14d1fd3664bc9904f443baf05293f2d8458dae8049fca19af9eae8cb974f24633213bc4c41cfacb
 MISC metadata.xml 376 BLAKE2B 9daed1ae92c654a29e69a651f3c8db46b1d92176799f2f0f0a04c9984d2326d30b7472bb1ca79be73537a9daa5e033cfd6e6691d9b84d1e8e6454bd7628db1f6 SHA512 3d71ea32de49c887a0229923e832e2e8ee6ac1194391cdf05a8ef21c8e2cad0679852de28d24cf955f087176d7a469cb27da48b02d739b86c768c0ad17a6f6ba
diff --git a/dev-python/matterhook/matterhook-0.2-r2.ebuild b/dev-python/matterhook/matterhook-0.2-r2.ebuild
new file mode 100644
index 000000000000..3e4e7b6b0165
--- /dev/null
+++ b/dev-python/matterhook/matterhook-0.2-r2.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Interact with Mattermost incoming webhooks easily"
+HOMEPAGE="https://github.com/numberly/matterhook"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index 2f4f8a8beaf1..ef21bf1db60f 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,3 +1,6 @@
+AUX mccabe-0.7.0-fix-tests-without-hypothesmith.patch 3585 BLAKE2B 928877eb6422450e410ff7a6721fc7dd0282c9d8ae4ba2be3542bf0b4c6e398f63b238fdacec979d55c86d440c463ddafcc757465dfe632ba2ce975b076ffa76 SHA512 590e7918f758873d6f14345345a5c4d3c31d098edd08252ac281bdf1ec547925620095f94a5937983136d040b4e6965207b05bd6ce7a069e6c67ace1f07493ef
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
+DIST mccabe-0.7.0.tar.gz 9658 BLAKE2B b4664a00d4760e2f662681875b548b67ad76d6b8a0ee46bf160e3232ad75172512ad7b4a99759dc13607cf06f3c772210b76a7051582d0bbd221091772543c07 SHA512 3e4141033c63434fad183f62dece872554302aeee8cb789586ac7d6d748d198799e2797df1d58458f4d431734f8899f11022d76666c848d43e6271304776346d
 EBUILD mccabe-0.6.1-r2.ebuild 716 BLAKE2B 4884582ba4b135fbdb844b1d581c258044e78aaa4563bd9097ae78c5ef361882983ebc5e482ddb2a2f1573ece982215c734c060207af1077c918c424d5be2b17 SHA512 2bbb177f9c1865902fac9154d5525280e8eaedfdc8929df5a68d67eeb7b0cd47a7d1a23a8d7419f312e01d5df2da01031f36f9fd8991b0309c41a90ef2de8e61
+EBUILD mccabe-0.7.0.ebuild 879 BLAKE2B ee4438b6b36e42b4203e1d995e1502c6fc6b010543bc53059082f298c128aebf9d4f5a44e817f7c50cbb64057fec39c8a775211c7e390a1ac3eaa4e95b1be29f SHA512 f8c0d4595e899eb7cc7bb6544dd1dcb5c08d5043c4fc1bbf127e764b7d713146017fcee7622ed8c9f33fd7b734c314210e34389f1a768bb20ffeb616bcbca198
 MISC metadata.xml 399 BLAKE2B 4abb33f734bea7c7f0e42b4840bf818ee190d83c264a623e4a3f45eb1578e4f49384976efd205234821d60d0982f5ab4abfa6885e958bc75bedc064a16d14f75 SHA512 52255fe16006844729a51af6ebd3501e1365cca9470e6cfa029c74ebd86252c4dcbf3f250876fdd0ea7b6380a51ec975370db464dfb42fbef8d4880cf5336322
diff --git a/dev-python/mccabe/files/mccabe-0.7.0-fix-tests-without-hypothesmith.patch b/dev-python/mccabe/files/mccabe-0.7.0-fix-tests-without-hypothesmith.patch
new file mode 100644
index 000000000000..18728fe59826
--- /dev/null
+++ b/dev-python/mccabe/files/mccabe-0.7.0-fix-tests-without-hypothesmith.patch
@@ -0,0 +1,74 @@
+diff --git a/test_mccabe.py b/test_mccabe.py
+index fe6e8d3..14d8012 100644
+--- a/test_mccabe.py
++++ b/test_mccabe.py
+@@ -241,37 +241,38 @@ class RegressionTests(unittest.TestCase):
+ 
+ # This test uses the Hypothesis and Hypothesmith libraries to generate random
+ # syntatically-valid Python source code and applies McCabe on it.
+-@settings(
+-    max_examples=1000,  # roughly 1k tests/minute, or half that under coverage
+-    derandomize=False,  # deterministic mode to avoid CI flakiness
+-    deadline=None,  # ignore Hypothesis' health checks; we already know that
+-    suppress_health_check=HealthCheck.all(),  # this is slow and filter-heavy.
+-)
+-@given(
+-    # Note that while Hypothesmith might generate code unlike that written by
+-    # humans, it's a general test that should pass for any *valid* source code.
+-    # (so e.g. running it against code scraped of the internet might also help)
+-    src_contents=hypothesmith.from_grammar() | hypothesmith.from_node(),
+-    max_complexity=st.integers(min_value=1),
+-)
+-@pytest.mark.skipif(not hypothesmith, reason="hypothesmith could not be imported")
+-def test_idempotent_any_syntatically_valid_python(
+-    src_contents: str, max_complexity: int
+-) -> None:
+-    """Property-based tests for mccabe.
+-
+-    This test case is based on a similar test for Black, the code formatter.
+-    Black's test was written by Zac Hatfield-Dodds, the author of Hypothesis
+-    and the Hypothesmith tool for source code generation.  You can run this
+-    file with `python`, `pytest`, or (soon) a coverage-guided fuzzer Zac is
+-    working on.
+-    """
+-
+-    # Before starting, let's confirm that the input string is valid Python:
+-    compile(src_contents, "<string>", "exec")  # else bug is in hypothesmith
+-
+-    # Then try to apply get_complexity_number to the code...
+-    get_code_complexity(src_contents, max_complexity)
++if hypothesmith:
++    @settings(
++        max_examples=1000,  # roughly 1k tests/minute, or half that under coverage
++        derandomize=False,  # deterministic mode to avoid CI flakiness
++        deadline=None,  # ignore Hypothesis' health checks; we already know that
++        suppress_health_check=HealthCheck.all(),  # this is slow and filter-heavy.
++    )
++    @given(
++        # Note that while Hypothesmith might generate code unlike that written by
++        # humans, it's a general test that should pass for any *valid* source code.
++        # (so e.g. running it against code scraped of the internet might also help)
++        src_contents=hypothesmith.from_grammar() | hypothesmith.from_node(),
++        max_complexity=st.integers(min_value=1),
++    )
++    @pytest.mark.skipif(not hypothesmith, reason="hypothesmith could not be imported")
++    def test_idempotent_any_syntatically_valid_python(
++            src_contents: str, max_complexity: int
++            ) -> None:
++        """Property-based tests for mccabe.
++
++        This test case is based on a similar test for Black, the code formatter.
++        Black's test was written by Zac Hatfield-Dodds, the author of Hypothesis
++        and the Hypothesmith tool for source code generation.  You can run this
++        file with `python`, `pytest`, or (soon) a coverage-guided fuzzer Zac is
++        working on.
++        """
++
++        # Before starting, let's confirm that the input string is valid Python:
++        compile(src_contents, "<string>", "exec")  # else bug is in hypothesmith
++
++        # Then try to apply get_complexity_number to the code...
++        get_code_complexity(src_contents, max_complexity)
+ 
+ 
+ if __name__ == "__main__":
diff --git a/dev-python/mccabe/mccabe-0.7.0.ebuild b/dev-python/mccabe/mccabe-0.7.0.ebuild
new file mode 100644
index 000000000000..8713a242dc81
--- /dev/null
+++ b/dev-python/mccabe/mccabe-0.7.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=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="flake8 plugin: McCabe complexity checker"
+HOMEPAGE="https://github.com/PyCQA/mccabe"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/hypothesis[${PYTHON_USEDEP}]
+)"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests-without-hypothesmith.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 7aa66891d010..ccd2cfdf1a43 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST mdit-py-plugins-0.3.0.gh.tar.gz 50654 BLAKE2B e84842e7cada1d9239f1d449c1a21ed654ab13017ea92f82190053b37371bc7e06d7afb65f6f56f7fa935666d24d05dca99628121bd4092a1143c289588ddfa4 SHA512 dd6aa738c6d93e45437326b1be52e0a9fc411aa3beacb61690919c272979c97ac1b38116b1ebb01c7d8fe724d4af9621c81ccd45131a690df8a2c0c325eef0e8
-EBUILD mdit-py-plugins-0.3.0.ebuild 720 BLAKE2B b43c3d5a7db15fe83a402e8ad751a9b39bd1df285680d52b397a0c41707b43c26cd8e254d86c463ec2d507f68318ce6ac7a7d68d4e59f954c864aba32ae0e158 SHA512 64d52667b813e3222caebb4a871e837ce099d1a3a55237d0a40eb8cb2a2a0d2eb6c8bd74cf15ffb55b692cc93b69eb950a42096c48fc80001d834c747ee36b26
+EBUILD mdit-py-plugins-0.3.0.ebuild 731 BLAKE2B 1650367f723e7c13deec9ed6d6a0ef34ee689d304a3e9dae1969f482662565ea9feb71c2fcdd7eaf1d0ac6fc71fde10088c7af9c5072cbe0d42b498c6734728f SHA512 74e0b635b52c2f0ec31aca0c2154866affd25a1b2dbbee5b9ae8ee87bb8724b45b21f185e05189e6ed4ff62bd62c11061514a3b23f5e269e9b786e2f43174eaa
 MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
index d7b94a9e2c88..7a658489c7a5 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins"
+HOMEPAGE="
+	https://pypi.org/project/mdit-py-plugins/
+	https://github.com/executablebooks/mdit-py-plugins/
+"
 SRC_URI="
 	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/mdurl/Manifest b/dev-python/mdurl/Manifest
index 5019586021d7..06ecd8aa39c2 100644
--- a/dev-python/mdurl/Manifest
+++ b/dev-python/mdurl/Manifest
@@ -1,5 +1,3 @@
-DIST mdurl-0.1.0.gh.tar.gz 16148 BLAKE2B d7b64313b346b5af550165fb7cb2f6af0575db3b0a9e1450097e30c6bc4e411affd62d5b40d6b335cc6491f826fbe5133cf229436acc5449d120f9847ff8d840 SHA512 773f868702276c05e635f8ccae1238cb0836107dccf0a9c179929acc008645e09c92e07bc102dd66e2df98e637665444ffe77860066eefbc5c747ebbb70cd595
 DIST mdurl-0.1.1.gh.tar.gz 15265 BLAKE2B 1a0126c674c69f43df08be248e88bc65529ea25703f6d43f1cd5917181b547b55541a4dae953a4e20e1f18bdc3eac17e54e6347d9e90fe2957c6935bee3edaf2 SHA512 ae7ee5672f59595d96fa3fd8b45154d3175881432dea60c72ef6dbd0b22124a20183539c83552bb9a8dfa1fc1c4ac3132201ce389a6678853c55c0224aa04622
-EBUILD mdurl-0.1.0.ebuild 509 BLAKE2B 7e6ef8667a0ec259e66e6d56c18eb1c93f7114f2178b6678e7ca61935b19d677d2640f16c10bedb2b7ad273ae0a99b9d3637f7b9d4bcc82ddfbb9d7697bc5893 SHA512 d7b5017131610a5275a1459af6bcd669f8b5b46bbdc28ee93ebf6dc8377ad95a99157b074a22683c985a15b5d7db54cd35f54c33719e30b691032f7c8596d7a2
-EBUILD mdurl-0.1.1.ebuild 537 BLAKE2B e6b330113a1278c54cdde281bcd070f46d45281a563ef1c0319c666d91001d71a291e85d7f3611e51d6a34d3a352c58a2ca0c4bdf085166093cd6f855b078902 SHA512 be55099f34186766891ed9d97cc51e7ca56ba189c8c8711a891a3e9332801b608615eee7e4aae59983d9cf7565c865481537fe4830b20d8962772d532a2819c1
+EBUILD mdurl-0.1.1.ebuild 535 BLAKE2B 7798b12faf4069e882c64b4dae5680832554751e98804753b9d19f0e9f1438b481f07e09e470e459d7a7dbade33721790370947d069197a92cdcd1291676e5b4 SHA512 25a24f7d7c3b0c6052c455c94339d6f6f691734a04afeeae05c4892ef4baf5756b433fe35b7387d1a1adbade08c80b766a80fa4d962bec526c2f9a94ed1a84fb
 MISC metadata.xml 394 BLAKE2B aa057d7c7bada96d6c55c84bc2e93265bba07098d21f7c2732ab0faaf7a3bb5e995387188bce5e573d1e14a73c89784ef4f7d85dd430eeedee0104689cff8baf SHA512 f2d4709202646808a878dded8372edaf0b9098ee86f157ad073a469c8adbae8a16497b9c4e18a8e76869cc0ef0dc0481779658078be7935d1a7fece921211dea
diff --git a/dev-python/mdurl/mdurl-0.1.0.ebuild b/dev-python/mdurl/mdurl-0.1.0.ebuild
deleted file mode 100644
index 8a75611cc871..000000000000
--- a/dev-python/mdurl/mdurl-0.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=flit
-inherit distutils-r1
-
-DESCRIPTION="Markdown URL utilities"
-HOMEPAGE="https://pypi.org/project/mdurl/ https://github.com/hukkin/mdurl"
-SRC_URI="https://github.com/hukkin/mdurl/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdurl/mdurl-0.1.1.ebuild b/dev-python/mdurl/mdurl-0.1.1.ebuild
index 8b3d3875e037..6389d45c94db 100644
--- a/dev-python/mdurl/mdurl-0.1.1.ebuild
+++ b/dev-python/mdurl/mdurl-0.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -20,6 +20,6 @@ SRC_URI="
 
 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index c7153eb5024c..e057c708a27b 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,3 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
-EBUILD mdx_gh_links-0.2.ebuild 479 BLAKE2B ca339365cf16294d3c809ea8067d75ee201e8482a0002bb3caefbb367fd9203ac856e6fb9f3c943d5287187c714dfaf929d4b122fc63885bc7cb27c37010fe1e SHA512 259cb54733f2555b6121f5b6b05232a9665ae70de902bc7ee629d304c98a9b3d77cba2266500cc6ceed2556a07e9d46046f202334e37436cc26b30c460ca99a2
+EBUILD mdx_gh_links-0.2-r1.ebuild 510 BLAKE2B bfdc30f7d2cec5cffa912f1c8d2b959403192e1964f5c005ee51fdb949eb0573a26aaf5f8c167cd7dfcc29dfda78d941e96a87a1ddecfa61c3128338300ccd1f SHA512 2aaad6dbc060672ada382da070ad8d8bb7a7d7040cce970debd0b61f6f7341830b13bb5c06f0f9bd7fb8546acceb50deaae671dd0be5f5e5b84599d823e9539e
 MISC metadata.xml 358 BLAKE2B afd0d531616d5dccb789fbf6122ef55817334d1d038084c9717da41d65fc576f176063abc0cab5535bf6a2bf01e6fe89ea0ac7b376047fb535cd770a67c5cafe SHA512 7d7aa45569fdcf361df845792a9df05a7b5aa3460be70e0b26d1de5f5039e5abac0fe149ba2f7e1dae4cd794866521bff7076e4aaf15766e06d97a52a7ef33e5
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2-r1.ebuild
new file mode 100644
index 000000000000..b64e20480cfe
--- /dev/null
+++ b/dev-python/mdx_gh_links/mdx_gh_links-0.2-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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
+HOMEPAGE="https://github.com/Python-Markdown/github-links"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild b/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
deleted file mode 100644
index a53a419b7794..000000000000
--- a/dev-python/mdx_gh_links/mdx_gh_links-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An extension which adds links to GitHub users, repositories, issues and commits"
-HOMEPAGE="https://github.com/Python-Markdown/github-links"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 206b116e92f1..43df178ee951 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -1,5 +1,4 @@
-DIST mechanize-0.4.7.tar.gz 217289 BLAKE2B 9254cc88141b08bd9f97b63ac1dcb6b417e042cbefcf710ea9e1c340e8f6331ef9301a47bc6dd989970810ef36b97b867b81b3a44c9a4cdf283a77b04f25decd SHA512 f2796f322b1000818bcd4bcedf1d88538ba3a43151b74c950594a60dd7b5cf96ea4fcb605e30c93a5df095da35418401487928b9adfcca932e95dbf964d74c53
+AUX mechanize-0.4.8-python3.11-test-order.patch 3062 BLAKE2B 7aa0734e93931eafe7527c722d5850df39f99225c4d7b173f48799b81f212c730e9ed6e42da3feaa080e0d5ed0f732b2f0d1bebe9dd01b01c5915e295d536495 SHA512 5e4947badd6b25e0788c67d751a71e8a8d46a16ff758a902a5874dd4cd818b9d21f36b5d3363a411b8f5c3a9398227957a35f25f5b92e29fc8127df3b96828e2
 DIST mechanize-0.4.8.tar.gz 218055 BLAKE2B bd91738092ac473ee6e65ee5f175479515f735a0433b112241f17061adf7e60ef6fa410fa549f088390b6ef6c8b2ff95e00335a626322ad170c88923c96e8e44 SHA512 71087481d27359b3ce795eae440ebb3a146f8dd5a6d5ac5dc91ae3c63f2c487beb472aa06b2925d6121faa038a0a8be50f6cecc54ee7209eb2b61e16242ffaa3
-EBUILD mechanize-0.4.7.ebuild 657 BLAKE2B 0771db52d3446f853c5400bc1394708e6c336b021960314ea6cbff890219420f4dd03002eecbf56e1c20d8d9ec136059ed1a608abcf9a03f0a5e364997469a3f SHA512 32cac3c2b5c3ca08206ecebf4249cdb6b6117f6f1a7b2a76e31cbae6e9f0ada5db06520f456428fba84eaadc21bcf73bd72f1b96ba15a84e792c9fa53b96856a
-EBUILD mechanize-0.4.8.ebuild 691 BLAKE2B 4a81c6549c6f6f7441034299e5c1a09a8c7ca0680df9a97666e53407fc2a6e3df9b27e138f27ed357e6d9b2f902e3b472a391bae0ec4d45256619d37aa38d585 SHA512 5e2645a6257fa8c6ef7ab4ec6e4cb0b210a8ddfdf6f8915652a14b8e389fa065d1750ab754fbc92f67fca8b295ed0f9c42455bb5104aef87a7036f936b0ab3ad
+EBUILD mechanize-0.4.8.ebuild 757 BLAKE2B 38d815dad291fefb5cc5b25ca64a2b55435ca790b9ffa6b12dadd425ebff69703920148e6b2a973f7971eb20b856fa5f5d5e1ec34d97d2145407b407bfdd408b SHA512 16e4c8afbcf47a9cc1455b531c878c65e41b71afb8dfd3c45f652cc7be564c6a54b39e5b27fb06395a6c987d10401da4c823752b08b17ba9628d4129846f8345
 MISC metadata.xml 1003 BLAKE2B d841ad699d157456853adb7431fa35aa56e7193696d629bc8ac725f1678b6146249d045f5c411c6ee2a35272f5b9b4cdde157e2cdc7c5bfd2ba06c0a94b001f5 SHA512 0bcc6da1505e523ef5b6e116bca7867d4cbc2cc8d8718071ad2f70077082a70acb970724e337caa3598e0bd663c8a3a5306cfb16b61cfa0fab68b7e86de2602b
diff --git a/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
new file mode 100644
index 000000000000..0808460dcc67
--- /dev/null
+++ b/dev-python/mechanize/files/mechanize-0.4.8-python3.11-test-order.patch
@@ -0,0 +1,79 @@
+https://github.com/python-mechanize/mechanize/commit/529d2c4cb8f31284f8026642968ba3adb9de1171
+https://github.com/python-mechanize/mechanize/commit/7ba3d586368c03577c061c35bc27664a907f5435
+https://github.com/python-mechanize/mechanize/commit/560839d51e54943890c2d37c0d0854792479cb80
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 11:13:16 +0530
+Subject: [PATCH] Use asserts for failing test so we get better feedback on the
+ failure
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1028,10 +1028,10 @@ def test_Cookie_iterator(self):  # noqa
+             i = 0
+             for c in cs:
+                 # assert isinstance(c, Cookie)
+-                assert c.version == versions[i]
+-                assert c.name == names[i]
+-                assert c.domain == domains[i]
+-                assert c.path == paths[i]
++                self.assertEqual(c.version, versions[i])
++                self.assertEqual(c.name, names[i])
++                self.assertEqual(c.domain, domains[i])
++                self.assertEqual(c.path, paths[i])
+                 i = i + 1
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Tue, 24 May 2022 17:54:50 +0530
+Subject: [PATCH] DRYer
+
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1025,14 +1025,9 @@ def test_Cookie_iterator(self):  # noqa
+ 
+         # sequential iteration
+         for i in range(4):
+-            i = 0
+-            for c in cs:
++            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+                 # assert isinstance(c, Cookie)
+-                self.assertEqual(c.version, versions[i])
+-                self.assertEqual(c.name, names[i])
+-                self.assertEqual(c.domain, domains[i])
+-                self.assertEqual(c.path, paths[i])
+-                i = i + 1
++                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+ 
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+Date: Tue, 24 May 2022 18:09:16 +0530
+Subject: [PATCH] Change test to not rely on order of cookie iteration
+
+python 3.11 iterates in add order, earlier pythons iterate in domain
+sorted order
+
+Fix #74
+--- a/test/test_cookies.py
++++ b/test/test_cookies.py
+@@ -1022,13 +1022,12 @@ def test_Cookie_iterator(self):  # noqa
+             "www.acme.com"
+         ]
+         paths = ["/", "/", "/", "/blah", "/blah/"]
+-
++        expected = set(zip(versions, names, domains, paths))
+         # sequential iteration
+-        for i in range(4):
+-            for c, expected in zip(cs, zip(versions, names, domains, paths)):
+-                # assert isinstance(c, Cookie)
+-                self.assertEqual((c.version, c.name, c.domain, c.path), expected)
+-
++        # python 3.11 iterates in add order, earlier pythons iterate in domain
++        # sorted order
++        actual = {(c.version, c.name, c.domain, c.path) for c in cs}
++        self.assertEqual(expected, actual)
+         self.assertRaises(IndexError, lambda cs=cs: cs[5])
+ 
+     def test_parse_ns_headers(self):
+
diff --git a/dev-python/mechanize/mechanize-0.4.7.ebuild b/dev-python/mechanize/mechanize-0.4.7.ebuild
deleted file mode 100644
index 0dbed48e2d13..000000000000
--- a/dev-python/mechanize/mechanize-0.4.7.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} )
-inherit distutils-r1
-
-DESCRIPTION="Stateful programmatic web browsing in Python"
-HOMEPAGE="https://github.com/python-mechanize/mechanize"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( BSD ZPL )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	"${EPYTHON}" run_tests.py || die
-}
diff --git a/dev-python/mechanize/mechanize-0.4.8.ebuild b/dev-python/mechanize/mechanize-0.4.8.ebuild
index 910c92be7113..327456a039dd 100644
--- a/dev-python/mechanize/mechanize-0.4.8.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Stateful programmatic web browsing in Python"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-python3.11-test-order.patch
+)
+
 python_test() {
 	"${EPYTHON}" run_tests.py || die
 }
diff --git a/dev-python/mediafile/Manifest b/dev-python/mediafile/Manifest
index de9ecea120ac..0b3b3268e583 100644
--- a/dev-python/mediafile/Manifest
+++ b/dev-python/mediafile/Manifest
@@ -1,6 +1,3 @@
-DIST mediafile-0.8.1.tar.gz 559592 BLAKE2B 3eaaef6349cf24dc871bee94cedaffe4c6ac713da0a55fef926724697f0e42149d544cd28ee9b8d9d21fa1e117306838f586cad7f085bc359f4ed8e78f6aef1f SHA512 58398ec94ab4865d88fed4c72344599b70fbeeffb538ec23ca84d8a8e19fac82a1d0d52c67867df056458716d5138a1c96e650bdb766c567134b2666cb8c140d
 DIST mediafile-0.9.0.tar.gz 568726 BLAKE2B 22466b54c890c8a1bef88a0d08e729d0b1efab12309299c64ea227a5662c263402e8e4ace4b7c9d2d0d06ba41b6f74465ebf88d090f0fd4f41d91fb6cba941ef SHA512 8b432d81c7c1fc8340a2003220a0d96b448ac64e551b0b95528a37fa5923a97358fac574573dece344cda88f4f206f1cf7bc457bdd310a7a003c395908864218
-EBUILD mediafile-0.8.1.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
-EBUILD mediafile-0.9.0-r1.ebuild 591 BLAKE2B 052af13ce46b4ed8231dd144a0af3e5a89f6f7c85934fbb7534cf848842e721b38e44d62edf88c39babe294a8f48de94a985210d42ad7fc826248ede70a89f93 SHA512 da27069fe394e6731f77903aee5bfe01353316a2deedd81c28aacb7ebdda7a6b04311a0f4eecd735ac7afddc21909afb8ce1a1ee6c39c1d404b89e809cde1197
-EBUILD mediafile-0.9.0.ebuild 605 BLAKE2B 55f46a2344826282f2df531f7780ac7e6d1ceddbaccc28154f8c1693efd92533330e540fd0657b6747b71c208e7874084e419791e90095b75433520c839f239b SHA512 2c75325e378dd1e3f02e1962fbb954c02ae066a7bd8f19b757cd1a3fc2aeb64ef25091d0111501344b3ba20c909ebe327b04817b078d3b45140f3088518697c3
+EBUILD mediafile-0.9.0-r1.ebuild 590 BLAKE2B 0cf76f278b68239bb0e9ca568420ddfbbf9e42dae61e750d5c9c0fd8f1740e23e8f9de968c3e8bb733ca1f2a544b4f61541b75a1b6e79bbb5a7ca9a1c08a8824 SHA512 6e7299345d2ff4adba8eb317a9a24d40b981ef23db07aec52e16fcdcc8f151b23dd03e420d6c1e206f1bf2fcc35a6575f34c58f4e7b3e5a17606fa394acc2070
 MISC metadata.xml 680 BLAKE2B 0b6b669509378e4377452e3f0020f16f41cb1c162b5596aaca7459c794b7f5c818df76969b5829d3b2e72ca0a4463a5d8b946c133acdbc063e5c4cb6a55ee1b6 SHA512 70109bda3921ac9eb6f0f09f748d3afdb977b6cb6699a457e5ad439d341a88cca2a28c229c0a7c5cbc50937ce7e8b2448156f829b9603f911b5c07807e3eebd1
diff --git a/dev-python/mediafile/mediafile-0.8.1.ebuild b/dev-python/mediafile/mediafile-0.8.1.ebuild
deleted file mode 100644
index 2f819917342b..000000000000
--- a/dev-python/mediafile/mediafile-0.8.1.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="Read and write audio files' tags in Python"
-HOMEPAGE="https://github.com/beetbox/mediafile"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/mediafile/mediafile-0.9.0-r1.ebuild b/dev-python/mediafile/mediafile-0.9.0-r1.ebuild
index 83d355ede4fa..427466aacfae 100644
--- a/dev-python/mediafile/mediafile-0.9.0-r1.ebuild
+++ b/dev-python/mediafile/mediafile-0.9.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mediafile/mediafile-0.9.0.ebuild b/dev-python/mediafile/mediafile-0.9.0.ebuild
deleted file mode 100644
index 2f819917342b..000000000000
--- a/dev-python/mediafile/mediafile-0.9.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Read and write audio files' tags in Python"
-HOMEPAGE="https://github.com/beetbox/mediafile"
-SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.45.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index 823103627ac2..e59fe32ed18b 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,3 +1,3 @@
 DIST memory_profiler-0.60.gh.tar.gz 142585 BLAKE2B aa7fd9e547eecadc184d4da5830c582a9a9ab9565f3dc9c763caaa7e75698ed6b499d2555e4a93b39d2f80f85fad025b84043e0812cb25dd1511f4ebf8da5a85 SHA512 407e44a410cdb4c7c8cc5ff40198c28012f8b0c6bba88d2d1612681eb621a1b802ef137be62fc64ca9e3c362ca3814433bc12169d7c3827bf97293c5bbb8bfbc
-EBUILD memory_profiler-0.60.ebuild 1788 BLAKE2B c880040bb2fd76f91e449527770a8b9c669e6383fde69b481e9613046d27070aae7e1b6c7079d5f0c77a077c090516a87e2c1878834832a818f9a07c3bc5323b SHA512 43f02d01b7a2aaf22620d1bb1f17cf2c3c562b1166b111365d9b81c7d4b82f0e67b674bc5eed26663a09a3584a485d17740d245a63fcc95b0d063383ce280c36
+EBUILD memory_profiler-0.60.ebuild 1795 BLAKE2B 306779b206e489492c8b02af49a7d853d390eef028ff766d5319a0164141aaa2560f64b4067d00fc25f45b0db46ce480f25b776f91ad038785baff09d5ffcb3d SHA512 95f4a018603a6a42a7c66b5b63014378d955e3b6cebc7f3a726ef93a41f169689b5eac8a7fe1187dadf9e377d2353ad9ebb5587a2bfe83ab4aabf3435dfe3a40
 MISC metadata.xml 548 BLAKE2B 744d692e6a44ddb587b1ae69c5f6ff48fa0f02b8acadcaee34242f810d1404fc6b3c4493a257a70b3af21850e08a17a8ee3758ae9e8af1937b645a2968b5d4c0 SHA512 b7872bfa470fb34a4d60bb9ee976d5a62122b0b701635e305988660952e695f52d9d4f0227518dc9fb337b4a3f6a95dc11b5298f1787ddd100b3f46c34f812fe
diff --git a/dev-python/memory_profiler/memory_profiler-0.60.ebuild b/dev-python/memory_profiler/memory_profiler-0.60.ebuild
index e95aa5f7afbe..65cfca08bfe4 100644
--- a/dev-python/memory_profiler/memory_profiler-0.60.ebuild
+++ b/dev-python/memory_profiler/memory_profiler-0.60.ebuild
@@ -17,7 +17,7 @@ IUSE="examples"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # dev-lang/mercury: collision on 'mprof'
 # https://bugs.gentoo.org/571176
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
index bc78dfc92641..b1e71db43cdc 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,3 +1,3 @@
 DIST mergedeep-1.3.4.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
-EBUILD mergedeep-1.3.4.ebuild 518 BLAKE2B b4e73e7ca11563b1201345af4df416a8842440d338ebcdc295281929ab168ebd0ceb090799e255e23da102a04f92a7c2670717238859ddc0efa35cc0007a7905 SHA512 f1260206d4634c8714346660d84970256bbab83d5afd300e23d127dd18dd804a1c387a2d294a5d568807cb1081873fe52762bfe450ff3c00e5e9bb0b035a64a7
+EBUILD mergedeep-1.3.4.ebuild 518 BLAKE2B 3b686defcf4ad98b1bb41f70f6ec0d1e4f0bab02abd27bf036d6158c71ef198987da5929aa629d6cb11bdb032b7ee059773a2a06465a98834b93520ce3fe30fc SHA512 a2a96cfa484adbdf8f7cc24208dfae0ad2e9018be4f35a5c10720ff3b2ab33cc00e1739d4bd754a63d95c0d1cb73d11e55cbeac5e87f920c2b1d3353e8dcbcc2
 MISC metadata.xml 413 BLAKE2B e71e80d2c461b4e06c5423d8a62aeba828d15e74546208daaeddde8cdacb2d29410f7ec2c6502886af026d94e829da42a9ebdfb3db84ba3a3f20576afe46a8df SHA512 a7959c7245826060b771e422e1272ee8dcf1f2c8fdca7e1648d87908249a772b5509cddadf70053b0a109d91f6357fbb88b4fd89e71c588b0400444e2d3bba5e
diff --git a/dev-python/mergedeep/mergedeep-1.3.4.ebuild b/dev-python/mergedeep/mergedeep-1.3.4.ebuild
index 086e86c3b3e6..db5b47458877 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4.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_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 0f9144465765..cfabfea25d97 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,4 @@
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
+EBUILD mergedict-1.0.0-r1.ebuild 444 BLAKE2B 258009af12151b11adc9c4c537959904fa7bf95c77449a4ff1e89bd5ab5011463f902e48e093e2d38e95a3991dc3eb5b5e1cf2d3b3243e304eea3a4e5bb44002 SHA512 ed2291b584bcc78e69c86ca4d031381e6ca08b2c486948073196d830ce1862db17dd7cbc979547cc482c8153638315f554ddf5ba9cd233f999ec30b37f1567ef
 EBUILD mergedict-1.0.0.ebuild 410 BLAKE2B c6b49b61287107c1591a3fda81c39362878c5fb2a35bf78767e559fe2f58a53c300f36d3adc24873133557ae0a501e2e9a8b33f0dd7130cf22d0b750dd911ead SHA512 65d25b201ee2d1db73eb62d52203a261b8d3890344bc3b9b2c7cfe4ee32fb43b89c6a6a6446d320448034b64c1643cce9b904291400354a442d56ef0f4c76229
 MISC metadata.xml 376 BLAKE2B 187fde54addef683a9c1fd63cebaf56d1a9e7be22bff5635291785a7f5cd15c26f2bbae8d09033364849d3a955db8e3736c4180e72ef1df38179a5764cac4d2e SHA512 60ece1ab0999b9fb136fcfc52237285a8dcb7f54f73ee1d6b4ec2051361883f04237117f6e8f5d6558b61ca94d55ebab3b40b683d075b060c99eb6aad5c29ef3
diff --git a/dev-python/mergedict/mergedict-1.0.0-r1.ebuild b/dev-python/mergedict/mergedict-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d96ac8c4a475
--- /dev/null
+++ b/dev-python/mergedict/mergedict-1.0.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python 'dict' with a merge() method"
+HOMEPAGE="https://github.com/schettino72/mergedict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/meshio/Manifest b/dev-python/meshio/Manifest
index 66b7676663d8..e7cee21afbbc 100644
--- a/dev-python/meshio/Manifest
+++ b/dev-python/meshio/Manifest
@@ -1,3 +1,3 @@
 DIST meshio-5.3.4.tar.gz 492100 BLAKE2B 2eda13879b5cfd777201a668accfea82ee852ba729f5037584b9760eb1e9a2482a8d2e3ef7774271a38d88fba2533f012049040783e8abbd35ec4c3bb720ae52 SHA512 d8e7228045aa70d0a3ca5b113a24889f97aa327abe10d2c7bbc54ec358735117b6ba37b40fbf1a168f00f96a055d6940fd2f5cd0250e20c43c50ea7827e4d53d
 EBUILD meshio-5.3.4.ebuild 692 BLAKE2B f13a4b288475688c4f2b291464841c1c136ee5752c378db91fbd5886cf52a8861903b860e2067a121f0ccf3386939590ee56b89ca98199b3572540458b02789a SHA512 cd3a33a1c9d28f705ee53bac0e1857d1bfc15b0528f0a73b3d4592e0b7ef322430a64772192bf018fd3e09651ec27aa9b448025875b9606815ea057bc9829766
-MISC metadata.xml 393 BLAKE2B a7e1dec79a05362bda35e9fc80b49bf2957ceee7365ae565525af1a882c0ab3ea5f8a006d3262820579fc6e486ab5ee4d9ea46611d022576bd1cf0d9a0d90cf5 SHA512 25a78dee1c87895b6c4c5588ca527297743cdc76c472f51abc1bf2b2e658bbc3eeaa791c41525ed5b116d86e2de91b883057e0e0ae2424d78018490f905d654a
+MISC metadata.xml 494 BLAKE2B 43f170b895da8ca56f6117fdbf06b59a5bc165bc1fc73b6f7aec0f7439550e9d425311879410240570874a63872a66aa75da26b8cfd6f6bcd42e6e1305f49d78 SHA512 7079c5f9211b06baa0bf0ed7f3bfd6bac84a318f660e26f9f0574826c0a38c6713266e87d0a61da01e3110d4d52d48083aacb945f471614116d463845e9b44d7
diff --git a/dev-python/meshio/metadata.xml b/dev-python/meshio/metadata.xml
index c168c1788dfb..7dae8a217668 100644
--- a/dev-python/meshio/metadata.xml
+++ b/dev-python/meshio/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">nschloe/meshio</remote-id>
diff --git a/dev-python/meson-python/Manifest b/dev-python/meson-python/Manifest
new file mode 100644
index 000000000000..bd630373f75a
--- /dev/null
+++ b/dev-python/meson-python/Manifest
@@ -0,0 +1,7 @@
+AUX meson-python-0.5.0-defaults.patch 819 BLAKE2B 1d6be7b3878b52aad4c0e0cf571a252727fff90e72f9c75eede3046e1736820498c67b0a50e36eba490d8ad0aba4aa645fbcd0ccf7dce5df35d0677016688a57 SHA512 37109dbbd40694070a075d92b26d90ebf42ea53004656da39a531433b31c3edf3c18fdbd5f29c02ba0f704690d6ff438a9de89cd821692fede6c9e6ebae29446
+AUX meson-python-0.5.0-pyproject-metadata.patch 4094 BLAKE2B fa9a654d90fd8e7cc9ab7b1d7d0bd6c275a0767f95fe6abb480846d53ef1b00e4e25d098c17fe22dc8137ea05adfb0d1a920c7afc9b7a60f847b489d1d3e5a1f SHA512 66c7eb0c19caffe092c51629cb789300e2e8e8b9b78161960c1ee7d7a1377e6b9fcf1ce2b8e343a1b1c418ac868ca292dd3de6c123d9434d060671cb17bf8384
+DIST meson-python-0.5.0.gh.tar.gz 30525 BLAKE2B f9afcb0edfdb06ce001b5185bf8c09de18a35d0f2d12f8fd69ed35cf17cc5e987c73724403fe1d6c44c80f1fad41b4b66b07b26e050b551673b3860a3d453a29 SHA512 e3941d258c5d16d0355752aff2f6458705a6af7d83850f679c5304d61699c393e186b9da2fe1a6405cb616a319250351e02ad81ddc8abf042f64c6b42b0be1cf
+DIST meson-python-0.6.0.gh.tar.gz 26783 BLAKE2B d5c5b95d5d609487a0efee1ce05b133794705cdb16f2d05d6e08b9201541e31f61a832c7770b4b5ad675f8dd91860c30c67769ce8fc0af2c48e65b0aad187ddb SHA512 25042ea030d2ad323c67daa0a520db936a4a4efa0de1c9f631c47fac22d797e01d1f1707ed407e2931164a35b3916e19a774ee16ab1d45fc91e41c75add57fa1
+EBUILD meson-python-0.5.0-r1.ebuild 981 BLAKE2B 2b8f82ed85cd4e9e08221596cf0d74e8177d42d6184338461cf2c15aa77060aa16f0082935b78a2ec1dbc37bf765d4b394c05fe9e3967b3004283789e8e255e7 SHA512 35d06bb9f0f3facaa3294010978efb5db56c374ed5a7d5f25f60ce334e2c7d96bd94eb3fdc76fbd44b27c6b19f141f3c4d592d661b89a7fa2e4483ec876ec2c7
+EBUILD meson-python-0.6.0-r1.ebuild 1048 BLAKE2B 2c6fa715c72007b7ef19ecc532cc740387da9d05241fc7acd14b094b65086eb863b64470da496c938d945ebc6359f1123cc68ca52a064ca91c01e617ef3740aa SHA512 6c1d80399018626a7bc4b68f6a5dac46a8a5e8f8119603938da653d4793aa1856c62e3089d0960022b1784fd66079f680575486f5e6f8d4bfcfb180d66926764
+MISC metadata.xml 352 BLAKE2B 581fd656bf2da3af0cb7a9f50ef99effc9c2fc54c5012a363a3aaf4cb5cb1715c8626aed86ea176ebbbc22ece33e8b0f76d5c818b4533f99b3bac5b92f75fff1 SHA512 7e57debaea115565ade7e8ab87af065c4580506225df1a203c92fea877a9b918ebfce6fd172412bf318be07a8a4548be492318e5626b31688ed2714f00594d54
diff --git a/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch b/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch
new file mode 100644
index 000000000000..07077ba4fdc2
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.5.0-defaults.patch
@@ -0,0 +1,23 @@
+See https://github.com/FFY00/meson-python/blob/main/mesonpy/__init__.py#L452.
+
+(Also: https://github.com/FFY00/meson-python/issues/54)
+--- a/mesonpy/__init__.py
++++ b/mesonpy/__init__.py
+@@ -452,7 +452,7 @@ class Project():
+                 f'--native-file={os.fspath(self._meson_native_file)}',
+                 # TODO: Allow configuring these arguments
+                 '-Ddebug=false',
+-                '-Dstrip=true',
++                '-Dstrip=false',
+                 '-Doptimization=2',
+                 *setup_args,
+             )
+@@ -464,7 +464,7 @@ class Project():
+ 
+     @functools.lru_cache(maxsize=None)
+     def build(self) -> None:
+-        self._meson('compile')
++        self._meson('compile', '--verbose')
+         self._meson('install', '--destdir', os.fspath(self._install_dir))
+ 
+     @classmethod
diff --git a/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch b/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
new file mode 100644
index 000000000000..fd96d942eb73
--- /dev/null
+++ b/dev-python/meson-python/files/meson-python-0.5.0-pyproject-metadata.patch
@@ -0,0 +1,110 @@
+https://github.com/FFY00/meson-python/commit/678a586427088a58dfac15bb3fe89b3d7ff0178e
+https://github.com/FFY00/meson-python/commit/c01645aa3617ccd424ef3ec052d13ac25e7df433
+
+From 678a586427088a58dfac15bb3fe89b3d7ff0178e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
+Date: Thu, 9 Jun 2022 20:24:32 +0100
+Subject: [PATCH] mesonpy: replace pep621 dependency with pyproject-metadata
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes #33
+
+Signed-off-by: Filipe Laíns <lains@riseup.net>
+--- a/mesonpy/__init__.py
++++ b/mesonpy/__init__.py
+@@ -46,7 +46,7 @@
+ 
+ 
+ if typing.TYPE_CHECKING:  # pragma: no cover
+-    import pep621 as _pep621  # noqa: F401
++    import pyproject_metadata  # noqa: F401
+     import wheel.wheelfile  # noqa: F401
+ 
+ 
+@@ -353,7 +353,7 @@ class Project():
+     _ALLOWED_DYNAMIC_FIELDS: ClassVar[List[str]] = [
+         'version',
+     ]
+-    _metadata: Optional[_pep621.StandardMetadata]
++    _metadata: Optional[pyproject_metadata.StandardMetadata]
+ 
+     def __init__(
+         self,
+@@ -372,11 +372,11 @@ def __init__(
+         self._pep621 = 'project' in self._config
+         if self.pep621:
+             try:
+-                import pep621  # noqa: F811
++                import pyproject_metadata  # noqa: F811
+             except ModuleNotFoundError:  # pragma: no cover
+                 self._metadata = None
+             else:
+-                self._metadata = pep621.StandardMetadata.from_pyproject(self._config, self._source_dir)
++                self._metadata = pyproject_metadata.StandardMetadata.from_pyproject(self._config, self._source_dir)
+         else:
+             print(
+                 '{yellow}{bold}! Using Meson to generate the project metadata '
+@@ -550,8 +550,8 @@ def metadata(self) -> bytes:  # noqa: C901
+                 Name: {self.name}
+                 Version: {self.version}
+             ''').strip().encode()
+-        # re-import pep621 to raise ModuleNotFoundError if it is really missing
+-        import pep621  # noqa: F401, F811
++        # re-import pyproject_metadata to raise ModuleNotFoundError if it is really missing
++        import pyproject_metadata  # noqa: F401, F811
+         assert self._metadata
+         # use self.version as the version may be dynamic -- fetched from Meson
+         core_metadata = self._metadata.as_rfc822()
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -4,7 +4,7 @@ backend-path = ['.']
+ requires = [
+   'meson>=0.62.0',
+   'ninja',
+-  'pep621>=0.3.0',
++  'pyproject-metadata>=0.5.0',
+   'tomli>=1.0.0',
+   'typing-extensions>=3.7.4; python_version<"3.8"',
+ ]
+@@ -29,7 +29,7 @@ dependencies = [
+   'colorama; os_name == "nt"',
+   'meson>=0.60.0',
+   'ninja',
+-  'pep621>=0.3.0', # not a hard dependency, only needed for projects that use PEP 621 metadata
++  'pyproject-metadata>=0.5.0', # not a hard dependency, only needed for projects that use PEP 621 metadata
+   'tomli>=1.0.0',
+   'typing-extensions>=3.7.4; python_version<"3.8"',
+ ]
+@@ -41,7 +41,6 @@ test = [
+   'pytest-mock',
+   'GitPython',
+   'auditwheel',
+-  'pep621 >= 0.4.0',
+ ]
+ docs = [
+   'furo>=2021.08.31',
+
+From c01645aa3617ccd424ef3ec052d13ac25e7df433 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
+Date: Thu, 9 Jun 2022 20:27:49 +0100
+Subject: [PATCH] mesonpy: update code to pyproject-metadata 0.5.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Filipe Laíns <lains@riseup.net>
+--- a/mesonpy/__init__.py
++++ b/mesonpy/__init__.py
+@@ -424,9 +424,6 @@ def __init__(
+         # set version if dynamic (this fetches it from Meson)
+         if self._metadata and 'version' in self._metadata.dynamic:
+             self._metadata.version = self.version
+-            # version is no longer dynamic
+-            # XXX: Should this be automatically handled by pep621/pyproject-metadata?
+-            self._metadata.dynamic.remove('version')
+ 
+     def _proc(self, *args: str) -> None:
+         print('{cyan}{bold}+ {}{reset}'.format(' '.join(args), **_STYLES))
+
diff --git a/dev-python/meson-python/meson-python-0.5.0-r1.ebuild b/dev-python/meson-python/meson-python-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..708c817c7349
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.5.0-r1.ebuild
@@ -0,0 +1,46 @@
+# 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="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/FFY00/meson-python/
+"
+SRC_URI="
+	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-util/patchelf
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pyproject-metadata.patch
+	"${FILESDIR}"/${PN}-0.5.0-defaults.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
diff --git a/dev-python/meson-python/meson-python-0.6.0-r1.ebuild b/dev-python/meson-python/meson-python-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..9ff05d7701f0
--- /dev/null
+++ b/dev-python/meson-python/meson-python-0.6.0-r1.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Meson PEP 517 Python build backend"
+HOMEPAGE="
+	https://pypi.org/project/meson-python/
+	https://github.com/FFY00/meson-python/
+"
+SRC_URI="
+	https://github.com/FFY00/meson-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pyproject-metadata-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	>=dev-util/meson-0.60.0[${PYTHON_USEDEP}]
+	dev-util/patchelf
+"
+BDEPEND="
+	test? (
+		dev-python/GitPython[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-defaults.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/furo \
+	dev-python/sphinx-autodoc-typehints
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# https://github.com/FFY00/meson-python/issues/86
+	tests/test_sdist.py::test_contents_unstaged
+)
diff --git a/dev-python/meson-python/metadata.xml b/dev-python/meson-python/metadata.xml
new file mode 100644
index 000000000000..e2b414a5e2c6
--- /dev/null
+++ b/dev-python/meson-python/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">FFY00/meson-python</remote-id>
+		<remote-id type="pypi">meson-python</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index d381a6f6ea1f..134d46265390 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,5 +1,4 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
-DIST metakernel-0.28.2.tar.gz 197302 BLAKE2B 86d4464a8d796273aa831665fa7ecfcf7ed180fdb7d40448d9f3c84b96aa0baf36d8dd5771f702520b44786a1f3b031531430fb3c4687fbf498851817bfeb33e SHA512 5e41dbf5b3bc1121e2d2ba4a60cf3e2bd52c6c19f0965442115e241b1a261f441b01b29e5771539a9ef53a4fd421c58e8ac45296112e58c3a71e93a1e918cb17
-EBUILD metakernel-0.28.2-r1.ebuild 822 BLAKE2B 5b91da4a69f58d03550f50344ae03002dac2e22bbd72fb19ef9083dba64de012bd02caf3ebc9642725df329fc4e2a01f3279015ab83fceae23f479c90c060ed3 SHA512 5ddcce76f6ca3b82fd561653bd15574d452184642bb1410ac62198956ec536d092f7272301f6a83409b9d84250ac570e248a6398d761c3f2de00e0291a2c5fff
-EBUILD metakernel-0.28.2.ebuild 789 BLAKE2B a4e74c9c62c25b4480b9dfa530e0b76b0f90cf26897c8c20f5cfa2d5d1533b7e3d0071439de3c54820951441c06bd3784704c7541ae08c696d2c7dd7bca2318a SHA512 c2f3e1262227045df4138a71488579a190da08599b5526a65180d8121125fe1b7e724a0589e5172566c12c8e016992081ddb2a18ab80fec8ed511a5c28321b60
+DIST metakernel-0.29.0.tar.gz 197295 BLAKE2B 486c57b3d0c4c41aa73c129cceccebbf818a4932beb35f5114723e43e37f496d04df50d3cfd09b7d4c254f5dea02d1c7b43f9f6e9c9e7af8e946fd79179a892b SHA512 0748663e79776680f9c52cbc4b0ee76f33ece0a489740068d60455c5003ff27e3fbe8f8c1f0f51ffe9448dbf32109e7d15e8d851198e1947d638fe91dfb4e39c
+EBUILD metakernel-0.29.0.ebuild 863 BLAKE2B be8491354e3632d786060813de5f3a8ee0ee34cdc529ccbf57f6736c2195b8999a1dbdfbb03fe0da430145c6200f15cb13bfb1eaac5a5d9a5d20446acec3aee4 SHA512 04ac387af15e33b725ee7d9017d9b3eb79a8f7b6d687ba3c5806b7b1a7e4d96f73f10f23e348ff314f04eba71c4501b9a0ea56e4e1a03e5149d4b0edb6adb894
 MISC metadata.xml 635 BLAKE2B 3f108898788d2cd20d5638feaed2cb9ecc32db4350f8ee5996c7d3724b304fae040cc4c9ec20d9c7fde8041bad1ff1ab79106adbd17fe57722daa7f191eb2dbf SHA512 d84bd755109e0d4b45a2e8dec6b7ed2a5ac9dbcbe9fc8453c599969c06dc3d4e7a9001382e37d1e7c2d0fec940cf636b29ebd7e6a2ea7aa2f1420d20a4194e1e
diff --git a/dev-python/metakernel/metakernel-0.28.2-r1.ebuild b/dev-python/metakernel/metakernel-0.28.2-r1.ebuild
deleted file mode 100644
index f15f9a247ea6..000000000000
--- a/dev-python/metakernel/metakernel-0.28.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Metakernel for Jupyter"
-HOMEPAGE="https://github.com/Calysto/metakernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
-
-python_prepare_all() {
-	# cannot import name 'MetaKernelPython' from 'metakernel_python' (unknown location)
-	rm generate_help.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/metakernel/metakernel-0.28.2.ebuild b/dev-python/metakernel/metakernel-0.28.2.ebuild
deleted file mode 100644
index 58faa4a144bc..000000000000
--- a/dev-python/metakernel/metakernel-0.28.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=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Metakernel for Jupyter"
-HOMEPAGE="https://github.com/Calysto/metakernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.2[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
-
-python_prepare_all() {
-	# cannot import name 'MetaKernelPython' from 'metakernel_python' (unknown location)
-	rm generate_help.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/metakernel/metakernel-0.29.0.ebuild b/dev-python/metakernel/metakernel-0.29.0.ebuild
new file mode 100644
index 000000000000..442871c6c8cd
--- /dev/null
+++ b/dev-python/metakernel/metakernel-0.29.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Metakernel for Jupyter"
+HOMEPAGE="https://github.com/Calysto/metakernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-5.5.6[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.18[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jupyter_kernel_test[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.25.0-disable-brittle-tests.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index f89d1c893475..73475c2267c1 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,4 @@
 DIST mimerender-0.6.0.gh.tar.gz 16677 BLAKE2B 55db5bf97cd65de89271af8713d9dbdebab6254fa2dc62cfcd78394f4333093fdc508ad6e93f104eee2f3d8a1ceb9197353b4ca085e3b4887b4560c2c65c45f6 SHA512 68c584ba8ae608097b739078dd729bd8b5493087901ba281959abdb81d4e6052ff045c487fde4f67744b413bab36d7f938c68b162049ebe33bff642571b8fd98
+EBUILD mimerender-0.6.0-r1.ebuild 722 BLAKE2B cabcf9c68e8edcb36da31c5bd73da5307b813200b25c3c13722c2f8abdeaa2794ca8bb8078885c13d99d552734f8d772ced5768b3e4de4dcaf28ab63b1050602 SHA512 79dae7e3fb652830c76cfef2d5f55ba3d5081e991df8597e8887baaef3bf1ec727c1e461acfabe3bcaa8a3b2338b3e856cb12b3f7e0ac1aee80e7f6e45745708
 EBUILD mimerender-0.6.0.ebuild 687 BLAKE2B 2d456cef3b2d10dbf55d7088aaf5f1fbd806644a271524d6dd571e9135e1de201d0e2633892def7a59f0bcda9719a1f235022960f88d468cba20c777cbaf4199 SHA512 6cf3b50633225fe57b44423f11964b71af1f76a8b9f9c25ca01066907d3e818ffb3f50e44dce584b4f003d501e4d25521cbf7108aa50be8081d9f0f4e65b5942
 MISC metadata.xml 376 BLAKE2B 107a6d555f9627145798ad26abec52ca2c37d62d3141fe0d36dcb6e0c9be40d514eefa6b0a3f6aa813b3f30411a61d5e9ac35b50ec20a719e0c11b0cf9017f3d SHA512 ceae628b841986e04e52c4c093d87457db0399f18bc102a488de0f638a66dd39624c968e5ddd62219461fe4b49045169f1d56380602ac7f26d87876186c3e36d
diff --git a/dev-python/mimerender/mimerender-0.6.0-r1.ebuild b/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..71402845f379
--- /dev/null
+++ b/dev-python/mimerender/mimerender-0.6.0-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+HOMEPAGE="
+	https://pypi.org/project/mimerender/
+	https://github.com/martinblech/mimerender/"
+SRC_URI="
+	https://github.com/martinblech/mimerender/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/python-mimeparse[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" src/test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/minidb/Manifest b/dev-python/minidb/Manifest
index 6e77dc5b6250..15f1d755230f 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1,3 +1,3 @@
 DIST minidb-2.0.6.tar.gz 12019 BLAKE2B 00e070d1cbe1966d44228f6ad13b9280ee8d79b1b37a72d685dc53b05d329e6ee02f77a7cac729e6c4e651d66d88d1fcd7be7f704e91b3ef2dddd8c928bfed50 SHA512 17c845d5bd45a99020a96a1e1aeaf2d7663f41dc23828b4ec00e49bebb066e021d751b9a1e1ee846973306198224f91543d20219beaa40b4d245cccc4f746b93
 EBUILD minidb-2.0.6.ebuild 446 BLAKE2B cde694729d3e7544e30c266d42f2b7026b51fd53b51a320546645a179c8808b040ada4f4cd715dcdd4521a639082d6fa718125977af6143e929a911d5f369085 SHA512 b5fd06e8e45d4563b8d61c1085f5868c38c471a7da7f3e57701a815f6eccfdc6e4fe952d144670ce2c44102660289337260796273a18c3ff3754217643f5d3a1
-MISC metadata.xml 447 BLAKE2B 73d7b3ca462bf8154416c62316235f63d5be06e71d44315bb07924b211f172a90f0191deb7a4799c352ae68946e9202d7f3c9e74b966ba6531168a4c238db0aa SHA512 a0e7a7c66491ae1c0e1f63bde0ca685db3a1810cfd1235438d46215a12f435c9f743c1e661d8e4cab0702269f73c5f28a391a8466c17220b653eb76b4fd7a5db
+MISC metadata.xml 548 BLAKE2B 73e5840f9b81cbd36181338a9e0c68b688abb69c1a71b082b3436ec4d4f8750f77d06593e1b823243f5c86a516956e8b25db632eb318ced582bb94c0717562e1 SHA512 ecd8a69c67f4c7fd24df1a1c85a41b2f7d6ed8850e5b3c8d09bee66da55302d26f12dc73b5210634060b5da71477fa8b65d055e98572490e31ebe686d88925fc
diff --git a/dev-python/minidb/metadata.xml b/dev-python/minidb/metadata.xml
index 074aad559881..227580c72213 100644
--- a/dev-python/minidb/metadata.xml
+++ b/dev-python/minidb/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">minidb</remote-id>
diff --git a/dev-python/minimock/Manifest b/dev-python/minimock/Manifest
index 54f75ef3b48f..bdaa13093343 100644
--- a/dev-python/minimock/Manifest
+++ b/dev-python/minimock/Manifest
@@ -1,3 +1,5 @@
+DIST minimock-1.3.0.gh.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
 DIST minimock-1.3.0.tar.gz 13828 BLAKE2B ed60d9725ada7173f88cdd64d76e3674fbeff352f4ead919f2a3a94ec871189051da29da5ee285b4d663eee143da847c95e35286cf33a587abb7fe95e02a4824 SHA512 de7feef7fee044ba45a52d7c83905d082ad2ed2c3d12b294a6995086b377a22317730326946d048b19063758f158a9bee7bbb6a79c9ae0b4ba7a93e4a21ea196
+EBUILD minimock-1.3.0-r1.ebuild 623 BLAKE2B 51e4314a1dc20b16a4e1aa4ea314b097112f02b78424ad8387063649ccd2190c4c7efa480cb53532cf486e0eae77cf938c9f3516d6938ea4ec2b8cfbed6e953c SHA512 a3769955bec456eacdaa521ae5bd1b83c34e6a58ddf1039321efb66cf7b0882ae78ece94dacdefd47f28c2f9cb66e9b0bf85a778aa5fe1e811b844d406c92287
 EBUILD minimock-1.3.0.ebuild 558 BLAKE2B 7916e6d42927acd97a9bd488f22a5dd320651819638808b59acd7f19edecff6c80a7cf90edb78cc67bf850c4ba06ed281c234008d818a15f163dfd58a882e3ea SHA512 755ecccabea68142268eb5ad43ba1e42f29ee0ba92524e2be33f23ac63a15797b603354ddce7d12f1b581f5188f9b3b3fe94ef948599a75eb3bfdf76eb6b6e83
 MISC metadata.xml 390 BLAKE2B 9e75c471275dd555065f040f21dc122c7517752b5e8c1944b6c9b70959786f701f9a6e73cb38d2a6707307b5293ddd82da1f84a5407566f516a6a744fa9caf63 SHA512 3506164492e1dd9b17e387f3bc2e57d8663cc899b0dd40bca73e8b4bdd9c62d845465d7fe91ffb5d22711e08a66da984f97d7d56374ef39cdf3cc62354dd2ffe
diff --git a/dev-python/minimock/minimock-1.3.0-r1.ebuild b/dev-python/minimock/minimock-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ff4cbf3dee73
--- /dev/null
+++ b/dev-python/minimock/minimock-1.3.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="MiniMock-${PV}"
+DESCRIPTION="The simplest possible mock library"
+HOMEPAGE="
+	https://github.com/lowks/minimock/
+	https://pypi.org/project/MiniMock/
+"
+SRC_URI="
+	https://github.com/lowks/minimock/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+DOCS=( CHANGELOG.txt README.rst )
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 21d0870f17d5..41670df59d22 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -2,4 +2,4 @@ AUX miniupnpc-2.2.3-shared-lib.patch 1297 BLAKE2B 006825495896e2c614611abfb51453
 DIST miniupnpc-2.2.3.tar.gz 101360 BLAKE2B d2a7f64d56be524c5c4aadfecd40da4e1ad040fd7eab64be5b5716cb06047e86e3ed6a9c17f697fd3210af0fb0a6ae032b6ef0a5c1f0d96a2e185db97b0d06e8 SHA512 8b9555d336d5dfe8017a16727f964cddacb3f2bf3528fe3dd2416480da5763b24e1740345e470f2123c170d79d88444e41dbbce4536e6069590925e4805bc5ee
 DIST miniupnpc-2.2.3.tar.gz.sig 543 BLAKE2B d10bcb765e0d7a1eb68dc6269080b71535fced443e801a09677872bc498c866a02f22d851db963fb126331f28d2314542507713f514560d9d6eca2262287dc8b SHA512 636ad425b430629ee91b2755b543e9754aa88e243972f47839a2ad958757a12ff598f962e9328e5ad0fa3e0b2f895854c9cb3ca099048e7c132c8ce27806986e
 EBUILD miniupnpc-2.2.3.ebuild 898 BLAKE2B 97be51c84d3ce87cfd374dd0a232b9a86fefd476e5d4566892aa65bed032a2736abc9dc8663a91b09e04f03ce87c6496643a32d304b3be8cf1f4b5dfe0bf440b SHA512 15dd97bd7ab4f6f04b28f8cfb73d978ac3257ec4a721597d9bdb3a90a6829c0fa687c4a9b1018ed3f4352df567c815d76603d3d8bebdba74858e194f2f57d64a
-MISC metadata.xml 320 BLAKE2B ad0563e313308b3f4e7449b7010821c45c720f90fa9dbcb72ddd82707281ccff98d0c9ed60083d3b3e6c650a2d4f57c83fc0194758e1fdbe7ea73fa0fd6f850a SHA512 72ea7bf08fc1d4a32c473d8e62a368e9e79b52814a4d40a3f0be85bc208e2a057895c8db55196c232564e4a496b5e2b19a1206e967450b715f059219e13c53f7
+MISC metadata.xml 377 BLAKE2B ea6ed68d8dc3db74e7f2c667a78a74538e5ad3540b1c1cd05c51309188d468a63cc0672f46a35f1815d7317c70481c414f832bddfc0e8b29a960f9e68faeaeeb SHA512 eeb47bbf1e29648cc00c7fa2adfa3faed52a888e943d7fe34e5fb20dbdb1e323fe6d9f102af5737fc73b70d0f596274ad7a8c54904c8b6a9d6af4973aa69a481
diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
index 3797ac3fc7ad..304bb292a330 100644
--- a/dev-python/miniupnpc/metadata.xml
+++ b/dev-python/miniupnpc/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">miniupnp/miniupnp</remote-id>
 		<remote-id type="pypi">miniupnpc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index 57c95596a3f1..17469c4ceaea 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1,3 +1,3 @@
 DIST misaka-2.1.1.tar.gz 112700 BLAKE2B 0d50cfbfa127a51bc6da2abc3a91c8ce4706b6a1dbbfc4af14f85d47262ab1cca4bdca0ba7056e668570b20bed1f1a150124a2d5da45ff8866cb7007b2b9bca3 SHA512 4b9288d56ddd57e07985043acbb5a2dfec9b7c0bf385b689b17f2b062f5d7aa961e0dab8e237173e714b13aa5eabafc646833d5a78cf728035444d6fbd365bee
-EBUILD misaka-2.1.1.ebuild 566 BLAKE2B 20ed4c677b516f49f5429d6db17f03ba44cc5312194baf35c5198bd2c338cdc58075d5fb3f5c8da020406a5be08d6ec3d51ec1ea9d953a91c8e548d567539cc9 SHA512 700cc535423921af1e907c605507b45acf15b30b481af0a4587d5c60d550f4d14e2f62e65066212cdadb6bc4240746eafad5932ea1c01bfea6aa6b7c3d4767f3
+EBUILD misaka-2.1.1-r1.ebuild 567 BLAKE2B 2a5e8aa92646da71b7e5dd84d95b871569585a5af2022305e171a9e98520015765e69f11f6d0e954045052cafbc9da32f07b37a152ccde1b518381bbf40a9c4b SHA512 ef7562421c045e37a4af702a5702fef19eb79b7841834e2398b83d6952c481b0c89971722ca576322d68895e1909c8e3bbf48234e90f29f01d49a323f9150073
 MISC metadata.xml 499 BLAKE2B 88b448e6397db40d76c2f5237866846f7461e6722c5a468f8318db789a48df77567e03461927271af3c6e68dd7791d657af88d3d03c5596a0c9b21c65fa25f8f SHA512 99761aa316e3df24fd63cc51af21898499ae405f0ddfe54e391d114ca02dbd0ee1e3f365c958f70c33293cdfd7516f60e91ccf10486978c28ca0bf9d331840ba
diff --git a/dev-python/misaka/misaka-2.1.1-r1.ebuild b/dev-python/misaka/misaka-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..279edf81e1fd
--- /dev/null
+++ b/dev-python/misaka/misaka-2.1.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CFFI binding for Hoedown, a markdown parsing library"
+HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
+SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
+
+# FIXME: tests requires write access outside sandbox
+#distutils_enable_tests setup.py
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
deleted file mode 100644
index 17ca17e0548b..000000000000
--- a/dev-python/misaka/misaka-2.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CFFI binding for Hoedown, a markdown parsing library"
-HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
-SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
-
-# FIXME: tests requires write access outside sandbox
-#distutils_enable_tests setup.py
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 4fc6563adda9..0c80a90031e5 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,5 @@
-DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
 DIST mistune-2.0.2.tar.gz 75778 BLAKE2B 6ed690a70c54a0a06f154d42151d7d857f0e70cfe32529d7176726bd1e2f7a4fb9bf66be476af139c338c9f8b0d0de6541727e18718f6537d3a07771f34441f8 SHA512 8250243bf6cd2496ca1309e1fb062507f37c197817a4c5ec1a8e3c5865b6cc58866b88158b3a2e2967ad53b1f1a668a2e4282c30179ce126242c528000215992
-EBUILD mistune-0.8.4-r1.ebuild 550 BLAKE2B f66e83a4dd3f2f9f2c2fd9dc0c15c1102e74b47b2b820b8c953824179356067f193f8ff2de5c237fb1c9c3d7646f6811df4cd1b78f5a250cc958f79e2565186d SHA512 9f70a3f03163f765705d23b366a298ff4edbe8fcf2036e5151d5c38f07d2838ecfc0dd5b06730ac0b5c44e4a1b32c1184e41434a040af379f526ee5b307abac3
-EBUILD mistune-2.0.2.ebuild 584 BLAKE2B 76210a011cff11725ae45f2d706174d4a2d4effa505dbff6ff751ff739ac366d49a426329670b74880c9b8464c02dd12e41415834304e139693d7404d0e326e3 SHA512 261be31c55a492f475ae777d40e342171906d5ba4031bb0aef2ecbfd28c26b0327cbfcfc4ab1063859e6006ad0d6775781a3914e22bca8dfa061783401e1b4a6
+DIST mistune-2.0.3.tar.gz 75763 BLAKE2B f9508f6a3b955d716947ee8d3876b63a81113a4886dfc3212bdfff00db4c84527b334037eefae4592660ae802e14cab21727c1a50dfbf0ae5223a409688301db SHA512 b6eb9585616af3e1a10d48e469d893d3965048d47a772fd6dcfad4aa026feea8ffe8048c8e93b2d430c07b4bc15e8e8afe43f3a12cbeb8d70872af8b83dc9358
+EBUILD mistune-2.0.2-r1.ebuild 589 BLAKE2B 8292ebc85d55dd390885c8cf972435a5c0f7533a8f0ac1d866e1b45f57f38135df7b484a1aeeb220fff77090212f68dda3c29be767bc1fba8d41553f8c112f0e SHA512 369a8525bbd5851d6bc6ddccdccefde590e83153711cc15253e2589c622fdddb6f3dd8e24b8e406f2baaf0785cda237e07c715d69245fc92c5c4bfdffebdea69
+EBUILD mistune-2.0.3.ebuild 597 BLAKE2B ec9c0ce6de4522bc278245b804f6f9932cab6a009dcc05b7f86bd589aa2b9ed9aa0f6328e0adf22f0b815f114f426b0eff6fc690666ff0167fd8b1f0c09354f0 SHA512 062e3ae5450e1bb2ec10724a324929f23d7c79b891de7bc3f99959898ce6c5ea3da607d0e232b75067240908abd153c8c2a19e4b91c9e57f033c123d47ac0ee5
 MISC metadata.xml 403 BLAKE2B ed684a2a6de8b40c202467abc3277bfd280cff4441bd265b2ceb36105a4d3315a5147db7ec555a01c7cdd5c2ed26521254c75586cd44edbeaf0c59766800fc71 SHA512 a14b77e8fca2f7c7c51803f15a53ab82198d5a0682f7ebc53d5565e5b50d22c2ae196607da6fc67ef2c07c11a5469d394b1753546c270735dfa56a99bffc0f28
diff --git a/dev-python/mistune/mistune-0.8.4-r1.ebuild b/dev-python/mistune/mistune-0.8.4-r1.ebuild
deleted file mode 100644
index 3972b2bf063a..000000000000
--- a/dev-python/mistune/mistune-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 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="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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests nose
diff --git a/dev-python/mistune/mistune-2.0.2-r1.ebuild b/dev-python/mistune/mistune-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..0808b2900d27
--- /dev/null
+++ b/dev-python/mistune/mistune-2.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="
+	https://github.com/lepture/mistune/
+	https://pypi.org/project/mistune/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-2.0.2.ebuild b/dev-python/mistune/mistune-2.0.2.ebuild
deleted file mode 100644
index c70f0620079f..000000000000
--- a/dev-python/mistune/mistune-2.0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-2.0.3.ebuild b/dev-python/mistune/mistune-2.0.3.ebuild
new file mode 100644
index 000000000000..718413dc53f7
--- /dev/null
+++ b/dev-python/mistune/mistune-2.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The fastest markdown parser in pure Python"
+HOMEPAGE="
+	https://github.com/lepture/mistune/
+	https://pypi.org/project/mistune/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index 2ff33fcfd557..096207dd8e12 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
-EBUILD mkautodoc-0.1.0.ebuild 605 BLAKE2B cfc9f5ab3c8c01e45fecadd39b05adeb8868d61a42ce83068bc771800b0be17a7583be42f41e0238f2484cb6a329dca587b19bb7f569966b76b5abf8223b84a0 SHA512 6a44b800e8718310d30c0330b722aed3a3e82f1ecaaf07dda0a7d1b7231560c6939945d80d8f25bad2031927fa5f9017f3ca6b36febd84c3dcd7da4bbfb66854
+EBUILD mkautodoc-0.1.0-r1.ebuild 711 BLAKE2B 63a80be760fa044836598ce7f8302cd1b0df3c9e2e6e61095083df33a30de0f8c2e65f0688599b03820a4634da0aad2ef1e27741982ad6e7006f323c4e60cde0 SHA512 85e5b11be1c5dfadc160261040cd7a741869566e8108c41b342ed5cae6ce68ebafbf8c65ad58eb4e7ff792629fbcc0cf638f850f8aa4a22cbe778cd3b34f4fe7
 MISC metadata.xml 517 BLAKE2B 982eb0e73c28e8565ebcd08f9822e5d35258e8cb1f44b57a3218b928c6d9873b1d5ae8890d4688ca4775806aa140c3be3ba52c9af8afe87f7ba2e89ae09c1e97 SHA512 640db2d746a27484dcdbd4d84951dd207a0ec6ce9047346432fddc1b08ad98f19077d320c603a85297161c8202dd1c5328486280c343987976a3108667978a51
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..05071c660cc5
--- /dev/null
+++ b/dev-python/mkautodoc/mkautodoc-0.1.0-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Auto documentation for MkDocs"
+HOMEPAGE="
+	https://github.com/tomchristie/mkautodoc/
+	https://pypi.org/project/mkautodoc/
+"
+SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}" \
+	distutils-r1_python_test
+}
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
deleted file mode 100644
index 228c3dfefd11..000000000000
--- a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Auto documentation for MkDocs"
-HOMEPAGE="
-	https://github.com/tomchristie/mkautodoc/
-	https://pypi.org/project/mkautodoc/
-"
-SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/markdown[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	PYTHONPATH="${WORKDIR}/${P}/tests/mocklib:${WORKDIR}/${P}"
-	epytest
-}
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index b11b5befb244..5c43d0e900ac 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
-EBUILD mkdocs-bootstrap-1.1-r1.ebuild 468 BLAKE2B 60d5dc716d6f919adb1d899b319462655ab8b11b1f226da2f725d60fb7de66d2fa87de877f35943f26f9b81ea7fa2bee4ca5dd04c766dca341b476bcebc778dd SHA512 2a213df10aa9cbfa4a4cfb6ddad1c1ac907a322682197f9cb49013c73f69f21103aef7809f3c6406babe9eebe5eee8c2ac73857be66307fa5fe8910acb24460a
+EBUILD mkdocs-bootstrap-1.1-r2.ebuild 499 BLAKE2B 88d01fb0376e2d475981639ca581b6afd283d5088e8acac00e59b0b3523d863dcb082c5fbfb31ce9030783695b8d80d9940ccdb9573d70be134be47bbbc1cb01 SHA512 823de587b3544daaaab017d9d3c84029b3d59cb979f3530049b86a294599b32b03df2db2480192952cbf6f8f6f3104ea283e79fb3e2f70af41674a9bcc880f6a
 MISC metadata.xml 449 BLAKE2B 991a60ba78b90e5b405993269c325a7724fe2c8977836ad2fb15e5c4b429236e7e03be4f6f91dc81a954403036e39cb30ea419a1a79589b1b33e63b3220630ea SHA512 ce0378db70f5c4d524ae77bdc4b40c99ede5741c49d59669d63ad026ad85dfc57e11880fd9476021f2d1d080ff8e4540a07bfb2f50fe34afecfaa77bec78a1b7
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
deleted file mode 100644
index 417d22e6ad23..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.ebuild
new file mode 100644
index 000000000000..1bcbb3dc774b
--- /dev/null
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r2.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootstrap theme for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index c40e93d983f1..290a8d253b10 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
-EBUILD mkdocs-bootswatch-1.1-r1.ebuild 471 BLAKE2B 2aa2d4716aab9fa72295e6296f297b79632a0ee75f9a7550802e5fc550c08a6e453926f62c1bab715ea20b813b0d5689a54d63941cd1509435a837f1f0b9e5a5 SHA512 4dad4556c4672b33ed97d51912269a4e7154cbebd92af457bb45d9ff3126f6be4a0688da1851540747af285f5548fcbcb0a4efa6c70df0253896bf5581ae216c
+EBUILD mkdocs-bootswatch-1.1-r2.ebuild 502 BLAKE2B 849be6572aff6dcd26eb11fe1d7722ce06632eb23c898165f83be219347a8aec8e93e0109f42dca8e53d5d6e52fcb54d039a650427653d99b0481cd1fdf122a7 SHA512 9ec10c6d7b1abb7767431f3fc03cd6acd36292eb53ab33bd15f2877463d818ff06c357c23ebf0000a9b645a107b1572dfa46be2706cc2f0a7d92cf6f7f4bc2fe
 MISC metadata.xml 451 BLAKE2B 6604531dcf8e275e499aec87bcb7ec7de57ea73912e4178b40d342a4958832952f8f2c5ad5c3b45fc2aa71f9afbdfac0fa997c8fd2a49adec7a20937781617d6 SHA512 2edffa466941d9b6c5cf6572d785e829bb41dabc6d55ade2cc4752cee2ef4fb232a1731d81e173b40c89453a04cfd061b59d6a9bf99a9e21296bbf89a1628fba
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
deleted file mode 100644
index 23d161cb9901..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
new file mode 100644
index 000000000000..8976a0763c55
--- /dev/null
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+DOCS_BUILDER="mkdocs"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bootswatch themes for MkDocs"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
+SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 17616a1223f3..56f48f83e0e1 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST mkdocs-git-authors-plugin-0.6.2.tar.gz 27623 BLAKE2B 7b0dd3b865b067b63e467fa75018a92cea8cfeabdeb66791664ea143ebecbb072110698f1366f917f390dd29c33794c7d2cc03e03bb84f8913b572d667e77b9d SHA512 75e4a4e6f3ca443257b5f61f5f0d9784cb4bb28a5a03412cde5c226da697117a29c2f4a3d1cac2aa362421f244fd56ea8580a923414a8e096bedc4502afcb5b0
 DIST mkdocs-git-authors-plugin-0.6.3.tar.gz 27644 BLAKE2B a8778baeb504db5d0571aa20603e8d60e04d8c315c096b5b3f89bb6a3b433a11b04a510d7f80ae86a9bb54259c6a2b0f2e1cb5cdade4220d4dfa1f06612e4aea SHA512 ab1f6984da002b72af2a53131222a3ff7b6b50a7a57f5d1986bca9e7d34365eaa5bfdf7d920e4dbc555e332587607480eef4134d847faf866a3b4750db3747eb
 DIST mkdocs-git-authors-plugin-0.6.4.tar.gz 27799 BLAKE2B 02456df969fac72fc29906ed6faa34ead8d04dcd005fdc39bf72393e5252934c398995cb07133107af99672328d03b96e9a19625a7a83ee438278cf4f8587f50 SHA512 948b59bed123acc4b02a01248b831ac27fd98a24653fbae315424a1da33573d109667ff8b836be454e7c9b56a6f68f45200effe8649fd4fe6d5551d1b93a6cd5
-EBUILD mkdocs-git-authors-plugin-0.6.2.ebuild 1235 BLAKE2B 5c8422d30f2b4e0d2a89ea8cef665b718ffc69fff1c40547efab146b9869a6c933df00b9791f3c7e8e2c03e39e85593ff73cca13a047c3a92fba7450851503b8 SHA512 3c19312212180a4074d5ff8a20ac80525caaad6300f903db1ae02f79d8ec9f24fc60ce0c2d91fbdd9c1c608a52e98090ee8bbe67756602d046c585d19d72eb76
 EBUILD mkdocs-git-authors-plugin-0.6.3.ebuild 1233 BLAKE2B 89fe7ee0e50bdd73b247adf81943b4c48271d48ca24c5e0bb911f4b4d6980bd1c3f866fae432773b18ce4f253d9202cf8a0f0e618d7234f41f2e36e10ff95c6a SHA512 e3d7b905f6929aecabd899a369ff62f4ba0646b499e43aa26573b104222d7b4d7c6c6e1b098c8379c677ee47a8df221d7248dfee22050c4d104e542114dcd380
-EBUILD mkdocs-git-authors-plugin-0.6.4.ebuild 1259 BLAKE2B 06ba7717ca6a4f8e9fbc1677a5a2881022180997c8d7c97821cf28950109bc62bb4bec47ba9ab953cb009381a5d82a1a93cd9ca77af50548a15e95cb8c136149 SHA512 15c4c591db3e928ba82bab38eb5d2854ae59869611d50e9847c09eb889f6629017d957ccae244c170add5376ef6d591f00da848615183b741b0166a1749a28d7
+EBUILD mkdocs-git-authors-plugin-0.6.4.ebuild 1259 BLAKE2B 0068f2359374ce6f4540c8534e528ed60809165e8df55d26c5c5578b6b2c6f87cfc7684b2bbdb48498c198b62e9632c663eb5ad33b223554c9e382b340d1b9d2 SHA512 be9b53722fce8f2569ee7741dbc2d4e8520a45baa6b5f559e01f183e071910e1fe483ecb1dca7e2660b679369c65080ab7e7522077dfe6e15f14b1ae1b733469
 MISC metadata.xml 564 BLAKE2B cee03d6742cb66a51c92f8999483f6c04c2b3fc7e8b88f5882bbabc577a54e922bdccf8a1a467e601c43511a372ac90ff8aa4500bd95715cffa83214ee2e64e9 SHA512 2b5539fff2990ebd293715b659e7b9bdeb63117c35933f49a21b873b45188476d3d44f6ac5b1656ee598f028e80f648b91b36ef4dae3f900705dbe2a7355356e
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
deleted file mode 100644
index 5e3f4cc0b40d..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
+++ /dev/null
@@ -1,51 +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-material"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
index 9351c88694ad..4a07fabcbacf 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="dev-python/mkdocs-material"
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 5355994e20a6..0c13b90ba0b9 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,9 +1,3 @@
-DIST mkdocs-git-revision-date-localized-plugin-0.11.1.tar.gz 369943 BLAKE2B 261813f3d63d6b1bfb021aab3f9db96f7977ac8f6bf6239158f1d8045e1eb5b21b89f2c4eb493634944b202334f59ce589797624137bfc643cda3ef52969bd73 SHA512 fb5e1c1b65f431585dc6a6887fc079a3181e73286697c331317a69f7748453af61abfb8fc58eb55203f09c9a70c752781dd834d03e13184ddb0bb761aa10e371
-DIST mkdocs-git-revision-date-localized-plugin-0.12.1.tar.gz 370763 BLAKE2B 6b69b34a18288d042aa754bcb6f3c6a3b96de0016db1ef888d2b0fe09f479964e6d0473d8af700aec904befb79d5a56e775847c87cd06b1ffc90cfdbe6e73b18 SHA512 4368ae0341fa9e3af08f93cce883b03cc9bd3bef16dcec7314c7e439d6524726173ffb60bbc11bcdd9e3c9ef5f1fa7d24a1c01dc543241061c61a8b0f5044614
-DIST mkdocs-git-revision-date-localized-plugin-1.0.0.tar.gz 375656 BLAKE2B 3dc850f219ca0396015c474d714412253b05075f5ad55fbfdcc4ed90468466e6c6735904517d598b66cf408c222e83ed35d176b1379a26a97b64d88bcbff06b6 SHA512 632f4e2d0ce8fc0f90707918526e49e2752ecc36c2623eb0df76d49476f6e4b347265166f5f1d6148475bb01bdb61a6337a3edf6ccba2cccb2c372a9aba70cac
 DIST mkdocs-git-revision-date-localized-plugin-1.0.1.tar.gz 375668 BLAKE2B 355b0fdced378305dd12c72d05186ef50fc1e5b7e5302c9c0887ced03329d598528367313e81d3c8a4658ed1bb2e940c9495c09c2e6e40a03cbc52833fbb13a5 SHA512 7f54ac18bb09ce1f396d593edb5e456476c18c68464dafc62e6b6e1f3aa89735319016925d2f2b8a4ff7aed03d8e02109da23f23a84d9ae0d138bbca278aafd5
-EBUILD mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild 1320 BLAKE2B b079b62494e9b4f0b4f6b4dbc6d073d5f2dfb9839b462b880490765bf79c09d0946845847372f22a0588408d39c63227790673312545a030aa05fef641954ea0 SHA512 f8551f29bf0fcaa2727c7454cf3fb57d5b067e6d44a4e905bdd3004176ce8fa373febd0bca18e56f488a0d56d8f9ebecd4e3381ef0d57a9bb304b17d07ed01c7
-EBUILD mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild 1346 BLAKE2B 7125ec011a060758f986229f87c2c456d8a9931e156ce68842e6808e49d61aab7f653ca240e70eb823d166cc134ed93d720ac31b44b39643ab09b4938986babc SHA512 78f577fe4a2770ace8f4d3096e58480c92e0fb2f426081c9cc032a784ede5e3da76068bb4cbe76231cffcf85903bb90fd08c945876f42d98ad76c3cb7eaae234
-EBUILD mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild 1465 BLAKE2B b52c4659e785f4e87cb36e39941dba488d0e3e6c9b1ebec114c28cd019c4bfc25245e6c517c2e6320582f468c803719735852b5d485982ddfd13045c7929419d SHA512 08560f6d0a2a02094eb1110ae436d9093fc0dca72cfdbfd28691f62f4eb5ef64b17429f62d119acd1d7614d988a34ff53f3aacad8c2e9eac1acf066a4a43877f
-EBUILD mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild 1467 BLAKE2B 6bc43c17f0a85006ee50ff6f22a4293d023fc623ec0666e9e4770325a55eefad38aa3264eac8745f763a81d30f5d7ca54814a3a922cd0dec752519e2e052a912 SHA512 6344a596c3afc900a83eb12df2fea094d113ecdb65fbcf20cc2e2aeb995b58615cc5bf13083b849df21373823ed99a7f8156be3afb93b4ee4f1b56fe68e77540
+EBUILD mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild 1465 BLAKE2B 1a56964093c775066e461c1d8aa8000ecc9b2a5556961b2f524efef14088024504f1cb7aa8945c2fc678c21e2f568a955b5f3e5193e3a2cecf6db6c357cadcf3 SHA512 c3040df805f5d9379ffa4e5ca6131052c75ea238aea4e512a298d0cc3e2420c2cbd8360f72151f37680931d506e8f876598138175b152212e24e98b82536cc87
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
deleted file mode 100644
index 6b9312abd7ea..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 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-material
-	dev-python/mkdocs-git-authors-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
deleted file mode 100644
index 49964697772f..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.12.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
deleted file mode 100644
index 0a6513c1f589..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-i18n
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-	dev-python/mkdocs-git-revision-date-localized-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
index d39737874f73..9579e0437b9f 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-i18n/Manifest b/dev-python/mkdocs-i18n/Manifest
index 51e699c7d3eb..e00757ac7d5e 100644
--- a/dev-python/mkdocs-i18n/Manifest
+++ b/dev-python/mkdocs-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-i18n-0.4.4.tar.gz 17191 BLAKE2B 4ab926befac2c90b6b9ff55fd6887c8b78e88f801c820749df125ea97418fbfb0a8531b2168b508737e7dffbf426826433211ee80f25b80a42ae160f78a93670 SHA512 f9f27c0f274aa7ee5c64cee46d4165d51022cac0171f95a238b62c911e1be16b6a4ff227fea3b78de2ffa0095b9c95280e8919e207e6947db300a136fe16e659
-EBUILD mkdocs-i18n-0.4.4.ebuild 553 BLAKE2B 64f5acdf89cfbff5370c2e06a46b726f3818a148618098d7a2e9b9364ddd472a54e73ba8a02e9f5a36a119311d810d33d1c4592d83c36757a75dfdcfbeade8ca SHA512 a132747c5cf88ae8cffbb5fd23c9fa9e80ea7e4850398700d42c3f2196fba31716e63cd6b993af865627d97a697b3b18cff05150de8cf12ea308c43488b62330
+EBUILD mkdocs-i18n-0.4.4.ebuild 553 BLAKE2B f95a0615ea7969510815db749b5b3d1a413b7d0f774647124a61f881e3c4e58447b3bbf5585fa14fb7d20391f45c085c71c15e373dca5292b065e1ce54d328a2 SHA512 b29c630e4187f53b62c85740a7f166ca68afe643862bbb8bbd1758405ff1f5a41d3d643fafa780957b6c37db1807c59474db8e35b414b95042efc6a0d00278d7
 MISC metadata.xml 540 BLAKE2B 0b6e023e1903f143668642c8a150cb0610500b8ced2082fb31586a1157281fe21535c249e67dc19789cd36318e255efc914f7f5e29dc2af97e6f0866214b8523 SHA512 6bf089cea5ea6ce4547fd616ecfed754f68cc17d7caeed4f633ef41c4349cfca1c68585a1bab548db284dcfa672348b73e53a5e6610a73480913694df92cace6
diff --git a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
index 2d4d9700e6d1..ef7366b3cd64 100644
--- a/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
+++ b/dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index 978803b948e4..1e1a73859bcd 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-extensions-1.0.3.tar.gz 11983 BLAKE2B 0a9594c85df0782543275598368497bc5bd902c2e96dd75628b94eefc2f7998b948cc659577db6b27fe2787fe2a6547bdecac823f4a9533bb6b8d781922f9a6a SHA512 af6ec96db5628527d6dbdeb6557276cdf297ab5926cebf5508d6e5c4c5b8493b9f55b967230e2853d28bcbb17129a32778936ccd0264ab75c870be2eecf2e8ef
-EBUILD mkdocs-material-extensions-1.0.3-r1.ebuild 695 BLAKE2B c0bece76dfa4d61fe59d8ed9d6b0e9d8902614cf2c0c691d02884f3c0a2c5ff74a2bd8ccc351d9ce10b0a9f422778a648e075694eff0bf4c967bc95970f2d3e2 SHA512 20e10188b1bd0432eb001e4c59c8dbbdf234c94da8de7b9169a516f828504504adcc6cd7f7399b9495ea32b9f636bc13efece300c312d62ea11fd58d56077a1d
+EBUILD mkdocs-material-extensions-1.0.3-r1.ebuild 695 BLAKE2B c10e0e0ac21e7da07036fc503442413341040569a20bf9a98ff02078693ad532cd10f71d948a63294f306b8c6e93b16341306d21e4383959d90463931625c18a SHA512 e887ccd7dffd1e5d938c1467bfc6e21e82c3334b9ad9c47028c44e6ace9fb77e81476f759c78b06af72e951f8abbe518f03e76ee122f873b8ce1afaf0a32c89a
 MISC metadata.xml 451 BLAKE2B 3deb46d9e68b98525a9d7d31d2ccc0cf3c142d2988dd01636f037bec1b0ebfb07bd675c402fba89f6c7d171444e693b1c070eaee27c9a0ce94d48a1edd73b58e SHA512 add6b4dc2b6a8032aa3edf9ad22f02edaebf4cfae392c2920db40c201adedb20e6f085de59f2224a3fa037060c7cdb3dc238d3174a97f95aa35bc3bc8618f3da
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
index 300d926ce1b1..39d03444e9ba 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index d908a273c4f7..cfa3feb908f9 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,11 +1,13 @@
-DIST mkdocs-material-8.2.10.gh.tar.gz 8324008 BLAKE2B 333c8cdcc09cb4b64cc165884933e81c5986b9d7c423f722c517b73a6348d97396b359ca20488de5dbd547816070c4585f6e21f0ad13e8415f7b007d1207fb72 SHA512 c9babbb06a91d52e8a9f6e33b1a2a15ab124af5322b893667d704acaa77f4d7702b4fd05e3d677770f02dcf7e9a14bc70ac048599ecbb8817c7af3ce84b69368
-DIST mkdocs-material-8.2.11.gh.tar.gz 8333237 BLAKE2B 10b891f712a9df03a6e3cccb2e1df15c8dca138b18aed3f4ece33bdc5c81c545b3d5a8030f5a6346277150661586fce33888a4837cc7452c077362da7be9bfaf SHA512 02af540a966cc684d2dd014764b18f85ffe854c0093ac7b69ae147ba57c4d059d8a8ba83439ca9b31c9bdf4436c524467590de74e09f2bdbb070c1cfd464ff2a
-DIST mkdocs-material-8.2.13.gh.tar.gz 8333520 BLAKE2B f2ba716a43f2db823cc824e69b57b9ea2982cc8da73c61fa6b4984a04aab04df72bfa63b671c21e8db9648e2d6891d6e0c9e9294d3bf88b4f530ae22a7c8a6d7 SHA512 ffcde4b54e4ff0fb298ef9c818230209aaeae41d5489e735d6c3b25a0c0242b58e1d587cf791791ac6b1f19152e7f599898d5c3da44eb7888abbebb4e3e3ef63
-DIST mkdocs-material-8.2.14.gh.tar.gz 8335509 BLAKE2B 0fda8905763eb30fb96c96f7edb72735150fff564921ac9d07109e75c6481146c58149bf1a7afa1262dd650cdf8f08aef58ff1914e7ca428ed46f2c225c3cfe6 SHA512 24c142b326a72abd44cc42472062b86e90162cbb8d06f7ce62e5f8443de5af034dd7bbc5a1bb577f0bc157298c6f97d43d668a633d7da3610c0b623c42bbbc3f
-DIST mkdocs-material-8.2.8.gh.tar.gz 8304608 BLAKE2B ff44912e812a32c7bc99fb7a07178864a952ecfbe953fe8e4d06188e2cf79f87276a881aeba1b2e5b5c290b4e12afa72761b35988290b7039163c643ec51c154 SHA512 fd2308f78c2dfff81d917f958903fee44fdd214a209464c4279d399812a686a26084e40367b0809889f682adfe5d1fe3b4707dc206621f3aa216be59e13d5d0a
-EBUILD mkdocs-material-8.2.10.ebuild 1046 BLAKE2B 173553bf1150ab6378b4f81fd8545eb4d9c5181c7323fe1257d74815008c788ee0b36b9506ef8806cbabf9a338912ed18f203ade9121f75a010a36786ac6156c SHA512 5268e38cb3df4a117c1fac6e73a1e75fa43fb4639cf5411fea1106dbaf0355acb2412aa3cf7013715fd4761b6aa5a08e3a0a843b5dd48d67944b99c538372e72
-EBUILD mkdocs-material-8.2.11.ebuild 1046 BLAKE2B 173553bf1150ab6378b4f81fd8545eb4d9c5181c7323fe1257d74815008c788ee0b36b9506ef8806cbabf9a338912ed18f203ade9121f75a010a36786ac6156c SHA512 5268e38cb3df4a117c1fac6e73a1e75fa43fb4639cf5411fea1106dbaf0355acb2412aa3cf7013715fd4761b6aa5a08e3a0a843b5dd48d67944b99c538372e72
-EBUILD mkdocs-material-8.2.13.ebuild 1046 BLAKE2B 658ec6ca3cc35f053827537a4d8d89c6c6d88fb456fcc76518c5ecbbb1334dc4e6e31bf9302fc93208b4de4ecf8a0ed73fe60389e9a9a83752f5b367075ef837 SHA512 154a0a4901df747aed644fef2c572f7c83d98f44452d4c3a42d33b7a5a70e49bbbaa084a63309325b69bcb1f126a21900a7f9a87f24cd1edd092899bbc31eb21
-EBUILD mkdocs-material-8.2.14.ebuild 1046 BLAKE2B 658ec6ca3cc35f053827537a4d8d89c6c6d88fb456fcc76518c5ecbbb1334dc4e6e31bf9302fc93208b4de4ecf8a0ed73fe60389e9a9a83752f5b367075ef837 SHA512 154a0a4901df747aed644fef2c572f7c83d98f44452d4c3a42d33b7a5a70e49bbbaa084a63309325b69bcb1f126a21900a7f9a87f24cd1edd092899bbc31eb21
-EBUILD mkdocs-material-8.2.8.ebuild 1044 BLAKE2B 62e53b29887db5f6862f2cd991a512af4359eb5453ff56096d21f1bf1e0b68e76dd4de0baff612f7eeabf5abbc74929629f2e151b21e02d896ba2e401efd6c9b SHA512 cf145810cbf84c10611b75e989f7ecf7ce7334bece51dcdaf119c61b6f2b6f4398f3a8d7ef3954e21595de2b7975b522b616791a0732a2b8a6d0d989e7c4940d
+DIST mkdocs-material-8.2.16.gh.tar.gz 8358163 BLAKE2B f3102be342d697e462c798fe8227febd7f3ec99fcd9791dde96103ec39f9ec86c68c8682170b48e1bf56e03d4be45fa6cd372b1b4391ef4ecbd1bef2866d3e90 SHA512 4ebc03e2b9954e3d64c1837b20df7c85d610ffa63303ba07e5f42ae680777fd577b1aa4744732352da6bfab4f70e2ca17afeb092d3a494f3e0a7c5f7b2149fb7
+DIST mkdocs-material-8.3.3.gh.tar.gz 8283580 BLAKE2B aa6dc9e07b0a7fcb6fd598f4bef37a2c3b00ee4260bf6b2fe088dfc9e8c1468f8ec50767d41ddebad0c32a193669e560bbeb835684e5c8451d5985637038a1f9 SHA512 ed3bf417b8c9f2da9f198fd7079ffca3c1bf9f6f455c1c03fb4b3b566ffdc95be6b39d4f47590eca74610b2a0efb34dacf50ad2c2c4f9cca4e18079d584a7128
+DIST mkdocs-material-8.3.4.gh.tar.gz 8311720 BLAKE2B df2b01fa36b49e33be95d67935b24361f1d87394f118b51c51e4b822b8975dc41530d3e1cb87c7ebeb21dafb6494664730cdf96608af5dd5b83fc8715971dd92 SHA512 453e866c1dac643c9347573b3412642a1eadbb5e1087170bcd8ada57506d53d59bc52072ab8a6ac034feabacd09a47f3d32b5f7f3b0535e98d7ab3bf29733af0
+DIST mkdocs-material-8.3.6.gh.tar.gz 8312956 BLAKE2B c4a6603a23adb882c404356234b10f9a41159424534f1eed4d407381ae8bad0c50adc2d92670e33a52e0e946fdcf0a5a02ae74b25e6ef7439cdb57f178eab313 SHA512 94ec949c133d09b166326490ee8da4c539ded266aeabdd46970596df7da5607dc06866e618cdbe1694a8e1cd1ba0202a3fbb9da90cc5862f4324551c3a4e4154
+DIST mkdocs-material-8.3.7.gh.tar.gz 8202111 BLAKE2B 1a30a3d4de788adb3b0129458d9c3ad14f16f40c8109f8b31cf15cb285cd5ad58e8eea529a8bc74ba8ef9342589ae2e22a561e01e1d0940ac77e673232557caf SHA512 766bb25d4f6a0332bd7ebb473b846b45a006e44335cf0b5b57024ef1f77f5ca173ad3fea5041ce9bfb777d2da2249907f3c4b921d41686fe430ed43c158e8780
+DIST mkdocs-material-8.3.8.gh.tar.gz 8318363 BLAKE2B 5b97026e96e28058e7d7081db9da92bc4457e8e7e022e4201c558c1193c5ff293f85ec576cb46db40de24c301f73a614217062a6bee2835fedab71c362e89a96 SHA512 216ae887463e67251285b788ff298db504ce65043337707a2f54dc3ce31f3461c90126a86c506c709592b3e3876934685a97e68a9c58ac0a4b6be480bb3b65b8
+EBUILD mkdocs-material-8.2.16.ebuild 1044 BLAKE2B bae6282cd8a771c6c6d9f11205442841ba82f970b1a0ce8490902931670a45fa0ff1b8ba08d2d4c9b819ab43a668b9acbbc4f84aa7c35f854519cd609b2472f8 SHA512 7aaf4b2f7e3f75e579300424d9d8c2418c96a96ca61c085b53ae15f152abbe142dbf13924b24d36eddf1321f6de1dc6d3d5a018e19612b2245cd860eb03818c6
+EBUILD mkdocs-material-8.3.3.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.3.4.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.3.6.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.3.7.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
+EBUILD mkdocs-material-8.3.8.ebuild 1046 BLAKE2B a1354ffb639fa1d967358867a01440e15f966ad4884c761e48ba14eb08a874ba1ec3bf1df1eeb1d214d16aae5b089cfc5254dbb4817b32a34b432d03a2eeebe8 SHA512 e3d4630057818c974fee925e51e8f38bc39cf5d86aa989158f97d024ac4e0c0cd4daeaa57242edf20429d9a6bea02a0019fcfa68b60c36d85f461c781fe3a54a
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild
deleted file mode 100644
index 348f317ad661..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.10.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	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}.gh.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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild
deleted file mode 100644
index 348f317ad661..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	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}.gh.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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.13.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.13.ebuild
deleted file mode 100644
index 32f2ac148686..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	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}.gh.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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.14.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.14.ebuild
deleted file mode 100644
index 32f2ac148686..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	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}.gh.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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
new file mode 100644
index 000000000000..65c7c88b4dd1
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.2.16.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
deleted file mode 100644
index 7cb07d3578a8..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.2.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	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}.gh.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.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.3.3.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.3.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.3.4.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.4.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.3.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.3.6.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.6.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.3.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.3.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.7.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.3.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild
new file mode 100644
index 000000000000..71839dd0e93b
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-8.3.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	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}.gh.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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.12[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.4[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-extensions-1.0.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index b66b8e2d7d4d..f6612f8dc228 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -1,4 +1,3 @@
 DIST mkdocs-minify-plugin-0.5.0.tar.gz 3387 BLAKE2B bce05582eab831976b430d5c331c0e51cecf790f4db6f3bd089ff6f0f5421c0b824c9bf6637a6b00555eee203b23cbd5fc3a0e81fcb5a8697ab7c06e94a9d2e0 SHA512 a31770c9de39439ba5eb4e35acd088aa7df2d7fa39f7942819c0b25429abb7b2b0626765f26f4d4fc77fd11e48dfdf90f9eb93e999cf7b641bb630c852eec50a
-EBUILD mkdocs-minify-plugin-0.5.0-r1.ebuild 678 BLAKE2B fd79b3e8ade11bb28094095654d382a9100ae35caa30fc045abeeb093a8f0ef4e23645e67ba1d8d66a8fc22f167f523f32fe99927ba048a28a2727defed36728 SHA512 5f0f373b01bae7f3e41324b2674a239d253266dd17704657d1bde049158c25063c7dd47d4787177ee38026029fbb0461b68203035b5ddc8bf840bf88d666b7ec
-EBUILD mkdocs-minify-plugin-0.5.0.ebuild 626 BLAKE2B c90a113faaa46b981c15434d254abd513ffda1a3a7409de9de339ec9d793827f51baa1a6626c42267b3e5e78572870f31acd55d18f702249a3361a2fff3de627 SHA512 d5c05d9804e84241f707e2ce47091e684e95316e07799ca0ce1984406330a6f07029bb1abb556112f923b3d591ee27a21383f746306024568d9fd60427d91548
+EBUILD mkdocs-minify-plugin-0.5.0-r2.ebuild 709 BLAKE2B 0fe20ea91a73c81c4a6fc218fc04fe1306bc56d640e5d238638aa2b84ed5605d31db6f100b808f61d8acb37bf31839f3b7f3997c8228d5e8df94f97bcf138cca SHA512 6f39651d52c31858271aeb4478c201ac6fa16a4de6ea78170fb83b23cffcb606c06571bb3e34abe5a265dbf7b42b36ab5699476e22062be93ab9ba3d28c00989
 MISC metadata.xml 437 BLAKE2B 0b089b896a3b9458b03573a6f2870ee98c194a76969cb730508582aaae75cd5ae3fc46739ba12850a2388cf588aa68c6a45e31a59a8f1894e7eb02fe78d74992 SHA512 f238ac7d118776d582d880a4355d0786dc5d9b3f82e9139d5668fa9be009eeb7228a0bc0b2d5254e76b167ec30457241b808917a910b8d2037c781e46a871946
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
deleted file mode 100644
index 55540167844a..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..a0d8ee6df7a4
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r2.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
deleted file mode 100644
index cdd329da5633..000000000000
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
-HOMEPAGE="
-	https://github.com/byrnereese/mkdocs-minify-plugin
-	https://pypi.org/project/mkdocs-minify-plugin/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 9706139b37b7..4f48d35ae1bc 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-redirects-1.0.3.gh.tar.gz 6395 BLAKE2B 6e6b319cacd5039550755b1796d09c5377b65174b9e0f2dab7e47b37626bfdeda4f9c52ecc7eb3adeec31f4c28c408bcbc4f8461b16c8f02cfb60bdf929d776a SHA512 7977e92e1e8e29a7ef3f3644060d1d872bb67c2386d1880799b95e7d505834ff629bf70824301972f10af39ad8c60e8813f28ca3165ddb9b150af359bce361c9
 DIST mkdocs-redirects-1.0.4.tar.gz 7028 BLAKE2B b1f266b2bd68ecaf722d28f3fde7f5ab6eb51c800027d09838282f12f8705d2f9ed6f3d45c809ec575e73c70a05ab23d0700f0d6e15a0f36e1fa2f8becabb5b0 SHA512 965989351c62ad83dab4f02526ad118f90d3b9eca9863189565a04d7013aa5de0fb2ac1a8480f308e72aef125ecd74c53a7d2db0b279835074272d30c9eb87ab
-EBUILD mkdocs-redirects-1.0.3-r1.ebuild 779 BLAKE2B 5c3e18b1568369ac34a93f6eb9e7a24a8f4a023ee3de44297b3dcaba2c47b285a5c0931c7f1777c52901f38afbe5b849953cfba2ffdf4843dcc9b0a9585d3121 SHA512 b7b50d0903a47d7af2ba663d96731225282141cb2dd6d40c6786f0c652977a0ef2bea1578cff0d4cc87756ffcd929d91a425c6768c163f46a909b86a34b2afed
-EBUILD mkdocs-redirects-1.0.4.ebuild 671 BLAKE2B c8acf627c35bfa5ffa50e909a6418d45e02af12e20c347446477f22d4bdc5457361dc73e44d0012b9b9311da0935af67b5c8f77b89d91f7b9ead759aaefe8586 SHA512 c415597431b21330cae8c905f38193388b3e0ec14be3a3a0d8333dd4e72744a7e023be35475fcd7a1592207d8ec22b5284d724f2a2998d4c1763dba1a3d2965b
+EBUILD mkdocs-redirects-1.0.4-r1.ebuild 700 BLAKE2B 001c76b12062821f862aa5b4b2c6fce2392ab75381e318bd05b936b7df326fca2a65d3eda604ae1733a7d598ce40a041de44c0c4f29d653eaea63065a3131aaf SHA512 330c058349913adab85d097cb238b9757ccd2ffc91817da9f8144a2d4e956ab561e064083299d6bd9057f563bb7ff61d91cbfc3e687bccb32aafdd4f5afabb45
 MISC metadata.xml 428 BLAKE2B d25c3a01b0738679986b91e7a1bc3f8b6ba0b2683b616c4301ecb8528590d33168202007eb7defb98b5fca91b4bc032e934bf900559c0dd921dff93799602621 SHA512 c706f8029bdfc42e901bd18d0fc23550ec7dbacade9812fde08c7563ebf0d230d2630ccb1211c1b57185da4b21c37d216c8939149bd86a94a5b9443f25768d41
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
deleted file mode 100644
index 60d9f2023194..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-
-# Upstream forgot to tag the release, and no tests on pypi tarball
-COMMIT="07ef89796ec97be3c6ea2681441992d5d4bfa87b"
-
-DESCRIPTION="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="
-	https://github.com/mkdocs/mkdocs-redirects/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..08319014e15a
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/mkdocs/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4.ebuild
deleted file mode 100644
index ea76877dce9d..000000000000
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="Plugin for Mkdocs page redirects"
-HOMEPAGE="
-	https://github.com/mkdocs/mkdocs-redirects
-	https://pypi.org/project/mkdocs-redirects/
-"
-SRC_URI="https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
-	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 0e4dfa2f2fc2..1bf6fb6ac044 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-1.3.0.tar.gz 4085674 BLAKE2B e34605c2d1122ff86ed5cfb6134cdda67450e8f32d7628626ff4ac8c36c45b127312ad693efe35237b714adb9efd244f12f90cf8ecacf6009b75786db30ebb1b SHA512 d33d728eaff4e39106c1187cf04f579706ce28af364852c67706ab85f6b9ccdcd26ae84cd4d5ea7572e52fde1d1137eb3e424679dd4c8ef043c9637aac062270
-EBUILD mkdocs-1.3.0.ebuild 2243 BLAKE2B 46ea225d6b41d485e2bce065e084fe951e31ea52639dbb2ea1488142cd677524f64ba4aa31d9a24121cc22f6ec4fa335389cdba40b62229fff749f6d5bdeef84 SHA512 f9e684ecb8377e2271c316ba9c7db28d19ccf96e5fd6b91e58ba2ffbc0a2e652f719e745847bd231c3775d18678ddac0aa34493d2e6c23f1e755cec3c5d3c57b
+EBUILD mkdocs-1.3.0-r1.ebuild 2288 BLAKE2B 8a7422e0e7ee24f4af1a3a789cbb07c6d69b396d568d803efe932098af4bd74315e5701b1c8347d60fa050362bd580509f3c21d6861c735ca31b87c281de382f SHA512 82903c70c5aba1a350deebde695dbe48a2e8bbd3eeb12cb53ca30508edb412e899e34d07e82b1d38fe898384a009b3a7eb0ee963d5b4b6435b0768c4a082aa2a
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..41fd1b9bcc69
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.3.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	# Does not work in emerge env
+	sed -i -e 's/test_paths_localized_to_config/_&/' \
+		mkdocs/tests/config/config_options_tests.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
+
+python_test() {
+	epytest mkdocs/tests/*
+}
diff --git a/dev-python/mkdocs/mkdocs-1.3.0.ebuild b/dev-python/mkdocs/mkdocs-1.3.0.ebuild
deleted file mode 100644
index 46541abdf194..000000000000
--- a/dev-python/mkdocs/mkdocs-1.3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		$(python_gen_any_dep '
-			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
-			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/click-3.3[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
-	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
-	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
-	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
-	sed -i -e 's/test_IP_normalization/_&/' \
-		mkdocs/tests/config/config_options_tests.py || die
-
-	# livereload has been dropped in this release, this test is a remnant
-	rm mkdocs/tests/livereload_tests.py || die
-
-	# fix apparent typo in test (importing wrong thing)
-	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
-		mkdocs/tests/theme_tests.py || die
-
-	# Does not work in emerge env
-	sed -i -e 's/test_paths_localized_to_config/_&/' \
-		mkdocs/tests/config/config_options_tests.py
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index a2bc4382ffc1..23f2c5a156e3 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -1,9 +1,9 @@
 DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
 DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
-DIST mkdocs_pymdownx_material_extras-2.0.2.tar.gz 25789 BLAKE2B c1da5c38264e9186802e24a49c2c46f1f0da70640c3e806f26cb19f1f947b3eb5bdba31cc722fd566d40643504aa63adb8f59792c51be95f4baa2324cd0729f2 SHA512 fffc5982ef7127b2e990d9206de0f09e240250da2d56c1efed6e841dad759980300209f65faa0edf61bb1a882ebff367be6533fb3f47e7ebb606520def6143dc
 DIST mkdocs_pymdownx_material_extras-2.0.3.tar.gz 25866 BLAKE2B 6d14f7591c7519bed30de4ffde15a7fcf8d5ac20440609dc8cac0beb8adcd72f6882d1c4f15b809a423b657f951f8393b50832d125c45d946c420514615df624 SHA512 23964157be8773b9532580801498c4a31b29dfcb713e70e6adcc0d2c6a56350b7edd5d36dbbf58f6d946cf2fdcb4eb6cde72a63e4b40b5ca140d83f18e011375
+DIST mkdocs_pymdownx_material_extras-2.1.tar.gz 24220 BLAKE2B bc16a3f4b7f471a14b3f5189ce7749f49a72b33c0b4ac9d67f6c7324004532103136898a2cec49adabba37c93c2ac1189e637ed4f2c6f4611f1fcbb9628ac707 SHA512 e10545455adf58643147a802ab422a3b3e293a8853c5e20c0c91cb97f8ee1bd3cb1f2ce23bb73f30f0b92872ab549e8d8fbd41bd783b1d9af3e995e313ebfa4b
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 557 BLAKE2B 2854ff1077a941e23e2d51fce318bd41b8239e10c1d6be3fb65ecd8f08397f00ec46991021a23ff1d454d7abe5e6779d9aa4d36340e9fe84ff238c8e69e4be10 SHA512 6bd3f7d6daae3de6152502f9cc7ff522f6220f5111e80cfee6e0d400c9492dcbe1ab5baafd709f67d11a132df8261df60ad89cf82dc57c6f47ca72de1f34f389
-EBUILD mkdocs_pymdownx_material_extras-2.0.2.ebuild 566 BLAKE2B bbf0ee418644c2ca617f8c5e0c0a393a7d65f446d590aaf27b606ea362023943890cb25530ea5caac299374a727eb27eb198b8a4f3fd7e5e4389db075627c5b8 SHA512 ac108f8a48ead1b249e3ebe76ad8851e9f4550b29786121f2ef2bbc8d65bd0d5c2fdb59612b25e9da886e03c392e31b0d8c29b6c8d1bfc95a43d3722fe88e5b4
-EBUILD mkdocs_pymdownx_material_extras-2.0.3.ebuild 568 BLAKE2B 7b453b9fa57b127d4f7b63a360d76354029d917e8a2e7b251f5f4828cf1481449bb9715ec17c49c35edec93c41cfaf6c6e0f29e378835f7e7ba082b83d92cc6e SHA512 1b405681eff718ac0a3b0a064aaa5d78a6b6449a55c4827b7a6748e61379b6a7a50cc8992b6888d0d028822d34138e2711f1b48fa9bd0c41818c2776b98c040f
+EBUILD mkdocs_pymdownx_material_extras-2.0.3.ebuild 566 BLAKE2B 98e25cc79a87f3f5373870bf79edd730d2e4bda782cc23a34183f99def00aa025191b4cdcb58c9ef2a037b298e7b4fed58f9ef50c43d38006af915d078a83d12 SHA512 eceacced7ff7e71b8a7c3a9313592fb361d1f028484c403391cba9bebe4933fd57be3e19c11593bd18db4c66238478d11ead6a830f5b707d19e1db83b92926ea
+EBUILD mkdocs_pymdownx_material_extras-2.1.ebuild 568 BLAKE2B d4934f42391c7046af25f3975dd3240e5d7ee5d8d34eaac6d93add639a87234f57acacde6cfcf2c1d585a1c959d588d67fc4612dd59b2b34d794f660fc2b9ba4 SHA512 ea571b3390226f98506c6ff141d37aaae3e147d1931616e18d15da444edb74b3457f683c81761eba80850e4733eb3fe2adee9ead6b3055dea7dea729a5ac533e
 MISC metadata.xml 1167 BLAKE2B a4efd99b0128f99bb7a8da17fde37695cff1f9e50ddec9d3b71e5eae4a09b8ba6646259c724220ee5905faa420efcdaf4be1d0828c8cc4d9e7040ebf1398bd0e SHA512 37d5b8e942796e54f31d0a2d592157d7a50d8fe5bdedf6f0e57305d60b4d7fd99f649e2604bb53cba5cf457227c3c1debfd607b3f5b97fcaee7e8209fbc900ec
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.2.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.2.ebuild
deleted file mode 100644
index 798836e82314..000000000000
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Custom alterations based on Mkdocs-Material"
-HOMEPAGE="
-	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
-	https://pypi.org/project/mkdocs-pymdownx-material-extras"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
index 2025f4982282..678dbe8e1266 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild
new file mode 100644
index 000000000000..f6fb11199a80
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index c9d7c98e214a..e0064d9e9683 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,5 +1,4 @@
 AUX mock-4.0.3-py310.patch 2849 BLAKE2B a23047a6a872f7badb845388c3dcfb6c554824e524a094c09762a8749b3f6c292ddd58a1843cc540892a1a850f639af254a74abbfffb70deda4b756dca7dec9f SHA512 ad4448a85267aab11a35c761896779d66b45c2a38b6208226eeddcbbb7b28bac840f11fb9d69b72781383a82334a37b00dfac601fd9fe16f842da93c1b4ee3bb
 DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
-EBUILD mock-4.0.3-r1.ebuild 875 BLAKE2B 51127615212ea62f8ed4a2c31d2f1857d2f49e6930d73289fe013f7f327ea236e42c406d3184a55a09dbb94c1eecda1976a410ccbc180ebef302a54370bfdb0e SHA512 c9ecf9fcf5d7af60aa1b5f3ef269dc78cb0f298c3e0a5861d58a3cec473a07d2ce8c8f5a0c1cb884ffd50c7f3f1b43c0851d6d2319190cbf100a8a929c164c63
-EBUILD mock-4.0.3.ebuild 1540 BLAKE2B d41fbeb74d3b151eb58373b20b6046239a75b0429bff8a83eb3bfc1ecba815768f5838f0d234e1864f251c2c17b4e67ccd378556129ea8c0d41457416c84a4e1 SHA512 69d6cec9a1cbca7df447f3597c08469548cb0d53344ffff0457dc3b59eb1d06fba8bc5a08a0b318930bc3eae82aa4023903b2652b099afe85d5c4b5d02ce3bc3
+EBUILD mock-4.0.3-r1.ebuild 867 BLAKE2B eb394dfe8d34ba9c00879e98c972e802908ba9313d90acf4425fa048236ddaec98db5745360d237e1369e2e5a3c9c6d841860f6b3bd4a6913fb2172ce64355e3 SHA512 ce209606b78052b54f71873b98df4df33055255630d73a454cd3184a021b01d5c32ee4c81dde04a66e1b072fec3d2c30aad12536d9461ea2f32f5a2e70fea8b8
 MISC metadata.xml 390 BLAKE2B ab0f000e11ee427d56fa28e307764a2c1864ce74bc679a491ab005a70d2bf8502d9a82b5d1941fcc268438880f8f950587aa090de9e611a520f89a49c78c0cbc SHA512 8456ad417374be30c038abce5a232d1075b8685e6432be93f49a74f327239354e14edfddf5e4a473264fb09bc0e4e6059489c1d0d651e8391ab0678d22987aeb
diff --git a/dev-python/mock/mock-4.0.3-r1.ebuild b/dev-python/mock/mock-4.0.3-r1.ebuild
index 98086486bfc5..ef0f66319384 100644
--- a/dev-python/mock/mock-4.0.3-r1.ebuild
+++ b/dev-python/mock/mock-4.0.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
deleted file mode 100644
index 522c268a1f72..000000000000
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 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="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="https://github.com/testing-cabal/mock"
-SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]"
-BDEPEND=${RDEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
-
-src_prepare() {
-	sed -i -e '/  pytest.*/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# Upstream supports running tests only in their dream pristine
-	# environment.  pytest doesn't work at all if mock is already
-	# installed.  We can use plain unittest but we have to reinvent
-	# test filtering.
-	cp -r mock/tests "${BUILD_DIR}"/lib/mock/ || die
-	cd "${BUILD_DIR}"/lib || die
-
-	# https://github.com/testing-cabal/mock/commit/d6b42149bb87cf38729eef8a100c473f602ef7fa
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -i -e 's:def test_copy:def _test_copy:' \
-			mock/tests/testmock.py || die
-	fi
-
-	# Avoid pytest dependency
-	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
-
-	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGELOG.rst README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
deleted file mode 100644
index 3e800e99d6ac..000000000000
--- a/dev-python/mongoengine/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
-EBUILD mongoengine-0.23.1.ebuild 2385 BLAKE2B c1b8ba665fcb94b271229e18971fc72eb23d2f434413ed6ccbdfe0d8d349dacdfcc79283f642a42288d59fd310e5d5afbd15c72246c56afdddc155afc3d81ef6 SHA512 2b75b872bad8b035b32fe7e3c0334deabb280d6309f72d8be4e88ffa75881ada64612a60e7ff5c3fd3b5abe31a6173e8890f28b88bd9937fb1100bf71c5589af
-MISC metadata.xml 402 BLAKE2B cdca7f343f9a264c7c565fb4b99cee9dd4e1869ab6068b8b1da6c1ad657d16fea05716d34b3fbec028527e8948dd1fd4e1aa3e272fc814af6646259be381093c SHA512 c5eb1eb9118bf5165146ef41755be092b39a7bb2d6cafbf5cce11066a5a0e15233556ea3a6a2fd250eb8c71cb7a725df37ed32b3018568aef746585c5109efa7
diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
deleted file mode 100644
index 0adcbd8b583f..000000000000
--- a/dev-python/mongoengine/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">MongoEngine/mongoengine</remote-id>
-		<remote-id type="pypi">mongoengine</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/mongoengine/mongoengine-0.23.1.ebuild b/dev-python/mongoengine/mongoengine-0.23.1.ebuild
deleted file mode 100644
index 299f1c980342..000000000000
--- a/dev-python/mongoengine/mongoengine-0.23.1.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
-HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
-SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-db/mongodb
-		dev-python/mongomock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: investigate
-		tests/document/test_indexes.py::TestIndexes::test_collation
-		tests/document/test_indexes.py::TestIndexes::test_covered_index
-		tests/document/test_indexes.py::TestIndexes::test_create_geohaystack_index
-		# no $eval
-		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_query
-		tests/queryset/test_queryset.py::TestQueryset::test_exec_js_field_sub
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_normalize
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_0_values
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_False_values
-		tests/queryset/test_queryset.py::TestQueryset::test_item_frequencies_with_null_embedded
-		# TODO: investigate (wrong order? bad comparison?)
-		tests/queryset/test_queryset.py::TestQueryset::test_distinct_ListField_EmbeddedDocumentField
-	)
-
-	local dbpath=${TMPDIR}/mongo.db
-	local logpath=${TMPDIR}/mongod.log
-	local DB_PORT=27017
-
-	mkdir -p "${dbpath}" || die
-	ebegin "Trying to start mongod on port ${DB_PORT}"
-
-	LC_ALL=C \
-	mongod --dbpath "${dbpath}" --nojournal \
-		--bind_ip 127.0.0.1 --port ${DB_PORT} \
-		--unixSocketPrefix "${TMPDIR}" \
-		--logpath "${logpath}" --fork || die
-	sleep 2
-
-	# Now we need to check if the server actually started...
-	if [[ -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-		# yay!
-		eend 0
-	else
-		eend 1
-		eerror "Unable to start mongod for tests. Here is the server log:"
-		cat "${logpath}"
-		die "Unable to start mongod for tests"
-	fi
-
-	local failed
-	nonfatal epytest || failed=1
-
-	mongod --dbpath "${dbpath}" --shutdown || die
-
-	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
-
-	rm -rf "${dbpath}" || die
-}
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 9676bad0efbc..603aeb9d3de1 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-8.12.0.tar.gz 108698 BLAKE2B 2bc48aea5b8508381ac909a963d0fcbf08a17d2d96f17de1dd582bc8ced080be540322ee3f65c66eab1186d024bb2957e7bbddd62041242a7cc4cfff1ad67bc2 SHA512 73759f05d178bd6fe98cadac401707faf90a4f7b456c4aac3f0b3f6c13a2284600971e0b271f1768cacd3ae9b69848404f85432199ca51b8160fbe67045dfd17
 DIST more-itertools-8.13.0.tar.gz 101264 BLAKE2B 28c212e76f18081301c6d946e06112beb2a6a3fef3b99582d5ea98c2142e1e47b0f5300f441a4d206f5950120466212a9fde40eae53bce0098097063468f56f5 SHA512 2f3473cdd67ddcb2c658f60638b91a25c4ce9d9a92bbda5ca937dd4748857408bfe8dd9d4e699f53bd9f10d7b433db57e499bd28f184b8faa58b2004f2c92004
-EBUILD more-itertools-8.12.0-r1.ebuild 1219 BLAKE2B 3302b7f3cbc13cb48752f4917837102125d87820176925deaa6de6f45f48a99f3b38fa37c080bb55d0ac0a4986a20e47d0d001960bf3477efa27e6394bf37bf1 SHA512 8a60d09d81210db291a347d422fac511fa3db68ce9a920b120f27252c4174c015ceb8f1995ddf4c40b32cdd9c21ba2569d7eaa36ebf2f25bd24122b1b928fc1e
-EBUILD more-itertools-8.13.0.ebuild 819 BLAKE2B 6d9d5596cd54586b7471545484062bcc6d26111c1d72d3cb88ee3cfc1cc592c38a60f3acafc6dee5382a565dd869d9954d46dd37cbdfd6d87efc12acf5739f8c SHA512 3dcb0ef2b1cd40ab24deb2b9a0bbaaf537dfdf5a70fe688925210495a42079ee618f14cf29668d1a27bdb7db34896e9dfee12cdae750bd0aa7765a992933926a
+EBUILD more-itertools-8.13.0.ebuild 811 BLAKE2B 76c933f588077a282e7c0473918aa2ea821117b71d800f29da1c02c93e54d2a922149c49fd1a46b056d9a10f45dce80873223dfd083417f3f503f85a56d27627 SHA512 a985e7a6754b20b156eeb5746a4ad88b426efcca0e3ccd8b2386bcf9a8e6ddcb1b74db3e66588c995699e592c7a69981d65f1a79b051677ae53a791bd188c0fe
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild b/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
deleted file mode 100644
index cb58e6381111..000000000000
--- a/dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q '\[build-system\]' pyproject.toml &&
-		die "Upstream added [build-system] to pyproject.toml, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "more_itertools"
-		version = "${PV}"
-		description = "More routines for operating on iterables, beyond itertools"
-	EOF
-}
diff --git a/dev-python/more-itertools/more-itertools-8.13.0.ebuild b/dev-python/more-itertools/more-itertools-8.13.0.ebuild
index 1857cb45c541..fda8ede7b374 100644
--- a/dev-python/more-itertools/more-itertools-8.13.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.13.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index f4223031743b..109ef442a7f9 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,9 +1,11 @@
-DIST moto-3.1.5.tar.gz 2282060 BLAKE2B f7b2cbf1de96b6d96b334e5b51bcdf69fb9645261564b28b290c19c37c27df5c25395ce54cc7d9c424f25cb381f4ddf13dc51456fb7baeec5e21b2da6abf725b SHA512 583c4e76a5acacdcce456cd953109b130dd53d6bf3e50d56d5ead6bfbdcd181109ce3df141686a4717687d3e1e8b33a73bdc7155c36aa5d064a4621e007ab17a
-DIST moto-3.1.6.tar.gz 2273226 BLAKE2B 91966fd315b3e5b4904ecc0e17c716bb47ecb6b644ccaad2cd52fb92754b79af0edb11573fadfd40b8ae75c17bad3429b6e2c4801424c4f30fea32689cd790d1 SHA512 f97ca412910ec9a0cf6d7e28b2ff2f2bf6a3d142a091f65eb4ccf8d53ae9d5362cccdbd24d72083f2d9c6200a3f6e400cca32c16965731d0fbd22239f9866d59
-DIST moto-3.1.7.tar.gz 2275858 BLAKE2B 7984da8df1ebf305ae11f16179612854b630e20eaeb834d85be4063becf73d0615183c93d242e162c7520225fee9eca149a9756fd507b9aaf8e19242fee3f25e SHA512 fed1c97515bed3640f6959cfba417ed27771d77a1b43e94877520ed582542eb61cc4f7d88c791834425b1a1614641a2c178f57787440af545ecf5b03fd6649f2
-DIST moto-3.1.8.tar.gz 2295468 BLAKE2B 0417e08d730d840f552c171d3ee7cfc07b395ffaa27b811c8f43426aebca6969b29111d481b9eb6d7fe1d4cadb4296027354b908512f03e0c45e2d9175b4376f SHA512 357b5841601f39732aa244d8ecd062b6812eed3d41cbf3a08138d826de5803cd631adc5b9fe2cae2d1e7553951906e49a8af464f97dfd5683f8099e475ca8b94
-EBUILD moto-3.1.5.ebuild 3783 BLAKE2B 2a10964580092a2fa6b56972a30bd04b4150a1902af028b600ad3ec4a098be88064cf5c14c4293b35ca87fd5b4a8e583f22a0d1e9820b0462af7b049255bc16a SHA512 0c4986fe5dae3ecb5183ab6fb60b7445a6bb7046f94fffd3c7e2f87e42efb3ca4c0d4f1e37033f0c72682a3fb6b35dbe3499334f203f3b2cf98da233a7a8f946
-EBUILD moto-3.1.6.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
-EBUILD moto-3.1.7.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
-EBUILD moto-3.1.8.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
+DIST moto-3.1.12.tar.gz 2323555 BLAKE2B f2ecefc5dbbc3f4ce66a799ec255cad40ce466f62fe3bfb0885866c7d0125884a0fef299b58fdcf1cb5da7ef58ac513d844b2fbae6d6545dcb38f2a3bbb2cda4 SHA512 29b8d0d71f3227784eddd05959434451ad88c9c0346b3684360e57bd3df8b9734f781d263bf992ac946749c88b433f6c86c1fc71d71a2dc565633c812579c297
+DIST moto-3.1.13.tar.gz 2330638 BLAKE2B ded004bcd783f623edd5b198c39b0245bc847233be46e101b8556adf71c8a7495a175957b3c5c475ca66c392df0999f53c8cedbb439cbb39cd5566e610887cc2 SHA512 95708e6638ab9a8d68b1acaf3af14fc381584e2d978d7f03ee500c50cd2b3409d99633f0e211bfb86c40335e67581f9e6ff3dc7934f8e91fc9f8be8311de8b5b
+DIST moto-3.1.14.tar.gz 2340613 BLAKE2B 8bdd9131449c2f3aeb1e4b4fcf40fe2d7ffac86777a73bcdff1d04a3450ec71030e5611c1d3d7429fd57e7ebc0791aecca4c57b8fb12456d18f2256693387fa0 SHA512 3a07e4f15a70ec422f81ba8cf5e2f38624981ff809e7ec51a3e23e26f3dff1755aa11d236daac097da0961948a46cc93e549e36102fbd8d5036f419d5fc96312
+DIST moto-3.1.15.tar.gz 2352817 BLAKE2B 29c756ac5a6bdca2bea4bd74c746756b1621342ce8db7064ca822f78cf9a49cb298c27f74b5ef388c5262217c3fb22b5ae8988de9b3d37422834c6eef85c1b4e SHA512 9d2268e71ef68136e2d43285cb96901e0b6176f59a03183ec6628df8055a636cf80ace1c31446daffb49b7b7a10c1ed6680f0e984654352c67cd0f2cc8ea1a25
+DIST moto-3.1.16.tar.gz 2318840 BLAKE2B 775c952c7c5df36a859bfbb4417d613207f51643c129f37fd88398c9185109ee99be948db234573f02fd301a1541c1d50dde0d5fe296561f3382320fc671beec SHA512 c893b6de5bc5bf7bc025e320825d388de878affc83d1b54457f898891d306ce0c8dcb4aecfc33119cd2df78e5a9b0d07031cc45db4d965c0cab0bcb6154b0d34
+EBUILD moto-3.1.12.ebuild 3952 BLAKE2B c973165d7405a0ae7574cabe74b162e802e8b73ffb47777f6f815bb27f6c6677c56a1ac20166e99382854549798c55db798a6bcb3484e534f58a068c2ecc2f22 SHA512 9edfbfd062bae8d80a36eea36f53f9b255c370e5b34bcc3649a8bdc25efa32fe1aad8ac0be91a99ced0f6142825146a7a7b63455457a8bebeb1a9f36019248d5
+EBUILD moto-3.1.13.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
+EBUILD moto-3.1.14.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
+EBUILD moto-3.1.15.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
+EBUILD moto-3.1.16.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-3.1.12.ebuild b/dev-python/moto/moto-3.1.12.ebuild
new file mode 100644
index 000000000000..83bce6f57fce
--- /dev/null
+++ b/dev-python/moto/moto-3.1.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	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/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${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_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_pending_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_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		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
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# 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-3.1.13.ebuild b/dev-python/moto/moto-3.1.13.ebuild
new file mode 100644
index 000000000000..d32692d1217f
--- /dev/null
+++ b/dev-python/moto/moto-3.1.13.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	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/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${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_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_pending_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_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		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
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# 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-3.1.14.ebuild b/dev-python/moto/moto-3.1.14.ebuild
new file mode 100644
index 000000000000..d32692d1217f
--- /dev/null
+++ b/dev-python/moto/moto-3.1.14.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	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/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${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_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_pending_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_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		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
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# 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-3.1.15.ebuild b/dev-python/moto/moto-3.1.15.ebuild
new file mode 100644
index 000000000000..d32692d1217f
--- /dev/null
+++ b/dev-python/moto/moto-3.1.15.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	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/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${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_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_pending_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_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		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
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# 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-3.1.16.ebuild b/dev-python/moto/moto-3.1.16.ebuild
new file mode 100644
index 000000000000..d32692d1217f
--- /dev/null
+++ b/dev-python/moto/moto-3.1.16.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	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/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${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_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_pending_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_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
+		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
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
+		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
+	)
+
+	# 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-3.1.5.ebuild b/dev-python/moto/moto-3.1.5.ebuild
deleted file mode 100644
index 9069529dd086..000000000000
--- a/dev-python/moto/moto-3.1.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	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/pyparsing[${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_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_pending_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
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# 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-3.1.6.ebuild b/dev-python/moto/moto-3.1.6.ebuild
deleted file mode 100644
index a0c6ea25e7d8..000000000000
--- a/dev-python/moto/moto-3.1.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	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/pyparsing[${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_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_pending_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
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# 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-3.1.7.ebuild b/dev-python/moto/moto-3.1.7.ebuild
deleted file mode 100644
index a0c6ea25e7d8..000000000000
--- a/dev-python/moto/moto-3.1.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	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/pyparsing[${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_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_pending_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
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# 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-3.1.8.ebuild b/dev-python/moto/moto-3.1.8.ebuild
deleted file mode 100644
index a0c6ea25e7d8..000000000000
--- a/dev-python/moto/moto-3.1.8.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	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/pyparsing[${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_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_pending_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
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# 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/mpmath/Manifest b/dev-python/mpmath/Manifest
index fba9d5185136..dd20d91617d7 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,3 +1,3 @@
 DIST mpmath-1.2.1.tar.gz 2135690 BLAKE2B a21e0ef04a025f23e32dad5839db411708266c6cf3408e97ec5c995f197b14f446c1d328bd2e9f50e1c48a2e08239ef7908fcc3aab8659118fc1e0e78106a47e SHA512 2dd908bca26162adcdce0493146d009e04d3d96db965ff2207c332504020fa6f5a5e2af97d38e8fb3e7442a26c1e93a756a8d93b378da720ab7c07753f700d10
 EBUILD mpmath-1.2.1.ebuild 959 BLAKE2B eef6c24dff514bb74276cbfd2eb9340090483fc64d9f008a7788182e0cf85e0a84a91904399cc58dbebeaabe11a0549b236a9e83e92dd59dbccb50615f2068ca SHA512 bc43764e18449fc797a6db00051e2b26eaeb9be48c777397a37d88f6fbedab363f826b4c9f67293b6bbc17075573642d627860f48c9c0d0a3a5f0c072103f9bc
-MISC metadata.xml 631 BLAKE2B b0ef210a0fa246fae26cb43e5581e04c74e4d5b48199274c3013c0d2ef57a613d9f1f5d8010cc581d043de7a0332fa7ad7d689cbbef91d19fb8c1e9e596f9245 SHA512 fdb484dce2baecbaea1f6115a6083fa404afe6be962707681eebe491ea87627048fc4338985a8337b1021092365c4a742d27b7ab82b8074075700ec3ce877413
+MISC metadata.xml 732 BLAKE2B ea477c6ec344dd4d81872b771fda360f78739c0853ff45f2b3a32569f5cab76cd73233fbe3380ae19e10da61b172fba6f35db0e55d2b0af788da47167f320871 SHA512 7525d8d88ebcc5063f6c171b825c9d115c3c7223f49be28eae80d00b66e2a281060f28d5fda9c547833f3c0b0f3d2667434acfd52a30fdadb99193afb170769d
diff --git a/dev-python/mpmath/metadata.xml b/dev-python/mpmath/metadata.xml
index eede81026465..289a27dddbc4 100644
--- a/dev-python/mpmath/metadata.xml
+++ b/dev-python/mpmath/metadata.xml
@@ -9,6 +9,10 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<use>
 		<flag name="matplotlib">Add support for <pkg>dev-python/matplotlib</pkg></flag>
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index 9a82fb5ea4f4..027f9bb089db 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,3 @@
-DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
-DIST msgpack-1.0.3.tar.gz 123830 BLAKE2B 308af03206fef18edb0acd3c1d91ccd28385731c02cb930e8f64786bbcd8925510cf4ca0b924830b84fd6eaa7edf91e6a43f79c77d856651768eeaa1ab8cf855 SHA512 1569e42c6499c60458a63aa722b5c7e3dc817e38ae4bed2dc8199dc1bcbc36ff876e055b046b4f6063b5606036ae9238080c05be1e09a61a34e7f97fd5031fcd
-EBUILD msgpack-0.6.2.ebuild 964 BLAKE2B 8a253263d5cc5027ac0827ca5e7bd0a093e54ba2c558084cee2a0f33ab4ba8898e4e9aa1a2fad710e13a14740163eb80e22c38f1694482d4babdf23020150d1e SHA512 251ec2c7702f95ead296a78c8a251cef4b3e8c697b6f23899b1a1be813cbdf411df7b3567adc72f09d3ed328fdbc71da17f58a7144c775f0064d782c5e4c32e7
-EBUILD msgpack-1.0.3.ebuild 987 BLAKE2B 2488bf09dcc45e632ce58bfeaeeac2e6326a93e853ca61a573529912e3c49311a7d1de147830f74f6e30aeb5b8e0e22d024797481f34c7003386d988377029c5 SHA512 8d1328ce00b5c8a774eb3577e82eba693999f248ae22f16a8b50eb72b9d8711ae11fc6bd6c2b707cd1afcd63535d2a63aced6f7e7f62b4ef0ffac56c1c888e0e
+DIST msgpack-1.0.4.tar.gz 128053 BLAKE2B fcbaafbea57f87c949a43a6bd6f6507eb3a07ac5e4a9c44fabfbb7c07849f1edabb8dadcd99a547fed32bce0f900f965368c4ee744acd4e850cad5c27022f463 SHA512 dcd59bf77408acf7171bdcc46c4d6bf875d36e80b216b7721544855e6c2b20be469415ee768b2195e74fe4650621ee6bfaa7897e709ac0d8d59cdb30772cb90b
+EBUILD msgpack-1.0.4.ebuild 1038 BLAKE2B ddb9fbe04f1b989e7efb1538491710dc196d07b284a4422126fc803424152d2c9cd498ed8924e5bcc6b689afac86fa8c577023b2f33433241df9015779993f37 SHA512 e6f777b22d8e8b8e2915e91023d5fad4f2024edea8cb08a907b15794561164190e77dc24199a727807037eccc82e2828cb709982140c1ab16f91edcbb560661c
 MISC metadata.xml 520 BLAKE2B 5facc8e5c11591c6010fe5eef4030e23502b890d15a896ada0c5625e63179887e13206f28695af92b358c56a9f9660767d8b4234c2c8b489cad41fec01af289d SHA512 a62502d0b2ec3da1b21297f4d4e5fee86c206c8d6a2c19d7bffe2a64b4a2fa990edb3ba07bbacccb59ed79efd23fa713a37b8adffa7f0cbc811fc0fa249d9b63
diff --git a/dev-python/msgpack/msgpack-0.6.2.ebuild b/dev-python/msgpack/msgpack-0.6.2.ebuild
deleted file mode 100644
index f82e46a6cd93..000000000000
--- a/dev-python/msgpack/msgpack-0.6.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="MessagePack (de)serializer for Python"
-HOMEPAGE="https://msgpack.org
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-IUSE="+native-extensions test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	native-extensions? (
-		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
-	)
-	test? (	dev-python/six[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove pre-generated cython files
-	rm msgpack/{_packer,_unpacker,_cmsgpack}.pyx || die
-
-	if ! use native-extensions ; then
-		sed -i -e "/have_cython/s:True:False:" setup.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/msgpack/msgpack-1.0.3.ebuild b/dev-python/msgpack/msgpack-1.0.3.ebuild
deleted file mode 100644
index e5b2793b5bb3..000000000000
--- a/dev-python/msgpack/msgpack-1.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="MessagePack (de)serializer for Python"
-HOMEPAGE="https://msgpack.org
-	https://github.com/msgpack/msgpack-python/
-	https://pypi.org/project/msgpack/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-macos"
-IUSE="+native-extensions"
-
-# extension code is relying on CPython implementation details
-BDEPEND="
-	native-extensions? (
-		$(python_gen_cond_dep '>=dev-python/cython-0.16[${PYTHON_USEDEP}]' 'python*')
-	)
-	test? ( dev-python/six[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove pre-generated cython files
-	rm msgpack/_cmsgpack.cpp || die
-
-	if ! use native-extensions ; then
-		sed -i -e "/have_cython/s:True:False:" setup.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/msgpack/msgpack-1.0.4.ebuild b/dev-python/msgpack/msgpack-1.0.4.ebuild
new file mode 100644
index 000000000000..120918926a91
--- /dev/null
+++ b/dev-python/msgpack/msgpack-1.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="
+	https://msgpack.org/
+	https://github.com/msgpack/msgpack-python/
+	https://pypi.org/project/msgpack/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-macos"
+IUSE="+native-extensions"
+
+# extension code is relying on CPython implementation details
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove pre-generated cython files
+	rm msgpack/_cmsgpack.cpp || die
+
+	if ! use native-extensions ; then
+		sed -i -e "/have_cython/s:True:False:" setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 640568c6e44b..24db1a5068aa 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
-EBUILD mss-6.1.0.ebuild 737 BLAKE2B e225efab75d77e57fea5b86103a5f7b810f0e09b4b7b4d6eac0b7839a9fc42a09dd5220521b262e4c383ac0e8e844ef8619129683ac57a8863f774a2e23b5c05 SHA512 6adf4d9cdac578c417e10bc490375bb27a72ace6e1685f1474e2e8e66525b3c5972c13cb73d771461b04d0d5b3e3c9d038f538cc4ebc402c781a3a958906a6e5
+EBUILD mss-6.1.0.ebuild 737 BLAKE2B 851ab63bcb92336ef1f23b8c5c574d26dd82e84a3a6e9297bdaa5eaa5e4e2952aec8ef2950ff161a1b4e67255e7e9b07fe172e221eed9a4384c071d852830e1c SHA512 6074057a0fa624832c04ff3cea445954bc665ab7f56a0dea53aaac0562cb7a778073b6f71658e03914f4274335949408b5d9fd653f406f6d20d86507170c9cad
 MISC metadata.xml 349 BLAKE2B 16d2d04e5a562c97025ec77928a0936c3d874630bd6ef8f0860cd413173efab37ddd18b0a2420c64f5c4bed0cfe4b07ba3c52a7ce09355b8e8955ada63934ca0 SHA512 7c8f05dbdf19a484fff37966cd0e41e04bc702f2d7effdb19be0417a5950afe8248360d99306e233da943d3a3ba8bf5acbf1308d1f87aca04e01a24ee0dcd387
diff --git a/dev-python/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
index 7186c6443ab1..92c872443229 100644
--- a/dev-python/mss/mss-6.1.0.ebuild
+++ b/dev-python/mss/mss-6.1.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=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 8b549252a3b2..5553e39113cb 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,3 +1,3 @@
 DIST multidict-6.0.2.tar.gz 56840 BLAKE2B 1fa9b0d92a94ed022849a851f925e132b629216ddd0d5d4772304fd3361a129692f8b49fca2765118ab1cbc306879924d0aa7c6b57b648158a093a9f311a8d30 SHA512 508f18c5f731e7438bc7cb84b29aff22422769a8ea4c0ba7c875361d1bb1da78bed2db8b4ca34b833effd03ca3e7f00dabaad64bfce54b3e8d208cdc808083c9
-EBUILD multidict-6.0.2.ebuild 785 BLAKE2B a2373f82cc8a2b6b873486fe7137798fa444995600e34ec9149a83fabc116136f7cf290dcbe36e8fa7cd5063fd503378e44841a1da4ba74745b531e96dcbd697 SHA512 13c4c6a39780b8aba38edd9036f8c11eb4a87483a196102262e5bf0cd0ea68550d5bfc393b0d818268dea5b70b7659dc1c207d6bcfd99239603c5f06a0ab20ee
+EBUILD multidict-6.0.2.ebuild 834 BLAKE2B 7265e5a702ef5890168426f2d72d9aefb12488598a3561486153a165fd0c343c3c9c9ca15ff65b7895837a10c89f59cbe33f8577bb982dcc4df77a97aebef036 SHA512 fec2f4059ec97119bb61e0cab341cca612abfd571051bdada84d49d43c179d648a4101036bf90432186dc7475ea7682022f6a2fcb9434288da51ba4e409754f6
 MISC metadata.xml 476 BLAKE2B 4cc6b7b2d709459ddec7c0eace1cf5dc418a0953746816135ac5ad3d8a8aba4c5086ce13b4282326de9ec9db9ffb88eec7612748bdfaf29059252f97fd56692a SHA512 88215f090cf407903b6de7139c9dca5892f58111c8d1da9b52e91b4dac18fe212140868a05ec5ffa2231519f062b4499a25b05e99eef1a81bb9655ea61387338
diff --git a/dev-python/multidict/multidict-6.0.2.ebuild b/dev-python/multidict/multidict-6.0.2.ebuild
index 95544f494ccc..efa818c5a11f 100644
--- a/dev-python/multidict/multidict-6.0.2.ebuild
+++ b/dev-python/multidict/multidict-6.0.2.ebuild
@@ -4,18 +4,27 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="multidict implementation"
-HOMEPAGE="https://github.com/aio-libs/multidict/"
-SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/aio-libs/multidict/
+	https://pypi.org/project/multidict/
+"
+SRC_URI="
+	https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
-BDEPEND=">=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
+"
 
 distutils_enable_sphinx docs --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
index 182bcd873b7a..b3231f654c33 100644
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@@ -1,3 +1,4 @@
 DIST multipledispatch-0.6.0.gh.tar.gz 23692 BLAKE2B 4f73f05382c4aefbe3706839a18ba68d8ca0ed025744fe67d2069a770c517821d726913e5757dfe0ebe4628738b4b3dc83c76049f2beb4411b3679f574cc5f8d SHA512 34cefbceef1c756d06f0fbcf34709b70750928e21b1d5f02eef61eec3d5b8ce29475bfe4c53943f3fa9264b4de1f2524d813c6723927e576cd83771b6a4fcaf8
+EBUILD multipledispatch-0.6.0-r1.ebuild 701 BLAKE2B 614e59e4921c912d8498e0b338ccbc4dffd1873d361bbaeb6ae97e3ffddcf636bf04feee64cf54f629f09e3e8041f4324c2f765a704f53177141fb3d8914dc97 SHA512 f3c739aca27379d6e3546af5e2860e151b33b1c50eb61769af00b251cbb70e9a587bbc327eeae03b467a0f01602c9a8277870bdc8ee25c76667f8d36f0adff3d
 EBUILD multipledispatch-0.6.0.ebuild 662 BLAKE2B 5ebc4eac43fb755ec52b2f7df1b608672daf618b1daceb128349df5158358c2b48c22661ab1701e6ea1655034c517f52797ce518ef113ed386c82e7b0ef78612 SHA512 a3d4c9b039b37aec7d06d1d8a5383e0f9e53478b4a9caadb220ef32ba216a746ac04ca0781a63372ec0fbab11e707ce8c12899ff4af1095cadfb50b7705f015d
 MISC metadata.xml 464 BLAKE2B a464e3fc85e98875517a3d4b074d10f9fa6551d3efd9c809fe5aeb4ec52a98a8ca013fdae69b14eb936fabbbe13ead24bc9df5fbe1517d76afde445307b82ca2 SHA512 bee687d0f5502a80f129ae755eedb4aaeba508789f118cf7409ac01f8e81c2de9aa48ea85c9479edfc3b7e8337768402758bda94e602e9694b6b26230fb7d099
diff --git a/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild b/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..665a6a06ac63
--- /dev/null
+++ b/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Multiple dispatch"
+HOMEPAGE="
+	https://pypi.org/project/multipledispatch/
+	https://github.com/mrocklin/multipledispatch/
+"
+SRC_URI="
+	https://github.com/mrocklin/multipledispatch/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	multipledispatch/tests/test_core.py::test_multipledispatch
+	multipledispatch/tests/test_benchmark.py
+)
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index af9bca3c6407..83308af279d8 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,3 @@
-AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 758 BLAKE2B 15c4dd76fbfba10beda19505d251ab15fc1bea8915162c056a68a958357d2e3dfbc18c73c947f44b5789a70d532c12f537a9978dbedf6cf5e5546ea6a7c18140 SHA512 1bcc5c6b3d04e1a9fbc66e8e0ad2ca40758240798ed98f3e31c18e6892563f5b0fd7752bfd0301889658557a9c0e79d03bd8417ccfebceb07b2a58b895c57ed2
+EBUILD munch-2.5.0-r2.ebuild 711 BLAKE2B 990f6b1beee089fcebe9bc38e679bc51ec3bfde962816b674d6690229da9b5d8dbe30678ad30b352465da9660444eaebf9b82e8f2e62d986d96a601acd899d38 SHA512 ba7695251df9d134d1ea340ed7fc332674bfc0cb34f58073ae3d15434a4f80f0933971791a4a69eeee0f1379c0082430682e20b763f89d9354301805f1d2cc54
 MISC metadata.xml 401 BLAKE2B ab900d598b463036c2f6d7cb6a5b1abcc25e5739d3fb953741abae620ee8ac845077870dacf433211c5a4d14972114f8d16b94a86514be5de7667a2ab32b1f45 SHA512 f3334ff207272f39f44dad54f2d173218b2192675e04dd076cc16b461a656e146f3ba5b73e53ef8c115c5c3f32f40664f6191c31aa20fec5bcedb61186fed4bf
diff --git a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch b/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
deleted file mode 100644
index 450020cc2c19..000000000000
--- a/dev-python/munch/files/munch-2.5.0-revert-pbr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 31f229c..9046e38 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1,9 +1,29 @@
--from setuptools import setup
--
-+from setuptools import setup, find_packages
- 
- setup(
--    setup_requires=['pbr>=3.0', 'setuptools>=17.1'],
--    pbr=True,
--    long_description_content_type='text/markdown; charset=UTF-8',
-+    name="munch",
-+    version=__version__,
-+    description="A dot-accessible dictionary (a la JavaScript objects).",
-+    url="http://github.com/Infinidat/munch",
-+    author="Rotem Yaari",
-+    author_email="vmalloc@gmail.com",
-+    install_requires=[
-+        'six',
-+    ],
-+    packages=find_packages(exclude=["tests"]),
-     keywords=['munch', 'dict', 'mapping', 'container', 'collection'],
-+    classifiers=[
-+        'Development Status :: 5 - Production/Stable',
-+        'Intended Audience :: Developers',
-+        'Operating System :: OS Independent',
-+        'Programming Language :: Python',
-+        "Programming Language :: Python :: 2.7",
-+        "Programming Language :: Python :: 3.5",
-+        "Programming Language :: Python :: 3.6",
-+        'Topic :: Software Development',
-+        'Topic :: Software Development :: Libraries',
-+        'Topic :: Utilities',
-+        'License :: OSI Approved :: MIT License',
-+    ],
-+    license='MIT',
- )
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
deleted file mode 100644
index ef1adba8f2dc..000000000000
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="A dot-accessible dictionary (a la JavaScript objects)"
-HOMEPAGE="https://github.com/Infinidat/munch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-
-BDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	test? ( >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/munch-2.5.0-revert-pbr.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i "s:__version__:'${PV}':" setup.py || die
-}
diff --git a/dev-python/munch/munch-2.5.0-r2.ebuild b/dev-python/munch/munch-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..43f92bae1c42
--- /dev/null
+++ b/dev-python/munch/munch-2.5.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A dot-accessible dictionary (a la JavaScript objects)"
+HOMEPAGE="
+	https://github.com/Infinidat/munch/
+	https://pypi.org/project/munch/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+SLOT="0"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 76c36bdced9c..8eaf1597a7cd 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,3 +1,3 @@
 DIST munkres-1.1.4.tar.gz 13777 BLAKE2B d783ac7a4fd55826ef3ddddd2ba82cf0499727e605a2414491af7dd9080193c53f1e48ed17dba9a462578bc958d3d9e2e1e413408143b4cfd0305f9cb3b6c517 SHA512 24ae7d04f4a6fe52f7bb9dc79bbee3e33425b85813382e2634e106a5d26d2d728ba8d34fab9390b7c3d651bc0e95214dcf9c94ac436636cd5b487a054b5a2c54
-EBUILD munkres-1.1.4.ebuild 529 BLAKE2B 3b5502867f9c43f3e9d5d5d3182623266ab59755af6d53fba3716d271bb60238b43fe807faf86185fa7ebe92e837be59de2944378fca7f44fa41104f28804814 SHA512 10fa2274a450f4d14dadd939463600098e9389d826bcc2ed8d679b16ed15acf7a333cc7eb67c5fc9862a663a01b814428492ef0572c83732e8b74bd496b94194
+EBUILD munkres-1.1.4-r1.ebuild 560 BLAKE2B bd1d5b3bd930f66299f84c8522424f4951784230edb5b9f23323d0ad937ea4b954718c4ce56b3c751a50ea2fa277e27bb385ff0d182f352f862d5a8937423722 SHA512 689c775315de884d46ee0ceaa5d7a4e9027621fc9d73a6ab7321acba596c233f8867624dcf575bebdb8c9d6c383b70b8177dad4645be61423f8c46f2954baf74
 MISC metadata.xml 772 BLAKE2B 476197b5218d2e1b000c16be048dd1ef56b605a93978468b0fc95500032102497777021803c5b6db546ee433aa4b5d1f02f232384a0e4665cea4d2a5b0cf1230 SHA512 5b433e5ab0c97c69680da925ed03362fdbb40ab74c5d8cb851f5b4c3b66f50f9de066657024b230d4d0d8274c6dd1035502b375581ae595c2032f3537035a8a1
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..f8d408677de7
--- /dev/null
+++ b/dev-python/munkres/munkres-1.1.4-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Module implementing munkres algorithm for the Assignment Problem"
+HOMEPAGE="https://pypi.org/project/munkres/ https://github.com/bmc/munkres"
+SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/munkres/munkres-1.1.4.ebuild b/dev-python/munkres/munkres-1.1.4.ebuild
deleted file mode 100644
index 60083d981c89..000000000000
--- a/dev-python/munkres/munkres-1.1.4.ebuild
+++ /dev/null
@@ -1,18 +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="Module implementing munkres algorithm for the Assignment Problem"
-HOMEPAGE="https://pypi.org/project/munkres/ https://github.com/bmc/munkres"
-SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index dd72dbb040da..b8fe94eb6096 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,5 +1,7 @@
 AUX mygpoclient-1.8-fix-literal.patch 1376 BLAKE2B e538cd673ae420e86cc68a8e8a93a20ab5714e2e44f864b62dfa2b2944fc5ba2c4df780079fac1db1ec531fc819b6c005bb727cd7ec95163f82d82ed6e6d256d SHA512 80409bb7419561e35f6200d0788e4e82c67b29114a5822c18f8559a280c5aab4bdfd3a263c1eeb3ab67ef17e95430e19723a8a8fc890644427811be6cc6ef9c2
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
+DIST mygpoclient-1.9.gh.tar.gz 44998 BLAKE2B 5feb17fbcdd02c632a11d9ae685b099addd2fed056e72d532e6391b707cfc46e694182ea4e5d7334be10796b5bb19b2d8cbceafe0b69798206f5ec41ca337913 SHA512 57502295725d3a1351e877998442141dd596927215d3746786c12db061ebe3bdf8282e8b2d554997515a558f608c0815e4caad311ad3f1ea9f5b62321e8d6635
 EBUILD mygpoclient-1.8.ebuild 836 BLAKE2B fda0a3569b1d605497bf10d6499806acdaf57bbbf70c783e2b35fcc1617535c6ec224ebb3c335d5e11a8b7f03f2bf26b86c3f3aef595ec601f25d8764c2d87d1 SHA512 d694c61cf3b353fc86b00367fd4a8d3d3e8b49b829d1447ffe7b571e567fa9996effa71dc46408d8a4e3e2731e13f99677f74f4972f7a5a553fb53ca020d3563
+EBUILD mygpoclient-1.9.ebuild 623 BLAKE2B 2f5cf8fe3dcab475051249c193dd46b620664759a4c350b987223294b82a02fd5d311178b9e5b6fff1dc3fd7bfcac2fd6369d679fee7d94703571a314f22d83b SHA512 e2754955aa22b4aad4e486f10571a27846a486054c308fe621ef139576fb3fc404cc4f118214f29ccf9168bf4c092c4462a96e6f6f41fe088050c94591dbf5fb
 MISC metadata.xml 512 BLAKE2B 2ff1435acc5efe1b4390e91957781baa2d555f127de82ceeefb7349f5c4b553a56924e0ecfe698e8a570da8a6d5ef462240a4c5b2f00c65918f2a175596fa9d5 SHA512 c89fef8499773f751d23d33d7c4407be85286ccf88f93f5fdc630a86602de024e2f3cb014837877f7b70012a3dac8625263fa8898aaf5c0675f0fa3afac31b20
diff --git a/dev-python/mygpoclient/mygpoclient-1.9.ebuild b/dev-python/mygpoclient/mygpoclient-1.9.ebuild
new file mode 100644
index 000000000000..1286362967e3
--- /dev/null
+++ b/dev-python/mygpoclient/mygpoclient-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A gpodder.net client library"
+HOMEPAGE="
+	https://github.com/gpodder/mygpoclient/
+	https://pypi.org/project/mygpoclient/
+	https://mygpoclient.readthedocs.io/en/latest/
+"
+SRC_URI="
+	https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/minimock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index ad04d8fd8c53..55e299e06068 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,9 @@
 DIST mypy-0.942.tar.gz 2701940 BLAKE2B 5501466e57b4afb8825e6c804cbdc270c79ff457c39f2e5834f4b68df70263c05b2b9abb08fe58202ee65f5e22d2291f39fcb1fc47168416134538c5f6e12ab3 SHA512 79b83587eefad10d7d20d3bfd8484a9e8b2d363e68c1e5ffaa3a82ca8b8f8d9183036ea46695a634f9156911d6f918af684ac636105b37b3a5d0e958f5d661f4
 DIST mypy-0.950.tar.gz 2746164 BLAKE2B 8466012fd3622f5e730acef774115ac84ff8c6f5488213a450de63d5acc790f937b7c69a1b05b46deef6fe8f81a13ed8e85f83c6c22cce9abdbb73b2ecf4179c SHA512 949d1dade3f225bbef0934fff040f7d5aec47039f554a669ca491d6cb46d56de3fcae0186864cdcaf5dec1347bc3af453218520536a0afa77e89a5c0e4640500
+DIST mypy-0.960.tar.gz 2767017 BLAKE2B 54ca4b9ffeef1f9211569ae8daee3ae201bfc6239eb9530dd5b7bb53983b0f9d343951dc49e4c4cd257660491be3805d7b8a3b5621dd25f1b7726f522a1c74df SHA512 1caa5ea5d87631a00acabd712053193aac4ed2f475760da90e395d64c44092797e45a4793a5fa2dc05458e9d2411b5cde14811c8a5112376c00baf9792df923f
+DIST mypy-0.961.gh.tar.gz 2767264 BLAKE2B 333e860f2416d065fd26f29f818e88c25f223c8f558bd174280ccfbe856c823253095830cc9cc44dd453b3661583d7626e5679ce1e44479b62ed75139051a9a2 SHA512 f7f57d38777256a45c950a45e832b6f1b9465a6663056472a9b32dc8c1d38b4d28ed856f4de12202de5910eeb6197a22073e12924a1e3f58d5631aaa938c0f2a
 EBUILD mypy-0.942.ebuild 2067 BLAKE2B ae5ed742a488d69d1ab9600d5e163fc44b99fc38effb0eb54892b5ac1029a50ec10b0699c767ac9a92b7b40a8d8957fc317af52b6081adb1c5a5f984f1a1c157 SHA512 20e6e340c0c03a7d081d419c2ff68433d8d1aa947c538744c45da45126fba2cde9bbcb8137f3a16d20cedc6374fdbd5f07559454db009d457903bd8f3b141ca1
-EBUILD mypy-0.950.ebuild 1693 BLAKE2B 8a9104ef8cee35e8da6cad72600b0a7af10ec8a748c3b17ecc40037fbeca7aeda536fcc8a20cb7e2b971def88b0cb05ab34afcbad67138a7043760f0b37b3d53 SHA512 453df7970adc5c4072f39b3c0b82f5a5ab03118ae3a65e2570d175d1b88cb93e3fb44704ba8cbd5cc1887c4e239ca2807789b38f4f2f025911c3af05dd7899ef
+EBUILD mypy-0.950.ebuild 1686 BLAKE2B d6d47d2756a681d8d401081f022dbc0b2810a3b52bb6e36a71398c0b37e8a64bc7638f7066bd4e94f9cdcf285fd73a53b4086f67f41bb6c41ad9c88b9a1cbd76 SHA512 c9cb3bee73f0f9747a1566206d7a2cc40d5344f79e870ea7505305c7ac13cbce2e3e889a324f6bd6c6f312072bc596465a052b33a780fb15cd1e4234e6c1a535
+EBUILD mypy-0.960.ebuild 1734 BLAKE2B b03fa3303165fbab8a643748715b59fe1d99e94b3175823cee90916a95e62245a2d482087d5e2ffb5abbd9f9d292efd0274aa81de3e00f4cccd7d05fd369b04f SHA512 02d9daf5ba3caa8e4443769bb23f64d0e791ae38df13ca2a4156e33b0d07ed5260dacbd16cbd01995b971ccda0626802636ebaddbe8a369bf5befbb3e6951b72
+EBUILD mypy-0.961.ebuild 1728 BLAKE2B 2c91f49de108aad40731952a01a74a1a04ca42faadaff43fe7d45ba146a3bae67b2f43cc5971b820ca552a69ac60048a193f98b778c8ef99b70fa5a40f360460 SHA512 3ceb5969fe9e54517c9866b7d4ff38f6b8da5e2c733359a82f8c1c43a35174b1346a725ce2c33610b9695dd983ca7dd7c45b82dde91f26e3ac5d86f0a0592fbd
 MISC metadata.xml 515 BLAKE2B 75827bbbeb70fd4b9295ab4689068d2d4b686b32d4059acde94fb0d08048e9e56ecaf3eec39dc5567b2753e2552353e273cdf2f4e27d077cc9b03320ee09c64b SHA512 c1c3c7a3651e61e0b63ab4462f0370cce9cbdce33e64c5e7a1fbefe8116d5d3d3b35bc4095d8a5ce28caf69b0644af3f13c9a27b683f2f981e52f8bfe4ac8615
diff --git a/dev-python/mypy/mypy-0.950.ebuild b/dev-python/mypy/mypy-0.950.ebuild
index f0681f205e87..06f879d5724c 100644
--- a/dev-python/mypy/mypy-0.950.ebuild
+++ b/dev-python/mypy/mypy-0.950.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mypy/mypy-0.960.ebuild b/dev-python/mypy/mypy-0.960.ebuild
new file mode 100644
index 000000000000..53e61a80d3b6
--- /dev/null
+++ b/dev-python/mypy/mypy-0.960.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	http://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/mypy/mypy-0.961.ebuild b/dev-python/mypy/mypy-0.961.ebuild
new file mode 100644
index 000000000000..af438f0f0428
--- /dev/null
+++ b/dev-python/mypy/mypy-0.961.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="
+	http://www.mypy-lang.org/
+	https://github.com/python/mypy/
+	https://pypi.org/project/mypy/
+"
+SRC_URI="
+	https://github.com/python/mypy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# stubgen collides with this package: https://bugs.gentoo.org/585594
+RDEPEND="
+	!dev-util/stubgen
+	>=dev-python/psutil-4[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/typed-ast-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	<dev-python/mypy_extensions-0.5.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	test? (
+		>=dev-python/attrs-18.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/furo
+distutils_enable_tests pytest
+
+# this requires packaging a lot of type stubs
+export MYPY_USE_MYPYC=0
+
+python_test() {
+	# Some mypy/test/testcmdline.py::PythonCmdlineSuite tests
+	# fail with high COLUMNS values
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 24b9dfb652fc..b0740430693d 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,5 @@
 DIST mysqlclient-2.1.0.tar.gz 87635 BLAKE2B b92e138f6128873912e951087bc4f12b3c00a400521c7ee64da177c6f5a2dfb3a649d92f7a12f45c8716fd8b6b9682a0eff6d9bc111cffac38a27676f67d396a SHA512 a0b2645af225fd6f1f551cfd34c09309a859410e66287c32637901e15beb88632f9a3e87cf2b08a94867a9b2d4a048c56d63d55f523eafc82f1b1b93ce1c843c
+DIST mysqlclient-2.1.1.tar.gz 88138 BLAKE2B fdd044f2703af874dc0ca67b2fe07fcac3ceed5a4543aa15a0daa852ddf5ad6940a43675c0f104d9aa173e96da946e33054e1cc4c1b9812487558af64cc8fd43 SHA512 d8aed044b651aabb8d28d2df085f84e4d824ef0f147216d111425a9c8024f55634236ec131debf46660084c5a8fd67c944db60ffbf89e1d712cdca80c0726a06
 EBUILD mysqlclient-2.1.0.ebuild 2060 BLAKE2B 6f01c9b7ac4e37d4ad1670cf7e392f4bf420e2ac0c1688df8c9df099476519f92c18bee9ef1145b9d350f335f39f84907e4d51da50c3e4842348d64b6f9de76d SHA512 c2cb94c40114c5fafe4effaa92ba7b49f9281bdbeb46c6cb502ea48b117b63e0a50c25c03e714d48e0d557d44b6236f227fd911951f14425ee0f95385360c231
+EBUILD mysqlclient-2.1.1.ebuild 1920 BLAKE2B 60ba3343ef92ae4963610a24c679e56ae77dddfbd078f354f2aa0a60582c9d1a4eaf294aa6c4c8df639532b7fd5d7879e74fda48879b151b9564c695f4c8e279 SHA512 d9cf6b656baed93b80178f81cecd7b4910bd05326cb5a4d12b5cd62b1f440fc399804d42252c32d37f14c479220a2ede3244cef6acfd65ff18e8ff4c106c8e7c
 MISC metadata.xml 507 BLAKE2B 3c274117dde5aed93bb78488b1c106ea9b18243725d88867e6b568a09229d97bc35a1116d8a529c5c72cabcb9feb33de8157448cf3d339dbf1861d8a9ff2c1d6 SHA512 4304ae4addf93365b2acfd493a27a0144bfe0dd2d559a3fce73f52d0d1683c84b1597c9d11f36b332b6428523fd8082297ab39ce000d961ccdf39d92833828ac
diff --git a/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
new file mode 100644
index 000000000000..e1988244df9f
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-2.1.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to MySQL"
+HOMEPAGE="
+	https://pypi.org/project/mysqlclient/
+	https://github.com/PyMySQL/mysqlclient/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+src_test() {
+	local datadir="${T}/mysql" \
+		install_log="${T}/mysqld_install.log" \
+		pidfile="${T}/mysqld.pid" \
+		socket="${T}/mysqld.sock" \
+		log="${T}/mysqld.log"
+	einfo "Creating test MySQL instance ..."
+	if ! mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${datadir}" >& "${install_log}"
+	then
+		cat "${install_log}"
+		die "Failed to create database"
+	fi
+
+	einfo "Starting test MySQL instance ..."
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--pid-file="${pidfile}" \
+		--socket="${socket}" \
+		--skip-networking \
+		--datadir="${datadir}" >& "${log}" &
+
+	local i timeout=10
+	einfo "Waiting for MySQL to start for up to ${timeout} seconds ..."
+	for i in seq 1 ${timeout}; do
+		[[ -S "${socket}" ]] && break
+		sleep 1
+	done
+	if [[ ! -S "${socket}" ]]; then
+		cat "${log}"
+		die "MySQL failed to start in ${timeout} seconds"
+	fi
+
+	cat > "${T}/mysql.cnf" <<- EOF
+		[MySQLdb-tests]
+		socket = ${socket}
+		user = root
+		database = test
+	EOF
+
+	distutils-r1_src_test
+
+	einfo "Stopping test MySQL instance ..."
+	pkill -F "${pidfile}" &>/dev/null
+}
+
+python_test() {
+	local -x TESTDB="${T}/mysql.cnf"
+	rm -rf MySQLdb || die
+	epytest
+}
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index a5d29f3d810d..401305f9b5b0 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,8 +1,5 @@
-AUX myst_parser-0.17.0-32-bit-test-fix.patch 1273 BLAKE2B d1d46785f723a61bdeb6e4fa62b2d61aebc4e525128b488c749956708f5b51e23ae265d6811d4ced35a4b10e8565abb9358518dd27ed6b494706bf8ad1bf5ae7 SHA512 315e9b82a13bf599313e431d57b75308689a7ba649d8eec08c0bf489691399badab68ca449ca0c5d2fff96f96bd8e4ce8d18880781ddb9d0e393fa05cd515c51
-DIST MyST-Parser-0.17.0.gh.tar.gz 877372 BLAKE2B 00dea98fa9cd8770480047a824e18a903098600dd52cea427e1cf3a4ff0a4930502967e136a3c6e9ccb4a7f6c54c8c4c8f9c5bfc701e1b24a0006b867f8ce74a SHA512 e9f4ea05ab55b0979b26f0211603aee0835a30fb37a0ca23f23b96e0b47670b6b8e443ee9759df5011d009e20d817eaffd4066c4be4920f96786c283aa206239
-DIST MyST-Parser-0.17.1.gh.tar.gz 877466 BLAKE2B 79f2e03f07ad0887318e4d38745b7bbcfba5ffcb8a56a689489e2202c151702c3b1200607c7f8a0bb29b276c6ab74c201dd819a93a5b1dcfce556bf2bc38ffe1 SHA512 8b149f35d83285d54ad5e6c530eded9c9c838e65f5971c0c0fd5c1be55f365eca9d2c2871fa3c176daa58a7d7498fe06df747818c46f9fefcf9641db3286817d
 DIST MyST-Parser-0.17.2.gh.tar.gz 878600 BLAKE2B 0c5b9dd5aa1e1e54706c1a04770fac33f8b2233164f2462a27dccdd405592dde4d41ab986632a2903aa26a6e7ae942e0ad54103c48f0829d410b080facb061a8 SHA512 625894686093266af03ef2cf01cd3dc2fea80c933479d6df3a4b99a103f17e8afd7120fe7a56ef21bdc8aa33569741a675caf4a7e1ed6ddbe3facae19b3c222a
-EBUILD myst_parser-0.17.0.ebuild 1376 BLAKE2B 4e7eaa3c4c07795b2ce7278dd3ac1a12ac097c06cfaeaff2be7db417a4532c92128e72809324fb621cbea5e0534d32f6705e70b55b0c33dde097999ce5ca3ab6 SHA512 9714196c4dd0ff376fffeadbc9599c17433f0e687f06b4d3d8be23aefbdf20ea8de31939359d754458d3c4f633b3203b3d8e426f38cd7d94bc57a67da0660994
-EBUILD myst_parser-0.17.1.ebuild 1314 BLAKE2B 8d3662daf3255794bbf8e12ac39100e8a8dfa8160e2068277b035791cee2584d9afb33ca8a9053401628d8c2fc6ce0fb00b89044e8603504e428c897920e2e89 SHA512 6b2a56527693d48635f449afb183d567449939b8f26fe4dda266e0010018b268ad02cc024e784f45187921d8bb3dd14223f14145f86766ea3f81a57398d028b3
-EBUILD myst_parser-0.17.2.ebuild 1315 BLAKE2B 241f3bd442cd9f9fb4922a5c6a5fc836e7703a38a0a815b01e14d0efefd25223fa0e185f728e4927f3294534974bb778c591c0c3c793fda8eeb900199be4c8b0 SHA512 976e71e53b81a6ff173a9d7a48fb98c3b83c03f1823a33ccd80b62076df86949a0eafc770f941ebac8988eca3e079c9722a4310b85e36f99b768dbde4f20231d
+DIST MyST-Parser-0.18.0.gh.tar.gz 768448 BLAKE2B efb5d1907b5779b1816f1cc4fd5ede9543cf246e4029f4bf6d763a8aacdf54b5c8c5efa2fea61de4bf257f5979871409ee907b3349cdb4f099ac689131d0805a SHA512 919494467de3f0cd97c9c8062626b88c22fd0596e120b7ca117b8bce18d9fad9faf06a36e4c5bd8a4dad838c888524c780beceaf3e7acb42232bd3c903fabc3f
+EBUILD myst_parser-0.17.2.ebuild 1307 BLAKE2B 0b16429855acefc1bca9c867c20f5f03b6125d2df0083d25c30fac7e503daa08cd9a7aab1fa4da0eb70441d4b9be4580a273a3c54f2618ad1d46aa379ed44c16 SHA512 d6c780e2078bef21d367bbfbec9c544ab0c9bb853018dc7e560f99b95e32642373cf0f78a9ad95220dc9355f55ddb13dafeb138024f8c431a2491ae279468ed4
+EBUILD myst_parser-0.18.0.ebuild 1622 BLAKE2B 5b8049fd918f20c8d164bfc78428e25db0253fc67814bd6a81dad529aa53778e208a31c1d404ec50bf8cfcdf9af3c541d19d3d1a51861734d8ccd5760e34c9af SHA512 79cf43f33189615ee9e989cc0f261b9437c4ee068486b981042e16b4141819191eb88c023a9806f6d39f206f938945b041fa0dcec38b89d14e99e12b99b5a237
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch b/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch
deleted file mode 100644
index 2363ac639c60..000000000000
--- a/dev-python/myst_parser/files/myst_parser-0.17.0-32-bit-test-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/executablebooks/MyST-Parser/pull/523
-https://bugs.gentoo.org/832823
-
-From 84b0223eace0a1022935f2766da6c930181503e4 Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefano@rivera.za.net>
-Date: Sat, 19 Feb 2022 14:57:58 -0400
-Subject: [PATCH] Massage test output on 32-bit systems to match 64-bit systems
-
-Fixes test_sphinx_directives[35-highlight (sphinx.directives.code.Highlight):]
-which was failing on 32-bit platforms due to linenothreshold defaulting
-to sys.maxsize.
-
-Fixes: #522
---- a/tests/test_renderers/test_fixtures_sphinx.py
-+++ b/tests/test_renderers/test_fixtures_sphinx.py
-@@ -3,6 +3,7 @@
- Note, the output AST is before any transforms are applied.
- """
- import re
-+import sys
- from pathlib import Path
- 
- import pytest
-@@ -50,6 +51,9 @@ def test_sphinx_directives(file_params):
-     document = to_docutils(file_params.content, in_sphinx_env=True).pformat()
-     # see https://github.com/sphinx-doc/sphinx/issues/9827
-     document = document.replace('<glossary sorted="False">', "<glossary>")
-+    # see https://github.com/executablebooks/MyST-Parser/issues/522
-+    if sys.maxsize == 2147483647:
-+        document = document.replace('"2147483647"', '"9223372036854775807"')
-     file_params.assert_expected(document, rstrip_lines=True)
- 
- 
diff --git a/dev-python/myst_parser/myst_parser-0.17.0.ebuild b/dev-python/myst_parser/myst_parser-0.17.0.ebuild
deleted file mode 100644
index e2a7f33c4954..000000000000
--- a/dev-python/myst_parser/myst_parser-0.17.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
-HOMEPAGE="https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.0-32-bit-test-fix.patch
-)
-
-EPYTEST_DESELECT=(
-	# Unimportant tests needing a new dep linkify
-	tests/test_renderers/test_myst_config.py::test_cmdline
-	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/myst_parser/myst_parser-0.17.1.ebuild b/dev-python/myst_parser/myst_parser-0.17.1.ebuild
deleted file mode 100644
index 765e019e6eee..000000000000
--- a/dev-python/myst_parser/myst_parser-0.17.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
-HOMEPAGE="https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Unimportant tests needing a new dep linkify
-	tests/test_renderers/test_myst_config.py::test_cmdline
-	tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/myst_parser/myst_parser-0.17.2.ebuild b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
index b52f2822628f..89a18be3805b 100644
--- a/dev-python/myst_parser/myst_parser-0.17.2.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 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/docutils-0.18[${PYTHON_USEDEP}]
diff --git a/dev-python/myst_parser/myst_parser-0.18.0.ebuild b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
new file mode 100644
index 000000000000..784cb08154fd
--- /dev/null
+++ b/dev-python/myst_parser/myst_parser-0.18.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=MyST-Parser-${PV}
+DESCRIPTION="Extended commonmark compliant parser, with bridges to sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/MyST-Parser/
+	https://pypi.org/project/myst-parser/
+"
+SRC_URI="
+	https://github.com/executablebooks/MyST-Parser/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv"
+
+RDEPEND="
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown-it-py[${PYTHON_USEDEP}]
+	dev-python/mdit-py-plugins[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/sphinx-6[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pytest-param-files[${PYTHON_USEDEP}]
+		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Unimportant tests needing a new dep linkify
+		tests/test_renderers/test_myst_config.py::test_cmdline
+		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# bad test relying on exact exception messages
+		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
+	)
+
+	epytest
+}
diff --git a/dev-python/nagiosplugin/Manifest b/dev-python/nagiosplugin/Manifest
index 44d225024fb3..30a799155145 100644
--- a/dev-python/nagiosplugin/Manifest
+++ b/dev-python/nagiosplugin/Manifest
@@ -1,5 +1,3 @@
-DIST nagiosplugin-1.3.2.tar.gz 54262 BLAKE2B af2a8a876105a1ea26671b39d611beaa46303998544adadee3370c6d1b5096fa93160121f89412f3778a2bbc1c3e95606a49413b8f3f0880c9c9ca4e946fb1b8 SHA512 899650852397bffb66ad53843233adec2c91e96656674a9b21c5a02ed97ce4db69c1440d1b88c5799a54745e69b8c05f52188403b5a2fe9050acbd0067806d50
 DIST nagiosplugin-1.3.3.tar.gz 3119586 BLAKE2B e1aecd6f69fc7afe5cbba259191d2ae540efa513ea8f61a263a453ac2b1f6a5d91bbb209d01fc83c72080b54540f7661c04b3485b5cc6c1f9aab44ee2e8fba67 SHA512 edff09b689fd767b9c8ee2ffab30fc63cb740234c830f2f8fef5054e5bc44e945c69858e2374257433b758fb33943a8b148c023a8fde75edbc188da7424a00b6
-EBUILD nagiosplugin-1.3.2-r1.ebuild 519 BLAKE2B 2bb80a882e89a374199fbf066e226f9a53487f806f9c24736aac39bf39d16db808daf303a9f82f364f0eb1cecae1cb0ff00e3833e1f6fec165d989de60acd31a SHA512 2d7b5bb31d6089d66a119970aeccca99b21d4d6517d445360accf54423d6eb1394b5ac0fb261cb942e7857b05b755657a25c8c4ef4575016aa8a624dd23309fa
 EBUILD nagiosplugin-1.3.3.ebuild 551 BLAKE2B c5cc48272bb4a584f5814fb859fb68adebf49fda3105a1f1dc276f47fb250f9dc1d08f39042eda790553f095424f9d0c4290eea77a61e9dfa2d704adc204d36a SHA512 4c941083bb983618f07023f4eb5e2e95c6207afe0b2a2887b99bf92f0f50e811ae1b38929bd1b73e58cacffbd7350d7d850c86688731a3b393436e3f2adc9c01
-MISC metadata.xml 453 BLAKE2B ff379e2cf739a4d002c710c1288e1476f2639a9f338f867f2ab680262beb7e11d98f1e78c304353b17d5bfcd2460e5a733921a452d9f8e3310644e6e1121ad97 SHA512 2a0fa4aba722284e5d83e318da82aa01b21ffde9dd59b3e44a858576ed26cac204b46f1f44e8acb74a8f5edf3de25c8a6fb5130b2a240ec4addf24d14f671cf2
+MISC metadata.xml 554 BLAKE2B f2be163e7fbd5d95a502293d86a506387f0101fa2d68f7d257e4a95a8a40c8ba37df415f598ff5eef3529da03fe1e2597e67fa74dbe1e46783889648cbfa6cf4 SHA512 53935c83a9edc9be4a8a692196087c243a74804d84bdc1857b9c1bb9e99c253401a0c9a9239deab5b27fdd2e236a424e69a5bf54110f8e0bda675eb702b30c16
diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
index 8aed90173f4d..aafd5563e8c5 100644
--- a/dev-python/nagiosplugin/metadata.xml
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sbraz@gentoo.org</email>
 		<name>Louis Sautier</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">nagiosplugin</remote-id>
 		<remote-id type="github">mpounsett/nagiosplugin</remote-id>
diff --git a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild b/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
deleted file mode 100644
index d547b7438f37..000000000000
--- a/dev-python/nagiosplugin/nagiosplugin-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A class library for writing nagios-compatible plugins"
-HOMEPAGE="https://github.com/mpounsett/nagiosplugin https://nagiosplugin.readthedocs.io"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="ZPL"
-SLOT="0"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
deleted file mode 100644
index 84bf18f3e1f4..000000000000
--- a/dev-python/namespace-google/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-google-1-r1.ebuild 827 BLAKE2B e80654f7f488e9a3893b952df6a3ccf7a6986215825e7d915a1fc89381d67c11a2ff345f88bbb94f3e8238e81c2a719ae3dffd50928d66be91c21008977dd218 SHA512 6b74b7c1bc778ab77bbd59ca2867cabf06c5743938564f4c869c8dc87e1b00e5f7d512767500cd277b6313e09ea54a2cdb40534a304ab239b9541f635cd44b1d
-MISC metadata.xml 219 BLAKE2B f7cf6cd41e0433b323b2c16caf31baef1c0b5ea00980018722e5fae803f92216e39343892928605454b0c756e121929eace02b4925a6bd7f10421e91a1845357 SHA512 27c6aca9eb36b7d427c10b6daedc4bc6c0d744fb464e5322ef6823073bb9be648a60ba2fff5f855282a5a5a3da3ce379d9419cde175d462f1fa443ff6b3a4bdf
diff --git a/dev-python/namespace-google/metadata.xml b/dev-python/namespace-google/metadata.xml
deleted file mode 100644
index 3d7915601999..000000000000
--- a/dev-python/namespace-google/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
deleted file mode 100644
index 285076609031..000000000000
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for google"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/google || die
-	cat > "${S}"/google/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule google
-}
diff --git a/dev-python/namespace-lazr/Manifest b/dev-python/namespace-lazr/Manifest
deleted file mode 100644
index 05b6edbf215c..000000000000
--- a/dev-python/namespace-lazr/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-lazr-1.ebuild 702 BLAKE2B 71b8727d11f2f1a001af4250395345e7963139df8bef58d6f9758023e08c9c2f5833231901cb4ff95fe77802d22cd249cd9b9aaba2572b28dace4011da7fab27 SHA512 68f4fe4098a06acab8af175b03586461c12c65b59425df490b7a0354d59745547bcd6b3878013f30cb46cc139f115db7415c7c3a004152f3a64976bcafa8bc89
-MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/namespace-lazr/metadata.xml b/dev-python/namespace-lazr/metadata.xml
deleted file mode 100644
index efd7c8c21836..000000000000
--- a/dev-python/namespace-lazr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-lazr/namespace-lazr-1.ebuild b/dev-python/namespace-lazr/namespace-lazr-1.ebuild
deleted file mode 100644
index 666b737652b0..000000000000
--- a/dev-python/namespace-lazr/namespace-lazr-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 python-r1
-
-DESCRIPTION="Namespace package declaration for lazr"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/lazr || die
-	cat > "${S}"/lazr/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule lazr
-}
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
deleted file mode 100644
index f8d72909ce70..000000000000
--- a/dev-python/namespace-paste/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-paste-1-r1.ebuild 828 BLAKE2B 3e8c99433ce125ef9d1dc76ba599e50a49d3edc40e2300dbfb1312c5a8f1b69fe06228673a892d2f434d6ea357f0e2c3604b74c8268e3c502f26349926f59698 SHA512 a900d06339e45767a9cebe82f152750b664b1af546688f172def152f0bdb14c9f366f6b4bf10a4c2a8f97f77a8c3034e2d4cdb77d8dbc676100e355c9d4776f5
-MISC metadata.xml 243 BLAKE2B 3c6936b8f9745e6fb81fda204eada4f73210288cdb19a90b1cf913ed01d6ee9155d4a69bc5dcaf8c69a21123339626610d7b57729981a9d10800b85501baa120 SHA512 50af947c4f1de2f27e6bd29010dda35e92d2e0477bfafcd4d44ab218d2a47788324aabad58b603ef5c30e69b382084e7dc3cecc581cc0ffbbdd71ed566772a44
diff --git a/dev-python/namespace-paste/metadata.xml b/dev-python/namespace-paste/metadata.xml
deleted file mode 100644
index 7d421671d884..000000000000
--- a/dev-python/namespace-paste/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
deleted file mode 100644
index 8cd006f2de4a..000000000000
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for paste"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/paste || die
-	cat > "${S}"/paste/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule paste
-}
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
deleted file mode 100644
index 9d94b1e2e5aa..000000000000
--- a/dev-python/namespace-repoze/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-repoze-1.ebuild 761 BLAKE2B cbfebb03f44f9ae979bdc6f0d13ee8fcca70db4783c8c4bd68ade370061411a3aaf3d8be885332370ae7be35a8797fc8cf91f9e95b7ac3fcb667d1c4a899a3fe SHA512 6bce77ccf3c912abfe25c486637a74a124d3a6dd8548fa9d9b270b6b704fa9874b66e0b31de9297fe54ecbf00e679eaac3e47552663130e9527a41e58ef65bbf
-MISC metadata.xml 219 BLAKE2B f7cf6cd41e0433b323b2c16caf31baef1c0b5ea00980018722e5fae803f92216e39343892928605454b0c756e121929eace02b4925a6bd7f10421e91a1845357 SHA512 27c6aca9eb36b7d427c10b6daedc4bc6c0d744fb464e5322ef6823073bb9be648a60ba2fff5f855282a5a5a3da3ce379d9419cde175d462f1fa443ff6b3a4bdf
diff --git a/dev-python/namespace-repoze/metadata.xml b/dev-python/namespace-repoze/metadata.xml
deleted file mode 100644
index 3d7915601999..000000000000
--- a/dev-python/namespace-repoze/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
deleted file mode 100644
index cb7c6f285e6f..000000000000
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for repoze"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/repoze || die
-	cat > "${S}"/repoze/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule repoze
-}
diff --git a/dev-python/namespace-ruamel/Manifest b/dev-python/namespace-ruamel/Manifest
deleted file mode 100644
index ac9f6bdca46e..000000000000
--- a/dev-python/namespace-ruamel/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-ruamel-1.ebuild 902 BLAKE2B 8d7078e9ff3f82a9af7fa2c010d6bf60eca277323e60d5404f8b9d30a9ec346964ed6c9c08cf4efc3a0d0d4a1b2ce52ce181da29f2ecb44f2155efc0a1bcf6c5 SHA512 ebc3fcbf4186d2b1d54b55593f0978bb6da49d5213768646afb999f7ed69500d7eb8145aa5030f57936d131c3185f798ead7b26e4712e5cbe28cb7012712edab
-MISC metadata.xml 219 BLAKE2B f7cf6cd41e0433b323b2c16caf31baef1c0b5ea00980018722e5fae803f92216e39343892928605454b0c756e121929eace02b4925a6bd7f10421e91a1845357 SHA512 27c6aca9eb36b7d427c10b6daedc4bc6c0d744fb464e5322ef6823073bb9be648a60ba2fff5f855282a5a5a3da3ce379d9419cde175d462f1fa443ff6b3a4bdf
diff --git a/dev-python/namespace-ruamel/metadata.xml b/dev-python/namespace-ruamel/metadata.xml
deleted file mode 100644
index 3d7915601999..000000000000
--- a/dev-python/namespace-ruamel/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
deleted file mode 100644
index 5263778ca1ca..000000000000
--- a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for ruamel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/ruamel || die
-	cat > "${S}"/ruamel/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule ruamel
-}
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
deleted file mode 100644
index daa16175e644..000000000000
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 945 BLAKE2B 3ad2c71620b9dd5bd371e6ef293cba46b58a2e5f9d982bdabb2102bcd6438df8bf06537587a686858b0c620473f19b67daa0693270d2ac316570265faa5b5c56 SHA512 4d7a4a4ab47def3754af61f2a35ade6e163af685f494cecba230531bbbc770991972bbbacd60c52b0b659c4e8fec2507366be80e3d4766dd8be6bbc10accb8d5
-MISC metadata.xml 247 BLAKE2B 210f24b321f8f35cd1d368e9f50115682ac5d9f4eb007cc4b1273ee98ab6bc2158300fb863f60b53df3580988d67965e57067bcf9d00814cef3c6564078612c3 SHA512 ef6fcc3a42578fd36df1ff7bf949de64beb7e5c6ba6893f74af3d394ac533c34ea7852ed9edd8bb7a59f3d52c18e1497d437042c189c0224f1d2380634142799
diff --git a/dev-python/namespace-sphinxcontrib/metadata.xml b/dev-python/namespace-sphinxcontrib/metadata.xml
deleted file mode 100644
index 2cebbdb30a38..000000000000
--- a/dev-python/namespace-sphinxcontrib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
deleted file mode 100644
index 6a28d9882522..000000000000
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for sphinxcontrib"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-MODNAME=${PN#namespace-}
-
-src_unpack() {
-	mkdir -p "${S}"/${MODNAME} || die
-	cat > "${S}"/${MODNAME}/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule ${MODNAME}
-}
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
deleted file mode 100644
index 95977d505703..000000000000
--- a/dev-python/namespace-zope/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD namespace-zope-1-r1.ebuild 892 BLAKE2B 794359cd7a7c42f6a4b42910088924256bbb1dc7d53c76cf8e58f6b660fbcf29b9e8c009dcd6d94cee3ff82906977234a4d8ef8e26cd56cc4c5627f95eba5966 SHA512 901898c3b508e713c263ee135e1cbc3517e59fd30a551a53a798faac3e68c487253bca8c03d163769a0125b336871b3589e624df2ae8d3377c8426b747849ddc
-MISC metadata.xml 219 BLAKE2B f7cf6cd41e0433b323b2c16caf31baef1c0b5ea00980018722e5fae803f92216e39343892928605454b0c756e121929eace02b4925a6bd7f10421e91a1845357 SHA512 27c6aca9eb36b7d427c10b6daedc4bc6c0d744fb464e5322ef6823073bb9be648a60ba2fff5f855282a5a5a3da3ce379d9419cde175d462f1fa443ff6b3a4bdf
diff --git a/dev-python/namespace-zope/metadata.xml b/dev-python/namespace-zope/metadata.xml
deleted file mode 100644
index 3d7915601999..000000000000
--- a/dev-python/namespace-zope/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild b/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
deleted file mode 100644
index 96e1cf199f33..000000000000
--- a/dev-python/namespace-zope/namespace-zope-1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit python-r1
-
-DESCRIPTION="Namespace package declaration for zope"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_unpack() {
-	mkdir -p "${S}"/zope || die
-	cat > "${S}"/zope/__init__.py <<-EOF || die
-		__import__('pkg_resources').declare_namespace(__name__)
-	EOF
-}
-
-src_install() {
-	python_foreach_impl python_domodule zope
-}
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 17ffa76e3f3b..e46ec4c489b4 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-8.1.0.tar.gz 145241 BLAKE2B dcf9ffdb58cfe4d0f7ca0ed74701c8137a87716831dc747c5fb68d187a93c1b7414fa3625c0ed385e727e97c36feb99e9ecc6a41dd3d9da342d357646b5aaf32 SHA512 a065899b124e6a6ee8560ce1882650e35f0c36ddfd3c56462820886b076cd8cdb0121825e30e298af576e07915cc5bc1e90fe3f0b1f7bfb89f816c00665baa22
-EBUILD natsort-8.1.0.ebuild 698 BLAKE2B 849d2cc5a7d6e673c49c30ad0c69a3df1c408046fa205ba62423f5451bf7f28842540149b85630d3ccbaf8e685946b5a0d0c153799d418df42015b44203df17e SHA512 260c3f040708610a0d885ea1fc34e62bbf46b57fd6cfdcaf92177dd859dc5ae31207a184420bcace19e4ef9ca68b9a66aa0761ac194612ad84939ff0989d8d58
+EBUILD natsort-8.1.0.ebuild 698 BLAKE2B c0a65346a7f0a9c89e61269d9aa32efc97dd5d854f7dee4511df30fb6d9d11ac73bdd49ef48adeb1d258603b5e94a0cf0624cd328a5929a7f414b1ebf4bf67bd SHA512 6296a30c0bd421c2cd49eda90e00bb5cd583743f164f1a6b861a3fc0afc0069269026893676dbbe0f4ce2177e5508a501482e8d632cdd4cf34055afb8ee99e8e
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-8.1.0.ebuild b/dev-python/natsort/natsort-8.1.0.ebuild
index 7eefb3f2f2c1..39f3832df847 100644
--- a/dev-python/natsort/natsort-8.1.0.ebuild
+++ b/dev-python/natsort/natsort-8.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 794e65fd32ec..a893f06ff40a 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,3 +1,3 @@
 DIST nbclassic-0.3.7.tar.gz 15973 BLAKE2B a26a975fa8711c41a199e0b88b5ec83aefa4b812fce6ab4a765aa4920fae6b863519dbae556d663bf761a866a26ee6fe7c322c947312b89770a34f2a5b570455 SHA512 3ceaeeafa7e56d17cda29e4c86b4cb5f44517721b47e41ad1ac535704b8f460d88a5feb280ad8a9cef78366581e08c94837cab4ef2eae8dbce2ded183a787ea2
 EBUILD nbclassic-0.3.7.ebuild 875 BLAKE2B b120ddea33af8f4a3ea2192e94838b0c178584b927827769e50ac274289d585a79726ac1048217c9c374399dded66ad2aa7976a1cc2cc11b7fa9a106987ff60d SHA512 91afe190cf196bd823193f1f284bcd5769e0e23bedfc166065bda1878195f5ebe8995db0cdcb17f36e821588f70b95418cbe11e5600784b53d9d3f9e5dabbd61
-MISC metadata.xml 410 BLAKE2B 0b5a5047ac30e2bfc7f85fa8d5243dc4d90f21b3ba4cfa88e6dfa08d8a063a49fd962650424521a436963a40cd4d2b54ca15326f29aebd3df158c4985d94cd26 SHA512 3ce674ac4b73cd15fba38ea29f8064ce2a5c5b77ae58cb0b046a1b9b9263a3149674a5e24d96f3517d6a5fc2cfd13d5de15090ac40aec4865ec0626e91b28723
+MISC metadata.xml 511 BLAKE2B 7b2f2ef561542668fe43b2ac8d4e7b515238054c532d1e87bf043640925ec907ef57163d146458d1f4df15aaea47dabab852588ffff5cf9c9628c9e0c5c97e8d SHA512 533f4dcef511e4737a67970dc1234053777da2af6fb056cea95d1ff50e80d49a4fde3bc636c106405ceb7cd55fb3b7b4df3461e7bef2ab18baf27c65d1b81f33
diff --git a/dev-python/nbclassic/metadata.xml b/dev-python/nbclassic/metadata.xml
index 434ef7ba1288..67aba38d805c 100644
--- a/dev-python/nbclassic/metadata.xml
+++ b/dev-python/nbclassic/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">nbclassic</remote-id>
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 3584d1af9399..bb77c811f7b5 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,9 +1,5 @@
-DIST nbclient-0.5.13.gh.tar.gz 75335 BLAKE2B 02a1d7d84b51c3af81f4d511e3a68a94d28478d09241a174309d9338a10be9c2e7cc48601bfb844dcad979eca867890e96df47d0e2aa6d7f7881a2e899b79ab5 SHA512 cebb9c4216d4c1668908a0b332a32d63825e7c3cfcf78b3e918df16364a04a12c396646f4e0b215a9bbc40d1be907a361f90aff3721e299d17c852f8acec0d04
-DIST nbclient-0.6.0.gh.tar.gz 76454 BLAKE2B a6b9f829d4d67f18d489d913000d6507d988ba2e88a0a63c1e750941fa24d071b4c711f1bf2f8af154b62b853378c9c1a97426d8b4082bf6911be1da6935cb26 SHA512 3e986b44ebafde75b95042fc32f38d152487b5ce3a62aac4a41eca27c35d24c795c4dd0e694a9f211d06bc37ea4f76959ce30ebb8a19e04ed4ffafd5b8f1a4a1
-DIST nbclient-0.6.2.tar.gz 77390 BLAKE2B 0281b8fdfb01f31f2a1b9ed4b85b4dae1f3becc4afce29bb4359291840cf0dd69ee8acc97872e7c7e532c337d3a41a5d694b3ba644883f11ccf503439216eafa SHA512 878657911f30ae573a42f5a85d5e6359b32ae1aed178491912a51947677263137ce8ab7de0a34bb149a2fd4aab872c34977eb6ce1c77701ebfd1082b60576dd5
 DIST nbclient-0.6.3.tar.gz 77571 BLAKE2B 41b96f8c174506a97b257b352e2614f023785137bf79d57d9bd4fd38942b54cc9db97bdf63c65579e67f88afd57ff81cbc798880080842e981797ee07be9f441 SHA512 bf267f3f49289cadcce412dc772f01dab5cd4d5a4ceb3fa12b076357d04191a15573d540773d47d58a14570fe219a9591ab539b917b52f3f7a902aac0493ba82
-EBUILD nbclient-0.5.13.ebuild 1002 BLAKE2B bb5c800b48a69084a08eada6f4a1ba07948903d8b5172fd11f30298cc2c4061b68b8a88ba2a26f62da7d279b071ce5aa658a7bc52ecc8c8d685fe2d20a80d167 SHA512 23c081e6666a235c9cc2594c61be6b94347728a5fc7eacd49b556915187c0d5a7492b07940661d844e78e9a68ba1d20e939bd084b671f4cd53473c7b59c83d6a
-EBUILD nbclient-0.6.0.ebuild 1048 BLAKE2B 387ae603fce17532c809d5cf2479f8f0225135207aa94b1e36243611c9672e49c47c83fb846f3fa990c077aef29695a96ae5dad75328354523cbf0218d47b75d SHA512 311aec8799717ec293feec4c5f08984a1d401430c3463b32d589baf77326d371505adaf1f4805e7e95af3bde75ee0047ae148594018538f2d83b6d28ffb4608f
-EBUILD nbclient-0.6.2.ebuild 1047 BLAKE2B f10716b72b78aff6c703601f03621da0719afec9a44acbc522ee396c6388847ed2ccf16088447ef50ab95bf68ff15fb08c184c44f7bc3b20a25d989dc06f4d33 SHA512 79b7ad7121a7c62e2a77bce47380c3f7e31fe7698e3c05bb90fadeaaec4e2b0f23c47e4366efc4e8160ad9d414ccec38f15ef6c40312c000a1e75adda63f80fe
-EBUILD nbclient-0.6.3.ebuild 1149 BLAKE2B ce252661abf980cd435f85c220205dc3e8cb0523516a3de5609bc45e7cd398b7ed5f23c4352a77f5cf52dfd2f0fb42fea40949089b4991421d2218f33a07802f SHA512 ce1dba674a24be5d181040f4ad84559b96aa6ee4b7e82481c52e4326fc991fc04970bdd3e01d75cb9a4551197149a183459a496206a80c3e3f09afd246fe59f7
+DIST nbclient-0.6.4.gh.tar.gz 78101 BLAKE2B 91a653eb1735fe1a43044f18da773bcb0c4afd485fe7bfd3630c8c6a80776c9ff7e4cb08130c4e3953f03832933c429e68d7383677d8e56c54b485d55b8c5469 SHA512 a953b40b314ce104b28dfb9178a004ca4726d8a5912c84c168bf71527ee224082d3910f11040b172b6e62683493978b9b10161b69cadbca48a5652a4f98b5009
+EBUILD nbclient-0.6.3.ebuild 1141 BLAKE2B 8bf9e4cd36754e443357b01c750a2124e52a615844b83b62671241905df38a9258a34b767c2c87555141387231ed301e4fad6fde9d55e54894fee0864c393965 SHA512 e0dfb18f5c21860fcfbf36256b517783795e10077e60bcaa8c0d2691591cd582370c3736404bd2a0f7db6e588887f9eb4aa30b0c54b473f6e531e265ca90de5c
+EBUILD nbclient-0.6.4.ebuild 1152 BLAKE2B 19fd773a0fb377cb4c48f94ea21682d850095ec7a72acdc8fa16e6fb8b67f354720d00e3290da2ad274204024415f5ff60a5ebfa996a35392ccabc9752dfa285 SHA512 2ee5cc22265d688fbad357d4a811efc6aa53add711ff9c7f1b7874dd72453f9df28da23a42e046e3b58b890ae70abe6647141686f79f641907615344e17da277
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.5.13.ebuild b/dev-python/nbclient/nbclient-0.5.13.ebuild
deleted file mode 100644
index 8af84eaa2b01..000000000000
--- a/dev-python/nbclient/nbclient-0.5.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.6.0.ebuild b/dev-python/nbclient/nbclient-0.6.0.ebuild
deleted file mode 100644
index 71bde32bb4c5..000000000000
--- a/dev-python/nbclient/nbclient-0.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.6.2.ebuild b/dev-python/nbclient/nbclient-0.6.2.ebuild
deleted file mode 100644
index 894b8c2bfd5d..000000000000
--- a/dev-python/nbclient/nbclient-0.6.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nbclient/nbclient-0.6.3.ebuild b/dev-python/nbclient/nbclient-0.6.3.ebuild
index db858bad0b8b..2df1e22489aa 100644
--- a/dev-python/nbclient/nbclient-0.6.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.6.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 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="
 	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/nbclient-0.6.4.ebuild b/dev-python/nbclient/nbclient-0.6.4.ebuild
new file mode 100644
index 000000000000..cc41ec1e5d49
--- /dev/null
+++ b/dev-python/nbclient/nbclient-0.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client library for executing Jupyter notebooks"
+HOMEPAGE="
+	https://nbclient.readthedocs.io/en/latest/
+	https://github.com/jupyter/nbclient/
+	https://pypi.org/project/nbclient/
+"
+SRC_URI="
+	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jupyter_client-6.1.5[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+		dev-python/xmltodict[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
+)
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index a889581c8711..81b1eda982c0 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,4 @@
-DIST nbconvert-6.4.5.tar.gz 906309 BLAKE2B 5aee22eb9ce6bb36e04cc3b3db5460041b0a2dfb4afeb1e4787e941d6815f22b7621104ca6d14cb0977c5d09f9a0fade8a5787416b5f55ca1b09149730560bf7 SHA512 9a32eceaff065016baea9fc79478aeb8981f55a2cd47889e640815f2bf924df201d9ce72a4b615d533bcadbd681900678d30de61f777ae4f12bd9fce62d73622
+AUX nbconvert-6.5.0-mistune-2.patch 12454 BLAKE2B ebf7b6ee76b268d7e6b55f94c4beccb4b7c1efdc5f37732ea06dff6df97e51c7c53149583aeb0e45b2e717870592d1615ab1c22cddac14afad7ca962119555cd SHA512 388c7966b377861561e3823b5312328535aab6d1b88d79ac55519bb7aaaade4b5c1859b1dca48a675ab7569474f04c5755fbebe3a0dd455a9a7d23d0388f47be
 DIST nbconvert-6.5.0.tar.gz 908377 BLAKE2B a91c6c93e9e33f90c5c7f19743e20aa6cf88e5dd29be4ee777744d96037dddd15294858776c8391d79f5436e929fb1b623a3f11f6c4cbcf60728dba2204b6e2e SHA512 4e0d26d581435525f819c05207890cc7cbeaff786a16c354f0356c9bc50111a724a92b7e15445a0cf0ebf1e1c2f0ff064a2c8722267f66dd8677ad82b5e61714
-EBUILD nbconvert-6.4.5.ebuild 2041 BLAKE2B 0da6d5f0c013a847375c55d6f5ce05bc3769b4c0b81a1b93acf92c75ae784ccb0b5736c9604ad02d118225816172cd94422ea53cf75b99710b36574dbf038c33 SHA512 a4d2fd0847a2911dc925581d0faa57cf823caf559f980c499f8d850ac2125817e52efd7ae17db1ba9521212b902870acc269b9cb0dfa9c937357d12e6f9a8015
-EBUILD nbconvert-6.5.0.ebuild 2046 BLAKE2B dffc6c2a59ed5e8f475c18a46b3e28b459a14f9ee555b6332790d5da2979837b1c698a1583affab565d3cc0d57485e535989b3340a91f579bbda99e74bd6255f SHA512 0a0e3173e426b3d27e2384f6a682e1ff618bde07fa0f905848fe3801f72ce5d96b1c39564b22afc4ac7b1d825e596f67e1b33964d32325ea2e946107e28152ac
+EBUILD nbconvert-6.5.0-r1.ebuild 2130 BLAKE2B 4aa566ebbaea70b1b416e7d89f6b81cf2441ef06e9b3fbf634a8a3023bdf61623e4ee89a66bdeac1d7a19ac7862b3449d43362b7611356c0ee458fee66363030 SHA512 3e1489bb742474e7458473b29348a11c1684b30c6970a5d441269f8a1b9323a7d7cb607775cbef8ebbe9b21e04e04fedfcd5fa2ff938aa8f576144ee399dccb1
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/files/nbconvert-6.5.0-mistune-2.patch b/dev-python/nbconvert/files/nbconvert-6.5.0-mistune-2.patch
new file mode 100644
index 000000000000..4a3f4731b32d
--- /dev/null
+++ b/dev-python/nbconvert/files/nbconvert-6.5.0-mistune-2.patch
@@ -0,0 +1,339 @@
+From 6e5ba41803cc8c3192f001b3ede9b74454220bda Mon Sep 17 00:00:00 2001
+From: Tiago de Paula <tiagodepalves@gmail.com>
+Date: Mon, 9 May 2022 09:39:31 -0300
+Subject: [PATCH] Update to Mistune 2.0.2 (#1764)
+
+Co-authored-by: Steven Silvester <steven.silvester@ieee.org>
+---
+ nbconvert/filters/markdown_mistune.py | 212 ++++++++++++++------------
+ setup.py                              |   2 +-
+ 2 files changed, 119 insertions(+), 95 deletions(-)
+
+diff --git a/nbconvert/filters/markdown_mistune.py b/nbconvert/filters/markdown_mistune.py
+index 382a5388..636e1e8c 100644
+--- a/nbconvert/filters/markdown_mistune.py
++++ b/nbconvert/filters/markdown_mistune.py
+@@ -21,7 +21,7 @@ except ImportError:
+     from cgi import escape as html_escape
+ 
+ import bs4
+-import mistune
++from mistune import BlockParser, HTMLRenderer, InlineParser, Markdown
+ from pygments import highlight
+ from pygments.formatters import HtmlFormatter
+ from pygments.lexers import get_lexer_by_name
+@@ -34,158 +34,183 @@ class InvalidNotebook(Exception):
+     pass
+ 
+ 
+-class MathBlockGrammar(mistune.BlockGrammar):
+-    """This defines a single regex comprised of the different patterns that
+-    identify math content spanning multiple lines. These are used by the
+-    MathBlockLexer.
++class MathBlockParser(BlockParser):
++    """This acts as a pass-through to the MathInlineParser. It is needed in
++    order to avoid other block level rules splitting math sections apart.
+     """
+ 
+-    multi_math_str = "|".join(
+-        [r"^\$\$.*?\$\$", r"^\\\\\[.*?\\\\\]", r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}"]
++    MULTILINE_MATH = re.compile(
++        r"(?<!\\)[$]{2}.*?(?<!\\)[$]{2}|"
++        r"\\\\\[.*?\\\\\]|"
++        r"\\begin\{([a-z]*\*?)\}.*?\\end\{\1\}",
++        re.DOTALL,
+     )
+-    multiline_math = re.compile(multi_math_str, re.DOTALL)
+ 
++    RULE_NAMES = ("multiline_math",) + BlockParser.RULE_NAMES
+ 
+-class MathBlockLexer(mistune.BlockLexer):
+-    """This acts as a pass-through to the MathInlineLexer. It is needed in
+-    order to avoid other block level rules splitting math sections apart.
+-    """
++    # Regex for header that doesn't require space after '#'
++    AXT_HEADING = re.compile(r" {0,3}(#{1,6})(?!#+)\s*([^\n]*?)$")
+ 
+-    default_rules = ["multiline_math"] + mistune.BlockLexer.default_rules
++    def parse_multiline_math(self, m, state):
++        """Pass token through mutiline math."""
++        return {"type": "multiline_math", "text": m.group(0)}
+ 
+-    def __init__(self, rules=None, **kwargs):
+-        if rules is None:
+-            rules = MathBlockGrammar()
+-        super().__init__(rules, **kwargs)
+ 
+-    def parse_multiline_math(self, m):
+-        """Add token to pass through mutiline math."""
+-        self.tokens.append({"type": "multiline_math", "text": m.group(0)})
++def _dotall(pattern):
++    """Make the '.' special character match any character inside the pattern, including a newline.
+ 
+-
+-class MathInlineGrammar(mistune.InlineGrammar):
+-    """This defines different ways of declaring math objects that should be
+-    passed through to mathjax unaffected. These are used by the MathInlineLexer.
++    This is implemented with the inline flag `(?s:...)` and is equivalent to using `re.DOTALL` when
++    it is the only pattern used. It is necessary since `mistune>=2.0.0`, where the pattern is passed
++    to the undocumented `re.Scanner`.
+     """
+-
+-    inline_math = re.compile(r"^\$(.+?)\$|^\\\\\((.+?)\\\\\)", re.DOTALL)
+-    block_math = re.compile(r"^\$\$(.*?)\$\$|^\\\\\[(.*?)\\\\\]", re.DOTALL)
+-    latex_environment = re.compile(r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}", re.DOTALL)
+-    text = re.compile(r"^[\s\S]+?(?=[\\<!\[_*`~$]|https?://| {2,}\n|$)")
++    return f"(?s:{pattern})"
+ 
+ 
+-class MathInlineLexer(mistune.InlineLexer):
+-    r"""This interprets the content of LaTeX style math objects using the rules
+-    defined by the MathInlineGrammar.
++class MathInlineParser(InlineParser):
++    r"""This interprets the content of LaTeX style math objects.
+ 
+     In particular this grabs ``$$...$$``, ``\\[...\\]``, ``\\(...\\)``, ``$...$``,
+     and ``\begin{foo}...\end{foo}`` styles for declaring mathematics. It strips
+     delimiters from all these varieties, and extracts the type of environment
+     in the last case (``foo`` in this example).
+     """
+-    default_rules = [
+-        "block_math",
+-        "inline_math",
++    BLOCK_MATH_TEX = _dotall(r"(?<!\\)\$\$(.*?)(?<!\\)\$\$")
++    BLOCK_MATH_LATEX = _dotall(r"(?<!\\)\\\\\[(.*?)(?<!\\)\\\\\]")
++    INLINE_MATH_TEX = _dotall(r"(?<![$\\])\$(.+?)(?<![$\\])\$")
++    INLINE_MATH_LATEX = _dotall(r"(?<!\\)\\\\\((.*?)(?<!\\)\\\\\)")
++    LATEX_ENVIRONMENT = _dotall(r"\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}")
++
++    # The order is important here
++    RULE_NAMES = (
++        "block_math_tex",
++        "block_math_latex",
++        "inline_math_tex",
++        "inline_math_latex",
+         "latex_environment",
+-    ] + mistune.InlineLexer.default_rules
+-
+-    def __init__(self, renderer, rules=None, **kwargs):
+-        if rules is None:
+-            rules = MathInlineGrammar()
+-        super().__init__(renderer, rules, **kwargs)
+-
+-    def output_inline_math(self, m):
+-        return self.renderer.inline_math(m.group(1) or m.group(2))
+-
+-    def output_block_math(self, m):
+-        return self.renderer.block_math(m.group(1) or m.group(2) or "")
+-
+-    def output_latex_environment(self, m):
+-        return self.renderer.latex_environment(m.group(1), m.group(2))
+-
+-
+-class MarkdownWithMath(mistune.Markdown):
+-    def __init__(self, renderer, **kwargs):
+-        if "inline" not in kwargs:
+-            kwargs["inline"] = MathInlineLexer
+-        if "block" not in kwargs:
+-            kwargs["block"] = MathBlockLexer
+-        super().__init__(renderer, **kwargs)
+-
+-    def output_multiline_math(self):
+-        return self.inline(self.token["text"])
+-
+-
+-class IPythonRenderer(mistune.Renderer):
+-    def block_code(self, code, lang):
+-        if lang:
++    ) + InlineParser.RULE_NAMES
++
++    def parse_block_math_tex(self, m, state):
++        # sometimes the Scanner keeps the final '$$', so we use the
++        # full matched string and remove the math markers
++        text = m.group(0)[2:-2]
++        return "block_math", text
++
++    def parse_block_math_latex(self, m, state):
++        text = m.group(1)
++        return "block_math", text
++
++    def parse_inline_math_tex(self, m, state):
++        text = m.group(1)
++        return "inline_math", text
++
++    def parse_inline_math_latex(self, m, state):
++        text = m.group(1)
++        return "inline_math", text
++
++    def parse_latex_environment(self, m, state):
++        name, text = m.group(1), m.group(2)
++        return "latex_environment", name, text
++
++
++class MarkdownWithMath(Markdown):
++    def __init__(self, renderer, block=None, inline=None, plugins=None):
++        if block is None:
++            block = MathBlockParser()
++        if inline is None:
++            inline = MathInlineParser(renderer, hard_wrap=False)
++        super().__init__(renderer, block, inline, plugins)
++
++    def render(self, s):
++        """Compatibility method with `mistune==0.8.4`."""
++        return self.parse(s)
++
++
++class IPythonRenderer(HTMLRenderer):
++    def __init__(
++        self,
++        escape=True,
++        allow_harmful_protocols=True,
++        embed_images=False,
++        exclude_anchor_links=False,
++        anchor_link_text="¶",
++        path="",
++        attachments=None,
++    ):
++        super().__init__(escape, allow_harmful_protocols)
++        self.embed_images = embed_images
++        self.exclude_anchor_links = exclude_anchor_links
++        self.anchor_link_text = anchor_link_text
++        self.path = path
++        if attachments is not None:
++            self.attachments = attachments
++        else:
++            self.attachments = {}
++
++    def block_code(self, code, info=None):
++        if info:
+             try:
++                lang = info.strip().split(None, 1)[0]
+                 lexer = get_lexer_by_name(lang, stripall=True)
+             except ClassNotFound:
+                 code = lang + "\n" + code
+                 lang = None
+ 
+         if not lang:
+-            return "\n<pre><code>%s</code></pre>\n" % mistune.escape(code)
++            return super().block_code(code)
+ 
+         formatter = HtmlFormatter()
+         return highlight(code, lexer, formatter)
+ 
+     def block_html(self, html):
+-        embed_images = self.options.get("embed_images", False)
+-
+-        if embed_images:
++        if self.embed_images:
+             html = self._html_embed_images(html)
+ 
+         return super().block_html(html)
+ 
+     def inline_html(self, html):
+-        embed_images = self.options.get("embed_images", False)
+-
+-        if embed_images:
++        if self.embed_images:
+             html = self._html_embed_images(html)
+ 
+         return super().inline_html(html)
+ 
+-    def header(self, text, level, raw=None):
+-        html = super().header(text, level, raw=raw)
+-        if self.options.get("exclude_anchor_links"):
++    def heading(self, text, level):
++        html = super().heading(text, level)
++        if self.exclude_anchor_links:
+             return html
+-        anchor_link_text = self.options.get("anchor_link_text", "¶")
+-        return add_anchor(html, anchor_link_text=anchor_link_text)
++        return add_anchor(html, anchor_link_text=self.anchor_link_text)
+ 
+     def escape_html(self, text):
+         return html_escape(text)
+ 
++    def multiline_math(self, text):
++        return text
++
+     def block_math(self, text):
+-        return "$$%s$$" % self.escape_html(text)
++        return f"$${self.escape_html(text)}$$"
+ 
+     def latex_environment(self, name, text):
+-        name = self.escape_html(name)
+-        text = self.escape_html(text)
+-        return rf"\begin{{{name}}}{text}\end{{{name}}}"
++        name, text = self.escape_html(name), self.escape_html(text)
++        return f"\\begin{{{name}}}{text}\\end{{{name}}}"
+ 
+     def inline_math(self, text):
+-        return "$%s$" % self.escape_html(text)
++        return f"${self.escape_html(text)}$"
+ 
+-    def image(self, src, title, text):
++    def image(self, src, text, title):
+         """Rendering a image with title and text.
+ 
+         :param src: source link of the image.
+-        :param title: title text of the image.
+         :param text: alt text of the image.
++        :param title: title text of the image.
+         """
+-        attachments = self.options.get("attachments", {})
+         attachment_prefix = "attachment:"
+-        embed_images = self.options.get("embed_images", False)
+ 
+         if src.startswith(attachment_prefix):
+             name = src[len(attachment_prefix) :]
+ 
+-            if name not in attachments:
++            if name not in self.attachments:
+                 raise InvalidNotebook(f"missing attachment: {name}")
+ 
+-            attachment = attachments[name]
++            attachment = self.attachments[name]
+             # we choose vector over raster, and lossless over lossy
+             preferred_mime_types = ["image/svg+xml", "image/png", "image/jpeg"]
+             for preferred_mime_type in preferred_mime_types:
+@@ -197,13 +222,13 @@ class IPythonRenderer(mistune.Renderer):
+             data = attachment[mime_type]
+             src = "data:" + mime_type + ";base64," + data
+ 
+-        elif embed_images:
++        elif self.embed_images:
+             base64_url = self._src_to_base64(src)
+ 
+             if base64_url is not None:
+                 src = base64_url
+ 
+-        return super().image(src, title, text)
++        return super().image(src, text, title)
+ 
+     def _src_to_base64(self, src):
+         """Turn the source file into a base64 url.
+@@ -211,8 +236,7 @@ class IPythonRenderer(mistune.Renderer):
+         :param src: source link of the file.
+         :return: the base64 url or None if the file was not found.
+         """
+-        path = self.options.get("path", "")
+-        src_path = os.path.join(path, src)
++        src_path = os.path.join(self.path, src)
+ 
+         if not os.path.exists(src_path):
+             return None
+diff --git a/setup.py b/setup.py
+index 7220a875..2dfa2534 100644
+--- a/setup.py
++++ b/setup.py
+@@ -245,7 +245,7 @@ setup_args["install_requires"] = [
+     "jupyter_core>=4.7",
+     "jupyterlab_pygments",
+     "MarkupSafe>=2.0",
+-    "mistune>=0.8.1,<2",
++    "mistune>=2.0.2",
+     "nbclient>=0.5.0",
+     "nbformat>=5.1",
+     "packaging",
+-- 
+2.35.1
+
diff --git a/dev-python/nbconvert/nbconvert-6.4.5.ebuild b/dev-python/nbconvert/nbconvert-6.4.5.ebuild
deleted file mode 100644
index da5877b38a2e..000000000000
--- a/dev-python/nbconvert/nbconvert-6.4.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/mistune-2[${PYTHON_USEDEP}]
-	dev-python/nbclient[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	mkdir -p "${HOME}/.local" || die
-	cp -r share "${HOME}/.local/" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		nbconvert/exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	epytest --pyargs nbconvert
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..548aa27d3dad
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-6.5.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+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/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
+	dev-python/nbclient[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mistune-2.patch
+)
+
+src_test() {
+	mkdir -p "${HOME}/.local" || die
+	cp -r share "${HOME}/.local/" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+	)
+
+	epytest --pyargs nbconvert
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbconvert/nbconvert-6.5.0.ebuild b/dev-python/nbconvert/nbconvert-6.5.0.ebuild
deleted file mode 100644
index 89f78c3cd38a..000000000000
--- a/dev-python/nbconvert/nbconvert-6.5.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converting Jupyter Notebooks"
-HOMEPAGE="https://nbconvert.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
-	>=dev-python/mistune-0.8.1[${PYTHON_USEDEP}]
-	<dev-python/mistune-2[${PYTHON_USEDEP}]
-	dev-python/nbclient[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
-	dev-python/testpath[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	mkdir -p "${HOME}/.local" || die
-	cp -r share "${HOME}/.local/" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Missing pyppeteer for now
-		# TODO: Doesn't skip?
-		nbconvert/exporters/tests/test_webpdf.py
-		# Needs pyppeteer too
-		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
-	)
-
-	epytest --pyargs nbconvert
-}
-
-pkg_postinst() {
-	if ! has_version app-text/pandoc ; then
-		einfo "Pandoc is required for converting to formats other than Python,"
-		einfo "HTML, and Markdown. If you need this functionality, install"
-		einfo "app-text/pandoc."
-	fi
-}
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 829b7591c5f0..cf76418b91b3 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,3 +1,3 @@
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-EBUILD nbdime-3.1.1.ebuild 2508 BLAKE2B 41aacea8bdbdbe4304f9cc9fcb52fe354087901f36771c431e73b8cd870b4d1ce9505ba00b5550a1741583d5105d23d3cb300c3f04b1190643ce4e5204752617 SHA512 ab48eccca7e1a364b4ae9640ada07252952f8ebe8f28c2c5d256a9c918f13c2631b90e0d0838e59daa115bfaed7aab50a9d2a0b359a84c0a210353da36038ad2
+EBUILD nbdime-3.1.1-r1.ebuild 2499 BLAKE2B 9ebb9d97322c53790c3c9fa4b4937a9aa63e1c7db80e418068d590ca0667b2cf049962bf0306001a3e02bee4623cae4b98b4c782c974ea8a66ef76689aff1779 SHA512 5b7160b79311b47727ededfee63b4bcb31fc6a62372f7acbe7e2af4061755db7677bb56ee75eee09456bd5715041aff7a6b9dff04b6fd2f00a8cf90a18fe5830
 MISC metadata.xml 514 BLAKE2B c3062055cb710079162f879e3a7ca9cc1009946eba2e3d09f5cdfeb9f3bccbc12a9c6fe86d84f80d88b07eb17d03b55f8d1c6770b97c7a760015e4466e6fa531 SHA512 069589261da9b38841c363712255d55e2203c55af94ce62c3640a90139b6d260d2f1ba6475b9c0264b8c4530207cdb17983ebb2f67565fef9fce891603c1d3a3
diff --git a/dev-python/nbdime/nbdime-3.1.1-r1.ebuild b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..f4d2cdfa60ff
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.1-r1.ebuild
@@ -0,0 +1,79 @@
+# 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="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="webtools"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs/source \
+		dev-python/recommonmark \
+		dev-python/sphinx_rtd_theme
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# yield tests were removed in pytest 4.0
+	sed -i -e 's/test_offline_mathjax/_&/' \
+		-e 's/test_api_merge/_&/' \
+		-e 's/test_fetch_merge/_&/' \
+		-e 's/test_api_diff/_&/' \
+		-e 's/test_fetch_diff/_&/' \
+		nbdime/tests/test_web.py || die
+	sed -i -e 's/test_git_difftool/_&/' \
+		nbdime/tests/test_server_extension.py || die
+	# reason: [NOTRUN] flaws in deep diffing of lists, not identifying almost equal sublists
+	sed -i -e 's/test_deep_merge_lists_delete_no_conflict__currently_expected_failures/_&/' \
+		nbdime/tests/test_merge.py || die
+	sed -i -e 's/test_diff_to_json_patch/_&/' \
+		nbdime/tests/test_diff_json_conversion.py || die
+	sed -i -e 's/test_build_diffs_unsorted/_&/' \
+		nbdime/tests/test_decision_tools.py || die
+	sed -i -e 's/test_merge_multiline_cell_source_conflict/_&/' \
+		-e 's/test_merge_interleave_cell_add_remove/_&/' \
+		-e 's/test_merge_conflicts_get_diff_indices_shifted/_&/' \
+		-e 's/test_merge_inserts_within_deleted_range/_&/' \
+		nbdime/tests/test_merge_notebooks.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	use webtools || DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/nbdime/nbdime-3.1.1.ebuild b/dev-python/nbdime/nbdime-3.1.1.ebuild
deleted file mode 100644
index aff1fcbbdd00..000000000000
--- a/dev-python/nbdime/nbdime-3.1.1.ebuild
+++ /dev/null
@@ -1,78 +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="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="webtools"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_server[${PYTHON_USEDEP}]
-	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-	webtools? ( net-libs/nodejs[npm] )"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs/source \
-		dev-python/recommonmark \
-		dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# yield tests were removed in pytest 4.0
-	sed -i -e 's/test_offline_mathjax/_&/' \
-		-e 's/test_api_merge/_&/' \
-		-e 's/test_fetch_merge/_&/' \
-		-e 's/test_api_diff/_&/' \
-		-e 's/test_fetch_diff/_&/' \
-		nbdime/tests/test_web.py || die
-	sed -i -e 's/test_git_difftool/_&/' \
-		nbdime/tests/test_server_extension.py || die
-	# reason: [NOTRUN] flaws in deep diffing of lists, not identifying almost equal sublists
-	sed -i -e 's/test_deep_merge_lists_delete_no_conflict__currently_expected_failures/_&/' \
-		nbdime/tests/test_merge.py || die
-	sed -i -e 's/test_diff_to_json_patch/_&/' \
-		nbdime/tests/test_diff_json_conversion.py || die
-	sed -i -e 's/test_build_diffs_unsorted/_&/' \
-		nbdime/tests/test_decision_tools.py || die
-	sed -i -e 's/test_merge_multiline_cell_source_conflict/_&/' \
-		-e 's/test_merge_interleave_cell_add_remove/_&/' \
-		-e 's/test_merge_conflicts_get_diff_indices_shifted/_&/' \
-		-e 's/test_merge_inserts_within_deleted_range/_&/' \
-		nbdime/tests/test_merge_notebooks.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use webtools || DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-	python_foreach_impl python_test
-}
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 4e8f4ccdfe00..f26cf328744d 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,7 +1,3 @@
-DIST nbformat-5.2.0.gh.tar.gz 133519 BLAKE2B aa9ff18ff879fe4b85af6d552a7d2f44d10bb96366e7af15214f7ae4c9d193a24bee8d0dc0ae1b71da13f44abaf4093e412f32b8357b4846985940c002a17b7e SHA512 55718e84a5125f8c28c8cd1be0725669f4d56bc22e6dd92b907a0e8cda27e17f8f56aad29806ee9f1c2c58641dd80455f04241fe5a54f8b6309575bb7656fc87
-DIST nbformat-5.3.0.gh.tar.gz 133531 BLAKE2B 7d4e0fdee7c2b5cfdb09bf90ff225b6be184cb6e02e36319e52c5a021283b2ae884c189f1e98a9fd40f1e12811bafe37cc59d27f1e34433d38c00e5fb0cc9fbe SHA512 50cb0b98501c2ee640ae1e6036346912ebc58f63faa8f1e4535681eb3f468072d5bc462d3788cc4233108612239fe03a1da41acfe30c915e13e7428f35415a91
 DIST nbformat-5.4.0.gh.tar.gz 134574 BLAKE2B f61275ad501381f05dc22a79f24c175fa71610f09cf125a40aaa90d0e02d3b27d82d918c1036b0516d4f879609f65c1ce62de86b033012e25d353af453828b2e SHA512 f601438193bfcb11f1ceed74995ab6862ff8c916f9bddabe38fd70bb997f4407bede4318ae7034d75424b20b75846010ddda2a45b8fe8de6dd9310617b00fb9d
-EBUILD nbformat-5.2.0.ebuild 856 BLAKE2B 70e90c653c21e8bf8b22b0282c8d92389cc8d0d224cc584ffc42d118fd3a1548349c27359eca147c483fa9e7fff338f0814e03430b3a36d20d6d2285810b3634 SHA512 558c3865fbbd7929eb10f25267b9a84067e892cb37036ccf5bdd4a52cb0a03e84e742476c99d29bfbaa026b67e97214882dd0f5c9b8613848bee8dc8b8521782
-EBUILD nbformat-5.3.0-r1.ebuild 863 BLAKE2B de6f5c38aea3cf10dec200b524db63c778f23bef35115e623ef8a14e60ba0f56bb481402bedaaa6e2549fbfe060c0fd0d298e392fc8fa985c77c541e9730c074 SHA512 9c8717916bf32320e6a086aadbe8a9529ec8f6342b896514d0a0a88f2f81d1f066b663578bcf96cdbb85c4d1752603a94dc411b70298f35a2394039defbca8d9
-EBUILD nbformat-5.4.0.ebuild 941 BLAKE2B 71a513b7fd0e70e63b3fff15b615cce4f901e9c02b20b181be12832aa0f9949cd5dd2fe6606a6e6e8f71672c6b66cfc64a86c813954c034b25fae7a58d436d9e SHA512 5a8eb24866946a1bbdaa174d8d24011d986e0b68d8638dddaf600eff81763252f0feafc6c59a22dbdf1e35e0ef43f3036fb804e66455f2d54359ee9eed843101
+EBUILD nbformat-5.4.0.ebuild 933 BLAKE2B 1fa16104e18ea8861eab84a86793c7c293e60df5a644739151f1a9f25ab5d024f4ab10566dc80779f277f30401259383d7212f121ab4de1ace442eaa4e5a7855 SHA512 d9ad6af3086e5f87f3ea7a95c86d9a0b0a0ac3b6c39ce7fa24825e57527621a10338f1c9644c2b51d2c4d9049c632e5c2c9cded6cd98a0072d2d64ac16046ec7
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.2.0.ebuild b/dev-python/nbformat/nbformat-5.2.0.ebuild
deleted file mode 100644
index 2cd892c57689..000000000000
--- a/dev-python/nbformat/nbformat-5.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.3.0-r1.ebuild b/dev-python/nbformat/nbformat-5.3.0-r1.ebuild
deleted file mode 100644
index ec6adf34afa0..000000000000
--- a/dev-python/nbformat/nbformat-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="
-	https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/fastjsonschema[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc
-distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.4.0.ebuild b/dev-python/nbformat/nbformat-5.4.0.ebuild
index da4c6a04fbdd..4fd7bd5ef555 100644
--- a/dev-python/nbformat/nbformat-5.4.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.4.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 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="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index ed93fba2652d..80ae95c21fc5 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,5 @@
 DIST nbsphinx-0.8.8.tar.gz 146831 BLAKE2B 26687d74900e7667dff644a91d58eeed57e2b2e91391d4a8024d5ee2c858d5d8bb132db5b025357817004480bc161d8ad6f5c003240d6bbc23420e1633a63abd SHA512 8a791171d6fffc414e19224d29e323644e141c5c51522b7914549aa066f2757cb4e88318a1bf20e4abbd7130cf85c4e8c3fb5537802098342a32c896e3caf3bf
+DIST nbsphinx-0.8.9.tar.gz 177348 BLAKE2B 9571813137832a81bc5eeb0882711df0a37ee492de1c8c65aab755636d614239e9cf961d57baf0eec05b8070a915213beae5ae94cd21d1f0e1bb57726698951e SHA512 10240ea849929579d2f76a0fdf5045cc9fca7d31c05b3a4073bb7aae67446c7be807a2d1afde60396926499bd42f1a9b514f5594c457eb5070d32126e5340309
 EBUILD nbsphinx-0.8.8-r1.ebuild 657 BLAKE2B 9acffd8bd796fe9839905437a964556c3d8c2d0be4ae34af284b20dc6e86df026953a6057bae6cfed81a834864b23138844860526d7a34855a1cb7e5ca62642f SHA512 87d6c305a07397c94577664e8f4ab14cf7d5cb46a4f12093391944927b302aaced354d97130b2ef4e258d9ec18bfe3a6460872e9e081f8be43517524319d2cf7
+EBUILD nbsphinx-0.8.9.ebuild 702 BLAKE2B 2b1adfa7624afaa32d3f9f809b7138308fccdf168c7ea858dd4fea4eab3fda3ce8c0d7ec05e516f05d0b3716763c7a755ab78847d0066fa6afaeadbd3521cb8a SHA512 3eb0423cdc259022955ac154f36632ab8de4a066842067e2da52ce27e89fe85df76e9a9266ef28a971b8f86abc63dc6bd60420a06c8e1ffbd8987f48ad17740a
 MISC metadata.xml 835 BLAKE2B a3a10c9fb26688d90ad6f4e2ddb8b174eae9fdc2637d4aabdb86f63093982c7c9a42c4eaa3b2adee6ddb12ba2d537aec79d324c0a3c7355424a4255cea90eda6 SHA512 9ac5cebe164b19f80e0eb07f7c4fb5cb2cf5251af1f81290931f8fd01223261cb6224500387c131c7bc8738d7bb07eb790fd9ea426a295d0688489510e58d55c
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.9.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.9.ebuild
new file mode 100644
index 000000000000..b4b9f9e97832
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.8.9.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="
+	https://github.com/spatialaudio/nbsphinx/
+	https://pypi.org/project/nbsphinx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 371b70af8166..ef96ad95e063 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,8 +1,4 @@
-DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
-DIST neovim-remote-2.4.2.gh.tar.gz 438766 BLAKE2B e4ff3218e405da24f5146e38fec94d61953e2b89ef1bdae49a2ec925c3c1f953187fec51e9ea9a71c9265959212221fd73d59582a8f91fd4c03c734ad04e219f SHA512 4c39a28781d33bd179492816b2723dba4ef8e535813a25373c94852125b2b743732e98875c89111dce4a6329338c7d69837fed0dd9072740b1bf2b0f192855ab
-DIST neovim-remote-2.5.0.gh.tar.gz 439382 BLAKE2B b37317362b13dcb796d6a6ca0bd16b99b48154d9615af162d3da3898b080bbd87ae4624c37240498d73b92522a32a732cfc75ce8f69e172c97dd837b0965748e SHA512 872ad20f947a5ac99a1a91b925e1daa59e0c4ed6b7dbe9fede806dae2c3f1f5bc8bd660ba58513c41e402d39e2ad15d5f499d57e13782af7d10d8390a2737ea3
-EBUILD neovim-remote-2.4.0.ebuild 704 BLAKE2B a18c1b0fc42deab1c1d84f4898c5bcba374c4ebff451cdeb4636f6040b53a9e25b78d5791babf8ddd3f2f905257dc1a36cd79b7e7714caa0d3cc0fdd6e73eec7 SHA512 f554e88ef6e4f30bde226ddcb7fc4a899f962642dfb5778c9a79a7fe0cdd83e613d7d51c46de1a8b74fb7d4c70e53237c482c3aedacab77444dd56f861cdeb01
-EBUILD neovim-remote-2.4.2.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
-EBUILD neovim-remote-2.5.0.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
+DIST neovim-remote-2.5.1.gh.tar.gz 439548 BLAKE2B b57ddc0b8b432b65864bb560412684e6967db08ed09e1e7fe7294ba24d0d0aeb377f0f6fa38f4b0de44d5ea6bcc796ca2b8a491dda26eab870deab37f3608c59 SHA512 2d3c921485b18a9538f82b3a057834bdec5d8568a84528afaf52d73a69b60cf1eb6dee33f50a10d961fc0985c7a7d262a4edfc9f26f3ffd5d945472855fe3121
+EBUILD neovim-remote-2.5.1.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
 EBUILD neovim-remote-9999.ebuild 762 BLAKE2B 3de34d8b5b790a5e705b4e14b7d905dc3a030aa188c0a6dc3d2ee92288bc7c8782eee36e12ba83a9010173a0829244b86e3ec6cb58810b673aaa736cd60fa271 SHA512 0b28877d745f8bcaaf41716c488448ffadb260b7e9e8f8e2a99274dbe073479cd8f267f2219601475ba04a77d3b92636b2012712a4a6632429f97342f1502764
-MISC metadata.xml 468 BLAKE2B 9610ea02ac7735a7a3eda88c233109fe413b86cb22f7c09573ccf504b2925ed8b5727f13969f159d6695a1385330c548c83df666021b263b1676f48b926de59c SHA512 54517ea76d789c9151bb8b00a372ba3f516d0a1c27da975bc357f392d231915a20a4d72a3027f1b3e9a488d4f933371438c04ed1a5f2342be32d694fc3fa9fe6
+MISC metadata.xml 569 BLAKE2B 65fd5db847539e9169fe09bdd4dc33b79504004bd8b76f01a896cf791032a507698b4d799381826aa613fb64f9dc6224d6ce7af4be258c673477f60a64f466d5 SHA512 0d33ba138f652df7f84e4196e514af5a8d64be9acc6f809f0cc7c18585e10abfa981f1c6dffcc7602626c35913a6f194e99f2cb57217bcedd64e444dae0414cb
diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
index 2ffcbb601a94..bbf1e5633e11 100644
--- a/dev-python/neovim-remote/metadata.xml
+++ b/dev-python/neovim-remote/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">neovim-remote</remote-id>
 	</upstream>
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
deleted file mode 100644
index 24fb72fd1950..000000000000
--- a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="https://github.com/mhinz/neovim-remote"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-BDEPEND+="
-	test? ( app-editors/neovim )
-"
diff --git a/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild
deleted file mode 100644
index a7036334d63e..000000000000
--- a/dev-python/neovim-remote/neovim-remote-2.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
-else
-	SRC_URI="
-		https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-DESCRIPTION="A tool that helps control neovim processes"
-HOMEPAGE="
-	https://github.com/mhinz/neovim-remote/
-	https://pypi.org/project/neovim-remote/
-"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	dev-python/pynvim[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-editors/neovim
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.2.ebuild b/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
index a7036334d63e..a7036334d63e 100644
--- a/dev-python/neovim-remote/neovim-remote-2.4.2.ebuild
+++ b/dev-python/neovim-remote/neovim-remote-2.5.1.ebuild
diff --git a/dev-python/nest_asyncio/Manifest b/dev-python/nest_asyncio/Manifest
index 567d10fcefe7..39440716ae80 100644
--- a/dev-python/nest_asyncio/Manifest
+++ b/dev-python/nest_asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST nest_asyncio-1.5.5.tar.gz 7386 BLAKE2B c5d3704dae962ec82a515e2c056c24bd0fbabcf1cd2347379e1d58fc23c922325c89ed0941aead4dc90e0a94fc39ddb5e38fe4decc6e444b0c1261ae955520cb SHA512 8f28b4495f1d595f5943fb8a40c8894183398865059c42686483d6c4af6634b5119ff6e694b98662bfdd71046ec0bed70f5fcceb67971637c0fed91cb6d6eaea
-EBUILD nest_asyncio-1.5.5.ebuild 503 BLAKE2B 1dbba19c5d9e3b16559add7737d4d32227853a1717fe9e317fc81162d3941ba1fb71ac9b191a6e87a32891929b1eddccda2038921cc3810e17edb428e4a3d96a SHA512 dd67682855b7d7b004630552b1dfe53594bc0328bc1296e1ee15949dd281bc954e21dde67bcf1da36b0cd3a45bf557838a6a60f6558104e4dadc182a8fa3120d
+EBUILD nest_asyncio-1.5.5.ebuild 503 BLAKE2B 641735bf6b59883d13a4436451a4afb209195e6c091ba869ae388dba89b0c4cf48bb22642a791441dd70ee8696560f587b22f710d6f0a1a774aa02a1c9bfe5ed SHA512 cb73fabc7222ce7e08e295a996d24a5f29e3beb19223602505de6c77661187e374b1f1bdd6755f9b258df1efe872bde087602168ebe74531f658106c3f58a313
 MISC metadata.xml 389 BLAKE2B 7725ccfe525c9aa2f6b3330e97fad88e1dbc5dd829573d9c32bcf0b492af7303e33668e1370dc6cd8fc89cd55f0be20110d72de0caf87eedf61869e8231f6ad0 SHA512 f1ab8ce0f9568dc9d533d5c47135a937bb5f109ff49315b63444d963c4572602d3bcef96f182ca54df7bbce676e50ee2f0ba795f5310f022922b0b49edc23518
diff --git a/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild b/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
index 27eb86984a13..528c66ce4771 100644
--- a/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
+++ b/dev-python/nest_asyncio/nest_asyncio-1.5.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index d41a00c7f774..63f05ca46aa8 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,3 @@
 DIST netaddr-0.8.0.tar.gz 1959055 BLAKE2B c0a361c100490c17203aad14eb14a3e09c63f5a6ce2f4b7e85bc57942329ac4603a1d4b3a09a9ab964a775dfb50a8746f6dd4a05d2f9bba01674624a7d7b46c1 SHA512 0b518ef240b81af425a5aaa6f087b10dece3f352c0c67cde8553ac00daa9d1890637c05d16740e2c23b30ae068c1b4c409ca8291e02093699fafd638701b9069
-EBUILD netaddr-0.8.0.ebuild 951 BLAKE2B 1389c25877461180195600b1bd21835a72e97816f6a23a86ff5929dd2442c94b633210d3d28bc7fb60a5262e818de7698183cf01504b9db74c1b7665c7cb3a4a SHA512 ac1a6a658277605f02f48d2396b81e35f5fbca6640441e502c98c23a12c9e7b14b62336b0d767122b0e035aa4ebb638e7c97842038ae8662d7b16b47670cebba
-MISC metadata.xml 555 BLAKE2B 5ad7c0c1c5cb143e0a5e79aa75bcfdd806bb009179f3c4e37515a2ff0a6836f049871657234a3dfcf10ca3aefd505c197bae201e3fd63c640abec0888f123490 SHA512 30c9e373f5f4dbca2b8c5f277abe84d6a6746b2a87dba4d15f4c134d4d8f8ca0312c3c844c0c57da231e0ddd947001116f867c2b62620d2e6d8a4b6a1b13b919
+EBUILD netaddr-0.8.0-r1.ebuild 854 BLAKE2B 93f1b8a55bef6f02de09742ee4d4d3e2b54c63841fdf74135182b81da725bb117b65a0e10e4df6b4c77bcb6a42c4a5277e8f125c2597b2393af4bcc8c1e2bdaa SHA512 263d1e05c194757d927eabf27851eacb44501d7432fd5a42cdf5f7d836ea39186665f5450f98e3c0f5486ea6a1101f371d6c3fb3f6227ce6fde300e61b7a5c41
+MISC metadata.xml 580 BLAKE2B fa813dd9ba11bbe59493df919e010a21ccc3d94a3683e5687953eb6bf6b759b61e03de1d4f7810cc7f2d189fe936c7fab754713ac315c06f7a24c86c0c7da67d SHA512 bd4d624a37b55968e2ac085f7f254343a6e2903ce50c0a54244238a0f436b67ef6a13e60f39c6cee4c043312602f19cdca6b6d67ac9a75677e7af8f14afeed1b
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 412f2bbd49f8..c2c2e497ab05 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -5,9 +5,10 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">netaddr</remote-id>
-		<remote-id type="github">drkjam/netaddr</remote-id>
+		<remote-id type="github">netaddr/netaddr</remote-id>
 		<bugs-to>https://github.com/netaddr/netaddr/issues</bugs-to>
 		<changelog>https://github.com/netaddr/netaddr/blob/master/CHANGELOG</changelog>
 		<doc>https://netaddr.readthedocs.io/</doc>
diff --git a/dev-python/netaddr/netaddr-0.8.0-r1.ebuild b/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..b5daaf23f914
--- /dev/null
+++ b/dev-python/netaddr/netaddr-0.8.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Network address representation and manipulation library"
+HOMEPAGE="
+	https://github.com/netaddr/netaddr/
+	https://pypi.org/project/netaddr/
+	https://netaddr.readthedocs.io/
+"
+SRC_URI="
+	https://github.com/netaddr/netaddr/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Disable coverage (requires additional plugins)
+	sed -i 's/^addopts = .*//' pytest.ini || die
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "CLI support" dev-python/ipython
+}
diff --git a/dev-python/netaddr/netaddr-0.8.0.ebuild b/dev-python/netaddr/netaddr-0.8.0.ebuild
deleted file mode 100644
index 79f6da4e04f7..000000000000
--- a/dev-python/netaddr/netaddr-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="https://github.com/drkjam/netaddr https://pypi.org/project/netaddr/ https://netaddr.readthedocs.org"
-# The next release should have docs in the PyPI tarball
-# https://github.com/netaddr/netaddr/commit/e6f545fccd83dbd14baff40070594cc96838c9bf
-SRC_URI="https://github.com/netaddr/netaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# Disable coverage (requires additional plugins)
-	sed -i 's/^addopts = .*//' pytest.ini || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "CLI support" dev-python/ipython
-}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 94df443fc810..ff62453fb797 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,3 @@
 DIST netCDF4-1.5.8.tar.gz 767013 BLAKE2B 26e30b9ef74b6d1af07fadc5a0c93c1370c9e684b69345e18801c00691362766bce393b7fc8c0ccd4cd4b8e7ac448f3c69a1769e056c780c668c441cf0418b94 SHA512 b43e10356a60ecdd1aaa7585648242e9d610e042da8fd97f374617d7813cc9f35b4133a88ac4c10e921df12d5b2f2b1668af4fb69578b57b7c3d57a731579260
 EBUILD netcdf4-python-1.5.8.ebuild 1133 BLAKE2B ece242c3d5f3e64e23e9b9f1d2692684970fc9133fac2cf63a49dedc216fdfe48b3736e8c2132161f268becd0de3f57c3829cbf3c128be4311f0a90d1c6629b9 SHA512 af7017a7b7d5b459b6aeff6c3b2e525cd8fe04bbb89327e5d22a09c908dc629121c9ffd4c3a3dcf0c6b48240f81250e264252a31281d73e0bcddc8063ff44517
-MISC metadata.xml 681 BLAKE2B a34becf14c53b1f2b7568035f7ab8fa1cdce3e9fb39acf05c8f1151d432057376acde5904e5e63842742061488abe70b84a79d5fe20e2b2b72e160294624da80 SHA512 e6455e3f020069cc843044210c5567e458e784160b6b01d14b753bf29a17d1525a169b5cf4d432abf8d0394c5f0ffd1b14772fb6bdf5ef2913f2f866f08bb23c
+MISC metadata.xml 782 BLAKE2B 13395c54962217119a1acd466d86c0afc4436955638d158fe6c495ce501cb2a6229d3ba5196a8836f2969cbe2b93927b9c89485e230cf667e3da426b61a28f2e SHA512 28b2fdd4c8d8d52d249f8b8cea8738d76ad1dcbfb170ac4f854be2d5228dfc86c93f8edd3b413c399067bf9203632e358d87461677630ee6acf98cc8aee6cc10
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index ee8fe5ff5e42..e9799992da68 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		netcdf4-python is a Python interface to the netCDF C library.
 		netCDF version 4 can read and write files in both the new netCDF 4
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 354e68e0ebb6..cf0e189bc284 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.11.0.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
+EBUILD netifaces-0.11.0.ebuild 572 BLAKE2B bedcff6df8d62dac261911249984dbe330eb34d708118ec6e0890ad967d0e0e009de5773d16d7c1e2d99e832446d848dfb44085b6bcb1c347b2a69094b470435 SHA512 53f372d542e4ea80af0af7ceebcccbf75c3dcf31d2a38333ebdfdf0d85bf90d09a796866e969762a88a58831f592e1c8e696caf1db0416628505850c7b226ba8
 MISC metadata.xml 451 BLAKE2B 4d43f77c5e911cad7a8bdfa7cee80c553a645abfce7c551f1d819a62193e1263bf28d70c47d14f05ccbe9155ab08dae49c18cfdafdbd6c5705eab28e5c717258 SHA512 abf26a0026b93acfb3d81979694c13b2298bf09d410fa85994c9406a4e0219c1ee8d83b4814323cde287d27fab2526682df48238fe5db35ef93c4c3e0c0e068f
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
index 9d457ffccb7e..5beb4380a339 100644
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.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
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 1463bcaa2709..eb35f0eaeb4f 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,7 @@
-DIST networkx-2.7.1.tar.gz 1923431 BLAKE2B 0b30a9cebc10708efdd446a688ee9a60523a06adf450af1b5a4726fe66b5041ef8c30625012c790042068aa9d5ac555ab814c3cce510365528d21afbe5007a89 SHA512 16b988d0b7faabc4126355a7530431d3a3870517812314097b73d1e3d0a02dc7cbf82d0e99db4a038dc3a23d72cf1a1712a17c925dfed360be2bf27cf01e9c42
-DIST networkx-2.8.tar.gz 1937426 BLAKE2B 5a094177ed480c6f7cbdacb6795fc4f2e0aec53ed89a33e19d78f47830d46238f35b7cd76098f6e00397f7cbdf305256910b7930cbb2c775ed4c2b18d9bd596f SHA512 72cd6637faa4228f6c802cf36935b5460fdf9b6cf191c3b375810bfc3732823e3286bdc1e6cbf7e6a7ffde83d0cf3bca157ae27ff98c537d43fdb4b8ef45ef4b
-EBUILD networkx-2.7.1.ebuild 1376 BLAKE2B 13d08bc22d59a9fea07dc7bb14480057aade434b8d524a7dda61abf43c1d3bb593c67f1e392dd0a50dc296a33d040a314d6d48455a114a6fdebd08ba1ffcac81 SHA512 9f60e67f901a1bc3bb3382a96bad746e7b16f813acb030caadea2c3016bbc0fce3c6f5a5296ff24e0cb3663bc0fb85ea2072d401fde6ed52f1ca833239ce7000
-EBUILD networkx-2.8.ebuild 1380 BLAKE2B f0134be4e9dffed56e4c63026e15d3fc25e297f606cedb66dd2dcf5698132f29c6e3bcb340c83ffd5b3eb5b40968364f71dd8e7ac6f46bbdf1b0f28dfa215f25 SHA512 3cc38a45ebdb526fb0b7676b3fc54953bb9d544ea6b67f3c425955c8004a6b0669b790eca5bff49a8f3bee92a46047adc6149422a8bbf40013bcffe81410ddaa
+DIST networkx-2.8.2.tar.gz 1945873 BLAKE2B 212f42d8da35bb7c29b6feae626bb21036807e26996ff663dbb22b54908448715cbf6509553e2379a208b4537f03c92a3183a74a8074f4d2edae9b97084e5a8b SHA512 5b1ca05a009f78d693f8dfedaa51650d7834e4870d1a08fd8ea27f1293cbaccd9b4a2fb5d146df491e8dfcda1ca538786b257fb9b1250a383c59ea2b54188f55
+DIST networkx-2.8.3.tar.gz 1947042 BLAKE2B a9d098023df1db6c94d531eba8797348d81b7cd52e22bbd421109be2e604b599de3a9a30c847682b53ce395ecc0522351db5f2f21b194be5ebd05c42d751a43c SHA512 1bcf606868f7041c1f412c0d853779c99f74be675b11b32727d502b78f8a672872291addfc7c8cba6bc7f464c2306a412862063e141853ab91999d2c54315214
+DIST networkx-2.8.4.tar.gz 1951336 BLAKE2B f45708eb8a642ee2561caf6b82b8947cc0ed8a90e22ff3424c54db728f6ab91bbaf78c62da113d02325c8f56418690386143c74f2098c670fe102c4e5ec78b9d SHA512 3f874e08a55d924905506fabdba1540745f7a1a99745531b49442206b6cac9b911674441d2241bc2c3e8c173635d53f2e5677fe76936630236ffb3fa021b2f9a
+EBUILD networkx-2.8.2.ebuild 1685 BLAKE2B beef082bd74db5cf409eeea757247472551fac116b9b9351eae5232ed67ddccb49f3400ef8c46f0e70c4e8f9ed26b41135e500a3f44baabee9a808bf9a0adb14 SHA512 d9ea657a4d066af0205edd666badb6c0b4c9f98d59eeee0dc34ff12b5ba80309dd1d2d3dcad5e12b09a10cbdf3d90ffb9a35713f7df32b986a46f6e9dd91254f
+EBUILD networkx-2.8.3.ebuild 2008 BLAKE2B fd4d69762205882f3fb2bcaf6eb6228ea35debbf9ffcba0c1ed4ddff0f1d63c88ff70cbbf3b0b6d6b8164d539ce474f81a00b80526a338b6a56582c55cd24cb9 SHA512 0dd3d93457396af4d11721ab33a883a972909b865b87de821baf6b5e0bdadc926ff1ab5de5d58071f0e98e59e6ee77134038cdf0f12e5caa30a524a234449669
+EBUILD networkx-2.8.4.ebuild 1707 BLAKE2B e465232ad11921ebe043d19d27ab8fbaf452279873a6ea90c6743ea6ef444f5c74883f3ef90e401ee213dfa84e4739a7d08dadebede757be5e9660da3b35686f SHA512 845ef10696e1c16a758273ea97595fb11c50c0e6939b9b4520ca18760e343bb3711a22c3e057973196aa2fa540d2f27003122358b535479ccd53304a41a04666
 MISC metadata.xml 1088 BLAKE2B 407d24ca890c5b2a7c49e5eab7f79477f66cb140ed286a7d0c65be075714c671c0185b067f7ced6e9a1cdc17361cfbeb406c306dafb915590abf6b5b1263a4a4 SHA512 2a790d427d6c4391d409f767359a256ee5b8082246811c82949b898e0a2a9f23e7c40bb045ff5eaf17f3cee04d7d24adcdf1ff0ae416ebd7b2572cfdcf04064f
diff --git a/dev-python/networkx/networkx-2.7.1.ebuild b/dev-python/networkx/networkx-2.7.1.ebuild
deleted file mode 100644
index 86f3961f798a..000000000000
--- a/dev-python/networkx/networkx-2.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest -p no:django
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/networkx/networkx-2.8.2.ebuild b/dev-python/networkx/networkx-2.8.2.ebuild
new file mode 100644
index 000000000000..d33023f9d699
--- /dev/null
+++ b/dev-python/networkx/networkx-2.8.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 )
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/networkx/networkx-2.8.3.ebuild b/dev-python/networkx/networkx-2.8.3.ebuild
new file mode 100644
index 000000000000..d35715a5eaa1
--- /dev/null
+++ b/dev-python/networkx/networkx-2.8.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			networkx/algorithms/tree/tests/test_mst.py::test_random_spanning_tree_additive_small
+			networkx/algorithms/tree/tests/test_mst.py::test_random_spanning_tree_multiplicative_small
+		)
+	fi
+
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/networkx/networkx-2.8.4.ebuild b/dev-python/networkx/networkx-2.8.4.ebuild
new file mode 100644
index 000000000000..504ab461ddb9
--- /dev/null
+++ b/dev-python/networkx/networkx-2.8.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{8..10} )
+# networkx skips tests w/ missing deps and the available ones all pass w/ py3.11
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" python3_11 )
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "dev-python/gdal"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/networkx/networkx-2.8.ebuild b/dev-python/networkx/networkx-2.8.ebuild
deleted file mode 100644
index 7cc373d794bb..000000000000
--- a/dev-python/networkx/networkx-2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Python tools to manipulate graphs and complex networks"
-HOMEPAGE="https://networkx.org/ https://github.com/networkx/networkx"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx epytest -p no:django
-}
-
-src_install() {
-	distutils-r1_src_install
-	# those examples use various assets and pre-compressed files
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
-	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
-	optfeature "YAML format reading and writing" "dev-python/pyyaml"
-	optfeature "shapefile format reading and writing" "dev-python/gdal"
-	optfeature "GraphML XML format" "dev-python/lxml"
-}
diff --git a/dev-python/node-semver/Manifest b/dev-python/node-semver/Manifest
index 9cf230024514..9b6c8afb14e9 100644
--- a/dev-python/node-semver/Manifest
+++ b/dev-python/node-semver/Manifest
@@ -1,5 +1,3 @@
-DIST node-semver-0.8.0.tar.gz 18449 BLAKE2B 171374808e18b1f3fc2807abb9b99ecfe18a392afbc59ad056f0524e374ef4a27e5a56acf0c3927c6f351503981d743e4e63f108bf0e5bd5eda62f04e24191d4 SHA512 665ae0dbced16e0f05306614b1577464aa1bdac666b35cf2e7ad4b8844a6814dc7e8672f0dff3043c7bd048aa455d671efd268052ac59166293b91d1dff17784
 DIST python-node-semver-0.8.1.gh.tar.gz 18550 BLAKE2B fd033b22595c4173ab33ea456f561f158dc7db4ef03a83948d5c4eacf33f2530d03f881d28073eb3d84790f306574ceba7fd5eec8ea5c50f9dafc74a0cc11003 SHA512 5a988755ed97aa1ba9b97595738200821787c2cc71f40198cffdc22c4b823fe132668946ecc3f0fb66d6c33fe0ec7bdcfa9c9794e3d382b38f8551d15d4af5e6
-EBUILD node-semver-0.8.0.ebuild 755 BLAKE2B a263aa13f73c107f0db7a79aad5528abfcdcca8e14f06d006cb060fb5534e9eb1d88c9950582b2b97c957fd879cb7834f2d060742f13ab7495b1c3cbcb498ad2 SHA512 67b883ad351b7cbc17ead574cc3e92456e61eec624c2ed135fd9d5c093d9cfcd9b69692b652023ba5a84ba88357bdae4fd4d2180e94f5d7b01eefdf1854ad5af
-EBUILD node-semver-0.8.1.ebuild 730 BLAKE2B 4f5d70f38bf4df6bc64876df0f1cf4822b34363b563c6141608ab211cf7476206c7c6d5ee38c36f24bd5863ee72476aa7a9f3cc01e337cb5a7ba5d168aa1afd3 SHA512 34a79a51b775426edbb9b8ae3d50be5fb925cbd74acbfe323bb2b3414858cf20b2f1f600f6d0fbaa1fb3b556bd114e4fbb77449da722cc38be155df631c7ebd6
+EBUILD node-semver-0.8.1.ebuild 730 BLAKE2B ef79f780980277ad9e3179c9b48b2ae8f587298058a7414cb9971b32afc45eff1cccb6fae678c713a4f29e11bbbdde65fdd470bbe8db7fd4f6a9ea6443f24ef4 SHA512 e841bc63fb6d2d4b4db7c9bcf1e91c7ac2fdd8c07ff05790c8949ad5d3eede1951e4cc96a363a47671c3513e716d175cf2fe8ef1274517d7239bd341cc48cf9f
 MISC metadata.xml 643 BLAKE2B efe8878eb7a0603425c025505175af4559d00025b5cba44eef12b04eb27abf2dc7222056e886866c138f4993f7e9ae4913d70d0b49a4a605351e1a6a25c8c92c SHA512 2b34dc85f8a453bd6c15fcb72c3a1ca124cdb38c64fb5999cf57669a73d8ef64df3dc8eecde3d6532b38f1e0ebf4b35b8866ef8a842cfdd6db4738586bd1e3ec
diff --git a/dev-python/node-semver/node-semver-0.8.0.ebuild b/dev-python/node-semver/node-semver-0.8.0.ebuild
deleted file mode 100644
index bbe600ecf9ef..000000000000
--- a/dev-python/node-semver/node-semver-0.8.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python version of node-semver, the semantic versioner for npm"
-HOMEPAGE="
-	https://pypi.org/project/node-semver/
-	https://github.com/podhmo/python-semver
-	https://github.com/npm/node-semver
-"
-# 0.8.0 has no tarball on PyPi
-# https://github.com/podhmo/python-semver/issues/43
-SRC_URI="https://github.com/podhmo/python-semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-semver-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/node-semver/node-semver-0.8.1.ebuild b/dev-python/node-semver/node-semver-0.8.1.ebuild
index 890c1dd273ad..dcfed7db2fc3 100644
--- a/dev-python/node-semver/node-semver-0.8.1.ebuild
+++ b/dev-python/node-semver/node-semver-0.8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 0aa44ba15605..d73e1e6621f7 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,5 @@
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.6.0.ebuild 488 BLAKE2B 315e82ae857f22e5dca08f33173861522608a59aef6401e38d6db45c5962539524a25f2564b183d303b6736d9e03c17720b896ed9228b3d127f2824f4d74943c SHA512 c79cc80bab972b26c59e53c14c0cd1e66a0ff2883eea763501db70d14623c6525f203615730c2197130b81b0fc3d5726a34c4322be2daec8ce5e6684c0a4b312
+DIST nodeenv-1.7.0.gh.tar.gz 36209 BLAKE2B ff5853c04f9c442ffee883f7c981e574704c4ccbb37a8627257c4c7af3c86d70034a2e62b4bc6f4e7c6da32e0edb4f5b9216bf288f47991d9b42f21be454634f SHA512 1e3e4068591d51d8915de73ab0f82f04620ca628152ec5a454e7ad18001ff20b698f9818353c44b80200ab529d95fa3196a3dbc85f0c497ea49f60eaa5dc9ea7
+EBUILD nodeenv-1.6.0.ebuild 488 BLAKE2B d62471bae2ef3c5d6c1ce6d87c3e8a4243eec3cce4f330a1cf1b7edd1fd8135eede22fd766af939657df891c5b0baa6ecdc6f7a4d05e527b933c89e1f1d88d4e SHA512 8a605cfe0ef66a3071516154e0c601aee3801014a019082a7bb69b146858ea0c89b159964eec5a059198978af4fd6eb67f98a1dd069626180ba5040c1c5cffaf
+EBUILD nodeenv-1.7.0.ebuild 553 BLAKE2B 17564b89b3eff4ec46b8c27e61726da665349fc75cb1b3150961f9df9b40cabf411a9de5530321edb144af0059fa95852b816f7d5c41494578353d9299d08c8b SHA512 705917b8c4c59b834245bb45e9ef9ddc55cf6e7cfd9457f89ec6bf9d654351c245949c348da23025fde7e2e6dcb1fa641e2cb56310429268c5efb8b2e84e51cf
 MISC metadata.xml 378 BLAKE2B 7dfad28224587f9df7781a7b1d8837b6c386b40fe20da3fe4b1cd4dcdc417a55ce5da03870907e44f6aa64e1d1160dda43848dac097ef881615688c511ce9a4d SHA512 06d76ecd3a1077b3bd37d37783ff37b4f58ad2e7fbb5294a0594ff748e5f64498567e4d1814a89ed0136ecf17a335a0f8a1627af2185144b4d929b25a8eaa2d3
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index c4f47045664d..fd34280955b3 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.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=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nodeenv/nodeenv-1.7.0.ebuild b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
new file mode 100644
index 000000000000..76eb5465f571
--- /dev/null
+++ b/dev-python/nodeenv/nodeenv-1.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Node.js virtual environment builder"
+HOMEPAGE="https://github.com/ekalinin/nodeenv"
+SRC_URI="
+	https://github.com/ekalinin/nodeenv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+# requires network access
+RESTRICT="test"
+PROPERTIES="test_network"
+
+distutils_enable_tests pytest
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
deleted file mode 100644
index 93ad0d37c0fe..000000000000
--- a/dev-python/nose-exclude/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.5.0-r1.ebuild 522 BLAKE2B 4477e15aee6a19cf2646da767100b1dcc7ea46639b33a5d92b4dcaf6e1f7ff65973cab4dbeca4b06a076dae43219e18d16ed36a588959f954f412ae454b228e5 SHA512 76c34baaabfcece3655d83d40f57c151bca3793deb398db6c91ac66c03e44e022395926759e2945260a778be2e66a2a72b06130c36e3d677f6c08d3455166d18
-MISC metadata.xml 601 BLAKE2B 5684a56301895bf343376d2595cd0f725eb0b6ac8c7784dd9ac2ea966268ef2ecf91aa69ac2c0bf331a2b56fa138cf9059338a7694ba557ad6ee21a1add6b0fa SHA512 5170dbb9524d8cde899485133f401a2c187e826694202e96b1a32452c0edadea9c53d560134b0bd5307192a4fcacd52697c08d166976d8585eefbf5f3832b84a
diff --git a/dev-python/nose-exclude/metadata.xml b/dev-python/nose-exclude/metadata.xml
deleted file mode 100644
index 3812e52f1126..000000000000
--- a/dev-python/nose-exclude/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">nose-exclude</remote-id>
-    <remote-id type="bitbucket">kgrandis/nose-exclude</remote-id>
-    <remote-id type="github">kgrandis/nose-exclude</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
deleted file mode 100644
index 6188c953cc22..000000000000
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Exclude specific directories from nosetests runs"
-HOMEPAGE="https://github.com/kgrandis/nose-exclude"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index fb7756752433..68d4a7fb045a 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -1,4 +1,3 @@
 DIST nose-1.3.7_p20211111_p1.gh.tar.gz 327855 BLAKE2B acddcaa0718f23f281ea34a977354b3ef88c95d4ef712afd8354effe6df7883d473b50caaa3b5c79fcc4c36a9d45bee4eb5865a6ef66e371dae12ed1a0a0418a SHA512 752eb1337fd481a1b8498ead330d716cf4180c18faabde257e9a1139928b9fa38e2e145d36c1ea8e3867a36d4843134ee26e9e9f83ff84d21f0fe246d2392d15
-EBUILD nose-1.3.7_p20211111_p1-r1.ebuild 1493 BLAKE2B 20ddccc792a0247665a9b9a5228b97dabdb09cf048274c7b12f352b28b2b09cc76ff15f10a9a15cfc3c0064c0d37b53ac9ca2571277fafd3954a82da7e5515ff SHA512 f161ff5c507ec06f08393428357015fedb1da8e5c88a45fc4e75562661cc34d8ba9c59037bedf6f13e43d2b2603c94ee4f5e97749a070e5ab985a6c46c69260c
-EBUILD nose-1.3.7_p20211111_p1.ebuild 1434 BLAKE2B 8e669f8fff66a8f211e35dfdd0f8b7737af59bf5cd98e15c2926f5478a280ddb1fa2c8d37d324c60a58105ca98b4d391f4358ab04a60582c09920d99451b3157 SHA512 cac7a9b25fe42092f7f3262bb6b1d86abd220a1d9b2fe834a516fb746082aaabf4311550e7ec58af1c1cef9ef53bb7f04e7e043f16728bfcc743b23bfafe564d
+EBUILD nose-1.3.7_p20211111_p1-r1.ebuild 1485 BLAKE2B 277e62799964afef8e41b237d2642170568c5f8f333ea9395fc90147c86dd6390a3abb1e442358f619c4637673b7738ad7079f78aa423530e5729f5468a6f854 SHA512 6687bc5e75b2899ade13a066cc60819070ea2cdf692f2da46661dd42f6282eb2cbf543f773df50aa208dcbf88f5916edf83e4fd28b6cf53a01c6d78dde0c8129
 MISC metadata.xml 399 BLAKE2B bccd250e005dc4b4921b8affffa56c918069576663c44671189d40dea344c0fb880fcf41656b1c9c5043cea9a0203b3ad3b980f7920ecebab82b4c71f75214d4 SHA512 15fd9ea9d0c09833f25497e2715a15cb2b2dbcbe042e0a3fa24525455eaeb470d6c799fddcd635a5197c984252649a26352713fcd069123fe2546edc20566fa6
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
index 1722ad8f50c1..483709a85a70 100644
--- a/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
+++ b/dev-python/nose/nose-1.3.7_p20211111_p1-r1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild b/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
deleted file mode 100644
index 0bcccaee3d86..000000000000
--- a/dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-COMMIT="94fd6746619ee8728f2b8740ebf2d1582b03cb15"
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="
-	https://github.com/arthurzam/nose/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			!hppa? ( dev-python/coverage[${PYTHON_USEDEP}] )
-		' python3_{8..10} pypy3)
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)"
-
-src_prepare() {
-	# failing to find configuration file
-	sed -e 's/test_cover_options_config_file/_&/' \
-		-i unit_tests/test_cover_plugin.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m nose -v -a "!network" || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/nose_fixes/Manifest b/dev-python/nose_fixes/Manifest
deleted file mode 100644
index a9228c971c64..000000000000
--- a/dev-python/nose_fixes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nose_fixes-1.3.tar.gz 10033 BLAKE2B d6b7f9bdfb803e59be6eb400004f595ad717da7f8967c38006206f51dd599bd42984dab6a9f5ccaf30a74d119da55ff0282b3bb5c9bed9c2c37360865903f12b SHA512 2e054c04493cf11f06ee8977d4922290dbdd7928a4fe4947a76b6cf300c2d16796b578e48c0ea514f3c5a38e011fa9779e7d308eafa0ec12cc0622e124494d93
-EBUILD nose_fixes-1.3.ebuild 563 BLAKE2B 95f305bc13672bbb3ac689c33ae1150d544a57cdb0fee6508c0d92c69657d32dd73ecfe6120b4c7d158e09532b0d95b472ab51075799194c8e41d4edbe3bce1e SHA512 994077df960d8af710220aff2e860b46503151568cfbf4c9c54b9324aaea6364a5a876400275a570d61e462ba22517b8608f10a29adef1fcf76524b6111670e0
-MISC metadata.xml 349 BLAKE2B d291c90b8e589df30a3bea70fb7549be665743bf3ac2ae85ef219b1e7c9e18266bd87e868949589b18eea335e7c74c0afafcd4f8ea77107a6683b2518b22e7c2 SHA512 9a904f22217820d4546ea6163b46fd155269e6c18d0d2a05e40dac3f84fda23b1885e2db30618990abdc636e57c4b47a979f03e3c98c870d409e8d65d521a082
diff --git a/dev-python/nose_fixes/metadata.xml b/dev-python/nose_fixes/metadata.xml
deleted file mode 100644
index 309ac70600a6..000000000000
--- a/dev-python/nose_fixes/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">nose_fixes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/nose_fixes/nose_fixes-1.3.ebuild b/dev-python/nose_fixes/nose_fixes-1.3.ebuild
deleted file mode 100644
index 599a6bd318a3..000000000000
--- a/dev-python/nose_fixes/nose_fixes-1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin to make nose behave better"
-HOMEPAGE="https://pythonhosted.org/nose_fixes/ https://pypi.org/project/nose_fixes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs dev-python/pkginfo
-distutils_enable_tests nose
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index d612ff31f2f0..945bbf755482 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,7 +1,6 @@
-AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
-DIST notebook-6.4.10.tar.gz 14357395 BLAKE2B 32415b7d303b18c380ea6bab398246307a2b218ad52cdeb9a08db6f2f5f100515f36407358de094144f8da558762f7acf62505edbd9cf9e757fad1ac299f2431 SHA512 78a186c9907006d1fec1cea99e4c0f4181f673bf4dd383ed934cd2eb491cfd247db240fcec6a35a2967fe12b121863bbfaad0c4a8270618d03cd746f4688743b
 DIST notebook-6.4.11.tar.gz 14373938 BLAKE2B 3f6aa2f86c205dec6b66a8eb3a6d3509f8ba0f80d17f7123bfbede41b7ff6d986271a8eeb32916fdf71c56105b0571192c71740836d34baf88b52a35ea0c4a59 SHA512 beabc84e3d528b0786363c705062717378e73aa824ffe6ce8706f6ed765744f40f651bd4e0910d6a0302990f9efcabea1af51c6894106c49869761bcf217084a
-EBUILD notebook-6.4.10.ebuild 3160 BLAKE2B b9a53dbeff695777c29dc4ff1927989a1724b8bb82707061242246788bf91f2274d715a249c8117805873325dc91c084bdd58de020c9f70651506010a292deb1 SHA512 42f2c39114745f9e9ebf85fa8fa17e7c99436a3d8ff4c3afd8bf726ac55782e87c0b503e99f0aa72c84b52b1184cb930f4710e4aecb148ac7d352ae694d4f749
-EBUILD notebook-6.4.11.ebuild 3172 BLAKE2B 2abc220d8e2af5516a8846b772a4860591ba73598eaee539582170164725c3ff9b4fe4083cbe611ecd92477b231f74148fc2302fe0edfa0a4028aad865254a77 SHA512 63b6f10241b11a84506d798f1765a987e2e0fbd3396612f66da8b89ff158aa01171c28ecceabc7fb1f93c45f76dbe21ae4c26aa3653f2a3584658176abce05e2
+DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
+EBUILD notebook-6.4.11.ebuild 3164 BLAKE2B 132f4a78997645e2ce6cf10cb15e7cb8940e60d7cd11bb4e9f815c18327d499d0e59f62f568600be4a0a2d6fe5c986f2915a12e6ada7123053b2933606977f9d SHA512 86958592f6ecaf9fce14ae8f808b27369955364cd7c1e6f6db07390b397744caaa1e832ddf807cf64cec072d9399275c42fdb3417a1d1509d927125d08ac8037
+EBUILD notebook-6.4.12.ebuild 3172 BLAKE2B 2abc220d8e2af5516a8846b772a4860591ba73598eaee539582170164725c3ff9b4fe4083cbe611ecd92477b231f74148fc2302fe0edfa0a4028aad865254a77 SHA512 63b6f10241b11a84506d798f1765a987e2e0fbd3396612f66da8b89ff158aa01171c28ecceabc7fb1f93c45f76dbe21ae4c26aa3653f2a3584658176abce05e2
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch b/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
deleted file mode 100644
index f9ce5c3a9e39..000000000000
--- a/dev-python/notebook/files/notebook-5.7.0-no-mathjax.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Disable bundled mathjax.
-
-Patch by Marius Brehler.
---- notebook-5.7.0.orig/setupbase.py
-+++ notebook-5.7.0/setupbase.py
-@@ -169,38 +169,6 @@ def find_package_data():
-             if f.endswith(('.js', '.css')):
-                 static_data.append(pjoin(parent, f))
- 
--    # Trim mathjax
--    mj = lambda *path: pjoin(components, 'MathJax', *path)
--    static_data.extend([
--        mj('MathJax.js'),
--        mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'),
--        mj('config', 'Safe.js'),
--    ])
--    
--    trees = []
--    mj_out = mj('jax', 'output')
--    
--    if os.path.exists(mj_out):
--        for output in os.listdir(mj_out):
--            path = pjoin(mj_out, output)
--            static_data.append(pjoin(path, '*.js'))
--            autoload = pjoin(path, 'autoload')
--            if os.path.isdir(autoload):
--                trees.append(autoload)
--
--    for tree in trees + [
--        mj('localization'), # limit to en?
--        mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'),
--        mj('extensions'),
--        mj('jax', 'input', 'TeX'),
--        mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'),
--        mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'),
--        mj('jax', 'element', 'mml'),
--    ]:
--        for parent, dirs, files in os.walk(tree):
--            for f in files:
--                static_data.append(pjoin(parent, f))
--
-     os.chdir(os.path.join('tests',))
-     js_tests = glob('*.js') + glob('*/*.js')
- 
diff --git a/dev-python/notebook/notebook-6.4.10.ebuild b/dev-python/notebook/notebook-6.4.10.ebuild
deleted file mode 100644
index de98e834153c..000000000000
--- a/dev-python/notebook/notebook-6.4.10.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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}]"
-
-BDEPEND="
-	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable bundled mathjax
-	sed -i 's/^.*MathJax.*$//' bower.json || die
-
-	distutils-r1_python_prepare_all
-}
-
-EPYTEST_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
-	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
-)
-
-EPYTEST_IGNORE=(
-	# selenium tests require geckodriver
-	notebook/tests/selenium
-)
-
-python_install() {
-	distutils-r1_python_install
-
-	ln -sf \
-		"${EPREFIX}/usr/share/mathjax" \
-		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/notebook/notebook-6.4.11.ebuild b/dev-python/notebook/notebook-6.4.11.ebuild
index 05106aece83b..3de25560fa62 100644
--- a/dev-python/notebook/notebook-6.4.11.ebuild
+++ b/dev-python/notebook/notebook-6.4.11.ebuild
@@ -15,7 +15,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="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
new file mode 100644
index 000000000000..05106aece83b
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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}]"
+
+BDEPEND="
+	>=dev-python/jupyter_packaging-0.9[${PYTHON_USEDEP}]
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/notebook-6.4.11-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+EPYTEST_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
+	notebook/services/nbconvert/tests/test_nbconvert_api.py::APITest::test_list_formats
+)
+
+EPYTEST_IGNORE=(
+	# selenium tests require geckodriver
+	notebook/tests/selenium
+)
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/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/notify2/Manifest b/dev-python/notify2/Manifest
index f640d92ef37f..93dde6b45a82 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r3.ebuild 852 BLAKE2B 1fe93518519774cf7cd41bb5d7df0a5efb87fbb39cf6366f9ff358366fa5fb336635602de2b44367d8159355770de3bf8d8c1d951db1538cebb8ffa992e5e0a2 SHA512 b9917b2d8354438466fd84738d7324294d373b98921a23cdb468c93c281d56d61b64f306745325bb7ea50ad5f882ec68fd43ae596cc945903a76d6a16ab6bc92
+EBUILD notify2-0.3.1-r3.ebuild 852 BLAKE2B 107d2c42afb71ec4f34108676e5d6f203a302f4a088fc6a591388eb81dbae19fc00689c225782945bbae17010220a28f9acedf4c7dccbbd0c72c251f4044c598 SHA512 98ed51f9456c5dfec08f279b920debe69de12f43958455b62f6f6a42a07f9418e690fc1e1586619fac254c22030386c31c60995f37350e2f289947c87e8a90c0
 MISC metadata.xml 490 BLAKE2B 7627e5eb7c44257e2d495d2fc86e455e88eebe9a6d9a02491580b558224549bb9f93cfcb2f623375006537826599e81e8a2c5bb844930dee2381c40182cb3fcf SHA512 159eb84765ef2e160b602cb8725364c0e15efd3f42f6939643e38f271d1a5bc3ff610b24bc775cbd8a189faa796cda4652537ee19ab4678c805c7a90b11e1478
diff --git a/dev-python/notify2/notify2-0.3.1-r3.ebuild b/dev-python/notify2/notify2-0.3.1-r3.ebuild
index e31ed3f3ad6e..5bc052252be0 100644
--- a/dev-python/notify2/notify2-0.3.1-r3.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 57c07ae3e603..ed0a31a66711 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,3 @@
 DIST nototools-0.2.16.tar.gz 9712796 BLAKE2B 654f449a00741dfa4a9b3b8c2a80d40907698098d1c4ee94363657d88b24fe1f26287af5e7795484846d394573a868ff82fa9a8c0a51b953325d6f6f97d7f7c8 SHA512 3c70c29f8411ae3eedc2738e0b2f42f9c0b675494bbdc107a8b43612fba08401c704ec94db63bb92aa1648b168f9e0d9e8139b8c61dc3b43973876d105324554
-EBUILD nototools-0.2.16.ebuild 1007 BLAKE2B d1867749b4feeeb96310f9f31df66512b6cdf1a2ff45f3e7bcc71f9cb7ece24f8544ce07db0d95cba92a2cf2d73901037a43e3af7aa2490c41f97ef903431693 SHA512 2e0d1a1d8282225fc4b27d202ce84c3759dec70151a77ab08edcbba16d252bfb9839a0e4d0ae380face7da19fb0eafc6d45802631b379dc6fa4df22fa6d19254
+EBUILD nototools-0.2.16.ebuild 1014 BLAKE2B 229cc3fc5ee9462d92710a98c3653d74f20e42ce990eed73c62a10a647f1663df286dfefab92ceca4d3504d9c627a757e6b3c9e08dcc983bfdcf7e885a80c4c1 SHA512 d7b425740fdc853f3eaf258bf033e62cc21a2e11ef98197512272e23452b6fb960b836236ff68894a0dbb4cadc90e346d449aa7c0c1188de9ecfda8762369620
 MISC metadata.xml 268 BLAKE2B 8d5ab1863c10c503f76cdd433fd868e4ce4eec3f42fa7e733ca1a628a406750e72529417653f79ca1d8cee380613cca90ac1e20a812ca713c2a6274be8a5982c SHA512 712d6c0a662d14734ad37f97cf00cc131986bc010650cdc7362a08a0881276eb790068ff8d3aa9a265858a4a83b3793dc2c02151b391d8bdd4a9d9c044c0b434
diff --git a/dev-python/nototools/nototools-0.2.16.ebuild b/dev-python/nototools/nototools-0.2.16.ebuild
index 950e1887b730..04fbc372331c 100644
--- a/dev-python/nototools/nototools-0.2.16.ebuild
+++ b/dev-python/nototools/nototools-0.2.16.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/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=media-gfx/scour-0.37
diff --git a/dev-python/nptyping/Manifest b/dev-python/nptyping/Manifest
index feec2bcd3041..403e3dfbba9b 100644
--- a/dev-python/nptyping/Manifest
+++ b/dev-python/nptyping/Manifest
@@ -1,7 +1,11 @@
-DIST nptyping-1.4.4.gh.tar.gz 48098 BLAKE2B e13e7d6189a1ac826e8ea66918c006a63f0ec584e6d61cc7e0393b9a10709b41f75b43548ac94ce762c5180dc716e0717316573d45e8bec8951188d5df9bc1ad SHA512 4dd124734fde7e19867af0efd0c3a79f220b20576cb2f34a1cfb5e47c4fde44e936dca708d68bef99eb554afe7576f7fee447d6dd73f3c136340c8f48770f7b8
-DIST nptyping-2.0.0.gh.tar.gz 54691 BLAKE2B 05343da5b1b36ea0b06267ce0c8108b2e236c8d4124872da2ae5858b3fe9c06875846fdd07960abcc9bc961e468e1883a5da6b50d12e74b7628aacec9c1c1e16 SHA512 e7de94e93896af34285117be61799ee971cb2fabe87e8f04473393a042b299765e91ad7cf2d07339d2d1b7cee117e42ecea28197adda6de54686154e21754dc0
 DIST nptyping-2.0.1.gh.tar.gz 54790 BLAKE2B 75aadc4310dc3e5262aa8f007bc65584ee110fd0f2c1d0737c35a0c57bb0f0a5191f0260dbc0a6c80cab0f546d1e3ade219d6b6318cc2d195ba0579318c20841 SHA512 d832cc0d701a36a94c97bc6db2445c7ff72ec7c41fbcb48ea2006fa201bfca169012be9501029f77f4da7a2fd126227292bd16ba5d0bd7cb6924e3eb74cfaa01
-EBUILD nptyping-1.4.4.ebuild 632 BLAKE2B 1d0fd5643a71d5652f1a4ea38adba95bd612b17dd7b9f8d01e3eea3342e9ceaa4efd28db7d5cd833e6b0db84d06dd4bb4f6bdf221c4ad2f30cfc24fa4f921b72 SHA512 ad249569918431e4a8db7baa20381c780afcc126ca4305ee24506ec9c325981283b68b98ab6f641e330f436e7ee649c80b47c681a4ee4659615f125d86ef6eda
-EBUILD nptyping-2.0.0.ebuild 941 BLAKE2B fa1a2e1b542672387edefe343778741d0f602c9ad581c99e13fdaabeef769d8ea40e65995ba829a64b9940bfac364d6a87907c3a31a97bc07547c9eb18d6427a SHA512 2f26c9590a20aa5f162dff5164b736cdda1100d6f81abf67d695acb8117d794465821da943e67c74339751c11c2f58bfd66abc9b5c2a6f1907c880a5951e71a6
-EBUILD nptyping-2.0.1.ebuild 947 BLAKE2B 19fad96a1a12fd962be234fcb46d6febd42f3d3c0004a1addfa36aa34c1bd1b73abb1e6ad2129cc508df8d551dfa5861282045af3e6bcb7c818bc7dee877f522 SHA512 54f45f0d465566aa13fdfbe26e8893cdfc71246db8b056f69d994b9d36a5f524d98301d4c0ff695a18384bf2c6338035670ed5b2dc5fefaf22f2e5887254260c
+DIST nptyping-2.1.1.gh.tar.gz 63606 BLAKE2B 846d85230f7391a1119cab522e17424cae20276981a06897921a82bb739296ad449197526f36da542fcb263ff6595913d9c333fd0b83b10fc835cea338f7f094 SHA512 4e9993a01650b8bbd8616b2721e92d1e7a2fa87e8cdc55239a30b09f6e323bbcebb532b6cacb4891b50c4aa6cabe8f00dc25d4b052bddb1827fc1e3d021299ae
+DIST nptyping-2.1.2.gh.tar.gz 64535 BLAKE2B c050c7c49e4c4570b73496a3ac2aa24742844e7cbc1db353d1bf065eea4fdd892221139a085d217a9118dea5b19b0bcec512577c943cc841492f1cc0b14c3681 SHA512 f6d600f7595294829bae5b8cade8b66952df02f30b795af6b193401083d61e5dc8ac4ac474ddd5ef72c3fe3e7f11a4a895a5ff89ab7ddd2664382fbe4f8017c2
+DIST nptyping-2.1.3.gh.tar.gz 65157 BLAKE2B cae8b1a34ac42bdb805193437d2bc02d16c4c37b6cfd04e84e777ec11ce40b32a8422e89e7c63e876b99fa785bf2b15fcf0ea295313ae8a46e662ecb2e370d5e SHA512 7d0c47f5fc67af6ef3af4c757e75d2b415011c4bb7ef08100b4649dd17a8afe3b430ae1b621d36097e19ee635bdaa95ecda6e62c6fb01a58983c66386b51717c
+DIST nptyping-2.2.0.gh.tar.gz 65224 BLAKE2B 11b77690dc83492a13f5a58839655c210d3bd48368e14d0c97be4b5e51f4de54d4e4a238f5865826309b40dc7bb50376ca45827e9e74360dad215bd798610809 SHA512 3c29689994ca87418614e55811b66d03087d127b9e620c2dc3407e3e3ff984cdecd789b0dbd955db460f865a34941f061a7496362ef9944351f59a0e4c3ef483
+EBUILD nptyping-2.0.1.ebuild 940 BLAKE2B d15283deba92a0fee217527355818cae49a20ee7ee9ea697b2dd66b30f4ee9785f1e457ad6532173e417083d327f908133ba84348b2c102f28ee1b40b38ff85e SHA512 dcba91125dbbcb8f72e4211b1473c41d423b51dc6d3b589e7837e9dc29b9ed8e87150c2d889e32525bc6133950cce3af8844db80f418d5130ce7ab490f4083ab
+EBUILD nptyping-2.1.1.ebuild 947 BLAKE2B 19fad96a1a12fd962be234fcb46d6febd42f3d3c0004a1addfa36aa34c1bd1b73abb1e6ad2129cc508df8d551dfa5861282045af3e6bcb7c818bc7dee877f522 SHA512 54f45f0d465566aa13fdfbe26e8893cdfc71246db8b056f69d994b9d36a5f524d98301d4c0ff695a18384bf2c6338035670ed5b2dc5fefaf22f2e5887254260c
+EBUILD nptyping-2.1.2.ebuild 1079 BLAKE2B 4c563fb76e1a9856363a6d422235673b7fc917ad9f4c9db26be6dc7f0d2c6c9c15b5c6da3b9248c4ceee27ab444349dfc033d747073435a909496644f3fb3b10 SHA512 b1ec43b7fdd8c2cfbcbf0556fb83e08e57cf4fb009f469261165deae48d295bc03d7db1bccdc5ab0f6a18851074454a40a92adbabbde751a6e19d024716026cf
+EBUILD nptyping-2.1.3.ebuild 1128 BLAKE2B 7a302d6379614cec3f0681f5f1936dc38fbd3a4377c1eb1e99c74ca6c35041c1e4e47c6588eae4e9ca3fc72d2dd866740d5e8ddb8a25c3f62f1479636073243b SHA512 4b008f3dcece2747862f2bbd04cfba62a60eae719a878d27344e00cb4ed869ca99a6a573659b53a9027eb7cdc927b195b1bb450b4905c12dc73edaf75ead2df7
+EBUILD nptyping-2.2.0.ebuild 1128 BLAKE2B 7a302d6379614cec3f0681f5f1936dc38fbd3a4377c1eb1e99c74ca6c35041c1e4e47c6588eae4e9ca3fc72d2dd866740d5e8ddb8a25c3f62f1479636073243b SHA512 4b008f3dcece2747862f2bbd04cfba62a60eae719a878d27344e00cb4ed869ca99a6a573659b53a9027eb7cdc927b195b1bb450b4905c12dc73edaf75ead2df7
 MISC metadata.xml 427 BLAKE2B d314480c0cbd8bdf8be3bc5936d01cf73a3b27929b04a3d2147b43c5829a582d9ac3cbefd2c99e35c7dd83d5d4ebc39b0173d996483c349b392fbc27ada65a11 SHA512 1ee6a94fd1d8e2b61f97eec3144d5382e2ff7ebef369815551b033d218bd790ffd8eb21adbebe44f9935feecf62a842f9c6fa5989364f46f6facc606f94786e5
diff --git a/dev-python/nptyping/nptyping-1.4.4.ebuild b/dev-python/nptyping/nptyping-1.4.4.ebuild
deleted file mode 100644
index d265a23ae81b..000000000000
--- a/dev-python/nptyping/nptyping-1.4.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/typish[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.0.0.ebuild b/dev-python/nptyping/nptyping-2.0.0.ebuild
deleted file mode 100644
index 3a0ad81b5c2a..000000000000
--- a/dev-python/nptyping/nptyping-2.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Type hints for Numpy"
-HOMEPAGE="
-	https://pypi.org/project/nptyping/
-	https://github.com/ramonhagenaars/nptyping/
-"
-SRC_URI="
-	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/mypy[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# TODO: package beartype?
-	tests/test_beartype.py
-	# relies on Internet access to fetch packages for pip
-	tests/test_wheel.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.0.1.ebuild b/dev-python/nptyping/nptyping-2.0.1.ebuild
index 1764b2a47adf..7b25a09221f7 100644
--- a/dev-python/nptyping/nptyping-2.0.1.ebuild
+++ b/dev-python/nptyping/nptyping-2.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/nptyping/nptyping-2.1.1.ebuild b/dev-python/nptyping/nptyping-2.1.1.ebuild
new file mode 100644
index 000000000000..1764b2a47adf
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.1.2.ebuild b/dev-python/nptyping/nptyping-2.1.2.ebuild
new file mode 100644
index 000000000000..2771eb3cd6a8
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# test for... whether the release is on pypi?
+	# requires Internet + feedparser, meaningless for users
+	tests/test_package_info.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.1.3.ebuild b/dev-python/nptyping/nptyping-2.1.3.ebuild
new file mode 100644
index 000000000000..3815be94d4dd
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.1.3.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# TODO: package pyright?
+	tests/test_pyright.py
+	# test for... whether the release is on pypi?
+	# requires Internet + feedparser, meaningless for users
+	tests/test_package_info.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nptyping/nptyping-2.2.0.ebuild b/dev-python/nptyping/nptyping-2.2.0.ebuild
new file mode 100644
index 000000000000..3815be94d4dd
--- /dev/null
+++ b/dev-python/nptyping/nptyping-2.2.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=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints for Numpy"
+HOMEPAGE="
+	https://pypi.org/project/nptyping/
+	https://github.com/ramonhagenaars/nptyping/
+"
+SRC_URI="
+	https://github.com/ramonhagenaars/nptyping/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# TODO: package beartype?
+	tests/test_beartype.py
+	# TODO: package pyright?
+	tests/test_pyright.py
+	# test for... whether the release is on pypi?
+	# requires Internet + feedparser, meaningless for users
+	tests/test_package_info.py
+	# relies on Internet access to fetch packages for pip
+	tests/test_wheel.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/nspektr/Manifest b/dev-python/nspektr/Manifest
index 6b09b33f1086..c42ddcc8bd04 100644
--- a/dev-python/nspektr/Manifest
+++ b/dev-python/nspektr/Manifest
@@ -1,3 +1,5 @@
 DIST nspektr-0.3.0.tar.gz 6314 BLAKE2B cb7b9b5b35a455d4e72e78d93db49b4f8e274c7d7a6c8bf7ccca52cce2598a937d31b76f1a30c4aa6d673e4ce52c4645ce7392965df35b0888d1c69226e08f00 SHA512 6fc22ad7858858f3b956ba5918ca92468f13d4b7db0e4861b836e63153f7e4319c6468e4f73969ce3fb7845ca8d97808b9db2eb2705a47fe1a8c4c19b9c2ef33
+DIST nspektr-0.4.0.gh.tar.gz 6763 BLAKE2B 6393a2d16825cbd580758ba09a7f2277417fc0eb4e7c6f23d49ff1af89a7c6947d4c0bae7158424b96f8f0e3e3aab6ac3f5bb624a8d7edf61eb571b28e690d70 SHA512 c106091e949ce8236c1cf54543bebd2b63484dff95e161fb57668bd6bcb4b17ddf0ecc440c15a0df36cc8c4398ccc439b642eab49b528ba2cbedc75ff009179d
 EBUILD nspektr-0.3.0.ebuild 1743 BLAKE2B f455eb064a5e15d5a2162da586148a4a8568a7f8e951407d32b4dd3211435d1ee4ab8021f33d9e7938058e1637455ba1744211796862854842bf2e44a956aa9f SHA512 4d2875ebd1004be37d1b2ae1c5825fe137532b96ab942f8912868e5eea4434b1d0091003831428a9a9d907c69198760b5ac5ab8221d7b1697de30e1e53ff2199
+EBUILD nspektr-0.4.0.ebuild 1618 BLAKE2B 9657cc0d10ead056c40be7bf7b03da0713dcb11c025a5da648c0030794a93b3782741a912cc342a14675a46b7c4a6cf5f3331ae8255d76a70b24d05570d62125 SHA512 96f935b20516268627ec925bf4ce4264833befaeeeb7ab7b8f0aa5edaf21886625f4ff39fe66a2de66182efdb4709d23d076b91f95f6146b308aaeb92d95a771
 MISC metadata.xml 343 BLAKE2B c5ec4b6c1f41692875fcb9a93dea4c0f253339788b94fd667709898e2cc49470f113258137093fd29986ed8fbadf2ea64f95319c51568f12259b8869558bfdab SHA512 da052d5ee619430fbfc021b9eb8d3967dc4d6ca3ce0bc5c9b1badb067d7c0babe12abde3fbc9c4710bc6a0cf081e6bc445504b852ec714f819781e1c4780779a
diff --git a/dev-python/nspektr/nspektr-0.4.0.ebuild b/dev-python/nspektr/nspektr-0.4.0.ebuild
new file mode 100644
index 000000000000..832fd4c23343
--- /dev/null
+++ b/dev-python/nspektr/nspektr-0.4.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 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
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution package dependency inspector"
+HOMEPAGE="
+	https://github.com/jaraco/nspektr/
+	https://pypi.org/project/nspektr/
+"
+SRC_URI="
+	https://github.com/jaraco/nspektr/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/jaraco-context-4.1.1-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-3.5.0-r2[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.2[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "nspektr"
+		version = "${PV}"
+		description = "package inspector"
+
+		# tests inspect itself
+		[project.optional-dependencies]
+		docs = [
+			"fake-nonexisting",
+		]
+		testing = [
+			"pytest",
+		]
+	EOF
+}
diff --git a/dev-python/ntplib/Manifest b/dev-python/ntplib/Manifest
index e6bf7094a611..74ff23ab4787 100644
--- a/dev-python/ntplib/Manifest
+++ b/dev-python/ntplib/Manifest
@@ -1,3 +1,3 @@
 DIST ntplib-0.4.0.gh.tar.gz 7315 BLAKE2B 508936a01e23dcb2ac9446f4ef6a1f8084a250cfb58e456efc25646b8fec49d3317f751fcffc9d397201d7b41c2b9d387afae2e4a75518225eacc4f3fb01c1c9 SHA512 ad735b1bccc4dc149622423b2877dc1d4b461f245dd0bd5b0cf963918ea63806772783e03eb8a66c75934746981fbd28789f19efa339c87b2f83e8218ee4a4c3
 EBUILD ntplib-0.4.0.ebuild 518 BLAKE2B 915ada90e2fe3fb28ea43ad922b707be0e7787611510d1831dc03b1720090100d179e15cfb776a854d2e72ed8b231f1096b7ef1d9140b3fd318ffb86b5b5c95f SHA512 381ba62cd0d1605f465ca99fa39fd41c5a8212adc67b88e871ff1d2cc294a95f990a8890711703f209986dea36835ac0732be4a2f7b5578d368e900563e6772b
-MISC metadata.xml 288 BLAKE2B e24d5041fb116b3f0c66f01380b243dea5bc1fd87739e4bc993c86021b17385b757023c3ef2c53598a04c1ad007b0a2d1c1e32739161951b6cd78e90604e47d4 SHA512 57e67588f64d70ffc8514d4ae1faf921429e097c4d51c001c4951023b0030cf8fff4be65c4b8691afe55a886223bbb4f0114bd266f85cd404f4233be4009a009
+MISC metadata.xml 389 BLAKE2B 1bf2832e1fb70926659fd695c18bda211d522f8bd14407e57701c71527ee82a9f9c2f9b152052561d419d7a2afc4526575cfbb8f61df6ec5a98765cce6efd609 SHA512 3d5e4bdbfbed1852c1610d5e0545dc6bc8f7bcff85a03d794f835ffb7559938f0daec8abc25702969ed2be59865a6f2f67c07a0d7c83a6fe16323b7398681a26
diff --git a/dev-python/ntplib/metadata.xml b/dev-python/ntplib/metadata.xml
index f74f2aadab26..37bedc1a3a86 100644
--- a/dev-python/ntplib/metadata.xml
+++ b/dev-python/ntplib/metadata.xml
@@ -7,4 +7,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 0c9a63e66fc6..f673381d7f69 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,15 +1,5 @@
-DIST Nuitka-0.7.1.tar.gz 3753656 BLAKE2B 3df355bec346442a76a73e73a17b923fda43404305d727a239275991cf7fd31fef902635aa5f406485e28e43fb79950ce53fe5fcf7110869bdead5f5576513aa SHA512 debbef81475e70d3ab01cd3df990cb20f7b7217f73a35c66bb10dd6ec6ded7abf098239d1f88001f3bb282b84790f570a07dba4ab9823833e84d3faa6e7fe4f8
-DIST Nuitka-0.7.2.tar.gz 3754512 BLAKE2B 6d4dfbc51ab5144f5690864abd8ff1e143f98384c859011f43f91b7e25ec6802531c0f017381c5a99b12d0051c716a06fa8f1cc7ceb4e1c46881fea359eb0ab3 SHA512 65a2fe6f51593a717aab3738979b3870ba21fda8b25df88ab99f0b27f58b261cb68511cb45b0bccd0a9eafdf1bf96c4a93d735efc80f882e44dbbef76298db02
-DIST Nuitka-0.7.3.tar.gz 3784700 BLAKE2B 016c8c88c40c07e97e56c8a37f60c4a6a1a1a1b0895adba5110b508d07f8ae8561c295b5611408ad571e0fa2df7d874a9f5a4180f2d8a62eb355eb4bbc02fcd0 SHA512 d9c672310cfd05f054dad3cd7fb628415f78b0d8aa2551577e880f30fbc836cc08f49041b709b7b1ed41452651743a2d1ac719a6a214792cb749bc2dd6a3bff6
-DIST Nuitka-0.7.4.tar.gz 3785037 BLAKE2B 4bf1e5980071ca34059e5c4aec098a3ab2e2d33884f2bd4673972dbff490f6ed20b200525c3220d0652ede8c06374d0e086fee8c611e9ecd663c9ac4a13f016e SHA512 5066f01cb4ffc99550d0bef816201cb988180144ac9d0d4aa587fb894196c286c44a96637d956f8ef05b803d3bdc79f4d926ccf3db4a320eabd02fe5bd984beb
-DIST Nuitka-0.7.5.tar.gz 3785194 BLAKE2B a97a617dcf55fd12966b9e464398f5bda770a6bf7a026e90aa2adbe3ed43f1e0a6feb0741626f6eb24b07f5a8acfc1e17b54f53720a9a33f24f7da4fe321a9c1 SHA512 e31b2d4014cd533f916e5f023a9633d7f96ae7f4ca8da6bc3911dd23864c42e62f73d8f7e13345d0cdbfdfec0205be2ba75d6acbfd687949ed4091e978e6d455
-DIST Nuitka-0.7.6.tar.gz 3785026 BLAKE2B f8e3f58dedbe9688ae86741b61fd8a56a0d87ba8a2323d0379f09aa93aa954a4b8bc5f6aa736dc57bfd5bfeef2cc06ce76321d7af7cec585904111aaa86c0083 SHA512 dc30e29d671704f6be0c15a9da5d0122dd8b2ee1a764e0274529959cea0a6cb8d0e923027d91a7f4a58dfa2886a5d5a93afacf60354ced66b7f723310bedf188
-DIST Nuitka-0.7.7.tar.gz 3785340 BLAKE2B e856bcb3ecf69ecaa447ea73219f544bfceae8ee3a480fbd13b0a763efb8c8ec3c856a6142cff6a91273a88fc0aec15a6bb6c28fab1d9ca0c4dfeca229c11b68 SHA512 124e2d405b1104d0ba42a69b20a5c6168bb0643a13a4de789279401e09c30091853a8e464d9c4877a01f93a5a63934617cf52678994d0ae179560cd21d5b196e
-EBUILD nuitka-0.7.1.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.2.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.3.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.4.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.5.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.6.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
-EBUILD nuitka-0.7.7.ebuild 1133 BLAKE2B 96da659251cd7e57699f3abd46f7cf3e862b74cb2cd846f61ddc8324afab9fa6a1c4ef5dbd986c713c3a43739f07dcbbfc0cf222028bb07da92a055d2a438ae9 SHA512 774bc6ec699d9ce8bfe1470e85a2cbe4df4b6de3efd9473372c7338c1b4d4297798d28070f15aa68b0462c550cc8389f64ee75b153d038019d69e2766cb5505d
+DIST Nuitka-0.8.4.tar.gz 3828278 BLAKE2B dbd6abb945f66ab6a5a359b8370fd3d5d36fbdc2c232b5002356f59ffbfa531180b96467b67a2edbb7a779c75ebe58789e9ae0ff806b5649eea4a5b7d9c0934c SHA512 683918e60f2f65d22911f894c2e4fedeafd9d0ef0cacd48bb66422fa2077f225c7c861186b83b9c0fd50eb965b956a1b26342249b3db2af599250c16fe84a152
+DIST Nuitka-0.9.tar.gz 3855240 BLAKE2B 59a508aabb04af0b841879a4de23fe9f9f8ea2588125127834319da21ef22ab530d8e39a2baba1b49043e9997dff9a20004fc548af5b09456b5eb3cd8f1d30a8 SHA512 ae2903e89233b7944e1ee1aa846897d30c352302bb8b064a31ab69237dc15ed0e451bba63db5530968e10f60b8da745bf7d7f1f130ff039d9aac2329f628f32f
+EBUILD nuitka-0.8.4.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+EBUILD nuitka-0.9.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.7.1.ebuild b/dev-python/nuitka/nuitka-0.7.1.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.2.ebuild b/dev-python/nuitka/nuitka-0.7.2.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.3.ebuild b/dev-python/nuitka/nuitka-0.7.3.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.4.ebuild b/dev-python/nuitka/nuitka-0.7.4.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.5.ebuild b/dev-python/nuitka/nuitka-0.7.5.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.6.ebuild b/dev-python/nuitka/nuitka-0.7.6.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.7.7.ebuild b/dev-python/nuitka/nuitka-0.7.7.ebuild
deleted file mode 100644
index 1a35fde421ee..000000000000
--- a/dev-python/nuitka/nuitka-0.7.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
-	eapply_user
-}
-
-python_install() {
-	distutils-r1_python_install
-	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.8.4.ebuild b/dev-python/nuitka/nuitka-0.8.4.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.8.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~loong ~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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	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.9.ebuild b/dev-python/nuitka/nuitka-0.9.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~loong ~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 "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	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/numexpr/Manifest b/dev-python/numexpr/Manifest
index 9bf1d5be4907..68c4a01ead77 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,7 @@
+AUX numexpr-2.8.1-numpy-1.23.0.patch 883 BLAKE2B ec2ebce730e72d2813892a152a18ab791565da18c2133d380a06d43c0508120d06d6b7be1e303897f9abb59811a42985c9f315468de09d0e2a79e176780b5d8f SHA512 1a00adc9c9ede86e982368a434a90b297c4907dda351fec6557b42ca02f766633d17346aadadfc6cbb4044dc599d3c67caf5dd7ce4f1c0c52f1914623f46a6e3
 DIST numexpr-2.8.1.tar.gz 111984 BLAKE2B b5d0b5bd5507c8c513db6404917b6256d9c8d232ea5d2f027f42cdac4a5e5c5f8c2db3d2283734f80d0ae7df2551314d088ccd2ed8e2c7401cc04a15ad61751d SHA512 243cddcb1fece9410e35c87a4c3f794ac0963ddfcc054b9a9c9842a2bb4e782d6c939f532d00d724d4b447d915764c3c8bbb87a99c71a22951798329aa7494bd
+DIST numexpr-2.8.3.gh.tar.gz 112551 BLAKE2B c433e27dafe14e0760cd825992a4dcf3e35ae7a32c1bb768c6f5632e8505be5b10dc08a89c97836f019e53d77cf4aa811cc0822832d605934e35ae93e1cbb661 SHA512 4753159f8247ed18dba01d4db21e8e0a149a253cfc064719c9ccdcdd779d109aca64d2306820d912c274b5b6037a9dc849285ef015fec1e1dc9f0c8bad246393
+EBUILD numexpr-2.8.1-r1.ebuild 1004 BLAKE2B dce2c039e02112a06e1bb2b209e3bd7055ed17579efed26ce411016f6e985a7f82940ccd4085eed19aaecd0734ef0ebf75d73a1f36c8b74bc372ffae0aaac45d SHA512 f8d30d44a473ce1b80556bc2422ffbf1ecb247cd88a82aa51f22d31bb404fc59a47f13efbb6ebe7379ae3c058b33d58bc553b27b58897b577de866bb17f5e74c
 EBUILD numexpr-2.8.1.ebuild 877 BLAKE2B fcb53d1172529a31edcf3a161b12ffffe3ddb938ec797f247f97bc62f57fd43a6fd82c5c5323b010528d81022785ff24810e5db06b10eced877d24ec4a2b4165 SHA512 cf79f29d797eef24877beba01d5273bdbcdfdbe664de076d927fb182252cfdce5d7d09ab17df52eff1f252e69d2b72b7a0661578ac5c70ec5cdedbbabe980d19
+EBUILD numexpr-2.8.3.ebuild 955 BLAKE2B a2b1f390de3d09bc4111e3a43d7ae46b57ac6c19f8d5bea78d3750b91bf8221bc3f333d2cbd7a50708b9ab8a6819ebea7659b852a4ff525fa89251aeafb343c3 SHA512 98b7d4f34bdea9cb2352a83973627c974c9aeeb2c3418b43453b7dc4f2a1c22bb56431757348cb78a1b2b6090a152e42d64bfdf08573290cab464b64689bd50c
 MISC metadata.xml 961 BLAKE2B e94e9d69b1a1f5c1dca1e9d0d791b215c7a7ef8f8b42a00bd32e16ee9ba3379a1f5049a1539c8bfcfc7adb110b8179928c5a8273429550000b1a5e6f5cf4c897 SHA512 4e59af51f1f4a44de1289ae47dea1bb2461bc3ab860191e6ed8bc0c244e43cef766d571a903cbdf4e23b3b06bbd0d240b77d1234f30362fb26d1f7a43619dd57
diff --git a/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
new file mode 100644
index 000000000000..b0e841077620
--- /dev/null
+++ b/dev-python/numexpr/files/numexpr-2.8.1-numpy-1.23.0.patch
@@ -0,0 +1,22 @@
+https://github.com/pydata/numexpr/commit/1c6a024947c3aa1bf926ecb9828036b306d7c6d7
+https://bugs.gentoo.org/853955
+
+From 1c6a024947c3aa1bf926ecb9828036b306d7c6d7 Mon Sep 17 00:00:00 2001
+From: Robert McLeod <robbmcleod@gmail.com>
+Date: Mon, 24 Jan 2022 10:54:34 -0800
+Subject: [PATCH] Fix for #397, use of NPY_ARRAY_UPDATEIFCOPY flag
+
+ Changes from 2.8.0 to 2.8.1
+ ---------------------------
+--- a/numexpr/interpreter.cpp
++++ b/numexpr/interpreter.cpp
+@@ -1269,7 +1269,7 @@ NumExpr_run(NumExprObject *self, PyObject *args, PyObject *kwds)
+             }
+             Py_INCREF(dtypes[0]);
+             a = (PyArrayObject *)PyArray_FromArray(operands[0], dtypes[0],
+-                                        NPY_ARRAY_ALIGNED|NPY_ARRAY_UPDATEIFCOPY);
++                                        NPY_ARRAY_ALIGNED);
+             if (a == NULL) {
+                 goto fail;
+             }
+
diff --git a/dev-python/numexpr/numexpr-2.8.1-r1.ebuild b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
new file mode 100644
index 000000000000..55c558ac78d4
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.8.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-numpy-1.23.0.patch
+)
+
+python_test() {
+	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
+	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
+		import sys,numexpr
+		sys.exit(0 if numexpr.test().wasSuccessful() else 1)
+	EOF
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numexpr/numexpr-2.8.3.ebuild b/dev-python/numexpr/numexpr-2.8.3.ebuild
new file mode 100644
index 000000000000..cbfed545e678
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.8.3.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
+	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
+		import sys,numexpr
+		sys.exit(0 if numexpr.test().wasSuccessful() else 1)
+	EOF
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 94fa2f074057..7a8a7529078d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,29 +2,40 @@ AUX numpy-1.21.0-no-hardcode-blasv2.patch 2839 BLAKE2B fcb8c6d538b00a1a5796ac58b
 AUX numpy-1.21.4-build-compiler-args-ceph.patch 2033 BLAKE2B 63aae1b73e41332d5179d822aeefd5da3289505e9d6f6d7755a34746af5506113fb81eaccc08f1582ac5820d6fb2a1d00ee4ba98ef482f4adc72c7288069c6d1 SHA512 ffad960980048603012c0d435013f0f3326a8ecd26eba8ad27c1287b3eb624733c53ddeb270108c1d26339fefc1cb8faaea233ec6e2ac7a072a023ddb12868d0
 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
+AUX numpy-1.22.4-py311.patch 1150 BLAKE2B b07b61133b70f59f350759d94fa45e9fe7ec6e9d795c9de5e374fc135dc2dc146a72b3b7f88c61ade00b511ae34ad304453d062c96a0278c153899229240788f SHA512 f55de836c2d9d379bb5ed7a87826143b1f54845d9eb0e215d416936096b2a0a6d4195857cd4dc2be1238c638059bff3e826d9b655acde7be859f00d93347382c
 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-1.22.2.zip 11447735 BLAKE2B 43dee4d06139822b1eec8280591ddbf6629bc8b92c5c279bf2c5e2f5b0afb4c30c2af2e783002a836280dc6affb60f51a49a37821dcf647563aa19b77aa489c8 SHA512 4ad584527d4395404c2d5d8fe5eb1aae1defac39361a987bdaa4d1f133c03fdc32c3d554c0edb544b55946f46fb3121c98526ebc1ee06e174087c727bf9b88d7
 DIST numpy-1.22.3.zip 11451867 BLAKE2B 0212cf2882410f9d9083fe40b3630733d0e407cab32c7aa10affc138e6305fdcba119a7a2d1b6c3dd5b99765d9204afa5ac8e389369ca933e779e5a647271605 SHA512 fdeefd0ffad798a078376fe16ad840551309d3bbf551eca09d92a35048ee75c3739ab0becedb23448d82999da148827e69ded8842201c3dda72b46b4eb9be93f
+DIST numpy-1.22.4.zip 11458830 BLAKE2B c999a42119e8d71942e4df4802ea22eef6c1ab65e11ad1f8364dd811c3df0eae1c7499055e76b523dc011bc9574f4060e17ecc3ea8bd35f5247fa17e3e188364 SHA512 bb2993459157c43f8c419de98be1c832f108b4eb6b96e1d20f406eccd782681ad8d0f8653637962ac592abe7d75719c17678ec97f035f6c87d4c7f939a1a8a48
+DIST numpy-1.23.0.tar.gz 10714532 BLAKE2B 8b7784adfe4aba8a21a50b460b908cd20eede912f46cc6840a65c03f4f128123ead64e61768ff839a6a79797680a5189ff39284be5819bacb6eb7e1902a09656 SHA512 899d0ca062b676b64de0da204339694dcb7e52f257625e971f9a8ad7267206a6ad2924353e4dd1e153b4a64ae318380899c9e1ee7a6f53fdeba4c19b34917583
 DIST numpy-html-1.21.0.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-html-1.22.2.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
 DIST numpy-html-1.22.3.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
+DIST numpy-html-1.22.4.zip 23724824 BLAKE2B 44ea3da0a703a024a629c8413dfffaf760458b185d19452da0e7e23c819e19833291e10ebd07bdda794077574b8852a368036dda8335c2753cd481740497502a SHA512 4077d9974bfd7f2c189025c3740350652e6f8e0b5727fbc9711a1c0118c1e4ecc281d4876baf1c6a5dc802d20178d6b04a2922f14e9c321cd3b68228b1e295c3
+DIST numpy-html-1.23.0.zip 27964271 BLAKE2B 0aa26d7c39f2d6b119e404dfb9642967770881ee0d640157a9ed11d16f21cd43109bed3c08f89fda457ec470292d945e2bf8b2dab56e4b36192d5e8eb3757b44 SHA512 218a2e893816af767c7cedd1f2256e05f68e59491c29277c95de653a206aaff35c5fe3bc6afd6d6d5ea7957748ec565593eb30d004e36e94c894ea4a6884902a
 DIST numpy-ref-1.21.0.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-ref-1.22.2.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
 DIST numpy-ref-1.22.3.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
+DIST numpy-ref-1.22.4.pdf 7537013 BLAKE2B 702398fddde349901f9303f4788a3ae3cc4bb78b4d310e169fcc6193fd62b33947c89ede45ba9aaea55e74f6a6abc755d3d94428adce9a8163678c6718aec2da SHA512 c1617817f94ccdfe2bbdebdc9c6869beefa1369d5ab0897c1573d8fb5cb3de153f90d5588aae84a0f498fba57ad6bc5c0c5c2c3aefb119e2913e4ddf007cc8e1
+DIST numpy-ref-1.23.0.pdf 7715485 BLAKE2B 7fbb0ce29e86fc7cd4932a6a9f0221b579b6cae695231edfebf863e5b4c2920796d802ccf9ae3e05b331964ac7c4f51099578d91b6b7fb357c6de2110a5f7cba SHA512 6036c6a36f332b83f371c7530a6ba6f354b1334d667d2a52993a1e52aa9d94d524e216f768928a006c717ed4b4131879f6e491a294ecfd3a0d1b0f9f937a887a
 DIST numpy-user-1.21.0.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
 DIST numpy-user-1.22.2.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
 DIST numpy-user-1.22.3.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
+DIST numpy-user-1.22.4.pdf 3978348 BLAKE2B 87cc73cb1c406446eb9d86ea6cbaeac6ba13c7d2b2ffd47524483af1698c3efdfaafe61e987624c5ce01939494861413b271e9a96f49abbbe69d634b9be55c95 SHA512 8e04c0c90255038471de6ef0f8f4ed9e356d646b028bb16f667f3c59170eddaa0d86d48226462c5c17b8123b2a28a09982764979e9e76658b4e26cd0a976f3a1
+DIST numpy-user-1.23.0.pdf 4123384 BLAKE2B d4587c9f979e1ef4734768598d6e106f2b4b0c8222f901a6c4caf0920e41622201252c5bd172b16346e0357138b5ff27c59e56c851be5ae3b7712624bd9cc5b4 SHA512 58e1ab96d2cfbd96df205c86f0a1a09e204349f70d21df7f8481c21ded8b46f4b9ede3216d5cce6c2b9bfc0aacbecdfa198bdb2d4c258a0dd4acb6e3ba421f9c
 EBUILD numpy-1.21.5.ebuild 4250 BLAKE2B 566a16851c2b64a2960c578dd462380573c861ce31aae4ae04f298caa7be278a1d81bb315ae45d6d616d9169ce8c83c4e8308e979149b069f7aee909ef114fa5 SHA512 73185b6fb426e2c0851796ec9487992dfc5655f7b2e862ee881e9af2b9e8121beab5b81f315c91faf287f8aa50215956f5ae9298c8a16e7ad0ba8f5fd675bc50
 EBUILD numpy-1.22.0-r1.ebuild 4230 BLAKE2B 25c3b4283ea4a58cbcd8c1ef2ea539fa0d378c00a873a633bb81a40d146eb43bda016d98689e9306e4050cab65a265ad5908e8a8a3bbc755d82e42c99a68aa77 SHA512 9aeda8408565e61c7f1b18b909fac304f13b3ab59606a5f5957cc19905803b62656d3035cb7c4588ac37ca150b3d6d2fa1c06c5c882fc02b65d15b418778a750
 EBUILD numpy-1.22.1.ebuild 4475 BLAKE2B ee6d48a454d685da1ee4715391c0ca9dbe4072980c09bfa9c21e217a6a94509c3172828f76f0c408ce8c6c3655842a184c1636bf3d923a2bdfb35b6f0667345a SHA512 9f2898c9ab8bb3b2a7007ebd0f7094b844c74b05f64e62418a6ac9ba27f96f7eb7bfaeb480b267f615b4406040e651f16d254afd9db4a2f3e8381e545d341f89
 EBUILD numpy-1.22.2.ebuild 4522 BLAKE2B f3dbd009337631f3f72590d4ed8e1dfd910a624ce7980ec5d20edc7673ddf887e5e18eacb9ac5c33b128beaed1901ba13fddf3ac484d11c791c8e1af3ce7baae SHA512 e32115bf9f08bb1cbe0312ad34bb2a16c98e2b5973f33ae380e7e8ede7f4e0c4943d899fa60addaceb2d563309ea6bcb73000b46291ccf5b4cf33982f8c31d10
-EBUILD numpy-1.22.3.ebuild 4752 BLAKE2B f7980dc5f8f712d86ba3954c57533e230f00c3d70a32a3fb3c34d45165fde735f7b12ab94a0e26ac8ab99b647ffdbc8609bc8c6ead6a792cd7a3ad54e073a5c6 SHA512 19ffe272a31d4430fcf02426aa8887d60f7e95cf5cd7afc6e6580e9fd56cde5fb6710ae7fc890abe7bfe2875555d7bdb79e4e6e76fb879d853a5cd5f4b518c31
+EBUILD numpy-1.22.3.ebuild 4809 BLAKE2B 591d29cf3f8786179f8c883d185357db303bb90da5b577d4fc8c0d548bfe2296d247d10901ae931e276db68e2ef197c38a34740767afe9f091b5bd266ae50442 SHA512 a2973b01c557c5956ba9aebb8f9a15c56fabc321a672f61b06e19fc0f83c03e04856128eea37453b57797ee5f45572952dd67f51436a493ecfdc7434cfb6688d
+EBUILD numpy-1.22.4.ebuild 5025 BLAKE2B 3d338b40070c780e77bf4465835f8335edd771a119fa9a44b52db33b6951a224051ec44faccb9817df893f4ea11202538284a21c199127bae31eb200e17ad9fb SHA512 fb389e0de7d0275f548b86b2ed414ee974cae6456021f63c1696b7d5d7a0f523dc1a6e4f7db18db6af7a61d5113203c504d857fac809c96beb9bef68f5ea503a
+EBUILD numpy-1.23.0.ebuild 5073 BLAKE2B 32f377be0893beec58c4074d5514ae8bfefaf0a458f398bd481222c5f06045580c3cb21d963d06b8af8203f2d666f630e26ed313e8a1792e05ef5cd4b93af2e2 SHA512 b31aae22b0569df0e9871bf32c80fb7d273c90e05f04d2645c873a5fdc3a5d00150623b49e49a06d18dbe52859ec559d72dec07cf6215a4d6cad639400a05ab6
 MISC metadata.xml 930 BLAKE2B 8731116ae6d997dc77539b6ff9a8aff2466986888e3fc2c2a77499522360ba5ba11ec61e4eb6756b7cdbb9d7dafe05a862708dcc0735260e8af038a42dea3419 SHA512 1db89ba1a99457bef29a9501e2d14c11904251163172604fe58001048beb477eba5b1e4784c8636d0eb6767614b80a7341823a9d264a5663cc055a5a2c437390
diff --git a/dev-python/numpy/files/numpy-1.22.4-py311.patch b/dev-python/numpy/files/numpy-1.22.4-py311.patch
new file mode 100644
index 000000000000..7af6431a5892
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.22.4-py311.patch
@@ -0,0 +1,31 @@
+From 42f3203a45231b338cf1a4c77fe81ca4b7fef4ef Mon Sep 17 00:00:00 2001
+From: Bas van Beek <43369155+BvB93@users.noreply.github.com>
+Date: Fri, 20 May 2022 02:42:37 +0200
+Subject: [PATCH] TST,TYP: Fix a python 3.11 failure for the `GenericAlias`
+ tests
+
+---
+ numpy/typing/tests/test_generic_alias.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
+index 52d3deae4..267230a95 100644
+--- a/numpy/typing/tests/test_generic_alias.py
++++ b/numpy/typing/tests/test_generic_alias.py
+@@ -20,11 +20,11 @@
+ if sys.version_info >= (3, 9):
+     DType_ref = types.GenericAlias(np.dtype, (ScalarType,))
+     NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref))
+-    FuncType = Callable[[Union[_GenericAlias, types.GenericAlias]], Any]
++    FuncType = Callable[["_GenericAlias | types.GenericAlias"], Any]
+ else:
+     DType_ref = Any
+     NDArray_ref = Any
+-    FuncType = Callable[[_GenericAlias], Any]
++    FuncType = Callable[["_GenericAlias"], Any]
+ 
+ GETATTR_NAMES = sorted(set(dir(np.ndarray)) - _GenericAlias._ATTR_EXCEPTIONS)
+ 
+-- 
+2.35.1
+
diff --git a/dev-python/numpy/numpy-1.22.3.ebuild b/dev-python/numpy/numpy-1.22.3.ebuild
index 50089a576034..5c87f668b01e 100644
--- a/dev-python/numpy/numpy-1.22.3.ebuild
+++ b/dev-python/numpy/numpy-1.22.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="
@@ -143,7 +143,11 @@ python_test() {
 			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
 			# more precision problems
 			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
-			# too large for the tiny x86 world
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
 			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
 		)
 	fi
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
new file mode 100644
index 000000000000..4797c2585d6c
--- /dev/null
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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 ~loong ~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.30[${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}"/numpy-1.22.0-no-hardcode-blasv2.patch
+	"${FILESDIR}"/numpy-1.22.4-py311.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
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_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
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# known problem
+		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.23.0.ebuild b/dev-python/numpy/numpy-1.23.0.ebuild
new file mode 100644
index 000000000000..5ffe8b0b6d7e
--- /dev/null
+++ b/dev-python/numpy/numpy-1.23.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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.23.0
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	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 ~loong ~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}
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	doc? (
+		app-arch/unzip
+	)
+	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}"/numpy-1.22.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	# 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_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
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+	if use arm || use x86 ; then
+		EPYTEST_DESELECT+=(
+			# too large for 32-bit platforms
+			numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+		)
+	fi
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# known problem
+		'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 95cd739f7531..e0810630500f 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,9 +1,5 @@
-DIST numpydoc-1.2.1.tar.gz 70350 BLAKE2B f693436efa8e95527e4d7d20676b1f3e563369190a71cc4e2cc8ec38b65ad500f3e0e8a4e89ce48ebd3bf1190c8fff1ead05cc22dbbf80fdf147b9996b2b5add SHA512 439ff422d46ea8eaa26bd14ac41f8d64638d8df081a3b889eaadceafbde64f2a091f6363d0565759618d60c4fe869d8f62ec0878d45674022056058621048d0e
-DIST numpydoc-1.2.tar.gz 69659 BLAKE2B e5483ad3d6d82e9ff51d2d7cdc36c75407361059a696047f1d0fb7d3307c36ee056e8c0b9eb45fc11e4d341350c1b1dd021d60252055154c6907942e549b9555 SHA512 b8ea82a947c7fca9d02c2083f6040f2a1a115400e43257fd6ce7ac9b1b174d22ed7723053b87893d6bff8f47a625932297c884e853be4e00d3ae2262ad0161cf
-DIST numpydoc-1.3.0.gh.tar.gz 70243 BLAKE2B 64b6550bffb644945972e38eb9783ca0a81478c9c9f8aac9d0a91b5871fcc9470d55533ebd4cbe287cf7ade2f355b05e4a31e8558e4fff3a836b37ed33027b13 SHA512 ba6b77fba590a9cb97562e9325db98d3423e39eeca6f28975960bc3ac9c83922ad9c47ecb92c2e2ec359f050304225fc204347708cf699cb40074eaefaa29e41
 DIST numpydoc-1.3.1.gh.tar.gz 70432 BLAKE2B bcf1214625671e89fcffedb7a90b1ef7f5993a43bff5e632e21bde647bb1b1ae1f4d21d4cf653622879121ea72c58486b78266d73b51d239243394b177b80078 SHA512 2b2ba50444765460d2df756c65893e59236bf3e47ab5980ed2279c0f3930bd841c68b2cb1438c3e25d0f2416fe4f2670dba9ebad4809c63a8db479fc8068916c
-EBUILD numpydoc-1.2.1-r1.ebuild 1080 BLAKE2B d295ef6e9227bf3360ff4c334ef7ca212d2795dd46f9ac62475ad01ed597f71f4356c226f210196aa8e6dc6a9b0f37af51c3d31d6b0613902f2d945e1c939958 SHA512 3328cd1901fe44a2c54e1c339091a1fd61fc47ed3269d0c83a27bb9076e2cb63302693652d396c0bcb3daf5e117bf5bc4e16127a8267f613e471389baf784628
-EBUILD numpydoc-1.2.ebuild 1008 BLAKE2B af23e49a4e3599f7ae80c717095cb3f8c758e8e6f8265901db7c315718517ca6ebfaafd39bb4c7b665631e0a416d717743c95ede1fc0892344e847f77fb118da SHA512 97aab5ab6d369fe625b2108d6913df429e5af8f09fa3f9872f768fab1d797714c5bb9ad4bd3a94890a3d9f7b8583ea2678ea2f1b5a19d6084a301cef78554240
-EBUILD numpydoc-1.3.0.ebuild 1134 BLAKE2B 1316fef4887ac48f0004835bd50362206ec48e7800c7a589053ee13d0e8dcdf11bc3628a3d8fb8ecc6aa97d75a5e33d0b3203a78ece40633b61da8a54bc76e9c SHA512 38e124822310ea45c8b79692c5feebd2eb6e8f5e755bb61808493431e813022b34a7cd06549ad3c4384274b47020fe69b7280e629cfdb73ba30115905a1e680c
-EBUILD numpydoc-1.3.1.ebuild 1134 BLAKE2B 1316fef4887ac48f0004835bd50362206ec48e7800c7a589053ee13d0e8dcdf11bc3628a3d8fb8ecc6aa97d75a5e33d0b3203a78ece40633b61da8a54bc76e9c SHA512 38e124822310ea45c8b79692c5feebd2eb6e8f5e755bb61808493431e813022b34a7cd06549ad3c4384274b47020fe69b7280e629cfdb73ba30115905a1e680c
+DIST numpydoc-1.4.0.gh.tar.gz 70041 BLAKE2B 34df315b65a034da1bd4742dbbaef77164eaf16c8e56b0b941c6084bf32c0e116d7b4d9795d936380ea4a92ee73b31d61540ff87ed9c129c193f4ead211b47f2 SHA512 24a267149cd696bac552433cf64353aed6f0a3040127ff7cabc42dc0a44e8d7e0cc99d903a6554249c888ef7198adead5aba20c67b0af2e7c738a391e9a9ef02
+EBUILD numpydoc-1.3.1.ebuild 1126 BLAKE2B 3f4342751edccee8b8d900db7e9b1aa6118218ccbfdf93c35ba207629a2f8bdd2acb4be63c5034a0ff857f7070a74826d6ae776eebf975754f9fe9525dc5801b SHA512 9592a745a59051ad0f3e93e7b3f13d1c09e90d6beca8e256126660e41689d4115c35a8e1e7039272189d13950f11d699ea3de67dcc6d8b26f28080b99d3d2b8d
+EBUILD numpydoc-1.4.0.ebuild 1134 BLAKE2B 1316fef4887ac48f0004835bd50362206ec48e7800c7a589053ee13d0e8dcdf11bc3628a3d8fb8ecc6aa97d75a5e33d0b3203a78ece40633b61da8a54bc76e9c SHA512 38e124822310ea45c8b79692c5feebd2eb6e8f5e755bb61808493431e813022b34a7cd06549ad3c4384274b47020fe69b7280e629cfdb73ba30115905a1e680c
 MISC metadata.xml 403 BLAKE2B 437fdd3881a5ec60a83b3cb018e57c714a91030be9ab0032b8662e30b7bcd120ee3dd2015be561dd8a65a39833ef777e22f040a6e466c1b56a602a4ac33d4917 SHA512 833d00712cf7dfdc1080181301c03388a3c966436d2d9c9badb609cff66fa49035a6d001d60f205e1c2c49808eda7fad65abda8802f42f7ba36939b3691a8390
diff --git a/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild b/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
deleted file mode 100644
index 8a0d7f8dfe4d..000000000000
--- a/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-	# unpin the dep
-	sed -i -e '/Jinja2/s:,<3.1::' setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.2.ebuild b/dev-python/numpydoc/numpydoc-1.2.ebuild
deleted file mode 100644
index bf62083a00b3..000000000000
--- a/dev-python/numpydoc/numpydoc-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.3.1.ebuild b/dev-python/numpydoc/numpydoc-1.3.1.ebuild
index 8b2f2b65ba40..ba68d1e747a5 100644
--- a/dev-python/numpydoc/numpydoc-1.3.1.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
diff --git a/dev-python/numpydoc/numpydoc-1.3.0.ebuild b/dev-python/numpydoc/numpydoc-1.4.0.ebuild
index 8b2f2b65ba40..8b2f2b65ba40 100644
--- a/dev-python/numpydoc/numpydoc-1.3.0.ebuild
+++ b/dev-python/numpydoc/numpydoc-1.4.0.ebuild
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 7eda22880f9f..68956d069b80 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST oauthlib-3.2.0.tar.gz 163829 BLAKE2B cf14aeea253bc25f696bb638f364ff74d1a695a0f72dc8a77e2a5433e20672a5cf4a7b25f222940a08a5a26b503e671258ef26ee96e121fa016fbec3d6c5c874 SHA512 abb052cbaccb00a61e9a6c0028102927310d2d864d853cd0826c9a8eae8a9e921da33b79be554a3c6f6067cbcf43b25140f5224c8ab1e7f0a4eb6ab227d418a3
-EBUILD oauthlib-3.2.0.ebuild 772 BLAKE2B 9bd46d81d710148a77698bb03fc547876e6caefe9df412c10804131eba618b35a76d9b2ad78d2cdd83d0a9a6cf2ddfb90557884b7c8b237be70d35fdad4f34ef SHA512 37c43d2b2e7325212841004f4536bd2150a8f02a81df3ef922ca9c371313eb299867564683df1307b348650ce78faa68ae808b2f50ead6d18ecaf1f2e2416dc5
+EBUILD oauthlib-3.2.0.ebuild 778 BLAKE2B 78d49ad3b200f7e8e7a5b5bca319f266b19f6f9e2b086e86831647d5173bbee3b2eae5aca9eb59e7b1fde6d90a76f9791906034b2cc0c98c5dab736151ab6703 SHA512 b42208f8e63460039795b492452a791890ef8015aa0c23db2ea880a4ce58e23037fb475b4116d8b67fd5b117cf79701495dfe30a3c299dd4aee490bdbc05cbdb
 MISC metadata.xml 393 BLAKE2B 7b784c5d6a94cb2eee22f2b92b154fb6a975d752a6af15822fbbd055175078ca3070a75ae575ce65619b9a09420ad5197f320f117a60e72db2ce47fef16ebf34 SHA512 30ceec289fd200942c38e63e9ac46e2caed0db9e990f89b3c04484cf11b8c584040bfb58c827d6a4d3425071b66b099e6dd7ac99397edbd2d58e943e04c2d9e6
diff --git a/dev-python/oauthlib/oauthlib-3.2.0.ebuild b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
index 08d73a5fcf23..e3dd63873a2c 100644
--- a/dev-python/oauthlib/oauthlib-3.2.0.ebuild
+++ b/dev-python/oauthlib/oauthlib-3.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 
 # optional extras hard set as RDEPs. See setup.py
 RDEPEND="
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 9f76f30445f1..5a047ad3d88b 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -1,4 +1,4 @@
 AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bcb58275d90f59fca9dcc8bebdd52f5d6ed69455f9135647b27ed64d3251cb7d7b5f3da4e7b394bf45a45791b73c73 SHA512 8d8a43bcb75141a5fa278871d7e4e3b2ba1dcb833967a347f334675d6fa1a510d7f9abbcae82419617fc593ca02e1708ff69d9b4babe1d23e08d24814f9b564b
 DIST objgraph-3.5.0.tar.gz 638591 BLAKE2B 7a0ee6c9ee1d8417f7b322f19a397ea2452ed592ebbc07afc1378e86b5bad3895ed2e4a20d92a5f4b0215f68fc7440f85852303585a3161497a85d41d4c4e550 SHA512 da29202871bad06f2caa9cc297e7bf9a15af4c89e23baf9c271764e0ce93ff9557cd5c21d0bf39b425713460dbe2dbc8468d70c6bfcc1c3ff8b1b4d4a7923858
-EBUILD objgraph-3.5.0.ebuild 689 BLAKE2B a52a27d3885eea9fe3a3ca64dfbeabf22a79bb5b9ec0d76b7dbaa34e03520aff3cdc57ff70f8b5d3cebb89f32b2644f8424f96f6fca3e3a595aa1707e8cf975a SHA512 ccef8d0c87cc9ce63a0f0c505386445903fa5cf336d09b788ca656a0f04aee04c670f4a08559a88d3460fdb29bdc67aadab2599ebc0cec64fe52352220798789
-MISC metadata.xml 349 BLAKE2B 6027c339cb5596f31c245e4b29b04e32226fecd7959db0ef177701b3d0580e43f05e338a44c6b328ddd8d520bacc9c7b8251d642ee3c9ab7c97a926eb0b56bb9 SHA512 4348dc0ecb04ee53b4d2c15cefa3ec4077a9de4126a67789505f940eea83df865c5222b4a3436605ba24c900374be393d67746020cec2b747687d785f3c892d9
+EBUILD objgraph-3.5.0-r1.ebuild 911 BLAKE2B 558e7e7460c32ff8d0f00b000037dfe5ff3895c076020bbaec9b26843affa0d34e8f5e7f2e7c537a2c1363c1f6c7c6b18258fcb941794fcf33b090de4fc8fb3a SHA512 1013f9d4f021eaa7db67599afd0d1cf50f7c0b26e1bec11243e09ee6fa26b4ecd872b3e1f193b45cd7a9a7739ad352372f5a8b0f8cd1909d144aa40a2400faa4
+MISC metadata.xml 456 BLAKE2B 2896fef2d737793b6c981b8b5c7aac9e4b7ea8204bc99135499bbc28bf79822e280d8a05427146166e2b619ad8390b05d77de23fa7dca1a5928723ca98927ace SHA512 d02440f1b7773e04e9ea208ae7b7a9fec800815bbf1d9903a3ecce28b66afbd51e7cc534e0d92d41fcd02896d131d0d45161791807e97e2d25202685b746741a
diff --git a/dev-python/objgraph/metadata.xml b/dev-python/objgraph/metadata.xml
index 7a6162fdb1da..7c310a2ea977 100644
--- a/dev-python/objgraph/metadata.xml
+++ b/dev-python/objgraph/metadata.xml
@@ -5,6 +5,10 @@
     <email>heroxbd@gentoo.org</email>
     <name>Benda Xu</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">objgraph</remote-id>
diff --git a/dev-python/objgraph/objgraph-3.5.0-r1.ebuild b/dev-python/objgraph/objgraph-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..56d96fed6d22
--- /dev/null
+++ b/dev-python/objgraph/objgraph-3.5.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Draws Python object reference graphs with graphviz"
+HOMEPAGE="
+	https://github.com/mgedmin/objgraph/
+	https://pypi.org/project/objgraph/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	media-gfx/graphviz
+"
+BDEPEND="
+	test? (
+		media-gfx/xdot
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/objgraph-3.4.1-tests.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# the dependency is optional, actually
+	sed -i -e '/graphviz/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/* )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/objgraph/objgraph-3.5.0.ebuild b/dev-python/objgraph/objgraph-3.5.0.ebuild
deleted file mode 100644
index 14cb70486ce1..000000000000
--- a/dev-python/objgraph/objgraph-3.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="https://mg.pov.lt/objgraph/"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="media-gfx/graphviz"
-BDEPEND="test? ( media-gfx/xdot )"
-
-PATCHES=(
-	"${FILESDIR}/objgraph-3.4.1-tests.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/* )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index e41ab368d121..d8db1f0e5d46 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,5 +1,3 @@
-DIST octave_kernel-0.32.0.tar.gz 27353 BLAKE2B da8ddb0c50c65937b4c2b803b6ecc6c5627b3044597ad21377fae9aca5e0ad4bddb6ba65dea77606741c51e435d55c83770d7442de66874c2124f63fda333ac3 SHA512 de8293bed51aca9fe16c2969a467916c90c0c900c5818d48368cd4307bc2b5f0a925f85a0c824c4789d48f72bc31fd7cb341486e70c87a0ca6bc61c799da0ab9
 DIST octave_kernel-0.34.1.tar.gz 258197 BLAKE2B 3bb482784c8f3c5571d1278bf30596338fc5827b99507c13fdb7c8b5e58d5718ce5c0dfbd85a7a81a260aab1a4b465ff29043dfa6fe59cac07fe7793dcd8fbdf SHA512 fcd03450af3fa35d1638030fbd840e706ef975eeef364ec1e0fe01cca44d154cfc9186d8a0951a203fa14df52cc8561e4459fa295d719680c5076f5864365f0f
-EBUILD octave_kernel-0.32.0-r1.ebuild 575 BLAKE2B ead1b15fb745b2e9c44dec2c7b45c96e583ea5f2862857bc781ac7c7d764a28a3ec1ef8907c7a4eab28f42a704f6dd397f652aef26e5a9304c0427f81f624432 SHA512 e7701732a02423b9322d02b604bc6df5fa4d5567385424e9867f8b89b9eec477a6d5c59337dddca63291304bbbb92d0b916f64da75c851a769899a43e4b136a7
-EBUILD octave_kernel-0.34.1.ebuild 788 BLAKE2B 7fbfbbe9eab0d3c8249e8379967a56c195ab937264819ff0fbbc7caaae060214236adf91207c14dbc14fb8ae9f16ec4c471a42057760d34982871c6ea082a68e SHA512 59453098d4824656027375a609658e52400fb5e7bc39f90160ab9dd8709d80569412eae25067f9e13c53710046783060d372307ba3f2cd765e5774939f744017
-MISC metadata.xml 444 BLAKE2B 1b1dcd2d06a678bd21e5701df2651008bac69fb9c836bcdb9c8c4234f40f8587b22b26f1d361c95a14727c085b5c477fa11e419d909d1b10565725b2671b3b71 SHA512 4be6433f2089d63f56755912c89c1bbdd5bc8bdb80deb6afc5336a4fb45ebe724ac92763c318fc8fb6a9e99eacbf6919949bf59ece9937bb42ddee45c39b5329
+EBUILD octave_kernel-0.34.1.ebuild 833 BLAKE2B 1d601954f232dbd8e52b7f023452b6ddef0d708a9ced88ca5b31d7d9e95308cb3f12688893a0c1aa7fde58a7d511faf7656af56f4e8a848a8bed6bb744675497 SHA512 e770ba7a70af8fe85e73aca4f7390ab3e6ad74764a89e3ec7c5191d18fabd21ab82b394223dc24210523160f2fd4b6d4b6f57ac1a08ed94d5c9020ec12ff0d2d
+MISC metadata.xml 444 BLAKE2B 12156b480eb8f067e0607890a8e7268d4f1af4567642a313ede0af857f16842d9340b1151e599da72545d2e0b10d7dd1b395a7d842428d66a4eab03c98643a79 SHA512 e550005af502f75a213bd9b12f08a00d1ec10774f32023b1c4fd1d244f07a8b8ca78dd698dd926ab098ee39ac7994cd12b0e31cc031ed4d38dfe83473af57abf
diff --git a/dev-python/octave_kernel/metadata.xml b/dev-python/octave_kernel/metadata.xml
index 376a215dc3ea..b6f20bc190e1 100644
--- a/dev-python/octave_kernel/metadata.xml
+++ b/dev-python/octave_kernel/metadata.xml
@@ -6,7 +6,7 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="pypi">octave_kernel</remote-id>
+    <remote-id type="pypi">octave-kernel</remote-id>
     <remote-id type="github">Calysto/octave_kernel</remote-id>
   </upstream>
   <stabilize-allarches/>
diff --git a/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
deleted file mode 100644
index 4658ee510d56..000000000000
--- a/dev-python/octave_kernel/octave_kernel-0.32.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter kernel for octave"
-HOMEPAGE="https://github.com/Calysto/octave_kernel"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter_client[${PYTHON_USEDEP}]
-	>=dev-python/metakernel-0.24.0[${PYTHON_USEDEP}]
-	sci-mathematics/octave"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/octave_kernel/octave_kernel-0.34.1.ebuild b/dev-python/octave_kernel/octave_kernel-0.34.1.ebuild
index aec75ca0f82a..3f0ef383a425 100644
--- a/dev-python/octave_kernel/octave_kernel-0.34.1.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.34.1.ebuild
@@ -7,7 +7,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Jupyter kernel for octave"
-HOMEPAGE="https://github.com/Calysto/octave_kernel"
+HOMEPAGE="
+	https://github.com/Calysto/octave_kernel/
+	https://pypi.org/project/octave-kernel/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 4cee712af8c3..d0224021a80b 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,5 +1,3 @@
-DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
 DIST odfpy-release-1.4.2.gh.tar.gz 10065808 BLAKE2B b339cb44604552ee530d8fa8385d753c1f9210f9335813ab279150b16d36f72263fc02c0d2c01ce4350dd3c81b94e7e9f394ce8ec2d85372eb972558a86ded0b SHA512 75368010c015e13302d2b43228ef9ed1f6c9307da60cf199098609729b008c69836511c953dbc730f3097124878b1fa6de7e8d5f49e20716062ada747698f84d
-EBUILD odfpy-1.3.6.ebuild 603 BLAKE2B 1104355f943672acf9243cc37714592897f9bbb6d727254906b621f251cfd8e2a5cadc5a5f4af8229a769e535a5ad1966cf8852434efde229447dede88f62be4 SHA512 c3fbd2133cd7f58606c45a91adf8bfdf0b39b45be0e97753737791bd6390012eb673e44213d733905999b1ec8211825569011bc9dfe4c2977b3541d42f167d6f
-EBUILD odfpy-1.4.2.ebuild 784 BLAKE2B 9b8c5bc42a64891e832020435179fbad6b0e620e95650536a278843d92b0fb0035de3863a7d74823cda3e2f8b28aab1104b379b5aa736e407b2298dd3f1a8162 SHA512 fe30c6ccf6c775b686e78c375f0020288305c1bad5d31849e3496045279a12091df8d438cdbe5cc851ddcbb1719032538f605e3513d6248ae7478d99e3d09185
-MISC metadata.xml 358 BLAKE2B 94958f0701e867122284893912b89308d82d1665bddfcbc0be71dbc70b46667de86b5eef678d5aecff0b4644569174eda897ccb4fc30480dd67c70c886c2385a SHA512 2eba10eb0b2d30f538600527ba65e55ad00cedc71f6020b8c1f6f7a6685ac216e4a4d1bab709d2ed78e1f6539c64530bac83a5acbab6c0f4ea1ea46ad74e2b99
+EBUILD odfpy-1.4.2.ebuild 782 BLAKE2B 8f8196f0081f30c827e0ddc37b9a1078f334afd32f53a3dab93134184f6d486a4c07785dad65035f3add04b1ab39430837d06fbe0bd3a9aa27a6281bf5488d95 SHA512 684d3456c0cd0c6d1b6e4bfe4f5162576d01eef4be4776e1d5340e81be3ff7f101bd7621386abf49a3f07b713aa0a06258130c4a0da8b23818ddeeb8e545e14d
+MISC metadata.xml 382 BLAKE2B bb1bb4d6968f087d5397390f1a727e2402c3c99be82836c60253f83bf06489c6a2c1f3ea4fecd5549942a1ef76eff48ae882ca1cd5a6dba4e244b058e506aace SHA512 48bd2f35ee4f6cac6e56512314398c8e5d7166c0f131ce181ecc0d246e5882b422b7d11cc6dd6af99c79fbf5ef673341282a34ba1e57fa0a3d704b172b5ce6e5
diff --git a/dev-python/odfpy/metadata.xml b/dev-python/odfpy/metadata.xml
index cbb444ef77fd..76eb1be93976 100644
--- a/dev-python/odfpy/metadata.xml
+++ b/dev-python/odfpy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">odfpy</remote-id>
 		<remote-id type="github">eea/odfpy</remote-id>
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
deleted file mode 100644
index ed8c62fc4648..000000000000
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python API and tools to manipulate OpenDocument files"
-HOMEPAGE="https://github.com/eea/odfpy https://pypi.org/project/odfpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/odfpy/odfpy-1.4.2.ebuild b/dev-python/odfpy/odfpy-1.4.2.ebuild
index 28687c31112c..2f6cde8ff7eb 100644
--- a/dev-python/odfpy/odfpy-1.4.2.ebuild
+++ b/dev-python/odfpy/odfpy-1.4.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 75269d968260..cf1c25602c9b 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,4 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46-r1.ebuild 611 BLAKE2B 8afe0b97bc5fe24a2142e2d175195880fe74ae4dbba114bcf6a7fad366579c3d5741cbb7c02f307c3c83d63400ef99e2bd48243038869c45ae25359f779dc3f7 SHA512 1333c00cdc81378466756fafe3297a65b7b2a19bf7b70f00f7af27b94caf94419d7d6a3343032d1bc7278f3a8df428af348b5e76f6ddfb76357f1218830ae4ee
-EBUILD olefile-0.46-r2.ebuild 736 BLAKE2B f58ba4726575abc38776efe8c38ee86902f5c7760ead1cf8b40da522d2bb7f4e569578fd3901309de23186f3e4a40e2afc4d6b228542db75286015b796837cb5 SHA512 863a2dd9379587f4a311c1860b968ec8910e8bb063e73605d46b5bec9262f77db817714708d10a1e1a263457a9b23423bc3ef283185e907b06b39482ea4930c2
+EBUILD olefile-0.46-r2.ebuild 728 BLAKE2B 4093f6bda24039bc0d1807c2b41ec88b86d78149e4fb90e0a1ac738dc0b5aca33c6231ead19d5abd17f3438c6653976e46c0db771c66bdee122911c65bdc94ea SHA512 0430145ce1d32900c423a6327b0418a14ff5a4aa8237c9de95b08106ccd1c73cdd77d309e90d6d33ed9b7165c12058373c1afa0f364c6c4ca66dd1a9ed951d32
 MISC metadata.xml 405 BLAKE2B 0624bf86d3688ac305571048b0dd8229d8789c7c28cd8d3e5536a7e653390400a2aa7615da7b2b32dc54eb11762d9c72db9d3b5cd19518fb52c4ec479a42f15d SHA512 2dfba1b0cb3bd235952c0ecad910354a1589243f66a2d04ff93a9975aa3395e50cea3230947e8db884442951a8871c1457c1a9b99e8657a04432185b3e9acaaa
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
deleted file mode 100644
index c485fb9559f9..000000000000
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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="Python package to parse, read and write Microsoft OLE2 files"
-HOMEPAGE="https://www.decalage.info/olefile"
-SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/olefile/olefile-0.46-r2.ebuild b/dev-python/olefile/olefile-0.46-r2.ebuild
index ca3aab1e0e14..651511a3ad71 100644
--- a/dev-python/olefile/olefile-0.46-r2.ebuild
+++ b/dev-python/olefile/olefile-0.46-r2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
new file mode 100644
index 000000000000..5fe7f2b8400e
--- /dev/null
+++ b/dev-python/openapi-core/Manifest
@@ -0,0 +1,3 @@
+DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
+EBUILD openapi-core-0.14.2.ebuild 1733 BLAKE2B ba75a26c077c9b9ac1c09f321c941d96cfbc4b37404d77481d9d0a03ddf93e931ad4a5b623a7bc3fcf48c4157b4f31989c0fdaa45e0f132d5a1d54a35173e94c SHA512 cbe22ad4328af6634c37a4348edca2ee841db605f4d09a3a4c4a63548d077acad7bea0742a375229a0c777bfb4dff137ea3c40ebc256486c810e6b17e6b3490d
+MISC metadata.xml 376 BLAKE2B bf1f9cf9377b172dfb5f916332dbf9d1e485f3ca1f31f754afac41931598c1780c474989edbfcf39bbfd4ceb8e8030280cf0997514dfb8e02bf3294176fc3dfd SHA512 c7fbdc21a2ea86abe5bcf4a3e8ba97634a447926ce999aff761965ff411fb05b09fab5e5338da5f8a8486a6b024cfeb27cfb9d9fbbfc9bad6f9dabaca1c82799
diff --git a/dev-python/openapi-core/metadata.xml b/dev-python/openapi-core/metadata.xml
new file mode 100644
index 000000000000..13f408253cd2
--- /dev/null
+++ b/dev-python/openapi-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>
+	<upstream>
+		<remote-id type="github">p1c2u/openapi-core</remote-id>
+		<remote-id type="pypi">openapi-core</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/openapi-core/openapi-core-0.14.2.ebuild b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
new file mode 100644
index 000000000000..8f30b58a2c65
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.14.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/dictpath[${PYTHON_USEDEP}]
+	dev-python/openapi-schema-validator[${PYTHON_USEDEP}]
+	dev-python/openapi-spec-validator[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/responses[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# falcon not packaged
+	rm -r tests/integration/contrib/falcon || die
+
+	# Theses tests fail to collect
+	rm tests/integration/validation/test_security_override.py || die
+	rm tests/integration/validation/test_read_only_write_only.py || die
+
+	# There's a problem in the test suite here
+	rm tests/unit/unmarshalling/test_unmarshal.py || die
+	rm tests/integration/contrib/django/test_django_rest_framework_apiview.py || die
+
+	sed -i -e '/--cov/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
new file mode 100644
index 000000000000..1a85d8aa4ae5
--- /dev/null
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -0,0 +1,5 @@
+DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d4188f1941ce5b2475e02520bcc10e7cd29817c8ea8ebaaac5af1ffb0e3d5079ed2d1493414cdaf55336744b142385754585e748af8ac98 SHA512 e6dfe3d6cc99fa9723102ced42040203157639be68b0438d7bfae4499e51cdb6257a36dca10425a5d5e692cebb958468ebeee722116b99d800a6fcf972400c66
+DIST openapi-schema-validator-0.3.0.gh.tar.gz 27083 BLAKE2B 288f5d18874625c69eccf9be6442258ff8af735795eac0ee0449e5976584b1af22c1ea771bb79b4fa68623e60d417b140737e0d1ee85791027393650f0c1f747 SHA512 003ea97a1cac598eb3728d96291d8be56c6ba9e2d3cd4f77c1258962f67b460a887f4473fed39587870583e13a83403623c3b2f96fa8d02345583cd3bdaf008b
+EBUILD openapi-schema-validator-0.2.3.ebuild 857 BLAKE2B eb473e375f925dc889aafd6ffbae05880a663acb1b4a929795f9ef555e6dd92591aedc9f092e593fd3b8f8500b62f36d3e7101a791baf24296639fab7c39dfb3 SHA512 98c81c69daffc9d3f19a686e9b343ac0fd5bd74a966a129259d953895066c5216c6d6398372fe053c08b92b3da2915b204b3a5df5f183d51a5c91fc3b5b6f8ed
+EBUILD openapi-schema-validator-0.3.0.ebuild 900 BLAKE2B 12a9c332ed2c45205ce5bd62b138fcaea9cbcf2a032593123ecd0d86f026316f3c4a404480fa74c10b8e5a160622e8ff47309ed17490fe1437b260a7bbaaa26b SHA512 2e0722818e1a038e3a399a1936b358f1f71245eeb773e5bd696245727b35996f6136bcc661907786e0a841ddb3e3e19e87b4ad4d0ffa479ef7ce64db7a63bdb8
+MISC metadata.xml 376 BLAKE2B 6812229fbb8f1d8d5b21b7717bc6494f9c07cacfbb0b7b5510206557d295d91fbe942f5c2a24c8841447f2e6e0077f949d81720061b6f8cbe56f4772d9dcb6bb SHA512 8fa107a7a073629d9115e7d42aa532f5b4f1d955a522076ff8c515e98fe69192474e40eec08952d4287d8299afe36ea811c709e1b502c0489cb3511ebf748c53
diff --git a/dev-python/openapi-schema-validator/metadata.xml b/dev-python/openapi-schema-validator/metadata.xml
new file mode 100644
index 000000000000..b4e6776314fc
--- /dev/null
+++ b/dev-python/openapi-schema-validator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">p1c2u/openapi-schema-validator</remote-id>
+		<remote-id type="pypi">openapi-schema-validator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
new file mode 100644
index 000000000000..62d30a279c6b
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
new file mode 100644
index 000000000000..b25ebd5a26c8
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
new file mode 100644
index 000000000000..000f3647e540
--- /dev/null
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -0,0 +1,3 @@
+DIST openapi-spec-validator-0.4.0.gh.tar.gz 46051 BLAKE2B 43a1458ab1801700261f750e49d45b0cb4d02f1c17a16943b5232836061e0e1466fc973343bbd4bf7a8669b682bd6761cb905fdfb3b80c0b9720253cc2d5a926 SHA512 d2eaf22c75e72eb5061a916eb37b13179a5ba65eb8a00ec42e81c6b4168239bc8613388f2d77ce35113d260385b175280d8863a3deedf18ea5aa93a79f058419
+EBUILD openapi-spec-validator-0.4.0.ebuild 1503 BLAKE2B 9630f20e77d363c1dbc99ab2a3cc6a5732fb1a9931fb39a7070e8822b24f4d45310b53287ca0c6fe3c09bd6f4a0f7acf01233b60b79c040954fd42fa36efddf2 SHA512 0c8f2cfbc74d2235fc83f579a33f781972b6756a632074ccea4a41f87014286b9edefb23d14fa3e311b81350372387ddd463a758d3f69c5c705ddb8a64db25af
+MISC metadata.xml 372 BLAKE2B 6b08d5f1a63e2ddf4c0f1ab8479a18109231211c82a2a1178a9e1d0775ad0fd5811580c3b2175137ec135b6c8d8ad0e0d728d79da98c092fd87fc604c7cc8a4f SHA512 4fe628abc1481b9dd5874dd5efaaefa5f1adf24e2e58183d2ca75677680077a443702887bb21c67049df998052dc6afae590ac9197b6edb87cc10c126ae22345
diff --git a/dev-python/openapi-spec-validator/metadata.xml b/dev-python/openapi-spec-validator/metadata.xml
new file mode 100644
index 000000000000..f1585fdeea72
--- /dev/null
+++ b/dev-python/openapi-spec-validator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">p1c2u/openapi-spec-validator</remote-id>
+		<remote-id type="pypi">openapi-spec-validator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
new file mode 100644
index 000000000000..c86f945de79b
--- /dev/null
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-spec-validator/
+	https://pypi.org/project/openapi-spec-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/openapi-schema-validator-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/integration/test_shortcuts.py::TestPetstoreV2Example
+	tests/integration/test_shortcuts.py::TestApiV2WithExampe
+	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
+	tests/integration/test_shortcuts.py::TestPetstoreExample
+	tests/integration/test_shortcuts.py::TestApiWithExample
+	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
+	tests/integration/test_validate.py::TestPetstoreExample
+	tests/integration/test_validate.py::TestApiWithExample
+	tests/integration/test_validate.py::TestPetstoreExpandedExample
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 9e61751aaad2..350b71672c0d 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,3 @@
-DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
-EBUILD openpyxl-3.0.9-r1.ebuild 731 BLAKE2B e97f38fb620be1e3b8ef50ec5cbca43b80d618013a4170eec5c38f427b06e6bac7698818ad8a6303e01a92fdb3c5637106e968b390a0f9c813a965adf3dcc669 SHA512 edabd3402a0639895c9967ee0566ff567f734e7328c3b848a332ddd3e98915caa326ef7a890e6f39fc55b3f67acc48adf4263db33f8acd201c169098d5c7e304
+DIST openpyxl-3.0.10.tar.bz2 2427596 BLAKE2B 7422e15d1852d7ce6fa7547cdde2ff6cbe02ccdc13d0a48272cc0f544ade8283833ccfd006d83cca0ac719b2354af76e220522655cadad8dda11bc39ddb6de30 SHA512 1b06ed6c17ab15c277a46cb83db030ba37424a718962070728a8723db50e3fb6a77078b26e04aaee4a924686cacb2c6413742f7aa3533c0f9ecfabca9757af56
+EBUILD openpyxl-3.0.10.ebuild 783 BLAKE2B 332ebbeb5c147098fdd8e0a448f27d398e434acb3059f3b8cae9cd881f97e44fd78c0a9803a941667872325f77e29e4f9f0120f6c3f814caeb28c0a559ae2a84 SHA512 3538002bd35979cc8ad99810de41be44d517dd161f9f8bab0732f9223a13c8a160cdbe8e1e4aea632e61dbcfa3665a23add78cfe8ad09ae327a05fa6f11383ea
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/openpyxl-3.0.10.ebuild b/dev-python/openpyxl/openpyxl-3.0.10.ebuild
new file mode 100644
index 000000000000..4b9fd449a041
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-3.0.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="
+	https://openpyxl.readthedocs.io/en/stable/
+	https://foss.heptapod.net/openpyxl/openpyxl/
+"
+SRC_URI="
+	https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+RDEPEND="
+	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
+	)
+"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
deleted file mode 100644
index a758545ba7b6..000000000000
--- a/dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 6ef65458b156..3afbb6bde3af 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-2.4.0.tar.gz 1255985 BLAKE2B 6066ef5b4fc50093dd7a55d4e7824be9495f8cc9af5f20e1ee7ee5bacea1deb5d1e1a08e408470ba5923de9ece2658dc187bef9c6d5cb767d4c492543bbdc3c1 SHA512 34bc69fc3455c013ba05e6662ea362f0b9ac4070a9e70b34987846eec84197069622fbddd295251d2a363f08303c5a2e9b998b01207bdf6891ca68aa33682c78
-EBUILD openstackdocstheme-2.4.0.ebuild 600 BLAKE2B f24fcc130220657b1ef34d6500d19b9adacbe9cb3b6cd20c6010bfb838c99e6255c62dd8853a318e2ac45622fa1ec3aebe3f152491b176c78f907b1497be107b SHA512 306d0df86a6cd8fcc4d1d0f9469cc57618ab634c23b0bf791eb76e7757295ae46223eabea1789dc51589757e2324594633d6d4f349b31c7a0a1836bdef0cc486
+EBUILD openstackdocstheme-2.4.0.ebuild 607 BLAKE2B f217aa59ade34b83d2cc05fd93051cb81d8ff8d80befe46f5940d980d698142d696fb0f571c65fa4fdc3e5ff811ebfba1a2174d2f017b2978a623ed2bc712a5c SHA512 dba1ef34eb79e8e7a0fb4cb4cc9d8403eafd1ea45c18724770ceecf0b8d851e9e2cd02d910b20093f1405c34dc9727cae5bf7958719e710f6e6b94c7a783ff69
 MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
index 1a2bdef4d1d6..6f53ebadad60 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 794fce35675e..aa399d8bba69 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,3 @@
-DIST openstacksdk-0.61.0.tar.gz 1029483 BLAKE2B 5add768f12bc42562bcdaddf0379e1f59af80b34c5a7f808aaa7469788a685b093b47a4c2a8a771f6cf426f6ac11e188fca0843aaa5173266f3c69a0ac69c4f9 SHA512 6f02486b9de8c540cf43f49f55b67dede34a24a96229d42b43aa215f6286566579f726b53732a9b3b952cee5df1fa8d3cf2f6ccc7c0ca7f9a1a96888640ff734
-EBUILD openstacksdk-0.61.0-r1.ebuild 2622 BLAKE2B 7cdd297b2b2f0bcbb710bf80c9e41545e4d5258250adcbb91342c872d34658add7827a17c6c64e1513ddf72fa4ef18a82605f1a535ba8813c651505a12efbfcb SHA512 ab1d8911500f274961686147f1e028d1974480b434bda034880bce8afb77ef160d2d7643bad5a726f3e4fc4ef75921b2c399883a5137252b77e71d0c0e6c0568
+DIST openstacksdk-0.99.0.tar.gz 1060314 BLAKE2B 0c8f641e301ba4fb8ca83e651f85f8ba98aa73904b2e94b15b17d99354aace5b73ba243c4e624e4c53dd7fb1deb147801aee93233f1fe019a0068873530bdb37 SHA512 5e15f29002231dbad15e7a2dadaa97e64ed191389d259222880a7e40984d6fbcd9d1602a041164e4f819141417d108a179171b4c1430947dc5c5e9cdc5409aea
+EBUILD openstacksdk-0.99.0.ebuild 2629 BLAKE2B 93e22db864042f78ac25e4f9563531a91ea28ace65efc96c2141a602c745837c8bf7d72caf4427717cacb9b3e4e743f47b8f059b5e5df13153892bff32fdd914 SHA512 dd98022c9cd69f395e935f516fedaec2ccf4ee810bab9e91232c8a5cd2871de343186556f0047181514e6bd3fd705daaa2b4c85c7813c493a5c88b8b37b54536
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
deleted file mode 100644
index 52ad9fbcf7da..000000000000
--- a/dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="https://github.com/openstack/openstacksdk/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
new file mode 100644
index 000000000000..c93382d4051c
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
+HOMEPAGE="https://github.com/openstack/openstacksdk/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+CDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
+	>dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
+	>=dev-python/munch-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/prometheus_client-0.4.2[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Internet?
+	sed -e 's:test_create_dynamic_large_object:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# TODO
+	sed -e 's:test_generate_form:_&:' \
+		-e 's:test_create_static_large_object:_&:' \
+		-e 's:test_object_segment_retries:_&:' \
+		-e 's:test_object_segment_retry_failure:_&:' \
+		-e 's:test_slo_manifest_retry:_&:' \
+		-i openstack/tests/unit/cloud/test_object.py || die
+
+	# unhappy about paths due to test runner
+	sed -e 's:test_method_not_supported:_&:' \
+		-i openstack/tests/unit/test_exceptions.py || die
+	sed -e 's:test_repr:_&:' \
+		-i openstack/tests/unit/test_resource.py || die
+
+	# requires hacking
+	rm openstack/tests/unit/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b openstack/tests/unit
+}
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 5666e96ff5fc..19d9c627b35b 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r2.ebuild 1109 BLAKE2B 821c011b7b4eb20e1a26d18ed05e7c9b85867bdaed4d47d6047315d307a398ab9130da8f24a265ed44c9406a175ccca068110ba0ddb721b916824f06c8105f55 SHA512 27bccc9fbe1510a593018e04c83d3a356392f44e533af01b338738a7013dc105cc97ff313bf52dc0365ab2fcb39afa95dd1edff6b5cbd7ec374b0eb2c6dacdda
+EBUILD os-client-config-2.1.0-r2.ebuild 1116 BLAKE2B aaf7b54cd0990ebf3d621837383506805776087239714d8e52df10b73ca32b9678a5e54cf38fc8716be34210a25ebda88c41186d511fe0942448fff55709d7d4 SHA512 50059e6ef8ec9ded6005d2691d724246a18ab87f4cc16c1e6100adcb37faa69c917c9ea82001caf17adfa8b30ad731c4b3751f716dc304b808bb25949462f568
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index 5d9314515e08..5d494178906f 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 3a4d92a178e9..c4ead2cfde8c 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0-r2.ebuild 798 BLAKE2B 98b6098724350499089a1ca38da8856c711b2bd51afe8402a2492f3fdfe485748a72359a6ccac6af531b6f523592fc3da27e95fc380805fc8fcdfc7f613925c0 SHA512 18fe3bc3680495c4b296b16ff7e0c128f0c17fb34c4cef465b7217389a764276be1ff41e41d52867fa7185b1f846d0e0279d63f127be26aaec25406748c6fe44
+EBUILD os-service-types-1.7.0-r2.ebuild 805 BLAKE2B 06fa4e3c13603d23f955f574434f36b20b8067078b3f52d0a145839cba20435f5cf9f6331611d44cbd08097c41f48203e097b96b923a5b8ff976f98626a07636 SHA512 1181fbbb8b1f85066bd8c742423487f7dfcc2195843ec93badd3ad3bcbc0ed66afbc141801853bec1dbe8944f9c3823b62846f79e188359de45c12abaad5cb6d
 MISC metadata.xml 479 BLAKE2B 4938f0bd922ecbb31533b39c79b0dd063ea3cf3516714a66fe60d3e683c0064d7d3fbc8dd0bef95ee6f701dac3d6a22ed0528b014626464ebc6b762c4ad96aa8 SHA512 a41c9dccd4965c90e599a5ef74687e33f334b4d6a2f5bc0949a30b3e8a71a3689973c34e4e4eb3ed048a6653ccddc81cd9ce9f6c18fdc4015ff4418794052e00
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
index 2b3295f88abe..01193a9fc226 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 65c906aa372a..628a60313535 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,3 +1,3 @@
-DIST osc-lib-2.5.0.tar.gz 97942 BLAKE2B 92c2d80463d966c96b3aa18edefc6044a8f20c21484a6ce52e81b57d7e1cf9ea4f3fc5d4a95f01a23c5480a4c4fa06c29d492d48a36f3b6a8df5608203d82045 SHA512 00351402b1048f3efaff2d21673c5dfc9cb41683a0ccb40defb6e8aeedd60271172e63fe25394f048dd4aed22a6bd185946d4d324b30ce111264fa6fd85acfd5
-EBUILD osc-lib-2.5.0.ebuild 1452 BLAKE2B fe813cc9357a60162bfd4955a2b5fff2c20995d4583d5d4bcead5ecfcb3fa56fb8d02d9950a784eb2d990cf379a721e2dba6490a60195b0bb8b205b3308662ed SHA512 8fed060a1362110c35d934ee45a3ffb14a31f36496b130c32ae6708cd92793a01591ac67b7ab1ffc38e82367db3fba85e1302a5b65e23a22b3a070440490dc16
-MISC metadata.xml 729 BLAKE2B 176bf470c3c3bbe5474967ab8123237244d26e811aa6ef251e88cfb3a6ac6b7cf3b96085dc670cf2053b700e2d98534867ec043e8c3f26249d4152f9ed70d4c0 SHA512 d75db35ea445e03ca7adbfffe78946519cbd7a44251735193fab8a0a1cc3c80cf60ffaeed5b9c2f9ea92bea2ee367271f6c068690625562c8c96341f38141d7e
+DIST osc-lib-2.6.0.tar.gz 98452 BLAKE2B b22bcce4a0cdc787422f4fa2d63cae8a289801f5e04bbb2623f261017887e936d2514016ee38aa5b2e4f6e87f137f1d9f59a289b589cd0d6ccce21c54065ccd1 SHA512 b97935da923bbd802ba32a70a91084ca60377a0995b1b204053409c87865dda2a88e8bbf9adf3ed6fb05169448a9d1793a9ea00bc0199f17f86201989159621a
+EBUILD osc-lib-2.6.0.ebuild 1459 BLAKE2B 12f71d4a5f7d0915dd65e87c6ef034b6af0617f462aa76e7d679d5cb03ce865482dc9b6e006995115d4b1711a1b480f393fb943e3e6744a3aad15fffe2f78dc1 SHA512 31b8d46bc60e284f28d478443ff3b20473de3e383ef3e054d0cc676f8d47680cf708a8dfaa6e2c01ed63015288e1f18fca955d0c350337ed3c8139576ed2987d
+MISC metadata.xml 836 BLAKE2B de71d2a55a0b65cdabf503321d91f3e708f50189e6a06e11ce96f0d273286e1a6b5a871726dfe33784b91e941463500c964cb85c583241b003d3742b1d91c92d SHA512 e132c2ed9283d65464a151c918ac4ca91793ce850c7bb0a7b63178ddd42cb59b69b036acce0a8d0078f4b1b778a2361ca6a6f6e01d83e12cdc76dd8682b5b281
diff --git a/dev-python/osc-lib/metadata.xml b/dev-python/osc-lib/metadata.xml
index a3c454c14187..9cf3ca3e07f0 100644
--- a/dev-python/osc-lib/metadata.xml
+++ b/dev-python/osc-lib/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     OpenStackClient (aka OSC) is a command-line client for OpenStack. osc-lib
     is a package of common support modules for writing OSC plugins.
diff --git a/dev-python/osc-lib/osc-lib-2.5.0.ebuild b/dev-python/osc-lib/osc-lib-2.5.0.ebuild
deleted file mode 100644
index 2ffd12bd9455..000000000000
--- a/dev-python/osc-lib/osc-lib-2.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A package of common support modules for writing OSC plugins"
-HOMEPAGE="https://github.com/openstack/osc-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# need to skip all tests under TestTagHelps class
-	# checks exact help message, based on another unittest runner
-	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/osc-lib/osc-lib-2.6.0.ebuild b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
new file mode 100644
index 000000000000..4b1581252d95
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins"
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# need to skip all tests under TestTagHelps class
+	# checks exact help message, based on another unittest runner
+	sed -e '179,$s/test_add_tag_/_&/' -i osc_lib/tests/utils/test_tags.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 5058f60ff668..ca81179fa6e1 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
 DIST oslo.concurrency-4.5.1.tar.gz 59126 BLAKE2B 61f509b4ce76cd036b695bb5ad744374e029239a63a629a4b96d44c8ba29150095fe9d57000367c4d07dc7c358ef61cfa4868a2347f206327093ad32ffb85955 SHA512 88319915c90befb01a275666b4a760357c1e72f04d5faf27ab9c67629ecbf2dd3a73d077f3c57435231b55aa777a9642f26e91cc4cb27ad56eb801b2b98eca48
-EBUILD oslo-concurrency-4.5.0-r1.ebuild 1288 BLAKE2B 979ce66648dff0255feaddbc99ada6574aef396c476a0230fca12ab4a12642b4c3f50764c64977d9bc1efaf493b0bd2be01fff2d31a9c1dc3f9a866fd31e5305 SHA512 0872c65dd1f4fd0e36382264cc2085538b22249a1040b4858ad6e8a61938aee3ddc330c0dd9d5551a3443b3319780a8f51727e7d65ba679682be46b7f0318f50
-EBUILD oslo-concurrency-4.5.1.ebuild 1285 BLAKE2B 5a796e60c803c7247cde42c3432a439e58386e54038cd4ad7072f24031bb346834772ceca403c86140ff56adddb50ebd8ab62989456116418545f17766594ebd SHA512 98e0807d1a3632b717371a9a19704397275bb155e54323d94be7de98b83ebaf30c8d79cf76960d1d35c933a981d2e04831d83705d0665d9c0277132bfe3906d8
+EBUILD oslo-concurrency-4.5.1.ebuild 1289 BLAKE2B 3d713b7d9694bd7a3206af0db3dc50dc364fac72566bcdb55a226a53690d2956bf6f715d536dda94382cbb76dbfa65bf481961e87aeeb869d58fad02409431c8 SHA512 7d28018accfdbdbe47499ee1e95ec9cafe7648429a6d09b05eb6004282b77dcbd0f23b6b831cce62b68bc5496b599aa1563b695db5bad9b6801d6aa894f74937
 MISC metadata.xml 540 BLAKE2B 3cf35ead27deb8915aafded620fabef948d56e3feff9a6936bf8b80cf4ca3a84a000a0f56c2fee944dbd5c0ad7fb5211656ae861c64257d2ef83629e914521ad SHA512 a10fd1f009c73620ae68719bda0304ee3d8b64c0edb05d6bc818d14475499a1a78c613815b9fd29991c9b90b830e099139f263861e10b696432651da65a7d637
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
deleted file mode 100644
index 3de625739047..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo Concurrency library"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency"
-SRC_URI="mirror://pypi/o/${PN/-/.}/${PN/-/.}-${PV}.tar.gz"
-S="${WORKDIR}/${PN/-/.}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.19.0[${PYTHON_USEDEP}]
-		' python3_{8..9})
-	)
-"
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventlet*.py' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
index 03da8577b477..d04724cd2fc5 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index f00b69c36bcc..abb8d846fe00 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-config-8.8.0.tar.gz 160783 BLAKE2B ebc9cdd7ba9ad3e1bbca932f7c87dc5573a5453808baccd2885345efad4d62ad23819945b5a30645983489312d3fc083cdb414c13d1b772a8de49d74aa1f8797 SHA512 8ddb6a631421737fe9c08b5a5fadfa68a53ef6bac396b86b4d30b5be0449f0e000a40b09939513c3651eca49dd750c324a01656792a68ed42cdcf1539d65cf44
-EBUILD oslo-config-8.8.0.ebuild 1376 BLAKE2B e294d772b72b6a280cb2fa2f23c0166e639705cdc883adc457029eaf8c9f3d1352db747e20f9ffb3e2bb922a51772f0f147370e86a7f06e9fcb0a0e5fc1bdfdc SHA512 326bb1c25a68abcda7cc566313940b37ee7cbc438ef66ff7a601be580532931ece0884733de5b87afeddf66549ded018dd7249ec9f7348a50455d0caef0dd586
+EBUILD oslo-config-8.8.0.ebuild 1383 BLAKE2B e22ec891a4969bfe4c0ff831a5fa4dcd9cb7c512aa8657c5685d27b40e86cbaab7ae70f0e2e52a024e713d42b9f83e9b8df0130a9fa52d106a4c822720bb3b89 SHA512 1be08a1513d699ac4061c6cd44fda8bb2f514660e859cdb00fb0d6792a09b83baa63198cc6466222c89dcdaf7e31480ce1a68a8cbe23a7a4a3e7d0e01d3b3507
 MISC metadata.xml 696 BLAKE2B de9409262056cc13ab81347edaca214867f49fcd909ce16a21023c70baab5a888d8db7a9cb5ec094951b4e2617c82bc5778bdd85c18aaa683369c093c42045a8 SHA512 24f2510fbbad8f21fed9ee4b171ae33a1d271980bf227288c957497ac305c890578a93bc0ff93997e73010bae82d933b4a7cd3aeaebb762bb3a36baee0e07014
diff --git a/dev-python/oslo-config/oslo-config-8.8.0.ebuild b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
index 2c3d56e2b930..0a11e48aaf96 100644
--- a/dev-python/oslo-config/oslo-config-8.8.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 817e97dd7a83..5ff27bfaea5e 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.context-4.1.0.tar.gz 33573 BLAKE2B 8fa4f94f5cb5c82d95e55bbc553f97088ae8907b38ebc95b81674709c6fb4eeffab4f83f042c2069a9bcddfa827ca0c5c9e31ec12f21ad1c82dc111ea7d1732e SHA512 83ef0aafc94460bc16ac84841ffa78bad2594d7b81578552579251b2548779296552f86204788fe3acd1a393e7ca54d479475e8c062649d0fd2f4989c3cbebe9
-EBUILD oslo-context-4.1.0.ebuild 865 BLAKE2B c1db480c6d3581f452aadb22daaf6af5780772f6d56e0549fd0841d38c2dc778529d32b326a2f2c7008464388294c6267147111fdd38c09c9f5f3324a547d4be SHA512 d7b3a1015aef1b6a11b74531eb7bf10facbec1373901c833d6453e1190740fd44242e9159fa441bd912f38b4dbc7dd522c79115f7aa636afdc2c039c6d3e7c03
+EBUILD oslo-context-4.1.0.ebuild 872 BLAKE2B 6f2874144a5e7a88a65d2ee150b0f1fb1d8155ae37d4c5652f12467d36d6bc824f53b220b26720c27976c4e1197263c0bf146f1e0a6c8c7d52861269a7bc174f SHA512 cee48c0a8ce4b97ab9be4db769b3fcb45654d1adfce7d6808a0fe8f1fe2e3a5679b7a46f0f7457723e1a888d0177d0414dd7190b651d733ed815e5d10e8c0687
 MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/oslo-context-4.1.0.ebuild b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
index f5946ab6512a..601a617e6c76 100644
--- a/dev-python/oslo-context/oslo-context-4.1.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index f6acb71c5cd3..35ebfcb8042f 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.i18n-5.1.0.tar.gz 47423 BLAKE2B 621ec835fc975978fe3da392edda66471cd85fcfbe5af8c7a1704d7422d8f52f3b61c97ac8cfbd2aca94f65c8428cc5f97b095bc116ece605a4dc325a4a0171e SHA512 b2243f22de3ef3e33609c5aff573c4448a42c74d75022e023bea97c5338608e3fcd9da92aa2d262051e6b2ccbd5a88cfb2c91da79b7e3f81420dc24117da9b1d
-EBUILD oslo-i18n-5.1.0.ebuild 709 BLAKE2B 8f0264bf6b0d3c7da62b0543f714fdeef744b83dc6cb47898cda29f0b2469b42ddd7ac8a44a2cc46bb07ffa77d3be91807df1f5281be44311f75b9208e039187 SHA512 8987898bfb17b699ce9675713502726e3b2f6dfef23b4379e64f21e017a68ae828d12d464d6ced75988c511232802183b712be67668a491484b9c0b65e34384b
+EBUILD oslo-i18n-5.1.0-r1.ebuild 779 BLAKE2B ed2b212f63b8f5478c46ea993ce1ab947565e8c5271de47941478a55c8beecd79ce59e1e02a8baa6d2eb6d949a9270593b5c764281d9f052b9cec72d0e105e92 SHA512 3161cf874a33eeda145b1f208d57ede2f33056015f0874ac2f4e235e1c5c98b66242726487aebdf95fa93e358b86fb2861f63bf578894392e65ab5b946565497
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
new file mode 100644
index 000000000000..7053c73f76d7
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Oslo i18n library"
+HOMEPAGE="
+	https://opendev.org/openstack/oslo.i18n/
+	https://github.com/openstack/oslo.i18n/
+	https://pypi.org/project/oslo.i18n/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
deleted file mode 100644
index 1f89bcf3e363..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0.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} )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-"
-BDEPEND="
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 6e46ad0dd749..06d1dbaec5a8 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-4.7.0.tar.gz 92502 BLAKE2B 092a3673d769be807db90790d68aae3ffa219bb31edf7477bd8ef5a8d290d2cb7978d1c088d7048fd31f519091170627d433b496bd1532b8eeb2dc47e3ac854b SHA512 eeb7e158c940e35b28f736e8ae5fe0beadedf821f1f54f340490307c3a7dac58b2c62393bc4cd26af43b1be37372422323987e4f830d5c4c25e4ec01bc327856
-DIST oslo.log-4.8.0.tar.gz 92939 BLAKE2B 1bbd2d6c2d7c44ea9a2bf8e037b64d37018e3208c2cab13e0e2ae547087ba6ed5b1cb6e39bd4a6be0896a723180b4307c7393a57fcb2169cfd05d01cca6f5b99 SHA512 a918aba1707aeaeed7883497f1cefd6c6169889283627adee5c3a41c6840043b963c8f74db0c47f840c9019a9e783660a1850235c9479653fefccbceffa83fc2
-EBUILD oslo-log-4.7.0.ebuild 1365 BLAKE2B 430d2e2915630c7d1cb5219e065650faec75a555b6270ad5e7ffa668a9668c71b7dcd1ef61d062c5f85f972d597dd2c2bc795622fd43b5f6c0f21d367f125688 SHA512 1a3123249272a4e406b2044c21cd742c5855da64c26f9d4a050592aa3a5c1d79c73c6fbfc662ec78ab4ace2d1aafa17387b648dd671b07acd2bc1fb2742ae25c
-EBUILD oslo-log-4.8.0.ebuild 1368 BLAKE2B 39a84d41b1725fee6040175421f6aa99dfe7fcb533425f5be875748571f95baf3254f1b80d9fadf2d3b56301c1511f9728d9cadf16160eb42d756397a5efa9bb SHA512 86c86ba753728ef81d89181b2f17596508e41eb9143a0c4cdfd1fb68bbf47408fefc9bb19432d4cfacef41ef7a95bb87cd3308df38a2658fa0cd5855e6a74e2e
+DIST oslo.log-5.0.0.tar.gz 93053 BLAKE2B 640d88e3e7a0f45bbc1407d5e0298a157653d5c2c18a9347057447f0ffbd2d12d878ceefaab6df5e0df2337a85f63945e2af2fb1a58ab51ed2fe039b088c1667 SHA512 fd5cc985a6ba8fecbe052d1036620ae3fd5b6d7a2bbabbdc677fc7db399c6ad806ec032cb595f005ceda74b5477b120df65839cb7904049cab8c2e57a82e8d82
+EBUILD oslo-log-5.0.0.ebuild 1372 BLAKE2B a947c33a0f4a5abe6619fcf4032c4593a4bff50f91c44d6e01cfb7976acc65a61fc38377e5e0291a21ff12e1689d5b587072c68a9f9a05233a3c661cbf7231f3 SHA512 26f0e9e39d7c59ef0bcc85d2b182c4162f691a1d5a6ae3171a3b8d05a4b36d16257025a2370d871b61c9146785d44f9bd541e7ed618fc7bdec5e4e50f679383e
 MISC metadata.xml 908 BLAKE2B 49c859acb4b62996a3f4a9beb659b8e1169e700cb4da456d030da25d9c38f05de603e03e5e6a7fe56486b0d5dff6ba2953825d95358b32f53f1e66ce76b9e57e SHA512 9eb901e9f165d84402bcbfc048d2ca08533dd2f6450da96586ec536269662ae68518f50abd5413dc65f9bd817798e2cc10b219f6b5c0805a38d7992ef82cf7db
diff --git a/dev-python/oslo-log/oslo-log-4.7.0.ebuild b/dev-python/oslo-log/oslo-log-4.7.0.ebuild
deleted file mode 100644
index e77ab076a87a..000000000000
--- a/dev-python/oslo-log/oslo-log-4.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-4.8.0.ebuild b/dev-python/oslo-log/oslo-log-4.8.0.ebuild
deleted file mode 100644
index eaf985b0c766..000000000000
--- a/dev-python/oslo-log/oslo-log-4.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc/source \
-	dev-python/openstackdocstheme \
-	dev-python/oslo-config
-
-python_test() {
-	eunittest -b
-}
diff --git a/dev-python/oslo-log/oslo-log-5.0.0.ebuild b/dev-python/oslo-log/oslo-log-5.0.0.ebuild
new file mode 100644
index 000000000000..2d399d9ed300
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-5.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects"
+HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/openstackdocstheme \
+	dev-python/oslo-config
+
+python_test() {
+	eunittest -b
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 300e0a306bd0..f60aecd59072 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.serialization-4.3.0.tar.gz 34114 BLAKE2B a123cdf8a52be65e5c8ce8073bd04db7013f88aae20ebbb8d32a8a4e30588d5e5c11ba8c60087264b0b55e98962172ecfa1030f48c223d52b6dbe814c69c9014 SHA512 78c8d08365755c2bd10fce1fbee403e3c8301bfe0f3b7dd9dccbd5aeb3e010cc00c7b295c3b33b472b50911f332aa3d40d761e49ca0252e522e9cd11017b807f
-EBUILD oslo-serialization-4.3.0.ebuild 1040 BLAKE2B 5d69725f3513e34d24cc5f0e98328f16e755f4bd63c2d9303c30bafc08b25cb9da34c15f7108b3212073600f8034dc8e07785f153be7e0548a2bbf73d98baebd SHA512 77d97a36efbfe3f290beac4b948dcb1dd46890f288b917179b57d15398cd819f23818ce038fad6d17cbb832ddeda04f0a40f87938008924e0685feca85538c90
+EBUILD oslo-serialization-4.3.0.ebuild 1047 BLAKE2B 0484f3f68f2c441939c35dceff633d99e1e55547aeaaa255e98b498a8a83e0a51a63585e545f01b48e4c4a04c0a74b208f96abbc07b29f35c1bbfdd2eb65922d SHA512 311404a8aca2f69940239bafe398e72d5a6449cd87d546c48d00534aa56d41f0bed86909fbc9e0ac64bb38b2dfc28ed20f8580bda5095d42678836b5bee68f7e
 MISC metadata.xml 615 BLAKE2B e25d338d3ea1f94f81bfa5d225b1883ac14eeecb217ab0b4d8687bb8a7ddb35bd33e39d894444655f67bdf346cd394ad280aa511b8c291c4525265877ab75942 SHA512 a95c2e689c9f7d5a60fe1c4bdb9b78eaca78d78cac5ccb765696204122f65a21ea5285f6bbfb88cdbbe1042e69998872bc545bd2af1ab8765317f3a042860778
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
index 968510426ef2..68125caae558 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a218166d58cc..223a163fde51 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,7 @@
-DIST oslo.utils-4.12.2.tar.gz 101505 BLAKE2B fb2d56c767e8ed100ba789560e6b50dfecf8528de2a2717a9660e3dc8ceb93838137d59f1c2e3f05ccb99b95ea1ec86870e22160fb670a8cfb2dd9d6783f1d0f SHA512 fa56225f1991b031e2122cf08cd0992d8a9bfacd9a83d590f87ff86c495d51763ac06f65076c746a59563a60f886601d00ea9536dfcc927fca94c5a1431bcf67
 DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
-EBUILD oslo-utils-4.12.2.ebuild 1625 BLAKE2B 9f10dfc95d869452f0a40e7696bc383b0d99e361a10c28d6bd9cf2c207e475861a627f1a4881eb448761943f43c2b123ea05af129954932ee0eea86fed4a9fd3 SHA512 dc033d47519f54fb0fac47152c7931a670ce885099adb0ba856058683a7aa26555689ceeff9b6510a6faa3d2f7588a2b17e6a9499a56b3a85a9f8f459d478670
-EBUILD oslo-utils-4.13.0-r1.ebuild 1665 BLAKE2B c6cd2ab7179ab9422b68cda82dabf6d689a100a804c211c66be1a7871c5da942b7191dbb13c0561ba76a1e9fb165373a2d896c0cef8e87eec41ed9a68c60ecb6 SHA512 eb604282dddbd71b8df0d8ceb1f955c3b5551405b03647b51a9c1e881267f3d3caa3fa287a57b08d1b5037bfc4d4194caec1bd9689b4d15f78f23b4801e5fea1
+DIST oslo.utils-5.0.0.tar.gz 101823 BLAKE2B be62ddc2fb9130e3f678366b6181f1f334f95846a09ede4a08917cd88427492978e53039a482a7158f234caf96c9e520026ab6009f1df5de588a9fe68aa0664f SHA512 8941caf086354c9066ef51e64dcab5854b8d99c2b51807cb2d8b75fac0983f5787e499b0727423b624791ead2b5c9b55b463d5ff47f7586f3e302dccec1f5408
+DIST oslo.utils-6.0.0.tar.gz 101261 BLAKE2B 8a659b4bedf49e40c85ee40fe026205964d2f4a919170e4700c85e754f4bbffdf5bb9305aea00f7b36233feec93e42bf5e0c72591eeedc02709a7fcdba64d9b6 SHA512 9f9dcd585419372711af69917daf717d7c694cc604aed4db242e508ca6bdea3db9a52a29c354dbb5c80473a819c80dec9eccad7e6f6ca297c3469bcd2db5c7d5
+EBUILD oslo-utils-4.13.0-r1.ebuild 1669 BLAKE2B 7bada81a49796f1b4cb9cc7ad4feb1e9832149624076dd26fe8c8e610c394127f031d367c14abe46c22212b9882f9c82ff896aab1f984a8f762f40f721d7659d SHA512 b86f2f59fcd2f18bde993c47862462ba1becc45c2b99f27db40c32caf6fcc6b0c2f5c1ffb82547500cd2372f5b381efcfcc5c935a230d3e98b703e8eb5162dff
+EBUILD oslo-utils-5.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
+EBUILD oslo-utils-6.0.0.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild b/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
deleted file mode 100644
index 2671db683670..000000000000
--- a/dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		' python3_{8..9})
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# spurious rdep
-	sed -i -e '/pbr/d' requirements.txt || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	if ! has "${EPYTHON}" python3.{8..9}; then
-		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
-	fi
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
index 15e4051eafb6..fbf7c0e01d64 100644
--- a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
new file mode 100644
index 000000000000..a0bf0d0fa37e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-5.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# spurious rdep
+	sed -i -e '/pbr/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
new file mode 100644
index 000000000000..a0bf0d0fa37e
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-6.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		' python3_{8..9})
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# spurious rdep
+	sed -i -e '/pbr/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! has "${EPYTHON}" python3.{8..9}; then
+		find "${BUILD_DIR}"/install -name '*eventletutils*.py' -delete || die
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index a7e5081e8e4a..ff33b5aa128e 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-4.5.0.tar.gz 38233 BLAKE2B 73fbf056467c5d86c647b0ff49ce2e75654c8a2ffbcda78f8ea49edddb55a4c5e0f065c7a95291468b2d5d73ec5f5152d16a2129ab17fc5e6d457284e684ec31 SHA512 2dc0644365621fe271e09f2f7be631f697749c9d343f1ce9b635986df41ec5be8787350b3f2eb6b6501f4baac1ec597b2f0ecada7936db967075ebce837e1517
-EBUILD oslotest-4.5.0-r1.ebuild 702 BLAKE2B eb94404e26d4f495ce8626b52f4dab3bcba925e8bfc6d4f3d0f61b0f5eac87c1128b491f087997cb9c861914f88f79a58633552861305a186412373a7beb06f3 SHA512 31742bd2eaf6db6d2e3db6e88be688e6718204905c7c18dd4ffd0c59d269aa4e3bfaf2f4aaa84e1390ad2c64a5f7005d89a569773b586de832a783d024d07e17
+EBUILD oslotest-4.5.0-r2.ebuild 841 BLAKE2B 5d0720a8ff933d1b2fa867b01529478e476e223eeed0aedcff8ae4cd5b0d0099bd31b5172cb5460c580b0f15aa20ef809fc1d1984f768567e6f248b28a93702b SHA512 04a59d556f658db19e84fd7dac8e03aacd9ae22915c3985a681f8832085369aeea77fe524f7bfd91e1ba13958530b55c708e0e1b9c24f08372b2dffb1166d93b
 MISC metadata.xml 935 BLAKE2B ec63aed42de004f150dad32092560db0c3e76297cffdd791fa4f717af68ed6e88ee012923e1a41583ae56568e9e7ce8dcefa58d38cc66f675d78d9bf6a17601d SHA512 b116d2489597a1088c189a0db83950551c2da239d7a27319b63f886b63deb047fc6ef1b021db8044b14420bddbd759856d655e7d114df11bd918c1263ec8a1ed
diff --git a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild b/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
deleted file mode 100644
index edc449cfe072..000000000000
--- a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/oslotest/oslotest-4.5.0-r2.ebuild b/dev-python/oslotest/oslotest-4.5.0-r2.ebuild
new file mode 100644
index 000000000000..a5d04babb6b3
--- /dev/null
+++ b/dev-python/oslotest/oslotest-4.5.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Oslo test framework"
+HOMEPAGE="
+	https://opendev.org/openstack/oslotest/
+	https://github.com/openstack/oslotest/
+	https://pypi.org/project/oslotest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e '/subunit/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index 292d398ef08b..f74f9e1f3a15 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,9 +1,3 @@
-DIST osrf_pycommon-1.0.0.tar.gz 45084 BLAKE2B 83bfd5393575a5032e72ae93c9c3eec87d2907ce3fbd3e9fe14a94e5470d61594ab75bca394ec4b7960bbdb16c3ec060966bd6bf47f9a4037d530501c7ce947f SHA512 ff7204116c94eef972b7071f8d6c68fd7cdb1a518fd6c77cd47f54e5390815ff4b6a7d265ef3ed0093c1baa20eb332d69e92926e856da0e34b7186100b688d83
-DIST osrf_pycommon-2.0.0.tar.gz 45467 BLAKE2B bcf111183b66dd19e24182e6fee75674f0481bdeb2498ea2a0d10c56977651da60f94444706df525ee71f64d5eb1a24e2e5b4acaf13f19f94b787ce5b424c81e SHA512 ebb06a86c3527ea9dfb24778410a7f84d5560216aedd4ed5fe0b22660b6fbf9625d093dc8653db58a2cc7f3a81e6c4a2770fca90694441cdb141fb840935c50e
-DIST osrf_pycommon-2.0.1.tar.gz 45839 BLAKE2B 9961eade38c8de980cee01debbc177ae8ef3ef872d2525c9c6a1660e2323a5bfc02d9f5e6295aeada0cb3a9506da27637eb3c042a1328aff7b5e0e6435bd4dc4 SHA512 9f8affe81c6adc7436ccf9481a84b98a32650c6a0d6bff9c378faf1a9202bfeccb9f72046fecdcdd38f5d6047319db97e6e7e090446ab2fce759949046590f4b
 DIST osrf_pycommon-2.0.2.tar.gz 45927 BLAKE2B 49d8ada07d5cae3b9ad0fac7bae38749517680d3c7d7b84f06f83e4f6d14534cd62fdc72bf4fe11faf0eac4d7e5ef133b9a2410e689fafdaadbb5c1a7838a371 SHA512 3efba5e7010bf96e264c01bad1f095e121e998f34125b6393e5154eb7632704ae18e5d72f17862f527d584bd2e2e216d115b8c87e523ddcfff6656d6db331091
-EBUILD osrf_pycommon-1.0.0.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
-EBUILD osrf_pycommon-2.0.0.ebuild 730 BLAKE2B 97099bdfa63723ca96cabead6428f5c0432397a0427625481189c18ac81dc24fa1d5e04a24042957ee2e49e54a0ccd61861c2fad251ab567a847d1a82c537d59 SHA512 41f101fd202ff6a5d327231a812035cfa5e0f945f2c1ee8dbfae0be9b91b956dd9b7c130d99db1951bfe24cc2c245569d4a5b2f6b90caded57d9d779a756f1d2
-EBUILD osrf_pycommon-2.0.1.ebuild 670 BLAKE2B 194ac36f67797b86438b852ece0780de42a64de2313cb0e7263ce4e4adba86bf67755ef6c29b8aca971a514d1a1ef977a858e037c71f3a182da2a3a996cd4d8a SHA512 968651679f73a64d94c2e46b6ff90216071056712f347d163b96c06e36bccdc5761992c872833fcce43a895a94b7c93c533826a064c2f61be4a761e11707f722
 EBUILD osrf_pycommon-2.0.2.ebuild 654 BLAKE2B 5fbd480e268152cfd1f035ad827dbbac6dfeca0c922facb0c30f873633a5812299a00a931d69a57265540c019ae690a57f6c3085613bed908d714063917bf5d1 SHA512 bf5de5fd5880affd3f2b4cd4a0ba253328ee3c13354422d31bbfc8ee8efca77e070ad7484890a4ecee178dcf64654fa4581a41580bdab50551eac5fbf1501dba
 MISC metadata.xml 485 BLAKE2B c4787f4886029b55a7c557caba54277711a229ea61b7b66f21d7e0851f934930f223e0b304c2b46ef2674d1dc7a829263cae991d352a9609304d92768a4eff72 SHA512 8b4f0a9f465e968dd93fea7715ed6efba8eaf0362643174784ac14074709eaae5d4e13f1b4075fe6c61475d106760d7dce3c129cb86404dc540ad14d55c6640d
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
deleted file mode 100644
index 76c71e1f7c8c..000000000000
--- a/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
-HOMEPAGE="https://github.com/osrf/osrf_pycommon"
-SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# linting is something upstreams do
-	# for us, it either means unneeded deps or breakage due to changes
-	epytest --ignore tests/test_code_format.py
-}
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-2.0.0.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-2.0.0.ebuild
deleted file mode 100644
index c05eb3531f96..000000000000
--- a/dev-python/osrf_pycommon/osrf_pycommon-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
-HOMEPAGE="https://github.com/osrf/osrf_pycommon"
-SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# linting is something upstreams do
-	# for us, it either means unneeded deps or breakage due to changes
-	epytest --ignore tests/test_code_format.py
-}
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild
deleted file mode 100644
index 2c0977439143..000000000000
--- a/dev-python/osrf_pycommon/osrf_pycommon-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
-HOMEPAGE="https://github.com/osrf/osrf_pycommon"
-SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# linting is something upstreams do
-	# for us, it either means unneeded deps or breakage due to changes
-	epytest --ignore tests/test_code_format.py
-}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index a51ab714e267..6135105a1d92 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,4 +1,5 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
-EBUILD outcome-1.1.0-r1.ebuild 848 BLAKE2B f33936ca0991ba45e17cec760305620e2306baac9a6a6f143da29c78f261909f829416ea23173604ec9232e9725b7511baef4f57bdcab1b13f0ad70043a525ac SHA512 d0b766487ccbc5fc22e0370996fb1e81be85bd5c8c3ded8073ba6ab18ae18150d86138f60ac2722607d0e8ea747148fc6d9e878da59f83695f51fe398a39a0a2
-EBUILD outcome-1.1.0.ebuild 777 BLAKE2B cf2dbdeb7aa6c9db4e9e87733533235c0ff5357d949582c03f85ecaaa05e35aa7777406a692e9c9104c19e7171ab5e62a7a0a6ee95c9a5995dd87dd0bdf33fba SHA512 d435bef3694e0b2593a628a56a3c258c4e9ce9d079cbe8cc228dfa8856c12ce33065ccde3e2bda4f5f85428ff51d19e340351971abf45ebd86982fdf2772189a
+DIST outcome-1.2.0.gh.tar.gz 18147 BLAKE2B 19e99c8beb1c537a15040211e2fb2f30e425dbb6c81225f2b44720d52e26d8065f434949cd22f97d3a44b64d404077118842a7c85d38f1b7b01ec60d26ddaa39 SHA512 ac8f8738b000e50ace5fbf2c373c9d28f05e88fe40a11602dbb08c48d369f28651ca6c1269ce9ba4ebf1aa9701525e966c061f75313d8650e739934e3ad15003
+EBUILD outcome-1.1.0-r1.ebuild 842 BLAKE2B 72f21ae60bdf2feb37e01b26bc62456edfd7d921351b02020e2cafb54e413241b2c5eae011702af4ad4e95eaa1e1e4934ca4013f97ecd5502a47309d1e2cc424 SHA512 256f4eb85822405032b324d8f42d3a53ee2d458aae30320041b6a8d03904bc329010f6b5ccb5e2df831f61e1aa3563079342b2b97c24cd25b5b495c3aba592d6
+EBUILD outcome-1.2.0.ebuild 853 BLAKE2B 37608eb786e11bbb451d5e94a4842cb3ad5b0e060bcb939637764a7a663324ddbf84f23037c5b155e95dce96519a3f2d2a80b0784ba607e1f36a0be9d41594b1 SHA512 f433cb157241a5f4f52f9f2e9b0e0643098aa90a08da9e0f5a6b5d04776a4076d2e53eae7c65715b7989f27f0909b4e15925ddd5acfac6d4a4cbdb8092cb2e03
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.1.0-r1.ebuild b/dev-python/outcome/outcome-1.1.0-r1.ebuild
index 2be36f800610..caf7841c08f3 100644
--- a/dev-python/outcome/outcome-1.1.0-r1.ebuild
+++ b/dev-python/outcome/outcome-1.1.0-r1.ebuild
@@ -4,14 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Capture the outcome of Python function calls"
 HOMEPAGE="
-	https://github.com/python-trio/outcome
-	https://pypi.org/project/outcome
+	https://github.com/python-trio/outcome/
+	https://pypi.org/project/outcome/
 "
 SRC_URI="
 	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
deleted file mode 100644
index 722e60e24ead..000000000000
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 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="Capture the outcome of Python function calls"
-HOMEPAGE="
-	https://github.com/python-trio/outcome
-	https://pypi.org/project/outcome
-"
-SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/outcome/outcome-1.2.0.ebuild b/dev-python/outcome/outcome-1.2.0.ebuild
new file mode 100644
index 000000000000..8df9f4999311
--- /dev/null
+++ b/dev-python/outcome/outcome-1.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture the outcome of Python function calls"
+HOMEPAGE="
+	https://github.com/python-trio/outcome/
+	https://pypi.org/project/outcome/
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index 9347d92a680b..67def232f19e 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1,7 +1,5 @@
-DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
 DIST ovs-2.13.3.tar.gz 102736 BLAKE2B ee6f10a41bf46534d3963360a63a0a39a7ffbed6de468894c566c7dd2ee0c645cf6f8f211bfbcda70f03b4204e396fc0b081f457df9d27f93fc40d158bb641b8 SHA512 9f73dc383f7b717000d6d1f8f2f9114ee2be2457c9b352de68c01c1f9075c39ab4a9ef14fe67083bf1da1872240204eb2642fbf7b5a871a5ad044191e0774d88
 DIST ovs-2.17.1.post1.tar.gz 104766 BLAKE2B e1cb471f7f3f3b8461292c79ee5318a36d70c2ee55947bfa0274277e36514d20ad9293cb8c602e0b2c82a590397869fe51f52ee2579255bb8163014d58dccaf7 SHA512 772e7b4768f1e7fe1f2be700a0eb6bc539459e4c70432c45e7f7877b060f4c845eaa5a974f2b2264af621f5f43b97da30a9fe344a53904ec0008393689e6b895
-EBUILD ovs-2.13.0.ebuild 483 BLAKE2B 1ea179d3766cbf386f8cd0879e01e9133ea8f8bf9dfa9d10a18de583aae76f5883c6c178489a3d5c653590c77f54b1daafb10fd505af02c5ca99e5c845fbf9ce SHA512 03b847a996f20a0dbe4e8db990d51357182a0758c02f4ddf6ac1028465cdfce9b63153a40e45931d495bffd2ebee78b2f86a65cb1a01605c0902c23b759f1a61
 EBUILD ovs-2.13.3.ebuild 483 BLAKE2B 1ea179d3766cbf386f8cd0879e01e9133ea8f8bf9dfa9d10a18de583aae76f5883c6c178489a3d5c653590c77f54b1daafb10fd505af02c5ca99e5c845fbf9ce SHA512 03b847a996f20a0dbe4e8db990d51357182a0758c02f4ddf6ac1028465cdfce9b63153a40e45931d495bffd2ebee78b2f86a65cb1a01605c0902c23b759f1a61
-EBUILD ovs-2.17.1_p1.ebuild 500 BLAKE2B 8650c58a964f75407a7fcdc8fcd44bade3384fa5cc6dcd98ceb4598e284c3ab556d116250e8ebae3210f89568607038ad1fd29abba9d4e9f0cec5995c8fdd6cf SHA512 6a357b7c07f0bcc4e9e6a3344e09bd7802a6ae5a02c4940b6c6cbda80d02e62cb18dd74b1dda6d125b5a94ec68bbb3674215a7147d499e7a6db8dad7ac050a61
+EBUILD ovs-2.17.1_p1.ebuild 498 BLAKE2B 4232b6c5e8fda1fc34440b1db7eccb221eb199b6a3c4f50a61cc92fd946d890fc5ee31cae163aae6451ea7fab31b7423e2693399cc5397b1653384bae2249bed SHA512 4ba46b4c6ed030c96c39e37e95019ebba11e841ed7eceddb6aa29f8792b00d138fc8a4ebf9f46bd6c145fc3a40d153c135dc3642dc05bae49de35df981e72dd4
 MISC metadata.xml 376 BLAKE2B 4081255d63944056ab552b38343f541feb2f9e18d1abc39b2a5a2bf64170925dafce6449a7203ca1060cdfca86916a421029538f708d5a870f4a34371120102c SHA512 d940cc54f710344129ca3e64bb20b0313b8e3e7442d7b70da762c4e72c7ebc71bc11979bea707fdb1d755488153623b8778ceac34afde61797b58cbcaf48d658
diff --git a/dev-python/ovs/ovs-2.13.0.ebuild b/dev-python/ovs/ovs-2.13.0.ebuild
deleted file mode 100644
index b1d107f7d83b..000000000000
--- a/dev-python/ovs/ovs-2.13.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python"
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovs/ovs-2.17.1_p1.ebuild b/dev-python/ovs/ovs-2.17.1_p1.ebuild
index f0cef5068684..e7cd6f385273 100644
--- a/dev-python/ovs/ovs-2.17.1_p1.ebuild
+++ b/dev-python/ovs/ovs-2.17.1_p1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_P=${P/_p/.post}
@@ -16,6 +16,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 0de13cd9134a..069013c53988 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,3 +1,5 @@
 DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
+DIST owslib-0.26.0.gh.tar.gz 948463 BLAKE2B 2cbdad2d8e9bc4b8a7e2db58dc75a7c053bde0b2cc772a01f230db044909615b96e62b08bb93233df153686a180a5e93af1bda6ea79b8565efacccfa18fcf4da SHA512 27362c47eae87dc6318d505dd1b0987de36d140d2d0fd5d7a5195470de39d73807fbcafa142366f6981cc36453c262a41133c6c68baf45a97d0fdaae5a0ebf4b
 EBUILD owslib-0.25.0.ebuild 1008 BLAKE2B b37bc0a351127e7dbf203fb0c3c92f17e0acd7ef591fa70922e0ea1e249a5c2d1ff2d1b7359aec0e63a25a72ccdfdee7bdc62694ea084b772c2f29a96fd1ebff SHA512 288045a3f8840f587c06290839eb70d37b4716946ed55cc669759b3ce3f062c561a2a7fc8a7f3df61aea892acbdfbb293f5af9e1e1bc6325e0c54392aa753c58
+EBUILD owslib-0.26.0.ebuild 1017 BLAKE2B 8da0d39b1c5969e54ecacf36c08ec3f198800c2c495597ad4a656afacecbf2fb954053e77f24b3377838034b27746cf5ba4f28af9d002c53ffacbff0335229ea SHA512 619c153975a73e3a93651939f70288cda1359c15bcbf2132aef437bcd6ee7faa6efc5c3c31096394f576021bc748536bac1062066ceb970a10f5c34042761735
 MISC metadata.xml 520 BLAKE2B 01705147ed084a8215d15016b6cc94b2fcdc926eff2755cf2d4c768197d0c39a30a8b0602d93bac7ec221e32c30b9280b37d5736f2f46342ad36e23c1b4a7c1c SHA512 c146cb483caacbde7966a95b899372261493543826cb20d638cd91e7cae245d60f1504bc53f485e35ca5d6c3f83780fc1da211c0838c604dafde27284dd8e40b
diff --git a/dev-python/owslib/owslib-0.26.0.ebuild b/dev-python/owslib/owslib-0.26.0.ebuild
new file mode 100644
index 000000000000..50d119522978
--- /dev/null
+++ b/dev-python/owslib/owslib-0.26.0.ebuild
@@ -0,0 +1,42 @@
+# 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="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib/"
+SRC_URI="
+	https://github.com/geopython/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/OWSLib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+EPYTEST_DESELECT=(
+	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/paho-mqtt/Manifest b/dev-python/paho-mqtt/Manifest
index e34b7495516b..1dc2d64274d9 100644
--- a/dev-python/paho-mqtt/Manifest
+++ b/dev-python/paho-mqtt/Manifest
@@ -1,3 +1,3 @@
 DIST paho-mqtt-1.6.1.tar.gz 145673 BLAKE2B fb583a2505892370737edfc9ad06b195c0feda4fd87794f3aa40fb30679b5710e04483e610a6be9c0e0978084f3ca96c0d285cf8cacb2bf67aca605f1d53ed7c SHA512 8a13c1f6f97138728d5cab6f7bcd6474942fdf9dfc18d1fad723d50de81f4e062953b5bef2ebbde27b08e480eed305ecbfeae467d70eb10f07ec0adca11750ec
 EBUILD paho-mqtt-1.6.1.ebuild 633 BLAKE2B 7b45cd7041971ee070ab444906859186800740ccfbd402c93ced7218a4af7cc6e6634cd30b065f7223bea6a925a4b11677ed092fba8baabada4bcdb5984e2838 SHA512 142f0b65011013f545ea4de9fda4cc52a5e4bf5f114e575105f7506985cba8d37081be0afa84301f974abb46a2ccade6da27f52bb67d80a7758dbba3c1adfbc7
-MISC metadata.xml 407 BLAKE2B 4745c4fa81f796a8cecb2d8bd579e477f9a8b8983b844014aa185ae505dce602c5829db557b266dfc2c4474cde675e7bec1d0ce3e9563daacfd7c92930f72730 SHA512 25bee148e3659b941008618e3eaa6949edb8311fc2d34b120c3a0e551408ed5634f55e83a87ccdcc454437cb06b3f25527b282d546a6791d0b60202b7e5f5243
+MISC metadata.xml 508 BLAKE2B 92c37e962fa7af68e121e95a9c850c2d8bb4f087a7aac06740564dd10a4d52d3ff6861c52dab295a5dc343681e25055a9e69c1f7e32820816049fa6501b9e3fa SHA512 e9010f6f4256f611dcc07a080472bf78c55c0dc94bddd4c8b544944f4e1d780d8e36425442ecf97c2992831b9cbb9f55cfe2bd540dfb723029a984e7d5f12561
diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index 004e04637dee..62a92bff3848 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">eclipse/paho.mqtt.python</remote-id>
diff --git a/dev-python/pandas-datareader/Manifest b/dev-python/pandas-datareader/Manifest
index be6ed8858ceb..52c8df43e83c 100644
--- a/dev-python/pandas-datareader/Manifest
+++ b/dev-python/pandas-datareader/Manifest
@@ -1,3 +1,3 @@
 DIST pandas-datareader-0.10.0.tar.gz 259641 BLAKE2B b8a5c7aaa76b30abd9297c820638731fc5d81b5ee2cd1a016c1d8d10dc237708b913a4ec505b9a703b02f470413725f58fa4cbf54ba70113bfae5d0ffb0875b9 SHA512 b078122c6c0a614aa5b55151446b830dba64382b0570761ac80baaf362ef8121fac2c4b53b8cacc367bf985ef1ecc16d44041f1d1f4b13fc1024fe6ab74f1d0b
 EBUILD pandas-datareader-0.10.0.ebuild 1138 BLAKE2B 521dc29343e42285a89dfa11cfefe32b63451a4711b7d13727f7270c8327485cdc3609e684b45d54b31d6fc2a14d58cec87aa6e6f7af6edf9b380fa73103003c SHA512 99efb1f1ca2111feb06c482d24dbb6f405c9faf8adafbc4e8166500c65d45348ee1bb24b3959a0b9a53734750a4bb1f5a26685dfc78368622641492ab1c75660
-MISC metadata.xml 779 BLAKE2B 19493a6cd2565e5d57d94f9d5338bbdf3f83ffca4e9b0c9e661d67ab3ee3df47d3ac5bc39b8c2104ecee651b44e31d492c250c15df72f2783d51f4adf88ef047 SHA512 0fe7810189a7730edb63cc8ba48d398c397cff63a8cc570f2b1db1dbd0bbe06c64d2dc517ec9221ffd85de7736411a72597c940d3a38f18a434b858b00196449
+MISC metadata.xml 880 BLAKE2B f1274ace74e6e9497162ec76ef8abf31f412d839f3cb2095a31a8f69bade977dfd42d75aaf1c976b6b2eaeb82347f5cc1f46cbaacdea9ffc10939e9dcd270d7a SHA512 6a904754515fcb0994e7908467615267cdc67f872241c4159870051936f244af1a773e806d894fba070c3367a9c016f49a3c72b22c83e47baf51fabe074ec35c
diff --git a/dev-python/pandas-datareader/metadata.xml b/dev-python/pandas-datareader/metadata.xml
index 82df29caa4df..c824e7cd3610 100644
--- a/dev-python/pandas-datareader/metadata.xml
+++ b/dev-python/pandas-datareader/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Up to date remote data access for pandas, which works for multiple versions of
 		pandas and lets you extract data from a wide range of Internet sources directly
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index c1df22ab8f8c..129a870d4258 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,6 +1,6 @@
 AUX pandas-1.4.0-distutils-hack-assertion.patch 439 BLAKE2B 6753d2a86071109b586a0ea957acb2db1d394bed2a6ad0ede53d7ae4bce81e034ba8e929611aae701cc51ab8d9ef95c8c2d608ad3f9def16aed6fc5ae237fb68 SHA512 04a3644dbc5d07859fea162877a528124b8b0af8288464dc86c394675006710f73653af58ad188d3d628c356c66c201190dbc6d3e77c9d9d0a3b2f4c758e014b
-DIST pandas-1.4.1.tar.gz 4941369 BLAKE2B ce85253b32c3be6baad74e2bca98d24b43f42c311ffad128615b711e461a76067035e238cf1693eed12d4ca8e354aef56f711e45cd934a4af6222f4727838b1e SHA512 2d8ba8f3152b5bd5495e406ce21d896342ef77473ed3c0207f77b6503c3f4353bbeb5ec573696eb6748e65e956d9d1b97d314a136104151ecb5ba822afa72422
 DIST pandas-1.4.2.tar.gz 4940242 BLAKE2B b44c9e46458b4e2919b2d215c8678601ef0976118197172ddc74fa712cf07b02cdb09b79940e90bf6907a45e7e3c63615292f7141a4fb8ed4ae22a36decd1e39 SHA512 6406241e30e9ed386610dd90bbb7407cfe3e94ff20c8fd1241aa75288894666f06e59f7c74b5f916080a3745254ba22ec9dad1195f040b613639b5712aced571
-EBUILD pandas-1.4.1.ebuild 6289 BLAKE2B 65cea796ac18b0a0599a2ef6b222bf48e2e8ac968b9f62424e5092df4bbc6ce1f84e8ea259be38ec7c32b0b414eb23622990f04e5f3ea8bb5e1066f0b867dbff SHA512 072c72cb0c109e2e364fa5f1fe2aa0f7567ca76245cd1e1c323a43ad6ed923b19e5806e18e771a15208e4ac931c24904c062c27e6d93a9484715287a4622fc69
-EBUILD pandas-1.4.2.ebuild 6552 BLAKE2B b1fc02c67efd7260dc6c3a0894f127e09ac2bab39d212e7bb5f393debc27fd63095621bd8cd8a676ddd641e334db22bebdf32542ce978289d7f973f756e2debc SHA512 a83c9ae7ad3fa2fa7d4e791489c63d9003928b6504133c9fba8aae7f417324bac84da67204a1c2d0c01aea999b0dc1560946386256b253e37cfe48cc74443996
+DIST pandas-1.4.3.tar.gz 4941520 BLAKE2B b134f7c04c2478b7105214ed62e9adcaed98ffb4179a785f7887850d66702bf0f185d60a3da6de6226742529008bac614b494453dca929e477960ff3b43ef93d SHA512 d8d7575ce2b813361641d4e438844e03ed79179f5dcc56f2e4923bfeceab6f825a9bcc419e9492ee5e0272ea7c9bb9eeab6a0e242a880a87999df2a492436d8e
+EBUILD pandas-1.4.2.ebuild 6549 BLAKE2B 06dc9e22e7147b81d555cc60a7bd7d8d0d7ed2895ecf951a9fc433a35013a48c7ff4808739656ed3ad57414f8f3525e6e1b13a334132cccec836a3522673218d SHA512 6378a9d969373d46e215459ae300cfd5d9d394177ae76dfc350ed2006892c470854175b0eff4d7a694c09a4b605de6040c3eeb08ba7592e147dfbc7e58d66478
+EBUILD pandas-1.4.3.ebuild 6421 BLAKE2B 475c95e4af32fd45c9502840b0375c2f6fd96a17f819301e1d125d1701d00b84fdc011fd997a3aea4b50c3aafb06550c35ff3b3281651260a75bc08fed9f6af2 SHA512 e993eafcbe4dee5ab0b7e8b241d887a6e0c81b65d1b0ecefeaa3f348115b72f4d0b9bea774f00cf72dcff3ffe250d0743dd140d8b960b021d95fb6379cfe0c2e
 MISC metadata.xml 918 BLAKE2B 09b6ef472cbceaade61bfec8780ba3659838cd73f0a19b277d731db75655ac7e65d396f9fa74c19a2d5e03269c541dfe2af59296c048e77744f00bdb55295d4d SHA512 0b1fd089b0ce35a4e3408cd7224a249d427571a638961a8d63dee73b386d03b5a22e4ff085e2e548749f9fc03e9beb18317010d0b67f608dafe305bb4a87ddb2
diff --git a/dev-python/pandas/pandas-1.4.1.ebuild b/dev-python/pandas/pandas-1.4.1.ebuild
deleted file mode 100644
index 4bec3853ef04..000000000000
--- a/dev-python/pandas/pandas-1.4.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-VIRTUALX_REQUIRED="manual"
-
-inherit distutils-r1 multiprocessing optfeature virtualx
-
-DESCRIPTION="Powerful data structures for data analysis and statistics"
-HOMEPAGE="https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/"
-SRC_URI="
-	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc full-support minimal test X"
-RESTRICT="!test? ( test )"
-
-RECOMMENDED_DEPEND="
-	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
-"
-
-# TODO: add pandas-gbq to the tree
-OPTIONAL_DEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/blosc[${PYTHON_USEDEP}]
-	|| (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	|| (
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
-	!hppa? (
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-	)
-	X? (
-		|| (
-			dev-python/PyQt5[${PYTHON_USEDEP}]
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-COMMON_DEPEND="
-	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
-	doc? (
-		${VIRTUALX_DEPEND}
-		app-text/pandoc
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/nbsphinx[${PYTHON_USEDEP}]
-		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xlrd[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		x11-misc/xclip
-	)
-	test? (
-		${VIRTUALX_DEPEND}
-		${RECOMMENDED_DEPEND}
-		${OPTIONAL_DEPEND}
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
-		dev-python/openpyxl[${PYTHON_USEDEP}]
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		dev-python/xlsxwriter[${PYTHON_USEDEP}]
-		x11-misc/xclip
-		x11-misc/xsel
-	)
-"
-# dev-python/statsmodels invokes a circular dep
-#  hence rm from doc? ( ), again
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( ${RECOMMENDED_DEPEND} )
-	full-support? ( ${OPTIONAL_DEPEND} )
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/pandas-dev/pandas/issues/44980
-		"${FILESDIR}"/pandas-1.4.0-distutils-hack-assertion.patch
-	)
-
-	# Prevent un-needed download during build
-	sed -e "/^              'sphinx.ext.intersphinx',/d" \
-		-i doc/source/conf.py || die
-
-	# requires package installed
-	sed -e '/extra_compile_args =/s:"-Werror"::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile -j1
-}
-
-python_compile_all() {
-	# To build docs the need be located in $BUILD_DIR,
-	# else PYTHONPATH points to unusable modules.
-	if use doc; then
-		cd "${BUILD_DIR}"/lib || die
-		cp -ar "${S}"/doc . && cd doc || die
-		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# test for rounding errors, fails if we have better precision
-		# e.g. on amd64 with FMA or on arm64
-		# https://github.com/pandas-dev/pandas/issues/38921
-		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
-
-		# TODO
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
-		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
-	)
-
-	local -x LC_ALL=C.UTF-8
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
-	epytest pandas --skip-slow --skip-network -m "not single" \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
-		einfo "An initial build of docs is absent of references to statsmodels"
-		einfo "due to circular dependency. To have them included, emerge"
-		einfo "statsmodels next and re-emerge pandas with USE doc"
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
-	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
-	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
-	optfeature "for msgpack compression using blosc" dev-python/blosc
-	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
-	optfeature "Plotting support" dev-python/matplotlib
-	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
-	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
-	optfeature "R I/O support" dev-python/rpy
-	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
-	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
-	optfeature "miscellaneous statistical functions" dev-python/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
-}
diff --git a/dev-python/pandas/pandas-1.4.2.ebuild b/dev-python/pandas/pandas-1.4.2.ebuild
index 25f0024b0fed..f362265d293d 100644
--- a/dev-python/pandas/pandas-1.4.2.ebuild
+++ b/dev-python/pandas/pandas-1.4.2.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-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="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandas/pandas-1.4.3.ebuild b/dev-python/pandas/pandas-1.4.3.ebuild
new file mode 100644
index 000000000000..6c9f4d057959
--- /dev/null
+++ b/dev-python/pandas/pandas-1.4.3.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/
+	https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!hppa? (
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/cython-0.29.24[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
+
+		# TODO: these require a running db server
+		pandas/tests/io/test_sql.py::TestMySQLAlchemy
+		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
+	)
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	epytest pandas --skip-slow --skip-network -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index 0655c3be5c06..e160136b8cfb 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,3 +1,4 @@
+AUX parameterized-0.8.1-nose-to-pytest.patch 3745 BLAKE2B 739bc6c813254e3616ffa3b7fb5c057cac41df1b9d8b076a0fb570d6908e7bd740f90875add4ab6bd265f60087a396434b8641bdc75e5108afc1c790d852132d SHA512 e7e65482f15f5fb3cfba9d7dd3f66755919ab6bf7464812cfa8636bfe0c0d409576d05a0d0e7ada79e4aa1c595507b0b7c12ad13c211b9f8decb7bccfc24833f
 DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
-EBUILD parameterized-0.8.1-r1.ebuild 585 BLAKE2B ec6849c07af0f1678555730f68fd0098ee8812586f38ee93b57985663783c779be70d6166e051d242193242cd5ed2e688f484c36ec4ca7500cc7337825b33419 SHA512 7273afe5f5a750786b973399c7b093885d89eec43178f2bf9a0ae6f55176e04031306a39b4aa78ae5f12300c4d5fb4980bc3d2cbb2429b23b506fee3135581d8
-MISC metadata.xml 318 BLAKE2B dd75a28765343d56c2a8b29bedc13e347e9357dff3b2533ba98794a9734d71b1a1779d005077a5cc827407ceadf617abee16ea8e140f58358faf40f4ab9d6d51 SHA512 363278e4c6b8fc56a8f3290dbd6814721e14f768339a0c5cf23665162d9e268db7b57df364d63500e9b6269e146733d405092c36bd74cb6907042f8488bc39c3
+EBUILD parameterized-0.8.1-r2.ebuild 691 BLAKE2B 916f4274b4558945f2bbbc0c363b3e5c16792d2a6a8490df056906becdb8772becfba0dccb1d958df18b269fc21eab623c733bb64ceaa366a0debae9b7b76d0f SHA512 dc86cf31ab1645d8b22b494defe338623e1e4c65b4bce5830373b659053e45212a94ea2a81b201b212618ab81a77b7690f958dd20b15867de9f174d1ecc288d6
+MISC metadata.xml 419 BLAKE2B 11205a56739c16da842d2351a75ec9c66efcb0609dcf96f9c42c49d92026c83e6f57b79137efbd349680f0c58a085d17d0262ccd5bdd373b6b93cbefe40de5b1 SHA512 50416bb191c1a07ce64655ca3f289e9d94d12cf14d493b262efc01fe16d6d0951c199ff57812511aa547c4cd287a257d184dbf4b424938cf6d3ea10e96dd5641
diff --git a/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch b/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch
new file mode 100644
index 000000000000..45b86d8a13af
--- /dev/null
+++ b/dev-python/parameterized/files/parameterized-0.8.1-nose-to-pytest.patch
@@ -0,0 +1,101 @@
+diff --git a/parameterized/test.py b/parameterized/test.py
+index f98d865..ede7689 100644
+--- a/parameterized/test.py
++++ b/parameterized/test.py
+@@ -2,8 +2,8 @@
+ 
+ import inspect
+ import mock
++import pytest
+ from unittest import TestCase
+-from nose.tools import assert_equal, assert_raises
+ 
+ from .parameterized import (
+     PY3, PY2, parameterized, param, parameterized_argument_value_pairs,
+@@ -91,7 +91,7 @@ if not PYTEST:
+ 
+         @parameterized([(1, ), (2, )])
+         def test_setup(self, count, *a):
+-            assert_equal(self.actual_order, "setup %s" %(count, ))
++            assert self.actual_order == "setup %s" %(count, )
+             missing_tests.remove("test_setup(%s)" %(self.actual_order, ))
+ 
+ 
+@@ -235,9 +235,9 @@ class TestParamerizedOnTestCase(TestCase):
+         frame_locals = frame[0].f_locals
+         nose_test_method_name = frame_locals['a'][0]._testMethodName
+         expected_name = "test_on_TestCase2_custom_name_" + str(foo)
+-        assert_equal(nose_test_method_name, expected_name,
+-                     "Test Method name '%s' did not get customized to expected: '%s'" %
+-                     (nose_test_method_name, expected_name))
++        assert nose_test_method_name == expected_name, \
++                     "Test Method name '%s' did not get customized to expected: '%s'" % \
++                     (nose_test_method_name, expected_name)
+         missing_tests.remove("%s(%r, bar=%r)" %(expected_name, foo, bar))
+ 
+ 
+@@ -259,7 +259,7 @@ class TestParameterizedExpandDocstring(TestCase):
+         actual_docstring = test_method.__doc__
+         if rstrip:
+             actual_docstring = actual_docstring.rstrip()
+-        assert_equal(actual_docstring, expected_docstring)
++        assert actual_docstring == expected_docstring
+ 
+     @parameterized.expand([param("foo")],
+                           doc_func=lambda f, n, p: "stuff")
+@@ -335,7 +335,7 @@ def test_helpful_error_on_empty_iterable_input():
+ 
+ def test_skip_test_on_empty_iterable():
+     func = parameterized([], skip_on_empty=True)(lambda: None)
+-    assert_raises(SkipTest, func)
++    pytest.raises(SkipTest, func)
+ 
+ 
+ def test_helpful_error_on_empty_iterable_input_expand():
+@@ -366,10 +366,6 @@ def test_helpful_error_on_non_iterable_input():
+         raise AssertionError("Expected exception not raised")
+ 
+ 
+-def tearDownModule():
+-    missing = sorted(list(missing_tests))
+-    assert_equal(missing, [])
+-
+ def test_old_style_classes():
+     if PY3:
+         raise SkipTest("Py3 doesn't have old-style classes")
+@@ -418,7 +414,7 @@ class TestOldStyleClass:
+ def test_parameterized_argument_value_pairs(func_params, p, expected):
+     helper = eval("lambda %s: None" %(func_params, ))
+     actual = parameterized_argument_value_pairs(helper, p)
+-    assert_equal(actual, expected)
++    assert actual == expected
+ 
+ 
+ @parameterized([
+@@ -428,7 +424,7 @@ def test_parameterized_argument_value_pairs(func_params, p, expected):
+     (123456789, "12...89", 4),
+ ])
+ def test_short_repr(input, expected, n=6):
+-    assert_equal(short_repr(input, n=n), expected)
++    assert short_repr(input, n=n) == expected
+ 
+ @parameterized([
+     ("foo", ),
+@@ -442,7 +438,7 @@ cases_over_10 = [(i, i+1) for i in range(11)]
+ 
+ @parameterized(cases_over_10)
+ def test_cases_over_10(input, expected):
+-    assert_equal(input, expected-1)
++    assert input == expected-1
+ 
+ 
+ @parameterized_class(("a", "b", "c"), [
+@@ -461,7 +457,7 @@ class TestParameterizedClass(TestCase):
+ 
+     def _assertions(self, test_name):
+         assert hasattr(self, "a")
+-        assert_equal(self.b + self.c, 3)
++        assert self.b + self.c == 3
+         missing_tests.remove("%s:%s(%r, %r, %r)" %(
+             self.__class__.__name__,
+             test_name,
diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml
index d046902715bb..4ee6d8ce9ff4 100644
--- a/dev-python/parameterized/metadata.xml
+++ b/dev-python/parameterized/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">parameterized</remote-id>
diff --git a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild b/dev-python/parameterized/parameterized-0.8.1-r1.ebuild
deleted file mode 100644
index e5377e43bf39..000000000000
--- a/dev-python/parameterized/parameterized-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/parameterized/parameterized-0.8.1-r2.ebuild b/dev-python/parameterized/parameterized-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..8c781e672213
--- /dev/null
+++ b/dev-python/parameterized/parameterized-0.8.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Parameterized testing with any Python test framework"
+HOMEPAGE="https://github.com/wolever/parameterized/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-nose-to-pytest.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest parameterized/test.py
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 972ef1777f2c..a957b3f82de7 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,7 +1,6 @@
+AUX paramiko-2.11.0-invoke-tests.patch 1175 BLAKE2B 1ac310c2721b2366db7d5b2bdfa77058ebe820fba7f0c0faeb6a5ceb97621a1d2c1207109053f7b9d5a17b8b2084908afd9a3ab2ef0c6e76fd7bb94d5b439eed SHA512 bb3c7781aaa4b201d9c2f963f54aac0c76d7918c782f48981a108de7173d1db77dc42c24806bdde12b378186887922cad02504a7695b83f3cb25e9ff84ab9cd1
+AUX paramiko-2.11.0-pytest-relaxed.patch 3354 BLAKE2B 19326d3dbf4c3870dcdaeff0d9827a09894a44be2941a23f6ca7e3d8c05560b1ffa150d38e44301d9722948135a4b82a76cea16d5cfb8f8e3bcaa41bc842561c SHA512 98d508334f6d0ca3aae94a24bcc95bb9f3cfbf895b0f647896298f85ccb14e0868f948610d5e40a738d17d26fababe26a296d6acd3678c21e9351431ca3d6790
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
-AUX paramiko-2.7.1-tests.patch 4119 BLAKE2B 516417ae1b3ee7a5d189defaf37a397045ed0172948adf1a09534a697606a2ea1636e849d6d2989f29a287bc307a33530a7fb8135a57040da915047fba1f1d31 SHA512 ecd247dc00898c577b9b1cea0316b29c1be0c5e46865bf4f4508392fc2ca6e2d4c2a1938aa74f07dbe94bfbfa37f80129226ef1f1688a7449fc29ca99264c829
-DIST paramiko-2.10.3.tar.gz 347738 BLAKE2B ccc66a7e0fe3f777e74b94374ed59435eda440fe0aeab3871e68a132610193d2fadca1fd200db3d194566b8a2a8d6ff889d71594fed69a01fb97ca43b967e957 SHA512 e1fce2ad33ee2942b519458d53497671e66d4777c23877954b135cf9bb8ec43357156147c7e012956ccf6198de800835a617b541a4b0faf54df00f936128514b
-DIST paramiko-2.10.4.tar.gz 348637 BLAKE2B 8ce0d34418b6a1dc1d98fc180d2b2f0fb4333b7e1c52fcf7edabc3b0fc096f1b644dbc21a5b37f9001f046969c3d513ad5f6d7261339a71fa3ec922161cd7be7 SHA512 df39958e647dd6519929f68c4870228a61f54e763751e6b1d07b5e802786c85dfc34af39588009e729c4d189ca17d3aa09a58d4242403a1a1a53d36f6cd313b1
-EBUILD paramiko-2.10.3.ebuild 1328 BLAKE2B 027affeae6b512f11a8a0099964ee47b87da3e9fe9b7f11ec2c356c1329805e6ae1f20f8906446d5fd94b8f346a3ba2fb3020d8c6ece93fc20a350f91add9f73 SHA512 274d7704847af9b1e070449d865aa81c004c522f7b01fe7ec9e31626b8cc6defeebb214e301360f3fdc933fd6285c21c20e9255281aa5e31987706f93efd7e49
-EBUILD paramiko-2.10.4.ebuild 1335 BLAKE2B a00ca07b71567c67f89e2dcffc20fd22a708d0f95862d2e524cc5226bf84e1a3c4065c1dffe4c2f7c8cbbd0bb47a6504acf9865162a55f0881834c0cf3676ad6 SHA512 ab7f4680357ba5e20002609685ba56a963b838e62d420a4a6c94777b3a62e236dcc4dc369d3969c0c24ced9e88ecdec659724787877f967dfdf6a422c1e548ce
-MISC metadata.xml 1332 BLAKE2B 2254eb59425633af43d092c6cc5ff99de6da52918692f6c23c31627587c956fa4b2cd2117ad899a423d93bb1d321581891f3380301a6b44a498978aa9a710094 SHA512 dcbd15823763fd67164a4d77995a7aa16486cbbd747276991cc805a9e6fa28752c273d373a85b3f52eab10f809cf9af60a3afc1ed7bf1ac3121eebeb071e3e23
+DIST paramiko-2.11.0.tar.gz 350793 BLAKE2B 86358e08407f8a820a9b33a60e771ac3adb8f3e003ccbc4704ba69a52bd427f38a9c49a20e6a07220d07c25dbcc35a472b2091fa9f7bc1447bab0d7a1ce16b35 SHA512 59e439bd54d83938f91d6c9888f2278bafa4ca48582939580bdabc6207dbe6dc856f6006ad26b7ec91b9d39e92ca70dc6270c6b5d4f77a5e1fa0ec8bd084d4b5
+EBUILD paramiko-2.11.0.ebuild 1367 BLAKE2B 09833fc4293b0065c9339798e84e27ba3b97b25fe0eff3a2485d811c776f5c39f51eff34aac21bf3bfa3c6d8939a2bded9889c903476f5b91ed55d4e66e29164 SHA512 ca5481ab2b72f6af4464d6fb3acb478331b899817af54c5eeee369fb47cbef68e508374d1875fe04caf75a17747751cc8075c84eabb55074bbac2289b2034ddf
+MISC metadata.xml 1218 BLAKE2B 9173c01a0d0b5a37d3fb79568d9a4bd3dd6eb03d33ef7a03442761a106991f033f71d68ffb1cd3902519060a627ef7f80f998e7499fd8f2a97ced9330a7c7311 SHA512 d53cbc8f43218893f7cf8bd0d2b05dff76ce1a0a17b54e9ad8e43d12b4f6b64f3d3874ac848b0d46c3460b3c57b2197c78b4c9ee41a88e29ef224d76b376cb26
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
new file mode 100644
index 000000000000..80fe876ef8e3
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.11.0-invoke-tests.patch
@@ -0,0 +1,40 @@
+From 529558cc20e448e45e24dc7b7609cd62300838b8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 16 Apr 2020 09:46:39 +0200
+Subject: [PATCH] Skip tests requiring invoke if it's not installed
+
+Since invoke is an optional dependency and only one group of tests
+require it, skip them gracefully rather than failing if it's not
+present.
+---
+ tests/test_config.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 45fb262d..017d4bbf 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -6,7 +6,11 @@ from socket import gaierror
+ 
+ from paramiko.py3compat import string_types
+ 
+-from invoke import Result
++try:
++    from invoke import Result
++except ImportError:
++    Result = None
++
+ from mock import patch
+ from pytest import raises, mark, fixture
+ 
+@@ -742,6 +746,7 @@ def _expect(success_on):
+     return inner
+ 
+ 
++@mark.skipif(Result is None, reason="requires invoke package")
+ class TestMatchExec(object):
+     @patch("paramiko.config.invoke", new=None)
+     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
+-- 
+2.35.1
+
diff --git a/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
new file mode 100644
index 000000000000..6e746aff1863
--- /dev/null
+++ b/dev-python/paramiko/files/paramiko-2.11.0-pytest-relaxed.patch
@@ -0,0 +1,94 @@
+From 03741e48c83856e53fc3f1487d660165cb718c11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 17 May 2022 07:26:36 +0200
+Subject: [PATCH] Replace pytest-relaxed with plain pytest.raises
+
+There is really no technical reason to bring pytest-relaxed to call
+@raises as a decorator while plain pytest works just fine.  Plus,
+pytest.raises() is used in test_sftp already.
+
+pytest-relaxed causes humongous breakage to other packages
+on the system.  It has been banned from Gentoo for this reason.
+---
+ dev-requirements.txt |  1 -
+ pytest.ini           |  3 ---
+ tests/test_client.py | 20 ++++++++++----------
+ 3 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/dev-requirements.txt b/dev-requirements.txt
+index 3ed9eb40..e90f3373 100644
+--- a/dev-requirements.txt
++++ b/dev-requirements.txt
+@@ -2,7 +2,6 @@
+ invoke==1.6.0
+ invocations==2.6.0
+ pytest==4.4.2
+-pytest-relaxed==1.1.5
+ # pytest-xdist for test dir watching and the inv guard task
+ pytest-xdist==1.28.0
+ mock==2.0.0
+diff --git a/pytest.ini b/pytest.ini
+index be207cd8..5a506bcd 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,7 +1,4 @@
+ [pytest]
+-# We use pytest-relaxed just for its utils at the moment, so disable it at the
+-# plugin level until we adapt test organization to really use it.
+-addopts = -p no:relaxed
+ # Loop on failure
+ looponfailroots = tests paramiko
+ # Ignore some warnings we cannot easily handle.
+diff --git a/tests/test_client.py b/tests/test_client.py
+index fdf19c45..e4af71df 100644
+--- a/tests/test_client.py
++++ b/tests/test_client.py
+@@ -33,7 +33,7 @@ import warnings
+ import weakref
+ from tempfile import mkstemp
+ 
+-from pytest_relaxed import raises
++import pytest
+ from mock import patch, Mock
+ 
+ import paramiko
+@@ -733,11 +733,11 @@ class PasswordPassphraseTests(ClientTest):
+ 
+     # TODO: more granular exception pending #387; should be signaling "no auth
+     # methods available" because no key and no password
+-    @raises(SSHException)
+     @requires_sha1_signing
+     def test_passphrase_kwarg_not_used_for_password_auth(self):
+-        # Using the "right" password in the "wrong" field shouldn't work.
+-        self._test_connection(passphrase="pygmalion")
++        with pytest.raises(SSHException):
++            # Using the "right" password in the "wrong" field shouldn't work.
++            self._test_connection(passphrase="pygmalion")
+ 
+     @requires_sha1_signing
+     def test_passphrase_kwarg_used_for_key_passphrase(self):
+@@ -757,15 +757,15 @@ class PasswordPassphraseTests(ClientTest):
+             password="television",
+         )
+ 
+-    @raises(AuthenticationException)  # TODO: more granular
+     @requires_sha1_signing
+     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
+         self
+     ):
+         # Sanity: if we're given both fields, the password field is NOT used as
+         # a passphrase.
+-        self._test_connection(
+-            key_filename=_support("test_rsa_password.key"),
+-            password="television",
+-            passphrase="wat? lol no",
+-        )
++        with pytest.raises(AuthenticationException):
++            self._test_connection(
++                key_filename=_support("test_rsa_password.key"),
++                password="television",
++                passphrase="wat? lol no",
++            )
+-- 
+2.35.1
+
diff --git a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch b/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
deleted file mode 100644
index a25b7c24ef27..000000000000
--- a/dev-python/paramiko/files/paramiko-2.7.1-tests.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From e91cac80d679dfe16897988b0c14c1293a93c805 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:22:59 +0200
-Subject: [PATCH 1/2] Replace pytest-relaxed with plain pytest.raises
-
-There is really no technical reason to bring pytest-relaxed to call
-@raises as a decorator while plain pytest works just fine.  Plus,
-pytest.raises() is used in test_sftp already.
-
-pytest-relaxed causes humongous breakage to other packages
-on the system.  It has been banned from Gentoo for this reason.
----
- dev-requirements.txt |  1 -
- setup.cfg            |  3 ---
- tests/test_client.py | 20 ++++++++++----------
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/dev-requirements.txt b/dev-requirements.txt
-index f4f84748..b1b0cdf5 100644
---- a/dev-requirements.txt
-+++ b/dev-requirements.txt
-@@ -2,7 +2,6 @@
- invoke>=1.0,<2.0
- invocations>=1.2.0,<2.0
- pytest==4.4.2
--pytest-relaxed==1.1.5
- # pytest-xdist for test dir watching and the inv guard task
- pytest-xdist==1.28.0
- mock==2.0.0
-diff --git a/tests/test_client.py b/tests/test_client.py
-index 60ad310c..88fd1d53 100644
---- a/tests/test_client.py
-+++ b/tests/test_client.py
-@@ -33,7 +33,7 @@ import warnings
- import weakref
- from tempfile import mkstemp
- 
--from pytest_relaxed import raises
-+import pytest
- from mock import patch, Mock
- 
- import paramiko
-@@ -684,10 +684,10 @@ class PasswordPassphraseTests(ClientTest):
- 
-     # TODO: more granular exception pending #387; should be signaling "no auth
-     # methods available" because no key and no password
--    @raises(SSHException)
-     def test_passphrase_kwarg_not_used_for_password_auth(self):
--        # Using the "right" password in the "wrong" field shouldn't work.
--        self._test_connection(passphrase="pygmalion")
-+        with pytest.raises(SSHException):
-+            # Using the "right" password in the "wrong" field shouldn't work.
-+            self._test_connection(passphrase="pygmalion")
- 
-     def test_passphrase_kwarg_used_for_key_passphrase(self):
-         # Straightforward again, with new passphrase kwarg.
-@@ -705,14 +705,14 @@ class PasswordPassphraseTests(ClientTest):
-             password="television",
-         )
- 
--    @raises(AuthenticationException)  # TODO: more granular
-     def test_password_kwarg_not_used_for_passphrase_when_passphrase_kwarg_given(  # noqa
-         self
-     ):
-         # Sanity: if we're given both fields, the password field is NOT used as
-         # a passphrase.
--        self._test_connection(
--            key_filename=_support("test_rsa_password.key"),
--            password="television",
--            passphrase="wat? lol no",
--        )
-+        with pytest.raises(AuthenticationException):
-+            self._test_connection(
-+                key_filename=_support("test_rsa_password.key"),
-+                password="television",
-+                passphrase="wat? lol no",
-+            )
--- 
-2.26.1
-
-From af228a2d950654ccdd4a5d665da0018bd976c108 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 16 Apr 2020 09:46:39 +0200
-Subject: [PATCH 2/2] Skip tests requiring invoke if it's not installed
-
-Since invoke is an optional dependency and only one group of tests
-require it, skip them gracefully rather than failing if it's not
-present.
----
- tests/test_config.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_config.py b/tests/test_config.py
-index 5e9aa059..5eeaeac3 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -6,7 +6,11 @@ from socket import gaierror
- 
- from paramiko.py3compat import string_types
- 
--from invoke import Result
-+try:
-+    from invoke import Result
-+except ImportError:
-+    Result = None
-+
- from mock import patch
- from pytest import raises, mark, fixture
- 
-@@ -705,6 +709,7 @@ def _expect(success_on):
-     return inner
- 
- 
-+@mark.skipif(Result is None, reason='requires invoke package')
- class TestMatchExec(object):
-     @patch("paramiko.config.invoke", new=None)
-     @patch("paramiko.config.invoke_import_error", new=ImportError("meh"))
--- 
-2.26.1
-
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index 7c7d0ca7ee68..05fe0aaee56e 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -5,10 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person">
-    <email>alicef@gentoo.org</email>
-    <name>Alice Ferrazzi</name>
-  </maintainer>
   <longdescription>
 This is a library for making SSH2 connections (client or server).
 Emphasis is on using SSH2 as an alternative to SSL for making secure
diff --git a/dev-python/paramiko/paramiko-2.10.3.ebuild b/dev-python/paramiko/paramiko-2.10.3.ebuild
deleted file mode 100644
index 01fc4e263788..000000000000
--- a/dev-python/paramiko/paramiko-2.10.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/"
-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}]
-	dev-python/six[${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/paramiko/paramiko-2.10.4.ebuild b/dev-python/paramiko/paramiko-2.10.4.ebuild
deleted file mode 100644
index 6f8a297919b6..000000000000
--- a/dev-python/paramiko/paramiko-2.10.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/"
-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}]
-	dev-python/six[${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/paramiko/paramiko-2.11.0.ebuild b/dev-python/paramiko/paramiko-2.11.0.ebuild
new file mode 100644
index 000000000000..88f1f1aa6d93
--- /dev/null
+++ b/dev-python/paramiko/paramiko-2.11.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+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/
+"
+SRC_URI="
+	https://github.com/paramiko/paramiko/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}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-2.11.0-pytest-relaxed.patch"
+		"${FILESDIR}/${PN}-2.11.0-invoke-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/parse/Manifest b/dev-python/parse/Manifest
index 4dc517b38230..cec21256fc55 100644
--- a/dev-python/parse/Manifest
+++ b/dev-python/parse/Manifest
@@ -1,3 +1,3 @@
 DIST parse-1.19.0.tar.gz 30884 BLAKE2B 97f0d1fb7f1d2d826f20df592a61bc94e65ea583ba651d4ddf18b3ffb21d977444c2a3a0e75ba9138d2bae48668456d1ac56d50d05d4b8ed7721733f3bda59f2 SHA512 25e183949a78213e699c319f5dcf1b2664ea6cfcfae4b9eb8dcaf1825e55dcb2ce2032f9eb630e962acf2d94588d4f4b8cf340af1075cbab5ab44aed5377ef6f
-EBUILD parse-1.19.0.ebuild 429 BLAKE2B 1bc183c4f2690584460e376c6248aae50b4ed7c5a767d6aae120ecd65e1508e4b76e8ec8595a13cfc649c3119c6825475da78986c92d4924fc10083f61cc09b7 SHA512 c654c2485ceda449ced84f3bfb6fe56254f6e78e765e571adb3014a956ea76e2b00c0bb8c86cbf4c0370df5ca9b309e78a1adc76450e4a1c0bffc4adc5793a86
+EBUILD parse-1.19.0-r1.ebuild 466 BLAKE2B 87298882a84cf63f91f20a4856197ce87ace7c97a6aac298d5fe45ce46429c2d1ba88ba5472f204311e718f6c3064dd22ba78410a0bcbc7d3526d95ff06967a1 SHA512 f76570522eef1ed30e823dda8da3c609ebc2e6867f78983e0843ce7c8a252dbe173587a97215f28e6b8a7b9aaf3117adad3369729f669df65effcaaa10b4f3f0
 MISC metadata.xml 396 BLAKE2B 42ba6e57fc13212435a73e964b285263bcf59113036917323c9d1f8f9b7a6c2154026023f8f5e5860ea883756f0faf374330eab21492f023aacfcef2e0e59a78 SHA512 b3c05ef4031f719e4349f165a9457d1fefb6bcd39167e99d1ccbe2a7c72b14b1541c16f4cdd334f670fe46c8c5a88ff875e8f57d33cdb6b85cab0fc7fae6b750
diff --git a/dev-python/parse/parse-1.19.0-r1.ebuild b/dev-python/parse/parse-1.19.0-r1.ebuild
new file mode 100644
index 000000000000..47663cbb6a34
--- /dev/null
+++ b/dev-python/parse/parse-1.19.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
+HOMEPAGE="https://pypi.org/project/parse/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/parse/parse-1.19.0.ebuild b/dev-python/parse/parse-1.19.0.ebuild
deleted file mode 100644
index 4aad51748837..000000000000
--- a/dev-python/parse/parse-1.19.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
-HOMEPAGE="https://pypi.org/project/parse/"
-SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/parse_type/Manifest b/dev-python/parse_type/Manifest
index 3e0416025d55..f5532d19853d 100644
--- a/dev-python/parse_type/Manifest
+++ b/dev-python/parse_type/Manifest
@@ -1,4 +1,4 @@
 AUX parse_type-0.6.0-setupwarn.patch 127 BLAKE2B 855edba7ee9af98889adbf1ccdcedcb98f0132b8fc1655b78acfe3c42ff57cfc244a525feb4b07dc40d3fd116533fab57f671fa5c5097cbcb4249fe86e2191d4 SHA512 b3005fa307ebda056484087ec7103d051b770316e46e46d6a1956288d417fd6c14fee76923ed9d20eb735f9ae426c5748db8ee3b6d6fc880ca3a120fbade597e
-DIST parse_type-0.6.0.tar.gz 270864 BLAKE2B 776e58bb7027bf33bd47f266296f29b0e04d94911a91b2962d644671517659839e8a0600b4424076f5f6775a4c9db27774195d8dce908eac61fcf59377dcdbc4 SHA512 ace12b013306d5d330ffecca2f929667169da24b6593f86c13820ff34628fb00ef045c37f5c8b6ddc1094d5a8ed6fb929918871b1d0493ef6719d2bb3d2293de
-EBUILD parse_type-0.6.0.ebuild 821 BLAKE2B ed2817bebca409e40df2ed21667c8d954b75208a316bc064474d59eb615ef08f9e6362853b60b07f8cfad727acd404fc290539fbecf2b0ca040ae3beb3d6a7aa SHA512 26ea23fa82af1695daf940068acb61f4a36d046cb455a2f26f0b1cd4d3e462a20d93f327961a7676f5b0c123e2b06e55d9f649f39f161a31367f054928cc2daa
+DIST parse_type-0.6.0.gh.tar.gz 272744 BLAKE2B fdba57380bfbefa43793338ddd1dfc618d15036c8e78adfbccd993156c77d59f30c2351b1dba826bdc41de12ab3e403102124fe85a462f3fbb6fb915885fb026 SHA512 cbe2c8d2bac567cb89b600ef4b0fb5e65c5afdb8e83c3da01cf0b80ce40630c6fb0e1156e352f8b64d5b6d69555126edfbd3f48c6482f7fe8cfb79fcff8ac5b7
+EBUILD parse_type-0.6.0.ebuild 824 BLAKE2B 1e04eefffd9818277f92573cbf51f7fbafdfc160e82bbf19de6bf131118d796eba5aa1ae71c391d9f82672caba944d202f0bd0b88990d069b4657dcabbab6346 SHA512 7b43e647cfc1e2d9ceee720e70a5ef056f9b65f0972eb3bb4aa2c6287b204e59d84a5e3719e1da96a1e470f0af35b289a9a9c771f71169d4c0d3afd047b32a23
 MISC metadata.xml 401 BLAKE2B 38e88a68d1271796b0e160ca4266b0d35c135aebb3ae4c88ea609ebfc2407a2b8cd7332bcb4adc0ffb2188259d4bd41eaf22d53d0eaf1947078fcb253835e6de SHA512 ead81a56944702a5b717e6c1b909cc81ecc68194a08586a52ef5b46b533dd34ecdce1f8da098f6967e705c74cceb92c026b717f96056ac35f70134c8e1e5bfa3
diff --git a/dev-python/parse_type/parse_type-0.6.0.ebuild b/dev-python/parse_type/parse_type-0.6.0.ebuild
index 0d408b82ec7d..b0dd2c0d8eb9 100644
--- a/dev-python/parse_type/parse_type-0.6.0.ebuild
+++ b/dev-python/parse_type/parse_type-0.6.0.ebuild
@@ -4,12 +4,12 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Extension to the parse module"
 HOMEPAGE="https://pypi.org/project/parse-type/"
-SRC_URI="https://github.com/jenisys/parse_type/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jenisys/parse_type/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 4ab3fbbcd5fe..851adad45375 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,3 @@
 DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1
-EBUILD parso-0.8.3-r1.ebuild 744 BLAKE2B add679c46648e975eebd80588b2aa1febfde010a1e3d0869067dfd9e0ee000fec82536957b1c7fc27ef91588393ed00c1c86404158cc03bdfc1392fec6bdb8dd SHA512 ab3158e82db730dfcbe01e726a12e7796e031b1a6eaebb664a1021d37230bdd04b608c43425ff0e8044881792dc589a135f4302ac2e94b64028b7dea62a3c537
+EBUILD parso-0.8.3-r1.ebuild 910 BLAKE2B 99740c901e7f0174f65c163c5ae148696e38107f0f155a4b4c80e3d63817324f1e20cb61a23888a44865e9e702210df141d0beb8879a3d5e49ce2e8cf0dd07d6 SHA512 9f3cc7e1dafafd8b9f476227f19d7de2b6bc1547ccdcd245a5fc19e46ae7728b85ba3f315924d6698fe807b1c4f032821e89351b71b6f84891e7c031f8afb2f6
 MISC metadata.xml 403 BLAKE2B be2e4f9dd7e074a3b76a591f034f679bff13b7dc36d8b206e45550276533ba752a8e04162ddf4f580a8e247d57f48a997cac34c14dc7b5ae4a3d74751fb9cac4 SHA512 10517311994816074cfcc4809206ccbdb6a9ac3430e92cf9c4dfc45d8e95a92843843e2bf1a19b97aaa3c330bb923581e4ea6cf6a88f1063f2dab8d041f6c90f
diff --git a/dev-python/parso/parso-0.8.3-r1.ebuild b/dev-python/parso/parso-0.8.3-r1.ebuild
index 7aae84fd1c6c..8db1f3257f01 100644
--- a/dev-python/parso/parso-0.8.3-r1.ebuild
+++ b/dev-python/parso/parso-0.8.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -28,4 +28,7 @@ distutils_enable_tests pytest
 EPYTEST_DESELECT=(
 	# py3.10 changed exception messages
 	test/test_python_errors.py::test_python_exception_matches
+	# With python3.11 this additional file is run by pytest,
+	# but it is not actually a test and thus fails
+	parso/python/token.py::parso.python.token.PythonTokenTypes
 )
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 2a941ec07caa..1b0dcd7a99d2 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,3 +1,3 @@
 DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
-EBUILD parver-0.3.1-r1.ebuild 839 BLAKE2B a4743a32560b4e9bdd62f6f2acb0b108f87aaea4c0d154f76da20fa778bd8146dd7e56f753bcf53a921dc0fc2eca3282ed5542362a6f96dc41b8f155aef36c62 SHA512 dd9f44d64bf9ba9a8d99bdb414e4cced972940f1e8f0f8883da7d21d094f07e2de11f1d289926e7df3bef26955df11cdce530bf2673b95cb205f21e7402e5a16
+EBUILD parver-0.3.1-r1.ebuild 846 BLAKE2B ffa735708bb6d3abb0f6456615902fca8307682de39b172b09541a12002cd4e109d38651e521f50ce652bad26c7aad0035a98614aa2005ac4f13c70b3e213b1b SHA512 537d3c92a7ab2c25849fe9a29acfd08973352ff87d71251006c42724202811c4c69497a7a5dd30d9c51d6ed9e238b4802062e64fef5513bf6fb51d1cc53582e3
 MISC metadata.xml 502 BLAKE2B 2d9a48c3dda6814a6eebbcfd210a259d15b7ff00a77b3df667e55e934a0c8b590c3180118d50223d8799f9083fb1990b56d88143dfd380f1bc82b83011f2dff4 SHA512 0140aa49b40780ef0ed6fb364c6eaa5f6ba2f6da51fa0492dd147ed293be7f391942c1c30c86db2d2d49edcaf157767229511b26d0284e595a68a9917deb8ff0
diff --git a/dev-python/parver/parver-0.3.1-r1.ebuild b/dev-python/parver/parver-0.3.1-r1.ebuild
index 3b22b3d2afea..196c3e7716aa 100644
--- a/dev-python/parver/parver-0.3.1-r1.ebuild
+++ b/dev-python/parver/parver-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Arpeggio-1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 8b2dbc5cd2ea..db79caf61f0e 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,3 +1,3 @@
 DIST passlib-1.7.4.tar.gz 689844 BLAKE2B 38f616105ba70cf93cf36383c73f2a4da7bf66ced2844effffe74d9f7c29ee0aece5652974dd1414f16e32fbe6957e2e921cf01bc59daa70195a6d50a4a3bf2f SHA512 350bd6da5ac57e6c266ffe8bf9684c8c2cce3fc6b513eb6c7bc1b302d2d8a1b701e9c01c953782520a2ac37b7ec1f6d7bd5855f99f6ee0e2dbbf33f2d49a9530
-EBUILD passlib-1.7.4-r1.ebuild 1089 BLAKE2B 122c3a0498fa6887733d97d89a84b8bfd82da215f1096b23f232d6bb3e088ae48b61e20bf1a42b4818a1ec110ce89b6e5248b714178300893a6f4048fd90a1d8 SHA512 4e2dd4d3918678b8455c1f1c4984d8178880e1339409c9e48ed68ee7548aa33d88cc2179418afe5040541002709dacc869dd98dd263a440df69b094f7ca0541e
+EBUILD passlib-1.7.4-r2.ebuild 1372 BLAKE2B f7302b1927e4605d29ff5711917b34adad611c29f7f62589258757643cec443000c442ab6c1890acdc25d994489a4613eac59fa32f1faa8f4625830af03514bd SHA512 5e42070795a90fc68c5a5ee214188b9e7c446deab53482b048273d2b324d3226ac0d14f41a4bd70cada30050fe1aee5abdd78076886f2cd9d6b2e9fe08539823
 MISC metadata.xml 618 BLAKE2B ae1d81ff9a45b639031fb9e143899a866c74fd20a5bba55d9defac47c7fd51e491822b272983d19546f30d636f930f3582441318d338e66f25d30e97160f74cb SHA512 45a87efb8f21d2b1e578f5bebfc4a820589aa401ffc623ee5ea81888700ce59cb47c769993ebc2165dd5fd6e3051c882c8dd60ee068a6113390b16ba424325f6
diff --git a/dev-python/passlib/passlib-1.7.4-r1.ebuild b/dev-python/passlib/passlib-1.7.4-r1.ebuild
deleted file mode 100644
index b8449306ebb0..000000000000
--- a/dev-python/passlib/passlib-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 optfeature
-
-DESCRIPTION="Password hashing framework supporting over 20 schemes"
-HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-SLOT="0"
-IUSE="doc"
-
-BDEPEND="
-	test? (
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/scrypt[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)"
-
-distutils_enable_tests nose
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
-}
-
-pkg_postinst() {
-	optfeature "Argon2 support" dev-python/argon2-cffi
-	optfeature "bcrypt support" dev-python/bcrypt
-	optfeature "scrypt support" dev-python/scrypt
-	optfeature "Time-based One-Time Password (TOTP) support" dev-python/cryptography
-}
diff --git a/dev-python/passlib/passlib-1.7.4-r2.ebuild b/dev-python/passlib/passlib-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..d31eb973137f
--- /dev/null
+++ b/dev-python/passlib/passlib-1.7.4-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Password hashing framework supporting over 20 schemes"
+HOMEPAGE="
+	https://foss.heptapod.net/python-libs/passlib/-/wikis/home
+	https://pypi.org/project/passlib/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	test? (
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/scrypt[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		) ) )
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# broken all the time by new django releases
+		passlib/tests/test_ext_django.py
+	)
+
+	# skip fuzzing tests, they are very slow
+	epytest -k "not fuzz_input"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use doc && dodoc docs/{*.rst,requirements.txt,lib/*.rst}
+}
+
+pkg_postinst() {
+	optfeature "Argon2 support" dev-python/argon2-cffi
+	optfeature "bcrypt support" dev-python/bcrypt
+	optfeature "scrypt support" dev-python/scrypt
+	optfeature "Time-based One-Time Password (TOTP) support" dev-python/cryptography
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index ad6ba47b6bce..58a65425c589 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,3 +1,5 @@
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
-EBUILD paste-3.5.0-r2.ebuild 874 BLAKE2B 7d1f864fff2172f8eedcc0ff1fee7e5698bb9c8557fb7eb91f8d954c56c75a1f9cdf5dc0d1dd368d2af58e516d1a9e0776bb17766d448bbcfd46822c2e07d5ed SHA512 ce749ba7ac3a459437214488a8c5f9e69c8dc01ac14ecded235738fbfae872e0a4d2e022b9109f980d4ffb460a6748a02f24332f8230bc803676371988db92b8
+DIST Paste-3.5.1.tar.gz 637755 BLAKE2B fc5f4afc064ced52322f7c2cb20c84d24538bdd3a5dadf7b47f62dd8b64ed62a2925102b785e366bc9b9257835529ae226a4d291bebd40d70bda16be781613c6 SHA512 7ae39691bb6067309a12bf76e2a110913c7be6ddcda6215eaf0228144ff26a1c7b50500729b65e27652dc7a7edf6fe26bd144d261e8754d7af8bac495d4613f9
+EBUILD paste-3.5.0-r2.ebuild 1129 BLAKE2B cc83c624249833832ec65e8eea0b41a1b8e5d9a95647fb55ee7608b4b008f2fe2044c9d8c5ac3bf537e6e6489987b3389f2c50da7aedc39b4c1c8074a9daa442 SHA512 715d5f4702ba53ef80606c8fd2ea4f5dae037b46da95903fcf3349a4615de4feb78ba69f156d65b54455e02d679f014e8907e36be4e073cf6cca1631f8aecd66
+EBUILD paste-3.5.1.ebuild 1137 BLAKE2B ae967d398946834c054145bb949c0716e09de1caa810ec66b58f18798988cdeca2da1841863ad58391e1d91b9c4e4a0af961d7ecf746259d60a76304e5b796d1 SHA512 d2511625b0f3278f964362ed87ee77cfeae7a7a2790e7fbed21dcb059804186b8af80e236e6be891a0494a7d02ec2d7d244961eb3f3eb0b6a9846435400310ec
 MISC metadata.xml 628 BLAKE2B 96690448ed95a0b6794142c3641a2e5baa5618926df08f8b25850f67cbd05fdf8ec165f7b7db421d2b96b156fb1f7ce123388d7d70769e777acde6d15c88b955 SHA512 a33c225ca164a23e44820e92bc94cff49383bf792c91e8d432f9bc0a0de537b0e4b01a1b99097df1d2e8984554b78be5101db556e1c37e00e9b5002d0729e6b9
diff --git a/dev-python/paste/paste-3.5.0-r2.ebuild b/dev-python/paste/paste-3.5.0-r2.ebuild
index 98ae3580d026..a89c1a5d2dda 100644
--- a/dev-python/paste/paste-3.5.0-r2.ebuild
+++ b/dev-python/paste/paste-3.5.0-r2.ebuild
@@ -4,13 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 MY_P="Paste-${PV}"
 DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
-HOMEPAGE="https://pypi.org/project/Paste/"
+HOMEPAGE="
+	https://pythonpaste.readthedocs.io/en/latest/
+	https://github.com/cdent/paste/
+	https://pypi.org/project/Paste/
+"
 SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
@@ -26,12 +30,21 @@ RDEPEND="
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
 
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_proxy.py
-)
-
 python_compile() {
 	distutils-r1_python_compile
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
 }
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_proxy.py
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# fails due to cgi deprecation warning
+		tests/test_cgiapp.py::test_form
+	)
+
+	epytest
+}
diff --git a/dev-python/paste/paste-3.5.1.ebuild b/dev-python/paste/paste-3.5.1.ebuild
new file mode 100644
index 000000000000..7b27623d9a37
--- /dev/null
+++ b/dev-python/paste/paste-3.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="
+	https://pythonpaste.readthedocs.io/en/latest/
+	https://github.com/cdent/paste/
+	https://pypi.org/project/Paste/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	!dev-python/namespace-paste
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_proxy.py
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# fails due to cgi deprecation warning
+		tests/test_cgiapp.py::test_form
+	)
+
+	epytest
+}
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index daab8d7972cb..c084c716d119 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,4 +1,4 @@
 AUX pastedeploy-2.1.1-change-sphinx-theme.patch 752 BLAKE2B fc381dfb1ee909471b89413a8e5b8f68876cc66615776664e8eadbaf15833b36c9799139db15fe551c9cd7d50fe305e13d104d4a2dc1176eb7ba576b0cc7cc05 SHA512 479d0e34f2d86254855335874499eb5bff2151a2f08cd04f021976933441005062670487108374ec24084dd8ea7881cb69938c61fd7a28ded53a32bc0e5df972
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
-EBUILD pastedeploy-2.1.1-r3.ebuild 938 BLAKE2B 8178704805796464f7be1d4f43316a8b3da5aefc434f293513b1057c9f7180dfc1a79bf896e97310b9a8417c1c7d29934d613abc7668495210d5f72b895fc4eb SHA512 240f0928779bf8ab4ae0fdc2add651c72f5895d85f3d593be2ecdd3607b22c1daed1bb87fea5a0b6a3ccec97f2e50082543009f9bfc305e18ba16181dc96bd16
+EBUILD pastedeploy-2.1.1-r3.ebuild 992 BLAKE2B 71b2d8fb06be52e58f05f6d7a51926b934be953224fe68ba2aea95ae5defd82fab3cb0ca086f1b1e86a26ceb104467d97695689748fac670e0f4e6a46b69b43f SHA512 0d991ee7a060edc097b32184cca0cb7a017d2f0850f38d7ad685a4fe80235891895b5728f2968c2698d4dd7055c646cb553a7cf90f6cb62a6c6e129b4a9cf5c2
 MISC metadata.xml 965 BLAKE2B afd902e013f9f3ffa27225cff2a97551875a2cc4a02d968c5366cbbccda0442ac8e381eb8d93655a7a5d6101c97f2e00b362657272ddef4123af57ee1173b045 SHA512 2ab7460b4b6baeedbb1a7c64a760914278f4af622a3e0fc9452fcfccb7274383a26b559f45f7eb11a1f4cf546d24b7582a0dd61f64198b8760d247b6b4a2cd16
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild
index f783815afabb..8fda2c1f81ff 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1-r3.ebuild
@@ -4,16 +4,22 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 MY_PN="PasteDeploy"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Load, configure, and compose WSGI applications and servers"
-HOMEPAGE="https://pypi.org/project/PasteDeploy/"
+HOMEPAGE="
+	https://github.com/Pylons/pastedeploy/
+	https://pypi.org/project/PasteDeploy/
+"
 # pypi tarball does not include tests
-SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/Pylons/pastedeploy/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/patatt/Manifest b/dev-python/patatt/Manifest
index a21403e8c0d2..e4c9a7b85716 100644
--- a/dev-python/patatt/Manifest
+++ b/dev-python/patatt/Manifest
@@ -1,3 +1,3 @@
 DIST patatt-0.4.9.tar.gz 34316 BLAKE2B fd731f4e8932da610f31e5176e4b9bcfe8433366b61691fc545d55fdd89675ddd17a695408391528fd213e755e1d421d21551ccbc4aa96ffccc9b62213c17aed SHA512 d4280dd944cc774fa34228a50aa1573a27df2da5cb3a22dba2c3cefe4797ae902810904da776dbd89ad343b3886b6a0015996082307f83577e6a46ac533ba0d8
-EBUILD patatt-0.4.9.ebuild 495 BLAKE2B 10a5c5ffa0aeee63f1466697a8214850988ec5d375ead2ac407e5e0650fa7888a0db1565e3fdb1e98a00bf20b8261317e47b13b4a83e615649ae11cf0b1ae3a5 SHA512 7bc679e77e209aaee39814e917dced024c50eca770f267755707b213c0850c6dd7603e7808886596cf929af4b8ce8c81c0f8c1742705b5bb7a15904b4f69c967
+EBUILD patatt-0.4.9-r1.ebuild 485 BLAKE2B 799542609df23163c047bd28ac77d49d67d2315c8034ef19be4e1084e0499697ea57169e1bb6673a160eeee4f5695fb8fd37e7bbd1a30bdb3e19d16c778496ff SHA512 ad4b4d1b9fcbdd9aed5daea0e67775e23ee135c46e0e7ff40fa7687bdaebbe0f60a73aa23267c0b6e3b298cdeb6ee5cdf79c732227dae85797adecf213f96367
 MISC metadata.xml 320 BLAKE2B 3fd31b71da563854a59f507b7ccba9d226adeb03aa805b24041d2de01d348ed708076965869d098851ba70a59cf3b09ebb8852360797b8138a1fe84c2f0e3d56 SHA512 b00b0d84ca5f7f2d676ae5fc9668b7a5c69a164d089a4d52da803df4329ae70634e2299ef1946f40ab42df8ce3c865c0ea45545e69f543621057bcebc939c4c7
diff --git a/dev-python/patatt/patatt-0.4.9-r1.ebuild b/dev-python/patatt/patatt-0.4.9-r1.ebuild
new file mode 100644
index 000000000000..9d63be6a35cb
--- /dev/null
+++ b/dev-python/patatt/patatt-0.4.9-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple library to add cryptographic attestation to patches sent via email"
+HOMEPAGE="https://pypi.org/project/patatt/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/pynacl[${PYTHON_USEDEP}]"
diff --git a/dev-python/patatt/patatt-0.4.9.ebuild b/dev-python/patatt/patatt-0.4.9.ebuild
deleted file mode 100644
index 13bc17c3a9b9..000000000000
--- a/dev-python/patatt/patatt-0.4.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple library to add cryptographic attestation to patches sent via email"
-HOMEPAGE="https://pypi.org/project/patatt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pynacl[${PYTHON_USEDEP}]"
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 7bc90bcb49b7..1ad26c8a3393 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,4 +1,3 @@
 DIST pathspec-0.9.0.tar.gz 29483 BLAKE2B 00b48f6987a074e23ac6f344a44ac8f265463bdd87907cb8a602c690a739d1a9a673182fc4d61a6e2ffc02acb6632591b873e435f9fc3893e1cc48015e120a16 SHA512 660f13525325c27b598048a3576fd704c3843e0b07770187d005f0e93996a90cee44e9a0725b6bf775982f586ed3b4ba7cccee966d7149e71e2b95d48030b2f2
-EBUILD pathspec-0.9.0-r1.ebuild 616 BLAKE2B 205062b7f450601aac1cd0035ade265940e34c2812e5179553dc607434348921c6626266074e64af91f11b0b204e1bb423c3555a6d1e5cd866f94fb5c23de3c2 SHA512 62f620d8d5d23d1f8662ecb572462445772d6a4fb0ef039bad1a76f3cce73ebd5c4aceb276a355eefa8efa954573a481fbbf7ff8167e50575fda07a74408bf0b
-EBUILD pathspec-0.9.0.ebuild 570 BLAKE2B bfd4e6776b08a3b7c05926ee39530b23c463f1e398c379c51c2c62f95663f3d7bedab422ad9974731497ae83c596f3cd4136dee7a4e5dccb68dd78d81bd9e550 SHA512 67048322b5abe56e8f10ccf243a867b5ae978dbbb7cdc542ae9c83d38d6a4f4a4eabd6789cd752a0634bbdc2bdaf775d48c8d6d847dcd86ffab7a915aee2b987
+EBUILD pathspec-0.9.0-r1.ebuild 608 BLAKE2B 65de979b7d88a665e2ab51969be988d080ef194f6be788826a53e42f399e5b36fd8002ad8ecdf93ba274b31d996281053400cbdee391a7688fcb5497de99ec03 SHA512 a1f9d69dd08e69a00af73d0c8a87c2e4616e5fef174b38fd82ff66b97f16a78ffd86a27850a9a721d0a6d94cd93bf9fa0a619f4d310901b7d332c4d3cc4bba66
 MISC metadata.xml 422 BLAKE2B 0ee7832564e0f9bd965c3914be3d2abfdc15798f8ae075c1156f554953ab37464a5f1e631711fbb7e3b7b4b2649c2bef90e216b08ca0332ee68060fd5c2ad760 SHA512 2a7d9ee56fbaa78db6f4c5195c6f1761e1444d32d0eb668f0fabfcd3fb25ca73426e709def433f8ecf37277b98deb77b30a56234e7fdcefa19a138633499f4fc
diff --git a/dev-python/pathspec/pathspec-0.9.0-r1.ebuild b/dev-python/pathspec/pathspec-0.9.0-r1.ebuild
index d39be34d123a..979c9262c50b 100644
--- a/dev-python/pathspec/pathspec-0.9.0-r1.ebuild
+++ b/dev-python/pathspec/pathspec-0.9.0-r1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pathspec/pathspec-0.9.0.ebuild b/dev-python/pathspec/pathspec-0.9.0.ebuild
deleted file mode 100644
index 57a9cecba0c0..000000000000
--- a/dev-python/pathspec/pathspec-0.9.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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 library for gitignore style pattern matching of file paths"
-HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pathvalidate/Manifest b/dev-python/pathvalidate/Manifest
new file mode 100644
index 000000000000..ad20ec064aab
--- /dev/null
+++ b/dev-python/pathvalidate/Manifest
@@ -0,0 +1,3 @@
+DIST pathvalidate-2.5.0.tar.gz 26130 BLAKE2B 122f0331807cf33e30f81409423224d48e5a3ed0836410e62ec804da7cdfc730b06fb1968c5220e7d8e79c3773c7011ec3c416c48286581554b8730d3c72bf61 SHA512 f71d6d532d3f096ec80277245bc69ddfe861f2417d11ac432b08e2e5a8776007f174754b701a6b7e3b3754b8b49c5105dcaf5039234fc5827091b2ad78bf58bd
+EBUILD pathvalidate-2.5.0.ebuild 627 BLAKE2B 85b8e2a9e2c93b4d2dd4e544cebec5b57a5f0cc7f7a7d1f2ecea3a859db81665b627d9ca2d7b6e08a0a2eb37327b1ae04eeedebd26702a83c98650f130157b5a SHA512 1348386cc7ef8859587c2e4e64e65ddb551257043100a2217bd6eb965d9cf7eaef27028c3afa7c906418838b0bfa48b989a634041c11b0c14028933cd5b392fa
+MISC metadata.xml 380 BLAKE2B 74443705f1555927fd82c5c5b82a2ba1d5083bf71eff1120806115b2a1a32e60a32d84677dc4ad4aff4c66dd501f4e08ca732fad27bc50ba28ad32e1e6e54eb8 SHA512 0ffa0a37462d7081d14df6ca0d7d403644b85ee08e5088f92d4497930336f67bd1db516d09cbbf3e3f64553289a31da9749189d117fe04a6bc2a44b0b0473b07
diff --git a/dev-python/pathvalidate/metadata.xml b/dev-python/pathvalidate/metadata.xml
new file mode 100644
index 000000000000..f13a1cd9991b
--- /dev/null
+++ b/dev-python/pathvalidate/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pathvalidate</remote-id>
+		<remote-id type="github">thombashi/pathvalidate</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pathvalidate/pathvalidate-2.5.0.ebuild b/dev-python/pathvalidate/pathvalidate-2.5.0.ebuild
new file mode 100644
index 000000000000..4373e9dee10c
--- /dev/null
+++ b/dev-python/pathvalidate/pathvalidate-2.5.0.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="A Python library to sanitize/validate a string such as filenames/file-paths/etc"
+HOMEPAGE="https://github.com/thombashi/pathvalidate"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+	dev-python/allpairspy[${PYTHON_USEDEP}]
+	dev-python/tcolorpy[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/patsy/Manifest b/dev-python/patsy/Manifest
index 209c08f87fb1..d0a0955c3f0a 100644
--- a/dev-python/patsy/Manifest
+++ b/dev-python/patsy/Manifest
@@ -1,3 +1,3 @@
 DIST patsy-0.5.2.tar.gz 397275 BLAKE2B 3aa5dc310729bd979c78004d5f1badb83b75b08d290cf8258191c87d61401f0b6ecd9490f1c4b932269e545c50a16694e44de9c076ca80648717c5f1af62fb69 SHA512 898df5536b0ff3a4d299e69c5f73a3d754cfbe78fe463fb4c4726cfd67d4e30c77cd3d7093131737207cb9f29c1374ab20a68ec5978007ea51878ec7c395f48d
 EBUILD patsy-0.5.2.ebuild 643 BLAKE2B 178669501e3bc257c62e061463dd0e7157da8147b9551a35c1c5fd0779957bcef28525027f4c80c02ba164705b7de1838d7744aafe0facbe081d674cdd26af26 SHA512 5a5d675a8c17e6f1c2687a3e64baa55c6fed6e0d5b686e9be22398b5cbcfffa6da5191f7d689bf86a1f4097d3b32afa2c0ed7a17c2a9a0a5639d1c2ed9c09fd7
-MISC metadata.xml 569 BLAKE2B c7e5c84214d6630ee67fc867db27979aefae315267eb1689750506c5ab39189dfcc39bafac886ae3319a6a0417b68141eb60ef19c257fa4048ca8cdd0e4c1709 SHA512 ba4bd3cb646d50fa3388e3fa138f9dafa78e171e1be114c63f122ae982a27702a9319a953a697e7de3beca10d8a642ab35070017048bbee89c5e5d729fa70d57
+MISC metadata.xml 676 BLAKE2B 727e3f213bc9b161459d98c6f284de53441f49867737b9e0ed071a1efda2ccb29337d60e56e856738f0090fb06c7beae549937b5a030c98bff841c5fab63445e SHA512 e06eefe79b047b89a4e518e69c929199ed365d99e21512df924d6d753298926fdd3547a18066401085fc6e4638dfec2134ea43746351504d30ec4ffe483803ea
diff --git a/dev-python/patsy/metadata.xml b/dev-python/patsy/metadata.xml
index c35cd2c23489..f9b91ca76c88 100644
--- a/dev-python/patsy/metadata.xml
+++ b/dev-python/patsy/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription>
   A Python package for describing statistical models and for building
   design matrices. It is closely inspired by and compatible with the
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 83bb867a63e1..73785a664380 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,3 +1,4 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
 EBUILD pbkdf2-1.3-r1.ebuild 514 BLAKE2B e901975d5462192c4227b06c87af80a8338d5919504b4adaa22efefce02fd94ffa87f82979fa8f76373abda0162c900f64be03b7cb2f04df2f09277088d72f8a SHA512 084a8b14fb8bf9961e98a5613736a7a97c65ff82cccd7b6d2480fd15bc919b2ea9dc378800e1ee76d75d7e3e8a56159a0e9be36c17bb5ecd1e4f827fe6c44ced
+EBUILD pbkdf2-1.3-r2.ebuild 540 BLAKE2B 0227e069abc1c3ad4c50ee090cc274d9ee63d68069bf9bd5bd967acbe81595754546c2c9742c355910a3953826eab4bd9b01221e5f9c03acd9bdb0c7a6fbf1f4 SHA512 abb5a929a46c5a7a45720a0db5e1ea2351ff3aa3fc7c992f4f4c7e54342cf1bbf1353ec0895e43bb76e9afb08f0fcabaac80ebb2f21d03c25d7380d4ac78128c
 MISC metadata.xml 515 BLAKE2B 9629265ebd206e27e03ddce87f0dcc2fb6a126f5ea4340d4f0468eba0329c966bafec686c6ed96d9e36e8bc24ac1aca8a607f9f068be1b76a1abb56cd5869462 SHA512 fa169d02819b18ad3669ce538dae1fc218c5f77d055e04d3c68be1a29841ba791cd84e07150978993c0481d4aaa9ec32001385ea13c0772fadbfcadaf274a28e
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
new file mode 100644
index 000000000000..074e9034be1f
--- /dev/null
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Implementation of PBKDF2, specified in RSA PKCS#5 v2.0"
+HOMEPAGE="https://www.dlitz.net/software/python-pbkdf2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+python_test() {
+	"${EPYTHON}" test/test_pbkdf2.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index b041ddd3e94a..9c68be8c84d8 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,5 +1,3 @@
-DIST pbr-5.8.0.tar.gz 127170 BLAKE2B 7fbd166f01617617c0dff568d1bb88a4be03d62f4f0c3ca1a7d16a7cefb20dcc924ffbb8df0d2d34516cfe3b60b8e380a0eb4a1071220bb4ab695d3d7c88d824 SHA512 61a8eb63bb76ce8515c4203d60df7c973e02ea61b603d155b611724efb2b15c42416bf8a0285451d3378056d390bbf63d991cec32cc4114ae5cc30ebae0a5a69
 DIST pbr-5.9.0.tar.gz 126893 BLAKE2B 3f1d39c037afa7fe6d45b0b039968243e99717b347d1f1ada25023a64e7e683c0d83d2ce177e0f7c5f4cb65cd2a0eedd594b463d5d72bdc86560d811bd3f0cd3 SHA512 b36cc331664b91899a884bb1bc6980174ba2463db35c591d480d0b5a49dd37781132893e488c6a9238fbd2ec16589652d66b01a8c2701d02ff5c0b04e9c6121b
-EBUILD pbr-5.8.0-r1.ebuild 2216 BLAKE2B 80b0812a8b02ada55321ca9964224aac42cc58f1189113752cf1368825d218f780c71625f374809f2010a67e466b4e6aa7f3858ac54dc1ebca8c3dae2e68e162 SHA512 d486283f6940cb96fe31c3a51448ed9d3f83c300d4e930661f36ff034c2c7ccb7d2d76ba4fd4f13cf8b10b5d93f4376dbaa34f562953fb542ba526f06098ebcf
-EBUILD pbr-5.9.0.ebuild 2225 BLAKE2B 8df13f9f3b0610a4cbffd26459d2ae023ef5c5c033d2b1efec0dff54be5789f32c3c2c85a8466af34af1e753624fa5c5429905288348e027ed67c25285c4141e SHA512 cd290db95a44fb40f1d9b681752083c71b53d881a12b3850421f2855c12b97e793fa349a69f88859493c01bd993d6939286b499098e467065d442b2be9b6b42d
+EBUILD pbr-5.9.0.ebuild 2140 BLAKE2B ef8b041d4ea07de48895918c8e14c114751f75cb2c62478c6447cfa6e5c7a662767a014a4fe614f9d53a4506ef2ca4ebc92421bb820f709764606508d6dd4a2a SHA512 065b9255f3d35bf54f62afb298ddfeb7eb09b0a5815fe6c6f19f43d0f7bf51d20c8c43d42e7e0b3d28d823d65a4a487e7d8fd3b782ce75b5bc3625abba656a17
 MISC metadata.xml 815 BLAKE2B 439ee90d79572a8653f1ae3b8b5bf0883adb34ceac5257458dba7a2505e25ebba1c5080095139f6521d8fbd57c11ea38cf4049710b584069aea0ebaa7760077a SHA512 3d0618ef6656706acd829be80b2e6a0b0763b5f4128dcd360f28818d42cbc8825ecd04f7f47af5929a3a35fd60a3b9f9816cc37ee30af164c2e5b51764c25afe
diff --git a/dev-python/pbr/pbr-5.8.0-r1.ebuild b/dev-python/pbr/pbr-5.8.0-r1.ebuild
deleted file mode 100644
index 0c4254d5cca3..000000000000
--- a/dev-python/pbr/pbr-5.8.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 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="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack/pbr/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
-"
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-# stestr is run as external tool
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/wheel-0.32.0[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' 'python*')
-	)"
-
-distutils_enable_tests unittest
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# TODO: investigate
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	# installs random packages via pip from the Internet
-	sed -e 's:test_requirement_parsing:_&:' \
-		-e 's:test_pep_517_support:_&:' \
-		-i pbr/tests/test_packaging.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EPYTHON} != python* ]]; then
-		einfo "Testing on ${EPYTHON} is not supported at the moment"
-		return
-	fi
-
-	distutils_install_for_testing
-	eunittest -b
-}
diff --git a/dev-python/pbr/pbr-5.9.0.ebuild b/dev-python/pbr/pbr-5.9.0.ebuild
index c78b5363efe1..1fa3a8120a3a 100644
--- a/dev-python/pbr/pbr-5.9.0.ebuild
+++ b/dev-python/pbr/pbr-5.9.0.ebuild
@@ -4,17 +4,23 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_TESTED=( python3_{8..11} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" pypy3 )
 PYTHON_REQ_USE="threads(+)"
+
 inherit distutils-r1
 
 DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack/pbr/"
+HOMEPAGE="
+	https://opendev.org/openstack/pbr/
+	https://github.com/openstack/pbr/
+	https://pypi.org/project/pbr/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
@@ -35,22 +41,18 @@ BDEPEND="
 			>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 			>=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}]
 			dev-vcs/git
-		' 'python*')
+		' "${PYTHON_TESTED[@]}")
 	)"
 
 distutils_enable_tests unittest
 
-# This normally actually belongs here.
 python_prepare_all() {
 	# TODO: investigate
 	sed -e s':test_console_script_develop:_&:' \
 		-e s':test_console_script_install:_&:' \
 		-i pbr/tests/test_core.py || die
-	# broken on pypy3
-	# https://bugs.launchpad.net/pbr/+bug/1881479
-	sed -e 's:test_generates_c_extensions:_&:' \
-		-i pbr/tests/test_packaging.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
+	# network
+	rm pbr/tests/test_wsgi.py || die
 	# installs random packages via pip from the Internet
 	sed -e 's:test_requirement_parsing:_&:' \
 		-e 's:test_pep_517_support:_&:' \
@@ -60,7 +62,7 @@ python_prepare_all() {
 }
 
 python_test() {
-	if [[ ${EPYTHON} != python* ]]; then
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
 		einfo "Testing on ${EPYTHON} is not supported at the moment"
 		return
 	fi
diff --git a/dev-python/pdm-pep517/Manifest b/dev-python/pdm-pep517/Manifest
index b2ae29718658..ace5d24e2a4f 100644
--- a/dev-python/pdm-pep517/Manifest
+++ b/dev-python/pdm-pep517/Manifest
@@ -1,5 +1,5 @@
-DIST pdm-pep517-0.12.3.gh.tar.gz 304242 BLAKE2B ad4beb6ab35c219e1991b585bf9ce087be3e7e957f34b1dbc9de676f7b49c3084471e2b55c634eb6fd1cf6cb88dd4161b5060a17a5ca7e5e3ae57c9610303f6e SHA512 4c0f098d5237353fea73ef62149b8177987881239cb6b1b112bd6789931acd7484c56d413f780db4f23c60f4ff3a37c6956de3e1de472fed114487925b0e3553
-DIST pdm-pep517-0.12.4.gh.tar.gz 304353 BLAKE2B ca2b18af38423f7430a40e5cced207bd4bec8d101204902c89f335c5d08131e95fe17c5af7a3ef0e654c9e2106145ef5242c9015924a2711c90dbb0d2f48128e SHA512 2007a84909147cd48e9ea6114119a63855ddf48e220f8c896d516b6bddd5a7bd62046f090d739a5069b9e06700f0318e57bd1a4b3c7531508b41540357639c5e
-EBUILD pdm-pep517-0.12.3.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
-EBUILD pdm-pep517-0.12.4.ebuild 1284 BLAKE2B de8507d9fb7a4202ba5f5322679d07fa5ec9aeff63be7a82fc2812d747f25e2714c85633d72f9f29045a8cda1ac99eb3d98b734d9d15419ea2ea98b7e8e0af35 SHA512 000f54f4f4460432478f558536758face9e999aa42061c13a5f1e1011eb3b4ed10ba2e3fb280855235764cc9e7fc977403986934fbd2030cc09d3bd0d4259e47
+DIST pdm-pep517-0.12.7.gh.tar.gz 304959 BLAKE2B 0571a77803b999f88f38da843c5fcf126eeb538c6812c3e245be2fc14d6cd19929559985efba2d245bbf0efb00e412b2133fca6bbe9e63317e6b7311867e0072 SHA512 45da8ab31071a57062fac5b89abe7d912d787d647eda1b45fe3941c43687fe0fe5c8d11e539290035375e17eef808489000513e3128708fcefd851e792757b8f
+DIST pdm-pep517-1.0.0.gh.tar.gz 307117 BLAKE2B 6af1cbeb10bfcf040aaaaf60535d660c00ad84f0a186b508112e224df7eed417ce97ec1bdbf2764549172ecbededf4e9b17b6ae915b71599f04d09f2103c0a7c SHA512 cb8c02af8c4f00cf68e6379c2e93aa0ab7d30f4405debb62f7c46afc10596ab440128f1a7444fe6989d5eafb462bbbe0cfc83325bc1aba92268498a3d96332e8
+EBUILD pdm-pep517-0.12.7.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
+EBUILD pdm-pep517-1.0.0.ebuild 1291 BLAKE2B 6089f1611fc324431bbbf3beaa921932bc04b2383457b511fdeca14c963e3e50a5c0fcdb80d80606870bccdb75072f02b08aea1c8a3e2461175c8ef6001849fd SHA512 d94576e6ef3ad7154ea8d7ea494402e514f54e153d21e9e98bdc8220193750d76bb6719400c56a5fc62a4b1c27e0b5ba24de41f090c0a7f4876031c2ba716241
 MISC metadata.xml 400 BLAKE2B 0882adff4040585d2881a8712b035a5204909639f80f637526b793fd9e31e9d6cda6119cc069d8ff2e768b9d5807eab16bc27bfd35beb5a613722afead2d8b0c SHA512 484e17561642cf1d26d61a1d95554614b9e77b1ee985cba61ad35dad9c9470d0f64e99385200b8eb7e2cdd5e1427cf7835d6e39c10dece1fb90dd6e81cd15d91
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.3.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.3.ebuild
deleted file mode 100644
index c95abf912f72..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
deleted file mode 100644
index c95abf912f72..000000000000
--- a/dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 ~x86"
-
-RDEPEND="
-	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2[${PYTHON_USEDEP}]
-	dev-python/tomli-w[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r pdm/pep517/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.pep517\._vendor\.:from :' \
-		-e 's:from pdm\.pep517\._vendor ::' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild b/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
new file mode 100644
index 000000000000..65915f36678c
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-0.12.7.ebuild
@@ -0,0 +1,58 @@
+# 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..11} 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 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r pdm/pep517/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.pep517\._vendor\.:from :' \
+		-e 's:from pdm\.pep517\._vendor ::' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild b/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
new file mode 100644
index 000000000000..65915f36678c
--- /dev/null
+++ b/dev-python/pdm-pep517/pdm-pep517-1.0.0.ebuild
@@ -0,0 +1,58 @@
+# 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..11} 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 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/cerberus-1.3.4[${PYTHON_USEDEP}]
+	dev-python/license-expression[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r pdm/pep517/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.pep517\._vendor\.:from :' \
+		-e 's:from pdm\.pep517\._vendor ::' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 2c6d0139687c..b445d53c0912 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,3 @@
 DIST Pebble-4.6.3.tar.gz 25888 BLAKE2B 71f9e4c77d7dcc841f8c3a5e9d3df764727c27fc1ee5bb8250e33d49ce006ee94c11309f469f2ebb79aa720fd58ac2741b240aaad8f6d3c18be68189f180b639 SHA512 92cbb5ac01cc6fe57055facb6bcb6a64e19eb5eb3a3ae5fead32d4dd1001a3c70fbf85ef832dffc6b6bb81af6b1c275e12a61eda421176548a7bd5a928056313
-EBUILD pebble-4.6.3.ebuild 560 BLAKE2B ef029fcd0171c43954db896df71981f7705ba38fd2322d57645254a5a00d7d22e243f63cdfed4f0c2fa66588478c763a2892a962bd689118213bbb8e8cf37135 SHA512 86e53f862c3f4c6b488083b8a47f531318f600062457f2e6aaca58f354e3671adcf23c9064eb1f2f6d66545acbf3c614d2acde8909808f7e84157589b79f25ff
+EBUILD pebble-4.6.3.ebuild 567 BLAKE2B d1a945738553407ac0966a10c6d6096495c3e2e8aa781c77140d40822ce6ef830aecde2ed2d71c4120faee48df02e6014db01b8cffe73dea96910e825266df9d SHA512 a7045825f43f73c5e564d20c14fcef48079c4d5727cc149ef47afb47b19735ed171aeb9de0b22f056d868062f213ddf23bb4c0c5e2b91cc0d64c9136213b590a
 MISC metadata.xml 367 BLAKE2B 587e93606cf39400151b413a1d1ee5446e6c6dfbde19bf2b9cd8e9a7226c1d4df53c8849625fba7c61a84ebc8939803cda5c1250c3068cb8cd61ef9db901ab6f SHA512 8f50888f29afc88c791f54078d4120eb26a0217ad76fd72f311bea4bfb769cd37adcf657bff4949fc9360b701b44d0736cd294101ce9838db538b6a34e103dd3
diff --git a/dev-python/pebble/pebble-4.6.3.ebuild b/dev-python/pebble/pebble-4.6.3.ebuild
index a0aa6284c637..e4885e4ca44c 100644
--- a/dev-python/pebble/pebble-4.6.3.ebuild
+++ b/dev-python/pebble/pebble-4.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_P=${P^}
@@ -17,6 +17,6 @@ S=${WORKDIR}/${P^}
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 3e2f219da632..bc5409a00361 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,5 @@
 DIST peewee-3.14.10.tar.gz 896121 BLAKE2B c6d42dbca418475325e704e86dbf1d420426b1276a63ad1d49f3361478325b5a4b01bcbd875b32439bb497c4e18248efa6fe44c589c3247ee84043ca1bfc1a74 SHA512 1f423097c67c6a3976ed77586e3ea9db6db42e3c18e6f4c6046176a0e8942a9ce228cefd2a09e39fde359479e70a04e4c06030682442d96657d24984666b13d1
-EBUILD peewee-3.14.10.ebuild 798 BLAKE2B 79a729feca936636222c50cc613e818d99fadb6364276811b775d7cd28fea087dfe2fcde5d1e8d113f8cacab0015a7427ea47b9d2eea95894ee7a3d9ec02d87f SHA512 eae3f61b9d162ee7e9bd7ca7a3c6fcfb54e5cc3e54a401597025259d07a2f087c0ef7119d807125051940d76615a74def1dc657a826d8a351c75bab98b64b3ef
+DIST peewee-3.15.0.gh.tar.gz 903961 BLAKE2B d3e01171fb281c1b371bc6518366fec698144761d1a88da25200b8a68ab909ca195c7900cc9f7439456ac14472f4b611cdd6ffb512e2448192cb892fb514cc62 SHA512 63c7a765327aa89ec0cb1d6306fa121f25fba39c353b475d6be4c59a2f8cf99724c366a314c769dc78e3da453c888d48d4d6151647af1621cfa16aade7118e25
+EBUILD peewee-3.14.10-r1.ebuild 803 BLAKE2B a995c5f0079702eed30e2aa34c212a7f08cc62b5fa9e63ee92b943da586cdd31578719088689ee2a8fcb449a65933dedb479cfd4d6d2df423d41a0b5493306cf SHA512 6ac376ab1d7c7e81f3de257a723a0f057d30d48b2dfbf9261f2ef44c1c6fb56520a4542b9dae6a7e3c2308047b2041bb6f5e1b40fb1df5afebb590f815a098aa
+EBUILD peewee-3.15.0.ebuild 795 BLAKE2B de3dc99c82667838e28a99d3039a331f2061fe17c651f445ae91f5c8090cf085d0c8b84eb651299991d9d3d736a7f08d4219f9c28b49ae35198a597d6f88ca60 SHA512 1d66d6c42f9adc68b3fbc272cd4c0ac933994a863e0e01586f3c42a843d6c976a525a7f80cf6b0e0bde6a8291868d5b8228d3284b5ffa3b7d086dada07b3f4fc
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.14.10-r1.ebuild b/dev-python/peewee/peewee-3.14.10-r1.ebuild
new file mode 100644
index 000000000000..b13a469ca0d8
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.10-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-3.14.10.ebuild b/dev-python/peewee/peewee-3.14.10.ebuild
deleted file mode 100644
index 669cead817b3..000000000000
--- a/dev-python/peewee/peewee-3.14.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="https://github.com/coleifer/peewee/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" ./runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.15.0.ebuild b/dev-python/peewee/peewee-3.15.0.ebuild
new file mode 100644
index 000000000000..07b7c4995d4d
--- /dev/null
+++ b/dev-python/peewee/peewee-3.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index 0bcb0db8d53d..e9fe47e646bd 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,4 +1,4 @@
-DIST pefile-2021.9.3.tar.gz 72179 BLAKE2B a1b5390936e6c307b1d7d30f317ae77b432b17300941bfe71c4c8ed9dfecf95d623ce98eb762378ee1ff7ae938e4105e4dbcb2f6b8fe32c502b725c43b3a1154 SHA512 1960a6301823387c76e61dff73250686a32dabe009ff0410691ab9be4e57fd5f7ceca2b78302c935b74465a1e0b8faac659045c8a2be07b21dcf1baf510b1b33
-EBUILD pefile-2021.9.3.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
+DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
+EBUILD pefile-2022.5.30.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 EBUILD pefile-9999.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2021.9.3.ebuild b/dev-python/pefile/pefile-2022.5.30.ebuild
index e80b72dea457..e80b72dea457 100644
--- a/dev-python/pefile/pefile-2021.9.3.ebuild
+++ b/dev-python/pefile/pefile-2022.5.30.ebuild
diff --git a/dev-python/pelican-minify/Manifest b/dev-python/pelican-minify/Manifest
index 27d0372efdc0..3f0d2f723021 100644
--- a/dev-python/pelican-minify/Manifest
+++ b/dev-python/pelican-minify/Manifest
@@ -1,3 +1,3 @@
 DIST pelican-minify-0.9.tar.gz 223517 BLAKE2B 808601e027af7b3970e3fcac08e9f0f656e48fe016a470b4a5b3892a108264e2fff52a9b036861fb9007da263e59c7fcf68867e789f65e20b29278fb8de445a0 SHA512 de28727ed6b39e89461b2d725139b88010def892f3fd23f822a6e84a585b3f93771fdc9ca8f402adc9bb196a0dde03b9d6417317c7e8141d83f0e6460860cd33
-EBUILD pelican-minify-0.9.ebuild 549 BLAKE2B 6eb27cb702e627ef5bc8bb8b1ff35a00b65bd886b04a5994fce6b2bad5702e0854cd7341fa07a8ca5808b03363b7aa46d1d65063323aa20599928761f4529dbf SHA512 4650c0807743dbe0d4a4b87241127368756c72cc45326a2f4c53225051367f57221af257ca7a11f9d01164ba9a7a69d59ad8737ea3bbbe95eaaaf61eaa3ae894
+EBUILD pelican-minify-0.9-r1.ebuild 550 BLAKE2B c8649ca022082f8c586d35a5e1eca2c29b45503b7c6046663870ec979c64d1de781efe75b01500997ed749e33fddb252fd67d390cf31ee1f379f3032bb4ab131 SHA512 8f44264560e75fe4ea75541efd60900629fd742299ec08d4291972d8f0efc5476014176e24de746d1c52058a654254fce654fea8dd0890ebcfee1b10c797d199
 MISC metadata.xml 457 BLAKE2B 840c8137747102d1098400c28407f1dbcf26444ac20c0e60d6ea49681a77f154aabd81d6519d1888df486430e9668a6b3b29cfa04a7c967f38501011751bf507 SHA512 129092e5d37556554f709433255cea8c4f8b7f8ad4945911ba98cf4459e131d776eb3595916939f30969ba0cc84c3f1d5824c9134bd96f490a38acd27d34dbc3
diff --git a/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild b/dev-python/pelican-minify/pelican-minify-0.9-r1.ebuild
new file mode 100644
index 000000000000..8e2494d08d88
--- /dev/null
+++ b/dev-python/pelican-minify/pelican-minify-0.9-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_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="An HTML minification plugin for Pelican, the static site generator"
+HOMEPAGE="https://pypi.org/project/pelican-minify/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.5[${PYTHON_USEDEP}]
+	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pelican-minify/pelican-minify-0.9.ebuild b/dev-python/pelican-minify/pelican-minify-0.9.ebuild
deleted file mode 100644
index 376f3dbb4dab..000000000000
--- a/dev-python/pelican-minify/pelican-minify-0.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="An HTML minification plugin for Pelican, the static site generator"
-HOMEPAGE="https://pypi.org/project/pelican-minify/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/joblib-0.9[${PYTHON_USEDEP}]
-	>=app-text/htmlmin-0.1.5[${PYTHON_USEDEP}]
-	>=app-text/pelican-3.1.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index d102be6e6fc3..65dd6f2f32ac 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
 DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-EBUILD pendulum-2.1.2-r1.ebuild 1013 BLAKE2B 40c2a747b6cc90b7dc80630264b37264ae131d60ca2d36656be3f3906e7ad21257f312bc367ad5ead9977e9f88440664925eb863830ec992f10eae8999e15235 SHA512 30195b48695885b3fe0b1c3771d4b671c3e7eb142b2b7464b9954ed47f22de1ecc733b61e47a77fd9edf6f542782efc21f42865fb753ac1ce9b95b5de420d869
+EBUILD pendulum-2.1.2-r1.ebuild 763 BLAKE2B 73f364e9cac88250bbfe2bde5d66d0b3dbad909d82e5915659bb08ce3740e3429c39afb5e9aceb59b90a0cc2d213caa9d5176e7864a4f8cde2d7dcc1ac1793ef SHA512 6ebfeb1132d9978f70a1070a5adeb1077f185019e0509349dc39741639df01ee1669748ee08560aaf84aaac6e78db7149f04a8a284f4bac23e2f8865b797e1df
 MISC metadata.xml 414 BLAKE2B 5f77b163192f5fd8ec655fe630948c160f8e31017cc78527fa379b7e6afab44fe51ed6b0acf2188d82cc4804f6377872646076e3bfb3362e4a5a46ca62acb058 SHA512 32aa44b3f154c7bf634244963e28d196fc629ba2415bd60ed66339a664075a0db8c31f093f13ac268b551d260e6c05220eceacff8d0f784b52e1fa62e71cacaf
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
index 32b705122dca..602bea9a4764 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Drop-in replacement for the standard datetime class"
@@ -15,22 +15,16 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 
-# Requires timezone information which is not installed by default
-# with dev-python/pytzdata, and otherwise approx. 50 out of 1600
-# tests are failing for now. Keeping the test dependencies
-# commented for future tests fixups
-RESTRICT="test"
-
 DEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytzdata[${PYTHON_USEDEP}]"
+	dev-python/pytzdata[${PYTHON_USEDEP}]
+"
 RDEPEND="${DEPEND}"
-
-#BDEPEND="
-#	test? (
-#		dev-python/babel[${PYTHON_USEDEP}]
-#		dev-python/freezegun[${PYTHON_USEDEP}]
-#		dev-python/pytz[${PYTHON_USEDEP}]
-#	)"
-
-# distutils_enable_tests pytest
+BDEPEND="
+	test? (
+		dev-python/Babel[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 34313584d433..28cf8cd79606 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -2,6 +2,5 @@ AUX pexpect-4.8.0-fix-PS1.patch 662 BLAKE2B 93bf985deee0b14690fe08abbb21be09044e
 AUX pexpect-4.8.0-py311.patch 2672 BLAKE2B 994d46c09777b972354ce27ce4908f60f02c47c3a173d0b5021d16742e690310036056c5145a96a00561e1f379d08d34d49e4a592c397091a77d94fbcae27642 SHA512 a5b1e07bef7c2aecd82eafe5dd559039b5e5bed3f71fe20b18f0a2a17c47b14ffb2b4e2550ea315df74c12910d5dcda55d78bac812ac45d56bd85523f08921b2
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.8.0-r2.ebuild 1182 BLAKE2B fdc67f66d369333f3f8b356c2e16d800311ccc4b38e2a53d5ee850cfee53a78d67cee56a217820e6f5befec113ba7d36c21a49be914325d76a19914c4a1a9854 SHA512 a215279bd237b49cdc12af2c4a7957649fddff7247ab351b302a674288bbfd913a439d953ed2f66efcc51c499d654f816058822d040a2c13cd11f3f0ebb03ae1
-EBUILD pexpect-4.8.0-r3.ebuild 1241 BLAKE2B 45b8c4dd77d97dffa617b131f397b7a0bf48838be00e5cd618b60089f5758517b40de5304a6bca92914bf57dfe5a6cd74f225f657fea0caa257706f1b962c5fe SHA512 8831bb701e670e177a37f078bb598502a6f886324a6eb75d4760faaa0de0eedaf766931bfccb4c8525d7139d796e27c29c61b054aba77c885c4169412b66301e
+EBUILD pexpect-4.8.0-r3.ebuild 1233 BLAKE2B ab62a8604ab0835114975ad66d754a755fd6b0e7f8212e5b2b107318d1b1dafa94a5e0fd30e7dd00e023c393aa02a150fee584ef7c7e72176427f271b1231ea3 SHA512 4eb571a7fa5ecba08d0d65b4cef2fc31a5095196e3ade8bdd5867f0e07beba43436eab8b73c3f24bbedf0718d0bda1b87415399b5e41f1f7ae261402a548b487
 MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d
diff --git a/dev-python/pexpect/pexpect-4.8.0-r2.ebuild b/dev-python/pexpect/pexpect-4.8.0-r2.ebuild
deleted file mode 100644
index 9e985d413abf..000000000000
--- a/dev-python/pexpect/pexpect-4.8.0-r2.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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
-HOMEPAGE="https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-3.patch
-	"${FILESDIR}"/${P}-fix-PS1.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-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_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
index 67a37a70dcc5..3edaca92588a 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 78ab511e73a9..d58d3be8e746 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,7 @@
 DIST pgspecial-1.13.1.tar.gz 50269 BLAKE2B 0566a7c2d8ee1ea350e27a4283f56c4cb1360f23ac9fe0147358ff68f527907c47650466dd41ae9c68e8a1f8ba658e452a88db360a7066f5562b7f0c578b8b62 SHA512 4b8f0495451db40087327640edc4bf8c29997b4f501dc5af6d093ad880fc337050d651676ae8ff434da3564e773f9e89e6e7d6bf0d6cfb7b70d8b4beea73a347
-EBUILD pgspecial-1.13.1.ebuild 1165 BLAKE2B c0399dc15594a46d059c4dcfa29a6040dcd7e912362630436b2644736b767eb2b32a8e3557c02eff7fd9e2fd4d35ada5e474a242b8edda4f68521c0e31231884 SHA512 1d20df565f481bb27a405f989a220e32adf817d53b5447d994d5baa4d45c8f144f2bd282d63a62e0eefea6275cad8121f0d0acb1f73f46ea8a4728924f6a0bf5
-MISC metadata.xml 469 BLAKE2B 4ac30bc0e9dcd93b61f08a2195303556758feb8c6cf2ce083d320d9d2fdd5297a7dc641a18b23bcbc9168dfdbc8b73e682d1b54232b875a8707073e0ea24403b SHA512 42c4588416412787dbaf3ff40bb11aca400b0afcd32ef686495dfd5fde91313a3308e3d49549e196f10d04869f0612a0987a4de4492366494403f1e55998713f
+DIST pgspecial-2.0.0.gh.tar.gz 50098 BLAKE2B 3e4c2b85c8d0e31bdd6d61fd1dd8e9a54b68fef23017e2a11238018d63fff8ba93ee5f8f5f4679321b1a757b4a504d86d9740bea91c95f0312a31cf0135378fa SHA512 59dfbc83be3f263fdf9fdad425675624f2738357f2b3f29abc37b90df1bdae30bee6145faa65715a7a166a9e8ee66201cc5344e697ce0121ae7c6bf9bb3af012
+DIST pgspecial-2.0.1.gh.tar.gz 50181 BLAKE2B 6f3f9f8feba717c18d3985d80a432eb7d127c65f7436bfc792a44cb5d7aad08e6e3b931cc289a051fbfea43cd5d8d7db44ede6de89683d462d51635c5caf2e04 SHA512 e89e7cd0f7e849fe93b8e8e79e409ee73ba6c22f3d76279415f236184f732d12cdd8b6bb7722b24ec2bd665f3429c0bf4e6905cd24c9739aa78906b12f841f13
+EBUILD pgspecial-1.13.1-r1.ebuild 1167 BLAKE2B 7b805cf0bb8abfa91ebf86060649ac2b6720a3da4a055ce1d8d02abb2e3a621b3a609ee7e85366d2610c26188f8f02ebe53f90f20f2e985c2746bce52d3b928d SHA512 41701fa1031422cb0c307c6c7899f490a3a600e6ac4276dc95a2621c8065befc2f39181277eae954a2be690655a3a9ed32147298692e5c6e9c3949045e9170e8
+EBUILD pgspecial-2.0.0.ebuild 1222 BLAKE2B 24a290eb5ff4ea49f43c4d4fc264ba7d39ae0522ec22966cb352f1ba6822954f3d44292ce5981841e7b9ab673540f8bc34707481ea733eaf92e25a80602d41da SHA512 acbc80b993be5310186288350929a0ca9de7d9df2ee129359ecb00980124000e3b41167ae2d3321de07232a270471892c821c98d2ec01f145faae0890fb51667
+EBUILD pgspecial-2.0.1.ebuild 1222 BLAKE2B a86e51aefbd23c19ac4d69e3fa9b6c4c6bf84a365434f3fe23f13148e72833283ff2225518feeb2d3a453bad8c56d3e262696c11730a3312a97bf57678e0b6ab SHA512 df60948d942ca3f18ac60c3d98520d15d9a1a601c086c17bb737917b5041c95695511d8624bdbaa40b8501c910983d44c534f57c52ad76427049ded1287a6775
+MISC metadata.xml 542 BLAKE2B f7c36257d672854f57623ce68e09e17b8bc734e0a2afa70308ff3c3dfee23274750a8d98034527e14c757546eb78b84f170b9a4d180e02cf491301ae34127c79 SHA512 cb1eac0516db3ff5f32efb6adcf2c39e5479f7bb2a44f3d7c75f4e38e07812db21fd8e8af94e97c613b54606c2660317b5dbb0221c88cc926968404898f19602
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index be3181917ee8..8b940410fbb3 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		PGSpecial provides an API to execute meta-commands
 		(AKA "special", or "backslash commands") on PostgreSQL.
diff --git a/dev-python/pgspecial/pgspecial-1.13.1-r1.ebuild b/dev-python/pgspecial/pgspecial-1.13.1-r1.ebuild
new file mode 100644
index 000000000000..d853eb868079
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.13.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4:2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )
+"
+
+distutils_enable_tests pytest
+
+DOCS=( License.txt README.rst changelog.rst  )
+
+src_test() {
+	local db=${T}/pgsql
+
+	initdb --username=postgres -D "${db}" || die
+	# TODO: random port
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U postgres -d postgres \
+		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U postgres _test_db || die
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
diff --git a/dev-python/pgspecial/pgspecial-1.13.1.ebuild b/dev-python/pgspecial/pgspecial-1.13.1.ebuild
deleted file mode 100644
index b0b886f4c9c1..000000000000
--- a/dev-python/pgspecial/pgspecial-1.13.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of PostgreSQL meta commands"
-HOMEPAGE="https://github.com/dbcli/pgspecial"
-SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/click-4.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( >=dev-db/postgresql-8.1[server] )
-"
-
-distutils_enable_tests pytest
-
-DOCS=( License.txt README.rst changelog.rst  )
-
-src_test() {
-	local db=${T}/pgsql
-
-	initdb --username=postgres -D "${db}" || die
-	# TODO: random port
-	pg_ctl -w -D "${db}" start \
-		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
-	psql -h "${T}" -U postgres -d postgres \
-		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
-	createdb -h "${T}" -U postgres _test_db || die
-
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${db}" stop || die
-}
diff --git a/dev-python/pgspecial/pgspecial-2.0.0.ebuild b/dev-python/pgspecial/pgspecial-2.0.0.ebuild
new file mode 100644
index 000000000000..80daceb18f18
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-2.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="
+	https://github.com/dbcli/pgspecial/
+	https://pypi.org/project/pgspecial/
+"
+SRC_URI="
+	https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-3.0.10:0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( License.txt README.rst changelog.rst  )
+
+src_test() {
+	local db=${T}/pgsql
+
+	initdb --username=postgres -D "${db}" || die
+	# TODO: random port
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U postgres -d postgres \
+		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U postgres _test_db || die
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
diff --git a/dev-python/pgspecial/pgspecial-2.0.1.ebuild b/dev-python/pgspecial/pgspecial-2.0.1.ebuild
new file mode 100644
index 000000000000..3873d4fe47e4
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-2.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="
+	https://github.com/dbcli/pgspecial/
+	https://pypi.org/project/pgspecial/
+"
+SRC_URI="
+	https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-3.0.10:0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( License.txt README.rst changelog.rst  )
+
+src_test() {
+	local db=${T}/pgsql
+
+	initdb --username=postgres -D "${db}" || die
+	# TODO: random port
+	pg_ctl -w -D "${db}" start \
+		-o "-h '127.0.0.1' -p 5432 -k '${T}'" || die
+	psql -h "${T}" -U postgres -d postgres \
+		-c "ALTER ROLE postgres WITH PASSWORD 'postgres';" || die
+	createdb -h "${T}" -U postgres _test_db || die
+
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${db}" stop || die
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 3e150c5d80ca..7fa53d576d2e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,5 @@
-DIST python-phonenumbers-8.12.47.gh.tar.gz 4899215 BLAKE2B 102caf51e4cb01140b43273b13a8ce44f51a3617fb48261f81e9d125475e34eafc6d8163e2baef861d0057d5f4f7e683b2934d4a15144277b203d69b12473819 SHA512 a7c24e469cd50b60ec9eb96dee6ef1540d90b20260c6ff6bf2eb8c0e6bf9c1e759d718de052805bb285135e2bd4927c469e901c811580a1cb4d6223757784b16
-DIST python-phonenumbers-8.12.48.gh.tar.gz 4899266 BLAKE2B 560af7966d06aaf116d2fcd3b0f7ecaddf9ce6d01b31f66461e54b9bf12fd724edb099352d5d7639491ad970ed94228deb1a648a3f7602b9a247cd97d4ec754c SHA512 d983ff0703c45517a3657f3beca63437a6d653ab34ee5124a6d7d2af31630472e985dfd28718b6730046460b7959d3733c39237fa861fe2c5ef30f5007e0eeae
-EBUILD phonenumbers-8.12.47.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
-EBUILD phonenumbers-8.12.48.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
+DIST python-phonenumbers-8.12.49.gh.tar.gz 4904202 BLAKE2B 20974162d5a8668c1d15021de71795983c4eda1f3afc931822b3593c80249481bcb4ea9f8b80066a71f7f2821284534991d3307eddea0e8f0270e75eced0573e SHA512 0504a84b3a6047c7ca4bc1667a0418d60c7f43052911751572820e7f4e40b430b8847e4c8f6e4d88dd7a2684b5ad8de2dfda8891d81fd8e1af1c595be152f9fc
+DIST python-phonenumbers-8.12.50.gh.tar.gz 4904755 BLAKE2B 60353aa081e4d4d0909302a97a45a89c1f94aac323a6a68fd93cd67146090189d0901b947c40e80e54e1718ce4a45c4a83d2799701ff1323666e82570174d358 SHA512 7a4406626d04a85e010036ceca20430a2562939ad8e7e2651afd65f0d5eb26feb1fbbe0c11f081ab58a9ab8bd81da2ccc153ad22f12eb8135b4f604077b5b29d
+EBUILD phonenumbers-8.12.49.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
+EBUILD phonenumbers-8.12.50.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.47.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
index 8e4b363b03b6..8e4b363b03b6 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.47.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.48.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
index 3b1d20a349fc..3b1d20a349fc 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.48.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.50.ebuild
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 907d0993046e..5c5d9c0e7ef4 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,3 +1,3 @@
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
-EBUILD pickleshare-0.7.5.ebuild 540 BLAKE2B 298b1080d593c00aebd3bca8910a2d02737d768851e688de303269a3debf298cbabe49a12e2279c6320bf2ff6aa34beb15a2e1c2367547edda6baa959748fd6a SHA512 b3165d36f02f3ef2bde0ff09fc1818a06a9733835dce9dbf959ebe88a3d9277f03e8d054c83296c75a5dde736b5c82d66c1f8b4132f383c54d827264f3cd6aac
+EBUILD pickleshare-0.7.5.ebuild 540 BLAKE2B 0994cd09ab9265e18538d1112d25c85a785b95f45cd4f41544faea5dd653f7f2f06231db422f6bb8178dcdf5db1251dc7b54ef26519a388042be3cd16d5c033b SHA512 f94faecf5c17a4eb5ca65f4a76934b80fd8ac4650b1ca38237d7a076e8bac73475fdc85035bba35d2fc0da342c24858985d7913b21c1e6f24560b7be266aba9a
 MISC metadata.xml 970 BLAKE2B 834db945c8e9c90ddcacf7d001f108b9e26321a155a747f5c7f00068cf915590813d1293afa5f0516233ab52d9a04d73091793bd945fd6e9a96cf51263fa8dd8 SHA512 12a8f50cd4f8aba47aeba2326400d488051d92ea05336b91d59f10e8c2885d00b39a453455c748ff1777a339c39ec0f5273126e719cbbcc8aa15503285b220a9
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index 28166ae76a85..babf1152b1d3 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A small 'shelve' like datastore with concurrency support"
diff --git a/dev-python/pid/Manifest b/dev-python/pid/Manifest
index e9e9e62c68e8..439876fe321a 100644
--- a/dev-python/pid/Manifest
+++ b/dev-python/pid/Manifest
@@ -1,3 +1,4 @@
 DIST pid-3.0.4.tar.gz 16228 BLAKE2B 386565071646ff5b5152c52a8a0881f54369540abaf34a82be399d5e579c763df81553393a6d9a9659beeec5f6b531c74eef7cd13f6dc6f56ee76783863c52e9 SHA512 71656511a12a27fe0c7106cd82459484071fd7a0d34f187bfd2f59dc484b6a86f2ae840eb04609c5ffb2c1f18dafd831b02c0fee5015cf840e6a1f26f95ec495
+EBUILD pid-3.0.4-r1.ebuild 480 BLAKE2B abf2041b38e8fdba1e66b7ef88c0658cb87787e0fe8a61165a91118405e8941b146df3461cf484857e5c6a369c7a0db52a486e45a7471038d2bdfa28f4ceb4bd SHA512 4cc2f7526655ca2a2d675166c340b5ad7bc8fae389d40347280cf6bceac816e9b2b03a9715eaf26cebf71b007d1462b2f6f5110099ea81fe09099094ad7784a8
 EBUILD pid-3.0.4.ebuild 447 BLAKE2B 533c15ad1af63c0ca21c9bef8801527969cd9fc72a599cee220bc56a9d2fb47b353e1710dd6d696efceec155ead63501b71e65ada1f370d834e5ad46eb6f535a SHA512 b84dba8a5e4004eb336fea1cebc4bc8399007c658d96501146bdd0ac1e8c8a450ed1705a54fc78e3f4186342e08f9ef7e7a37bbf7cecd9c6c39a0a446779641d
 MISC metadata.xml 586 BLAKE2B 3885b66dba6777796fdb2fe77a4aa305184962f55dff79c6f73504779991f1af466a063cd65b114c1ae169758d2256c54a5c5d83db498060083ba2f9f3661728 SHA512 73aeb60d965739bedd759d6aa12496a8d62fa4c6c0a2f505c899d51c2edb4d3f7d613bfc6db422dcc224fcc14ebc335acdae0fbedab1a9f4326a1ae262d0cbf2
diff --git a/dev-python/pid/pid-3.0.4-r1.ebuild b/dev-python/pid/pid-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..a08c896af9d9
--- /dev/null
+++ b/dev-python/pid/pid-3.0.4-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pidfile featuring stale detection and file-locking"
+HOMEPAGE="https://pypi.org/project/pid/ https://github.com/trbs/pid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index 35d703f413cf..3223b7ba03f6 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1,5 +1,3 @@
-DIST pika-1.1.0.tar.gz 139407 BLAKE2B 2a2bb71d7f1222ca06dd6202a26e502f1e1e1977651e4fb405a938d493e4f525904568fb57ad5eea0f5117f02c7fa9f1b1c971d7d911d0d62a24b161b2cb2ef5 SHA512 15eab619cffe5b6d62a65a66730b03ee3de24978268afd82f608a96b96cc29695159e228dbbbc21c06f4c02a9591c73a686d9d283ceaa725f53782c3460140a7
 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
+EBUILD pika-1.2.0.ebuild 471 BLAKE2B 4bd2625375b7764df69b868d010f7bb4279494d16ecf7122909cc4f52ddfba4b2c6452522e9b21117050ab042f60fea1ca2560dd88f16fd8fd369f1fd4ce126a SHA512 25ff0c17b5df13072ad906c56f6a593dd317860658cf42c3b01393628106829dd7cec4942a419c2ff018b11347ac624b431ac919de0b07a86344d011121bd2e0
 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
deleted file mode 100644
index caa31224cbae..000000000000
--- a/dev-python/pika/pika-1.1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/pika/pika-1.2.0.ebuild b/dev-python/pika/pika-1.2.0.ebuild
index d84dd6dba9c9..faf36d81feb9 100644
--- a/dev-python/pika/pika-1.2.0.ebuild
+++ b/dev-python/pika/pika-1.2.0.ebuild
@@ -8,12 +8,13 @@ DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python implementation of the AMQP"
-HOMEPAGE="https://pika.readthedocs.org/ https://github.com/pika/pika"
+HOMEPAGE="
+	https://pika.readthedocs.io/
+	https://github.com/pika/pika/
+	https://pypi.org/project/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/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 6ebb3cab0db4..75df61523cb3 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,7 @@
-DIST pikepdf-5.1.2.tar.gz 2355023 BLAKE2B 1186174a8375b63035157a65a23d62d2e52447719de8b0182a4d6892334eea52f140ce113415941e9f096716b5bc71d9c4967658428d87bd45a14e0a43b70caf SHA512 1b18c3ddb3826a1a74e82cf341a4ebeb5c98b587e148dbc6b479768cad14860700b39ebbcb421459f720bea63a4aa9ee4987f1c2cb944620e56c71193741a5ec
-EBUILD pikepdf-5.1.2.ebuild 1621 BLAKE2B c9ef21fd68798ccdb76a90285c620b0b633cd1580414a3ac22d7118f5fdd3cb1365307053fdd065dff21935b3cc734e0a632b100c0997a09940e2376408d6b34 SHA512 25ef04445dc00c28198fe13745b6886876bb42b6a50385854a24774e49c805354b228b6bd5d2061c66811797a9030769b3db2b2d1d7cb8265b944c614a85b91c
+DIST pikepdf-5.1.3.tar.gz 2356111 BLAKE2B 5a9ec1d06f91be44b4eacc68d7d9449a2bb74b59214ce3d1b10d3cdf81533d38450a2150834d0008cf81475e07e4de241ea16e438450dff6dadd5c15da533223 SHA512 d38a6203b9a4150e4daf4980517b72b0e8e797c57bd82009d6f95a1275c0e6f767e415e14fe6d1614bd51edaf660febafd0f0b85cc46482125aeced8f6912285
+DIST pikepdf-5.1.4.gh.tar.gz 2356865 BLAKE2B 7ebeedd7a2bb29371325b0cd6cb89cd56843eee1847cb26f0487d0114a3268e9a15171769abc16502c48684bb1bbe59050a2c692e17857f161ccd10a4663eeb0 SHA512 390c8f07bb5602715a061bf26b272cc8301dbb610ea06b8e5e5560282b7256c03e87717ab62a657c662ef51f549f5d52f0133f3806ff536451664ac93add625a
+DIST pikepdf-5.1.5.gh.tar.gz 2356890 BLAKE2B e08f311ad2714f856eb29510e847ca2ddf2b3919cc372d4bedb59c7449be69574a32ea6cd23f51c34d56096bb8d2936f70c52a6a948d513277ff2a5d13e35725 SHA512 e6da0471abdd2a8133fb5789f72eb948e32eae24ee61956fb71f5e279151bc6df5d18ac9b6d73987fd9b891739892111df8c5f93c90ba8ae022dbb2821858350
+EBUILD pikepdf-5.1.3.ebuild 1621 BLAKE2B c9ef21fd68798ccdb76a90285c620b0b633cd1580414a3ac22d7118f5fdd3cb1365307053fdd065dff21935b3cc734e0a632b100c0997a09940e2376408d6b34 SHA512 25ef04445dc00c28198fe13745b6886876bb42b6a50385854a24774e49c805354b228b6bd5d2061c66811797a9030769b3db2b2d1d7cb8265b944c614a85b91c
+EBUILD pikepdf-5.1.4.ebuild 1474 BLAKE2B d373691070d7295335ec968543bf0a1b4737736fde700c201dc40873bfbe8aeca9dfb5ac75c32c27f418f6bb6c80ae0c77e16328fa5912627159e6c2343f800e SHA512 e7d989139bfef0ac6c125a4f0fed8b5262b9dfe0cfce5709b83a6586ee2673b1896328471308362ef0a10435c552c234b9aa8e6f87c741c848972b9d90659285
+EBUILD pikepdf-5.1.5.ebuild 1514 BLAKE2B 668e031985e40a885a88e6d7a6608e87f22625c0b014e5c102ac0dbf2c2e3bc409447189ab93365fee0f339a90de5d787df66365173009ab986b4bb3907a14f2 SHA512 05690e54fce69f2c73f8b910ffde5e800cfeba2288c4fd3814def3fb989ac7d160b0f599f9fa31f86712c0773598154479baf7f2189d1d8d8dd8db328d64671b
 MISC metadata.xml 687 BLAKE2B 07c94d9dac5323202f955fd9c1e5a6fc78518a0a6f703c54c73b70e774900c41a4823beb3f8be7068d83878d1e60df0d7e30efd53bbc1ba31019477de82b092f SHA512 1be3ec00342e8079363db0c57f75ae88bd05e873869fbbb27442e9fe98eb6917c55b4eaf03ed22c4c44ca3aec9b84839cbc254202460a3266bbc42ff8f0f84b3
diff --git a/dev-python/pikepdf/pikepdf-5.1.2.ebuild b/dev-python/pikepdf/pikepdf-5.1.3.ebuild
index ab8a2b9d246c..ab8a2b9d246c 100644
--- a/dev-python/pikepdf/pikepdf-5.1.2.ebuild
+++ b/dev-python/pikepdf/pikepdf-5.1.3.ebuild
diff --git a/dev-python/pikepdf/pikepdf-5.1.4.ebuild b/dev-python/pikepdf/pikepdf-5.1.4.ebuild
new file mode 100644
index 000000000000..200d14ab9c83
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.1.4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-text/qpdf-10.6.2:0=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pikepdf/pikepdf-5.1.5.ebuild b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
new file mode 100644
index 000000000000..40a95644a05f
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-5.1.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="
+	https://github.com/pikepdf/pikepdf/
+	https://pypi.org/project/pikepdf/
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-text/qpdf-10.6.2:0=
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/-n auto/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0ca19eaf528f..0563ebc6ff7a 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,6 +1,3 @@
-DIST pillow-9.0.1.tar.gz 49512045 BLAKE2B 14f0969c87c57bad8fc38d873bba7a118d666e8b2e62e777ea17197e5ca973b3994bafb56b4464cde4059f2fc4040d73e7ddeec2a1053aeb1f201bf2ec2b38e2 SHA512 73893fe079bb2405c87b73b13b6eff198fb8970a891a7c9586bd2620ea0310d54cb35b1d594c6c6d3859e47d8d467700f987ae32aa6d3dc4a2e9286e8749869e
-DIST pillow-9.1.0.tar.gz 49748153 BLAKE2B 0051ea9c06c86f004f0708b3aa38f234e9b1fec32ef2ebaddfe47b3717b8ebb4834a2c8c2fe68cfeb44d24abe3a9039732679705f7aec790e62105ac5b51545f SHA512 22ef3a98a36ca8162447b6c716a0a9cff79ae9bf1007b7f835e0a8529fc6a062bea77afff17f444586989fff3e30589a595db34dc78e1e4000b966e8d10172f1
-EBUILD pillow-9.0.1-r1.ebuild 2884 BLAKE2B f857e0326d71e804fdf796f6af29889a8c033d999b34099d6fd7ace60caa245d123959c0b87e445ac79a94de50ccebb44d8bdbb493f6b6b29cca6a0086be9edd SHA512 3d7d8401c4887adb54033b497966545106556f61fb8721312718603db010578ff8169adab5476287afe6fe214273cc339d284e996f043fc4e64c458770ce4972
-EBUILD pillow-9.0.1.ebuild 2637 BLAKE2B 393b8e2fa5dbb13ef28acfbaf87709496617eaa904ada6f5503745e933a960aef982f5e11df5e4204b8cd754eb505508b79db01bce3d15089d9f56621753eb7e SHA512 af0aed73003e291f08aba7ae98bf803daadb1fceac2ca058a994c62865773648e04aa310fdf445ce2c8d5d7d965bfc113d40df52447e11ce340f6997f2da91fc
-EBUILD pillow-9.1.0.ebuild 3151 BLAKE2B d5bd712a739720718f3548a658b39d3021c5855023529df5c86e4cbb816f8d6df3e0c562e57c781c1657703ace592928ecde9271b2f2f0e2bd70fe6298fac1d5 SHA512 a8187e85acb9811b2f6684ce21f348ae8890b1867dfea8456146a819b286198bb10ea1018fdf8862fc3640d2fdba846105c432de5ba5a4e71a5e14499871b57a
+DIST pillow-9.1.1.tar.gz 49753799 BLAKE2B 969a338f768951c340177d0590c50ba1213f48810870ac3fdbc2556c57344e356e0cf1ef080bde29bf89291adbf9f64b2dd1f950260d2ce5c0eb28d197f2dfe2 SHA512 8c05c0af6be992667d764046c6d7c189e1486d6ab987474c15e3bc8a64b9955d4c91d94b94ea46ef6d1c6f343ba424240dfa7d758c666bec40fa580728206a5f
+EBUILD pillow-9.1.1.ebuild 3143 BLAKE2B fad8ba84632eb7c3629f29ffad6ab4446b867c406ef050beba384d11dd378f9fd6445d587dee4822c4c487dbc152ff49cefb0073199e614188af44e6244a00ce SHA512 2826d15d906f484a431629d69894da2a83dd6c966bcf0404d9c3bd4412e6504c8c94521efbdb1524d787c7ad2df91264611a94c47aff987b48ccd841f8393ee2
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
deleted file mode 100644
index 87bd35f1f189..000000000000
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-9.0.1.ebuild b/dev-python/pillow/pillow-9.0.1.ebuild
deleted file mode 100644
index c1fb9e79bab2..000000000000
--- a/dev-python/pillow/pillow-9.0.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-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"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	DISTUTILS_ARGS=(
-		build_ext
-		--disable-platform-guessing
-		$(use_enable truetype freetype)
-		$(use_enable jpeg)
-		$(use_enable jpeg2k jpeg2000)
-		$(use_enable lcms)
-		$(use_enable tiff)
-		$(use_enable imagequant)
-		$(use_enable webp)
-		$(use_enable webp webpmux)
-		$(use_enable xcb)
-		$(use_enable zlib)
-	)
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx epytest -p no:relaxed
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-9.1.0.ebuild b/dev-python/pillow/pillow-9.1.0.ebuild
deleted file mode 100644
index 56f56cbef8cb..000000000000
--- a/dev-python/pillow/pillow-9.1.0.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~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 )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( media-libs/libjpeg-turbo )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:0= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:0= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-9.1.1.ebuild b/dev-python/pillow/pillow-9.1.1.ebuild
new file mode 100644
index 000000000000..0359d0ccbbe6
--- /dev/null
+++ b/dev-python/pillow/pillow-9.1.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 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 )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${RDEPEND}
+		dev-python/defusedxml[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		|| (
+			media-gfx/imagemagick[png]
+			media-gfx/graphicsmagick[png]
+		)
+	)
+"
+
+EPYTEST_DESELECT=(
+	# TODO; incompatible Qt version?
+	Tests/test_qt_image_qapplication.py::test_sanity
+)
+
+usepil() {
+	usex "${1}" enable disable
+}
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		disable_platform_guessing = True
+		$(usepil truetype)_freetype = True
+		$(usepil jpeg)_jpeg = True
+		$(usepil jpeg2k)_jpeg2000 = True
+		$(usepil lcms)_lcms = True
+		$(usepil tiff)_tiff = True
+		$(usepil imagequant)_imagequant = True
+		$(usepil webp)_webp = True
+		$(usepil webp)_webpmux = True
+		$(usepil xcb)_xcb = True
+		$(usepil zlib)_zlib = True
+	EOF
+
+	# setup.py won't let us add the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but it doesn't for this setup.py.
+	export \
+		INCLUDE="${ESYSROOT}"/usr/include \
+		LIB="${ESYSROOT}"/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index b678a95eeb3e..972cd6dcb7b6 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,3 +1,3 @@
 DIST pip-run-8.8.0.gh.tar.gz 22145 BLAKE2B 18b915a29a1767022a609e356005e87f035c3d9bab6dd5ab44f9f42668f4d64c4ee5360cb92b217aa2b7b94e0fbfdb5f0e494e668d9bed8badc38ab36cced353 SHA512 301083a34dea08035819024f17d8108f9751a765cdfc8f2e273b948c7746111efedd80765a63c3ac145bdf7d2b41c9a0b2b20286181c4c94cbc5501fb81eb74d
-EBUILD pip-run-8.8.0.ebuild 960 BLAKE2B 52d8a86e02ef639106225fbc1f8a1e1b58f9c1a60722ebcdf1c1a0b9a32d6afd2aa5dd60013b480e17667b4715fe119000f3c5e7b3418c5f63d5d14424ff1d20 SHA512 0b9e7c1026a67a9dfd59e8cd3aef15a9c8d57ff7c8ae588d10f1e0214b7a51649c8f5d87d2c91792841c652de9235815b5dc3bfc8f39cec19fc47fd217bd7ade
+EBUILD pip-run-8.8.0.ebuild 966 BLAKE2B edd6810e1e04ec7fab7f848f104266a05c69d45f74c09de4949990ad2ef81536edf7a16ca3ec52fba121e15d57c898a073669333848a8442084532f5f0943d41 SHA512 7dccd319794d0aaa015a6a2cec2e9bf6061ce1721eb62c15be441573480e50afdbd05470ec21cc2c4032beb443a265e24027c36432bf1d0d4f9e497568830e95
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-8.8.0.ebuild b/dev-python/pip-run/pip-run-8.8.0.ebuild
index c6f180405527..4ce3a99ddf97 100644
--- a/dev-python/pip-run/pip-run-8.8.0.ebuild
+++ b/dev-python/pip-run/pip-run-8.8.0.ebuild
@@ -4,15 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Install packages and run Python with them"
-HOMEPAGE="https://pypi.org/project/pip-run/
-	https://github.com/jaraco/pip-run"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
 SRC_URI="
 	https://github.com/jaraco/pip-run/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 5e2536b520d1..66b896f43c18 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,11 +1,8 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-21.3-no-coverage.patch 1820 BLAKE2B f515e324f043fa8548f9add2fecf1f4d09c2487d695c429f870a6cd1ee9a228717c4fb152faa99a74d75d3b1998a5e7e93f710e2acd096f107f23091875f1f11 SHA512 b386e8116009f43013fe600d1f3928931a6595105bdd782266eeab85ba0f5a0743c7ccfbf2cab018d2ee0646b832573c56aad009e4b074dd805011d0a810348d
-DIST pip-22.0.4.tar.gz 9325766 BLAKE2B 9ce5a25e6fb9aedc39e2cddab2a8af3b47dbaaaf8bd22c39f8301b784e6e9f5434f63d5ef467f4d819b15bcd5cf8d3da52db34b3514c7b4a15823f77cb47e1c1 SHA512 af6d1787b4fe97f2eec9c2e3e3f0f756efca8cb83f6ecdae797986fb6050ee60d872a8a8eb7502a32c4334fc0c7af8cf3c58ce980407d0e9f89eec28a4290093
-DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
-DIST setuptools-62.2.0-py3-none-any.whl 1143965 BLAKE2B 42bf650892d2e5810f18f8002fc6318b5abf890d04b2a3050784b93da88d806af5118eee65ed89b06e1cb908e4c7f6aa50222fba4b8617ab36923cfb624528ae SHA512 496593580b5537fb142bc775d060d01ef3c9069fc06564b5e9cb8e2a56e8f264c1dc7438d38a17f8b7e20d509a6b4f62cdfaf290c4ed82e071a1cc10a297b8b8
-DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
-DIST virtualenv-16.7.12.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
+DIST pip-22.1.2.gh.tar.gz 9346675 BLAKE2B f709f8977d467d5a3170884bb75cd2f74a2f40801ae02a3725d442e18e4073f9c4a39cd1c9d2ce3949eb888be69d151f67d0cf2d0cbad7e2ec1ec6e78150b5c7 SHA512 7dd13150023f1cca8f5e01da7688ae418b5d0b36364efcfc15374a5147c7cabd46ff1d34e6499bc8e182dc0d34a366f5fe21d8ab4de4d112d269a97200401305
+DIST setuptools-62.3.2-py3-none-any.whl 1225929 BLAKE2B 608952e201f749ebf557e3962ba9856d5bdcbc534f3a25598cab0d6c53282cfb3b9f007ba135497a8addf49db4c02bc4387c486d95a4529d01ce4114154ec28a SHA512 366d69dc44e326dd7549cdacd8dec481a14dce4feef4338adc38b9de5c4c338f04d61696e13ce8603be1315f2e8734100f92d3fe4b4b11843e19f550c9631978
+DIST virtualenv-16.7.12.gh.tar.gz 8906590 BLAKE2B a1f206769e4e5797562906162e492e44c4a72720e4f88a0362dc802ce2df20c65aaab6a72dce2238445601a10fae59bd90cd362217994d30911f105afd71c5fa SHA512 0278b33fb19f6553e70ad3dcffa6ea1a455ff435b216ac9b4fadff216b2932714faa2bb6027af3058010111d8511a5c2fcd424f31c9645be361603971f111c8e
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-22.0.4-r1.ebuild 4109 BLAKE2B 3c3922ee76d09b71f7c21d4259c523a866177ad753c9c17cea3b5aec8a9ef877d12fcde9dfd925e92025e325239bf6adaa759add6e5fd622046de0092d50d4f1 SHA512 6666e4a5a2cb4c200297b318e5cbb6ec30c8a108726dbc169b0b05ecbfacd0f5452da46751d2f5475ae8f55f53d6905419810a0a296ae1195f14192298e9059f
-EBUILD pip-22.0.4.ebuild 5024 BLAKE2B c6f7a13f8b64c6c8992fd5a602662c624a4601ee75ff4d2b18e0191318f6c892305d4914d3f2f8728a4626f3850a00daae5b7587bf05da3c9f9515d72355e764 SHA512 21de587fd903b2e0fa74cbfba01f5a23317e905a30a14ef86edd9345a4d43e97c7a0a3ddcd29776963f92e6a17231c5b1affa2ca06b38d99a72efc609f500c26
+EBUILD pip-22.1.2.ebuild 4211 BLAKE2B 2500a5b290162ae49d1739e234e9a601f28e8468a1688be9f094e672cba3464b8392232669fb0d3599ca0b92a79c329f31aecbbb0781bf51da0cec4afe098a95 SHA512 6345aee9c220b2eec11f5c17416d22615ad444aec4dc46f42a399cdbca00272f39b221bb0670a39dc9e171361ec6747911c16d57d27322fab30d3c9a3e876ddb
 MISC metadata.xml 392 BLAKE2B 94ea3de1220cb9ca64ae1186597789cc83a54adfe44695932c07dd5065df0e5f9ee5078a495e3a12563b36809d781d8ab86bb6c92c485c023199d92547b74f27 SHA512 603199f6547105f3bb64f4fcaf004e9ef62fa2e0f8ec6eab56078119684b0f5119161e0f164fe02b2cf6dd6b115588c9ef77d727eeb6d138e281f1cb0bcb5de9
diff --git a/dev-python/pip/pip-22.0.4-r1.ebuild b/dev-python/pip/pip-22.0.4-r1.ebuild
deleted file mode 100644
index b199d1693021..000000000000
--- a/dev-python/pip/pip-22.0.4-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-62.2.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.12
-
-DESCRIPTION="The PyPA recommended tool for installing Python packages"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/
-"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="vanilla"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/freezegun[${PYTHON_USEDEP}]
-			dev-python/pretend[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/scripttest[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			!alpha? ( !hppa? ( !ia64? (
-				dev-python/cryptography[${PYTHON_USEDEP}]
-			) ) )
-		' python3_{8..10})
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_compile_all() {
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" python3.{8..10} ]]; then
-		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	local -x GENTOO_PIP_TESTING=1
-	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-	epytest -m "not network" -n "$(makeopts_jobs)"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	newbashcomp completion.bash pip
-
-	insinto /usr/share/zsh/site-functions
-	newins completion.zsh _pip
-}
diff --git a/dev-python/pip/pip-22.0.4.ebuild b/dev-python/pip/pip-22.0.4.ebuild
deleted file mode 100644
index 44134252dbde..000000000000
--- a/dev-python/pip/pip-22.0.4.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1
-
-# setuptools & wheel .whl files are required for testing,
-# the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
-WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
-# upstream still requires virtualenv-16 for testing, we are now fetching
-# it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.11
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="
-	https://pip.pypa.io/en/stable/
-	https://pypi.org/project/pip/
-	https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
-		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
-			-> virtualenv-${VENV_PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test vanilla"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/tomli-w[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-21.3-no-coverage.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local EPYTEST_DESELECT=(
-		tests/functional/test_install.py::test_double_install_fail
-		tests/functional/test_list.py::test_multiple_exclude_and_normalization
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
-		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
-		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
-		# Internet
-		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
-		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
-		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
-	)
-
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		tests/lib/test_lib.py::test_correct_pip_version
-		# uses vendored packaging that uses deprecated distutils
-		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
-	)
-
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/functional/test_install.py::test_install_sends_client_cert
-			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_authentication
-			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
-		)
-	fi
-
-	distutils_install_for_testing
-	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-	distutils_install_for_testing
-	popd >/dev/null || die
-	# prevent it from being installed
-	rm -r "${BUILD_DIR}"/lib/virtualenv* || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-	epytest -m "not network"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
-
-	"${EPYTHON}" -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	"${EPYTHON}" -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-22.1.2.ebuild b/dev-python/pip/pip-22.1.2.ebuild
new file mode 100644
index 000000000000..0811bec7ca4e
--- /dev/null
+++ b/dev-python/pip/pip-22.1.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8..10} )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+# setuptools & wheel .whl files are required for testing,
+# the exact version is not very important.
+SETUPTOOLS_WHL="setuptools-62.3.2-py3-none-any.whl"
+WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
+# upstream still requires virtualenv-16 for testing, we are now fetching
+# it directly to avoid blockers with virtualenv-20
+VENV_PV=16.7.12
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+SLOT="0"
+IUSE="vanilla"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			!alpha? ( !hppa? ( !ia64? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			) ) )
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-21.3-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
+			tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON} since virtualenv-16 is broken"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+		tests/functional/test_install.py::test_editable_install__local_dir_no_setup_py_with_pyproject
+		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x GENTOO_PIP_TESTING=1
+	local -x PYTHONPATH="${WORKDIR}/virtualenv-${VENV_PV}"
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	epytest -m "not network" -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index 1ee9c4d57443..dba2a457862f 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,8 +1,3 @@
-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-2022.1.8.tar.gz 11379235 BLAKE2B b73df14688ebe6d0c6153c64c2f3cd5106f184466061177cebfac120fc49af403a5d27919a8ff0e5a40e04a9950ab9949938c1d4c8d0c1a4df98440a3a2a2ae0 SHA512 9bad380548723172eddbbb9ebfc35a46effbd8eeeff47ad347d0ab5ae9f52e20de8dfc205dab6fb8ae8763edc488cf867a64ed443895242feb444d1bc0d9b8e0
-DIST pipenv-2022.4.8.tar.gz 11822017 BLAKE2B b647bf5dbbdb6a38ace41bc58c3178199c0c7cada826f18d0f58c6f3cd60290fa714ca434d19cf468cf316d51ac0895460cb007d677b53462a7efc86f3d3bb2e SHA512 8c0ed65b9431b785f86bc4fa0a0a55d96228ed2f9483805536fa3056853dbfabeac02578f694e9a3f2e00be579183d10dcbb957fb834d475e1621de6a05ebd2e
-EBUILD pipenv-2021.11.23.ebuild 2551 BLAKE2B 3633bd637db21a8830b388f1438d9531ffa2cf99fd43a1664ea9bdf9a555c695e29c84701d7b2241bdeafeb0ae449d8f709f1fd2a40ec137a97af8a7739e7be8 SHA512 03e32c60df6889d5d710d96fd84dbef61723c938337c8cd5684402517e90160b75a4aa14462c2a1cff22c8e9af0ca783e5d5894aeb3966bac697f2c102300a4c
-EBUILD pipenv-2022.1.8.ebuild 3365 BLAKE2B b13df7340dfb388eae6a4cb7a831dc0472cb0678f38daf20a8c913403661543cefc94544b424dff01deee484ca26af0846c931c302bcb1e9ade43e3a36557d3f SHA512 fec8ff3224b567e354f23f07f1e49e8fab58db34030aaad611770b5ec61cebe353ad79b93e5f75628787061908dbefde19fd7e3a533a592d13bf2d077ceacc2f
-EBUILD pipenv-2022.4.8.ebuild 3170 BLAKE2B 8bfd4a89f8dc663d3afcc05c476b991024c988c9c323656c8ea3fe2837c7a3509559997f3b79a98649c15f8f821129940d305a03af86fb4f0367a71d7385a63b SHA512 7cfe956c7d25f9328a9e12cf711c64ccaa2c61b4155a30a40644c1b10e09e05c4f7a4d0174080899bb6b457631eff7f358cc9f7358937420f0a964a2509a8a4b
+DIST pipenv-2022.6.7.gh.tar.gz 12253349 BLAKE2B d1efa1a6e38727c5b5d26c6ec6ad6dfb904ff1e8aed93416ac5bb470d87db0a8583fec8552bc53ee0277e4e7abf7d0a1068a9a3c5dfa2260dfcd0890748df4ae SHA512 2b9c42bd88d8643d07f2eb375040b5b26a88980f5f6e4ee8e99bcbbc17ab268f6dbfa582d1974d2cbfd18691dd06d8b9e3b6c25cec17d64fa3e5541529fe05fc
+EBUILD pipenv-2022.6.7.ebuild 3134 BLAKE2B 4b7570e3a59c1a976b3b08d37c6be065f7ecfbb61d77b57e74edffb1dc5252375844b7407176955b2c334b4eeaa597372fd152fa212c137a0bd25cb0e50f20d1 SHA512 e5eb85e289f9519f7380f027adf97c0881c34fdd7b38e68cee18cd964590e4ce2d8cda9c87f0e14feeab7b12e51e753c006f1cc50baa20bdd079f1c1a589e7b4
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
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
deleted file mode 100644
index a8ff7d107f9c..000000000000
--- a/dev-python/pipenv/files/pipenv-2022-1-8-remove-first-vendor-import.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-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
deleted file mode 100644
index 091b0495a4ac..000000000000
--- a/dev-python/pipenv/pipenv-2021.11.23.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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-2022.1.8.ebuild b/dev-python/pipenv/pipenv-2022.1.8.ebuild
deleted file mode 100644
index 36de6a9b7856..000000000000
--- a/dev-python/pipenv/pipenv-2022.1.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 ~riscv ~x86"
-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
-		# remove all packages toml* also catches tomlkit. Remove this when tomlkit is stable
-		find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -prune -exec rm -rvf {} + || die
-		# find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -print
-
-		# package names can be foo-bar, their module will be however foo_bar
-		find ./pipenv/vendor/ -maxdepth 1 ! -name tomlkit -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-2022.4.8.ebuild b/dev-python/pipenv/pipenv-2022.4.8.ebuild
deleted file mode 100644
index c361313a4def..000000000000
--- a/dev-python/pipenv/pipenv-2022.4.8.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/cached-property[${PYTHON_USEDEP}]
-	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
-	dev-python/iso8601[${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/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# 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 pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( attr cerberus cached_property click colorama idna iso8601 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" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	# not actually used by pipenv, but included in pipenv
-	rm -vR "${S}/${PN}/vendor/wheel/" || die
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2022.6.7.ebuild b/dev-python/pipenv/pipenv-2022.6.7.ebuild
new file mode 100644
index 000000000000..287a53485539
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2022.6.7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/cached-property[${PYTHON_USEDEP}]
+	>=dev-python/cerberus-1.3.2[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-3.2[${PYTHON_USEDEP}]
+	dev-python/iso8601[${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-2.0.1[${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/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# 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 pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( attr cerberus cached_property click colorama idna iso8601 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" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	# not actually used by pipenv, but included in pipenv
+	rm -vR "${S}/${PN}/vendor/wheel/" || die
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
index 04b0b598f982..70beb1594f3d 100644
--- a/dev-python/pivy/Manifest
+++ b/dev-python/pivy/Manifest
@@ -1,5 +1,6 @@
 AUX pivy-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch 703 BLAKE2B b2a183cd4a5d20a1ede7427a1c895766c63f694c38e559e4c7d12a1b8a0a88cfd596b26e31ca35489dc637110dae13f89c671fe52c9555624694ef494f8fcd2d SHA512 7ecc957ac8209aee41c010768d9953fc4820a3e6929dd45be16732385f6e1edd12febc2e05786090835eb35235bb976e1122df2b7da6d0d68c6ae3bdbf9dd9c0
 AUX pivy-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch 940 BLAKE2B d7e25c5690a7ea665d923753bcb0811ec9e9702f5085f6a368f1ffbeb84f7b17e8ee6dc02a5374bc5dd45c195cc068bf825b284a97a69be762e9348e7645067e SHA512 75ea0c401cf35b97c119c5a652b91911151ed878136860a90aa53730632dfb89dcd69fb66149145ae59005a93c89e89d1153c8cc23d4d978f9a68fd9ef65c7e2
-DIST pivy-0.6.6.tar.gz 6618471 BLAKE2B 5bcf2479bf26628e3dfe59c1440901368442de2f32a5680ef1af10d49239d8c73b79809495d7227937fd7784af1e1ded27f93f0255793e713add0c1cc35b8e5d SHA512 e260c6abd0aede7621d5fed66eeceb98a32634af84370ef713d70d583ec017cded4be682fd7e70e5faa19988a5e032a9d2f2308b8ae6dd9495d76e884de1d80c
-EBUILD pivy-0.6.6-r1.ebuild 978 BLAKE2B 0a8c8a54756eee2d06fddba0a4b1f06e35367f990391574bc68f72a8a4e7df24a80ccce426603421346c2ba2bd202f19695f648adaf095d3600202760d5883fb SHA512 7fde8ab0057aba362c92c25f61e75934c4d7717dfa9e1d0a5aac2ec36caf70ebfbaf1b16cab9eb0d61d23aace87884c7a3364cd410ce755f376734810ea5d804
+AUX pivy-0.6.7-find-qmake.patch 1009 BLAKE2B 18789a4592683bfffdd9094f5465d4e33eaa6b75d70843aa882838f09c517aafe5d576bf8587bb191b39403802ecaf683346e4c0c87cc4c28b404f46744dd8aa SHA512 650a2e023cd821609b9b601b2c5fdb7cdd05375a8931b989ded5aa6a3f4d517a789df2151ef6d4947b6d8b9875c0bab83cb48fd02161a8961efc1125c656de25
+DIST pivy-0.6.7.tar.gz 6618410 BLAKE2B 22ebe63a75fa624b772cb3d3ff6f03336258f6c8b638613413c19fcea072f83f73396bc91d35f0e06bc27ec57471ae67965ee492e62a7e73919f7827de645175 SHA512 606eac3527b5906ad6884c25775b5625bfd2a1b1c78f75017b05e662d622c75d30e70fd5785ec2145902f5a02d99098b52cc776aee12fab02f0319762ee104b0
+EBUILD pivy-0.6.7.ebuild 1355 BLAKE2B 7140623a4f62a47af8f66db3f8bfaadaf63b94c3adf2d50cd4a6d732ad98b8f5c08eaac0c1f63b8a9d8c2f3da2b620273cc80096445dc2793badd54e3fa21f75 SHA512 b5a2b69ef3d7563b17340267b7baa1858913f2599d94c2428dcab5d2e14caff31afcd974cdb38c80cc77efc37800c9faf34c4c94321dbd9a488dedd82e8da22d
 MISC metadata.xml 619 BLAKE2B 56498bc9920e301de3dacb10db1c2bee59120b8cd3d15508c3549868700574641916e1d3d6f2a734f87eaa91290fd3b1b7ff1373297ca61cea11e33fbd0fed9f SHA512 fd7b9a70a84749a1eab30c3e4ea56bd15d43266e23298a5be1cf3bbee85c38e34bf062ea2555af724766daa7ed755cf586d8c66dfa2286dbcce9c23535661e66
diff --git a/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
new file mode 100644
index 000000000000..6332afa97a3c
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.7-find-qmake.patch
@@ -0,0 +1,29 @@
+https://github.com/gentoo/gentoo/pull/25823#issuecomment-1150748775
+
+From 2d654ef2837f2ca934f636fc8a63de47a9d5853d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 9 Jun 2022 18:26:29 +0200
+Subject: [PATCH] find qmake
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/qtinfo.py
++++ b/qtinfo.py
+@@ -7,7 +7,7 @@ class QtInfo(object):
+         if qmake_command:
+             self._qmake_command = qmake_command
+         else:
+-            self._qmake_command = [find_executable("qmake"),]
++            self._qmake_command = [find_executable("qmake5"),]
+         self._dict = {}
+         # bind all variables early at __init__ time.
+         for thing in self.__class__.__dict__:
+@@ -79,4 +79,4 @@ class QtInfo(object):
+     translations_dir = property(getTranslationsPath)
+     headers_dir = property(getHeadersPath)
+     docs_dir = property(getDocsPath)
+-    qml_dir = property(getQmlPath)
+\ No newline at end of file
++    qml_dir = property(getQmlPath)
+-- 
+2.35.1
+
diff --git a/dev-python/pivy/pivy-0.6.6-r1.ebuild b/dev-python/pivy/pivy-0.6.6-r1.ebuild
deleted file mode 100644
index 50ca56ff2739..000000000000
--- a/dev-python/pivy/pivy-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Coin3D bindings for Python"
-HOMEPAGE="https://github.com/coin3d/pivy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
-else
-	SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE="+quarter soqt"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( quarter soqt )
-"
-
-RDEPEND="
-	>=media-libs/coin-4.0.0
-	quarter? ( media-libs/quarter )
-	soqt? ( >=media-libs/SoQt-1.6.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cmake
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
-	"${FILESDIR}"/${P}-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
-)
-
-DOCS=( AUTHORS HACKING NEWS README.md THANKS )
diff --git a/dev-python/pivy/pivy-0.6.7.ebuild b/dev-python/pivy/pivy-0.6.7.ebuild
new file mode 100644
index 000000000000..3ea7eff6d17b
--- /dev/null
+++ b/dev-python/pivy/pivy-0.6.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3D bindings for Python"
+HOMEPAGE="https://github.com/coin3d/pivy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
+else
+	SRC_URI="https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+quarter soqt test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( quarter soqt )
+"
+
+RDEPEND="
+	>=media-libs/coin-4.0.0
+	quarter? ( media-libs/quarter )
+	soqt? ( >=media-libs/SoQt-1.6.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	dev-util/cmake
+	test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.6-0001-fix-CMakeLists.txt-for-distutils_cmake.patch
+	"${FILESDIR}"/${PN}-0.6.6-0002-Gentoo-specific-clear-swig-deprecation-warning.patch
+	"${FILESDIR}"/${P}-find-qmake.patch
+)
+
+DOCS=( AUTHORS HACKING NEWS README.md THANKS )
+
+python_test() {
+	# visual_test.py is interactive
+	# pyside_test.py currently fails
+	# quarter_tests.py needs pyside2, which currently lacks py3_11 support
+	for f in tests/coin_tests.py; do
+		"${EPYTHON}" "${f}" || die "Test ${f} failed with ${EPYTHON}"
+	done
+}
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index a709bd8a158c..a4e6a2ee6bb6 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,3 +1,3 @@
 DIST pkgconfig-1.5.5.tar.gz 7331 BLAKE2B ef93a712198c1da5a38aec59f52d325b3d7cb25deef799bb006ba1f1d16b673b21d8c837475839e659f62eea9571a50476e38d3c8f95551fb5512a61a155334d SHA512 dfdd0a6ba0d9f37b6d504dc9bea8b19b18a3431ae54bb5fe061911bd1c6a20452f30ea66f67acc6c13c06123247036de7442bba3a7b0eb1af4ebb62d84df64f5
-EBUILD pkgconfig-1.5.5-r1.ebuild 567 BLAKE2B fa53db025da96a34408fb6e655dd4c91316dbbd9f4116553fe02d185a9f285afaf735df8d16ddd3f1d9d8e1d78f5aaeac1dcd2c316d6ec309be870f2f8d8700f SHA512 cdb72dd9a38c38d68ef3a8039de31a30cf860ffa5ee4b6432a9e2360dbef17439561e581ddc5aea513769fc8e99f88b111c53d1ff332398c4c0400f5ab893d34
+EBUILD pkgconfig-1.5.5-r1.ebuild 581 BLAKE2B 4bc9e9b7755e2afa8dbabd9ac67b1d628bfcd2bbe41e602dcd54d17fe9afbb737d6fb65944309eac26a2ff589b62502f646b32fb8f3538edff4851ffdb6d9512 SHA512 fa07bb8717b85f78593b64c2631df5407f498bc47fea6adedc4560b5cf54f8088fba792668f2b1bb68e11c3b743028dee5e84de08eea67a4611129dc093c88fb
 MISC metadata.xml 405 BLAKE2B 39706ac7fdc7a7ef4102b4868e79a831fffaa835daaeed133859cdb909a547167dbb06d3e2fad6bc776b1600268de62ae46660762876a72b2d0e48e2d250b831 SHA512 eb03e07a4a7b97f45087191073235f7de40899381df5457d6d62367088d8c984c051d1a7ef6e403088c3fde429324f117e932c86fee37246649015a3c38a118b
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
index 7e4f08590814..928cc9635956 100644
--- a/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild
@@ -4,17 +4,26 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Interface Python with pkg-config"
-HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
-SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/matze/pkgconfig/
+	https://pypi.org/project/pkgconfig/
+"
+SRC_URI="
+	https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="virtual/pkgconfig"
+RDEPEND="
+	virtual/pkgconfig
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 063f13720f6a..7a545f48efb6 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
-DIST pkginfo-1.8.2.tar.gz 374689 BLAKE2B bff34659d77c3f9f870b130ad0d86fa730c42f1f3db78468a4557df855eb57e6b1dc2fefbebf9126306736f680538bcc6cddcaefdcb9defdc99c22e04ae2e9fd SHA512 06164b6c17000cf25e72d39e4e025a395cdd09afaab6169180cf096bae5a1ff863930d3b368274b6a03458a9ae1c3cb996559c0b042807141435b1868189b5f6
-EBUILD pkginfo-1.8.2.ebuild 606 BLAKE2B b20efb10398edb54e868e02bbf90e63471a999278eee940ffb1d3ebb8245643ee8278b1e96366124d839e5109ef4ac6d8f8376b53f58cc7da1f60c9a1ca3c5e1 SHA512 e8836c43887c6d98b1a2e5f3201dc934b0c24bbb9be2ca8528999d4196f0c62a216f8f87f460e31f2bba0c2d548e9ea3358e317a11c48d74cf3eb2b34220e702
+DIST pkginfo-1.8.3.tar.gz 375734 BLAKE2B a3e9779bcb7cd326d8bd8137fa388055032fd4ee7732d47a341807201a97f1d44652d8e46adefd301cf7cd3c1d041e49a6ed2b8752e12347a8a2a2349cf397bd SHA512 54a67bdf078b38600651cb94afa62e9d86fce512022b1e79eb4565289ae3fad2325647654704488968e18cd85cbba4bd0ce28392fd09ae9638ee449e802273eb
+EBUILD pkginfo-1.8.3.ebuild 675 BLAKE2B 0bc2a787bc673fc106f50b484bb9987b99cefd880e13b3dd1b9b91da211b496152b8de428ffee896ef00683c8db9c9ef4d25dded995a19a95d186484f1b2fa65 SHA512 4c33fa944601b4b831efcdd606dd36b9417b11a49d612421b2e8fa6146d3980fb0a4d5d0fccce36c1816b8ca335c29b8a4c7e5511ce83f1241b6da2af69131da
 MISC metadata.xml 346 BLAKE2B b5a7868643825a1bd22054657ade61cf2470a128044535fef6781c9319f1e0e240638f74232f6e4fed110421cb56c2ad6cc1c98e49ff8c1acb88585465829470 SHA512 00afd3ed2f6cc2e2806845dd0b96ee154dcaa73ee036d27a8e3bd6c85f2445fca1cd4948cf60b9f424d41ef3b67941d564f831008b1e18ef8952ccadbdbc8001
diff --git a/dev-python/pkginfo/pkginfo-1.8.2.ebuild b/dev-python/pkginfo/pkginfo-1.8.2.ebuild
deleted file mode 100644
index 74ac7d42116b..000000000000
--- a/dev-python/pkginfo/pkginfo-1.8.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="https://pypi.org/project/pkginfo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
diff --git a/dev-python/pkginfo/pkginfo-1.8.3.ebuild b/dev-python/pkginfo/pkginfo-1.8.3.ebuild
new file mode 100644
index 000000000000..6c2807d22d3f
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.8.3.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="
+	https://launchpad.net/pkginfo/
+	https://pypi.org/project/pkginfo/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 07c9140382b5..d921ec3d741c 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,5 +1,3 @@
-DIST platformdirs-2.5.1.gh.tar.gz 20103 BLAKE2B 78df153feabd397e6ab0d3c5edfe899f2e2685e7b287bd17c36346bc109d90ba783b5164605bda448322811312299ce65d49b85537ebd1629448c1d82f4718e5 SHA512 c0f3e79fbb41cda1f543fcb6d3a4ea0c96872d195197aa720864c1ed0efa095e633202878da9b19abfb2aded08f5c736f431b1c615ee0f21cbf1775e87b12356
 DIST platformdirs-2.5.2.gh.tar.gz 20335 BLAKE2B 5d11e39d3e7482646e90d57642f0a956633408de5ec9f3cc1954e451ebb3bc3234a453c1e62997bcc74a32082f5d044a1e68ef6d7e75e27876495ad6ffb3c8f5 SHA512 7162050adff66124601359f0c1f73e671444d286e9f00c2694647df233c25e1eae673baf829e3e74e2a54d15a1633d0202dba986d4ed8a2864fc47859af0fd4e
-EBUILD platformdirs-2.5.1.ebuild 840 BLAKE2B 81a21969946909c6877282ca60c5b2eb13f2ea825e02d067a2a7c832728b711501e0d0422f2b0b8e54729691db4b0019e8671b39e7508fd36b1bd5a8db8f9a28 SHA512 4efa36ef9620651ead63b9b0252b4ec3253d6756b40ce4810d7e4f941faa302a93d4c73434bb64a577afa864065a11965159110eac39da4acc31b5a5b97ac132
-EBUILD platformdirs-2.5.2.ebuild 832 BLAKE2B 9e2c472e6d643e1d037f016ce3c098009d1f3fcddef63bb733296b71f1b7bf2557936e47b31dcb7e2c02d92559c64900b96722ba22d0cb12cb7d6a301040c88c SHA512 fd49086d3e3966e633538504910d3b89fdacfc1e7ed3d53b5882dbddf22514452ba9ecf4f65b3c1d8a1307a3268891ba114a94c319b0c843c0112c391461c824
+EBUILD platformdirs-2.5.2.ebuild 824 BLAKE2B 707f36f3b4f32713a600b55f760b8bc017285742749536e14029f79c7a6923a887ba453376b1bbd22d274c98e10d39070731803da36463a7849879a691aadfc6 SHA512 47f989d76004af0ad8f44844908b4fb56846cde0eb5bfd23e269f3034128af5e1ea9ade2a089f712c57272f345a3d0f50419fbffcdc07a038c694a4d1c57aa83
 MISC metadata.xml 383 BLAKE2B b8c8c1593d154e7a38ca4bc450c14ca21f2411ea1d71f67e9631c1def0acace43ebb6e67adc0c4a1f5f14aadfbce44d0d815fc3696410bef66c826fd5fb00a45 SHA512 f4ba6722e1cf661b3febe10bb15755a9cbc30226a08bdcabfa3d80be87b42d662d6a1edb3412ad79e8f36836a6dd4fd91a83dae29725ec47041056dc1f1f9b75
diff --git a/dev-python/platformdirs/platformdirs-2.5.1.ebuild b/dev-python/platformdirs/platformdirs-2.5.1.ebuild
deleted file mode 100644
index 6d6e9e3bb7e1..000000000000
--- a/dev-python/platformdirs/platformdirs-2.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/"
-SRC_URI="
-	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/platformdirs/platformdirs-2.5.2.ebuild b/dev-python/platformdirs/platformdirs-2.5.2.ebuild
index 8a195e51326b..2361230d32d8 100644
--- a/dev-python/platformdirs/platformdirs-2.5.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index 37768e6cb383..3711e919f1a1 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,7 +1,6 @@
+AUX plotly-5.8.0-fix-versioneer-import.patch 541 BLAKE2B 51ff6cbab8d9124243445f758aa4b976b7c26e1d3ce633e943bff133b81c0a7587feeb9d5e98a63f319c6afed8dc06e06fafe765ffd51fec245215c849fb4955 SHA512 db4743e538dddfe66e4c9c766698844af4d09c68188afefe92b6419adfe7cc0b1e9c1266d702d590b0b8dfc14bffbc8f08262ead0bff4dae3b5c71fa1259a4b9
 DIST plotly-5.2.2.tar.gz 7293292 BLAKE2B baef3accf8f5a3085908fcea558f8003687e18a1f97471c620c378c10d23d4222ef87dc47d64f45199b594414890db5b8ca5e3d7867c871d926c2ae441128c4a SHA512 4d6d79f7cc2063e73e7c17ff90a7d13324497ea8034d8ce62d79ec62b0530a59b2eaec8913fb05efb804cf5be8387b6f96d1710f41b9993233b5a13cf64dd310
-DIST plotly-5.6.0.tar.gz 8599746 BLAKE2B e76ac48e79a2470c320f21991a75c51c29ec959b9bbc50b1176df2f40572d794b2073f16964445a3d6dee4643063c7ccbee90fee1673b9bfd850e239fb39d0e1 SHA512 3ba91bd1b2a9cb1cd778985a0253b11f36e891e01cb734d6c88c40266f1852f2b2d02b12bc712c0b58b93dd68dd1c9b4378bcbb462bd63b3a67334cb83564c82
-DIST plotly-5.7.0.tar.gz 8609793 BLAKE2B 12318f837c248c54fd3a8723bc772e8348186942565ba5a4c095f348dc338cc098318889900500ec333d7ec352801926ec91d312f2ccd98a89f804159223057f SHA512 01675470ef5218f06b4e9e485f23155a8e8550748fdf86afdb2a2969f838464b70d4452811427ab6bed2846093e8cfba7e891f7d0ea3a621e1fbffe22182d933
+DIST plotly-5.8.2.tar.gz 7574127 BLAKE2B 1a9d05009148a65b2f4206165a3e02ea7e130663e9658af64bddc0df6f1b720ca29e1cf30150634403b4bdda96156899f0e2e2d12b81cfd04a4bc9812057a79d SHA512 f262cbe20fa51861a319911e04446d4aa564b878dc1aa8e750a5d03af9747ec439fda941ab63d20ecb5374417174a2bd1c4f5549af5ba0f57f135d10ae0877a0
 EBUILD plotly-5.2.2.ebuild 795 BLAKE2B e609d220f61b73ca3c11255e0fc28cf9c3a2ed316be1f39044cab25679683300d6281e80ce2f5ead3be391b3c537be7531c9148ec1a1bb069a04ba621ba1784d SHA512 a1bac18949480f19c68891497effdfe60cc3ca474ca24ce27134f2a1da5cd894426fca9b00ad8d6d24138da141fafefd09a40723b1314197068422cd988574cb
-EBUILD plotly-5.6.0.ebuild 1602 BLAKE2B e4c9fad96ba8756789aaa0a3789bedd7f5e68ed7c35d4645b9ec97207a080634d9b65587b9aa008de9271c9df47944d1fbbf68878bbf85c54b0299b6ba23655b SHA512 6aa34892331d5e551bf2962073349fdb9cd9a2844f064dd5e21c8551e384dd632bebd71a86ae508cbbec4c9a3480ee9339c10079d55ce00cb493fced05c56a07
-EBUILD plotly-5.7.0.ebuild 1595 BLAKE2B 3acd8461e2c34c67636e13bed9bf5d39d7be205ffea561aba2281960ed113fea3fe0814904457ff966cabceb40d5a4d8808014cee069bdb8177b1471e939189d SHA512 f724cd1973e94956edfa46b8e100911d2eec0851c0b68758a4cb3f16ed4f47614c35ab65c7c752d6d081d565078893ca5b68e7fb08a08f487817f326a0de4022
+EBUILD plotly-5.8.2.ebuild 1620 BLAKE2B 10a9f7acdeadd0d3bb0ba7054a8622d840bacc81251755e35d261a423601a749e78ba9a63019ae6ceb59d72b3010c056062a41155cc32a34979f00f8fdfcb0fd SHA512 699945bebab92a8d267bf14e8b1f69587ea707484251d45b938a1f909743fdd339f1c6bc5e6d41b30bafb77ae2c8e24f293d817ce746751b15fdd77f0bcc636a
 MISC metadata.xml 627 BLAKE2B 453adb04f4caba9790fe5223635245c8bca7ca5c6dc1930f09537045580b88b5fa1649e47158b13be6cc5cb09b4479a47690e37ef13208b47a95f82d14793a91 SHA512 a5183e9d217d1312e8d383ccb4ade66b92575492b6c8ed8987e3af18e9e456836b62b2d572ce62f9e01aae47b4a2bcbd12f79b4bb6acabfe69c2b63b20315bd3
diff --git a/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch b/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch
new file mode 100644
index 000000000000..37582b05429d
--- /dev/null
+++ b/dev-python/plotly/files/plotly-5.8.0-fix-versioneer-import.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/841002
+https://github.com/plotly/plotly.py/pull/3757
+https://github.com/dandi/dandi-cli/pull/998
+https://github.com/mgorny/gpep517/issues/1
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ from distutils import log
+ # ensure the current directory is on sys.path; so versioneer can be imported
+ # when pip uses PEP 517/518 build rules.
+ # https://github.com/python-versioneer/python-versioneer/issues/193
+-sys.path.append(os.path.dirname(__file__))
++sys.path.insert(0, os.path.dirname(__file__))
+ 
+ import versioneer
+ 
diff --git a/dev-python/plotly/plotly-5.6.0.ebuild b/dev-python/plotly/plotly-5.6.0.ebuild
deleted file mode 100644
index 23112789fce7..000000000000
--- a/dev-python/plotly/plotly-5.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-			' python3_8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-5.7.0.ebuild b/dev-python/plotly/plotly-5.7.0.ebuild
deleted file mode 100644
index 5bd40591e1d8..000000000000
--- a/dev-python/plotly/plotly-5.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Browser-based graphing library for Python"
-HOMEPAGE="https://plotly.com/python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# TODO: package plotly-orca and kaleido
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/backports-tempfile[${PYTHON_USEDEP}]
-		' 3.8)
-		dev-python/inflect[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/jupyter[${PYTHON_USEDEP}]
-		dev-python/jupyterlab[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/statsmodels[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/pyshp[${PYTHON_USEDEP}]
-		sci-libs/scikit-image[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	mkdir -p "${ED}"/etc/ || die
-	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
-	rmdir "${ED}"/usr/etc || die
-}
diff --git a/dev-python/plotly/plotly-5.8.2.ebuild b/dev-python/plotly/plotly-5.8.2.ebuild
new file mode 100644
index 000000000000..727c95cffca9
--- /dev/null
+++ b/dev-python/plotly/plotly-5.8.2.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} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plotly.com/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# TODO: package plotly-orca and kaleido
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/backports-tempfile[${PYTHON_USEDEP}]
+		' 3.8)
+		dev-python/inflect[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+		sci-libs/scikit-image[${PYTHON_USEDEP}]
+		sci-libs/shapely[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index 0a87d4cfbc23..8c3b69fc9171 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,4 +1,3 @@
 DIST pluggy-1.0.0.tar.gz 51510 BLAKE2B 8107df9a91a843166a602e7518dd1d4167304464a8cc80180b60b03a2ac803be9b1ba190df9189907addd34a92b93a6b271d3d6b7485aa563203ce733c6a656c SHA512 cf0bcbb4330c24ce473614befa19548f33fb39fa0ad094e1eae786202d7adadc28e16499f80ab96b630091765404ca5c5b6f9a55bc605e03514d8ab50cf9ae00
-EBUILD pluggy-1.0.0-r1.ebuild 711 BLAKE2B 59dadba37be355f4f607b933392356569dd07198004100d4e50783259c5d173e1a8ce7cb57e3365643a01319033918d4e3bb01c45cd57c2a3b4f4edbbf08c4de SHA512 cfe3d66bb9e7ae7ca6caa1c6ceb4f1fd5bd4a6eb007aec62c2f197c9dd99460217f3a476b34e433d8c51cc2504903d200002dae6a6d648c572741e5ca8f7ca85
-EBUILD pluggy-1.0.0-r2.ebuild 759 BLAKE2B aa356f2325319afb6241f9265436f4b1f86cb1edba9d88865da34224ce49e18e6a21fb100a7be81ab03d6414c89cfd0241fafac0da6f850a6595b2cf26e3d20e SHA512 b9060c1fd5f77e16c6d1fcacd7c36ac375005f970c8f4d027d441622bfe911483c5ce04eca52c9cfef58f68b0722272d4c8ec09cfc9bd1570580b715e3922652
+EBUILD pluggy-1.0.0-r2.ebuild 751 BLAKE2B eb16020730d350fa12e6785d5950527b5f477462297749a2214b605bf5d84426a9242f9d5208c107c453ac42f79c518c5eba71d3e36862d64d6d87c0cccdcd6c SHA512 ba5ca33b49133a54c032867b3ba46781a7811592005400508b3b8834830ed275af414526587e5f015abe3422897970ceb0efac629af50fbb1c31815427c7cadb
 MISC metadata.xml 506 BLAKE2B cdc1c868281f0140baf75a407eeea26276d7b8f8f0bcafee6393fa144fc054ecf58a812b055d7b48b7d5ab4aa5bc504d6dc567acf4336bb363c9854292d9926b SHA512 5fc4f019e2a518c815662db23bc44920558193cf639c093ec365ba120c113929bcbd9b611d6b2cb7e6057c0bd9d50dc5d1479840a6d379c4610b3ac8aa3ea1d3
diff --git a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild b/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
deleted file mode 100644
index 1777831a28b2..000000000000
--- a/dev-python/pluggy/pluggy-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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="plugin and hook calling mechanisms for python"
-HOMEPAGE="https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
index 4ae4ade2545a..3be1018aeb52 100644
--- a/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
+++ b/dev-python/pluggy/pluggy-1.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 24274cf83041..e911e30e74f5 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,5 +1,4 @@
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-EBUILD ply-3.11-r1.ebuild 1127 BLAKE2B 25a02120b4ca2d97dab9f511cf060fda48106c0153cc9d87fac88772bb02d5c1da82b5da8567ab65576054b5eecdac24ea5d0d8651ca9811a2d04361b9aed0c7 SHA512 738e74fe329e7d687fef020050b831bad38c8f82e8e4b48d5360d98977b2abd52f0fe01eef95b9636a3b48837cee5bd7005cb6b8f19a58ee3beb93c72f0a2291
-EBUILD ply-3.11-r2.ebuild 1150 BLAKE2B 3d54a16f536ead5bd80c6d751c4a7d7b4d87060fc5b84e18e95b0d4e425f08e5c6e0d98976720ad5b49dff465e5c2ef1cc3ccc385d3d3e5c4c3434da6decfcab SHA512 ec68d19833aa68d4e953da0b0565bf48dc4b16e8374d01217e6b8ec028b2d4dda048f7bc748741337c5af8ce3da8891d75cac4195fa75740d251398dc3123da8
-MISC metadata.xml 1419 BLAKE2B 5be31dfea59336a1d5eab0c4b6c19bfd5296b487f3318c6e3810157255762d44a81e5b6ca8d8b9e8b64842e7a39492876938eb74f203bbc07268d9d1c44fd2b3 SHA512 3c2d5084f24232d196c1264af4292ee079f33f5112cde19e3d1c9091ca999729a02ead2a82dfba2f5dec0f7be628550d844b13fa54f117dcc11f72eb069076bb
+EBUILD ply-3.11-r2.ebuild 1142 BLAKE2B 2111979ea827f582fdd1fc26e90e42ca1f0d6b1812d2f885efd162536c3024378950e7dbe63c455ee2dbcb09519b89609d2c61a56b164bff99bcf9d93816fe56 SHA512 f43fffca00fc2c32f1d613bbb18c1a861f1fcf98c2b29d73aab79a3f760b6e9405db46d3a04076b510a423787c7e6210c5e9c59b96e454131e560d72f9e09a01
+MISC metadata.xml 1443 BLAKE2B 5df93b13433b1ca18c3a92e1af58fd7f05adacfdb9653b237f927c9c9216400171cab22a1cdaea179a7bbced8b069906fc896dcdf738ab3519ba0f359a07a575 SHA512 9938bfb031ca1108d7abec644936def11a1fc7142947c40b95386376ec6b157a73f81a918ffeca4146b524e254a2d9262be1409033cffa991fe4674a20beeda8
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 05552c21d944..2a34109ebcf1 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -18,6 +18,7 @@ more so than other Python parsing tools.
 PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
 。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を提供する点です。 -- その二点は他のPython言語パーサーより優れています。
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">ply</remote-id>
 	</upstream>
diff --git a/dev-python/ply/ply-3.11-r1.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
deleted file mode 100644
index b196fb5a852a..000000000000
--- a/dev-python/ply/ply-3.11-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Lex-Yacc library"
-HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.org/project/ply/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="examples"
-
-DOCS=( ANNOUNCE CHANGES TODO )
-
-PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
-
-python_test() {
-	cp -r -l test "${BUILD_DIR}"/ || die
-	cd "${BUILD_DIR}"/test || die
-
-	# Checks for pyc/pyo files
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	local t
-	for t in testlex.py testyacc.py; do
-		"${EPYTHON}" "${t}" -v || die "${t} fails with ${EPYTHON}"
-	done
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ply/ply-3.11-r2.ebuild b/dev-python/ply/ply-3.11-r2.ebuild
index 0b251f5d8eb4..523724d24970 100644
--- a/dev-python/ply/ply-3.11-r2.ebuild
+++ b/dev-python/ply/ply-3.11-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="examples"
 
 DOCS=( ANNOUNCE CHANGES TODO )
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index 1bcb337b2344..b210a3b60be4 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
-EBUILD plyr-1.0.6-r1.ebuild 771 BLAKE2B 38956616582268d78bd6d1847b8f9f188c146f095725c7472adb0842dafbf51684f03d1edfc5c08444ac056ef01f2419b8657349a879c558e8c8de83678e3f1b SHA512 6a81fa31073dbec7376e7bb2fa922b7d37478bbf425e3a802d8e75746906972c8b0451c663bb510874d2cfb3f22b38a25d1348dcbc40c613ec629a4ffbff841b
+EBUILD plyr-1.0.6-r1.ebuild 771 BLAKE2B 0dfba25096d25c2a0a21df35b04f5b1d1d25377a193f5c9ce8593357f2c16f833842249d5faada8aad60cd09a01e80d35d6b87b2b00a6c5422ec8fb59bd65095 SHA512 318801f1ac2ed21ea4cc5e342442d5f060aba675a8030c34d582535605959813e9a5b41fb7559e2b562267cad72e038fe6d3f66f610988c5c00ba9c3a7633d90
 MISC metadata.xml 365 BLAKE2B 8a30581cdb4603530b64093b9ba4b374d00de92743eb4548363872381142c23242f09ba32e6bbaead07a06f13d47b1fa5f89e3c5b426f057994c85709f5b49bd SHA512 6e3bb4d6ddf61f54cdd1e490c93c7f0339c58f521719c0c2aac98679c44a1d3e5ca0d064f131a67520ff47fae080e6df3029e2dccb9d158a3128df1341f574ed
diff --git a/dev-python/plyr/plyr-1.0.6-r1.ebuild b/dev-python/plyr/plyr-1.0.6-r1.ebuild
index df2a068cf3da..61bc5e92d5be 100644
--- a/dev-python/plyr/plyr-1.0.6-r1.ebuild
+++ b/dev-python/plyr/plyr-1.0.6-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/plyvel/Manifest b/dev-python/plyvel/Manifest
index d2cf9521d233..255d3b2c8c33 100644
--- a/dev-python/plyvel/Manifest
+++ b/dev-python/plyvel/Manifest
@@ -1,5 +1,3 @@
-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.3.0.ebuild b/dev-python/plyvel/plyvel-1.3.0.ebuild
deleted file mode 100644
index 25f0cbdb9e9d..000000000000
--- a/dev-python/plyvel/plyvel-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..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.20:="
-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 06034a4a9017..8f9dcf734155 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,4 +1,3 @@
 DIST Pmw-2.0.1.tar.gz 830448 BLAKE2B c78fef1570a34b9784f936f16856c4450164d8a232770e59cc084c1113888af8ee002cd1c7ddeadcddaacb5eae9ff58fcbfc270fc066875523e31a9d26770cd3 SHA512 99654e961aa40a64eebc08fe473e94da0ce431e6465255c68c251dfd544a51edef1a5d97dfd89ce756eb5f7fcf917dbef27f646ba9451ab72f3d460daa09a556
-EBUILD pmw-2.0.1-r2.ebuild 1107 BLAKE2B bdfd68ec23822835e2c6c18db3db40ee107e9d1145470c9dbfcf48649ae4ea057c0cfcc0af48c284f4ba1ec87110c42175c000b17038563816c3b0af7ef3c2b7 SHA512 90af072444604f1827ae50567a316006e3e623ba0ed7afa384074dc196798b31d4bb68f39081276cd26eb8fb753960c972ca5a3777d86cc66732b9a746dd6b23
-EBUILD pmw-2.0.1-r3.ebuild 1114 BLAKE2B 67f360696405bc804a18b44605ae63b8b2d4a5477ba930d157ae599d8c902cd84c8d2e2a919d6806bcc94c75304c3e50148d735acfdc285cf43034ce386bc821 SHA512 b9c35e62d742a72ea580b7e529e91803d2190b7084da8a344d94f6d0e5174b001d414e059f63dd2424d35108038c054b869db523465a8272e0d1d00e59fcc373
-MISC metadata.xml 387 BLAKE2B 99c3a902dae4415dd912cad8aad2e27721685de791aa8957bec02ab02e21fc2d7fdefb058c8c1f0ea8068bf32f85067915b709b9f862ae08559578e2078ffb22 SHA512 d0347142c16a2de1e49ca50e30f474abbf7e41eac7ca080c26a5457b8da5fb8808c6b9c2103052eb6772585663037e9fc57ae15bbb42e574b6958b8ce2f968e2
+EBUILD pmw-2.0.1-r3.ebuild 1110 BLAKE2B 342d2805b46bb0af0964117803d6b17f671e1ae56aabe4d685a0ab6b23176bcb4ff9a169ed83cb381857b2b1fc4639f8cdecbd687c793b32dc6320965191de5d SHA512 7304fe1d26f6f85890eeae2555a14b0fcc900937a68f14a3d025edf8cde8291709686e09d2ef86320c8324a8bd1f56ee272808bd6b9496d9975c645bf40e0750
+MISC metadata.xml 387 BLAKE2B 5bb8b4e7edcc726c2347a5007c42a9cda4bec776e1f3cea934b0489ce3559e4f2ddc6c10b49f707433a80c0103aa77a6128263d66bc0334de4cacba5374a64da SHA512 9b6357e3ce690bdb369c394b7aa82034300cb9f4df2357ac0a837e1bf22cbd04b074ca5a75bdd8a2fb27292de40e2f63939e65fdf747a08d6172c507f3696bbc
diff --git a/dev-python/pmw/metadata.xml b/dev-python/pmw/metadata.xml
index 1e51c93f854d..cebbdcc70c62 100644
--- a/dev-python/pmw/metadata.xml
+++ b/dev-python/pmw/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">pmw</remote-id>
+		<remote-id type="pypi">Pmw</remote-id>
 		<remote-id type="sourceforge">pmw</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pmw/pmw-2.0.1-r2.ebuild b/dev-python/pmw/pmw-2.0.1-r2.ebuild
deleted file mode 100644
index 8469d86b5509..000000000000
--- a/dev-python/pmw/pmw-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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..10} )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 virtualx
-
-MY_PN="Pmw"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Toolkit for building high-level compound Python widgets using the Tkinter module"
-HOMEPAGE="http://pmw.sourceforge.net/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="py3"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc test"
-
-DEPEND="!dev-python/pmw:0"
-RDEPEND="${DEPEND}"
-# https://sourceforge.net/p/pmw/bugs/39/
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	VIRTUALX_COMMAND="${PYTHON}"
-	cd "${BUILD_DIR}/lib/Pmw/Pmw_${PV//./_}/" || die
-	cp tests/{flagup.bmp,earthris.gif} . || die
-	for test in tests/*_test.py; do
-		echo "running test "$test
-		PYTHONPATH=tests:../../ virtx emake -j1 $test || die
-	done
-}
-
-python_install_all() {
-	local DIR="Pmw/Pmw_${PV//./_}"
-
-	use doc && HTML_DOCS=( "${DIR}"/doc/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pmw/pmw-2.0.1-r3.ebuild b/dev-python/pmw/pmw-2.0.1-r3.ebuild
index 84486c02a806..f308f527ed85 100644
--- a/dev-python/pmw/pmw-2.0.1-r3.ebuild
+++ b/dev-python/pmw/pmw-2.0.1-r3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="py3"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc test"
 # https://sourceforge.net/p/pmw/bugs/39/
 RESTRICT="test"
diff --git a/dev-python/pocketlint/Manifest b/dev-python/pocketlint/Manifest
index 34d6f4c7414b..5b04cb9022b0 100644
--- a/dev-python/pocketlint/Manifest
+++ b/dev-python/pocketlint/Manifest
@@ -1,3 +1,3 @@
 DIST pocketlint-0.22.tar.gz 23779 BLAKE2B 3698927cc4a3f6ee6de74d205b5a7f937405e7ce2e9d987e34b35ce209635cab37357d0221a6762deb66350cd2b991420a9b12af2c9e6792f713e5c95dfedb59 SHA512 7ee9e6b969975274e7697d1d16fadaac82fa0a1855401d9f240aaae123831dc32e381dd24f88a3f004ab45df9f0251c408ed8f60a08fe99caf629af617c80ea0
 EBUILD pocketlint-0.22.ebuild 487 BLAKE2B ddb58387ad3830f65c4b44cb627e86bbfdd4bf0210bd106071fa70a9e3a5fefc1ee0c4ac91fd6bde07abfce72dff455f1a32501e381460a2d192f4458a7b44cf SHA512 96bf0eb52b41e9696c97fb4161ff526fb9f3acf4fc1f3d83fa13c9f0166eec59e93382d3908257950649058ca522bcb1254984c30291dfcd3789db19b7b0ff97
-MISC metadata.xml 387 BLAKE2B 0cfd731b291e082282acf0d1a6163c2cfe0b6a1a0292de8859b871cab274d4b2789f57f67c198e7659981b05c7323c0c282fde9ccd6182759df26370ff58c723 SHA512 307396f65c4a925b5d8dd8a37ed5f36787af7d9f065da79ccc04858cfe67fe086bc3e765cf95f27db1f3fb0e4cba1b1af9422478a68155384f50c22ed3b287be
+MISC metadata.xml 303 BLAKE2B fd0ac0ccb8faa5f3e9b7074f238915f2b7babb9dc3af3b1574dd3f98e2970182d4cc0e579f59388601e43bd8991fa7cbca570c499f48060a25bdf8279a5c0751 SHA512 9f916df92044f8b6c2351e094e0ffdee2cf039e4d2d2d101ecc5a5e10af58dd4bafa19dc6cba47af87aaf73ad22abd64b50803c5e77cb283ae12c1f9e1653f43
diff --git a/dev-python/pocketlint/metadata.xml b/dev-python/pocketlint/metadata.xml
index 69c97b8b46d5..376e45e89b6f 100644
--- a/dev-python/pocketlint/metadata.xml
+++ b/dev-python/pocketlint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">rhinstaller/pocketlint</remote-id>
 		<remote-id type="pypi">pocketlint</remote-id>
diff --git a/dev-python/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 04456c341f3e..c51eb96e9a9a 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,3 @@
 DIST podcastparser-0.6.8.tar.gz 29809 BLAKE2B 19eda892dcc83f5371d23147a9044bd1249c05885aa7e72edc868e05744bf691336ceb8b445dca4c51612846bc7e8c087fa0c36fa44568a4f95b0e8f3eb155cf SHA512 8c1152c6d7229faf375af5c3f02642debd081915dcb55ba706863620af6039eb710648bf970d1cd8018d43dd36ba579a456e3db0e82c7efcb6ac94a5cd23b1e8
-EBUILD podcastparser-0.6.8-r1.ebuild 434 BLAKE2B eef3eb8ec28dd501793653e6bf766ee711391a3659c813176ef9072681bf9ae16303ceb44a3bd23dda4939f136853147876d7d57336c6b9ff8fa1913b59e9b18 SHA512 3cd84ebf369c5d661814849e3500eda0c3d3038ec49ceaf6400da27326acee378966e11c7e9ff55b28fbd8ca380d3fa536fa578d024ccaf237ceb91ed9cadfc8
-MISC metadata.xml 455 BLAKE2B 041490b1b7d06df15950ac851b6ff6848068e0e6a3bf793eb11c51143d0324a69188d4e6d7fbcf1f93d68191417b5ed659490718804ecb08d7f67386763edd99 SHA512 d3fd0f12693e6b80925ae4fd9f00964e664039c17b973b778eb98dca08dd9ebb5237ca4235b5178488a18839eead5b4a80d362ed53d8eeeda58bccfd84f65a46
+EBUILD podcastparser-0.6.8-r1.ebuild 434 BLAKE2B 83aa5041e05546b8fb2bba7d34fb8c1e16f57d7ed983f730fe0b48ee067275e2fb789b482557382566c5f51a2036d8967d8f98e04287c0d78f05d57bbf1eff5c SHA512 91ee6acbdf6112efe87462932f6590f57e85721575ef13fdbcf182310c3a4f3f985bae688c861d66e7685850d6775e33b65d122dc2c04804dfa1d28036cf332a
+MISC metadata.xml 516 BLAKE2B 2cf902a3f89e91ef879ae5a9ece9dc5a3991ed06c2fe4542a330e5e52f24f850728a8d1588d02481109974c6cb400e6e53952356075c42cc4b0079f383fc4119 SHA512 947c15724f072eddd93600a0c47555c5a191a0c6bb28d1fad0149f6ac510b932678c494faa36a959d4639213c4133b2a9c28037177a6fddecc171b728f561d23
diff --git a/dev-python/podcastparser/metadata.xml b/dev-python/podcastparser/metadata.xml
index e1dd1b3fd96a..b11113d4a48f 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">gpodder/podcastparser</remote-id>
 		<remote-id type="pypi">podcastparser</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/podcastparser/podcastparser-0.6.8-r1.ebuild b/dev-python/podcastparser/podcastparser-0.6.8-r1.ebuild
index 4b639215e177..32d5a3f2eadf 100644
--- a/dev-python/podcastparser/podcastparser-0.6.8-r1.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.8-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/podman-py/Manifest b/dev-python/podman-py/Manifest
index d08f20a46e7c..0613c58498ae 100644
--- a/dev-python/podman-py/Manifest
+++ b/dev-python/podman-py/Manifest
@@ -1,5 +1,3 @@
-DIST podman-py-3.2.1.tar.gz 181095 BLAKE2B 5075a37d3ef20004424536bc1f9e6e08c842248fcb8d8235ebc354e832e78125fb19bd0001f7fd237ebc642e348368da90b634f0db8c84e23ef77e8cf99b71ad SHA512 656a5e61d9809e2866a071ff5b4792fb71fbe0f8cc05467b498718b74898acc39a970ba64fc08ffe70d9c34a9caeabc3d8ea07dcce856fec308b6ebd268b2fb0
 DIST podman-py-4.0.0.tar.gz 172208 BLAKE2B 79e153c9b8e064398f31ad270d0f84f1bcc8ba830d4240914004c5d4eb1fffa32496c5e88b8191b074b521510e2bf0b8ea211a481af8a0ba70e7b0d6c26efe10 SHA512 e1dd48c931871206aae11fbcc31a711eecda89e9c60f62d5616dc3219e073d3ba74d38f63a05d4688e97fb678d2e03f8cd883456f7e75f2d7e313aa859ca3e8f
-EBUILD podman-py-3.2.1.ebuild 1010 BLAKE2B 51c9140975adf5ff1058d8c202a79eb0d3ef276bc200a147485a6a24d4b6e1ad41b4e1f5e27c9591dbd62ebbb3c511f06afbc34e8f511353cfd315a7bd127186 SHA512 63e850654d60e3e7d5c42a1dd11ea1d5a6f0cc3aaecea552c7897828a2be184c975c3a840b6715d7de527a45cc5669c469e30a5f5e8704fbe822f4a8e6e95291
 EBUILD podman-py-4.0.0.ebuild 1043 BLAKE2B c0bcf07a8edd5cf477b96573f7cc3391aef6e0c110bb0385080b9b18763be6bffae2aca050b664c29ea5e9add7046ba593b3212ad68db3d292a2d11182188083 SHA512 cdb128ad8c28758e114df16fd7be45fc05f38860e2d3732e5eb7fceeebd7e3b378f5e34bc1515d17d31df7a1727ea561f5b84b189a92e85d4da072e007956809
 MISC metadata.xml 475 BLAKE2B 42fc2c044df94ebf8a4eb5088a39ad3075089cd5a007473db0964df4efb8c7a437c94db9c161d6ba81d2c017377919861f17b7fe3e133aa597312cad2df012f4 SHA512 017f54ebf56fc59c14ff0e9c2f15b899556ff3d512d22ed2abc35227c079ec64c8eb855f60e65299abd7f8b5433b2268dc7c2e428476efc334e24f0d90181bc8
diff --git a/dev-python/podman-py/podman-py-3.2.1.ebuild b/dev-python/podman-py/podman-py-3.2.1.ebuild
deleted file mode 100644
index c0d18e6cc5dc..000000000000
--- a/dev-python/podman-py/podman-py-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="A library to interact with a Podman server"
-HOMEPAGE="
-	https://github.com/containers/podman-py/
-	https://pypi.org/project/podman/"
-SRC_URI="
-	https://github.com/containers/podman-py/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.10.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		podman/tests/unit/test_volumesmanager.py::VolumesManagerTestCase::test_get_404
-	)
-
-	# integration tests require a workable podman server,
-	# and it doesn't seem to work in ebuild env
-	epytest podman/tests/unit
-}
diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index 469a0cdd9cb8..f8712d7e9389 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,3 +1,3 @@
 DIST poetry-core-1.0.8.gh.tar.gz 414941 BLAKE2B 1f663d927aee1f18a9ff38cbf95809538bf9c9e8079d040c240fbc1ffa9e492c6fd20c69f89ddf7e68ddea05beee3b909fdee02e93f47437fffa687dc492ec9a SHA512 6dfed1e1124c37a5f0ec535ede8848e25466da3df6fa6629f6330ce32f05a4d82725d64407e5bcf294d6e467b52966642505ee29f563d3794c4e7aca78045285
-EBUILD poetry-core-1.0.8.ebuild 1587 BLAKE2B 8b16b51d343c468cdd3573179a29b188d46ab7e5627e74439e9e2bb36d767c1373b7c0c279638e7a7938b21dfefc59e4ed24505f3cb1728462e5fba7fc4cd746 SHA512 3b72ea6c80ef0a7cf1cae959de086ad6953fca528957638f9717c99ad193197c9d5a995479d0a4d2c5c059862c8c0e154092c74593becf30708b3318ce7eeb93
+EBUILD poetry-core-1.0.8.ebuild 1593 BLAKE2B b118fba68c03afda98f3bc816c1e6f0c484808bc1fcfdc92f308d3b8cd4140fb212cebe8fb0eb6f8c6493ea4fbfa4b04ac6ac021ffcfbf3566db1c87d4d07404 SHA512 09b736b8a4d2cc54a85063f48e8a6782dab52f6227aa4e71238d522adce5e174356345541e6ab8558f4c4f59c5d2ee829cc8f273cfd21961974aa0639682f276
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/poetry-core-1.0.8.ebuild b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
index ee2d78cdaa1a..e5d93f22a8f1 100644
--- a/dev-python/poetry-core/poetry-core-1.0.8.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.0.8.ebuild
@@ -4,11 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="https://pypi.org/project/poetry-core/ https://github.com/python-poetry/poetry-core"
+HOMEPAGE="
+	https://github.com/python-poetry/poetry-core/
+	https://pypi.org/project/poetry-core/
+"
 SRC_URI="
 	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 05e6c1cf1412..c4f870600657 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
-EBUILD pooch-1.6.0.ebuild 944 BLAKE2B e70344ba7df04b0ddb68f3159332dd66849957dfe0e4a37c1b9613425131e3b2cc6e1fb6f256c2bfcfd5e9505b10506f5df37b9fe5ab8131a17106431e32eff2 SHA512 6ffc15731cdb1ae5ff9ca28d809bd4d6345e30888be925fe1ad571aa73737b989ec3138284c72b96a55a24105f4a441953b6d453e50d370f11b219bb12819921
-MISC metadata.xml 662 BLAKE2B c5ae3d2129776a265d43bb666d74a46b541f07ef55069e3d99d106161b1c1e2a5cabf6221529b49a24d10c4ebfb00e8301d8b6b3aba4e5b6c4eefd96004ae0bb SHA512 2ac2097ecce4226f1816bc19491c54c8aa96584bb70781f1253e63093264a9b1371e5348a06f5ea293b086452e5a618a5afc04d7b967e85c62bac027bd3ffdc0
+EBUILD pooch-1.6.0.ebuild 945 BLAKE2B 6cae26a824d81cae6d0c260938115b409fa5f1cf66beb4f9bb4fbb48b6a3f478967bfb31ccabd40487a4e2589007f33adc587f717570361bd167a2a3cab89351 SHA512 b48468199592c442cc0055af257ce0fbb2acc12f5ac13863b862e6fd1f166ca6206f80799f9ed2c749ec8e981fd0c923bf341f017cda4c0300df124e35e1e989
+MISC metadata.xml 684 BLAKE2B b6cd1db5a31f316800c9c5e15e11c858bebc81b7c38ced227e7f54a5a0386462fa9a92bb8f177d9df0d3fea00775dced1e2eebbb1622fededdac87ce40db21e7 SHA512 a96adfa4b8996e2685f7d5ea8ab6936fcc795a3f517da8ec14e885c08b2ae1f6d950ea9314e8aa6a4b2a4b436a23d1e98a6d56b5ae0c633bffc4fbeaca4058a4
diff --git a/dev-python/pooch/metadata.xml b/dev-python/pooch/metadata.xml
index 091ec6e2cac9..82f52f3ac83b 100644
--- a/dev-python/pooch/metadata.xml
+++ b/dev-python/pooch/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <!-- maintainer-needed -->
-    <longdescription>
-        Pooch manages your Python library's sample data files: it automatically downloads and stores them in a local directory,
-        with support for versioning and corruption checks.
-    </longdescription>
-    <upstream>
-        <bugs-to>https://github.com/fatiando/pooch/issues</bugs-to>
-        <doc>https://www.fatiando.org/pooch/</doc>
-        <remote-id type="github">fatiando/pooch</remote-id>
-        <remote-id type="pypi">pooch</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		Pooch manages your Python library's sample data files: it automatically downloads and stores them in a local directory,
+		with support for versioning and corruption checks.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/fatiando/pooch/issues</bugs-to>
+		<doc>https://www.fatiando.org/pooch/</doc>
+		<remote-id type="github">fatiando/pooch</remote-id>
+		<remote-id type="pypi">pooch</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pooch/pooch-1.6.0.ebuild b/dev-python/pooch/pooch-1.6.0.ebuild
index 4d6451e1829f..6c6de3de6478 100644
--- a/dev-python/pooch/pooch-1.6.0.ebuild
+++ b/dev-python/pooch/pooch-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 2b00dcd3e73b..18d16dfa43b2 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,5 +1,3 @@
-DIST portend-3.0.0.tar.gz 9439 BLAKE2B 50c6455c8d5ad51e1b523d4aa150ffc5a607a35d3c6fed4d2f686f2fa7fd7eefbe00bf0a033b9178b205e5bba5650e3de484c66d824f41b259ea031b985d2ccd SHA512 7228d454e7d22317de3462edb1e2f1b7fcf29e4601c9373709d80260ea5964c0dd4fbc39543e27a7f375b478ca119b285e47fac6ffda41401399cbe7bf485c8c
 DIST portend-3.1.0.tar.gz 9448 BLAKE2B d9391577ecc6f878ebbceb07266f06902352076fb61164b5e905a3ed0a557ce5dafcd8e3c77a099aab97fa576aee5be024d98f457e3b333aa80dbd534167218b SHA512 017dff68ea85f48d19398f71fbd8189329ca9c27c05d8599dd5e53632eb5ddc6dea322e94c924a0653f25f042a3c8ee1cda5f8450b02f3406a72036d54cd1aaf
-EBUILD portend-3.0.0.ebuild 644 BLAKE2B 4c029c20e8c10e62402446c5cbe908d7c843c3beb41d4266ef06c7ac9b9c09f8e3cf93e5aad279a8fcaeeb1a4e64423795439ced40e8fb0853fd9a24fe543c15 SHA512 64e7e503e2f71934a20739e86b186b61c60a6801a9becddbdda7e56072b03af15fdf87aad68b3dbe46708f0e160d847ca3e721c0631d0ace5a8ff3b2f05faa34
-EBUILD portend-3.1.0.ebuild 660 BLAKE2B a99d86b49582de918b44e09139dd0efa5adcfed9bd0c019804a5719c1ab72bbb31c7f2bc19885d1f0d598bd14d838d692a41d1a08f1eaf9ae302572f19fce2c0 SHA512 49933bbc879bae84123d046e66dbd40ef920b78a7aecc1b1032d247636e732d8ee0325930f06805cf6a22e91dea0f6fc17e3f1b2bc8f3212007284f0d4d5f27f
+EBUILD portend-3.1.0.ebuild 652 BLAKE2B 76c4e258a8707805de339cbfa80b6b6ce6063a38756dddc15c83135dfa54c69fc6fe48a5f7ad90083166e6577dcb9a38febacfab95e63ccda166424f1de4fe73 SHA512 c3f2da79386b2e40231e2c2f3d908cd2f48c3da89a21ddc9832c8a96897f7d9ff13fa386e2b6738dcc78704f0aaea43ae7c359eb53c6c116f9ec09edda2c714d
 MISC metadata.xml 494 BLAKE2B 00d31a220312e6d69d0a037174e45cc0e5ecbd963de8e513b6b0358ff40acbedc73e316801daad373e4007ec978f5097b4c00e25f2198ce86d5dcd879c4f2e2d SHA512 ca046a5e36611bd83928b4202c24af68aa7cc1cafbf2bd62a86ad4751226389885ef3aab6be8a25ba17513c89924901d5ac2a31ff27a2798506bbf2f09df2ed2
diff --git a/dev-python/portend/portend-3.0.0.ebuild b/dev-python/portend/portend-3.0.0.ebuild
deleted file mode 100644
index 4cc0735a2a31..000000000000
--- a/dev-python/portend/portend-3.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/portend/portend-3.1.0.ebuild b/dev-python/portend/portend-3.1.0.ebuild
index e0b00c9ec297..ac6ebf244cc7 100644
--- a/dev-python/portend/portend-3.1.0.ebuild
+++ b/dev-python/portend/portend-3.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/tempora-1.8[${PYTHON_USEDEP}]
diff --git a/dev-python/precis-i18n/Manifest b/dev-python/precis-i18n/Manifest
index 4e3826ba37e8..0c19929eb97f 100644
--- a/dev-python/precis-i18n/Manifest
+++ b/dev-python/precis-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST precis_i18n-1.0.4.tar.gz 67599 BLAKE2B db1f614b46015741b9f511b9a5df12e44b960ffb247357bf8d2e9f3a1deea9d417eed937e6c9e6a34d19a22c3e6d87bf8f2314767cd02b15cba068759588896f SHA512 f57840cffe1224d282e707f6a36ebd53b539f9acee58de7053f28ceed5356bd35627d7c205cc91dc81983925cca55138715051c0ca535ca1dcc9d26aad9a9353
 EBUILD precis-i18n-1.0.4.ebuild 577 BLAKE2B 2a399670ac691ff8b161f416d4640dfb412cfde7fef4c3bb98e87184b9bc18a2f853870ec46ff08b3a7fbee3fd89b695c5fad9db63e4dd3f483d7254cbc07d55 SHA512 286e3fd7febd92a474520fb67e9a6fad117aac50221222781c9226d7e04987aa4ed98c0bc9b791185f00462d2613ef4b43e74e3704ff9dd9d0f0883461db3ead
-MISC metadata.xml 919 BLAKE2B c019ece354a6f04003176e3237a9e22096a70e4b280b8f93ec955636d6fbd017539858dce2aa9558f85f8470f6a5528bbaf439b7e8ceb4e459a20616601f28ce SHA512 4012d3821b86169b56c198b9f760172ebb6f62349370b0bc92ab8b6b0b6ec0cb95fa25ee4d3bc3b274737dddac897f7ebdb1ca775175e0ce627e3f4d193e81e0
+MISC metadata.xml 992 BLAKE2B eb9ed20de9967e142348667d23c3b81b0962a35b606806c1795abbbf1c1366b300673c30733eb8254a84518a05d5211356e1341dbe2d2ab56abc5e9a72520735 SHA512 22148b307c78c80b9363f00ca984431946a4d7275799f71a8151549b475d6671aced5ba790b050b8dc16d6136ca534c89f96c5ac8a49edc8267417fa39367cf9
diff --git a/dev-python/precis-i18n/metadata.xml b/dev-python/precis-i18n/metadata.xml
index 5e7e5bff2356..6e539107fef7 100644
--- a/dev-python/precis-i18n/metadata.xml
+++ b/dev-python/precis-i18n/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		PRECIS-i18n: Internationalized Usernames and Passwords
 
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 596a3a3bcacd..003c3adc6b7d 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1,4 +1,3 @@
 DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
-EBUILD pretend-1.0.9-r1.ebuild 636 BLAKE2B 46173e947d7c83dd35745007016b2edf123a8de305745bd5ef0f8d910672e46aa510bb20e6ebaabb1df99235e1e647f73065b4929e95eaf938a91a640f7dfb6b SHA512 9275e1301cad1f97b396ecf89713bbbbb6915f9b9d9f2ced92c1864084c8f904fea6c2d65d1874010089f08691c927dc4a198708fb3a9b2a9cb8fd17db844edb
-EBUILD pretend-1.0.9-r2.ebuild 685 BLAKE2B a22a1769a4b818272c341775e65835250844d85f3cfa56e50d4761113dd417ac4ce3327add9cad18304ff826739c9f3e2abdcbf8c956f180aeab0578115c720f SHA512 7a1fa4a3c6f3f03de6e526d53459b20f3c29eac691625dbfffece01815e83a233c3953b8d1df6257d75e7f5da1cca6db1425f56a24c0d48833843f0f0729804f
+EBUILD pretend-1.0.9-r2.ebuild 677 BLAKE2B 00d5952e0cc01b98d1a2de39a86b62b769a8f705dc7e176f6e39210fc524115d999ab21edcaa194e99654fab7fd5f4d22309020b8066aacc65149d43e61337c9 SHA512 3ecfb770ac9270da6ce27ad4711345030a8170b8f8154637f8ca5b780dd8b5152eb98a521929fef98e0b9fac48264004e3847a65b5145a85d590831af1d61c56
 MISC metadata.xml 400 BLAKE2B a021fe05403ac78ec9e777a5214a66db753eed4dc98fc912102a6f58993fe507455ff7666f0f2d0b3bc8e035ec94def5f2562dc0565444b938723c21c1462cfc SHA512 982fd46410dead08959a8595503b24fa23eb3bf6e1f6ef3ba34845e0345fb42a7631794bc2906cb8a68c56b16cc49cdec84aeb5c7b348713731fa9812d694960
diff --git a/dev-python/pretend/pretend-1.0.9-r1.ebuild b/dev-python/pretend/pretend-1.0.9-r1.ebuild
deleted file mode 100644
index 07d771c34f88..000000000000
--- a/dev-python/pretend/pretend-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 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="A library for stubbing in Python"
-HOMEPAGE="https://github.com/alex/pretend/ https://pypi.org/project/pretend/"
-SRC_URI="https://github.com/alex/pretend/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild
index ab44f3afaa3d..a9216194e4bd 100644
--- a/dev-python/pretend/pretend-1.0.9-r2.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 69e4b9bc2876..b041d8b3d2e8 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST pyaml-21.10.1.tar.gz 20466 BLAKE2B c90adb2023c9555f55a6fafe4e82fa8c50795a9f798250f640d9db6511584f3715a0a8fa4ee3cb26148967c75d59665b05915dd6ef1d4f807bfc7a68f2818482 SHA512 3a98a021856446584f079bfb7427c63feaf6fdd1bd0d809d46aa0c646b2cb9533c393ed0167240be587aad7b94209b6e5bfe2c09918b45ec9a86ad9781bdf9f2
-EBUILD pretty-yaml-21.10.1.ebuild 671 BLAKE2B b65fd88d1876cdd10d0dd6b2ac14888d2e0b1c2bb1bfbba9b9d928e75b24e4bd74fee2bda2be82d69784b72ef76a233bd0208c4f75d089a315988b43f786a906 SHA512 93797c9d979ecb023226f41a896c353f71e35b02b04e80ea75723a3971f2327de9ddac3bea1a06e062021f8694ee5d41f98bfbfa851a790421b9e64e502155b4
+EBUILD pretty-yaml-21.10.1.ebuild 671 BLAKE2B 611d5f3e94827599f160a9d6e7c1bca3bac78781149a6553b7703516f9695159d7a6e7061105d281b2ae2f5f39e2cb3f2bcd1d1b5a951b8b514f36aa6aaafebc SHA512 d95561a849e4434b9f1b46c4ccffa7a947f917f925918bb90239e3869bebe7526693d7a997f1133b1b96ff64469a3650e4d4dd543eb38d91cb7ebd179ddb1136
 MISC metadata.xml 470 BLAKE2B 725657a34cdcbddf146ea3163af81fd22f78b895281e7dc2192b8c1f49fa9ec868e41a38bc371ce61160535ad0c5c1d8741109858cb8e3eafb40a77d623c3ecf SHA512 c64f440d674396b0a750780cbc5ab1a5003be1d3357b39a792cb9490870c768ab740266575cf6780f173252a893f6fa93fe9d4f414647274e520c4bd4b579c67
diff --git a/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild b/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
index 788583ea9577..dc848a5bf91c 100644
--- a/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-21.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_P=pyaml-${PV}
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 2c44810e0f04..12b31d59b45f 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,3 @@
-DIST prettytable-3.2.0.tar.gz 52976 BLAKE2B ec41ffe9c752f530128d641a3341cc5c2dc4fd26ae8cf795fd526144ae8c82d359d022a9d52aebcea3217251c7d9513ef2df0f50c3a4f31ec0c2ef6b9c7e6189 SHA512 8f2a0945159727741a52ffdaa5602b862841cb8e0c33d3f755699f4376d2c0bfa539a270e56242503f94cb4fc469cbfd27348abfd740ec8f1cd3f1970053e5db
 DIST prettytable-3.3.0.tar.gz 54305 BLAKE2B 4d131c16b6c6a0fd64aae1f9f54e286bf27b562888af56a6944d192a24c05d6138c3bdb8f298dcc060db7609d72b8d86ab9664bf6bcf43cd2105bdd433bae3cf SHA512 e190717e2ea89e8faddc7015fd5118e0d93ac5f5318641ce5960b22b4ea3740ff12c4d15812b33655252f258c96f9e848f554d1e678d39761c28025ba7772609
-EBUILD prettytable-3.2.0.ebuild 780 BLAKE2B 66290b1b9b3217068b906805c9fa4b786603f944f6d6a0b5af825d913baac947a6a066649a547e489636ffd6b093737cd870bae7d8cb44d1e8ea4a5622533b6c SHA512 8bbbd5b9eba073e747a1c3df13f98dc2f3851e09271d51c2da2b711129ff4ae4cf22034afc33ed792ff9cabf68fef5c3c09ca6f97a4e875ba470dc195a8fe40e
-EBUILD prettytable-3.3.0.ebuild 785 BLAKE2B 4d788476429eef1bc52b6ec08a6732378540a5bb2e5ddde0a05bae88e99720169300e29945108c8dce00fbcd7ddc494e07436dbbd61bab5d3a40f884cbce0948 SHA512 7487dc756206d08add72ca8547f8a675beb11b748594ddf41b5687b7881c89030dd3383ae7fc1fb27904a8fc5cbba76cec86e8b45ec3d1044669d35c59c22684
+EBUILD prettytable-3.3.0.ebuild 782 BLAKE2B 3dd7611537257743e0bbabab911a2aae4be5e1efbe5f6d0e7fd60b39099a02c4b9219efb9d289398e0287eb4e1319cdd31b544e7084aeedc2017d906d66430ab SHA512 1baa694913f1cdb9fe99ef332cef406631421db174f5c97dbe5dbfb963005931e43dc5eef61fa23717b5a90831bd98dcd2092b12cba9a84595e90ba4fbdcc5e3
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.2.0.ebuild b/dev-python/prettytable/prettytable-3.2.0.ebuild
deleted file mode 100644
index 5ce1f0f06343..000000000000
--- a/dev-python/prettytable/prettytable-3.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.3.0.ebuild b/dev-python/prettytable/prettytable-3.3.0.ebuild
index e5850a816952..ad2e242e5cea 100644
--- a/dev-python/prettytable/prettytable-3.3.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.3.0.ebuild
@@ -4,19 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
 HOMEPAGE="
 	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/"
+	https://pypi.org/project/prettytable/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
@@ -26,6 +27,7 @@ BDEPEND="
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 6eca89269932..9e65793e5a5a 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,6 +1,7 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
+EBUILD priority-1.3.0-r1.ebuild 771 BLAKE2B 03f1e1e7622b96eee80e37a991ad03b622a2a00e61bfc82eaf79ef7f04dcac7d5e436a0abe05f4ebc18654c28453d9caca6b0fdc6f873cdb6e8782092c3ca357 SHA512 50e3ae2d7604c32d36f81d6c31c8614a81b778782503f808eb64f3545af6419d7428d2deb85bad4f736f80b49eef62ce832e72c5348dd75e8545f5f78dce9fe6
 EBUILD priority-1.3.0.ebuild 718 BLAKE2B 31df88a983cca618ab29ea6e17efc147a7e3c9b76e4648e3070e58ee0ebc71ab99848090b2f5640ef73e79fee515164f82c15bf4fed3a336d045c141b8cd5d72 SHA512 f0e97a067ebb736e5a50e840ab39618455730cda04991a31f9cc1905f55753635ccc5daf1e2738c654d557ef751ad16580910b531d39115dec6ab83bb3c31ea0
-EBUILD priority-2.0.0-r1.ebuild 698 BLAKE2B fa99bc11ed459459fb64186fc45f6c6c2838bf642c1f9c75f95e9aa41f0fc610911c9eec070a1506bbd801de807f231e36a92b290feec4bcdca9223a53d68be3 SHA512 eaa477f041a7c9e747bac94bdbba68cb7e97e3fc0a6d7de3b0435e55a39c43e4f340cef2437a1095369365a76bb8486adcc3ae94bfe34850fe614fd58828d546
+EBUILD priority-2.0.0-r1.ebuild 701 BLAKE2B 4f965add99cf3b4e05740b8e4658900897c19147e8103ebb908c144b6859a8fd65efc5639a18c30a409764229f4d9b1d87999254e9a7808a8b5fbe46a0d98978 SHA512 410e923e0e0bfbf4c4fa3b9e38d2b762068b8e997462d587f701bd7f227e3c2779092de77b58ce199b70de3b3401bd6eb54ccd9af5fbaba810859a2cb72f9bb8
 MISC metadata.xml 840 BLAKE2B f06ec0d98208bec42462213928f2f312649ff7765747b591e4ec0b68fecbc3666c0a99d328c11d0f0e8a086b2e82dc76a9f82503a6e70a2346c802f9026cc692 SHA512 cf9161bb9d3c488dbec74364385022a067b9911caa9bfc2499c00e49342303ffea899e67eb5dffc8fc5a4285209eb4806db2c28d16f91e8407879101a2d324fd
diff --git a/dev-python/priority/priority-1.3.0-r1.ebuild b/dev-python/priority/priority-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..7d55561bc434
--- /dev/null
+++ b/dev-python/priority/priority-1.3.0-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
+HOMEPAGE="
+	https://python-hyper.org/projects/priority/en/latest/
+	https://github.com/python-hyper/priority/
+	https://pypi.org/project/priority/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/priority-1.3.0-test-timeout.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/priority/priority-2.0.0-r1.ebuild b/dev-python/priority/priority-2.0.0-r1.ebuild
index e18fa7a80fef..959444a9f5e0 100644
--- a/dev-python/priority/priority-2.0.0-r1.ebuild
+++ b/dev-python/priority/priority-2.0.0-r1.ebuild
@@ -4,14 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
-HOMEPAGE="https://python-hyper.org/projects/priority/en/latest/
+HOMEPAGE="
+	https://python-hyper.org/projects/priority/en/latest/
 	https://github.com/python-hyper/priority/
-	https://pypi.org/project/priority/"
+	https://pypi.org/project/priority/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index eef0974bf84d..d5c2e666249b 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,4 @@
 DIST process-tests-2.1.2.tar.gz 11554 BLAKE2B bf4716f32b8d5e6cd8d5f8eef1156c09545fe22e48134fa0f98c47172141f0365f1995c2dad94c4e3a6f5a151883f92048bcd943fa07faeb7eff9c60f18555df SHA512 56a76d8467312de34413994e663eb63378ff179720b883037735eae9d8f23a5cc0ea32d4a9a2f9041af417b5ada07b7948fd481e3d5b2cb43db3c19183f6b263
+EBUILD process-tests-2.1.2-r1.ebuild 687 BLAKE2B 8028bfd417a4c9b6029ef6d52087fdcbba5be7d51394a7f6562d5783b4a0d38a07296f057118bc0823d770bc254b833b4ebe763ed204f276d1862506ed9ff004 SHA512 80e795198bb9c623e2e91cc6b8cf4392aa7c2f59b74d9b6446b40a4fc524608fa814733d9c33f59d1df5f44f33539efe641f1d839232df2ccd02ba45c2dba903
 EBUILD process-tests-2.1.2.ebuild 656 BLAKE2B 647cb440278a8908464ffeacd90be3abfdeed1c95884c68dc0a482ec8a43e48527e0c2c3282f316a0825095a23bfde0240c57232d221b3de25af3c524d1f8b8f SHA512 6aa6b07aff67251f7e358cbf9e44a169e0fcec669505ca395fd4e74df43d4b25ecf558cc4e538f0b8c443c46597c04fa033e73579bf7208e8efda33094374cb6
 MISC metadata.xml 409 BLAKE2B 7a2bae7ebc779208f6e0eee56ee22501bda63f16cf87e692db98bab91570cf7c34dde7f1a41212b15e4cf88e41882dd1208a8b95de4af8989f012564bcf7f6e5 SHA512 71b33097b25a8ab5b37c52ac641a4a14cb667f82601a0eac53e5e1758c9a45d7132ce280533be4b833ae34756de2992c11c0671f75ffc45e095055e704b84852
diff --git a/dev-python/process-tests/process-tests-2.1.2-r1.ebuild b/dev-python/process-tests/process-tests-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..8c972224244e
--- /dev/null
+++ b/dev-python/process-tests/process-tests-2.1.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for testing processes"
+HOMEPAGE="https://github.com/ionelmc/python-process-tests https://pypi.org/project/process-tests/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+# There are no tests at all, under TODO
+# tests/test_process_tests.py is just empty
+RESTRICT="test"
+
+DOCS=( README.rst )
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 281b7a2393cb..475a371b3c67 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,3 +1,4 @@
 DIST progress-1.6.tar.gz 7842 BLAKE2B 102f1ac481b5d5007d72b02f5451ad4bf7ef986be35034f68fc94108025ea274494d3d9fe56b9473c8ea6ca4abc2cfc458b453550d180fcf567f8a5c5feeafe6 SHA512 58a614bba5a7273a42ba5e9607b3a965fec17f26a4f24563d4c13679ea32b23dda7509c5da81a2a34bebeeedd91154d0457ab8dac95cc7a092add2567249cc94
+EBUILD progress-1.6-r1.ebuild 608 BLAKE2B 0404b7fcf5edf73421bec7434fab018dba0a8205202cacd774194f9ca10da5dc28323f36f1ad581400091e70921ee04c86b699564da96d06031c4573efe61fd6 SHA512 e44d13e3ef776013efc26f65e61ad3e3acace20495a49a7a79afe69978b75faa5a933d93d7979bdf3b697d757e3e158900027bf2f65754385d67f72d84528da6
 EBUILD progress-1.6.ebuild 569 BLAKE2B b892ea2dfc5e507757b177473655d6d2473ed45d2df1ebc6b19d7b934402bb256c8062e346e5f4d6644fbfe1b050c65a81087dd50b4b098dd94ee5fa2f534e47 SHA512 bdc1dc45d6417a2930810696baaa9b1a522997229450a728180629fb157196722e7ba1a869a8b7015700894f395eba832a8938033db7984b1cf316b6e7cb7bb7
 MISC metadata.xml 392 BLAKE2B cd42262cc89d7106cae20e488eb8c11a83b891b474fba09ed3f23e68cdadcd53c5c1fd2bc3f52cd7be2877b120d5a019df19467a2e24d02b7cc66e4519bfce62 SHA512 0b9899e3fdac20740b4bbab98f4bd8ba794739a408f10c5beaba4d83c50d1bb0d97a46647b8d0a7da97cf3dd33521a2d581878dbcd217a5e2db0423fd3df94a2
diff --git a/dev-python/progress/progress-1.6-r1.ebuild b/dev-python/progress/progress-1.6-r1.ebuild
new file mode 100644
index 000000000000..5e3d96596ba5
--- /dev/null
+++ b/dev-python/progress/progress-1.6-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.org/project/progress/
+	https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index e77ba7203426..0b8235efa915 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,3 +1,3 @@
 DIST progressbar2-4.0.0.tar.gz 663046 BLAKE2B 1616f1b9c5f720f370dc9eb02ba37cf83391c853a525fca523fb33af1b580f38647b835a83558674a78dacc33bf7652cb9af8799ad13763f62d33417abaa35cf SHA512 b9b9dabb3093e42bc6f40c0e284caae2d29ebfa450db379c214a5ae39e7ccb8c690655da21a44882d0b68f24d83f55a3342671087a25ada168bce9d236685666
 EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 2842582020925fb7be82a1eebd95c500d16cec11c87b5914e1b7377f6e5f9f9ccf812884dd4228ea065561b1fb70b5359c11c8d7f6f11554859f360f346008e6 SHA512 9d640141010c8047bd20f93d2dfeae96036860a6ed2655ed7fef8dbe92f074b9021695afa069fdb94837717144df6e27c2b5688015ad90e1fa5b41c100c690ef
-MISC metadata.xml 331 BLAKE2B d2dac5a8c7f9c61da26e79aa470a02db594999812eaec2915c46039eb2b616d4575fc24aa40b6526201782d5fcc66c4558629636f584276f6087280c74da450d SHA512 bc73b6b943bd29892d00a18b0018ed79f8eb727f4f359234920adfb35db95b6becd79735ee10b473932a63f37e869fa0379414b9532f7360caddfa057b609446
+MISC metadata.xml 404 BLAKE2B 774a579e397ff18f4196eaf238847e52062742b1ff00999e6b970c4a0f5e032d6caf57e2f64903882269738bdeefa3b3533711d36c68694989ffe6b508c9c467 SHA512 95bd7c3ad0f1addc6d6dd57aa89f04b20ad7019b35468aa44cb5077a819c4658cf64196c5443a671d8beb339f5bdbf40e544807b21c7e2bc11b39da5e0e8dc99
diff --git a/dev-python/progressbar2/metadata.xml b/dev-python/progressbar2/metadata.xml
index 1785de8d3372..5d7c826aaaae 100644
--- a/dev-python/progressbar2/metadata.xml
+++ b/dev-python/progressbar2/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">progressbar2</remote-id>
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 64c8ac846cf5..05b09db66388 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,5 @@
 DIST prompt_toolkit-3.0.29.tar.gz 417831 BLAKE2B f46ff507c991f6bf9536f0161cc79734013c53dddd9053076a8da7532233138fd179c6adb009af575329b3a78ab5bf6ef34e3d8eba1f5cf80cca951a32cfcc04 SHA512 a0d1562fe4ced52972ca7ee3bc9fe158865461b28be393436651f326cf2ddf0553d49ac8051ed700ef95d3ce2a76b9fcc10d92b6890203aca4e27e050cb814c0
-EBUILD prompt_toolkit-3.0.29.ebuild 624 BLAKE2B 71e3e0ef66e87ddb180ac72aa4c91a71799f022bcb0281ad492667ed0626f1d786146050e82648f0120f36b4df8b8a614a4d6ec4ab0403211c9c58f8deeb98b2 SHA512 8ed1228d59ceb367d94f5a5f7aa2f4f02315b95c5780946ce61f197e97f192dcaac2797a0db6b2d5a2c3f8bd42eab37001156a4443218104ba840e98fa35cad5
+DIST prompt_toolkit-3.0.30.tar.gz 418985 BLAKE2B 2edc5024e22ccf60ab68afef9958eead5711b88f4f2abfde387e626893778eda5203f855a5590776b25efb3fccea87012d01e39551d192861841dab188d149e8 SHA512 cb0b9d71b09c353f2674052d75ec16a1803e0868ff5dd5625eefae767d45699b1b6bb99e4d98d3bca7ced7b60f52806ec10ed7ccab8a830c62d51baeeace23f7
+EBUILD prompt_toolkit-3.0.29.ebuild 624 BLAKE2B 55f6792522d0e9060e8450a4a746773f224fd920d63330ab4f1a926ec1f2f84384451d9602819dcf16f95924aef7987aec9fdcb619e937d5038c627d76f30e38 SHA512 29e465000f016239bddbca6ac3c9f880ccc670f812d3a9c58ff8b1e17d288bf61464a2d23c33331f472e66ba870a7adb87c7f4be01d11de4d8040374b8f73141
+EBUILD prompt_toolkit-3.0.30.ebuild 632 BLAKE2B 39797963edd09eb2b760df5a940bded40aeb978dad95643bff7c25e9ba2652ac0454c7abcda5ee6b7acb09403b90ade888273d78474eba3d2170ee8d45924920 SHA512 20f369e8817ca6228878e0663d44f4f127c29e49caca1fda69242a156f91dd3498502fa6a1cc5bf99664b04de135977ec71c605cb2dbac0c926a713311cd0da2
 MISC metadata.xml 431 BLAKE2B 534336484c65b57df5e672729ff722b67445948e0485c3a62c2f7081724cb951b5157c600dc6162a3bb857c2be0f378b18670786279ff8b5cff2858588f8ebc9 SHA512 a9bf68326839069c61e70d4ef3fe304706f2543b9b91eb291566dd66f36d1abec00382ae205549a35f10dfc730f4613c5cc5c0ee4d6858538d50c4145bd3b15e
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
index 70051e586baa..f2629af78381 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.29.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.30.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.30.ebuild
new file mode 100644
index 000000000000..daef0b2a5e76
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.30.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index 9de61d6eb087..b9c9b7592f70 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,7 +1,5 @@
-DIST proto-plus-1.20.0.gh.tar.gz 65648 BLAKE2B 19cfcfde913896de83d17c36bacd7799a9f28ea20c4681266b2194c6521aef116f6a594df8be8912bdf55558d84a0ab09d283ec444ba114592ebb7017db257fe SHA512 1e399bc0ac686f33242c1d15c15255ec1815e94eaf87de03e5145cc6ed249048c3b8af081b70964cb7b6baf8286f6be2f461c3638331a2269a5b2d89976ffa6a
-DIST proto-plus-1.20.1.gh.tar.gz 66180 BLAKE2B ee0299c8e9c9882ce417f6f885df18cd833dfbad80e0e92ca4e589eea794b0b00577d4c01fa69790f97f31d8bdfd20f07f4c7601bdf6ee28a7427f0e56714eb4 SHA512 12d9f76230d592c68083421bbb40c4b57741545c238227a743c275820a4d7ae53ea45d7ae5e73495b14736a95aa96250e243220f8b9bb5c988c12a2f84f654d6
-DIST proto-plus-1.20.3.gh.tar.gz 66941 BLAKE2B 359d95d37b8a4dad282cb9b33909982ffedca25cd3907583d689996d6e516143c0e4eb2b9bb06bc50e12fabe197f0622a3488cf21136decefe676980b20c7a9e SHA512 411089eb76508a5ca94d6b4228dd4bc1f8d01d4f5209bb2ab0e6e240d8061761c9c76cd03b3a4da7771b45a30df3b0ca4c17f7fca3ed6e710a9724ab7bc0f60d
-EBUILD proto-plus-1.20.0.ebuild 1022 BLAKE2B 8da6815a92a64d5a90058920490521511ad51946550f6a876febaa010a87635a3bc7c284269469a7335f3c2de476e0d1234a8815ecc82d50837eeff56a853baf SHA512 33cab9bd304ea4349e48d045989b6ccb238589383d495a184abbce4e6534382eb7a39143d8ef875a3283ebf9619f10ed28e0ebe8b52d13b94931e01b00dff315
-EBUILD proto-plus-1.20.1.ebuild 834 BLAKE2B 3fdcd159b52f5536561a97585d5a28ddb85e4b018982b0fe6e334d8625ecc2755a7acaee2e2d707fe1ea1f563ce4f6572ca7000359cc48e3ec899a55e27e1ef1 SHA512 c6d1bf3af3bfe55ec0f636d98e249198a375c69c01132443378af8b147c49bf68fd8823067c19875a97f1614245ea5348e79520f89f796744deb5335d7d5acac
-EBUILD proto-plus-1.20.3.ebuild 845 BLAKE2B 8214d5ada51ec352bbdd8bc095cbc9950c7da65cfc465bda2617d3d57af848ab21b0280c1693afb827ffa239a05de38df98e67c20158baae8326180fdbe9b051 SHA512 628b2274032b69f4af43d369a45e1486b45746467e5ddb5b082b5de3a355fe7706846db0c8e10aaba0266f0dfba9e71085be763f544db3ec1d69fdd0b109c798
+DIST proto-plus-1.20.5.gh.tar.gz 67573 BLAKE2B d764c8afb4608c38b050c256930a7ea37ee8d5393518e3146a66d11d4fee1cf3b35142426442d014483bd1ac5b815b6445b0f2c2c04f404136aeb6031a944e54 SHA512 bf612f23af3cf30cceaf8ee2027a721cc37dbe7e17d0ce643c31361397409171f92e92a6b53163e747931c3b0da66edca638ae4014c096bc0e3a8f1bc5dc8e80
+DIST proto-plus-1.20.6.gh.tar.gz 67697 BLAKE2B 88fbf1086bc9430360316c89baaf6216d3f395792fbc2bf1336c22aeb4f912dedd5a4af73c5a10cf6536cdc4cf285c89d1d0a86afd4ee21c7e40b26d34631240 SHA512 5da41a8ddabb34a4083b622d60e59532cd7cb97e4fd243b796aded06ee0f6d9ba5ac847434aa8141b90cb3481d45fbc703de2f905ff4f4676a5d86d77a01c44c
+EBUILD proto-plus-1.20.5.ebuild 917 BLAKE2B 0d6f5030b15ac4ed6a1bcf969bab8d0d700dbe274938b5c2f88b512b69ab493e4678a1bf2b74b1aef55727c13972d2c453b8c736a62c090d751b17d5cfeb2e84 SHA512 cdd555df32e78efeb385129ff7dfe301318c5b463d55266c9fb77c8c7b831c92ba6806f811c5b3c23f2ba0d6f954274458ea73c379d35f8fa6a6da5be8f5a347
+EBUILD proto-plus-1.20.6.ebuild 919 BLAKE2B 9d2e638037ab6e048257fb15d6e654d9c1dd4661e3875e1a2354582539311ad01baca958a454072a6c51e003a6bbf5a1bbf27e05b1cf2db78b7d3de9100aebfa SHA512 c306d37b44976b9fd4041c58458cf9cfb0d8c6af06ba456681221c291a4af6b80c9e47ff47203e9659638c7ee422299a82e353aac22d3c90c3e2128687d93ebe
 MISC metadata.xml 447 BLAKE2B d440be836b8a2823ab3beb7f76cbe7ff3f027ec512dff3f7d920eefea3f18329e1aa910ca16e006b1424cbd780f3fad80b8ccdc632c08ade651afd815369e9d0 SHA512 d64b8d2eeac9916ec2faab3b038082155e46e8c379ce06d7f554de763318539fa9040d15f90a3a95f337937c90f4b4042f51b1ea1cd11727e5fd971a0af5280c
diff --git a/dev-python/proto-plus/proto-plus-1.20.0.ebuild b/dev-python/proto-plus/proto-plus-1.20.0.ebuild
deleted file mode 100644
index 228d58940454..000000000000
--- a/dev-python/proto-plus/proto-plus-1.20.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-
-src_prepare() {
-	# https://github.com/pytest-dev/pytest/issues/9637#issuecomment-1031997415
-	sed -i -e '/staticmethod/d' tests/test_datetime_helpers.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/proto-plus/proto-plus-1.20.1.ebuild b/dev-python/proto-plus/proto-plus-1.20.1.ebuild
deleted file mode 100644
index dc2848b431d0..000000000000
--- a/dev-python/proto-plus/proto-plus-1.20.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.20.3.ebuild b/dev-python/proto-plus/proto-plus-1.20.3.ebuild
deleted file mode 100644
index e3ac839e6f05..000000000000
--- a/dev-python/proto-plus/proto-plus-1.20.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="https://pypi.org/project/proto-plus/ https://github.com/googleapis/proto-plus-python"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/google-api-core[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.20.5.ebuild b/dev-python/proto-plus/proto-plus-1.20.5.ebuild
new file mode 100644
index 000000000000..ed70ce138c8d
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.20.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-4[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/proto-plus/proto-plus-1.20.6.ebuild b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
new file mode 100644
index 000000000000..6be65f5713cd
--- /dev/null
+++ b/dev-python/proto-plus/proto-plus-1.20.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Beautiful, Pythonic protocol buffers"
+HOMEPAGE="
+	https://github.com/googleapis/proto-plus-python/
+	https://pypi.org/project/proto-plus/
+"
+SRC_URI="
+	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-python-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index ead7c93bc62d..8ee638497eba 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,5 +1,6 @@
 AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 1743 BLAKE2B c21d80a6cd218068d2a910ccd12c314810bd2eb679b59f79ba8d4d694948841d0fd8a56e921fed6f347ae9235f33903d79a038e8ae8659ea65bb59dbf7d7d9ea SHA512 7822b826d62585c48acebf04083546a3ebf8f6570854da8bddac3cc40554e71eaf57e9579c314ada33cf5bd0837cae23a3ef1057e44f6234d1d4a591c8036678
 DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6
 EBUILD protobuf-python-3.19.3-r2.ebuild 1521 BLAKE2B fa114bf35d495311e22ba3c14c5ddb7786b0841f490eea785e7f9d74b3106e9163d7f257a7807f02322391d467bedac1553b677ff6f6902d72731246bf6a8c8a SHA512 c018c87e6c104d9c30fa6aa8088bf67d241580dab165b3a7da1443ee715d372a2371e76741863310e85cb225cf23f42b468b1b1c46cae3c3d60409012d9702ff
-EBUILD protobuf-python-9999.ebuild 1328 BLAKE2B ed33dc72c2a488ab9184411b77bfecdc654bd5ad455f0c615f9f02f32f05a742cdd1c2e57f4b9eb914f0c5571387ab321992aae2e7b4023488fb28f3efe8b9ea SHA512 d8b129bcc4226fc4afb1bb5242b16e5b31e5e519ce0bf786d1dd657e75eda47e7838b332017befb6da8fad59ce3d297380f6f072361a12855281b678fa92d463
+EBUILD protobuf-python-3.19.3-r3.ebuild 1602 BLAKE2B 870b7d110f87b88a3b9d199d4c8abc5f61ee49b5a2f6d3c6d597c7d834b59a6636b5f603d99e534fa6f3b13c7912b43d65e77617ba5890479487dcd988461b43 SHA512 9ea579677fb722ec97a710b0daaf2ac1b2a9d55044a0a966893d41c2ff80d20daf7dbb498ee32aae1341525db4de894bde95d74b813e719c47ce0cd579317b41
+EBUILD protobuf-python-9999.ebuild 1403 BLAKE2B a3212b6bd2f93ae71951e9ec8978394e660423d83cf937a3703e10ab6dfde0ebf2d5676b981c96d9dba5477a0d862b66a69cdde2ab3275134f12fc925301d1ee SHA512 6cf1111e3d591acd3642ee225d448e7887549e0a396cd94b3edd76b368a35b28b1d25ae5a946998c087309117890810b9ede95d6a170ad9926d8948d9819fc74
 MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b
diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild
new file mode 100644
index 000000000000..f486c2f2c58c
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.19.3-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="
+	https://developers.google.com/protocol-buffers/
+	https://github.com/protocolbuffers/protobuf/
+	https://pypi.org/project/protobuf/
+"
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="
+		https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz
+			-> protobuf-${PV}.tar.gz
+	"
+fi
+S="${WORKDIR}/protobuf-${PV}/python"
+
+LICENSE="BSD"
+SLOT="0/30"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${PYTHON_DEPS}
+	~dev-libs/protobuf-${PV}
+"
+RDEPEND="
+	${BDEPEND}
+	!dev-python/namespace-google
+"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	DISTUTILS_ARGS=(--cpp_implementation)
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
+}
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index 9347d6babd62..3541dfec56fd 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
@@ -18,6 +19,7 @@ DESCRIPTION="Google's Protocol Buffers - Python bindings"
 HOMEPAGE="
 	https://developers.google.com/protocol-buffers/
 	https://github.com/protocolbuffers/protobuf/
+	https://pypi.org/project/protobuf/
 "
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="
@@ -63,7 +65,7 @@ src_configure() {
 	DISTUTILS_ARGS=(--cpp_implementation)
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name "*.pth" -type f -delete || die
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}/install" -name "*.pth" -type f -delete || die
 }
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index b7ee3d49025f..d9253b450dda 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,7 @@
 AUX psutil-5.9.0-tests.patch 12930 BLAKE2B 486e8b5316cda0aa7b03f803a76d800a6c40fe1188de1dcf334710fc4e1a53b759759956af0397ccd2afe75cb476b76f0b84675b517b74505b0889e512a593a7 SHA512 b9b67f5adfcd64693e5492ed6c03c0af8faf926a4091c0728e5f409bc3d8bcc1bf7eea76168bda5c6b4b9d69a850597cf26f5b87a4d0f1abdbd60cafcdf3104e
 DIST psutil-5.9.0.tar.gz 478322 BLAKE2B 763c8ae14ae546bed64a360047d2ce38783e9e7e939160f751c4ccc94b8e023aaa4cdca426f584e05dae8b1326333660e216d7cb3edd820e24a931dddfa5160f SHA512 b521cfce51e90fdf87ba19bf8069877e3210aede92c17460ea0b00324a36e133168e4bff550462d07ab6d93c597c6560d68954340031ff43168d54a8e5d4c4e7
+DIST psutil-5.9.1-tests-r2.patch.xz 3516 BLAKE2B 6a16d6f89fdeb06c7aa0d9d986eba84deae5f8d2bb829c2509744f954f9b274d8a70a00f94127f1880cea71f8d7e7b85097517f8516ee6ef14f17522ee9297b2 SHA512 b69efb32cd0229056ff9fbbde963f0f01f6bf1d0820f028527f464e38a9bd4211a55bd725cc8962a20608c12c28edb24b2063f5f58b53fdb6b001fe2f95da103
+DIST psutil-5.9.1.tar.gz 479090 BLAKE2B 88f35a9134d942fa56b5fbc79753e82245c3bfdb1f640dbf3b56815b89d872517f9ee3a3945532ebd1a399c3307e160ac80394766c3b2cc7e3fb36ffdd555eef SHA512 1ddb119a10243d17d808417817ec8659d22447f12a4bbc0366c13f6587a4b0b59f4e74f6ac5d1e1a908bb5fd287be630466d32beabcb5008f6a19c24a1557c27
 EBUILD psutil-5.9.0.ebuild 1157 BLAKE2B 10236f0cfb2e5b2f58e6c79e029edebd7e5d8e9ebc53f12b8620b6eb649db6ac7198cb0abdd18e0a17df6e3a86fe84a642ed202f09742a3b93e2f91e29f73297 SHA512 77ff144ed2f3c70555ec8c92b6feb73350a8ee97e96b1e92719a7847a4fd3014b26df9cc608813f45b63e0e4ef5ad3ea091774fb2e753522ec01a7c6a588b950
+EBUILD psutil-5.9.1.ebuild 1243 BLAKE2B 593488caca3f7ea620c813a4a87d85cec302d0c4a722722150507c39caf386ced35e56e54b0f28c913a7c10dd457dab598449579710daf9604d47eeec27472a2 SHA512 b7502bf413428481a6afda607fb56ea85b7f0d07f8d180b3978e98860a15747f437dba5bb734d3a7c204687de4623b5a035866b90f66bf0323cf3a83ecdf269f
 MISC metadata.xml 378 BLAKE2B 235c056a427ab18383c401143074ec62b91d471087c34e2bd48d5192c6221e089e32170d18cd0d69d51eb2bb02fb8a0efe59245af9224b284557812b32c341b5 SHA512 96492308dac753fb176e4810efa71757e66413d16589e52a942b02c91256b48f9873b53a698006923aef12aa7d1539d6fd7aa07632c073b6a92cc8920f6ce6c0
diff --git a/dev-python/psutil/psutil-5.9.1.ebuild b/dev-python/psutil/psutil-5.9.1.ebuild
new file mode 100644
index 000000000000..1345a4d6ded7
--- /dev/null
+++ b/dev-python/psutil/psutil-5.9.1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+TEST_PATCH=psutil-5.9.1-tests-r2.patch
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/${TEST_PATCH}.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${WORKDIR}/${TEST_PATCH}"
+)
+
+python_test() {
+	# Since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disabled for CI
+	local -x TRAVIS=1
+	local -x APPVEYOR=1
+	local -x GITHUB_ACTIONS=1
+	local -x GENTOO_TESTING=1
+	"${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# Force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 6a719522762a..662e3fa7f10e 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,5 +1,9 @@
+DIST psycopg-3.0.14.gh.tar.gz 381063 BLAKE2B cc63bda476bd7f5b53698349d893f42e300395cb604ef458d75aa40d0c7f7ac3f89e734534a2df0710fedd6ae63ec1426174c0e78d57680fb63156a2e2aad60f SHA512 3abbe947bddbb1ccc47ce9a5d18351311ca4729e3f25a6dfc5238aac821e69223078beccc30366e375026eee04645fa336b4ad579a91c8ff9d5f852b8c5584be
+DIST psycopg-3.0.15.gh.tar.gz 384815 BLAKE2B feed19f8482767de12a549530b8fbef5cd374636f1b1e84b2746f23379760bf3b75fbbaed64b8d45d120b84a1e56b4ce6fe26bf29fb13e6fd20eb39e4aebad9a SHA512 65c0e081821ca580f56495073ca69fa38e98888ff3531dc55faacec647cfeafcc74767c53a7d3edbeea1e5bbc557ba08fbc089be8b6bc73963cbb459b029e313
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
 DIST psycopg2-2.9.3.tar.gz 380611 BLAKE2B 78099da7378dcfa8b7f28aae4d533a7e890cdb7ae4c0cc718a9411e630fd07b56f074760fc29de8fe08fe727328cca39414a5f297fb92ed2f7471a24e633d18d SHA512 048184d1d162a371fc0fba711448a6fa8a6aac193421f4484c7f7b91c39065d5b632fa34fc15a901eca055d597302b1f9e38330b248ed0e4653dcdc544b0d660
 EBUILD psycopg-2.8.6-r1.ebuild 1313 BLAKE2B dbdf3b3a72aa22bdc1d55c9a6b8f67e706a9d13d9e43c0c09bae8a735eb999b19f262d104aaa9196c6189ed5ecebcafbce49f6499e9632d7f56b4d73c48453f3 SHA512 db57102c60158abf196eef91391c3a37a02a92fc6ffb79c57aaeaafa1b771938a1a3b1d048fe6130e9fab326b9a7d46de605090fdca09025baae051bcbd8f7cd
 EBUILD psycopg-2.9.3.ebuild 1306 BLAKE2B 166f519f6e4694fb2725e0f4e736a9ab907dc398c4fadee579da96e37f29faf6f6fe735e56dc9156eefa74302bc516915499d827b3762655863bda1162716e19 SHA512 ecb1f931618b74393cace6f850b35c7512fe5902bdf97eadf0cc1f54e60797c863fe558cda3117ca8a5cd025bd6a761545d6fc1d837aed8ec095c48e98cd7c1b
-MISC metadata.xml 322 BLAKE2B 2656ba386b42acf8e45737cf0f2428d80f91a05de732bd7db0e76bef480c6de927c0bba1c0dccb3d3404054d78354f698e75f03b44940fea6a7683c0c160a71e SHA512 01a60ea486677ccd335e348e90608ee50ac1ff6351d83a2ef4df76675a580f47b72e79ccfa3fdb84f725592bd5c6ef85322fbf40488258c45bc3724b5ff9098c
+EBUILD psycopg-3.0.14.ebuild 1660 BLAKE2B 00bfd0e20311e4dc373068065aafde93b951998ee7fd40484ee07644278c14a0c31f4b961cca0cadf1da4b9afa8976ea80c1f9ad60755d9a7d59481b07b14f0b SHA512 e2c2b675e0835821f1919cf8b531d42a965823d35ea1d3913b08eb325bbeb73f5d1ac5855db76406619430f74aad6dc17ab226dd21655eedeb4ecbb1856446f0
+EBUILD psycopg-3.0.15.ebuild 1660 BLAKE2B 7bbcbccf9ecc67e17b02e84d21fb8078020f5d7a2b57200b7cb723ef1911826eacea952eb12febd312ee6cbc593c492e6568dffb747cacb28b3f05c1e8e8952b SHA512 c5f48fc3efab2f8e59fa7b309b71f80ecc651208a969116c303fd11c82981a092e20d4d0d7c2804bd7ca129ea5015d7ead5131e1efc895ba2797d30ea7193290
+MISC metadata.xml 369 BLAKE2B 042788638a82318248d4e4ea1e12bf1631af6ffc435fc0110e13849dad600854e8b57f5ba3397c4d4e5d103e165b342f8aba869e72e9b63efc500382d3423414 SHA512 5b216575e8cae847f71a09ed6b676a73fccf2070f3bea3b35f1bfbde95fb0154b2fbb356948e112cc9f2298fc9868ac3994a139e72939f80d59c084ec58d80bf
diff --git a/dev-python/psycopg/metadata.xml b/dev-python/psycopg/metadata.xml
index 9bcf434dc99d..5a372b79afcf 100644
--- a/dev-python/psycopg/metadata.xml
+++ b/dev-python/psycopg/metadata.xml
@@ -6,6 +6,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
+    <remote-id type="pypi">psycopg</remote-id>
     <remote-id type="pypi">psycopg2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/psycopg/psycopg-3.0.14.ebuild b/dev-python/psycopg/psycopg-3.0.14.ebuild
new file mode 100644
index 000000000000..fec8d3cf5d5b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.0.14.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tests for the psycopg_pool package
+	tests/pool
+	# some broken mypy magic
+	tests/test_module.py::test_version
+	tests/test_module.py::test_version_c
+	tests/test_typing.py
+	# TODO, relying on undefined ordering in Python?
+	tests/test_dns_srv.py::test_srv
+)
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
diff --git a/dev-python/psycopg/psycopg-3.0.15.ebuild b/dev-python/psycopg/psycopg-3.0.15.ebuild
new file mode 100644
index 000000000000..1b13ee04516b
--- /dev/null
+++ b/dev-python/psycopg/psycopg-3.0.15.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="
+	https://www.psycopg.org/psycopg3/
+	https://github.com/psycopg/psycopg/
+	https://pypi.org/project/psycopg/
+"
+SRC_URI="
+	https://github.com/psycopg/psycopg/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/psycopg
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+DEPEND="
+	>=dev-db/postgresql-8.1:*
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/backports-zoneinfo-0.2.0[${PYTHON_USEDEP}]
+	' 3.8)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-db/postgresql-8.1[server]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# tests for the psycopg_pool package
+	tests/pool
+	# some broken mypy magic
+	tests/test_module.py::test_version
+	tests/test_module.py::test_version_c
+	tests/test_typing.py
+	# TODO, relying on undefined ordering in Python?
+	tests/test_dns_srv.py::test_srv
+)
+
+src_test() {
+	# tests are lurking in top-level directory
+	cd .. || die
+
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" test || die
+
+	local -x PSYCOPG_TEST_DSN="host=${T} dbname=test"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
diff --git a/dev-python/publicsuffix/Manifest b/dev-python/publicsuffix/Manifest
index 002e0b99b98d..7020b7e5f64a 100644
--- a/dev-python/publicsuffix/Manifest
+++ b/dev-python/publicsuffix/Manifest
@@ -1,5 +1,3 @@
-DIST publicsuffix-2.20191221.gh.tar.gz 98142 BLAKE2B 21b0dabb253175ecf427a51bcc7df2de7fa3fc9fe7d9032cc378160c4c53e75efa4c0e657efc93d48bb58f786160d89cb2fd7301e3c270f73802a926c31ea378 SHA512 983bdb17b76d10eb73cf69f0ba7590806bf6786ae0c30526593ce1ab97f3b22c967f9acae83b880dd56be41a29eae9cca5726926667eb74013d0d1078433bf05
 DIST python-publicsuffix2-release-2.2019-12-21.gh.tar.gz 98142 BLAKE2B 21b0dabb253175ecf427a51bcc7df2de7fa3fc9fe7d9032cc378160c4c53e75efa4c0e657efc93d48bb58f786160d89cb2fd7301e3c270f73802a926c31ea378 SHA512 983bdb17b76d10eb73cf69f0ba7590806bf6786ae0c30526593ce1ab97f3b22c967f9acae83b880dd56be41a29eae9cca5726926667eb74013d0d1078433bf05
-EBUILD publicsuffix-2.20191221-r1.ebuild 615 BLAKE2B 0205548d7a82ee3e895391605430bb4ed1be7c3e0293a83568a263801cf8b495a5a4504b23890da640ad6a5a26ed4faf3ef02d516b68753484db6df8972eae74 SHA512 5f0db982f3b423867deee320f3e47d3686a8a50a9e91a56a06f462357540a8c8f4905954b12aa2bb7295d2723be06aa4c9d8b6fde333300da33dfa9dc587cd2e
-EBUILD publicsuffix-2.20191221-r2.ebuild 742 BLAKE2B 8841059794afe3d0b4aaf7b37d34b5933ac3ed51be4696734aa3251bcc17309bf92cc4ce33aedaf67c3bdbda774782cc9745148275342418ab589d3a7f4fc4ae SHA512 8a0d8e6df80e352e6d919ae1ea42a57825cfa8d347678d3080b80833f1688924681d14f9e54aef07124756e775d642049e0c4b7b94ac64d9fc73056733f8e4f2
+EBUILD publicsuffix-2.20191221-r2.ebuild 748 BLAKE2B c9c4310b963435a38ebe04e77f21dc476efea5afdf49dd73442404c200cc6efcbe61092833c622b0d7f067b2b714fd602fd9ea3171bbe7aed7d1c9eb008f8e00 SHA512 7a4b6709a190373cc0071e1d9a12ca73a904277bd45754b23177c0483be3480db05c8dc04d9700af4b2a83de86bd060d28e34a996cb1098ec1daa348a8bebbe6
 MISC metadata.xml 673 BLAKE2B 25e985020585574027e1fff595ea2ec21edfacdcbf3a5ee0f41d4d8dac9b256eb5e9392ca00bffb54811418201c56dbc95d45b6fabe1737c76b1dcdbbb48effd SHA512 5e6803d5a53783af3fb10ea0de3c8900107024b3e320118c3163b4f33267a416cd330c7ffb86d3dde014e31aaf0910e400ea263872735f21e0983a15566e4207
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
deleted file mode 100644
index cbf7f3a521d4..000000000000
--- a/dev-python/publicsuffix/publicsuffix-2.20191221-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PV=release-2.2019-12-21
-
-DESCRIPTION="Get a public suffix for a domain name using the Public Suffix List"
-HOMEPAGE="https://github.com/nexB/python-publicsuffix2"
-SRC_URI="
-	https://github.com/nexB/python-publicsuffix2/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${PN}2-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND=">=dev-python/requests-2.7.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/publicsuffix/publicsuffix-2.20191221-r2.ebuild b/dev-python/publicsuffix/publicsuffix-2.20191221-r2.ebuild
index f33a01dd2239..8cad00faec6d 100644
--- a/dev-python/publicsuffix/publicsuffix-2.20191221-r2.ebuild
+++ b/dev-python/publicsuffix/publicsuffix-2.20191221-r2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pudb/Manifest b/dev-python/pudb/Manifest
index 8ee0d8ad7b83..f8bab47075bd 100644
--- a/dev-python/pudb/Manifest
+++ b/dev-python/pudb/Manifest
@@ -1,9 +1,5 @@
 DIST pudb-2021.1.tar.gz 216707 BLAKE2B 1287fa48607e9b73dd0bed063b29933dd4de6ab598ad99217ab13a719a6b9654765bc44c28150962ba22703733a4e956c39e843414444c3b7fff67cefe70d7d8 SHA512 54d62f1342ab461e58a382c0eb654ecc9d3bd759844bab2f0a339e91ba805670e4dc7ccd84e8188f34e06a07ac770f1c0cddd4a4ef916885af0bdc638db81fcf
-DIST pudb-2021.2.tar.gz 216306 BLAKE2B a3c4fce5515e49851ac0e2ec73aa4364d3311dbd64060181198315ec0aeeb860d95f34d09004a86bb73269252362a966e541547d19c6db74ffd51a0535a0942c SHA512 f6d07b752268115b8e833e5aac5e5984e77beaf02fd7d2ab91e0b94c61f4c32d639f4ed75d262e66526c00bec03c6c3cefb92d77d8bdb330eb5cb73f9bec009c
 DIST pudb-2022.1.1.tar.gz 218514 BLAKE2B 860e7a176d48a3a5424f86ec6dfabea70173b7e73ff3bc512e17c00ac3d7ff7e4f0a3b021e5ce1f38546643d035f4c567003b9808982e0fc4e49428cb08ae7b6 SHA512 0d098b2dac3442913ecf0827ed272dd57d6d03d44d6c67c6ddb8ef61bfc06f153e17aad60e5a0c17a490a675aba610b768289acf13ce9bc2603791b3c4012e4b
-DIST pudb-2022.1.tar.gz 218423 BLAKE2B cb31d6fda07f15593f6b8af1c99ce3e88f1bfd745358db0a9c22171b6db3c30d4501b68263a5ca53681daf864d9d43654e2cf0b3808fb2008204c6071f8fb33b SHA512 89b26c531254fe1a234b41a21ac3f2fc6ba4f0786b4d0ac49c34bc965dd53301a8111a077342b8a5dcc32c214bcdc76e28ce5983ad43fb36211f80d1a68c10cf
 EBUILD pudb-2021.1.ebuild 584 BLAKE2B a18c48f12cf4aa2110e4e8c05ded78ab9daf439f3bdeed7b28c5aa1b58184b409d8f8e65c567200bedc2429a664553eb0d40c2537428679c15461d11ffa25b58 SHA512 daf65f67d1a4d6d36a7b81bee844c73a080b8e0691098b1fce75b17f7b6dfdf7a4ff696ae5081c50e27956b6d74647e1cbbdd9135919ad69a41dc2b13708268a
-EBUILD pudb-2021.2.ebuild 605 BLAKE2B 29315e7bfab1d3ba5d72feab3823a4a1e88f592607bef8819f4fd88ae3af9129ffee3b49f6878d5b6357057e76db6e29732ae196262639c41bc0758e71bad612 SHA512 b456d183ca4750ea01a7f49118e52746ca7c9e611cbc1a856f51fa582e1728f6c72e29acdc8ed5fd10cbb85c9c5189c8c632af5832b15e0574b827a2a7ae7fae
 EBUILD pudb-2022.1.1.ebuild 640 BLAKE2B d80c719373bb866243e84fee2541d1d5d5248261b68a2d3897556ab91de76b90f74bb09dc00f434d63578d578e5cff086126201520e6b290fa3ed9b69bb543d6 SHA512 c87b03379bdbccc95b90cad95ca100f8aefc6243c1b9f3bfccbe850b5177e81e852102e2c4e18c2a075ce79fdd3c4e18c41efd399b6fb27b20fc818ff9d5b611
-EBUILD pudb-2022.1.ebuild 605 BLAKE2B 66914325889ba9f2a46a3aa0a6d37fc5d58b595403f5f077af3ffaafd62510d18fed793b42d9d75417d2c000ddabbdce93336ec4507061cc435ab4f9897bfae9 SHA512 332dde3f878144a2c886976389568219c19292ad589f6eb5622288db8d336dbaf65d7ab2719c331b9438975fd9d12a137b14927cbe53cd17763dd4696f2b44f1
 MISC metadata.xml 415 BLAKE2B e36096d9569f60ef1e2f1c412a4e17007880c5b3433545f3f7486532968a7502532f0ae614368d8bbc62f3f6550f08a63890d81a5ccf509db2047c0cdd9e6b27 SHA512 1c1de7a23e74095aa20edc4fe5de9c8c88eb5f3537d0bb0fcce345287170d77bf1f1b13fe17d5f100d71782c34940836f27a1778530af58312f3e22f21460dd6
diff --git a/dev-python/pudb/pudb-2021.2.ebuild b/dev-python/pudb/pudb-2021.2.ebuild
deleted file mode 100644
index 0244f21920bf..000000000000
--- a/dev-python/pudb/pudb-2021.2.ebuild
+++ /dev/null
@@ -1,26 +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 full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.org/project/pudb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/urwid_readline[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pudb/pudb-2022.1.ebuild b/dev-python/pudb/pudb-2022.1.ebuild
deleted file mode 100644
index bcd5082fed3e..000000000000
--- a/dev-python/pudb/pudb-2022.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 full-screen, console-based Python debugger"
-HOMEPAGE="https://pypi.org/project/pudb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/urwid_readline[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index eb2112663586..f16ac532b4c0 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,5 +1,3 @@
-DIST pulsectl-22.1.3.tar.gz 40899 BLAKE2B e0a3361ce9126afe9a79817165405c38638cd7b2328162750607d7c674431f0e57762f5aaa50ab17325d493b16a5370feaa836e6899cd91c64f299af008c8825 SHA512 cc60ca006518f8be327cf7aa0dccb4820b0891e7118989b31c968bd740134751033802dbe54e203c56cf6a5d541732684dd27128c14f753acc5de38b639bdf64
 DIST pulsectl-22.3.2.tar.gz 40901 BLAKE2B 5b3eb752865e95cfbb70a7228409fea70b4c55c7297d652b4614df7ea4764dcb446f7a3e25bb89f6a55badbf6b300381c7c28c56f0a47e7faf1e63003f39d02c SHA512 7fc11c792a9e586d191a32831e0ef8896c40da1fdeddfd4467d7ec352e5e0ef0c910d7a2e8e82e1a381b16afefa17c9c9db4821be74d4694c934337b2a862f0c
-EBUILD pulsectl-22.1.3.ebuild 524 BLAKE2B 75899a613349533f7c0d04b34c56d9921a11af34dc3a7a07d1ae30def19c1dd65a561b116df1daf547ecabc045c6996f3197e5ca0c6ecd1537f26970928f1996 SHA512 b0c81195633e702ca1a50c93f2b235d2673dde2bb2bd2d599c924716e04620f1e2bb63a4ee671d07046ff63852e08265daad343c224925eec103903008be9aaa
 EBUILD pulsectl-22.3.2.ebuild 525 BLAKE2B 2a94c1afaaabd288e84a8d7d31428d044fb5a3416bcfbd543c33c33e387b35db414f5e3d8068fb15c63a4dfc46d47476bc39356f6500132d3fd7c400f7f03170 SHA512 1b98fe73fd4a7abd2d1c2576749897d8c54b54317ab1f85a155a59ddbdf0709a20d6b12321d7e98b824fa472f67daaa51e36e8710266ab4280205111f714bd73
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-22.1.3.ebuild b/dev-python/pulsectl/pulsectl-22.1.3.ebuild
deleted file mode 100644
index b7d66bc938a0..000000000000
--- a/dev-python/pulsectl/pulsectl-22.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-sound/pulseaudio"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pure_eval/Manifest b/dev-python/pure_eval/Manifest
index 16b1d40fb063..b64d86074b93 100644
--- a/dev-python/pure_eval/Manifest
+++ b/dev-python/pure_eval/Manifest
@@ -1,3 +1,3 @@
 DIST pure_eval-0.2.2.tar.gz 19395 BLAKE2B 19f86a1436e5f1a026a24f62c435e8970d84960f4cde1de80c58949b1aede6aa7562e8430e10e3f7171212c31d5699a3321fad5fb2ea1eed961a30d43a632a79 SHA512 35d20cbbfd513b7ac341759e619401a5f57b7b9df8abd09ce6414d4ee6bfa45dcadbad7529d067e81ad7ea2107c14fd03783a3a77f8074dad30d2e5161656804
-EBUILD pure_eval-0.2.2.ebuild 537 BLAKE2B ff796c99a5fe400f890b612aef52930c4f8c7bd2f4abc26d6f1c356b0a029207d82e521d435e632ee21fce02b93d86273acf9aacf394eac0c1397ec2c68ad654 SHA512 aedb6912716b5a4963bd83d43190d9e9a667e5b27ffb3757b6ddfe2798a9ded9eb6664c2c55d6931d70a1f78deb58321328c2c485d310a51d51301db3c0438ff
+EBUILD pure_eval-0.2.2.ebuild 537 BLAKE2B d558cae7e1f9aa7db4ac6d63353aa3056c2e857f95dad39bb1723e5e503e112c6e554d4c20cf57e3ceaf0deab1567c95b3cea90d70dd39af71774239c3d8b630 SHA512 032f1a52ea5f34b6b919ac2dc68d44960c36c06448cef239cd2571049cb5a8d7da5f99c88eb32d920b7c59fdfc6a13e466c17a3ef165db01573d27bf715353d0
 MISC metadata.xml 373 BLAKE2B 56f08bfb33fbfefff3f37063133e1a5dab14daf3d30b0674e9b39d8ed72e5d1468f02ed3d353d508a28c4af1c5c7f858043246e043a9ce0da4937aa2b07d4993 SHA512 69be5163434e36fed944075b834e8fba4745698759e12258cdb9ed968e523528e1e11d291892f3a8992390edd9c54cc08b5fbb70d7473db5e274329cfceea101
diff --git a/dev-python/pure_eval/pure_eval-0.2.2.ebuild b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
index 2c426eb867f1..c8a195b5e58e 100644
--- a/dev-python/pure_eval/pure_eval-0.2.2.ebuild
+++ b/dev-python/pure_eval/pure_eval-0.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Safely evaluate AST nodes without side effects"
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index 58ba042af493..ec72cfd713fb 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,7 +1,3 @@
-DIST puremagic-1.11.tar.gz 295026 BLAKE2B 4d210807d9f5eb0c2eb88b0c18aa5cdf56170b347de4f95b92c08492d5f038759b39c1aa2d6ed4bc91e96e036e6f4d0891449af8aee3beac65c4d692fa295ec0 SHA512 4d4c9a93cd56a02aefb7090c92b41048f33923bef14022158f39c39ac93326b7180b8cc97495ad5ed3eec7d9f1379a5508829ee779aaba9b8aa8f975e787b1f5
-DIST puremagic-1.12.tar.gz 296831 BLAKE2B cd9979fba1016b1c4cbdd9ef1402d11dbe2faf37767e3232cf400b798cce328d90d224765cc2bf39fd0988abdfe39d1527dd7aa6e31b4737d00c1578f1cc3101 SHA512 b50e22b7597f206e8d6dbc0e2c120af21a7246568f059c6145e45471eedf04c797a9f00864468d5e05c9536f49f7fc6c7b30a83e67bf248e10ebaf8300726fde
-DIST puremagic-1.13.gh.tar.gz 300110 BLAKE2B d436735126d465cd43bc5537b2fb9385297d626b19b5b881c63fc7f3559600c9318c7ad91955cf66df2962ad122d2b42919bdee4460bc16ddb7750d4ffdc2fa2 SHA512 495777751874d4f2213b8bedb4bc3b2cdfdcacc5a1dd7cad85545fce473b8beca9a38fbe513d26c37455686265482b8bde7024111e76501d489aee7e5750d97f
-EBUILD puremagic-1.11.ebuild 480 BLAKE2B d5eb484485a5d2193635909950a7b754c1fa2c5d5fa2c1364b314f444a0f32b00cf1a76957256f437e0b8e49e9cc913831dc7ce002ea7c799a6f86d59d9953b3 SHA512 c56f66d813b60dabd602328dedf6f79d47d46484382dab26fac82595f805f5b46a0846d6337458ce4b0f547797360c455caabb0f74df9ec224e8c5833ee31554
-EBUILD puremagic-1.12.ebuild 512 BLAKE2B fe461c03fcafce7e16f89f002201e2b922ff84ae283644fbd92be30023c72d2e5fc1054d0b2bb36aa33ace0d32098084de8d109c0976bff3428575ab511ed1b2 SHA512 d5a19b75a928a3d3ec1c92ba5c7eed0275d9a23fcbebfb9e340aa95a6c974909b38d809303f0e51707f2c32262b9866f08df73556b4e90d096dfd6de039d5813
-EBUILD puremagic-1.13.ebuild 561 BLAKE2B 7e91bba8d22a5b79861a723621764fcf50edaee18d548b70913eaa9593828a38e794b3052f936b891f1a4f23917ec5a6c3116dd8e572d56f112c16372400037f SHA512 fbdf284eaa0683deee3cfd4599de82355cd507ffd4695cf7034cf9294e58fd102fa8b63b806c673e2a9fa8db14beddfcf1b7ad978bd47ea0acaa8f5dcfc90709
-MISC metadata.xml 452 BLAKE2B 3a92e247697a9b50d0ee083b1f4b9b89d7c01759fcf93f13deafc4f2ffb3798f6daa22fd1c2ef642becbc8f03b7ede86348e51cbe0d8fa06c940f99c9523b41d SHA512 ff07bf3513774e077100c43df3ca20f8330e91a855b54c2a1a47da8584b057c32efdbfca07ef5d8c1378b61d0bdd974a9144fd07f0abbc71b1340b811832a02f
+DIST puremagic-1.14.gh.tar.gz 295823 BLAKE2B b505f34d6744a0c9aa3a0c43846c150c9e1101884a825507b0941da84b181c1ed620dcf5457a5e60ec1fa5c93203d755297c4e3b37d311537dc6a248daf3031e SHA512 00d008f70849179a67a1794740cb34bd28386036e54a9c3f54aefb24c7fb6adccb624e0546ca86863e913c7178b6590473c3ce4fda906e9fd9306be483de28ec
+EBUILD puremagic-1.14.ebuild 560 BLAKE2B df260f2cb2628cf8dbc22eff45c3f900ab914e3b24ce866b6412973a7ce9c42039513f5646f3147686ee0edc376d5b24d9b12003d72781077aa7fb540170b555 SHA512 35f69e4faa1b94228136a41649328c0b48d0fcafdf298e52ff67d73e48cb80b7c9ad817457d2b9e96954bd2db27c305a9f991e600fa2f2f8ae8e626947cbc5a4
+MISC metadata.xml 441 BLAKE2B e16e921f5571378e7fe3922ef583aaecf4fdd0160ffe502105f982d05189679395bfb7babc5f3c12ce60af9ddc72ecedd5a7a68e18488cd35174ee1b3eb03c05 SHA512 ddedaeddbca2953c67d6d23414f6dd152823290bc4bd90aee470a16906c4fae9e21043250677faba4873ff50af4ddf88c7208cfd30a040b816ec44782687e3e9
diff --git a/dev-python/puremagic/metadata.xml b/dev-python/puremagic/metadata.xml
index 9f2ecb2e4c49..39cdeff15460 100644
--- a/dev-python/puremagic/metadata.xml
+++ b/dev-python/puremagic/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/cdgriffith/puremagic/issues</bugs-to>
diff --git a/dev-python/puremagic/puremagic-1.11.ebuild b/dev-python/puremagic/puremagic-1.11.ebuild
deleted file mode 100644
index 7f02fc5c206e..000000000000
--- a/dev-python/puremagic/puremagic-1.11.ebuild
+++ /dev/null
@@ -1,20 +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="Pure python implementation of magic file detection"
-HOMEPAGE="https://github.com/cdgriffith/puremagic"
-SRC_URI="https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/puremagic/puremagic-1.12.ebuild b/dev-python/puremagic/puremagic-1.12.ebuild
deleted file mode 100644
index 55ab3d289e19..000000000000
--- a/dev-python/puremagic/puremagic-1.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of magic file detection"
-HOMEPAGE="https://github.com/cdgriffith/puremagic"
-SRC_URI="https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/puremagic/puremagic-1.13.ebuild b/dev-python/puremagic/puremagic-1.13.ebuild
deleted file mode 100644
index 867d39b423df..000000000000
--- a/dev-python/puremagic/puremagic-1.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/puremagic/puremagic-1.14.ebuild b/dev-python/puremagic/puremagic-1.14.ebuild
new file mode 100644
index 000000000000..2bc8f069feaf
--- /dev/null
+++ b/dev-python/puremagic/puremagic-1.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python implementation of magic file detection"
+HOMEPAGE="
+	https://github.com/cdgriffith/puremagic/
+	https://pypi.org/project/puremagic/
+"
+SRC_URI="
+	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+DOCS=( CHANGELOG.md README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 6e9e96823a41..e1aa6003f598 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,5 +1,5 @@
 DIST amqp-5.1.0.tar.gz 128629 BLAKE2B 8fe0b07233fce04b84b46e0ab4da1badf2de8a2ac53494dbb33b246d149ccec728de42c4f9f7d40752701a8e02851805456d8d54c2e519bbbfdbbb1274edf124 SHA512 9f4f3fd4cea6c214ff03a80a9aec7c5bff65a964ff1e77fbc937f1b6daf45f7b06be0b0873b2998afc3de22b4693a3327f0b439f70a4496060997b9f1aa73331
 DIST amqp-5.1.1.tar.gz 127869 BLAKE2B 3ba95874a45f6fce163cf95b0b1fae57e636bc2bec8311f64fc9597025ba36f35daf8d0457af3bc10fa1f1dae604b262ebf205d7b89d4f1745bf3480b542278d SHA512 f549a85e4f04543dd8e844edb68350ca185de9259aa896af31ae5ee5dfdfe73f904d95821c403dc797c7f3ada17ce6bff4e0fd9fcdf2abc1b33a94d079f99179
 EBUILD py-amqp-5.1.0.ebuild 1173 BLAKE2B 57ffcc4a2cfdaa50524687f0dae4326ea0c6da60e996b9dd1ecb9fdf438d9533b71456f95d2e2e2a285f90ae775181fe743e93d3245e71aa5fe4f5019e800804 SHA512 ea8523316837c7c580cdd2f4e3f5abb50cd061257131287fe09f1410f1d6229a8a3f804b94d9c9f74e8a5c1b6d1d63c6b9dcdc2da224939bbd16e11dd190deaf
-EBUILD py-amqp-5.1.1.ebuild 1175 BLAKE2B 326bea2c919ec5b19f3b3cd5408544d37c8d85824f297f07c59335ce4793fc9392676fba914485f2e6e34eaf02a5e9cf4a76540e51f1ae3708bbeefa4ea65b88 SHA512 2adb31fd982366b81ddf932bd2bab3b12913e6564f4537bf0a2f1b50ade0a85bf82b5fa1ed0e8378b94aec2639d7186aa640a793253a54c5bdcca0d04815fe7f
+EBUILD py-amqp-5.1.1.ebuild 1173 BLAKE2B 57ffcc4a2cfdaa50524687f0dae4326ea0c6da60e996b9dd1ecb9fdf438d9533b71456f95d2e2e2a285f90ae775181fe743e93d3245e71aa5fe4f5019e800804 SHA512 ea8523316837c7c580cdd2f4e3f5abb50cd061257131287fe09f1410f1d6229a8a3f804b94d9c9f74e8a5c1b6d1d63c6b9dcdc2da224939bbd16e11dd190deaf
 MISC metadata.xml 505 BLAKE2B edee860b2641c1f220cca3efcf400391018389615234d72cf2a48e499c410608ddb664d65c7a3aba925b882bab96ba7b4f0c1173e28c385fe0a73b377e950af9 SHA512 b9b969cfcdc38791dec5c54ce96dcddc2eaf29bd023dc6a7c8e2f95dd00ece57abf02bf7d9e0179eb5716a20a041c2216dda94904e5d0a73007e775c14149552
diff --git a/dev-python/py-amqp/py-amqp-5.1.1.ebuild b/dev-python/py-amqp/py-amqp-5.1.1.ebuild
index fa1bdc3c1c25..0492c0df1c89 100644
--- a/dev-python/py-amqp/py-amqp-5.1.1.ebuild
+++ b/dev-python/py-amqp/py-amqp-5.1.1.ebuild
@@ -16,7 +16,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-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index e90b4faa6e8d..5c79d7c13a64 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,3 +1,3 @@
 DIST py-ubjson-0.16.1.tar.gz 50316 BLAKE2B 442894a7c010d1ba4a836827ca17e7cb10b34a6f5488851ce13a3c3ab02d8173250a664da4504bca9fd2d9377631e249127c789a4824930f8b35db2225902e9d SHA512 5c5e48fa236571832fbcd100ebe0efd7522a8f5773b74475e7b102fadc4e2917549640d12c5afb2aadbe65a6973b75540681da1df8febbf47f84844bc9337fb0
-EBUILD py-ubjson-0.16.1.ebuild 587 BLAKE2B 646cb0c75df26856bcea4c55de4e477dff5e80a08a532643a40475a2cb9f28a0ba69cc55afe53f94305ce174cd93e66266ed3c2361485468a10de98c5d54e405 SHA512 046d6f48ba7c768bea79f06030c0579ba46ca2885ae30d9dc22e0fd71a65cd2b1734352cef9bee33f28fb32fb3c459a350867d59e9853941a3ad5548ea6c8ed9
+EBUILD py-ubjson-0.16.1-r1.ebuild 561 BLAKE2B 140b2f493a6df068d666424018aa0ef507b13430babcb33eee41e4bfd3cf53c846f4a7a5ae06e70a440a8e9dd414ca56bfde7b7f7df52904acb677011931f8f6 SHA512 383821911dfc9de9885880110b201f7d87954017fadc3869d2e7e70efe1b656ca54de586eed3fac7eafec62bd0d10ed1ac2f4271c726a912fa8512090b58f313
 MISC metadata.xml 635 BLAKE2B 3d35f4fa84fed8d035d41dfcdc25ac5c520abf0eb564f1cb815e066c1bfbd03d29b5cc3a2742deb9ae13641f234155d2dea8505139723e87fa1eb7e95230fa52 SHA512 3037619d567221865da91b597164574437ef07b51c2d690760bd55a4406d838470eb272600c92264e5248ff4b347c7084fb3b498cc98003f6abf02259b8cdc7a
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
new file mode 100644
index 000000000000..4c6bb23e9adb
--- /dev/null
+++ b/dev-python/py-ubjson/py-ubjson-0.16.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Binary JSON encoder/decoder"
+HOMEPAGE="
+	https://github.com/Iotic-Labs/py-ubjson/
+	https://pypi.org/project/py-ubjson/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest -s test
+}
diff --git a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild b/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
deleted file mode 100644
index c252b0c2be6c..000000000000
--- a/dev-python/py-ubjson/py-ubjson-0.16.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Universal Binary JSON encoder/decoder"
-HOMEPAGE="https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# to make unittest happy
-	touch test/__init__.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyDes/Manifest b/dev-python/pyDes/Manifest
index 24a377863e2f..f13f0999e3f9 100644
--- a/dev-python/pyDes/Manifest
+++ b/dev-python/pyDes/Manifest
@@ -1,3 +1,3 @@
 DIST pyDes-2.0.1.tar.gz 9878 BLAKE2B 45a2d0575519afc389abe080f2c3a6751c5ee1f973e9e4370f24c5dbf9d85882e875682005eae3d749a2e11bffc3cd46868f83baa58f9e7e4feb7a25db641a14 SHA512 9d2a048dd6f629713d93d5cfcf5eaccb45a28fd3942f6837baf492bc6d9f0fcd16a1611e467231e9abfa6756d1684b0848c2190195e9e772bed2e6574327885c
-EBUILD pyDes-2.0.1.ebuild 410 BLAKE2B a46713dcf80199358c91069fe810cee071574f60242cd91dc190f678b191e7abcdef51e51d5a516020529fa52f68a3aad43856402c0f81d1c4a6aeaf366c8647 SHA512 6c085f5b156fc2c6549567fd52a8aa0a31f463718941c3ea6d6b9423a73cf97cb47e42f3153dbf466437ddc541a807e187b231c112dc7ccfbd58fed0cf336c31
+EBUILD pyDes-2.0.1.ebuild 410 BLAKE2B 91e1b4f12751035885e3c831a337aef7a66c6e9fb247abf8e0bd1c6418a02f53815702c104cf96f595a3748a9bdcf29f9fb02b7dc860d43f2cd742c21f9125b1 SHA512 3c248156092e658fcbd76cf43b45492645212c5f5bb21444c4c8e551406a1638763c91ad22af78d71b024bd85e04420c24b7ac2187172c05dd957be858985291
 MISC metadata.xml 446 BLAKE2B 8e721b577146cb6d08fd3b985582471426b38ba6ee06c3b7626181531908c6a97b0239d4d41778539febab9904751f3b336256ffe9e772dc61271ad6b8487c82 SHA512 c92b41bcc41a04c6a2879a9bf72df911a4c0278e586bd1c228ab41a6217b92636d1dc01ae67054a090b767ecad846c2c8a3928ef7e41c4d0eb0c789c404e38d4
diff --git a/dev-python/pyDes/pyDes-2.0.1.ebuild b/dev-python/pyDes/pyDes-2.0.1.ebuild
index 2668e53c17dd..d64c01a08fe3 100644
--- a/dev-python/pyDes/pyDes-2.0.1.ebuild
+++ b/dev-python/pyDes/pyDes-2.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 5c9a86340b06..23a6f0844252 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
 DIST pyFFTW-0.13.0.tar.gz 158660 BLAKE2B c54096f0814625d49832094a6d823c6d258801a0831b07846993da97a713238a5df5b59beddc38b7e940685403178b2f3100f5713334fc9861757420bc87303a SHA512 1d4c69cc19dd00f2433037f25ea90335544403b542c0c5ca00cb055e0fde076ec9e00990f02da2385466be171ed8c910a5ce06a7cfa5efbc6544b2383bbce599
 EBUILD pyFFTW-0.13.0.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
 EBUILD pyFFTW-9999.ebuild 932 BLAKE2B eb8d1dc786c8ddec960824a495b7495a1fbd3c14d495546156eed8de0105f055e231cb231aea105b403bbfc0c42343855e8b57bf83747d2e458d6dc5500bf16f SHA512 dcdea264e5c14a2da73c4dcccd444970b0ca9249bad11f9071ad89eef4c49285de8402232eb71e218e0644d3e0ee7051d9db5510fcd0d567761f94b27c45516e
-MISC metadata.xml 469 BLAKE2B f5f6504ccb53aaf8fb993ea0fd780430f54d8500762ababa8992b22a3b20c3511a8b4d581e4ec7c90ad6593c355ddcca36f2b66d5f1aada806514fab272207c7 SHA512 b2dcfff7de1c959732800e56377e74a23fff5d1d7b6a818d720845be576a9640865a329d99599fbc95fb1b853550760769ce7df0ebac33082b7468419c93a80c
+MISC metadata.xml 570 BLAKE2B 8229871aa2a0c9979a18661fd1c1ad5e5990d2f0094cef6607bff26372903727745f4ef69db073a8161ae218b3d0f7730d160435bfb503d99544590aac79860e SHA512 a219be98262af880f0786b71d3b57683fe5a1a7ff91c9fd62975ef9825f493558e2b0aab2e20653b38cbe053e1364027149642c52c0e2ac1b29f9212f3ef652b
diff --git a/dev-python/pyFFTW/metadata.xml b/dev-python/pyFFTW/metadata.xml
index 3656b10d5585..c90e2426dfbd 100644
--- a/dev-python/pyFFTW/metadata.xml
+++ b/dev-python/pyFFTW/metadata.xml
@@ -9,6 +9,10 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">pyFFTW/pyFFTW</remote-id>
 		<remote-id type="pypi">pyFFTW</remote-id>
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 06fd84e5fcb1..717ca9283ced 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,3 +1,3 @@
-DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
-EBUILD pyacoustid-1.2.0.ebuild 693 BLAKE2B cde0fb7d648f3616525b072a99109ebf5a055ef6d73c65a9eeb87139b13169700d7c4bc8301dafefc40c57941dcdd75bd80da0f7532b0402e04d3c46fcaa0391 SHA512 32f69fe18b0d7daf746770278b7f2132195968d55a1750ffdbb00b2f2786d4f191ff1e24880d098b48b28c8612ef3b7353b31556bb195ab8f012c7538f59cd8a
+DIST pyacoustid-1.2.2.tar.gz 15869 BLAKE2B 01f327dd640819dd799f48b32e859fe39dccda3fd62714bf324c8219cf7053b36f1399793523634e9d4f3c6405bed5050abb34bdf53c72ff0ee22708fb57225a SHA512 5bcb3f017c3013eb8fc9e335540a1f5e6a52fc2fefa53d5ef246ba16e4ff615dd1d1cf08b5c80b1a38b149e0fa7dc0b15e4890dcc3f5478ef874b4ec22cf0813
+EBUILD pyacoustid-1.2.2.ebuild 724 BLAKE2B 5987fd76b2d39d707a5f93bd2fccbc96bfac22059fce38fe4f68ee39a948f4baecf5e93384c33ff3598b699f3ca29017874bd642976f4c158d8a20db2c2c8469 SHA512 dd8d891c6fe10ef4045a8f7f0fb602b3e56be4a5f681d7605458710fc2ad4f4233a0674de64f3acf1457b6cc2f477ce9d0693a225e08222a11df3863bfac3328
 MISC metadata.xml 714 BLAKE2B bc0db30cff6644da34b7944bec3d60b47f394ac854d547fcbbf3ee4d2719edc4cb781a42b3ab266fb7dfb5762679daaa0e382fd0fa8c2cffdd35af4cc55633be SHA512 6b6063bfe7d64d8a053c0e5c1609d8011e8aeeb265a895db88154e246761027ec2ba5fd582fb08b64e5ee09b3a238030415613df9267620936a718b76d6d1692
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
deleted file mode 100644
index 7b23ee07bc58..000000000000
--- a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
-HOMEPAGE="https://pypi.org/project/pyacoustid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/audioread[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/chromaprint
-"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use examples ; then
-		docinto examples
-		dodoc aidmatch.py fpcalc.py
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-}
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
new file mode 100644
index 000000000000..878994af7c33
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Chromaprint and the AcoustID web service"
+HOMEPAGE="https://pypi.org/project/pyacoustid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/audioread[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/chromaprint
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples ; then
+		docinto examples
+		dodoc aidmatch.py fpcalc.py
+		docompress -x /usr/share/doc/${PF}/examples/
+	fi
+}
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 37988b153fd3..2f879d8fa4ba 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,3 +1,3 @@
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.1-r3.ebuild 786 BLAKE2B 508ed684d2a0d56bae46a5f6d694599108056292cd99f74d24579a8e54e74449ec5951a39e9cf26b57a6f6f793b3c18a7e733ed4fd333ee18921d1141bba46cd SHA512 b54badd895bbcf9e3ac81374396728fc921f1597e93e721491feafd3fe288936c7429754a5107a6e58d5310f85dd458c657a33901f3591202dc31a3253975771
+EBUILD pyaes-1.6.1-r3.ebuild 793 BLAKE2B 288d87c7b13719bcc13b303dd89f27362065715ada454aabceabf0db97a2334540d3817bf69abd8b37ee68b6268cf09a17e600c33a008abd23565201e3a95860 SHA512 d4d8fa2572681dd4cf877536690e157e483f24150db41c8bec6c74b66aafe9183a03ea472c7e79e36a9e474051d18ca4ebc926c116bfc79c4e07d05da4ba72ec
 MISC metadata.xml 439 BLAKE2B 3106536a0f46c9b8fcf3a1247fea58bccd871d1e4d25ef501dc18bd6ba6bc7f38b2dc050de59b2bd721069d848edfca018ddbeeef3869ffa56121231d0f89582 SHA512 676609865bf42cac05d966d2d72c8410fbe1f9c4e307bcdf0994225f4bc950f15083f2263210d506245b7be55e09da8479c7134160d5624d739299ca2c69dea7
diff --git a/dev-python/pyaes/pyaes-1.6.1-r3.ebuild b/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
index 2e4a7c6742e0..7e3dd08474f9 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( dev-python/pycryptodome[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
 
 python_test() {
 	local t fail=
diff --git a/dev-python/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 4d643d9bf265..dd8b1676e57f 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1,4 +1,6 @@
 AUX pyalsa-1.1.6-no-build-symlinks.patch 682 BLAKE2B 046f4cffa0b08a32360356d82384148b805544b6f05e44ec329bef2299b67e46c68401b800761e9dff2141b22bc029a55fd5cf01cd5cdb533303aef91a2bbe0f SHA512 fd3937df5a69326908da942a8926e10221bb85693c863cc06ca363ca8fb07761173d2b51113615970887442d8779b2e9ff468b927b078acf52620e944b71b779
 DIST pyalsa-1.2.6.tar.bz2 40171 BLAKE2B d142d5818527b30b333d2552045892854df25eb14a7983320fe56e30a6239d3fe947ef1f0e1202ed3b5aad7722002e0e5e82ab9f89564bb9640aca2dc03c7887 SHA512 11b8eed822e0f8acc96ff0e10eeec0ba26b2997c7a0000b1d82561661f59931cd6b6aa6397b46c5944a0853344517878ede6c9ba13bea241cefc72b72bf1d9ff
+DIST pyalsa-1.2.7.tar.bz2 40132 BLAKE2B c100d16bd8c0d9fc6eddcda360f3582c55ed1b143a58a49caf76a62494882952d311271941ce0ecdf57ac934f3564dc922c80e8a5f5742b593341ff4215b700c SHA512 126501fe7b9c006f28e9290bdd3ad907ea9e053b71e21e2c6f0b0beeecdba07b4b557014041b03452f96be690f59f2e647e075487ee87054f21f66df7f39b34b
 EBUILD pyalsa-1.2.6.ebuild 663 BLAKE2B 50e244254a4016f0146e8618d6869971b0804758146f93ea770733d2274659228b38244e0c8a4be2cb2578bf00e8b10ebafb18bd5473b0762bd929ff5edca38e SHA512 94ca6808022477fe84ee8e20eb3a403ea59c04110bdeea297573ed12fc7aec8eebda387f6aa0a64108a56bb50f4dade6e06025125619af792d1abecb118a8d36
+EBUILD pyalsa-1.2.7.ebuild 668 BLAKE2B 9fb9323f4d42531a3af96fc1dfd0dc74d636879924659caeaecb01b429a642078d2ed3bdea959c7a06997b3140d849b010b33bb7ec059fb2f8d5f6ee199c0bfa SHA512 5f3f11bd6b43788cdab8b9dcc985c34ad8f336c1c12c64e99a2fd96cea9bbc6d9264341d2f7bbef413e866d82de4882bab276ac95ed7fb92fc5be3f007e050ab
 MISC metadata.xml 427 BLAKE2B bce956560d50c4bf87eb6ef026903b4d860350851d0124dbc6df20c8ad5a62851eddf5736b3e44fe0bf596bd82d3bae465041b2a53c9884bba1469b99fae3875 SHA512 6c6a1a1acffe544b1c4b39ec98fa3892ec53fc7c2137d5d987cbb6f026e69df638e3c3b43bda01434ecf4a202559c81aefe5b2d2113cf26da3e9636b31a4331a
diff --git a/dev-python/pyalsa/pyalsa-1.2.7.ebuild b/dev-python/pyalsa/pyalsa-1.2.7.ebuild
new file mode 100644
index 000000000000..b722c5dd7316
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.2.7.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 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/pyamg/Manifest b/dev-python/pyamg/Manifest
index 849534e77791..23493423271a 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,10 +1,3 @@
-AUX pyamg-4.0.0-test.patch 589 BLAKE2B 2b337d2815b4bf091a30fcb03b8c9270e601a0dfc5c1d3ed2a4541e8af1d026e8d56a517097d403110eb91c675cc07177b0fc96c81fa48cf51cabccd81da1112 SHA512 c6419ae72b6231015f46679a277d61755cb11cdf1a586789d6cfddbd28ec548ced6bc81c4b973011163d6be76509d26035636ba5952c8bddc3d0c66bc258142e
-DIST pyamg-4.1.0.tar.gz 749906 BLAKE2B 31c05d64317b32cbdbd616e982557f0a94bc17b2fce3d982fe93e629d56ad526516603032b3cba9785bf5ebed038481ae641f55a5a1ad621442dde08791981cb SHA512 311642cbbe8dca621cb58bebb1bb05b7dc7b2364713886df96937ba56575137bcb4fb7006a232d2c14380cd41f4337f6f09a8a9794e279a155f27287497d2b08
-DIST pyamg-4.2.1.gh.tar.gz 3900395 BLAKE2B ad4427eb297f044b4782274ce55799bd9da4abec108267c4c0aaedab38e2fb4d89c4c365eca90e4045c411254640ead667fa0e511d9597ff00081c0ebacde9b2 SHA512 933f5f1da808cb02ff5fa91df54a48a971bb3b017582f5a829cf71c94f698469476b9f0306962140dc38f7265266c9b53f98dc7aaa99945b45bfa83003d26df9
-DIST pyamg-4.2.2.gh.tar.gz 3900331 BLAKE2B 34858026eb9e1eff20101e3ef810e7f3fed40e5b363c3a0858189276259576b8abe4d2a46fc386a1d759eff724bb8b7814944d08fd555783cf33e908a05812f0 SHA512 f9f18df8b34f240be7e738f1e0f74f348d718f63bb7a32bf0c78158e2ace985d60fc182beee5a9e75248aad3fafe0525a6f41b3acc356c52ce15b52730cbd970
 DIST pyamg-4.2.3.gh.tar.gz 4101959 BLAKE2B 190cce0bb06bbfc09e8c7a8d6d70498308e4d0e098c23a12d12ae8373b56ef183694430c1f85e287682f9733e3f85ff2bd94d8e10003f578af32f3c3f583a8f4 SHA512 ad11ed2870de41bb9596167a5a7fc3edd4c4bc898c2f5b5ffa3cfa862372d993fe1adfc5f3d199150ba69a4d2acbf75e5d99b3aa872273da0d05f1fd8d9f5c6d
-EBUILD pyamg-4.1.0.ebuild 737 BLAKE2B b1f0bd7c9f9cc65ca6d6aea2ed93078c50978d8bbd3b62fa9bc4c90556154151cefb683472bd5a4f06c3bec463dd08bc19a1fdcc642237bb01766907ae700feb SHA512 10b5cbb4d98f4daa312c6edb6fcff91df85ccc874ea52633d9f7f5f453f8b81398deb9087867dd0dbb0e5959a1f5c0e5beada9e15dcb7910c037daa526901418
-EBUILD pyamg-4.2.1.ebuild 744 BLAKE2B f7bbe6113dbe248f782cf6740deb8ad4d722b0dce7c13f025ef14588c489dbb918219dd941d4885a378ed69edc2d845413b81b0380387b898a88caf1029be6e1 SHA512 d26c900b0f9dbb3a76545fc6997043f84f2c148b9b4ca2a057efd879a088db704697bf19ddb1b14af5aa55c2a6b5d48415299aaeebf748423011301f694c21a0
-EBUILD pyamg-4.2.2.ebuild 777 BLAKE2B f4cc27bcf2acabfb01759003f1b518aa8a134e2f616d5ddc9c72de36075ddb77739d38e5c40a144e468cadeebff638f04799ac9c303bd3c78e3133b7bc13ac5a SHA512 d2c48422e0ba18340766d00acf5e53dc365b651b6f1e11903cc5aa8ba75658114822e5628a9af0ca57e015d976d1f4d8525cd13bd15adac06432a557f95affef
 EBUILD pyamg-4.2.3.ebuild 777 BLAKE2B f4cc27bcf2acabfb01759003f1b518aa8a134e2f616d5ddc9c72de36075ddb77739d38e5c40a144e468cadeebff638f04799ac9c303bd3c78e3133b7bc13ac5a SHA512 d2c48422e0ba18340766d00acf5e53dc365b651b6f1e11903cc5aa8ba75658114822e5628a9af0ca57e015d976d1f4d8525cd13bd15adac06432a557f95affef
-MISC metadata.xml 661 BLAKE2B becf7cacd76879bd3214eacf42cb06ac03c7e0abe3375e1a49d3319835111bad3a1625f56ae2cfae09284972b5d9195201912e9993bc4a18a9bb81f2f58280d4 SHA512 c9cd36f23fa97324ab520e15d1233ca6153c4d1d195a3d130c71c4289177883c6d9666f80d2ce9341e5182a398a55a286f27068aecb68bb233b1193909204c8c
+MISC metadata.xml 768 BLAKE2B 26229e93507c2f6ee26cf2f079b9e9591bd9e4b0f7922ae231444f885afc4a3050b4175a948b81260d5b50d2b30e608a65c220fa0c1e7a5fb8c3e7816f81e610 SHA512 f7f5876fbfc7a8057edd3c0f1bde6721721408a2def54cad978ca4a3699a1bf9c75a7b690c89e74a82a325a368d884e8f232a64385026dda267abf8898124b33
diff --git a/dev-python/pyamg/files/pyamg-4.0.0-test.patch b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
deleted file mode 100644
index 316d0a2baad4..000000000000
--- a/dev-python/pyamg/files/pyamg-4.0.0-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Backported from: https://github.com/pyamg/pyamg/commit/6f5e549e6105e18cfff9bf4b5f1834d081fa4510
-Author: Luke Olson
---- a/pyamg/aggregation/tests/test_smooth.py
-+++ b/pyamg/aggregation/tests/test_smooth.py
-@@ -485,6 +485,9 @@ class TestEnergyMin(TestCase):
-                 Bc = ml.levels[1].B
-                 P = ml.levels[0].P.tocsr()
- 
-+                T.eliminate_zeros()
-+                P.eliminate_zeros()
-+
-                 # P should preserve B in its range, wherever P
-                 # has enough nonzeros
-                 mask = ((P.indptr[1:] - P.indptr[:-1]) >= B.shape[1])
diff --git a/dev-python/pyamg/metadata.xml b/dev-python/pyamg/metadata.xml
index ed9509d3fc52..8f956fe42d97 100644
--- a/dev-python/pyamg/metadata.xml
+++ b/dev-python/pyamg/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
   PyAMG is a library of Algebraic Multigrid (AMG) solvers with a
   Python interface.
diff --git a/dev-python/pyamg/pyamg-4.1.0.ebuild b/dev-python/pyamg/pyamg-4.1.0.ebuild
deleted file mode 100644
index 27080fa711fe..000000000000
--- a/dev-python/pyamg/pyamg-4.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-# cannot be enabled by "distutils_enable_tests pytest"
-BDEPEND="
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0.0-test.patch )
diff --git a/dev-python/pyamg/pyamg-4.2.1.ebuild b/dev-python/pyamg/pyamg-4.2.1.ebuild
deleted file mode 100644
index 971ced744f5c..000000000000
--- a/dev-python/pyamg/pyamg-4.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-SRC_URI="
-	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	cd "${T}" || die
-	epytest --pyargs pyamg
-}
diff --git a/dev-python/pyamg/pyamg-4.2.2.ebuild b/dev-python/pyamg/pyamg-4.2.2.ebuild
deleted file mode 100644
index 3b4aa574d96e..000000000000
--- a/dev-python/pyamg/pyamg-4.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-SRC_URI="
-	https://github.com/pyamg/pyamg/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	test? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	cd "${T}" || die
-	epytest --pyargs pyamg
-}
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 75f9beec5c6e..ec0fce124be1 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,4 +1,3 @@
 DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
-EBUILD pyasn1-modules-0.2.8-r1.ebuild 701 BLAKE2B 18f4f927b56eb9c80bed8b21297ee243463b1db616e47d30bb65d703a54c2c201f0db9ab1c5c54251bf2bcfeeaf962808b6a64c6799dd2c3598fa72abd8bb246 SHA512 7dcdc1c8be00d4c21084f700382a895de409cf9810cfc7a66ece37e66816fc7bf15d601c99f7ca61b0e5ee7059c1aae71ead2bf257a6d4e055560cd44f9aa5df
-EBUILD pyasn1-modules-0.2.8-r2.ebuild 745 BLAKE2B 5522535c7f2d176b2dc6babb70fe6854270d1fe3dc3f387dc3e42773c80414d51d7e3073c49e8a5d7b964b49ec6d7b121bd1f48a76465f403a6f7ad0a2c4c0a3 SHA512 b33a6bbcdc400b1ca815505b5a710dc8f8599f85d7853818b73f4d5393f7e338e089d200fe3d7f247da2c40e6f92b2fa9730fdcbfbb384df6c5bf4a402d581ff
+EBUILD pyasn1-modules-0.2.8-r2.ebuild 737 BLAKE2B 87a40d3c154a4807750cfc59fa5ebe7dbfa36009cd68d4de613b987f604962a04f1a534d5d1b66b75503cc3d797bdbe780baefe6f984a5f32793a015ad69a655 SHA512 bdc62c1a64c103a3231282c09034a79dcce6b4105cae18d82a5e732c1e6100fef56d25af2c26da6fcc11745b8ea07797536097d39b8bdff207fcacb49a211a20
 MISC metadata.xml 404 BLAKE2B b5d3c68b942e6c2ff5a1cf31cc0b43ca1570e1d4280a85f376d7b81abbe540ca889f87039dd26fe1f595a2ca8b47acc4ec03bfc5598ba06a8e651c60c2277c93 SHA512 c4784ac61152a9d609e337f7c186b214b2e3add22d54ea7cfaaa0c8fc4fb9e0895617d0b73692aa7326088dd7b7e1ced8a871ac8312abc1f6b09fb558a4d385b
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
deleted file mode 100644
index 902f07354821..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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="pyasn1 modules"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1-modules/
-	https://github.com/etingof/pyasn1-modules/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND=">=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
index cbd434c92929..521e4f91fc2f 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index 4fbf97721f09..d739d3c0dcc3 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,4 +1,3 @@
 DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
-EBUILD pyasn1-0.4.8-r1.ebuild 590 BLAKE2B eeb65127310be46c11f24859283fb50852227000f2c86ac3d23de94c7f5150a3ac856899cc999c09155b4bc2414a613ca6b9af8566332da6dc2af267d2ad20e1 SHA512 f871bb5b8b6bcb6d29970ca8a48fbfa09cc427d09157a165ad9e815e52ca3e8bf3e194adde962bb5477deaf17580b4a72507485a151ee810b9c1d4e956f3a7a1
-EBUILD pyasn1-0.4.8-r2.ebuild 631 BLAKE2B c809cf50ad686a44b20bde88679bc7658350ef34dec416c262f1d775e1fae88f330d41036fd12f88140e29b10442ce96eb2d9abd9d942448b684398bc9bf320d SHA512 059bb2c4ee48b677e301424448e52d9d14fb7a92402548d0f87fe5563984b86fb5f745a0941862a71b69d902f15498d46c7dd7938f14ffa84c1001cf0ab04b9d
+EBUILD pyasn1-0.4.8-r2.ebuild 623 BLAKE2B 248cd929aaa8dccc48d2dd68d4c909507f1696cd48f8067708a2e0dc95aef1918b6e42d2fa80160fd7c9ade322d569ba4bc5a98ad61aeffed07ffada0a60d422 SHA512 44ca2b0b5aac745638df07322110a2dc2d01847f11d8098c777ab152139ced37cba35fddb81015fd6cc8c526d937bf35fb01317f6228ef0aaa4eec3e90b62907
 MISC metadata.xml 401 BLAKE2B 28d1b58f4b16507dd595524f0eb3fafa93a68222bc56f0040b33e7458b2ac471409c798af1014ccc50207fd0ac66a566aba36e1f0c04a22499396620f3477945 SHA512 a25c0976b4d0ff8a6ede6b84b6933b3405f8cdbf74416f01e91508f0c72d2dda4b4ff63c011846052b683bc7a3f7e5e0ea068d3b506d256bb15fd8dffafc94e0
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
deleted file mode 100644
index d88b9d42bec3..000000000000
--- a/dev-python/pyasn1/pyasn1-0.4.8-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 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="ASN.1 library for Python"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1/
-	https://github.com/etingof/pyasn1/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
index b83850870165..5a0d1b7e120e 100644
--- a/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests unittest
 distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index efbbf4c5854a..8127af72213a 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,3 +1,3 @@
 DIST pybind11-2.9.2.tar.gz 709521 BLAKE2B 76ae9c72faad805885eabbe4dadf1092fe814f04f2a8d834da035c7389dcc996c09a63149911aa7a5c0b70d2da9f7c32e94aaf1c941f13345e0aef40a5748dfc SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272
-EBUILD pybind11-2.9.2.ebuild 1116 BLAKE2B 8b5755a4cc0a8ef2026ecc06ce6224e5044aad8111e3b5c05e9af20ef0da3fc17ac188daabbb0d5b095c154c4270f2a4d4202fcf9e99124c090c9f2a34ce7c62 SHA512 27ffc7ceaf1a9251c4616bb96e50eedea22ec7b514350cd295aa0598015d90b1e378a63fd8ad4ba24303db951f924d3a9149c5797c4bcca602cb68472034150b
+EBUILD pybind11-2.9.2-r1.ebuild 1230 BLAKE2B e64837a80f44d0e2f766fce42db1d5e2f1310e9ec83b6139b5f6c316ad5b7bb7b0d0ed495e5f91e2e12ef7c291321aea604af0c919d48b52aa57a6f3115413ae SHA512 102fd9df725323434138f8517de62e5accc4c5cece77f7c9d289d31eac19f6ebeff5b393f6b5a6b22bf4b3f7da81aa0ffefc219ef701995cf3e4a769a2df562a
 MISC metadata.xml 420 BLAKE2B 8a3480ac275b7e2893d696bf4fd0d70f41ea941fab9e24b19d8561c0efeee81024ba6fea0ab26333346f3c176d1a87b35229e31ecefc74de2e7614600a64013e SHA512 8140e933878a75968420deab189bab1decd030b5209baada2857a7659dc32980bbc46678c6612ef56e4b4f6b598579bb8227e6c7fd00fbde63a40eb13bccf86c
diff --git a/dev-python/pybind11/pybind11-2.9.2-r1.ebuild b/dev-python/pybind11/pybind11-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..2d574fd4f591
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.9.2-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+	https://pybind11.readthedocs.io/en/stable/
+	https://github.com/pybind/pybind11/
+	https://pypi.org/project/pybind11/
+"
+SRC_URI="
+	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-2.13.5
+		>=dev-libs/boost-1.56
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pybind11/pybind11-2.9.2.ebuild b/dev-python/pybind11/pybind11-2.9.2.ebuild
deleted file mode 100644
index 1eec1ea3b37c..000000000000
--- a/dev-python/pybind11/pybind11-2.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="https://pybind11.readthedocs.io/en/stable/"
-SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		>=dev-libs/boost-1.56
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 170de3f9ed0a..f1816414ab72 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,3 +1,3 @@
-DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
-EBUILD pybtex-docutils-1.0.1.ebuild 529 BLAKE2B cf6bdac0501820a591e2fa424e9fc29d69ea2e3a0e09fc667a3e3c59fa43d77fc5f8e50efa0109511d9b5a1538805ce0f0004880b41beb7052997981d99ec7d3 SHA512 7ad018471351e33e13c2e6c388634686d82dfb1537ac6fe325a371864e9919a053b3ef7409ddbb87a4c06c3e86a7bbfe3d6f3fdec40f7d90bac4b8c1d8e9cf89
-MISC metadata.xml 428 BLAKE2B 876a8f74ae3520e45e2ea1e7ce1dabb7891738453e6bc4757c3e4d9228a0c8d6407e350dc902f1e8f2485366968e25fab8d8921ff4207076622cfb3218bee221 SHA512 85e0ffb9a24ef252898df540f4fe0b80626f623faf06e3650d1cc5473c986c79785b330420eda2c966ec985c12800a97552c659b32b91bff2ea2f39c5f36366c
+DIST pybtex-docutils-1.0.2.tar.gz 18450 BLAKE2B 84521d36994e3ca5bfdcebd308e6aaeb17f7202d024799612d34dbf58b1b1e58d42b898a4c792815a472b0a7008e28558fd722f39462cd3b1ee24b921f746a4d SHA512 1190fcbdfb89b858a1164dd2c99a5da7afb76a23f5b314963babd894e7578d75e80f2552319c6621e9c7738018fd1b8f4a3772057ed65466f2d9fc3e15c57e2b
+EBUILD pybtex-docutils-1.0.2.ebuild 564 BLAKE2B d140a6ce6462d65739d33dc68c9df41475b49246de6ccc7af7386525f6fd1f5ca9f45e8541ded3c2b4210dac84c269f77a6d5dce8c76ae0b7d172ba9e03d114d SHA512 b3cd3fadc664979c836808765312825d331e038f10e5e34f8b34ce301a96a96add10aebdb936e7ef56d03d50826ef88d3831918d8768a04b095d621911b70759
+MISC metadata.xml 529 BLAKE2B af193891d1d709d75fa2f89fa828ff5c946ebdff0b405ce06582e1222a7c3b32ec47ece3dbc96337ca11e6c3d510710954c256da58d7a171bdfcedce3e3c28da SHA512 990fa90122af363d3ed1af301c37ac1c5b3ece06e8712982cbc514d8ec7826a1ac174488b174cdd617bb820c0db269ebf515fdedf636181940af759ecb190916
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
index 937f93b087a5..13b57882d32f 100644
--- a/dev-python/pybtex-docutils/metadata.xml
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pybtex-docutils</remote-id>
 		<remote-id type="github">mcmtroffaes/pybtex-docutils</remote-id>
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
deleted file mode 100644
index 95945ba0ed3f..000000000000
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +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 docutils backend for pybtex"
-HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pybtex[${PYTHON_USEDEP}]
-
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.ebuild
new file mode 100644
index 000000000000..884d113fc0af
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.2.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pybtex-0.16[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index eb0cdd78dd56..4bfc794430dc 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -1,4 +1,4 @@
 AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
 DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
-EBUILD pybtex-0.24.0.ebuild 671 BLAKE2B 0c6a53ab7569a53da34e19922ee2d2034d6a0d52ebd19ad878fe58f70f8e7f8ffbab5b7d49575a797aab531409318cf5dbbe210ab905a7133d28554c9f4fb559 SHA512 746490efbc2a75014c16496d6ffbc1810910f47b21c6627864212e8de8d545007e33fb2652a99b667c82d82939d6afe82c0c50e2eb4d5755c7e7b55581a3dc7b
-MISC metadata.xml 553 BLAKE2B b0dd3fe280a5909fa264d22ab6f1e2ac8fd6812db7b590959c7ab2a5c5290fa42cff896dd85a089e2925f9fc2c2662e690013d31423b663eafa48cd382cf8208 SHA512 c8c93d21c8d121139145d6e394e92076153599150ad2b7d12bfd746f070565bba8375b1220839cceb4b7172831ed915160cedaddd36ca50e3cca2b08621a3a60
+EBUILD pybtex-0.24.0.ebuild 674 BLAKE2B 157ee91603c1e84fdc5d480093bd945e8dc2952bde779d40edd99f672b95d96df8022ed13ccbd16668a5fb243a56584f225ab899a25e60f9415a43f7f378ca82 SHA512 5aa6a07630121ec465af1b8288ebe08705122a2d2772bc8335e5176603306493c84d447c3b6a1ba221e3a3921da27ced967f854c14f67e6f1270a624244ca7b4
+MISC metadata.xml 660 BLAKE2B 8826995a0460980941d9bea150fe0291e4b268e23fab6fa6b88271986d9b5c7b1d3b269c2993e049087fe976f45a51ec28100df577ba1f9fca00900346486b65 SHA512 94dfd5376d5820467394d4c9fbf31dccdb36688de2296960a8318604a1bbf54746a68da0f7ba2f6018df71f95e1e69b5055aa4ddcb16d6977835752628b9932a
diff --git a/dev-python/pybtex/metadata.xml b/dev-python/pybtex/metadata.xml
index edc9a8403751..f07d078608bb 100644
--- a/dev-python/pybtex/metadata.xml
+++ b/dev-python/pybtex/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">pybtex</remote-id>
     <remote-id type="bitbucket">pybtex-devs/pybtex</remote-id>
diff --git a/dev-python/pybtex/pybtex-0.24.0.ebuild b/dev-python/pybtex/pybtex-0.24.0.ebuild
index 3c21d5769d29..5349f40ab8f5 100644
--- a/dev-python/pybtex/pybtex-0.24.0.ebuild
+++ b/dev-python/pybtex/pybtex-0.24.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=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="BibTeX-compatible bibliography processor"
@@ -16,9 +16,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/latexcodec[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
+	dev-python/six[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 89e86d371ba9..09b9e013513c 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,3 @@
 DIST pycairo-1.21.0.tar.gz 340712 BLAKE2B 6578c75b478c14c641b5c0be44c3c633d32ecc09c4ef22a079024dd12b539d37f88efa6ce8aadb5a88a48b3cc793e573afe00eaa4e3ba563c3133cad72dacfe4 SHA512 0de226b05d0a358f3546e4a0d5bf342f124373718d4900c891a09c1ede11e3ed1fb9bee163c00acfc215044683ddf0b29c8573b7454f9c39f957a47d63c34baf
-EBUILD pycairo-1.21.0.ebuild 1112 BLAKE2B 09e2f268f23b79f62bcd97b33b932704a5414f5f8d598261dbe86c08f083a2bb8a320934166bf621d019b496d05ac61fcdb52c734887ee822bc6f6bd8ec0a85f SHA512 e9e9a265532f608b785893ea4444da4cd3d93251d6e0c99415b8a327366436df344f35c537b8392b600625fc7257008fe5637f05f2bc53dd4f55d188b465d10e
+EBUILD pycairo-1.21.0.ebuild 1119 BLAKE2B 0b2767c15a284c8e79f0957c5e6007d48ec1c764372d90472fb38a8ae877ea15c6bca398e15e52bade9da1e5f19cf7fe799b9838ec71051f4c771b0836aacb8d SHA512 a38b33e6f08885ea9a39716c11a459e528c204aed26b58de0f890572d5ef8879b455821bab2ed34468ab5d0152c59196be109718faeb466cdcab5e24a9322561
 MISC metadata.xml 311 BLAKE2B 5d0e83f55c7abf1be229cb2d1595e8bc0fe0d1099363302c3f4dd721bf8a8c7981adfeea44fc2cb480b12afd9a440ebedf7e582a0ac4a53f9a8c8b2064947623 SHA512 ee62848f97608aad7cff520822a88d8bc2a182456eb251405a4043bf2d8097f89e085a978bfac96db17d2fe69b24c6b26ba803783b73c0532897c27e93149645
diff --git a/dev-python/pycairo/pycairo-1.21.0.ebuild b/dev-python/pycairo/pycairo-1.21.0.ebuild
index 10d5cb8b5bb0..eb6d70b38d8f 100644
--- a/dev-python/pycairo/pycairo-1.21.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index a127e54be626..a9cc156cb191 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,4 +1,4 @@
 AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc9944e889c14aa72c27c90512dcdda7941ebe68324f706ffd033a39fff2e89ae0f757becdcb28 SHA512 1036fa52cc7df49740d9c4cb06f4fbdce52c2de9181d44559ef4182e6f469d0236bc8d0103576516826b78a0e1d6a841a89d15e1b2283a8fd2099b205fc0b222
 DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
 EBUILD pycapnp-0.6.4.ebuild 794 BLAKE2B a26f745c843eacba51220ff62dcff0f4dcf5081b24f61d50173c28e24b39a5f4c940c47fa0e1b9c7f04c72d537670d9ebb77ca1bf3a3cea1bfd692ea5ae8dc1d SHA512 cb9a0925418447d07b4a0e1a80e131e512772c41b3b691a0ef86c6ef8d39323e7964282c6d0ff78cc2ace9cbdb455d0aafefa34b725af0702c69772eb66e6d63
-MISC metadata.xml 554 BLAKE2B e9656e327d4325e551c440e9768fb5390c4db1d96722d30e50ba7e4fab9bb6b1f46c3999358e988b57741ea40d6cd120636c40f8b62287dea6065096b17288ae SHA512 a6334326b8807c26aa008604eed49fd8127b7161ea30de141c72d0da54b29577055b9d0387391027fac92d04c9ab6cb4e1a8f7ad048ffb342bd905cbdeb2ee8c
+MISC metadata.xml 453 BLAKE2B 6672585a840a0d8f3fd1b5d921ce57b5bf23cd2b360a712fdf63fcebfd48f7bec13284294eab67575b772f9780e8db875c0b44d363a7fecd06beabae330e7265 SHA512 4d5abb2654ec2173df66078280870503007221a62e639f17b441a494d33df5086a54dd28776be90b0456f19a2fee0d6a34c3498ea494101e91ea8c268e089c0b
diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
index 75553d6e865a..7b9b669e8cb2 100644
--- a/dev-python/pycapnp/metadata.xml
+++ b/dev-python/pycapnp/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Alexis Ballier</name>
 		<description>Python team can take the package if they wish.</description>
 	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pycapnp</remote-id>
 		<remote-id type="github">capnproto/pycapnp</remote-id>
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 46ca6f20a91c..e34fd74dc42a 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,8 @@
+AUX pycares-4.2.0-c-ares-1.18.patch 1504 BLAKE2B 071494623af58e35516a32f4b73ad79a4e110f2794b7580af5e15856fecdd339d24b37129d8707752116e0ef078667fccf5073e90b45180011b4a9d3a9852165 SHA512 e8d9ba57015c9326b7939aac797324f9682daa7fbe2ba549164095792182b53bc49818ab1bc4be8bc0e8215d2e1336e262749058aa251a5e0371570a13b1ebb1
 DIST pycares-4.1.2.tar.gz 43668 BLAKE2B 4b26f8643ff5ce297981b0b60b3afb34b249138e8f702dd4aa0a38935e9e5338d048f3be1b4fb64d6d8b2259a279a8881dbd44b412c10427dbd7eee664e70495 SHA512 6fb2d24fb5f2638c55424608b02ebe9f630866d644decfb663ab9d8e2bb7a42629748fa220054747f9c36ce3dcb42f3b8e457c5c39009f94b564ff07efde0c84
+DIST pycares-4.2.0.gh.tar.gz 43939 BLAKE2B 6cac12ff2b3c44cf7d04b4ce3067d5435d416788e89251d87825e5ea265ecb178948e0187c47e8dfe40ec0480a66b8b2f6cc2c45e74473e9d66f5cc74269f50f SHA512 14c813242ff6cdc5249ae52c2b9ff1870d7b74c7c6083868b2b4bbe0ce2af3f15e9b2775f67940ffbfc4ce84a6a9232ba4fab5a17ef389f7a197a15318280e43
+DIST pycares-4.2.1.gh.tar.gz 43939 BLAKE2B 40f147189d5daf841a8165da86d881f1822763fbd050b040f11bd1f63a768dfbc71c78230d41331486cbc2354175b528f298dbb167ef7801e57b05b4a13c820d SHA512 b5462b58bf75a9ee39496209c8270bc9c07070d34d9c2f2a2eed4752ebf83392e256248dda06ec5934c235cb37636e55a21cff4181b0a03c3eff24fbf9297eb4
 EBUILD pycares-4.1.2.ebuild 837 BLAKE2B 7af483901bdb74f49ef8cf1ea7e36ad0eee1001e2969d7c58b52bce4bc4726b4e06496c140de9f42af9e11fa1ecc8344e9d5ce4363e08dc8126387cec0da0155 SHA512 13bda8a1153c57e5993849408184ce77679d581ba27285a37ce4510782c2653be30e5754e00aa34f9834fde2ea3e0098e027d63fe8ecbc7b586ab967ab9576cf
+EBUILD pycares-4.2.0.ebuild 982 BLAKE2B 0f17afdd1894faa0d862a00204418c1af0e33ebe95e11314c451057e0c833eb35b260171f4f7b2020afff38a0bc1b339c903878aa7cfe2f28f16d909a380620e SHA512 cfa353fc11ff452dca68dfa364d3116a1da979db19342e6279a4c6ee7b4f42956d2fea6c47bdd11a23fddf01a066ad556d75f4746111e2fb5396ae2c836089d6
+EBUILD pycares-4.2.1.ebuild 962 BLAKE2B ae6fd34d7202f21aefc7bb5d5a6bad660e154c3f1de6f54e11498a1755ee4a916ca9693bdb95377825ea505fd2dfd606d30f08bb221473b11bc38ca0ee73b51e SHA512 85d716de5bfe4e44b06404fd8bfbaab6290b550a896fb3e7fe77dd660f7eaacdd0c38f483fb6f3edda65fcb831f71dc5057f1747a13f9a0da7c1711c8772ab44
 MISC metadata.xml 444 BLAKE2B a68f545c6f704176b98ebb3665e2f56e4879016ea4ffa4f342954d568d6fe76ad67bcf9d521f694b8fc0f199bff50969eb646554fff4a78f8644ac44edda0cdf SHA512 fe893795f2031639d9fa27efcb8afbb5a3e0ac2eb2a05f0465391813d60fba07372633e40136ce38eb429bae95d1ae5dccecd0aba228537553524343133dd202
diff --git a/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch b/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
new file mode 100644
index 000000000000..2e094a2b2f1c
--- /dev/null
+++ b/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
@@ -0,0 +1,37 @@
+From 72202e0bc135e360102371708e83334856d485cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 22 Jun 2022 07:38:33 +0200
+Subject: [PATCH] core: add flexible member to ares_addrinfo to fix c-ares 1.18
+
+Add a flexible member to account for c-ares 1.18 adding an additional
+`name` member to `struct ares_addrinfo`.  This fixes the following
+exception from cffi, and the resulting test_getaddrinfo* failures:
+
+```
+Exception ignored from cffi callback <function _addrinfo_cb at 0x7f5fa890d040>:
+Traceback (most recent call last):
+  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 162, in _addrinfo_cb
+    result = ares_addrinfo_result(res)
+  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 841, in __init__
+    cname_ptr = ares_addrinfo.cnames
+ffi.error: struct ares_addrinfo: wrong total size (cdef says 16, but C compiler says 24). fix it or use "...;" as the last field in the cdef for struct ares_addrinfo to make it flexible
+```
+---
+ src/_cffi_src/build_cares.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/_cffi_src/build_cares.py b/src/_cffi_src/build_cares.py
+index 77f03aa..dec42c9 100644
+--- a/src/_cffi_src/build_cares.py
++++ b/src/_cffi_src/build_cares.py
+@@ -337,6 +337,7 @@ struct ares_addrinfo_cname {
+ struct ares_addrinfo {
+   struct ares_addrinfo_cname *cnames;
+   struct ares_addrinfo_node  *nodes;
++  ...;
+ };
+ 
+ struct ares_addrinfo_hints {
+-- 
+2.35.1
+
diff --git a/dev-python/pycares/pycares-4.2.0.ebuild b/dev-python/pycares/pycares-4.2.0.ebuild
new file mode 100644
index 000000000000..1b84ec92ebb6
--- /dev/null
+++ b/dev-python/pycares/pycares-4.2.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="
+	https://github.com/saghul/pycares/
+	https://pypi.org/project/pycares/
+"
+SRC_URI="
+	https://github.com/saghul/pycares/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/pycares-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	net-dns/c-ares:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]
+	${DEPEND}
+	${BDEPEND}
+"
+BDEPEND+="
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c-ares-1.18.patch
+)
+
+export PYCARES_USE_SYSTEM_LIB=1
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycares/pycares-4.2.1.ebuild b/dev-python/pycares/pycares-4.2.1.ebuild
new file mode 100644
index 000000000000..aa636a8ce629
--- /dev/null
+++ b/dev-python/pycares/pycares-4.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="
+	https://github.com/saghul/pycares/
+	https://pypi.org/project/pycares/
+"
+SRC_URI="
+	https://github.com/saghul/pycares/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/pycares-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="test"
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	net-dns/c-ares:=
+"
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	dev-python/idna[${PYTHON_USEDEP}]
+	${DEPEND}
+	${BDEPEND}
+"
+BDEPEND+="
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+"
+
+export PYCARES_USE_SYSTEM_LIB=1
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pychromecast/Manifest b/dev-python/pychromecast/Manifest
index 67569985507d..211e9a9cbafd 100644
--- a/dev-python/pychromecast/Manifest
+++ b/dev-python/pychromecast/Manifest
@@ -1,3 +1,3 @@
 DIST PyChromecast-9.3.1.tar.gz 53253 BLAKE2B f246a38c79ececa17721ba2d8397da691310462ce9b19aab2ad525d82ff8c4db213fbc8fa3e9205bac3ffbde72f7bd75eab26c6b5430921bd2fb561a49808110 SHA512 ee4ad719a1142e1a4c67b99b6ceadfd076cb8b818474c5a5b9bc9dd2d03f13feddcece4983459013192f85bdc73339749d0b2f2c1881ac879d211dbe2e578605
-EBUILD pychromecast-9.3.1.ebuild 595 BLAKE2B f66b0503496872d706d5baa34e1249e50135244364bfac6a5fac202f886a1c0d1808f5675f29118549c09992d128ae5a802af05d0ba078a07f9ec2c41453ed2c SHA512 5a847a531e8b43efe719c612080276314bd29409fb65f701cd869f8c81bdcb3ea22b0dab5e06b1bf2b7464108573969ea30c162dc22c50fbf350c47d64e147de
+EBUILD pychromecast-9.3.1.ebuild 596 BLAKE2B 158965ea36bae2fc1647501751277472a11bb2280d324f1a0a1c2feb649c1f8d719a6995851bef76743d1e3d2f4db67775cffaa0b34f2f13a0aab327849aa39a SHA512 de54772e0780df6ca47749f7fa5ed9d1a497e2e659847500e61681f827c358b0df46d5a42b6be103f241d44fa53ed4a14ba3d6abc125b3c137b580f4de7a2d4f
 MISC metadata.xml 354 BLAKE2B 20ef68373d5cb62e00da147728ff8f59faed7dcb88315c4460e1a6ff7cb31d40d56e639974d8494ab085c6b7faefffef6c51e4494b0b3604dbe9e3ab909adef4 SHA512 79684ace1b10ffce070e3fc83073b110e31fe2efdcfbd56b84c961716843f48d1df7defd330ded7862e006cb3f8d665de16481a16742922da450ef40bbf1209b
diff --git a/dev-python/pychromecast/pychromecast-9.3.1.ebuild b/dev-python/pychromecast/pychromecast-9.3.1.ebuild
index da95c8815f5d..52a7f1486ff1 100644
--- a/dev-python/pychromecast/pychromecast-9.3.1.ebuild
+++ b/dev-python/pychromecast/pychromecast-9.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python module to talk to Google Chromecast"
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index a1f6eaf90134..0074145e8075 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1,4 @@
 DIST pychroot-0.10.4.tar.gz 23745 BLAKE2B cce7be8c88b193b69838f14dfad62a5374936039bfe6478b8448b9a7f9e1ffcb373d5649ad1953beec6ca9ae138adc6871e129418a6fc64067b09eb6d4b4fa4c SHA512 fd93dba0a104eebe238f56e254fc445e1d34a2dbec6dcc307327fb92ebd7c85b1e729497ec818b756dee934f267cad755037ff004f78623d858617e39b473468
-EBUILD pychroot-0.10.4.ebuild 991 BLAKE2B 7c98ec9708358d2b0f1d69496a32a75ef2aa132c3b072244a9685c628484509b59777db12e6b3bf096930dabb56cbc8b8d7231e3b523e692306785054d217225 SHA512 b2497e372e91ed66442dc55063e129118c7489b015fea8dc0075baa80ad7e85da9c706bea85e8ee2bcdf116ce3eaa1dc8a4cce380ba6add74ceebdf780e9dd02
-EBUILD pychroot-9999.ebuild 979 BLAKE2B 7e16af679ca589e241106bcceccf797debd185bd3781a5f34d6c26561374c2573c3cc27d5763018556f8d56c725d0817558546009c714fe3b5ae3fc16c6fdb5b SHA512 a1af2f20aec9ee911ede7622ba1c4d0027dbd6656726aa67641b05e2a6f6cb3dd0ef4da6e5d880ae6ebab47446c06848410035b9316ddc765950ab1b49960b72
+EBUILD pychroot-0.10.4.ebuild 994 BLAKE2B 2301c2e40ca20c12207d457ccd5e793299fc405b8e5f8b0d1f38c862c516c08ec3d38971c6b3f8219ca0fb78aa1372d587ef772a7f060c41d4f0e4cd7baaebc0 SHA512 1101bd1b0eae6c0c0c8c9c69919744e85b8dfbe1f4d50a1bb804e8a35221384d00638c8d49ba757511ba85e63fb3df23b68bbf89c04b2e6f27b8404e4ff1bacc
+EBUILD pychroot-9999.ebuild 982 BLAKE2B 8cde1f910f066acb3991e6b71d3cb68deb4fc77eb9c71e6ec41204d1cd1d504ace2531103bc897a797b36dfd1a714942201186ada34aad4810dc6afd12262a08 SHA512 2fdc78494540684dccf9afe312b8a2db1ce2e03d4087af1d1f92aa581706fd4851a0322316dd3bc6e6ca99f3e0b2062ac7f42b0f085843e29304c0ab2a48bd48
 MISC metadata.xml 295 BLAKE2B 11cc50b4d91f820c103f10c332a219324672763dbbda0de14de487f8d1cbfc0dc542d4179c2ef29878ca28a51aa2bbcd28ba677ebbc9ad1853195cb08575cdf6 SHA512 7cb5822c5c0af4316da1bf4305e78779dd684c76175ecca0f8988f3da7cd82862cb72eff1ac51ce861a2755cfc7cffe30ef756b6f659f65a654553df59d49b94
diff --git a/dev-python/pychroot/pychroot-0.10.4.ebuild b/dev-python/pychroot/pychroot-0.10.4.ebuild
index 02d24600d1be..644764c88e80 100644
--- a/dev-python/pychroot/pychroot-0.10.4.ebuild
+++ b/dev-python/pychroot/pychroot-0.10.4.ebuild
@@ -1,8 +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_{8,9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 6258c1a766d0..2b8740a71dd9 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -1,8 +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_{8,9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]] ; then
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 50c49919ec41..c737a02a3953 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,3 +1,4 @@
 DIST pyclipper-1.3.0_p2.tar.gz 51079 BLAKE2B e5af84c15a19bf2ac7f0df78d588d34451c6f0a0bc40fa6a28dd8ef5f697e1d62eb4e14ac184e325ce4d6ad1aab23254d6e91857e3a44636a1652f86aa1778e9 SHA512 08b7f8443b0e98ddf7230824a451b0b0023402c4cecb44c1a264e08d204a3da455aef742b2ffcc0acf44a4ec3b864302af0d7a7ec34bb6a2080340b2320797dd
-EBUILD pyclipper-1.3.0_p2.ebuild 739 BLAKE2B 36b1109819ac8db12aba4df280a0e89c69891d734194dba42dee5524f82194b7109938c0aa16aafade792d84219e1303b02d7b74732d51d1da2658fa12f1dd2f SHA512 6fc253c1ed85853f1d7320a2f1c2b68b82029dc035658c7d9f16b85c91aef132014cdf4f4fea4185ae0ab627ef8281b99fb94c2ed039ec30c9c55331dda35d53
-MISC metadata.xml 316 BLAKE2B 8d2fc1f6832d7f1641a7ee82c2ae33b055041614f0d6b081890b2d51fed25fdb4aa13d369e72dd5d09febd52e50d2a0ee3a1069e7d4caf782e2d512cbde63713 SHA512 e41101f9685a3a105c27046fa08986191f57067bc267357f42a15596120b5eea0ec97206f1729555815a53051461df5a865bb8f57ced1e1d8735116903a7cac8
+EBUILD pyclipper-1.3.0_p2-r1.ebuild 781 BLAKE2B ae84fa331a29c1af815a0c86cfb26bef3fabe6b78fed717ad61b07e3dda6753ab66ef3e51457d0d157374d890de535e2e3cfb1a3beb1bcfc7a654ce642fb8c67 SHA512 e31bbb71c392b92c17a365ac0f8537e19018226c91ae3e21f190b4d4e4e42a7bb909f663ff9c92f7a52d254ccd1497d76707510868d8fcc9a467229c4feb8cbb
+EBUILD pyclipper-1.3.0_p2.ebuild 746 BLAKE2B ff1482f849ae7901652e535f20c0283b5cfbea8abd462fd87f3ae8c380cbfc79ff0e24d21e9dc2237d02aff3a8a8c4774a1bff531704a670b9a4bdb1c28cbce7 SHA512 b63a799411f21ae36a57de6552af808b6468d0a8890361c61b9dc33df5a9313e572cc0baaa0698ff9d31ab3c2237dcb1e07bc5f5972bede8836dbe2b40aabf0a
+MISC metadata.xml 417 BLAKE2B c8b53e4ae0fb36d82c7450dc8406d4f300fc57288fcc526fe7a7934171707f7626a56db8e07a4109a833303a267614be1d1cb515474ac22244d70c61f27afcc4 SHA512 fe39e318b9db3c27d27796eb6e7f2a97a1fb6acd03edaf17afb0519adf7e068c8c374f67616798957fa1faf88ffb3fd73c282c6edcee80a33abc621f8d2f36d9
diff --git a/dev-python/pyclipper/metadata.xml b/dev-python/pyclipper/metadata.xml
index 8523d5ed9688..7ee24bc5d574 100644
--- a/dev-python/pyclipper/metadata.xml
+++ b/dev-python/pyclipper/metadata.xml
@@ -5,6 +5,10 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyclipper</remote-id>
 	</upstream>
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p2-r1.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p2-r1.ebuild
new file mode 100644
index 000000000000..3352d3e25f64
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild b/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
index 7ce36e395cd5..10accd740683 100644
--- a/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
+++ b/dev-python/pyclipper/pyclipper-1.3.0_p2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_p/.post}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index ee525adef82c..62039e44f92e 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,7 +1,3 @@
-DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
-DIST pycodestyle-2.7.0.tar.gz 103640 BLAKE2B 5b1ad351aadff101732748fd4d3a4d34c3eabc058dd9d0c7551afde0dbb169ddce82ccc539e71b72ea2df0dc199b3c2213d259910a18b5acd892782e1314cc19 SHA512 26502480e5855f0fd9378664ec813bb38dc2f8ac22e01767fc8bf75e52fa7a7691382fd4f6f1edaeb5f41d150ed71ee87e0d7f525bf06acbf4b3034cec3a227a
 DIST pycodestyle-2.8.0.tar.gz 102299 BLAKE2B ac4708a513582bb0f27f1abfcc983319e6c7b853c53971d5f026f297f897b25a6c8a651a4d2441b19ab37e6df6f7a38a472aad0757fec59e0438263d76ccfdb2 SHA512 0098be44451bc173507e2b396aaf342ccf7f25a6a1f5d5c1f802079a76a66e6bedf9f358b5e07b27bee66e3b279c72a6b72f63e5984f58ae83b7fc5806880fc1
-EBUILD pycodestyle-2.6.0.ebuild 864 BLAKE2B 97507cc28662b2cab48505c4036c79a45c1b56b17a059bb78b74c4f9e04a8296f7dd8d5f7d877f48916ec9f27c9c866e5015252efccfcb73ad262392b5e50309 SHA512 33ed296fb2e286f8dc79845f416b3a9e309f908a2eccec959746301deedd0dd8dd3cfd7f3dae705386bd1325b207fd222ac890dfb20ab2154f1d7bcaa5d85ce9
-EBUILD pycodestyle-2.7.0.ebuild 844 BLAKE2B 3892da1bf698b18ee7e58228b73853bc28adde65ffed6cbe02c61276992acf62cbe9580dcf08155276af526aade2d3558b3694c2b786a1fba161dab23f96e863 SHA512 0474dedb6169e5971dbb3a01343657c4c48ede5a49a532bc77efa9834fa7c4026f08a8e063553123031ae327bf843ab85b5f321474372312dfdd16dfe47974ce
-EBUILD pycodestyle-2.8.0.ebuild 843 BLAKE2B db4a9098bb7cbe13832a702091518d8b6dd1556ac2097d4d3337e34843dbbd168ea75bbf7483b1158b34ea257f753074b094e217e9b22db333276fe954c9d261 SHA512 a9c8765d1738251433d199ee49a2ef3f547d867bc7e4ea3ad6032259f3780209c9fe91edee927b06d8009bafff20689a92d38446c887ac0e689f29e30d667002
+EBUILD pycodestyle-2.8.0-r1.ebuild 988 BLAKE2B 1a03070b2034e0980a1bcbccea10fb802cf8d29103ade396ad4834cbbe1b7f63c11e771467cdd53c188a0ee7025e5c0c5e7d7cc06d179d2d40c2e30194bdde99 SHA512 7ae95a135f574daea73067a52cd143bf502f54706264c7736673ed552cb7cd1bc33f2017f3fb8726d1605d86acfa294a469b9ed7e9fe69ac13ff61b55b1acc29
 MISC metadata.xml 350 BLAKE2B 6ca2711d99bb29041b5cc2a65218ace68f8d4f2d1d2d0a19f62d17f2340cc44faa7488d4eb29b72e86a0b2f003ea6a2df5f5d4e7d95894ff9c8c229bb6441156 SHA512 db79cd77edb6be824903614c78a39f427af51e940c0b08e1512c264b634ef3474fdba21a1a8b6c9458c2687f871d9374ea5f9b5080da4f6e652dd919e89d990c
diff --git a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
deleted file mode 100644
index 8d686c6ddfd0..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests setup.py
-distutils_enable_sphinx docs
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
deleted file mode 100644
index bb8b29e28d75..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-}
diff --git a/dev-python/pycodestyle/pycodestyle-2.8.0-r1.ebuild b/dev-python/pycodestyle/pycodestyle-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..8caa67171937
--- /dev/null
+++ b/dev-python/pycodestyle/pycodestyle-2.8.0-r1.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker (fka pep8)"
+HOMEPAGE="
+	https://pycodestyle.pycqa.org/en/latest/
+	https://github.com/PyCQA/pycodestyle/
+	https://pypi.org/project/pycodestyle/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
+}
diff --git a/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.8.0.ebuild
deleted file mode 100644
index 356ea77d9916..000000000000
--- a/dev-python/pycodestyle/pycodestyle-2.8.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=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker (fka pep8)"
-HOMEPAGE="https://pypi.org/project/pycodestyle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --statistics pycodestyle.py || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py -v --max-doc-length=72 --testsuite=testsuite || die
-	PYTHONPATH="${S}" "${PYTHON}" pycodestyle.py --doctest -v || die
-}
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 311fdb99ee46..b49aa9e54c6b 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,3 +1,3 @@
 DIST pycollada-0.7.2.tar.gz 3526845 BLAKE2B 3d8b4d2478fa4937756db69afbd8716ccd2dd4e0bec8e7dc045e84f06573605c0872d31bdee3d6ccca4b800699746877530f2fa81b5790c3f5c0cb3e7583fa66 SHA512 5c21155d52d54de62d192d4da0385bc7110ddd3962fe3e0e9e5904bbcd0e66cb1a95765c9996cdc5beef0edb30ee2123ae23b904d029be1c119e902d2fc4e7fe
 EBUILD pycollada-0.7.2.ebuild 990 BLAKE2B ddb45418f1fc87a1d281893e5e188ffaa00830a25fa8e4106f6105d46b602fd339f166fedab329dc8d03b63b44ecedd44a03ea12f9fcc87fc50f21ee7fd5160b SHA512 da92bdebb103a2708539f292fc6da627bfcc2547a20338f5c217ffe1e71f32c51ebb0640ab90dbbf25f69f74ff8e3ad750b364a794c6f93340193e2710ea15be
-MISC metadata.xml 798 BLAKE2B 2316e4dfff5e2f1c3ebbf58022828e155a94b6266dc1717988246e2e9c14d946c73323c73cd94f4e834bf199af20cad162529fec2d6798d78fa6a3de047f2ec8 SHA512 cca0d6eea8477c99b838b9f28b5fceb86ae72b2b90096d5a3019b38ece45be97e4267f320d9d9d6abe325091ed0646bdf2e84fe68cbd19b887ddd9318877f394
+MISC metadata.xml 905 BLAKE2B 9e1283685c76cd27ff971ab68ef51f56cf296aa44fe3dbb5bf74a3e6b4ea69abb927603acc16747bd1bf8db906b4437cf792330df5e7803a211b1699a01034d3 SHA512 686ffa6bb798bd4387106cdb461f0abdc2a685c53c4552c95c86febd6789e4b323ae1ac9717109fea96287ac100a93b33e3ce37eea37e6de3e4f4e704e40e9e8
diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 75c1b17e5e5d..11dc00fdfffa 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <longdescription>
   A python module for creating, editing and loading COLLADA, which is a
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 7f6311925f63..e937f3e53ac3 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,4 +1,4 @@
 AUX pycountry-22.3.5-fix-tests-for-pypy3.patch 740 BLAKE2B 192233d0307af96304a8fac1454389b81488365a1d44088b183cd3e2455ae600066e00e39a1ee68974961e5f5386967f24a495734490768f9423e21f15d259a9 SHA512 c593e382150bfea0e19446bb720e0d4f733aaf8964bf07689e8c8f238c8fe9ca2e89c957249c46cc489f9ca84540f0184659899945562e728bd35c965e2aa911
 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
-EBUILD pycountry-22.3.5.ebuild 706 BLAKE2B b7afe235d57315fc279be6038fdd7fcd0df2e64046cdafad1d40d3746f017e0d2b2f4d21bdbc33a22f88f7a9ac306fddcdb5a5a0629ad676223146bf1ceb7fa3 SHA512 80083ce73e817e559e543645395ecb94078d7af3346e88c074297e81cfc9a78135d5cd46a1e444d057a86ad13b77da0a94d537e65247f4bb39744dad6315f1c7
+EBUILD pycountry-22.3.5.ebuild 706 BLAKE2B e58e87539b05c2713c660009a610b0a59999823626aa965b0cf19a1e34575239bd62fec380614a58c0d19a82ced5d4215bcbe44680913317d3fd15dc5900e947 SHA512 179972d0fee6b929196f37ca77feaa6d417af3ee0ccd9f5c6c96cf58e1c7a050c2660a90bf3f0a006fed383dcdb13add090e38cda2bd65e559986ed87412a86b
 MISC metadata.xml 473 BLAKE2B d0b559ee14fa944b040388608d545a32952eac9ca3dd4d9c96b21b2457f195dda3034a2df4c3c3f54ac4f19b828e10eb603806ba6442aeff1d1ca93e9c67b5f5 SHA512 a4ef64a3474ced295324a04b292e892e5d4bfabaf850c38421b7d45d1a35a40bc8ca9a452e792d4a33b195896a8f29292b8a019a81b3e86f822ae792ecedba7f
diff --git a/dev-python/pycountry/pycountry-22.3.5.ebuild b/dev-python/pycountry/pycountry-22.3.5.ebuild
index 3b48902c8f3c..195a9c4a4528 100644
--- a/dev-python/pycountry/pycountry-22.3.5.ebuild
+++ b/dev-python/pycountry/pycountry-22.3.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 25b7790eeede..00a081f844ee 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,4 +1,3 @@
 DIST pycparser-2.21.tar.gz 170877 BLAKE2B ae6bf42dfc552bf1e3bfb5430cdb0c15b5e011ec53cbd03e0e2507c08a1a78690cefce2de134bd984caccc5dbde90661cb4c18df5c289217967213aac4d52404 SHA512 e61fbdde484d1cf74d4b27bdde40cf2da4b7028ca8ecd37c83d77473dab707d457321aecaf97da3b114c1d58a4eb200290b76f9c958044b57e5fed949895b5f0
-EBUILD pycparser-2.21-r1.ebuild 1787 BLAKE2B 1d0134066fa9431a1604c02e1a85071e7a9fcc1dc22ffb682bd9ea2f91f50691b6417ce40bedbdea6198c498b5051bd8d07dde74a611b58082357a7ab5419432 SHA512 f26a4019b1b5625eb67cc604ff0b7749d23d2b2d835ef9d362135dcc3fe7e7439e81ba90b1cad91ab4e36b39fc9bdff173c3cab31b60032b7c7b92a055b0bf20
-EBUILD pycparser-2.21.ebuild 2235 BLAKE2B 1873c8ff3a31533402bf8ef729f3bc3fdd8e3b0cb7f9377c1da50a428988270081448c8b6be81a1a4a8b28315cc66e7a676daa3d080f9b1a000914a838b35cd6 SHA512 f36d5e8e22a3c7a3e854c41273c10dc27f2996bdbcbc948ee5d80b1db040e23a8e238ae67ad6a6b19688e915c621229ae80e3a617c2a832bbdead779402f197b
-MISC metadata.xml 381 BLAKE2B ceed0b1da227f2b8016d51e7a6d6b9980d29c1dd930c9c5843c66ab62e3366f48f943bfd06155e9884fe08ab13da1844f7193a142d9d3f8f1db1a0ea5a9d3474 SHA512 e2603fae46f989057b80f13828825388f54f179b6dd9beeaad64e0eaa97ebd753e5eac752d79df460c31e9cfeb795998887964bdf92b364f5b7d7b6b2d65a21f
+EBUILD pycparser-2.21-r1.ebuild 1779 BLAKE2B 25ff869f5c361d91e8a6fa39ee7ea276b2cea2d1fb61e4ebf0db9b4c3c6fd007528be2f85d69114187b2b4a9550784a273b5c69d61975d79b00bae0cb83a843f SHA512 207417e9ddcf8a33b6f0cee6bbc6d0d8fda0bb9c2add19f03dbde29d52c8f99533909e2e502d0a5732b01ce00cb76dba29a9dc7338863c60c0d9c80e3d40fc3c
+MISC metadata.xml 406 BLAKE2B 61cb250ac460c4ea05f47bd8d208e44706bc80965ca1982e490d759d3a63652e5e13bf357532afb599ecea491f3c9a4cd315b97250b115bb7e8fa769b2ef03ff SHA512 b2d4ffde31f97a98e4a74bdd70751519d1339bbf3384e9e671760506fc2dac9d92bf6f7a743973002b4ae6da1cd2bb11abbfe63cbb330a1c32702b3eef24a62b
diff --git a/dev-python/pycparser/metadata.xml b/dev-python/pycparser/metadata.xml
index 45eebaf1fc8f..01a95276e3dc 100644
--- a/dev-python/pycparser/metadata.xml
+++ b/dev-python/pycparser/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pycparser</remote-id>
     <remote-id type="github">eliben/pycparser</remote-id>
diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild
index 602a4e535710..cb4db63ebd19 100644
--- a/dev-python/pycparser/pycparser-2.21-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/ply:=[${PYTHON_USEDEP}]
diff --git a/dev-python/pycparser/pycparser-2.21.ebuild b/dev-python/pycparser/pycparser-2.21.ebuild
deleted file mode 100644
index c54b32f9dd37..000000000000
--- a/dev-python/pycparser/pycparser-2.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="C parser and AST generator written in Python"
-HOMEPAGE="https://github.com/eliben/pycparser"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/ply:=[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# remove the original files to guarantee their regen
-	rm pycparser/{c_ast,lextab,yacctab}.py || die
-
-	# kill sys.path manipulations to force the tests to use built files
-	sed -i -e '/sys\.path/d' tests/*.py || die
-
-	# Ensure we can find tests in our directory
-	sed -i -e 's/from tests.test_util/from test_util/g' tests/test_*.py || die
-
-	ln -s "${S}"/examples tests/examples || die
-
-	rm tests/test_examples.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# note: tables built by py3.5+ are incompatible with older versions
-	# because of 100 group limit of 're' module -- just generate them
-	# separately optimized for each target instead
-	pushd "${BUILD_DIR}"/lib/pycparser > /dev/null || die
-	"${PYTHON}" _build_tables.py || die
-	popd > /dev/null || die
-}
-
-python_test() {
-	# Skip tests if cpp is not in PATH
-	type -P cpp >/dev/null || return 0
-	# change workdir to avoid '.' import
-	cd tests || die
-
-	# Ensure that 'cpp' is called with the right arguments
-	# Tests don't seem to always pass the include they intend to use.
-	mkdir -p "${T}"/bin || die
-	cat > "${T}"/bin/cpp <<-EOF || die
-	#!${BROOT}/bin/bash
-	exec ${BROOT}/usr/bin/cpp -I${S}/utils/fake_libc_include/ \$@
-	EOF
-	chmod +x "${T}"/bin/cpp || die
-
-	PATH="${T}/bin:${PATH}" eunittest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# setup.py generates {c_ast,lextab,yacctab}.py with bytecode disabled.
-	python_optimize
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 1c03f6896e12..b4447a09172a 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,4 +1,6 @@
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.14.1.tar.gz 15339859 BLAKE2B 72748a4eaf9f34be1ac3200a0ed0285a96111f52077b6d7cc5b4fa26599b6b8c6c17d79cdce4cabd7257cef840daf71440a78d00ded65deb52fa13e6b1b1efe6 SHA512 08e904aa2f3df19fcc75a8283fc867349617afe3919532912801d8abc9610f1cb64b878b56202cbdf0759cf5506ec5f793123093e21f18ba99acbf42fa4d9cf1
-EBUILD pycryptodome-3.14.1.ebuild 1161 BLAKE2B 7b910d718239b8f1453e4152e2dd18b70e5a313110cd457e89ff94ba3e0f084fa504d4f3392fea892c5fda70907a548dd9a9cceb3a35cf30779e295b62b1fe1d SHA512 0a64020e5f3ff47e6df0749127da423cadad039a8af0761e734cb149087cf15f1927d7fa8a2dcc2e197781d6081771ab5666c4905b787c7bf567dfdd63923c93
+DIST pycryptodome-3.15.0.gh.tar.gz 16547902 BLAKE2B ce1a6eaca4946d656c08f960f67537e61b9c82a69777fcb0b01b91a9a649c605dcc66a2a6d9fdc5533521a669544c7695e83db856dfcf8e4b2ba7301654b5555 SHA512 fc611174cfb4ca89fb457cc0d1220326ac813de5a83a959a95c1928a5220dc8c652655ac0a2b7d116b60cb4a8317959d8c2b2f3595e19b9b359a32beb042b58c
+EBUILD pycryptodome-3.14.1.ebuild 1161 BLAKE2B b0874894b4bd716bc3129a5b110f1b5697830b9554913afca5e98307be354dd963bbfec9ce9780bbb6af9d8da96304a7cd3807c57ec8db20931d5f3fb4b479c5 SHA512 e03092dd0f2a82057bc7b1a88c150590ac48f23d4487444c029a127ec1d18893caa2b29cada83b6a126a4651b40628ff088e322645d5da02a51a7a355cbaab32
+EBUILD pycryptodome-3.15.0.ebuild 1334 BLAKE2B 0a304f9fab2dce9030355fb0ca716471983424754e38b850363b86aa41499161e0568602c09a78a2bb5f187f5955f504b415fc85ca7802ab55033e4abfc0a99c SHA512 1c250f6bba72376d848984b2452cde8de241a62795c45c2ea14dbf96ff21bc6d4774e67305ecf40895a2ceb5896af2b1eed38fb35f9b5f6c28f7ca909a8dcc22
 MISC metadata.xml 386 BLAKE2B 1ec04c0cb752414f063177e637f1fc3e3c401db0c1f245cb33a3690e25597098b25fb2cd5f3ab99838a8bf8339906e2b23e325af5c7248fd880563c872c6fb60 SHA512 f19e2537c5a985389182860eaa45ae68a37ef1167c4b76b452513987fae6fcfb3534d102a079a003770372bbdb4f1997460c982b355f76d09f2387996e18091b
diff --git a/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
index 2bea33d6c90b..b5ca114fd9c2 100644
--- a/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
new file mode 100644
index 000000000000..9aa00023e3d2
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.15.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} 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}.gh.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"
+
+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"
+)
+
+python_prepare_all() {
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH=${S}/test_vectors:${PYTHONPATH}
+	"${EPYTHON}" - <<-EOF || die
+		import sys
+		from Crypto import SelfTest
+		SelfTest.run(verbosity=2, stream=sys.stdout)
+	EOF
+}
diff --git a/dev-python/pycson/Manifest b/dev-python/pycson/Manifest
index 336391b964ed..6ed6719fa7b6 100644
--- a/dev-python/pycson/Manifest
+++ b/dev-python/pycson/Manifest
@@ -1,3 +1,5 @@
 DIST pycson-0.8.tar.gz 10448 BLAKE2B 55e2ec4a447761d6764e9f25cdff534d3dcdf2a0e3bfd9255f02b1a5cd9834e4f4323ba47a1659ea973f995c34519622e36c691bef763ba83c8caf87fbc49f58 SHA512 873f1b0d825ad318ca5c62fccbdd12a8738c8b9ff58b4fe27ea611aa47575e24218b5010f6d6b12f5ebda835c2778dd15472ca5c73b634b3004aa08496f45328
 EBUILD pycson-0.8-r1.ebuild 480 BLAKE2B dfcd1b5e7a5cef8eb3269be4c3493129925d0b86ed9348bc71b154efa7f2e71ee7259238d0b22ff842b25c5eb86341748cd804cf7555c181d3bbc1924249c1a2 SHA512 27fec327e4d8bf3cb8a83bb08b7c57bd3cc5c34d76a3ccfc9798f5026f9b487ca09255e8409819a332c14ce23795a7f8455059f0c952b2bcfb8d85af0bfb9dbf
+EBUILD pycson-0.8-r2.ebuild 483 BLAKE2B ba9d5a95d4262a9ab99f10647db956e5099588a6805683dd3e7f5ac9ecca58b3897c9a687e5f49ae50c6567a089f9534583b0c43969da39a3af051623689a7ec SHA512 6005bd57f1e4ba6a97df15476d91d2925f6165858c20e4c602233f984d57a3de6ea59657eb7058c930b2af42ca39c97f84710cab523eef78fd83e2f28d392a74
+EBUILD pycson-0.8-r3.ebuild 531 BLAKE2B 4fecbab32310ee1618d8233c3eed2d189b4313a2832daab616a424a8a61563fde2d7f79e5acb3efbd5a491003dd8c3c680b25671a7009f58c4cb04b782906a6b SHA512 a7f69afd7f28889e60c68894438094f56eb1ef70a3fd89cd82c4a912283ff2068a8d785a604adbe0bbe0b903fe1835b7f010827f8ed62cc6ab868cb650cdf490
 MISC metadata.xml 404 BLAKE2B 2e69b57992fd74e8ae5c3c31b60c475faad1cfd0d27cc889fab184ec698c81ebfcc3016270ed000d3d2eace0929cfaa67be2feff6339d100a66388bdca2db837 SHA512 019ce3710f16f501f961544f638da92a268f83403bf7b58e3bc1fca957d2f36ea870c9c4b8c44cb0e48de93380e1a0155bfe16758e1d73595d2ea88b40cf9464
diff --git a/dev-python/pycson/pycson-0.8-r2.ebuild b/dev-python/pycson/pycson-0.8-r2.ebuild
new file mode 100644
index 000000000000..9e3dd0cf3c9e
--- /dev/null
+++ b/dev-python/pycson/pycson-0.8-r2.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="A python parser for the Coffeescript Object Notation (CSON)"
+HOMEPAGE="https://github.com/avakar/pycson/"
+SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="dev-python/speg"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycson/pycson-0.8-r3.ebuild b/dev-python/pycson/pycson-0.8-r3.ebuild
new file mode 100644
index 000000000000..e925eb8a41fc
--- /dev/null
+++ b/dev-python/pycson/pycson-0.8-r3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A python parser for the Coffeescript Object Notation (CSON)"
+HOMEPAGE="https://github.com/avakar/pycson/"
+SRC_URI="https://github.com/avakar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~riscv x86"
+
+RDEPEND="dev-python/speg[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 7179b42373b9..65ebd4a54b39 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,3 +1,3 @@
-DIST pycuda-2019.1.2.tar.gz 1584807 BLAKE2B 3250430ad626b28242ff44ab9576cf1f5ecf77530e789470dfebab324de95a735c0f56e67134891bace44b1f9b7a25133ffcb74c652c6568c5afedce26907fdb SHA512 22829daa5923342eec400a24342b1d738226073bb676476e4af97629d9311426b5d2465e60811696e55401568b90e152ac96d877c6262c416099a609862db742
-EBUILD pycuda-2019.1.2.ebuild 2218 BLAKE2B 060c482016d93534327e5e45fdc0560be24339490b642c2837a93194787e9f032710b090d92f421085ef95e04d37f4d0313c91590a4eafeac0385bb6ebf0bec8 SHA512 56cf00ec1761d1b8b2a6ba72cfc1ea43f1a64d4537dc56701c28758584e7e7516b924ec31be6862aad3e69117fb7f7505db7e6a408ab0b48bc1093b415fb8046
+DIST pycuda-2021.1.tar.gz 1682423 BLAKE2B 0ebd7554a5f92cd0d39ce7b5f64218f0b0dcfa1f3e63d3180306a149ad0581150630813eee7fbc17e32bb35ea711a46b84332705d6ffece7b11e7e928ef07aad SHA512 1df09f59e254f7e39b630ff41d22237ab0c81c0e6e7b7611c57eb98ade8531356b9cb3e381e6fa7e8495a46c465458febaf8ad56ceb8d570b5b25defb6dd55a9
+EBUILD pycuda-2021.1.ebuild 2353 BLAKE2B cf5e625a9bede76f3df86394ec8a71095301cd916669bf19e6d0bfe895f6ed2c8051b2235404cf9032c302dbeb937315b2eec19dc4fae8498459e3038ef5cae2 SHA512 3bf6a3688da755a4fc53ac200dfceaddb120c568d1db70626b0baca0d1b305211ea2eb51b4169be2f25d9a061234ac33a37299ea38ca2dff4c9de8dd5a59f880
 MISC metadata.xml 333 BLAKE2B fcbf9c2b3c4fe1261c4576c8b95ce0ec1e8182e8377205927acfdb803668d70653e1572d50be0c9d1c2400b81a7db9003db3aba9e85cc6892f5f1f048a546a9c SHA512 b05c6924e1a322ebba353240ddc5392f4c8b5172c291f259c0d149e644fded7f48056f3950651d73782fd4b0c88b5bcf33aec772e9f61bdd41b6d4cfad1568d5
diff --git a/dev-python/pycuda/pycuda-2019.1.2.ebuild b/dev-python/pycuda/pycuda-2019.1.2.ebuild
deleted file mode 100644
index a2d14a91432d..000000000000
--- a/dev-python/pycuda/pycuda-2019.1.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit cuda distutils-r1
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	cuda_sanitize
-	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}"/usr/include \
-		--boost-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
-		--boost-python-libname=boost_${EPYTHON/./}.so \
-		--boost-thread-libname=boost_thread \
-		--cuda-root="${EPREFIX}"/opt/cuda \
-		--cudadrv-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
-		--cudart-lib-dir="${EPREFIX}"/opt/cuda/$(get_libdir) \
-		--cuda-inc-dir="${EPREFIX}"/opt/cuda/include \
-		--no-use-shipped-boost \
-		$(usex opengl --cuda-enable-gl "") || die
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	addwrite /dev/nvidia-uvm
-	addwrite /dev/nvidia-uvm-tools
-
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pycuda/pycuda-2021.1.ebuild b/dev-python/pycuda/pycuda-2021.1.ebuild
new file mode 100644
index 000000000000..ffc9b069deb9
--- /dev/null
+++ b/dev-python/pycuda/pycuda-2021.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cuda distutils-r1
+
+DESCRIPTION="Python wrapper for NVIDIA CUDA"
+HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl test"
+
+RDEPEND="
+	dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pytools[${PYTHON_USEDEP}]
+	dev-util/nvidia-cuda-toolkit[profiler]
+	x11-drivers/nvidia-drivers
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}"
+
+# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
+# user is (usually) not in the video group
+RESTRICT="test? ( userpriv ) !test? ( test )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	cuda_sanitize
+
+	sed "s|\"--preprocess\"|&,\"--compiler-bindir=$(cuda_gccdir)\"|" \
+		-i pycuda/compiler.py || die
+
+	> siteconf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+
+	local conf=(
+		"${EPYTHON}" "${S}"/configure.py
+		--boost-inc-dir="${ESYSROOT}"/usr/include
+		--boost-lib-dir="${ESYSROOT}"/usr/$(get_libdir)
+		--boost-python-libname=boost_${EPYTHON/./}.so
+		--boost-thread-libname=boost_thread
+		--cuda-inc-dir="${ESYSROOT}"/opt/cuda/include
+		--cuda-root="${ESYSROOT}"/opt/cuda
+		--cudadrv-lib-dir="${ESYSROOT}"/usr/$(get_libdir)
+		--cudart-lib-dir="${ESYSROOT}"/opt/cuda/$(get_libdir)
+		--no-use-shipped-boost
+		$(usev opengl --cuda-enable-gl)
+	)
+	echo ${conf[*]}
+	"${conf[@]}" || die
+}
+
+python_test() {
+	# we need write access to this to run the tests
+	addwrite /dev/nvidia0
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia-uvm
+	addwrite /dev/nvidia-uvm-tools
+
+	EPYTEST_DESELECT=(
+		# needs investigation, perhaps failure is hardware-specific
+		test/test_driver.py::test_pass_cai_array
+		test/test_driver.py::test_pointer_holder_base
+	)
+
+	cd "${T}" || die
+	epytest "${S}"/test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 1c6d6a9619a6..06b160940da7 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,4 +1,6 @@
 AUX 7.44-fix-tests.patch 1679 BLAKE2B ca0126a6dc12203ba8409c70ffa5142288bc94fd07ccc4404ee6f19a8515a46cc4e257dd26a12266aa3263e359e9167daa3ef36bde9867d2a4346ce38fcaac1b SHA512 743fbc3335daccb4e1d21b4c0e659d87582120b21d1cacecf0725fed9fe1eb6251761fdb50814c04e79ac3b13408335b34072e94bc704d3c333b96eaa9d52f76
 DIST pycurl-7.44.1.tar.gz 227562 BLAKE2B 7dcbde563140f28382768b89b95422f873d5396a1f050dfcd3686d87b0ca2c3f3871281ed87b1dfbe7e4268728c2ec3ba7a76e7d7ef57754af5c185bf2a6fbe8 SHA512 e251db332791de07364695b5fd59b3a290486eabbde8be9914b5edeefa8702b4dd9ab678739ad765f76ededeb7192444fefe2a076d3977f454259dfd06731059
-EBUILD pycurl-7.44.1.ebuild 2567 BLAKE2B 466bf05ee32f22414003634b550e0fc137b7b12a48771a99ece9382835ce55500c36c6ae9726fc3b8a326f6e14ed82e6be18d40f516b26a8aa15bc23572ca5d6 SHA512 5da6e47330010c905f5c71b6f2af3eed23cf811272fc6d2556c39e1e4f97d788828ce47728f1c4fb68e116f4dc1b4f262e31a4be7c0f760312a7306621ade7ab
+DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
+EBUILD pycurl-7.44.1-r1.ebuild 2598 BLAKE2B 633630a72681052118b90decdec88c4dc89d3f732099a51aef2fafae6f2559841e263c9b284e746cc067b55e847e56c1973949f1b07d9b83689d627b673a6f89 SHA512 8a24ade216d126828771c3134365624eb593514041df26feb157c3fdc66fca1af47a8f149614fab3fcbb9233e531d003bbeb0f9b1b5ab1e5f082ae757579271b
+EBUILD pycurl-7.45.1.ebuild 2576 BLAKE2B 0ebfbc982170ac686f98b095fb0339ffb1a3e64bb83d7be26c8f6c81ab64a748058278b4f874e2f87dc4e7c94054620e6ef3dc6ae7795c0401abfb30f9befbad SHA512 f8a27a8b42a3f481c82b631aa645dc180b32d0ef1845712689404cf9be2070148a28a8ab38ff394b1c920c8d789852125b9d338dd4d8c0d0599941755f67d024
 MISC metadata.xml 1100 BLAKE2B dfc7fe054c7cc34c61bf58fef0378df304a539c28cbc0dff4ffff65ccc8892c38aaf1e275885fc54d2854d9acc6b382947038041f815b5941859be7cfe75523f SHA512 f1de0dccd625ae0b02ff9a55cbc1bbf7944faa24dba28ffd711c728001f180afa598a255132aea860ad616637325cdc653577af531b1a954a3994e8902c774aa
diff --git a/dev-python/pycurl/pycurl-7.44.1-r1.ebuild b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
new file mode 100644
index 000000000000..972d883b082a
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.44.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	http://pycurl.io/
+	https://github.com/pycurl/pycurl/
+	https://pypi.org/project/pycurl/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
+RESTRICT="!test? ( test )"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+DEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/7.44-fix-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# docs installed into the wrong directory
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	# TODO
+	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
+		-i tests/option_constants_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
+}
+
+src_test() {
+	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		# refcounting tests are unreliable
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
+	)
+
+	epytest -p flaky tests
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/pycurl-7.44.1.ebuild b/dev-python/pycurl/pycurl-7.44.1.ebuild
deleted file mode 100644
index 36650ec2f074..000000000000
--- a/dev-python/pycurl/pycurl-7.44.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 toolchain-funcs
-
-DESCRIPTION="python binding for curl/libcurl"
-HOMEPAGE="
-	https://github.com/pycurl/pycurl
-	https://pypi.org/project/pycurl/
-	http://pycurl.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl test"
-RESTRICT="!test? ( test )"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-RDEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)"
-
-# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
-# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/bottle[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug 510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
new file mode 100644
index 000000000000..4572acaf3850
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.45.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Python bindings for curl/libcurl"
+HOMEPAGE="
+	http://pycurl.io/
+	https://github.com/pycurl/pycurl/
+	https://pypi.org/project/pycurl/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+DEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/7.44-fix-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# docs installed into the wrong directory
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	# TODO
+	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
+		-i tests/option_constants_test.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug #510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL}
+}
+
+src_test() {
+	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		# refcounting tests are unreliable
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
+		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
+	)
+
+	epytest -p flaky tests
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index effb1c2f382a..eb28f510f7b2 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,4 +1,3 @@
-DIST pydantic-1.9.0.tar.gz 299758 BLAKE2B f6c2b89e598fc94db74b8165c449c752f11166752b12bbd37c23902b74c1f895bbd49b8fc4dc8da86b10880ac2e37178275cc28a42964e1133397364ea268d02 SHA512 ace542ff12698d568f2bea6121afc889c51892042b1a1b98464a6da6f71e50ecd8aafff7abd7ffd16983769844f7c970099d1fee7aa788f2e78172c0d5c4f472
-EBUILD pydantic-1.9.0-r2.ebuild 1781 BLAKE2B 1abc19250b73f7675214ed0f10aa8fae0f3b8f57302167e1af93c2830d05b3c080a62f1d7d37088aecb47765688b7f314017d3f0348d127422a7856a92a130b5 SHA512 2bde02fb92797d94a67ee7cc247e0cf862a7910847d9e94043b8377476db6e2ad9d528f5fbb95ee97d17b70f05573c50780965c1440f2bd84ab5dec628fcb53c
-EBUILD pydantic-1.9.0-r4.ebuild 2046 BLAKE2B e97b3adbb7c234d580b1c2476843a01f9eca49a7fef9b38ad0c9b71c3212438ddf0eb22d07cde79495c78997ccff231cc0be2c2ed1c16b6b87db5bcb81b67337 SHA512 f6a8b7672c8e55938003d20aa1baf37430d2d023ac5990b8631c4c9a3448a4785efe0ef534c8e8a44524f90b77116aeb48bdfebebf4034e7fa5b2b3cae573d9c
+DIST pydantic-1.9.1.tar.gz 306846 BLAKE2B c22e892f403b6ca5eff7f888c68f9df5c198fa03c8dab833edc556b3b1a4819fc28c9818a649bf5d9c4bb745b0bde826e164eda7760cd26f88e278c86776ad84 SHA512 19d2a50ef054b76cc7e8756759f3d67a14a58614dd6ff1b4f60e73354b0028e08743aa3bb5944da7ae357ab279134d3685c454d6affa6524b267c7cd9a40375e
+EBUILD pydantic-1.9.1.ebuild 2099 BLAKE2B 10a509b9b1b527e01c0aac2542a09dd9dd0a38132d45c2e02f3b8c0fc1d469d4d4ae6a5245e27ccc7cc85f8538edc86cf249c14e365e43233dee0a5127f85852 SHA512 c28f602375c529b5081ba5823c68452f5372fe97b9cddcd09100a617834f01fc9bfac731643cc18dc370387934c14c40a9afb4405a8c56f589545b243f82ac05
 MISC metadata.xml 492 BLAKE2B e21bc5a40669b2b321ba310df9dd4c6ff424e77d9d961b3aebc1f62b579444c7f505c19dae02590de999cfd8168ac522034275583fb4835e97e8db9b153fefda SHA512 bfb9c7a069a79735543dc12101af7cca16acc5fd93cae01515dc35a106c16a419c0e0e3a97a6bc8426c3db776417f7d29231022cb6ac27020f97e5dcfe0d0cbb
diff --git a/dev-python/pydantic/pydantic-1.9.0-r2.ebuild b/dev-python/pydantic/pydantic-1.9.0-r2.ebuild
deleted file mode 100644
index fa8a4597f362..000000000000
--- a/dev-python/pydantic/pydantic-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-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/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		<dev-python/python-email-validator-1.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-	)
-	case ${EPYTHON} in
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.9.0-r4.ebuild b/dev-python/pydantic/pydantic-1.9.0-r4.ebuild
deleted file mode 100644
index e7687b5727a4..000000000000
--- a/dev-python/pydantic/pydantic-1.9.0-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-	)
-	case ${EPYTHON} in
-		python3.8)
-			EPYTEST_DESELECT+=(
-				# Those fail on python 3.8 as None changed typing semantic on >=3.9
-				"tests/test_types.py::test_none[value_type3]"
-				tests/test_typing.py::test_is_none_type
-			)
-			;;
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.9.1.ebuild b/dev-python/pydantic/pydantic-1.9.1.ebuild
new file mode 100644
index 000000000000..1c247df8fc3d
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.9.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="https://github.com/samuelcolvin/pydantic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${PYTHON_USEDEP}]
+		>=dev-python/python-email-validator-1.2.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/CFLAGS/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		# do not build extensions on PyPy to workaround
+		# https://github.com/cython/cython/issues/4763
+		local -x SKIP_CYTHON=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock
+
+	local EPYTEST_DESELECT=(
+		# flaky test, known upstream
+		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
+	)
+	case ${EPYTHON} in
+		python3.8)
+			EPYTEST_DESELECT+=(
+				# Those fail on python 3.8 as None changed typing semantic on >=3.9
+				"tests/test_types.py::test_none[value_type3]"
+				tests/test_typing.py::test_is_none_type
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_dataclasses.py::test_self_reference_dataclass
+				tests/test_private_attributes.py::test_private_attribute
+				tests/test_private_attributes.py::test_private_attribute_annotation
+				tests/test_private_attributes.py::test_private_attribute_factory
+				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
+				tests/test_private_attributes.py::test_underscore_attrs_are_private
+			)
+			;;
+	esac
+	rm -rf pydantic || die
+	epytest
+}
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index a8f65c1dac46..5ad1cf6b2805 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,3 +1,3 @@
 DIST pydata-sphinx-theme-0.7.2.tar.gz 2632129 BLAKE2B 2beb9fac60b5f6c863ee4c570b88c4331135d2c8a10d84599f97944002576424caae06d062104a58c7f329f85e046eaa820d03a4117396009084707d563608d7 SHA512 2f6cac080807eab04f1c4de2fdd1563de17f1214f79c094f69b5ff116bcc47f1b0e159d6c87412c8cbe7691b19eebb3b228ca8243d05c81bba94d0aacbdb3e5e
-EBUILD pydata-sphinx-theme-0.7.2.ebuild 953 BLAKE2B f34642bfa1b1ba1cab9a659db5722457baf5f4b78003aade7ba41f25cb22fa97d3ba2ffc44753b3692e2ebfb5e5787409c1e9aa1b1fc55e0b94b9c989c3c7310 SHA512 cac1b47f0bd35f148c3f54c9a308ac70e137b49da6454fba05ab71febff4ae0bf7111e754a6852a14a9a7b11236548ea150ab066d91513d569b6b5fec1d50a23
+EBUILD pydata-sphinx-theme-0.7.2.ebuild 985 BLAKE2B f7677b33d9f4ac0f47f47d86edb8cccf0cf1d0f807b2364244e7cc235521ef680137db69aef89388275386afb2bb823f298fc7d80b4b031fa4edfe68432b2377 SHA512 fe63e436fa3d45e8682c7a1bc27cce2dd01311bfa95e321c6649700a8045d168500aa01884d3d9d1b230fbc66425787809986b7fe3307226b04cabcdd9ca4fd6
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
index 872d0f987bf0..c9882d5eba7c 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.7.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
diff --git a/dev-python/pydbus/Manifest b/dev-python/pydbus/Manifest
index 0d3be39eaad9..02634b97b1df 100644
--- a/dev-python/pydbus/Manifest
+++ b/dev-python/pydbus/Manifest
@@ -1,3 +1,3 @@
 DIST pydbus-0.6.0.tar.gz 2083046 BLAKE2B 65b50b272b004b30411ff396a9c50d8602485f281100467e2c75ed300cdb0a83532a354a62ef1a8e7ee38a41af243ea7de7a5e80232cfc7c79540e8ed71741c6 SHA512 65ac490dd44ad0aba0b3ea5c58cf6a99bd9de0ce86c6f03b9696335fb2d3f63df0e2e23a022d31d0185f7b8307bcc0f6e230efecc31199fc177f9a8a25929ad7
-EBUILD pydbus-0.6.0.ebuild 499 BLAKE2B ec5b91ca0fd12afbbe0e08a61e29c7998bb21fc45ccdd8661286bfbea93a737040f6cf8a28a98a311e37e8aba496a1359e1dbe3980dc0987d06849db40d2ccc8 SHA512 763732703aea034eea479a34b81750bd974c8f4403600646d9599e4295ca8301e677e077179029b9b21e181678535031c847f99d45364c71871a6b9d6abf80ad
+EBUILD pydbus-0.6.0.ebuild 499 BLAKE2B 6393f0f769202e83e630b28e38428f3ac7364dfed36b0f6d71b6f271dbcd13be86c202e3f736e79044fc716b0fcb148a6c097ff2d3bf3d460e2c553ce58a65b1 SHA512 39d7990ccf77b4365cf03203dd898c81ac63ad9244cbf2cc809120d0a9c194c798271e6521b8452a39290b15f4beceae339d416fdbea2198a0f104a58998c96d
 MISC metadata.xml 353 BLAKE2B 8d974d833f49b86537f8defafe2b898520d904dab8efc77cb897b61ab7f832d594faf64235cc5ebc22b867c89a2506cdad874422ccb7d001d7effeadffe2bcdf SHA512 26b01666d927c55b09a686029888aa3732c7134d263efa2f63450e987574240380a79408e092a32b5439e736d2a1b64f36493ca7b034b2a56e7ee62e83121215
diff --git a/dev-python/pydbus/pydbus-0.6.0.ebuild b/dev-python/pydbus/pydbus-0.6.0.ebuild
index e0e4e179657e..e250f6ff769a 100644
--- a/dev-python/pydbus/pydbus-0.6.0.ebuild
+++ b/dev-python/pydbus/pydbus-0.6.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=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index cbf61d4ceb2d..84989758a3c1 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,5 +1,5 @@
 AUX 0.3-no-pixz-index.patch 2089 BLAKE2B fec4eb3bbef769d43c7ef42bc2314252df6379c1d973e319ddc6377c870793b83eba63325f9531cbb46a35e7e13011353dc689438479bb3c42d67f52b4b7799b SHA512 1d051e0d2e829d91a5de704273dde1ed91c7c3bbedd5744fd24d54ec21418ed67db73d866ca1943e36299824214e677058fbfce9e61233aa7c1ecd90152e8fde
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3-r3.ebuild 751 BLAKE2B 96c92bd9a05b3268072b418cf8df2e9c4a0e58f1f39aa1f397ccfce0327418703e192bab70299061408028ed628916198cec10fa663479af18253e3a08465bde SHA512 5583ecfa841eaf16cdd9d746fa410abfbc49d695ad92f5d0e2499597e05fa3886410a518b424d543d1e736991fa99df0a0d75c7fc7976e2aca2304557b8c08dd
-EBUILD pydecomp-9999.ebuild 706 BLAKE2B afc2e6ec350d92dd6b3ab53ca4a18a234bc69035ee8cc682f3b4d4dddc093d5c4087b4027a70fb07a4c12122471430231d316f627f37967a140adcb4ecc259d8 SHA512 a66925b21db62b6c21034931710f71cc5bd170ef4e068a7ca7069c9885384096c6e9fbe435aad110ac9e15dd039ec9b7ff6df074c69b2968c6f1cc5106727931
+EBUILD pydecomp-0.3-r3.ebuild 758 BLAKE2B a75d8142279be6f4130fe7fd5a94203abcca432444a1c985c14f06e5b69c6da0ccd8ce7fa2e4f6b8b6bee24c7e4b9bdb4b65adb22076a4fee98030701a03e6eb SHA512 50508cec672c77e1f1610b7dc07fb6017b9e8dac19f43522f0a0a62d7096527ff04cadacca75c96c9bd6cdd8417320e9b3e2ced7b8adedf36c45c647f5211c6e
+EBUILD pydecomp-9999.ebuild 713 BLAKE2B 882308d4470481ad91a6a11dbc93266d58d6719b3e622128dbb02a55d28f5b515de90b86a254ff844226781fbdb68dfb10005219d18f3a1d587ed64997c20d32 SHA512 bcc7d4ff667c90195cf168a3b3bc54b30acfc2b0c701022d1a3dfd8cc99e3ec878de7a63ef04e613523636752505810d444b19d92a7f83f4b4fa38ca677ae836
 MISC metadata.xml 779 BLAKE2B f33c8009603ba2d4ce7246088d5f8c67919e79bbddde5f4423f2fd7526bfcbb87badca1e38a9ad8b524f6db2d2c5c5dd7ee05fb8a33bebac7177fa598aff0e20 SHA512 8129e96ba267ea1ab32a67149b8e645295ffc9a89e9740d1ae392e45d296fa19189eda30194018799e852652ac556654e852d651168b3ace794678b133beb8c8
diff --git a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
index 7d367a0aff99..9bf3c7059d42 100644
--- a/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 8266a320a04b..5179c059b59c 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index df5c21fa0085..8a071f2aff62 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,3 +1,3 @@
 DIST pydev_debugger_2_8_0.tar.gz 4171117 BLAKE2B 4f0ea0eeb228cb66f71e2046438396ff5ce59b42e620a067bc515ff504fa2da151e05f8ea6cf2d1aaa0768122431ccb45708a88c0616fb2859e96671b172e822 SHA512 b0189f1824b52f8ad35d1d1cfba0bd734806541ae2ff4f410c110763201630d296d10c2b7eaac8c656dfb3ff0f3c31bfdf2de28323778000cc7821e123a877d3
-EBUILD pydevd-2.8.0.ebuild 2551 BLAKE2B 9d412430efa60fe20476d45d2a13729c713dfb420db7d0cd652847ab2a151b3ab59dfc3fd80862ce1ca43e3f615d867c0ccc4bb7639dfdeb0c81c69a3b4e078a SHA512 659ce6f3a2388704f0105bb0bb77a5b49a08fb26e29cf268d50d103c500c9989cf9d2784fee980cbf4d8c202489484b7746f295f8ca6b608df4b06bab356b2e4
+EBUILD pydevd-2.8.0-r1.ebuild 2529 BLAKE2B bcdba7e5dcb16c62376134ea3bca43efb079eddde4b3a364f26937916ac7ea420db6bacddab587db30efa3cc41b6fdc05989db139e1760e3b6bdd80d63e68dd8 SHA512 8ce03313ecfb954d0c9d00c8c1efdfd94b0b0524c4fec63f84e9b2cca3fc454e9a62cdfc8a625be07baf27f40918cd5d58e5e01b673f35a795cc35b15afa01ec
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.8.0-r1.ebuild b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..a4da1a2f06b0
--- /dev/null
+++ b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 toolchain-funcs
+
+MY_P="pydev_debugger_${PV//./_}"
+
+DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
+SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/PyDev.Debugger-${MY_P}"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+# After removing and recompiling the prebuilt lib the tests fail?
+# For some reason the test suite is executing a slightly different gdb command
+# then before, which is lacking the file name of the lib that was pre built:
+# gdb: No symbol table is loaded. Use the "file" command
+# This also happens outside of portage so it is not related to any *FLAGS
+RESTRICT="test"
+
+BDEPEND="
+	test? (
+		dev-python/untangle[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+# Block against the version of debugpy that still bundles pydevd
+RDEPEND="
+	!<dev-python/debugpy-1.4.2
+	sys-devel/gdb
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Drop -O3 and -flto compiler args
+	sed -i \
+		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
+		-e '/extra_compile_args/d' \
+		setup.py || die
+
+	# Clean up some prebuilt files
+	rm -r third_party || die
+	cd pydevd_attach_to_process || die
+
+	# Remove these Windows files
+	rm attach_{amd64,x86}.dll || die
+	rm inject_dll_{amd64,x86}.exe || die
+	rm run_code_on_dllmain_{amd64,x86}.dll || die
+	rm -r windows winappdbg || die
+
+	# Remove these MacOS files
+	rm attach_x86_64.dylib || die
+
+	# Remove these prebuilt linux files
+	rm attach_linux_{amd64,x86}.so || die
+
+	cd linux_and_mac || die
+	rm compile_mac.sh || die
+}
+
+src_compile() {
+	pushd pydevd_attach_to_process/linux_and_mac || die
+	# recompile removed file (extracted from compile_linux.sh)
+	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
+		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
+	mv "attach_linux_${ARCH}.so" ../ || die
+	popd || die
+
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process" || die
+}
diff --git a/dev-python/pydevd/pydevd-2.8.0.ebuild b/dev-python/pydevd/pydevd-2.8.0.ebuild
deleted file mode 100644
index a6bc2036e653..000000000000
--- a/dev-python/pydevd/pydevd-2.8.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-# After removing and recompiling the prebuilt lib the tests fail?
-# For some reason the test suite is executing a slightly different gdb command
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# Block against the version of debugpy that still bundles pydevd
-RDEPEND="
-	!<dev-python/debugpy-1.4.2
-	sys-devel/gdb
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-	python_foreach_impl distutils-r1_python_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydiffx/Manifest b/dev-python/pydiffx/Manifest
new file mode 100644
index 000000000000..547db1525b9e
--- /dev/null
+++ b/dev-python/pydiffx/Manifest
@@ -0,0 +1,3 @@
+DIST diffx-pydiffx-release-1.0.1.tar.gz 82838 BLAKE2B 80ac477ff6b72dd089f134afc988251b20f7675e05c429e12238800145ed70f57acca835ddfdd77a2b22e53767b77d741537aad02f93bdefcee06a44965c7904 SHA512 dcb6b9dad321c5bec940d13dcf64853587c4e7636d34ea3ac4bc2b54df8915e1ac9804932034c069fcfba5f10f05972cc7dc46ba0d37c2e08c684bcbb2c2409e
+EBUILD pydiffx-1.0.1-r1.ebuild 855 BLAKE2B 40717678dd1d34802f14953f3cde16336ae8e80d233bc0147d6a6e6fdd667fefcd0fb60aedfe5ca54aebce0fd4367a9a952de746565c4a7cbb6379fff5955990 SHA512 accd8ffd126b6dfdd4f5500ff9c69a46126fafc7653ae6a8ad88b9c48dff98372fe3a523405be020a6eab03a25b62fcd82aa4f747ff0eceb7b77767d2de85785
+MISC metadata.xml 391 BLAKE2B 76c0b2eac63df75f2ad64518c4afff762891acab6983e22f7b5e7e270fc3eec64f5e8b05dfd82125cf2b9a251dd827eca9a5173852345dcf37cb5a7a41940ccb SHA512 2f15007d5da3fb592458d72cb0ad267f5fdc2e3cbb1c6df351fcf28f897ff7a98992d6ffd7e3c1050edcd57b1d40ef66874e8bb25178c01762feae62f23e436c
diff --git a/dev-python/pydiffx/metadata.xml b/dev-python/pydiffx/metadata.xml
new file mode 100644
index 000000000000..f0d405500367
--- /dev/null
+++ b/dev-python/pydiffx/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="github">beanbaginc/diffx</remote-id>
+		<remote-id type="pypi">pydiffx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..a5106d25a571
--- /dev/null
+++ b/dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+MY_P=diffx-pydiffx-release-${PV}
+DESCRIPTION="Python module for reading and writing DiffX files"
+HOMEPAGE="
+	https://diffx.org/pydiffx/
+	https://github.com/beanbaginc/diffx/
+	https://pypi.org/project/pydiffx/
+"
+SRC_URI="
+	https://github.com/beanbaginc/diffx/archive/pydiffx/release-${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/kgb[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# remove .dev tag that breaks revdeps
+	sed -i -e '/tag_build/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
index 29ebcd66b480..143917693965 100644
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1,4 +1,3 @@
 DIST PyPyDispatcher-2.1.2.tar.gz 23224 BLAKE2B 881e7063e61f80ed08f2e46967c7cf7e35d9687025a55d9b446e034085a09627b75263519c16ac64e0cbd9f84e822095f89ecbc52e95ed23a65fcb50d4e90d52 SHA512 a8a94a68551e72da2703a4f7fc93296fbffe78518ff363930125874a2a65dbbe4fe9434e910e0d019fb653785e41d024fe2c9d5bab5072c3989dd2a61ffcb708
 EBUILD pydispatcher-2.1.2-r1.ebuild 570 BLAKE2B f670f96f0217197cd83724237fd38b1e913fd1b8bfa6ab70ad4f54a83e40dcbbc0dd9cbd10af428d92a203c22bf2eb3630a0fe88540a9a373d387c1d9a3e3e34 SHA512 c975e7e117fd1c599113836618702111fc42d3275d997a2f5b924661b712fad14e325cd378b04b1661597b1bc216d9465fab7a7b8f8e6c9df51d183180e5d024
-EBUILD pydispatcher-2.1.2.ebuild 756 BLAKE2B 05d48d9487f06c1af23620cd90fd91e261a45b87eefe3943ea7b721ebe9d1f15d2612b1f839b49ae6896c80c4fbb4e10bc1a756644b8622521f50e8866390230 SHA512 5c5faba413be381c9a3ad9533b52b70951d5a36cc4769910fe9e85528a7bcd147f9434c418093c1b4e67482a380e54b7cb22befbf6bb6aed0efa2af3e037543e
 MISC metadata.xml 542 BLAKE2B 83fc0b93e4f022df719e7e7e098b8ea35371f8a23d348458b4dd338f05a4a6cfd6471c3af2167e9e232aa08bef5ca642f2ca1b888c883395ff0782961693ac93 SHA512 79d02743376b78c04173ffb581c3c3bf7044a7d87d716c131546f0f04b424e63dd7d0b424b481b9495addbd830d28f499a7867f9e3fa5c4bfaf34da926d05a8d
diff --git a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild b/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
deleted file mode 100644
index 005057144550..000000000000
--- a/dev-python/pydispatcher/pydispatcher-2.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_P="PyPyDispatcher-${PV}"
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism"
-HOMEPAGE="https://github.com/scrapy/pypydispatcher https://pypi.org/project/PyPyDispatcher/"
-SRC_URI="mirror://pypi/${MY_P::1}/${MY_P%-*}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="doc"
-
-distutils_enable_tests unittest
-
-python_compile_all() {
-	if use doc; then
-		cd docs/pydoc || die
-		"${EPYTHON}" builddocs.py || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/pydoc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index af3de6ee94b1..4edf24c1d7f3 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,4 +1,4 @@
 AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
 DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
-EBUILD pydocstyle-6.1.1.ebuild 826 BLAKE2B 6a4d74175b15feba62476f4b2eec62c5bb89e041a956c26ebe7c1c976a1dbc757acfc355fdeefa0f24eabd3df95ff2bf254d840a74bf3efd75e55ebc120164f5 SHA512 dafc7bd9640ce64d52f5f11cea60da974a2fa23d7ea88d985bf9bce6f676f324a893857e79d1e54a2b690579b41213eb8f44ed745f4d556e50ce408f9c130474
+EBUILD pydocstyle-6.1.1-r1.ebuild 907 BLAKE2B 57f32b8f5e4ec34f8bda21894780e698a054bdc5550e8adadc7acdcb36d7ac95ee369214b0d2c5900242e8d61bfae7b44de3840b8a59338ebe86df27b891751c SHA512 0073f98c21a90b393de547bb7116041fd20d04eeeb0246059a14dad6ebfa17718acfdc7d895083b772f53df3f79b3fdaf19d76a48acd0df295d66bc5b48b3e34
 MISC metadata.xml 665 BLAKE2B ac358d1ac5d68d11710048ccd4050f45cee96788829ee806bc5f4364c0f6b03707dcf15dd0cb9e7e3870cd9feebcead3c44b8f6bbff6738aa593079685c2a3c0 SHA512 7642d1384de3ec4bd55f7afc69ce67ad018eb9294f104234c5f3eb23a2c7a5ab36bda890a440fb5a7af8045d215048caf4b15bb3d965f414b755b51a269337cc
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild
new file mode 100644
index 000000000000..e3d4a9f3dd1b
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="
+	https://github.com/PyCQA/pydocstyle/
+	https://pypi.org/project/pydocstyle/
+"
+SRC_URI="
+	https://github.com/PyCQA/pydocstyle/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 ~x64-macos"
+
+RDEPEND="
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+PATCHES=(
+	"${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch
+)
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
deleted file mode 100644
index 3216381e7135..000000000000
--- a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python docstring style checker"
-HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
-SRC_URI="https://github.com/PyCQA/${PN}/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 ~x64-macos"
-
-RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/toml[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests --install pytest
-# Requires network to lookup github issues
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
-
-PATCHES=(
-	"${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch
-)
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index 47aa81c8897c..db18a50c7b46 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,4 +1,4 @@
 AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 586 BLAKE2B 3062f42c4fb51ae8c5f4c1e9c5693e518e89a322af632cc11bbca2ff012ea0c0d854aecd510a7ab7924888ae5b92ab3166b87f35b8cf82f9b573fa28884e7d8e SHA512 1360a195c6cf9725e1c93aa21d1a3c54352e41391288b7dce54195050d543e99a39d439acd6219a077b4566c579560782780b178afe5e0d142034670a270b3da
+EBUILD pydotplus-2.0.2-r1.ebuild 620 BLAKE2B a2317b42a99c4e91c6516964afdeec903d6ff93e35d1685d78540ab17611ffee676dba6c906fafe46d530c00c3da45283d5408ce5877032f288fa044d722e6fb SHA512 9407534321537713f067439258e5ed8559c289eca1fb6acfcfc4fbda61050f1538a355012e1328425ca88f086b501438a8e6ceb14b7faa9fad5a2fe2f56e031a
 MISC metadata.xml 642 BLAKE2B 910a9eae9b71e007107680352ac5f1a6af0d12dd78e496cb2245e9bff0727eea377ea6c82d85584340bee94bb163f2f93fe273ea46583f8c20f4e5b8f1cf7418 SHA512 06a7c06b6e064576de57e5de401bce5fd440431b0f70e385cf08f59eb9dca02a7b5eeb58ba1e99d74c9d950584b68c08c2a2298f47ef70ec9fe85641cdec16a0
diff --git a/dev-python/pydotplus/pydotplus-2.0.2-r1.ebuild b/dev-python/pydotplus/pydotplus-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..8b8cfe13eed5
--- /dev/null
+++ b/dev-python/pydotplus/pydotplus-2.0.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved version of the old pydot project"
+HOMEPAGE="https://pydotplus.readthedocs.org/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz
+"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" pydot_unittest.py || die
+}
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
deleted file mode 100644
index 93ac855e6227..000000000000
--- a/dev-python/pydotplus/pydotplus-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_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Improved version of the old pydot project"
-HOMEPAGE="https://pydotplus.readthedocs.org/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" pydot_unittest.py || die
-}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index 7efad5407461..556c4468d8de 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,3 +1,3 @@
-DIST pydyf-0.1.2.gh.tar.gz 14272 BLAKE2B 66e3a9ff2297994f61573fd033a43e1af5bf6b27335b87abdb9b42e469d954cb518faed3707a246c4bb59fd93a769970a0be9dede5c6858b5ce90f264ff4d289 SHA512 d3d9ebc5daed3e1d09de788505888120c907427c44afcb80ebe1e807e25ca95e8f3a76aebc30a33e915667827e396621e1af67216a2e88db3e75fe81c1d933f2
-EBUILD pydyf-0.1.2.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+DIST pydyf-0.2.0.gh.tar.gz 14530 BLAKE2B 00c696ea191abe111bf0ef098507f34ebaaaee516dc1afc46a194f3e051171ad1854292f5a3fcf1b559945990647ef8cbb308b3afe0dbc05120f15aa74dc8a63 SHA512 276083d8082c5ccc945144b7d2e3ba29f160d5159aa8d27726079dcc09a44a95d5b0f790874425cb41a00b1c22890b435b756b0bbe14ab43e9ad04a8ae2dad0e
+EBUILD pydyf-0.2.0.ebuild 676 BLAKE2B 5b83eb78d993b20906f08808292fffd9dfa714bb6ffb2815c3b77eb50db0e28fc0ddfe41697856d381583a766a9ef38baab2919de7f40f72a3bded477b3453bf SHA512 06113bc776109a81969ed09f425d1302cf6ccc7b19565690e293cbcab0daed9a73e1f98ad8cb06af941e7d5d9ce1d1b80380872f69902027c30e3450c2c1ebd8
 MISC metadata.xml 346 BLAKE2B 1019f43890db1484163da244f781505c1193dc5516cbeb8921540dc298d4cf61903a9a0151e23cc22b7db7fd677f4424c74b5a051b95eb75e38f3546501096b3 SHA512 420175bcf83c3fe2fc1bcebfd88f07e3c56272b999f9693a82b76a703ea5d94d6e144683a67eca871bc6d2723ceb8f70c4d29e354df20d273587a7be6a369904
diff --git a/dev-python/pydyf/pydyf-0.1.2.ebuild b/dev-python/pydyf/pydyf-0.1.2.ebuild
deleted file mode 100644
index 0ecfdfd4412d..000000000000
--- a/dev-python/pydyf/pydyf-0.1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 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 low-level PDF generator"
-HOMEPAGE="
-	https://pypi.org/project/pydyf/
-	https://github.com/CourtBouillon/pydyf/"
-SRC_URI="
-	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	test? (
-		app-text/ghostscript-gpl
-		dev-python/pillow[${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/pydyf/pydyf-0.2.0.ebuild b/dev-python/pydyf/pydyf-0.2.0.ebuild
new file mode 100644
index 000000000000..6d8ecdb03cf5
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/
+"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${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/pyeclib/Manifest b/dev-python/pyeclib/Manifest
index 24f5e85bdcd1..006d72cb1b09 100644
--- a/dev-python/pyeclib/Manifest
+++ b/dev-python/pyeclib/Manifest
@@ -1,5 +1,3 @@
-DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
 DIST pyeclib-1.6.1.tar.gz 6690168 BLAKE2B 4e59c2827487f09a21f49751455fabd9ce672d6edb83befbc06e7aebe66c2f8de5f83a5ddec612fee2ac727fad247d66f36c659ebdf316759cd9e4438c7f085c SHA512 fdb855551e9695c3748d78d43bc306e536ef45476143445520284d4918f2c84757247d217ada2df565d03b1769ef83ac8c82b92b8438c2d40915f8008fd769c4
-EBUILD pyeclib-1.6.0-r1.ebuild 815 BLAKE2B 8f68a5709ae73a2dbc128cd85e13e5c5c68112dc3d4408076be7994bcfbdc0cf9cef3cf51de4d35f5c64c0284f7f6b7a8c64f2b5078604f7feb7c9beb543128b SHA512 61b5eaf5b6f37acf654b320df368a38f221f55c35915707dc29ab8199a9c9b510298a3d508fbccd51b4d481b23dee56531fd4d0355f543e59ea59530e0239fa5
-EBUILD pyeclib-1.6.1.ebuild 866 BLAKE2B cd5c2a32a1624f6ff641add58cc00fbffc9ea7219222426dc03797abca567c1e5326d8f453d0f324ac7f047c305203f19d98d100a6a0b4e8ddf84ad5493042e7 SHA512 f85c448a6b7d0662357646a76cadc14667224961bfddd21920d3edb66596c8c37c703d72791881f12fd8acd2bec744aceaa9d48d8ca2adc1b2b73b9e93b00e7d
+EBUILD pyeclib-1.6.1.ebuild 864 BLAKE2B be1b4e715e87dcfe667fabed7174ae1b0f4b226335cb7a63386ca7b2791790e3637964de4712ec68abd903142f0e64c821a2ade54c102b741cd1bbd505040ea9 SHA512 bf7a90ea736cf807f0f2a8f6274238781811c522113cee0fd50dbffa54342213f2c05f2caeaa75ec1799cf2874d869487f2f16bb510b731260fa677f67a4c396
 MISC metadata.xml 675 BLAKE2B 07104447814b472c557066609e557460f4b6b8f206130cfbdbfb31c6fa8962f81def4f3f6101052f161f8659cf143b2e1057c91b02c3146d69cb76ba733c99ff SHA512 ce6a7d6b6322003124839dee1b325b4c3a788ca4cc8ed0335c6cfe4ccb70f25c7df4ac264bdc15001ee4668bf905448c17a532757bff92eb00e0e82cabd071d0
diff --git a/dev-python/pyeclib/pyeclib-1.6.0-r1.ebuild b/dev-python/pyeclib/pyeclib-1.6.0-r1.ebuild
deleted file mode 100644
index c3c2fba942f5..000000000000
--- a/dev-python/pyeclib/pyeclib-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 optfeature
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/PyECLib/"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="dev-libs/liberasurecode"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# https://review.opendev.org/c/openstack/pyeclib/+/798010
-	sed -e '/library_dirs/d' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "jerasure backend" dev-libs/jerasure
-}
diff --git a/dev-python/pyeclib/pyeclib-1.6.1.ebuild b/dev-python/pyeclib/pyeclib-1.6.1.ebuild
index 0709af870095..92ca26df9edd 100644
--- a/dev-python/pyeclib/pyeclib-1.6.1.ebuild
+++ b/dev-python/pyeclib/pyeclib-1.6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	dev-libs/liberasurecode
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index a31799ee3c6b..f3e2d49c07db 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,3 @@
 DIST pyelftools-0.28.gh.tar.gz 5086001 BLAKE2B 87dad42d87b9d3de2382e21d6f7115fb24e420e262735d4bd73c4e3a325d10b69c6eab5d73ff999811633d6a024c22c15ad65be637339f0c609378d54926f747 SHA512 005163a53fe12baad0998d60d531e3ce4201236b7b042e3c28d7e68f9c40586f94a2576be6918be991a3bf464f2ca55700c0475a6e8c7b05b4342a6f5bbf3354
-EBUILD pyelftools-0.28.ebuild 991 BLAKE2B 48036f4a61ff60c3bda54a8098cf68b10ad812828fc0fcee0fa2293407557e4c37a71bba34af3574f8c5dfd8623d599e3b5806e9d0c9a23f0a81c56abc31ccfd SHA512 129eba7d25073d7519a590dff7aa010cec76e55d6155ba7d0ea2ac741ad6f01bcec1248e1edff8283b9f9d8264fa3aa1af294a1f5536db1eb9508c88c2fda657
+EBUILD pyelftools-0.28.ebuild 991 BLAKE2B 6caf74dbd7ed007de77efb2b767ec07d2640f4078b77d489e5c9c68ac82969749a1bc3e25d723302c0cc75588c4d88539063392dab95bff9fc54f5766c99e288 SHA512 cf4ce27e860ec1f10f231735c342cbc10fa52c7c53ed9107e05f449af13840d9150daeec5f2e5be81dfc1eaac65f41a6d0ce1fe4e36aaa91bc4c09be88cdd02d
 MISC metadata.xml 395 BLAKE2B 18e95b29b16eeee438d7391b2370b4955f631578117df6bdf841f50af5c52c688a16e5819b521a37b7737ae0cbe8705c399c2483dd2c066e6e21a7c9b81ec477 SHA512 6ae9650404b3213bb2e1dcc730e782672cb35bc24e3f4b35b02a74d7866ddbda2fc2dc37809856a7e064968502f02d78e2cd1b7a078f44beadd62566913b9f08
diff --git a/dev-python/pyelftools/pyelftools-0.28.ebuild b/dev-python/pyelftools/pyelftools-0.28.ebuild
index c1d0cc6d93b1..cc04c1577d01 100644
--- a/dev-python/pyelftools/pyelftools-0.28.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.28.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index f29414a54596..d74d36a178e8 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,3 @@
 DIST pyenchant-3.2.2.gh.tar.gz 75565 BLAKE2B 150bdca0d316b2242d60d8c42baf2e5e8cee3df2c57bf47be61170af956cb8c4ee1a584ad2aedd1ed8f203028938c8c0ada40ea45045746deeb4e67c53dc5c70 SHA512 42ab2e0cc38af4223ec0233c9e22cd151aa9bda5b56b7bd642e39e3a323ab3c034391123af5d3a5399551533ba1c1746abd6bc9ee2ab4c7879b9bf0ac91e056d
-EBUILD pyenchant-3.2.2.ebuild 637 BLAKE2B 1136990169ff201bce99690b6f77db181c14f842e6614247d25e4f2911112ddb9b63b4c0d4d7a3496bc25d32a3d1473c56c88c1be7f79547cf56df474ed06673 SHA512 dab8d6cf9ac80a32658666187d74627ad0083e299a4697e805649ff2af8fb8bae7959192f138beb71630623933d63889f5ccd7ec65858c0c57636e8a8c76e672
+EBUILD pyenchant-3.2.2-r1.ebuild 679 BLAKE2B d8ba4576186a82da3a8c95a76cb2fd2012f964d897549f951c68f8e065ab91d612ddb3b8791b91b24c70d5acd9d74ff7e6c829c4aa5a15bd7767c49675b9bd36 SHA512 bdb4528233561d58fde2d76ed4b89f716c56361d18540cd55212737c61311b7e47ca6e73b16b04e146492e1aa4a24036455c4de0648e066391f41e767a3c1c87
 MISC metadata.xml 877 BLAKE2B 69ac0276b96f09795cb434b9f8f56ac243a740d1ec4aa70d66d135c29e0385334e7b48ff57aa10b618105b5330d5134eef4e34dc68fbbdbfa8b89a772b3a928c SHA512 aca40895f3ee12669a04065a65e14d638dbe9a7730d38768fbeeff07ffee4c816ecd4ed38190656578d429f31bc9c3d253e0183524a1f4bf933e58117b8095c7
diff --git a/dev-python/pyenchant/pyenchant-3.2.2-r1.ebuild b/dev-python/pyenchant/pyenchant-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..1ad802ab1bc0
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="
+	https://github.com/pyenchant/pyenchant/
+	https://pypi.org/project/pyenchant/
+"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	app-text/enchant:*
+"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyenchant/pyenchant-3.2.2.ebuild b/dev-python/pyenchant/pyenchant-3.2.2.ebuild
deleted file mode 100644
index d4bad80116ad..000000000000
--- a/dev-python/pyenchant/pyenchant-3.2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
-
-DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="https://github.com/pyenchant/pyenchant
-	https://pypi.org/project/pyenchant/"
-SRC_URI="
-	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="app-text/enchant:*"
-BDEPEND="
-	test? (
-		app-dicts/myspell-en
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 1d760d54abb2..6fc541e992c6 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,3 @@
 DIST pyfakefs-4.5.6.tar.gz 206310 BLAKE2B c37cb4709a285bfba411cd76da4f158cfe682d210411290ed3e06456ceb5b6de99ecc320da748c8d9b0e230b6384290638d3fd22f0e1388c1965b2b2806d2d30 SHA512 c7a31cc94eaa2b1830d4da355bf4d3de5cbdc8851561ec82fd2de9fe845457f13bcc25aa58a50afb862f396cb0e83c8bf71bb8be51cc3b628ff01b25db62eca6
-EBUILD pyfakefs-4.5.6.ebuild 727 BLAKE2B 96f95b27522ce438d3613398f9f7c297ef6f5efb5bec0bc960513caf9bd4c559e0e38580c10892403bde8fabc43261ecb02621197d919320ef2edc57ac83f102 SHA512 dfdab97602ae637d8a9d947263687511da3c00e663e726e0e979ff86d0c285f1ebb3878ee0b744727f8732b5be90bc2c0eb7fd032f07e188c750bee335da572f
+EBUILD pyfakefs-4.5.6.ebuild 1553 BLAKE2B 115f6b5b6ec93d47e45fb46c2a6acfdbddd535e1f2bf5edc5a470dea6814d50076fb9df51c7edd8b996d3c0a07c2e08fc2f69076826419fb9b20cf1d263652ad SHA512 4d540e284764f87545e4b284dcfb666943d173f3ca00228f2dcdab0ab6b046eab29926216e87668e5a0193f6ae4bfa2d6b3c2c00c19f84ef1c13de59445ee3fd
 MISC metadata.xml 395 BLAKE2B 8db2ffc4bcdcf27ed640f08d3f79b1dac72f3609d2113c5e2590c9b127ba0e20bf27f040976a34fd8a08166c455140cbc586da72d22ca67c329717bf5d54798d SHA512 86850a2bdfbc39096105db00d9b249224ab57c1fac71738f0a5df2b83bec7773f4150f7480b18fb066122fe0ed46fbc923a72e837db429b5b322e658bb340010
diff --git a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild b/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
index debf9ea93859..4e1d2e411cce 100644
--- a/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-4.5.6.ebuild
@@ -4,13 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 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"
+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"
@@ -19,6 +25,19 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 distutils_enable_tests pytest
 
 python_test() {
-	"${EPYTHON}" -m pyfakefs.tests.all_tests -v ||
-		die "tests failed under ${EPYTHON}"
+	local EPYTEST_DESELECT=()
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# known problem with the test suite
+		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesModuleTest::test_fake_path_does_not_exist3
+		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesModuleTest::test_fake_path_does_not_exist7
+		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesTest::test_fake_path_does_not_exist3
+		pyfakefs/tests/fake_filesystem_unittest_test.py::AdditionalSkipNamesTest::test_fake_path_does_not_exist7
+		pyfakefs/tests/fake_pathlib_test.py::FakePathlibFileObjectPropertyTest
+		pyfakefs/tests/fake_pathlib_test.py::FakePathlibPathFileOperationTest
+		pyfakefs/tests/fake_pathlib_test.py::FakePathlibUsageInOsFunctionsTest::test_stat
+		pyfakefs/tests/fake_pathlib_test.py::FakePathlibUsageInOsFunctionsTest::test_stat_follow_symlinks
+	)
+
+	epytest
 }
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
deleted file mode 100644
index e7c28122dbad..000000000000
--- a/dev-python/pyfeyn/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyfeyn-1.0.0.patch 1012 BLAKE2B d3d8ba8f46c9fe6eac5db4183c18fbbe118ba36bbcc3b9a263a470fac702ac81c17bb77acf7b913c3a3bb51d4f12bda60b07d8152a324b8f4c927f1800b104c2 SHA512 43811f881c479062af0376c9d3dbe440383599d7e6937481ad2ca8dbca3ff404ab8d04adaa4afcdf1c4eb001340ed1870a7f50730fbc3d4c458f5d6a1936cc73
-DIST pyfeyn-1.0.0.tar.gz 27316 BLAKE2B f1ece2e64be35f6e64dbe539406462c1802bb0149577662a92658769c1b347c2d98786cd83998e8887cc609f8ffa5aac3e3c995c253f54badd5bed43050dbf0f SHA512 edecbb61cbc63adb5d218cd53e45568f42aa018875bd57485afe612080300a16dd93d1dd0a1286b040a27aaf727a9e35e210f2a2edccaf9e6e114301a91c839a
-EBUILD pyfeyn-1.0.0-r2.ebuild 556 BLAKE2B fa2d388d486be83249356df9c766aba9781b1eb5f5d9e524e49e3220ea7f8a5d930f3c082e360b11e2e52d7caca625bef21b60b766f1420653e967e6bdefdf68 SHA512 797d7c8519b3124aa32fe21631e9df7302e1b5e9323f9bf000307969730bd4dd4d2ddf74b90a7201eeba8f09787687354f491beac2647c8a8a509cc96f2d82c1
-MISC metadata.xml 417 BLAKE2B 5e6d04e745bb383861b98e36e1d75928dc350806aa27ebd831789ea5520f101562d6f6adc9c52c8f8edc154bd7cb8ec3ab7e936a70a7a5392832a200c51f18a8 SHA512 65e098a0a5cc965770dc674bb6d9ccbf8e60fb24080fd382f8dcd828f8124cbd046e8b82e8af52a8e8bb7fc7554d8861e50c98dd66492b9370754eeb5788c79c
diff --git a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch b/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
deleted file mode 100644
index 0b4c29e74033..000000000000
--- a/dev-python/pyfeyn/files/pyfeyn-1.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U1 pyfeyn-1.0.0.orig/pyfeyn/feynml.py pyfeyn-1.0.0/pyfeyn/feynml.py
---- pyfeyn-1.0.0.orig/pyfeyn/feynml.py	2016-02-09 22:48:29.000000000 +0100
-+++ pyfeyn-1.0.0/pyfeyn/feynml.py	2016-02-14 13:11:16.034537778 +0100
-@@ -257,3 +257,3 @@
-         if self.root.tag != "feynml":
--            raise "FeynML Error: <feynml> must be root element" % self.root.tag
-+            raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
-         for element in self.root:
-@@ -266,3 +266,3 @@
-             else:
--                raise "FeynML Error: invalid top-level tag <%s>" % element.tag
-+                raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
- 
-@@ -328,3 +328,3 @@
-             except:
--                raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
-+                raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
-         if "style" in element.attrib:
diff --git a/dev-python/pyfeyn/metadata.xml b/dev-python/pyfeyn/metadata.xml
deleted file mode 100644
index de0ba66c8d44..000000000000
--- a/dev-python/pyfeyn/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pyfeyn</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild b/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
deleted file mode 100644
index 4d4853433857..000000000000
--- a/dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for drawing Feynman diagrams"
-HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.org/project/pyfeyn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex"
-
-DEPEND=""
-RDEPEND=">=dev-python/pyx-0.15[${PYTHON_USEDEP}]
-	latex? ( dev-texlive/texlive-mathscience )"
-
-PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 228f3122a74a..f0f15a9feb7d 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,9 +1,3 @@
-AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a17bcf39804e6787ed2627a77d3b068a8ac1d7951a207c83e1d76812ac77b889d6b4cbf0b1cc30cdd8c59f8ea886ef373 SHA512 47e1c624358edd34b3ddae023275a81ce529594689c3b67ec2c7b5acec84b9c9f426b9f79151a1ec3dc89b39335f11e03cb22db4f4c63399e876f887e3f3ecee
-AUX pyflakes-2.3.1-fix-py3.10-tests.patch 3166 BLAKE2B 9950380f37f84e6c6356a62cb4566a12517cdaf57c48c146b922dc2188c8d2f938691ee909b70e4b10a8f7cfbf35240659a10832295d87be483d1a5a1a12db24 SHA512 f67ce0684e9b1fc269845a8b43ac5f99243d8060674c90958cdd0b2781196aeeff96eb504cdf9a14a5b77dd658e0ff0f3ee70c955dadcf0b36c16148721dcbdc
-DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
-DIST pyflakes-2.3.1.tar.gz 68567 BLAKE2B 0eee1eb87bf1dcae68afcdb250644aa8a1189ca3d8d22608e25727bf01b94465cceb6c65be669b18779434c8879594dd92cfb3a108b7aff584cfda788f6e2f4f SHA512 85d3a2737d31ed4b5f4c2e3621759a5951d1320f95d74313fec09fa551648105b3ab84db94f7bffe5b77623e4adbea1d8ad12b9ce2fee7e81c41581a3ea81cc6
 DIST pyflakes-2.4.0.tar.gz 69101 BLAKE2B 852e50f3545138947761f9a8413fd6463bb9a28977c008feb1c3a81afb3854501b8fd3c05840d9d75bc6ebf505b545e62c047b87780b0bc764fd4225ea6a1e21 SHA512 f4c6512eb811511c897623f52c4f88e50275a3292582d7dd34462e90e39fecce939818cb92e750eebdd66eab25b91c23540104fc4530c42621d7cfeb1d33c577
-EBUILD pyflakes-2.2.0.ebuild 739 BLAKE2B a13889d951d54c49dca0df763c347390c69c1bc6e7471d8ad9b1a1c932340096874c2ec09cca6ec9ca23472d2bbbac90924a6be8ad06bb7b7f4b731d7d712bd8 SHA512 dab20e9ed9a1ba53a50c72466d5093a3a214dce230348910a91b91473b7bcd8370355a47d438612129a798d087b1ce55b7c21c881d06e740e461848ff8991271
-EBUILD pyflakes-2.3.1.ebuild 665 BLAKE2B 1f45b820bab9fab2fcb7cf744471d1caefc5c5c6c5ce50ed286d8baf5976e81d26f7a971880edf8791b3c17a3f47f5d0de0ec77d88cf7e437a5d29aebb6ca719 SHA512 adac3b53362f3a56bfdfdf05e7e65d6c3c641bcf7488eb2612cfba2daa0727dbd2a25ed9ba567c070f0e858ab9fb6a1d18ac538e0d7f3d58980b4da7cb3773ef
-EBUILD pyflakes-2.4.0.ebuild 608 BLAKE2B 00c0ee30732c03f736f3ac8e7bdaedc9025f890b5ecbf882b4a065f33d0958da19d17afdb2a548aa02d746a49928bd49a9c0601d1f12fd3d286521ad4506e791 SHA512 60d83676bcefca40ce751251ad3c8bc6bdce5d3165acc35549d2d6ca2ad6f90ff33ffc221ddfb2ee7493fae730bffcb11a30c716784e85aa7ce639dc5d9d2f28
+EBUILD pyflakes-2.4.0-r1.ebuild 646 BLAKE2B 2e0ee3052b051da22d04063d5e4dc1d447c3b7aaf216e621a92f2ebb299921140bdc0fc4340c9239a704d92b283aa4a4cc6a6c9e83864c3d10635685471fb739 SHA512 7b6ff841ee877cc5c294e8aec54fff885ebec6253ee479b998057b13a678063fa09125a2e1f84a141df0f8d09ed2cfabe44ef770ad2fd035a4104cac6681901f
 MISC metadata.xml 763 BLAKE2B e15bc4240e0cc54bd0d7ecca523bcc43c5ae6ebd4f195815f7b2c3494e0366f1cc6feadbc63fce82390ed414e8f52a7bdf15f5c56909ab39879814ff1b178558 SHA512 bb8e0b6f746c99e5185a8bca736f0af36068ae0de45d1bde9663f0e732770366ac20f2116ddd9d7a85239146cf5d7b8fbbfc5c225d7bca4650001f86468a0142
diff --git a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
deleted file mode 100644
index 00b1130bf342..000000000000
--- a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index b579ac8..d379b3b 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -515,8 +513,10 @@ def foo(bar=baz, bax):
- """
-         with self.makeTempFile(source) as sourcePath:
-             if ERROR_HAS_LAST_LINE:
--                if PYPY and sys.version_info >= (3,):
-+                if PYPY:
-                     column = 7
-+                elif sys.version_info >= (3, 9):
-+                    column = 21
-                 elif sys.version_info >= (3, 8):
-                     column = 9
-                 else:
-@@ -543,8 +543,10 @@ foo(bar=baz, bax)
- """
-         with self.makeTempFile(source) as sourcePath:
-             if ERROR_HAS_LAST_LINE:
--                if PYPY and sys.version_info >= (3,):
-+                if PYPY:
-                     column = 12
-+                elif sys.version_info >= (3, 9):
-+                    column = 17
-                 elif sys.version_info >= (3, 8):
-                     column = 14
-                 else:
-@@ -578,7 +580,9 @@ foo(bar=baz, bax)
-             else:
-                 position_end = 1
-                 if PYPY:
--                    column = 6
-+                    column = 5
-+                elif ver >= (3, 9):
-+                    column = 13
-                 else:
-                     column = 7
-                     # Column has been "fixed" since 3.2.4 and 3.3.1
-@@ -717,13 +721,6 @@ class IntegrationTests(TestCase):
-     """
-     Tests of the pyflakes script that actually spawn the script.
-     """
--
--    # https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
--    if PYPY and sys.version_info >= (3,) and WIN:
--        LINESEP = '\n'
--    else:
--        LINESEP = os.linesep
--
-     def setUp(self):
-         self.tempdir = tempfile.mkdtemp()
-         self.tempfilepath = os.path.join(self.tempdir, 'temp')
-@@ -784,7 +781,7 @@ class IntegrationTests(TestCase):
-             fd.write("import contraband\n".encode('ascii'))
-         d = self.runPyflakes([self.tempfilepath])
-         expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
--        self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
-+        self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
- 
-     def test_errors_io(self):
-         """
-@@ -794,7 +791,7 @@ class IntegrationTests(TestCase):
-         """
-         d = self.runPyflakes([self.tempfilepath])
-         error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
--                                                         self.LINESEP)
-+                                                         os.linesep)
-         self.assertEqual(d, ('', error_msg, 1))
- 
-     def test_errors_syntax(self):
-@@ -807,7 +804,7 @@ class IntegrationTests(TestCase):
-             fd.write("import".encode('ascii'))
-         d = self.runPyflakes([self.tempfilepath])
-         error_msg = '{0}:1:{2}: invalid syntax{1}import{1}     {3}^{1}'.format(
--            self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY else ' ')
-+            self.tempfilepath, os.linesep, 6 if PYPY else 7, '' if PYPY else ' ')
-         self.assertEqual(d, ('', error_msg, 1))
- 
-     def test_readFromStdin(self):
-@@ -816,15 +813,13 @@ class IntegrationTests(TestCase):
-         """
-         d = self.runPyflakes([], stdin='import contraband')
-         expected = UnusedImport('<stdin>', Node(1), 'contraband')
--        self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
-+        self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
- 
- 
- class TestMain(IntegrationTests):
-     """
-     Tests of the pyflakes main function.
-     """
--    LINESEP = os.linesep
--
-     def runPyflakes(self, paths, stdin=None):
-         try:
-             with SysStreamCapturing(stdin) as capture:
diff --git a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch b/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
deleted file mode 100644
index c96585d20c73..000000000000
--- a/dev-python/pyflakes/files/pyflakes-2.3.1-fix-py3.10-tests.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From f3b1b44bf3d2d5927004fa1c2fcf1ab2def816b9 Mon Sep 17 00:00:00 2001
-From: Anthony Sottile <asottile@umich.edu>
-Date: Thu, 20 May 2021 07:23:19 -0700
-Subject: [PATCH] fix syntax error offsets for python 3.10 (#635)
-
----
- .github/workflows/test.yml |  2 +-
- pyflakes/test/test_api.py  | 43 +++++++++++++++++++++++++-------------
- tox.ini                    |  2 +-
- 3 files changed, 30 insertions(+), 17 deletions(-)
-
-diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
-index d379b3b7..2c1cf19d 100644
---- a/pyflakes/test/test_api.py
-+++ b/pyflakes/test/test_api.py
-@@ -441,7 +441,7 @@ def evaluate(source):
-             evaluate(source)
-         except SyntaxError:
-             e = sys.exc_info()[1]
--            if not PYPY:
-+            if not PYPY and sys.version_info < (3, 10):
-                 self.assertTrue(e.text.count('\n') > 1)
-         else:
-             self.fail()
-@@ -449,10 +449,17 @@ def evaluate(source):
-         with self.makeTempFile(source) as sourcePath:
-             if PYPY:
-                 message = 'end of file (EOF) while scanning triple-quoted string literal'
-+            elif sys.version_info >= (3, 10):
-+                message = 'unterminated triple-quoted string literal (detected at line 8)'  # noqa: E501
-             else:
-                 message = 'invalid syntax'
- 
--            column = 8 if sys.version_info >= (3, 8) else 11
-+            if sys.version_info >= (3, 10):
-+                column = 12
-+            elif sys.version_info >= (3, 8):
-+                column = 8
-+            else:
-+                column = 11
-             self.assertHasErrors(
-                 sourcePath,
-                 ["""\
-@@ -468,21 +475,25 @@ def test_eofSyntaxError(self):
-         """
-         with self.makeTempFile("def foo(") as sourcePath:
-             if PYPY:
--                result = """\
--%s:1:7: parenthesis is never closed
--def foo(
--      ^
--""" % (sourcePath,)
-+                msg = 'parenthesis is never closed'
-+            elif sys.version_info >= (3, 10):
-+                msg = "'(' was never closed"
-             else:
--                result = """\
--%s:1:9: unexpected EOF while parsing
--def foo(
--        ^
--""" % (sourcePath,)
-+                msg = 'unexpected EOF while parsing'
- 
--            self.assertHasErrors(
--                sourcePath,
--                [result])
-+            if PYPY:
-+                column = 7
-+            elif sys.version_info >= (3, 10):
-+                column = 8
-+            else:
-+                column = 9
-+
-+            spaces = ' ' * (column - 1)
-+            expected = '{}:1:{}: {}\ndef foo(\n{}^\n'.format(
-+                sourcePath, column, msg, spaces
-+            )
-+
-+            self.assertHasErrors(sourcePath, [expected])
- 
-     def test_eofSyntaxErrorWithTab(self):
-         """
-@@ -515,6 +526,8 @@ def foo(bar=baz, bax):
-             if ERROR_HAS_LAST_LINE:
-                 if PYPY:
-                     column = 7
-+                elif sys.version_info >= (3, 10):
-+                    column = 18
-                 elif sys.version_info >= (3, 9):
-                     column = 21
-                 elif sys.version_info >= (3, 8):
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
deleted file mode 100644
index 879458907120..000000000000
--- a/dev-python/pyflakes/pyflakes-2.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=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-# Uses pkg_resources
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Should be included in the next release
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.3.1.ebuild b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
deleted file mode 100644
index 1c9e50892545..000000000000
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild b/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..9e1e1477eb75
--- /dev/null
+++ b/dev-python/pyflakes/pyflakes-2.4.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Passive checker for Python programs"
+HOMEPAGE="
+	https://github.com/PyCQA/pyflakes/
+	https://pypi.org/project/pyflakes/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyflakes/pyflakes-2.4.0.ebuild b/dev-python/pyflakes/pyflakes-2.4.0.ebuild
deleted file mode 100644
index 850b36c38aeb..000000000000
--- a/dev-python/pyflakes/pyflakes-2.4.0.ebuild
+++ /dev/null
@@ -1,17 +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="Passive checker for Python programs"
-HOMEPAGE="https://github.com/PyCQA/pyflakes https://pypi.org/project/pyflakes/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyfuse3/Manifest b/dev-python/pyfuse3/Manifest
index b675176b3185..e6ca8961c3a0 100644
--- a/dev-python/pyfuse3/Manifest
+++ b/dev-python/pyfuse3/Manifest
@@ -1,5 +1,3 @@
-DIST pyfuse3-3.1.1.tar.gz 460405 BLAKE2B 12be1eb8aeea1e76993dc46fb32d8afd220f9429fd9b17354849527417daf9b65fbb8ce031569eef80925783dda5fe2b76f7a82bf33b04a0ce6b299819887ef2 SHA512 8e091c770f1f8521ad7a2bfe6c88a4032b088b5cc47220790ea794bc3f8bf6e6a56776e30708d27f17da5ae57b35b0dbdf694822fb63313f4818a62326626d40
 DIST pyfuse3-3.2.1.tar.gz 509083 BLAKE2B 16ada8aec47d8049907ef2710e9bfdf7991a8127560e7264e4eb58f7062efde478d2914597333991be4a6ef67a2a83c470560456287c1298b2008454ac831fb0 SHA512 468ef4cf9e2caef346a108f481a4c6dca8909ff3ea5aed11187df4c70c72c6180af9004348d25648368598495e5a5d9be2ba95d37f4d6d8a8c982f4893471b04
-EBUILD pyfuse3-3.1.1.ebuild 649 BLAKE2B 5fd9a6383f4e997d5e97cd560cca1580d817630a8ad740e61fb204666f6fae7bdc2c98f523beb4219b952d3d6d061c4d68da9482ed7cc525ba3be49c8e09cf58 SHA512 1bb059cf8a239386d66864306363f5e9722a3d71e7b1364e5f03ec9981b7081ed4b60ed42e0225247fedf15d087090bd03c36bc12ae8cae384ec5e38748c72fa
-EBUILD pyfuse3-3.2.1.ebuild 614 BLAKE2B c3f5517df40b70f18ec672d1c70638c41446902dfee6f11cff2fe9a23cd132a0fc8bd7a6a8feaa6548016ff98681a2349a885e129e5a702e77607a25928e1aba SHA512 6477f0ee7226ff6997be3b12ad6f7ae5252baf8952706426643f9635392fdafadfbb208b951810f3385c1d906f7c3b92711d945cdbaf18f2ab5abd2ffc4d4da0
+EBUILD pyfuse3-3.2.1-r2.ebuild 811 BLAKE2B 6255df21de7d49791667bc773068a62ffd10b5f7431f633688bbd31616b2d93a50c8d79617fc2446219059f74fed21e316d5fe63220358799668df094345ca88 SHA512 93e465bcd5cfbcafabf027060d63cf515913ee432a84ca8cd98bb422ded5f9f72143c2515be86f85e8e92d8ca9fabdf4102b7ca18cf7825e2d2519a5868929bf
 MISC metadata.xml 378 BLAKE2B 1eab581597bf836c57f06347fbe9f5abea4aabffef115536e20a7ffc598e0c124197bc6edaa79c92158f1b5339a465d584501705f1f4d26857b92b2cbd518778 SHA512 7893dc5830a0707d32e907d133cb5e2a6f86bb531c31f71926790d6ad9704c9dc85693ef91aa19a5c4ce755956400c8b5d97882ae4a9f52c2d19f64e06f3bcd9
diff --git a/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild b/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild
deleted file mode 100644
index 6c01439d2f3a..000000000000
--- a/dev-python/pyfuse3/pyfuse3-3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 3 bindings for libfuse 3 with asynchronous API"
-HOMEPAGE="https://github.com/libfuse/pyfuse3"
-SRC_URI="https://github.com/libfuse/${PN}/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CDEPEND="
-	sys-fs/fuse:3
-"
-
-RDEPEND="
-	dev-python/trio[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-
-DEPEND="${CDEPEND}"
-
-BDEPEND="test? (
-	dev-python/pytest-trio[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild b/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild
new file mode 100644
index 000000000000..373c92fb4944
--- /dev/null
+++ b/dev-python/pyfuse3/pyfuse3-3.2.1-r2.ebuild
@@ -0,0 +1,42 @@
+# 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 3 bindings for libfuse 3 with asynchronous API"
+HOMEPAGE="https://github.com/libfuse/pyfuse3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+CDEPEND="
+	sys-fs/fuse:3
+"
+
+RDEPEND="
+	dev-python/trio[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/pytest-trio[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	python_setup
+	# Shipped pre-generated .pyx do not work with Python 3.10.
+	esetup.py build_cython
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyfuse3/pyfuse3-3.2.1.ebuild b/dev-python/pyfuse3/pyfuse3-3.2.1.ebuild
deleted file mode 100644
index 47024ff967e7..000000000000
--- a/dev-python/pyfuse3/pyfuse3-3.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 3 bindings for libfuse 3 with asynchronous API"
-HOMEPAGE="https://github.com/libfuse/pyfuse3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-CDEPEND="
-	sys-fs/fuse:3
-"
-
-RDEPEND="
-	dev-python/trio[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-
-DEPEND="${CDEPEND}"
-
-BDEPEND="test? (
-	dev-python/pytest-trio[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyghmi/Manifest b/dev-python/pyghmi/Manifest
index c12043897dca..ef6de5b63979 100644
--- a/dev-python/pyghmi/Manifest
+++ b/dev-python/pyghmi/Manifest
@@ -1,15 +1,7 @@
-DIST pyghmi-1.5.36.tar.gz 240917 BLAKE2B 69e7f990c97a889d90e06feeb1b7b3fc73d6441cfe8ba7a22e0aa0e2b3553afb5166fb732699718dad04592aca95b8aaf28943ed92de136e45f381094b7c97af SHA512 b5536cf1c48929cb8acc7c9f77c09d0d51456cdfb2f74346387a483661332cdc02a614eac633a3e9aeabfac48b1a25a627668660be167fbf07b96c090ac6e197
-DIST pyghmi-1.5.37.tar.gz 241173 BLAKE2B 7094150c6002b59e1fcd9b337987d3506928222d55195c024027d31d281e5074210dac91c64853bbaac628dc112b9c4081a7193146927112dcc987f789faa018 SHA512 e70894f6e63afadc68bae88ebd8ff1f63904106db86b582b547a6f1eb7acde903352f08ffc62d7915e2baa45507f70331a6dc9f6b0dcd471fd330e39a69d064f
-DIST pyghmi-1.5.38.tar.gz 241170 BLAKE2B f056fb985ca1281fc481bf9ccaa5a6c86a05655fa6d3055e4ef2d9823e2893fff7ce795aebca5fafca5a368836372a71c73b6d8210b458f1dc54e9b68e429d4c SHA512 8d134cf2fa4c1226debe383832141e36f77a465acf02b2fcdf1ba5b621bf23444f40c69b9ce98c0ad096a8f2e5e9b04b4d0627d25354b76a130bece8d75f91c8
-DIST pyghmi-1.5.39.tar.gz 241157 BLAKE2B f406ad0dd6ae2b45c34aae14738f10c86f0a62082f7da2ab75b8e01558a9c0a8aa4c123cca935a0f3f03f5ae92d799d283dd81155d3c31c886555184f69be2b7 SHA512 efbc603002870edbeb4944207521077f5c25ed080578d3008a542a0e65d3769fe1da7105ed15d85acc3931a126a440e64b6ff9d88f6f4a3b66a5cdabcbab3e4c
-DIST pyghmi-1.5.40.tar.gz 241230 BLAKE2B 265fc07c18fe17987340932d1b67bb631907a0b66832ca79794117ccff9bff99fcf9046f2d0911878b16b2b2e179fe05b0980e34ec9125895abeda1a7d04aca5 SHA512 3bf35fb68fa867689b3218963fc811a94d26072688eee5b1952d5694608d81b1fd6658bb335e96dac57513bff3ee8a10db83a79d6373a025a23c1ad0fba7b172
-DIST pyghmi-1.5.41.tar.gz 241325 BLAKE2B 40e69bea087c81b7375af96af65576eb4faacb0e52aba5bf9e719e4fe87bf9e320be79fdcfb7308e44a08e7da92d26ece8a483ba8489c04f0df0984300d94eab SHA512 80f859defc28c48c81deb4addb984d61a88eaa0fec1a9de8ab517001f16f8dabf6ce860142020f115158561e9cf75b4e8675fdd9aedeb7d9bd0ae3f38115e912
-DIST pyghmi-1.5.42.tar.gz 241338 BLAKE2B f005697a13517f707bc74132d54ebdcc3752409aa147fdc9e99143f1c6a0507e24725e8bc2bc07980e017e6c6fff9868f84bf02fb598a2b580531aba0b66eafc SHA512 ec191a9862a4e6f28a8dbcb54759ad5c3a81ca3f85ecd4c9bbad634a3392296d5aad49d809a099d2719f2235dee2fac962374a4109dee120a4aba521a589afd5
-EBUILD pyghmi-1.5.36.ebuild 962 BLAKE2B 696ccd79ccc4e312d1db34bd13bb8f24765b28247ab0d3e73824b17c40917c89883d696c9c5fdbf7b70615101ddde1409c1eba880b6a38ce0fe337d97bba06ce SHA512 1343070936d8c0aef0e6c4219039805c244be7b580c2ac8698093416abdd35205619f3bd5f3442628c1973ac46fb71bf129baade0cc954cca9da5d200aff5d75
-EBUILD pyghmi-1.5.37.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.38.ebuild 984 BLAKE2B 6fcfc77869c93c409651b0173a577b8429b9ac494efe19beb9b9cf1c732837f668b54d0dfb14445eb6b0b1cd93d521456ae2fd36dbf3499f12767794cb03c8a3 SHA512 5a0c831b694d6c3d453627952ad5786b5834b85a95c9b1dc47f7791eb3a6d8f78a4d36528ca25a44c4a56cc7fd3f9808ea55d8704f22efe103c43e48efd0a64b
-EBUILD pyghmi-1.5.39.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.40.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.41.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
-EBUILD pyghmi-1.5.42.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+DIST pyghmi-1.5.48.tar.gz 243927 BLAKE2B 8395aa3bbba752654c2ad73f76735370f31f9548f91e7e0bbb3e52afd2d67a00b316f7e1e25a49ad16004308a635104fa57a00a6bed63639068de86d96e44316 SHA512 f3ee4d44504b2fa5950817e1957ac23c666af6ba36b0ba65dafa5b42036d12d204accf996c75947ecdb5f9533025b9b0d17b0e96612019d622fee678fd0ff592
+DIST pyghmi-1.5.49.tar.gz 244142 BLAKE2B f35b483cc4d48c5bc3fe6bd5c6ac3ea320d7c131a0e77f8ff8af1d14ecdc38972170d93b830070ab8c2d27ec8b8f1607ea0c065af4ad402bd0ee2e25307b9658 SHA512 9c8ce9ddf61b613cba59a49af4f5ebc40e37f83debf10854d2781f6b47fb0fff058cb9f784ed2d527f84ed1bad7c12acb97460fbab6a8552876510634c1bf5dd
+DIST pyghmi-1.5.50.tar.gz 244226 BLAKE2B 461bc9598497ae1f61d772ff223e7e4d2dc62660d41da2b660c4d71241c73c9107e8b0f74e5cf33fa8c9a8e79afaa834e4fb72e584ab2234a2874f9b23927208 SHA512 96fd274d8c7e55b6efc23612f145575e27a9a4949e20495ccfe023ff37dd7103cf0f42134350bf5fc0d1e4f86416981d01c18bd00d97a0b7a738fb5b363da457
+EBUILD pyghmi-1.5.48.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+EBUILD pyghmi-1.5.49.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
+EBUILD pyghmi-1.5.50.ebuild 985 BLAKE2B 567b053a6ae5707e6f7c6de607ecaee5a6904a8c705beafeaa82c5614914433df06fa462dcb1cfe0d6173cb4f6c62579f778bc4c2e16f000a8ec76ee3b5e30b9 SHA512 cfebc5ca5b3460ec76b1a62b6d6a4642aadebc1739ea9b763f2556558f39597d613cc4b8f43b4e66ad02cc20e21d1b9a904554ca005d3ee9dd875718b7860794
 MISC metadata.xml 439 BLAKE2B 0c7ccbc424041a506c60bb0934e40465b64a9779d4d2b6992ba5d4c8563b114da1470a1b221798773824b92fc7b5d6e7b2f0b0afff7f266ea1fbf450f336c497 SHA512 0c919c41bbef88b080cd5941d767cb3f79e935dfedb6da16353b80da2966d488936768b8ad04c7fc695b3c6376143430115f5533b3492816bf293ab2ccf37fb8
diff --git a/dev-python/pyghmi/pyghmi-1.5.36.ebuild b/dev-python/pyghmi/pyghmi-1.5.36.ebuild
deleted file mode 100644
index 89a005676064..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.36.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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/pyghmi/pyghmi-1.5.38.ebuild b/dev-python/pyghmi/pyghmi-1.5.38.ebuild
deleted file mode 100644
index 6dc97bad8c60..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.38.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/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/pyghmi/pyghmi-1.5.41.ebuild b/dev-python/pyghmi/pyghmi-1.5.41.ebuild
deleted file mode 100644
index 1844c945d4be..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.41.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/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/pyghmi/pyghmi-1.5.42.ebuild b/dev-python/pyghmi/pyghmi-1.5.42.ebuild
deleted file mode 100644
index 1844c945d4be..000000000000
--- a/dev-python/pyghmi/pyghmi-1.5.42.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of IPMI protocol"
-HOMEPAGE="
-	https://opendev.org/x/pyghmi/
-	https://pypi.org/project/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/pyghmi/pyghmi-1.5.37.ebuild b/dev-python/pyghmi/pyghmi-1.5.48.ebuild
index 1844c945d4be..1844c945d4be 100644
--- a/dev-python/pyghmi/pyghmi-1.5.37.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.48.ebuild
diff --git a/dev-python/pyghmi/pyghmi-1.5.39.ebuild b/dev-python/pyghmi/pyghmi-1.5.49.ebuild
index 1844c945d4be..1844c945d4be 100644
--- a/dev-python/pyghmi/pyghmi-1.5.39.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.49.ebuild
diff --git a/dev-python/pyghmi/pyghmi-1.5.40.ebuild b/dev-python/pyghmi/pyghmi-1.5.50.ebuild
index 1844c945d4be..1844c945d4be 100644
--- a/dev-python/pyghmi/pyghmi-1.5.40.ebuild
+++ b/dev-python/pyghmi/pyghmi-1.5.50.ebuild
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 25d0952f5e60..83daf83b8b15 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,3 +1,3 @@
-DIST pygit2-1.9.1.gh.tar.gz 317487 BLAKE2B 56855e656eafc27f24d8d59a0f21e36c49d292d322e6809257036ec0673f88d3299bca76c8f1c1a16bc79d667f0c6a355467ac5960c9999b11c8eddbf398cec6 SHA512 cfc050ef8cb6af7eace49d2e2ca10c77893abcafa1b319e173d39553e01a595ba084e345dedff22e22806527ecaed5387584f813b30184931820bb2bb1c93e58
-EBUILD pygit2-1.9.1.ebuild 862 BLAKE2B 4707708fbb49544937f943955a62373e905cb05d22c1f3ae68f406d70bbbf82ef58c682ce9b5b3b1184ee26e3942668f55b20e33fbd3a81089f6f82aea6c3046 SHA512 3597f6f45971d4f6bf761d1e11ae3b12ef3d0410c17d7f5161bc8f97283f98ec40189d23ec82e3fd207167819d4251032c16412a4117d5d8160f6a1bc5a50d0b
+DIST pygit2-1.9.2.gh.tar.gz 750593 BLAKE2B 89eeb56edbb7f823c0439e511e3a525789483a80760f6dcfbbdea7f45f1e16241d9772b54288c0acdb471bfe62a457e8fe82ec520d808d01ee8d079076278761 SHA512 523af14ae418b56efd3c541fb306c3a799224db400053590f1676ace9b53ac4c731a1731081f245cd78ab5d233c9e67fa2e5c13e02b6f62de05123cd47a1a70a
+EBUILD pygit2-1.9.2.ebuild 870 BLAKE2B d15704061779a3431fd04c42c2470bbbe1eed31232335d0171f679c3c91c96ee666c84aca5bc44dd10f7cebe1dfd2c2ce8bcfeae3713ea88e0ae438bfd542476 SHA512 9faa85311b249d276ad7c33605a3b2fe3284a8284239a3103595960708eb0888fc4cd3e543828523373680f0c96d3370624cf6b1aeb97f5f6aa8055c47c0f271
 MISC metadata.xml 490 BLAKE2B a53da88b5fe40a56d831bb5589d03d247ca1d1d843bde9a1fe6999563a42c076a9f6462b6947ae217086e5edde35a4788f4552636871891f9820534a6f0bade6 SHA512 57cb7356bbb0a22fce2d7ecd8ab346ef5c8155d0941d6a15bf2e98364e755d6e5e5d6aacf24017b4b827b983032e4d46f2363483ac66d6e3882c8be12e60fb39
diff --git a/dev-python/pygit2/pygit2-1.9.1.ebuild b/dev-python/pygit2/pygit2-1.9.1.ebuild
deleted file mode 100644
index ef2034d47953..000000000000
--- a/dev-python/pygit2/pygit2-1.9.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="
-	https://github.com/libgit2/pygit2/
-	https://pypi.org/project/pygit2/"
-SRC_URI="
-	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	=dev-libs/libgit2-1.4*:=
-"
-BDEPEND="
-	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	${BDEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unconditionally prevent it from using network
-	sed -i -e '/has_network/s:True:False:' test/utils.py || die
-}
-
-src_test() {
-	rm -r pygit2 || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pygit2/pygit2-1.9.2.ebuild b/dev-python/pygit2/pygit2-1.9.2.ebuild
new file mode 100644
index 000000000000..14b86977a62b
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.9.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/
+"
+SRC_URI="
+	https://github.com/libgit2/pygit2/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+DEPEND="
+	=dev-libs/libgit2-1.4*:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.9.1:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 17238e2611df..250a21832547 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1,3 @@
-DIST pyglet-1.5.23.tar.gz 6532823 BLAKE2B 0f69766ff424385c623c0b5bbca74741f4a55008365a90617a8f688954cbd58e898f733b893ef5dc2e1a25f9aab400e1d6f17bb932353f1f4f339e73f79406d5 SHA512 ed088ee37521d8594cb7fd017f86c3ce0f8e8794bc628c5404cbe2d33fb56db0fa306e83e89be7d132be68be73619fdd30d4410cd04a3bcb2f5f012443fb8ed8
-EBUILD pyglet-1.5.23.ebuild 1373 BLAKE2B b670720c2d7f0320b44b17057f5fba60557298d0548cc0929c42b3a2a1f1d651ed933989d598630863089b305af1a70b7a6dd20f395471429fad0313a30cce27 SHA512 a1ddc286f99319e90daf93aa8cc55388ce688d77213979858024ae8081eb52ac653437e35a2614b5918fcbe93f519c28dc2863613369c0e1a4209bfdf1f8dba1
-MISC metadata.xml 1037 BLAKE2B ebbed18b0f2da5a586f2b97e18a01f8464455ba32ab74919501b9940e8c0f0bd1058f546c6ed781aef7ff97cf890a09c55712313f9589097c973688670071e0e SHA512 384ab6a4f5a5613c4883e29a714425ae74b7ccca1e205a14f08d653da1eb939ff39e31c54c000e7a61ac65fe8ededef0e9380c70bedc7de1580403ed51a68bbe
+DIST pyglet-1.5.26.tar.gz 6534434 BLAKE2B a4366390f4ed92ed9e6c2d362fd8a009adf0e8a21ca00e1b9fead3cba99d192bb007413eca36892433f3bc4e2bf3258c550b2827262fc70e87b20566d46acb15 SHA512 819b2bbf71c9c632c1cefbb31e2a7186905c1475a1e978cd75dd6c019e5a53e6af79bceb57c68b61a3bb5692e04091c89c67b9168bb76ee19009c1ab719b8530
+EBUILD pyglet-1.5.26.ebuild 1574 BLAKE2B a701c65476ff75e74611efe43d8401929e10ab4d73aee621664ed0c1772cc153d02799578a08f9f07fab8fde8033abca3b367ad705f71956c7242f9eb441e8ad SHA512 9c6cfd4b55ffb1f876dfa3b268f27a812b263ca92a428aec34885a9288c1aaee9a8cab15c073536da01fb54fa8db8710469c6bddbe543c4e54376b930055a610
+MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/metadata.xml b/dev-python/pyglet/metadata.xml
index 1c5fcf1b614b..95f52b0f74f9 100644
--- a/dev-python/pyglet/metadata.xml
+++ b/dev-python/pyglet/metadata.xml
@@ -21,5 +21,6 @@
   pyglet might be seen as an alternative to PyGame.</longdescription>
   <upstream>
     <remote-id type="pypi">pyglet</remote-id>
+    <remote-id type="github">pyglet/pyglet</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pyglet/pyglet-1.5.23.ebuild b/dev-python/pyglet/pyglet-1.5.23.ebuild
deleted file mode 100644
index 32ae3d197173..000000000000
--- a/dev-python/pyglet/pyglet-1.5.23.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-python_test() {
-	xdg_environment_reset
-
-	# Deselect openal test, can't open device in sandbox
-	local EPYTEST_DESELECT=(
-		tests/unit/media/test_listener.py::test_openal_listener
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	virtx epytest tests/unit
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-1.5.26.ebuild b/dev-python/pyglet/pyglet-1.5.26.ebuild
new file mode 100644
index 000000000000..cc992542d9ff
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.26.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 469463e5050b..e43b32ca04d8 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,7 +1,3 @@
-AUX pygments-2.11.2-fix-docs-relative.patch 933 BLAKE2B fbb1c86a25fc01784b26d6046b1452dd227846ee7ac364f9963d3bcd486ee1a510525d5b3c28ada76c9b2612a4830722e2db7a21fa972e680f0d372158a51fa1 SHA512 254f0c5c5c10aa115bcfaa8c724ce0eafa6a313d724eaa70af4fe4c6a274d341749d59296ad4db23dec94d600d9bec658082560c3a169adbd8ab4ddc3bbb099c
-DIST Pygments-2.11.2.tar.gz 4206258 BLAKE2B d9b7ac03ab564051df8eebf390586387d824584f5485eb6af2048cec181412fe2812409251c9c042421125a2579d9ac6de4006c1c0de025ed7b010482482b9f9 SHA512 606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f
 DIST Pygments-2.12.0.tar.gz 4282017 BLAKE2B 9ad241d5bcafe59057e9495edb75468e6fa74d150f2d3266590a5a567a7df8ce2ef4ea18f90a8ab83e2fb84993fcf00dec12b04dd968f4c516b8339c49aecc08 SHA512 70bbfaefeb34f9afb5d74aa924ac3da4a913d1c7f607c0b3f80b6cd25c88a8996e516a689062bf2009c472b29999e309eb044f0f427fa1ea8479bf921b51c524
-EBUILD pygments-2.11.2.ebuild 1019 BLAKE2B 2065030d7e37e5f1102203b0086d7b763f9a31a5de8aa93af09642351356e0299290640bc7c8ece094d29c54f136a6d5f4657d95481bd32485bce6661381197a SHA512 82235171e8ac32caa8c10694b57e36992ad15696584172fef85082fbbf29aae38734c474637acde31f499e6b1cf8858ee505d5ead3b5630a337e1ec85bf9c2c8
-EBUILD pygments-2.12.0-r1.ebuild 1069 BLAKE2B e54cf4f8557b6288f7f223187d2a4f40cd0e676a97fc3d8a0762f2dd2c871586f307b1ded676b408254e362973b7e87e042a357760127d68c3dd3eaf43478920 SHA512 cef79ea33de90f8e75b0d6bcd25c6b0baee14d87d795df9f1f09fd81d612285c00bc83726e7eaad7b1b63c5b76a208ea74a312cfaf6a87e1f3e0ab0891aae76d
-EBUILD pygments-2.12.0.ebuild 1034 BLAKE2B b922f0658c4fb14a7a2b818aaea09b3d6c9353d1d849b55939ff4cc3905748a950747d4d22c71bece1049608a4b329e703e98f6975846dc629a67163bf2506c0 SHA512 58345ee34c8e1cf7bc10c7097cc305be02108999760544a84ecb4a4b548c575d3b40c00a8fabf660db0addf9041ce70ae5f9b15cb32d39daa929d09d1543ae23
+EBUILD pygments-2.12.0-r1.ebuild 934 BLAKE2B 104be2454a72272b50f8719bf75976886a1e10a9d77fa398094f066add5d9fe8df611155ba2f665ad4150ece07096147cc9c89409c663634b7c598e73d9f4e2d SHA512 59b0bbef44110571991aa7ae18c5e5e0c99a3d8443d1f783e8fd9d6bdc1e1d65e2d3b1e4612c711a2ce149a0555e5ed007b288d6f5cf04eb4a78c1b05d991ba7
 MISC metadata.xml 557 BLAKE2B 59b5fbb74f5d0b8f65127b36871561853ec6afde94f0a31986067c1f6f24aa18e648c38752ae7bcaebe0ef43fc457ef32d017e463006f1c2c9e92932675e03ca SHA512 0810f5412085ff458230b3137845bebf5841a1bab0f729f2bc5152ee44b570e855323cefbc24eee54c5febb1ea2c90a5a4357106a15c8fa250d77eaa057c01fe
diff --git a/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch b/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch
deleted file mode 100644
index 199a88d28dbb..000000000000
--- a/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: Fix relative path for doc generation
-
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
-
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -244,7 +244,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg):
-         ctx['languages'] = lexer_name_url
-
-     if pagename in ('styles', 'demo'):
--        with open('examples/example.py') as f:
-+        with open('doc/examples/example.py') as f:
-             html = f.read()
-         lexer = pygments.lexers.get_lexer_for_filename('example.py')
-         min_contrasts = test_contrasts.min_contrasts()
-@@ -280,7 +280,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg):
- def source_read(app, docname, source):
-     # linkify issue / PR numbers in changelog
-     if docname == 'docs/changelog':
--        with open('../CHANGES') as f:
-+        with open('CHANGES') as f:
-             changelog = f.read()
-
-         idx = changelog.find('\nVersion 2.4.2\n')
---
-2.35.1
diff --git a/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
deleted file mode 100644
index 4df58e44053c..000000000000
--- a/dev-python/pygments/pygments-2.11.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch"
-)
-
-distutils_enable_sphinx doc \
-	dev-python/wcag-contrast-ratio
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.12.0-r1.ebuild b/dev-python/pygments/pygments-2.12.0-r1.ebuild
index 7d9033ed45bf..03d5af23ad29 100644
--- a/dev-python/pygments/pygments-2.12.0-r1.ebuild
+++ b/dev-python/pygments/pygments-2.12.0-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
@@ -31,12 +31,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch"
-)
-
-distutils_enable_sphinx doc \
-	dev-python/wcag-contrast-ratio
 distutils_enable_tests pytest
 
 python_install_all() {
diff --git a/dev-python/pygments/pygments-2.12.0.ebuild b/dev-python/pygments/pygments-2.12.0.ebuild
deleted file mode 100644
index 0054a81979e4..000000000000
--- a/dev-python/pygments/pygments-2.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch"
-)
-
-distutils_enable_sphinx doc \
-	dev-python/wcag-contrast-ratio
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 2a74d0a7ca70..5975a57f293a 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,6 +1,3 @@
-AUX pygobject-3.42.0-dynamicimporter-py310.patch 2283 BLAKE2B f59cd749cea48343d0bf1c798c1b8d038c763c2cf3afd798030c7befe428427fe30d37c4dcbd5ffe8c9bbca18b3cb04fdae464867262e489075a254c9ac29fc5 SHA512 2ab000c63386eb986cd396e6c51054482d06923f279021d04e9674f16e17cbfea00a8f0750c8cd05d04db0a07a35e5f2739aec7040372b039ae86971e636d96c
-DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
 DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
-EBUILD pygobject-3.42.0.ebuild 1840 BLAKE2B 17e0358b9b7821ff1ff2159b70bcaa417ec4b5925c9714a9b128693e35511a71f358f7db70d950e20024676566dea92c6fd77756a100cfba44738f41e330e931 SHA512 259ad017d2d4a4b81fe8b709832934963f1e5c05224ec5c4761987462a293954e2717d904435fc2ed6cc35488ed9637a1c2c6de402b7350c07f7a46a8315d000
-EBUILD pygobject-3.42.1.ebuild 1787 BLAKE2B 28f6d0b1473fe6a156ba98a1cd9e3311afc71cc5e12c87d1831e905b3e7f586c9cd77dca4226d79466a6e9e7675622aff6b32ca4cd8b7afd9edec3c9cd51ce00 SHA512 0404e16591e87012e01fea6a3b30aab837c603c979385b73745051f9c73b459f0b97340eea5c87b0f13572d675d6c36b3eca6eb26a2aff9237f57ee587a80fd1
+EBUILD pygobject-3.42.1.ebuild 1786 BLAKE2B 8da4bf87d753a965f24204363d4250554fceb822bf55090a401ac643d2bd91491ba6dbf3eef57517cfd684350261dc97e73058bf98656a9c92fc3e0dbd84d592 SHA512 aece28c7d33be016887008111abef907eed8d7746559d0527a8a1ef4c46cfde25a2689f620a7b4d4ed4edae332a07630d3b918ac767440b7c91eb892da4dea53
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch b/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
deleted file mode 100644
index cf292ffbf7c6..000000000000
--- a/dev-python/pygobject/files/pygobject-3.42.0-dynamicimporter-py310.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From dea457c0754550e210ab3cca9da8be1ae52d1d31 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 18 May 2021 12:31:51 +0200
-Subject: [PATCH] Implement DynamicImporter.find_spec()
-
-On Python 3.10, the code raised an ImportWarning:
-
-    ImportWarning: DynamicImporter.find_spec() not found; falling back to find_module()
-
-See https://docs.python.org/3.10/whatsnew/3.10.html#deprecated
-
-> Starting in this release, there will be a concerted effort to begin cleaning
-> up old import semantics that were kept for Python 2.7 compatibility.
-> Specifically, find_loader()/find_module() (superseded by find_spec()),
-> load_module() (superseded by exec_module()), module_repr()
-> (which the import system takes care of for you),
-> the __package__ attribute (superseded by __spec__.parent),
-> the __loader__ attribute (superseded by __spec__.loader),
-> and the __cached__ attribute (superseded by __spec__.cached)
-> will slowly be removed (as well as other classes and methods in importlib).
-> ImportWarning and/or DeprecationWarning will be raised as appropriate to help
-> identify code which needs updating during this transition.
-
-Fixes https://gitlab.gnome.org/GNOME/pygobject/-/issues/473
----
- gi/importer.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/gi/importer.py b/gi/importer.py
-index 32967974..63788776 100644
---- a/gi/importer.py
-+++ b/gi/importer.py
-@@ -107,15 +107,20 @@ class DynamicImporter(object):
-     def __init__(self, path):
-         self.path = path
- 
--    def find_module(self, fullname, path=None):
-+    def _find_module_check(self, fullname):
-         if not fullname.startswith(self.path):
--            return
-+            return False
- 
-         path, namespace = fullname.rsplit('.', 1)
--        if path != self.path:
--            return
-+        return path == self.path
-+
-+    def find_spec(self, fullname, path=None, target=None):
-+        if self._find_module_check(fullname):
-+            return importlib.util.spec_from_loader(fullname, self)
- 
--        return self
-+    def find_module(self, fullname, path=None):
-+        if self._find_module_check(fullname):
-+            return self
- 
-     def load_module(self, fullname):
-         if fullname in sys.modules:
--- 
-2.32.0
-
diff --git a/dev-python/pygobject/pygobject-3.42.0.ebuild b/dev-python/pygobject/pygobject-3.42.0.ebuild
deleted file mode 100644
index d16ca40b8024..000000000000
--- a/dev-python/pygobject/pygobject-3.42.0.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit gnome.org meson python-r1 virtualx xdg
-
-DESCRIPTION="Python bindings for GObject Introspection"
-HOMEPAGE="https://pygobject.readthedocs.io/"
-
-LICENSE="LGPL-2.1+"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cairo examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/gobject-introspection-1.56:=
-	dev-libs/libffi:=
-	cairo? (
-		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
-		x11-libs/cairo[glib] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-libs/atk[introspection]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		x11-libs/gdk-pixbuf:2[introspection,jpeg]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dynamicimporter-py310.patch
-)
-
-src_configure() {
-	configuring() {
-		meson_src_configure \
-			$(meson_feature cairo pycairo) \
-			$(meson_use test tests) \
-			-Dpython="${EPYTHON}"
-	}
-
-	python_foreach_impl configuring
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
-	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
-
-	testing() {
-		local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
-		meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
-	}
-	virtx python_foreach_impl testing
-}
-
-src_install() {
-	installing() {
-		meson_src_install
-		python_optimize
-	}
-	python_foreach_impl installing
-	use examples && dodoc -r examples
-}
diff --git a/dev-python/pygobject/pygobject-3.42.1.ebuild b/dev-python/pygobject/pygobject-3.42.1.ebuild
index 5a3a9f1a993c..95db0a28fc86 100644
--- a/dev-python/pygobject/pygobject-3.42.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygpgme/Manifest b/dev-python/pygpgme/Manifest
index 6bb44d41fb7a..9351de13aba0 100644
--- a/dev-python/pygpgme/Manifest
+++ b/dev-python/pygpgme/Manifest
@@ -1,3 +1,3 @@
 DIST pygpgme-0.3.tar.gz 50100 BLAKE2B d55ddc79a569ddf007552909a142836c54f97f6a5e9b503dec0405d1df387a9aac04f0424b3700cf35bb5d1bd891f0b90f2dc3fb7cc88435da83944adfccdaec SHA512 25fc199a7958adfa3bbb294108792974ba96ee7b15dff98f7933e9b089a6044d83bb7c7b77ca84ea0cab5b182f6d401cee42ecab57ab9ba34aa0b14eb6ce7736
-EBUILD pygpgme-0.3-r4.ebuild 569 BLAKE2B c11fc4f6f768d726d8945aceef7b343781c16577b70290319655bf619287013550686bc5a53950b298da88837153939965b94e92d146b2d68016813636681781 SHA512 72068c95eaf7ea4d0a639a73817f9f4adf57a22d0be8a05b41f75a08821adc56f8597f9ea0333e5f971b9ca118e2e407c9f569e80d84898f741e7b322914d042
+EBUILD pygpgme-0.3-r5.ebuild 594 BLAKE2B d1d7ef26a4db0b8fe36e896ce396c44b2ded459add84a1bf6610fa064547746b0967fc600d64d9d9c48b8aa1eff410eb70f75475fe7750766c59cc7e57697d34 SHA512 e746aa075866b72aa0761f56ff74e68520a40e9da13d40631e857a3d77e98a810e6f3fae87c707db49b00d5541954b52281f5d93ce03020f7823c6c71171f1ea
 MISC metadata.xml 596 BLAKE2B 1e8005d8a724905512d5b13a9ab215c5d8e604babab4b849a41e1e1844cb6e724623f9d71d9d8fca803269c27ccf12a259cc74139b9dbd40c26db40e53b040a3 SHA512 5db17552c40f40289b4dc80583ec551a3bddd9598040e06de22892f4cf64394649f0e1efa4e975a7a5927cb2efcaf8a84d41872de94f2909ce09affd8e3ec584
diff --git a/dev-python/pygpgme/pygpgme-0.3-r4.ebuild b/dev-python/pygpgme/pygpgme-0.3-r4.ebuild
deleted file mode 100644
index 40674561583f..000000000000
--- a/dev-python/pygpgme/pygpgme-0.3-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 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="A Python wrapper for the GPGME library"
-HOMEPAGE="https://launchpad.net/pygpgme https://pypi.org/project/pygpgme/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE=""
-
-DEPEND="app-crypt/gpgme:="
-RDEPEND="${DEPEND}"
-
-python_configure_all() {
-	append-cflags $(gpgme-config --cflags)
-}
diff --git a/dev-python/pygpgme/pygpgme-0.3-r5.ebuild b/dev-python/pygpgme/pygpgme-0.3-r5.ebuild
new file mode 100644
index 000000000000..4059028ee04c
--- /dev/null
+++ b/dev-python/pygpgme/pygpgme-0.3-r5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 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="A Python wrapper for the GPGME library"
+HOMEPAGE="https://launchpad.net/pygpgme https://pypi.org/project/pygpgme/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~riscv x86"
+IUSE=""
+
+DEPEND="app-crypt/gpgme:=[python,${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_configure_all() {
+	append-cflags $(gpgme-config --cflags)
+}
diff --git a/dev-python/pyh2o/Manifest b/dev-python/pyh2o/Manifest
index fc9afee2d354..7ec4e8a029d6 100644
--- a/dev-python/pyh2o/Manifest
+++ b/dev-python/pyh2o/Manifest
@@ -1,3 +1,3 @@
 DIST pyh2o-1.tar.gz 7327 BLAKE2B 9d6b308d17dd799e2c83a191c346a3d78fc0a097de2a2fd5cb6277a1525992aa18f6c6b61b2c2503ae4a9e7ddd3575e092aef77a0e84223a5a2c702c0a808f1d SHA512 529fa4d8e9c477346fcbd23d7172d41de96789797f0e1ad0557f4c0bdaea8a519a8e8735845d0080cf171182874ce0819e76357ca7c7db1d62a9544f907095db
-EBUILD pyh2o-1-r1.ebuild 507 BLAKE2B 8f2976c6faa562a4dcc2fc71cfdcecad766e77607aa9c83bad0cc9b2d3cbbd398d67d6ce2e1c74d5be58f156c247f7f9e6ca5621330a39107357147f768a79d9 SHA512 2d369737d678f8d5a90666865e5e3f60fb1cb7777a02163cae0214cf711fe8fad00f25bdf757f06baaea92d49832880bd4aedfa9cd598ede6e1f3e9091be1ad6
+EBUILD pyh2o-1-r1.ebuild 514 BLAKE2B d63b675bcdf93f6449d55b4bc79f8cd6addbca23d5b1f853549d24a8f1f0657fd635271295f20f402437d87d6cd873d8ae57f685d5156b5bdbdb829db3b7c106 SHA512 689aecd4887003d9be805e472311b9d8e7dd7a3d7d14786416b209fa0aa0b3b9ada6481c76d172b17b9cc29e9a44b7414f5a806ba7028619feee1ec1fa395aa1
 MISC metadata.xml 543 BLAKE2B dfed4810be25f6ff5858e519f465c02aedff046e3ec24bf5a1bb1a0fddd5609de4189f829a7a3ec61b60c3626f4fd5527d5245aa02a6350b30957b1967a5325e SHA512 e06b7c94f5c9768161d4337990ff59fc60d10c9bfbed073bd7642db0746cf20160e297a09b00ce5acaa7b5b3c3e269cb493a83c686f3ad6a506ca97483c30270
diff --git a/dev-python/pyh2o/pyh2o-1-r1.ebuild b/dev-python/pyh2o/pyh2o-1-r1.ebuild
index ae9149a0c504..bffa3a0c8f3a 100644
--- a/dev-python/pyh2o/pyh2o-1-r1.ebuild
+++ b/dev-python/pyh2o/pyh2o-1-r1.ebuild
@@ -4,20 +4,25 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python API for sci-libs/libh2o"
 HOMEPAGE="https://github.com/mgorny/pyh2o/"
 SRC_URI="
-	https://github.com/mgorny/pyh2o/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/mgorny/pyh2o/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=sci-libs/libh2o-0.2.1:="
-DEPEND="${RDEPEND}"
+RDEPEND="
+	>=sci-libs/libh2o-0.2.1:=
+"
+DEPEND="
+	${RDEPEND}
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 517a50a8ffc0..271f1e7ea839 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,3 @@
 DIST PyHamcrest-2.0.3.gh.tar.gz 59353 BLAKE2B b393f250f1a5f3f2d3014ae8a6e20ec659e034d8e681fcbb16f4e9fbe69ba7a94ce342a79584cfc99dff6af57e1d9763efd5ff8b5d891951289d9047cab4270c SHA512 4a28c0ae04db11a86c44dff001e919a5bb6b820af8ffd60b1a1f2846f257d79daac76fbdeac4a0039d149e643043258a0685382a3a4b52c6d4586b8be95e1657
-EBUILD pyhamcrest-2.0.3.ebuild 777 BLAKE2B 9de3b342973309c70c81882ae58f5defe3621837ee6c77438a8508782ea04cf273ede9428ba07c740553aa7ab806bc5aa3afc5c5da890bc6e6c8611be44fecc2 SHA512 23f53d32ab83f6cf572fa53fce45906ec115f97914c71aa236cdbcdaae0915090a7eb44939eecf2ad9ff9cd11687493d458d62c1adf14a6d23fde80cfd309055
+EBUILD pyhamcrest-2.0.3-r1.ebuild 853 BLAKE2B 0046909958a999de992568caf452b34ae5c1e36df60571eb8f0b99db41a9742f51b67b5b20d1e28dbe4d24910aab3025f321f50502a146947de54e3302796268 SHA512 100e7ed81dc4a1e1284ee42f120057ee4c05a1e2fc9674f709d2b795e195e2b4b097f82bcf42b3f76345030ff7e523294db122ed131011e54caf1eb815e3c1e3
 MISC metadata.xml 397 BLAKE2B cfdb950c34749dd9fa17d822df0194a8f35e477902947cf568f76aed96588c0e5a903ea5448f9772faef06ddc66df3c3c971978c6f4431861bf3586702d610db SHA512 024f24f466f0212a7ac599638bcd42b858e2cc786b7bf2641d0e0d4cc3df5dc97c958d4d85930cbd1c32e023f755f844a2675e2c820839729c54ad5e8fb40cd6
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.3-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..0e053987b9b9
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.3-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="PyHamcrest-${PV}"
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="
+	https://github.com/hamcrest/PyHamcrest/
+	https://pypi.org/project/PyHamcrest/
+"
+SRC_URI="
+	https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~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
deleted file mode 100644
index 8177f93d9866..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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_P="PyHamcrest-${PV}"
-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_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~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/pyicu/Manifest b/dev-python/pyicu/Manifest
index d0f4ec04317f..0c579fa939fe 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,3 @@
-DIST pyicu-v2.8.1.tar.bz2 242774 BLAKE2B eeb3c45124301b7072addcbfc3c97521d21fbdb5bdf2b0fe94f0181c225927a0b3bd6ab6271140fa9928d0220e5cb33c800b367cf4b0cf844ad64a2438aa016b SHA512 dc7fb292322c565da045db9d91e9b4cd58a559d6f78bf3f050bf25fbab942179b463b977340e08bbeb107e3a2be8a2eb0a0a91911e0c0b8b96327ba85fd13c46
 DIST pyicu-v2.9.tar.bz2 243533 BLAKE2B c2ea32f69637e2d12a57ded96b570ba7fd41c92aed4a0dea36ebe5c224b80fa8d1672251f8218e0a35d463957ab4291cff778c3e690f0763e465dc6f0a1af26d SHA512 f10025afe1a0de5a1726c3d4aaec5b10ba62064c33205117efe643185dcd3560e8971b600606e9699269cca795477bf86ed2f9e604e9c0e04bb75a86f31cd114
-EBUILD pyicu-2.8.1.ebuild 669 BLAKE2B 900d64afbf23856b71df56b9bc381edb87f16a19ed3149531a3b798a05738e2e7ab5a650ea9b4b8e909d6e92e8d5490b101439cac61894202346b0af22e586ca SHA512 6a9d1daf4af8d70c3acd9284017c1284aea9b80b96243bc192ad8486f46d2219c922c608949a9a8d727ff0a070ab63b4e6c817935a852ef79e4ce55501381d8e
-EBUILD pyicu-2.9.ebuild 683 BLAKE2B b7b3b963c2fcb23562a54b074d6da508c357221bd2c240946de42889963c7a7b698723c61350290ab65e9bae73d8e5eaa3befd4b38fe0d56970ab73fedc0731a SHA512 185926ddc8a37529eec8a5203afb2957c2ea843731fd7f637790a4c30ef6647a47e04495715219602ab3691af38a851caa926a9233facd286367990d43ffea67
+EBUILD pyicu-2.9.ebuild 681 BLAKE2B bf4d51d2df8c47b221d6e7c11a0bd7503b846a3f3f208dd8d7cfb7b6840ac476e486a42caf0466205c2e86a46509924a76938cdad64e8a7e5d966c7b54b4306f SHA512 c7fa76c08368699425e01e2bc22667a6541afc75c1c0400c409e7935c186f345c29e400c06ea35e6e43d19c880bee645ae308c5495ce2bbdf54d72995ee8e4f4
 MISC metadata.xml 415 BLAKE2B a96dc033850e25f2afcd4128d38becd7c86263e5bb366a701c88a2bc81118aef03217bbfe0c2ff0719f636104b2a12995815c36f2a3e6539136509c7900c25e4 SHA512 e8d901e2276b0a92ae8e0cdd4b0e1cacd29d9eda86491a31a2057d013b7c4f8c340d0e83dbfd53500906f79a827d837cc7e445c24e6cf5b50ee809ec2c35eb13
diff --git a/dev-python/pyicu/pyicu-2.8.1.ebuild b/dev-python/pyicu/pyicu-2.8.1.ebuild
deleted file mode 100644
index 40b49e45feb8..000000000000
--- a/dev-python/pyicu/pyicu-2.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.9.ebuild b/dev-python/pyicu/pyicu-2.9.ebuild
index 84a153bb0fca..ae449e97fce1 100644
--- a/dev-python/pyicu/pyicu-2.9.ebuild
+++ b/dev-python/pyicu/pyicu-2.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
deleted file mode 100644
index 4913e63f2e96..000000000000
--- a/dev-python/pyilmbase/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pyilmbase-2.5.7-0001-disable-py2-for-boost.patch 578 BLAKE2B c9aff2ec269ea894e046bb265c6a69418c128f0d9dd54afc924138b6060d55b1ff1da6e8a9fc512b3097b8ff8acce0c03012748cdf10263945ce6f42dcec3424 SHA512 969c3d5bd676a471739feca443a938584a78b8903b71d75f51abdcd87e48a5ecaaab3132258905bad063165e9a4861ea9e6ce0d6b21844462e2adbbaea37fcff
-AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826e6f36343cefba88813427d1f18f12eae4692ebc33d765d44c600846840129ee2f2d79e9c1fa8b0c4489dbe292bab38be952009cb8b7e92222 SHA512 193142fe50a69568bad5c7034d5d6cf45c1a36cd517f1c71875a651fb7629263c53769050a9e5e7ddec699a9bd08f84d32d1dc3a8c29c5b3576c2741deaf2986
-AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
-DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD pyilmbase-2.5.7-r1.ebuild 1411 BLAKE2B 12009569c445a31c517b20cf9ce23a435ec5f2e64d0cdb0ffedfea0baf57c24e7a2ab06acafa2fdbccc450c2aff5d8b9f16b2abf4cb898e7530d94e1643a5d0c SHA512 9aeca79d1ad912b21b568cc8d8c9d2fc374b527abd24a7fd97e7e1c7b8c88717cdab50f643fe8ae0f66ba24ede145981f6a987ed8fc0f3ddb6987cc2362a552e
-EBUILD pyilmbase-2.5.7.ebuild 1386 BLAKE2B 3ed4549ec313be8031285379f41f93eba037c3e6bbbd9cd173fe083a4ae7ec37b865cc4da47b289d8c7bb11c4fdd8d4cbbaf0da0c288454fc9fecd719e68f128 SHA512 4a62d97e0de989561e4ca3206e2e6d49c95253d032851a742e972846e0fec1b18baaea525d87dbb49e97430d9f8a812e0d4a3fcf58b0263d80805c5c5f7530c7
-MISC metadata.xml 606 BLAKE2B 0821a88eab729f251daaf08ade6383df3d8fa17aa9b322d5a7061e6f11765f8f1ea18a151832e29c7d82fb3d9cc442796dfcb548bb24694aef60b3334d1dbf4f SHA512 60e9e24c8fc0838707471603d214a21213810ec23bae5c8f4ce6c42d6f5459c2cc528e605cd556409eed4aad0316acf57e063e9dba53aaea05bb8f0fe0af1c8d
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
deleted file mode 100644
index 73281e5ad6d0..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0001-disable-py2-for-boost.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:08:15 +0200
-Subject: [PATCH] disable py2 for boost
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 291b96e..68b280d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,8 +142,6 @@ endif()
- 
- find_package(Boost OPTIONAL_COMPONENTS
-   python
--  python2
--  ${PYILMBASE_BOOST_PY2_COMPONENT}
-   python3
-   ${PYILMBASE_BOOST_PY3_COMPONENT})
- set(_pyilmbase_have_perver_boost)
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
deleted file mode 100644
index 1aa4152dbbe5..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0002-install-imathnumpy.so.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:46:30 +0200
-Subject: [PATCH 1/2] install imathnumpy.so
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- PyImathNumpy/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/PyImathNumpy/CMakeLists.txt b/PyImathNumpy/CMakeLists.txt
-index 7a70f06..2822127 100644
---- a/PyImathNumpy/CMakeLists.txt
-+++ b/PyImathNumpy/CMakeLists.txt
-@@ -49,4 +49,5 @@ if(TARGET Python3::Python AND
-     LIBRARY_OUTPUT_NAME "imathnumpy"
-     DEBUG_POSTFIX ""
-   )
-+  install(TARGETS imathnumpy_python3 DESTINATION ${PyIlmBase_Python3_SITEARCH_REL})
- endif()
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch b/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
deleted file mode 100644
index a28757cbf1dc..000000000000
--- a/dev-python/pyilmbase/files/pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7469db402e2affb094585c374518765c69af703d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 22 Jun 2021 11:47:01 +0200
-Subject: [PATCH 2/2] fix pkgconfig file
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- config/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index a4139bc..45dcca4 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -15,9 +15,9 @@ if(PYILMBASE_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
-   function(pyilmbase_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
--    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
--    set(libdir ${CMAKE_INSTALL_LIBDIR})
--    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-+    set(exec_prefix "\${prefix}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
-     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
-     string(REPLACE ".in" "" pcout ${pcinfile})
--- 
-2.32.0
-
diff --git a/dev-python/pyilmbase/metadata.xml b/dev-python/pyilmbase/metadata.xml
deleted file mode 100644
index 2b6000f11bf4..000000000000
--- a/dev-python/pyilmbase/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>waebbl-gentoo@posteo.net</email>
-		<name>Bernd Waibel</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="exceptions">
-			Enable runtime floating point exceptions in PyIMath.
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild
deleted file mode 100644
index d836bc69615f..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!dev-libs/imath[python]
-	~media-libs/openexr-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
-	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
-	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		# starting with boost-1.76.0 we ship the cmake config files
-		-DBoost_NO_BOOST_CMAKE=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
deleted file mode 100644
index b7e9e391a71e..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/openexr-${PV}/PyIlmBase"
-
-LICENSE="BSD"
-SLOT="0/25"
-KEYWORDS="amd64 ~x86"
-IUSE="exceptions test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	~media-libs/openexr-${PV}:=
-	sys-libs/zlib
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-0001-disable-py2-for-boost.patch
-	"${FILESDIR}"/${P}-0002-install-imathnumpy.so.patch
-	"${FILESDIR}"/${P}-0003-fix-pkgconfig-file.patch
-)
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		# starting with boost-1.76.0 we ship the cmake config files
-		-DBoost_NO_BOOST_CMAKE=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
-		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
-		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DPython3_INCLUDE_DIR=$(python_get_includedir)
-		-DPython3_LIBRARY=$(python_get_library_path)
-	)
-	cmake_src_configure
-}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index a96d12717ab5..5f522ac79b51 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,3 @@
-AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
-DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
-DIST PyJWT-2.3.0.tar.gz 62279 BLAKE2B 0f4cea0cee2461e5f829b2bba40fb6d2646d5bccaa8e6b2d26ba7379386a64dc9f5204ea607edec98fc0102facf3cc5595e5e97523e9a567e0cf0b072542a3f5 SHA512 c6a1d8c3ce87d2122aa4ce4e19c5d2683aeffae6fb29b20fa17e2dfb1a07faf721beb8ca390d3acdeb85a1476025ca5af4fcdb1019f84c8c1bf229246a7aafe3
-EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
-EBUILD pyjwt-2.3.0.ebuild 739 BLAKE2B e29b5ace1499a758ce0f7479f0c59110cd2751ff48d679f8576cb8b770f707d86c46f4a51a2585fc026c107704473338e2cc6f4bf362529d890168a3401cc265 SHA512 2b2cbdb8de7e8ef71c43c1e65ce199cd2ea1f7b47e38be13527c0ea4c0e63f0c52017ae03b3a0aa54876f867b0c9a13ccf24990a36f22712f97ca2e6e782978e
+DIST PyJWT-2.4.0.tar.gz 66327 BLAKE2B bc78ceebe3fedd4216420c34034de96dc6af488b4b50d20a03073753cfe94d059cda3e118f79cc3718253f56bb977b5b86543d1cd1ab7346a4095d0c2c6855b2 SHA512 6c60afe62f9341c0fd889be227cd9e44260bc88696a93d0c3398547e159001f04e402d207d2230641f0f3d37cfd7e6f9e50a42dadfb011d7087c32a864c792a4
+EBUILD pyjwt-2.4.0.ebuild 777 BLAKE2B 18cfe4313cc9b70ffb51b92284d5c4c2a31f6f1c1af4c365574448301ad84a8cf3a4eca6060df3fa2a2f5922e04151b409639ce72a6ffec11b0304a47d72df6f SHA512 23cbeef83d2e3ce13f37e4bbe42dba14eac0f80b512accd2aaa77de8a127f10fcc2affe66fea980267f9bb67e9f09548b2c8f6755bf0931def33a074668a624b
 MISC metadata.xml 450 BLAKE2B e0a5244140aed7eb1dbc7d1bedf41b64f999ada11a82d5a7c3720501d824c789590e5339d5855fa4d0f96ff1b572e86af41859f8f14105f2f9b1a715d9d71d87 SHA512 83bce7997e724867cf1962ce75d8bb8e7a4e7a8dcdb42b95d9d323ca3a3ea4584020d4b700885e1afcb753d4fcacee23ec7b25066e93c0ac5eb614f65d140f29
diff --git a/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch b/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch
deleted file mode 100644
index ebd9236c7994..000000000000
--- a/dev-python/pyjwt/files/pyjwt-1.7.1-ecdsa-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36a3f9bd0cc7029e5150b1931efbd62da975e8b9 Mon Sep 17 00:00:00 2001
-From: StefanBruens <stefan.bruens@rwth-aachen.de>
-Date: Mon, 21 Oct 2019 02:07:19 +0200
-Subject: [PATCH] Catch BadSignatureError raised by ecdsa 0.13.3 on
- verification errors (#448)
-
-The new ecdsa no longer uses AssertionError when the signature is too long.
-This happens in the test suite, where "123" is appended to the signature.
-
-Fixes #447
----
- jwt/contrib/algorithms/py_ecdsa.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/jwt/contrib/algorithms/py_ecdsa.py b/jwt/contrib/algorithms/py_ecdsa.py
-index bf0dea5..f1170a6 100644
---- a/jwt/contrib/algorithms/py_ecdsa.py
-+++ b/jwt/contrib/algorithms/py_ecdsa.py
-@@ -56,5 +56,7 @@ def verify(self, msg, key, sig):
-         try:
-             return key.verify(sig, msg, hashfunc=self.hash_alg,
-                               sigdecode=ecdsa.util.sigdecode_string)
--        except AssertionError:
-+        # ecdsa <= 0.13.2 raises AssertionError on too long signatures,
-+        # ecdsa >= 0.13.3 raises BadSignatureError for verification errors.
-+        except (AssertionError, ecdsa.BadSignatureError):
-             return False
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
deleted file mode 100644
index 1849483dffc3..000000000000
--- a/dev-python/pyjwt/pyjwt-1.7.1-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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1 optfeature
-
-MY_PN="PyJWT"
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/progrium/pyjwt https://pypi.org/project/PyJWT/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-DEPEND="
-	test? (
-		>=dev-python/cryptography-1.4.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	find . -name '__pycache__' -prune -exec rm -rf {} + || die
-	find . -name '*.pyc' -delete || die
-
-	# enables coverage, we don't need that
-	rm setup.cfg || die
-	# kill tests using pycrypto that break with pycryptodome
-	sed -i -e '/has_pycrypto/s:True:False:' \
-		tests/contrib/test_algorithms.py || die
-
-	local PATCHES=(
-		"${FILESDIR}"/pyjwt-1.7.1-ecdsa-fix.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-	optfeature "flake8" dev-python/flake8{,-import-order}
-
-	ewarn "flake8 feature requires 'pep8-naming' which is not packaged yet"
-}
diff --git a/dev-python/pyjwt/pyjwt-2.3.0.ebuild b/dev-python/pyjwt/pyjwt-2.3.0.ebuild
deleted file mode 100644
index 6b5ead763d7d..000000000000
--- a/dev-python/pyjwt/pyjwt-2.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature
-
-MY_PN="PyJWT"
-DESCRIPTION="JSON Web Token implementation in Python"
-HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!dev-python/python-jwt"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "cryptography" dev-python/cryptography
-}
diff --git a/dev-python/pyjwt/pyjwt-2.4.0.ebuild b/dev-python/pyjwt/pyjwt-2.4.0.ebuild
new file mode 100644
index 000000000000..5168c40ed0d3
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="
+	https://github.com/jpadilla/pyjwt/
+	https://pypi.org/project/PyJWT/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!dev-python/python-jwt
+"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 2eb55ed71a43..7bed484b7fff 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,3 +1,3 @@
-DIST pykka-3.0.2.gh.tar.gz 44440 BLAKE2B 8649e4b5134d902a459cd7f43ced59fb88bf6e9f7435aaf89a3c68fd349b941eea8154703107611a027c39b9eaca374d39497dd4f0dea72a1edfc4df99153539 SHA512 0e10366739839d792ac8866b2dc5f7a2d352b04f896ffa1c1922b215e8907f6fb9300ec955d5ed5f8c19d0714720b7f20569177cd1a9f2c98fbd27e42a9bd3f5
-EBUILD pykka-3.0.2.ebuild 578 BLAKE2B 0121c6c643470a953c255bd4ef29b3e32965aa0ee3f8367433b83e8e0407048e5752e20cd92eede3ab642a887a00fa7fc3fd0c7d026c374407e0f625bca9a5c2 SHA512 7310b5513d859cfdc3885f3a0b74dcea3ce5e522961915c24b226f70110475ccc3e7c5630161d154f527b938b1c430762f5c702da7584624cd53d45aaaa05fb0
-MISC metadata.xml 360 BLAKE2B 41f09dcec8c459e443b0dcb907f2997b5a2a558c897bed152978530429f6493d44a720dc61b23840d489037769f797da9295faffab86be143e2e8f5224fde226 SHA512 13717275dbab6fe660af9c44f6462b33d1122f60b954b18bd99efa83320820c166e3f2c6e0d81825819d3232945cc0d1d755e7ba24e1a046d78e658c1b2a02d2
+DIST pykka-3.1.1.gh.tar.gz 44312 BLAKE2B cb50f01e27ca7b6aec10b61fb41d59e1d4fec29b65595afbab1e931137ef35efe8860bab0ce3b7a6a30a44aa215deb237a4e13abc541c537dab062b7d14acf0d SHA512 0cb5ca7924f77d9d0ba8b2f288e2a635f7ce70ae49bd5f5ddf574f37f76252b575cb95898ab244d27b96090345bcbbe82bad1c97f5cca73fb8fffa707e553e55
+EBUILD pykka-3.1.1.ebuild 598 BLAKE2B d37ed434e7febcf4a1641d28f7c8fa5af3da020c94ee673a41aa5fcc1af6d6075382894eed724eda10e46b5308da9ee90f35094b5f7597e20a5ee297d5817006 SHA512 d8a30acd89c7db48e9a7aea28bf460f5c6b696d656965f64ce65c8f9b9ed67f84dd0ae74c09fdf4ba0d18839cbd4be50e69f7fe83a77abc58e4bdc738763cb12
+MISC metadata.xml 360 BLAKE2B 6a3cd04142f75ec9e5c91d91e2d267e618e9824ea8b9b6be452c77b22c7d2f29d41068848f32c4e03e85f90767d4a8c83d2064cd9e20dda4997194fcc1bb9e81 SHA512 1fef48dd8d3bc9397d4bbbc90a8a1a3db7f39a1e6795e9057d6bfcde6ada8f939b2589235b07824c15ee348c42f1ffb372a10d7a49741d7db57b542ce31c11e9
diff --git a/dev-python/pykka/metadata.xml b/dev-python/pykka/metadata.xml
index abd70e879547..f001f2e1068c 100644
--- a/dev-python/pykka/metadata.xml
+++ b/dev-python/pykka/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Pykka</remote-id>
+		<remote-id type="pypi">pykka</remote-id>
 		<remote-id type="github">jodal/pykka</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pykka/pykka-3.0.2.ebuild b/dev-python/pykka/pykka-3.0.2.ebuild
deleted file mode 100644
index c2c6981f6e79..000000000000
--- a/dev-python/pykka/pykka-3.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python implementation of the actor model"
-HOMEPAGE="
-	https://www.pykka.org/en/latest/
-	https://github.com/jodal/pykka/"
-SRC_URI="
-	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pykka/pykka-3.1.1.ebuild b/dev-python/pykka/pykka-3.1.1.ebuild
new file mode 100644
index 000000000000..03afb4608dbb
--- /dev/null
+++ b/dev-python/pykka/pykka-3.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="
+	https://pykka.org/en/latest/
+	https://github.com/jodal/pykka/
+	https://pypi.org/project/pykka/
+"
+SRC_URI="
+	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index e1ca3c60230b..613c6db696ac 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-8.3.8.tar.gz 36319 BLAKE2B 5251bd32549793a8d06b6180a3e4f4c20f23dbdfecc146eb877222995bcadcf8cf8343f99ad897fb3e00c0f455762f82f4e3d157c34be6f21b4f220e87b636a2 SHA512 b55d7cb28a94f19270bde7ff6a8d760ef9132c845aaa85340271e42af6987fcc919ba9b0ddaebb6da6c1ffe789aaf39c83d273f8adea88db58a9218577899924
 EBUILD pylama-8.3.8.ebuild 1006 BLAKE2B 3e2a3eada1fd7a44bdfcc1ea51c736922f3162ce5dffa00d11ff3dea366bd27b7f589de3e681618298c24ee31db7977ea2e8e9add35748790ce1104076eb7376 SHA512 2067b81d72b61bf61db5edf3c4a90615fb4d8b90a630f48a99f9fcc4b0a7bda3282f64dec22e3e854d7d1f943d20a0d7051e851413b151a47814bae1842e7d5d
-MISC metadata.xml 389 BLAKE2B 4320ff9500cf2ec3d896d0ae766fd5c850b72c773a1626df243904f779db7ab9c28c2db462ab90f72e99b1da96b1131d8da207f9e3d14766ef9c33fe92c4ca76 SHA512 024823ccef87858b76df67e12452882ba523cc05a09fc128d8fe943ac92dc45abd9f3912cf6232fe411874555eec205b2623419d9e0d3247bae7663fa3775894
+MISC metadata.xml 490 BLAKE2B 4c0dda4b057901937d4b6af02041edc0544e392ade5a3497de0d58ba5c1423332e6c1f0b289a3bbbdcccc1b45eedc01f158778e99f9a6f3911cb6b91d999519d SHA512 d3dc1fdaee046554de697e6aeb324910199ea9329a57ac89cebc96f2143e4d2482e31cadc5df16893fcd012058282f600fef676992d8dd55dba3f045f69bc52b
diff --git a/dev-python/pylama/metadata.xml b/dev-python/pylama/metadata.xml
index a7072d4c3652..5ea1c06f17d7 100644
--- a/dev-python/pylama/metadata.xml
+++ b/dev-python/pylama/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pylama</remote-id>
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index e9df54e6d93a..a86a5ff8f5a1 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,3 @@
-DIST pylast-4.5.0.tar.gz 40175 BLAKE2B 394a6329d0c7f03ae70cf7ee5e19e310d4fc4b70f86a6e8ed66ad93674465433ff7ab06cfbfa82fd33302a6d85b9fe582402c2166746e7853d1bada9de5f2449 SHA512 c885f0ea415c2a6b96454abdbcef0b61732a5253ddff45a03d85a2b7d733f6bff47d1806576e4acc6d07763e404985e5c35341e37b88d586d1cbec811d984551
 DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
-EBUILD pylast-4.5.0.ebuild 683 BLAKE2B 41b5623adf6db0567a14df28c62e07853511fe1f15fbe9c14525ba79a1ed446677b1ecffe7a467cf7b9b4d01b44d59b626bc62e3a94107bb865cf234b0f4327f SHA512 d6b1fb63794ed32b2e47ced7b2ac5f74a2f31b505d37171d97982a765dbb51f39df6a1be81feed48111046b0a40ed7619efe1edd89c41f415853db33bf5b5cf3
-EBUILD pylast-5.0.0.ebuild 779 BLAKE2B fbd6631b6feec17f0486fb4ed46e9e82649fb7ad3d38b30224b829aeedebc46a8f8a7df6561154ae79b5404521b9686adc8b66ed4c20c1ae681c27c9e7217b7c SHA512 d07bbab0471185d4487c2e3b2f0972c6e7244d41de2723d71ac590ed6c2b5107c47f373007f7da0f20460aa11f92bbde65ab4c3179df0529c476792f38928828
+EBUILD pylast-5.0.0.ebuild 773 BLAKE2B 4689bd56b0a492bbe89a755d170fd26ac093eba8e6188e82ccea5beee9ce01826c1805700d5a1d621d920efb31195c1b0d6ec437a32669da33be7cb736078012 SHA512 289710ed082564ca66a389bb2ecd226172a94b1431e4fd9209759fb58ca2c1032087d45aa1340e975c138254599de524dcf979a714e0a0288a7ae38558f91dfe
 MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
diff --git a/dev-python/pylast/pylast-4.5.0.ebuild b/dev-python/pylast/pylast-4.5.0.ebuild
deleted file mode 100644
index 0426b15a9d3b..000000000000
--- a/dev-python/pylast/pylast-4.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/flaky[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pylast/pylast-5.0.0.ebuild b/dev-python/pylast/pylast-5.0.0.ebuild
index 12fa00ca35a3..93bf1e071624 100644
--- a/dev-python/pylast/pylast-5.0.0.ebuild
+++ b/dev-python/pylast/pylast-5.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 9a181587619f..2645742108c3 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,4 +1,6 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
+AUX pylibmc-1.6.1-py311.patch 918 BLAKE2B dcc8b3a8c8cc6d7a2b8de79af116ed55171a968b6a8da89b96041e70232e239ff6eacb3a4ad8794fc951e34e71e9b142adfc8ddb689336d559f989e219e1a936 SHA512 fedb103ee4d392f21c4b8f4ce7d3fafe8e3c0d9aa8b2ce464cae5e7553fc3a9ec1fb82d085106faeca448df54d3636ec38c296682d9e49b097c9bd06e76a02b1
+DIST pylibmc-1.6.1-no-nose.patch 26090 BLAKE2B 160e5b58107dcea0354462370eeeb12739c7fd1549e1c64ddf1fe2451654e50c1408505985eb6a7150ce60185bc7acebba7a20c6444615bef8c6991debfba4cc SHA512 84fb37505def84caaacb1343032d18bd644f5072e6ce7a2d6e88bc33bd2dedc8b303f4cf2a9b57b32c3c4b8e01bef1bebcc09ecb525568c928aed326bee2cace
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.6.1-r2.ebuild 1392 BLAKE2B adc327ca0d47b2b1e37016c8631bb218b9fcba3f23db646a524aaff1c647145fc1b942747283d8e9fd7a3a220208e63edc5f49b774286e314dfdd388aef5cd13 SHA512 b7e322135e6025ae88ea861360b6c5ef1412fd266dacfd294c055ad925cfddd0ffe03948aeeede0b75367fbdc29133e0906a13b578caf94dfd756e8afafe62eb
+EBUILD pylibmc-1.6.1-r2.ebuild 1383 BLAKE2B 722b240fc8e21ef8ad8007d788937c130159080dbc4f6da82a7b7fffc620c9f9945d2c6f330515b17eaf3124738386ee91c8a159743450f711ba281697baab1f SHA512 5b7fbaa7198f7a0eac192607d51a118ab3a1251f017c303ee0f92743b02e83fdc34a795573d821baeda02685a0a19ca02f9784f14c86b0ad67009ef8dd072e21
 MISC metadata.xml 367 BLAKE2B fd37f3e072661e616dcfabb2054827a7b1c3830e555cb6fa461e93dadcd39ab1856c0ad4cbe03be85924889b97ba7cc88da651011a4b1c5622fcd950339f7e2d SHA512 33977c15a726c2039221bcbd282244c240013922bd4f1398e75f01ebd68dd0f8574ac890ddb578cb633a89b52584927800f86dcb4a1eb0ab27b165c38b9a91e6
diff --git a/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
new file mode 100644
index 000000000000..c687f90fb658
--- /dev/null
+++ b/dev-python/pylibmc/files/pylibmc-1.6.1-py311.patch
@@ -0,0 +1,29 @@
+From 22854a4ba8f7e926099219c107104723089bcad8 Mon Sep 17 00:00:00 2001
+From: Ludvig Ericson <ludvig@lericson.se>
+Date: Mon, 29 Jun 2020 14:59:36 +0200
+Subject: [PATCH] =?UTF-8?q?2020:=20Do=20not=20pass=20=E2=80=98U=E2=80=99?=
+ =?UTF-8?q?=20flag=20to=20open?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 9bea257..89871ea 100644
+--- a/setup.py
++++ b/setup.py
+@@ -95,9 +95,9 @@ def append_env(L, e):
+         s.write(line + "\n")
+     sys.exit(0)
+ 
+-with open("README.rst", "U", encoding="utf-8") as r:
++with open("README.rst", encoding="utf-8") as r:
+     readme_text = r.read()
+-with open("src/pylibmc-version.h", "U", encoding="utf-8") as r:
++with open("src/pylibmc-version.h", encoding="utf-8") as r:
+     version = r.read().strip().split("\"")[1]
+ 
+ setup(
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
index dd3d4aa2ac54..65a68720139f 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -12,41 +12,42 @@ DESCRIPTION="Libmemcached wrapper written as a Python extension"
 HOMEPAGE="
 	https://sendapatch.se/projects/pylibmc/
 	https://pypi.org/project/pylibmc/
-	https://github.com/lericson/pylibmc/"
-# One image is missing from the doc at PyPI
-# https://github.com/lericson/pylibmc/pull/221
-SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	https://github.com/lericson/pylibmc/
+"
+SRC_URI="
+	https://github.com/lericson/pylibmc/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+	https://github.com/lericson/pylibmc/pull/263.patch
+		-> ${P}-no-nose.patch
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
-RDEPEND=">=dev-libs/libmemcached-0.32"
-# Older sphinx versions fail to compile the doc
-# https://github.com/sphinx-doc/sphinx/issues/3266
-DEPEND="${RDEPEND}"
+DEPEND="
+	>=dev-libs/libmemcached-0.32
+"
+RDEPEND="
+	${DEPEND}
+"
 BDEPEND="
 	test? (
 		net-misc/memcached
-	)"
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/pylibmc-1.6.1-fix-test-failures-r1.patch"
+	"${FILESDIR}/pylibmc-1.6.1-py311.patch"
+	"${DISTDIR}/${P}-no-nose.patch"
 )
 
 distutils_enable_sphinx docs
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
-python_prepare_all() {
-	sed -e "/with-info=1/d" -i setup.cfg || die
-
-	# some amazon thing, expects to be in AWS
-	rm tests/test_autoconf.py || die
-	distutils-r1_python_prepare_all
-
-	# needed for docs
-	export PYLIBMC_DIR=.
-}
+# needed for docs
+export PYLIBMC_DIR=.
 
 src_test() {
 	local -x MEMCACHED_PORT=11219
@@ -55,3 +56,13 @@ src_test() {
 	distutils-r1_src_test
 	kill "$(<"${T}/m.pid")" || die
 }
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these require "AmazonElastiCache" running
+		tests/test_autoconf.py
+	)
+
+	epytest --doctest-modules --doctest-glob='doctests.txt' \
+		src/pylibmc tests
+}
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 2f9a27197283..7af408bc04fd 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,8 +1,10 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-DIST pylint-2.13.5.gh.tar.gz 1118551 BLAKE2B 70ee4254aa140aba16adfe67aeb896d9c455843dfa945d335b5ba48e85c9d2d8f057223bc74bd4c0c0bfa2d343a9f78e783705b885caaee6895fcddf7ce23ccb SHA512 e399239fbea58260b17f226dddb63f1e6a2f12cdd601a4e73913a169d23fe2b6085e776bf8144e2c5a555dfdc1b28a5818a4103969d504b638b6b41ee296d182
-DIST pylint-2.13.7.gh.tar.gz 1120083 BLAKE2B c45d6ec65c11d3682bf3279969f3e45b827b2bbcebbfeb05a31df3a93bb943bf9643a5d467c1e2eebf717577032571a48db1ce84e1c81d72000808ec302aaf1b SHA512 ec0b2ef565239ab3e577c5c2d22c1c8df8b8bb0858c34b6606f649484d69a25c1f51ca61a3da66833d9a713e8a686dc32b940e574650577bdcc4e13d76acc2e5
-DIST pylint-2.13.8.gh.tar.gz 1121081 BLAKE2B 06a0a5c3801318ca45073f04a631e0617b5803ce01fd3973fc96d350c38a988222d4b8b03f86c12c317f6f87db5b7b85d1c428373a17e51d1044b382a0d03c1d SHA512 8ab01a15da7d9b659aa11de3ee804e0ad54fefd549be468fe194f8ec66640f5ecbdeddec468c9fd76d1eea8006d60249b1abba59d5047774d22b7b461224695d
-EBUILD pylint-2.13.5.ebuild 2201 BLAKE2B b63bbce7df072dcb2092a09962aa1040ecd8631586f925550c7e83942d8c1dfad07763a099c4b1cb4862968ecc2f7297dc4bf0eb3357a4ac140ff4748b7f6fb1 SHA512 02a543138358a50d7e068af511f48dfc5db2e41c514a274ddf08dd9e864dbb80818a90703082d747a3343b40b67ae6031dabd5cadc306c957b6eaacab9976aef
-EBUILD pylint-2.13.7.ebuild 2209 BLAKE2B 0127039c27fa8488bd52f2b3d2e1d52a05ac4ae1773254098ccb052797f2253d44449f9d7347f81131e8d25cb87b828e1f2d91a8381fc21ff13fea9e0477bb8f SHA512 c3b946fa2523f220278db8a915f4c6c047754e760920ed33bf76fbbeea7638c23096a05298046d1c1773be487ac05e2ebe6cd997396045306d2f083cab5ede2a
-EBUILD pylint-2.13.8.ebuild 2209 BLAKE2B 0127039c27fa8488bd52f2b3d2e1d52a05ac4ae1773254098ccb052797f2253d44449f9d7347f81131e8d25cb87b828e1f2d91a8381fc21ff13fea9e0477bb8f SHA512 c3b946fa2523f220278db8a915f4c6c047754e760920ed33bf76fbbeea7638c23096a05298046d1c1773be487ac05e2ebe6cd997396045306d2f083cab5ede2a
+DIST pylint-2.13.9.gh.tar.gz 1123216 BLAKE2B f80e88f565595b16bba650a009bfdd6d55efa65227898d145d4867c116c89c7ab5244c509382f0e9023404b4e46accb742334450ca7342394fb4d0abaccb8d03 SHA512 dcea90b1b1494d928f0b12dd2b50ee1d97a74efce18e0ef54ea02b52209a574977971e12db8f476edcf1bd646ca41c6a77bcf9a425c01af71bd29e54fd6c20b9
+DIST pylint-2.14.1.gh.tar.gz 1270750 BLAKE2B 120cc78c3d76ccb10f88c94b5528f1ed42730b49ac7daea4c1e65cd82fa2aea2c7d77a3a26dcb84201c69afeceb538cddf1ba740af308b586624ee3d40656d49 SHA512 4be985bb78e4b2bd65a195b95fdeb2a95c59c82db2446c9c365b11f0ba57e2a3234a41865071272cb054647a15e7e1a8b48d034ca656a3a44ca509648f258c13
+DIST pylint-2.14.2.gh.tar.gz 1273238 BLAKE2B c242d1686f34c1b7bdefea29a031f43dfa40de8cf33f9ab7c23c7278d2abe0df63de28693717aa68b45eeeb4a7d3b8bf442ab85181826eea2282454ba04381b5 SHA512 977b84164f87cf7cf98f761d4a4977526c7098aeef4eea4cf057d6884ff368bd7ef52e483c1eb623f026343c8c6dcd961dd5301db8dd1ac9ba2ef4edb0c517fe
+DIST pylint-2.14.3.gh.tar.gz 1274008 BLAKE2B 0303cb43a4bb93419c0823dc17eb9f43a53ff1b38b0dfda185d785805839baef60b155220f6cecd43615ef783b005a44139a333df2961f736c76c513c2d6b757 SHA512 a2fd2ab2589e01188b8f587363cafba430626fffd20360cb4353a3d5a9fc5402103e74d2e4671e3d25526ed9625f77a49fc27bb0af931478f4c38ad99cf3c25a
+EBUILD pylint-2.13.9.ebuild 2272 BLAKE2B 3f4323a6c4c4571c8fbaeec14046cb290cdfbd41af303c44d8b11bd0e3dca19743ebe166c2c1163ceaeb184bf4bbc50a2fe5f66272f2706cccb0ef973defc492 SHA512 8050139759ca4109aa412b61995cdb7c13a7b23dc37cca9be22692498198253f71e178d6496361d6208ef1f824ec61857429e4e60cc8c1d8d553f4cb0968bd7b
+EBUILD pylint-2.14.1.ebuild 2260 BLAKE2B 6ab54d876288e7c8911686f5c9b5edfde88a231767287e9e7682d5a09cb0d1281afec3c0a9fd5cf81b440e975f52f8fa46d54aa17a73622b231ed924fa1a4c15 SHA512 04fa0d3689363653e2fa622479061df9819d03935d948b8fc8f4ef410b26039a47e164eab1aef3e19bd02504b0a6c385d86a41733f65c8d81a8bd088d080dc74
+EBUILD pylint-2.14.2.ebuild 2260 BLAKE2B 09777087ce75264713a36908d5182f09c52776b0f6a7ba2a8fd09b6a8aaba5a648a657e10b040aff68d544a1247e6408a8a650771546c7f1969206e4e264a389 SHA512 f5c1bc119cf5a6c6eb7f843ab01dd4d553a46c3ecfd3dec43315e74c375091c4e0cb01045c61138f5750ca0e6ae06860af6e29664862bb31973a2fce7a8dcff4
+EBUILD pylint-2.14.3.ebuild 2260 BLAKE2B 09777087ce75264713a36908d5182f09c52776b0f6a7ba2a8fd09b6a8aaba5a648a657e10b040aff68d544a1247e6408a8a650771546c7f1969206e4e264a389 SHA512 f5c1bc119cf5a6c6eb7f843ab01dd4d553a46c3ecfd3dec43315e74c375091c4e0cb01045c61138f5750ca0e6ae06860af6e29664862bb31973a2fce7a8dcff4
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.13.5.ebuild b/dev-python/pylint/pylint-2.13.5.ebuild
deleted file mode 100644
index 3589b92787e3..000000000000
--- a/dev-python/pylint/pylint-2.13.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	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"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${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
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# 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.13.7.ebuild b/dev-python/pylint/pylint-2.13.7.ebuild
deleted file mode 100644
index 899511134c63..000000000000
--- a/dev-python/pylint/pylint-2.13.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	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"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${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
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# 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.13.8.ebuild b/dev-python/pylint/pylint-2.13.8.ebuild
deleted file mode 100644
index 899511134c63..000000000000
--- a/dev-python/pylint/pylint-2.13.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	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"
-
-# Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.11.3[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${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
-
-		# TODO
-		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
-		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
-	)
-	# 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.13.9.ebuild b/dev-python/pylint/pylint-2.13.9.ebuild
new file mode 100644
index 000000000000..ac80bff11993
--- /dev/null
+++ b/dev-python/pylint/pylint-2.13.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	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 ~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
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.5[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${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
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+	)
+	# 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.14.1.ebuild b/dev-python/pylint/pylint-2.14.1.ebuild
new file mode 100644
index 000000000000..9dd158928f4a
--- /dev/null
+++ b/dev-python/pylint/pylint-2.14.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	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 ~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
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.5[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+	)
+	epytest
+}
+
+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.14.2.ebuild b/dev-python/pylint/pylint-2.14.2.ebuild
new file mode 100644
index 000000000000..9001edad3fc2
--- /dev/null
+++ b/dev-python/pylint/pylint-2.14.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	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 ~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
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.6[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+	)
+	epytest
+}
+
+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.14.3.ebuild b/dev-python/pylint/pylint-2.14.3.ebuild
new file mode 100644
index 000000000000..9001edad3fc2
--- /dev/null
+++ b/dev-python/pylint/pylint-2.14.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="
+	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 ~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
+# Adjust dep bounds!
+RDEPEND="
+	<dev-python/astroid-2.12[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.11.6[${PYTHON_USEDEP}]
+	>=dev-python/dill-0.2[${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.8[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	test? (
+		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	rm -rf pylint || die
+
+	local EPYTEST_DESELECT=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+
+		# TODO
+		'tests/test_functional.py::test_functional[forgotten_debug_statement_py37]'
+		'tests/test_functional.py::test_functional[dataclass_with_field]'
+		'tests/test_functional.py::test_functional[no_name_in_module]'
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_error_msg
+		tests/checkers/unittest_typecheck.py::TestTypeChecker::test_nomember_on_c_extension_info_msg
+		tests/config/pylint_config/test_run_pylint_config.py::test_invocation_of_pylint_config
+	)
+	epytest
+}
+
+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/pylru/Manifest b/dev-python/pylru/Manifest
index cfab303d8563..47c9a4704798 100644
--- a/dev-python/pylru/Manifest
+++ b/dev-python/pylru/Manifest
@@ -1,5 +1,3 @@
-DIST pylru-1.2.0.tar.gz 18533 BLAKE2B 6cebc3ecc91050bdf3c8f2721a7ee1768fb48692567eb2e8603e0d28fbfd01634087bf8fda0c0c3f8c9af377195623d2689f9eb59a3ad781ccfc5f58b362a734 SHA512 d4b247cb3740c2f94f4f41bd9affbb87db4e2ec8ff566978d130d08fee9df6109c13b64f22536903bf8be3ea60d4b105dd969d1156a279115b6bfedb817cdbf5
 DIST pylru-1.2.1.tar.gz 16923 BLAKE2B fce05a78d9b503e8ec51ba76007aa16ba013099f56fed990027d3adb16155e01bfb30164d9cb248051eeef8c8cf00d9f76521a69207581c53837374e4a4fb903 SHA512 06549ec128d13e00cf95638775d962c3feb25450eb26dd5cbd1275350768a3de895049b438191a9968926f4de37624e7a8774edd58b6007c040bf75a4450d727
-EBUILD pylru-1.2.0.ebuild 461 BLAKE2B add68c55187cd6c1c53b4ed9f527befbaf23a6bcea2964b8f92e7da298f01fa905c2196b24082947d308287c4fb09730a92864864471bdefa9e2ff2d13d24e8a SHA512 5e442e006bb8c9f2d954ad20c9fce8c72624cfa25a5b9362f782a97180b60cee160ab0b3f5885652bb349f8defa7e3ebc107ae46a1e0a61cba56b0386a426957
-EBUILD pylru-1.2.1.ebuild 492 BLAKE2B 53c810397b41bead7dbc6192c44b3ea2f763b6699902b00d26a32339abd1e0195848ec7776df30eff24d6e536f5231171ab76926ccf3b03ed2f1d2c0c445df6c SHA512 6eeb7891179cc2aefa0b2dceee4c7b7c53c78793fb4082a6d8430a39013e3ac4e379e1c432649bb73856d0421983c3cc04119642f9e69268770b34efce836cf7
+EBUILD pylru-1.2.1.ebuild 492 BLAKE2B ed9ff954c2fe48ecefac5f99a148f121a411912f9cb7ac854d02d3fd830828ab160d4b373a557f43d48b5b8805bc4f5a2dcc033f0ac2ea9a9587cb3a2f33b222 SHA512 494d0c9496024368f608f494896eadc1c9f8121acf18bb82bdb529b5deb4f29a2c502df237217f5c63f7649c6f913a884382907c08ce5353c38f1fce6e344fce
 MISC metadata.xml 370 BLAKE2B e6a3684cb69f05e9385b65af56db4328c9c29686a936338e01faca1c2cffdb8a7c979e2639236b3008b158a0a26672a5d6d0d0f2c94d6ee4efe3d9f19a17e659 SHA512 f7d16184fe57f25e6fd32f62b5d6a8dd4a2f89ab911c8bdd8ee3aaca678a2d97425ee928031f9cfa7cbadb3472d659f4bde8c3b2cb2b0af0afbaa825a2ea2c5c
diff --git a/dev-python/pylru/pylru-1.2.0.ebuild b/dev-python/pylru/pylru-1.2.0.ebuild
deleted file mode 100644
index f22b1b0e9eb6..000000000000
--- a/dev-python/pylru/pylru-1.2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A least recently used (LRU) cache for Python"
-HOMEPAGE="https://github.com/jlhutch/pylru"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-python_test() {
-	"${EPYTHON}" test.py || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pylru/pylru-1.2.1.ebuild b/dev-python/pylru/pylru-1.2.1.ebuild
index a305db0736a8..e50989ea11d5 100644
--- a/dev-python/pylru/pylru-1.2.1.ebuild
+++ b/dev-python/pylru/pylru-1.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A least recently used (LRU) cache for Python"
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index b77f64a0cb45..ead179130d73 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -1,3 +1,3 @@
 DIST pymad-0.10.tar.gz 26815 BLAKE2B df694f1fcc7b2c6d0d0aa064b60d061ade2240085867b6a12b3ed63a93cbcac20ac40b3929fbf5b8d9c7b6dbc52883130d02b309ce7690addda6c78813ca2847 SHA512 68a7c93031d174ab50dfa406eec4166be2158d39c4231baee18b7d9c879692376cbf491bcd3e5747e65c496b07a40d1597532551aedcdf05d0fa46f6e185a3d8
-EBUILD pymad-0.10-r1.ebuild 573 BLAKE2B 8374d2baa09eb088aaa4bcb85df56c0bc8131eac5c1517a9cc22582f93cb2561dd63f591a2184c8a8cb128ab69eef18aa4684c9b026afd72b7a42c10faba9081 SHA512 660c8e5cfa778e78f6abdbc271bdd88c6e4eb05b0b770143486aca490e4e07d6fc078f05c0413ee14fa48c684a287ecc9d391e8feaf9e07546bc8570d3f89957
+EBUILD pymad-0.10-r1.ebuild 572 BLAKE2B d9b374632226c4cc82d77a6758fa0126ffe2248d43bdc03e294a3a94441728a67e78db81b1096b3b636b318e1d44d39b96733caa438cde0817c7bebbe5b9d717 SHA512 8af9e84914e138525e0b484bf61519ed5e1ca062e03034db30e887d18ddf2513723c9a0d2092d0d95bd6b2962aeb0bb36952aea9a7c50b58e85a245faa8002a6
 MISC metadata.xml 361 BLAKE2B 7fe46dc6890e49f46abd33d87400a260162295a0b386e9ee20103cbe2165b820bf4b39253634bc12dfad6ecd4b6c9b2e88ed791427ddc50c75f819b5536f28a4 SHA512 d0cd267049f6cd4e697d51bdbd9b1e93570b0a4517f00201a10ade1503b95f7a6b5fb91a8c72ddcf7ace18622ca945e853509a0253172c56cdff0d93ab9c4ab2
diff --git a/dev-python/pymad/pymad-0.10-r1.ebuild b/dev-python/pymad/pymad-0.10-r1.ebuild
index 0708a1057149..e17b556f8b25 100644
--- a/dev-python/pymad/pymad-0.10-r1.ebuild
+++ b/dev-python/pymad/pymad-0.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 DEPEND="media-libs/libmad"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 0f264097e263..70e4bac7ff2b 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,5 @@
-DIST pymdown-extensions-9.3.tar.gz 1009329 BLAKE2B 6efe25ef0ef81d7e6b494b94e54c41c8e99cab517cadaba09d073996aef4b35c79e88386dd9ccd8199b3c4c6e105a1c428aa4b96069a6d1c44bf0296cd586b7c SHA512 8dec73e94d159b10f644268ed757b3326f1ee5d2a63e8ea806a700898bdfd82542c1791db0d6fcb29deee913276b23bdb5966511e9863eed332ab760d194c5b5
 DIST pymdown-extensions-9.4.gh.tar.gz 1009043 BLAKE2B af5d5af52861b80e859ec11444915613d752cc60ba7a1f179d5dbd242837c4fd5d5ad3d3e66a583c53567fe4feab4a6fbf3f5a96032e57c24185affcd98b0f52 SHA512 8b7b9dcb0d61a63eac1477cb8dbd0917c8e4dd35b98298b6d15ee744fd184747364f5e70de0cfe7959223df77e604f5d195d0d305932e1176c351a1fe1a036cb
-EBUILD pymdown-extensions-9.3.ebuild 1228 BLAKE2B 72f502f5e9f7dcb4f7c7e824fabd25e6f33638c817185955a50f60e0d4fd4f53bcd5bed9a31bf087bbd8d2f1c47bdb21baa4432f4ca66995220686bdc13f36e7 SHA512 c31c4a466b3c2ba002f6e8fcedf2f58da4a7db205e05dd21291d6434a2e2103a0c9fff331fea5efdf2b204c2ba5c5927465e21cacd1ed841e0b64866d1cdcb91
-EBUILD pymdown-extensions-9.4.ebuild 1246 BLAKE2B e7fc96a1c6ba0e9039405c449fda51941ae9f6e56fa255f4e2c98bb6f54604f7146fa0a9ca78bfb2be1d01451de16be34ace3f26e83bf8425e1a28e6c084b9b3 SHA512 b3954d95898e757e6f3491313f71c5b655c3237ae586faff6fa102460e8dfe925834bc3cd902645924e71fb9cff6b62d92e02b8f61abf64243f0696a4bf7d6aa
+DIST pymdown-extensions-9.5.gh.tar.gz 1004601 BLAKE2B 8950ca104edf476e5557eab1effd9ad4e879f2ef58823e1385b5ee000e704b260b20f758578021d4c03492e675027f079363da49429938221fb1c109c9e1fe2d SHA512 b640947b97be4f7592b86125c7de0f36c34052e77103f7d16818b8fc2794cc28d3b7baef84d99434ca1b2810fbe19bc2fc0d2430b8504425cca71677d9c8753c
+EBUILD pymdown-extensions-9.4.ebuild 1244 BLAKE2B 4527630ef9f66cd2c708ee3e32ab8cbc8909575271cd0260dc15442cd168bf7e666124c0e39e841a27034d2481d2306a14a507ad560d96b0b58913832640f138 SHA512 048ec6f01d2d2ec9152dde5badbd50d86624a999777aee58ab53b9ad2fea041b3090404be8ca02c2410275577344e1b905cc87b382f88072bd8a0635c702751f
+EBUILD pymdown-extensions-9.5.ebuild 1246 BLAKE2B 472c29295f1edb37df3115e7773a976bf19c56d170a5a732483aeadbfefbfb11060a89fb770c789fb997e3bdca0fd485d70ce8be273914a3737b33d13af6c076 SHA512 c57ca85ad7c9a7f31fd274be1d1935c356515670d33f4027c98968a30093c991891d8bbb72374e88a2694f6b65166a86768256872e62b0214007e0c3d702ace7
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
deleted file mode 100644
index 99f31b5e2689..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-material
-	dev-python/pymdown-lexers
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-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/markdown-3.2[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# 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/pymdown-extensions/pymdown-extensions-9.4.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild
index 8890af7b8a82..b8b9a0961375 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
new file mode 100644
index 000000000000..93c979c06ae4
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-9.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions/
+	https://pypi.org/project/pymdown-extensions/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# 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/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index 8caf1574b65d..59e6c89081e9 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
-DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
-EBUILD pymdown-lexers-0_pre20210308.ebuild 563 BLAKE2B 6909927f327e89d35069e74752ef5ee33c8a4fc41c0559ac3fb54db95350e8fa1475a92bd5f106fa3bc9e0a2f759d517ee6590d9533a6e8d928f5e7418a0459d SHA512 fa139c3d2adb752b7bbc7a925d9eb495df809c316f35d536ff9aca83eeb0c9df125fa3d0c4f5ba7b6144183d77f0efc661fb8a6a663e2ad6cde5b0124ebc25c5
+DIST pymdown-lexers-0_pre20210902.tar.gz 2998 BLAKE2B cd9793c247abd7ac2ff2a8104f1b43ef034a8da14fa27c86c59794b7f53c22e75820a0033673e44824f98b50a4e9af446538428252a4064223e5ad35bdeac23a SHA512 c411f935ca0fedbdd0547c2c78d2292d8a07469f90b401d29fc1c2cc1eb899fde865a5eefa253eade03dc139af6188e0b655b8924465238ce9a53cd636eb5b53
+EBUILD pymdown-lexers-0_pre20210902.ebuild 593 BLAKE2B 7819bd05e3a2f3390bb5941af1b53b8681a6700c2fd829ef775d6520a04f69121c5f8917f374c24f292e51761d18049492f61a676f543ee506aa94d78855dfdb SHA512 ed6f03024a5bed4b5e1daa5253d48d39f493156c324428243bd94fc87f86ba6405a5ba12045cb1a1ac6909a91b63340d34399673d67816aacabcaf539a445e8b
 MISC metadata.xml 642 BLAKE2B 15a30cfe9ed3e554cb573e57d6306ea638265800d553d13574ed475b33508d6f28733462f3ffc710806ed3f88c4fba8e5ea5b9b0a3f93d8d13bdb08744cf5abf SHA512 b572d550e2c28bc51128f01dc506eee21ea4c0128895679b5fca69a185606eb4d7d41c22c9af848e4d9a765c3b0ca1691a6049fe5eb71deeec3a9bd2e5de9f81
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
deleted file mode 100644
index d7e3f44fd5b5..000000000000
--- a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210308.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-COMMIT="84dc78c7692720bd614209124c3e8af65678532a"
-
-DESCRIPTION="Additional lexers for use in Pygments"
-HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.ebuild
new file mode 100644
index 000000000000..150d59192a6b
--- /dev/null
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20210902.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+COMMIT="4cd030ad37bedff37345b37c1f1cd118530429ed"
+
+DESCRIPTION="Additional lexers for use in Pygments"
+HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index f89b1604af20..473a7ec2a075 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
 DIST pymetar-1.4.tar.gz 3162928 BLAKE2B b92686204e84070722b3351ce04c1e65e3b47c7802767fbdb95027bcaea566518e61ac4c3e02dd0345c6672a87e2d50239a679dd7db426f7fa183023357763d3 SHA512 d5c5d382c68ffacefe07d63239f3b56984bf2becef922c945b0014a210ddf9ce1f96f99028e0ec9e649f70f6262925a836dbeb83309407aa2c4ddb4769db3dbd
-EBUILD pymetar-1.4.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
-MISC metadata.xml 1036 BLAKE2B 67594afc8ff3a4b74b89d55a22e2493e0e99e46e92909140317004ce83e37b6f6c864b6d7a58683f8e0eaa9557159e8f6ce7c07969893db8ee6d116904997f51 SHA512 3ea100f741d9635d5d512f91d1ab1be74910f40330da6ec7f2225e09ac8b53cb0b659d1d66f0f585ab3d6b8a2e1ceb6e9890f84d7bde20f01739dbc9656e0232
+EBUILD pymetar-1.4-r1.ebuild 566 BLAKE2B d1de4abc0b299422f4b31add1eef9531c9be8207abdde6fe9b6797b1b820699e4e70ab6f7c7d52e194d36ddc4c14ca935b83d3085e79f8de39744919d4cdfcd2 SHA512 4ec737ebe9a39c30ebd18010e75ab278fe571f28c948843c0679061d2f4a083e2696f8e311558ebf2e55d6d2f6acadfc0f6c660003547e8bb472e2c18cbb5af8
+MISC metadata.xml 1092 BLAKE2B 33e3f517b7f3451e463f2ac4a3bfbf0e6491e4e8990695dfb6dd9c0e9bdd823582822ba5142c2c4e67d7e6fc9a6162cea5b6e22cd62103fa16ccaf146e99763c SHA512 4a658b23fcbe07fb83a67d87c2a99254aa7a5957a53737e6af615aa8bfbc0db2a680d5f8f1cf81ce1c3c93875002fc50cbfa557978570c7ce99026258d9f7603
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 86d9aa756992..7d530b629b05 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -17,6 +17,7 @@ report. Documentation and a small example app are inside the tarball.
 ンはtarballファイルの中です。
 </longdescription>
 	<upstream>
+		<remote-id type="github">klausman/pymetar</remote-id>
 		<remote-id type="pypi">pymetar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pymetar/pymetar-1.4-r1.ebuild b/dev-python/pymetar/pymetar-1.4-r1.ebuild
new file mode 100644
index 000000000000..021d705b47e9
--- /dev/null
+++ b/dev-python/pymetar/pymetar-1.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
+HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
+SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	dodoc "${S}/README.md"
+	dodoc "${S}/THANKS"
+	doman "${S}/pymetar.1"
+
+	distutils-r1_src_install
+}
diff --git a/dev-python/pymetar/pymetar-1.4.ebuild b/dev-python/pymetar/pymetar-1.4.ebuild
deleted file mode 100644
index 51894f79ee8d..000000000000
--- a/dev-python/pymetar/pymetar-1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Downloads and decodes to the weather report for a given station ID"
-HOMEPAGE="https://www.schwarzvogel.de/software/pymetar/"
-SRC_URI="https://www.schwarzvogel.de/pkgs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	dodoc "${S}/README.md"
-	dodoc "${S}/THANKS"
-	doman "${S}/pymetar.1"
-	python_foreach_impl distutils-r1_python_install
-}
diff --git a/dev-python/pymilter/Manifest b/dev-python/pymilter/Manifest
index c94d833bc858..65b0531bc6e4 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,3 +1,3 @@
 DIST pymilter-1.0.4.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 EBUILD pymilter-1.0.4-r2.ebuild 617 BLAKE2B 8318f0f8c532175ee9c4c1417942019ee44b9253373e4083d2952db3342f62d9ba3bd8a525ea69d23eda458da970b2657b5c03a4572357db54457524556fb36b SHA512 85c107d27b40d4ce1730875e3567606d482916630d4147e21ac2e3760d65675951879862d3de06f852dff096e48b6000b2eb8cf0def15b2bba6ea33b338581db
-MISC metadata.xml 776 BLAKE2B ade1c407dcad79191c6ab02df2a369d38cbaec3757e9cd0da85d102ab916d51a80534c3bd07543f0f5a0cc0fda3069f0b0100c93bc3c470c39048a62acc3c6b0 SHA512 06ed5a5c5f91416ed6ca9daebbc78a300e35070133401166c63ec9f5179beba2b98f53345ce6dfc254d95d7ea6cd1cc32a15e3ad66ebb54adb1677ff5c9bd10a
+MISC metadata.xml 781 BLAKE2B 99f1de330652ceb0c2032430a6ae102a23e3c1eb908e1a6570c046c98524f77aa7cd0c1a91f3a110b56a8ee5f8af5d11b6a4d9c78bdbc43e26a462fda19722aa SHA512 9acd45710b1e5bc3b4e092962227399749e959ba7499712365513a7d4689ea033b89ccd110c5a28cab84fbe980bdb830743c4095a3d08a7e8ea22a9d1cb74db2
diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index 378ef7571179..a68143195461 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -5,9 +5,9 @@
 		<email>gentoo@seichter.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
 		A python extension module to enable python scripts to attach
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index ba68287aea9d..4bccd86d451a 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,3 +1,3 @@
 DIST pymountboot-0.2.3.tar.gz 4065 BLAKE2B 81ef6c967a2e8eaa76155446e0c59208ee10e5e3b40fbe9d910d5e4faf3ac1963146ef1df634c4795b56e709b90fb92edb57916586c8a1e5fa14ad92e1721f42 SHA512 fee4c8444b89ff0375c75eb44ec396d1c1e65d4bb08ff230ae0fdb1f822115ed44bf9904c284d3623768df0b4041ef7ab4cf9717596148d3df76badd0a3aa92a
-EBUILD pymountboot-0.2.3-r1.ebuild 501 BLAKE2B 04fe096220bfab780fac9112044ca88ca8b359d57a5a6c3b68034e9c21b659e88e21e63927fade7628c01bb1d56f782a86b4f47d95df62210a4031d20b1706ea SHA512 0d1badc968d9988ce7a6eee08a19869b0a953a0ed1576a8d368df6929e76ac6cb8642764f04df05046408716e12dfaa5fb455ab37584123469f3acffbef038fc
+EBUILD pymountboot-0.2.3-r1.ebuild 508 BLAKE2B da6d742638ae235247272198fd90444b9ff7cea57b7db9f0d421425e2b9306964dec98fe28a2f4fd1d5855bfc6826582fb95b4e7d2c0ffd03db255fab46e05f1 SHA512 810daa34c82c0c9ce14620cddc40a1c00bc259c09a4ba3882384f6d2ad61d92baf3e86a0e4f9a40a4939ebdee85274d248594e019939885b54a9f6f4036b43e3
 MISC metadata.xml 534 BLAKE2B 11562644ad15b24e6583a26cc616a04ef0000d24a90bb5b6c357b1094819126da2cc14eb77ce720efbdfcecb3bd2fd1caf6e1cfd560a9979a7d6356a73d4e625 SHA512 ba2416007b2b6ecb418081153a6ee9e2fa5bb79c64ccd6607e0679a3e2575eea529f48e655cbfc458b3c892e82fd14d02db1d4facad362fb63338eb977794486
diff --git a/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild b/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
index a8e1dc28c414..2235c15658dd 100644
--- a/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND=">=sys-apps/util-linux-2.20"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
deleted file mode 100644
index 2d250e19db92..000000000000
--- a/dev-python/pymssql/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pymssql-2.2.1-clock_gettime.patch 882 BLAKE2B 946af94874afe840ba4a44015321bc539695100bc9a73b5ffc0c5155c34adc8820eed0447261ce6bf8b404b16336b56b16d77c7281db1eae0f680808aabbe9b1 SHA512 27fed1a9b0b8f8fdad6a744da1c6c46637c9a1a755fb0cb6ec5b025314e5058365377828b9cebf19cb31f0dd59c4a4d500951a7ff32a1da4c08f1c85633f7043
-DIST pymssql-2.2.3.tar.gz 170134 BLAKE2B ed7d6d289b67c5ed76d737d4aec3a6731a94a2cc6bed445e526d62c4f7e9e26fe0e443846727895dd9fc396678d3ee99f021b2b365df14680817b8b8c130e5fa SHA512 10b9b976c7bfaa4c8433e08d256a580354181d41b08b1ced2648f8b4f864d1c83ee46a2d240f394d2c87cd4b494ccd51c0adf923e88de41c4cab30f2a0bae2d9
-EBUILD pymssql-2.2.3.ebuild 894 BLAKE2B f75949177d19f1b09101a786fc1e27679baea6725409b9e592b004bef46346d005e6f79cf77711569abcada985c36e80019f1fb2cb205ce968b87f7e2f1c19ae SHA512 508fa885fe1dba8ad7d6f7622854e8dcf983adc4824ceb36b88a71cd8569182b3629ec7a6f68a33786ab839c60a72be34c07551388f6e234f4b3c3b0dba236e9
-MISC metadata.xml 288 BLAKE2B 8ff1d6c61a36fc16df61bf7d80a7db3ad25dfc2d48506d78da521b567c9080d5fab50b59a5e637dcc7fb0c50b0758d651b31f9b4c304986908c166c1d041fa48 SHA512 cd670f008a714831f9cb7ccbe7ce9db8cee928c8ad5ae42fda3b8cf0dce3077eecbff97b42c8e2a9610aef9375805614a57d4b0ffc03b4ffd299f72dbf7a680f
diff --git a/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch b/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch
deleted file mode 100644
index 76d07e27db24..000000000000
--- a/dev-python/pymssql/files/pymssql-2.2.1-clock_gettime.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d130cacf5be53b4c15bb64787d82b1225b1485e7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 17 Apr 2021 13:10:34 +0200
-Subject: [PATCH] Check for clock_gettime() only when linking statically
-
-The extension module does not use clock_gettime() directly, so I presume
-it is only necessary when linking statically to FreeTDS.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 3ac434e..0295d01 100644
---- a/setup.py
-+++ b/setup.py
-@@ -95,7 +95,7 @@ if not WINDOWS:
- print("setup.py: include_dirs =>", include_dirs)
- print("setup.py: library_dirs =>", library_dirs)
- 
--if not WINDOWS:
-+if LINK_FREETDS_STATICALLY and not WINDOWS:
-     # check for clock_gettime, link with librt for glibc<2.17
-     from dev import ccompiler
-     compiler = ccompiler.new_compiler()
--- 
-2.31.1
-
diff --git a/dev-python/pymssql/metadata.xml b/dev-python/pymssql/metadata.xml
deleted file mode 100644
index aeeb1559a549..000000000000
--- a/dev-python/pymssql/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="sourceforge">pymssql</remote-id>
-		<remote-id type="pypi">pymssql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pymssql/pymssql-2.2.3.ebuild b/dev-python/pymssql/pymssql-2.2.3.ebuild
deleted file mode 100644
index 8fcca897c68b..000000000000
--- a/dev-python/pymssql/pymssql-2.2.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="Simple MSSQL python extension module"
-HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-# tests need a running instance of freetds
-RESTRICT="test"
-
-RDEPEND=">=dev-db/freetds-0.63[mssql]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# https://github.com/pymssql/pymssql/pull/708
-	"${FILESDIR}"/${PN}-2.2.1-clock_gettime.patch
-)
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export LINK_FREETDS_STATICALLY=no
-}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 8b7942406051..366ecd09b3cd 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1,3 @@
 DIST pynacl-1.5.0.gh.tar.gz 20350195 BLAKE2B 56ca4f47867cce6e22fdacb0558b5f901aae318b47bacfe5f4ad02d8923e1c86d0a2dd186ec29c820a786ab844d928479fca2d1472a8345b82be6bcbc67c3328 SHA512 905d3a7ce7f758b31a5d34471d5a0202fd2ba3d904a7ec59a158bcd1ea572fc87e29fc144c733d151cbaa48788c939808bc51d00acc973fe6d190eefdd3bfd59
-EBUILD pynacl-1.5.0.ebuild 880 BLAKE2B b3190da3bbf421eec0f084182b333b147b245a52a6727620d6ee9d848949f05b3a9a096ddb66690739a65858ae33d4da285c5cdfecd51ddaf764adda2751a04f SHA512 8fa3fc857cc7e589686352327f199dc1a5310be33723b059b51034ef6c8a1358a6898169a4e419a0bd947bf8296e79a12f33fcee1b16bfc603a9192955373c95
+EBUILD pynacl-1.5.0-r1.ebuild 926 BLAKE2B 8eee61d0c1d3c281d4e1ed8c52e894870f2b86d2249337a24ab15b3124a7f42d1ed1f53894634f6183433f2cb70837a0e75b14b84491477def5ffee50fa9be3b SHA512 4cfb693b5f1d0d8e7df4a8f2ba1c3a38a766cea74bae4653bfa45d2f5f6d4e4b073d796ed701375f2a8481a97fd56d7595395279acc082f0fc97ca25de213637
 MISC metadata.xml 674 BLAKE2B 676d246f5dac0a5f34c272e29b742a3a454e0ccef4a1ccecbacdfb652070c81bc145ee3d100f9c5e5ac025c183e80d937a4d9d8c6e0b5f26ac2c8225962681f0 SHA512 b5afb7450c64aace06974d98ce3cb172e2e4d7b343a0bcdf1b34505d3d9e180b774f359de1762a1b15127d23e5808289258e2333ab73f5cde04513015409c1a2
diff --git a/dev-python/pynacl/pynacl-1.5.0-r1.ebuild b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..b108506dab01
--- /dev/null
+++ b/dev-python/pynacl/pynacl-1.5.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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_compile() {
+	# For not using the bundled libsodium
+	local -x SODIUM_INSTALL=system
+	distutils-r1_src_compile
+}
diff --git a/dev-python/pynacl/pynacl-1.5.0.ebuild b/dev-python/pynacl/pynacl-1.5.0.ebuild
deleted file mode 100644
index 8c17681dfc74..000000000000
--- a/dev-python/pynacl/pynacl-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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/pyocr/Manifest b/dev-python/pyocr/Manifest
index 1d40841518af..d0837e3261c9 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,7 +1,5 @@
-DIST pyocr-0.8.1.tar.gz 67150 BLAKE2B d7f06db3b27c7352365713640c2421e5b73f54869d46c684d6b96d26c3d4c719c5daa1650e023f0cc5a17c0e51b4fb387ef8583ed501ab8369fc70d1c78e77bf SHA512 8a38f8175bd96de152cb0c34640fe0ca0bee369ecc455a1730a47f64d619901e48491fe0cf333073962f28a478f01ec71593881995e956589f60511b8636a32e
 DIST pyocr-0.8.2.tar.gz 67598 BLAKE2B b5cc1338b73f1147195dd094c332836e49189c3fff051de7e634d99de1135b07b1343af3d7c2dcb302e583a0b307c20aa2aaea4e878d6b2325a5aade7e438b23 SHA512 85100aa236bb2c862b5b67137267a657ae88b06eeb9bd1a895c18bfd7318641fa01ea3966499ccdfcc21480522e4996f0e12f2e8931bb455ade3adea428af17d
-DIST pyocr-0.8.tar.gz 65454 BLAKE2B 881353eebce22cf316cd4375cc8971e740a9a463216a5b49c07c7813340cfa1a9bdd869b84b4c26566deab1551884179ae2fe0184dec73880b716118367803cd SHA512 c8d811001b460a9004a80fbf570df3fe9a6af11e8ca0e90f23e5f3be54f6a54d859f4ad3db126a5216ea557ecb38ebd5dbece91810df2bf3e95f514c39649bce
-EBUILD pyocr-0.8.1.ebuild 805 BLAKE2B f80030efe0c0ef3a8056bb36cea9b833744379d1d1692d82477c6d1d83e9d986caa678fa5dc45ed2060a3204c43c1fc84118243ab729c56c1cc7f45cde250716 SHA512 f4e6282be89a90617477a83b76f14a00c57062655354eab2c0d9c9054a9a539a812d17e3bdd64c7ccc8dbf6d5be3f9eedb874baa7e3d06c070eaec1e04a718dc
+DIST pyocr-0.8.3.tar.gz 67625 BLAKE2B 86edfb08519eda73b29b57b57d495c0fa3bebe8b521d96ce4b644d534d2b32e92532e6275f595912c77093eaf0b1f767f08a130605e9b50142fddf77eb570c4d SHA512 aa4f4fcedd668010841d036899bb83bc0fca6499b29ce2f209e538fd3a2448dce2b52721f0b77bc402d9b3f62052af53e25e78780103172623dea1b367caeab1
 EBUILD pyocr-0.8.2.ebuild 837 BLAKE2B 7290b439e63c39784935ac6b2eabaaac133774c6a318ce691f7c25b994b76b87f5060f092fc48d4350084fef4dbc053c7aa8445f12ad16c36040eb2011013e27 SHA512 219c116479bc1751cdbcd9cf08a5378c75759ce3991fc503327515655bd190c56811dccee2232c34ed9559acbde76d718626faa7eacb667d4a2ab1dba685c139
-EBUILD pyocr-0.8.ebuild 804 BLAKE2B b0f48b6c0d42f8626d06730fbd5400b9bb3d4b5fc16683b8e99ed5f73f9ef1c4cd1af8ecccd820d43ef5036369c487e9d17e6fa4905bc6136ed597e2961c7778 SHA512 cef145c69319ff438fb778ae7a264e5582e70393df33d39a3a5e14ea082323ac8b8a18d6775ef00ff042ef39bc92a612405f77d4287984797e7460ccf2f4e8c5
+EBUILD pyocr-0.8.3.ebuild 886 BLAKE2B e70e101fca61e2c9c45acdef874cf025fd294e5ded5e893b819511624e13cabdd7d596220e8b1d9f8f1529fb7a7f260512c42829d0c2c67b38572cd67049418e SHA512 4f5b49d77b11df56a291ba573cb236b6958b955692a42da7f3fc329e0454966bac1057353127638b6ca4ff1839b1b518ac6f46a48e38f188951781e00aaef6fa
 MISC metadata.xml 1132 BLAKE2B 77ed8febe8322997eab2442bec13f5f4f7f101ecc3c410b62756687e8a24665388ecdc35a03a1728185f421e8dca3fb83eb3673807a9c7b600db27e7e30086cc SHA512 3307c040d15ee0ca37cae959e9824f0046f487a120b7b2b4c19fd1fc33b4bf1689796cbd0c6a6a2ff5f580910857abb7a3bcbe990d1384628445dc427a2c6500
diff --git a/dev-python/pyocr/pyocr-0.8.1.ebuild b/dev-python/pyocr/pyocr-0.8.1.ebuild
deleted file mode 100644
index b52028de434d..000000000000
--- a/dev-python/pyocr/pyocr-0.8.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuneiform +tesseract"
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-# (tests apparently do not require any backend installed)
-distutils_enable_tests unittest
-
-RDEPEND+="
-	cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )"
diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild
new file mode 100644
index 000000000000..da459ab474c5
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.8.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuneiform +tesseract"
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+# (tests apparently do not require any backend installed)
+distutils_enable_tests unittest
+
+RDEPEND+="
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyocr/pyocr-0.8.ebuild b/dev-python/pyocr/pyocr-0.8.ebuild
deleted file mode 100644
index 3be5b79808ce..000000000000
--- a/dev-python/pyocr/pyocr-0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuneiform +tesseract"
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-# (tests apparently do not require any backend installed)
-distutils_enable_tests unittest
-
-RDEPEND+="
-	cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 56feab344aac..df75dd962e88 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
+DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.tar.gz 452537 BLAKE2B 0d4d178a6bdf14dc3769dcb78c42bc894c0a443a6811fe9b25dedbc4a43debc06d1a1c32cb2a0df06fe16d1b2e78e65ef4f3ca8e9931be39384b3c8c813336de SHA512 e873807e757c19b59dbac2a0522fbb9c6e8af955d62bdcf06d8f3d792db3c9d2ce15372a6eefdca5b3f6756c35a85b5ff8d7dc1b6449bfd12c2b588576dd6f24
+EBUILD pyopencl-2022.1.5.ebuild 1526 BLAKE2B 9b68731abc39755ed821c519b707266dbcd70894d42e08b25a469eb7890e0bda52b0f2b903a52215aa0e2c58951e1c7c54f87b95be1c54aa0a6b0c86f67c9a91 SHA512 eb2efe2fb5d0ca6b85204e55256ba7f6eca721d68b96eeb421f465f1bff4332a10c587f3fe71d5dd72d2e5812f1c9ee4449432464f73d7cbeaca48c10d807124
 EBUILD pyopencl-2022.1.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
new file mode 100644
index 000000000000..dc2cb443735e
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
@@ -0,0 +1,57 @@
+# 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_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+DEPEND=">=virtual/opencl-2"
+RDEPEND="${DEPEND}
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+# libglvnd is only needed for the headers
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 33854b70ffe3..21db044a7229 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,5 +1,5 @@
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
 DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
-EBUILD pyopenssl-20.0.1.ebuild 1812 BLAKE2B 2a2cc8e08f97fea2586d96521c2a47d6464ea0bac973ae49505c05f9c3436369b3867c6a353f7a83f993bccd2eeb11b999fc33c93dcf6d7c3e0448ad6c408318 SHA512 194f7d3330d4f66b4144a7aa520f817a9fb4dd273dbc833dedba6c8cf16fc03c3d0331b2adfbd5b9c55aa029eae613884382b64604816c2c2b26f45b1c773d55
-EBUILD pyopenssl-22.0.0.ebuild 1624 BLAKE2B ef6deeabe15a07739f4765b4220ffbfed85e7dc37cad202c342965d67f8214d2d6443e3ac4e4602da4498495ad4dfff121726e7164001e54207930f18d39d46a SHA512 2ccfaba1e5918ae89903d8dd8ec8a3f8051c166d9690256b07a2c9a4a4cf5d208fca24fee9475246a7145fa7e1ae04aacbc00499f9087a99fb2271adc822e4f4
+EBUILD pyopenssl-20.0.1-r1.ebuild 1722 BLAKE2B d72fda3e356d0890e501a924e57eb92bf7adbffa5e18dc0727785a54eae14946f182b37d1adc77cdb90fe0e53b99453b9c55e78622d0c0fcb93b011ef0f8d94b SHA512 fb4aa69b3ff9b0e29bd97b9ddc9ade6391adafbbcb3d8f65f1476fb716a2b2ac1c67e9b45827348f87c40b8e7ef932804ff23323640474f19b95e1b0ca483080
+EBUILD pyopenssl-22.0.0.ebuild 1516 BLAKE2B 8811d78556c845f9dacecab431ec199e04a3eeb03daf2c9504a7d82bea6435788e93a2f14d003a90366ce32fc837973caa05fe8de87cbe181f879be3d375479f SHA512 5272324ac16dfbdb1697a1a7f65dbfe18a1d1e80bf46e10e0148a9992159cdf8f44fc681ce62d9bd29644d018e1a79d58a4068d9288cd36c8ec64e6506a498c3
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
new file mode 100644
index 000000000000..6ae449eb04e1
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://pypi.org/project/pyOpenSSL/
+	https://github.com/pyca/pyopenssl/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
+	fi
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
deleted file mode 100644
index eadda66ac57d..000000000000
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_configure() {
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		PYOPENSSL_SKIP_LARGE_TIME=
-		einfo "time_t is at least 64-bit long"
-	else
-		PYOPENSSL_SKIP_LARGE_TIME=1
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	local deselect=(
-		tests/test_ssl.py::TestContext::test_set_default_verify_paths
-	)
-	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && deselect+=(
-		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
index c2f361933d05..f03b92cd9574 100644
--- a/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
@@ -4,13 +4,14 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs
 
 MY_PN=pyOpenSSL
 MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Python interface to the OpenSSL library"
 HOMEPAGE="
 	https://www.pyopenssl.org/
@@ -22,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-35.0[${PYTHON_USEDEP}]
@@ -41,7 +42,12 @@ distutils_enable_sphinx doc \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 
-src_configure() {
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
 	# test for 32-bit time_t
 	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
 		#include <sys/types.h>
@@ -49,22 +55,13 @@ src_configure() {
 	EOF
 
 	if [[ ${?} -eq 0 ]]; then
-		PYOPENSSL_SKIP_LARGE_TIME=
 		einfo "time_t is at least 64-bit long"
 	else
-		PYOPENSSL_SKIP_LARGE_TIME=1
 		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
 	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	local EPYTEST_DESELECT=(
-		tests/test_ssl.py::TestContext::test_set_default_verify_paths
-	)
-	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && EPYTEST_DESELECT+=(
-		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-	)
 
-	epytest
+	distutils-r1_src_test
 }
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 3814262e2ff6..b6435b8f5250 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1,3 @@
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
-EBUILD pyotp-2.6.0.ebuild 465 BLAKE2B 9be15d15895128f9fbce09941537eac4eed4ca201490a3d7d411907040a1a0a9826f15b664085658492c604b666e2caad90ed52b8c8b5b1adcf09b964fa949b5 SHA512 047a4ba3db3cacb332b1203cb156596f3244d8c504848807e36207f1fb95e663fd76cf7fde7d2dd754184a425a9994bc142edccb318a809c72d835b06143c930
+EBUILD pyotp-2.6.0-r1.ebuild 498 BLAKE2B a92ee36c0ac76c38474112f47997f483fa5002e23557c95d30bb7a9aaa47d61df6dfde7e20626aa305cf7d40195abbf30c45179d3539260c53c5c2d4ab87804c SHA512 113c6d95e962461f8f3ef9e901aefadc6bfbf3e8befb1ce5dca18f3eeb9a7dc8cf99b6d89af667129d66000f235ae4a66b162165248e9ed0a9450779246a287a
 MISC metadata.xml 385 BLAKE2B 9f2d57ca90c859506181e9960deef6e0bf83854cc35066a18cabfdd1c49ea9019123f1ba3edef1d94c45c826ca0064d9a390a62e758fad87120813ee014dee76 SHA512 0f42bd43b2ef566bfc8b2a7ddb858dae6fe92d5fba0f19d6c0ba6cd38b010b6ba927f87c171327665af0a9bff541381d3b3ffe500988ca15d19da40188e06e77
diff --git a/dev-python/pyotp/pyotp-2.6.0-r1.ebuild b/dev-python/pyotp/pyotp-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..7491d02761fa
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.6.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords"
+HOMEPAGE="https://github.com/pyauth/pyotp
+	https://pypi.org/project/pyotp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyotp/pyotp-2.6.0.ebuild b/dev-python/pyotp/pyotp-2.6.0.ebuild
deleted file mode 100644
index 562f0b09e2cd..000000000000
--- a/dev-python/pyotp/pyotp-2.6.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords"
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index fe446b9c3184..a5228dd1b94e 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,7 +1,3 @@
-DIST pyparsing_3.0.7.tar.gz 944917 BLAKE2B bcbcd18817c69a69ac6863affb1309a5ca63fe46a45dc056d8407d79a77d1f19e4d1abce08f5d6f1aff7cbdaefb5b699787abcddfcbf64e5514e79e2b0b86ce6 SHA512 d5d5547188ebda6fb7f45928174314d3d4d10302acc8fb476cd6590fb4a75167dee5f6397ab0b63efd4cb55c0765708ffd432bcfecf28d8f808815e62615f447
-DIST pyparsing_3.0.8.tar.gz 948516 BLAKE2B 8df61ce3c5f0b9ef725bf750fa25c26e482a5786b6c3a03befbf7945c76f67981d0f60bfc98badeb353274e5e3c8442e105ae635d0b93681e23090e70716ce0a SHA512 5567824ac6d4c17755c0d47f2994cc2449383d9d3e9dfa374886d92af38651334483034713df420701d1c4560b331f61d763f7f8d1d7a14a7d221c022b9fc8a7
 DIST pyparsing_3.0.9.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d
-EBUILD pyparsing-3.0.7-r1.ebuild 2002 BLAKE2B 4385eb13eafb4fc84b4151f0e96a87ad44dd465a651bad98db559b50f45192be9816e1b658f5989181d6ab5c04b76e76c08ca7233260cbed39e3f4bf08af896e SHA512 bfbaf2e219c8bddab5b4fcd6ff022d46cf81feadeae5d684be39f512f85619a98d1760fe90b5ce8aca2f3fac41c45a5545b2fa9d00aad5a990eb3434cb39f3e2
-EBUILD pyparsing-3.0.8.ebuild 1654 BLAKE2B 7706a454aab6f7ee44504bcff4752a827a6d6207d9abf30dfb65e00cc64935365f74e26a58be1d2abc621532d23eca27640d50380bced46e71abf38bcabbb760 SHA512 ea740859b348f2181bef4bbe6b4e30a47f376e10962bf274a7c22f7f11ddb6ca6fecd4dc75cb567e28abddeef235e0bbde71ac4df8e3101c8d42aaee5a99a684
-EBUILD pyparsing-3.0.9.ebuild 1654 BLAKE2B 7706a454aab6f7ee44504bcff4752a827a6d6207d9abf30dfb65e00cc64935365f74e26a58be1d2abc621532d23eca27640d50380bced46e71abf38bcabbb760 SHA512 ea740859b348f2181bef4bbe6b4e30a47f376e10962bf274a7c22f7f11ddb6ca6fecd4dc75cb567e28abddeef235e0bbde71ac4df8e3101c8d42aaee5a99a684
+EBUILD pyparsing-3.0.9.ebuild 1646 BLAKE2B 46bb883bfd59182f3dea598b8305be12415b5155238e4be6636888d5c1a7b84e39601b37099e66d028489d89a55b5ce725f919a292f290ec3544a340c2c6488a SHA512 22b1afd48bc1b975370baaa76e9aebf13f5e090f95bbb762ad5e341f5c87e4cf4d566859ed52b438f1e45f50c50958451c5456aaef4e8d02e4bf36d3540f5941
 MISC metadata.xml 797 BLAKE2B 9707adcde7106fb0726de82da965fc3aaf7a23b34f4b71cfea4e09bd03cb44c069ccd4d16e6a6f37eca4720ff8c52d0bc11c864bd7dd9e6995d0d25cb92c5cc2 SHA512 0f791598d2b4a37797e7f917be22093f01020cde34876d7d0db3d1b2bf5da8a18d5399d70f381d98ea569f8c3abf7f1cff8b3cc92fbab39bb00f329a58e96229
diff --git a/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild b/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild
deleted file mode 100644
index 0ddc113a0975..000000000000
--- a/dev-python/pyparsing/pyparsing-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2004-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
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-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="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-src_configure() {
-	[[ -e pyproject.toml ]] &&
-		die "Upstream added pyproject.toml, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "pyparsing"
-		dynamic = ["version", "description"]
-	EOF
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-3.0.8.ebuild b/dev-python/pyparsing/pyparsing-3.0.8.ebuild
deleted file mode 100644
index 5dd04e79a482..000000000000
--- a/dev-python/pyparsing/pyparsing-3.0.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2004-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
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Easy-to-use Python module for text parsing"
-HOMEPAGE="https://github.com/pyparsing/pyparsing https://pypi.org/project/pyparsing/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="examples"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# railroad-diagrams not packaged (and not suitable for packaging yet)
-	tests/test_diagram.py
-)
-
-EPYTEST_DESELECT=(
-	# also railroad-diagrams
-	tests/test_unit.py::Test02_WithoutPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test04_WithPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test06_WithBoundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test08_WithUnboundedPackrat::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test09_WithLeftRecursionParsing::testEmptyExpressionsAreHandledProperly
-	tests/test_unit.py::Test10_WithLeftRecursionParsingBoundedMemo::testEmptyExpressionsAreHandledProperly
-)
-
-python_install_all() {
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyparsing/pyparsing-3.0.9.ebuild b/dev-python/pyparsing/pyparsing-3.0.9.ebuild
index 5dd04e79a482..ced9f03f4893 100644
--- a/dev-python/pyparsing/pyparsing-3.0.9.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.0.9.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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="examples"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 29b2f87224cd..f59a8f180ac4 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,3 +1,3 @@
 DIST pyparted-3.12.0.tar.gz 106440 BLAKE2B 824223e385a6f1bfd9c01dc4c665ddeca5b73bbc2e65a9ade8086393f3dc0ebdc11528beabe7eeec8d0b8172b49db15ad8c34425efe4db47439f1b5617f9c55c SHA512 c1779c16868799bbff0905ea908db668823d1c238b9a06bcd62b24f9681fdd1e9378e904a91eb5e426a6e264cf1f2feee984a514e9098bf10147643bf58aa918
 EBUILD pyparted-3.12.0.ebuild 638 BLAKE2B 11687aa440e396a1ea1625597ce47955acfc923dfb726631f489449a707ab4772e84a0b1dc7d199e4cb433544a7ef70f27e075777ac08e1716919a51d3166518 SHA512 8cf097b68adb520fefa0dc98fa14325479c8875d27744cc8be24101c07399f2232c18961ee33f52693b21aab8b47b51b01274282bf31ff38f71f22fbe90c0d22
-MISC metadata.xml 377 BLAKE2B 39af16d9a89626b161538ff81b17c7017bb4fb13d7c4eecaa9348e263015154c465c547a87c50a746e8e88b32a841fe3bb6c37a5625972e49750d11ade27f676 SHA512 fc05a74fa0baf09ce7720cf8e485fd6ac15cde36d49242942d4d9160c763d19fdd5f17baaefb2af62b0129529c7ad1322b815544fed7065c95447e4f7548c253
+MISC metadata.xml 478 BLAKE2B 52dafb612bb937b1451b00fd15b1f97609f0f9033c0a2dcbd080c73025e0d9cbdb1132c30803fb4e923811d852a2ea1b70c55d6cca13bc1c92777e0198c5bca3 SHA512 1e0ae2f7e920fe05c66940dc10c7e12e7c0d50de276c5fc530a8da09c336c458402b5ae773d09baba8fd68b7c09ee5cb369f3b675017a45e0ce8f6b1beafe0fc
diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
index 7bc577234761..548cb772df89 100644
--- a/dev-python/pyparted/metadata.xml
+++ b/dev-python/pyparted/metadata.xml
@@ -5,6 +5,10 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">dcantrell/pyparted</remote-id>
 		<remote-id type="pypi">pyparted</remote-id>
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
deleted file mode 100644
index 9ef2f2cb7fa3..000000000000
--- a/dev-python/pypeg2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
-DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
-EBUILD pypeg2-2.15.2-r2.ebuild 629 BLAKE2B 4b7872eb750793e1b78c47c75cad49a90c41b4dee4a5f4f2ed86ed4c4de1b4246c93f7c731d0719096f8159e3d48d47fdc953a9697aba5302613c814b7d35809 SHA512 f0892d078644a8d15e3e58f402c899bc63e706f78625cddd32e8d022c9c1197381a23569fa9b5208c0cfaf9591fdeb9903d3f4b6104119ed06e0e241b2fecb11
-MISC metadata.xml 310 BLAKE2B ef3ace0746990efb4b3df2d32aba68f26817250a78aac1239eb9b438ab5e9b6336b0835fa7ff63de16d7ab09d61be74a64922ce3c36d950eb7923e86818d4155 SHA512 e508bf8b05e07573ef2ab6ece6c642e33a9252767ae8d419f0500f347b214fd8e4046917b4b285310726beaa51a574ebcaf2f733889ee355aeaab1222e34cd31
diff --git a/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch b/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch
deleted file mode 100644
index 6ca8839d7776..000000000000
--- a/dev-python/pypeg2/files/pypeg2-2.15.1-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Drop seemingly wrong test line that throws an AttributeError.
-
---- pyPEG2-2.15.1/pypeg2/test/test_pyPEG2.py
-+++ pyPEG2-2.15.1/pypeg2/test/test_pyPEG2.py
-@@ -255,7 +255,6 @@
-     def runTest(self):
-         r = pypeg2.parse("!all", type(self).C1)
-         self.assertEqual(str(r), "all")
--        self.assertEqual(r._ignore1, None)
- 
- class ParseOmitTestCase(ParserTestCase):
-     def runTest(self):
diff --git a/dev-python/pypeg2/metadata.xml b/dev-python/pypeg2/metadata.xml
deleted file mode 100644
index 7790a32d909e..000000000000
--- a/dev-python/pypeg2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pyPEG2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r2.ebuild
deleted file mode 100644
index c75dac24608f..000000000000
--- a/dev-python/pypeg2/pypeg2-2.15.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_PN=pyPEG2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
-HOMEPAGE="https://fdik.org/pyPEG/
-	https://pypi.org/project/pyPEG2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index f20c8db81c6f..c346d0533faf 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,3 +1,3 @@
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
-EBUILD pyperclip-1.8.2.ebuild 1245 BLAKE2B b1645bab36693d214fa3e811846cb062e7a51fb042af1bf529f7960561461b01a9199ac8ab4a28fedc2ae9dec6e3dcefe4bdca4ef0762d3d0a30899d07981a3c SHA512 b1e436b2704522d00505ffc13f71683d1c834a33d6dd9d39b7f11efd528c67723e14a3e8a6e039ceac8d35fe98cd802fb9a030cbda48bc84278846a380a9e247
+EBUILD pyperclip-1.8.2-r1.ebuild 1238 BLAKE2B d07968dc9ea6d3ffa46037ae44921eb22cb90865aaea09dd119e064f320d27468bd1d40f10f17fa9251a82d2b3fb35de06b72cbe089f975a7812bbc44ddef6b9 SHA512 ad74b5acea2239e39a8b1466205649eca1e0cc03c29bf76176508897357372006e60ee9265debcca12d9806bab935eb8375bb1fafa8247d951934125446fb836
 MISC metadata.xml 430 BLAKE2B 4205f6477eeb2f1fa19813598e3c4bccf7b1f463771598a998096c6940e57ee9615aa56e5f440b674d49b51fd201f53016d3a79b3d1499652155a1dc0aab6fe8 SHA512 4b4cb2d92f223826c241816864aaa2dae6d16db257244a416779dceec48e3dd55dd3e3e4f5b75e10f94dbe5acfc12d4a43c31ddf3cde0b5859982b2e0a37ab6b
diff --git a/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild b/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..ca5a87c21038
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.8.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A cross-platform clipboard module for Python"
+HOMEPAGE="
+	https://github.com/asweigart/pyperclip/
+	https://pypi.org/project/pyperclip/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	|| (
+		x11-misc/xsel
+		x11-misc/xclip
+		kde-plasma/plasma-workspace
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP}]
+	)
+"
+# test at least one backend
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	# stupid windows
+	find -type f -exec sed -i -e 's:\r$::' {} + || die
+	# klipper is hard to get working, and once we make it work,
+	# it breaks most of the other backends
+	# wl-copy requires wayland, not Xvfb
+	sed -e 's:_executable_exists("\(klipper\|wl-copy\)"):False:' \
+		-i tests/test_pyperclip.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_pyperclip.py -vv ||
+		die "Tests fail on ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/pyperclip/pyperclip-1.8.2.ebuild b/dev-python/pyperclip/pyperclip-1.8.2.ebuild
deleted file mode 100644
index e59e589a1667..000000000000
--- a/dev-python/pyperclip/pyperclip-1.8.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 virtualx
-
-DESCRIPTION="A cross-platform clipboard module for Python"
-HOMEPAGE="https://github.com/asweigart/pyperclip"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	|| (
-		(
-			x11-misc/xsel
-			sys-apps/which
-		)
-		(
-			x11-misc/xclip
-			sys-apps/which
-		)
-		(
-			kde-plasma/plasma-workspace
-			sys-apps/which
-		)
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP}]
-	)
-"
-# test at least one backend
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-src_prepare() {
-	# stupid windows
-	find -type f -exec sed -i -e 's:\r$::' {} + || die
-	# klipper is hard to get working, and once we make it work,
-	# it breaks most of the other backends
-	# wl-copy requires wayland, not Xvfb
-	sed -e 's:_executable_exists("\(klipper\|wl-copy\)"):False:' \
-		-i tests/test_pyperclip.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" tests/test_pyperclip.py -vv ||
-		die "Tests fail on ${EPYTHON}"
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 42d92bcf15b0..52db53fcdad5 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.12.0.tar.gz 1969022 BLAKE2B 9b7f6712a2085507684ddde52401a75b05d0a13a530572f0f08b9143168a8ea61a5ee73983606b19f88ff23f3c5344aa87722c3986291c7349f82e95dd3b1f19 SHA512 abecf0773f59b7a757b47c6512f1bf8e98f4709b285f04cf235c085ab4767eb95deab8ede4b792d6f4a6156d47287f9f712cb658939ed5afc475644e282adbd3
 EBUILD pyphen-0.12.0-r1.ebuild 632 BLAKE2B 178a56a9f11d1352421a3d1495df40dc7a780aa6eeba1b5360ab0c53074ac64a4b1bc64ce0240ee3d9bcf70d82c4edd0131c1d2cb9d042e8dba9b70f8c6787ec SHA512 0fcdb35530f17013773fbdc3bac737c735ef68e7cb367f77ae83c9de1c31e8ec3691a767e3b1271965461225d2b24e11ec3d8e55c2737b9fa36117ebbf98fee3
-MISC metadata.xml 498 BLAKE2B fbe488a6cdb4ec1dffbc8455b1369b35ebdce6f86f7ea0afc7451b838eab586c2b4d7579ce77844412978bf3a1de964793f2a3766d9402b143921d5d00373e85 SHA512 3a9f7942d0c87655067e13537ffd7f050f87c964a25be650ff38ea4d217dfe84e3a0508f7c14333d8be5f8c191711720d83837e447f0fb1d0213dc439c5a9fb7
+MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 66eb1b098165..5a4c5ffdd2df 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index 4c3e813db429..7490d35f4b91 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,5 +1,4 @@
-DIST pypiserver-1.4.2.tar.gz 511019 BLAKE2B fe9a41c35d601ee20f2cfe0773ce341b8c8fe387a2b825d1e6d669d5f358846b436158beb8a1222fa33cf1841cad5aceacc0f5063f899445ad15ca9eb5b8efd7 SHA512 8597a6a7e83cb3f5ead3418ee91167e1764c123b244c05397fa892c8ebe84b58569f27ce85cd9849d6a41d20342de21cf9cc46e00b233d9d94d0540470e1c49b
+AUX pypiserver-1.5.0-unbundle-bottle.patch 3428 BLAKE2B f30c9c5b7204b3efed6f6515ce11ca6921ad44a5af69af6ea19059daa9b07396bf7312d649b93492e3e1f98bcc3e0df16c9178aa0abda77b048634b0461ae194 SHA512 fca45138c22b8c12c5fe5fc1742f5a7034d9353e7a520a8870b4a0b4d113b915ed8a34dc9cc9f268ff8f9220425f1131db8ea13443ff9050852bcd9d362ac942
 DIST pypiserver-1.5.0.gh.tar.gz 149963 BLAKE2B bfc0760982f97e93357702342eb5b1776f72c43e66742a8741ee2ba3109839006e99e49b65e04380097500c400e09bce77b74fc5f9072c7670349817ae3a73cb SHA512 c93e724a3aa6ec265d483c2989129292a05132d3d52db6d9b9c1429610ee23b56e106c9389bdfaad142f34071ee258bdd4291668c11f8bb412df043bf4555611
-EBUILD pypiserver-1.4.2.ebuild 1504 BLAKE2B 9ad37a5cb54089a36e1e0d7e37babbc98dd3eb07e37e1d6663efaf8218e338ad70a4e1a739b124f7ea77ba2c85718f24313070b0b77f6f34d93de1e5bee8f830 SHA512 78b40757eec87cd464d7fe8ce9b3eb27a57323f86fcd2fb9950b856087233c69202a19db4c3157096411590eef1c112bb1ff40924edf4c2bfe4b6e284b336d1c
-EBUILD pypiserver-1.5.0.ebuild 1372 BLAKE2B 3b55bef90fbbb71c1839354def790c729f39bfc4efaab0ab389a46fcf2203d1f3db09f5348c09e7fbfd591e3003bc8549984c0e6c87f2aa4260772bd59384de8 SHA512 42c013974601737eba3369fa72cd84bf476d384d469305b22709ec83341c0892605fa3984cd08a3f297840d1a3b15bbfd9d26211670257fa8cf1bfebfa28cb88
+EBUILD pypiserver-1.5.0-r2.ebuild 1561 BLAKE2B 61d5d4a478c7efc167cfe32c8eeaa09041f3b900308afda96ff0fb9040d5d7ca6c0c7d852a7007f11fd6a18949631228d597bde7f8511bfdf35506a74c7311dc SHA512 b43d71061cc96bd465fa26d370bd3dc94f4ef07e95b4b960fed39c0001ebdfc3852655d88ffb5b7a3cae0c40e401b31ac63d82d97a9e53c77a363438adb6d05d
 MISC metadata.xml 399 BLAKE2B e8726c9c4a494a64dd1490aa88f8bbca6536635af045364307d057d5dfa4762a1b0d59d3eacf7d84c9002ac38516eb7d2228ebd872db762a669bd6015139a4ec SHA512 a3d90eb11fc5bb2c78e53a4d64cffaf213a445c1677939c46fb400e01f4e74d1f206df2259ab348b61d27e3a9b3f03e94a49485be948b2e4106ba254154c7ada
diff --git a/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch b/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch
new file mode 100644
index 000000000000..69e1764e3f2a
--- /dev/null
+++ b/dev-python/pypiserver/files/pypiserver-1.5.0-unbundle-bottle.patch
@@ -0,0 +1,89 @@
+diff -dupr pypiserver-1.5.0.orig/pypiserver/_app.py pypiserver-1.5.0/pypiserver/_app.py
+--- pypiserver-1.5.0.orig/pypiserver/_app.py	2022-05-24 07:32:24.710366623 +0200
++++ pypiserver-1.5.0/pypiserver/_app.py	2022-05-24 07:37:16.147456086 +0200
+@@ -13,7 +13,7 @@ from json import dumps
+ from pypiserver.config import RunConfig
+ from . import __version__
+ from . import core
+-from .bottle import (
++from bottle import (
+     static_file,
+     redirect,
+     request,
+diff -dupr pypiserver-1.5.0.orig/pypiserver/__init__.py pypiserver-1.5.0/pypiserver/__init__.py
+--- pypiserver-1.5.0.orig/pypiserver/__init__.py	2022-05-24 07:32:24.710366623 +0200
++++ pypiserver-1.5.0/pypiserver/__init__.py	2022-05-24 07:36:54.633769799 +0200
+@@ -4,7 +4,7 @@ import re as _re
+ import sys
+ import typing as t
+ 
+-from pypiserver.bottle import Bottle
++from bottle import Bottle
+ from pypiserver.config import Config, RunConfig, strtobool
+ 
+ version = __version__ = "1.5.0"
+diff -dupr pypiserver-1.5.0.orig/pypiserver/__main__.py pypiserver-1.5.0/pypiserver/__main__.py
+--- pypiserver-1.5.0.orig/pypiserver/__main__.py	2022-05-24 07:32:24.710366623 +0200
++++ pypiserver-1.5.0/pypiserver/__main__.py	2022-05-24 07:34:05.608054452 +0200
+@@ -159,7 +159,7 @@ def main(argv: t.Sequence[str] = None) -
+ 
+         gevent.monkey.patch_all()
+ 
+-    from pypiserver import bottle
++    import bottle
+ 
+     bottle.debug(config.verbosity > 1)
+     bottle._stderr = ft.partial(  # pylint: disable=protected-access
+diff -dupr pypiserver-1.5.0.orig/tests/test_app.py pypiserver-1.5.0/tests/test_app.py
+--- pypiserver-1.5.0.orig/tests/test_app.py	2022-05-24 07:32:24.710366623 +0200
++++ pypiserver-1.5.0/tests/test_app.py	2022-05-24 07:33:23.470919728 +0200
+@@ -8,12 +8,13 @@ import xmlrpc.client as xmlrpclib
+ from html import unescape
+ 
+ # Third party imports
++import bottle
+ import pytest
+ import webtest
+ 
+ # Local Imports
+ from tests.test_pkg_helpers import files, invalid_files
+-from pypiserver import __main__, bottle, core, Bottle
++from pypiserver import __main__, core, Bottle
+ from pypiserver.backend import CachingFileBackend, SimpleFileBackend
+ 
+ # Enable logging to detect any problems with it
+diff -dupr pypiserver-1.5.0.orig/tests/test_main.py pypiserver-1.5.0/tests/test_main.py
+--- pypiserver-1.5.0.orig/tests/test_main.py	2022-05-24 07:32:24.710366623 +0200
++++ pypiserver-1.5.0/tests/test_main.py	2022-05-24 07:33:33.441025326 +0200
+@@ -5,11 +5,11 @@ import sys
+ import typing as t
+ from unittest import mock
+ 
++import bottle
+ import pytest
+ 
+-import pypiserver.bottle
++from bottle import Bottle
+ from pypiserver import __main__
+-from pypiserver.bottle import Bottle
+ 
+ 
+ THIS_DIR = pathlib.Path(__file__).parent
+@@ -52,7 +52,7 @@ def main(monkeypatch):
+         main.update_args = args
+         main.update_kwargs = kwargs
+ 
+-    monkeypatch.setattr("pypiserver.bottle.run", run)
++    monkeypatch.setattr("bottle.run", run)
+     monkeypatch.setattr("pypiserver.manage.update_all_packages", update)
+ 
+     return main
+@@ -263,7 +263,7 @@ def test_auto_servers() -> None:
+     """Test auto servers."""
+     # A list of bottle ServerAdapters
+     bottle_adapters = tuple(
+-        a.__name__.lower() for a in pypiserver.bottle.AutoServer.adapters
++        a.__name__.lower() for a in bottle.AutoServer.adapters
+     )
+     # We are going to expect that our AutoServer enum names must match those
+     # at least closely enough to be recognizable.
diff --git a/dev-python/pypiserver/pypiserver-1.4.2.ebuild b/dev-python/pypiserver/pypiserver-1.4.2.ebuild
deleted file mode 100644
index 55e9043f8868..000000000000
--- a/dev-python/pypiserver/pypiserver-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="Minimal PyPI server"
-HOMEPAGE="https://github.com/pypiserver/pypiserver"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/passlib[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.3[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/twine[${PYTHON_USEDEP}]
-		) ) )
-	)"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pipInstall_openOk
-		tests/test_server.py::test_pipInstall_authedOk
-		# TODO
-		tests/test_app.py::test_root_count
-	)
-
-	if ! has_version "dev-python/twine[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_server.py::test_twine_register_authed_ok
-			tests/test_server.py::test_twine_register_open
-			tests/test_server.py::test_twine_upload_authed
-			tests/test_server.py::test_twine_upload_open
-			tests/test_server.py::test_twine_upload_partial_authed
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..e8a875327309
--- /dev/null
+++ b/dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Minimal PyPI server"
+HOMEPAGE="
+	https://github.com/pypiserver/pypiserver/
+	https://pypi.org/project/pypiserver/
+"
+SRC_URI="
+	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/bottle[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
+"
+# NB: many test deps are optional/specific to tests we skip
+BDEPEND="
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/twine[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst )
+
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-bottle.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove bundled bottle (sic!)
+	rm pypiserver/bottle.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_server.py::test_hash_algos
+		tests/test_server.py::test_pipInstall_openOk
+		tests/test_server.py::test_pipInstall_authedOk
+		# TODO
+		tests/test_app.py::test_root_count
+		tests/test_server.py::test_pip_install_open_succeeds
+		tests/test_server.py::test_pip_install_authed_succeeds
+	)
+
+	epytest tests
+}
diff --git a/dev-python/pypiserver/pypiserver-1.5.0.ebuild b/dev-python/pypiserver/pypiserver-1.5.0.ebuild
deleted file mode 100644
index e6ba0228e52a..000000000000
--- a/dev-python/pypiserver/pypiserver-1.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Minimal PyPI server"
-HOMEPAGE="
-	https://github.com/pypiserver/pypiserver/
-	https://pypi.org/project/pypiserver/
-"
-SRC_URI="
-	https://github.com/pypiserver/pypiserver/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pip[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.25.0[${PYTHON_USEDEP}]
-"
-# NB: many test deps are optional/specific to tests we skip
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/twine[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_server.py::test_hash_algos
-		tests/test_server.py::test_pipInstall_openOk
-		tests/test_server.py::test_pipInstall_authedOk
-		# TODO
-		tests/test_app.py::test_root_count
-		tests/test_server.py::test_pip_install_open_succeeds
-		tests/test_server.py::test_pip_install_authed_succeeds
-	)
-
-	epytest tests
-}
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index c315619c2cd7..699f3c9b8b98 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.21.tar.gz 111899 BLAKE2B b4b8f17b76918f415c02edc09a597af643615f46839fb4464f3116e4cefb0a251227f344ff2c1c51efb87933faf647bfa6a7c4d89bc91c8389a3dc71479e878d SHA512 b8f5f9be05aafe59aeb69462b7ccc9e5c4df8eb157731d888773f0ef223dc1c45db83daa51347b45dc3c59be5141c3fc4e031004ac28927b786d7e254ffff4fa
-EBUILD pypng-0.0.21-r1.ebuild 568 BLAKE2B 3c64694b8ffd6ce267e39734aa52da668a6fef363523e5c6038928de35947f0c9c1f32be515fd4d13dff7b8298eae80e6711cce641a6c1ae6fd512e8e38415b0 SHA512 4ab7a3f7348f71c775dc9cd8a772f7e65f45ff9c96a46c33a207a724aa490cf6f1112c59c97742db3407ac34f776cf14154bd9fade28ec6b22b958405087f209
+EBUILD pypng-0.0.21-r1.ebuild 569 BLAKE2B 1de3c585d59877e6545f6b5be2573053b16257afdb23e3231bb4765110fabbfade995ed82fc09d67621e4620ca5fdaa50c68590503882b9d603c8f21e1228b7d SHA512 ed805c2c2d1fce00cd47fb815ed005871fcab1511d20764103595fc20fb8454307322ad899d972d3e995a01fe712fa21f2d8f82a6757a3eeabfa0bfec913f089
 MISC metadata.xml 451 BLAKE2B 75c7df259e2f4bfceb7b7abf4302169b5b423d9a9818238b06df0b69270a953ea590f4026774c2fbba4aa24c1e100c3ea40aeeae8a0625390f12c8aab1c173c1 SHA512 b7139dd634bc093222cbd6f7acba8f6ed7856c3b84a101cd3f5703b960d52aa9ef9b388b33cd7b997bf32405fb6bd67771663022da254c7a88fab56d515f4758
diff --git a/dev-python/pypng/pypng-0.0.21-r1.ebuild b/dev-python/pypng/pypng-0.0.21-r1.ebuild
index 01c6b515b2c9..fc4c27e1f789 100644
--- a/dev-python/pypng/pypng-0.0.21-r1.ebuild
+++ b/dev-python/pypng/pypng-0.0.21-r1.ebuild
@@ -4,14 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Pure Python PNG image encoder/decoder"
 HOMEPAGE="
 	https://github.com/drj11/pypng/
-	https://pypi.org/project/pypng/"
+	https://pypi.org/project/pypng/
+"
 SRC_URI="https://github.com/drj11/pypng/archive/${P}.tar.gz"
 S=${WORKDIR}/pypng-${P}
 
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index aea6eee24996..fb7fa4fc0597 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,3 +1,3 @@
 DIST pyprof2calltree-1.4.5.tar.gz 8806 BLAKE2B 3a8a838a8b03294504c64dbe1d0caee2606a1ec53005222dfe6c3692bacd0801041ce199fedb9c38e4f6edc91e210116d9c1e034e0aa283cafebb19bf6303fed SHA512 2fcda74ae67dc3a8abb5dc153864ef59f96cc62b1c9359d02be12e83966c17738f5aa4a3d1c6e2ff81614dc963fc4b2faf375bbbb1ad15650a6817e493cdde39
-EBUILD pyprof2calltree-1.4.5.ebuild 490 BLAKE2B 759af98d2a74f670f1b34a1181aa2a02eea56eff80b58cc4616beb16c35243930925ca409fa4c020240742822858f261cfed5ad1f88ecc81ffb02846f0be5475 SHA512 b3426f0112284cec6d11ecf5c2373a4bd12ae0f52389c669a7ec5dcf3ad5e7ddf6af71c4bef6b67ec8f56aa7f1a1f558aea0786619d452aca6e826a7b4af5ca6
+EBUILD pyprof2calltree-1.4.5-r1.ebuild 522 BLAKE2B c6fafcc988c7aa46422905644d70941d582f5e94a01104ca3e94ffaf09b537b49b6a6afc2e442ad89ad1740b952d6219b80daad2c38d23f344cb91ee59da5ad5 SHA512 c2d9dedf97e5a2b5bdc0db5d2c0f73166d93b34de0a525f8c2be1905f377549951e81e4c79df4de7eea969acbf28abd3c3824d574c21ded24792026d1a77e13a
 MISC metadata.xml 406 BLAKE2B 7d3e2257b0a06747c1772ff90ac2375467633f40d7b4064389e64aaf426b07d5ea263098115a96ce035f200d55c9e83049ef7df0812a585ff7dd9a86407db832 SHA512 ff6a0e3b75a157ad85bcd1e75dc277849b67379bb097e4ba0b2373247456cfcbc079d36f7cdde266669bf2db99eb63a471d3ab156e1218628db3b1b51abf43d4
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..dd5ed079c2b3
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
deleted file mode 100644
index a979232643d7..000000000000
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index f4d748835bcb..64098393d4b4 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,3 @@
-DIST pyproj-3.3.0.tar.gz 217539 BLAKE2B 14e2332ffdf3d67e531bb4809cd50fd4902828b0cc3d2427921624d56cf05bdc0f3d5b17ea0516b3f428ad82bc57df840e4bd2dde1232870c9b959c34998c254 SHA512 9e8429a4fbec1950bf72a8c582d4a944a6707ac54a107a7837bf7fe44f8c2e29f1f6d0dcd9f5ff3ef511f3d31016389745cc2dfc14e2089756e6e72fe6074c47
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
-EBUILD pyproj-3.3.0.ebuild 871 BLAKE2B 35550104ff8397b2b3df3353d473380ed270cf647bfc1038d31a0219977234e63220e1b6290edc328c583b8e3fea5377e6e1b7dbacfb8612351c02823b96fa36 SHA512 937e8b3efbaae0c5ab3febf7f5cde40db467506782dc8d68fd3a2f59cb3b056467237d2846c71d31537d3f2a9cdf6171a529d0d57b6dc022e9360e2c5c5d3dba
-EBUILD pyproj-3.3.1.ebuild 916 BLAKE2B 3579603416efd60f95665faaac0a8971f197c9b69691225b1ba4ad9705aac9ddbf8e1a58e7d2be82291e4b7858353b25ff59df7539d7f0d67e9127525121d591 SHA512 c21acafeae00354553ee440375015957c26d31f21face9a7a987731f0d5b34c7fd7b7719e6b0bd26e389df983d9dad7cf20a9306e85e06d8eed729f71969ea64
+EBUILD pyproj-3.3.1.ebuild 915 BLAKE2B d5f849bcb9810ea120ec31a65d124ad5486bc46dddd06cac47e3fa0c28a58c0ab0e49b611b9a0ebb976bd3469ad9125833d8d9fd7b0dbeac5175b98e3c3b2284 SHA512 297466d81bf0c982091a883222d0064f69f7475535b9b0e60b38128f8ed93c568d99f6f548c1dc7929ea44d7815d66fd02698b95c834f2c451e5fba410043c44
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.3.0.ebuild b/dev-python/pyproj/pyproj-3.3.0.ebuild
deleted file mode 100644
index c6d3c9d8003f..000000000000
--- a/dev-python/pyproj/pyproj-3.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-
-RDEPEND=">=sci-libs/proj-8.0.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	cp -r test "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest --import-mode=append -m "not network" test
-}
diff --git a/dev-python/pyproj/pyproj-3.3.1.ebuild b/dev-python/pyproj/pyproj-3.3.1.ebuild
index c8ba64083b68..f3f32a5b8852 100644
--- a/dev-python/pyproj/pyproj-3.3.1.ebuild
+++ b/dev-python/pyproj/pyproj-3.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux"
 
 RDEPEND="
 	>=sci-libs/proj-8.0.0:=
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
new file mode 100644
index 000000000000..7f479eccc0aa
--- /dev/null
+++ b/dev-python/pyproject-fmt/Manifest
@@ -0,0 +1,5 @@
+DIST pyproject-fmt-0.3.3.gh.tar.gz 14399 BLAKE2B 82af6d6c4424f83ed9a5539d64bfd517cf08df4bb14b7f1321a379a4d87d140f1518444b503731344e5fdbb4b94d92ce23605fe2a1cc978d26901eae98a31b8c SHA512 49c4648e140b34a6d2f27cc01be7253693e79687f2ff8dbcae5ca3cc64c14f5945f942ffb42d1d286ff221e5aaed22dc1f9953216f49232ce311c4c18130754e
+DIST pyproject-fmt-0.3.4.gh.tar.gz 14400 BLAKE2B 3ab116fe4d4f683eb3700ca2cb855744111b806514ef18f56cbe6628bfdb6935b813e852ff6ff64716959f1580e8817f485ddcdec6c463ecf5c8935912316528 SHA512 0e3adddfbe8afe3b9da85033ceea7c4e37f59bf48722a5897f6e7f2963cd95ba9eef7309c095f4b3fbd927a6486a058289cc3fa5f90c0108a75686b1b81d13e2
+EBUILD pyproject-fmt-0.3.3.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
+EBUILD pyproject-fmt-0.3.4.ebuild 776 BLAKE2B 6cacc964e5da9df0ed7b6a89e6cc4b2a1177ee2fca7dfd97b4e1564f0c9e13644ac2897f9bc8193cd7defaec18820a5f5d0b70740d5a82dc5b734ee2f480383e SHA512 7521d1c96aff9a1b3ea7d84311e410c5730b7a3cf83c12543e49b62c523b688ef009493fdc05de3a8debe29276a884fb5be3e9d01bbca505f0125e0da1ed3fff
+MISC metadata.xml 356 BLAKE2B 9d15eb809d02ee235382282c3eaaea6ae0f3c0192045829495fae1244f88907673f5e5ec26ee5234f25267add21b34fe416d1d48e54f3a899773160bad1cbc8d SHA512 77a3e6273b92141d5a337ab28b162ee27f3f1970316fe42becf2efbd4cdbc5ed6cb26f1f24201d0605c26dfaac75db467f42b00cc47df0093336bd0629f0a1cd
diff --git a/dev-python/pyproject-fmt/metadata.xml b/dev-python/pyproject-fmt/metadata.xml
new file mode 100644
index 000000000000..2b685521272a
--- /dev/null
+++ b/dev-python/pyproject-fmt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tox-dev/pyproject-fmt</remote-id>
+		<remote-id type="pypi">pyproject-fmt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
new file mode 100644
index 000000000000..bf9e0c458bdd
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+SRC_URI="
+	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
new file mode 100644
index 000000000000..bf9e0c458bdd
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+SRC_URI="
+	https://github.com/tox-dev/pyproject-fmt/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.7[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
new file mode 100644
index 000000000000..8f8433c249cf
--- /dev/null
+++ b/dev-python/pyproject-metadata/Manifest
@@ -0,0 +1,4 @@
+AUX pyproject-metadata-0.5.0-no-install-tests.patch 279 BLAKE2B 51598be4b5d055e89f9ea1f6019effdb013855b435d7e4fb1d096a1a3376788a73f9caf47bfac2ce5e9ed750a466aee105c1efc688500f12534418b8c2bea266 SHA512 517e62ac362ddefdf9268af8ea9ed13e72a50db79596582bab16d1313a4d13bb28d972f936ba5d5d6cdf91d6a26624c247fba5c769aee14bba9c71be2ca51460
+DIST pyproject-metadata-0.5.0.gh.tar.gz 13816 BLAKE2B 8f5613c1279539116e99b6f319b687a08160360109e1ed71d5bc6c0434ee316ef7c0b7109d6769a03452a41c1b258765c849fe416b4632b4ba25990b6b3702aa SHA512 66cd447a01d0d01ab37611415bd620517600af667d7179a2696f763ae031c013393c8145ebd33f27b43629659333effa58596a02dfc5c217935c90475250b822
+EBUILD pyproject-metadata-0.5.0.ebuild 664 BLAKE2B 0ad4c61e0a704bbaf6d7d7c5dc178691908223b8329c34fbd4df1693ce4271cc6cd981cdbb862ef09f024639235f0d09a52df09947c75b21068f69607ac2b1da SHA512 666b3d87777b5b4307fc5dc5bc1743b4aa39294a454fea51eaef1d4e3f042d40b4cf1368259a09dff6cbcf189859ed09a208d131c60755d2df50e559fe319de9
+MISC metadata.xml 378 BLAKE2B 1a955f7f514244f3ec1f106fc0373a1ee22b642d953367cce2f0877f05a42d959b85fe7d2dc0ea96660551e6028e99ba5ccad2d706a39ea4ef23986bbe6a89f7 SHA512 2754e713a2c45eb3ab729054ceaa6a1235ab61f815226a484f43a5f04604deafb20bf7d4baa61fdb79bc4ec8d53b27dade04596c32bab7e70e7b65d360bc4de6
diff --git a/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch b/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch
new file mode 100644
index 000000000000..0d57d4760b90
--- /dev/null
+++ b/dev-python/pyproject-metadata/files/pyproject-metadata-0.5.0-no-install-tests.patch
@@ -0,0 +1,14 @@
+https://github.com/FFY00/python-pyproject-metadata/pull/24
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -26,6 +26,10 @@ install_requires =
+     packaging>=19.0
+ python_requires = >=3.7
+ 
++[options.packages.find]
++exclude =
++    tests
++
+ [options.extras_require]
+ test =
+     pytest>=6.2.4
diff --git a/dev-python/pyproject-metadata/metadata.xml b/dev-python/pyproject-metadata/metadata.xml
new file mode 100644
index 000000000000..43c0a77cccbd
--- /dev/null
+++ b/dev-python/pyproject-metadata/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">FFY00/python-pyproject-metadata</remote-id>
+		<remote-id type="pypi">python-pyproject-metadata</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
new file mode 100644
index 000000000000..985f4eddfac5
--- /dev/null
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="PEP 621 metadata parsing"
+HOMEPAGE="https://pypi.org/project/pyproject-metadata/ https://github.com/FFY00/python-pyproject-metadata/"
+SRC_URI="https://github.com//FFY00/python-pyproject-metadata/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.0-no-install-tests.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index da3a4d72881f..64a3c013698d 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject2setuppy-22.tar.gz 13046 BLAKE2B 5f59a08294f3d6d9dcbd6d9cbf6769abb523e8a409944157e9e8dc8a03944d173c1656c18da9138e220ad1ead31cb6af70bea8628c0e7164357af32a86700ec7 SHA512 8fc2975c8b4384b6a79008e2fc1de6acd2bcb27c9232b45ae5bda0e40f5a0be330ef7c9ef4ab36ab8ab33e9faf587b19d8fb431d95c866ccce46afc975f3cf26
-EBUILD pyproject2setuppy-22-r1.ebuild 808 BLAKE2B f64764b47d43d2827120d58fad8c9f013c79e0adcb75678975485ff3c5ab8b3b6bdc23e8a0adfd7efa0b99b54c7982e4afe168159cabbd966c82dcfa02887023 SHA512 06fca6f05b0fe0a5c78abe2da8c6088edf3675cf54aab219fe49b1d1f0e64f57fb3a5f3709d4cd4552a94783f2d74e13beee006a6b60ee9f03c1bff855eff84c
+EBUILD pyproject2setuppy-22-r1.ebuild 808 BLAKE2B 12ac3f5b6c21932c079b3abd51f5e82be3cbbb538cf2ef47b984535d6860dbc6b7d0df9305633e0696e26336eba65355e11a265c7c23009efb2b20e878ee3d62 SHA512 8430e288e4231c4ca7a880dfc1fd82d872e597094156a36712da38c8c0fa6ea993405cca5c52e81caadf5f4be1f084202f494bd116e045197d5fdb0b851a2f47
 MISC metadata.xml 431 BLAKE2B 6403b7a6b11b6d90ce2a2978e3a57bf7c837d0ef5d2af3e5fe45f105aceb0c32e1a76cafb9dcf8040b0ce2bd884739a66aff2bd318cab35799e26efd1426c73c SHA512 6638d532a2ff39492b13f9114f4ed22c0ffd2bbe1c28f53fe1f9f9ae6731a4dd05ecea612b65d3bff830f5aadf5c87241f0cb84b2403513707ed453c4e091f37
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
index f92e2bdaf37b..483e37cb59f7 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
diff --git a/dev-python/pypugjs/Manifest b/dev-python/pypugjs/Manifest
index 9ddb6195c837..08fd38319949 100644
--- a/dev-python/pypugjs/Manifest
+++ b/dev-python/pypugjs/Manifest
@@ -1,7 +1,3 @@
-DIST pypugjs-5.9.10.tar.gz 48890 BLAKE2B 474a7d4bffaac17e282d7cd910cafc58d9d25d2d1250159cafe454e6a706eaaa9937c31129061c96b8a1f5eb008344e446ea3d86d0e9f02cefc614653ce6cdfe SHA512 f7bfe3567c40f485e048710c31d40ed008a85353f48169056a6f5e48907bf7999b0142b32b45ff413e08aef81811039af9384c86c259adb4d8458cbca422eefb
 DIST pypugjs-5.9.11.tar.gz 51440 BLAKE2B 19aa91fadb1bcfe871420001429ac17559e136015649b94d2a0ec4b80fffa5dcbed672ac036f8865623acdf51b6188bf195a9a27b55612cf7f1c8285fd8d4a68 SHA512 512f5e0296166e73fc12fff816acf35729173a0d275661df36e536ea9a86300f2eea01440d028fa6faeab0d7bfe6e634acab22ed89d97558eec948d3726197c6
-DIST pypugjs-5.9.9.tar.gz 49022 BLAKE2B 26bdad4bd951eb8e515a0c181a56f68a8fdf8131dbd9e61c32c266bd91575143006f3cb6c2f477a2406110b22ed279a1167821a1b1f403a73bb333013173db2a SHA512 f34fab60e4f9d0680a36e5d2a28c5f99668c13b296a1bb70778dced235d223c592d49adbadc2f70b1a7e350f28a2f29dbce8febe2b8e99d60a0e050254180c71
-EBUILD pypugjs-5.9.10.ebuild 1124 BLAKE2B 690feaa0e12cb860d254af786d53ab33fb5d82aa180c551029bc8be9da2553fc60fbd435a5787bab30aaa65173db672be60eee459fbd029073aa099b5dc5d671 SHA512 f84a692f968127b260c89b5cd5005098f2cc5252bee6a070b66e3f06835d150537b19537a63fd1d4921acaa335d22075ee26783d1fba645daaa278478702d4f1
 EBUILD pypugjs-5.9.11.ebuild 1194 BLAKE2B 8ada222997eadcfdbfaeef250454a730129c96301782440366e5914f5a1bc0157a2533621e8ee159f2802d84178770dcb214330212f792a7f9ec342bf1a93e99 SHA512 373ace770d2f596f067d44038d4f01c0de834c4b8aea0c2d4086e0a3c29f60cb82eb17b7b992d374349ee7bd53e5af4a579be72d73f81cc23baeb85c55ab829c
-EBUILD pypugjs-5.9.9.ebuild 1117 BLAKE2B 81d4c83a00f438b23a5e3e969291309d61185b5c7559f626c5d53746a0c6161d84fb5451321bf533bae5b94cabfae48fbb1ee48867f8c5ede4ccbd8e0cfd81da SHA512 1e3894ecafdaa82d6af1c928f026e3711186e2344def94c791bd5022163935fa0dbed8ab6040986ce3640bf6f8b29b7f3d22bd8c36989d24f1d69a2b69157080
-MISC metadata.xml 755 BLAKE2B 9ff779edea415203b9433d398d03a465465e53dd1cf767914d870b1e0388f691d40e30eab978485373835a959d2104e41d1918c99bceb09063b671566149e4c1 SHA512 a8b75ce0bfa50bdfa05ed7744e1600c1e427f5b850fadcb2631d041d78beb48291726e87c981cc0594e8d56ef7a53255db4a32cb32c4965a4f9ba6f558c49618
+MISC metadata.xml 856 BLAKE2B 7adffa922d42b0ed0296d0b7571ba5f34b24d1b95de546c73cf44444099f7277889a1675b7a6f7e992211a104a03dd6cca9cabc1a51c572714cf93dcbda5bf63 SHA512 75ae21defb98d0b25837623784a4884cb1ce2b4cb111badd41cf00184f23bd61985052c9e5f873fcca4b39a8270e9b685a52a3ba790270250c74d7670c4ac409
diff --git a/dev-python/pypugjs/metadata.xml b/dev-python/pypugjs/metadata.xml
index 39737b297a81..330bfd4cb612 100644
--- a/dev-python/pypugjs/metadata.xml
+++ b/dev-python/pypugjs/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
diff --git a/dev-python/pypugjs/pypugjs-5.9.10.ebuild b/dev-python/pypugjs/pypugjs-5.9.10.ebuild
deleted file mode 100644
index 284634970840..000000000000
--- a/dev-python/pypugjs/pypugjs-5.9.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 ~riscv"
-
-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/pypugjs/pypugjs-5.9.9.ebuild b/dev-python/pypugjs/pypugjs-5.9.9.ebuild
deleted file mode 100644
index c8ca907dcf5c..000000000000
--- a/dev-python/pypugjs/pypugjs-5.9.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 69b3d91e645b..4f4d5dfa20ed 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,4 +1,4 @@
-DIST pypy3.9-gentoo-patches-7.3.9.tar.xz 1564 BLAKE2B fe0875ef002842a78fb31589f6d0b255c3dea10f2bd014231ae9b17641f65f810ac84fe7961de1a4614249b0166f2127c3aa37947f7d1d4c85860a31b89110f1 SHA512 a1dc3ee36e908e29b2bbbb100a97b7910bd4325c5dc55c0455cdca450d6b272d1463708b383e0607e9499b1932da4442f97d2da57e47ed3a4ff8fd3c78a54732
+DIST pypy3.9-gentoo-patches-7.3.9_p1.tar.xz 3952 BLAKE2B 20ff145749d24f15214c0c78f3fdc5e1cdbfc307972ad9dbc03f1b9704b25ea962434aee0d58a882912374b45f726eb449f0abafd663bddf14867807951b0a7f SHA512 3ce7a126fb7c52754d3b65e3df0786c80a98522ce78ab44fd5f81cd84a41e8b5929df2d8e4f644ed6c2265ca5da397cd7f37d44944cd08f7c8ae1cc8a2fd7e0d
 DIST pypy3.9-v7.3.9-src.tar.bz2 26976726 BLAKE2B bf1ed21c575901abac020120aaff07ab57f1404713211b19cbd1eb4d6ffc675b7933be8c6fffc2b69ab467963d6598534cd5aa90c02feddad596611d2a6b6581 SHA512 83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
-EBUILD pypy3-7.3.9.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
+EBUILD pypy3-7.3.9_p1.ebuild 5459 BLAKE2B cecd4e9ef25bfa9c5c26e444d74eaccfe3a6f588c33af1f64ab0419cdf8944a5b6d78134fadcae6ca682edbe48197df765c830f9cc22a80fb2fa3e5a220fb61c SHA512 30c1a6315502c2fa6d219567c4ec827244257a4f4bdde204fbd0374fd0c1320cbf87097db029ef3822173fa2cd999799b7b79b51df3d1447f67140bee26ecc65
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3/pypy3-7.3.9.ebuild b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
index 37f7cfcc4425..37f7cfcc4425 100644
--- a/dev-python/pypy3/pypy3-7.3.9.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.9_p1.ebuild
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index 7b4ebdb1d0dc..6347a5d2fbe1 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.gh.tar.gz 63404 BLAKE2B b192c55f3e6fb5c6d2c5f245d34fc909fbaaa582586a2a60526a98fb83079136358a0012d98e0772fb73eecb5133fecb643525fae05de8eede10b6f7a6662f08 SHA512 87a307e57d470153b37cccd3e79c8e04fc8de63cc7ffce313a7cc7d7e7f53b2979125ac3680a4b261fe0eeffd476e7934fa189a679f9370d690113811cc750b8
-EBUILD pyqrcode-1.2.1-r1.ebuild 949 BLAKE2B 3ad047a96902dfacc6af87107a7579e3d6a9260f1231cd2376dee0fef241900b267d55e9711495c8eb689fc65e48a6fbbd7366617d37563ab1ca40d2a02ab979 SHA512 db137ab419c1d59f1ea9752bee41648e8873508c70d9b6ca04a260bfe78793ab4c1347142a453407afa16125230649a6ecf955a0463e1382f1ed1ba543a06cb3
+EBUILD pyqrcode-1.2.1-r2.ebuild 992 BLAKE2B af5bdfa9d1116ccf53f9f3cabf5a7ad8eb337f92fb21be0f1dd870ce373beafbe5c9bede8fa17a8938f2eba1016dba853013969ac882cc9b149a253aff78fb35 SHA512 9ca40b5b5f5599e06f91fd927e901d37c3aa5b845bb1cb09a9c8ed63b51113753ac256912605aa5b6ab33b825f53ee6d656d9706aa2205d60f003d815dd6e202
 MISC metadata.xml 686 BLAKE2B cd95896790f3aaee11fa9f6df8c61ca6bea93fded2f2580b6ddf0a345096a53b12d1cc5d9053d7ec9da5490631b6915c1225557c5961880bf878f6d212575d82 SHA512 9f6a5ddf32b3defdc13430f3366cecc5ebd0bf9038b556ee05c33a0c1b05c63ba845abb3a0ed98da3aea6f15e18b18b96e896c0a745a57ec39f48291f17143f1
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
deleted file mode 100644
index 07e0907a60d0..000000000000
--- a/dev-python/pyqrcode/pyqrcode-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-# upstream doesn't do tags
-EGIT_COMMIT="674a77b5eaf850d063f518bd90c243ee34ad6b5d"
-
-DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
-HOMEPAGE="https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/"
-SRC_URI="https://github.com/mnooner256/pyqrcode/archive/${EGIT_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="png"
-
-RDEPEND="
-	png? ( dev-python/pypng[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/pypng[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# don't pull in tkinter for one test
-	sed -i -e 's:test_xbm_with_tkinter:_&:' \
-		tests/test_xbm.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1-r2.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..1eeacfe0bba7
--- /dev/null
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+# upstream doesn't do tags
+EGIT_COMMIT="674a77b5eaf850d063f518bd90c243ee34ad6b5d"
+
+DESCRIPTION="A pure Python QR code generator with SVG, EPS, PNG and terminal output"
+HOMEPAGE="
+	https://github.com/mnooner256/pyqrcode/
+	https://pypi.org/project/PyQRCode/
+"
+SRC_URI="
+	https://github.com/mnooner256/pyqrcode/archive/${EGIT_COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+IUSE="png"
+
+RDEPEND="
+	png? ( dev-python/pypng[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? ( dev-python/pypng[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	# don't pull in tkinter for one test
+	sed -i -e 's:test_xbm_with_tkinter:_&:' \
+		tests/test_xbm.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 36e0dfc3b576..c81139d7e2f9 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
-EBUILD pyquery-1.4.3.ebuild 1135 BLAKE2B 7cc7d0b4c04403934b99ef4412f865a6fca9e5477db49f96571954528df5c993454aabbe9a756633fbeb3ab521ab3902f0a8d134f99c431ee711828ddaf1961b SHA512 0a89f46b4063998dea4e0d2f71c0c48eca4ece797c4ee5acb31ae06b8de61e570b4335032afcb81fefcc515124692140d32387014a2bb4a82d674d3cd81627c7
+EBUILD pyquery-1.4.3-r1.ebuild 1062 BLAKE2B 2926dee0ed1ddf8804702e2768150eb5118f38d9dcbaedca1cdc821b3db5ac6d7cf97ef6945a92b2fba7fc49a28c3a60e7e827587af6c3316a6a5ea548762de4 SHA512 fcae523a7ced35db8c70d89bd8ee707806288eb156324844541726e327f1ac46c9958c233c80994b022fb9dc855832df3a4b4b4b172c633a815e5ad01bdc8047
 MISC metadata.xml 401 BLAKE2B 0b74798cdf7529c934996c257374138a47c2d0e9a2b1b6b14511bf913f092d41c09291ecd9bf878b9aff3bf6e0956b0fbf9a59f721e236090aaa5a81db913c80 SHA512 f056c0982c8e233a79b23e9cdcbfcf6b6221e7cbceed7f5966fead5b9f8b7add936754de95650b2b0b8a5c2f5d9d76642ac861baba7379185acc886f01ee92a0
diff --git a/dev-python/pyquery/pyquery-1.4.3-r1.ebuild b/dev-python/pyquery/pyquery-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..cb8521e93776
--- /dev/null
+++ b/dev-python/pyquery/pyquery-1.4.3-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A jQuery-like library for python"
+HOMEPAGE="
+	https://github.com/gawel/pyquery/
+	https://pypi.org/project/pyquery/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
+	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
+	"${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
+)
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
+}
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
deleted file mode 100644
index c3709e9b3aa2..000000000000
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 optfeature
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
-	"${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
-)
-
-distutils_enable_tests nose
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests -v || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup4
-}
diff --git a/dev-python/pyroute2/Manifest b/dev-python/pyroute2/Manifest
index feb6b41dd8b5..50c30604565d 100644
--- a/dev-python/pyroute2/Manifest
+++ b/dev-python/pyroute2/Manifest
@@ -1,4 +1,7 @@
 AUX pyroute2-0.5.12-readme-filename.patch 332 BLAKE2B 37df4e22ef010582c9675a081d25493715b0a4cfd93c14320cfb58af576b189a282cf5ee774d821e24e9de1342e6af56c5508882b44fef1e63ac3111f70830de SHA512 9fe059bb14e7ecd98a9cfb749cc8dbaf68e52e3d1d0e66eb8a7a15a4b6f0161d4618a9b64fc20de4c15b4e5f750df82c648fd5169918c2f0dabfb9d3fac09a5d
+AUX pyroute2-0.5.19-exclude-tests.patch 323 BLAKE2B 21d429d3762fbd07566afaeefffa4682b35f5b0d5591d0525421973a225b10173a692c21bd46cf7d443d2ddda03289d9616ec0d299feb26aa712d57886daf678 SHA512 beaa77a3cc4e3987c50a797d6decdcf626a90dbbd34219738c3f6af8bd875282272f6fd6d6f59178e2a481e8e4274e3e5d6210a2b0b3c76a90cf94261a39f911
 DIST pyroute2-0.5.14.tar.gz 436853 BLAKE2B 9febcd6563d89b5ffd71342d8d83a3251494f978ad4449532b568cf0929c9f3d8d8d36e1a0b0f6733013e12f6322aea46d991a22f5c3fa93e47dfa08376ddd13 SHA512 9601cf8133b703c55770b6292cca1e907a029689aaeb350b6eee40406b56de5563ee0ba37b4814540c365a5974be78a024dcb27bc7ee00eac74676f4013cf277
-EBUILD pyroute2-0.5.14.ebuild 845 BLAKE2B f092beacaad15cad9954be29e8de69aaab504bb49a6a386089dd4bc15fe1feaf63fcaa75cbbd16fc11cf58eac6e03dd1a6e8ff07d5c0de6bf13212b39c3575a5 SHA512 996b550bef79f660a20f90ab38d91b4885c674e5f89e218947a365793792e4dc70b5d86c736bcd934dd75e8c825c4ac30091e618ecb2dd8f880d81cc7199511a
-MISC metadata.xml 513 BLAKE2B 18f41c6f7f743d99f819a0241807fffd380747e586e1426704b40f2b789fd681f43890b2fb3c8cea94f0c80d45d0d43edd722a39007afbc9ac94eeba7858a5c0 SHA512 476f039d7d4bded895eb4d30c5fa07fe66b61b612dcbd533d6a5ada96a267336914b3ce9ade638f8f19438f9d0700e47ff95eb8c0ae710fd597609d7e3d01f69
+DIST pyroute2-0.5.19.gh.tar.gz 457432 BLAKE2B ffb2717c60badb1453eeb15f5b83f1494e851ee011fcdebd3a5d249ecc4bea7064069a1af2fe2d34aefe9812c8b6808b8a14cbe518383c165b0b008d10505c5c SHA512 19b0acbff17415acad20a214e0622ca9a3fc51b92e603ab15663ea7e8da290fc0b2033aeca1c20200307e34173802f89998151f77d5bcfc5f87eb8b42ba591ce
+EBUILD pyroute2-0.5.14.ebuild 848 BLAKE2B 1a575140957e1275b3590a1ca0c8799fd691edc5ab9d0e53298420011223c4929cb7f0687b12aa2a6b7059b2971a10977bb9ad03a6f13a5acda283f14702ca39 SHA512 f94cc4b0d7a50bb3fa045950cc8a1ef71a422c64d24af01fa750fb0905d1ebff3a56d0be822a2cb43899de38d5f52eda2dad59cb210d03f5da7da1a0d6bb37bc
+EBUILD pyroute2-0.5.19.ebuild 566 BLAKE2B 133f408834ca25c36ea849fdb311e4566ae1f1d21840287cbac5163ee5b3100bbae792e357fe5991f57d06e93c97e2c1fcfc1171dc95e4c49b2e342675ed78de SHA512 2345e5786347b186efc482656be3c4736e32db609686b58b981db4cd276dc52205a13dd075d3389978dfc79f568f564f94cd515353d8a037b3ed6a64ba3148d5
+MISC metadata.xml 547 BLAKE2B 1d256c8d9bb8cc039853ff12c15d7c2747822ff95e3ae7f3e7c1600498c7b886a341a03327992e3a7933592eba0094eec6fba519b0d9f2b2f0ece57eb515ea4a SHA512 e845b3e319e9d60b1dcbf9ab66681b886b0c517a5a72288aaf9ccb97d5018dc3b01b8d921b8a9fcd3538cec96e9a7e1c452a704c8c422ef6e6fa6069a7ae56ef
diff --git a/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
new file mode 100644
index 000000000000..723c638349b7
--- /dev/null
+++ b/dev-python/pyroute2/files/pyroute2-0.5.19-exclude-tests.patch
@@ -0,0 +1,13 @@
+Index: pyroute2-0.5.19/setup.cfg
+===================================================================
+--- pyroute2-0.5.19.orig/setup.cfg
++++ pyroute2-0.5.19/setup.cfg
+@@ -35,5 +35,8 @@ packages_dir =
+     =pyroute2
+ packages = find:
+ 
++[options.packages.find]
++exclude = tests
++
+ [options.extras_require]
+ ss2 = psutil~=5.0
diff --git a/dev-python/pyroute2/metadata.xml b/dev-python/pyroute2/metadata.xml
index e7a8be4ba92c..2ddf3cfd395c 100644
--- a/dev-python/pyroute2/metadata.xml
+++ b/dev-python/pyroute2/metadata.xml
@@ -1,13 +1,13 @@
 <?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 type="person" proxied="yes">
+		<email>henning@hennsch.de</email>
+		<name>Henning Schild</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/dev-python/pyroute2/pyroute2-0.5.14.ebuild b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
index 958de6bbd127..aa6e0a92d04c 100644
--- a/dev-python/pyroute2/pyroute2-0.5.14.ebuild
+++ b/dev-python/pyroute2/pyroute2-0.5.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-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,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
diff --git a/dev-python/pyroute2/pyroute2-0.5.19.ebuild b/dev-python/pyroute2/pyroute2-0.5.19.ebuild
new file mode 100644
index 000000000000..6a607f41ac0e
--- /dev/null
+++ b/dev-python/pyroute2/pyroute2-0.5.19.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,9,10} pypy3 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A pure Python netlink and Linux network configuration library"
+HOMEPAGE="https://github.com/svinota/pyroute2"
+SRC_URI="
+	https://github.com/svinota/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-exclude-tests.patch"
+)
+
+# tests need root access
+RESTRICT="test"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 6918e0a362b9..cce73d1b6dbf 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,4 +1,3 @@
 DIST pyrsistent-0.18.1.tar.gz 100522 BLAKE2B 75632d254993666076a68d81b8b5a7aced8601146fed5cd63f1d56c5e0578650a197aca7630855de32a8447eab972203aa7d83009398f96e6f374c0a4b2cc1ba SHA512 353ad6e9165e1afdde37730a9289cf8dde28491abb688d702a8c8f5279e24f5ce387a5d00ac4a077322299f9c1a535781bcacdcd1cb914ddb317b3ca9641778b
-EBUILD pyrsistent-0.18.1-r1.ebuild 661 BLAKE2B 5ad77e6fd913eb877eefa8d08bc13b9fb449a1807d095097fa1bec0601749c9164d3ab2f51ec84b7e3ec6837aa461da68a6b4f2b00ea27454a386a8894007c09 SHA512 be6bed4b86d2ba4c2c276acde3bc4fe1ea1041b8a6b5c60c96b55620edb3c522d029503816040c79fec1a0d0169bd4e5714b6a0486b9df9f3cd83c39b12dc2c9
-EBUILD pyrsistent-0.18.1.ebuild 616 BLAKE2B a2d43fe6363553ffd48d861f11e5ab2ca42a094efe57d28c34262c42fbed433d0931fdb9b2df14a2b55b21593e949ec0d1ec4a07522b4768c5665adf7fae2e87 SHA512 a06c47df02d6a6581210798634c667425d52384057a03f142128ab1283b4d937d851fb89ed84aee23389df0d780b59277cd2e6fb83df04379943af6cb46096ca
+EBUILD pyrsistent-0.18.1-r1.ebuild 653 BLAKE2B a0e141f6e4cc27b30ffa4d7fc77d91b2a62c0b21ed6d098b6aafb9243bda9ad0bfea46b3ad866dc4b369baad8d09552b7f2578b56bf4b4214de6eec4477f5da0 SHA512 38a60e54664c6865abcec9f02931cc92b4ed4427fcd6c278faa9b9d6acf39674a4487ba636e0587927ca39a353297bb86a686a1763183c941eb049411862c551
 MISC metadata.xml 522 BLAKE2B fbf571fd4d833fea0dc9942620655c45bb91b07ca02e2e0fccb23980de26303b9e9c3963453cae3775f7db33dfd485a4a55782a1b1b2b635af0d62e331596b99 SHA512 fe358befc92e29769bc2f84a516da1a26026e4ab84e812326da72ee02b18c79c3d6acdfb71cb6027d2d0f1e559cc00cf39406e335fb8f38d4479353a7dbb4ff2
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
index 7a4e9ef1fc6d..2485fbfa66a7 100644
--- a/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
deleted file mode 100644
index 4eb37e40b485..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.18.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 ~loong ~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 4292c0b3f1cb..0792a3c16bfc 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.3.tar.gz 150092 BLAKE2B af7d58266044792987e6f9a2bc708ca043e32c4f87c8622b5662449254e7d6b630d5769479f3eaf59dc9a3a9fa294330953dea3383aee6c216f3d7dcfd26266a SHA512 2f5c762fe4a7d8d3292f335fda58f8f2f88729ea6d33a508e5f461692fef8d006ccc9b761a78750b8416dc5c1f7c6b06c069e3f6e7b19d91621226590bfef708
-EBUILD pyscard-2.0.3.ebuild 789 BLAKE2B 2f03d446d184b7f8abbe76cc5b8378176be470dce86403400172f23de91bedbe72c91b725f247ef0a139b29d2d75429e855099bf7ac64e9b22c0601acff49c94 SHA512 3f07f9177afb49e260f86ca85c87c7ab814356f64857931e197eb94f85b662756ccf8ae6431851c22876979357ff9512a4782dac6772332084e4cc4864988d10
+EBUILD pyscard-2.0.3.ebuild 789 BLAKE2B 52df9e501dbec8dbaf0fdb62e3ce2c185cc4dcb3d055112742cb0b1709991efbf75df91ca423b3a6818b9823381898296e100fbf601149e2b9ab912c112a521d SHA512 72ca54672141d40f36d734d31b1a878eda3ed7c1468055cc4d475566bada4b33248c9f66f1a4998ae90b65c21fa955559cc6f19ffbc5ec5134fcd82fb228a5ee
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.3.ebuild b/dev-python/pyscard/pyscard-2.0.3.ebuild
index 9396b82e059b..4a3457a0eb60 100644
--- a/dev-python/pyscard/pyscard-2.0.3.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 optfeature
 
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index 515112a4d0a3..8e0c30f35eaf 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -1,3 +1,4 @@
 DIST pyscreenshot-3.0.tar.gz 32865 BLAKE2B b39d338be4f1dc23fc30fe84a6f8ee6b6346761b023222438e8ff33e01beafc347d34118332efb053057c54383f5468e73049041889a6140a70c0f928c655661 SHA512 f8070941ade2bc710157238f47c9575df1504ef63152980b2bc0edd1f69c9ca4aeec3f738929de1c81a51fed79838053674626981ec61d95dafa7b9998004606
+EBUILD pyscreenshot-3.0-r1.ebuild 1013 BLAKE2B 981fa42c2bada24e4ea335f6b750c1f885aaced53178e79d741f1d812b8d06101203cb4757278b14891ca2404cc914cdb27c2dd44eec2e0dd168559c003a75f0 SHA512 cc149cb9c02c330aa907b29b84f8017e9e16c6f2e2c49762085d08e908ed02a9f907c0462a8edfce1bd9343cfdd1d2138e6931ba059687fff87dbacd82af0615
 EBUILD pyscreenshot-3.0.ebuild 980 BLAKE2B 39ed92785b2e03db21bd52a81263f0c374503a0d688cc328a214e1493dc427b9c28a74068e675ad1f83de06fd8bf988eb42da7df65c78cd6168d61ff5ad8a104 SHA512 937d6c9e7e3482026bd0e709b28c0aac885755f9a2b8c7936cff511adbf90e66777c49136d0dbfa167b393a32bc361b7e349e3630f97323f46e7f6dbacd80322
 MISC metadata.xml 517 BLAKE2B d76772ddeef8328b34da232460ea50b4d5028c4bb4a10249bc505d41260e2d99ddf6cd75b4c3a757d3184cf95a283f69cbef7823715848119c118cc6dbcecbbd SHA512 55968d60cdb0a300a5a733a3d1e1ae1ccaa828691cadf2c36cd0e4e7c56c665f16e3ab82c3c22e7d39419ae2e1ef1d83e754567b576d160bba1384ae0e3c820e
diff --git a/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
new file mode 100644
index 000000000000..673bf65d8b11
--- /dev/null
+++ b/dev-python/pyscreenshot/pyscreenshot-3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python screenshot library"
+HOMEPAGE="https://github.com/ponty/pyscreenshot"
+SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/easyprocess[${PYTHON_USEDEP}]
+	dev-python/entrypoint2[${PYTHON_USEDEP}]
+	dev-python/jeepney[${PYTHON_USEDEP}]
+	dev-python/mss[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+		media-gfx/imagemagick
+		media-gfx/pqiv
+		x11-apps/xdpyinfo
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# skip GNOME/KDE tests that require D-BUS
+	local -x XDG_CURRENT_DESKTOP=none
+	virtx epytest --deselect tests/test_check.py::test_speedtest
+}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 80affebe4de1..f91e5a08b944 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
-EBUILD pyserial-3.5-r1.ebuild 879 BLAKE2B 90bb0e17ae2037ed66a397fc95a819f9b320bae4f207830f9eb082f542af9bb8926d08e3a1ed3bf79e043911dbcdf9227aaffd3e370651c3a37dad4ab0d5b763 SHA512 81896771a60414eacba40fbfb51cf59bdb23abc4f6db2bb9d916c58248ea062aee8ba9e2e8e0182b4394055c1571cb048d01eff8522ef126d31fe674c2dfeaea
+EBUILD pyserial-3.5-r1.ebuild 879 BLAKE2B c0d4bb16b988e271cd4f9f5bf106c26ebf0dca6c2448c160fd06326386519d806a9288b6391fec3080c5fd10fe47ea64271ac867d5ca2f242e1e30981eea7bc7 SHA512 90d3ae2c761b475b36f1f6ef9bdb20cbad9cf566a25160dd154bec41f15515b99f8a3d649f00006ae7c63607557c9f3df541b5acadf40756534cb57173ed54af
 MISC metadata.xml 446 BLAKE2B 9242526e2474443c6bb0cc1849dcbd28ae0eaa6ce835b28c99059ef40b3bde19486e6bbc68793b1edffae5e12029b4cb613fe6446df11b976eb49c0ee6889ca4 SHA512 d05a16f86a16a3f6a7d53117f5497fdc9d792171fde7af865b3a126494794251b8b9feddb80e221f21ac66443a90b3ae9d4ea64fae24f1c27dd269299714ba2e
diff --git a/dev-python/pyserial/pyserial-3.5-r1.ebuild b/dev-python/pyserial/pyserial-3.5-r1.ebuild
index 8eaf645e6b8e..3815a6ffc214 100644
--- a/dev-python/pyserial/pyserial-3.5-r1.ebuild
+++ b/dev-python/pyserial/pyserial-3.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index 0944a5c0fa87..6c1fb3b6aa5f 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,6 +1,3 @@
-AUX pysimdjson-4.0.0-unbundle.patch 2582 BLAKE2B 2005c989186247775a8929b81fe5cf4ac2d7d7e83b6b4b3116f00456ad03cc2e9d6e554e624a129ef6e62e1e3310cdc57b97dbd5452d984865401ae88b057b07 SHA512 49a47e18b7da306bc347675fa1b1a822e9365ef3a5b9d4f3eccdef5b32d6bab9f5d110b93dd90c65075e6b21027d07e93ac6469388d6609b750ca9d72121de19
-DIST pysimdjson-4.0.2.tar.gz 3740054 BLAKE2B 379c8637096074615f2045171e0950af0190e8485db6a1734f4fcd19d9eeeebd91cb79c18abd2fe6256287f15aa6a3c12c1283e4affa131db14f9948ab2f0d63 SHA512 537b7958dd3429831ee201b6a4fc5fa8fca50ad14def016b472d3f234f81175441152c1823eed0bcad06f59e274e2b6b036f26a3af8f6977ceea5807471de4a5
-DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
-EBUILD pysimdjson-4.0.2.ebuild 875 BLAKE2B c3885af46c512f68eae0b2605368a09272dc2b61fe416e841101e6363191e574715fcca104c34f6c13f42dce61ba2b9e9e0230300eced63e3937555e36e6fd30 SHA512 92d93fdc48c43748f4e8359beb026b33899aa7cc71bae32196309fe5291ccf1d221af862112b376215ac275631c092ed4708633be4c25e2c5db11215a82cc680
-EBUILD pysimdjson-4.0.3.ebuild 996 BLAKE2B 6129b38ac39b0040c6ef0cbacd36d28643287d0b1817fc4573f443473e115021f147c3499dfec63832d0e4cc2b27148c9e5cced5f297fa86b52ccfeda378d6c2 SHA512 9148a1b1fc0e5da24ea4a63fe7e1dee2fbdf1c7219141119865714b5427bd92a201d04ef13f8e7407caf4135de0bf628abd645640463bc83bd58eaf91602f127
+DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
+EBUILD pysimdjson-5.0.1.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
 MISC metadata.xml 424 BLAKE2B 2ce7103dd2d65113aaac5d7acbb50e6fd92726f640c3917339bb1bcdf6124b6c3f1d926c73ce0beba130aa20ede87252a2fe9e0fe4d89bb7c4c9501b4931afd8 SHA512 ba65f9b7d1340d102a782321859be6b03aebd755eb4c8bb604a0e71ad25056f2029a77c92fcf623130f8accd6137f1722e99db3d0b91d9d00d2331cdea5a9bc7
diff --git a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch b/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
deleted file mode 100644
index de52bc063a24..000000000000
--- a/dev-python/pysimdjson/files/pysimdjson-4.0.0-unbundle.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/setup.py b/setup.py
-index f1de675..4c23028 100644
---- a/setup.py
-+++ b/setup.py
-@@ -27,53 +27,59 @@ if system == 'Darwin':
-     os.environ.setdefault('MACOSX_DEPLOYMENT_TARGET', '10.14')
-     extra_compile_args.append('-std=c++11')
- 
--if os.getenv('BUILD_WITH_CYTHON') and not CYTHON_AVAILABLE:
-+build_with_cython = os.getenv('BUILD_WITH_CYTHON')
-+if build_with_cython and not CYTHON_AVAILABLE:
-     print(
-         'BUILD_WITH_CYTHON environment variable is set, but cython'
-         ' is not available. Falling back to pre-cythonized version if'
-         ' available.'
-     )
-+    build_with_cython = False
- 
--if os.getenv('BUILD_WITH_CYTHON') and CYTHON_AVAILABLE:
--    macros = []
--    compiler_directives = {
--        'embedsignature': True
--    }
-+build_with_system_lib = os.getenv('BUILD_WITH_SYSTEM_LIB')
-+
-+macros = []
-+compiler_directives = {}
-+libraries = []
-+sources = [
-+    'simdjson/errors.cpp',
-+]
-+
-+if build_with_system_lib:
-+    libraries.append('simdjson')
-+else:
-+    sources.append('simdjson/simdjson.cpp')
-+
-+if build_with_cython:
-+    compiler_directives['embedsignature'] = True
- 
-     if os.getenv('BUILD_FOR_DEBUG'):
-         # Enable line tracing, which also enables support for coverage
-         # reporting.
--        macros = [
-+        macros += [
-             ('CYTHON_TRACE', 1),
-             ('CYTHON_TRACE_NOGIL', 1)
-         ]
-         compiler_directives['linetrace'] = True
- 
--    extensions = cythonize([
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.pyx'
--            ],
--            define_macros=macros,
--            extra_compile_args=extra_compile_args
--        )
--    ], compiler_directives=compiler_directives)
-+    sources.append('simdjson/csimdjson.pyx')
- else:
--    extensions = [
--        Extension(
--            'csimdjson',
--            [
--                'simdjson/simdjson.cpp',
--                'simdjson/errors.cpp',
--                'simdjson/csimdjson.cpp'
--            ],
--            extra_compile_args=extra_compile_args,
--            language='c++'
--        )
--    ]
-+    sources.append('simdjson/csimdjson.cpp')
-+
-+
-+extensions = [
-+    Extension(
-+        'csimdjson',
-+        sources,
-+        define_macros=macros,
-+        extra_compile_args=extra_compile_args,
-+        libraries=libraries,
-+        language='c++',
-+    )
-+]
-+
-+if build_with_cython:
-+    extensions = cythonize(extensions, compiler_directives=compiler_directives)
- 
- setup(
-     name='pysimdjson',
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
deleted file mode 100644
index aea670752664..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="https://github.com/TkTech/pysimdjson"
-SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	dev-libs/simdjson:=
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/pysimdjson-4.0.0-unbundle.patch
-)
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# bundled lib :-(
-	rm simdjson/simdjson.{cpp,h} || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-	export BUILD_WITH_SYSTEM_LIB=1
-}
diff --git a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild b/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
deleted file mode 100644
index 303773b7087e..000000000000
--- a/dev-python/pysimdjson/pysimdjson-4.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for simdjson"
-HOMEPAGE="
-	https://github.com/TkTech/pysimdjson/
-	https://pypi.org/project/pysimdjson/
-"
-SRC_URI="
-	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/simdjson:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# benchmarks aren't run
-	sed -i -e 's:pytest-benchmark::' setup.cfg || die
-	# force regen
-	rm simdjson/csimdjson.cpp || die
-	# unbundle
-	> simdjson/simdjson.cpp || die
-	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
-
-	distutils-r1_src_prepare
-
-	export BUILD_WITH_CYTHON=1
-}
-
-python_compile() {
-	distutils-r1_python_compile --libraries simdjson
-}
diff --git a/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
new file mode 100644
index 000000000000..16140f582754
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for simdjson"
+HOMEPAGE="
+	https://github.com/TkTech/pysimdjson/
+	https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/simdjson-2.0.1:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# unbundle
+	> simdjson/simdjson.cpp || die
+	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+}
+
+python_compile() {
+	distutils-r1_python_compile --libraries simdjson
+}
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index 6803bfc709cc..056ad5e7be57 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 418 BLAKE2B e6d680c3ce25aa3208c10d6719be0193f8cf98dd2cf01cb75c5075480bf6bcc26b71125ac0432b539a0e55783ab191c1e598fcd2a7b04df36aaf6f093ddcce67 SHA512 14d9b5cde4572c99b4fb0c6b019a34b9ed86aa2d8c4edebbf72f159e06cc0f943490657bfb14943854646ac87eebbf8d26f3342043f2db90df9682cdd45d529e
+EBUILD pysnmp-mibs-0.1.6.ebuild 419 BLAKE2B a863374588e780a6d34917ffb21d84a97a97b97c296f2d68f4499a35b8af5badbaa12daecf9f03377dbecb6ab2a45e6dee7f714141e18be3c30c68a9f60aca3b SHA512 e42479c5c6049f14006fb7ea763eff25e373514a5dba0286977e243da6a14aad6501a372033c6fa0cc31469d6dd7d71a9ed559edd6b3f43d181955ec15520c55
 MISC metadata.xml 1607 BLAKE2B 107ed99b0739df483bcc869f08befbafd79c5278b0296cc7c604cc592ef68c138b0fab4cfb302261b7111fbb9bbbb1f62b2e3dc1b0e03857598514488f397059 SHA512 5628650d645a873adf817639d7b8a5bea54852004f64474c39489b7815ff48ffdcda13b9ffeac0c34783e957ec4a4adb5e537fa11333b30310be3269b27a495a
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index cca89c2e7910..04cf09d681c4 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-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..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="SNMP framework in Python - MIBs"
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index edfeeac0d7ba..7ec93358dd6e 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -2,4 +2,4 @@ DIST pysol_cards-0.12.0.tar.gz 21337 BLAKE2B 5d31dc32b7b968366b34481623d2c71ae29
 DIST pysol_cards-0.14.2.tar.gz 18113 BLAKE2B 63704d97598927b600a8f34eb46565e8bf927bc27cd409579de6ac5f4b9154a881b1727c30a61381c169a267b313a4aabfe796a98341208ffb9a8327ca83ec71 SHA512 5e296819ebd6a874175c098b0000524defeb22456bdce961270ecfe26de48fb0d5f5b56eeb3457a12c51f72c9d90abdd35ebaf91244ceaa7d3034caff2b59386
 EBUILD pysol_cards-0.12.0.ebuild 590 BLAKE2B 1bb8031e5b7f168e561404715df4a9895ba7f6cb9fab0e5451174d06ecdbaf8fd6e8326e5722ce7e31a4074fa4232c819d6d0ba4c05ad422bd5035e4a4745ba9 SHA512 4a6d161548176b3926cbd80f163e2ff68faef6eba946c690d999884936a6fa074b44ebe90ff2cfa34d7b78c0f66ca73bc162105ccd9ef235121375649427b946
 EBUILD pysol_cards-0.14.2.ebuild 498 BLAKE2B e6c6024a8590fb53cb773924b6d1bc4db520d9a3947546d7b2517120a966eae64a067680de166ec1817ee32159144af7d79980a2815178b600bd5550783a97db SHA512 9f38e8ae8b9148d5cf905b01e0ec09dd72498a52f91d5591a91f859bd71ba910ae34ab06b66545106ef80a011b7c7375f637a1cf7d053fa429a81f50b174f8dc
-MISC metadata.xml 373 BLAKE2B 46901a318c0d1ded50b8b76a38fa58a226a039d6248787bee65af0665b78425626b0e1aa3c229822bb8df1e1a6c723584d74ad9c6eec9aff4389f5914ec1e8e8 SHA512 3c4ee2f2e97f67dad2026c64ca9be9dd486b7cc668c8e5c51da1c9dfcd11234c1c81685a1f3acf51ed537f7c9c118f484d2b95805ca2aa393a9d718859c05ded
+MISC metadata.xml 474 BLAKE2B 47398a90962b1059e1d2725f7b20dbc10586cee53ab27eff6a9d0c8d93cde1b103580494a38aad77a3ae04c7f7a95bcbe52722ce18476a77994e49cb64076e58 SHA512 b8cba71875a546d130fbc94e3a76a3e0dd27552ce14de46a8b6bd79f12584b59ea8e9354fadd272c4e21ac9df7f43e9c1db9087338acfbed3dc680a6d812ffa6
diff --git a/dev-python/pysol_cards/metadata.xml b/dev-python/pysol_cards/metadata.xml
index 56773c363d07..474258121ee8 100644
--- a/dev-python/pysol_cards/metadata.xml
+++ b/dev-python/pysol_cards/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pysol-cards</remote-id>
 		<remote-id type="github">shlomif/pysol_cards</remote-id>
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index d0850e8856f6..309d4736ebc3 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,3 +1,3 @@
 DIST pyspelling-2.7.3.tar.gz 151244 BLAKE2B bdfb40c6f39dc5adcc31691ef75b2582e78e8d0ed800ef0e263f8f98987ce3911650cb08085315c617c185e6ef183a11508fde4608349d0dad435b9f4fe1da98 SHA512 6903b620993933e80dfef320c0218c6372ee37f1db958b489d273aca24dd91bcc86fd12967848b8e31c2d7d458fb5fbfb521f41328c5955a1914f7d552ae7341
-EBUILD pyspelling-2.7.3.ebuild 1311 BLAKE2B 03ae67c78a43d9ac3584cdf4f1ba0dd6134fb35629488eebfc945de9617a993d59156ac154bc040d4f6b8a3fc5b65d41ed96916f269dc3def5cbae832437c29a SHA512 c7a7233335fdd98f42c8fbc2f0a6e134c67fa141187aed4403e014f3f6230c75f52b0b766f8132569da3e8f856c7a0d120b5e907357aa11e1374fed3ee7560c1
-MISC metadata.xml 1923 BLAKE2B d82f0be825f6bd90b0a20c49de49490b8efbeeaf30a2715cfcec0412e7ca0b15fbfa830a11e83e22e691d14b48ae1c21cca046d6e44b3c025cd23cc71a5a39d4 SHA512 c4e89e70fc837a9feb201adbcbbc61320fde0ecccd5a44d4db4c244d879d1648c2a9f10928e94c32952c99237160e7cc36bc77de69bde2acd6a6fabb69f1f92b
+EBUILD pyspelling-2.7.3.ebuild 1343 BLAKE2B c9c7b5fd242d35b7409437ad367e057d6a9ddd16cd46887e01774fba63c0b3b87447d94cc20ac4e8840f8edfce8b577365d5a9a6596e85e91365b1293adfbd8c SHA512 2c11f06a26a6b07ed3dc1850bde45bdba8ec9fe98408709dceae09ee08944baaf909ff7e0a9165cfe74135966df19515547c585816f17418e00c93f464e9580a
+MISC metadata.xml 2024 BLAKE2B ba187994d3fba90c24276f96371a70a47c652c85ce20d4a11b2a74707e6345b202db00af9771cdc41518267a5a6b0c1ea85d7b68401ff8cb421cfee1fbba98c6 SHA512 53d11553f7e4fbb5057809e0eef8bc33564226bb92c0900f7cc40e8fcbffd20aef04b4635bc2ff2d0c778475fc564a4de02afd1293099710ea81490a435b3f18
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index 4acf9d94155e..f2f1fdc55a35 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">facelessuser/pyspelling</remote-id>
diff --git a/dev-python/pyspelling/pyspelling-2.7.3.ebuild b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
index 9a2227b6667c..baecf3bf8bfd 100644
--- a/dev-python/pyspelling/pyspelling-2.7.3.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.7.3.ebuild
@@ -1,9 +1,10 @@
-# 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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
diff --git a/dev-python/pyspnego/Manifest b/dev-python/pyspnego/Manifest
index b7194f6cdb57..b8e86f2583ac 100644
--- a/dev-python/pyspnego/Manifest
+++ b/dev-python/pyspnego/Manifest
@@ -1,5 +1,3 @@
-DIST pyspnego-0.5.1.tar.gz 325941 BLAKE2B b6acb16ff91dc5c0e4b738d729096e60346e8fc74c153d567f8d766a027b96733a00c6d26104fc9fe871974d92079e89ac899f79b7920ff87fba0475e399ef8f SHA512 d5632783103359d056f2c6597d06b134147705c42a63d52c71c6007542c0fc2a8e8255872944e8153b605fe231d26f80af79f17fd5cb19ffb7b2ee560a931aa5
 DIST pyspnego-0.5.2.tar.gz 328222 BLAKE2B 7c811948d1d3890e2d03f4a532b9c0158195684b0cdee915811b1ee3bfa791b84632edb6d098562aa7b9f4c36eb00f244e249340b4de557999ec2a0f176ebd1e SHA512 805da232d138edaf4094614df0ebc4840f0c1b9deb9586026bffe0ec17d54553e4d3876ffc53d87b13687b741951a68334369f0f2475cf2f12359f072dc6a0c8
-EBUILD pyspnego-0.5.1.ebuild 1256 BLAKE2B 017c0793505ea24b7f86b58124ea1d3b688fa2517d744ce189e17633ff45313ea4826f96e3acce21176562792b55674e4a4502d6eb1b5c5617b3a9597073835a SHA512 b4a103ff72fc7091b44c2f56e9424d98b65b6d4c9267c70bb0ca46233c33fb2c1ece221f4dfa882df88e589d8937015435f27bf72b49e33201a48592456097bc
-EBUILD pyspnego-0.5.2.ebuild 925 BLAKE2B 1f0af31c89ff80bdebc9b0a44ed5ac236cceb0948dc0b1c0ea6611f57f53ad1beebcdce0af7975650de37c767820a22ce64e4bd553ff66cfd280049f560f9d0b SHA512 af4c92ee3596768655b85774c1a1e3dbbc1df886b67f6eadb01071d8d788a299e5039ba42312d604bc6693b86451e782c34156839ee96217aa9b5194e670b414
+EBUILD pyspnego-0.5.2.ebuild 922 BLAKE2B 72374a98bd8ad5eaaadb201d5fbaf996eee2050f84bf232e67eb135020f2510aa2332a7e24051ec5846cc1f6047d552dd4373d0c0a87562e4f9cbc3aa333915e SHA512 1320ae5b3d893d70604c4c32152974f59dc31399b8aff9c2e93aa4aa8d90c437c29c1f9a7b368fffde1ef804163df16e7d355241c64c53b3816e6d909dd621d0
 MISC metadata.xml 370 BLAKE2B 113adf1bd70a99f41e2b8cd4d5bb69cbd4f6bffa1dba325a8a6e35a1b5ee2800ef1d4b9ceec9be2ad1291fdd054fa81fdb841cdf40b5e969360bf1ee2e456960 SHA512 baa8a1fee20b0cea6308fbfa24fc395cd58e8729eb703692cc2a109e838284ec21559d4c9af3c99fe6d63ac6a8e04e3a3c824cb073302f788f2fa5dcf1dbf00c
diff --git a/dev-python/pyspnego/pyspnego-0.5.1.ebuild b/dev-python/pyspnego/pyspnego-0.5.1.ebuild
deleted file mode 100644
index 261f1db15a3e..000000000000
--- a/dev-python/pyspnego/pyspnego-0.5.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Library to handle SPNEGO and CredSSP authentication"
-HOMEPAGE="https://pypi.org/project/pyspnego/ https://github.com/jborean93/pyspnego"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/gssapi[${PYTHON_USEDEP}]
-		>=dev-python/krb5-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# https://github.com/jborean93/pyspnego/issues/33
-	'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-False]'
-	'tests/test_auth.py::test_kerberos_auth_keytab[negotiate-True]'
-	'tests/test_auth.py::test_kerberos_auth_ccache[negotiate-False]'
-	'tests/test_auth.py::test_kerberos_auth_env_cache[negotiate-False]'
-)
-
-pkg_postinst() {
-	optfeature "Kerberos authentication" "dev-python/gssapi >=dev-python/krb5-0.3.0"
-	optfeature "YAML output support" "dev-python/ruamel-yaml"
-}
diff --git a/dev-python/pyspnego/pyspnego-0.5.2.ebuild b/dev-python/pyspnego/pyspnego-0.5.2.ebuild
index 8cd0a2bef5b8..b565e261d017 100644
--- a/dev-python/pyspnego/pyspnego-0.5.2.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.5.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 788dc8e61719..47b41758d3cc 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,4 +1,5 @@
 DIST pysrt-1.1.2.tar.gz 104371 BLAKE2B b6f8e1e6d0cc0ae7ac4a5eb1ac9c5444318fd579fd2cbd926bed932326c986743d3efc1b604353df92a3dc67ea0d47f9a77eeba28d561b3f69b4b63eff8b78ad SHA512 a3a0988068d3cc13e6d44aec548a94e79d9ed29cfcd1e8e35ff56b50f0feb32a1baac2220c5331281c98a19ad9a3e9f960832a661699921cde0d185ea21e9753
+EBUILD pysrt-1.1.2-r1.ebuild 648 BLAKE2B be8563cf017f37631c65cf1770b0f4a10156a736db12ca6433e2a2d9846f5d1f2d6694ea4295c78e650817eb408f618b01f159048f4aa7717154394bc9122af7 SHA512 9afc61f6bc52adf716aaef7e44b52d9b7827c4f56b97678e8c9f877f91a58946f87d03fa0732a20090b2d2bd8ab90db69ec3f4874eec3d484a4ce139fcfd150d
 EBUILD pysrt-1.1.2.ebuild 614 BLAKE2B ef3a9a28a65ba9cdd2a7a29dcbfca07941eaf6c21fbbf8497e0d2eb221a8fcb276c8c786b7ce7faa490adf3196bfe488e1f7773af2708289df5426dc07d1ee53 SHA512 14abb14febc2f71181c526e42e539d04d8aa00e621ee7ee68122547b6888d9bf3fbda7d10b6b3b1e275597c8325b23b0db01fd0a775cb66456df66dc941aaa91
-EBUILD pysrt-9999.ebuild 604 BLAKE2B 1d78a42bdb4659a3a3e45adec31efc746fa3601e12acdd3ca448c73368e0eb1a8e1e07af0583353519bff188dff5ce2832fc02fb63905a8866511afac33fa223 SHA512 be4ee5ee18b977eddbd967a774c95c3e698ab26f2a705c99ee34476c2920925b7144230c0ac3c7f0093819d9bed724d8a66863cde669123ae6cc2e9fdaec0113
+EBUILD pysrt-9999.ebuild 648 BLAKE2B be8563cf017f37631c65cf1770b0f4a10156a736db12ca6433e2a2d9846f5d1f2d6694ea4295c78e650817eb408f618b01f159048f4aa7717154394bc9122af7 SHA512 9afc61f6bc52adf716aaef7e44b52d9b7827c4f56b97678e8c9f877f91a58946f87d03fa0732a20090b2d2bd8ab90db69ec3f4874eec3d484a4ce139fcfd150d
 MISC metadata.xml 426 BLAKE2B 6f0df402cf1f1a013a465bcd85db592c0d820ae940b42e1af970ce277dd8664ba35ffb534692ab1eee00ac6273ede28000b76ecd09b9971cf827da5aea857b8e SHA512 baf3b7ae135e0fc9e22fbfedcc741bf3d020a1f1e20ca6b7f996140b783af828fa0a1b80d3952ca73bc78f21e09e2677673b3b02775b0f084b5926435d2ecea3
diff --git a/dev-python/pysrt/pysrt-1.1.2-r1.ebuild b/dev-python/pysrt/pysrt-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..d7d904f7615e
--- /dev/null
+++ b/dev-python/pysrt/pysrt-1.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python library used to edit or create SubRip files"
+HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 89d133c23ec7..d7d904f7615e 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,19 +1,20 @@
-# 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=( pypy3 python3_{7..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
 HOMEPAGE="https://github.com/byroot/pysrt https://pypi.org/project/pysrt/"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/byroot/pysrt.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-3+"
@@ -21,4 +22,4 @@ SLOT="0"
 
 RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg/Manifest
index 34edad458dbb..579a485a6221 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg/Manifest
@@ -1,3 +1,3 @@
 DIST pysvg-py3-0.2.2.post3.tar.gz 23436 BLAKE2B a1f0ff710b73dd2e82811d322aa6365583febe8c9e7d690221690d285f94b3d0ae3f74e47b0e0ef236e389f0621ce5ad61ba00329a306c30a81cab0e77ee29db SHA512 3b0e30401ff9481df3fa5fde5b1e338bbabb86cdb846a11c08e8138563268311e20a4ce5317e5a31c337f2b8c5a3debb7abf8e0188e798e455378a363b31c95d
-EBUILD pysvg-0.2.2_p3.ebuild 458 BLAKE2B 1a31f6e205148674835dd862e056f1fd7830ad7f4c52beb9822b287fb1a98008c5202ff2e04df8da8d165d744d2c4cb52eae984772eeeea65399a7585ec65d46 SHA512 696f9a4054fe745ccf7517df244d5adfb4e224055e896f68b772c5a9e78b2f48631ca05d55385ed405723c6cd37cad9ed3ab1e82ef917a36dcd1b75363346d84
+EBUILD pysvg-0.2.2_p3-r1.ebuild 490 BLAKE2B 585e7aa81fabe4fc03d63c4329f96cb8977cb78bf5a22c161a272a2f608dcbb42cade23b283f9c0385151aa19d69824ea4ef5f3261b95339ebada0227307f005 SHA512 d9c8113673dbaba2134a308230b0e6977eb899f6c47221d9919b0b6863db27c82e3b1943f27f4e6d9e6e2594b0919f6ab3fbf6cef200010370f1502414b6dcca
 MISC metadata.xml 371 BLAKE2B a60cb7953f5e191711ef79f1d5d8dcfc74c96d7157f9a9642aabd9bdd878e5043977b088b326a63c1475235d4d8025aa6ce4569e93e9edc0883d65305a903a8b SHA512 04f38b12464fd9ed2135cfd232cd1320beb62ad7c3ed8cc6ada8904445e99d1e92faecc66513e491f520ff91ff8c4362c6ad947bbc9ef958fe8fdfe3ddb7a052
diff --git a/dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild b/dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
new file mode 100644
index 000000000000..73ebbf35f1ea
--- /dev/null
+++ b/dev-python/pysvg/pysvg-0.2.2_p3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN}-py3"
+MY_PV="${PV/_p/.post}"
+
+DESCRIPTION="Python SVG document creation library"
+HOMEPAGE="https://github.com/alorence/pysvg-py3"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild b/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
deleted file mode 100644
index a258f0188e58..000000000000
--- a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN}-py3"
-MY_PV="${PV/_p/.post}"
-
-DESCRIPTION="Python SVG document creation library"
-HOMEPAGE="https://github.com/alorence/pysvg-py3"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/pyte/Manifest b/dev-python/pyte/Manifest
index 321ebffa68d0..ce45926b74cc 100644
--- a/dev-python/pyte/Manifest
+++ b/dev-python/pyte/Manifest
@@ -1,5 +1,3 @@
-DIST pyte-0.8.0.tar.gz 91320 BLAKE2B b973050912c7d3b67393208a5b17f382705fe78964528e003b71addc12586353a3a9c7eeb68c224dfb945b5f9d3b52823cd254885dd5ac6901be119583a71a2e SHA512 c488fd0a61c1dc34b27e12ed9ba1109bb2c331626c982da06e7540bdd168008cb5106a17c71e60e38c493f2dd9f21ba3cf05118928744dfa192d62e511b4c4e8
 DIST pyte-0.8.1.gh.tar.gz 92220 BLAKE2B f4f803ecbf9bc62936ea499929b7fb976c14ee09fe00ee56d5499bb2543a6ac769dd7c87e177c297bbf8ab082c34f154a26daf3a1c84917249400b09556c2b80 SHA512 f49d9394cca92c27fdd5319bdce164d5cac63b77d13156de7105bee6087a615e844fafa8507089c8bf6cf31a796cc858a3ccf597aa23cfa595d0d9e0adfab5d4
-EBUILD pyte-0.8.0-r1.ebuild 798 BLAKE2B eead274cc268188b967a4e13e863b5d5a31d1b46beb9a351955aa97f7e89bdc7522a0fb7f90fdfe4af19fab9dc47ccaf4ea88d1bef7e97a8e9d63407427982d2 SHA512 0cd58575ceac136485ffcac21c1b02134155d531e5c04f309065d716f7f809f3bc57dada8acc8d1b36bc881f2c8323a5e7d9196651e24b686f3656d302881a44
-EBUILD pyte-0.8.1.ebuild 740 BLAKE2B e1576484ba1b78b35599e194bf7db30156834319940979603b58e1781cbb235982a0b938ca7b6c86a5f9db58afde8719307d3ec33e8be38bcd79dc521a929e9c SHA512 612bd723a7a7a742adea0dce90966f1f1583b2092156437b1b0c4993d7e341db5878e0ad49e920df47d0e1b7b1f479a31c010dfa514e4cddcb3b6ff7e6db7a6c
-MISC metadata.xml 373 BLAKE2B 0d75ebf59f26354f2efdcdb8803173e129847f5599c8bdc80bf990174d09adbc43d0d0e9b8a01f5757bcbc93db3ce0dfb08b485816777fb699156ace03e0a0a5 SHA512 b58c0a13ea3c23d2a9534e139b8691d17a69f43d3c04192b1a8a3750d44fdb0ee4d043c8fd04740680e1f3967a9ea4b578becb307b1a1628e35006d7ca987e23
+EBUILD pyte-0.8.1.ebuild 738 BLAKE2B f2a4604af398dd8d61e781eee4423cd4f7d1cc28a9b180bcac9610f5b977fb4350b09e939c117698450586b0f8da41f1604f66b590b1894351b18f7b55281036 SHA512 488accd6d334ab612283aa155104d9b23839f6dd3dfc102710d599b54bd18dfe1d7f78904d1cb9ad11cbda69fe0b40b7cda05dc4f5164fc1e92c231b0c8a0a45
+MISC metadata.xml 398 BLAKE2B 4bca2386a5448c989f5aa69096d6f1ab1601fbbd547d81c01920054cab0d3aed2182965e6ffda0ec07ddac5a18fc759e002173ffced3574767d730a39f06fafe SHA512 30ca4fae97a92145e55e0a59dec2edaafeb7931cd422bbe0c96d1ab1f68cc49124f00ed0d2143d444091b5c2561076e47b9ecd7436f59a11c79d3af670528a24
diff --git a/dev-python/pyte/metadata.xml b/dev-python/pyte/metadata.xml
index 2807eaa9ac5b..1ec91be8fede 100644
--- a/dev-python/pyte/metadata.xml
+++ b/dev-python/pyte/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">pyte</remote-id>
     <remote-id type="github">selectel/pyte</remote-id>
diff --git a/dev-python/pyte/pyte-0.8.0-r1.ebuild b/dev-python/pyte/pyte-0.8.0-r1.ebuild
deleted file mode 100644
index eebd4e957b7a..000000000000
--- a/dev-python/pyte/pyte-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple VTXXX-compatible terminal emulator"
-HOMEPAGE="https://pypi.org/project/pyte/ https://github.com/selectel/pyte"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-# use github tarball as pypi is missing test data
-SRC_URI="https://github.com/selectel/pyte/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# run pytest directly for tests
-	sed -i '/setup_requires=\["pytest-runner"\]/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyte/pyte-0.8.1.ebuild b/dev-python/pyte/pyte-0.8.1.ebuild
index 7a8fc8d73612..fa7fea362e6b 100644
--- a/dev-python/pyte/pyte-0.8.1.ebuild
+++ b/dev-python/pyte/pyte-0.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 30448b9afef3..cfa6cb614c49 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-1.0.4.tar.gz 11868 BLAKE2B d964fe29ebe10e80391ebcbe4fc73bf37e2d8568c4d7679493ce68392b5722d75735798a78f388134d60b9c922bac116b0d453cabae5a95fc06c4288cc5d4c8e SHA512 baf87e3aa229e8a4ab6746d277a923436ad2e0625825581c94a2fb0a9bbcd309bfc55186f8866589b65a75ccfd7d5b494d71554359724c0b2c9541ea94a177d8
-EBUILD pytest-aiohttp-1.0.4.ebuild 741 BLAKE2B ffb05228ccbbc706c86e5a527a7f499bdc50bfa43291cd9964bc363ce27599870c0c208be45038a5339ea9782af091558f6a76029a75de386aef64812ceebcaf SHA512 853a152696e5623ebfb3b8429db95b300c60c9ea95c1e97a927cf02e23184bf5ca49234949a653ea828484fddc5ed441c016f81faa97c167c92aaa9d718acc98
+EBUILD pytest-aiohttp-1.0.4.ebuild 945 BLAKE2B 66b346075f6f32cee1500badd491f43591abe55e99b34445f5d42cb7e3b5c95e414ab73b6987e3c6f25e5b5b745d0fb4157e500de63c7415cf0a994d9298c86f SHA512 2dbdc85b2cc6e9e2733e2e54b49e93ff71da5b77d5e758101c84e7b3299db2448fd54fd22a190a1f4cbed219ff6fc96468258033560a5aec1aeaf540df73a349
 MISC metadata.xml 383 BLAKE2B aef07c31a48de61fffa14c250aac7d1de63b652f94d83c52d32df2100da3bc5be19f224078b1b984520cc7e0b3d80838379388aa4c0e9531317a79dca178370c SHA512 b73d692782a9eae48022738bbcf3771605c8d00bf73ab2499cc27f309069bb80a402cd1ce618df29de7dfd11c226514aa3ec7d78df1ea784c7221691febf06f9
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
index 1ad54bae78d3..d009d00e3de7 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-1.0.4.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin for aiohttp support"
-HOMEPAGE="https://github.com/aio-libs/pytest-aiohttp/"
+HOMEPAGE="
+	https://github.com/aio-libs/pytest-aiohttp/
+	https://pypi.org/project/pytest-aiohttp/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -26,3 +29,9 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning doesn't seem to be emitted for some reason
+	# doesn't look very important
+	tests/test_obsolete_fixtures.py::test_loop_fixture
+)
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 4d638cf067c6..f3de4d9e9f90 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-bdd-5.0.0.tar.gz 61174 BLAKE2B 6dd1d53614226d3515b0f61f71822363b559aa45789bab7f3416c75e603e87a1fe48627f36862f44bfa7ac6ec5023ad8afde6054ec67fc9a2e756be7de729fd1 SHA512 827e57d410b05207b6c646062ddb54b677e22441311820d3bd406df202b6e9344dedf59cd4868e89cfbf8606fe3f15559e4cc3958d100e4fa74f9b864e6faada
-EBUILD pytest-bdd-5.0.0.ebuild 1007 BLAKE2B f48521f15672f0591fb5ff819f3d4af0a1b2bbb52eabc6b37928127d6e58278c416eadfd028bc89a2a303b0199992fca1b30773424953d2e56bb33ce59becc8a SHA512 c8a57233df65d452173b22e6975225c0313c4af60d14b56036b92710b1fc1fa25999afc91b9538e490e9434b6ef5c7fb5114cbcd9b800e17f16059d3b19ee7fa
+DIST pytest-bdd-5.0.0.gh.tar.gz 61174 BLAKE2B 6dd1d53614226d3515b0f61f71822363b559aa45789bab7f3416c75e603e87a1fe48627f36862f44bfa7ac6ec5023ad8afde6054ec67fc9a2e756be7de729fd1 SHA512 827e57d410b05207b6c646062ddb54b677e22441311820d3bd406df202b6e9344dedf59cd4868e89cfbf8606fe3f15559e4cc3958d100e4fa74f9b864e6faada
+EBUILD pytest-bdd-5.0.0-r1.ebuild 1037 BLAKE2B fced384bd393f3371d5ba248728f9c5ec7a43b3f746ae9e1b6550c320cb4dfc2427ae725b339ee0a54dc729d800b1b5584eac34ec149bcb5a90837ba64416c9b SHA512 c475eeee113ff2ce20abeef242a80e805dd516a206e5b491299b445cbf169ad8b8fbb5c1cd0e43b8beb899028ed343beee61e1e64a522c2ebaa927a0ae3a822b
 MISC metadata.xml 404 BLAKE2B b5bdea28ab998a54bd0b76e38c37a77af74d4ae149bfc5af47e7466b7c13ae6a5784be0ecc3e6cd8ccbbd5164dea02d704f596b7e00d22b0d640c4ad3dd13b41 SHA512 97800a5877bd8f3aa880a0cdff19cc89de983ec1a0cd9fbe2c74178b6fc214a0ca7fbb013b2ac490e1c4109f03ded7055e1517a3b57f6da0d79c9f5ea5864e77
diff --git a/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild b/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..edc44c97450b
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-5.0.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pypi.org/project/pytest-bdd/"
+SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/glob2[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse_type[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+src_test() {
+	# terminal_reporter test needs exact wrapping
+	local -x COLUMNS=80
+
+	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_bdd.plugin
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pytest-bdd/pytest-bdd-5.0.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-5.0.0.ebuild
deleted file mode 100644
index 1b1087b8edf8..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-5.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="BDD library for the pytest runner"
-HOMEPAGE="https://pypi.org/project/pytest-bdd/"
-SRC_URI="https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/glob2[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	dev-python/parse_type[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-
-DOCS=( AUTHORS.rst CHANGES.rst README.rst )
-
-src_test() {
-	# terminal_reporter test needs exact wrapping
-	local -x COLUMNS=80
-
-	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_bdd.plugin
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
deleted file mode 100644
index aef63a55d9dd..000000000000
--- a/dev-python/pytest-cache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
-EBUILD pytest-cache-1.0-r2.ebuild 809 BLAKE2B 867b002029f34525e8dc0b7ddcc8be7835f3f0f83b5f715dc803d51fb3c250ca5b96438b33897cdfb22f4dcb1eab84668ede32c3c0e864596dcefbeeffc263c9 SHA512 3650616043ff37db8944d39f29e97c66f92f7877115737e2d76bd8d2855d1e585c97c66783060e8976ad3f50924cc218b0546ac7b488e34c1188bc58a8645d08
-MISC metadata.xml 316 BLAKE2B e8a16e7e7015b6e3f1126d5349e523950b3a4bd0cc3f0b9f5603a4924827b33b479e088294d819bb883baf5b859a55a5fbd5f51746e013db7d41e23e2eb34343 SHA512 65266a78aafc57ebe73155520d68427d3131975250e315cf80eb694167aa0309b840a21367018a0db8b4c3db8a47c9cede4443ffe27ee9a2c98354d5b1c3a7ed
diff --git a/dev-python/pytest-cache/metadata.xml b/dev-python/pytest-cache/metadata.xml
deleted file mode 100644
index 9a2f9dd5b752..000000000000
--- a/dev-python/pytest-cache/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pytest-cache</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
deleted file mode 100644
index c68ed0efcfdb..000000000000
--- a/dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="mechanisms for caching across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-cache/
-	https://pythonhosted.org/pytest-cache/"
-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 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-# https://bitbucket.org/hpk42/pytest-cache/issues/12
-RESTRICT=test
-
-python_test() {
-	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
-}
diff --git a/dev-python/pytest-codeblocks/Manifest b/dev-python/pytest-codeblocks/Manifest
index a8013185003a..5abcd92b5766 100644
--- a/dev-python/pytest-codeblocks/Manifest
+++ b/dev-python/pytest-codeblocks/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-codeblocks-0.13.0.tar.gz 8407 BLAKE2B 5ba3c41f7b4af908172799036331c6605fcd7d9c0fb0bdfc5cf3697e97181ec099b580a30d9dcd83ed568a5ee8fe736843d26b7d39163581adeb5d75a9a321f6 SHA512 092035e5cf3d1d35fedbc6f867ff77a40751df5b4a3b922d5f960fdaa5d1ca9e599c7b813ae60a4da3cd43e3e7884f38260f77bc466e234422480b5edebee24a
-DIST pytest-codeblocks-0.14.0.tar.gz 8432 BLAKE2B cb63d68e61a909bd199240470be6f09a0e48a6ef7ab4f2360940030a384919939e2274a604499bbeaf533cbf5e15b7402fd2294841ca21bc9d65c54977353549 SHA512 740b6a74a3451cee25e37969706d7b603f258c76bb8b1cd608eaf63021aaaed99136a41885b453a2708302f53e8d9516a3487dc3f5cc8ad39ca6c3ab9721ae86
-DIST pytest-codeblocks-0.15.0.tar.gz 8559 BLAKE2B 0f8cf91d333e233e480353ab55283f9d97af17e5265f7a9e6db5c7cd98aaf6075b33a44e850aad21de5112fcc233fe7f65e23710f6b1804a85fd6269d042c406 SHA512 57d14aefc0cd49aa1b8fc54dfaec47965d4b1c867cad78ba9e8fd53da85898b7eac303ac402abe10b2d63d7621979bb8bad91f66f1e264568d56f4ff70488021
-EBUILD pytest-codeblocks-0.13.0.ebuild 564 BLAKE2B 34780f8584ad8eae6d61a9f54bd83b6c563d736df53e2a0f62a6a04cd69ee7fe2b1d2b02a92a29f8fa3dc80367fa3021e151962d13369e5209b1e9b4ae21e2de SHA512 77a03d8fecc1d14b59c865b8c3c1d11886f8a072662778cfb1370a4caaef50a90ca946d926aaf82db700a83f2bde5d7827e038d9c155b8dc12715233a3d2ae15
-EBUILD pytest-codeblocks-0.14.0.ebuild 572 BLAKE2B ad38eb268751a5ff8c372ab124787d20525113f094bd93d32806d9678ed05911557c03baceae7b096d41ac87bf866c2e1ff2cfec6928cc216d58252af18d6441 SHA512 a2642bcfdc2aae90b0e68cd0d20c239810f7239def377b3b30ce7d02e8a0f69f392940b138489c7853cee4cbf02aa6f4294e65324137c57ed2a2fdf00afe53e7
-EBUILD pytest-codeblocks-0.15.0.ebuild 622 BLAKE2B c41d30a708648ea9fe3a264635382294969375cd9310542623391fdf115ccc29fe20890a0fddad397891c137dffb34bcf1dcdea02269f1cc18baecc7a5e6312a SHA512 058fccb234126dd449257a5f2eb97de8bd95842abe780779a590f7bc101f1b64893fabfab420bb1e1367bdc6b30d832d2f79d687bfa856159538bcac7b21830d
-MISC metadata.xml 529 BLAKE2B 09fcee4e8de6e9206a8e1bcc11f185c163dd4014e4dee464d8e253ff18d9902b8e5445bbca6778b34ef6513014fed8454f0bc26d647bbd7606b3415dd2ee5aff SHA512 2238f717da848ba0472a236c3a0a1fb2ad50e16a15ffc7875e2d50d3a77ae25c3a1e8e26d606e2516a301bcf103a67d9ef59a2b54c807cd6f0cac72e70445c6e
+DIST pytest-codeblocks-0.16.1.gh.tar.gz 8900 BLAKE2B 1e884f445975c4c685e763560a8bb5516bd7213b09a8c967948347e455816766dccfd0984fb5746949f90afdf00e0fe21a52f41be65933532d8763ed6ea716a1 SHA512 4c3d91488550373832c8dd45b39873ae3810b423147b3b9524afc8e205605324092b4462b62acf2e34e70b5456795834cae511d9c9a06e08288a46cdb38b1778
+EBUILD pytest-codeblocks-0.16.1.ebuild 631 BLAKE2B a5f5b25dea468439059c08cbc196fe85f4760ba157a277e7fbf2af2986efd38b164045dcd75b500dd400e5810dea22c7c8db8954fc1faa26f1e0d8512b08e308 SHA512 ee742c49b05152fcfa1910f5e8d26278c1acd55e5f8fb29cfa1647a4f67d4cf2ebb9a19116b4abf9e20caf0007f8a937204b93535fa42811fdfba8d5bef7ba18
+MISC metadata.xml 529 BLAKE2B 471620ffc4ca164b51a629d0cf744e30333ed6a3620cda03b0a5a424a5a135c1a651277463c33d52104cab6fad79c04f35e81ec72ded1b9240c166f654580102 SHA512 bd0df9564b3ee21e5746130a07220755f8c7e51bbc85320c3847161454e9bbd34383531e58413e183c4e199f466db559a88495ed6d5a4fa160e95e818eb00f5b
diff --git a/dev-python/pytest-codeblocks/metadata.xml b/dev-python/pytest-codeblocks/metadata.xml
index 7911d01e1748..5e068555e020 100644
--- a/dev-python/pytest-codeblocks/metadata.xml
+++ b/dev-python/pytest-codeblocks/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nschloe/pytest-codeblocks</remote-id>
-		<remote-id type="pypi">pytest-codeblocks</remote-id>
+		<remote-id type="pypi">pytest_codeblocks</remote-id>
 	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.13.0.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.13.0.ebuild
deleted file mode 100644
index 7887ec6bbde4..000000000000
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.13.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/pytest-codeblocks/"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytester
-}
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.14.0.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.14.0.ebuild
deleted file mode 100644
index 675979cdf569..000000000000
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.14.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="https://github.com/nschloe/pytest-codeblocks/"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytester
-}
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
deleted file mode 100644
index 63e1535ce48a..000000000000
--- a/dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extract code blocks from markdown"
-HOMEPAGE="
-	https://github.com/nschloe/pytest-codeblocks/
-	https://pypi.org/project/pytest_codeblocks/
-"
-SRC_URI="
-	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytester
-}
diff --git a/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild b/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.ebuild
new file mode 100644
index 000000000000..eee40482f02e
--- /dev/null
+++ b/dev-python/pytest-codeblocks/pytest-codeblocks-0.16.1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="
+	https://github.com/nschloe/pytest-codeblocks/
+	https://pypi.org/project/pytest_codeblocks/
+"
+SRC_URI="
+	https://github.com/nschloe/pytest-codeblocks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p pytester
+}
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index 54744a9023e6..cf54176b2676 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
-EBUILD pytest-console-scripts-1.3.1.ebuild 875 BLAKE2B 254f656281bf54bdad6881fc72538212eeb0d1fd155f709983abaafd86e84be8c34269c723734bc514b8d4040b6eba17a5cda1a8e4e358dbc0026434f8fc9eeb SHA512 86c4b3ade950221dcc27708455c7e1154e53007e46dd43d15fcf3d145711a4acbc7dd62ec84ec246c47dce5c986b6065cb1c9412e3f74317985d721d1c2bcfdb
-MISC metadata.xml 433 BLAKE2B 89f8e1d9dac848739320e06de4b6212f72538d6b9ae39d8266fb70f0849c529174ae89afae16e7282fe22f78e8970c3e2043f4d7e7327ea10d2659ef49b649d4 SHA512 58636b71252ea9aacbcf2c4640d4f63bef22710dfed931b3a081de2c92ba89499711df90aed069e71cbb8006d6ce515fb5ee46ec5f2631406cc01dcc92493fcf
+EBUILD pytest-console-scripts-1.3.1.ebuild 875 BLAKE2B d9e1ddc307c8bce8a830430cd0ace07efc38b9093e8a4115da4a41cd707dac427fa292b3ee99cc56f1db2a2f921a8708d2296784cad258f4fb7c42acd5d75586 SHA512 03854e92d6f68e052f8f8aed913367fc04157385e071688100a7f66e4b387e412d04471718e73a52d874f24104fe4d7370768a4c5590f5c4ed47acfa9edfd903
+MISC metadata.xml 534 BLAKE2B 9d795cc21a80ef3c90b9b9a0eda1c124b77a8e91f786edfa56ac368cb68f6a33712b5041a3ed635da970f494282fcfe939312fdb688a5cb55dd6d3489f6321e6 SHA512 f3568e76d4699d0f97a5b26b2d381d064f60f72c4ef7de42c1994be98a6cd21b4971241dbcf3c324af2fed617438a238ec5ecfa03c00b37a93dc2d91bfc82250
diff --git a/dev-python/pytest-console-scripts/metadata.xml b/dev-python/pytest-console-scripts/metadata.xml
index 9de186a0813b..f2497055c2c5 100644
--- a/dev-python/pytest-console-scripts/metadata.xml
+++ b/dev-python/pytest-console-scripts/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-console-scripts</remote-id>
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
index 0061459e1907..4fd00d677528 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 1af68cb04b3f..4e5dfaa884b9 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1-r1.ebuild 703 BLAKE2B 9fd186af4768a1cb02726734b90d4c0ffb88490c1cf4384721495fb33a7f36e784fe272bfbe7ce29a2ba652f8b0ae20415662950d254bde1797baa975e4f75d7 SHA512 715e379567102aef890a6b2595c89a43039c199c16bc4525bdc93b427c146443d4a7d3a5244951df74d87530f4f1c99ab9d910c0c7ec1f938e1bc553d38b8db2
-EBUILD pytest-datadir-1.3.1.ebuild 671 BLAKE2B 61e3eeebb0b535a1a7dffe7c62eec6a76fee93486dbd1b1d4bad8249fa1c994196b46961f0d965fd2991d93981eb37ea97908898dbfcf2fc567817e4a0ce0c4f SHA512 c8d8d286b67ed36044337509c35266124bae7588b4e6414d67caa588cb8b8e650cdba49b1165d6135982924a29ca8b5aa28f1a3a063ff9945e2b514e8d8e064b
+EBUILD pytest-datadir-1.3.1-r1.ebuild 751 BLAKE2B aca38c3e98bd47fb7997a67c745c2b8eafd8ecb998415ab30c34098b38cfba7614d6c0dac4c5bd1195d3af78b54b7433c151c7c382f323974f201011282a695f SHA512 93c65524982c8f39158622c726d51613b0390a61b36bfa158603f9e7911d165c977c41f6401b40687a1c9eae879e0a58833a061da019c5233096335ce00dbe48
 MISC metadata.xml 360 BLAKE2B 32eda1b71737f15dd195beeb8a8b8a94c2c931a234e2c582d6841e2ec10e5e40010cb461fea2abeb1eedfa460da3edff78bd0befe638feee5b38a4dc453f221f SHA512 cf15128efd3dcf4b064a051144f9e1a7b2cb236f90ef437849204026ca2997e808866fa4b7972212daeae5b438a157a2b82d3db34084c5f3a94d7012b36117c3
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
index cf8db19c0287..29016d5497a1 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1-r1.ebuild
@@ -4,18 +4,24 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Pytest plugin for manipulating test data directories and files"
-HOMEPAGE="https://github.com/gabrielcnr/pytest-datadir"
+HOMEPAGE="
+	https://github.com/gabrielcnr/pytest-datadir/
+	https://pypi.org/project/pytest-datadir/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 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/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
deleted file mode 100644
index 49be9ac3fa1d..000000000000
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-
-DESCRIPTION="Pytest plugin for manipulating test data directories and files"
-HOMEPAGE="https://github.com/gabrielcnr/pytest-datadir"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
-
-python_install_all() {
-	distutils-r1_python_install
-
-	# Do not install license to /usr
-	rm "${D}/usr/LICENSE" || die
-}
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index b62b7fe308f1..95ffcee9222e 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-2.0.1.tar.gz 9793 BLAKE2B e7816cbc68e1ed1e2686ce3437cd0f59a52191d5413dbc9e0d6f9530a57728ad0917d86680b91228aa55ce689bc16c4da83595f87d82f9be9c4ce222c46fefea SHA512 c74362d5f1b0f3ff6d35d9049e82b7dc54be6755f1daa13366c47dee1ab9f1b1085d8c9719952d75c3c6c58b76a2c5f6b0162c78e53da71fe09bd91ed27f6bf2
-EBUILD pytest-describe-2.0.1.ebuild 699 BLAKE2B 0ee5652721e0ee463559d96594d4da3564b1779ffd3957f16b07d8757f3a4d33386b2f2e53973369972840e5a5177728ec43779fcb69ffd85b2dadc302b9051f SHA512 6657e80c6d7081473f5071c79c831fc9c4d3452849c94a8eaf15da7f843f1604cea82df3a14fa2425711615082833b6e46e59e6f240690e766ae2c61c32c75b2
+EBUILD pytest-describe-2.0.1-r1.ebuild 731 BLAKE2B ca6c10e3e8c951c1db2707ed239714282f7b7d08423795fedb8d935a141fb867af44b09a40e271e8ddaef8afb49e19cc6e2b7f1c6b5b992ddf75d7c07de846f0 SHA512 c5b9d09b8ae885782da1e02f5b3353183dd23b3eb70e0149f10a33f8929c3204a4e7895edaad3b3ebeab49e0d2edc6709b6c1686d9980e75a341019ddcdba42d
 MISC metadata.xml 409 BLAKE2B 00d21d44dc08a1a7166d85d5be7ce30b7af5d36e3e28bdcebb5f4495f9a5508bb7bc7f534aae9c242b0708a5e7c8bda4e693a2b05efac94e4283b1c8172ac5d0 SHA512 60e89b39de96adf0c7b80aa46b67544bce41c95eb2076e6f546f04ae46cf7d69709f89b9475c8e5b821b52afa9b3c344f2f5d7789fb2ceeba49facadc5d4c56b
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..36550c410a31
--- /dev/null
+++ b/dev-python/pytest-describe/pytest-describe-2.0.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Describe-style plugin for pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
+	https://pypi.org/project/pytest-describe/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# We need to disable some plugins because tests don't like unexpected
+	# output
+	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
+}
diff --git a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild b/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
deleted file mode 100644
index 1d2df2e46f29..000000000000
--- a/dev-python/pytest-describe/pytest-describe-2.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Describe-style plugin for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-describe/
-	https://pypi.org/project/pytest-describe/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# We need to disable some plugins because tests don't like unexpected
-	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
-}
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index 4c164431dcc7..5c6c694abd73 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
-EBUILD pytest-env-0.6.2.ebuild 460 BLAKE2B 397cfd7a213ff8361f8eef070e9e2e0484db00fe6cdf08b1ce05a2b1a366f625e6bb2377d4c3cc11c8a4256689f8a2f6e65c9fa2662da99b6a3b3ce3dccc63c6 SHA512 6af2e469b3a70c14ce44c279fbae3425cce4ed799eabccd8af9296eb9ab64906a6a51c4dba97b83c28a56849eaa986daaa5bad72ae5b1b6e55b24251a45843ee
-MISC metadata.xml 383 BLAKE2B fb5665ab9789604b0f0ffcc657c7cb41fe9b6167908bde0c439b861c6f6fa2ee09791da768434c2c4f18ca5a8f44cf34e0bd191ffbac72c1ca0e9090a08b3a13 SHA512 ff80433ea4b414f19c221a53c8c8a346bb01ad5a38ed56508ca6cc487059936e16ce0601ccc66ccfa5875d062b76f5a0b2e26b1320fa55e234c972b7d5bcf575
+EBUILD pytest-env-0.6.2-r1.ebuild 492 BLAKE2B 83b45fa4c8799fe025a6c1fdddee4ce7f695f03fc35e8e8677c9380ab7a56cd4c924aeef79e6d5c5197da8944ce650218b5681996bbe9ea3d274ed615169365d SHA512 4e80b35540a58eb1149a56c4c99f78d3e2eb2d0234b152a0aaf8c9b5feb66e66d8387e3f69a98c205ab2b5567fe9e9e36907c2d2f31e969746b0a0ba72e5f47e
+MISC metadata.xml 407 BLAKE2B 7353d52edf97f5667e7f3119b1896cc04ce6bb5f3e88eaca88091c7c24dc8a077b50c1b03bca5975c82cf70bf19af6e9a94a59043694980796ca8714850aa0dd SHA512 f0d9b4f02428c70f3d55f70d44f02dc198a363cbf7f00f7469af8cfdd729ef7467f115f98d84f038f6c65b58bbcbcaef5fb79b9992494b3ed598b64a94d9dc71
diff --git a/dev-python/pytest-env/metadata.xml b/dev-python/pytest-env/metadata.xml
index a795a9d361ad..ccf6121fada8 100644
--- a/dev-python/pytest-env/metadata.xml
+++ b/dev-python/pytest-env/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">MobileDynasty/pytest-env</remote-id>
 		<remote-id type="pypi">pytest-env</remote-id>
diff --git a/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild b/dev-python/pytest-env/pytest-env-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..cf52e35eb739
--- /dev/null
+++ b/dev-python/pytest-env/pytest-env-0.6.2-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that allows you to add environment variables"
+HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-env/pytest-env-0.6.2.ebuild b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
deleted file mode 100644
index 7b7d947f3bf6..000000000000
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin that allows you to add environment variables"
-HOMEPAGE="https://github.com/MobileDynasty/pytest-env"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-expect/Manifest b/dev-python/pytest-expect/Manifest
index a2c6d69135cb..174f102b1816 100644
--- a/dev-python/pytest-expect/Manifest
+++ b/dev-python/pytest-expect/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-expect-1.1.0.tar.gz 3595 BLAKE2B f291021c1fb44371f43d5970573872d3db04e0b29e909de01c2183e79d96f9a72060b75f914cd7460b914864b98191460b4c44809a0f5ddf728fc6ef0c94c348 SHA512 41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd
-EBUILD pytest-expect-1.1.0-r1.ebuild 660 BLAKE2B df1aaa55f576f02a944b22b52a54a6ecb50c9471d8a13092a50760b402ba5cc6c102b8121a4261c5fbe74041775eab1f503aab6c378455483b7db3e59982afa2 SHA512 fb485efc880806211155fba00a0665e1fb67fad0669eb5510fa8a73df20d7979d4dad1b3a0a7147989bb9814325b5ec81142fea0b522897aca04e064536a8840
-EBUILD pytest-expect-1.1.0-r2.ebuild 705 BLAKE2B 09d37113a3b7d7c341b807514de409e516a661988aa40260ac4a5d2ba5c503cf913daefd6caa39c5dd827c59dca29e3dd2a693d28b3d282de425ad5982650db5 SHA512 d14994f787e203b0b9b21da639bf6b2354da35637f907b089a859f816caffccb0f1438c43148dac450c691d091e5bcd2df6be205d148242ea39c2bfe2a2f6900
-MISC metadata.xml 485 BLAKE2B 76212d43ee4934e9f7b98ae1c5dbc9799e4b388bf7911d2d5a69f92556f3c45521d6e4a9de2899716829f80503d7257bce3aa4d594563197028a80952fe0e234 SHA512 959f50811969db93eff402e0fd7672bddcbfe1e328a06d09844584c8a90f7c887298c7a87946d4ee8a86e832cdd51e684fe548869904efda737ee989af25c5e1
+EBUILD pytest-expect-1.1.0-r2.ebuild 697 BLAKE2B 1e29ba72713cb0a4c41c41c691f6d8849f83faad6b36d7bff1bf7b5335f34d2a40b841a63f990c2e5b4fdec3b1094095a06b52c0eaef69c4e83bdaf729f0f5cd SHA512 ae6a4cb353dd7f217db9a1afc698cb15676c61902bc7939f7670e290c66f81e37170cebcf0807e842c85e6be0a66e920b7baac7647850770e345e54ec7de0dd9
+MISC metadata.xml 509 BLAKE2B 1b9d7d7de1d9c71841b14d37d912d52e68cf24e3a1cfb2c1091bfe42461a824d5c5255cda0e7815157a2b213ecb765f22f471ef71a8d1bd7830b5381a676adcf SHA512 2ac21f6b29012b417025b9c377a02c36db6c6fc7753fa4c278f9c597dcd5da8dcb5f9c7b926c3a03ad64893eb6ea0c14e6409e867d88906e94392023c218df74
diff --git a/dev-python/pytest-expect/metadata.xml b/dev-python/pytest-expect/metadata.xml
index 85d2433382ee..664bd58020cb 100644
--- a/dev-python/pytest-expect/metadata.xml
+++ b/dev-python/pytest-expect/metadata.xml
@@ -13,4 +13,5 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
deleted file mode 100644
index b85bde2739c6..000000000000
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 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="py.test plugin that stores test expectations by saving the set of failing tests"
-HOMEPAGE="https://github.com/gsnedders/pytest-expect/ https://pypi.org/project/pytest-expect/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# no tests
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/u-msgpack-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild b/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
index a6b8fa81adda..07363a9f05ba 100644
--- a/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
+++ b/dev-python/pytest-expect/pytest-expect-1.1.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # no tests
 RESTRICT="test"
 
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index 86ab6b987281..e0c1724fa0ee 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
-EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B eed00faa56622564548d3178eb720da2320ef757b713cba5cc8a632a2e6b0ac478e3317f7deb7296e48f62208b0edd3a3938c4e61fd2dcaea9e932851dd02be8 SHA512 cce9affe6d7ca9f217ca2e07b014aa10602f3b7e81978f3eb737b620495f795ac2b44b0016be470c3f7bf050726ecd9e33d8df0159c67b028afc3c9183550bd5
+EBUILD pytest-faulthandler-2.0.1-r1.ebuild 542 BLAKE2B b68b3b23d078e08724b388aea65e853b6a86951985337f414fa1124d1646894b1f487ad308a12aabc463618a1a13ead27cd07ae4e7436357b7788f84eb6eff79 SHA512 6a178a39c0f507d9374363e9fcd221251dc0d20cac3861a41e45d9308124349f0ce5e10fca3552c562780a5b961da9e321134364c6bd8148e7e454d6d4d7ce83
 MISC metadata.xml 365 BLAKE2B 69e090b51eb1caafae5a0870c88286d9fca98456fa0c750e18d9bcd2a73d0ec6b5d0e7f9f5f53c33f09f07ba577bff3d4b07029220508df05633a03c9976d402 SHA512 a64ffcfedd62e8b6beae15d5d5e0ef5069fe64ce086e8abcc241d7dfd2cb7b2352402ade66d5b2864c328d822355d999f0eb62c7c174cd0111259c87b101a922
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..c79a0fbd6927
--- /dev/null
+++ b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin that activates the fault handler module for tests"
+HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild b/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
deleted file mode 100644
index 37aa6fc04bbe..000000000000
--- a/dev-python/pytest-faulthandler/pytest-faulthandler-2.0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin that activates the fault handler module for tests"
-HOMEPAGE="https://github.com/pytest-dev/pytest-faulthandler"
-SRC_URI="https://github.com/pytest-dev/pytest-faulthandler/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 689e083dd8d5..32d2c638bc57 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.7.0-r1.ebuild 870 BLAKE2B 5c81cf77b1d1dc1cf9b7df44359901df83d7f26a517c340c8814364ab01e751b629b9240462452429bdc9416c6b85a802edddacd84c4b7790b5ac07414e5ec80 SHA512 8a9c21d1a900b0bdd2a832d63af209a702b6b1f9faf6a3b6591d8fb3b2e63a3c2e07223c803eef7c02280f09d366f24e18fdc784f0ae24fbb018ff13ee9b9e40
+EBUILD pytest-fixture-config-1.7.0-r2.ebuild 911 BLAKE2B d867baa77c54a3d7e998f5642ad29d151f54f694ae8625262b8ff807a684b6ff04a6776fd4ee476030ac42686b5dbdbc98999601e57cb3be37e5932094c898ca SHA512 edd1a153d5647d435f2118fa79654218b5155ca2d1cdf43dace1aa6c7764f82af23f4b90075f7a1cfdbbee17040c3429cb76ea3b02893b4cbfb87bc7d44e1082
 MISC metadata.xml 679 BLAKE2B 23a9fd64a55fbcfc0cf51c23fc76615611c8e9dae4b1f349e210cecaaf80a5c08518e00e99b5f20928bbce9a8ed5d179b2228b0e88eed94309cb805d477df6d8 SHA512 907d88b5b91aede0deff69f42d6fce39a79f18ee8e510feb2772cc940b5f55e52152fc95aa2e542867dfa6c6dd36e7cf96c91ffc618ae0cfed287256d288598e
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
deleted file mode 100644
index 313f95cc7865..000000000000
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-fixture-config/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-# block pytest plugins that will be broken by the upgrade
-RDEPEND+="
-	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? ( dev-python/six[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..040b3f90b5c2
--- /dev/null
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="
+	https://github.com/man-group/pytest-plugins/
+	https://pypi.org/project/pytest-fixture-config/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# block pytest plugins that will be broken by the upgrade
+RDEPEND+="
+	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 0bb152a01f61..9545dabe297a 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.4.tar.gz 7271 BLAKE2B aee9b573c1d4e173465d8547a568433eec3a6ab93a05c1a7655d7ecfd3dff2628f50b4f13f2aaa9a8f3ff365552f54cd1a5a3e4c7b347b056615e136fc5c5657 SHA512 f3bc82bef2dad4a1bf145179f1d25330adcb123cb6e2dd9802b0696be56ef66a8c705725a4e05a9fbbdc37d7482af7fe615735e0e94055f66b0893cc4cf15e53
 EBUILD pytest-flakes-4.0.4.ebuild 543 BLAKE2B 867754b17cc9502e1175575442ac613ccf20557ee4378b255f9c2104ef2496f2959215b7c5d117abe301ae1dd38b3974ec01b543a5016f933906b8c5c1fb9805 SHA512 3cbe066578b02601e838482f37e9e0801bb93168da868925bafa1adaec2b46728476e8caa9e5872511d7eceeb82bae22c6acad0f3139eb47090ad5675a651008
-MISC metadata.xml 330 BLAKE2B 27326dd6d6687ac291c21cabc5599cc765cd3e42fe3394497b0888c49ccc56cb92f82136f76655ac89e9aef270b9810e0afd5357f306cdc9e217a160f7affa7d SHA512 6728a8a8ae3432c021a9f599aa97a8a4d1ce3ab4aa035b179386f29e80dc98aa6345d3ee2e230bc437a2496feb8823868094c6b1b0444294023af244c35dd6b0
+MISC metadata.xml 403 BLAKE2B 7409c48e9f3ec2349283436f9a8da1c660f2546a606d18de670aa7898655bf582cb7094462e6100d05fd0fa2ec635216110dfe55db5fee13c98a01e8ffa131be SHA512 9ed3103c82f3c991703b610df6eafd81b3e1324c7616a7a9c2ce0181fc64585706c810685d9b5c6b004235adf5f22e632c5f2b099c8cc1678dff36147e8b1cee
diff --git a/dev-python/pytest-flakes/metadata.xml b/dev-python/pytest-flakes/metadata.xml
index 78a876afdb61..cac50b36446a 100644
--- a/dev-python/pytest-flakes/metadata.xml
+++ b/dev-python/pytest-flakes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-flakes</remote-id>
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index fd3f97450994..57c125258417 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-forked-1.4.0.tar.gz 10197 BLAKE2B 7a6ec42f7ad1323eea243739a9186fb87eac3016afef844ec39a6e3fd55f7d40b1410fcc27074624f8468e6dabddffcc22ea0597bbbd898fab71c82c06e25b46 SHA512 ba402aec6dbec7a94815913192a49390b637a123d3557f48d809ae2e871e9e0cff8f9d0feb99e2bd06fe9486520b5e539f397d39475a720f8283b1bd21c751c7
-EBUILD pytest-forked-1.4.0-r1.ebuild 880 BLAKE2B 3a62ed89df80f90dcf53fb8ab178b54d770ed398cf493d2f22af519fad081cf156c4f7387a964d5a27782ff780837023fe6a89aa6623a6748dca917dce45db0a SHA512 5e6604608d3fc54828ce76f3659a8775febf431e635ecd4d372d8367f381ab7e68d895d3c249dd17488ed1aa79c479f794311d0591a0ce95b3f383d36caf1620
-EBUILD pytest-forked-1.4.0.ebuild 859 BLAKE2B 2a4b583da28bccde55d824c12639d32d29075360968a7df675d14910bdc1f4cea285ffbbf44cc4a5e8f63454656c4f17aa20bd62baaa1033f87dc8db4c06dafe SHA512 aa50686dc2f08725ce50a2b281688bacb9152198ce9cf14e1b0af51a8a6c1830db1cd7805e3332a2e5841f1c2cb185788cef41238dc677dc73e7cf00f967fb51
+EBUILD pytest-forked-1.4.0-r1.ebuild 872 BLAKE2B bf39dc762923933fd9401a0686d2e378e04a85bab28b9d278a0e471108a2ac99dbe20f6b496a03fb92bff4e26662817e7500bdebeb9ed75ad0939f1bd782af64 SHA512 f47c2485979347742456f0142c7de596f03b5f91f82294da019a15091fa874ff9e4a79699a78611cefafe77e5ac124f0dd71fabaff43cd836edec0d84c3c2c9f
 MISC metadata.xml 405 BLAKE2B 8cb6b3e3b440bc53f5d02a9638b00356f64bc02a8d7444ec5e295fcf91507f94c2460acd02008e6b11ca3bc2dd3d2f96ffb61c583fade0ff4ca00a182c01f903 SHA512 4a1dda1d8ada98b57881884ec6e982c308b54ab29e2cfa104f398876a1bd8ee2015dc7de4891c305f65030e30259079667d42c7a80d14d5148feeb5b7cf5904f
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
index ad4a61224380..0487631e4714 100644
--- a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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-forked/pytest-forked-1.4.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
deleted file mode 100644
index a9f3ffc010c5..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="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 ~loong ~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
-# implementations on pytest.
-RDEPEND="dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index 96b56051f4ab..ad35204ff3cf 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,5 +1,4 @@
 AUX pytest-freezegun-0.4.2-distutils-depr.patch 1655 BLAKE2B 3af611f832244acc2dc76ec8a69522275063dcdc4dc48b1d9235260e194be01730cc2b1b5a1507286594f2a27e2fffe489ced4a29624c54cb834a3fc6b1e8c7d SHA512 da1ef13c2eb724012a6b011f3bcbe6030200c1ca2a9bfa4cb0a0337e22641e16091d0e58b71367a232419f976f98e6269bd3a5a0a03f432dc8e3927c97b556d2
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2-r1.ebuild 838 BLAKE2B 9491b8106f34d5944ad4fdeb5fb8bc09cdb2c91b1bde7461a9edd2902aed7b2247966f2cfb2dda7377f6f53eecb0081388d7fb5e0384e74178d3f866bc9558d9 SHA512 b1f4238524f669d6c2f3ff311431dcd44bd5acca2318c97876cbfdf2c022e40f266b8bdfd8f93481dacbabd4846507b8f1b68da172637ec7dfc0d9bdd8eced62
-EBUILD pytest-freezegun-0.4.2.ebuild 635 BLAKE2B 199816a86088fcd6f125ac3cb51fe73e9cc40d993a74efabcd2c60c1b2bd699c408b8904488ecc10f7e778275138d08cde894a001c261662e797a98a4aa082e9 SHA512 27f3e0ede6e0afd84a8096005d4856e236b054c5bbf532a58e18618287503652d9624f3d16842db097b887677809248e9b0c9466971feae67c5bf70bec1519a0
+EBUILD pytest-freezegun-0.4.2-r1.ebuild 830 BLAKE2B da4d183497be1a9eb75ad730851bf660ced2bc4ce5bc183849ff925bf34fd519370a0f4b386830a7d45b174469f8b95aeebc4b5e7d5397f792176bdbb4871d79 SHA512 58c9bf02de3fc51b1066710e2ffad262100b4d27fef6d53c07001292d10880a71a800c7ce5ae9f07552872e0aff71e2d89b269cee5674581ffde82c31998f384
 MISC metadata.xml 322 BLAKE2B 3e34df76fbf36fdf27dbdae10499c4925f51f9ef3945895ea54f4423f5efef036bcaf6e9516e74c4e0eecdb4e7a314f0a689804e1719ee28287b6c417bc7c1da SHA512 6b495faa2f661da0b83e25fd3bbfad4e3856247948b503a3f01d82d2cd3d9908c85699ab4e5d99dfe2ca48d55287e320f9c908ae4a2330f2f2c037aee258bfa9
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
index 033c1633aa62..ff9821ed2e2e 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
deleted file mode 100644
index 27d5e3ea6050..000000000000
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020-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="Easily freeze time in pytest test + fixtures"
-HOMEPAGE="https://github.com/ktosiek/pytest-freezegun"
-SRC_URI="
-	https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/freezegun[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index 3d8a7c490a08..566635435fc6 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,6 +1,3 @@
-AUX pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch 1218 BLAKE2B 1126c43aa209aa989f969e9ef04e1ddbd9502b697f46f4920234f022b380f5098f06b12fd1b9aae42d29ee61480f0db617af261da01b6ce2cf749e4b20fc06b9 SHA512 67fac2cd8ff09b6e104ceb2c7c239316444a9ac9e361ca2dfb152118bf540ab64eb336dd6a02a2c30a1579d47f3aad64789a5f95f9298f28a696219312af1bc6
 DIST pytest-helpers-namespace-2021.12.29.gh.tar.gz 51376 BLAKE2B cbc79e6868a18f7174b96e73e3e902ea969d5a361c141e12bf5a67eeb7c93cead61629842f8b8744e58240cd8b85f9864ed95fec7ce048446963592b41bbd7e5 SHA512 82c231ff11a36fce7b16a0ceea51c9306f7e05ca3f9e8cc7cc1c77ac9822f974d1ac893d2bf9b7154bf9593a529193daa041ccaaced6fdd9e38ba4f794f161b0
-DIST pytest-helpers-namespace-2021.3.24.gh.tar.gz 25881 BLAKE2B d13e82eebf09b4acb1d8fb9d3609f8814a49bfd0df56f23fe6f3fe3fa1508c4f1ac338b3f75e1e97ae90f71cae548dd100548d23cdbaa6c4bdb76cdb6e3d4a41 SHA512 1914427a4805a168d4067cd5db5663d28e3ff680f612e70a169a7efbc6c2c7ba0e2dc74132595aa70e13b651886bd10a6947e56558edf22b871618c967537073
-EBUILD pytest-helpers-namespace-2021.12.29.ebuild 1004 BLAKE2B f2a9352607b11b77539231e5c01a2b03801009d07906e901353e76347164d14348bc386066d766d5ef872f08eb67b1df528c40b858e5be195f765e273c22c821 SHA512 ee3d8c720069f4f3745bae4a6ef382adc6b0a5d25e6e7f5a694bf7253d5a4a05ce9db8bc68186a77f427f0dd2ac8e49f435968cdb4ee395fd47c1d4420326419
-EBUILD pytest-helpers-namespace-2021.3.24.ebuild 819 BLAKE2B 18b08e19e531e108b235a6795dedd86b46b9ad7fdd2d26521a8a825fead3461586a516e93d9f045a50f6f837d5ab511a09fc691e8057c364fedff98bf2b69187 SHA512 452ac5e8c6a884c25218b1aa5f549688edb972560822534d35edafdb49574a5efd7e4b42fb2c03b983b08f646a6e5e70a71fb530d343c6e7cdb04107b8fec588
+EBUILD pytest-helpers-namespace-2021.12.29.ebuild 1002 BLAKE2B 968f8a81e4ecd7feed1157f8c57107cc3a1dff2cd8044310ab4c63513f08dd7f111ffefe62ab51446087e48d7c153e8733f294789400b01d646c883826ec73f7 SHA512 8a18e7d72c12e0c28eee9bed39c5204a22905e9103fbf62068b89acfd507ef6373fef68be84c6b719a21cdec9b59eea4aae21e2533b3d9df88fcf8692679ec61
 MISC metadata.xml 514 BLAKE2B d2cf552d0b34b0556bffdb2afb6524b5c0ce81d503a6a1dc2b4957beea0c96c1eb3ea4f6e61bd4351a26fa2983d10b155a58bbf04fcfba1fe4e55f720a7db09a SHA512 9aa9a28164597c7a6bec22f6c07f269c5954b02a4a7523373866e60f2d6824c83dd4912ca2e05081a2257f7e01e135f2544a0732d3c2f51266b331c753314108
diff --git a/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch b/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch
deleted file mode 100644
index 5bde4bccd537..000000000000
--- a/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,7 +1,3 @@
- [build-system]
- requires = ["setuptools>=50.3.2", "wheel", "setuptools-declarative-requirements", "setuptools_scm[toml]>=3.4"]
- build-backend = "setuptools.build_meta"
--
--[tool.setuptools_scm]
--write_to = "src/pytest_helpers_namespace/version.py"
--write_to_template = "__version__ = \"{version}\""
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,4 +1,5 @@
- [metadata]
-+version = @PV@
- name = pytest-helpers-namespace
- description = Pytest Helpers Namespace Plugin
- long_description = file: README.rst
-@@ -34,21 +35,12 @@ packages = find:
- python_requires = >= 3.5
- setup_requires =
-   setuptools>=50.3.2
--  setuptools_scm[toml]>=3.4
--  setuptools-declarative-requirements
-
- [options.packages.find]
- where = src
- exclude =
-     tests
-
--[requirements-files]
--install_requires = requirements/base.txt
--extras_require =
--  docs = requirements/docs.txt
--  lint = requirements/lint.txt
--  tests = requirements/tests.txt
--
- [options.entry_points]
- pytest11 =
-   helpers_namespace = pytest_helpers_namespace.plugin
---- a/setup.py
-+++ b/setup.py
-@@ -2,4 +2,4 @@
- import setuptools
-
- if __name__ == "__main__":
--    setuptools.setup(use_scm_version=True)
-+    setuptools.setup()
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
index 8475898d5ed5..83122e6a1198 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
deleted file mode 100644
index 4022f5c76182..000000000000
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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="Provides a helpers pytest namespace"
-HOMEPAGE="https://github.com/saltstack/pytest-helpers-namespace"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-extra-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "s/@PV@/${PV}/" -i setup.cfg || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest --forked
-}
diff --git a/dev-python/pytest-html/Manifest b/dev-python/pytest-html/Manifest
index 332574360184..e0c0f51ef5ae 100644
--- a/dev-python/pytest-html/Manifest
+++ b/dev-python/pytest-html/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-html-3.1.1.tar.gz 38548 BLAKE2B d2491280ceb4524a10a46891448bb63fe997a4be82062e727fb1d79ef6154a0b4229bbec27c6601372776f7c8dd124aab5d4968482fc24ad24330db5d2520187 SHA512 78091b485d153b54cd76abb8cfeb6494830b1b51a10dc0c00c73eccf67962d2805e3f83972c7ccfd1f877a939b582f80d5ddd5273fd1ddcac2a1a9c2eb121300
-EBUILD pytest-html-3.1.1.ebuild 766 BLAKE2B aa4daa33743fb37f34c08a1ba0d168941f11867710768d37e4c7b4fbb32c30ba8e29253662c6aa0a8898476c64e94df9dfbf6ee750f2454fac5be211b3a3f9b3 SHA512 e8bf10971acbe3f24fe63eb678ff79d12a1bf2e1fed01aec3fa9fe58695940164c48c7d53699f7bd2c4e6517263e9b09d6da48b7fd1544ced9353a2aee4bd7f3
+EBUILD pytest-html-3.1.1.ebuild 773 BLAKE2B bb537f64235968266bdea0dfea33f2bb2823d78d0260e21a2fcf1977bc6977b4de4f3a6f6ea5a4453bb81a229ccc241e61489a4018d6195accc3ec6ca75efa21 SHA512 4b45ab76b8c912b860359bdeea6cdbc8435daf3380528aff17897b77c69abc598fb17b5404e42b81a22bd35f53765e8ceb7c138bf25c13fd5d9c9ff8a6552b65
 MISC metadata.xml 355 BLAKE2B 5446d5fe85ef69fa4a60a8fb32cfa805d61cd958cf2676c1c6727ce229aac8b115eb4a98d6865e8a4e7474517471b2dfbb28e72dee75796d5b119c98cd7e163b SHA512 ef1ac38e97a25941605ef44f6d872d30a8bcebf2997cd732b5dee2aef948be2346eaa9ae360953ce02c7b1223b454470c1d4328f24b0fa8c6a3d61bd0af8590a
diff --git a/dev-python/pytest-html/pytest-html-3.1.1.ebuild b/dev-python/pytest-html/pytest-html-3.1.1.ebuild
index 052856b3ca2f..bc639d3dfc4e 100644
--- a/dev-python/pytest-html/pytest-html-3.1.1.ebuild
+++ b/dev-python/pytest-html/pytest-html-3.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=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 # Lots of test failures...
 RESTRICT="test"
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 391147ce1cf0..a64ce0f9288c 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.2.gh.tar.gz 18727 BLAKE2B 56a7fa1c1694cad98815fc6c6f676b509942fa1fca192ecb4cb5a0d9f325d7df6ddb3a3ac67d884c8f8caba807677351c42c28a3bcba80b9196e74d666951cc2 SHA512 b4adac1c37506391d83f7772814b4a9ce5134cc6834d8758e71d39610f8b29e57e72b11b2233be51e41b2c36bc305d40fc4b260a7f83d10390f4e940df8aa366
-EBUILD pytest-httpbin-1.0.2.ebuild 966 BLAKE2B b63bd85708287d37e189342899f77b7b034d3de5d9c01bf41a17777704c81885d684bfe88e38a29f6d4f58633d357c507f30269fd1a79b21aaf82fcb85b4df01 SHA512 281d1c09dbcda06d863bf852ada004102f847c00d776a9c081dd2db358182b5fe641552d17dd60404babf9a6dd5b38004eaae9789e432e602111191620087464
+EBUILD pytest-httpbin-1.0.2.ebuild 975 BLAKE2B 75f9a8817d9683348d4dbe43428de25cf14733672eb7777dccefeb490825df6e468d12124a5ae5c64df9150a2b381f2bb920db68535ebc2574fa00a0bf9c5a59 SHA512 2d13b886619728c53158ffe531fd428c4a809ba3ef3b26f7b41e2d7adadeaeb53f5fc1bf244435086420c220f7eb798906c3f8cca1266fef541038f725fd6479
 MISC metadata.xml 547 BLAKE2B d60e6b3e6c7d0c37dcc42dcffeed9e08fb7ad3dec5e4f5fdc0ffd1f7a2c46d89ef57a9576028457ee433d0ecbd100ae200ef507b22bb326838732751a7c644fc SHA512 4629dfe7e4cf27d5d52e7ce3e646f590b4d80a490c638cb035352416a587b494328d3f23e088d13ae1677c415080a7249301d9830be0cfbce7a44023302bf582
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
index 4a74e053a530..6a0722e3c494 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
@@ -4,14 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Easily test your HTTP library against a local copy of httpbin"
-HOMEPAGE="https://github.com/kevin1024/pytest-httpbin
-	https://pypi.org/project/pytest-httpbin/"
-SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/kevin1024/pytest-httpbin/
+	https://pypi.org/project/pytest-httpbin/
+"
+SRC_URI="
+	https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
new file mode 100644
index 000000000000..8c4e7681ea44
--- /dev/null
+++ b/dev-python/pytest-httpserver/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-httpserver-1.0.4.gh.tar.gz 78911 BLAKE2B 425f72438797b55a84662f580dd9bfc1d6dd8a0513587e72b6e1de7e669eee75c777fdd6c2cfcbc92273737dd47568b48a22f12e8a40952f82a599f30705a604 SHA512 e80754910117736fd172d7bd5e5fc41721fab8adc705b72f0ee4cd866c878ed267ad3819645fd567e3af2c9e53deecb3749f1a873d72ff9e234c4fdd7f7cabea
+EBUILD pytest-httpserver-1.0.4-r1.ebuild 765 BLAKE2B 921806e34db0a4ec3ffeba9a63e761db990f5726fdce9c9bb890f3bfcad8b65b2d73e932fffab02eb3a09c1e0460d0f35423d875e37c042c7164d19fc48ed551 SHA512 192fc0eb9343f5888c2ff34366bdd1ea844bad1aa82a0a552b370802a4eb59ae28abe4b48cd5bb507d2c6dea384403cf1b38b4f887e9480d6e30eafd8783b2d1
+MISC metadata.xml 411 BLAKE2B f74c6327167acc706faa9d9e60e2f964e476f33cf33b525287850dcd46e1fd35d6a770d495c929b36bc288c6e2a08d32077bd5265c522598477bb61c4abdd367 SHA512 a536367a8872d3d722f7671d6824d05d1912e9ba53a25ade91bab5cfa4dca3cb2e3f669c7a70416c68a200f1272c5709509b37133886f0d64816b096918fb4f0
diff --git a/dev-python/pytest-httpserver/metadata.xml b/dev-python/pytest-httpserver/metadata.xml
new file mode 100644
index 000000000000..7c1d1a182b30
--- /dev/null
+++ b/dev-python/pytest-httpserver/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">pytest-httpserver</remote-id>
+		<remote-id type="github">csernazs/pytest-httpserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..ec3afa2d9048
--- /dev/null
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP server for pytest to test HTTP clients"
+HOMEPAGE="https://github.com/csernazs/pytest-httpserver"
+SRC_URI="https://github.com/csernazs/pytest-httpserver/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="dev-python/werkzeug[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e '/tests\//d' pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest -p no:localserver
+}
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 44065d06eb5d..7e2f904a11ed 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-httpx-0.20.0.gh.tar.gz 23106 BLAKE2B b44890bc0f916a10d57b1fe16523808cc9ab9a364d39980c49b4d26823afe7c9388b442cf99225605d741d192b5f282acdce0c7929e00ea076f10f04a55597a3 SHA512 54f588ddaaa0b9909f38a25ae1cf08d63f943a0fa169d4b77d2e8b967fc001af1f667b7c91dfcaf14bbed948d72df22ec133468ad692157b31259b2b155ebd88
-EBUILD pytest-httpx-0.20.0.ebuild 680 BLAKE2B 46d46c493fa5ce3e2b0c1736f34701fbbd7722f12233f45ec245564492c2bc76b076311f9c679c16bccdb632cf0644b1851c54dedfcd4041a0e6a5f9b5ac9461 SHA512 b53864156b55408dc3899d0d15be5248b80e0e12f16d3dd50bf8977d773f062de53649f390fb7545920a3898301019505022cbcea4d19e4b7d3c9fd287921306
+DIST pytest-httpx-0.21.0.gh.tar.gz 23123 BLAKE2B a9a1bc9effc557829071f13cec76aa1d164ae7040b685390c92f33c644c804448eba1ad3e841abdb667a2c0289abd64f5d3633779bd8b0355a1c03d390d94bd5 SHA512 6be6fb39ad1ef233ce9be7cf510422754b6c97a1b565d49224e82cbe4218ee24051b6c5865215ed575f200446dfe8dd1470908467c67077c51a4f5412b113c2a
+EBUILD pytest-httpx-0.21.0.ebuild 769 BLAKE2B 97cd781f719ab8478c394d961ab45506ac8d30a374706bae1cb0fc4e0f2b8d2f62f78deb5b283da7e66db18c7aff58d6545aa8d366f752ad1e21f19cbca28643 SHA512 0c7647d481c7bb97e95eafce830c03cfb02b596c23548c33d0baf6d69413e4d1db8ad9d4610cc706f8c6fe58818b36b13f436f71d62b284df04e1b899b8df981
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
deleted file mode 100644
index 74125eb14438..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.20.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="https://colin-b.github.io/pytest_httpx/"
-SRC_URI="
-	https://github.com/Colin-b/${MY_PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.22*[${PYTHON_USEDEP}]
-	<dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.21.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.21.0.ebuild
new file mode 100644
index 000000000000..7d55391a5293
--- /dev/null
+++ b/dev-python/pytest-httpx/pytest-httpx-0.21.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Send responses to HTTPX using pytest"
+HOMEPAGE="
+	https://colin-b.github.io/pytest_httpx/
+	https://github.com/Colin-b/pytest_httpx/
+	https://pypi.org/project/pytest-httpx/
+"
+SRC_URI="
+	https://github.com/Colin-b/pytest_httpx/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	=dev-python/httpx-0.23*[${PYTHON_USEDEP}]
+	<dev-python/pytest-8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index 07e1658e1d69..f0d5ec65cf31 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 534 BLAKE2B 453b7620f99168b5726ee117dc567c06880a745bcc59787d9f1362da597f6def5f7f75a59a7b7c12900fc6973aa28e82955962312f74a3bbaa9dd1c6a31e9a24 SHA512 6bc574a9dfe3aa65719803fe2bc65d364e9795397d9351bc2acf6e4cc8cfe67a1839ef2c1feaa150a94b3d543169410279ed3adb1cc204a2f31d2fc296e7847b
+EBUILD pytest-lazy-fixture-0.6.3.ebuild 566 BLAKE2B 6d0f0b89c5f70a431b21454bd1758d3da5ce4a79b4fa1ba86dfef21d9382680092167003b5346ba74047f11df7317f636f565b679892c6e6e534b0b3f75923c2 SHA512 401126dfb5fc00d5737aadfd5167120a394d8b585d063ac06cf257df131cfcdd4f4c2436219c6fb5614c7449ef43816c396f4028b61287da01ae5024320622c0
 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 9195da7dff8d..89b3ab6ee1bf 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
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="It helps to use fixtures in pytest.mark.parametrize"
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
index 1356bd59b9f6..0be800529293 100644
--- a/dev-python/pytest-localftpserver/Manifest
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -1,3 +1,3 @@
-DIST pytest_localftpserver-1.1.2.tar.gz 41275 BLAKE2B ddab430541208ea7e30b7091f0e5ed1ff347c4f289c79e1bf93e7fc56ac3d9076065afefb383e8e394cf702ce906747c7450acc0423df73cba5762cac01efec2 SHA512 44dfb4e680f82d6156212a06e320d437c5aa947b149177bb05a612473f882e0d2e8ff02751d0f79d56596cada82a299c9266b5849220687cea1028df7ca1bb00
-EBUILD pytest-localftpserver-1.1.2.ebuild 622 BLAKE2B ba6c3e8a0cb91820caa2fbf4f67813526c4169d0e1e60c3de39170702978fe27261f819db005dbf9609ee185191b85a914e49523613a3e61ee901b50265fea22 SHA512 90113f93c94de2ac8661059b07445fab8d9195ef6210438ea38dfa24d703fcfaf9365d67340d4b39086d87aa591560fd248c98a4bef44e0c6f768b32d40f08d7
+DIST pytest_localftpserver-1.1.3.tar.gz 44510 BLAKE2B 98085adc5dd31bb6556ea1f31c6342e8453a07c24658baf5fe94e91a001e9b88c5f6ef01a3a8419bd7b1bd3eb053ef52788c80926c5984b523d9f575224ff6ec SHA512 8058f7c6853acf709fdf4e0ce169af4281e2236a615261c0e148965dc1899af78b558ae5231600a106c538c1790ad886bea80ba7ebf278c70b6d553e58c0202b
+EBUILD pytest-localftpserver-1.1.3.ebuild 821 BLAKE2B 4c258f31b34e2ff29d4f284783871e7485267815b3d23bc557701be7a9ef0b2e4be9db9f74f6c2402da2f24beec173e6f2a49f12ffc59cdf23f35c3c28f0818e SHA512 77a1c02e55dd513eb1167e361e65504622a0c04ef0161b98bb46e4cc4de67814a46f6554716c7c7aa9c08da742443b621ebbd8265f42bbbd70a93e22ae8d3f95
 MISC metadata.xml 569 BLAKE2B 5a2afdbd9c95515e83ac146f95c1c1da36e556402c625151fb52bf067e58d4178111e8fb0457113cc292b0f480ccb9b1d4026f9bcb212db57711b4c08e3db658 SHA512 cdcf50653ca1020b258d9c38e524d6a27c9e287cdb286f36d568dd2fc1b07dad241df07d0fcc2466d341d11d3d0ade5ddb033b026eba744500cc2931da44064d
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild
deleted file mode 100644
index 4706d32e6255..000000000000
--- a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-# Tests require python wget module, but not in Portage
-RESTRICT="test"
-
-RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild
new file mode 100644
index 000000000000..e826b9bbbf46
--- /dev/null
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+EPYTEST_IGNORE=(
+	# These tests require python wget module, but not in Portage
+	tests/test_pytest_localftpserver.py
+	tests/test_pytest_localftpserver_TLS.py
+	tests/test_pytest_localftpserver_with_env_var.py
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 62ec608f7575..810e6d65bcfe 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-localserver-0.5.1.tar.gz 19341 BLAKE2B 759a90552b6f950579088a7c41448ad0f000aab980c56361d0e1a40d98a00ee234bf542a6309eb096602536da3fa819b7227a962d0592a801131a019f1617cdc SHA512 dad8b21020cf2f08ad03398b82bad7b47e553a9c6b489b94186bdc61c22f57e7151f8dbeab38ef42d03658104ec42920ec363288a1bdbea34dab6aee1da03c48
 DIST pytest-localserver-0.6.0.tar.gz 182346 BLAKE2B b8f56c6db3bc9c260c747cdf707aac0de22152111d3a8f9c0ea8adb8e5e556edf4a1ffa0d4fd517bf95428c69ebc0c1629a103c3b8f44a57b939f696cb9240cd SHA512 149796393af260fa5d69560852e9d11b569515b8486859302af2ed369a93bbb7cad11f54210851bd4030d8f7f5936a0306fe9599bc8477bdfc61d3d0a83cb205
-EBUILD pytest-localserver-0.5.1.ebuild 701 BLAKE2B e3287dc598c4b1866ebe74c80dc2f5f4fd8f49b1d1b18802cdaf9e8927ab7ce2d5920fd9a44cca74116e8b0fbc3382c89b6498ab26a88edbb9036f691a138879 SHA512 f5af0f2eaef0d095d301ff67bafd2661a0e6ae36fc4e20faa11adfe2e43f77bbadb27abc1bbcc7a304a85fd4bbd4c5a29639acbc04b4490221f55a5c5e56919a
-EBUILD pytest-localserver-0.6.0.ebuild 832 BLAKE2B a6b3ec2b596e2f222dfcad293373f54cbfea541d7aea34d85bd955deeadd2ae9c10c5f81a9e2f06726514e28cdb999383c0995bda9477a8350be0890cc9df641 SHA512 8a84c5b1c101785e8d9965f58b29505b71c8efba639d1030e796d52ebca5344421e686d6d10dbedad71a3a5fd9e7d3fe0ec177910e7449887510c29d8348afee
+EBUILD pytest-localserver-0.6.0-r1.ebuild 933 BLAKE2B 43f47c55517a73d9482f1b3abcb5fdb9ed47ea72a6e00105e08bb5663813ba1614c8173d54892187dedaa8ab8feac289506934bde41deeb062a2fb88ea189a55 SHA512 62ffd115dc0d5b7db13635dba5c701053cab965cf281622d52d30c7d6e9f28e8eada7d8b6c9bf4bdbf274146e91acba71a98ace6ce767330cf8328b4ec5b1be2
 MISC metadata.xml 346 BLAKE2B 00f1243b0ef08f63d41fd211743230b93c976b52c5048bcdb2b5317610541a088ca13302e9c66e6a1a03156f071c5808d6960ccb1bfcf1349ba727f7ea608c25 SHA512 515a24e3a2fe049ad130ed44c1d42fb92ddf2f1bb4e512f8fce7e63b18af8529ae8790ca0dfc9b93589940c00fce192f1b16063936be26358e0e827afd359148
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
deleted file mode 100644
index 96b9ecf2c9f2..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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="Pytest plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.6.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..87ee974827cc
--- /dev/null
+++ b/dev-python/pytest-localserver/pytest-localserver-0.6.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pytest plugin to test server connections locally"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# requires aiosmtpd that is dead and broken beyond repair
+	tests/test_smtp.py
+)
+
+src_prepare() {
+	# remove aiosmtpd dep
+	sed -i -e '/aiosmtpd/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.6.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.6.0.ebuild
deleted file mode 100644
index 809e2e45c873..000000000000
--- a/dev-python/pytest-localserver/pytest-localserver-0.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest plugin to test server connections locally"
-HOMEPAGE="https://pypi.org/project/pytest-localserver/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires aiosmtpd that is dead and broken beyond repair
-	tests/test_smtp.py
-)
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index e99bc86ee738..3f969c71707c 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-metadata-1.11.0.tar.gz 14135 BLAKE2B 1de1c47b1d7775040075de479722fd07cb187f14cd37c5fe73458fb54ce01653295288fd11add8066170b8dc39f80c8749e739deb01ac8d579ef5e6f4339478d SHA512 09867df6158ba66f55a0a812b3731b4372f874b6bdc91301ed0c4d4c38f6fe9a4f936006d4e27f8c68d4a2d6b0fe5fedee3c6269bc6867eb1c7d73a42bda0361
-DIST pytest-metadata-2.0.0.gh.tar.gz 20152 BLAKE2B 8ce06c327a3242a049c9af2476536a85e99d56925ba4ac98d7e07f72900f8b50c59950f25f4ccbc9c6c17eb2310ad381862f24d26410bbd68a6c2868cdf83547 SHA512 b22cf7925d3f38242670efde5e5482c7f971af78edf7bcccc765602dd4d688502c9b3b5b2a9723b37334bb8ad2218eb2318a82b8b2d6576ab8d69fa1ca321245
 DIST pytest-metadata-2.0.1.gh.tar.gz 19945 BLAKE2B 931ede3b58471e3092eb26af38f380810140539c7c50b5e3e9a63bdddedd9577b1f23aafb24ce80de55078f772b0dae8715368559f79a3f31f33e15870134f45 SHA512 03981b4fbcd812cf5896d6db2b74cbc1e6c84cc13613f916248767cacfc7650580f668a5ea8892be85c87fa08101a8a2f440ee6e0cc1342d4fa9919d41153a6b
-EBUILD pytest-metadata-1.11.0.ebuild 548 BLAKE2B 2565f81c140adb4a9e66c369115800afcb4812e017557b6bcba37790e6951d35c0a5928c6854ed679c5811158066a4d763cff8a477589a308d1a590180f2674e SHA512 0ba35808b470c5adcb6a76eaa5f7381ba97d6eb2328f122bf41ee5a08b9a6b66596190fdcc622be2e777b3f513f338d0adeaff3ee44e9c73383bf764d6ac3fcc
-EBUILD pytest-metadata-2.0.0.ebuild 697 BLAKE2B 1a977ae128dd0c636a295c74c5bac65625b4a2e43ac500464efa503e488c55b3ef4fc0a26759268a2192db72bca5819a1ef2122b78fcedb7c0f34380b5b54e5a SHA512 adcc4371dd2ae2d209641c64d7339a64c1283555bf992ee959e94d11ff94fdb15e3c370a2e07841b20d0e69ba7dfce40bd9c8ab50eceed662a912f0a5a8318ad
-EBUILD pytest-metadata-2.0.1.ebuild 733 BLAKE2B 77ffc6ae911da0cdbd609b263a30520063a2d64a5387b78759b1c814246d1256ab19d48f621306497f45ad3bd0d68247883d916363240c7b867cc5321b190b04 SHA512 b9a4dfa2dc40da7c3b2247834dfd572d11ce4bf1ea2ed4030caf1bab09e425055d2461876f01bc2fdce61b71810946c1377a51c213c06de6dd6b5df65da38e02
+EBUILD pytest-metadata-2.0.1.ebuild 740 BLAKE2B ff12af000c7ee94f06b187a64b6174955b875eda17c5828997ad5705c93bb67bb5ecb4279dd0944ae7514ef528dd6a2857a5c6ac1c34e92616238bef15e08192 SHA512 a3ed0507ff666e97be6547d53b7d6d19f4c1657223a3de1ca120a068b9ab9477d29b670f6ff65c283e1928771949c0ab5860642716dc0e6a767fa3fe2127b26f
 MISC metadata.xml 385 BLAKE2B a888886c89fe52cd8e209fc9638fc3cdbf9b7dde0114c46d57b4f9b91f1ef49ebdb3f967e913036109054547d3840c8bd5ca24e5b80ac541889c48ef63748233 SHA512 20094512c77c3ea6f5501aaff0fc9b6ef07aa0580c555e3da5d6ad25e1ecf2f9f42443b7a43256f3fb99aab029a83a2d2696e9a0c8b2ce81e95ef15ab0c33b23
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild
deleted file mode 100644
index eee2b6544974..000000000000
--- a/dev-python/pytest-metadata/pytest-metadata-1.11.0.ebuild
+++ /dev/null
@@ -1,20 +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 plugin for pytest that provides access to test session metadata"
-HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild
deleted file mode 100644
index 967fd1ef649d..000000000000
--- a/dev-python/pytest-metadata/pytest-metadata-2.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for pytest that provides access to test session metadata"
-HOMEPAGE="https://github.com/pytest-dev/pytest-metadata/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-metadata/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild b/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
index c3d5cc6860f6..3f2c81106531 100644
--- a/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index ef6f9debec3c..fc27bfe9f227 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-mock-3.7.0.tar.gz 29311 BLAKE2B 27227b66008c70c4016c8e15d0021a67e84730a8b49c5664dc4f29e16d5f163df293269ab332707e44b7a0b182e15e20ab0ebaf4b9d923eb911083377972dad1 SHA512 6ba69e86bac8a430a9f1f1c615ad21f505b87848ac50fc551bc02f81306bf8769fd015615d96085d87d4c695c24b0686a95116721358687b48b64de5d0ae6901
+DIST pytest-mock-3.8.1.tar.gz 27671 BLAKE2B 6bb4a3d752ae0f4e751cb50fd6018802bb7f3cee53429693161185ef369bad8addd8637d2526750fcf9ddbe9205da3d1d615efa19b1d58ae71603ca3902c67a6 SHA512 db8c0e2cbb7f8741569035a4e6ab9335ec0b03e05f0df07de0de8dad769974f96752c15d85c439da432623b51296b88970e3e29a212930e2bac33ed47d6055f3
 EBUILD pytest-mock-3.7.0.ebuild 1059 BLAKE2B a16270f47039f3c785b0ab4887a8d254ef0c2ddbd9f3f47eee3c836aa306bd6c753527b46000a27cd52828ab721314b334e27b5058cb807316f6148cf7768248 SHA512 3c944b84e9242582e3e773d491d732bb16952e53e1948a73eb475d11420dc040042552b23048124dc43a709d8fbf3982bf645ed2e95ae2642596be1b1d3fa09b
+EBUILD pytest-mock-3.8.1.ebuild 1067 BLAKE2B 2054d7347b138717e9c83954c1c813a52b09081e375fe73de0bfa6dba9881656f54921a7a0c63d030e62abeb74c4ba4295cb58196af46801abc3e511c6dc33dc SHA512 427607c7a44bed7a2f47593ca67db71ec97f809dd91ceba04cd4fac564f041a22aa1d7d4ba0dd544bbbe465a4db21c6c4487bf4d857b1ac9b4777f91d495fdb4
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
new file mode 100644
index 000000000000..ce9187b4e2e5
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-mock/
+	https://pypi.org/project/pytest-mock/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytest-6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
+	local EPYTEST_DESELECT=()
+
+	if has_version dev-python/mock; then
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_mock.py::test_standalone_mock
+		)
+	fi
+
+	epytest --assert=plain
+}
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index ebc706b83352..cd9ac657f3e7 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-ordering-0.6-fix-pytest-6.patch 920 BLAKE2B 2b964bd2cef5f947bc53554abb8c7f0432f3a8ca632b0f52dd304836a79a4e4050edc0e6350f92f517f43a8fec077a58ec407ec90ee1489501ceb7b6971fa76b SHA512 7164f9982668dbdeb016e39937101bf879b6b0267e05f854b34a50637505ed762f6fbc931428e346591e7a1b1ce1da0a929f19222931db5b284bdcbdd2fc0ef7
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
-EBUILD pytest-ordering-0.6.ebuild 946 BLAKE2B 14679714049443414eef77f733c07489ce0f6f1f6f798709a905801632dccfa9c4cc650f1a642f716552b3c1f3fa85785ea263b42e829583dc920e5b5655302a SHA512 9f9e301ae4ef40c53f254839ac8880929836c3e1e785a8796374f3365841caf0a337870a103cb0f04681d8613e9fe3b0dbc2f1f7dbb03d1d246884aa4159cce3
+EBUILD pytest-ordering-0.6.ebuild 946 BLAKE2B 8844aa4d5e34f2a5386c3768a0b7688723d784b621ca375174cdb8051bf306a39636291e8c1a7890e91e86578ab30f26e7f478882f1cb437778010edc09065bd SHA512 bc160a1f58fa633b6e34020b14fc818bf95ce6e466b2ce22dca3192b4e6a20f6874e0a6333da09f44ded17ec2010944602da0ee198d2dd6bb410ef2314ac986c
 MISC metadata.xml 423 BLAKE2B b33ec2a8e4852bb8d9865369719cc4c38398950279b84ba6feb2a7869b42824310ce9a664cc6cf7b3a1febee4d86048158923a396fce9ee1e99051daf34d6e69 SHA512 dc144919d84e8933f9ce70faa6482ff0334d28fb7e6a5b2feba53d29d3b2002cef05a6012e1e2764a8364da39b2914b2e8ac7101611828c41809372fda94a12e
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index a69c5eaa3471..b30a24266e30 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
index 54e742bfe19f..db2323a2f86e 100644
--- a/dev-python/pytest-param-files/Manifest
+++ b/dev-python/pytest-param-files/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-param-files-0.3.4.gh.tar.gz 6882 BLAKE2B e2e96bd2cf7b8676f92eeb7821ef76f1f82bb066210170ed4d04a16a7fb3ce346bcd63688ef9d46118c03fd74812fd821fff0414565befb8c558d03d15af2945 SHA512 2df6fe798aab743fdbf892b88ee1d09c554119429167e85bccb87e4ae9d487f8ab5a66c4157827500e8a5d2930277c7490348f6c38f23243e421d5449bde2df5
-EBUILD pytest-param-files-0.3.4.ebuild 642 BLAKE2B a4657729cedfe84412be512e84e70dd0b59174111fa08dc972ede712ad201eb3875ff03f3e81a3ad5ce87cd18a1fe4d529c373b4c942205cedd754ab9802683b SHA512 ac9f6d852663f2a9542e2c3f48d4ffb45fd8191861180bf4297eaed3ac08c2d2518fe0e6e8134fbcaf0262f425b89ed544c98d494cc97fbd9d0d79cd13884354
+EBUILD pytest-param-files-0.3.4.ebuild 656 BLAKE2B 7edf2380892e4cd9248b56ed240b6d01fec3d00c516ab0b5cc3a3df24fdcb535281fb3bdc9a0e273707abb4f0fc9c774ee2abd159e4f3c747aafcba2684b5a33 SHA512 07758a726d321205427f1eaf8d281f89f95079e46caad6f74e2508e1c3e3c213171537a4febbb929c6580f1870621566eaeef12929439f29d8af60f144b17f9b
 MISC metadata.xml 417 BLAKE2B 94bde89ae7cf0181aba1215f8a406889a4473736c37cc325c57635f590f72369402e54f8e54f0b528c9757229b4fdf8608b292a15cc6fa83a997aeb53a64b4ea SHA512 f5b341a0619f750edc6e3f22fc3cfb0c5204d2ce19a756df0f5b282f97fe133f8891105c48b532711bba826ef4cca935eeed4fbb0703da5213cbc3074b7229c2
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
index 5e0850cfa5ad..816bb8658910 100644
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Pytest parametrize decorators from external files."
-HOMEPAGE="https://pypi.org/project/pytest_param_files/
-	https://github.com/chrisjsewell/pytest-param-files"
+HOMEPAGE="
+	https://github.com/chrisjsewell/pytest-param-files/
+	https://pypi.org/project/pytest_param_files/
+"
 SRC_URI="
 	https://github.com/chrisjsewell/pytest-param-files/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -19,6 +22,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index f4e68ab672e5..37608626e313 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-plus-0.2.tar.gz 8210 BLAKE2B b8a28e72cfb4e10daa021528de9b5df2e9eb0bc4e911557c7c14a0825284787e94992132c0b74881867a41b55a67785c60b9b87a1594ad33fb57ebac8de391a6 SHA512 e16a03433cb6eb30b6881bec99482bc65cb7d1fa3d0db855befe666c0645d4b5ec02debde9dec4322ed0a0b77d3ac3f1cabda0cf98f375ffd68dc29fb55f5139
-EBUILD pytest-plus-0.2.ebuild 622 BLAKE2B ce7062baf929233ad5c8e1c89efe7fa85ace4740b4fbb5e55a8a0eee397b0970e18e613ad1ccd8160e149ebf025779ac5baa6e3aa332fdc254eacee485c6326d SHA512 0ca7038df407ce27686687b054d4404639870ee278a5efa355ce7cd56f7f85dbea5b4f00cca5c5d63db717f9d31809b396d9887f5e465a4e481fa03a08407127
+EBUILD pytest-plus-0.2-r1.ebuild 660 BLAKE2B 5173858f8d85857d44519d05f56daa147456df76b540a831883111366a2c827445240453823529c4e7eaa6ca50d4206bd5857d2422413b257e1b7536f865f626 SHA512 b04dafe2c78aee3d91d051d24ee6a29debaed70b48b91247279e10a400c926112691b2abbe274f33a6b6d0a0dd9deae84a1b134e1ed330f154e7d317b1834102
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild b/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
new file mode 100644
index 000000000000..a618aaa1583a
--- /dev/null
+++ b/dev-python/pytest-plus/pytest-plus-0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
+HOMEPAGE="https://github.com/pytest-dev/pytest-plus"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/pytest-plus-0.2.ebuild b/dev-python/pytest-plus/pytest-plus-0.2.ebuild
deleted file mode 100644
index 0e691d690afb..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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
-
-DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
-HOMEPAGE="https://github.com/pytest-dev/pytest-plus"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 9c5c1921898a..cf1a7a4292df 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,7 +1,5 @@
-AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0e0886eeee5eb4bf447544a0f712e8906edc5ea62f60555917b97c143a4804fe76e5244090907abf51bf69f98c2893552115af64fd2 SHA512 ab68967a2f30acc2aaed1c8eadeee84283b469b3465c5e79d9c37ee14236ea0e2fe827ba83efa92d5d33c369298e548cea72f80109949426aa38121ba7edb45f
-AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
-DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 DIST pytest-qt-4.0.2.tar.gz 113466 BLAKE2B 73ba6571958f3f4cd76c3e891eaa014d464b94a7965afac6cee5b43bafdc63d4d640f84c7bfa1666146ab5139f79c760bd9f5a2a44f788b6384df200ac48ad0d SHA512 7f59c499e1395460c2ff20a969cec16ca104f742c648faa0d7eb1528c04d8ee52c04c52798478bc01c5467bee33d3389b141424491ba5442f9df4e82f0dff173
-EBUILD pytest-qt-3.3.0.ebuild 1661 BLAKE2B 8af76902d54c81283ed1627278746fd874a0bf91eede889ec3de5a0be397e8b9cc5633abd67466e6bc9508bd56c84da0b5c069d3dc9bf339dc11b7cecb51ee37 SHA512 f39627d2dd504df4601390d1a310302d3e132db8d27a8e1d801560c921a87754691798bdbe60cc7b9337417cef993229f2c7673f9c91da8f9ffd4eac8aa9540f
-EBUILD pytest-qt-4.0.2-r1.ebuild 1436 BLAKE2B 8e671b876c92f5984e487c6bc3b6cfe411a526255bda40b60dc25867d9af3c3db20a7f6bae7b8f0d3ac5077522ab0c9430b44cea86be74487f96d4bc47fdd054 SHA512 e76bb5e8499495eae1d8f5ba060e06f4b69d93d04552eaf218ce84bd0addd05f69c19cd4436d99e33124fc5b63da5b5ef54b04e200a03500a4206466c5d87fbf
+DIST pytest-qt-4.1.0.tar.gz 119702 BLAKE2B 7c906c94761df6472ae65a6ebb38dff07de8156730e3e10615ea8e08f0bd9f9fee07127ee6e8616055117b1db1911bc9b4486345d84b249664d317561195ad77 SHA512 bfb56abbaac47bf9da26eb19d6913d59872f2a9923da339e9a30a2145d0a094ddec36bcfa21d39c4cf318f95a83c72c249fe70034294a6791f9d84345f77451d
+EBUILD pytest-qt-4.0.2-r1.ebuild 1578 BLAKE2B 36e13e3720c4e5739b2673992c2f888fc45400ac04a3a5d091d92bb32712ce39f7874c61e3c6e2f1511023b2ce5e8d2b06e75b0366e1d655be5e88e7c2a8f7b2 SHA512 68a89df20780c5d41865ed9b3d560667401712abbfce2e6dfe9071252ce95877b8c7854e0f7620d90543cd4f1381685d750f0fba4f6204a8b65e5252d886b04f
+EBUILD pytest-qt-4.1.0.ebuild 1695 BLAKE2B 11efdcf4e0ce3ef578e9a803476c0928f94ed3a8fe41caba28c6263c3d1996896370002347b8c9b7dc109faa26986971e0950e705394a02b222c7ce1306ccbd6 SHA512 238e661ac00081736d35fa3284f83f7e57d72e21c5ba34a91ccb171de511cee4c566dc197a397e8e44471fe1c4f9d34f53911754ecdf41c52ea591e18e4bda82
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
deleted file mode 100644
index cbdeb80c1c56..000000000000
--- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-fix-file-match-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_modeltest.py b/tests/test_modeltest.py
-index ef9371c..becd3ae 100644
---- a/tests/test_modeltest.py
-+++ b/tests/test_modeltest.py
-@@ -350,7 +350,7 @@ def test_qt_tester_invalid(testdir):
-             "test_qt_tester_invalid.py:*: Qt modeltester errors",
-             "*-- Captured Qt messages --*",
-             "* QtWarningMsg: FAIL! model->columnCount(QModelIndex()) >= 0 () returned FALSE "
--            "(qabstractitemmodeltester.cpp:*)",
-+            "(*qabstractitemmodeltester.cpp:*)",
-             "*-- Captured stdout call --*",
-             "modeltest: Using Qt C++ tester",
-             "*== 1 failed in * ==*",
diff --git a/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch b/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch
deleted file mode 100644
index 1acef2bb4922..000000000000
--- a/dev-python/pytest-qt/files/pytest-qt-3.3.0-skip-show-window-test.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/tests/test_basics.py b/tests/test_basics.py
-index 7fdaf93..a972ea0 100644
---- a/tests/test_basics.py
-+++ b/tests/test_basics.py
-@@ -82,31 +82,6 @@ def test_stop_for_interaction(qtbot, timer):
-     qtbot.stopForInteraction()
- 
- 
--@pytest.mark.parametrize("show", [True, False])
--@pytest.mark.parametrize("method_name", ["waitExposed", "waitActive"])
--def test_wait_window(show, method_name, qtbot):
--    """
--    Using one of the wait-widget methods should not raise anything if the widget
--    is properly displayed, otherwise should raise a TimeoutError.
--    """
--    method = getattr(qtbot, method_name)
--    if qt_api.pytest_qt_api != "pyqt5":
--        with pytest.raises(RuntimeError) as exc_info:
--            with method(None, None):
--                pass
--        assert str(exc_info.value) == "Available in PyQt5 only"
--    else:
--        widget = qt_api.QWidget()
--        qtbot.add_widget(widget)
--        if show:
--            with method(widget, timeout=1000):
--                widget.show()
--        else:
--            with pytest.raises(qtbot.TimeoutError):
--                with method(widget, timeout=100):
--                    pass
--
--
- @pytest.mark.parametrize("method_name", ["waitExposed", "waitActive"])
- def test_wait_window_propagates_other_exception(method_name, qtbot):
-     """
diff --git a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
deleted file mode 100644
index 8e4e3f6611c2..000000000000
--- a/dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="pytest plugin for PyQt5 and PySide2 applications"
-HOMEPAGE="
-	https://pypi.org/project/pytest-qt/
-	https://github.com/pytest-dev/pytest-qt/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-			' python3_{7..9} )
-	)
-"
-
-# Patch 1 skips a test that does not work inside the emerge environment:
-# pytestqt.exceptions.TimeoutError: widget <PyQt5.QtWidgets.QWidget object at 0x7f57d8527af8> not activated in 1000 ms.
-# Patch 2 fixes upstream bug 314
-PATCHES=(
-	"${FILESDIR}/${P}-skip-show-window-test.patch"
-	"${FILESDIR}/${P}-fix-file-match-test.patch"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# This is not going to work since we want to test both implementations
-	# and therefore pull in both and explicitly set PYTEST_QT_API
-	sed -i -e 's:test_qt_api_ini_config_with_envvar:_&:' \
-		-e 's:test_qt_api_ini_config:_&:' \
-		tests/test_basics.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTEST_QT_API="pyqt5" epytest
-	if [[ "${EPYTHON}" == "python3.10" ]]; then
-		return
-	else
-		PYTEST_QT_API="pyside2" epytest
-	fi
-}
diff --git a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild b/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
index 11a6bd58b0a3..cddbe0810ddd 100644
--- a/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
@@ -22,7 +22,9 @@ RDEPEND="dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		' python3_{8..10} )
 	)
 "
 
@@ -50,5 +52,8 @@ python_test() {
 	)
 
 	PYTEST_QT_API="pyqt5" epytest || die
-	PYTEST_QT_API="pyside2" epytest || die
+	# Pyside2 is not compatible with python3.11
+	if [[ "${EPYTHON}" != python3.11 ]]; then
+		PYTEST_QT_API="pyside2" epytest || die
+	fi
 }
diff --git a/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
new file mode 100644
index 000000000000..69dbc6a6d79f
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYSIDE2_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Pytest plugin for PyQt5 and PySide2 applications"
+HOMEPAGE="
+	https://pypi.org/project/pytest-qt/
+	https://github.com/pytest-dev/pytest-qt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/QtPy[gui,testlib,widgets(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+		' "${PYSIDE2_COMPAT[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# warnings from other plugins cause the test output matchers to fail
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytestqt.plugin
+
+	local EPYTEST_DESELECT=(
+		# requires the window to be activated; that doesn't seem
+		# to be possible inside Xvfb
+		"tests/test_basics.py::test_wait_window[waitActive-True]"
+
+		# we are forcing a specific module via envvar, effectively
+		# overriding the config
+		tests/test_basics.py::test_qt_api_ini_config
+		tests/test_basics.py::test_qt_api_ini_config_with_envvar
+	)
+
+	einfo "Testing with PyQt5"
+	PYTEST_QT_API="pyqt5" epytest || die
+	# Pyside2 is not compatible with python3.11
+	if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then
+		einfo "Testing with PySide2"
+		PYTEST_QT_API="pyside2" epytest || die
+	fi
+}
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index c16d2daca109..0143f3c688ae 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.3.1.tar.gz 109616 BLAKE2B cc1c4f5bb221f9b2e53cd235a135a91a301de955fa46a6ab62ebe900878d22ca7814745df72de9a664e16cfc044d99c9048d637dd4f0e3460af25ff2895b6ca8 SHA512 e6c95a085263c9f67223a342a7495e3e46b6c278ad35af726edf7cd0212e516431626d7655250e68f922417d2224568db15992e15f4f4105aada7180372adb64
-EBUILD pytest-regressions-2.3.1.ebuild 1516 BLAKE2B 4afde902018d174ea6106f2fe0e6b8dcc258c5f7860aae9c1d1fab494ac46b85c25b766399dba536f9194f72f6a9f7566c1337f35d86e9f946dd64abc5486306 SHA512 0d69146606e34ece6878360ae62c176d24143c3b5ad0ac9c6ed564d93cea88e07094370a553aa5b792d256a8033dfdcdad4c58f5886968bfe856a8a554007363
+EBUILD pytest-regressions-2.3.1.ebuild 1522 BLAKE2B bc46559668916cbd1f725de9d37dd2190379642a88749823ca9607c4fdff1f2db234794e22b7dd659eedf6d2e3a47daa2d118ae559b4e40dae6635beb4c83d85 SHA512 7f0b2dc1913bb16d97b47dc6c7b044da54cfff9934df2246e1ee0909e0be777c221d617e6f9288604189bd932efb362b02bcd4acbfbe63f3610158400865b401
 MISC metadata.xml 465 BLAKE2B ae41a884052ebc7399af62f7c8375c1f32088f7ebc23625b521b1dedb31a9844b86fd05a55008178d248f2c9e2a552868301bc35649418cc0a767038f4a484ed SHA512 b698190fc24eff3235795959a1b165860a21a001bb0e05cfefca7d0fa6ee7e987b1b31bea3c69c8dad82ffd9df24ef665a57f8c39a6f17e872b9d2946a69c010
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
index a684e60f8a64..ae062b79157b 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 35e4619cbb3b..ee2998e29651 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-rerunfailures-10.2.tar.gz 15863 BLAKE2B 9f317f3a39ac234e145a14d532d2727bb9fb5fead65c05372cf95268e0f589f9de994cd3c47e75dcb354c996595698c43fccdea5134d2e1921429c8ea7b71451 SHA512 8830610276e2cc172ee372ae4d8376bc6329138751ea2737a4def6af32d05c112c872a7a180ff554018058c05ed0d109927dbac61f748586257e40b0243f03c8
-EBUILD pytest-rerunfailures-10.2-r1.ebuild 907 BLAKE2B bfcaf8abb5ad3ac825bc6937a1a0cd6ecceda311f3291095b5f2024f498eca74f9ab994f339fc2153f2fa02af0cff76362cde4dbce6b2c7a31363e034333fbee SHA512 e26c959b1c58ec06220e814b6a7fba04b4e6d12ed86e2ba10425080a5378db287e54e2c7320cd9fa053d0c1a40e824d4e00cd9ede1e5d3e21893b4a7755020c9
-EBUILD pytest-rerunfailures-10.2.ebuild 845 BLAKE2B 59adf88ddab0bf066213e4f8a7613044fd077c76f8800ebdb5fa1c1b6cc2743b16950fdf643e643aacadb1f4cceb7797f1a323fc31ee2ec3b7ebdc9ff42be1bf SHA512 675ac1ad11f81cde29e8025135fecd93ac432398dbd642f83f88ae5b805f6700cd4eb13af3bb6f1f2df4cf609db9dac995bf84014b100a304f65301105e87e54
+EBUILD pytest-rerunfailures-10.2-r1.ebuild 899 BLAKE2B 523b954d54f811a155b4b63232c76f2da365f2409e391fb50b831e38c680276396f6d4f4d0c6425a5808c2b875230fbe8bcca19790b1f5537faeddbfbd7ec2de SHA512 45347b510fac16dd65b82feee2ae6a81f7acbce40ae108d570431030cfbdbbfd71b500564177cb298d8b5053186b25e788226463e5cddb1fb019a10641723342
 MISC metadata.xml 432 BLAKE2B 3bbb0bd303a26d2a336563f187160b3b023e6d7a3a776922dee4853164d7461f395e840b2c0ba1349687d24050ccb5fd18166aeec397c9b21a1aa0e6b536b795 SHA512 f372a1f73a4dc3e60f66bd6049cddb4d8cd8fe53bebff2a6d194eb3d5872adab9b7ac226971696fb24a8d4e4744427c4d4148054fc51a94f63320d428ef80d52
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
index f95ab9e36356..d87d0f5754ea 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
deleted file mode 100644
index 4079a3b88a38..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-10.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="https://pypi.org/project/pytest-rerunfailures/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	>=dev-python/pytest-5.0[${PYTHON_USEDEP}]
-"
-
-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-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index 1a3e1f3754d7..9d294e0529eb 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -3,5 +3,5 @@ AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f
 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
 DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
 EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
-EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 1997 BLAKE2B be3bd42015780b72b1374093680fe96798e669fe9382a7c430a495db833296a72ac70ebce4eb4f742d382cded51f7ef644a1c01887bb058498b525c83ea3de8f SHA512 24e052ba39d700ce8aa352f19f28728dad2a0bbaa17e8db633f656df76a19f20145b4dd966450907f560dc6321cbbf6d06b0c005a1539d0472ba00a462029c40
+EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 2004 BLAKE2B be652e742fdaa0885645a3f95f0c7789a5fbb7e5eec986fc26abecdcd191e9e0c7cef4e78a22c61d5e3703f3cb51153d1dfbebebacd9f8b1d76438a1766ddbb1 SHA512 354e0fb4e3a8aacd1ca2b4e3f13f7f24a882cb7b52e9fe4dde4a76172bb834db9232e17c296339cb67dafc7932fbd6ff04e66ebcaa5c468c5926c50f94e68a7e
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
index 9e4d5fa4bb0c..a998aed2c79c 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${PV//_/}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 8d72bc579b94..29b642b2bd26 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,5 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.2.1.tar.gz 21303 BLAKE2B 6f4b66b713ca4976eae61bf516bfecf13b8d6f56e03ae772ba9465e7c4c52b8d5ffa713b9441c73538a0b05665da7b7aa53d5f5da1626c6c208edf1c8239b1b1 SHA512 95d70431a7c3fa3b1602e6ad0e72975cecf5f0464e1bbc21d5b4eee6aefee52794c7b1d8dacf0681cc4cbb5ae7910075a7d0b3859647cc55298a2792489c4bfb
-EBUILD pytest-services-2.2.1.ebuild 1206 BLAKE2B 6201c98783409c49e60e3daa8ff3fae828ba4734072676547c5180a72aadbbd55515c9a417452ad74eb8ffd48c8d22bea9acd0dd2778126d57da281ad7af5291 SHA512 cafe8b1a9f537b19cf759e201b355a349da457deaf0761ff4eb0db2616cc88e77da79d48c9413eebeac894c3e83cdba73126b7fa0f891e5330b63af04a97963c
+EBUILD pytest-services-2.2.1-r1.ebuild 1119 BLAKE2B 197aade6ee13f5ed34b8bc526a37e55fcf03805a04492cf9fff53f2941654c7979a36bc9768eed0b760132d31869f43d7b2681d8a5afc84516b863cb3eb41012 SHA512 6ba554d706311dc89479bf667592a2ed81d4d6c6aee23ed7ff075a472cb1036e440858a6142faaa889f52bab257cdb74ddf6a515b3464ecef7f2f91b642cc611
 MISC metadata.xml 409 BLAKE2B 9404f6ceb2072dddeb6dee14b62e76bfe75c0123c352feea87c5ef43793efa7ce778203fe44727ba56dbf21b408fef027a479f66c3f5542b71e140aeac5624eb SHA512 3dd74088fbe606f8188e121dc76a269ebcc1ed7cebeb6a3ad9fe153c9f1097b468aae12a1e86ce4c1a8a6c7a10136b8a9889e2a96dfd9f0fe252440e3edae1c8
diff --git a/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..f44d7562aadf
--- /dev/null
+++ b/dev-python/pytest-services/pytest-services-2.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-services/
+	https://pypi.org/project/pytest-services/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-services/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+		net-misc/memcached
+		!dev-python/pytest-salt
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
+	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
+)
+
+python_test() {
+	epytest -p no:xvfb
+}
diff --git a/dev-python/pytest-services/pytest-services-2.2.1.ebuild b/dev-python/pytest-services/pytest-services-2.2.1.ebuild
deleted file mode 100644
index 67efd3025477..000000000000
--- a/dev-python/pytest-services/pytest-services-2.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 fixtures and utility functions to run service processes for pytest"
-HOMEPAGE="https://github.com/pytest-dev/pytest-services"
-SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/zc-lockfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		x11-base/xorg-server[xvfb]
-		net-misc/memcached
-		!dev-python/pytest-salt
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
-	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
-)
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv tests || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 25014fa7d801..78be39522a89 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-shell-utilities-1.0.5.tar.gz 89489 BLAKE2B 9cd7f95c9c1691e19c320378d1c2a4e147cb6fdc35ec6f3c80dc288e70416fce67b60ac86427f1ad322b2c17de3cd762e483d63076fa291b4b7d22d7a29c9e45 SHA512 395107af9eaa13ef39d01858e1674b6dedddc2cf93b9aba61316fd8d847031e1b535cc3bf4f2899dbc7828609b7d45b500aad29bb47668be6e0453ac099e99e4
-EBUILD pytest-shell-utilities-1.0.5.ebuild 1307 BLAKE2B 08fcdd6d7166344c3ce8371b97f4ecdf784b971b927d073d0f3b30f80880664345f0028691017ec54513471aae70c3a1d242cf783e655eefccaaaf8038d65a87 SHA512 94386a1e4cf9dd2fa906191fbc636a53a0311ea76e76a0a2482d1bb2850ff49f7b98d94ba491d5d31f35f1d374445fb7fee0d0500247d1359b4c1a0130a6ebb2
-MISC metadata.xml 335 BLAKE2B 62e842ec4ec614a557cbe0360488a306fafb8db8c858615403965bbfa7766ee9388f4786c027b303e9e550b7104a3b600d678239feba18a66d77d46a51e2d33b SHA512 62b9164ddb9f3e2c9d3869027bf116bccdf3ec05f35ec6e8094fd4ab79d1ee5c142c810b2c47dc281e23b4aa0c1dfa8f48573d97ae7f45e001dbc0288203b1da
+DIST pytest-shell-utilities-1.5.0.gh.tar.gz 92287 BLAKE2B 015f78838eaff93438cbd7cd395926ac8f61653f6d27275ca87b379e5f27d60165157880e41e603823c17e639dcff91ac4f5fda1e904ad505bb9db0a577b800c SHA512 00cb5fa6979e09c90ba82928a135f644dd4056fd004f6bee8d216ca63e2cf4549f944930bf16e7a124f26a79c1b696d18ecf210bee3273343b9a90f9126f340e
+EBUILD pytest-shell-utilities-1.5.0.ebuild 1059 BLAKE2B f952a1730a3315233009193fb9a1d480bf5067a0d6b1a65facd6e2abb936486a8f4e756d828e7c90543a2ef6481e039e960f32d8c545f0ddf83e69d8c152e77a SHA512 3839b6e62221d30f0386d2b70c87d61c1f21865b0236195e653230b11ba47f97624376d7b64f0b8b2ae5c6ade347a7f71015e9e11a3bd9d417d0a62e4ee0bd05
+MISC metadata.xml 436 BLAKE2B 8cb927224ae6ac36a59818b60f8b4ef4a8d1cc4ca284934f50fbcc957ac25a417307c533d6d3728f38e98977ace3cdb106b9b62abe10a9b843a42ecdb30c97e4 SHA512 505a9f97a74581b9c7f59862186db14ab2f543cadbd05424e32541f31ff0c88295b4ed0b6dfbfa53dec1208d16275fcf99cc72c6a51c95e7f07e5392804a09cd
diff --git a/dev-python/pytest-shell-utilities/metadata.xml b/dev-python/pytest-shell-utilities/metadata.xml
index 16b2592b889f..30fe0225f1c3 100644
--- a/dev-python/pytest-shell-utilities/metadata.xml
+++ b/dev-python/pytest-shell-utilities/metadata.xml
@@ -5,6 +5,10 @@
 		<name>Patrick McLean</name>
 		<email>chutzpah@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-shell-utilities</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
deleted file mode 100644
index e28b54adeec0..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.0.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestshellutils/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
new file mode 100644
index 000000000000..8baa0cbc0b49
--- /dev/null
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
+HOMEPAGE="
+	https://pypi.org/project/pytest-shell-utilities/
+	https://github.com/saltstack/pytest-shell-utilities/
+"
+SRC_URI="
+	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 50f2b4c330ca..216acb880729 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r2.ebuild 1199 BLAKE2B 7abf128e7e67756019e99288df95d64e68a839873802b7b25e41049baa6031554e89a9331474d6d344d8863276b504e3246285a16056cf51b155836668bdfb7d SHA512 0fafb7b4479acd2e973f55a1529efd9470006d7fbebb203696a5f0263aab207b13e7edf7db2d3180aa263f147c3684c21042e0367d148215120e4f5c6717fc67
+EBUILD pytest-shutil-1.7.0-r3.ebuild 1227 BLAKE2B 36338d50121c5365d707e4320b3896cb7dab9de74c06012b3fc726d92fe890d0456dc9e92b302f9139ce1ae5a93d50e0f1eba564769bc12d299fd635a3204fed SHA512 b55d8ba401f572d32c6b88058840ade9e76b7588457d0240a2471df87ee8248c4cbc1ec455ac0e94323ac4058a91f28075444c73aef844a7680ee90366de6450
 MISC metadata.xml 733 BLAKE2B f5f17136e92ebe6188aa94910e3b58c33198bf65b9de5cd70de16ec5d9d205afb46e1c73508b56367ca972d55e69e4c746297106eb7ef5f3e9e9a7ff1a5f7f83 SHA512 af24c62c04e5f1dda2fe559436658172be8b280463e1fa1bc078eca03900e4949660b4ceade8d78fef387f16b3630762181824b3bce2a50c3ad76092dcffe9a5
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
deleted file mode 100644
index f7381ac85085..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-shutil/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-# block pytest plugins that will be broken by the upgrade
-RDEPEND+="
-	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# remove unnecessary deps
-	# (contextlib2 is not used in py3)
-	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
new file mode 100644
index 000000000000..94344e25e51b
--- /dev/null
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A goodie-bag of unix shell and environment tools for py.test"
+HOMEPAGE="
+	https://github.com/man-group/pytest-plugins/
+	https://pypi.org/project/pytest-shutil/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+# block pytest plugins that will be broken by the upgrade
+RDEPEND+="
+	!<dev-python/pytest-virtualenv-1.7.0-r1[python_targets_python2_7(-)]
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove unnecessary deps
+	# (contextlib2 is not used in py3)
+	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index d420f12689bd..db2ef6e544cc 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
-EBUILD pytest-skip-markers-1.2.0.ebuild 1580 BLAKE2B 70ba4fe95d5b71e17b685f45bd8127b6582346b8b23d20381dac9ad3052b407b1b1117cd57e81a0dd37df39b898520b93a7f1ff53efbeb8b72f6a0cd8b8859c3 SHA512 c8457d502fb0e48a5fe24c8d7749559e2c9a67990080144eeda26cbef27abb1e9059463ed3b341995fe0f4250a49073d519f8baef9fc876dd6790757fd2b7d1f
-EBUILD pytest-skip-markers-1.3.0.ebuild 1581 BLAKE2B 0f4da0a78e83a949f96a16a4019dd29f0aa96736769a64167ae70d88b64fdd234615c61bf4ff1e529aae2037e40da1aafa4d089758c0d848ae4d54f7da6db931 SHA512 1793ba8b9be8b75df611e88efbddadace8ca513bee85a871ba0c2037643ecdd808afa9d0410f4a3ea45f102ddccd92de0ffe4f2193ce3dec3b129672ccdd7f2f
-MISC metadata.xml 332 BLAKE2B 444e088c986bc7bcfa6ede30c807c1ada0a8c3dba264ebea0469df16858c0adae29bf5dfdc0ca6b1039ee02d092f6470156b161c88bb9f2bb03989f4ff117855 SHA512 b4251ca80a18902ed8be25eca4830de8fb9ce23bee47b013a992c1250a84788ccf82e5c6029d655884f71ff78feb1915482c9405882657f0b99846df01c174a8
+EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1009 BLAKE2B 13d913d2577c5b605f7433680079e64078947d5b4a9e23b82ea1ae86febd939c80d15d0989686573ba6e28437cefa5919722a0cb62789b2d3a7ec8c2d9d3a638 SHA512 a6e5def5a19c2950dddbcdc2bc694b4af4a50877e0946a310bd5f2f7259370137a9e1397c9f738a3644cfa6fa8746bc38b4951a0d17b285fb9af7a47a167131e
+MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
diff --git a/dev-python/pytest-skip-markers/metadata.xml b/dev-python/pytest-skip-markers/metadata.xml
index fe019e56f6a8..2d065697b436 100644
--- a/dev-python/pytest-skip-markers/metadata.xml
+++ b/dev-python/pytest-skip-markers/metadata.xml
@@ -5,6 +5,10 @@
 		<name>Patrick McLean</name>
 		<email>chutzpah@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-skip-markers</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
deleted file mode 100644
index 0fdd92751034..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..ea590b0e73dd
--- /dev/null
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
+HOMEPAGE="
+	https://pytest-skip-markers.readthedocs.io/en/latest/
+	https://github.com/saltstack/pytest-skip-markers
+"
+SRC_URI="
+	https://github.com/saltstack/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
deleted file mode 100644
index b04007948c06..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
-	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	dev-python/setuptools-declarative-requirements[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	sed -e "s/tool.setuptools_scm/tool.disabled/" -i pyproject.toml || die
-
-	printf '__version__ = "${PV}"\n' > src/pytestskipmarkers/version.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index daf254c2384f..948650b02604 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtesthack-0.1.2.tar.gz 2669 BLAKE2B f1f5a052f9418732de4a97ff438d280d177860439e667e29ff0d0503740e009c88046b5ba859884e5fa9e958ea1be7388d7fc6838c19e44075ab0ef757ee41c7 SHA512 ddb7b0c27f912bec31e58ddc54930e229755df8980d146c861f7f1c766ae742b4f1552117d89638bdbd443f22890262320a56565954ebc6deeae6184f459a5a8
-EBUILD pytest-subtesthack-0.1.2-r1.ebuild 657 BLAKE2B c8eb0c587d8d56c4e2cbb066ce5cdf291f2769b0fe9201827b83ea11ddcb4f0e9607859973609fc2acd2921199d2e55219a72956d47ad09bc41e0b0a77862d4b SHA512 c36410db2a8c7f9fd091df49558df4434ee3bcc7e290e9309465866d9e5426378082ef36ff414b1bbcb17e32bcaf30c9f9d5be53b537ffee22b650d4cb0ba792
+EBUILD pytest-subtesthack-0.1.2-r2.ebuild 709 BLAKE2B b27b30aea55a82a39625b76122c2f4bf0e7c46d6e37e7215b0eb6137332ea6de878f7903f1244780d7847c5c74cf4cc4f81e464daceb5e87f033b752c33d416b SHA512 a8020181f8584450567a34d05136607b916b578b339c8244302ebe46f43d588832a2597a3ab06783283453480724eff5102a7e6c8a2b580b8f34275461c780cb
 MISC metadata.xml 414 BLAKE2B 75bea5f93518f1e9b08ed1ad9f772c670bcf565f28b4a67c511fe919513741257fc5917f180ef31ed3e6d43b7986e8e1357ec456f9ddae4603baee1801dd6cc7 SHA512 5b4440d54b4ceb803ba5d9e4ea97fa38b777dbd1af02275f59011f727d9cb166427e8ed63b164b1891f6313349d49d31f4d7762e679439945a6ed4c24add6f46
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r1.ebuild
deleted file mode 100644
index 40ab8552ca9e..000000000000
--- a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-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=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
-HOMEPAGE="https://github.com/untitaker/pytest-subtesthack/"
-# pypi tarball misses tests
-SRC_URI="https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r2.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..9bff61945a25
--- /dev/null
+++ b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
+HOMEPAGE="
+	https://github.com/untitaker/pytest-subtesthack/
+	https://pypi.org/project/pytest-subtesthack/
+"
+SRC_URI="
+	https://github.com/untitaker/pytest-subtesthack/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 89139217eb47..26ccdcde07dc 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-subtests-0.7.0.gh.tar.gz 9714 BLAKE2B 027badb226c6889ed2fb809eb0b3944ef227a804ea58562fe9337f37526a07a41b11cdfd356d8e9a29f9affc9d0702dead59045db9781504c92186ee613ccb1a SHA512 96531a42c06a20cdf3f3665993d3e80d198a60d536246f4dc46df20b56e47f3f6fdce9478351a8922e370435f974e63d565550213fbbeed8487eedc131f46404
-EBUILD pytest-subtests-0.7.0.ebuild 1039 BLAKE2B 2b7b3f0f8b1b3bad0efeb94d4f7277b7519bba9fbc39dc568be36f72cb22f8c0069b0dc980f9a9f0d8e3dbfc8c7639a7279b9fde4288138bb565b9bef8fcfe39 SHA512 84e5868ab829ab9e9b317badce7e9e98c15e3886a6cc83d48c3dc9cb09764c885883463a6f79d659c53ec728307d203e23d9c90607bbab7a4da9c9ebec883ba7
+DIST pytest-subtests-0.8.0.gh.tar.gz 9767 BLAKE2B 707f6744f1cd7723d7bee11f5e535750fa179e7ad3912cd94d5200002e1dc0a206cbdb5c3bc8be587a1c81342ef9d6a8a397acd08388096a484feca6f9c84e0c SHA512 0164e02c81685108bb5c12f7e7ce92dc2fd5c844be454b2cb26e3cb942d51c453f06bb48e0300438a82b28c747dea35ea4f75eaf65ff8b66b338bcb0f0dd9ed1
+EBUILD pytest-subtests-0.8.0.ebuild 1377 BLAKE2B b007cfbe785cd0a779778f0deb676e5f447995d1d3959218b36f7ec0302c927853eac31b9dec45dd150fe7732cc9bf0f7695c6a6342ddb48dd715fda7383ef6d SHA512 fd9032fa6333d5af9885f7aab509977b5011b36bba61ab9f6470f14f5fc79e790aa49f90e88ab9dc0c6c7d931c66e79e9b9e2fc9366bea6d05d467b1ae403d05
 MISC metadata.xml 409 BLAKE2B ca267dc80fa124c3c8ba82f5e46356492e8cadefcf8001469c3c076b079844ae72829b5b527658bea341c3fee3f173421c9f2e7ec7042a171e234070113f4734 SHA512 57c12735a910107b53dbe54969f15ce70eafda3df096c78082d91d5bedc53b015ecae3e3d901e0a2a90841370916f6e4e94041e0b5589ffdce323144375e6c20
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.7.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.7.0.ebuild
deleted file mode 100644
index ff8252c2c7b9..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=">=dev-python/pytest-7[${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
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild
new file mode 100644
index 000000000000..ac20291c5208
--- /dev/null
+++ b/dev-python/pytest-subtests/pytest-subtests-0.8.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/pytest-7[${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
+	local EPYTEST_DESELECT=()
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# broken by output changes
+		# https://github.com/pytest-dev/pytest-subtests/issues/69
+		"tests/test_subtests.py::TestSubTest::test_simple_terminal_normal[unittest]"
+		"tests/test_subtests.py::TestSubTest::test_simple_terminal_verbose[unittest]"
+	)
+
+	epytest
+}
diff --git a/dev-python/pytest-sugar/Manifest b/dev-python/pytest-sugar/Manifest
index 3a226fdaf097..1c2e77c8852c 100644
--- a/dev-python/pytest-sugar/Manifest
+++ b/dev-python/pytest-sugar/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-sugar-0.9.4.tar.gz 12727 BLAKE2B 898692fc4083871d707fad44c7dd0c1298c28c190d705ef4525d4ba68d77bd37bb2634e43795ea553041317dc2f014d9be8ef52cfe40383ee75af36e5780cb98 SHA512 bbe375f0ae934d132457d698c9e09994a9a96a31860397f1b5e50b32139e5018f0137ddc0d3dd84bec29fc2b4c16592f59a38933c53fb8acec714c64689c4c76
-EBUILD pytest-sugar-0.9.4.ebuild 678 BLAKE2B 0c79851afe5e0b1e609afea2e4dc4c529bbd0542e4b143f4a09421e1a3878074c0050dc64d2219239a747cb6c78c3ce6e2da2c0f81a5adfe91ed021db7bc503a SHA512 a49885754c4369d68d5fb916618df2734801fcf20334ba0877888b4c8ececd688c14461c9ddf353ab41e7d34d383ab88e6474c1f74dc79307c3d26f1a6a68864
+EBUILD pytest-sugar-0.9.4-r1.ebuild 714 BLAKE2B 06f75d3f18badc75c7bc9f075ac1a3881f79820b1e13cc993f3534e222534c47999c198ba2e7b74643196ffba3950f60441afc5868330c38787b282787e0fb82 SHA512 3abe3d3d430dc54e7e670a2012d8c44c425e7052e8f82f77695ce1a0c9522943ffe3a741167e67e0a746fd9cea06640fd75a665918c9b20eb69e13c492364385
 MISC metadata.xml 408 BLAKE2B 85f1b0ab3459c14c25ed5da0e2f458094e76c22d442f4e32d2496da42c66daf473e7301dadb6fbf5041bf3b167a8e24d3755c1ac61f48e91fd88cf28ad25de74 SHA512 19e8b2f5cee8223178d9e5de58e8d048515857755600d4d0d2c4381e83c679a939ba67a48daf3ca16e1895808512f4882b37afd71f8cbfd5f4c15f67a30e7ab5
diff --git a/dev-python/pytest-sugar/pytest-sugar-0.9.4-r1.ebuild b/dev-python/pytest-sugar/pytest-sugar-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..543243b7b7e6
--- /dev/null
+++ b/dev-python/pytest-sugar/pytest-sugar-0.9.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin that changes the default look and feel of py.test"
+HOMEPAGE="https://github.com/Teemu/pytest-sugar https://pypi.org/project/pytest-sugar/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-sugar/pytest-sugar-0.9.4.ebuild b/dev-python/pytest-sugar/pytest-sugar-0.9.4.ebuild
deleted file mode 100644
index 8c9c3ebc520e..000000000000
--- a/dev-python/pytest-sugar/pytest-sugar-0.9.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin that changes the default look and feel of py.test"
-HOMEPAGE="https://github.com/Teemu/pytest-sugar https://pypi.org/project/pytest-sugar/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
index 92e9c3b01329..bb6c3a8968a0 100644
--- a/dev-python/pytest-system-statistics/Manifest
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-system-statistics-1.0.2.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
-EBUILD pytest-system-statistics-1.0.2.ebuild 1280 BLAKE2B 84625cce9af9867e86b35b8511da868e8564ac1edc5d2a4ab6b20c368522590d7cfedd8a5500861886c9540abdb9db3b67dcb73e63a781cefc1ee2f9f5af9601 SHA512 2421d59b76373e3f822275b7ccdf5d42165c59d9f34f29dd5630335235dc0b2b3be0e1b633ea490386a929304207a0588675f017d9936d07ea00953d1f30e66b
+EBUILD pytest-system-statistics-1.0.2.ebuild 1287 BLAKE2B e022b0b1c59f0ad4c66194941c095fa790bb273cca566ca2beb9ac44365d81d789aba7246ab8bb2552867cdf6cc5e0fe17a71b3fc02cdbc16a77bb769fa017c4 SHA512 4d5ee20cb93e02e772bf4dc2b41ae98de0794013850cf69a3c947a699c0017c44e805f9dc83c607c0f8e51c490cadcf5d241386fb9a980a7b1610d7dc8b2349b
 MISC metadata.xml 337 BLAKE2B 00bcf31ed6a7b0b94fe3bc0f3031d64bdd682be4797a4f2878ac0d66012d8c026a7295c923f9081f9e7b1b2dc1fd7c6dc7a4e33dfcd97f80785a737815979313 SHA512 a28c702734f0907afdb667a42e8d2672ab938bb4802f4e55e69de872694176b5424cd7073a9b2caee7dbe856fa511e41447ed30e49cc64d053a14b9ad830766a
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
index cbef3f0ce756..cfad9b945e60 100644
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index a22b54a9b94e..9740d79df8ae 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,5 +1,5 @@
-DIST pytest-testinfra-6.6.0.tar.gz 78285 BLAKE2B c7583685aeb770f76e4679730599909b8fff53d1909664f55e2d35f7f5a6a96741e3aa56b81da464c2d474d1d5f646892e36a4f9b6938327cb526476536b0b6c SHA512 f78f1cd5240e157d4e2949178f29900a7b85a6065b4113b18273af3f1fef6b19c859192f59426b93eba48418bb89d163ad1d951e97d4fdfcea4394635a05140a
 DIST pytest-testinfra-6.7.0.tar.gz 79187 BLAKE2B 08678f381392fe8a1fe335adc90ac6dc67c5bfa33c87f4e9d81b439eaabd29c393b8dc80cc79625784e76e5b0e264cdfc272cddb531acefbac9a8327be46f7be SHA512 d11f30da0eae9f215173d3f84e6ba7965d926b8ef6c49619c2ccae3d3ff215f351b950eea019e6516a56de0aa7bc533658af978d827a3ad3d1c50e37902b6f91
-EBUILD pytest-testinfra-6.6.0.ebuild 1240 BLAKE2B da9f1bf50090dcdc689931c5e29da618b771ca18a9560befe5e9b4d7c9a8f62105caa9ee01085ae9e9a9ac8cbe0d8d394736a00f33b031e2636329a4293e432d SHA512 c8770bd3050cd08b1da5e0f819f9c8342b805b358d5222babdc8f68d56fd8e241723e63c317fa7d235360f5cfe3323a7a4075b0a5dab03d252da11009805d300
-EBUILD pytest-testinfra-6.7.0.ebuild 940 BLAKE2B c95be203fd83f13a0df3765ed3835b563667d656a3ddf5bb9b0da06a1977b380fca88cce5cb7c5e9b7ee7ed919a96fea0838fa40bbba1b9f9e21125937aefe36 SHA512 b851a47929614abff04ce966dca68450e20512227170c07ceb9ee5ee18b4ed7aae8927123b150f72d941d43277624eb90ea6903d0c3a5c1826eb046c253360ec
-MISC metadata.xml 680 BLAKE2B feb779de8bbaf041a3aa00046c4b17fcad0e863ebd365732c9f1e0bbdf6c68edf7ec2b7d546c2bdf458c134f7cb17a65ba07fe6edb5af7675d4bb79af75a23a6 SHA512 386a4877ca43ef6a1408ecc0871ba40c40b4654ee3824b4a99f5ff6f4769284d54c9377cebcd5456815fc5470110a337d83f8016a6598cef8ce29d93cd3645fc
+DIST pytest-testinfra-6.8.0.tar.gz 78611 BLAKE2B ab1f9732db6a5d88730f4989cc47dc2086844f9809754d9f7811a8f0f092cf3d1e6f48fac2596200bf8e354cfd4aa3dc767bc21139267813141c9522d2116453 SHA512 e0c044430ffae1772b937b405572ef05b6177a645aff7b96e1f779d4f68449241757efae137a03ea8aec28db5f91c0e71574ab52aebef0052ca99ea0ca08db23
+EBUILD pytest-testinfra-6.7.0.ebuild 947 BLAKE2B 5249013975cb8ef7bcb52c19c9f8d501ec350475caceb6dceccd975eb03f1687bef64696f8ff337799716e0baecaaa013798213fb38b6108a6734a9a3cdb183c SHA512 54819d9bf4defa1d7b0e87b4cd9760265584eda71ab912e53e889826e810a98077d70acd3062c9a93e4826121475f94cd3098c1c48152e1bbe2a4d10dd54d1b4
+EBUILD pytest-testinfra-6.8.0.ebuild 987 BLAKE2B f970c8ae96b5f44e26b27f998b3986f546a39609b5baad6600c50eb6fb33ded56e54f8b96b09ace17104b994c7d14a6868dd8bbf6392de22d442498c38ee6f00 SHA512 f446b699e128883ec784264998f975c84ce2d09ec79c8ac74e7e047296d931448643b9b59b034907f15e58d72d812e663c3e29542fc28afa5981312da78e3dc0
+MISC metadata.xml 781 BLAKE2B e38dd6fa967258affb201d6474524e22124a1b8848cff08f3da88e97ff3e13597770c494ee040481967028ee4d82112fb3d38f1034cb7982288d859efe540a21 SHA512 b6c868e77d1202622086340ae284071eaf1b95948c84a8a00f06e819e72325346d7aa226931d1bb5a3f782f23656c1e65f4b21a74ee0cb70deabfd602f774e99
diff --git a/dev-python/pytest-testinfra/metadata.xml b/dev-python/pytest-testinfra/metadata.xml
index c093ba108334..60e822fcc88a 100644
--- a/dev-python/pytest-testinfra/metadata.xml
+++ b/dev-python/pytest-testinfra/metadata.xml
@@ -11,6 +11,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pytest-dev/pytest-testinfra</remote-id>
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.6.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.6.0.ebuild
deleted file mode 100644
index 562a2e01bbd7..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="https://github.com/pytest-dev/pytest-testinfra"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-# Ansible is called via its CLI
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		<app-admin/ansible-5
-		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-testinfra/pytest-testinfra-6.7.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild
index 90b45ea64fde..86657537b3ec 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild
new file mode 100644
index 000000000000..5ccf9168fa88
--- /dev/null
+++ b/dev-python/pytest-testinfra/pytest-testinfra-6.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Write unit tests in Python to test actual state of your servers"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-testinfra/
+	https://pypi.org/project/pytest-testinfra/
+"
+SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# Ansible is called via its CLI
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		app-admin/ansible
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pywinrm[${PYTHON_USEDEP}]
+		app-admin/salt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+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-toolbox/Manifest b/dev-python/pytest-toolbox/Manifest
index 4f3d751d5b69..1c3e200083ce 100644
--- a/dev-python/pytest-toolbox/Manifest
+++ b/dev-python/pytest-toolbox/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-toolbox-0.4.gh.tar.gz 8594 BLAKE2B fb1f19513e9e4b191c3eb995cc5e9445bc9f19affef87350d925c5465210c4de945b91120f86664c1dcf02a638595a7725cf88e3244e377ae77558c70d65643a SHA512 ed27700ff77cd607be808142cc310cd2b7461e55b3f8352d304ef8ca6c5e6c060c67a63238a1025407868ab8e229c4a16eaaa56aa75000159762001accb67752
-EBUILD pytest-toolbox-0.4-r1.ebuild 757 BLAKE2B f53e454f12734030f1fd168691daddba5da410dbc8a632276fafe4374dacafefcaf7b826593b23514eaf61aed85aafe4c71b1e880d0b15a3a1d697956288b296 SHA512 b7192bee1948df3a9cbd4ab3c400375da15360ce4c0d3a2b5158030be5068b9e6905d572436d5675656b0b72435df889535fb1f999f866bcf6cbbb40ab9dff65
-EBUILD pytest-toolbox-0.4.ebuild 692 BLAKE2B c51849da62225a374485865a58bf249ebed8a754fd45921930b412f8e5933c7ac28f91374c4fe41b774d79818fa595ccb28a25a59eebbb03d7bb1021962f5542 SHA512 9067d07543bbe177eb8c756c79a65d9071783c9e020098b80e68fa1ff8c7e03ccf7e5744ebed7c61f4a52d4c5f22d09895bd558c9cf1e6682d634488a9fc0eca
-MISC metadata.xml 395 BLAKE2B 5d6c5c889169be1f1e05eadc0cefcbe90d51c4c7400aef7d1c653c4a018f5288384c30b7f58d8502d0c1ffb2c07aa08a81cca7e4d12b5df7ef344fabd13ee7a5 SHA512 bfcf70da768f5a66edc1ed98211ced383bac3ea1ca2313efc7caac197aeeba1c988fbd738b7118afdc775ed30b43ee8af42c9c39da82eefadb88e87802f6f8e4
+EBUILD pytest-toolbox-0.4-r1.ebuild 1039 BLAKE2B 3cb51977cc652333a5b72d00d3a2e43394e0a5a484858909ad3c136cd50ea162074eb274d88ec1a1cdae031e21175dbecdde16579c23779cb2fc02a7cd1ec23f SHA512 5723856f8d4d5a6cca2681f16f753876ea5591cbe5e3f384b34f8ee5a502bffc9c49064a30a9afa52d961a9c866673cc3f6c934fae4be5ea41ad481e451d47a4
+MISC metadata.xml 419 BLAKE2B 4d9d5836c30bf06f5b7cdc563cea54b206d17bd08ab192642f06697d81c8d7e4ed1094aa3851e905594dc233c7381937f2397149b19944e071019d6d5cd774c4 SHA512 044a0eb820497c6a01bcc0358d62cdcb6a071f82d98a81ca2b052108401db5dd07a993bc0a622631ce96a7add97b9686d20b015088b6cd6089eed830155b8f7f
diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml
index 0b43cf3a3e28..3143de31e5e4 100644
--- a/dev-python/pytest-toolbox/metadata.xml
+++ b/dev-python/pytest-toolbox/metadata.xml
@@ -5,6 +5,7 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-toolbox</remote-id>
 		<remote-id type="github">samuelcolvin/pytest-toolbox</remote-id>
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
index 89f7a584745c..8de597b0cadf 100644
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
+++ b/dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
+HOMEPAGE="
+	https://github.com/samuelcolvin/pytest-toolbox/
+	https://pypi.org/project/pytest-toolbox/
+"
 SRC_URI="
 	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -17,11 +20,14 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pydantic[${PYTHON_USEDEP}]
+		' pypy3 python3_{8..10}  # TODO: python3_11
+		)
 	)
 "
 
@@ -31,3 +37,13 @@ src_prepare() {
 	sed -e '/addopts/d' -i setup.cfg || die
 	distutils-r1_src_prepare
 }
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pydantic[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_comparison.py::test_close_to_now_{false,true}
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild b/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
deleted file mode 100644
index 373a1f591ddd..000000000000
--- a/dev-python/pytest-toolbox/pytest-toolbox-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021-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
-
-DESCRIPTION="Numerous useful plugins for pytest"
-HOMEPAGE="https://pypi.org/project/pytest-toolbox/ https://github.com/samuelcolvin/pytest-toolbox/"
-SRC_URI="
-	https://github.com/samuelcolvin/pytest-toolbox/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pydantic[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/addopts/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index f0ba093b3986..6427a99e8120 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
-EBUILD pytest-trio-0.7.0-r1.ebuild 1418 BLAKE2B 10d7fc04b885ff655f372020bec69829fb16a6a2fd9b2ac5de44d5bf8d2f951c1cc4450e41aa9dd9952c774946cebd549637802d5331affa2b8830233bde2177 SHA512 deb463a56ab9354ef9d3033b8f9d3aaa4e8174114ec643fca9f1f14f07471cf74a56bb502931477ed388d1cdcc141b9854c30e30d57f26acbcb7a4214422f558
-EBUILD pytest-trio-0.7.0.ebuild 1352 BLAKE2B d8b2cf8f9c25872ed7e0109e60d477bfee74a0b97d6f9b0888de997c33b33ca3ee1b5fec5b3b7d939207245b3d99f7a0674a9315c6b4b5a27e57a8e4dca5e048 SHA512 8c239976d389d4f2c190da5a7cbcf751e9225fdfbfcc09cda700e1ffcded5fa4c70165850afabab096dcc2b9a8c91ddbbc4778163445d9e766243d8272be51c3
+EBUILD pytest-trio-0.7.0-r1.ebuild 1410 BLAKE2B 97dae59eae0a296ceb1f966428e6fc1327ea94c7c31885d6bb170285e8fb9e97cdca433dd73e89606473006a6f828478f5ddb75eefcc062fe7325ea75fc2730b SHA512 5fec150eafe5735a4f795f4b4b5b6ab6ca8354bd3401bc10fbe11bd5500f7c06e1f6fce6d463a803ae908b5ca821beea16a43be7805b402526315ed1b22cf358
 MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
index 8b853daa24b0..e81f730b78a4 100644
--- a/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
deleted file mode 100644
index d5f1cdacce4a..000000000000
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 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="This is a pytest plugin to help you test projects that use Trio"
-HOMEPAGE="
-	https://github.com/python-trio/pytest-trio
-	https://pypi.org/project/pytest-trio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.15[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/attrs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinxcontrib-trio
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv pytest_trio/_tests/conftest.py conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# disable autoloading pytest-asyncio in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading pytest-trio
-	local -x PYTEST_PLUGINS=pytest_trio.plugin
-	epytest
-}
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 32f7c16f07b8..b9aea61662b0 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 828 BLAKE2B ce64e4147a655fa9cf8cb5be99e06d63e0689a53108b841be67a6c53104c4ce0a6d75cd36c4bff66176b75ef6f05059f6266878ab4d6b7feb85ba1f19cbdb425 SHA512 1b3fe0805d166d2f42c19643fbb01bdad87f7e5b8e9d139026a0a99c32ad3228f2f6c29a651ba792dfe026ac2bf98f29584db97d10a4536d24b01405d284f2df
+EBUILD pytest-virtualenv-1.7.0-r2.ebuild 863 BLAKE2B 6820e18ec0246240fff8a745f190988bb70dfab6e6e2c8f356e17ab5e1581cd088fc17b99c87f663ccd13277a5692fa76f3aeefa7de18fe4a9a1e7031131e9ff SHA512 7b6c0065a51aaee8a68244b1ce4fe88807cf52012b986728f91075d4a899d002497574c6244771f4ad1016f4f33d5f77211e62cab719a4fe50fde28e919fa2e8
 MISC metadata.xml 707 BLAKE2B c206e0d54a4248c62d845417e497ef069eae4e0897efc5d7ea8e96f2809c65c0ea10db14d8aaf3c2a7d76b713b12a08492146f121c7ed0789d4273992fae8530 SHA512 a4d9f18b9c9141031d751542f7e57af57a7c32fc5f787636349975d9c7f32da33676abc58c97c3d8e7b292fad600be3fe6272ea6a3214c46f044ff641abaa6ab
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
deleted file mode 100644
index e950fef2e797..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/man-group/pytest-plugins https://pypi.org/project/pytest-virtualenv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..26cd62c07f48
--- /dev/null
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtualenv fixture for py.test"
+HOMEPAGE="
+	https://github.com/man-group/pytest-plugins/
+	https://pypi.org/project/pytest-virtualenv/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+	dev-python/pytest-shutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-git[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index ad3264a1d6a5..a7b48e9a344c 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-xdist-2.5.0.tar.gz 72455 BLAKE2B 4d7427e8a7d85d7b0dcae2697fae0f51913a3a2414fabbb192a8e3938431f5f121677dd43adecfb1fc7f3dd6feb94901e28b0a96787a2c2eadc1504aac55068f SHA512 22da4db7cdd6173fb8377b6adc30b5617ccb0bb308cb5d30980484dd7ddff87cf2a485ae8522c7957d8954dd2f8a5542b9f63b0fa7184cc44e50dbafc3f4e909
-EBUILD pytest-xdist-2.5.0-r1.ebuild 1131 BLAKE2B c7d846c8e378993ae77dd0f67264658ce09f748ae45eb0504afca76b0ef9bb4e91760ec4dd7c57ae4e55828b6e72941ac56ccd620a9528c115f4bc39bc7e81e8 SHA512 53dfa89a39676e42a3db1cdf785e45dba00cf8bd842f09a65fb67e8ed2f19e6bbb42061eaed90efe9ca49ff2e5da65a289e19f5fa427e4894b7c33cb147684c1
-EBUILD pytest-xdist-2.5.0.ebuild 1169 BLAKE2B 37d48c5b36ef3b530b0015a361124268492dc64ca4c53f4598a6dd8394976cf65239e76cb274423af96d6c78b710805cd1ec937f104fbd2f58aad69a4ada69c4 SHA512 c43b96c8f84c528ac2f847fafae6f15a6afcdfb2d12c15db6fa6037409eea3c909e738e176d849bf4374f44aec496990a4452cc43b970ccf4361bb211bf5566e
+EBUILD pytest-xdist-2.5.0-r1.ebuild 1123 BLAKE2B 79d4a01654de1c96d9f12581b221e68b519e1e860858e9d836e2d636b6b93635f8b24f3ff8fb26034a55d6dfc799391a508e90dfeb2e420bbbc7f652de6f2ff7 SHA512 7a92a6e4eb4399a4837ca7453d8a4c9c56a9a05863c01bbce39e632b11d2e66ccec6f650a4c86df96a22b6a4bac52185f3bd93ce4e94261c2291cc9b10e001f5
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
index 1079a190886e..b43a7eda10d9 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.5.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/execnet[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
deleted file mode 100644
index 7e1cfa8213b4..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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="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 ~loong ~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.2.0[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 12d16834fc89..3d523ee3ac0a 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,4 +1,3 @@
-DIST pytest-xprocess-0.18.1.tar.gz 26976 BLAKE2B 9772fff488414406f487add01fba9ee2e10e12965d5b289b8c17cffb5a6566aaea0653ca1b390e6b4c70d79ce3698b0ce8122ed919f9778cb8cf3f7488cffc8d SHA512 f19cba9954e4b2363db13b7dba373f5e50cfca6f43d6455f271bff4d01dcc2a3b15c13a47076dbeed34feffee856a8271df4837edab413e964a848cbb6228e7e
-EBUILD pytest-xprocess-0.18.1-r1.ebuild 692 BLAKE2B b1087f9caebbbcf415e745d5ef3e821f1a81b725c4b5f28233da1644c59374f04a9e0c4c4cdbd9c352301f14af7f7ff2f51015c97d0d056abbe2abffc56ea221 SHA512 257135c87f8ba7b2bf930dea4184d1de6129f8bbc00ab0e3063377a9be5163f87a34bd82026b034ab75000cab5438e3e55db5a3daadf90fe1dbe5aeae0d1daf4
-EBUILD pytest-xprocess-0.18.1.ebuild 646 BLAKE2B ee2fbcdf76fa7e80f8d51c004ffcbae62abdb6a03a87db882fa44c32b2047c8334dea7832abd9f487b2f22bdb8b3b92bed4cb6d1bf8ab0b26fe122addef49272 SHA512 5ecc54438b985faf8e21a79bc62719830fa82f5b5c650bda8df734214311d1288c2fb73e266bfef6d6d86feb850cd6b6dc09edecb3ab15d3afe06ea7d9a107ed
+DIST pytest-xprocess-0.19.0.tar.gz 30217 BLAKE2B 1990a48036469f990451b8eb12a05b7f10295532a72567f95d95d6e12f192f0b76bd511a994c5b8f0e3725f0edb76c4991351fe68e82f351d9b47a9921230f11 SHA512 d41c3c91892d6126455e9b834ada7aad5d0fa67603eff14a73309589e269a21de032e8192e9bde4d6656aaa4984dd0c98242d54b0e2b24a43b85c8ed81a00d89
+EBUILD pytest-xprocess-0.19.0.ebuild 684 BLAKE2B 7cab7b699749b1bc2d35f015852cc31304374a497c7d861bff383ea46111467c4613b3810d1f48081a85ab647218c77d568bd30b15712c9920a59682898c6637 SHA512 aa84967b3bed18718f978f8e090d9ca92ba47416197d241ccd4e9f5610a0cc1c3cb9a2fcdde47c43a4ca4fc5681d4508def33769b9ab46e9770190f677b88a6d
 MISC metadata.xml 422 BLAKE2B fb18d498d2325613b4ddb9262d90108aca85cc28c4dc298359adc0cb589565df894b5c48bfdc7a7f83cf30421f324fa1af93333ae20fc793910993e0a93db90b SHA512 19e96fb0695284d9adfd71eccee8f3ab0661d5e0231f3f55db0456a3dfe797fb683985cb776e45a183a710462e990f539f75a764dca68d0c2e631abf68d8344e
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1-r1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1-r1.ebuild
deleted file mode 100644
index ad5324f444dd..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xprocess/
-	https://github.com/pytest-dev/pytest-xprocess/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
deleted file mode 100644
index 05ea0dad22cf..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.19.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.19.0.ebuild
new file mode 100644
index 000000000000..cd0427f806de
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.19.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="
+	https://pypi.org/project/pytest-xprocess/
+	https://github.com/pytest-dev/pytest-xprocess/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index 79b6ca509bc6..a2d60ecc3ba8 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
 EBUILD pytest-xvfb-2.0.0-r1.ebuild 614 BLAKE2B 330a82c9f4f6a65ab4284a69cb3827e92165a37d4ca0ca1d3c0909762005d5cf87fa51f80882666f1dd5a00e1f32dd15476b77444e8c0e4805fb61a49526594e SHA512 a9beeefdb251390f11413d524bc0a4598242e127675a5bedca38127b7ed2022b88471b008bd06896d1d187911326bca8086b4d3804e50bff1f58e341f2d434b4
+EBUILD pytest-xvfb-2.0.0-r2.ebuild 637 BLAKE2B 1d72171eab03be370ca42724f16980ee0b7023b1eff6420fa54c50daec88d8e07c39c920133717aad2ec4e2f62f2fc113f15462a1f4ceaf9f502664a1c096288 SHA512 7d48bcf18458ed77f47bd04cff52fe33a9835fd9b51cd6a438493b770b9a96f164dbfea6d5d9c047b1edc3896865ac695512c1211faade7b71b373b3efdc9e1d
 MISC metadata.xml 421 BLAKE2B 8d985c910db94ed9c8af91591415be5dcd6b1f95ad007cec26c4ad463a23e45c1767e5f477d12fd9a951c165a1df6b63abb87ea7f14534bc89ed9ebcf5afc69b SHA512 45c25b600fedf96a778623b6397c5122e57189a38723fadd2fd9d1ae9a62a42a66231679a7fc1b2674c7dd51f20ce1bd0297f7d6a2b80ab98ec2102eaa673cd4
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..1de8de0246d2
--- /dev/null
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_REQ_USE="tk"
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A pytest plugin to run Xvfb for tests"
+HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
+SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/pyvirtualdisplay-1.3[${PYTHON_USEDEP}]
+	x11-base/xorg-server[xvfb]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index a00ae0d40024..dc04486bd742 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,7 +1,4 @@
-DIST pytest-7.0.1.tar.gz 1249154 BLAKE2B fcaef6afc6e98f6716a80f6451671b2abbf9ad676330a6e66e917a73e018eef966de8e7ef7ab48a1213167476eef1eb37cc5e84ec2bd9e5eab4ec6f1a8071c87 SHA512 21493717159a64fe6467bd096b578b127d81438d04f5b03ba2f4047237054f865a1f50a4e291b9d95b1a144f59bc7a8b3a00008493f4fb4f14bff7fb65c5edc2
-DIST pytest-7.1.1.tar.gz 1255528 BLAKE2B cc70b61ab863c19db62fc765c1819624d2e330116e4c8561693a895d3157ea6011a9f2db4e96f22cb802b295ae841c81e71a741cec8f64d4b7f70c539356fa7e SHA512 53fd016f030ac0394ac686a3756fad05efca8363d6b93df04f90732efea7643cdbba9501dad6d9055d314fcaec0887674496d56986efeb73915976276bf0a700
+AUX pytest-7.1.2-py311.patch 941 BLAKE2B 71b323bbf191e2996e332f04cbf6793aba2f34c35c2061ab77b24ba553dab2c839089bbb63a3d6a4d91cf39d29875b8fbbf7acadd18fa592b7009cbccbfd34a1 SHA512 4420f5a7d5edb6563e407c8610c52a432ee41657d14d78c51919adb2e7d426ae0f5a570bb488b825c18dc4c3a654d38f1070307e73f2f23ab7681ab0601c56a9
 DIST pytest-7.1.2.tar.gz 1256241 BLAKE2B c59e477ba52f2ff6f9885b91bbdc9b70dd4ffced3902417cd2e8cf28ba778e92ab5738f1be4d1c8c5c41c7140ac56622b6d44261d618426ae39fd00026bf139c SHA512 e61c9b0a8fc053626da307d6bac1f5caab451c4948ef7c7f2e2f991c3433a55f81ec0d9412fca646c02f22e695c71e873ee48fc0ab0aad337ce01b70628df494
-EBUILD pytest-7.0.1.ebuild 2583 BLAKE2B ac9a4bd8516d6e8cc1684b4a53609ed07070560906a7f1509e51c6a91498db1ccb0f126a93a0d82de03dd417cd4bc9fc46629594fd4f0bb828c35d8f196f04da SHA512 1a4807b27cba6ee0294334a5ce2916b1431315cb515b2ec73f625d2ceb1734d169ec9548352408bc3511946b0a612aa89c8c6556852a995acc670cf21fc5590b
-EBUILD pytest-7.1.1.ebuild 2922 BLAKE2B b4b33ff624f38d5cd4e6523ddce61e153b840754215c718e8f3adaadb0a117ce3cedd9ac7dfd05d6485cfb28fe5caac8effd5acfbb91dd8704b70a0e9540077f SHA512 755e2263b6c907d10efabd194fa6a7073d0e3431337884172a30dcd8b88bed8e3683355d8a2cc0b8a027498d7394d7ecf27a2d253a7efbe963cf60d11435faee
-EBUILD pytest-7.1.2.ebuild 3171 BLAKE2B 60418e8b5401783a2070fc3c55352dc91d90ffe10240e20550a1ff8522bbddab31b9e65af1806ada2ec9591bca73f1fdc941630748f6815ad45d43e9c475e7e7 SHA512 cfeaa5188053c5463bd660575dc1ceee163c58d0dbbfd729c98bfecc74bbe96f6ed12a83964cc9b4cab7426ac84ba10e06c89236d43eeae011499b468d2d8423
+EBUILD pytest-7.1.2.ebuild 3171 BLAKE2B ccb3afbacae88cb212c4285aa6558af1261c9be7a914978c618d03ab113df412f7d23ab8d81f0fa524ec2f1186154ba1cd84db546ebbe594e15f61743f20032f SHA512 e0acece779420e4d0e8b3cc8c557a6971cb80f7b19b3c630e0e6e6c02aee37eba575fb974e15ecf380181d075a73020d308a6064a866239ae7239930114574d4
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/files/pytest-7.1.2-py311.patch b/dev-python/pytest/files/pytest-7.1.2-py311.patch
new file mode 100644
index 000000000000..ecae07b9ce24
--- /dev/null
+++ b/dev-python/pytest/files/pytest-7.1.2-py311.patch
@@ -0,0 +1,28 @@
+From 2f8ae29c173ea8335a1e0cc7027a76032429e8f9 Mon Sep 17 00:00:00 2001
+From: "github-actions[bot]"
+ <41898282+github-actions[bot]@users.noreply.github.com>
+Date: Mon, 9 May 2022 13:38:22 +0000
+Subject: [PATCH] [7.1.x] testing: fix Path.rglob("") failures in Python 3.11b1
+ (#9934)
+
+Co-authored-by: Ran Benita <ran@unusedvar.com>
+---
+ testing/test_conftest.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/test_conftest.py b/testing/test_conftest.py
+index 680482045..d2bf860c6 100644
+--- a/testing/test_conftest.py
++++ b/testing/test_conftest.py
+@@ -553,7 +553,7 @@ class TestConftestVisibility:
+             )
+         )
+         print("created directory structure:")
+-        for x in pytester.path.rglob(""):
++        for x in pytester.path.glob("**/"):
+             print("   " + str(x.relative_to(pytester.path)))
+ 
+         return {"runner": runner, "package": package, "swc": swc, "snc": snc}
+-- 
+2.35.1
+
diff --git a/dev-python/pytest/pytest-7.0.1.ebuild b/dev-python/pytest/pytest-7.0.1.ebuild
deleted file mode 100644
index 6642ca7f51e5..000000000000
--- a/dev-python/pytest/pytest-7.0.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-7.1.1.ebuild b/dev-python/pytest/pytest-7.1.1.ebuild
deleted file mode 100644
index c538e9bf15e8..000000000000
--- a/dev-python/pytest/pytest-7.1.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/iniconfig[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/argcomplete[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-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() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x COLUMNS=80
-
-	local EPYTEST_DESELECT=(
-		# broken by epytest args
-		testing/test_warnings.py::test_works_with_filterwarnings
-
-		# tend to be broken by random pytest plugins
-		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
-		testing/test_helpconfig.py::test_version_less_verbose
-		testing/test_helpconfig.py::test_version_verbose
-		testing/test_junitxml.py::test_random_report_log_xdist
-		testing/test_junitxml.py::test_runs_twice_xdist
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
-		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
-		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
-		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
-		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
-
-		# unstable with xdist
-		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# regressions on pypy3.9
-		# https://github.com/pytest-dev/pytest/issues/9787
-		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
-		testing/test_unraisableexception.py
-	)
-
-	epytest -p xdist -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/pytest/pytest-7.1.2.ebuild b/dev-python/pytest/pytest-7.1.2.ebuild
index 1143038d9a5b..877b50d9abda 100644
--- a/dev-python/pytest/pytest-7.1.2.ebuild
+++ b/dev-python/pytest/pytest-7.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -39,15 +39,18 @@ BDEPEND="
 			dev-python/argcomplete[${PYTHON_USEDEP}]
 			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
 			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
 			dev-python/requests[${PYTHON_USEDEP}]
 			dev-python/xmlschema[${PYTHON_USEDEP}]
-		' python3_{8..10} pypy3)
+		' python3_{8..11} pypy3)
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
 src_test() {
 	# workaround new readline defaults
 	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
@@ -56,7 +59,7 @@ src_test() {
 }
 
 python_test() {
-	if ! has "${EPYTHON}" python3.{8..10} pypy3; then
+	if ! has "${EPYTHON}" python3.{8..11} pypy3; then
 		einfo "Skipping tests on ${EPYTHON}"
 		return
 	fi
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index 188b92a244a7..ab060596a949 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,5 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
+EBUILD python-augeas-1.1.0-r1.ebuild 626 BLAKE2B 67f185c715cd68c2df3049c9760e8cf02e258093a55250c3753f9ae9c5fcc65637ed1adb5756ccfa1cafa943afcf7e9e1d0fdafafd6dcc5ec63d335994e0e1d1 SHA512 e691cb4247c4dc8050a6cbd653187ded7a329aa49410c6d71975a5e14cd9649abe6e22f3bd244285f22f87ac54cd1c0a47e4200c26f777479155797521253c19
 EBUILD python-augeas-1.1.0.ebuild 593 BLAKE2B a281c1c4a107ddacbd8d96f1d954a0979a3e5e27f6c358f978d6388fe5ad66787b56e304aea783458c8edbd2b6304190a466a0fea1155d779264bb56906cdf23 SHA512 2699f316a8cba901bc5acb03e3270602a8624c2339b0da81abbb0a9c1a2e8f54788d28775b2a1d9073d83a8c5810f76483a6cc9a077ed29a0b2ffb7699ca1d1c
 MISC metadata.xml 423 BLAKE2B 0caa39c52d7e83a0955531808d9bc2abb0ca3d5a1d81d0c1258d209debed472e55c96f93f6e6474beef75ce6b0691195c0b1092154eb463ffdb4190b4c59f0fc SHA512 53e90a9adbf82e9e3f7671b7de404fa4e32050aa9316b226efd782ad49628eeb3a407d6ad45a71bce698eafd60ac3bb46b6289df094fccfd2196d9d33ae290a2
diff --git a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..47cf09eb8435
--- /dev/null
+++ b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Augeas"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-admin/augeas
+	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/remove-tests.patch" )
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" test_augeas.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index d31caba9c7f3..532041590dd9 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
-EBUILD python-bugzilla-3.2.0.ebuild 668 BLAKE2B d06595c1b9a885fb73e7f7a884beb20b05110f601a8581270128169f87437cfec587a95623e529cc8a42606ea237c64551b2b2271f5741093fc6e8dc7059fb8c SHA512 6f68cf94e384c4b10bd94a437c988e230a3c66a81dc603fc3e318ec9b1f986118fb90a32e3ad1f3e73c6f9877a229efa4584d47f4ed4a8942d2acba976b83be5
+EBUILD python-bugzilla-3.2.0-r1.ebuild 750 BLAKE2B bf334727b8cea37208f2245dba5c8935e0989d78dd6ec3f2955cc7c08246c4bbc463b4121a7a7e7e5330265ccbb606132f2754b392ed166498c58f99a9fcec7f SHA512 539c5c5bac312d4c278a9b6525499caf4c32ffdc366d3af008561e12c29093114a1d8807dcb38e16d6b01ec4d6cb4964a46da81d5a72bafb30bc2e54067ca631
 MISC metadata.xml 662 BLAKE2B ef0a5692d9d4f3ca0f474eb012ef97cccba5fa9c8737ac85852d9bb3214160d69fc95eca8239de8d08bf6ea04b5004097ce6b192c2276bc574f441766042c7b3 SHA512 e4ce0016e9ab606c8233759992ea2daa8b20df9b60f129c0b3e210536f0697b46469828de321fa7a09e56889747da67cb38242b739aed227d4a60657207e7f8b
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..a54bcff15482
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="
+	https://github.com/python-bugzilla/python-bugzilla/
+	https://pypi.org/project/python-bugzilla/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~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-bugzilla/python-bugzilla-3.2.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
deleted file mode 100644
index 462b475163cb..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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 ~riscv ~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-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index de1658a240ca..b6d5d4a59b0f 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-cinderclient-8.3.0.tar.gz 234371 BLAKE2B 092d7abdd348f5fac750efb3f3f4df1575584684ad613d22c558630576ad2f82c399af671aad7070dd224a89fa01d73333c2505dc0166d2e4c70e21ac01f298d SHA512 4d633b39a3c59cfdc2fc2c6235b3b87093f7617c89a80b50cf26d8f6fd63e8c3197d788e0b9e81347b9427cf363289b09b85376512d5820031472a735e0ca839
-EBUILD python-cinderclient-8.3.0.ebuild 1230 BLAKE2B 4ef8d54a5919be9090bd62d63bcc89d86696221ef5dada366b663a705f34feaf67120cd633b21eda59eb6213d030633aa9f3928fdc593e26f29e8d10e53cc0f7 SHA512 072b26a6b28e3729f1484abb9f010dff33f8485dd46b480be2799041f831f2d22a1e7fdb071be02e46923ad680dadbec7d3796eb55c8b05957d4eaea0aa77afc
-MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
+EBUILD python-cinderclient-8.3.0.ebuild 1237 BLAKE2B 83416e79a26d7c137d7a8871a11d5e1203d438cbb04d2719f862663e76e94ca5e5288ac25bd838468f3fa6eae4f0fdef20ddb58c67b0d83b40563022ab960c4c SHA512 e512063e57ab396f5673a3ff3334631808393b033cc764670a23a9b590e5f6caf70ddcedeb6c017c8da220b33aea40bf790fa6bf716bb623bd5dfc46d660b2af
+MISC metadata.xml 727 BLAKE2B 0017cc08edf25f27b8a2816bc3ce1374148a17522bf2c5ea643ad10cde9f5779b1b6bf1e3c91627db76d2f77b8dcbfc87a29fb2cdd8064b3140fb14d1e6e00a1 SHA512 e30e64371f7a5f5fa506396f2edbbc7f862a585c7fe9af4f6fe63e99d4bbe9f9bf3a1f002a62c40ab9d75bd90ab99446bb80bf7f2fedf5b37287eeb54e5dacbe
diff --git a/dev-python/python-cinderclient/metadata.xml b/dev-python/python-cinderclient/metadata.xml
index 4bc2ec42d2a2..67ae8c63517f 100644
--- a/dev-python/python-cinderclient/metadata.xml
+++ b/dev-python/python-cinderclient/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-cinderclient</remote-id>
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
index 6b385327639c..77b4b8b22dad 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 183e97890f91..b0b45fb374d1 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,3 +1,3 @@
 DIST python-cstruct-2.1.tar.gz 17298 BLAKE2B 9acc10f0d386c4413634945fc94b3e44210617c408ee18cf6533f70e7d64c609d463e9beceeea7c79b125e0bf0ab67a720d9ff98f45b4e7ce1f51d9280b55733 SHA512 c56c87d291c4aa2afcfdbcbbc19c03ec634b6fb0dcde9d516ef2a9079be2fea52a053c47cd20dfc0fe6537ac90939364da659d8eb4763069a9990681207d432c
-EBUILD python-cstruct-2.1.ebuild 479 BLAKE2B 29cecfe02f3aff90a7d9cf8ce888fda2b28edaed9a81463d7b15fc0b16c35d1aedd1da6cd88054353691e4d101e4034832c4f3f776ae4dc696b7e4da0ac0cb1f SHA512 1928a9f672f070c5093651b2cfdb0804ceffd70689a637b5154d6009ad2df4030773bada4c420a610ef7247713e0a95c24bb9b40c00d66eab40670c04ef62577
+EBUILD python-cstruct-2.1-r1.ebuild 511 BLAKE2B 57d9a0555155fffff38d8f290191b7b61225f1697fd22e35670c4618960a8143707c0c473e9d3cbbbd4bff6b5c2ea23b2cbf7704685f01fcdbfef96ef270171d SHA512 ea33dcd6371bb90efa9fd376b3746cd544555d005d30f6203170e0c075c2b31046c3613222714d42c641e20081903042d474a76b51092eacb38c533e883d0072
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild b/dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild
new file mode 100644
index 000000000000..b3f6cf186e00
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
+SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-cstruct/python-cstruct-2.1.ebuild b/dev-python/python-cstruct/python-cstruct-2.1.ebuild
deleted file mode 100644
index ccdcbbfbf89e..000000000000
--- a/dev-python/python-cstruct/python-cstruct-2.1.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="C-style structs for Python"
-HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
-SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 5dcc3e169c12..e4cee599d52e 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,4 +1,4 @@
 AUX python-daemon-2.3.0-fix-py3.10.patch 1137 BLAKE2B 6731a8f43214d3a69bd577b1cfbe1252c21d0f76377026a73a09edcf9f8a99f88e104214ebece37a8a658c458fab0c4970796f46a8b976218062a4b5ab4e4e0f SHA512 5012ad1c3a4b2e88c16e7e3bb64761e9b99a8233e25808aed9e9ddaeaeb9c47b8b3b0884ca927f9d7c36239b84c932f96ef4d84e26cc005f25bc222332f1c4c6
 DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
-EBUILD python-daemon-2.3.0-r1.ebuild 916 BLAKE2B 20e2b44d23b276872a93fea5cfb193ba41ab3f4421c22e9e6be82277e3256e5996155339558b77cb4ddbe2a09d8b8fd62bf3be32dcdf3b5e9a20df374ccccfc7 SHA512 5f2cf9dfded0645053b1a8c68c5264a70963a3248918cae8a382d051097c46fc328235bceaedc9573d7bee02ef04b3d6d1bcd93f836ef6839b6e1b4b931806b8
+EBUILD python-daemon-2.3.0-r2.ebuild 915 BLAKE2B d2be9a4fd48cbb0ed62dda6f5e3a131302e39c7c3cfe0123c2f1af15b09f830c7908030f7e072a2a5e69bb9dea4bdee190633429b1b32dbd6c0e0df0406ddfce SHA512 cb748a6ab7418fb0130aa761f3e893ae651f3cb9162edcb2ef24176075bb07b96f08200c9f75e82c153cc8484f21b79c468730f100fe031ba4fed4644c26618f
 MISC metadata.xml 341 BLAKE2B 62d37c28a9bf9e9fc6e2dd9fc5295558eb395dac54a45e548ec7d6738fdebe42053cd2f85b160135fe8fe5828eb065bf7d95b17f3c76697ab6ca2f0e664ffb8b SHA512 83badd112e5e5ed2584cd883abc20b43a18585e7c1d006c4d4861f555e633225f251d7c5b05e2e8f94f74107e32a5eeffcdd3f1265feb463f7c521c7c7141752
diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
deleted file mode 100644
index 6cb93f1a8363..000000000000
--- a/dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="https://pypi.org/project/python-daemon/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/lockfile[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# fix for >=testtools-2.5.0
-	sed -e 's/testtools.helpers.safe_hasattr/hasattr/' \
-		-i test/test_metadata.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..31025d91ad90
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fix for >=testtools-2.5.0
+	sed -e 's/testtools.helpers.safe_hasattr/hasattr/' \
+		-i test/test_metadata.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 2a3d862e71e7..f44effe6113f 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -1,6 +1,5 @@
 AUX python-dateutil-2.8.1-no-pytest-cov.patch 687 BLAKE2B 97eb6d653a013b6fb279209804d7a82b4599ed672eb7a6b94654dc789ae3ad5e2978c9684439d94e405423c0a022ff70155c7d50f5d03a5e74cfe111a665ff7c SHA512 f4e90ed1d1cdab509a574319ae6cf0b646c2741eb05459c408caa29e1a6ca512e71a258ca8119c8e1f59948276c9e14e726b6f53cea868709bd89dea2280b700
 AUX python-dateutil-2.8.2-system-tzdata.patch 3495 BLAKE2B b3d5ca203731932044f16bcde48f8f981f6907ce8a9319423d41eb0baf62331d472c1a5dd72ec3ac1f059296423adaea18bd4ea6d660add56cfd73ea86f26bf2 SHA512 44d2f3f9f0c04401cb545dc0a757b682eb3a9a66e63cf64121e75243cebdfa53945c6ae9bf197cb6b754c9732e9407fc9384aa45b2d7181740bb1ae23af718fe
 DIST python-dateutil-2.8.2.tar.gz 357324 BLAKE2B 060f97280b63ed70e6d83fa5696af6dc3c729cdf5bc48c7a90e3e59eb0cc0360e5205536685550330d64ecc9b6e40ca12888409d6819dd136b17a67add2ec4e8 SHA512 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c
-EBUILD python-dateutil-2.8.2-r1.ebuild 1152 BLAKE2B 7d7d4b279396c98e949b44b2b9e32fcdd2ba98520e98bf70efbbfbc539cf56430857cb70680084e2f9a055d7756f439f305926487e33d6a5b2b9d9e6c7df20cf SHA512 f5dbad6eeabe545d8f069d486cd15bf019049d8bd9a1c75507b90466bd745a07af9fbf7224a2148b5e921f88ee90463d12e2bdb892c8fb1e6077d484ca9e004d
-EBUILD python-dateutil-2.8.2.ebuild 1111 BLAKE2B 6f09ebb7a7563d7adc49ff71b6d987868e266e1c85ca280f9468c318b500a3fc2f921f80660eb45cf9c363214c33e1aa816cc2615c7d68e25a472275ef850e73 SHA512 6710b00dc000ae4f943a0e45dcb4c46744d6874c3675820050f9d5fff220aaeb96a4ae91256af2979eec233739d7fb9151f37a26291504dbf4ed552291efda2c
+EBUILD python-dateutil-2.8.2-r1.ebuild 1144 BLAKE2B ca83732912199964ccee899460735a3e688a6f3bbaee29da87c8d2f68a3c182bc77d3178f1249fa840332d7ce858150abc14b4bf3490814b38b515a0389d9f9d SHA512 a972d72bae44c79e72792b2a0dc4dbe360f0a8f865228e71fa5722a3426007878d845def2076288e5f8fdbeda5c301deae693c8cbc3e2be84b66b9e5d63610c3
 MISC metadata.xml 629 BLAKE2B 214855770bf1b160328f6a862bc1e3fd2d0e27a36c8ad240d494e8d8a54e5be4bac6abb7c2b94b1d8cccd7cc1026a100c8cc092203de3fd4c4173139d4722385 SHA512 ae326caea99b731c8ba2a162b2ea7e9441381777c9be8dd021caf12e04d2ec068215f61bbe2dd1baa6d4710defcd2dbc4ec5ee8b15f1c1817aaba1f8c841eda5
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
index e89b317e7dd7..e916a0ac679d 100644
--- a/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild b/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
deleted file mode 100644
index b02796cf77f4..000000000000
--- a/dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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="Extensions to the standard Python datetime module"
-HOMEPAGE="
-	https://dateutil.readthedocs.io/
-	https://pypi.org/project/python-dateutil/
-	https://github.com/dateutil/dateutil/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	sys-libs/timezone-data
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/python-dateutil-2.8.2-system-tzdata.patch"
-	"${FILESDIR}/python-dateutil-2.8.1-no-pytest-cov.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't install zoneinfo tarball
-	sed -i '/package_data=/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index f1e0af3f769b..b0ecbbf26902 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,3 +1,7 @@
 DIST python-dbusmock-0.27.5.tar.gz 89775 BLAKE2B 316bb1ae06c894702d54b7a54d0c422a877c50fb7e8aa4a1bb3c9ac342acdec8f6adaafea86afa5aa041414a283fdd284e27b58728efa234fb8bcbbf92b25f27 SHA512 6e5f5eddfc949c610b64a766434988c142397893e088b8522e6895e31383ec3c14d2f053f9aab17f00137e883a01bf95be35326f7ca97ee8c9780d6704e7d1dc
-EBUILD python-dbusmock-0.27.5.ebuild 867 BLAKE2B d3dcbd61ae8ff67fc1aad8d00efe070aa0bca6c18b87865d687ac2836adcd11a1fec9ce369081485a6b58f3d355699ecb4255eefefc238fa5d3b2259feb6888f SHA512 f1c3fdf3f54ca594f4420d5ef7cb21fc0f861cc67f3bc1bc6290caf46d85df9a4b90e301dbb26cf7f8d856916d11f7ded13b81c016fca2400bbc66f128778496
+DIST python-dbusmock-0.28.0.gh.tar.gz 85445 BLAKE2B 65038699f11de8fd8c50937023c1da113964ea81f39ba151bddf9cb69021c33f3de67b9fe5f7ac5d0a484f324b705b83d462fd1ffbab642d827ef1a3d82460a4 SHA512 62db0e6e8292f0d6426ec6f13af9aada8175ea5d5e84bf4d3890f0c3897c0ea06295de0625ec6041a86bb688fad28d6da9a1b3310daafeae4e56d7a596a90092
+DIST python-dbusmock-0.28.1.gh.tar.gz 85927 BLAKE2B f513e571f7aa30f19a86eb12439028ef141016d0a2df8684bf92378081ce6f8675c6f2033ab2f2dd27f9687ae3de09e1c36127d3b9468ae5239f17eeff861bfd SHA512 92fafa96f5c3dc216e25092a35a70775f1af257eb6ef3c3df00fa3ea062e1bf366f8c2113604ec1fc480d5586b0c1aeb72ce6d25447752b33591b15f637ca6ef
+EBUILD python-dbusmock-0.27.5.ebuild 1140 BLAKE2B 19400e0f9ff71f396ec8a4a09b13d2cd5ef72384e94984e21b7b7c4906cdf8e5c6efa22341e5d38cce7cda2d21ac3d8e663eeb514571c5dbc063bff94b43f56f SHA512 707c88edb879b5a696aae8d73be6caa6e9df24fed7952cb2b58081b6bdbb85ee62081245ca5067ac6903e417d27651a0fbca909a42c8f078a7bb6f218cf9234f
+EBUILD python-dbusmock-0.28.0.ebuild 907 BLAKE2B f049b4ae917008d9c2d87139b40869ff2702ac69b50c00fadd239c9061faa1c992553eb5bdd20ff12f2dfceb6edd074dc4ebc333fce0bb0585cf58b334b5a970 SHA512 716709c87cfa40f78da04f39c241cf4d9bbdc59407f8718ce5301fdc0f82328ecd5ac116a9a075f9b7fe6b64d5e06f9ec7ed9f2257413c80a912c5697faa109d
+EBUILD python-dbusmock-0.28.1.ebuild 954 BLAKE2B 7ac8ad0e1d7bc2abb086a59679a6db0c4f60107d11bd3b05747a7f03329666cb2ab48ee4a57b7166c0b85ad82f4f27580bc4dbc9bc02557e567c807856a244ac SHA512 05a11e2cdc56efc68df83c55b98487be19f70371ba9ef03c9e40f1ee1290df617c901e63e0a4c104af282d3890d9cee1fd2ac548e00f606711bfedc764c25899
 MISC metadata.xml 457 BLAKE2B 7c93de164cfb7badf62932420c9fff4eb07e2247ab2293f5299649e79fd1b8b8d51b30a3c685d9d88043e4e4067c557961be45d9cf2fdf1a13bee5547934eb98 SHA512 0b9ece97d74dc9a74fc9a3f55b1561c7f1473ce483ee7be53f875c740d433409b846161821d44e48c0a5988b5999e5704cf5f6afa2436f57fd1b654518ce1f87
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
index 73574b585de1..36786f746994 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -32,5 +32,10 @@ src_prepare() {
 	# linter tests, fragile to newer linter versions
 	rm tests/test_code.py || die
 
+	# Test is removed in master
+	# https://github.com/martinpitt/python-dbusmock/commit/424719793c0a8e15ee05451cd58e21fb09914453
+	# https://github.com/martinpitt/python-dbusmock/issues/75
+	rm tests/test_accounts_service.py dbusmock/templates/accounts_service.py || die
+
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.0.ebuild
new file mode 100644
index 000000000000..7b67a06c46ee
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.1.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.1.ebuild
new file mode 100644
index 000000000000..39f9ae8e9046
--- /dev/null
+++ b/dev-python/python-dbusmock/python-dbusmock-0.28.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="
+	https://github.com/martinpitt/python-dbusmock/
+	https://pypi.org/project/python-dbusmock/
+"
+SRC_URI="
+	https://github.com/martinpitt/python-dbusmock/releases/download/${PV}/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# needed for unittest discovery
+	> tests/__init__.py || die
+	# linter tests, fragile to newer linter versions
+	rm tests/test_code.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 309ff423b81c..4fd7d1e93c59 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,3 +1,5 @@
 DIST python-debian_0.1.43.tar.xz 175832 BLAKE2B 2b43da25392c844a3c8fa8e159695ef4c871c6620be88d286abde31b9285e3f005e3c20997617d24014fe94a1a3c446c8721f8d92c35018ac308da8703788bcd SHA512 510dd37ef65be2ee0f9c4c4c15010b94fc7c05c621de2cb25fee4f6e741f51dff2e4cdc333313bac8269bfa621533217b3f72ecbd8b0b6368aa52c54e5237bb6
+DIST python-debian_0.1.44.tar.xz 179372 BLAKE2B 39d19c46e956231cda7c1fdb3ca89f8ef579d61e6bff06b35114184b2596516b3a01f756ff8e34e9a0dab669658cce7b8fdbfa39ed770df376acf6c4c6fb1401 SHA512 34c627cf32647f196a4b41a8913fd9aaefcfd6c96d21cc8f9798723ac11dac371574f62af9e549437188f2f492cb80445e33f35c72b6fa8212223029371a7b33
 EBUILD python-debian-0.1.43.ebuild 910 BLAKE2B d9cfcaed8155908f5f5368ffa0b024672055467921c8244e81480da9708262e4379ae8cd6abc5b1e5013a114e0fc33b64897c81fec2672d0f45402941730b33a SHA512 5d9e19affafacb78b99ec9d1a4d2b1e575b649c8191d0afe1371758f0ab1e0ca1d58d2087c9bd513ac0becb58dbdac394315076706df9efb7ab70d25013bf808
+EBUILD python-debian-0.1.44.ebuild 966 BLAKE2B 603a89e178cdde7e72085b616803c263c7b4874fb6abbf71fb306d81feed10d6fa3010476e7fd177d69764bdf0a7332cf08ce8e45bac37820048bcc2fdfef654 SHA512 3550de40d71c5c7aef4db108121109cd3e79deb0b7e17c3ee446484ceac6256ed31271f58be72422022a7fe90d250151b9041d527b5ccfeb4a81e2695787f452
 MISC metadata.xml 448 BLAKE2B bccb39bdfb24e81bc05028fc92033468f5256be096cb409b4413f69444d59d3d9a3469047337a7fec79ac707ddf4d269b44b20c725f7fc4935bd10335e1f9374 SHA512 8e3fb6ca4bf305e23a51ff56cf84648aad1e96d36aa7a4fb138f7136ea77a6a76a8985557ecb1c9da962479c8c9e36c253655d6e6602c1833f2a2230b44540aa
diff --git a/dev-python/python-debian/python-debian-0.1.44.ebuild b/dev-python/python-debian/python-debian-0.1.44.ebuild
new file mode 100644
index 000000000000..3c07375c1483
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.44.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python modules to work with Debian-related data formats"
+HOMEPAGE="
+	https://salsa.debian.org/python-debian-team/python-debian/
+	https://pypi.org/project/python-debian/
+"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		app-arch/dpkg
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# See debian/rules.
+	sed -e "s/__CHANGELOG_VERSION__/${PV}/" lib/debian/_version.py.in \
+		> lib/debian/_version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# See debian/rules.
+	"${EPYTHON}" lib/debian/doc-debtags > README.debtags || die
+}
+
+python_test() {
+	eunittest lib
+}
diff --git a/dev-python/python-discid/Manifest b/dev-python/python-discid/Manifest
index 6ae0ce0b4c7a..eef182ffa211 100644
--- a/dev-python/python-discid/Manifest
+++ b/dev-python/python-discid/Manifest
@@ -1,3 +1,3 @@
 DIST python-discid-1.2.0.tar.gz 30756 BLAKE2B 616613de23b66adfc92227a9f36b710649f2a419ffd83443766ebcf1dbfaf528b7d933011bcbdcd19f5092726b81e40d905a62a64262a528dfad89e561210992 SHA512 239cb608508e94109aa9b8b582bc3de1fb9408b508d56698d7f17ec9ebb0d37c1fb76557d98b6d194c1532e3047efcde3adc5d6e9634bc87533d331423a7f19f
-EBUILD python-discid-1.2.0-r1.ebuild 553 BLAKE2B 23c6ae0bd651d25e558d5ebaec7d80cf9469b4812267bf7461e52d1b61fcb68f00d2d4ef4a096423905d4e1a70660e74020443758ab5d1872799cebeb0f4de58 SHA512 6a23e937d5cba764f82008e6bdbc4536b8290bae5a92e054ff07903f47aa8ef188a173ee178bb5b6f69c4ab9ad521408fb4887c44f7a40c4b209959993661982
+EBUILD python-discid-1.2.0-r1.ebuild 553 BLAKE2B d54749d7aa8bd8a09fc7b225c9620c8b35c6102dbc3a0ae920ab2bf436eac06c3d45fbef4ab6e082800df8199f0c8f344466dcd369e969543b66fb75f2c54988 SHA512 2b5dc26e4735e3518be986edc38e140119c9fc5d82e07add6e6cd101bb8413a79dc599480954b2618490759669db7019239453745c471ff03373c01bdfba77f2
 MISC metadata.xml 371 BLAKE2B 4b7018e07405d1a136a9aac46dfca2de948cb3c332a683b2c28d5ca7eeb190e2f516490a9acd051a572179f1e24696498dba5d1ba482f500a0f5f9529783415c SHA512 1feae4778b19e5dd9bdde91c04dae4133b6a08808e06350d8a7e14181bd93950dbe2ba3a41da558bdce852088f036128f20c62aa0d4f1adaa26c3921b9658753
diff --git a/dev-python/python-discid/python-discid-1.2.0-r1.ebuild b/dev-python/python-discid/python-discid-1.2.0-r1.ebuild
index bdb9724b6eea..7ad3c35a601d 100644
--- a/dev-python/python-discid/python-discid-1.2.0-r1.ebuild
+++ b/dev-python/python-discid/python-discid-1.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-distutils-extra/Manifest b/dev-python/python-distutils-extra/Manifest
index 62fd973bf08f..1b0b11486540 100644
--- a/dev-python/python-distutils-extra/Manifest
+++ b/dev-python/python-distutils-extra/Manifest
@@ -1,3 +1,7 @@
 DIST python-distutils-extra-2.45.tar.bz2 38094 BLAKE2B b8c0adcb92d07e087e10389c9671e9eca78a9a634d0092c1633e184fb9d128b006903ce8f2c9deb504b3d1557a8afc78e3edea7f1a2e95734c55099b4a21dd41 SHA512 04d2be290726d7ceed599031bfa960468c6a8654c8d9105dd77cb5744f6908d1c9a6732095692aebde1f1e042ef70b2695d41586663e4d539ee96247a39f02a1
+DIST python-distutils-extra-2.46.tar.bz2 38178 BLAKE2B 66bded2a07a65a45e7b5a36c1846a0927db8cc38c158754c660ea854244736325b9b186de1739666e228199b32ff6184676a78f132689a996a9a417562dc0926 SHA512 78dd97f40e805dd106fae279770fbd28af75a01a0c514cdb937dccd87948cb8ae2413dbab43d624365b44a29e6da7b0a1290502a0a0d63e8abb700ae9b9c5cb1
+DIST python-distutils-extra-2.47.tar.bz2 38346 BLAKE2B 2f9ad3c8c429570bd45c06af3eb2b12bf5f539c49e3b3a40c3558e67a4e4fc9f0bca0c4217bac6c8792e0514d75ac2b4b112dbeaffa96d626fffcc237860342d SHA512 b848b8ccfd84289e5482ba264a8d8d81cdbeba97358c9fff6fb02040eeb740bacfcc19b302e56a95b400528f7e03390ea4073b8c80d1e5a5e61e1b6c46b39648
 EBUILD python-distutils-extra-2.45.ebuild 872 BLAKE2B ca19e571d86a908c826099ef9127ca91a8c47ceaee03b1ec4bb1ed3a04ed12464ccd2369dfd4de71e839a274b3fe81a994440c6b8a70ecb9fc215430134bc088 SHA512 9b3a89a7c8ed0e0f5960636064044c36cdb46847c75f7cfe0a0a2f459737030b670268ce71c2d888edcb8847401a072bc3f52d91fb501c176686e91f646736b9
+EBUILD python-distutils-extra-2.46.ebuild 957 BLAKE2B 1e0cf322dcdd07d8a468f6ac94967289de264f9146cd0db3649e0431b325a679c56286f62a3257e45a9f98a4793e0695497a6d413dfb949e49be219ed865a078 SHA512 5161b83a90a5f386302ec392ae7634b6ee5dd6c8fb0bcfb5003385269cec1a8cab109f84ef7c7a0bae5b38bc75e23e60b9f626d1619397850293832481a95622
+EBUILD python-distutils-extra-2.47.ebuild 957 BLAKE2B 1e0cf322dcdd07d8a468f6ac94967289de264f9146cd0db3649e0431b325a679c56286f62a3257e45a9f98a4793e0695497a6d413dfb949e49be219ed865a078 SHA512 5161b83a90a5f386302ec392ae7634b6ee5dd6c8fb0bcfb5003385269cec1a8cab109f84ef7c7a0bae5b38bc75e23e60b9f626d1619397850293832481a95622
 MISC metadata.xml 340 BLAKE2B 21821b0f3d5483e62c4e84a0d98acb7a9984cc7a72d9c3fd140dd37fb2b93b724c8b92a80da9880d2cf314cb457f7f328efa5313fecc361dcebb1d4ea61ae504 SHA512 a7413179a36b347c297d304e24ea7ba9995fb8e66d2d0498923da83dde5e657855e6d875bc9f10b62f4c7342bf0e07a42bb0c1033d74b7a07422d29273c46857
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.46.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.46.ebuild
new file mode 100644
index 000000000000..d00792e6360e
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.46.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="
+	https://salsa.debian.org/python-team/packages/python-distutils-extra/
+	https://launchpad.net/python-distutils-extra/
+"
+SRC_URI="
+	https://salsa.debian.org/python-team/packages/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{README,FAQ} )
+
+BDEPEND="
+	test? (
+		dev-libs/gobject-introspection
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-util/intltool
+	)
+"
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	"${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.47.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.47.ebuild
new file mode 100644
index 000000000000..d00792e6360e
--- /dev/null
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.47.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Gettext support, themed icons and scrollkeeper-based documentation in distutils"
+HOMEPAGE="
+	https://salsa.debian.org/python-team/packages/python-distutils-extra/
+	https://launchpad.net/python-distutils-extra/
+"
+SRC_URI="
+	https://salsa.debian.org/python-team/packages/python-distutils-extra/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{README,FAQ} )
+
+BDEPEND="
+	test? (
+		dev-libs/gobject-introspection
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		dev-util/intltool
+	)
+"
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	"${EPYTHON}" test/auto.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 739698630f94..674e65611716 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -11,5 +11,5 @@ EBUILD python-docs-3.10.4.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a
 EBUILD python-docs-3.7.13.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.8.13.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.9.11.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
-EBUILD python-docs-3.9.12.ebuild 628 BLAKE2B 39532896182e54266b026d8b4c475838341ae059ac5030131a862bc537da288ec9a2095af94ffefac41eef184327c134c236f91c8266e87e75ab35b0f3c152a3 SHA512 79122453b1b936c83e3ef12b5bb99cf8364079a3a4678740f1aa74180af00376f5ba5827cb0e85ead8b51d969b62d6a105e171eec2963d9e317b327fcf4c9034
+EBUILD python-docs-3.9.12.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 MISC metadata.xml 237 BLAKE2B e0ddb660341d52285c05ef71475c4790faf6a2c02dfcae63852cf6ec1d59f8d8d05f0053f4dabcc655cee5c52d4105ab7c49b1d073ef81564776ef2ab1dd18cd SHA512 b7c9ef68c5b33164535e398194694d571950d673409429aba5d40fdeffbc69871645509798671b80e47bce55e4237c094e50968e22534b4e83a020b11f4804f3
diff --git a/dev-python/python-docs/python-docs-3.9.12.ebuild b/dev-python/python-docs/python-docs-3.9.12.ebuild
index faae3196acc3..0d66370bcd05 100644
--- a/dev-python/python-docs/python-docs-3.9.12.ebuild
+++ b/dev-python/python-docs/python-docs-3.9.12.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index 361fb2be4d6f..6af8e78f2b95 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,6 +1,3 @@
-AUX python-dotenv-0.19.2-entry-points.patch 531 BLAKE2B fdb966643534cc91b89bfc6776d7fb805c3caf803ccd6cbfc507e385aa42baadca0472bc827b77e6f3a85b28d030ef862f14033f48444e54aea7a3d285a4bc4d SHA512 5eca6b19360ef71c2af6a636fa6148fa087d570810622e95a6132d6946643449c15b7c09a100e544415c6e963aa7d94cb23b101a10edd0c6c01be7ea7fa9477f
-DIST python-dotenv-0.19.2.tar.gz 31508 BLAKE2B f92285090b680d3cbf842f99b6ca49ab9af877a1ed6543cbc3a41ba592240739fdf94f2ea21f2e2e3c9b9e68eeb36c5b1c12004fa953674e3f47942176e125c6 SHA512 da411fa02326ec7407bbb6760dd4e5f22eaca60d725ade3ac89302ec4e33d00fe8c231e8a64d0bc22698a93701143085c098b6703e598c6d8c2e4c57b9bafa20
 DIST python-dotenv-0.20.0.tar.gz 32069 BLAKE2B 360c878241fe4df4cee2ef59a2a4967e3b5fff7250297e4adb4b7f2c50deaf66bdc76b97bc9a1998bcf3d7da7c5e40c98f93d3e3cc044a2e73e159a85a2d93fa SHA512 85e3953f296ec59130ea212b794557d479efde0ef519303dd3a8fe8da0be2d445728b9b8fd5a4bc13372a0fa322f49d290038538ddca580841d0df1f3758f0b7
-EBUILD python-dotenv-0.19.2-r2.ebuild 1055 BLAKE2B 732e045c61d042e9e95fb4ab9d4623f6de566cb2fb5aaf2a1bf089cc0fef3156412101be4076f89a0434d0c52bd9f71a06965d81fcbf4884d0eeab4a181fbb37 SHA512 44e11bd7c2ad62bf1679a31aa4ec9f70d799120b2e0b7da2a06056b9516e90f6c9be16dfdfa9ff261768cf80f68d36bb1f77a72acff134b8e53d9b50f987851f
-EBUILD python-dotenv-0.20.0.ebuild 1178 BLAKE2B 83bb711ffd80b5dcbeaf60a49a434cba0e2ad465a53ed1c1a01af173fb359b5ae58e7379398d5238a149007832c5f5278d1e904561ed92d5f157cbe8a5a48bf3 SHA512 97bbe582be018ba43f5fa14161806bd22ca781c43e367898fdfb5567f26f6cb4653be690b7b9993bf18d9277544aff46b7ccf69ec4f5f3516aec2e7333f3cc5e
+EBUILD python-dotenv-0.20.0.ebuild 1170 BLAKE2B 07fedc0168e098bd1774198ac25fae18098b48d5a12c0c892b4e7b8e4beff46bd191fbe12f827d7aadfa6623f4f274d7455dec03573aa17436a844a5fa191e8e SHA512 12453425e8de895966e57c610139b4fb4fd7c7ccd327da82f165f98822be3ee1cb639366313c48c44760d7625e5a59f21ece9107c009c43b1aa5f13920db94e5
 MISC metadata.xml 466 BLAKE2B 2e6368e01f6c9d9ab8e69a62196a10765ebc30365a3c2fab3e171386c7f26adcb93e7e4d0796696e531db66236c2c7f31b6c948a76682ff385993cc5504eba00 SHA512 45b35de8b5108267b28a1d6975824440d821cfe3e3a1c99dcadbe8d64b4ef78feadb9b0b7434c7292250e7f4615c13f2f37d5b5d41956d136f9bf25d175c356a
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch b/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
deleted file mode 100644
index a01806fbc8c1..000000000000
--- a/dev-python/python-dotenv/files/python-dotenv-0.19.2-entry-points.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index a8122d3..c7bfe82 100644
---- a/setup.py
-+++ b/setup.py
-@@ -36,10 +36,12 @@ setup(
-     extras_require={
-         'cli': ['click>=5.0', ],
-     },
--    entry_points='''
--        [console_scripts]
--        dotenv=dotenv.cli:cli
--    ''',
-+    entry_points={
-+        "console_scripts": [
-+            "dotenv=dotenv.cli:cli",
-+            "python-dotenv=dotenv.cli:cli",
-+        ],
-+    },
-     license='BSD-3-Clause',
-     classifiers=[
-         'Development Status :: 5 - Production/Stable',
diff --git a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild b/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
deleted file mode 100644
index 55aabf2a3b57..000000000000
--- a/dev-python/python-dotenv/python-dotenv-0.19.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage .env files"
-HOMEPAGE="https://github.com/theskumar/python-dotenv"
-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"
-
-DEPEND="
-	test? (
-		>=dev-python/click-5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGELOG.md README.md )
-
-PATCHES=(
-	# rename the entry point (note: old name is needed in tests)
-	# https://bugs.gentoo.org/798648
-	# also fix syntax since it doesn't seem to work anymore
-	# https://bugs.gentoo.org/833389
-	"${FILESDIR}"/python-dotenv-0.19.2-entry-points.patch
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid collision with dev-ruby/dotenv (bug #798648)
-	rm "${D}"/usr/bin/dotenv || die
-}
diff --git a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
index 1b7f64a5f892..7a35ef4c30e9 100644
--- a/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.20.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 5f6bac9e8e6d..b7bb9267f4dc 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,7 +1,5 @@
 DIST python-email-validator-1.1.3.tar.gz 19863 BLAKE2B 10700b4c6a48c50095045b6e3c9218cd565776b26e17c1c043633e208b9fbd346162cedaa4a1116ec2fccf63b4383438c7e1aef6faf9d2ead5512af7f934675c SHA512 d9087bf56783daf389909e13652a9db8f0408badf454f6239aa20f6a5e9510619d3662cf1567a03d0b14c4bbe81644509cd12975b2aa1b544d644b6c2b2854f4
-DIST python-email-validator-1.2.0.tar.gz 22603 BLAKE2B cc2364e903cf4f1c3983ad4764a46a317188353899f8cd929c72c60387a25a819405b0cf8253488fa11e4ce9be48df98c64bdc0c3df1664a74c2e6c9c4389e6a SHA512 3c4f87e0992615ae4d1f44e6e0fe9909b43d5810f2aca96129f5ee4dcadac7b4ec5a979dbf6e03f60b8bda2ff0d7cf87f9276c4b4c624e2d036627e2d5d8afad
 DIST python-email-validator-1.2.1.gh.tar.gz 24348 BLAKE2B 7cd19c07bd0b8c467c0f0ec15376f0677305c6025eff5a86854dfd7cad3fe6971e218e724d86d4040af3f590fe5e841e469dea7dc8526031dccb494845848630 SHA512 e758518ef114e08cca0f83c681e6ff7ec6fad54c1e0bba727ee0f8917e93040ed3873ba0207e21a4830208d98637937294c5c28d67c317dc4ad3351c7d3f99a4
 EBUILD python-email-validator-1.1.3.ebuild 1228 BLAKE2B 2d434fe758ed5a45f7e2858158e6266e544d27bb97f8766148c2a89e37b19b202ab4e3093286f0a2d7fa29a46a9c2632ade095cabacad6a81074f9309d6462fa SHA512 5caa7ee4aba28db692c362e14aafd988468eaf2c8a19b58661861a87dbb04fda90335e773a859656762356e122cc6e6de54b530ad9e4838ac3ac78d17f951aff
-EBUILD python-email-validator-1.2.0.ebuild 1248 BLAKE2B a5b217a085a638455059830a4382b0830ea3037b33669a879fd3c8e52afc62935cd9f9d47609f93fbe00cba8c337b4fcefda362937789a12c7d98bbdcda565f4 SHA512 d35dd2b69d41ca5df37454f94b564415229daf9a1298dfc4c1e9ac6f92a3e3934016c646f7f82ea2e9e1136946984032362b7a1ac64225b3caa9857832553521
-EBUILD python-email-validator-1.2.1.ebuild 1382 BLAKE2B 36d856aeb324057599fb8a3a8a2c0373f0bd2d90ff33238179d2d6120e4b5ca90a90567171d6b9c1f40177d05cd2fc886c0f0164258b6df93ad9c421e3a0928e SHA512 ea8b2cb236740a630db5edfdf94aca7760f73b44e268c7ebed7754384a6bf0f4712bb51684d65ac40629fad8272cb062c8456e2c44679ab794106372eb0402b2
+EBUILD python-email-validator-1.2.1.ebuild 1374 BLAKE2B 73d62090870886cfbd7af400621c1739737a74b2841a3ef7c8b6a31b17c78f238174c5a5d90cdf97b17d3e5421e838d8e8964647d970fb537875523b6b6fcb38 SHA512 f7ee783f90ad7bf44f36b60a1ac92c0e02177d10ef88326577b821e89f01c809bd48c02dc45bca9152a9fa9cc5a02fd8f8fda94b941d56b775be2827d28f6d6d
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild b/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild
deleted file mode 100644
index 93d2f84a715c..000000000000
--- a/dev-python/python-email-validator/python-email-validator-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A robust email syntax and deliverability validation library"
-HOMEPAGE="
-	https://github.com/JoshData/python-email-validator/
-	https://pypi.org/project/email-validator/
-"
-SRC_URI="https://github.com/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# these tests rely on access to gmail.com
-	tests/test_main.py::test_deliverability_no_records
-	tests/test_main.py::test_deliverability_found
-	tests/test_main.py::test_deliverability_fails
-	tests/test_main.py::test_validate_email__with_caching_resolver
-	tests/test_main.py::test_validate_email__with_configured_resolver
-	# these tests rely on example.com being resolvable
-	tests/test_main.py::test_main_single_good_input
-	tests/test_main.py::test_main_multi_input
-	tests/test_main.py::test_main_input_shim
-)
diff --git a/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild
index af9f4ad587c8..3e5b04ba445d 100644
--- a/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 9870c31c94a0..91b0a5dd29f5 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,10 +1,3 @@
-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
 DIST python-engineio-4.3.2.gh.tar.gz 299722 BLAKE2B 87dece98d72b7b0384e3b9d57062a3eaa7aeb80ac3f2f685d50b8816e122398ffd54da1f4b99a90a1f535e2d0f0d282167a682de022373e6108f7e91f8689aa1 SHA512 59933a0093167042a3873ba1561d2859359a5ad160f6b7b5c19478b1f73d1bd068779942c8bfc44dd5a8d9f155359571298b960bcd217aab341bdfec35bc5b28
-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
 EBUILD python-engineio-4.3.2-r2.ebuild 1763 BLAKE2B 74e891a2966f99ed984f7fe7d7cd651c92ee1242a9b7679053f493a9632c210ead89460208cb716c15231175004e9f37caeb17a240730553476003f787f5b7d5 SHA512 754b43f5240620970c9694b0be0cc64b44e48b653ddabebcd66285356b08333b5ffe2501792808f74216cf1de2dbdb27cc83e270e8ddd1d4eaeebfc675027474
-EBUILD python-engineio-4.3.2.ebuild 894 BLAKE2B 821b0a9ef0b7cf1a5edb7d7a9bfc592297633c37044100c104c87b9eef306fa17dbb519c857fc8ef7d22902e86419ec3c2409a6be0e6cc73c0378a378ee1e64d SHA512 141ac7031547e675e7c24a5cd147f5f48cffa121ae387385c977d3519145a910c31779190b17eec6d10a71d744a059925e194d0c148f8dd42276db928dc4a4aa
 MISC metadata.xml 518 BLAKE2B 7325d24cc26b1a3b4e2dec04159cdd4ebcceaf0384fccbee11205f9c000b1e9f84f97c742a6181dbad419e2527c6f874bc3f89760daa6b6dd2feb9b1f874b515 SHA512 40fe9ac96224019d28206f75ae6249c75dbcb759918c03826af4f8a394586bd5df445ef475cd009e8af93ea5c7424abebbbfd65ac2e2eb7bdd9e8a29f2dcb34f
diff --git a/dev-python/python-engineio/python-engineio-4.2.1.ebuild b/dev-python/python-engineio/python-engineio-4.2.1.ebuild
deleted file mode 100644
index d1b9b9a21ef9..000000000000
--- a/dev-python/python-engineio/python-engineio-4.2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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-engineio/python-engineio-4.3.0.ebuild b/dev-python/python-engineio/python-engineio-4.3.0.ebuild
deleted file mode 100644
index d1b9b9a21ef9..000000000000
--- a/dev-python/python-engineio/python-engineio-4.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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-engineio/python-engineio-4.3.1.ebuild b/dev-python/python-engineio/python-engineio-4.3.1.ebuild
deleted file mode 100644
index f087b877255a..000000000000
--- a/dev-python/python-engineio/python-engineio-4.3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-engineio/python-engineio-4.3.2.ebuild b/dev-python/python-engineio/python-engineio-4.3.2.ebuild
deleted file mode 100644
index f11d0aaef405..000000000000
--- a/dev-python/python-engineio/python-engineio-4.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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
-distutils_enable_sphinx docs \
-	dev-python/alabaster
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index fb391a8cc901..d52493619223 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,4 @@
+AUX python-evdev-1.5.0-python311.patch 430 BLAKE2B c735906d032cdd94f7a42ffc616fff89419ed30622bf9da77e108afd38e5ef867fcab92c12c462d6508e3877351e300a3e3af9c7c6e11e7d80deb4c2a17f99c0 SHA512 24fc3a1e0a4966611d57a44019144d2c6052995aedd2587dc4502b0593258efeea7aad41f60eb992f1f7b2bddddabe5fbcfb1cd6e05c0bed0b99495d8b211bf2
 DIST python-evdev-1.5.0.tar.gz 86384 BLAKE2B 6cb6fb634d974b8ab15722def24037019590f510792fcf2bb64d8c2ffec0871ab4075674eb45a737185e4b42e39d0cd556760d51b13b5a97b79d3ee64cfd342f SHA512 27ceca723a0157fe9efa2f7aad8bb790c63d2b8d399f629eaf11fb387f3ebde0885b2d8a5297492968d625d8d9b186877e074334115e70551a1b121c8864339d
-EBUILD python-evdev-1.5.0.ebuild 731 BLAKE2B 942569a78cf71438667911ce1072391e692dccc93ca212475d31e7a339678681bf05a7354d42165a584a68d48dd3f6c6197c8a2681deab143e5ff57fb4a2474e SHA512 df1b755e543853b71226198c851fa196db760854cedc7a1daf02d44716342b68d64821ba671614c3c59966587ff275eb46efe0595d20cc06c890e0af588af9b1
-MISC metadata.xml 236 BLAKE2B 3432dc60db586ece2a4503a7360be713bbd86c5fb6f0bbd88becdcbff3d3fc1ea0686e836da9ce965cc7f3934cbf0b098000efba470d85ed4dd27d43581ff656 SHA512 e4094b8bd3c78483b7a36697dd232f371a826cbf485900b3903d679f945659b8af64720786fd02a414052df6de2e2b0aa2bf7119a2a4b9e69ca70e8649acb809
+EBUILD python-evdev-1.5.0.ebuild 831 BLAKE2B 6c26520eb2b51f32cdd3a2c76f5a80ff51fe0435b22f43f35dcf4c5c1460e49b21c4330f261bd29ce2519f26415344889d5f3043ee4bbdc952d894f1ed73ebd0 SHA512 ea7bed5d4fed4af67702dd597ee849d18952da1680d6dda562cbbaa33050e5d3a8ab67848276228da36deb2fdb1047020b296a9e9f13643c7c804eb44358a336
+MISC metadata.xml 309 BLAKE2B 6ae01a8430958d20e84fe2de8b8eaeec666b4937a5dc140eed1a90b455f6a17be819e8ae999fe13e1095f2aa9415385ff520fad147318110482390a1aae8419e SHA512 067f19a8bcb3eb7174b9db8c475ca66fbe661a263c8280accd7d05cfd2864605ddfb2660cfd2f146e99266985808b29081a9bff1aef8c8c50303d2ba059c13bc
diff --git a/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch b/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch
new file mode 100644
index 000000000000..1f516c79acb2
--- /dev/null
+++ b/dev-python/python-evdev/files/python-evdev-1.5.0-python311.patch
@@ -0,0 +1,14 @@
+diff --git a/evdev/eventio_async.py b/evdev/eventio_async.py
+index 77542a4..68225c3 100644
+--- a/evdev/eventio_async.py
++++ b/evdev/eventio_async.py
+@@ -85,8 +85,7 @@ class ReadIterator(object):
+     def __aiter__(self):
+         return self
+ 
+-    @asyncio.coroutine
+-    def __anext__(self):
++    async def __anext__(self):
+         future = asyncio.Future()
+         try:
+             # Read from the previous batch of events.
diff --git a/dev-python/python-evdev/metadata.xml b/dev-python/python-evdev/metadata.xml
index 685f01270c4f..0c52c6f51f48 100644
--- a/dev-python/python-evdev/metadata.xml
+++ b/dev-python/python-evdev/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">evdev</remote-id>
 	</upstream>
diff --git a/dev-python/python-evdev/python-evdev-1.5.0.ebuild b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
index 824baf37bc3e..3d0340816d88 100644
--- a/dev-python/python-evdev/python-evdev-1.5.0.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,10 +17,15 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/gvalkov/python-evdev/pull/174
+	"${FILESDIR}/${P}-python311.patch"
+)
+
 EPYTEST_DESELECT=(
 	tests/test_uinput.py
 )
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index dadc9ef0fa1f..78f10ab67f04 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,3 +1,3 @@
-DIST python-gammu-2.11.tar.gz 135567 BLAKE2B 133172cfd0715ff6b5bd47b93e5d93d52af3e608459ba1158bf008da9b5f24f6d155c04334dea7ff2cacdea678f00d986838a139290d5f8ac874bb9702fcd5e6 SHA512 cdf3a54fc538fecdbe3dae63f0534094ce94a289998f9b670a0b3e12a3c571eb46ee86eae67a7a8d2428698850046d5c75569753bf77551cd395d315e6f9b70d
-EBUILD python-gammu-2.11.ebuild 790 BLAKE2B 033f3a46bd211f278be1422cf5721dc50904707e7cdefb7053d29c19cea95ea4b8d1e20bc49cd056b482d38fcffb442bf9b51659d2697c181d09744902869cc5 SHA512 f3285cf9a82efdfd964df9920ee29171bbf1adfd0cab72438365718ce7486e48bd1160160046d2021e19436c3e829882371e016c98b826b3126aa3fccf1dfaae
+DIST python-gammu-3.2.4.tar.gz 144136 BLAKE2B ef06b78568e9b88da95d09029191a2de0c4e26cb6b222326bffd0134a9c7eb743bab20201347d3be8a81db43f6005ec2a0550e1976a59de9ee9202c733ae41e0 SHA512 9d76b402c50018cc52476376952edebb6b0934aa374ea2a2177f5497d0949fcc77644aa2a35c7402b3f2179962d903409b7b1949c5e85a0e5130058d34f89664
+EBUILD python-gammu-3.2.4.ebuild 827 BLAKE2B 4987ea19d8fc2cebd7fc1a4f7945a8e8fc542df85e715b18474b5658df5944e683d9ed014fb19c0aff3391f7968f385d52bc4957089928d9d68d7dca138db663 SHA512 7c49203312e78afb98e696f648d7fdbf701c6969b9a252f01d813b8fe8c6abdfc9c62c6d2ab21d08543f1503ff72cfb6e5304859a649cbae721e9ac1031fa22f
 MISC metadata.xml 299 BLAKE2B f8e1c54ab09e004a0f87f87a793af8d1dc6b97dfc1fbd07183407e9f6501b5c0aada63828495d5645d37a97c4e8ef3ec44e5c5771c4721e5a6d5c00008c586ad SHA512 6308e513011c0966d9c535f5ca153e38caa4bf843143fa3aad57e36e94d50f7e97232e62b8611045158d8e1f0741f70247e9ee799e6227f5497d1133c6dc1832
diff --git a/dev-python/python-gammu/python-gammu-2.11.ebuild b/dev-python/python-gammu/python-gammu-2.11.ebuild
deleted file mode 100644
index 74f61aa9ae4f..000000000000
--- a/dev-python/python-gammu/python-gammu-2.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for Gammu"
-HOMEPAGE="https://wammu.eu/python-gammu/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-mobilephone/gammu-1.34.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		$(python_gen_impl_dep sqlite)
-		app-mobilephone/gammu[dbi]
-	)"
-
-DOCS=( AUTHORS NEWS.rst README.rst )
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/python-gammu/python-gammu-3.2.4.ebuild b/dev-python/python-gammu/python-gammu-3.2.4.ebuild
new file mode 100644
index 000000000000..bcad3a30d78f
--- /dev/null
+++ b/dev-python/python-gammu/python-gammu-3.2.4.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_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for Gammu"
+HOMEPAGE="https://wammu.eu/python-gammu/"
+SRC_URI="https://github.com/gammu/python-gammu/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-mobilephone/gammu-1.34.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		$(python_gen_impl_dep sqlite)
+		app-mobilephone/gammu[dbi]
+	)"
+
+DOCS=( AUTHORS NEWS.rst README.rst )
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docompress -x /usr/share/doc/${P}/examples
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index b1abac560fcd..cf6bece89ea9 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1,3 @@
-DIST python-glanceclient-3.6.0.tar.gz 202581 BLAKE2B 20bf5ee863cc3d319cc7b670f4a218c9b84b49c392f7a7756636a93643ddf81781f808d6d966ca1982246b66b7963354c433239f554eb2aa0291bd1d57da2e79 SHA512 7bcf08386cfe6d4787dd8e6616907814a53fcc35bdac1818aef7ba094dcd37dfddddda43a1451d55f22d175f400f8680801d1a43508c5d85ce39f15164b71a5d
-EBUILD python-glanceclient-3.6.0.ebuild 1361 BLAKE2B 15a65849cb2717b5b58a93b0d1fe741eac75df7018ad46625af80e208ea9139d260278cd0816337d94accdee84d49be5fb5032e1cf9a886dfbdda09f555390c9 SHA512 aac93dfabd708f2a3fe4d3fa90c0dab1aa32048ab3aafbb32d0165afefc4957d3e464136e143aa1eaa91ce00a5d299968f518effefc0460939b8e80f3489e596
-MISC metadata.xml 556 BLAKE2B 1007f5d86b8a7a5feb6018997ad5126f31c10d619d480adaf28db855ae9745c1395632b1d0fb9c915106e7678b7148487c3a2de800e8bf19e1abe55b00df7ecd SHA512 43aa944c6c8a91dfe59aa8261718fe144c852f0e036cddbf4453cfcfde21816e619388de98713de965d03c63ae242ee4fc27be103263cd1d44a5985b3c905fd0
+DIST python-glanceclient-4.0.0.tar.gz 202815 BLAKE2B a1d6dc46ca77c67bd42e6603b36652cc2ad9464b172b0bea778aa87130a6ed68613dda68db1ad5215e6d2ea34b9ecd96bc0ce853b94fc137b80aa7c85763622e SHA512 31ce9ee865ba543674a9ccc0267f1e02308e444bedfe1728ed59c20abe77cd7936b059c5adb0a8f73e5bf999c5ac5a34ac3cafe2e695718535ead786916e2414
+EBUILD python-glanceclient-4.0.0.ebuild 1368 BLAKE2B c214037962e915dd7cc819fe0cb7e909f6339fbd5c0c4cf062784bbc03bfab6315b5b77b4e0d6188934c6bc998208b37387e659e481075f3703610e2db32a760 SHA512 42546dfe8a3785af744be30a4eee98311dde31a0732d5b021be26b3c239465c46c87278936f81d67eb09bd51ce3d415c6819db629f8c6d072fd4b9f30da59dbc
+MISC metadata.xml 663 BLAKE2B 642540f3f4d577797725731f2374b5801ec2d4ad799ee4ccfaa4e29d955bd93a8ade0e6c9ec7712ee27d9f1f93186854472d301016a732020575b8f7bc1c5138 SHA512 fa9b88dce5a10824dd0d6987698587666343c95d8b6c607e466f14883c34fb0ebc846b683ae7d8bb65efe88007e6db0d2b1b41ba389c3b656a24f1839d03d9e2
diff --git a/dev-python/python-glanceclient/metadata.xml b/dev-python/python-glanceclient/metadata.xml
index 9e0c824b4236..f849de2f5536 100644
--- a/dev-python/python-glanceclient/metadata.xml
+++ b/dev-python/python-glanceclient/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-glanceclient</remote-id>
diff --git a/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
deleted file mode 100644
index 02139d725b25..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b glanceclient/tests/unit
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
new file mode 100644
index 000000000000..ee5d6545a356
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b glanceclient/tests/unit
+}
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 4502bd739ae9..85ec913de35c 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,3 +1,4 @@
-DIST python-gnupg-0.4.8.tar.gz 58696 BLAKE2B d9ab2fe3ea933a22e731fd70e153e60cc3b158f15e3f8537440c355037092ff7545d29e8d2eab88efb38dcc6e3776c31f537a9c06467b473e93cbc9f0e2ef189 SHA512 fcaa121a356595328a26e8184280f859dfc2771b9692dcf28db2d9b0fdddc77d4c1238665a8e419758ec17320616e7741aacd3638e37d449b86fe5555beef1f6
-EBUILD python-gnupg-0.4.8.ebuild 666 BLAKE2B 2f905b1d595897a87d3837c0c279e29dc6c50f73c5e087b1353f30219df33f2eab52741d7c74f14961b19a18c5b4dc4dff3f5b90ed9097ce11653e63858f0cc4 SHA512 e0d4de3a335ca8c3e386948ef53f88f16893220c182e7f2cbf4aa3a4606bd24a67f29109bb8216f8d08a8fa9544e876d4b81318e11bea0cfedb7272d18db3d13
+DIST python-gnupg-0.4.9.tar.gz 59982 BLAKE2B 09ca33bf181239d2ed39930e2b017f30e5c3ff158ccf937a1a1e72366cd144bc7327c8a57517840f976b10fbf542f8181721fa6e203cf0b67766b3fea9ca2d16 SHA512 e59685bea966addbfacfd5516601c518c9ccd7a828250584a00dca5c2062b30bd859ae73b467bd16db60abd800bd0b66f68177e56d3c48654416a294e72f3e8f
+DIST python-gnupg-0.4.9.tar.gz.asc 801 BLAKE2B d95b5e5bb5613adfb5705851ba1f1ff4a9331bfedb452d3f15e7838aaaf66b9b161664e1dc7f16acc4490eb2647dcf6ed1d1cf9b5272bd9523527b7329917cfb SHA512 ca91795ae7c43e825f35bccbbb3464e6f9e60742f28d1e215e97680c4de454b07375d66593553ace53d6fc9ceb423253a34f3ea6a5bc1b27e7da9b0ba3c385f2
+EBUILD python-gnupg-0.4.9.ebuild 935 BLAKE2B 9929eb6e1de10becc40e4e16e0aca814853fcdab9fc01aa6b5e63de1b015eee256e9d1441b70fa9053fac2a4cf59c42d12ddc3b68503b8a22f4d0f495da4a636 SHA512 8e5cb7e7b9aa70e81b7c5c4c466129fdb9a9dd3566e70d16929c45d738380cfa615e035f23c781e05fd61c1ef70c497c499f71dfc521bdc2d618850c2c0fd06f
 MISC metadata.xml 720 BLAKE2B 774ac2960b75f506d7ce3770bb5df5df01a5950a19f90ea6467d4be13aba8401ea5f1ead501f3d87d3387f83c4b78ad60cad984ff3ea8b1ae12eee3ca3736faa SHA512 9f237208c6c1ca48719e75842ba59963e707d5bba577a98205491a1531c70b4844dc119d267e2925b7650193a3d8d19ab04c4c26b4459192e0293d37f8990ba1
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.8.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.8.ebuild
deleted file mode 100644
index d82eb5d2f98d..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.4.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="
-	https://bitbucket.org/vinay.sajip/python-gnupg
-	https://pypi.org/project/python-gnupg/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 eunittest
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
new file mode 100644
index 000000000000..ab6d475d13ce
--- /dev/null
+++ b/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vinaysajip.asc
+inherit distutils-r1 verify-sig
+
+DESCRIPTION="A Python wrapper for GnuPG"
+HOMEPAGE="https://docs.red-dove.com/python-gnupg/"
+SRC_URI="https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc )"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-vinaysajip )"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# NO_EXTERNAL_TESTS must be enabled,
+	# to disable all tests, which need internet access.
+	NO_EXTERNAL_TESTS=1 eunittest
+}
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
deleted file mode 100644
index 9d058abd3356..000000000000
--- a/dev-python/python-iptables/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-iptables-1.0.0-ldconfig-fix.patch 652 BLAKE2B e672670d6e6cd804821ef2e68f968edaf372270ea31979da2e1b69c5e9233e8ba3fc5a8870c545fae7eb77b1defee0ba3fb18d1e25fe6504112a84442aa5fa8a SHA512 23c94efd33542ce7c1b87084a35c76431e85de6138ce9b6e2365def28d493814682e85dbf869bdb4f7d2b75c1def3a1c6af9fd5546f2c91ffe442d50c43c61f1
-DIST python-iptables-1.0.0.tar.gz 52245 BLAKE2B f61cf655440a40c96e49452caa1070046e539313ce709c629cb93c11ac66d51dad5fb11c183a8babbba5766b8bea27d0ab604d7aec104775371791cedc2262f6 SHA512 417ebec4391c6967f3b1cfa56d79dc1c6d053570d71bb29713ed327ee1fd52e0be9c3b9a62a1ae666644bbb472e5174402584cd5ddfb0b24c11e1d30773bcea5
-EBUILD python-iptables-1.0.0-r1.ebuild 783 BLAKE2B ad316006670f0a29193fb8510875208f91d9c05b5e431f9659f50d86a15feed2b2fd24d861eb340a0edb3e37a35d77f3480b7e0d576b46e0bb97e2fc9c03de3c SHA512 d74dff3e38e7c599395dd75126a048bc1459e6d2318b22dc1c000627f6b189e421a7d004404a7a9e93a597cebace74fcd71be8f4116d0a878391729b92d24622
-MISC metadata.xml 1341 BLAKE2B bba77a30d0644398e68111f93feb51da2631b004ef9e846d6230d131029d7c8a20f60e22b2e4ea4b3f89e67cf69b6a211c69cbce842f147dbde72f6a3e5ee453 SHA512 ae5e85cda77b5132828ee3d1759d7ad7348f645e2a86b3527afc5422e12105e57c655f7c325a3612f87ec6f1edfdc1a622c38c3300177d5a00f30dc25b6fe0f1
diff --git a/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch b/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch
deleted file mode 100644
index 14fe9eae38da..000000000000
--- a/dev-python/python-iptables/files/python-iptables-1.0.0-ldconfig-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/iptc/xtables.py b/iptc/xtables.py
-index cf21029..8f62164 100644
---- a/iptc/xtables.py
-+++ b/iptc/xtables.py
-@@ -4,6 +4,7 @@ import ctypes as ct
- import os
- import sys
- import weakref
-+import pathlib
- 
- from . import version
- from .util import find_library, find_libc
-@@ -805,7 +806,7 @@ _lib_xtables, xtables_version = find_library(_searchlib)
- _xtables_libdir = os.getenv("XTABLES_LIBDIR")
- if _xtables_libdir is None:
-     import re
--    ldconfig_path_regex = re.compile('^(/.*):$')
-+    ldconfig_path_regex = re.compile(r'^(/.*): \(.*$')
-     import subprocess
-     ldconfig = subprocess.Popen(
-         ('/sbin/ldconfig', '-N', '-v'),
diff --git a/dev-python/python-iptables/metadata.xml b/dev-python/python-iptables/metadata.xml
deleted file mode 100644
index aea9ace736c9..000000000000
--- a/dev-python/python-iptables/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		Python Bindings for IPtables: Iptables is the tool that is used to manage netfilter,
-		the standard packet filtering and manipulation framework under Linux. As the iptables
-		manpage puts it: Iptables is used to set up, maintain, and inspect the tables of IPv4
-		packet filter rules in the Linux kernel. Several different tables may be defined.
-		Each table contains a number of built-in chains and may also contain user-defined
-		chains. Each chain is a list of rules which can match a set of packets. Each rule
-		specifies what to do with a packet that matches. This is called a target, which may be
-		a jump to a user-defined chain in the same table. Python-iptables provides python
-		bindings to iptables under Linux. Interoperability with iptables is achieved via
-		using the iptables C libraries (libiptc, libxtables, and the iptables extensions), not
-		calling the iptables binary and parsing its output.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">python-iptables</remote-id>
-		<remote-id type="github">ldx/python-iptables</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild b/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
deleted file mode 100644
index d9dc371fc300..000000000000
--- a/dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for iptables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-firewall/iptables"
-
-# tests manipulate live iptables rules, so disable them by default
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/python-iptables-1.0.0-ldconfig-fix.patch"
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 83a4d3fdfab1..9bf36b61cdde 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-ironicclient-4.11.0.tar.gz 220770 BLAKE2B a653cf04497a4df9627ed5026094690d0569dd7d6c55abf3a3223fee8cbc14e450106645ed1e4461cb3931f2ca49c8df47ca9e8e2ec9478cf15fcc0623d19379 SHA512 863429269807f759a864e427206d29a68b7431ce33009e1b6d3a630ab154e66b85b9f61dd90303a681a5ed459005af1686edf056eb9a63cfb6de1f1eda85bbb5
 EBUILD python-ironicclient-4.11.0.ebuild 1442 BLAKE2B 091cccb364fd3149797fa0119175c0be1db34db55ddd1be37c7566777fd2802fbf216f7eba59c6e21588d919c4ded935bff74a08497cec771db20e4f605ef262 SHA512 8af3ff0dc6a4704bb04c934235f317d2e69d9a6ca9ab1e2b122055674e71d0ed3da765eaf3bc081d0de522595165a74acbde4c161ac461d4d17c6716f1a5c3a6
-MISC metadata.xml 337 BLAKE2B 15cacc055a0d30f7e002d10388af0533f089c7b694b70a8bd2d9be2b74b093b87268e710b7c6be7a88cce3946882eef807203090f1c7484c895c8254b7ef959c SHA512 739d5e13560065dc8e4931a15e0a6af7c650209675b660d2571ee904184bef9fa7d5e27e0d73ea9976742b188b109d8634687e6d9b6b6acabc4dc3950ae995a6
+MISC metadata.xml 438 BLAKE2B b2028cc1ec57e7e7529f12df2488aad68aaea4a9fcb955bda1fc837fef9d923e58379d35f6855127d1035456bad22b0cfad430d89dc2e33a60f1cf7768af4e5f SHA512 ff95238ceec079bce66bf738d3d18d6de2a3afe6e8e8d5da500612be2adc15b51fcfa73dfb5beccb2c6593ad51a287df9a60dc151f87d12483cc29d2f6656b88
diff --git a/dev-python/python-ironicclient/metadata.xml b/dev-python/python-ironicclient/metadata.xml
index 49de9fbf7990..59f66e649665 100644
--- a/dev-python/python-ironicclient/metadata.xml
+++ b/dev-python/python-ironicclient/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-ironicclient</remote-id>
 	</upstream>
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index 8c1cd973db97..defdb25d2248 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,3 +1,3 @@
 DIST python-jose-3.3.0.tar.gz 126578 BLAKE2B d1279d2a0788b4d395e760ee3a1b2ce8c9340ad12ebe103cb1ba98aea33566cf0134d5af75be9727fff96adab4fc88f1b471ba9ea7d36c16de10587a9efd1304 SHA512 de7147cc6e12406d6e459c32829acae46395acba727c53e65bc05f4794ee3050eecd355e3ae2e87f4ebdbd871f53822eea08a10f25d7ca6088fc6128dc7d9637
-EBUILD python-jose-3.3.0.ebuild 1057 BLAKE2B 54e99062f0add047514ba02cdb3b08ee3eb6a7006f8d83287a1df0eb719d6b5f55bb93bdbe4189d6d4b382de4dd17f58cd3f400ac720ed4ffe9bc5c836e3170c SHA512 bf851f4f962d9083e295f8275151ffa17aaf53a49424b4f25748ba4d7869446aa8eceac775b93b435c71be3dfa7161904eeba65c1fc9c3221553f5ec8894a485
+EBUILD python-jose-3.3.0.ebuild 1057 BLAKE2B a15c8d11fa31a953f61e8e58c56d3483c457f2fc7ea0d6af06d362632aa095d43e9b635e4c627c66478f04c63e7b778023af7b16244a26d58d90963ab845ac02 SHA512 59831f2ce25053d67d7e7adfe422c83bbce523be10464988f733c86b2288f2d53bb960f92c6af5c2cd908f88e362e1be5a9a54b48006f3b351e395d5841a4bee
 MISC metadata.xml 570 BLAKE2B b931b6de4f0dc9a5cefa9b31805590b2c667c5d2bc1ea31aea6f7c4b47db6d861e9fdc4666e66784b25e4dcc84e2d6d257e9ed19a80c1310d83948467cbfdcb2 SHA512 369591ec42b7dcfd9e28f0fb510bfac1212e678e9829f5c8ffbc35993446865b721457d790dbf63551f8247f28e4990bef7e9928600e74541d50cf353f41eafb
diff --git a/dev-python/python-jose/python-jose-3.3.0.ebuild b/dev-python/python-jose/python-jose-3.3.0.ebuild
index 4a3698d38f43..91e269867da3 100644
--- a/dev-python/python-jose/python-jose-3.3.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A JavaScript Object Signing and Encryption (JOSE) implementation in Python"
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 08c7d5e99b06..63efa541da3f 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,3 +1,3 @@
-DIST python-keystoneclient-4.4.0.tar.gz 325003 BLAKE2B 4c375ce3c3e0c5c97c20ef89fe240c8d36fa6f2cbd32adc91759cf4a94c95eea8b7a90a08be77322253adf8982f12523ec6cb49c4e0997245bc9dbd5f5d9c5ac SHA512 04e601bd193ea6301cf6350618221f857ff7c43cda350368954417559892101aa47ff9e053255bc4c7ca5dd5bfa6ef724eeec49dfcf29c2296033d80a8aa0252
-EBUILD python-keystoneclient-4.4.0-r1.ebuild 1596 BLAKE2B 8dbfb36ce7c6feaad6d10fe07ebcd885ccc698f8d93c1204c304048750d62b94e6425df95be2158bc9c9d01f533af1facaedcf10040c1a8abb0ed1c969de74fe SHA512 62d8eb6b41948f3f15e14a36e18c669c8c1517d019085fb3fa53836a1a3fd1ec9b3179bbb732765811e46a362927fe696fae89598b80af5f03673c7cadc73b5e
-MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
+DIST python-keystoneclient-4.5.0.tar.gz 325120 BLAKE2B 4511cb381ebfc11afefef0dbb7b9962efd2bbb5ac7455386ef4e831459614dfd51570cfaa1be9672936a6ed45d58b9b29e8326830840e80ffdb758089cbab887 SHA512 d3a5034bd05843b733410d4c6fc2c271edb25c837b50ba801031b45a00c0632b4420f2f4dd24dd25e78bf71b5ae31e2ec6b303d85aa4ecea0a89a49b5c67533d
+EBUILD python-keystoneclient-4.5.0.ebuild 1603 BLAKE2B 204392034fee3def14cc9bf20894a6859a81c860088c8e6af9a8a8f7ddbd0cbf0a632260a532dde9df61d44b67940d9d8f2bdca3873a2e048ead5b7c56366a95 SHA512 b9bab09647576f6f20832a8fa8b1fe2bd148704c260de32c725ea62bf5a0c18e95c9fd8b43491938f6cae865169de2495949cd4d1bc38483cf10d79307b94cc5
+MISC metadata.xml 594 BLAKE2B effce3a1ff7b31d301f9a597ccc8a7c70854d64aa50f92e5d990deec018f47b8fe7460eeda8c72a032ad713ddf32fcb3d84c9bddead92e5e82c807b5646360f6 SHA512 319bc83641ffbe8bcda7aafedcbb63a95dac3dd9a151a9d9f8c51d5f7a4522bf08b04f3157cae5667cd14ce8c87707e40426bece26c37b5df41845d3dfe90586
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
index 8ce39f20365f..dfd8cb7a8015 100644
--- a/dev-python/python-keystoneclient/metadata.xml
+++ b/dev-python/python-keystoneclient/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-keystoneclient</remote-id>
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
deleted file mode 100644
index ac801e9b8d4d..000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest keystoneclient/tests/unit
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
new file mode 100644
index 000000000000..97d6d25ea891
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.5.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client Library for OpenStack Identity"
+HOMEPAGE="https://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.28.0
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest keystoneclient/tests/unit
+}
diff --git a/dev-python/python-keyutils/Manifest b/dev-python/python-keyutils/Manifest
index 864740f7c4b3..41efc4eac042 100644
--- a/dev-python/python-keyutils/Manifest
+++ b/dev-python/python-keyutils/Manifest
@@ -1,3 +1,3 @@
-DIST python-keyutils-0.6.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
-EBUILD python-keyutils-0.6.ebuild 711 BLAKE2B 34eb85e492cecacabeced473a994bed7ccf5f633e4f68078e0cb18cbfdb5e567c77960e825c2b8de9738136d8101226c26dd50de08f0f1a19fd521d51134f7ff SHA512 e7ae416e7e71d78fb01e392445f127fedb6adf1b730fc3df638ed76aca764484c3047c69e25e100515a5babcb45b22eaf546b728c69a61a8bc94975aaba5f6ab
+DIST python-keyutils-0.6.gh.tar.gz 45427 BLAKE2B b62a1194bad87fe42c658c0603ff236e8e5594e8d19dbf8b29bac5b2ef5b3c6a6d19eae3d529c9408e06802c883fad365d41d27c656776a4994b58a43b8bf1fc SHA512 e282d553a644d9b38c6256e027ee553a123bf21e4222491e22699ca5bc5041dedc4e9a9a8c1bafa44985f3b1d5fafd85ded9ed5332b6d94d6c62f3fa6bcb6d0d
+EBUILD python-keyutils-0.6.ebuild 714 BLAKE2B 24b7cd88ceb417437f6caf00587bf77c52bb756b8a8c7d27f74b431792876050b3d2e3074b77a6ad39a36e8483359812e8b7092391c0a7bbb242919a209d0ea3 SHA512 761403a14244b572eb32c105f1d2f641f1870e78f3d04bdb2b604102c9dde95f7b9307cce345b486b15527e1a667b91ae27da70c9bfa8bc0e9e0149fe15b94ce
 MISC metadata.xml 383 BLAKE2B c88a0df9232a36db1f568579905d43c26fbdf5e2bd119e6ae9e7e4ff54f85bf7e247d57edaa6f9a364a938ccd6401f7e617515381f3fb4f9ad1f739f93d016ae SHA512 769de9462b430f810c33781b059d24da4d006b1e47ce1e57ca529a8a240442120fbe8b03c38f4e189e045593192b23cb0f4c5e0e1e63b4e43051da64129f63e4
diff --git a/dev-python/python-keyutils/python-keyutils-0.6.ebuild b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
index f1daa1fc72fc..f1b8d08fe3a6 100644
--- a/dev-python/python-keyutils/python-keyutils-0.6.ebuild
+++ b/dev-python/python-keyutils/python-keyutils-0.6.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 DESCRIPTION="A set of python bindings for keyutils"
 HOMEPAGE="https://github.com/sassoftware/python-keyutils/"
-SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/sassoftware/python-keyutils/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index d8d36f97cdab..e6d64c2a4684 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,4 +1,4 @@
-DIST python-ldap-3.4.0.tar.gz 376169 BLAKE2B f514ddb6267fd8c21a1c4595669921a1256a8087a3a272b3751636313e7d79de9d34f4213aa57128679dc5a93db4ef7a71f7f92894a1802deb8c2ca9dfd92fe2 SHA512 d10c10f1d416a0f67e7669c6c0b5460a3484bc31f4af471d581a9207689e5687c08d1ad78ba8d47e0ce0c35d24d79e4b848b4c503534f211a36c1b882bee3605
-EBUILD python-ldap-3.4.0.ebuild 2033 BLAKE2B 56f792253b2b02f694f0ed917a80b07e6d83df03da2b5f80da04a5a376a3af618889c02a32b319c67c5be0107dcd66a52d2fcea11ceab8bd351f321f0c66ca6c SHA512 5d0bbeeb940ce633aa11215c56c1648c66041bcda37c4ca996031185f92f1266659b961d18da8f546a7c347a1a11f4a97b77a11cc0f4b5a966e23593c44f9a82
-EBUILD python-ldap-9999.ebuild 2030 BLAKE2B 32a24852de09d6b86c045942bbbf194513b4bb5c314fc8d3d17d333bc0467261bfed6fe43bc9187247d59e55ed89e87e9d29d1f2d74264e4274ac4a0234e4089 SHA512 6cdffdf419e5167a658e950552a78d50b4217e43c7cf1c8f90e2c47a32ecf5860d377d65c79703816b6b139468744dd9350449d1cfb632167ed3ebc5c6c142a8
+DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
+EBUILD python-ldap-3.4.0_p20220420.ebuild 2339 BLAKE2B 643b27187a5fc5892a6c7301bacb58fbf57a31f6de6a704e7871e6a9dfc693d9c6c3980137cfc41cf745d6fe52ebf94f0e98fa33094237e9dc0ee5407c0ae2d8 SHA512 2dcf1c028bd92213eedf22b099b9f4518b7a5add89d73b3aaec0958b20276ea18311145ac0ceb902f8ed9ea72eb1dfb5367e7404933acc309a0e5cf400d5aae3
+EBUILD python-ldap-9999.ebuild 2000 BLAKE2B 1340f010714318a6a8e90ffa228a3c0799909ee1f70af5ec5cbd73449d6982a18df35353a3d356d559a89c43be1c44f097698236a6118ad66fac5630a75d57c8 SHA512 c58a4c82d5e18bb29b62024a826b063f0f47ee3f9e4a798251175b4115a31f5a5803962ec597c12d8855faba83c259f559083a6499524f41197d2ecfd0d3a9fb
 MISC metadata.xml 449 BLAKE2B 14ffa18ca09eb663d3ef4ff5bd0ebc8511fa408a4e96c93885ba2beaccdf3bb82a9733a01149e088c8b66d6cb938f94fc3940c0c0cca5685599191e772443cb6 SHA512 2f5c014e55f838b84abf6ba630b000620a01e2fca6d1f1bd1b30db309f820df50c2ef7feddc17c69ee0188c3cbc91a388933b4bccfc8d2ea0cb18c6dae85cda6
diff --git a/dev-python/python-ldap/python-ldap-3.4.0.ebuild b/dev-python/python-ldap/python-ldap-3.4.0.ebuild
deleted file mode 100644
index 382194ce39e0..000000000000
--- a/dev-python/python-ldap/python-ldap-3.4.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/
-	https://github.com/python-ldap/python-ldap"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
-fi
-
-LICENSE="MIT PSF-2"
-SLOT="0"
-IUSE="examples sasl ssl"
-
-# < dep on openldap for bug #835637, ldap_r is gone
-RDEPEND="
-	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	<net-nds/openldap-2.6:=[sasl?,ssl?]
-"
-# We do not link against cyrus-sasl but we use some
-# of its headers during the build.
-DEPEND="
-	<net-nds/openldap-2.6:=[sasl?,ssl?]
-	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx Doc
-
-python_prepare_all() {
-	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
-	# https://github.com/pypa/setuptools_scm/issues/228
-	if [[ ${PV} == *9999* ]]; then
-		rm -r .git || die
-	fi
-
-	if ! use sasl; then
-		sed -i 's/HAVE_SASL//g' setup.cfg || die
-	fi
-	if ! use ssl; then
-		sed -i 's/HAVE_TLS//g' setup.cfg || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Run all tests which don't require slapd
-	local EPYTEST_IGNORE=(
-		t_bind.py
-		t_cext.py
-		t_edit.py
-		t_ldapobject.py
-		t_ldap_options.py
-		t_ldap_sasl.py
-		t_ldap_schema_subentry.py
-		t_ldap_syncrepl.py
-		t_slapdobject.py
-	)
-	pushd Tests >/dev/null || die
-	epytest
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r Demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.ebuild
new file mode 100644
index 000000000000..93023b5578a9
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.4.0_p20220420.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_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
+	inherit git-r3
+else
+	# Snapshot for various new OpenLDAP fixes, bug #835637
+	# (There were a bunch of followup commits and general other
+	# serious bugfixes we want.)
+	MY_COMMIT="7f30c4721ea2ca4373ed7860e6467781f0afa758"
+
+	#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/python-ldap/python-ldap/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~x86-solaris"
+fi
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+IUSE="examples sasl ssl"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	net-nds/openldap:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+DEPEND="
+	net-nds/openldap:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+	# https://github.com/pypa/setuptools_scm/issues/228
+	if [[ ${PV} == *9999* ]]; then
+		rm -r .git || die
+	fi
+
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local EPYTEST_IGNORE=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	epytest
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index a01b853838d7..6bcb8bc92611 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Various LDAP-related Python modules"
@@ -22,16 +23,15 @@ LICENSE="MIT PSF-2"
 SLOT="0"
 IUSE="examples sasl ssl"
 
-# < dep on openldap for bug #835637, ldap_r is gone
 RDEPEND="
 	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
 	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
-	<net-nds/openldap-2.6:=[sasl?,ssl?]
+	net-nds/openldap:=[sasl?,ssl?]
 "
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
 DEPEND="
-	<net-nds/openldap-2.6:=[sasl?,ssl?]
+	net-nds/openldap:=[sasl?,ssl?]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
 "
 
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 3334d07f622c..3d971872bedd 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST python-Levenshtein-0.12.2.tar.gz 50502 BLAKE2B d8992d30639e36aac1b85fada8f5273ed867aa3019208ffeb9972e999dad783d4ee16e1f6988c9306eb80f622b61fcf3a0a937b380c7a5acf50223268ed8de1d SHA512 97eac9d19121758af7620ad3963846e48434ceabb5376a83f28452015adf1a620620bfb53edb1c4f60b0fc8ec2b0faf35a105d7e2a0fc5df7a45fce81ba0dcdb
-EBUILD python-levenshtein-0.12.2.ebuild 629 BLAKE2B 2cba10d39f2b0649c27b43f444194b79a039b0adcbabbc6ff5356fdbfe75d9e78226b3aa5561d54d839e587efb9fc6c01662857bb7278a8a8c384e8c8f524812 SHA512 d0178d1070d6c85948a955d4eaebeebcb0d1159ee95f17ed12c1b308045dc420b1fcf710059b1a52e471d981f63b75f5192b3124b0e553d270cd83c27f9b0a54
+EBUILD python-levenshtein-0.12.2.ebuild 628 BLAKE2B 060e89bd437d621387049f253260d0c5e0b3dd098f12177d2ade17e7a144afc99fba2dbe768acdc93aa259947607477fb4cb03bc652ea49d29615be6de35fbba SHA512 3ae63ce98ea4fc6879647e836088c64b06551bd605578b62cef993b1189423d20375265d2248af2b5ea938ee47b1d1c3a62ab555d34609942541eb4d902ece41
 MISC metadata.xml 386 BLAKE2B 9c0dc72d1e563ec5833073032b22ee87d001bef49607c37dec69db4283ed2f7e0dc9da40dacf6e42ee6969474d3ecbe9ff6584b2e0b48f1b7d8d3bd9893dea67 SHA512 9f742e94267ca9054fb569b7a2923e00371157993d7b9da86dbe505f6a198742f564e14913ac2078fbce86d11d77d7eaa9c6e11b4f1d2f97c748f931926f0b48
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
index 5628d65199a7..eb68abba9ce0 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 MY_PN="python-Levenshtein"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 9861065bb797..479204f43c38 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,5 @@
 DIST python-libevdev-0.10.tar.bz2 32385 BLAKE2B ae962d714168a3c035220dc9343ae5907e5de5a645b9d5857cfd884a847fb5b2b13cbdcc6204a66940ad406e92a3add332755c3adb5a10b7cc6a5ae62468c1ff SHA512 1ea54c5e335d348182fad71151ab37103a8c295c8efb73a60f40b41e399cc5fc48525006b15337e591147fc5385e8e56a12dcbcec2dd2e07652a7b60f85eaf1c
+DIST python-libevdev-0.11.tar.bz2 32406 BLAKE2B 0291a9008590a2900961d9e790c2946b67bc045a5b0df43f9f40d9c8838b332e1a839c21411ee88eddc92e9c59a038bc7ce8dd365bab71075fdd0a8c629c3a34 SHA512 6fb6181fc97cb1a7a087d298a933891cf05d0160d033c6d6300bcb6a904064b727a15e8e75665ee2933d0e8a0aeab2638f01bbd8d9f803f508157fd0e5ca41fc
 EBUILD python-libevdev-0.10.ebuild 690 BLAKE2B 93170e3c547d00ac719543abc5693d142db9f0530f2eb0e1b3a78867562e8bfeb3f4fbf03f0f8ff64f12044b89093897e517692c66a9b0f4809decc863234f78 SHA512 440d32eb1112fd8b7f7859783b8671a918acf2216516066a2903ab70bc1f23fa833f3c842240ffd44aea810a98ffa00f9227ee81c42284163a24ced95420ea51
-MISC metadata.xml 330 BLAKE2B 5e5d0c798e9cda51a5339cc535ed4095ce88aa6b8e22f50301fa5eb766635411729a8f1568727249b38623974b9eeb027d81b9515262b12c74fcb720680ccca1 SHA512 7eefac30ab962d4e53a7e8e1e1630f891c0f985d70579ff53bbff9acead6e324747d3771bdaef274abed608c3c983fc2cac92acb7970511b45612a63b3be95ec
+EBUILD python-libevdev-0.11.ebuild 750 BLAKE2B b738b7b4e4fdb4ab27fa75d1d27768a99193420e9e97fbeeabbd1ba9eab88a6a37f1abe636a5106dab4663c5c7361ff59dfa526771dda4ca9366b4bc4845a48c SHA512 9e726d9d6e391eb1c7af4dedc38c24f0b8264cb9f35a5138368eca9a5a0dbfacd29f8e07fc6c42614071f362d81cc6f42055f1306c464d56de1e1863a00440a7
+MISC metadata.xml 431 BLAKE2B ec6c61b87336524c898e27258485e09a41cb406113bdd78291111b8988268cab3fcf459395bbb5e15b35e7889ea70c2177afe28b9015fb4baf60218b87aafef8 SHA512 4dece3b0b4fe8309ad780adc408dbf282c29e7f08ff5839dfb1f3e4d1a3edf3be7a1e0ad3943b42dae4eecebef92614e9c12faa962c2d5331518fd1925d05b49
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
index b9ff935d2324..74bbd50a95f9 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/python-libevdev/metadata.xml
@@ -5,6 +5,10 @@
 		<email>x11@gentoo.org</email>
 		<name>X11</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">libevdev</remote-id>
diff --git a/dev-python/python-libevdev/python-libevdev-0.11.ebuild b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
new file mode 100644
index 000000000000..7725950e387b
--- /dev/null
+++ b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrappers for the libevdev library"
+HOMEPAGE="
+	https://gitlab.freedesktop.org/libevdev/python-libevdev/
+	https://pypi.org/project/libevdev/
+"
+SRC_URI="
+	https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-libs/libevdev
+	)
+"
+RDEPEND="
+	dev-libs/libevdev
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index b77d158ff084..8c51ab95e8a8 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,5 +1,3 @@
-DIST python-lsp-black-1.2.0.gh.tar.gz 9226 BLAKE2B a9efe698c32ac86060f360e1d1129620783d0dd1588cf16b6f96a4f805845d5c94e862b265d63643e877afc68916ad0fbbe922fc0c17e224ea08f61756a3fb41 SHA512 b5f999b0e02abc63dc194a2973f028aa5f74b3110d0ac35e6aefb45a4260bf3fb5b1f142f71a85feec431765af98409977a47039d28a79cfac5746cc677794c7
 DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
-EBUILD python-lsp-black-1.2.0.ebuild 703 BLAKE2B 3ef918729c86f625aabc8d4dbddce220b8b44463eab65c2fd5caa44470db3c99ceba7ac669d73f1b68f2f727a7129f780a282bd54b1b8665dbdb343a7e105e6c SHA512 5e15e8a9d602706efbc65f3a3791b9da8c4a0228030b0464c118509fadf73e81c481c21321bbe87fce63eb82468f31c203881ec1df3eb95c28982ecb25b9e24b
-EBUILD python-lsp-black-1.2.1.ebuild 705 BLAKE2B c5c353095fe7c5bb54264a3159dae6986c5357528ccdec5c587f3bc48e86afd1a106fd6f247376bdb7f7750eff0739a393415ad9550ab34908a9e9038bce833a SHA512 a61cf858ca09b32e3d09b46c9ed54493f6d96fe96301e270aaaf0dc8401970f784d0f250ec11b48b7745221128c47562fca4f8514103a7d6ea1c8aa23dcd1cf2
-MISC metadata.xml 429 BLAKE2B fcfbbc17f713e9f33164eac55cde53fb505d550a9049bf843809cb688f038912770764332e8eed56ef39972ff82e39e1a27a2d8248d887950857fb790e6a7bc1 SHA512 6a1438c96853dd9fe11eceaddc7e350311db01a95f17fa05b3f2cf651ae778b5361b9612423c2d124bf4dfdaccea836538a3aade91dc58efd4feb81dba23ada7
+EBUILD python-lsp-black-1.2.1.ebuild 703 BLAKE2B bbb57fbe237e9a0039c4e5dc302ed8ff2cc3203f8a21a5411178a1c7ca25dca0673e4b8559bd58f71875c73bb9e6f182679c784c59e5d6bdd482b026e3b0f872 SHA512 42c7b2dbdb566080823ee02534237fe66c2f2039ccb26d2e20817f07937722006d72e77bdd8b16d228cb51ebd46be11b6169818b721f30ee98e58fa536f6b991
+MISC metadata.xml 530 BLAKE2B 385bef4e8337f4a4fbcdbd32f52dec0b0758dd0eba50c9492465caee46dbbc96402b744d5835043f50f6c89147576c96305d8fcc4cedd42254ca2a19caf9234b SHA512 121b726a498e17b6244ecad14edd8fa3fcf23297516280f10b6b4fd5c1cb784f3a6caf902764977f8abd3cd3967db6d8fbac594c773969711dd572a487cae717
diff --git a/dev-python/python-lsp-black/metadata.xml b/dev-python/python-lsp-black/metadata.xml
index f6c1bcf3a35a..bca167850ec2 100644
--- a/dev-python/python-lsp-black/metadata.xml
+++ b/dev-python/python-lsp-black/metadata.xml
@@ -10,4 +10,8 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
deleted file mode 100644
index 40bb1d745c1b..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python LSP Server"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-black/
-	https://pypi.org/project/python-lsp-black/
-"
-SRC_URI="
-	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/black-22.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
index e6006b0f3e59..c94c7d3401f6 100644
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-jsonrpc/Manifest b/dev-python/python-lsp-jsonrpc/Manifest
index d28ed534824f..e422b7ee7214 100644
--- a/dev-python/python-lsp-jsonrpc/Manifest
+++ b/dev-python/python-lsp-jsonrpc/Manifest
@@ -1,4 +1,4 @@
 AUX python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch 342 BLAKE2B aafe30896b88531102ff79900d845a24a506ff8d0649699311e77f9ba6742f591500e2cb83a2e5aff3118a1174819b2745a8f9ca6919af8b84d379422c7e06b7 SHA512 baaa0105df9906d451a9870c7f0ca5980c6b667b7d8c4fb4f57a0fb3bfbd3f2b7502cfeea7f2abb041c2dcb344f6f5ef69822d82daed3de1ebe4564c812c7430
 DIST python-lsp-jsonrpc-1.0.0.tar.gz 10011 BLAKE2B 671490d439f10eebf2d05f221adad25be6f881f4a0f4fa975d4574937a951d4d0bc51264a9ec67d3ef5d112b6e025b551685d3e3c2b959c4a6bcef92d46c5ff3 SHA512 447835fc6c3810f486d80f85295089c021b792843bdf88d461c021b8b04407d8f7e6a99c07351a23658a5dff46eb475bc64e51bdec029787cd33330b54d4dfec
-EBUILD python-lsp-jsonrpc-1.0.0.ebuild 761 BLAKE2B 9bf55eaf3b4dc14fd412106feb33cf6ab0d4e9e35d096a720ba80d217e8b427b1543da21cb9ba5b2c84a586f7d41d1ed111c54d4a872fb759d91aef14758c580 SHA512 6aa3be0ccd0b8dd3610a92254ae4ae6d1e0be00a135cbd4645b0a162c48d70148a2fb8ea09de26ec3761317f7407df42d445624a5a1710071a27ef128b51bfcc
+EBUILD python-lsp-jsonrpc-1.0.0.ebuild 761 BLAKE2B b2aaaa45f0a5232df4cd4bab313c781141246086ed9deb74b65133921ebf1fd559199a75ea49b6e7b248f60bc6cf77cf6d46f41129e608fcc99a79d138fd857f SHA512 ab04e6c72556f968129246b6b48a304cc65169933553ccc2417448880315ed027f54902a7cd953d231d5039efbf6974256b267271cc19570a27bb8c26b665a04
 MISC metadata.xml 465 BLAKE2B c1c85dc7e2694420f8fcb80c4de578d159fa124b3cf7388d66220b6425ca6a11bad88b3ed91f5272f81a2604dd68009e4076a5d800585a2e4e6f9c448eb25a8e SHA512 16456c751af90b7169978398771635459406029275332d569304f9369ecd0ee5b4cb1e269c9a22c5b636d72e6c5f685f55e5f6b73a62b730c2b8c8734ba971bd
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
index c50e45eabe07..0bfcf0625003 100644
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.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=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 1f7f75d0dd19..298cfbc0b62c 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,5 @@
 DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
+DIST python-ly-0.9.7.gh.tar.gz 239814 BLAKE2B 322d8e9bb3293aada00834e8e4822b2ace11643ac8bec2d351d38f302c941703c1c47f541c5141097fa0e9e7da59fb93f473891a568a222dc5f6cf212e004af3 SHA512 83b5030e2626146f1309b0cc8a4626d6fac58112c97785ef47672fcb14dcb8fb7e95ed86f3afb09709cdf6c15d4ed21619d94926b02315860b9e151c411f6652
 EBUILD python-ly-0.9.6.ebuild 518 BLAKE2B 6c4c598502562cd75c928eac43e72f2a68ea4c2aa13d4c8a9b42f11bff97c862c77b2fb8723ef6ae919f557b000a35a5c627c92246f7a2d19c88368bc0f47621 SHA512 08291203751905df39ee8af9c693fa4a6858f86a6ee4e426add957f7d9adc2fa7d94ba6c5bc17f896b2923e9ab38e02ce6c22c92abd1c10afebfd320ebbd0a13
+EBUILD python-ly-0.9.7.ebuild 576 BLAKE2B 852884a687c60f0e503e37b8259dd10afccad4aba18bc9dfd90c6c6d019cce2a0e1507048894c6233f074169e89a0455e421c9dbf24fc658dfd422c7ca988903 SHA512 3f754d24eda950c7c9bfcc8e39e0854fff3fe54ec400a555b773e620911e42bcbf4fc3c3c9e5980ff6b076c20c8cf8c5ad30b5383fd05ad77d2ea70d2c3f20e5
 MISC metadata.xml 308 BLAKE2B 98c8e0b71cb17a542fdca32a5ce319424e03edce2e7f4404a196ec22d1268938a04264cc432f67488b4eb2016e748a98e690206253a3e8305a62469c81e16874 SHA512 3fa5710f000482b5ff321d7fd66a0d3eb62542fd4bf18a424a6248dc0b02250fb7c8552e2b3869f6eaed6959be0ecdf63d82f1a3014e258591156561a80fb2f8
diff --git a/dev-python/python-ly/python-ly-0.9.7.ebuild b/dev-python/python-ly/python-ly-0.9.7.ebuild
new file mode 100644
index 000000000000..2f9018b2c0b3
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Tool and library for manipulating LilyPond files"
+HOMEPAGE="https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/"
+# No tests in pypi tarball
+SRC_URI="https://github.com/frescobaldi/python-ly/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index 274bd7ece60b..ac060c274774 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,3 +1,3 @@
 DIST python-lzo-1.14.tar.gz 14050 BLAKE2B e1df6b842562064ca13ddbacb194047ca343694d480a5a65e7d2876ec98a4215b4badb3b2a839f308dea8624c162a0536f363c093bcb2e5b48c68b69fb472729 SHA512 036cf7199afe12cec8b9c7ee92134f58357e1f892870ade3a619541a69c9cc92155892d53bd43330732b848016c2997e096a9a492e52f15d04fa516ca7645b93
-EBUILD python-lzo-1.14-r1.ebuild 714 BLAKE2B 6e1a4292278a1f14154d99af197d9d5115c66d21d5464c1be4253936c63f0c81e7282d4d728925d59650e1431724d83e1f97f12edbbc699d1ce8a853a09fb66e SHA512 4230a52cd47696d00f3b68bfdc8e76222ca17d269e8c34e546383fb5da16fc4cc1045a212f1e17ffcb49ec58a30a4d5eb119d96d83fe0ae993d36af098dfaa22
+EBUILD python-lzo-1.14-r1.ebuild 721 BLAKE2B 015f4a58a8196429be0fdea294ad6bf8de5e68b75433536c08db999b5e58c7928f1286e988f49a9c8a31eac29097183e632e1923df6017b6b2cbf6aa9c111a5d SHA512 d762d7de221efb257404367a4db7d43792f95759c0f03d4d3ed84f414dbe87848ad3a486e81552b939f782224ed1ddf868a8e2eade5cc3ebf0a60bc80510b8a4
 MISC metadata.xml 386 BLAKE2B d9e750b2ca0a3d46a031a5fab249197e73847ee5997a12c71f441eb5e386821818df07dadb272d5a726255a9310afecafa34b5f2196b49095a5ddd768054f5b4 SHA512 d98f79fd1e62456f1603ba412cdfb14e986c6d7831b6c88d9b561da24d36924aa3a979411f1d216cbbaf4740af2db733f61dd13f64ef94fe0e6d8e5e80545630
diff --git a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
index 9b07ee88c369..74aba4147cc0 100644
--- a/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/lzo:2"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 710384f051c0..885240e3c49b 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,5 @@
-DIST python-magic-0.4.25.gh.tar.gz 864121 BLAKE2B ec79112aba9f79a6dd6a3840a1286432806c0cd035d301668fd8177ce36b270ddf1c928f70d51cfacb88cca4d5fb31706cff946b16ed230e8850bca9ebda8c0b SHA512 eb138f7f2d1320f831516fdf21bf7dd404acf070be6093b7ed8697325f60998d886405c5ff348c7e4ad69ecd2ee0ab899afe455db90eda502acdf8b86337f79c
-EBUILD python-magic-0.4.25.ebuild 748 BLAKE2B 23132036facdc06cb6a5198aae572371d44ea4416bcb0766d69d5da75048789aa12687b282077544cc1c6cc7450d2e829afba97c6983a9927b5e5cadd94ff9cd SHA512 047afbc4eadb6e70f9d8b72eddabaeb7300ba63e2ac82cc59afa889fc5107cdb25cdb6b37a35091caed38f01cc219f59d97653ae9f988e8c10fbb4790516af5d
+DIST python-magic-0.4.26.gh.tar.gz 863618 BLAKE2B 62d85758402d77376e685eb0f8964fd5d9e2a62775c3566d7f2a76284b287b6b17f9f759dbc08404087fc8a524609cefa65ab8e74020c4bd4f49e8ae3a2d604f SHA512 a9f2f8ef9f1aef9e9455b656fabf8e6cf7b1a9df4af2012c7a9426e0740cd6e8952e6957e01710809ab018d008fd531a74e9f66640af1299b61c35ede590b749
+DIST python-magic-0.4.27.gh.tar.gz 863649 BLAKE2B 4ba22d0f8bd5e70eb37e3b46eba1b885d49682bf45d703ad7966bcc67614427ebe597e3100575f863b7e54421c6de6fc875af24a9d5b49742fe07b361b65f198 SHA512 a476730a5caa9a2a784187f57743d5cec4b1829a6a76d4d1fb4e0112caf5487888961df293bc38074ef1a5d313b0fc4aed4cc99b980f5336e8a907c44a33e84e
+EBUILD python-magic-0.4.26.ebuild 780 BLAKE2B fe8eb0b4274fa6da8247b689442405652e6dfe0586f480cd1ebe921670eff12d7b92776339d029894d66e9c365919d372f141978f005eab1493a129f4ec01f20 SHA512 0affc72f396735ceeb81ea3b4c51b90d4d0902d97a9838aae1adfb9df485b6c880348d97d6b9b137701309cb05498d163d144bc8208a8214d6b5fa8cbb6850a3
+EBUILD python-magic-0.4.27.ebuild 792 BLAKE2B 5cb73489b78ae49cd370c5502168c06b48e020ce309c0d1f3fd82107f5bb4a63ea6c95b48b6b7c17c6a63466aeaed20589b33fa2688958f1763907a6250f6b37 SHA512 5d5c487574a4457ba36fd7aa2d45f07d410e27f63486dd624e525546425a36037f137667bc9fcf712d79d1e54c4bc5b958f4c182c8014dec6987b58393689234
 MISC metadata.xml 411 BLAKE2B 614256656c3be285f997a177b6239cc4f6c253c8708cdb7339dab99f6a21fdec0a36af90a5c8cbe39f29939cfb64b276abd572fd9687e609a26e1098bb1ceb69 SHA512 ff2c756d280d753fe614396f5dda04958b3a3d0a3d94586724d2580d5901af01ebe30e1cbb98e263ca6dd95e6043222311be375595653cbf7ccf54dff9cd971e
diff --git a/dev-python/python-magic/python-magic-0.4.25.ebuild b/dev-python/python-magic/python-magic-0.4.25.ebuild
deleted file mode 100644
index 2f64601425d4..000000000000
--- a/dev-python/python-magic/python-magic-0.4.25.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Access the libmagic file type identification library"
-HOMEPAGE="https://github.com/ahupp/python-magic"
-SRC_URI="
-	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/file[-python]"
-BDEPEND="
-	test? ( sys-apps/file )
-"
-
-python_test() {
-	local -x LC_ALL=en_US.UTF-8
-	"${EPYTHON}" test/test.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-magic/python-magic-0.4.26.ebuild b/dev-python/python-magic/python-magic-0.4.26.ebuild
new file mode 100644
index 000000000000..fcecb826af0c
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.26.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="
+	https://github.com/ahupp/python-magic/
+	https://pypi.org/project/python-magic/
+"
+SRC_URI="
+	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
+
+RDEPEND="
+	sys-apps/file[-python]
+"
+BDEPEND="
+	test? (
+		sys-apps/file
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x LC_ALL=en_US.UTF-8
+	eunittest -p "*_test.py"
+}
diff --git a/dev-python/python-magic/python-magic-0.4.27.ebuild b/dev-python/python-magic/python-magic-0.4.27.ebuild
new file mode 100644
index 000000000000..156134420732
--- /dev/null
+++ b/dev-python/python-magic/python-magic-0.4.27.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Access the libmagic file type identification library"
+HOMEPAGE="
+	https://github.com/ahupp/python-magic/
+	https://pypi.org/project/python-magic/
+"
+SRC_URI="
+	https://github.com/ahupp/python-magic/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux"
+
+RDEPEND="
+	sys-apps/file[-python]
+"
+BDEPEND="
+	test? (
+		sys-apps/file
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	local -x LC_ALL=en_US.UTF-8
+	eunittest -p "*_test.py"
+}
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 98d02d874f83..a51b3d0b938e 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 585 BLAKE2B 4149a21781103c1f0f58518c01dc037eb44a6058cedd52e5698e26eaf7057bf5123dbb27e8e939381c75b242ab8df5b6b88f06b28953fd76d96db296542f9f3c SHA512 62b531e2826494bed8ec75c71709f1aa6ccc046fd4b7ccddb8c5fc0505b0c316fa02e0451894be212cce8670a9ae4c072053f621a4f43e587349d18048d0779e
+EBUILD python-mimeparse-1.6.0-r3.ebuild 585 BLAKE2B 9766f0a148a54e202b1500aa3f0b78e65bbae7be6343e92836e7e0d2e60b2143e1127de447f9a491cfd105032c70f6c8ebc6040982a4e4e26f8ca3eea6a126bb SHA512 45839f6c85be6c389c9db17a6f3cfaaa19a720eed8f18352b01d7d0f74b4bfb80fdcdb8e526b22f29ae202a3ddf3a8b2ea3baf324cf2b457e7943ad97f0f0701
 MISC metadata.xml 420 BLAKE2B 908782d7a4e94706f35fb8a2b802ea10866e9cc87af3556a548e133cc2d31ee39284861bc6bd3652ba99437fac82a7c2fc23eefc7294092910438723930d2c11 SHA512 7548eb1027e03bc129d97aba45c2418832fc2676f618e42b648e03de7544e65d34eabd65067da44c7190aa4652d623e70796a0b02433a0741988c08813673966
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 64b17a15caa7..6a504ac18564 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index 1541919617fb..d81878fc9db6 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1,5 +1,3 @@
-DIST python-mpv-0.5.2.tar.gz 207755 BLAKE2B 3222a54db145a66ae8b992f1c4e8243c50099573586fd8be9a2d88ff360898bf9b72905c22c8d056178b7917f093a494dce9138f3f8bb5782152dc38b71b1dad SHA512 cd542b0866d6c75395f1ca00bb6df3981998dd801dcee97b15e080fe66e94270f15daa674f663aa6974dcf6aa425d6e17f8476031badeec035727b2b690816f3
 DIST python-mpv-1.0.1.tar.gz 210008 BLAKE2B 3ba95ac4d3219615c80ea475c1f6dc3acd608a8ded919eea55efac8bb44a8946c959a2b39473e6c9e80fa1a4e52f525d6ef9871e3eb4b2664aeb1460208bc677 SHA512 16a6e93b63f30e535c1e3bd77702d7c703dd9c0a6a689f09e689663cac04e587bdc2135612062d791ffb38c709bc289d0297ebf9f1ddaf9b1771f25eae225f1b
-EBUILD python-mpv-0.5.2.ebuild 609 BLAKE2B 5f1a3ddcf5d4cf7029fbff2545801986e8fd44afbfc32cc743932cada21846a5392a7db3c53f0f82dc85e349c85c6948079ac74f742612a828aa68ae6caf9b03 SHA512 432fd8ff99c56b5f0f00538446e6ea50d2e82777d6efe8d095b7c95b6238b50cc639ff92cccd3c2c1e7b6cd5f17b7af513a17b905dd1af2cdb7782c810c45155
-EBUILD python-mpv-1.0.1.ebuild 703 BLAKE2B c5bbd841d48444bd7456c80170d5b88de2fa768f08b8fbcda33a04283bb1e05fe708d2dd18285602953c1d91b61f87cff224dfcc3abd78584b37c1fc0a1e39bd SHA512 fb3f4029944df3c71b57d12397e55f541f20a1549e755f501b694f6b2a8dd2b31aae9a846a3fc614b681e6ebea94d5d492b0209c468336bc5f8036ea2f5f57a3
+EBUILD python-mpv-1.0.1.ebuild 1045 BLAKE2B 04767db81fdc825423ed4f7049958613a25581f2f3eff05ef250ec2d104783aca09e11bacc3981eb1940d2fd6c018bc9ea20a3db8bf9f6d0cc9b28b88ac67749 SHA512 f26e661ac2da145b0380df60eed67e75ecae40d401afc77d7318fd89b27e00e2e351d511e3c3b05f92a79990b1bcda00820089dbccd5c794171657f8c7fcc315
 MISC metadata.xml 413 BLAKE2B 3e6ced6a506525bd576741fbcb1b0ce6069492dd1e90295a46b029340b833d981b351ac717e3896f4b13f3e8635065e974317298711922ab131925d98d0447a3 SHA512 9426ddc828c6b8f420c3d0241f827dd7746ca797c45182b0324b8278a24e4038a856494b420de2de572ee2643082ae271a5c21030098432736255ff2f6798db3
diff --git a/dev-python/python-mpv/python-mpv-0.5.2.ebuild b/dev-python/python-mpv/python-mpv-0.5.2.ebuild
deleted file mode 100644
index 9db6369612eb..000000000000
--- a/dev-python/python-mpv/python-mpv-0.5.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 virtualx
-
-DESCRIPTION="Python interface to the mpv media player"
-HOMEPAGE="https://github.com/jaseg/python-mpv"
-SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	media-video/mpv[libmpv]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	virtx pytest -vv
-}
diff --git a/dev-python/python-mpv/python-mpv-1.0.1.ebuild b/dev-python/python-mpv/python-mpv-1.0.1.ebuild
index 9aa5df22bcbd..a7486b1a5621 100644
--- a/dev-python/python-mpv/python-mpv-1.0.1.ebuild
+++ b/dev-python/python-mpv/python-mpv-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 virtualx
 
@@ -15,9 +15,6 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# https://github.com/jaseg/python-mpv/issues/209
-RESTRICT="test"
-
 RDEPEND="
 	media-video/mpv[libmpv]
 	dev-python/pillow[${PYTHON_USEDEP}]
@@ -28,5 +25,13 @@ BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
 distutils_enable_tests pytest
 
 python_test() {
+	# https://github.com/jaseg/python-mpv/issues/209
+	EPYTEST_DESELECT=(
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_negative
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_positive
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_shutdown
+		tests/test_mpv.py::TestLifecycle::test_wait_for_prooperty_event_overflow
+		tests/test_mpv.py::TestLifecycle::test_event_callback
+	)
 	virtx epytest
 }
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 314471494cf6..89b5cd63a4a8 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,5 @@
+DIST python-nbxmpp-3.1.0.tar.bz2 128551 BLAKE2B bbff0bd92b12addb73e661136531df7629baa7936a1d52a86a17b59047681d30744dbc3618143a0b4ff5460bb64ad01a70b1bfb018f32bd78cfd9dc848f18668 SHA512 6676da4a21915305952118b9d35d91f3b420a23f1f3bc1fa22ee885face3f9b4474417f58e4a2c6446fec48ff632822ab83343e104df480d33d75f1b46cf8fec
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
-DIST python-nbxmpp-nbxmpp-3.0.1.tar.bz2 125866 BLAKE2B 9338dc599a1a3ad1daa455877c5078a7dbd3b76f9914ca7f43b4defceb4f62dc84d77e9def7e08cd42d970d7e1461befb7208bde1c6db784de69c4bf92d3ada6 SHA512 3cf8de99f418b8f4e52b03147b305573e7fbaf79277f27b9b4b05f88686390d28cb8c3437c511d291cf677fdb96ac15589422b7395827b8a9f2298e15eb1a48b
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
-EBUILD python-nbxmpp-3.0.1.ebuild 810 BLAKE2B a81c707f6b36e9ed7b80b1e488756739b86ceb7a6225a266500018036e77402bff0edc2e574b9dc2558ee4e2a263c88b52585e9f7f68fae5e227292d917f41b9 SHA512 460e73a6cb6aadfc195c40d5025be791d4f6f66dc38253fc4e6b42e8b85dc2548a11ebcdd680cf330f1bc31b50530fe84ee3878fc46bad6c6c6cde957ec13cd6
+EBUILD python-nbxmpp-3.1.0.ebuild 745 BLAKE2B fb76ccda9625fcfedcda1be5f950ed12b0bde5901fb7989b25055c1cf08e738b52473eb972d2b336230b08c2d013b0b7fd012daff7851517be5ee77f4c2b70dc SHA512 262c7f37244669ef510b105db6034712673d5234ce3cbf9faef7c2786c41e07f31c84d3c301447c77dea6eef82c903f4ce260e61ce7790992426c62462af7fd6
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild
deleted file mode 100644
index 7504190445bc..000000000000
--- a/dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
new file mode 100644
index 000000000000..fafffe2d9512
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="
+	https://dev.gajim.org/gajim/python-nbxmpp/
+	https://pypi.org/project/nbxmpp/
+"
+SRC_URI="
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index ce989ce6f17a..f2bd2c4fcd4b 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-neutronclient-7.8.0.tar.gz 304872 BLAKE2B 780e1b2942a43bca93888683d1c2e713cfc0927d49135004a6f6d42dff7962def6b0fc7f308b75b4392f4fb5df4d26fcea107b9006d4ba957c0d76294395e5c9 SHA512 3022d79348334632ab3afa142aab11e424b168a4ba04223722da80e59de2695b477c2d829bb14a37e7baf387f9d63b8c4456fc5712f8d591d3de51fad76d6c78
-EBUILD python-neutronclient-7.8.0.ebuild 2235 BLAKE2B 20567491e93584820a02fd7e6a5e795dffb6d58476f9470ca3383bff0d2e3adc8489fb7281b672c5d5975430fc22c4b7ada367d12231d3eca48a4d434aa27477 SHA512 d94be5286f4358af9b4406f30d7296b6819009c66f26685dec17ca7d23cfaa2f1b27662a6e84b79a07c924eec127aafc22ce5e865179d587fa1f66dc594d7847
-MISC metadata.xml 538 BLAKE2B 13ead632c3a584fb1e8393993fef34cf6e9e61c3d80b90ffea2ab5280abf61235c8823f62154741fc9dcb7bac9be9565c4e8a1e3c4aa4c24af9a6673b0fa2f79 SHA512 50378bab897481da3809a9d9c82d53d7b3e0470e1decd432ca18ea1e57875aed3ef5b8c993f23099529ab74d7e0575b664d53b4abf8d737a1c7933ff781cfee9
+EBUILD python-neutronclient-7.8.0.ebuild 2242 BLAKE2B 652582a9b006c17bc92c9f6c29fda3385677d7d6a7f4869420ff1b979776a6eee2b049a27afbc4440dedf607cf70a5611cf9adebbc5d9f626bb11b48c0df7271 SHA512 a1271d1d26ba54fe0c53a488459452ed40a56009a81fc31e25c954a9a803beec2dcd922168735c3e45a2ec065f535ffda06d8ea748ee6e20e76436b9f5e57f64
+MISC metadata.xml 645 BLAKE2B 7c6f6fa18789cbd9334a7d611b47f5d2b9b0110a2c15cfcd50b95a4be593e8d5c7fa5d53a2db8a82c68c6e9f75db668cef4b4dfa7aa446f4cada0db80a669acb SHA512 035c9734f11c8b8d1edad8991c527d51060f58a171dbacd26c62a37cf8b061df318fad31ca352c17116e77e7e2338a85cfd8ee8550b10a2f93eb7ca3be3fd192
diff --git a/dev-python/python-neutronclient/metadata.xml b/dev-python/python-neutronclient/metadata.xml
index 98b93317ed13..55d3f4d2d0e9 100644
--- a/dev-python/python-neutronclient/metadata.xml
+++ b/dev-python/python-neutronclient/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-neutronclient</remote-id>
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
index d4d3c305f1ad..143e5e0a0ef8 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 0a534350bd25..a9c24a1aa63a 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,3 +1,3 @@
-DIST python-novaclient-17.7.0.tar.gz 335462 BLAKE2B bfd7853a5100df1d9a0e17f905c9a2d4ea0d13e1345438d42e4af21e348e78c3f4ddca6408f31fb164f4bf3b2770088118e24ec12edd1afb2a4c22b3b0461092 SHA512 3942088f2636d186434b7ae4184ee84f5e1e4862a526b33befae09219eb7d08ab02fed64589aa9eefd0ab263ea231969b0e4e59a0427eaae5daaa26516d92ffd
-EBUILD python-novaclient-17.7.0.ebuild 1832 BLAKE2B f8e0ecd415f4fc41a00b45f6ad910c197ccdc893d827b68e9e9d65f751af0bdb60e51f3626e19140a964dcd076ee13880ecb6d02810c7efd6f87a1b382193a37 SHA512 88456332de00a57d5b4500bf432df5227c28a94f8cf0996893bb6f6147d836c5876516cc2b7906c298593ab111c4858957f6dcabb9fbf0fbd881a44a19e3b180
-MISC metadata.xml 786 BLAKE2B 8e3cf9379a274131833f3a6ad3f5582cd9517ac8361aed04e3a39f14da4074de9f462ab890107db966f553726067b4109aa18d21e747545dd4a25c8794366a80 SHA512 568595965bb99b0f0cfea9e502d1876652a3184e54a963ad3841e28ff5205479a525fbd8252998a4df5505b6a50bccd59bb10288cb0244851c47b967f58208d7
+DIST python-novaclient-18.0.0.tar.gz 335142 BLAKE2B 0b76ce92897e16310892427efc9062d20d1316be61e7391eaf9aca618844c4420f963591d1aa773b2d1ae1785aaf63888de6aec5baabbbedb09e4937a14d24d2 SHA512 fe3c5ad591679329a77421a1ef520823855d0ba1a7aa077d92a8b01e2b8bdab814c8cc94b5f76c1e59d6c7e70355f6efebd7b3596a4d4f74966aaedc38deac4a
+EBUILD python-novaclient-18.0.0.ebuild 1839 BLAKE2B 110bb910a913cd7c3a97640830a843428e3aa7bf901d604f0469f0518269561f52bdff81295113d97c3a5d593911c80168a4fba799bd45ab1e0029621cdd4504 SHA512 eca22a12880d074f90d7212952527736cbb5224ed9211a2664c6aa429796ee8e93dea35fdc1ab0202b70b7908ab60626a863066733dbd32515306ffa2c2ceffb
+MISC metadata.xml 893 BLAKE2B 42037d5052de72a81e2aac430fd14d107a0fa723c4288cd7f599bef817975ecc6b1dfc82b754ace2a50e4f9e0f5870cc6a43a3f0722d7647a38322e6cfde7eb8 SHA512 f89bf49eddaa5803ab953abc2dac189252095e529071cbd6412c15885e0a890a8e73a71295d3c3f9ebfb16bfe321316693c104d330037d112d03e04eadbf5a4d
diff --git a/dev-python/python-novaclient/metadata.xml b/dev-python/python-novaclient/metadata.xml
index 70e970120f65..58529b73f74d 100644
--- a/dev-python/python-novaclient/metadata.xml
+++ b/dev-python/python-novaclient/metadata.xml
@@ -9,6 +9,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
     This is a client for the OpenStack Nova API.
   There's a Python API (the novaclient module),
diff --git a/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild b/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
deleted file mode 100644
index d277d815c735..000000000000
--- a/dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/ddt[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		dev-python/python-cinderclient[${PYTHON_USEDEP}]
-		dev-python/python-glanceclient[${PYTHON_USEDEP}]
-		dev-python/python-neutronclient[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/openstacksdk[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
-	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b novaclient/tests/unit
-}
diff --git a/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
new file mode 100644
index 000000000000..9d39e46619a1
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack/python-novaclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	>dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bandit[${PYTHON_USEDEP}]
+		dev-python/ddt[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+		dev-python/python-cinderclient[${PYTHON_USEDEP}]
+		dev-python/python-glanceclient[${PYTHON_USEDEP}]
+		dev-python/python-neutronclient[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/openstacksdk[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/tempest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -e 's/test_osprofiler/_&/' -i novaclient/tests/unit/test_shell.py || die
+	sed -e 's/novaclient\.tests\.unit\.//' -i novaclient/tests/unit/test_api_versions.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# functional tests require cloud instance access
+	eunittest -b novaclient/tests/unit
+}
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 047f6ff0c0db..c3f3e19c254a 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-openstackclient-5.8.0.tar.gz 827602 BLAKE2B 07893ae405532614605560d4d3423e501e2d86da5ad5a529fdc62113d55ad7a010407d45143a4d7ae8adc731804e6698a5cd527089ff9de809ac117f08e4e959 SHA512 ebd288fbdcd18245bed4262ab191ba06dbe6fb54ad4247c332f9c11b1439c3158e557bf20a7a7205e7913becb6c59126121521a32bce1f70092dc2d7f648b808
-EBUILD python-openstackclient-5.8.0.ebuild 1713 BLAKE2B 92df6e375d5f83d65d9dbfe62485875cd3f66019218780c67a686efbd120c99701cca9907840d4f93a48bbd5b7e1b82b180c4f466848fc4dc4cfe75c41281586 SHA512 df9c235d692412a1765eb970a28015eeea7146d85924e4d27ba1f3d08222e39a5247dfff13833f67d08d34c8c328aa8971253f0fbddcdf9d638913070a42c945
+EBUILD python-openstackclient-5.8.0.ebuild 1720 BLAKE2B 01514eab267866c7e837c930d90557c8b783f223d2a801141dce6ca8e4109e8b46d7d5de10c7334057f3c710b854966ec61d2bb6173ea4f2e3f70248f4c6972c SHA512 bd565751bfbd20c53b498bedcefcc0156749b2d8722671396fec1b6c1623a1ae193e02a7801fe334132e7fdeb776ff972da1e08f4d87008d07f4e68d6ca90277
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
index e262f189ad35..6313a9cb59bc 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-pam/Manifest b/dev-python/python-pam/Manifest
index 15cf4a6e86e4..9ee63ef738e7 100644
--- a/dev-python/python-pam/Manifest
+++ b/dev-python/python-pam/Manifest
@@ -1,3 +1,3 @@
 DIST python-pam-2.0.2.tar.gz 14787 BLAKE2B 4bd9d7d57802fb30519ee755b091d8dd21da7fdac164cba2ac11fae48c8f575498562309d996a67766218e15e1b5f45f40c4cf32800de349fe0fa0cd03ae911d SHA512 eafeb753b22ffccc1c5729516ea1ae26799d3749140fe91849ddb804066cabd4b5493e9b059172977dd5b3c5d48c8b5ced6c5c944931fcf23225dda09db026f6
-EBUILD python-pam-2.0.2-r1.ebuild 543 BLAKE2B d583eec7e8bd29e53ed8503dd4207a8315dcfe8375309dfca325c593c2cdea79d678d70d84b136c7c950ab67e4646da43630d177855aed5072ee541b2d89fee9 SHA512 e9fe2f11ff675081cef551fe7b41c0893835e3bdb58a023b552d90faf2a36368999e759457d80f962b1e7b07f26fd843db8b09a65ba72ae29a5a261760cbc185
+EBUILD python-pam-2.0.2-r1.ebuild 557 BLAKE2B b72fad14e55f96ee60ee9628853042bfe0b2bd87976df86389628c208a19fde02aad6ff87f667de7585a9ce303b264d94608e3c0dbf26ff2322e080f77b6f9fe SHA512 96878089161c06f745fea975694f82f5e5016d400600535166452f9929d6cb800e522987c28d8a7eb4ecb9ebb0fb81c90d4da46cf0c52cf77635dbec4f173769
 MISC metadata.xml 417 BLAKE2B 4f5cd02a89aaddaa52fec569bbaf6b972eea84c9647d24246f986b227089b87dbfb008ba43a82c1bc94d0cac04dff115e7113c3267475220414634d509da6ac7 SHA512 13efb5b77fb437c154c185a7dc00341a9f06ddefdb517b174ea985edf10ebd4c7bb3d2d272e907acc19c964ea8db41eeeac1ea2fc4d7d92960bfbc26352c8775
diff --git a/dev-python/python-pam/python-pam-2.0.2-r1.ebuild b/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
index 5226d53691a4..af5abb12ef39 100644
--- a/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
+++ b/dev-python/python-pam/python-pam-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/FirefighterBlu3/python-pam/archive/refs/tags/v${PV}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 023b76af127b..360847f98d05 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,5 +1,5 @@
 DIST python-poppler-qt5-0.75.0.tar.gz 23281 BLAKE2B 06b2b0899d2a3cfc84e623b98cc3379aa45ac9ca9267f25168cce04f2ed761fd897043376fda3386b2daff2b46850b24782cafd6aabb13a8e7d6f3920b55a02c SHA512 2f03036a2eaeb8e28875f19a813ff85a91c1e9a94301bdb736ecc50e7ececb4de2622728e6fecbf64e114435529f82b6afd23d772e2d3910ae03d5d2b5da3205
 DIST python-poppler-qt5-21.3.0.tar.gz 25641 BLAKE2B 5937f1ddc1493bb1ef1d98b91dd8ccec4bd8c835956d84c8d7ce7a1cedcbe16854861e1f13825812e0f74c335020f0d74aad2d2bbc7a5780c6eb3ac77437f13b SHA512 cc942a860c2c999ff04fb0468b1556b0e23e7aa19a0185a39c5e903e717dca64bcbd51b8fe34b6885bd789cbf5cc1080c2ca1dcee30b3e69fa1721618e8db278
 EBUILD python-poppler-qt5-0.75.0.ebuild 791 BLAKE2B 91f44f72522a0356983397fc7952bce9eec772e79e2e73c084468d33863ca78f6ca49344b5a1dab11ca68d2068bbc81aa8d6907f2895cb59047027c5cd551a10 SHA512 66e25ab4696e3a5f7806121888d5d696180d60edf473a8eb944692fc5611af399828e555eb2e63b14ea9b2892bc1bfdd892905cb699eada1777dad01511a1415
-EBUILD python-poppler-qt5-21.3.0.ebuild 728 BLAKE2B 568361f6d145792f5801a907690eccfc77889716d47f80a9b3c736c3609fb0bca53e94995fd01bd42e827969df93c5d32b53b8849d2f700c69c06cf7aab656f6 SHA512 d840a35d7fbd8a85f806468bf50f4004f37b575e6a17fbc3746593948e83f350a888381af65da45bbab83b219c01f44ff349cdf605de46500415111acef54840
+EBUILD python-poppler-qt5-21.3.0.ebuild 726 BLAKE2B 56503f59e0c9116ef3025b22ab30601b1083fd5ea2d1e1971bb2cd7afc76b815d2419a9d861b906ea88e3da09490fdb126155623d7f6ec5d6de9369ea33e1d37 SHA512 7f6bef05c85f42d5544879caab2055feab070a5b06d3d70b616c71b36901119725b9b3a738c95baafd9bf4e2ad6b5f344f2467e53b9cc127342d226efc9517f8
 MISC metadata.xml 392 BLAKE2B 51992d04b5914b5248871f36659a45176628fe6e45f78b75ad1f64dadcbc5e2606a022498125cefcad2526a43b88e92dd115592b413b86245083fca038611fcb SHA512 6b356062a520973b99990be8f40ff7a5f705089988ebe889a09829fad92ff42d6ec4cddc406f39c6bb19bbf0d6c231557fd350348721c2d9feeb0d4808fc27fd
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
index 11ca6622f42e..33e11a00af0a 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/frescobaldi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
index 99e9bfc40c5c..e8d455442277 100644
--- a/dev-python/python-ptrace/Manifest
+++ b/dev-python/python-ptrace/Manifest
@@ -1,4 +1,4 @@
-DIST python-ptrace-0.9.8.tar.gz 104079 BLAKE2B 3d387beca9c92c0e3bbd5cf2c9d2af447c233b631e894ce1af2cdc697a1a48e24a299bbc998cd187ac9ad0f45bfc886f476afdb69329d761e8730a047731126b SHA512 f50ba7d457bf20a161a99913a552f2e829e97975d7cfbf8cf5d89b4f2320772b537678f2e70b9aaa88341c4f01d4bf41f62683e913628db503152f3510a013a3
-EBUILD python-ptrace-0.9.8.ebuild 711 BLAKE2B 4671311f3170342ab4aa0cfa2aebea4cc9a3e7e582939b36fb2f293fb3098ea4c1051eae02b9e118cbf89acb2b2faf220b0edca0e4e9996bf1ca24d59d7ed40c SHA512 1a982e3c59e605fd3c16d1d28df5dc74d9d11dfe8659d8f379664ea679f8b69e4f8bfd82be11bdedca82552f1cdbde6bbb48ceb06b8b320ba261591584092db2
-EBUILD python-ptrace-9999.ebuild 680 BLAKE2B 15cc0d82169e51bf51139a47669eeb3ceda9d07591a769331f6e76a5d87411f18f500941ebae09c4bb0c1f4a4b5ca8897a6d209b01a8156abd8b5c9dfdfbd541 SHA512 3a8137451ba0af29b4544af22c2e4fb68500a8323f3f07c1f24e32b42cc7c51a0a0025b723eab31fc308620279d160b1d96d0bc7cbacf2c9f85adb47229edddc
+DIST python-ptrace-0.9.8.gh.tar.gz 104079 BLAKE2B 3d387beca9c92c0e3bbd5cf2c9d2af447c233b631e894ce1af2cdc697a1a48e24a299bbc998cd187ac9ad0f45bfc886f476afdb69329d761e8730a047731126b SHA512 f50ba7d457bf20a161a99913a552f2e829e97975d7cfbf8cf5d89b4f2320772b537678f2e70b9aaa88341c4f01d4bf41f62683e913628db503152f3510a013a3
+EBUILD python-ptrace-0.9.8.ebuild 714 BLAKE2B f9aee66e456ba39058854d991487db1474121d502dd063b7c7a9ede343f3a023badc4621deb8557a3f7e2af6225a98f6ad3ed770512ad55163724f83571a0c81 SHA512 cd49b162b05e994529713d224df1daff97826430d474064acdab8a854144c3c8431bcd7f4827a07e41edd95d79e96514101199083df0165e70ccb6f7ddd005a4
+EBUILD python-ptrace-9999.ebuild 714 BLAKE2B f9aee66e456ba39058854d991487db1474121d502dd063b7c7a9ede343f3a023badc4621deb8557a3f7e2af6225a98f6ad3ed770512ad55163724f83571a0c81 SHA512 cd49b162b05e994529713d224df1daff97826430d474064acdab8a854144c3c8431bcd7f4827a07e41edd95d79e96514101199083df0165e70ccb6f7ddd005a4
 MISC metadata.xml 667 BLAKE2B d0faf38cb37c0b796651d6af380bdcedba899a99ea0eb9cd1cd5c5a8f1d06e39a87f9cad287ffc19340ea45a912b423adf27b3a3c7eaa9d8aa5594e455a397ca SHA512 55c3567d5e039844afc9cd78df944b86a709a791bb1bd76cb8330125f7f0d1d24b371d56b80264ff2a0c107d1c0522a03a3668f705db2428a7579c9e6460683e
diff --git a/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild b/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
index a97f40f69773..4822a8c9c7b5 100644
--- a/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vstinner/python-ptrace"
 else
-	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/dev-python/python-ptrace/python-ptrace-9999.ebuild b/dev-python/python-ptrace/python-ptrace-9999.ebuild
index c87c6168a30e..4822a8c9c7b5 100644
--- a/dev-python/python-ptrace/python-ptrace-9999.ebuild
+++ b/dev-python/python-ptrace/python-ptrace-9999.ebuild
@@ -3,18 +3,19 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="A Python binding of ptrace library"
 HOMEPAGE="https://github.com/vstinner/python-ptrace"
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vstinner/python-ptrace"
 else
-	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/vstinner/python-ptrace/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 28854a8edfe4..bd39641877fc 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,3 @@
-DIST python-slugify-6.1.1.tar.gz 13259 BLAKE2B 2f85061775d9e921bf5679ab47d9a5b4fed2d2e1703aa2717e21c1d43fd1b93ef5d7060151bb4b473cd901aef16d3d905d2ca5004ae7bc61e906464bb52494a2 SHA512 2ffe8420b2f0504c57f42bf20aa0145ae521dab8d1bbefcaff1a815aa04377c7eb48eab929890915a9c9632a5c1cac4d3e7e093dcdfdda59f8ecee1ab787cbb7
 DIST python-slugify-6.1.2.tar.gz 13302 BLAKE2B 600ac1cc37cd0001ca3c08cdccb4655dd3754f7673596eada2dfb6adcb6c190f0e5644bd1cba4debf0fae42ae183b3d81acdcc09270e3ade94076d69ba25895a SHA512 3748c18d469032fc002318fbd5730b96a6f8430ff7b0b1a9afb4c19d4dd8e7528400682fa6b2fcc11ec4230917d7e7f61de290f5b199935d77d5335006af0ffb
-EBUILD python-slugify-6.1.1.ebuild 591 BLAKE2B e4f15f7bba14d47063751e5546897361a4887a38536e23e64b983cfbd8f43da0e596303548534105bbc30466d3d57fb71cf9e20be1be0cf9e538db6bb9169345 SHA512 c0d8e4c73c6568e165f279ca09d4bd792a2f56b5fa68638e25c4d957bb4f2c51d0045ed909e5c45c17104b04dd82715c7e8752f92a3c5e3361847a7a2d8c2810
-EBUILD python-slugify-6.1.2.ebuild 596 BLAKE2B 4ecc2dd4a6ece3effc108900d3a23f266fce2d43dfafe357502a074790630905fe0154348e28c35bd63196bdc80db08d983482e5d53638f4532e6bac04c38366 SHA512 f17bceb9de90ee8901bf78b66b8a32626ab61ae3994833254f2d165577548e73ef44ad7353f594a42c9b649ebdcd5d5dcad6c653dd0813e96094513b52295c53
+EBUILD python-slugify-6.1.2.ebuild 594 BLAKE2B 380f92dec445d336032dfef1275603db24ee4db779c8e1cbbe25df03d0ac6a81a26f02819147e01b80fc13624919d147b40b8c800424da89b79780a366484535 SHA512 d84326a73774731dfabe4c63604444bd3a21441ca7fe5ee932546f89ac19161f1bd5d372cf1d0291636aec26fbd03942ef56da32fdd38a80c5d0c82a72b2071a
 MISC metadata.xml 637 BLAKE2B 4869f272370af0065e6d0479d660a8fba6665ad019a3072cb3a2f1b003fa0cd7ae57dc8e19ad8ceda33d97355c1e4d1ebebb96978935d016fa8bcd2b7fd72660 SHA512 bc09a7914759371c03436e5dd0ef50bc1972cfbf2b815e91048d78d277402d8431be59673f4106483b690dfe3b3cde7ca5e39719effc23dc77e1e9b505e14a01
diff --git a/dev-python/python-slugify/python-slugify-6.1.1.ebuild b/dev-python/python-slugify/python-slugify-6.1.1.ebuild
deleted file mode 100644
index c7d0437e556d..000000000000
--- a/dev-python/python-slugify/python-slugify-6.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python Slugify application that handles Unicode"
-HOMEPAGE="
-	https://github.com/un33k/python-slugify/
-	https://pypi.org/project/python-slugify/
-"
-SRC_URI="
-	https://github.com/un33k/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-slugify/python-slugify-6.1.2.ebuild b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
index 8312bf675562..7a7756dadee1 100644
--- a/dev-python/python-slugify/python-slugify-6.1.2.ebuild
+++ b/dev-python/python-slugify/python-slugify-6.1.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/text-unidecode[${PYTHON_USEDEP}]
diff --git a/dev-python/python-sshpubkeys/Manifest b/dev-python/python-sshpubkeys/Manifest
index 9bd0ddd272d5..3bbfefc32c31 100644
--- a/dev-python/python-sshpubkeys/Manifest
+++ b/dev-python/python-sshpubkeys/Manifest
@@ -1,3 +1,3 @@
 DIST python-sshpubkeys-3.3.1.tar.gz 57896 BLAKE2B 3212ea0c38377255258a831cc942f71c0b0efb040ba8ca3283200b638dcae7a31ad5763ae0de4f51a7ae0c3f0a1b83ca6db96f00384ecd1e1e3a369028e4ed41 SHA512 8a59e73eddd795a71b64fc7433292ca03a9f447a13c8ef40d68fc599776c37f5e4a1fdbbf2f2ab00b0091a513e2412f213f6a21474ae0784af2df9a7107a2ed6
-EBUILD python-sshpubkeys-3.3.1.ebuild 591 BLAKE2B f5e53fbc557e8b1457c0e733c2b2e783b649f20aa9f91ba5b3e48ffa563f989fb5904cc780dc2f3611a9e15577fc2643724ff26cb05eded210abade72f14fbb9 SHA512 c5118cafe55921fbb9db1bc9656c8a5744c0741f989b60ddf4da6b8af5ced60b63dff92b167b2883d148fa412344a4d58ff4d6ef5d0ed5736ed930bf8da55ab9
+EBUILD python-sshpubkeys-3.3.1.ebuild 591 BLAKE2B 8fa3af1221f5e5e775a9c456b86532cfd0b640d7cc3dce6e3a72dcd93e884b9a0c04be0ac0c16dc0883a456c7f3d292bfddbe08a842b979fa3b0b5e302241d25 SHA512 2f54c68b5a94928bd20c185a5e4fb795ee65ec582d59987bc81f0c0d34dc0240b8d98d1de7b0c25852aa1db7bab00fcebd5fd7883d034b0dc185eafd73b18c89
 MISC metadata.xml 512 BLAKE2B 89b935c91163ef432c76b498b4d0a2d49c64c2d5f2f6af891c6f6c6e3a0479fc56d3b9947860f5dc6ebd07d5fea9bdb3f526226cf1b4af64a3b9097007bd08e2 SHA512 5d5dfdec492614ceccb2ac84a67f7f0db3dd5979d811e8ecf9e9d87df6334d490fb345c75ca5e4846a2f98dcb8dc5bc12ad1679b29d95040477e0f327e6da07f
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
index ecd6f4f9c7c7..3d96be549d59 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="OpenSSH public key parser for Python"
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index b275196210c5..8c5f400a8f34 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,3 +1,3 @@
-DIST python-swiftclient-3.13.1.tar.gz 201632 BLAKE2B f7cdf7e30ea333f568c8ef06d065b18908b1e4c9f8f0b777906bdfa8f6c998292136859f62f0d2e58465ee9eec3452d29e3e69ed7567a07bfcddcf6ad1bf321c SHA512 bd958fb8cfde6f72bcf82d381ce06e0e94c383aee85abab5a111c408bacf2578eaf53244ae12438d4454fcefe8d867246aef952d1d15012364e20817cc90042d
-EBUILD python-swiftclient-3.13.1.ebuild 924 BLAKE2B 34f8cd9501e62c88efaeb8375456f5dba26d6a867c674f68a201e1f3302fdcaf4858ff45ce99260741f86f7d4e02efb7d14fad8adcb01871cedd130096cc45e6 SHA512 f78fdb10af2083b561f1c276e5dab1ca0deaa1a5acd1357525121d90360e05273b7245e161ab6ef46b5857719d568e1f7307e834cc08e46f7fb3cb69ba5e7e86
-MISC metadata.xml 516 BLAKE2B fc43b031ba021a2a1cc6dbcb86764ef6f9cab62794220d4f3850050550a18a80dc112d0dd6d1be8562f1d6fd6d961057992e22abb4b4774c79bc69ac7c5402c2 SHA512 8858489aa10114c604eecd42e954d560a04d02e22c139f418b5d085c1be3fddac5d3e3c2ced39c2e4684d970569284ac988cb24d492e8997c3caad7e9ce59f05
+DIST python-swiftclient-4.0.0.tar.gz 200490 BLAKE2B 37cadf27758640a916014e09309282a4b7ffebb3e578ae7411744fafd22431cfb748cffb4127309b20a8b2d8daca7f8f0a1ed6431f55766c33b243744ce5a71e SHA512 9058558564973ea2a4944e87dedd7b9b12e106672576da1d796eae336d3127ce8b35803cade93c605b38fd16a2d3466e6dc710838ceb77143059007625299360
+EBUILD python-swiftclient-4.0.0.ebuild 1056 BLAKE2B f238ad88b6d5af2b50a97ea8d9609223e051f9540e5d83ff1a59ef006609d4d9243e5ffcc7169ef8315cff903e36bf321fbaa0f8d1d81297eb9be4a591525dad SHA512 70a794f5441ba89d9fe557d532b7de99b0abddb415683023f0b8587cb187385ad6cc13773d5c87e9433b0e288f2248b5a6b9575e1c8df46da6878a6b4c0c9859
+MISC metadata.xml 623 BLAKE2B 168e5384739e27a69e799a4e94038a8b7ba8434a439f92f601657ab4404c2f610da2324364a73c982aadc39a691fc368099b0ed604209331e9d83a33da1ece67 SHA512 d3028eb4ff16c9baae166c749c40388d45627a583ce041ece508f66cd8eea2f5f1ab72eed930c860497d6cb1e3e7f03c20f165c661197c4e507bf5a2c6833d1d
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
index 37cbe1d28ab3..1ea027c4474c 100644
--- a/dev-python/python-swiftclient/metadata.xml
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -8,6 +8,10 @@
     <email>openstack@gentoo.org</email>
     <name>Openstack</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">python-swiftclient</remote-id>
diff --git a/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
deleted file mode 100644
index 3bbc276c77e9..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-3.13.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 bindings to the OpenStack Object Storage API"
-HOMEPAGE="https://launchpad.net/python-swiftclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
new file mode 100644
index 000000000000..4ec90b98b6ca
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-4.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+		dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
+	# fix duplicate script/entry point
+	# https://bugs.launchpad.net/python-swiftclient/+bug/1975361
+	sed -i -e '/bin\/swift/d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 6f2c11479b54..c90eccf373fb 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,4 +1,4 @@
 AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262ddb0e331d24c2e950bcd0cf78c92d5f5f79804a9f0eb4a52a7203d353a6be297118e3b951823a973f9a99a8211efb5a31be458 SHA512 92a4497733efa551d9c966f39ba31bc9d3443ece6591f4d664c3732f01f10c928c07de13e2b9e65725f30fa18da7a4a9ee172e0b627d98e1d991c19b7762e2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
-EBUILD python-systemd-234-r2.ebuild 859 BLAKE2B 9b7c2e26291f93c4a76942d672caa7927dc16f6961d934ed38f98730f31712aa40065053e54f8ccd78fc5f90ae36bef6237a655166ed21cca2a8cef0fa980166 SHA512 38637492cf948da1b5a8f670ee6baddcceff1d2cee02ae8d0e9602f2998ce48c6095b1b0ab55199158967b217182e270780a88e8c7e6025c4e52bcb831565bca
+EBUILD python-systemd-234-r2.ebuild 865 BLAKE2B 8707e264d86df1a815c2b6d1d88c73717cb1066b7f7e11aa86679a18c769b487dab7e4f0bd14f2500d70dd51e5c916cf1fd9437b1524b2393492c1951ff8a1cd SHA512 88ab314e34907113fda7cf90f43bb921b46f01fcd517a428e0518caab541ba96abc44ac2bcb28b7ac053eaa17770718e48d0437df681b134cb48fd3ae792b432
 MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690
diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild
index 28970956fb37..ec89a20eafc7 100644
--- a/dev-python/python-systemd/python-systemd-234-r2.ebuild
+++ b/dev-python/python-systemd/python-systemd-234-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86"
 
 DEPEND="sys-apps/systemd:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index c3cd0f883673..06c792299fe0 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,3 +1,3 @@
-DIST python-utils-3.1.0.tar.gz 24251 BLAKE2B c00f4c45480f0948cddfa65d4f1ce17ac6831e29b24913d225544619ebedaca67c0f143b55698f8e2edd658e5f90ac39e005a5c29e09d75b5643f79992ba878a SHA512 e22ea0dc7aa0e6c5b45c55843011971c5075639424d38a712703b0d5ef8af32e3661d39af63b6015c4edfe11fca7a256f4f02c3705e1724fe8b9015931d85cbf
-EBUILD python-utils-3.1.0.ebuild 620 BLAKE2B e9dc61bfcd0d891238f969befc4097e3b93d667b11d699ad8e148674914bc14566c119c83ee0ad52f814f22a84db3fd42fe74249daf5c182db50fe6ff707b7bc SHA512 b3e960ffd2dd79013123553bacd8c7b1dec3aa791464b60405f2b0e8d9f4cf09c2c5e4ddd951800707d40d77c04448a27209892373ef7a92f8a1fea3fe0d32bb
+DIST python-utils-3.3.3.tar.gz 28031 BLAKE2B d491e5ba1c8e2ab8d7c7797757cb6163f5f4cff223b898b4a9502f85b740df3c128234fd0034fc422d17efb38cfc7056aa7fb3aee9441f1f763fc742930da5b3 SHA512 6becb1873da57f66aec26b98dab22c7917dacddd1a843a0c6e4f2939986a33888cb3b6addfa3b98660f9f35ca54763cf6da34e4099cd3e21987660f12a574b27
+EBUILD python-utils-3.3.3.ebuild 762 BLAKE2B 514736bc1166f789c5fa133adeffe37ebcb2eef44066d2932edfab1abca349c9454708722c0ba3fba167b657750cb189ab4997ddb3a27244200d76085da571f0 SHA512 3d3cb67467d01032b072314a34c838abad8ed817e37cbb76cdc2fe363679e4c27fb2aa90b9dd0c8115f9153d7e33c78f7370828732ad6838457e9f402a61de4a
 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
deleted file mode 100644
index 076e60f23fb9..000000000000
--- a/dev-python/python-utils/python-utils-3.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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/python-utils/python-utils-3.3.3.ebuild b/dev-python/python-utils/python-utils-3.3.3.ebuild
new file mode 100644
index 000000000000..d3823b0f667f
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	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_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
index 12ac85de4a73..d751fd16dcbe 100644
--- a/dev-python/python-vlc/Manifest
+++ b/dev-python/python-vlc/Manifest
@@ -1,5 +1,3 @@
-DIST python-vlc-3.0.12118.tar.gz 148685 BLAKE2B 356963caea1a14fdc9d5ba814fc442fd8d93fe327ebea7fd51ede52d29aaf7b72af3e9d6de9a7e1372515694738fbeda49c698793fecd80a47ab5f51b01f3d08 SHA512 d84e373b77b763c169fa4c2ffcdec979fca44cc40e873865b6a55d79481f2b01711fee48f8ab7ca2506ed73a72b970b6fd410f121c24120640ddc0ef5efbd05b
 DIST python-vlc-3.0.16120.tar.gz 148853 BLAKE2B 2de404605f9015cb1469932dc581128a100b2bd88a765565b979a2ed33f68dd35c91212abc4cabf34942c4fabfd198b41debd4ce0e56d5e537c23e701385d9a3 SHA512 8acf6e8bfe0bacc13b6c4c58fd2e5bc2f6040c47dcdce513aa6560eb09301c1a9a6c78125e491735b1898b11a6194465bf3076b653ddbf6caff9b49e7c15b975
-EBUILD python-vlc-3.0.12118.ebuild 447 BLAKE2B d159dcc3e3936a8f0e1a4d6ea0501c3bb9cd8392f8f7dc316dd2f47bb25bcd61ab0d6380313885649809c1888e38825c23561d73cc6b92e9b8a2590994a37190 SHA512 f37cbfb2927da7f2f6cd8a45a5fde0de05e224dcc912e5b147060eb3d32564f299d9cdb9fcc9662a6f4f1bb0e7dc613092edd75005692074f2bf2caeddb364f8
-EBUILD python-vlc-3.0.16120.ebuild 478 BLAKE2B f77880b429ff0c24216d41df6a62bc8f48280dc9e450c7fc95e7aef7ba7ee7db33d4da61b415400aa684a316052e13ecf81107aa73ee5f1d75e18c76bf7376de SHA512 0196c8e177c0d1958f22b7968e5f2fb6690b5f1b272bc8c32cc8ba26099df54d7fec329f63242294695bf84a36e18a3d2a5cb1210b65ee0bc36072b68d1b708f
+EBUILD python-vlc-3.0.16120.ebuild 478 BLAKE2B c90094f0762039e7a74080799699f6bb110787a1fcb76d6e5b61c8a29940de4e8444f2a27d2a15994c6b006914fcba8461ff3cbea0a3f94a47c171d4e51fa1b0 SHA512 e8a711938ba0fcb0002ac8c846c920428f6d84483c426c52b3aeed67822cf21cda58fb7ca69609101c785457bfafe3f54426e2d2faa65a221b5e91a34030c05a
 MISC metadata.xml 357 BLAKE2B 0c56f8cfe0e66e7c73e7c353426c1f12ea56884391034d5f0664decbbffa57f176b2d516ddc8a2ca890f729bed1c74de393049c3cddff188f1d5d7c2bb1dd78c SHA512 57e362121d3249fa2a8bc6a4b5cfd4da89c31e12a72ad1adc03e25e7d4a7ccaa2341396f91975ff822d517b09c1878f719b9293f284488510185c8658408093d
diff --git a/dev-python/python-vlc/python-vlc-3.0.12118.ebuild b/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
deleted file mode 100644
index 154fb58abe28..000000000000
--- a/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python ctypes-based bindings for libvlc"
-HOMEPAGE="https://github.com/oaubert/python-vlc
-	https://wiki.videolan.org/Python_bindings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	media-video/vlc
-"
diff --git a/dev-python/python-vlc/python-vlc-3.0.16120.ebuild b/dev-python/python-vlc/python-vlc-3.0.16120.ebuild
index c24d4bd67b02..0128672f63e2 100644
--- a/dev-python/python-vlc/python-vlc-3.0.16120.ebuild
+++ b/dev-python/python-vlc/python-vlc-3.0.16120.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Python ctypes-based bindings for libvlc"
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 610176ef5559..a7a16115f3f3 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,4 @@
 DIST python-xlib-0.31.tar.bz2 211425 BLAKE2B c0a15b11c264942479c86088d8d5bdc0c759ae71df8939feee200ff58ec30d3b2c0a99a119cc56e5c32279b26517e7925cf9124a367dc7d32fcaf0be4f7cd41e SHA512 f98978cd0058ae18f08f9da71b4ff31cd7811040ec1eb03ce065c187f312259d674dd76aad447752c8f508e585838948c90182eef5d5240e6c06b0a5dd1fbd33
+EBUILD python-xlib-0.31-r1.ebuild 926 BLAKE2B afaf7029aa5249c4443f22b21e9b5e010539e682715ce473d49e84dab2c148662429f31947a236f1181010d71cd13e02805da7cf62981fb2110d0247fa12a8af SHA512 a6430bb77322402750b732c5e26ef69ec9eef75f14f031c986a51747d247348c9070cf33ca8229d7f4e341a444cec28c5344b64035fc75bb6d4338ce18fb13d0
 EBUILD python-xlib-0.31.ebuild 891 BLAKE2B 4047fe5708424f0ebeedcdc94bb307218fe3e6faf494e15015a1adc6217fad84589e9451f4c95331523ebcae404e7bcc92e5cd19da7d299d058cca3b6eac770d SHA512 345e6deec4c0146fad01d9b004bb0629a58dc189424273e95f4a4c9d24201d9813fb04f27271bacee726b2e76381c0290760b931e6c2947026122e2b99772753
 MISC metadata.xml 434 BLAKE2B 3fa5d4e6b3b0347d1872805cf074795e486fe64a6b5b3edf326e9a8f81c1f5b86472ec6d906e85ef11493e9aeff9ef8ecfbece69103df037c8237fee3bbbaac9 SHA512 38738c99171d5351a797b12384a0f29b38250bb62cb17ff6250e3215a580500eec3210e22ee9605356c71477b8574b9fde34c5dee944b8437b901adc9b417218
diff --git a/dev-python/python-xlib/python-xlib-0.31-r1.ebuild b/dev-python/python-xlib/python-xlib-0.31-r1.ebuild
new file mode 100644
index 000000000000..b9715050ed58
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.31-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-xmp-toolkit/Manifest b/dev-python/python-xmp-toolkit/Manifest
index a87d4161e9e7..c7a907cc0195 100644
--- a/dev-python/python-xmp-toolkit/Manifest
+++ b/dev-python/python-xmp-toolkit/Manifest
@@ -1,4 +1,4 @@
 AUX python-xmp-toolkit-2.0.1-test.patch 397 BLAKE2B 059d415194f4544de5e4f6bfcbc2bec466b14e72e46792ac762115dd8b33bcd87ebfcdc9412695bd5b75483ac6e82024c083725ed73713c1bad100c30f22448a SHA512 f70eb11fe5b46ec0fac9a4a5c56a7a5b9dc75427b53e8159ec873a74afde23ca4bf5940b185932fc566a10f8a47d2ff8e56fa514eac1b06c94135cfa7070747b
 DIST python-xmp-toolkit-2.0.1.tar.gz 3576384 BLAKE2B cbe73d08d101d0d44c368fd1f1c6f1c8308ece5ca26f164f78312d901fb5d0387a5d2a6519d527b3625d11e338df5c366bed8a7361ac822ac887ef8be3a74948 SHA512 46f83b03574b2d742f6c6efb5b94a549068557ad6338e74fc62368c265d05f0b66a4dd36b17cd51b39f7b6cfbfb1210d54cc44c69e9a9e3da3392ee5f11de3bd
-EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 1049 BLAKE2B 28c96605a27ecc0c056aab4e61b377b24ef982149c4d00d4f3b8bc10312cda18ce326af28f3855865b651b6107ca76cfb08cc7baa0dd80bc5e4d2be0a2f68124 SHA512 a9fb8fa005bc20ed8544e9e31d1e8c7e1edda419839a588e5ed8dcf3ff3106c7c7f96b7b473451a4c39fc166bce22e756f5118ce7be0a1078a043c822b1090c8
+EBUILD python-xmp-toolkit-2.0.1-r2.ebuild 822 BLAKE2B adb983236b3a11d64cfdb6ff061bfd025dc79b6a983bd5c49f794ee6088afcd3b923212c434fe9c382f11dc200aad57de37dd956fefc860cf9bb7b51d2d16eaf SHA512 965d7bc5765b89ff7cbbf094a93c1654087f6386879dde9440534a96c468c141860d639a580b75fbe75a2facc617e9122e74ac3e88a866dcc660553301b1f655
 MISC metadata.xml 417 BLAKE2B 818d54b619c9571b00493c9c463f4e2899c187071918f9e74189d8be23b97f4cd9a8ca0313c5f26507f9e581d8e268be3fe17f03c3f409b1eb333540fb48d380 SHA512 dc5ef8f44af10a54da69fc6bbd392c4da30ecc49c829f2f8c26022e2d42da3ab0a705f31bd72f404454fe76daf1162ecb72ea1e106c93a48cdf100b59f492a91
diff --git a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
index beb8ea247ada..c53f9037ac21 100644
--- a/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
+++ b/dev-python/python-xmp-toolkit/python-xmp-toolkit-2.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,11 +21,8 @@ HOMEPAGE="https://github.com/python-xmp-toolkit/python-xmp-toolkit/ https://pypi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( media-libs/exempi )
 "
 RDEPEND="
@@ -34,13 +31,5 @@ RDEPEND="
 
 PATCHES=( "${FILESDIR}"/${P}-test.patch )
 
+distutils_enable_sphinx docs
 distutils_enable_tests unittest
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python3-lxc/Manifest b/dev-python/python3-lxc/Manifest
index b4875b32d55a..bdc9b5d67c4b 100644
--- a/dev-python/python3-lxc/Manifest
+++ b/dev-python/python3-lxc/Manifest
@@ -1,4 +1,4 @@
 DIST python3-lxc-3.0.4.tar.gz 27278 BLAKE2B f549ffb94c2bc331e0628a344432d4699aed64de466b0d1e9e4338cee8252ca9f5defeb2c940bd29723e20aede23d8a33bd1bdfe57874069e8cc5a61bfe9bf4a SHA512 37660fe97a2171cc3346c31e736ead8a38e328bfcbea621d6b563042fcd1e70c48b97440f6263fb0f6f02a4f1704af2241661bc526921c124a6456c06a497828
 DIST python3-lxc-3.0.4.tar.gz.asc 833 BLAKE2B ed44e595fc7ac3d7c4d64f8a84e78cfe48428299015d7c7c8504301d98511b644ede378feb8e1947e4007f43e97ed4e9aa35b1d1456ae108818b3696e1bdb44a SHA512 5c1faf28545ce26047cf3bd81f90aca48046f63c5d5dd0c18b9a2575cc0735f8a45dea6a78bf4674b9092b82012b26080db727f7afaf1c856edc7ef4dfe5486d
-EBUILD python3-lxc-3.0.4.ebuild 671 BLAKE2B 6b74e4247c0de8a50c2a31507b60f9d023e235ac48ca647769e4cbebd974b7dff1b45fd750f1726fc3483403b11008f99549f98a6233aca7b5238a6ace73f300 SHA512 8e343f0993faca63b474693cdb10bb662117e457753e90c80d1017c4839c68209bcfc3631f983b7f1184999d87ceb16b844649f7b458fed261e2ce1c24f36882
+EBUILD python3-lxc-3.0.4.ebuild 691 BLAKE2B 6a577a62797159150f4d82618728d1fc74be34c7a8300f321dc4abce778922ee067ca3cb0fa2f1e6f0a2bb7203d557a0bf5f417001950c4321b67d00e3e279ed SHA512 6bb80d79cb66e5ee7a4a5a1d6e05e4fd6d150cb3fb945e3631fac5c3bf24c3e6a47907b90101e4fb059fe6722729aa1386116d1bfe1e489a64c696090db82d24
 MISC metadata.xml 362 BLAKE2B e4403cca17caa67b766cecd1a719247e8d9400c20320a8d79c69b90cb1afaa3bdd1f45bd1a20368db277248ac7c4f8f25924b1238169f57ab8db3fad8c8837a9 SHA512 3d9a140ac99917956e9863edf4ff549666b279e8f523736f3e00361b995eaf849f2f810075e3ce11a591ac45c2f98d6425f8a5e8bbb4f1ef521bbfab360442b4
diff --git a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild b/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
index 31c6778822cf..c3e7c28b0bd1 100644
--- a/dev-python/python3-lxc/python3-lxc-3.0.4.ebuild
+++ b/dev-python/python3-lxc/python3-lxc-3.0.4.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..11} )
 
 inherit distutils-r1 verify-sig
 
@@ -18,6 +18,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="verify-sig"
 
 RDEPEND="app-containers/lxc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 
 VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
deleted file mode 100644
index 4beb5c5d402d..000000000000
--- a/dev-python/python3-openid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python3-openid-3.2.0.tar.gz 305600 BLAKE2B d793eb61335d7240d5c25324b8377d19781df15012c8da6d5d0d7445c8a7fcb31711156b48d32efae8b6de27509e8f9112535ece7820779ca9b7f2e7be04fb0f SHA512 54412820fef21928e1bf30d16c9bc73d454e9ff41df028a12047c08abdb4c2c9e1d9053daebab8b0327cb0fe0f67e364c2506a47509fef6db5bff42f8399b799
-EBUILD python3-openid-3.2.0.ebuild 725 BLAKE2B e4132d8a1d215feea68aa6122d1430a402aafac26d7095bc290afe0a11bd719ea28badbf42012f73b5256c6fb1ab3fd848e69cb58b76856b23a05e89dce36f1f SHA512 657ce8cf2f1a86c459d0a4261e346a0d273394e010859b8fab008497cfdb92bcba59cfd705a68a1c962463232838887c43a3ea2cde6c7cb6b2ae39d5ba9c902c
-MISC metadata.xml 305 BLAKE2B f6bceba4f78b8638744252810be24ec173c107d474a65374f629f185c4bf45b8d86f91ce933841383a01bacafdcb3a0461b72ac9542353f80f68bd6f22b0b8bb SHA512 4ab4f4f3bb3167200276da4a12d755128a6a27ad65430aefd6133b41d3024dc60ff7379d437495a1a80bc01eae3565df49eb26cc82ab1079ad4a2cfc63a91fdb
diff --git a/dev-python/python3-openid/metadata.xml b/dev-python/python3-openid/metadata.xml
deleted file mode 100644
index 4c87ab4831fa..000000000000
--- a/dev-python/python3-openid/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="pypi">python3-openid</remote-id>
-		<remote-id type="github">necaris/python3-openid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python3-openid/python3-openid-3.2.0.ebuild b/dev-python/python3-openid/python3-openid-3.2.0.ebuild
deleted file mode 100644
index 6066e6b63193..000000000000
--- a/dev-python/python3-openid/python3-openid-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenID support for modern servers and consumers"
-HOMEPAGE="https://github.com/necaris/python3-openid"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND}
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/psycopg[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( NEWS.md README.md )
-
-python_test() {
-	"${EPYTHON}" -m unittest -v openid.test.test_suite || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
index 9cb655b348e4..c3768d6335a9 100644
--- a/dev-python/python3-saml/Manifest
+++ b/dev-python/python3-saml/Manifest
@@ -1,7 +1,3 @@
-DIST python3-saml-1.11.0.tar.gz 506373 BLAKE2B 909244e18b6ccb3cd0ed0059e387c14eb75a1a0fb709bdbc33f6dbcdda5b70359e6fedd77ab88e580aaf28503ca3f3fe49308f56338a1d8855149a7ba992034d SHA512 9e54eee28e2b6430d9f08342c312997b6a20f85e3f663573b93c4d8d65a6540c7d6f4e05d35314014b20ba080110a2a51718ac6754ef2b19bfe23d2d4381de24
-DIST python3-saml-1.13.0.gh.tar.gz 509986 BLAKE2B e7c1720683f0391fe943de6ac95c69605a9e1499cf68d9bc416b56390bb5a4f16b17722aad4f6af2cf018195251554ebcc27a10a1605529fd3c98dd37efa4fea SHA512 e13325cdb2857d95ebd34dc4417f7929a76d1afdeb11972ef2fe3719c2db210137c5fef2c5dd4c09bd4dc467aa76afe5cbf14015f7eaf0941b369487313d3c97
 DIST python3-saml-1.14.0.gh.tar.gz 510031 BLAKE2B 10c1102b29b58017a39241dbab7d2fb85231f051e3701ff24197f2e501ae19b1889d4032fe86a60ed5ee708380d44111dc6ab87900c8463a141ea911fe774eeb SHA512 6807a4741164dfdf185a4c63691d5a1f0e91feff387265dc8b54b135d44158c751c2274eb1f47eb71d61c7e233d38ddc83f34d092cb842676830699ad6ee8af4
-EBUILD python3-saml-1.11.0.ebuild 797 BLAKE2B 1c245a6e213b97efa6ab7f09981b590eaa435b6c8678a0cc8e19a3789e56fb8880c8828498352d84972263871e229713a6a2ba277ec6b08f082c4ee3caf586f2 SHA512 1401dd5af395897e7cfe36b7f51222600b594d734302e0ccd95fd6d391904cbfe8ecbfd06a13970e16e54580e48b99b4c11ec1c8783df2a038cc0e4eac3432ea
-EBUILD python3-saml-1.13.0.ebuild 874 BLAKE2B dfb3c3fe567681329898ace60c6b9a588e3e66590e04c25f4a47b377123313e545977f263570ad2aae1fb6a449999ba01b1691d1d84c35dd06f76a92074a84c7 SHA512 9cb09497ebcd76f94131f4f6d853fdebb598595439dae6e0ce9244020ec7db5dcf1bc8ed39a8a81cb8059d031879af64a93ef583b97ce58444b6cfb45215a541
 EBUILD python3-saml-1.14.0.ebuild 879 BLAKE2B 718e5388290ab913b43cd3d0505e790ae95802c56a9dc7cba0e8f3e072d58b2ef73864c07b639cc937a1656b868adc2248e3b82492fdaf9d90fe87c1f1e05b15 SHA512 c1a86aaf51f12e3d2e165171254dd256a14c20dfe6880085dbbf37698168f1784d7118cbd3e455211e546df1a1ac252dc567c8be0da04b82741e389d29620c4a
 MISC metadata.xml 487 BLAKE2B cc928de641a0bbd7e3de2b4d917853439ac6838b673c9aed83b5597d841d1df159474f4df5c48dce5d8e9cc95e5db5329fa4f4413f028cf49ac15b859f125164 SHA512 96c163d9e207ec64903025fcd4e425ad9e39099bae2349f44026cd668171965dc13033f34ded70d56af6f817f44eaf3ef3b67beeda207cc2f55a39cfab5541b0
diff --git a/dev-python/python3-saml/python3-saml-1.11.0.ebuild b/dev-python/python3-saml/python3-saml-1.11.0.ebuild
deleted file mode 100644
index 0d7e03a43ba0..000000000000
--- a/dev-python/python3-saml/python3-saml-1.11.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="OneLogin's SAML Python Toolkit"
-HOMEPAGE="https://github.com/onelogin/python3-saml
-	https://pypi.org/project/python3-saml/"
-SRC_URI="https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/isodate-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
-	>=dev-python/python-xmlsec-1.0.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python3-saml/python3-saml-1.13.0.ebuild b/dev-python/python3-saml/python3-saml-1.13.0.ebuild
deleted file mode 100644
index eeea40c22257..000000000000
--- a/dev-python/python3-saml/python3-saml-1.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="OneLogin's SAML Python Toolkit"
-HOMEPAGE="https://github.com/onelogin/python3-saml
-	https://pypi.org/project/python3-saml/"
-SRC_URI="
-	https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="
-	>=dev-python/isodate-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-xmlsec-1.3.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# unpin deps
-	sed -e 's:==:>=:' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 765faf2bc570..e872dd6affc4 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,6 +1,4 @@
-DIST orocos_kinematics_dynamics-1.5.0.tar.gz 251515 BLAKE2B 53c14354b0833867b6fd030cde91c9524b6f0537ea0d0f3977e7aeb8482030edd5723a571030e8b78e4d6d01eba38c6a8e5c49d66c49c4b1b0f2e7a3d8159c74 SHA512 5fc9c336d6ed31ad59a5bdf6ee06444cac29beae090b9026b34f35a3cb4cdf1cd6c33af621205b8d6a5201070e679531c8b5bbdeb8a91cd1d8061153b0e47e49
 DIST orocos_kinematics_dynamics-1.5.1.tar.gz 251074 BLAKE2B 6be8171c3ce3bc6613fc342b8d3c772de766bfab78c5530364339ce2f9c4a37e6bc5519482f30939b210d9cb9e7899b3da66784a5c301653493212bc690917a8 SHA512 9774b76b755ea81168390643813789783f60d0b1cdb46cd250e3e0d27f75a6cf2fd3bfd2081c04e30a14ff4fc70d0080c9b43b82ee181c2dda82f23f052b338d
-EBUILD python_orocos_kdl-1.5.0.ebuild 1513 BLAKE2B 65134936ded2bfc06912b2fa15aa7eb9eb9eaab717f01ae29431f7ebedb08e74a856d9b734ce84266ea2921cd01dd87c60840f1f48e63db73b4ebe4b64d0896b SHA512 285b544d07eff109415b9c92b5dcfce5e4f5df3f920d6bec6903969b7942dbeab2a51cbef5fa3a4b19c415850bcb5ba51c1b0c82a73115dcd94db3915103e7dc
-EBUILD python_orocos_kdl-1.5.1.ebuild 1383 BLAKE2B 5afe5e59334c474d1e59fe4b2d16257a7a45326e3ce3b313e6b6f6e7b347758646f993358ef3b5d6ae1d74a74d20a3d584df86f08f891d26a90de714f8b11c45 SHA512 99bd926c539914067505d606d221a201977498152243bcbd7b720e5e0fb6b61b9a4881eb0e7ca08f25aa30b81584df51081fd522ac52f00cce8ad2102acdf539
-EBUILD python_orocos_kdl-9999.ebuild 1383 BLAKE2B 5afe5e59334c474d1e59fe4b2d16257a7a45326e3ce3b313e6b6f6e7b347758646f993358ef3b5d6ae1d74a74d20a3d584df86f08f891d26a90de714f8b11c45 SHA512 99bd926c539914067505d606d221a201977498152243bcbd7b720e5e0fb6b61b9a4881eb0e7ca08f25aa30b81584df51081fd522ac52f00cce8ad2102acdf539
+EBUILD python_orocos_kdl-1.5.1.ebuild 1388 BLAKE2B 8d25a648b0b00d35bc029fff1c2ca5857d85ed0bf9e6384bfae0b05536d44e555cf3fcf3f43489bded7a7d88b54f06b1aa6e2eff578634d26326d0eee37e8930 SHA512 57e9b7e7151facde1687dc5da996007434740af472bd4bb5e87c9385c6732d8515133feb21053e4ce22bf231cbc49df9714a3214a65229cb54bc7c3b2074c9cd
+EBUILD python_orocos_kdl-9999.ebuild 1388 BLAKE2B 8d25a648b0b00d35bc029fff1c2ca5857d85ed0bf9e6384bfae0b05536d44e555cf3fcf3f43489bded7a7d88b54f06b1aa6e2eff578634d26326d0eee37e8930 SHA512 57e9b7e7151facde1687dc5da996007434740af472bd4bb5e87c9385c6732d8515133feb21053e4ce22bf231cbc49df9714a3214a65229cb54bc7c3b2074c9cd
 MISC metadata.xml 348 BLAKE2B 24d15c62289bd5137e3faf1375eac0664a376eea167ca46192ddfb04e2d6ffa1992efe8ebc1844c984f3d359d1898d4461c007795e2bf9e8663f28ad47d8fe57 SHA512 a7d33155beab65af1f583ced9eed5f76e6e3121a1eb9ae65cf11eb3e1245bb8c26f8c6da0f716db6248558b202aa8b019f607257713e7c9e33bd016e64c123ca
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
deleted file mode 100644
index cb5f4ef382d9..000000000000
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-# pybind11 strips targets at build otherwise...
-# https://bugs.gentoo.org/806857
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-inherit ${SCM} python-r1 cmake
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="https://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=sci-libs/orocos_kdl-1.4.0:=
-	dev-python/pybind11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	S=${WORKDIR}/${P}/python_orocos_kdl
-else
-	S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
-fi
-
-src_prepare() {
-	sed -e 's/find_package(catkin/find_package(NoTcatkin/' \
-		-e 's/add_subdirectory(pybind11/find_package(pybind11/' \
-		-e 's/dist-packages/site-packages/' \
-		-i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	python_foreach_impl cmake_src_configure
-}
-
-src_compile() {
-	python_foreach_impl cmake_src_compile
-}
-
-src_test() {
-	python_foreach_impl cmake_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake_src_install
-}
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild
index 3c9273f16a74..803362cbbffc 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.5.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 cmake
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="https://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl.html"
 if [[ ${PV} = *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 3c9273f16a74..803362cbbffc 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1 cmake
 
 DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="https://www.orocos.org/kdl"
+HOMEPAGE="https://www.orocos.org/kdl.html"
 if [[ ${PV} = *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
diff --git a/dev-python/pytidylib/Manifest b/dev-python/pytidylib/Manifest
index 5e44309cd7f9..0cbcb298d3fc 100644
--- a/dev-python/pytidylib/Manifest
+++ b/dev-python/pytidylib/Manifest
@@ -1,3 +1,3 @@
 DIST pytidylib-0.3.2.tar.gz 87669 BLAKE2B 57eee794e3a6ba147b778360a12d2417c21579250620854267a83300d918cac0320c768faacb531517b66eed7fd7afc1679e76f2db626f7d7daa80af1667a06d SHA512 24f755ed2607e300711f5a1aee510df3a0a410cc7d8d8f46e065ec8d93c50e436a492cc2831e9d416ab9837497c603f9dc8705da543102813d3264e6de033ca7
-EBUILD pytidylib-0.3.2-r2.ebuild 602 BLAKE2B f95a8d76f7850b617b75b3e957b2a9d12ff84de707d150f33d5b6ba5474e8b51d7f643146ba8ae6ff7c3542b9807c494de974377019e1dbe368c8c38b6a22e7a SHA512 b4f009fc1d8875cba6004d3c691a02f87a3cce702ac17de16f70b323073f71d0e268a735369fcdd27ba9d97c974e7695f397be1534812d58c124cf5aff192065
+EBUILD pytidylib-0.3.2-r2.ebuild 609 BLAKE2B ca77ca8f06453adeede2d70c03913bb42522e9f7765b313d2773b1067592d6942eea174bdd2b40a00bd5231a2df081f10aa797c5a30cabee4ff403715c21b829 SHA512 8646563edc10e19846c5db139e932bec45ed66f1e3bf6d8f76880b9aa4d2808714b2528cb53d57ff3c4dae67b590823ae71e8051069f0d987f771f836bdcb53f
 MISC metadata.xml 386 BLAKE2B 827fbfb2980cea331345e42992787858b4bfa481157841c2a6970d75e4a5d669e864e545c07723baa5fd673d7fac020fa8ed26008e57064e3de4b230809ac358 SHA512 88a181e7b71f76b1d0271362b39a7310ecf5cd90cf98aa41e609833cfae4c5886b6d4beb1fd387ca6aec3f7a9da1bdc9a1e3424b018039804049ed94b717f92c
diff --git a/dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild b/dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
index df990695a520..9eba21dc1d42 100644
--- a/dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
+++ b/dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="app-text/htmltidy"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pytimeparse/Manifest b/dev-python/pytimeparse/Manifest
index ea1589436b60..719f1d9e31d8 100644
--- a/dev-python/pytimeparse/Manifest
+++ b/dev-python/pytimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST pytimeparse-1.1.8.tar.gz 9403 BLAKE2B 671a96f0f7d517e6cd137b8ec7bda17976993a683ece5e06f857cb07063cd4d7fdd08a98f838dbf35251a8403b68f7dc538e5450db3abe644e8c7c4f6c76b645 SHA512 9eb4530d779b940d66412920eefa4f4d3c43719aa3e4104da4f337c05421bcbb6ad4cb2d6459ddfac770fc9f19960a9d8ce578e67f2513499a7bee8efe9541ec
-EBUILD pytimeparse-1.1.8.ebuild 653 BLAKE2B c0a653a8eff39bc3490601ea744d0023aa2ed66c5908725f49677b5552c8897072d53f716b30bf24c34d5bf7f8f83fd364809c361f0ed80708a6c2c80dfe2d81 SHA512 3d5a6399d3734baf680b5b5f5afb7359b51b85ecbc4e078d36ff9f6fd1ca04c161f6d88b7a15d2f61a08d38f799893c1fb7b6031c77152d7da48eb8f64419897
+EBUILD pytimeparse-1.1.8-r1.ebuild 498 BLAKE2B 9aeada4248de898b4ae3774ecb747ae3b05e4e70f5542484d0d1d87882bb14538fece59161bcc4ce0156242e80110009ce5f009f129097e10ac3a7ea89b44a56 SHA512 120ba958202bb5f8af01e2860b55b2234e69d4c76853b02e646c544bef27ee63823850e286cbdf6a5bf06c04b5fc4236b53d595f97e7d0050987f17c5fddbca0
 MISC metadata.xml 501 BLAKE2B 9ad6298b97c2882d63f95eebd4e055745b736b15b28c9268096b08e8a1376169614795b2b5138ae03fdb22c75be6c30776bc8b998955b88aaf1b3ab2ee60d44c SHA512 2a01bcf9ca0e6a9b285f5aff31e05e8b31c00487ddb09036c69d86fcdd3c28ce89f89a309d9510436a0b27bf922778f46914b215918ed9e1ab9b31887d1e08b2
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..307c17920bb5
--- /dev/null
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="A small Python module to parse various kinds of time expressions"
+HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
deleted file mode 100644
index 536667deb9cd..000000000000
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A small Python module to parse various kinds of time expressions"
-HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-python_test() {
-	local unittest_args=(
-		--verbose
-		--locals
-		pytimeparse.tests.testtimeparse
-	)
-
-	"${PYTHON}" -m unittest "${unittest_args[@]}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytoolconfig/Manifest b/dev-python/pytoolconfig/Manifest
new file mode 100644
index 000000000000..f4baf563989c
--- /dev/null
+++ b/dev-python/pytoolconfig/Manifest
@@ -0,0 +1,3 @@
+DIST pytoolconfig-1.1.2.tar.gz 12066 BLAKE2B 9e1627bebd1cf8e5cd36e3d772ec3abc26d46b55bb582fb4c11f3073b2a0c1bcc64022a559791b3c63e4c92db7a762f5c2656e353f69dde223c319e419e61adb SHA512 bae9636d23ab3df1bf7f64d10ec7735b741bbab53afb79bccac3586774081c1d2170fc4086725c13bc6d296c3460098956386f9707ef9aeb6b57a21a4c9ba16f
+EBUILD pytoolconfig-1.1.2.ebuild 723 BLAKE2B a5c3d02d2f7a312a0641adb42e7777f6f800651ff6ff6db905b2b1cf859983db808fa70510eff2c14b1c38f52d81cc68891c18940c627377e29834dcaa70060b SHA512 ccbc3fe26187f1bf0ff8792e3880ab46a90d99ea8a377d49acf7eec65e381a687ec0abab586b5505c3c2e2651d8b469b67d4c56a82b8b886a3727e3b625f3361
+MISC metadata.xml 423 BLAKE2B 3007e2ab50dfd0a5b91d18dfa30099586f14daf29583323da9b275fdfa8c8c2e1cfc575e78a0f5b7983c6d23b03767ebe8f2f2dfb83d35638c0577257e2de62f SHA512 556361958961c85b7f3fc8b5d15009329b0534db086c15392e0c8067357576848a5533fb5ad4d2b75295b7a245f69fd81de63cc5aad555e77211e8f46552e147
diff --git a/dev-python/pytoolconfig/metadata.xml b/dev-python/pytoolconfig/metadata.xml
new file mode 100644
index 000000000000..0d65c075419a
--- /dev/null
+++ b/dev-python/pytoolconfig/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">pytoolconfig</remote-id>
+    <remote-id type="github">bageljrkhanofemus/pytoolconfig</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild b/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
new file mode 100644
index 000000000000..1e765af00d7c
--- /dev/null
+++ b/dev-python/pytoolconfig/pytoolconfig-1.1.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python tool configuration"
+HOMEPAGE="
+	https://pypi.org/project/pytoolconfig/
+	https://github.com/bageljrkhanofemus/pytoolconfig/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10} )
+"
+BDEPEND="
+	test? (
+		>=dev-python/sphinx-4.5.0[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.9[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 2629792da52d..7dd6ba57203c 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,11 +1,9 @@
-DIST pytools-2022.1.3.tar.gz 68522 BLAKE2B 49223fa3763e40e613708323e755f3cf4df2da4642110742fc9f4dd2275caa171e394023edd62f9cb254e475c9167b49cb9a0d10285d516fb282347c47a919f0 SHA512 d50c4e89714ad7190d2011c3d1c5e572f615c6e1b53d5e4457d784499b796c740f425c53799d74c3376a350eb15591aa6bda64c9458519c0d0aa6d7e98468b33
-DIST pytools-2022.1.4.tar.gz 68840 BLAKE2B 27205ec5e4af2f9193c5ca3e2ca33f8511f49105b7252d3fd95006e6eb6086c1650e39050be3cb469b2906ce946144d5c5d5c155380d3e8b62b0af85975cb736 SHA512 feb1d2f10175700d8fea1e531b9f0c78a57f4f1547976ac0c4d2e40b870cba95b99b7484ba2268fb36e62894d074856acfbfeb1219b23011cddb16cea597bb2c
-DIST pytools-2022.1.5.tar.gz 68877 BLAKE2B f25bf60d4bb927f3b1cfb6535704a0ea258240985b2e112baef3505286cc21d9917a4c80ceee04bd9efd916c455dd58c696f92c03d59b056804809a1df26e743 SHA512 85086529cc0d197d97378b9862b84fd2951bfaf1fa3af1d2ff2698d0e9053949c0eb060f9203237a99eb7c7a773ef9eb46e7f503120e607a38a077333faa7c02
-DIST pytools-2022.1.6.tar.gz 68918 BLAKE2B ddbc2b4956aa820c811dd04ea6297455837d388c6aae46b73a934086014aa58633777a2647ea1aa8c13d61f2aa95f36b836d1f98104a926cdfd12402c6456410 SHA512 9b2c2f9e08d71ee5b56e352fff36206276108125174cd977103e59255f0ce180dc9bd00a9ae0e88071b3e60019862c6e72613bc094bfe64d26fa694e7de6685d
-DIST pytools-2022.1.7.tar.gz 69154 BLAKE2B cba04b4033b1910ad0946f650a6e5ab94c0802375eb27575ce56a838a6c62c541f5ed6f80842b2b42c7001a6d1bbf0379aff559110e07862e24e60d60aa2a619 SHA512 9b96aded94604848e9e8784ecdd09aa1fd99a33005ac4840f9a33a5e059895193967060e9e9eb37281a8b8ebae5c9867671109137685492c03492efe672302db
-EBUILD pytools-2022.1.3-r1.ebuild 715 BLAKE2B d841c014a4adc7ce9ba86666dd49267e9198c368d34d24a9e169a4ce1dc206001b79d6e63153bca93a5e20f64e714b0863d65c07a71ae10360c64dcaa382ac1c SHA512 332c398b3b946c914dfadf8ce4b61cd5fa50d2e3d509bb56e772c7f9bb80d1c3424139f298e339124684a395ea9c95fa0982b50a8678154aa03aa8ba9c57fb96
-EBUILD pytools-2022.1.4.ebuild 716 BLAKE2B 2437c9fd401982fc48d04e6a8b33fc16a282983498c07665fa7a72a02e598586c717ceac2704b9061f17b72c3970114021108192a12403945974ce72139be76f SHA512 4ac55d43ad2037941ef66452c83a0ef250924df8140efaee611a4a6432695c571342b57970335e077b946969deb69c16898aa17682dbbe5f7bc805201d3d899c
-EBUILD pytools-2022.1.5.ebuild 722 BLAKE2B 24d816deffe8ee15c46fa68875bcfa18e2f41239cca38b6d71e14045e4b434bd47adfe67d3281cb3839f7aebc01799280d60b4806741868684902aa242c16193 SHA512 651456e131b6baa8786dd1128729750ff73ae1c73cf4a037d9fba8c80c7cc52abbb530d32e76c8db897d7081479a7ea956a0e2ec2328bbcfd39a309b57db854d
-EBUILD pytools-2022.1.6.ebuild 761 BLAKE2B ee42634d8354c40d4c527c7e4ecfa9fc7e435e87fafdf96283de1cb34ae9d3dba0a96f79392838f22f5de2b74dbb8d3f6a3a6a856303e72c41289e42749b3d11 SHA512 4d04f0ea1aa3631740cfce68c952bd06ee71e1ba1279f5bc93452eb750ce67ce853e26383aa2cb6a8cd9612ea880d554ba29c0f89d67651c7b3db866434294d5
-EBUILD pytools-2022.1.7.ebuild 761 BLAKE2B ee42634d8354c40d4c527c7e4ecfa9fc7e435e87fafdf96283de1cb34ae9d3dba0a96f79392838f22f5de2b74dbb8d3f6a3a6a856303e72c41289e42749b3d11 SHA512 4d04f0ea1aa3631740cfce68c952bd06ee71e1ba1279f5bc93452eb750ce67ce853e26383aa2cb6a8cd9612ea880d554ba29c0f89d67651c7b3db866434294d5
-MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
+DIST pytools-2022.1.10.tar.gz 70033 BLAKE2B bc7edcaa68110866e2be0f6dec9d712f0c9f4a5eb10c19778940b12fc93437ccae9fa4ebc8ef563fb6127a7348c12532b5d78104dd1c6ce301b2ec6951bb2609 SHA512 6c19ab1b765f036459f24a80b9034b9028b94f1d340bcecdbfa53f955f3240220be3c6c1dad9b4e4d367d1ca094622ee6bcd043b7ecdc85706f2467eed43b58d
+DIST pytools-2022.1.11.tar.gz 70285 BLAKE2B 65d88261aed8d96cef6a111e9ccf15d3f7c15a3bfd42d5cced7a6a13801b4d894b059f80aae5aa03e35ab23461e6e24341c7f1c9bbb23f4d130a448f52baabc9 SHA512 68c08320c15baa0d7e09baf13e311b4f4a354f59947a01753dad71fd239159d336186cf8bce66aa4b25c6404248d729b5de61ce29eca13e61fa6b48ad4fcc574
+DIST pytools-2022.1.12.tar.gz 70346 BLAKE2B 6f3fc1b55185e0ea7e680a089d66c7f64b9d3312ebf02c3fdba776f49d6156ccb83f5eef9139f1c6f9e17448f102c38661c2cd07e33277923f9379a017e72194 SHA512 66a4a60b26ee543a774322583a22105f5e886cb86956b4edb95ae361a5aa6cff28b1bcf6ad84b9e2f68c81bb11f5a18bd2e8d0335343550a6e9bca4cb0e9c0e8
+DIST pytools-2022.1.9.tar.gz 69731 BLAKE2B 12a6b4a299eef5713dbe226b65b3f1d7ef92a67fbef7bcbf166a09dff79ce6eb2ac7976aab9c54d5a1363d96dc61db928ca44c22de8b33637cc0f09f0b0dd347 SHA512 242b41010db581ad18bc96572bd8f25b15ff4228e1ea3ad8eca2016a36d6a2b55bcc570437821eb40605ab45f574b738f8364adbfd0cac28c2b12fb75e75dd14
+EBUILD pytools-2022.1.10.ebuild 866 BLAKE2B e3b3789fc882cb66abac9ddb48ea2253d6a04bd426c41f4385531bea63f9796957671624dd9a2b79d3191b3ed1731be1bc2d56344d9c1d9be935fc224d106953 SHA512 4388571c6bdcc6fd19016dee9fc2a4a30f9d109d6a6d1bb24afcc96c732408aefdf5f5fbd8fe2fe21cc79d94ab6549374f2db6b8607de49911480e60da921819
+EBUILD pytools-2022.1.11.ebuild 866 BLAKE2B e3b3789fc882cb66abac9ddb48ea2253d6a04bd426c41f4385531bea63f9796957671624dd9a2b79d3191b3ed1731be1bc2d56344d9c1d9be935fc224d106953 SHA512 4388571c6bdcc6fd19016dee9fc2a4a30f9d109d6a6d1bb24afcc96c732408aefdf5f5fbd8fe2fe21cc79d94ab6549374f2db6b8607de49911480e60da921819
+EBUILD pytools-2022.1.12.ebuild 866 BLAKE2B e3b3789fc882cb66abac9ddb48ea2253d6a04bd426c41f4385531bea63f9796957671624dd9a2b79d3191b3ed1731be1bc2d56344d9c1d9be935fc224d106953 SHA512 4388571c6bdcc6fd19016dee9fc2a4a30f9d109d6a6d1bb24afcc96c732408aefdf5f5fbd8fe2fe21cc79d94ab6549374f2db6b8607de49911480e60da921819
+EBUILD pytools-2022.1.9.ebuild 865 BLAKE2B b6dcf442f87140b46a73942ed18b92e371946396bd62d3412da0aebe7dc1b1b79e05c5ef12f46fcd777370fd8ecf86b9be216d181246413af9709742427d9b73 SHA512 675a748d0a7fe5219276f825480b2a4a35c0abec20d22b3cd33718d0eb3cfba8717157c204bfa87940f5b98591002d59911d969dedba6f86f929d7e0861d9bfd
+MISC metadata.xml 496 BLAKE2B d0067ed5726907ed3d635fc88dc33722335e7c853ee4a5a1c727faecdf6a78ab7de4261fe40c5c903908e1f2b8eb597ff3c014044fc7ea02bc357254d544da64 SHA512 c6b546564e9c54bccc55f83310ff194192be0673bfe552e18e29a82e87d2caf4c0d51e42d1675cf5b8f6dff1fa1410676f71c9c0c56273ba6efc4efc608c43d9
diff --git a/dev-python/pytools/metadata.xml b/dev-python/pytools/metadata.xml
index 050c3f2146be..7a972bc64a8f 100644
--- a/dev-python/pytools/metadata.xml
+++ b/dev-python/pytools/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytools</remote-id>
diff --git a/dev-python/pytools/pytools-2022.1.10.ebuild b/dev-python/pytools/pytools-2022.1.10.ebuild
new file mode 100644
index 000000000000..099c6522be45
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.11.ebuild b/dev-python/pytools/pytools-2022.1.11.ebuild
new file mode 100644
index 000000000000..099c6522be45
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.12.ebuild b/dev-python/pytools/pytools-2022.1.12.ebuild
new file mode 100644
index 000000000000..099c6522be45
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.3-r1.ebuild b/dev-python/pytools/pytools-2022.1.3-r1.ebuild
deleted file mode 100644
index 58f62d1e8b8f..000000000000
--- a/dev-python/pytools/pytools-2022.1.3-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.4.ebuild b/dev-python/pytools/pytools-2022.1.4.ebuild
deleted file mode 100644
index c12bd0efdfc5..000000000000
--- a/dev-python/pytools/pytools-2022.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.5.ebuild b/dev-python/pytools/pytools-2022.1.5.ebuild
deleted file mode 100644
index 3fb4bfc6e6cf..000000000000
--- a/dev-python/pytools/pytools-2022.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.6.ebuild b/dev-python/pytools/pytools-2022.1.6.ebuild
deleted file mode 100644
index acc0a57c8b2d..000000000000
--- a/dev-python/pytools/pytools-2022.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.7.ebuild b/dev-python/pytools/pytools-2022.1.7.ebuild
deleted file mode 100644
index acc0a57c8b2d..000000000000
--- a/dev-python/pytools/pytools-2022.1.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2022.1.9.ebuild b/dev-python/pytools/pytools-2022.1.9.ebuild
new file mode 100644
index 000000000000..2b7be207348c
--- /dev/null
+++ b/dev-python/pytools/pytools-2022.1.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+
+# NB: numpy is now an "extra" (optional) dep -- we can remove it from
+# RDEPEND If revdeps don't need it
+RDEPEND="
+	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index e06da098f14d..c56a7f3c9848 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,3 +1,3 @@
 DIST pytrie-0.4.0.tar.gz 95139 BLAKE2B de57b4c36429c3e2d9ec7cb89e6515fd0a131e890bbfec17797a9a03b932ca2370cf283c67b4a99bb742b275c6f005789af410b875e857d30e6ba9e959403899 SHA512 c951568774c1e35d2b2bd5a52e5368da5ef2ffc83476d60882aa842debcd53c5eb0ed19f497a09f78c6a736ffba57702eda3aa0f3afa74dd0d1e770c17885c74
-EBUILD pytrie-0.4.0.ebuild 630 BLAKE2B d99690cc84daf9b6ab621e336cc615df014c158ea9e682b07f4441f5c80317f2059a3d984fdbbc8080162c8609714a737726eda01fcb7a10996db2281e74c1f4 SHA512 0efbbc9393086279d30da27aec4dae28a12c96b98e5821fc3b81d25d03ffd7728e6013d726087a185eb575d37c5e1710dd40605d81751740f4a787ed00b3574c
+EBUILD pytrie-0.4.0-r1.ebuild 667 BLAKE2B c151cb6fea5f5cf00f173835e86e270fa7fd23c848c21568517aace6f5c45eb77171fbc217ddc5037b6799e6fbcc04af9f8d63f47eb21f1e86fc8773f8ee92d9 SHA512 6745f960348ec04b40749aa3b6d9c93b76ebb2ed5d2f130a25a07ec9019306269482dd2bebbbed170c855baa073d3508f6ea9f83e98bd3aebfd82b68c6a29192
 MISC metadata.xml 854 BLAKE2B a7fa6b4a467c61e58349618c846c9d5ffc2ee32d81ff7a9cf44d429e5fbf61c84770bdb3ee3852ec3b62a0203b8db21e1b59ad83573322f2d31922ac87dce44d SHA512 c32decf2d307db809e549b39565ccd501f7bae584a1a2ac1993b5377610aefbb4df95a813be01939f5c301e6731d049a5072ca4a83b673ef5a3fa2df230ee652
diff --git a/dev-python/pytrie/pytrie-0.4.0-r1.ebuild b/dev-python/pytrie/pytrie-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..f18d53d95962
--- /dev/null
+++ b/dev-python/pytrie/pytrie-0.4.0-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="PyTrie"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="A pure Python implementation of the trie data structure"
+HOMEPAGE="
+	https://github.com/gsakkis/pytrie/
+	https://pypi.org/project/PyTrie/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytrie/pytrie-0.4.0.ebuild b/dev-python/pytrie/pytrie-0.4.0.ebuild
deleted file mode 100644
index 83a96afb25ee..000000000000
--- a/dev-python/pytrie/pytrie-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-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_PN="PyTrie"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A pure Python implementation of the trie data structure"
-HOMEPAGE="https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/pytz_deprecation_shim/Manifest b/dev-python/pytz_deprecation_shim/Manifest
index 06af15ed692c..46287ad3460f 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-r2.ebuild 1079 BLAKE2B 72c57fc3776ac7b23d758d67c22f13bbe743a816cdd890395d1a77d2d9b24423969ae8e7ff93f569d0f9c0c59a0d361e4d37a3236f4f53d2d5a3a085f350dd70 SHA512 3c3d2a3aba12044cec8c840438a5e04d766a330bda45483daffff110cbede23846b67857e96c42e0e8ff3015482a871179c698e512c728c47fa40f96a77add5e
+EBUILD pytz_deprecation_shim-0.1.0_p0-r2.ebuild 1035 BLAKE2B c9e0c61025e2349705d3335f87fa312e5c106c9c2e6937d7edb0365ea095c63d9ac5bdfa1971eb0fc18073983f27af8968fc285473f13be1e998d8cf17b46642 SHA512 494a4199e164ad16bae0715852619bda5ff093218414ca299b2b35e9e7b911f80b03a90c88cf101cc8d2e64f712dfa013dbfcb68e69f1f5030bf80570a83ac39
 MISC metadata.xml 419 BLAKE2B 2840524ff112ed60eeca8162297a1d4c0c3ecb47a5abaa440d237832f90a823789f07400200d2a0d31b25f6d2484a85d448549f32ccd7b4a1d755ff263c7df7b SHA512 3c75ed2c66ae13d4f67d50f07eb5e17fea8d4f8a3252d3a4d52ebe0c688c9253c61dc065ac6cda6120909e625fc1b6eb74a6f2d7dfc8cf25c8aed075a4f75bbc
diff --git a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
index 4067747deaa4..8d310bf3718f 100644
--- a/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
+++ b/dev-python/pytz_deprecation_shim/pytz_deprecation_shim-0.1.0_p0-r2.ebuild
@@ -4,15 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 MY_P=${P/_p/.post}
 
 DESCRIPTION="Shims to make deprecation of pytz easier"
-HOMEPAGE="https://pypi.org/project/pytz-deprecation-shim/ https://github.com/pganssle/pytz-deprecation-shim"
+HOMEPAGE="
+	https://github.com/pganssle/pytz-deprecation-shim/
+	https://pypi.org/project/pytz-deprecation-shim/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -21,14 +25,13 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s3
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
+	' 3.8)
 	sys-libs/timezone-data
 "
 BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index dbf51f5c52a2..7095f8392f19 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,4 @@
 DIST pyu2f-0.1.5.tar.gz 39008 BLAKE2B 475a47ad99bfbe8f85ebe246eb7c394d0855732fc6bf0dd887bb32ad02bacb1f34dadc5506d330add64bca5b353824e773d2b1e971e78d9cf9dc2438d12b4f62 SHA512 ddb15bb1d917117a2b19ad169ac0f8b8c7667d7ef8ee4c266cc30326429bb3627d41d84dc390ce0036d0b0f110e1d2da47d06d4e4d03a8be98cedb5ea3112246
+EBUILD pyu2f-0.1.5-r1.ebuild 704 BLAKE2B ca12e97d20077a7d2f35e8789c017e9ebe7d775bef89761800114772706626f6f91db3d8bf096136ccd89c1d509d9405369f697893eea4390ba206669fa658b1 SHA512 9b630b19deb3ff99fbc056ddf40e2bd8ae7c0e04a3ffe8e49a69aef32e5796e3157b72efd90c4f9999f48bafefd16121d8d9b4431837efcae687b0cc83017f43
 EBUILD pyu2f-0.1.5.ebuild 670 BLAKE2B 1a0dc257926db4e9958138022d0404ae8866a4c3313bd26eec9cc9656d3208d3c9283bf0faa953c7e9e36f42121dd842e4aa3f57a013c51be3a8783cdac41410 SHA512 5e2b11b8d4a24e5b526e9e52ace15de60e5739c74e8ac22c7ca2c26acc7a7b7defc6dbfd92edea3f344352398d6aa28b51a96593c66379796ec67c9c2d48e7a1
 MISC metadata.xml 365 BLAKE2B a79d187c19602699fa11ff064ca991aa5ceefeeaab5f8b2bb1c9888ead8e23dd3bd4566b17a8956390c0db1f04e4d4fd601a1a667491aed4c30959d312efef49 SHA512 03eae2c778e036e9ef06f25d2ff97ce1865a7b44edb32f59b751121e303a7774c78c258cce889fa4af1932f51abdedf282137c8ba573f5dce1a00066636463a9
diff --git a/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..10896fda669f
--- /dev/null
+++ b/dev-python/pyu2f/pyu2f-0.1.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python based U2F host library"
+HOMEPAGE="https://github.com/google/pyu2f"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 3791207fb763..dee6511d7e13 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,3 +1,3 @@
 DIST PyVirtualDisplay-3.0.tar.gz 41134 BLAKE2B f80faa66b6b55ac1c48a2e249e48e52f63327a1acac2020d157d0e6b1e8ff3d46ebe027ff59a3356321688a2c815e2e34552aa9de2355e9e427cd82032eb348a SHA512 2ccce9ca6f36dddb15a992f2d4961f203d755ac4df1944f67bfab906061ae30c78db5d1cb050feddb45e28bbe874b250ce7ef1886cc52239fc0a784dc3be1198
-EBUILD pyvirtualdisplay-3.0.ebuild 1023 BLAKE2B 6e453b2dd9c7276926644298bbca218899eb617d287567880ef0058f07f608ea28be0a1cf6eaf46569471c067ca984d51c92340a1e06ad85345c7d86801d6fb6 SHA512 14c866caaa5a724df00b1e2538cfe79adf8135a4e1e68df30759a592b41ac44ea2ad9adec3bfa16291b4c0db7e416c1287f3a9b4ee61c132e46e744718275659
+EBUILD pyvirtualdisplay-3.0.ebuild 1023 BLAKE2B 8f1d868e69d8121aaf8eafb08f7ffa32c7f922f58ff94c608aff71dba0cd383979c8ef493b79218197a6d111e40e7168f0623e85e1fa5a5850129d11f05e1e6a SHA512 87c603ab271d9e60b88b9cc58e247dee68fa8e678f641e0822c07f5cfb3836d4f768ec7ce90bdcdf1ece306d72a781a5999e13ed869512baeda9d0a8a59f566b
 MISC metadata.xml 525 BLAKE2B 2c11e097aaa0db0d64946dd2feefaa78675bac0109666fba72d8e29169c8639930dd56a7338fec96b4ef500f7aac2ec3097ae0aa6e67945e0bcc8c95a89b5812 SHA512 18c2811672dbf7ddab4230074108a43c8206066478c8aa768269ea58d6a3840ad1a858948b192eaadb6e720792d2c0c57a9e3484c2b1e22080b7991fb2b32f4f
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
index f6ca624bd1d4..4c4702f415dd 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index 71b44d961d82..57abdf6159a6 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,7 +1,3 @@
-DIST PyWavelets-1.1.1.tar.gz 4578294 BLAKE2B 1d3c9118739f831a3a198ab4461daa337b7952e16693d8ab15498ac26897a813d0adc02ae339a6a3ebfd3810db13ed297714c36ba67af559835af58c2ab243e1 SHA512 3e70625dad27822165e79b7d240c34072684ba340e8d314a026d2e47e81b04945d9ed9c6a5f0730eab285d3d5ebb1b311aaec5d6d06bced1eea80000bef5e787
-DIST PyWavelets-1.2.0.tar.gz 4590716 BLAKE2B f715381b9cd2b00aae335e11485b6f13a529e9ca440d8d96ffafe49dcedcb389686b4f2afecbf1c956c621cb709c5910a22900162534acb1e935f990d8a89c38 SHA512 45c3b6cbe4e646d0abc1c0cec4baacb6b7e780e8a539a57c31e1811ec88c6c53ba19718c390b62e4c8d541f5517f8d3be8a3346d4a907de0dff4f4ef173e3bb4
 DIST PyWavelets-1.3.0.tar.gz 4585209 BLAKE2B 0835fe2ea375eb6036862f137569f77c9723203c581695688f73704e9f21e7dd4034e535b67bcf2b6e2819d2ebc69e6336b8d1ea16702412ce637f914a830b3c SHA512 57eaf4bd5d92f40658208a14c75f58dd7a523f702e209a1383b01e2f5a6d62b15d498126151819060bd2931aea6e280fd5c2dea1e22c21953c16a60d9f184c6f
-EBUILD pywavelets-1.1.1.ebuild 991 BLAKE2B 3d2531a27aa3e1a0e7749cb32ac0fcebfdd39c8d064af9259a215ca0ec27637386389be1010367ee056e05e5022ae17df4b8e68bee5da1b1f70be05dbd4246c4 SHA512 6c6cfe37540133f2419f92914ba60e25d47237dea33e729de5520953364e1e53f35eb0fa189efd7752859cba58ba9b8c59276e4a04a4396fdcf047a619b95885
-EBUILD pywavelets-1.2.0.ebuild 1006 BLAKE2B c6264e15f9c236ecd003837a47706660782dc24fe32e8e5298b4ca30f0ff626b5f4b79c89abaa872f0c59bc50faf3cf54971262fcfd99f18b2f0d9db6c166a79 SHA512 f866697b8bd6361ae32914a5fffef55ffd8fdf3fa069b24313844042b63a253989e47d40f61819cf5634bec752b31c33108c87a3a8f19d8cff22880e54898a9c
 EBUILD pywavelets-1.3.0.ebuild 1002 BLAKE2B f01b34d40c8bf1212b306156aefcc0f604b78b08bf38a03e4fc9cb5bf0868eb51afc0511a5c68607aacc31b53dfed00f8b76303aaf4c46202eefaa20ba70b519 SHA512 867b620507100782b11bceb28ab57c559f016b35814d8dbf30b2deb881970b672c47eb5cf708136545fba9d2f541804e7ac92ede55bc3e8fc011c74f777bc0ae
 MISC metadata.xml 805 BLAKE2B ed7a8e670ccab1e38e43540cf439a3488e7684d2a2951f3bc7cd2eca5d294bd2e0ed3fd01f44c674297c15aae4ce4d07536882669692dfdeb279e460f6b0e6f4 SHA512 eee1c53a3b3c9579ff6960b763825001fd9aca8da7720dbd36658a2967c3b6c4bd77892449f15677a84b983b58811c831023bc1c152bc8f84f44412d49178199
diff --git a/dev-python/pywavelets/pywavelets-1.1.1.ebuild b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
deleted file mode 100644
index 1852f244e8be..000000000000
--- a/dev-python/pywavelets/pywavelets-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/pyw/PyW}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Discrete Wavelet Transforms in Python"
-HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/
-	https://github.com/PyWavelets/pywt"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
-	dev-python/numpydoc
-
-python_test() {
-	epytest --pyargs ${BUILD_DIR}"/lib"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docinto examples
-		dodoc -r demo
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pywavelets/pywavelets-1.2.0.ebuild b/dev-python/pywavelets/pywavelets-1.2.0.ebuild
deleted file mode 100644
index 41d21c3054dc..000000000000
--- a/dev-python/pywavelets/pywavelets-1.2.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
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PN="${PN/pyw/PyW}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Discrete Wavelet Transforms in Python"
-HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/
-	https://github.com/PyWavelets/pywt"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.3[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc/source \
-	dev-python/numpydoc
-
-python_test() {
-	epytest --pyargs ${BUILD_DIR}"/lib"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		docinto examples
-		dodoc -r demo
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pywinrm/Manifest b/dev-python/pywinrm/Manifest
index 439a3d897804..07fed9d43787 100644
--- a/dev-python/pywinrm/Manifest
+++ b/dev-python/pywinrm/Manifest
@@ -1,5 +1,3 @@
-DIST pywinrm-0.4.2.tar.gz 37842 BLAKE2B cf9eb683b77f9a2cc2da9343ebcbbd27404024aea23784721fbea0bce4f8a2359c3647e81bb5fce7f9317bcd8d84cef2c5ec76b17d15153348e66897a6fe1319 SHA512 c5ff02606d6c887ef199cf814d931575728947bbbbff3c2ae7e52bed355408df06ea9351a4ae0b47a947a05ca3476054e501b3abcfca5a36643ef4cd6855a0e4
 DIST pywinrm-0.4.3.tar.gz 38356 BLAKE2B f998b9b56a60bf9d56b871e5fa8f59a4c0ec510b7a0a626b543b10e790596455797109eb2f929ff3224915ba8f6d1444843d735a67b9e2657fc6f705447dd056 SHA512 f6da28fc1c53a4c000539583ef5e6bdc108a2396f161a416cc151a8591478a6c7a577c5733374339fe3612a5a85046fb9cd44ca38f502aecd56b2723aae16943
-EBUILD pywinrm-0.4.2-r1.ebuild 815 BLAKE2B 71ff99fbf494e38904c73c61083aa6aa86eec82a0a820f6e3300ecbf2b4cd3f74944eb0314b1e1e9704e14cd406f53cbd6a798f9c6f9a28dfb0f323da737fe4b SHA512 9bcb06c863036554a8b1efc2dede5461c693b6bd6fcc19e870dd8a953e346bc1c12f7b9bbece3830eef91e90c44af221c8b12f39eaac5a02af2d6a59148c6838
 EBUILD pywinrm-0.4.3.ebuild 815 BLAKE2B 71ff99fbf494e38904c73c61083aa6aa86eec82a0a820f6e3300ecbf2b4cd3f74944eb0314b1e1e9704e14cd406f53cbd6a798f9c6f9a28dfb0f323da737fe4b SHA512 9bcb06c863036554a8b1efc2dede5461c693b6bd6fcc19e870dd8a953e346bc1c12f7b9bbece3830eef91e90c44af221c8b12f39eaac5a02af2d6a59148c6838
 MISC metadata.xml 393 BLAKE2B c3656e83163c2e04cb1e313d4aefbaefa6ced59e186495763decafcc2a6ecbd57f55afddb8cf23f6dec82327821951ee086b5461351cd439818847f5e8eed1f5 SHA512 041088b77f748863dd04f869d6ddc17188e25cb78434525ec17e25c7d0530002d1321aa35f7a9c773646873281ecbf09a7d8312af5ce6a59a1a55cacc7106e43
diff --git a/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild b/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild
deleted file mode 100644
index b5ab98e4499c..000000000000
--- a/dev-python/pywinrm/pywinrm-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Windows Remote Management (WinRM) service"
-HOMEPAGE="https://github.com/diyan/pywinrm/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="kerberos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-ntlm[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	kerberos? (
-		<dev-python/pykerberos-2.0.0[${PYTHON_USEDEP}]
-		dev-python/requests-credssp[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 68d379abb3a5..83a858368a88 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,5 +1,5 @@
 AUX pyx-0.14.1-unicode-latex.patch 600 BLAKE2B d7e2b4804731372b8b149b8e50ed6163297e60548c479aad8d796df4630f87e3df7e28379c6e88158e135f1b2e1eddcc712828efdd3fdcae501681bdf5e602f0 SHA512 f2a6af35aeddcd10d936a9ced93f708606bccb9f249bb45c6cf86111744f7efad9c08e9ce9e41d63b04345069e973e2ae69df5a2b004535bb0fac09dbee3dc90
 DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444acbc3222fde880ba93ee5186c99fc12afa8df2c790bdacbcd6e5ff4ab00e697d8317a9a6ae3039b8b2f02cf7774a18ca533 SHA512 e28e3996284c3f3e423e2b6957cddea71980bcb781d4180894e08f37a7ecce9c6021917329d6d433dcba792cbabb15c7cd503076e616ba5189193a5c554374ca
-DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
-EBUILD pyx-0.15.ebuild 2101 BLAKE2B 96ae821b8ed0b2decdd83d8e161acfd1042eede9ae5b2a6942ce97d4429df932c41614afe454d7f4b12ce21201e5a49d2954e570c846345036b0680bbbf62cd2 SHA512 f83c165ad41c470659b3d60de980cb626d5dee57428e64602ee6c06c55716c4a00082a195b19161e8094023d27022c5a63b93ff34e298a484661a27775ba5532
-MISC metadata.xml 698 BLAKE2B 4932dd660d490e02e5129236ade8f54e6b62da7a785cde853a7d85b6b8686da100a3d1ea6f515fb87cdde040a2affbfb0a8034038c7e4b0a9b384576afc134b4 SHA512 002d4f9eec26d792ff59fe4772344c573dbd2615d9dd09ab3fb6109948a9ae33858db8bb6b2b79970bd5a19326f6bddc1e3969d656f684c7cddb7fb581c54ecd
+DIST pyx-0.15_p1.tar.bz2 746171 BLAKE2B 5b2325c7bb279e4f6425f0ba7f3808b7e540c7455738c617efdf1ad9d383a466d1b67b90e20e0bdbfa7d2fc56f1c80a4ae2badc5ef78f63ec410370d516f4ab3 SHA512 97809a38029011735d2cdea8f7e8326890d748d4159f44379f89c396b7ea4d2a026ca3370bb069974b07215da91a47b9334d8dd1f7db954c2dd272122bde8ff0
+EBUILD pyx-0.15_p1.ebuild 2116 BLAKE2B 7ca45986128d0f817b8f14529fa702dbced71aafb92dc3e72123ebb6951dc5de8db55c53381a23984847da82ca949e2ca6e27b079dea53881bd871e9ecb8bbb1 SHA512 40d5e3d0a5199fa254eb90796b8debf4ec0818b52fbb741b68afd4c70ddfb797466ed982bfa1e7472e5bb4a1bb467eac81821482390b81d3fbd7e6666996682d
+MISC metadata.xml 805 BLAKE2B f8d20858aeafdb2ccaee5dfc3875e1ca206b2e38c566b71db723754ccde1c00b9db1e8b1da758214692e2c87f152ae1df94ecef99fb8b4ff97444b6ae9551e79 SHA512 44f7bf6e5ec2e9314fdd7171971c7debd79349732ce6c3aeff6e4b6d05e253a83c52c19fd4a41ac6ae59189cc95946abf90154bdfa9ddb92faa587cb897e943f
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index 142b34083be4..59b5a28379eb 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/pyx/pyx-0.15.ebuild b/dev-python/pyx/pyx-0.15.ebuild
deleted file mode 100644
index c5277d7a5fda..000000000000
--- a/dev-python/pyx/pyx-0.15.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="
-	https://github.com/pyx-project/pyx
-	https://pyx-project.org/
-	https://pypi.org/project/PyX/"
-SRC_URI="https://github.com/pyx-project/pyx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-	test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/tex-base
-	dev-texlive/texlive-basic"
-
-BDEPEND="${RDEPEND}
-	doc? (
-		virtual/latex-base
-		$(python_gen_any_dep '
-			dev-python/sphinx[latex,${PYTHON_USEDEP}]
-			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/pyx-0.14.1-unicode-latex.patch )
-
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[latex,${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]"
-}
-
-src_unpack() {
-	unpack "${P}.gh.tar.gz"
-
-	if use test; then
-		mkdir "${S}"/test/svg/suite || die
-		cd "${S}"/test/svg/suite || die
-		unpack W3C_SVG_11_TestSuite.tar.gz
-	fi
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-	# stop test suite from downloading files
-	sed -i \
-		-e '/suite:/,$d' test/svg/Makefile || die
-	distutils-r1_src_prepare
-}
-
-python_compile_all() {
-	if use doc; then
-		local -x VARTEXFONTS="${T}"/fonts
-		emake -C "${S}"/manual latexpdf
-		emake -C "${S}"/faq latexpdf
-	fi
-}
-
-python_test() {
-	emake -C test
-}
-
-python_install_all() {
-	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyx/pyx-0.15_p1.ebuild b/dev-python/pyx/pyx-0.15_p1.ebuild
new file mode 100644
index 000000000000..d2a3f69e6665
--- /dev/null
+++ b/dev-python/pyx/pyx-0.15_p1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+#DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="
+	https://github.com/pyx-project/pyx
+	https://pyx-project.org/
+	https://pypi.org/project/PyX/"
+# git 0f28343
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2
+	test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	virtual/tex-base
+	virtual/latex-base
+	dev-texlive/texlive-basic"
+
+BDEPEND="${RDEPEND}
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/sphinx[latex,${PYTHON_USEDEP}]
+			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/pyx-0.14.1-unicode-latex.patch )
+
+python_check_deps() {
+	use doc || return 0
+	has_version "dev-python/sphinx[latex,${PYTHON_USEDEP}]" &&
+	has_version "dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]"
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+
+	if use test; then
+		mkdir "${S}"/test/svg/suite || die
+		cd "${S}"/test/svg/suite || die
+		unpack W3C_SVG_11_TestSuite.tar.gz
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+	# stop test suite from downloading files
+	sed -i \
+		-e '/suite:/,$d' test/svg/Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	if use doc; then
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C "${S}"/manual latexpdf
+		emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_test() {
+	emake -C test
+}
+
+python_install_all() {
+	use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index 471ca1c1737b..05f9fd2812c9 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
 EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 543 BLAKE2B dbb6d96fa9e0d67483603cdea1e148f3ea0da215afb7912fa3ad6c0d72162b06414a2b5607ee465761795fd7c2779df0d413afa8bf3827b5528273e0a771865a SHA512 def118bcf9987323851d3e51a2d94c5b612fc42cc771b1121dac9cba59f7584d59c781082b39ce9113cb510debc366fed710213991fd40c27d42de7546bc54fe
-MISC metadata.xml 415 BLAKE2B 557fe5fa541c63212ac509fc5732f1521f73ee2f527491180883905ee866d368cb04cb4f47910c8c9b9ff9fa274fea98df8d892dede8d444753bb9d236c97688 SHA512 3e8d61f69f7ee3ad2239fa05ba5356335508b43868d8bb95694cc2c4660d38aa7fef05165aaef86655976370039439dac840756d3b13e77df7a694b678cac1af
+MISC metadata.xml 516 BLAKE2B e5677cda6ad803bdc75b1958e40bfcf4ca2134400d4b93f821e217977d441b8ed09872699b512897eddaefb3b5676e5bbbe3f2199542940ed5010fc58e048152 SHA512 8d724bfe477be076c126ceae44f1b94b12d24fa0bdfc62ba95783ef1ab8d1e46f421b533cfd5184433ff876230c3c09c77516a9ac9248b4a683b977f07733f98
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 8167ee58a136..0fd668f7517e 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
 		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index 05d8f3ef901e..4ff95848b0cd 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,3 @@
-DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
-EBUILD pyxdg-0.27.ebuild 608 BLAKE2B b4034adaac03c8c863cdc804419ea70191b1d22abdd2334807197f5a9cdc65f81c19836d1b2e53096d574e2d6551f10bb188042b819f4ee867e3075fec547f6b SHA512 56668c034883bd16594f77140481547abb479ea1dce12746e7a19c1f96a6311b0e389fb6ee320b7388d8249df6be6dfd6ba21005c41bbf2e05b2b737254c8fee
-MISC metadata.xml 513 BLAKE2B f56ae8a6b049c3d85540d02e8aafa1e1b1a05ceaa94e85a90f652728e66ce240d81b2ccdf1779aee5faee03d9b2a98d1b2478121db8d94df77f8eebebb5f78ec SHA512 1db823b0aecdfd3c7a878c7ac19ae3e5208bc6560d6ad0c92e2e4c6fec40046ab7bc4b2e60733098efd8e0a65b5e25da62fe672cfb1dd4833344f5a6a18e8189
+DIST pyxdg-rel-0.28.gh.tar.gz 75755 BLAKE2B ba6d0dd956b13b7722d48f3d8a4ffa73b17efd6b4db3e73f521de72338dfacf11301449445bc911657f45de1c849c6425a24e5523f67116d96c7f38aa7bf320b SHA512 e1a7c8675afa109495e3530d9acc59a17368723b03ff66ee502133fd383bbe11c9908d93b18fdad3b589d47225ff8bf6bb8cacc800b1c1f39059e1178dafc1b5
+EBUILD pyxdg-0.28.ebuild 693 BLAKE2B 7df93f2f8736ea99eee119054a0b769c5b03c2d08b0f8ccb9ebee421b8816eb7cf163fca34a64085a98e28a331fb53fbf10fc4710317a5a9f6ca5c901aa3a99f SHA512 498ea9de6dfead7f87f960e37c381e3523a1fbf71df16cc5048c0f695b42d534fcbbeccb3b6c609a55067f23022d09f8b02b7423bb44c5e2a21d8a1055115ba4
+MISC metadata.xml 512 BLAKE2B e38fd5500a695c43f16e4e4a2486565fa2fa6cd22bce3ccce7a4d1870e1f831fef84dbacf53b7a7535328230d5861f263fe720ff8578a86b21ae0cf80efc78ad SHA512 6503d2ab184a0a8510f11ad262edc435500e29ec6cd3bc62c67501b6c44a2e5a1207cb34c686e3d3d92e7838a9e03cca5cf69c699b4c97c5470b8cc9b2fc65c9
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index 04ac42b9b8d2..7bcc4753878b 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
+    <doc lang="en">https://pyxdg.readthedocs.io/en/latest/</doc>
     <bugs-to>https://bugs.freedesktop.org/</bugs-to>
     <remote-id type="pypi">pyxdg</remote-id>
     <remote-id type="launchpad">pyxdg</remote-id>
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
deleted file mode 100644
index 410396213b73..000000000000
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-rel-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
-SRC_URI="https://github.com/takluyver/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/pyxdg/pyxdg-0.28.ebuild b/dev-python/pyxdg/pyxdg-0.28.ebuild
new file mode 100644
index 000000000000..341a02c6ec8d
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.28.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_P="${PN}-rel-${PV}"
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="
+	https://freedesktop.org/wiki/Software/pyxdg/
+	https://cgit.freedesktop.org/xdg/pyxdg/
+	https://pypi.org/project/pyxdg/
+"
+SRC_URI="
+	https://github.com/takluyver/pyxdg/archive/rel-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 992637cc459e..3841f77c3369 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,3 @@
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
-EBUILD pyyaml-6.0-r1.ebuild 1014 BLAKE2B 728b2e2c697741bde82374965aaee6341f9f0e5b767c13b1e014cbe303f9623f74b27cf43207d2382e2b2b023af0d737403981bca761df27fb33c2b2d5d9fbe4 SHA512 667c7d30921f2e4b21cd1b042fc3a4fb9835670dc6b855009bb51b01c0c320b87557d9e5163ad44624ae997c76129ce115aa4bf4fcb62fb90fe32039659e349b
-EBUILD pyyaml-6.0.ebuild 1323 BLAKE2B 073f228376d18a696d7503b661b6b088a39ef5d3511505ae6f18bdbdb122b72dbddee3c4a265d80a9750ac941b1941c2f7edf6b70cf6308e376a5851ec5acfb8 SHA512 950e2cd60852e0f3ef9bb9bc11dd2f63b815b5a26c8a5feed4b2a11080a91c1ec82c3b6436a04cc59ad0970fbbfaa04e6e880bed21035371b7c29b242c9835b0
+EBUILD pyyaml-6.0-r1.ebuild 1006 BLAKE2B 58ed4048f00e3d83ce1da31f62f5ab5d3565915abc9754ac0f12c79cbf77038a0a0a5e8fe6fa594281d1473b69be6553bcdeb1bad984d1124863e23d03f6bcfa SHA512 e956d2994c41871f0fbe3fab47e8516cbaf3ce85abc235d829a86422da03f1f9235978cc2692a80f94c5f81d3ab2a4313b1dfb3f8e12ebfc26af6cd0b5e11cdf
 MISC metadata.xml 426 BLAKE2B 6216e38c3e79e811aced6c777b49779953abf4f1b0a1185947f6a6fdc851fdf4cc973092024a6cb2d76bf06863feb49742c7a6892a8761b48a5e74902757a610 SHA512 f549b70fcf1588625fcc2bc33ad0c41faa267ad5bb84d564f5502dee1ad2340a663d1a2b92cf9fdeed827a5f7cebdbe76d59166e89de6d03e7933141029c051d
diff --git a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
index b9fb87af60eb..da35f2f7a319 100644
--- a/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-6.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/pyyaml/pyyaml-6.0.ebuild b/dev-python/pyyaml/pyyaml-6.0.ebuild
deleted file mode 100644
index 75fc788295b0..000000000000
--- a/dev-python/pyyaml/pyyaml-6.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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="YAML parser and emitter for Python"
-HOMEPAGE="
-	https://pyyaml.org/wiki/PyYAML
-	https://pypi.org/project/PyYAML/
-	https://github.com/yaml/pyyaml/"
-SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="examples"
-
-RDEPEND="dev-libs/libyaml:="
-DEPEND="${RDEPEND}"
-# bundled distutils is broken w/ pypy3 in setuptools < 58
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-58.2.0[${PYTHON_USEDEP}]
-	' pypy3)
-"
-
-distutils_enable_tests setup.py
-
-src_configure() {
-	export PYYAML_FORCE_CYTHON=1
-	DISTUTILS_ARGS=(
-		# --without-libyaml doesn't disable trying to use libyaml
-		# and results in automagic dep; --with-libyaml guarantees that
-		# the build fails if the C extension fails to build
-		--with-libyaml
-	)
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}
-	fi
-}
diff --git a/dev-python/pyyaml_env_tag/Manifest b/dev-python/pyyaml_env_tag/Manifest
index 37f51454ca40..7d2a9d7930fb 100644
--- a/dev-python/pyyaml_env_tag/Manifest
+++ b/dev-python/pyyaml_env_tag/Manifest
@@ -1,3 +1,3 @@
 DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
-EBUILD pyyaml_env_tag-0.1-r1.ebuild 517 BLAKE2B 5fbb33851b48779a6924deaf4400a363f11ae287fba4cc60082ef368ccb4f259a7e31eeeddb2a13d0de4bcf07450d1086736bf477eb675eb5f747054614ac12c SHA512 99d8d68a8cef130b0cfd1e65bf0f59d8931cacc1abadd49dc52fa3ce50e2caf75b8e8133b0de3c5557da63e18684e0ba2bf5a26214e4d6df3eddf8eabca0e82a
+EBUILD pyyaml_env_tag-0.1-r1.ebuild 517 BLAKE2B cc85514fad8935dbf3a7cfa023cee7f1e71acec0fa846bba289e9d11ebe0418071093b01f3084bfd6b09726a60225eeab6cbf3a00379413f836c4736a24694ad SHA512 91bfa4d5899a5ddb7e8cec98615dd550a24d77460536b7018fab8d29b10d1fc3f18d65935ff9c92094523b939159402eb7631bf79316309e3a932c99b27d1ff3
 MISC metadata.xml 421 BLAKE2B 944e5cd6817404e00303896bf56c698f37fbf90843d454d087ab929657cbf26a66f287aed9649044bbbaf70e265b78ba8612daa18adc2136f6e4e5e209e3e6e7 SHA512 c2a508a66f08dc1fb6532ca60c49d2053500e592eccbe0d808f6107130fed73348edf9399f3e880dc8d5969f8a42b55492eec03cb4e85de009f62e5575e86b76
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
index a1ba11271452..581d1f6eac39 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 4366a927c9e3..c29b2248335c 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1,5 +1,3 @@
-DIST pyzbar-0.1.8.tar.gz 41562 BLAKE2B 3aafe745025ba542c3943956f635ba2737f78683447402d3c166217d1c18ba6d9debb170e04aacd611b53401cabc62dd0533ec72cef82ddcd454a1d6c026c3c1 SHA512 e186c7a2f29ec107f66b87a2901e128291747ef7a2159675f3170aef2a3a4b1f4cb4319da830d577c986e20abb3f2935e005361cc98857b0e1b880fb4cf40233
 DIST pyzbar-0.1.9.tar.gz 45793 BLAKE2B 205c4cdabecb0c59c78bd3e901bd8348a8648c6c6b48afed5f71883c8ec438047843752269f273ca277ce87f3831e1873f859501df7bdc24834fe2b667922fed SHA512 f9fe774400ed6428bc78a428bd1b7847d5c6d557ea8637125348708f0641b36eceabe69362302c3d8658cf2186ee836c3bfc207fa800a6d03581375c251227e8
-EBUILD pyzbar-0.1.8.ebuild 598 BLAKE2B 0c771d3869b2d897d110dccbe926818671b16fa6d41795a651dd3d1a5710858bafb0439a486ecfad4c41b01b4072c5cd78026cc23855853facc4e1d3b2575c89 SHA512 f53354f5f1f938bac7126e3c6e73f784e5c9f49f1c9c3b6eb30b7af1c0cc5857d345e6489700d7ccad9fd2da5d5dd0718052ea80eaa394c800978127a9a8897d
 EBUILD pyzbar-0.1.9.ebuild 631 BLAKE2B f6fbd0becd908a6b9a5b230ae5a4382cb1393ea57e145089adcedde7a764d59d16dd85b7ea5370654843057d043cacab52dadd7916c3d7f64e9297196a6fdf25 SHA512 31a74d7f72dee80c184dcdf8ba65c2325b99dfa79863c9dadf756bce9433454320d475e48a4b100e2f01fd24a6c13f001eb189f789efe491548ee9c06fc3035d
 MISC metadata.xml 310 BLAKE2B 2a5ebc879b7838e96c41d786affd97a6e3d8ad0792937969cec8e9c2efeee99588b4c958136fad2294b0445bf7d0337ffefcf53ff0342f83cc3eee7d1df7c0fd SHA512 0fbf1e07aeafbc30b5b8a641034382e2811fa8c9cd929f10df9d94909c00e238a055688fa8c89950e707869b8532e25ebf5fbe31bb7dca5c68d2bfcdbc026065
diff --git a/dev-python/pyzbar/pyzbar-0.1.8.ebuild b/dev-python/pyzbar/pyzbar-0.1.8.ebuild
deleted file mode 100644
index 48f0bc8d05fe..000000000000
--- a/dev-python/pyzbar/pyzbar-0.1.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
-HOMEPAGE="https://github.com/NaturalHistoryMuseum/pyzbar/"
-SRC_URI="https://github.com/NaturalHistoryMuseum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	media-gfx/zbar
-"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 79fef6ba1807..de304dd4ce3b 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1,7 @@
-DIST pyzmq-22.1.0.gh.tar.gz 401919 BLAKE2B ec43c62e68633a7e0ac06e7a717b6409e444dbd1347154c2a29a2dfb00916829656308122fa2cf0fc1e3013c82ba6bcc5e11b86582f95d46f43e9e81f6d8ff74 SHA512 aa135279927bff07339b99b4ebbc7d47effbfba7df99d3576088fe0e7d4a3ad44174a928e8b94afdeaf531c6a30cbb7bb88bce7fe19e7e5420b079ffb8e8690e
-EBUILD pyzmq-22.1.0.ebuild 1750 BLAKE2B 9a9b161f6109ddf4aa44ee5d996d3e5e48567bc259cc6b84d494b6077de02543f9f80e00a173bda74513d2de0e1de6ac008da3bf2f7b9bf1cd4bde501e764301 SHA512 97e3ba80e576ad03eed07ae94fb7bb08433b7b75d3510a9811dacfd10589e6361c81dfce0ea14e6d8aa98d17dc77cc33346e583caf9619fd83ff7e3f60563231
-MISC metadata.xml 429 BLAKE2B 028c54b8d775ee16d84b4fe0da1fb586629bed6792633bf71256e2a58ce5b2fe109eb5e4ffcdaee0c05cd890d1de7935374cbc81e57ffed98ef21562125f0537 SHA512 f4712a304c9e30094a267cbd23cf55b335bb5cee2e942e0e4dcf1b3008b700e9e94e9600c5b8c620b04b1a66f9a51611c679fb4eb28a99ce8c48e8f920717ecd
+DIST pyzmq-23.0.0.gh.tar.gz 399818 BLAKE2B ebd99acb5270f4ba2f851f3df9a7cb81f986730eba81d54c2c4bc55f24f98ebafdd7a24fcdce1dc5727a1e2e1ce57a9b52160800c6eb29c08bb9ee94450c5a83 SHA512 aaee7af933467daf56db660b84cf79972042aee6b2c9640c00e09e0d7c78cafe61346df567beb8eebadb4408c1887eb355beee04c4a6b1efa0d8dde8a4c82283
+DIST pyzmq-23.1.0.gh.tar.gz 401651 BLAKE2B 8e78f993bc7ee0212c6fa598d7993fc7b9cff8ebfa25ee833039d69214a00a6cf82ecb388ed6fb06caf8a63f7cea3be84aeaabf6f451f5889ef20943edcb9fab SHA512 06b71c641381f6efa57e1dc21864855694bf6a160ea388dc55da6092482257dcf776bd777edd318bd39d1462450e8c8873336cc0c1c5e15639f8f77ce7bff46f
+DIST pyzmq-23.2.0.gh.tar.gz 402085 BLAKE2B 4ab26af04c76205d0770163e248e28a22aa8f710a66c9dc96e18c772338c434ad06227d57edd5aa3476fad68fa7320e9216a102b2cb19649393f1e9ef5d9599c SHA512 348482f4b6fd4ebeae8e4720a7005ed35eccee2bf26b0128115b756ee560156b34e6f043c96b71a84d47b1313bd2d8e0ed0f74c7768e23cbf65bd906036800c5
+EBUILD pyzmq-23.0.0.ebuild 1858 BLAKE2B aeb3a8b77d655c19d70fb63620a8b933af2febbbb7a2dc50d3d6aabcc45ede63e17f519c96e65287a81d8d976a7301c9b46c367217f5eb469e4dc0f5868e577a SHA512 11548dd7124f1f75ab1e2830507956cc5216505eacc0fa824a51ab44992e096deb13484949d65f28703d457cb109c2aa49906c2d10b7167707430a4316cb286f
+EBUILD pyzmq-23.1.0.ebuild 1866 BLAKE2B a5f14054580779d5ce85837b26835e0152afd5a38086601fe1099a183649049fd21b41aa322d2db6fdf202fc41e5006a5abce700da854282a816bc347c72978e SHA512 ae901ef0d324ebf059a39c01669efabe24e349759a1eca780f7390d4709fd8b87237b610f98ec384e7f39d8e5152e8eb8291d19cf381679a11a93b7b94087fd8
+EBUILD pyzmq-23.2.0.ebuild 1890 BLAKE2B 51ea9d5f9442873f63f9a663cb66ff67cc1d934cfcce5340e74dfc88476a8b25efd29a3c2ba53b7d84c330c0fa29c5116eb55f82ad1817cf032be68f7bb987ee SHA512 deeff0b97be6d77f148e1e98009bb505d97f99efe773d47cc19f5184138f75808dde0311e48418b263044c46123f0ae37e63536560d4ba0bbaa8154004d845b3
+MISC metadata.xml 548 BLAKE2B 0120b82c6a48537f80d08237f4184ff855c109a0a461adfe7921e25468928ea053cc7727c7b00ff96ea556d719e453ee27cf534b285f24f62f7d1ca4ab326770 SHA512 124145f71518d39daa57522eadc27ab4782c3fc1794543396a6b6c91dda29175c4c097d6be90d7d405823621ce66f62e169b97e086c983d7f08178e6d85cee40
diff --git a/dev-python/pyzmq/metadata.xml b/dev-python/pyzmq/metadata.xml
index 1a624fdd7836..f3cb0b82106a 100644
--- a/dev-python/pyzmq/metadata.xml
+++ b/dev-python/pyzmq/metadata.xml
@@ -5,6 +5,10 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyzmq</remote-id>
 		<remote-id type="github">zeromq/pyzmq</remote-id>
diff --git a/dev-python/pyzmq/pyzmq-22.1.0.ebuild b/dev-python/pyzmq/pyzmq-22.1.0.ebuild
deleted file mode 100644
index ab3b8854870c..000000000000
--- a/dev-python/pyzmq/pyzmq-22.1.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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(+)"
-
-inherit flag-o-matic distutils-r1 toolchain-funcs
-
-DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
-HOMEPAGE="
-	https://zeromq.org/languages/python/
-	https://pypi.org/project/pyzmq/
-	https://github.com/zeromq/pyzmq/"
-SRC_URI="
-	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+draft"
-
-DEPEND="
-	>=net-libs/zeromq-4.2.2-r2:=[drafts]
-"
-# it uses cffi backend for pypy, cython backend for cpython
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/cffi:=[${PYTHON_USEDEP}]
-	' pypy3)
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	"dev-python/numpydoc"
-
-python_configure_all() {
-	tc-export CC
-	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
-}
-
-python_compile() {
-	esetup.py cython --force
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local deselect=(
-		# TODO
-		zmq/tests/test_constants.py::TestConstants::test_draft
-		zmq/tests/test_cython.py::test_cython
-
-		# hangs often
-		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
-	)
-
-	cd "${BUILD_DIR}"/lib || die
-	epytest -p no:flaky ${deselect[@]/#/--deselect } \
-		--ignore zmq/tests/test_mypy.py
-	rm -rf .hypothesis .pytest_cache || die
-}
diff --git a/dev-python/pyzmq/pyzmq-23.0.0.ebuild b/dev-python/pyzmq/pyzmq-23.0.0.ebuild
new file mode 100644
index 000000000000..c888d1e26c4c
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-23.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest
+}
diff --git a/dev-python/pyzmq/pyzmq-23.1.0.ebuild b/dev-python/pyzmq/pyzmq-23.1.0.ebuild
new file mode 100644
index 000000000000..f3c9d5bbf854
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-23.1.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest
+}
diff --git a/dev-python/pyzmq/pyzmq-23.2.0.ebuild b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
new file mode 100644
index 000000000000..e049552be63b
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-23.2.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	local EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest -p no:flaky
+}
diff --git a/dev-python/pyzotero/Manifest b/dev-python/pyzotero/Manifest
index 5d7a041d1e3a..19aa95d717ea 100644
--- a/dev-python/pyzotero/Manifest
+++ b/dev-python/pyzotero/Manifest
@@ -1,5 +1,3 @@
-DIST pyzotero-1.5.3.tar.gz 525734 BLAKE2B 11de38c1954478ed9918f33bdbf550d6d0eda99a6e38154361c2da336158bacfaf16f1d9bb9ff08550e6951c3e29efe50618c78672bfcec6237bc42e6b52c6c5 SHA512 b31872db4a2fd53f6c17f6a33115ac762147810efae6f6351579a03f651f843e46b1d5f584cc47c1d20d8dad5c318d2835c2e053bc43f3063e84bce85658d9fb
 DIST pyzotero-1.5.4.tar.gz 525739 BLAKE2B 93acb725cb47e9f1642d88ea79e590e29af6eecedb5a14e220c9d6ce2c27d05dfd9042ef49d53c710a507050f566b097a272e025d26d1b10a64357e511da656e SHA512 10c27d531adf358c337aab3358d24e28318dfee02b08387663f0433fffc645ddc633929a8422d508952e26d29219c350c6865248c447391436d8cb5061f273ec
-EBUILD pyzotero-1.5.3.ebuild 770 BLAKE2B 7cff12fe634b1350c76fbd80cd3a0ee708b9260f15231eb64f0c80e58a3fe26dcb5dab1795a78719b70e788cdafc679d00701ce3e541320746c14465f521d10b SHA512 d68b27577071270ddfdf8ec83656e90a346ba545a217ad2218a6779e70412ab137709a7d25c7fb9cb45b4c3cd169254b0216bada90c4e7924e28f60c373fb38b
-EBUILD pyzotero-1.5.4.ebuild 810 BLAKE2B 28afa8d2d5e91aa7e941f8464f9948f7581218617d13b06cf3d8a35f4e24f0779db9459afc9463924d72740aaeb16f0e68aa5d171cafbabcbe723351c9809dec SHA512 ee85cd731bed0aa3bfe4d541710ac504dbb0d6bac48cdc1bd03b770578f90c5828539a872e994deed2ef3f7757b9431094e477e0cece63eea0b0802d183e3496
-MISC metadata.xml 512 BLAKE2B 3369ec5041d7c1819a6a871b5b84733165166c5d32dcf0a271bc431198f2989710e0e3d1d334c3d44840a7fc786530d91beb1d3727ffa4bfb2a235afa05dcb3d SHA512 b6ca7abf0757b75bf25a3e53a5686c17722db174f741144ddc4897a1f3fb864af0d5defa356dec5a65aa324f19cf44847eca44f4b31c0677d01dccda938e089b
+EBUILD pyzotero-1.5.4.ebuild 810 BLAKE2B a4e8519e891c8adc6671841ca81367083b16265d883ebb6c4ebae280b76d2d591d9d93237afd2bf38d5efe87bb6a31cfa2b36def1f72a20d81041199a0f5efff SHA512 26a09412f7f049e54caba0b5eb6c862eec5a558471ed37a4ad0e8368ed677c48de759d238e0267eaf3697b14b02f7d650fe2721ac2ff05cf684fbb3f07b77195
+MISC metadata.xml 512 BLAKE2B bf20e20fc4c9a9345d42fca55ed12b940b14464416e50f0bf5d1c8ecfb3faa07b692e14ccaddb3efd161e903c020209eab23715299a27166d63c4e7b1d2e0db4 SHA512 10b3351acff6184aa7f3254b21ebf9bd733dcd1471030476eb427c1b788d23dc0307ae7ed441b3267b32891dee3c463e646e8acbb4cf4a42d8c1c8ad08518a7e
diff --git a/dev-python/pyzotero/metadata.xml b/dev-python/pyzotero/metadata.xml
index cd6613432d41..fd5579dd92d2 100644
--- a/dev-python/pyzotero/metadata.xml
+++ b/dev-python/pyzotero/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">urschrei/pyzotero</remote-id>
-		<remote-id type="pypi">Pyzotero</remote-id>
+		<remote-id type="pypi">pyzotero</remote-id>
 	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyzotero/pyzotero-1.5.3.ebuild b/dev-python/pyzotero/pyzotero-1.5.3.ebuild
deleted file mode 100644
index 54a56823cf6a..000000000000
--- a/dev-python/pyzotero/pyzotero-1.5.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python client for the Zotero API"
-HOMEPAGE="https://github.com/urschrei/pyzotero"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	app-text/zotero-bin
-	dev-python/bibtexparser[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/httpretty[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/dev-python/pyzotero/pyzotero-1.5.4.ebuild b/dev-python/pyzotero/pyzotero-1.5.4.ebuild
index 22190c083c5c..43f353340a99 100644
--- a/dev-python/pyzotero/pyzotero-1.5.4.ebuild
+++ b/dev-python/pyzotero/pyzotero-1.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index 657cf4ff1b43..f6e57367febe 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,7 +1,5 @@
 DIST QDarkStyle-3.0.3.tar.gz 431182 BLAKE2B 3c9406aca5d01c3682123e044d2e5417b300b724c6366a411a00211b482582b26c687128f6c32e7a95a29fb70c3a322fd525483c48120e5671ddff713e4e0035 SHA512 2c44a4469971b127f7fb8c9a5bce452c98653aaf29dcdb7e0df2da7557d6730d64ebf6a649f8516fb13a2d4e77d0fdadc293457d94406d8e7491be3fd52a9313
-DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
-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
+DIST QDarkStyle-3.1.tar.gz 698602 BLAKE2B 8c96b2dd5532c9db0c1d813fe0cf049b7cf55ef6469d2ebb21b5ea85fe6ecd23e8a247c45f45cfa674f8012a4a03ea377df8cb7efac8f13c079e2512091ecdc7 SHA512 275fe333bcf2502f8f1ef61eca3f82d8909e760e8f88a1605157c5043cb1e4cad97bbb8ddb0464ef2125c1b70f318bfa8f0106d2721d6b9862c162b5f716aa4b
 EBUILD qdarkstyle-3.0.3.ebuild 1151 BLAKE2B 8aa4d862fd9e1a27f896062eb9428cecdb98d3ce3516d8d6696efbdb702482af106a5467d1e3f06d3178957e756df485317347badc596130a19fb5002bed97f9 SHA512 451928b6dccb5efb1ee9be0b2fb421a2e1d2a20aa09725f1833a5813f8aa15bfb3ffa92bf8912b855e17800769fa874ae261751bd7064261e0fee0174b37b140
+EBUILD qdarkstyle-3.1.ebuild 916 BLAKE2B 2c9474ab52f1dbfeb20bbef3a3db6172b7f67f452d5bc7072ba4f420ab3b2ced58539f29e48afa5679e10f5a4a10b9aa2f2c779c1e27176a16012e1f2b2eba13 SHA512 2d236f6b9ba3e92c2871d8aea68d6ffe410fe729fd51c90038366d67c6de95400df9690e687ef6da3c387743987672991c3182ef8002ddb7feef891262bed8b8
 MISC metadata.xml 356 BLAKE2B 16d4b6d558d5acf0b812a0e739f6073445ee1a9c02fa9cf334d74f29cda84e3a1cbe9e8a5f6c9d09c68606a0273f83f528b738c524aad97fe2365d855d627984 SHA512 487500f2a0f1d7b2389f5a0b2b9da6185746a4a1702037ed3ab982635c9663925cf999a7df400aa98aa0d4ff2b2d2bb0fae7c14f1a6c4d47d4cd8964f8e1471c
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
deleted file mode 100644
index 7fe35e187bc1..000000000000
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-MY_PN="QDarkStyleSheet"
-
-DESCRIPTION="A dark style sheet for QtWidgets application"
-HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
-SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/helpdev-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]
-"
-
-DEPEND="test? (
-	dev-python/qtsass[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/m2r
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
-	#/var/tmp/portage/dev-python/qdarkstyle-2.8/temp/environment: line 2949:    66 Aborted  (core dumped) pytest -vv
-	sed -i -e 's:test_create_custom_qss:_&:' \
-		test/test_sass_compiler.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# tests look for a file in source dir that is not installed
-	PYTHONPATH="${S}"
-	cd "${S}" || die
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r example
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "qdarkstyle.utils" dev-python/qtsass
-}
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
deleted file mode 100644
index 6069541ac9f2..000000000000
--- a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-MY_PN="QDarkStyleSheet"
-
-DESCRIPTION="A dark style sheet for QtWidgets application"
-HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
-SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# TODO: Figure out how to get this to work
-# Please pass a palette class in order to create its qrc file
-# This appears to be fundamentally broken: test calls create_qss() without
-# argument and that function does sys.exit(1) if the argument is None.
-RESTRICT="test"
-
-RDEPEND=">=dev-python/QtPy-1.7[gui,${PYTHON_USEDEP}]"
-
-DEPEND="test? (
-	dev-python/qtsass[${PYTHON_USEDEP}]
-	dev-python/watchdog[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.7[gui,testlib,${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_postinst() {
-	optfeature "Retrieve detailed system information and report bugs upstream" dev-python/helpdev
-	optfeature "qdarkstyle.utils" dev-python/qtsass dev-python/watchdog
-}
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.1.ebuild
new file mode 100644
index 000000000000..be9e061855b7
--- /dev/null
+++ b/dev-python/qdarkstyle/qdarkstyle-3.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature
+
+MY_PN="QDarkStyle"
+
+DESCRIPTION="A dark style sheet for QtWidgets application"
+HOMEPAGE="https://github.com/ColinDuquesnoy/QDarkStyleSheet"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/QtPy-1.9[gui,${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/qtsass[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.9[gui,testlib,${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "Retrieve detailed system information and report bugs upstream" dev-python/helpdev
+	optfeature "qdarkstyle.utils" dev-python/qtsass dev-python/watchdog
+}
diff --git a/dev-python/qpageview/Manifest b/dev-python/qpageview/Manifest
new file mode 100644
index 000000000000..6454f544488d
--- /dev/null
+++ b/dev-python/qpageview/Manifest
@@ -0,0 +1,3 @@
+DIST qpageview-0.6.2.gh.tar.gz 159098 BLAKE2B bd28acaf0f2a123963136acd32ce1a7ee72bba3c19f253af821b44e38bbf314ac3ccb48a8c96b06f484d399ed13bd3b8b3cf62e7b2a44d85edb38d04b60ceccf SHA512 80b1d6d4419594bcac195450ab030ab0b4fe3fe92dc9a6db598d1dd2282670f0d0b9d957b3c37313d7002f8f7dbc1bdd101edca81e5edca19c6e33ec4f6e4ffe
+EBUILD qpageview-0.6.2.ebuild 761 BLAKE2B 01b247cb9ba7b143c15f1cd52bc5e0c9423802c060c34073f0b3fa3dc392af027f0b5cc22b8bf906db756f54f729271ca5eafab1c2405e1b96a7e520b847b9a9 SHA512 a1c168e964c5354f1610bf1371ac86304d0345fe18bfc156413d95ee79314776860d02d588b00c9bec0cf752c8ce01d10aef2445df9366b051d13279c19e8445
+MISC metadata.xml 382 BLAKE2B 9a18f6dc2b6308f84d65992f60b673b25370afc73f7b697673732f8cf93e5fa70791cf0cfc5ecd357d5852385ba3ea289d4076c2b9db68e5c5b9f5320d8a47ca SHA512 24dbff938564a04437fdf3758fa8801556211825fb72b346a67a12b191608105f51c98ebed2377b6275083dbfa6de413383c09804fe4a6dcd74b5fcb730545c5
diff --git a/dev-python/qpageview/metadata.xml b/dev-python/qpageview/metadata.xml
new file mode 100644
index 000000000000..bf0b8f79adf0
--- /dev/null
+++ b/dev-python/qpageview/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>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wbsoft/qpageview</remote-id>
+		<remote-id type="pypi">qpageview</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/qpageview/qpageview-0.6.2.ebuild b/dev-python/qpageview/qpageview-0.6.2.ebuild
new file mode 100644
index 000000000000..90d467d7a46c
--- /dev/null
+++ b/dev-python/qpageview/qpageview-0.6.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Page-based viewer widget for Qt5/PyQt5"
+HOMEPAGE="https://qpageview.org/"
+SRC_URI="https://github.com/frescobaldi/qpageview/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+# GPL-2+ added here because of https://github.com/frescobaldi/qpageview/issues/15
+# Should be GPL-3+ once cleared up
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/PyQt5[gui,printsupport,svg,widgets,${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "Printing support" dev-python/pycups
+}
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 7d97e86a45f0..3e71500f9777 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,3 +1,3 @@
 DIST qrcode-7.3.1.tar.gz 43495 BLAKE2B 9986ee77752625e127008038c6c044b5adeb3bd526c27a55b23915190c3c9069adf1c6df1ce5f76cd0255f45319ecb66ebf226932666ea6c89872a46e13c1cd9 SHA512 9e0e508418164926a074d8c6d85419b39a36c01ac6d92415a15ce43d4aea79fa2a8d0167982f832970d2a68ec18d2b729f09e15d80b4f4c33b992999527d39f9
-EBUILD qrcode-7.3.1.ebuild 623 BLAKE2B 80bcddfaf6fc1d7160261dbbf78f6797a60bf69906704b5e1f2a52f46b154831e1aa717e80a4d46a117fdbc77eba1c91bf36c62fa3e313917102647dcd719f25 SHA512 fcc928ffa520678bf9dc85e4d98922234269cfb9353800129bd71d905b349a28c9068d08ab79c0cc66deda15ab067324e9692f921d73239b059645acf624b5cb
+EBUILD qrcode-7.3.1-r1.ebuild 790 BLAKE2B cee88bcffce05cc4e9f84051e7c2dd04c9f81cfca454a84801884e44351859111a8d74886034bd09a4193a4c567922154461cdef52f78ca0ee1a89f0beb97223 SHA512 2b75bf00552c9359a07c5ed6dcef834eee1d6744d7975f9462f1647a08711128a74a0b3279fe26b5728656a9c9f2a490ac20e0004ef2e8bfb54c32e80d0e1a3d
 MISC metadata.xml 334 BLAKE2B 2b24f6601d29305978e939bc72895aadd12d9343f6178c454f807b17e8e90fb645df6d16e098c6b36343a4ab45d776fe1e274a188f6383904784bdc5271a921c SHA512 b6d35afd78cc9abb2f0b5e75b3267cb8b6d8cd9230fad7c808bc64d31d480f640d4a8f94aaa696c46d2f230b6e645a02f157d72f22456f62902012d7a820bf71
diff --git a/dev-python/qrcode/qrcode-7.3.1-r1.ebuild b/dev-python/qrcode/qrcode-7.3.1-r1.ebuild
new file mode 100644
index 000000000000..f2aaaf82c36b
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.3.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="
+	https://github.com/lincolnloop/python-qrcode/
+	https://pypi.org/project/qrcode/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	qrcode/tests/test_script.py::ScriptTest::test_factory
+)
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/qrcode/qrcode-7.3.1.ebuild b/dev-python/qrcode/qrcode-7.3.1.ebuild
deleted file mode 100644
index 029bcc724333..000000000000
--- a/dev-python/qrcode/qrcode-7.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="QR Code generator on top of PIL"
-HOMEPAGE="https://pypi.org/project/qrcode/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-# optional deps:
-# - pillow and lxml for svg backend, set as hard deps
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/qr.1
-}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 77f7920b61bc..caa9a1c47ee3 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B 99a1c78b5b6bb20e5396450e6c5d3443c881a66a18f62dd8ccaead47896092a55b859ba1ef3a952d342923cc527354a120ce21a38467745e9f39380e2adb2b3f SHA512 34f2ce3ca646d2d55f351987a5f1d88039a112a15aaa0ceb0cf30223141b73129b9f468574e468e7872e35ed71a222db58fd0c303c4b00671e80ecf2834bf97d
-EBUILD qscintilla-python-2.13.1.ebuild 1833 BLAKE2B ce14d2fa476fed0b61dfb0c414a9bbba4a6898bb1be25942fe3c8d74064e50c07c5d8a8855bc8aa6af71941b0a81701c8417e126fba74df47e050158b52c222b SHA512 fe79230fac5056accb75f7119c95a3db5666234a2a0be4cf451d4963b03cb00e3d8ff058c8d64d0309799a082f8c1707834b54a54761ff30c96849b17c940900
+EBUILD qscintilla-python-2.13.1.ebuild 1831 BLAKE2B 86b481b7b4afb4cfcfb9829e24b644a1a7f3ce4836a8b8eb0abc18c3c3e2ca5566bd86ebb3849632d96034f34f3ad8ae8b7737d7f2f6e411571357c100f1dbbb SHA512 e39e345d290732dabd683f00c7b4f9008d29fe5cae0c7a12a8eacfeaaccb1253f4dfb9e390b1c32628e137448503647f9b2d928076657aff574778800e599bec
 MISC metadata.xml 679 BLAKE2B 7d346ab99b6c19180388b012b949a7ff4bd474dbe222bdbecac25c6c29a1f5b14fa9e0a979a2b217d2604c1e9471776012303c45341277582bcb0f77681d94d8 SHA512 5a09f0497846433a08b407bc3b2a5c611087744a5354f744d97663687d179a9c8a0159e73fb88a7ee70cb371ddd11293f44698d3fac4899771b9bd3a4ed11a5f
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
index 3b9a839cd1c5..b207654bc061 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.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
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}/Python
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index f1bd95263e75..90952e489911 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,3 +1,3 @@
 DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
-EBUILD qstylizer-0.2.1.ebuild 1538 BLAKE2B 28e0c24e1d3423098180b33d83eadb428ba79bf20a65563cd1e1fbc670c95a955d4dba45c0ccad31fe74283ce39de98d558bb79e443c38634b7b8a45437e8490 SHA512 5b81b311255aa5aedfe2c42d4d945a7481fab161aceb63ee7fa7a1164b9073cd47fd1d6e7b0c6b24d33bced9952cf01ed7e25878d3557660e2a2f881a0a35521
+EBUILD qstylizer-0.2.1-r1.ebuild 1569 BLAKE2B a142ea81c24235a68602ea7711ba47078fc1749fa7cb42c8562681c140f09cfd83ee74d93543f346c6ac6c438fa34d2e738fad0ffcd062a25cefc06e57905e50 SHA512 a0a382c0292119c8c684db0151a4615ac2a52ff213bcd8859e8be8ad19455959786d3efc11353dcbe039aebf43072932c05a34dd80823c2b85418dd109f48b51
 MISC metadata.xml 355 BLAKE2B bbd0a92b969f24330e934a3fb9db82c99d4e0f4daeb6a4fadaa5cefa0caa2d4eab393f2743664ea7bf685df3deed81ffd3e4eb8f12089d395c4c6b231bec9d58 SHA512 504b904577a9f891df117d1ca79a0041463cef7fcadb8c2dbfcf2f88abf2c26bc08a976dff5d8e51a563d6a6070b354fa2c1918051aeccf3ea5a359a3ea04694
diff --git a/dev-python/qstylizer/qstylizer-0.2.1-r1.ebuild b/dev-python/qstylizer/qstylizer-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..f8b7f07bfdde
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.1-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="https://github.com/blambright/qstylizer"
+SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-vcs/git
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
+
+python_prepare_all() {
+	# Exception: Versioning for this project requires either an sdist tarball, or access to an
+	# upstream git repository. It's also possible that there is a mismatch between the package
+	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
+	# was given, but was not able to be found.
+	#
+	# There are no tarballs on PyPI, so we do this as a workaround
+	git init -q || die
+	git config user.email "larry@gentoo.org" || die
+	git config user.name "Larry the Cow" || die
+	git add . || die
+	git commit -m "init" || die
+	git tag -a "${PV}" -m "${PV}" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/qstylizer/qstylizer-0.2.1.ebuild b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
deleted file mode 100644
index 3790a3be9a2d..000000000000
--- a/dev-python/qstylizer/qstylizer-0.2.1.ebuild
+++ /dev/null
@@ -1,52 +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="Stylesheet Generator for PyQt5/PySide2"
-HOMEPAGE="https://github.com/blambright/qstylizer"
-SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
-	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
-	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/inflection-1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	dev-vcs/git
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
-
-python_prepare_all() {
-	# Exception: Versioning for this project requires either an sdist tarball, or access to an
-	# upstream git repository. It's also possible that there is a mismatch between the package
-	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
-	# was given, but was not able to be found.
-	#
-	# There are no tarballs on PyPI, so we do this as a workaround
-	git init -q || die
-	git config user.email "larry@gentoo.org" || die
-	git config user.name "Larry the Cow" || die
-	git add . || die
-	git commit -m "init" || die
-	git tag -a "${PV}" -m "${PV}" || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 8b36089e7f11..be97ad71614a 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,3 @@
 DIST QtAwesome-1.1.1.tar.gz 2277767 BLAKE2B ca8668e0b6633087b7e09ffcec19809c8b7e12af2caa0beac896940cdbf3a113206f6952916fbe81c53899a56f8222e613df9c028f59907a2553174551ef9fcf SHA512 3cf04b822464c14f52f23499e64515f50f743aba40a8d22224d22315342cef760da476dc9b2ae42e901ac8ef8440e105a6bf6175efc6749250e0fbbbc255e08f
-EBUILD qtawesome-1.1.1.ebuild 909 BLAKE2B 2edf72df24fe2f734ae4234d1fce6ba352e36b34e68868175830980b9cb7f13d08d063dc057ade3d4c6ac89dcfa67c09fa193293e34ca82823bd1f4fa88d3252 SHA512 69aed83cc8dba0735b6c83bff64ff45d8c63bb4840705040326bacc7556a9e886991b7283e40530ddc9ebee3d8ce19cfd7952d56388f7048032fc8f6f37adbfc
+EBUILD qtawesome-1.1.1-r1.ebuild 939 BLAKE2B cdb36334f7aabfbc699b2a35e58af8ca0675b6523515312c3f355570b14cf0d21380b3f4e2f726415d179fd892ddc95dd40751f0bc238d7b3c886d1b80a352e1 SHA512 04227f83f62819d26ce53a4529ea4ed68bb3559d9dae4eac4522845eccdd8cd49e38f3a5b1fe90136abae6976382cb1fca852865ba5f0dddc185c8a55031ddfd
 MISC metadata.xml 810 BLAKE2B 7d9237109b80816eea90f955a2a7f4f989589b4b16aef6151017a68dc4808b5b13e524d0356f88ff57f05c40be268729f016ae3f9bd059eda6d06ba75ee03ef5 SHA512 9b15bd5c9e0486fc64d49c6a7a1ef2fafc4c7e9e25ac57ca5811e435cc49c24421ca695c7dbaaee7b317c4a90fd5e9f929c3f79d7e57ce8cac85c6267e103dab
diff --git a/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild b/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..9f975f17e6d9
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.1.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	media-fonts/fontawesome
+	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
+	# the tests with pyqt5
+	PYTEST_QT_API="pyqt5" epytest || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/qtawesome/qtawesome-1.1.1.ebuild b/dev-python/qtawesome/qtawesome-1.1.1.ebuild
deleted file mode 100644
index 4d8a21cc0144..000000000000
--- a/dev-python/qtawesome/qtawesome-1.1.1.ebuild
+++ /dev/null
@@ -1,39 +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 virtualx
-
-MY_PN="QtAwesome"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
-HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-fonts/fontawesome
-	dev-python/QtPy[pyqt5(+),gui,${PYTHON_USEDEP}]
-"
-
-DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source
-
-src_test() {
-	virtx python_foreach_impl python_test
-}
-
-python_test() {
-	# Tests fail with pyside2, so depend on QtPy[pyqt5] and explicitly run
-	# the tests with pyqt5
-	PYTEST_QT_API="pyqt5" epytest
-}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 0eaca0a14a70..bb2079aeca94 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,9 +1,5 @@
-DIST qtconsole-5.1.1.tar.gz 428840 BLAKE2B eb5f6dacf576133c07bc45a9f0fcfdfd041f72012d9564e288a40ac060a6843f6438c80836bcf2f35ffa1f575383bdffe347a498930fe96e2d99a1f1fbe3a032 SHA512 dd9f725fc6e55dea3910650c4c5641336ed1ed56e6eeaad91e6567743bc02fbd0ca567295c3c8897bb800df305ec0bf9f2d8caa8ad0099cdfa2d20c7ca96fbdc
-DIST qtconsole-5.2.1.tar.gz 429573 BLAKE2B 57d42dee8710576785dd1e2e054469b5b2325fad1c30aab1b071f1aac80f3146edc057b03b025d72f0c8691d002a06dbe45bf51d51876ff730d39106d4e4aaa4 SHA512 86e310da66f36e38a584758b18482da927acd70f095600554d4bef3c0b0fcfab5df9d9990b94943a14932afbb8d5ec1db5810c40ef2a7e59172788291684d9aa
-DIST qtconsole-5.2.2.tar.gz 429610 BLAKE2B 1a9f163dfa8a2d38829b2db5a5589b80605b82f144d95e51e3668f296b8e839fd3045c813505926a4c8690e438e79d82c0307c33416152d28899b2f0324aec1e SHA512 43727a08a0b828421bb051063055b3306a2111bedfd148aea6bccc04e103bbffb798c35440bfdb82ffa6bf17a2b0ce9e1ad2d0b3df9aaea294a23dcf582dfd57
 DIST qtconsole-5.3.0.tar.gz 430258 BLAKE2B 883c95124d911b17a1cebedc357f207e042a9679a09eb63bace09f7f39eac4b1f3a24ccd372760e3142494208119dc4131939cd82e8cab364dacecca184c8545 SHA512 6fcfaa7ad842f3f45d4e2286ce816a0b4c71e3c3fb07b86589934efcc637e2cd6f5712fa8a10c375b8e86d1e1e6ce32de9f2be2fc0decd554b51c658e106b120
-EBUILD qtconsole-5.1.1.ebuild 1256 BLAKE2B cb31c8fc5ab44fd088cf922da2cce87ac7be31fd4b6cc25486bdb6be5deb4d8ac68fc61d8a63708df73899730671807caa34f60e82295cf2167da8d0b99a3f9c SHA512 ec28716597e72806ebe96ba822cea86d294798f6ae16871f8059ac342427ca2ef2025d8663ee1d30f5d9a89ebafc2ed4216301edbd689e6c8cdcdced6fd029c7
-EBUILD qtconsole-5.2.1.ebuild 1400 BLAKE2B 46b54271d309c64eb4580ada2e220af9d73f96021b47603b2557aa78736dfddb735af5e7f927976d9b4dc3a5c00c5315e981edbd84a3d6305b5d053642d5b5be SHA512 ee5c6c63e25530b765b4f5e146a417579ffd8d341613ec7dd9f6697958754db14500c51bdcef7db94fd740e0a20436aa882e5a158b3a5fb08b1f80566e69b1ed
-EBUILD qtconsole-5.2.2.ebuild 1398 BLAKE2B 14777fb565b0fe92a0969759480454137145650bc9c1c977a97dc745f20f5b519318374d7ccba0012cf81088ac8270be4605e6720d4dca1583953a6e9964e71b SHA512 e554d7506288ec0359771d6467da6d0cc41f9d726a510b07cb119cecb9a8fbc2e50a41d1eaad588de4e5e58ee92d47bf38a67fba9b952bc4bfaf4e2e15d46d48
-EBUILD qtconsole-5.3.0.ebuild 1469 BLAKE2B 78717d4b5b034d72af1e4e11b6fb6c5950858727450153ad9f855d81985f63cef04563c51c566d84344aa0fa0d60023f0a0551903fb2367f6f80c23fe0e6b8c7 SHA512 d0eafe8c8ddd8275faf7e67017871020c2f3d9444108a1c8a168f90b69a4317965ef791f639ef075d079572e9616111be9d44a847a98446730a8d0ee5f1cb229
+DIST qtconsole-5.3.1.tar.gz 430680 BLAKE2B 4655d9aa78a95200fb3f4d2016749d4f1c75865d259da8583818259d05301469b9851b85a2716336084f022f546e97ae003483284f0305793da80a5de7635ac2 SHA512 bebf9c97ebe2a030feebd34f9dbc83294af5eb64946b252c5b5e6391e2760ff95efa7f0be89ec59c424de5fefb3f876ead897d17b679fc87896fe440ba936554
+EBUILD qtconsole-5.3.0.ebuild 1466 BLAKE2B 2d5cbec971ad1cbc72b6f3eef5d9bd09beee421eea135f4eb558fa8f6b8484535344130f823b936b89b01d22885be7f5b13589d18cd2139aedd5f7792b066870 SHA512 851169f4445ebc84c347772c2959ec478cddedb87cab71e51fbc7e53b6ae674832bec97dd0b2b83d03c5d08da9a5563b80b46bf70c7aa8362ac5cde0d4cfc197
+EBUILD qtconsole-5.3.1.ebuild 1596 BLAKE2B 69ca074939f73968844e15e996ebee3dce514f72a6b24e473f03dc4588a96633400616b9d5adb63381b64bbdd4ef35342ea7114b03540e1d7ad4135075c7de57 SHA512 04f3dab235e5e9344cee88abf5298e15bf5253fdfed14ec1ba9d440a3c81c3fe58329a007de44ad27dc71451f158410156a57536152f74351ffaeaac490ee658
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.1.1.ebuild b/dev-python/qtconsole/qtconsole-5.1.1.ebuild
deleted file mode 100644
index bfb91fcfbe63..000000000000
--- a/dev-python/qtconsole/qtconsole-5.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/qtconsole/qtconsole-5.2.1.ebuild b/dev-python/qtconsole/qtconsole-5.2.1.ebuild
deleted file mode 100644
index 82cf36fe9fd7..000000000000
--- a/dev-python/qtconsole/qtconsole-5.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
-	test? (
-		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/qtconsole/qtconsole-5.2.2.ebuild b/dev-python/qtconsole/qtconsole-5.2.2.ebuild
deleted file mode 100644
index b09cc2e315f9..000000000000
--- a/dev-python/qtconsole/qtconsole-5.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
-	test? (
-		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	epytest --ignore qtconsole/tests/test_00_console_widget.py
-}
diff --git a/dev-python/qtconsole/qtconsole-5.3.0.ebuild b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
index e0d4c909ce7a..8b8c53bf23be 100644
--- a/dev-python/qtconsole/qtconsole-5.3.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.3.1.ebuild b/dev-python/qtconsole/qtconsole-5.3.1.ebuild
new file mode 100644
index 000000000000..e065753cbc2d
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/qtconsole/
+	https://pypi.org/project/qtconsole/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+# The test suite tests both against pyqt5 *and* pyside2
+BDEPEND="
+	test? (
+		dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
+	)
+"
+# required by the tests that are removed:
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	# TODO: these tests require virtx; however, running under virtx
+	# causes pytest to segv on exit (even though tests pass)
+	EPYTEST_IGNORE=(
+		qtconsole/tests/test_00_console_widget.py
+		qtconsole/tests/test_jupyter_widget.py
+	)
+	epytest
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index b7e2f8fe03f0..6f31eefe3193 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,4 +1,5 @@
 AUX qtsass-0.3.0-fix-py3.10.patch 871 BLAKE2B 06635c5b2c712ef94862b0b0a7c97f7ca92b20aeea609f7c847f9176788e1d510248928303480ff8ef18d131ed1216a0cf50cdd270af8f3fc7f9c32bbce23dcf SHA512 b5b287142987c47eaf750dada9a701308c31bbbb70f01283e62078c7d427d02c006159eef916356e6d51b6bcf1f1c865503ac8bba7fd0445b3e5da0f564c698e
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
+EBUILD qtsass-0.3.0-r1.ebuild 637 BLAKE2B 34417acaad2ff5dd340cc90727a858f5415d523326cf0b0965078bcae45b5005683ddecea46467ee456f3ac3af32712164ba213a607fea8e7a1e7057e44eed43 SHA512 9dc11807ec61e0194f5b630ba15f20cad93de69f4c497e62a4ee120de8f9c31cca69ad46f22efe2a8b2f768e8de5c634eb8424b6390328aad84733c56a604121
 EBUILD qtsass-0.3.0.ebuild 604 BLAKE2B a5a8ebf649e9d9f7e10fcacc2d5542825bc28457a9014a0b93018c5ff492836e20afd8f3cfcba18f3f3a87e871192bfc0c55a0d2529f4cd6b1090e0a85f86dbd SHA512 1b07efa995bf30fddd9ac2f8065f833eb3e64c0566d7623d64da9d1e75082d962bee401d881c597799126b879569a0a4cc5aa944436765fe1c0aa810e078c822
 MISC metadata.xml 352 BLAKE2B 66047b3dad50e6ba1385183873daec5013a184b12181332b595735b6f03b1e94beffb8fa79dfeb2b2b74c882e37e4705a8b6b7ecf49ba86b5a61d83e595d52a2 SHA512 efdaea1305996c0018db716d128c79932309c8327713f7768dba4c1c699ca5f33b39848568f50cb03d0ab4427e43a9715f2796fe0dc7340399d1c589ff73d6b6
diff --git a/dev-python/qtsass/qtsass-0.3.0-r1.ebuild b/dev-python/qtsass/qtsass-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..452aed88a152
--- /dev/null
+++ b/dev-python/qtsass/qtsass-0.3.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Compile SASS files to Qt stylesheets"
+HOMEPAGE="https://github.com/spyder-ide/qtsass"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# assert 1 == 2
+	tests/test_watchers.py::test_watchers
+)
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 3e81eff6b928..36b4eddf911a 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,4 +1,3 @@
 DIST radon-5.1.0.tar.gz 1873643 BLAKE2B 475c140fa3f9350b2376a66d3cf0dddd7f0ab1b3a4f397e82b65d175dc20ece38da1cdc7a83ef2f9e65d7d735dd589fa7ccbb5d966ca07cc7950430dd33642b9 SHA512 98e1c3dbf419ff0a791f01ea5376177c5be47c9cf1afdd9ae53014e8869dd10c7a7661a69bace48adb880173a8a176d4a13534711fcf53408b3f495f4579f7c5
-EBUILD radon-5.1.0-r1.ebuild 735 BLAKE2B afd264184c1ae0467d1ec9674c49abdb262d0d8505a2a696136a3b04146d74961218593a6dbda4d2906babe6f43b7920a1109ec0c292cf04558990e556d71c0e SHA512 90cfa8bd680de4f3ce359d84f576489457194d5e896edfce44cdb6b1ae54522977276e618b684a5d1bf655591516e3348515952817972acabfd7975e1e6db7d3
-EBUILD radon-5.1.0-r2.ebuild 845 BLAKE2B 501ef245d061b71b298fc3c337827d7949e4d2c4d03637cc36dce2e1f910c9cae89f3df9a9cd15fef58557cdb783814ec4911cfda72bb02343c24617223fe91c SHA512 69781453e777a7eb4278fb49593cb3ecbab6df417483ba2896fc0c79b8d9aeeb6c7380a8dd8487da781d97f0491234e6c71679213acc846d98a88ea51e2b060a
+EBUILD radon-5.1.0-r2.ebuild 837 BLAKE2B 10bc3e11bfed93545e1634dc6332883d37ebf431bd25eb94292344ab20d40a6c113b0d1693b62cd196cbdb6a0e044affc18bb09ea5b7da9a1db061f012e026ee SHA512 6040254a3ff2ac52c89f31243e7724998efc1642537761a874e0cb25e84f67411baff31bdf701f7036456d3606e7e0d262691b30fbb08c349c4cb7c2f954207d
 MISC metadata.xml 384 BLAKE2B 9c13838aaec4e01a6152498eb4f0e3bfbbb8cffe0cebc53ae7602c6ef1009852b8568f33e6c0299619a2a2df234abc6e06726ca145b09470b2798ea500dde731 SHA512 5c1a2d23ef8a2450f6d2540d125c9edea2e512e2df03a6d8501a41e238902afe4283c9f455b178e80626cf266aa472391c342d6128683f534f37db60eab38720
diff --git a/dev-python/radon/radon-5.1.0-r1.ebuild b/dev-python/radon/radon-5.1.0-r1.ebuild
deleted file mode 100644
index 0597c06cdb0b..000000000000
--- a/dev-python/radon/radon-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/mando/s:,<0.7::' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/radon/radon-5.1.0-r2.ebuild b/dev-python/radon/radon-5.1.0-r2.ebuild
index ede29bb7c85b..4bdf98f146fc 100644
--- a/dev-python/radon/radon-5.1.0-r2.ebuild
+++ b/dev-python/radon/radon-5.1.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/raet/Manifest b/dev-python/raet/Manifest
index 657514d4ba80..e44e17815dac 100644
--- a/dev-python/raet/Manifest
+++ b/dev-python/raet/Manifest
@@ -1,5 +1,5 @@
 AUX raet-0.6.8-msgpack-1.0.patch 8061 BLAKE2B 90607848542b8ba5a219a872f6f4f4e12546ebf12e1d38cfc3c3259282eda97a641fcfa587646e83ffa5e98d5cc3b0e77c032ebf2358a5cd603e2ac58ad9a114 SHA512 524e2c787386a885796a3666dff792d7e2808585658227acbab51c90c7ebfdfb0435ea67bcdc23e9be6b43364452e23a085d4843e4c1ee1dd576e140007c4293
 AUX raet-0.6.8-py310.patch 1893 BLAKE2B 26dfeb901c64aa8b0c8a63f8be4e02ce65a99eea5e2f81d15be9eacb686a0d13bfe2e41588ed214a78906db2e607e1468f8c477a1c5dbe67cdf7cfae2d16da6a SHA512 d15618790b20e4843ed04a1ffe17acd3b31cf51388a9764c0f8ee33a28d503345dddea8da93418c6b46291ca61e4faf6fe3351935365909d1cfde5fc18d43f6d
 DIST raet-0.6.8.tar.gz 807419 BLAKE2B 2370eb55b76a52cf89363f9891a411ea7fa2f27b84bd216c44010fd9afb5dcd9261570f916db00ff7bd922c485cd6123b3a6522154b6e05f7869d7e790177f7b SHA512 01279e7414ec3edc9f2bc0641cb9e0606ebf5700b5ce37a05fd5919f3274b3b43aad64110baf4c4b1fda3843cb1a87b6be4ab592a8f62e82b3a716a86ae61b20
-EBUILD raet-0.6.8-r4.ebuild 991 BLAKE2B dbdd04ec23a4910387483528e604a806728193e69222e0e2a7a712bb43c945dd9aef200f430cad9acf7edb61c268b4df94239856273755d1afb04b3aee8f1f24 SHA512 1efdc85618a5daea5104ea914c6ecc127d2797ed3a543b276b70a890d25c1359f7f3d73bb8a1cfb8a3ef399bd50fde7c70b9682a9136eb2c70e2ee4355712bab
+EBUILD raet-0.6.8-r4.ebuild 998 BLAKE2B 859638beeed370b54d3ff652c882f5ff240f29a7d2137cc7cc57fd08d92e2add09880988ddc3f744180c40d2d71a895e9e5a117a7193148fc66f560108bc89a2 SHA512 b0e2dd715efde127026979afbd3d4a4a1b4fc4425e748caf10c0cd19ab6e6f673034deb98eacacdf76aab10d30f180d69e52d3a761635ec3231ddb056c5b1e93
 MISC metadata.xml 475 BLAKE2B a717b6ad3a8b2cdd4b4c48c6fae1226e92080952af627757ac935a6bc8beb3fbf941d6aa0c631281cedadfba5d10d95d6a9b5c8e4a3a47c8da800a7e89fbf8ca SHA512 605d31af6fa66007c18033eea24b7de74b8529996d9a9a19e9e188fd83831f83c5d621aff03e423d25388fca790970de9add12a10ce300aa90bbe08226f6a8e7
diff --git a/dev-python/raet/raet-0.6.8-r4.ebuild b/dev-python/raet/raet-0.6.8-r4.ebuild
index 279712894829..222b90704843 100644
--- a/dev-python/raet/raet-0.6.8-r4.ebuild
+++ b/dev-python/raet/raet-0.6.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 95daa4b382f9..de4052c78f6f 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,4 +1,4 @@
 AUX random2-1.0.1-py39-tests.patch 1264 BLAKE2B 8a9010deebf3529bc968c6b05a84a2034994455874a1b011d0a711da5ca863ad1aef4e462e7d5f6183121bd0f01e2f2270e057cb2c54d907541e9a0e491f09c7 SHA512 20164add503f8a6cf8750cc2e95baec382f3faafac8ed50046b61e5b81a9a2da4033f8a9f196e3ce1516dfe21228c2d25e3957eed3c85bb1c8aeda284a864d1b
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1-r2.ebuild 522 BLAKE2B 7879648d7168d78e20c3f3abe9f8399d03492d65a84daaa5098550c5d034d75a699c9e7559a9251a722aa1dc77b3dda9780747a4d5afb8dea6dca22dd51fae00 SHA512 84605bf1a71cbad616668fd5e3752eef2a5a688b7e01a85ad5b047d5c8dba16692492896e70e14bef28fa5e3144d11cc92683e6487b3eab5e444f045e291c60d
+EBUILD random2-1.0.1-r2.ebuild 522 BLAKE2B f657d837672eb741fcd112c8a24c1aca28d0191aae69e5f80e9a38f01f20ea7624d9ad9c9e5ed66a3c02e8e9a11d6e3fa118240d13e363f18016dc998c49f6fc SHA512 09fec47e106c41ad20114cbbd9773e3c0acd446281e913db388dda15ce16195df43a4265caa2aa7dea13d25488703c388f3589289ec74ac2b2f7a72ae7329b96
 MISC metadata.xml 317 BLAKE2B 8308aafb7ac32af516a3ae84ce565e825a376fa226b11657b4175a847961159468bf474e0b293ebde604ef2ec7881b2fe8f71aaf4c326f9cdcf39acea3edc2dd SHA512 f569e09a6f9d184b6261fdf01b7568727d267c3e66b1f450b55b31248b757269d7c0bef6e87e4b3a4b1937c8dd4115338b484fa32a84fc3b4cc8b41450f3576f
diff --git a/dev-python/random2/random2-1.0.1-r2.ebuild b/dev-python/random2/random2-1.0.1-r2.ebuild
index abc7460ee960..1bede88ea6f1 100644
--- a/dev-python/random2/random2-1.0.1-r2.ebuild
+++ b/dev-python/random2/random2-1.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 516103a9b12d..cf48c086560b 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,4 +1,5 @@
 AUX rarfile-4.0.patch 598 BLAKE2B bf53d965f61a693fd9e26d8d6f3c3305fe31371363ddfff6e21e48a98ea2386b7effdcce6f615c553b3a764da73b72791612b723e8432de1a156189e93e062f4 SHA512 2d3b37f7b58e04ac9f880eba0751f38486bfd17e3c96b6b6f4e08a6b8b70a5cb482af4b8b5ef3c46ccde8f7bb848c84e123d950687cb91930ab6304e7febba57
 DIST rarfile-4.0.tar.gz 148026 BLAKE2B 331548d54dcc3d81c690cc383e36e3f00515999c72abb54060e0dbb34691bb7e06736318a33ec349492e27e561ed2f4ff4446cc5254e9f341f4633adaab878aa SHA512 05e15acd749564288d4f069970ac196344c33fd2710e918b84afe4c388aa364a17c63f86577037524336e3a022f6db2c8619f9b526f89e00753a8ab0d89263d4
+EBUILD rarfile-4.0-r1.ebuild 579 BLAKE2B 81a90e73d39f556416cd6dc5bbf1ba1d2f0babeb0e2031accdd6fcbe15dc78ce6029f0f36527fd020625bf864c6cf7dd1d635167738b68be87ba58e1bba22ae9 SHA512 b37c7a3339c7648d5315276df719210a1c41f1d06d08a6555deb39f7af1f9589c298703844b462268c905f032272e5fcc80f8f2934a66f827a3a3afaabdaa073
 EBUILD rarfile-4.0.ebuild 546 BLAKE2B 7c44ea066e07eb280f221c5484149e4dc5fbb7a891d4a31b2941bcd2db8852b73e312d7b10e255df932ba6eb4f5045a003c98a6e71b6fe40e37b875dcc1350fa SHA512 aad82ecac0845d03598339907c3a2c3c95ea452039d9cac9862754086466f5e6bbb49b406661b35db89eb78e67925731f92fa41aab35f58405bda089216370ab
 MISC metadata.xml 531 BLAKE2B fa977e37331b11cf627c551ca3d0e579338cd3ac43d761e5d6f120caf1386cc18d602770376f1b64360911642767cb4b3456d235270137ebc772fc02791e8665 SHA512 8d2d3de2fc185c657aed70818abadcac021c679e352774f941bf6fa908dfc383139c2343f5695e21197553724f75f853ed03cafc9413640ca6a4257c6e1867b6
diff --git a/dev-python/rarfile/rarfile-4.0-r1.ebuild b/dev-python/rarfile/rarfile-4.0-r1.ebuild
new file mode 100644
index 000000000000..8c383b1620e6
--- /dev/null
+++ b/dev-python/rarfile/rarfile-4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTLS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Module for RAR archive reading"
+HOMEPAGE="https://github.com/markokr/rarfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+compressed test"
+REQUIRED_USE="test? ( compressed )"
+
+RDEPEND="compressed? ( app-arch/unrar )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+distutils_enable_tests pytest
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 9ce1b79e3893..fc678dccd17a 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,3 @@
 DIST ratelimit-2.2.1.gh.tar.gz 12366 BLAKE2B 7c810bd111202ef6cd86a789627367665457eb2fd88f13d91b18c934210b72f8f4b0ca1ae0e26b502234c4bf3e74d1c6608260d51a022f9f733d10eb061de023 SHA512 a9a2347e9f9e152e5b1ffcf346cf750c5c52471aa2216b485d989edfc55686077990676a35e0125277313ad50a656a14ab72b7aac61b661e2fc4ec74611b5990
-EBUILD ratelimit-2.2.1.ebuild 542 BLAKE2B d42a37cf7c65da5d617000a6d8c06bf6f5bad43c896612c897e1f08a5ccdbd97c99960c047ed16796a11590b86864cb32799d9a798f9241a0c35bc8bcdc4b452 SHA512 6b120be4ba600e3e664baedc5de186cb32442ad36ba893996ea11847f4c1e3f5abe0c74597188840cd5e9ce883bcedb54080095cb0b1f67ef9254dd13053df05
+EBUILD ratelimit-2.2.1-r1.ebuild 574 BLAKE2B e2cf708c7a9c77c5829a9b23e3c75d3709acfacef51bc1754d27bb9378d99c0ab7645d238034662027087ca9367ed4e3b276c0c80d81161925a8405320a20426 SHA512 99f3d0837c05510cb4a6af565721d9c0ba8d5ecbe705f4853f238d100346b5258d9e40c8d8c5fa4bcf1d3f8679a40f5f42afbb395680352deb45f280c08234f5
 MISC metadata.xml 820 BLAKE2B 9e052ae412570ce5ca7ed5a001faec65df8dcb5d43aaea653457b19f285143f192be11fa3e0fa463ffb82f3db720bbc01438c695503e1529497aa3a864f0ee66 SHA512 8d4d294bf2a966244112f55d4519d2876de7d3500254f2b5c4c700e2d6a16cdc7caa6c1f9643f9622118e1d5703038d9bb2d1c42f319c8be5c729b88ee900dea
diff --git a/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild b/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..8506452099b0
--- /dev/null
+++ b/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="An API rate limit decorator for Python"
+HOMEPAGE="https://github.com/tomasbasham/ratelimit"
+SRC_URI="
+	https://github.com/tomasbasham/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove --cov args injection
+	rm pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ratelimit/ratelimit-2.2.1.ebuild b/dev-python/ratelimit/ratelimit-2.2.1.ebuild
deleted file mode 100644
index e94fd565e17c..000000000000
--- a/dev-python/ratelimit/ratelimit-2.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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="An API rate limit decorator for Python"
-HOMEPAGE="https://github.com/tomasbasham/ratelimit"
-SRC_URI="
-	https://github.com/tomasbasham/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# remove --cov args injection
-	rm pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/rcssmin/Manifest b/dev-python/rcssmin/Manifest
deleted file mode 100644
index b8a6064b597d..000000000000
--- a/dev-python/rcssmin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rcssmin-1.1.0.tar.gz 580779 BLAKE2B 162ec087b791a4ee0c23994cea431e01f76c199c1d2118a75c9e49ebfc0d4f46fc4088126032851446acf2bd7b76b8f17095896100338636f4df8de75612f55d SHA512 9dc7fac0fef73c389baf8fc132e58599471517a2b77b13fe6bfabd30246b46bf859f7307ff1606d6634bdcdc472bdde0882fe7282018a34fba7b8fc80f6e9279
-EBUILD rcssmin-1.1.0-r1.ebuild 595 BLAKE2B 05aed0d510e0865dae3f410bab486db2d4b227821bd786717f93906c49c090425f7a2c2c49b50b4f184e0326c1dc3641a7a0b491710208f3e7f8cf2d37de83a0 SHA512 74afe6452a8babbf05c69eff93828987b96b2bc2b03addcd733704a6bf687e3af1e58c67244dd68a21b9992f9ea9e88161503608d938bbb9b64800c943a626a9
-MISC metadata.xml 294 BLAKE2B c502bfbc75a7d9fab19f1aba913da9d42cb64dba2e964042e5fb100b295ba512ede3425456731d4d58783f044e1fd029248fddf9c877ae1e37af6b48915965ef SHA512 bcc3ec707b0de17ae43be3832957bedb8f2f46b7ef3790edc44456713f9447fdba7c8ce269181a6750415d8a41d2bde5fe68530ad64040fd97dcbb7f44728001
diff --git a/dev-python/rcssmin/metadata.xml b/dev-python/rcssmin/metadata.xml
deleted file mode 100644
index 8dd7e4b3e18e..000000000000
--- a/dev-python/rcssmin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">rcssmin</remote-id>
-		<remote-id type="github">ndparker/rcssmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rcssmin/rcssmin-1.1.0-r1.ebuild b/dev-python/rcssmin/rcssmin-1.1.0-r1.ebuild
deleted file mode 100644
index 414a710c2392..000000000000
--- a/dev-python/rcssmin/rcssmin-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="CSS minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rcssmin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUP_CEXT_REQUIRED=1
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-}
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index a0bf2387e602..5f81a1b2ab64 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 572 BLAKE2B 114316530def4015d6252051453669b59b724b6c7fb752ebc0fe1f6e20fe7e40c7c2f97c70f4b4918996bf5f63b34c633b35369d5d73baacf70a6bae1238eaf4 SHA512 af5ed428087ef1fed19eaeefd54d49a3e6422f527ba3dfa281bc6a615dfe85ce0c7f9d8158ca48caed997c8e8dcab937eac2f9f365a8cd942ff36d107015e1ca
+EBUILD re-assert-1.1.0-r1.ebuild 650 BLAKE2B 38276ca45bb45547be1d5dd6d157d907b9f33438b704641507fb324471ab33952c58b01def083ac838b32b8961d259c7d3af8501910e48f8e54c5dcb84a76987 SHA512 f16845687aaa622f92ffc725b621a54de392ea66a8c323eda21eb7672bf11653b4ab0a47670c39d3b4138a4b05da7b024ff71748c729e2f961f9566de5bc22f4
 MISC metadata.xml 395 BLAKE2B dba34f6404c171596f781768e266b2e3ae21b2572db8695c6d17ffac5cfd91ea63ade4dac01b4961a5b691090ad6940d11cc82b629e6abc71e7b393c70e1f572 SHA512 f6c637f1fd777a2382954939e57c07aba53287f9a148ff19c6444ef249d87ac0e1d003b8ec2c2bbf396f756169dac2205bf597f16f5334a4f94e0032a08fe299
diff --git a/dev-python/re-assert/re-assert-1.1.0-r1.ebuild b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..4826d5328163
--- /dev/null
+++ b/dev-python/re-assert/re-assert-1.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Show where your regex match assertion failed"
+HOMEPAGE="
+	https://github.com/asottile/re-assert/
+	https://pypi.org/project/re-assert/
+"
+SRC_URI="
+	https://github.com/asottile/re-assert/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/regex[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
deleted file mode 100644
index 63d0e6096c9f..000000000000
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020-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="Show where your regex match assertion failed"
-HOMEPAGE="https://github.com/asottile/re-assert"
-SRC_URI="
-	https://github.com/asottile/re-assert/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index b853263ecd84..49bda4599199 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-34.0.tar.gz 28835 BLAKE2B 556088064a27ca0ab556102a9bc7026f5089e8a326631c0b7d3d5d0906b63191fac1f4f473c5c3229c0357b090bb63c8bbf0cab66e793c5de0d8eb8da696d2db SHA512 835beadb6dd98793cfce1a1691c66121ad2df9d205d9e1415bf8555495460af7003c9153a58fe5ea0909541b305d2fc4a39120f395805514e11fe391783447a3
 DIST readme_renderer-35.0.tar.gz 27224 BLAKE2B bb58a6cb39aace47714aa351c710663ca9f43f04055e21a5ea3954b2d1fff58dce073b0a41bdfb07f34ffe16f2fbba9ba59c2a6b8f84c0eacfb7d9f7cd881380 SHA512 29377cea5a029f7c4cf2ec0362771a280936e84fc39117c13fc6557172581570af298520ea6f5df53260e1da539ebe3fe4183bd1fb5620af48824bee04fefc75
-EBUILD readme_renderer-34.0.ebuild 810 BLAKE2B 2f6596e00bce5cae7e65cfd01efde0ad59db2176c9842753dbc27b6720cf716e7b9255a2d211251d0168dd625093c80fa225c3a528f4e4f6d6d05319943c1b03 SHA512 c23162e3b5a249dd717a9818b9a8b5399fc05ee826466f16c3a7f7261238f1d55ddc8eec509c4fc34b9bc68d3aed6b888e932df8eb0bd3a61f57cc3381935285
-EBUILD readme_renderer-35.0.ebuild 831 BLAKE2B a9b4fa1d2957da7f1e56d21bc6a63d06641123759a97da1c50f74f5c20a27dcd2c31ca012fbb99838eb351eb65efcf723d94e936a63689b72c0bbf91766527ad SHA512 a3ef9fb8f135867e1bde55592b336af4cc4c6198c4d806408067359b6438e8f3f0907bab2b9f73474bea7f3a131ddefe0925deda69d57120e3f59f7c8bbc06f3
+EBUILD readme_renderer-35.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-34.0.ebuild b/dev-python/readme_renderer/readme_renderer-34.0.ebuild
deleted file mode 100644
index d4550307dee9..000000000000
--- a/dev-python/readme_renderer/readme_renderer-34.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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-35.0.ebuild b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
index 35fd2b513a00..8546ba34f288 100644
--- a/dev-python/readme_renderer/readme_renderer-35.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-35.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
@@ -25,7 +25,9 @@ RDEPEND="
 	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
 "
 
 DOCS=( README.rst )
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 5af219146c3a..2c0a5cabe372 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,5 +1,5 @@
-DIST readthedocs-sphinx-ext-2.1.5.tar.gz 12351 BLAKE2B 5cb3e821b04dabb492cac194ec3be4cdf5874811d8e57556c653611d4a1e2d57a38c00492662d1530f25f15a011834a7966af4c58b9f8f8fe71559753cf3d79d SHA512 0d2960ca55bf9be4faad0a8aa9cdcde74aaa69529b98be6059377ae037ce447d5919617fd8d4afb85ece6dc7f2693426e1a5574049025859e300211f7a5802fb
-DIST readthedocs-sphinx-ext-2.1.6.tar.gz 12343 BLAKE2B bbc1b80e18c1023ef498b7508b1acc400279042ec224bb5d51e60eef586ca2a95a740cddf4bf4a2f165c7012a521cff01196286ca21a51c5a0ffde03e2bdb70f SHA512 f9a4cffbd8939162c2a439e08f5f52a2313f00f42b3efecd4fa1431aa85aac205afcd04b5ecda089a4a239ef77e4f885a7cba9884219229b7c576f173bc52b14
-EBUILD readthedocs-sphinx-ext-2.1.5.ebuild 802 BLAKE2B ae1cce36b673028820bb4b85c91abd963fec2d291660e578f986840c1fb0e25411fe4725dbde28aa3477548972e46585d5ea4e6709865801e0fa3f900c71d083 SHA512 3f5ec3a54701c4cf7932f8cabddd000be08c089954417126008dfa75844cdf126956065f79fb5ffcdfed6636ed589c021c9d65f2d61c861eb9280631306928bd
-EBUILD readthedocs-sphinx-ext-2.1.6.ebuild 864 BLAKE2B 56b18805a4ae1a7ea12d471983d99ca076858da74b6b52de7edead067bd1f1f7775865ec247a3650151516b430e16d4f5cd3efd4dc5c1326a4a2d1d37c481570 SHA512 ec2a32f73a226c14db350f94892a5a4f8080d8bfdec20ea90b49609ab7bed57791cfa3508a46fc53fc87da3edecd4b5bd0b42f335e9ae827ce664d69ae8b33c9
+DIST readthedocs-sphinx-ext-2.1.7.tar.gz 12351 BLAKE2B 4646016330591dd32d7065d3805f6158aa57aaee44848e91ac7550149a151ed32ff0d6945165c0112e39cd211126b773713ef8d8f669156c36e9f70a24afbd1b SHA512 bbf4a0e266248374198eedeb84b9866cb69e7a8531bbdbb6ad765f2d7013aa1b0b51cc57205b59be04592959b026c71e887035e663b7eb2c0ed6769272542162
+DIST readthedocs-sphinx-ext-2.1.8.tar.gz 12359 BLAKE2B 9a1c66725d4d48b6511462c5eea5d87fb28962444f8ff921208579bb2118571da34d2697d2bc91dc1ff71a2e3b7cb1c5b20021bc2f053fffd34f4eb0ae99d387 SHA512 2766c0ce69d7d3738cd454c8d3e733542849e6cd96414e1714f337defb62f9260c89a00c9bcc26582e15ce1629d61c48441826c2af84d92da0a6a5b65f474891
+EBUILD readthedocs-sphinx-ext-2.1.7.ebuild 856 BLAKE2B d8e5cf1d9446624b4e95bef4b4495b4fe86ebcf437f88276141c57838c0f1d00ddaef03d3fc9e5c90cfc2ded7a85873090df8da607cf95504b718558444c9990 SHA512 a6484aeedbd3671d83f47bde0d8cb672d83c8ebdc6150134728335770dde71ee618d57e73bfa2d1997dfed4900c8511883120d02a0d1bf823e3402521bbcacab
+EBUILD readthedocs-sphinx-ext-2.1.8.ebuild 818 BLAKE2B 0577c3804c389514548329dc565f19a425947d223e738f4ab046a2d079608aae4e2ecd53407fbe66595cd2b65781949d407b96b4bb9e4bf8167320a796746492 SHA512 2d14a88470c821f084525158924ef57d07cd6d35f1bb0d96552b4bd6edc1dce2b3aea50b88d5e5ae6e928b9ec293453f5c44e4b68ce8fb599e4ccd6a503d4346
 MISC metadata.xml 350 BLAKE2B 39fca03d3a995a65683f45a330e386123ae2efaa952f3bc0a6153708008941ddabff9045b480b85551c3fc26166db3aec9daafbe87a91d18dbb4041015d7ec66 SHA512 c116ddd2f8b70bb1c5d0bfc876e60ce35dff1fa7ee2c83a26992f96960beef17c0fb743a7ac5b5c41a3028422c2f342dd683ed503752f7f6390d9987ff8a3057
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
deleted file mode 100644
index 13e08b6d32eb..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.6.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.6.ebuild
deleted file mode 100644
index 63333c7b8aee..000000000000
--- a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Code specific for Read the Docs and Sphinx"
-HOMEPAGE="
-	https://github.com/readthedocs/readthedocs-sphinx-ext/
-	https://pypi.org/project/readthedocs-sphinx-ext/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( ${PDEPEND} )
-"
-
-# unittest should be sufficient but tests are very verbose, so pytest's
-# output capture is most welcome
-distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild
new file mode 100644
index 000000000000..8de94e25687e
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/readthedocs-sphinx-ext/
+	https://pypi.org/project/readthedocs-sphinx-ext/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${PDEPEND} )
+"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
new file mode 100644
index 000000000000..e81bce103439
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/readthedocs-sphinx-ext/
+	https://pypi.org/project/readthedocs-sphinx-ext/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 0249bd381785..803671ab7385 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,3 +1,3 @@
 DIST rebulk-3.1.0.gh.tar.gz 252775 BLAKE2B 9624a02f8df950e3efa77c0fe7c3dfa083c255b10c118a571aa4f4fb8ee95f663f7ba45e66e77ec4c3fb801a6a1e8e369b04a6ec1323aeed6c8b13deb286614c SHA512 591bbfeef1d472722d6250cd35f308c0ac9c5f2dee77f4702f1d9fa1e41bb1a16bbf7c4aa634d0b4f43d7f9093bc1e2faa38edb0170212fea2502ff6a284fcab
-EBUILD rebulk-3.1.0.ebuild 753 BLAKE2B a45a31335f30b0aa805610e459da54f1fcbeacd7e355f6c1418674244ed648e9697e0767e592db5a17b4f81ceab266c188c35c75a098e6b09dbb9e6d66df79d8 SHA512 4ba66cd30cb914403cb6ac690856c5feacd845717be926bb4e4de9fb32f47bf2640879d89b5be54ddde0bc78e15c5c0f807fd9195303b51ce8db8f0254cb30d4
+EBUILD rebulk-3.1.0-r1.ebuild 792 BLAKE2B 62190f75dc3d071233dadf9cd3c499e44c111115f053ca67d21137758e6a0833b6ed7af55ea4b10238f0aed40cc472a0995ba2fa4784cf6418985e8001acbb09 SHA512 6b386e62bc8a98762d9088a4de2a98d7c590bca5b74b8fd55704a63b3e339d6a5fdf9f5079a0e4fde123755528fcffb366dc07a157df3280fd58a43b1abebf72
 MISC metadata.xml 387 BLAKE2B 3c0709f462a60d8a837b1e1dd7321d2f4d4c7715beadddb282ef3d78fec4092cd53611be561fa2cede086f82bfc38e481bf93e50d0f3a947d9346715efb2082e SHA512 89a819bda60288b8f66a8b426caa18d52dfdc476867e4b35c00eb1cd4b069833c94020e3315d135c736a1dbddc30e3883ddf6007cd54061aa431d3ffce58fcf2
diff --git a/dev-python/rebulk/rebulk-3.1.0-r1.ebuild b/dev-python/rebulk/rebulk-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..83e6b774ff5a
--- /dev/null
+++ b/dev-python/rebulk/rebulk-3.1.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that performs advanced searches in strings"
+HOMEPAGE="
+	https://github.com/Toilal/rebulk/
+	https://pypi.org/project/rebulk/
+"
+SRC_URI="
+	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Remove base64-encoded zip archive with pytest.
+	rm runtests.py || die
+
+	# Disable unconditional dependency on dev-python/pytest-runner.
+	sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rebulk/rebulk-3.1.0.ebuild b/dev-python/rebulk/rebulk-3.1.0.ebuild
deleted file mode 100644
index 07104a1fea0b..000000000000
--- a/dev-python/rebulk/rebulk-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python library that performs advanced searches in strings"
-HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
-SRC_URI="
-	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Remove base64-encoded zip archive with pytest.
-	rm runtests.py || die
-
-	# Disable unconditional dependency on dev-python/pytest-runner.
-	sed -i -e "s|'pytest-runner'||g" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index dff5774d02ea..448ba254fd79 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,6 @@
 AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
 AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
+EBUILD recommonmark-0.7.1-r1.ebuild 812 BLAKE2B 5805f62ae3b1af6ab13250f47baa24b883282ef0f75f76d7fd0e5190471fd6217886e6b189d8d81cbcb31bdbe2de0a0a6de4f79c0bdb330ec14420f49920ffaa SHA512 d0b0e64da290d4634666a55d2834ea75baa155092dda8e29262d712e89bd802c69ce27ee3ee38d4c1485a104deba22ed92abad3c1afe8da0e266446bc41a89c2
 EBUILD recommonmark-0.7.1.ebuild 773 BLAKE2B 323f01c99250e0a4f7247336d6eef7f9c4e16c685fc9aab37c3e2c4a820eae340eb5d80888256677966a73f3ff28c4633e4dce2dd9c04f675ac55fbe7819ff43 SHA512 2c89006cc89d74c821498a5a447b824120d4fbe80f66070d73f64e07887881ee6ee53d191c5f5fed7c4f7c1dbb3f31c03f87fa97f6543b76be4d310aae85c681
 MISC metadata.xml 417 BLAKE2B edec6b1431f7ee81baf5668ef5b0b8e65e01cd936cc8e56e6b71b27463faf2d24b70fc6bc85b6a3298146b4384d28326c0929b8f61aa0c2811765395d1e03dba SHA512 420722dae406a557f45ae5f7e57a7cd38d5b3b2d7419e41d4d4249975947524dcc26fbdd8d6fbee216af3b07763d5955ff0a7e30968397afcc0278ce71d4e87f
diff --git a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..5069662f14f3
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.7.1-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 5cd0d1f8d1f3..edb4e2bdf342 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,9 +1,9 @@
 DIST redis-py-4.1.4.tar.gz 2352106 BLAKE2B a7f40d381e3e1d295d2ce88f0adb897704d0065ee7d5bb00108c2c8c67ef649ea63d4ca06dbbe2b21b2f92d70d96f8e2d32a7992ecf702bb4c73589f30c1bae8 SHA512 6dd1bc7622529382901b2fe6e63a5f9d6a4b89175b486c879a63cc8f0e708737431dfe5b834124f0d33f34540ac54813a0e6953bbed3a9dbd226597b4b1cb3ae
 DIST redis-py-4.2.2.tar.gz 2421362 BLAKE2B ab59a649e8bc08d706536f994f0462505cea39828072884739b1a6434b45fd120e3b8acb51e8e88ec9fe0ce9acc0bfd6a5ff92bb67080724c7b121ef539af16f SHA512 80673d48cd97af1c5ebc67e919f16891ccb20cd30bc06619ddffeb117ad87f82b73f9b9bda6d36829bc51a35aa3c9b2af7c879ec665cc9664bdd86ac6510095b
-DIST redis-py-4.3.0.gh.tar.gz 4605505 BLAKE2B a7cdf8941f99291f6c6f53e6b11b1cd45fd64d0d96e11848d648964518a970275152c00c3aec3a0342ffc5a4805624344076154d007684ce90137f37df4d90f7 SHA512 881f250f04cd0376d2e617ff07cba3c4f987574d64b0813890310412293c7825bb11a5117b65b27dad05bbdff250f44a736d542ee116034b7a644c6e58f981fd
-DIST redis-py-4.3.1.gh.tar.gz 4605537 BLAKE2B 239dd9be0e6c30dbaeeb609f222802f33e4a4e4a743fe1f348f542fe899b89e47ad9513bf99db713d3cbcb13df0e6593d4631745c3afc3368f8a9e8333b759a8 SHA512 8d38876fbf3593825bf593188a9749bec0f652907f510657e32043ed26fd6d59b1554870f59af65939754500645e4c4c8f15bcb8eab1385a0640c374aa938643
+DIST redis-py-4.3.3.gh.tar.gz 4610718 BLAKE2B 7edcade0d1d192d49480b10ddd635934dbb8a580e3b92e4cf2fec995520fa26f805f258f1af0a22077c1421f6a7234674c5fbba0da029d0346ab2019b40c88df SHA512 f16e8367258c3042ab687b7435cf481a64e89acd0687f6ee5ff1babe7b0bf120300e38601e8c3c7f0d8a864774c5f77e856a0f720e9eae8bc3a1711fb342e62b
+DIST redis-py-4.3.4.gh.tar.gz 4613714 BLAKE2B cea5a6455160c67c9ab3b8f9de8ae47aed97e7bea1e408ce1a001afe3e0c4a7a14220887504fa40c749d15be9d89f77e36b6f7a785e0ff22a49037b6ef245e87 SHA512 55dd00c15cedb82cb5edd46b1f18f32c0accb8c85b1b94bbfe04591dc07f6151ced81cbfca8ac6fe88a6743bf5abc50309ea23bef96bf4332a712979c61ea0b7
 EBUILD redis-py-4.1.4.ebuild 1918 BLAKE2B c1646652b418e9c7e7e19c086f387f517f0e2f1367e3d93b83c6bb63eae38f376f1cc82d2ad49946f2b51f580e3170487416be43a796bf6f68b1ca2b138cb3af SHA512 9733635fffe6f1334cd371dafa897be7820fdc2e4bf9ffc01ebb563586c27bd84f3f51f15ad49c2790ea83cf6598362aed272cffbb6b50596e0912f3d64578a2
 EBUILD redis-py-4.2.2.ebuild 2072 BLAKE2B 10dee545afbf0ca9fc16cb8192297c37087e2fe65b36e46d51ff2c708906c29dbc5042a9c8a8fc5c223bd42f1da6ba3c1c70a6fdd43b26826fa851ced772c77a SHA512 a9995670abcdcd506e03c327e8bb108d63b3580679822da114fd09ff88f7e9e8683d69da2f0520f545ac739589c94a2c806f21ba44ad5db76785f89783b7e092
-EBUILD redis-py-4.3.0.ebuild 1768 BLAKE2B 3fe4517f814c2b988e8cd3b2e365571fcbd83a3acbd3cdbb09333b623f0d33449753732a8fff0225b0eee4968db4c2f35b401fad12c9196fd97e6249a0acecaf SHA512 438f563959b683978b2700e59379b14ad0013bfad75f6f3a43761813faa83563d3da6221e530626e7a7468228c9518dc5cebb4adc4f04f55e16677fb7b88a71a
-EBUILD redis-py-4.3.1.ebuild 1768 BLAKE2B 3fe4517f814c2b988e8cd3b2e365571fcbd83a3acbd3cdbb09333b623f0d33449753732a8fff0225b0eee4968db4c2f35b401fad12c9196fd97e6249a0acecaf SHA512 438f563959b683978b2700e59379b14ad0013bfad75f6f3a43761813faa83563d3da6221e530626e7a7468228c9518dc5cebb4adc4f04f55e16677fb7b88a71a
+EBUILD redis-py-4.3.3.ebuild 1768 BLAKE2B 903c69a5c916873d69fe39816dc97ea127525763c4b335a0169536c2b245e0ee0af4ad917e5fde6b138290c6bb84a6d7e27be87a70ce8edeb622fa3d49f5d9bd SHA512 b176b69714207b864a0f85b8c35228ae46d5a4be889e9a07fe641a48a6e85ca067e123161f15bb0b5e32fa400f5ac1f42c4ea3e686d5bd765e56ada368e7e9ed
+EBUILD redis-py-4.3.4.ebuild 1768 BLAKE2B 903c69a5c916873d69fe39816dc97ea127525763c4b335a0169536c2b245e0ee0af4ad917e5fde6b138290c6bb84a6d7e27be87a70ce8edeb622fa3d49f5d9bd SHA512 b176b69714207b864a0f85b8c35228ae46d5a4be889e9a07fe641a48a6e85ca067e123161f15bb0b5e32fa400f5ac1f42c4ea3e686d5bd765e56ada368e7e9ed
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis-py/redis-py-4.3.0.ebuild b/dev-python/redis-py/redis-py-4.3.0.ebuild
deleted file mode 100644
index 9f000b888e29..000000000000
--- a/dev-python/redis-py/redis-py-4.3.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		<dev-db/redis-7
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	# 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.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis-py/redis-py-4.3.1.ebuild b/dev-python/redis-py/redis-py-4.3.1.ebuild
deleted file mode 100644
index 9f000b888e29..000000000000
--- a/dev-python/redis-py/redis-py-4.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		<dev-db/redis-7
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	# 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.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis-py/redis-py-4.3.3.ebuild b/dev-python/redis-py/redis-py-4.3.3.ebuild
new file mode 100644
index 000000000000..2ff14c069707
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.3.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# 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.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/redis-py/redis-py-4.3.4.ebuild b/dev-python/redis-py/redis-py-4.3.4.ebuild
new file mode 100644
index 000000000000..2ff14c069707
--- /dev/null
+++ b/dev-python/redis-py/redis-py-4.3.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="
+	https://github.com/redis/redis-py/
+	https://pypi.org/project/redis/
+"
+SRC_URI="
+	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_timeout-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		<dev-db/redis-7
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Flaky test
+		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
+	)
+
+	# TODO: try to run more servers?
+	epytest -m "not redismod and not onlycluster and not replica and not ssl"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	# 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.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	# "${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index 22aaad645606..451a419e4e90 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,3 +1,4 @@
 DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
 EBUILD reedsolomon-1.5.4-r1.ebuild 791 BLAKE2B 6690500f52bbdae8e9aeaca4248b1c3d02c56b5f3aa8f2d5acce2d5f296f62f532700b0873371e36aafbc22ff5101c3008cf99c602f9a52668014ade05421323 SHA512 fee307951edae4c67812f2b934f9a564edc292b2cbadee5dec728e87ab0526de7dc32d8f4e9141d95000ae648785e21ad6f054c91a8c47975cd06e51a4d606e1
+EBUILD reedsolomon-1.5.4-r2.ebuild 823 BLAKE2B 4497a8c2f58c4783779e42895827a25a707973a478b83df301ea5bf88b73fc36a6075584891d2f134dca42baa01f80fc7623d6929dab4ccebfe68edd25f2472a SHA512 3d7a605e82c4bdba4f8d9b1f0fcdf8e99b4297417043592465e72468f9703ae2e64c28e522745c63a0b5d804fa871e5f1f2c8a91955bb2f2990ef4d5d87afd95
 MISC metadata.xml 532 BLAKE2B 90e7740e649abc65ccee0b33c6515689b33c33199bbaad9b30ebe8bcd4e86467526d8a85e50af308c69b82930506a942a57a8b50580c892cb9e6fa902b19a3b1 SHA512 76556763e4d00a4796435298017646c45f26c7bc913adc444dc97300cad75a91609fed422ed0f9dd6bca9f0e193d43ab8efea22d321e59e110f0e523be971eb2
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..aaf1728840ff
--- /dev/null
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python Reed Solomon encoder/decoder"
+HOMEPAGE="https://github.com/tomerfiliba/reedsolomon https://pypi.org/project/reedsolo/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+	rm creedsolo.c || die
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
+	"${EPYTHON}" tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
+}
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index fd84d6614a59..c5415a577c90 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,3 +1,3 @@
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
-EBUILD reflink-0.2.1-r1.ebuild 1140 BLAKE2B fd4712eab114ac219d612e9661cd45bfb0d56506a5c9d9b4f7baefab81a1b70c7dc9b24149bc54d7fc656fc8ae545ace107fc6b6ca41911e5963b5849e0e59a5 SHA512 1bb1880ee2b2031669ffa5baa9b9724372e26db7865be3dd4a63ec10635d3369ab517552ad9a1ec141fbd28d7418525a83ac095e202b683e38c8a77bdd4aa2b0
+EBUILD reflink-0.2.1-r3.ebuild 1139 BLAKE2B 843cb78a8b2b5114a3e2b3accc885ba3e9282206ee861c60af1e474d76f0a90b29323715514d51e9dba755136c919963776b6c6f4ecfe81ac0216ea19d2bce71 SHA512 3a24d6124e27cc295e07fac696de2c39f051c6f9f13f80a046ad9ff1b3aa7c86da0d599bc30c2215bce9d7f04962382dd3c71c67418efc7e87bb57c489f91c49
 MISC metadata.xml 494 BLAKE2B c3470939e469632cba9f41a54ebaeb727f54059f99d610e62dd82207ee08eabb36279d2ae7270b8be32de60da0e3fb301b3181693b26c5d9fc7f69b03122deee SHA512 8034be071497c8239e2e48fbd7993a1ab3d1875fd925a3d47bbe797f289949f95135f84a732f1edbd829009c266bbbfe9fc9d7ac43f22fad9c2d11ef18118d93
diff --git a/dev-python/reflink/reflink-0.2.1-r1.ebuild b/dev-python/reflink/reflink-0.2.1-r1.ebuild
deleted file mode 100644
index 6319755c9b2d..000000000000
--- a/dev-python/reflink/reflink-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper around the reflink system calls"
-HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}
-	test? ( sys-fs/btrfs-progs )
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local notestmsg="Tests need FEATURES='-usersandbox -userpriv -sandbox'"
-	if [[ ${EUID} != 0 ]]; then
-		ewarn "${notestmsg}"
-	elif
-		has sandbox ${FEATURES}; then
-			ewarn "${notestmsg}"
-	else
-		pushd "${BUILD_DIR}"/lib >/dev/null || die
-		# module import will fail with any other directory structure
-		cp -rv "${S}"/tests ./ || die
-		pytest -vv || die "Tests fail with ${EPYTHON}"
-		popd >/dev/null || die
-	fi
-}
diff --git a/dev-python/reflink/reflink-0.2.1-r3.ebuild b/dev-python/reflink/reflink-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..d70cec53ca58
--- /dev/null
+++ b/dev-python/reflink/reflink-0.2.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the reflink system calls"
+HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~x86"
+
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	test? ( sys-fs/btrfs-progs )
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local notestmsg="Tests need FEATURES='-usersandbox -userpriv -sandbox'"
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "${notestmsg}"
+	elif
+		has sandbox ${FEATURES}; then
+			ewarn "${notestmsg}"
+	else
+		pushd "${BUILD_DIR}"/lib >/dev/null || die
+		# module import will fail with any other directory structure
+		cp -rv "${S}"/tests ./ || die
+		pytest -vv || die "Tests fail with ${EPYTHON}"
+		popd >/dev/null || die
+	fi
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 3ce06e0fdd94..8a238f6dae22 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,7 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-DIST regex-2022.3.15.tar.gz 383001 BLAKE2B 459fed91a8996d6191ccd220869cf0c0e793f774552702c9aaec00882f71adae1e7378233811f6885d95b10db963d098a1d4c45aa0887c26d304df85fa9fb124 SHA512 99ef24b28dc5b1ec6a5d670698a98025aff14d082f6c24a3122157d28879f71c3ced2f5d2a3c8c6091609d93b7a500b2882b92b29a8fe1527532dd9f280cd51b
 DIST regex-2022.4.24.tar.gz 383365 BLAKE2B 743a27afa1d504e9653b56d868b076479a476108213137ae7157772d29824204eeb781f5d939debfa8da122e22acbfbea6d8c356b14ad9c1eafca2be5970fdd2 SHA512 2b9e83c7164986eceed5ae0e33aca9075afa022398684bb688064394cfa43f06b0ce72c15fb7ceee55b7793072c7b1d7709513faedce4719f0c406164e9e0593
-EBUILD regex-2022.3.15.ebuild 845 BLAKE2B f92f3806f613635bc00cb858a0e60942ccd44170f3ff5f08d307fa82e9fe8c2bceb5556f71bcf08d3c3802962f2d9f589c07fed5f33f8768161ea3c199345d05 SHA512 073ef9bca89bbdb4af7bdd5b0abaf4773c32a43378c245369f6963196a6d2a53a19e9d78bed80bb08744b4af383b7f5cd7de93bdf3cf076d1e0a017b5ce69eee
-EBUILD regex-2022.4.24.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
+DIST regex-2022.6.2.tar.gz 383342 BLAKE2B 48587a91366203301c517dc9cfe4f09e70905924484b906481bc89cf376854d406871312e154ac8b5833feeb50848636a95fdf99511df4feda4f16794a70856b SHA512 ce69a058aa05c471ce8728d29d5a498e387e5661d754d13bee51558a85f5e9e059a1464cc1b7721294cab421bae7219da7fd067e331e6cd6fd3dc464fdf0ecc1
+EBUILD regex-2022.4.24.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
+EBUILD regex-2022.6.2.ebuild 897 BLAKE2B 409dbb1b548b25d5ac390fdd799e88f54255462fe43a054bb079396a58d2124f06b619c9f97bd95e09a84fec93ed76f0904ace13a81f40ba34ab54fedc885e30 SHA512 0c57dc92862339020b9caf9e727f75f577fbcc3710dfbc8657ba403d7791e2a7a42e0866d6fe82640b2d674167c60ac51e259dd03ed2acf8260435f0b352fbfd
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.3.15.ebuild b/dev-python/regex/regex-2022.3.15.ebuild
deleted file mode 100644
index dc19a169b0db..000000000000
--- a/dev-python/regex/regex-2022.3.15.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2022.4.24.ebuild b/dev-python/regex/regex-2022.4.24.ebuild
index d864a4bd8ea3..df6875fb35c8 100644
--- a/dev-python/regex/regex-2022.4.24.ebuild
+++ b/dev-python/regex/regex-2022.4.24.ebuild
@@ -17,7 +17,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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/regex/regex-2022.6.2.ebuild b/dev-python/regex/regex-2022.6.2.ebuild
new file mode 100644
index 000000000000..d864a4bd8ea3
--- /dev/null
+++ b/dev-python/regex/regex-2022.6.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://bitbucket.org/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 45970ac02213..fc572684bf56 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -2,4 +2,5 @@ AUX rencode-1.0.6-drop-wheel-dependency.patch 493 BLAKE2B 368e3b618490538adee98c
 AUX rencode-1.0.6-fix-CVE-2021-40839.patch 1166 BLAKE2B b0ddee3e9ccc62d7caaecfec8d8e1363942fe65c9d931fac9bd609e8738d8a796c644e1657906257daf5161de0f1e7a5efcad31eb424dd3fc9508d5bf6d56f84 SHA512 885ecede3d9fb52eb09728e37863cade4800f87d09ab6ffc1e55d1ace90b8e197e4f3073f6fcf548f2e8e4b9d7cfadedb3190d556427e826bbd6b2ba48ca6cac
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
 EBUILD rencode-1.0.6-r2.ebuild 977 BLAKE2B 15a4a35f2c803a2ee938e9d1d524693c7b69137699824ae643c2e64ef893bb668e2e3d0132714bbd923a82813930d616620572ea42048e656c4b34b522881e59 SHA512 84f2e115729e2939111a2a10b16fa323fe23912e19705ecd71c84d9e61ed8b51f89d1a2e22088933599c6e37fcfe316a5cb14f5129563e68a9ce0ccd6de9cdbb
+EBUILD rencode-1.0.6-r3.ebuild 1009 BLAKE2B c862462bec51762e1a68468c60d56414862329f75e5defcfe1d7b268ba145222f931293ac0ea728ef445a676339be5961aa47493b71e23f554390c77c7c7d100 SHA512 2789006651c4be9c189d7271db7000b14af0549a022dcd5413a33130e9f9c243969e15b1b501af4ebe1ca31b3c1498157d2e3677d3a4ceb1df42027719afb9a5
 MISC metadata.xml 712 BLAKE2B 0d5545f8297c043a09922dc92765fa62ed6aa3fc77fb69df2208a46f298a50575b5235780c174a044df7f0105b11d1fa9667b77d152bb6f1b91720976200f26e SHA512 10b0ef1c5a426a0ab03b157967710193ab783382619191530b4f9a27e352879c5e48f462ea9624008f6aaf779391f4ccb7cafcbe11c86457618f0365d6f81ea1
diff --git a/dev-python/rencode/rencode-1.0.6-r3.ebuild b/dev-python/rencode/rencode-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..9a72df4ef367
--- /dev/null
+++ b/dev-python/rencode/rencode-1.0.6-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="similar to bencode from the BitTorrent project"
+HOMEPAGE="https://github.com/aresch/rencode"
+SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/aresch/rencode/commit/16e61e1ff4294bddb7c881536d3d454355c78969
+	"${FILESDIR}/${P}-drop-wheel-dependency.patch"
+	# bug #812437
+	"${FILESDIR}/${P}-fix-CVE-2021-40839.patch"
+)
+
+python_test() {
+	# The C extension ("_rencode") can't be imported from "${S}/rencode"
+	# so we need to cd somewhere else to make sure "rencode" is imported
+	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
+	cd "${T}" || die
+	epytest "${S}"
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 8587d02a1c53..d061cc451346 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,3 @@
 DIST reno-3.5.0.tar.gz 83644 BLAKE2B 803d3d3c9ed572624b77d2851221edcd0a86241f86876970f1a64877d3083b39d8e574567f14dea52680538770a37bc70c55d74b66ddab6fda551209c32bb844 SHA512 4d48ec3faf26d046498edccc0dd6007dff36d8346395b5c62b2b85a8ff9bba5ac571cbdcb2aa8e522b6f4c155bd845a416cc715c30a29e8eae6d033ee1b52be7
-EBUILD reno-3.5.0.ebuild 1065 BLAKE2B 954f9a0e093aadfbef2ebee6d1a5b10e313a44ad44da079be381da6b86ca765ce3f6cf1cb73660c3d097c1e5bbccc008dd9e0af59e5ce8010efffa5ba9521720 SHA512 8d19a4557ffb5dbd1e4783c99da26471da6828e139d8d929abe38b54bae4f9a1a747cb2ef5199594a55249ed501f61f45a00dc589659c7c0a781180ad6fadfaf
-MISC metadata.xml 400 BLAKE2B 933415cb7e31bbcf30191336617ffb9adfa5c83c26164fca5f813015ad8cb9c5c6a88276e8b8ba37ba0dd0fd4e658861150fe80a6770a16bb419959ca1c9d924 SHA512 2dffa12ad580c59bc034d4788054a4184d713422ef658b031c0190ee8c5756f37db3872e1f3a26c60ecdf9138904f87552119ac5559236a7e4ab2081d7a8c5ed
+EBUILD reno-3.5.0.ebuild 1072 BLAKE2B 26562df980a0b1ff5dc2159e0ef9109edb14fea22a158c383f1ce2d2cab8be5b6a81ba75c3fdc1445239818266f354891ca5037fdad04345e922580a811f7f4e SHA512 bbd31682fe71658fef20c545ee804197dda5fb14f119b45c3650e667dc14b8312e7950ef3f0ef28fad217607711774236d94b64e313079119a44a0622352cec7
+MISC metadata.xml 501 BLAKE2B 3c3c1d7026eba72db293c2c7e628cd79127314ac578b1cd2db662e058c0be9b0225b3304dbb0f5b30d38729e6bb495014905ae27c924fcf01b3410e2e7f1a0db SHA512 8944b85dd5a9dbd5419abbd8c70d74d414f987053a9721ec402b047af2e35b2584254d19aede528cb96b8f720f8b92cabb6797ddc2c41ea700c2fa5e3ecef627
diff --git a/dev-python/reno/metadata.xml b/dev-python/reno/metadata.xml
index 758b8775b144..56137c142b0c 100644
--- a/dev-python/reno/metadata.xml
+++ b/dev-python/reno/metadata.xml
@@ -5,6 +5,10 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">reno</remote-id>
diff --git a/dev-python/reno/reno-3.5.0.ebuild b/dev-python/reno/reno-3.5.0.ebuild
index 6449033e1620..c2f5a53316b9 100644
--- a/dev-python/reno/reno-3.5.0.ebuild
+++ b/dev-python/reno/reno-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 53ed37c8c5bc..a7faee2bbee3 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,12 +1,14 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
+DIST reportlab-3.6.10.tar.gz 4518482 BLAKE2B be43079f4695bf20804864e5e0a4957093e657516dd6da45ca6b51a5da4522bed80ee0050fdd213c1fa6556c6c3e3c0173829fdc336c0d63b92ef3560c351675 SHA512 b079db8a51c917de1ab6f27d4ba733568e425fb73041331a9da842cdc00f583fb4196e5fa2a5cbdd3fb7f3681bba850950d5b391a38cbbf25ae904b88d0c278c
 DIST reportlab-3.6.6.tar.gz 4509457 BLAKE2B d2cb5c764aa86000dd97798b5aea25fdc07e4230015dda6c11099e379884ca74532327dfe723069d5e56569dd7e120d94918f64a5f705bfef212b484f812aa7b SHA512 6f05e5f7c6b6c0b6f8d65fe11e2900ecd427f6c293672b12a4cc094476da1cdebc0df59198660614251d388241d7c886c345f958d337d351ea048b3b25a71ba5
 DIST reportlab-3.6.7.tar.gz 4504447 BLAKE2B 3e691294d20f94850840ddc70565d2235bdcb37d47b5e869e34e5fea93dc9ba017d09f088e18b6479266354076b89461849dd1eb7d1d4e8b12a9c4a95706bf66 SHA512 51f98900ccf7ef34fefc237bf1c787931a525cd82284685bda26f411760b97d1b85fce5bffa59b133705f6c1769a8d3616ef85ea368ed59dfc72f24d5faf6e88
 DIST reportlab-3.6.8.tar.gz 4503191 BLAKE2B 3d61ac2554309a8dfff2107ba6157152b558355fc6ebd7d2337b0f3152ceb9644ae2dc20b6e0f2ed312a579fc5f172e05eeda69e3b6acbbf921b62f27ce50f77 SHA512 7eb2381a8020f751f03008bb8dc1eb07f954a97c0c3d38646602a22ed7f69dd73e11bbd1251a471da141c98492be7f3867cf120e489c58911ae6e9f29c926507
 DIST reportlab-3.6.9.tar.gz 4507750 BLAKE2B 881eeaa36fb3934a75e420822d5b0d0f1718da190741190e58756c952bc3efac304e2c7747d8748713ef3f9449ead40c44d6774d6ca90218db51c16790d9e8cd SHA512 401127eaa3e4c9f303f5c13f96151a563a16efb15d1e9aaf6dab04cb23f275b552cdd8fb9a3a49bca420a8ddf83423c481dacdd11e39220592cf0ad911b70c42
+EBUILD reportlab-3.6.10.ebuild 1251 BLAKE2B fccb4eb891c9ebdef81377ef0211bf5172552f0cfc1db294307398aab665d86176eb91bd86ea9c01fe11d3cc883f14757fc606b49929e8c0f1800569b8947de3 SHA512 e514adde7f1918da137d3a412354fb69fe23de6c4f69584360982600d5a89fb48555137a268accebfe7a0d17595a59b4140cbd6de6bec5ff5b40616b6c4981f3
 EBUILD reportlab-3.6.6.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.7.ebuild 1284 BLAKE2B 683ec85fd62b21c3c733e6717ae8fbea631bd0e43034b0f8783d01ee25fd232ba822bd69a41b6396612df5f197d562b95890cda3a885dcc7664a872fece7ac27 SHA512 9205853da42741a5b61a65ac1084aba232a1289aeee924ffc478e1cab80cbb90345254342ab5629da423a51434ea4a92d30a237202184188889fb88feb02b97d
 EBUILD reportlab-3.6.8.ebuild 1294 BLAKE2B 4f05f621cebd0f1bf5c81731b305f6c95223ace2e0f41f5202780b12137f9bfcef709b40d16fd3f3893da4a2bed0daa6826b3968d48f64852cee6deedaf29eef SHA512 38aef3cc5db138fb2356a5752e8b8c50a85964c368c211efc12c6e9b989d43d06bd8d59d05e4a7ed43c0f5711c985973010275d65e35659ead775dfadc0b8d29
-EBUILD reportlab-3.6.9.ebuild 1243 BLAKE2B 608be410dc2374d33517a9eee7350df8aad5fc920a108500ff18cebf0bd3b323a05f90268a9c99812b995ef3dc513d92c2dbe0fa880d4d3cbd4b49b07baea562 SHA512 feb7744bc7597d63f3b63501813dde4f26ff1dee569342e5347f80f8e9fc414f93abe39113dba2ebcf3257e05bd15110e4f54f987e56918fd77986b3d6218735
+EBUILD reportlab-3.6.9.ebuild 1245 BLAKE2B 0b7cfb248e32193c06df4a017b018ebb47baf5786b91b12e641f43e7a3461d8a6933e4a7753860d1ef14b564aa6fe1ddec11ed1472bf20c61cf33ada6d3b781c SHA512 cea1cfff67c11de929dbcdf8126c1a078333ea96048bbe191fc84b62d047d08b74a831bac49b636c0ef2d787dae611d86478e113d09981d0b23d562cd3c9c5de
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.10.ebuild b/dev-python/reportlab/reportlab-3.6.10.ebuild
new file mode 100644
index 000000000000..9f0f5242e1ee
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.10.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/
+"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/reportlab-3.6.9-paths.patch
+)
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+		use-system-libart = 1
+	EOF
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/reportlab/reportlab-3.6.9.ebuild b/dev-python/reportlab/reportlab-3.6.9.ebuild
index 9cfb9219951c..e432d96c0d39 100644
--- a/dev-python/reportlab/reportlab-3.6.9.ebuild
+++ b/dev-python/reportlab/reportlab-3.6.9.ebuild
@@ -4,17 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Tools for generating printable PDF documents from any data source"
 HOMEPAGE="
 	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
+	https://pypi.org/project/reportlab/
+"
 SRC_URI="
 	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index d3db40b10f1e..95fbfbf703d2 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,3 +1,3 @@
 DIST repoze-lru-0.7.gh.tar.gz 19489 BLAKE2B b0a33dab1fd69962f04e9c088b005a2a6d456ec8dd17f628b7077b51841bef5e9503034959c8b89e84bf5c471d9366d467ee6b7a610508c4b098775532628fc2 SHA512 52e7ab83979d34a4f0c97e62600e64bf430ed0311120fe948f6b407b7713446d5e954c54f811b85ade74eebf2a4d54653c12c38d07bdac51c456aea86334468f
-EBUILD repoze-lru-0.7-r3.ebuild 711 BLAKE2B 4a57d7c5a06d19f2dc4e9080068736b08035bb02bb815d54c01be1bffd82b68a01bd27c16d3de105c5870ea0d5e4c8e18e7ae4aa67b61bc2406c77856310a7aa SHA512 d3106b7d63cf71d54d1c3adaade9695937b1098203457e8e3c6b291a76bdd2c3fb57ea99ac59aebc0d1a9995e23a8fb2696af7347955a6b7243eb8bf522b4f7d
+EBUILD repoze-lru-0.7-r3.ebuild 766 BLAKE2B bf88ef8e7992615fe3fde570fd97a560402ca0c885dc457dc7dba58a94769dc48d5176bad434dd4653549a3c1e621e92dc75c1840fd69b3458c58dfdeb2989c9 SHA512 9261e458991e41e8d996b4e45a10a5ea5b09de9c3b333d2af58052ed1d227be53ca7b2717eb43e50f9091804fd8a8e02f1d46dfcb55d10be53d8a839de85220c
 MISC metadata.xml 324 BLAKE2B 9006fa47a7c20c083296486e2ef35ede7b6767ebdd5612e9f2faf3f3d7fdacf144f8a300782fc0d251a9ce36bca8d4aa2cce176c50ecc84ca4ca049d3ed7c4ad SHA512 2175dfca130b655ce386ace433823548fb58f288af644c0548e3a3fe5bdb2b19d82afadda801686110d99ec59a46c30b221fd8e4aa7edfbe3b7ef00388f81b66
diff --git a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
index 0fed4e8ddcb6..07f5c05f0d44 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -12,12 +12,15 @@ MY_PN=${PN/-/.}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A tiny LRU cache implementation and decorator"
-HOMEPAGE="http://www.repoze.org"
+HOMEPAGE="
+	https://github.com/repoze/repoze.lru/
+	https://pypi.org/project/repoze.lru/
+"
 SRC_URI="
 	https://github.com/repoze/repoze.lru/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="repoze"
 SLOT="0"
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 0ef95e820aa0..8aa617fab2ac 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,6 +1,4 @@
 AUX requests-cache-0.9.3-cattrs-22.patch 6925 BLAKE2B f753c154741fe3a6b6fb05db19ddeadff669e2175a2113709921a2356dd53f4b867be8f9a3b91c36cbeeb891f9261c956b8728acdc03183a678117190afbd026 SHA512 f3258aa033e197dece2eca00169a833259d44c91488780edcc945839960bbeeb28f77d7dea806eecabcefea20aaa9c1a8c3448a0d34da58f89083cc7e82a597c
-DIST requests-cache-0.9.3.gh.tar.gz 1541517 BLAKE2B a6096e8db01ccc7e6afa94ca35460ad79bbc503fe32fb272c3b43bb3344cb4a4e3c6f9240dc8d26a49b2ae4b564de72be22553b40847480487c150b192aa9490 SHA512 d413fbed156bd3fca48db8b153b01a883ee72d62f6e8982d490a5378dc188c19d0b3af5e37e6f47d19ed0ba11b3c0e01489720d56df12afcf1b47088e1541221
 DIST requests-cache-0.9.4.gh.tar.gz 1541821 BLAKE2B 90f3ffe8f4213a47d19c1190f1201bb484473a4ee2fae82dff59c9e80bc8c154739e99f5024aa55b436f9e620d5594441df61e2db44e3cbb381d394c1b6b4a0b SHA512 66023dc8b153070a532f160af58ac2102f6b9d536a0045c4c62ad1d4175f59df6e7db5a25422f5610a2f17049270ad0b63c6023ddddf64235432a63d2cce9b91
-EBUILD requests-cache-0.9.3-r1.ebuild 1949 BLAKE2B e0f87b5e1577ff920cb56f50564e1faba6589f28b61fd9893167cc95e4ed515fe04bec4e312879d56017fd2d7459602a3cca0a7c738e103037913b92bd0a66b1 SHA512 d63349d0c19426433db1e4c27087255c52b57e646c09507c4422708360528169a3a12d6047af5853ce3ab18f74c0f8c50d1f231f6061a28dd53daa6f888b8d6b
-EBUILD requests-cache-0.9.4.ebuild 1967 BLAKE2B 393418ec7ee8ea27588d22623aba1827c79fce7c89b5dd28dd9534bfd945fdf3ee8f8e6770967f6ebc5684e41f2c9b9a6ce789ea89158ed3d4aaed273462364d SHA512 29986b8746fe34e488c4e6646b4e68b5861a3f128b25f8d958ca182f42d851fb29bb7dff5fde407bb0aa2b850754d8bd04439052115fee7ca92ce310a3b35f13
+EBUILD requests-cache-0.9.4.ebuild 1973 BLAKE2B 80dd5db6761f818e3b389fd063371cd549050b7636fff825637d106a58feeb678e9915b773d28beac892d00a1c7e63d5dfa24bcede8c66e7e1b7cd472253bafb SHA512 e82a49eb38e33ffedc1d1cb28482ac838549116a9c8ed73b08f79a74b4f4a2cf95c5638465828056d862a6762168d2678319ddfbedc825b48e4e8ccfec2c52c6
 MISC metadata.xml 470 BLAKE2B 83ea1b65050486c1ff410664b87a19e514102ec030ea0f3d4076d435503f6ad2dd16caf8ff0c947d064c93955a743fe45d14c4d64471613c9de65c33f6708b93 SHA512 54160c5daeea03d90c896e30f35ed6ce8e7a29280a5e1bb1d1b0c04b5899a48ed3261d400762bf9c92bb73ddb554bcaa533b620ecda691e43fe89c1d943b7b54
diff --git a/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild b/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
deleted file mode 100644
index 1d237051f1ea..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-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
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cattrs-22.patch
-)
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/cattrs/s:\^:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-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/requests-cache/requests-cache-0.9.4.ebuild b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
index 13d1ae62b521..c9a10a8eef4c 100644
--- a/dev-python/requests-cache/requests-cache-0.9.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
@@ -11,17 +11,17 @@ inherit distutils-r1 optfeature
 
 HOMEPAGE="
 	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/
+	https://github.com/requests-cache/requests-cache/
 "
 DESCRIPTION="Persistent cache for requests library"
 SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index a34c4487c50c..3cfb5752a100 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,3 @@
 DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
-EBUILD requests-file-1.5.1-r1.ebuild 499 BLAKE2B 4c305298a94e0fde0994abb126f8667f7434ab00e0395ff185c0cc979a879ee1bf02c7d5321e438af8bfc326ab343113d6813ae60d2c39aeed379ab3b43b793d SHA512 b64fce5cdf9fa321e49ede55a55a3112b31851496e92159396638e04210a6fd31f1612191e7a3f47e63ffc5e033508b660cc701537e59cfb04249f6ed8f89883
-MISC metadata.xml 452 BLAKE2B 18888177e7a3de72dde3461c1400e4a250f30c68f948c3f0dd3f84c8cd7cfc768ff00e09bc75a936b377e1a2b4e6d8eb5ad704e3194cec74356d1ad1c141ced3 SHA512 efc7c2c991afd404f394057204a0a3450911b466b07f9b123edbeddbf5ce0f54634240e0a91193cb657fefe238483d6f3cd1a97c545ffb62b2701d2edf8cdc0e
+EBUILD requests-file-1.5.1-r2.ebuild 531 BLAKE2B 671f765fbaf0098f524342b95bbee5c91d538fb9eb12c73988c1ff41f3ecf437fc2c8e85b1b2bf5b3b2e5db4ae11a83cea8d4c1c6009692ac4a54ed4e1f6d960 SHA512 7a383791f94f7b3b31c91f636f3936f937749ded6deff9db5a973e950e0f31cc75cdb78347e855d1a9a6b28597e9a3d6837e91f16b660dda19d5d3ec9f523406
+MISC metadata.xml 476 BLAKE2B eb2da8f47418e2152568b9888b3fae9a87350ab45f310b6d21179b4a707b7d112bb175dabeffb6eddd0835d9d82eb8c3514d5512ef6d375ad1454017f6b4b5f5 SHA512 23dca887bbd51d5fdda6270693faea3d598f1d376800511293927500e221c3fbc9233e96b1880e9ce1f8bff9b0b2f9f6ff78a35376ed0d2ddd81f2636cc50542
diff --git a/dev-python/requests-file/metadata.xml b/dev-python/requests-file/metadata.xml
index 74eef4237c5a..a88c0ed00b89 100644
--- a/dev-python/requests-file/metadata.xml
+++ b/dev-python/requests-file/metadata.xml
@@ -5,6 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">requests-file</remote-id>
 		<remote-id type="github">dashea/requests-file</remote-id>
diff --git a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild b/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
deleted file mode 100644
index 887739b3d06a..000000000000
--- a/dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="File transport adapter for Requests"
-HOMEPAGE="https://pypi.org/project/requests-file/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-file/requests-file-1.5.1-r2.ebuild b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..538f84179910
--- /dev/null
+++ b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File transport adapter for Requests"
+HOMEPAGE="https://pypi.org/project/requests-file/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index a8f43692524e..2f0226f8a8c6 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,4 @@
 DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
+EBUILD requests-futures-1.0.0-r1.ebuild 998 BLAKE2B 74b95fbdd08fad50f82934d9b6227d7597dd3e691487069162afc316fb48079a1fe20f3e6f6457000643b4d52a86fb5fd2f4f6bd6b6893eda5667ecd37ef3bf1 SHA512 1a35d42fdab30b84e3a038ed7146a3186ca0f4820a08ce5af21f750a913fbdd8b54d392dc3d3850696fd8a6d49575de3e9807a1e40e29f370acd767e52030767
 EBUILD requests-futures-1.0.0.ebuild 966 BLAKE2B 3fb624452834017f69502431ddd9385c9f3185fb334ab738615126fda5fa394957b07df574a8479c1d6f14c08dab22a4032a3b0a05a22ed4bc6e6170b5eefc96 SHA512 e4a56f1c76334d4bb959218cdb0b4867ce573dcf7cee4befea48e014946b4d3474f03f6b5c8583e4ec03ba56da3987ec9b57388324061cea68fe582173881932
 MISC metadata.xml 562 BLAKE2B 116ce554daf71a47d20efa98708554d50185eca1272c26556666152459feb42ef8187fb74da72a5b365f360ea397ed1056b932e9339ca4c3fdb82b2f12983278 SHA512 fc998b8ee8cf4a4d01b02db9890632eb793c8f3ffa021c3eb2466e1ec221c5d36aa5875804989c6ec0897ed243019673e0b185a371d728a86d2d5238fdcaa25f
diff --git a/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..2e7cf55ca78c
--- /dev/null
+++ b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="https://github.com/ross/requests-futures"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# known failures by upstream
+	# https://github.com/ross/requests-futures/issues/94
+	test_requests_futures.py::RequestsTestCase::test_redirect
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_existing_session
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_session
+)
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 6ca461f742fd..10f71b07f674 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.14.0.tar.gz 21275 BLAKE2B d64c92bf70df07a8dd38626a6699ecb95aaf82b6aa93797eefa80af2b9760f5b064e0aa3a3bca5242ef73ce1efc4b6ef0ef1bb1802c7c59a20b6655bd3894aae SHA512 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-EBUILD requests-kerberos-0.14.0-r1.ebuild 777 BLAKE2B ceb7d7249dd99be0bd10a30cdaa1aefe8612bf55605c189e76be2c5708ea55dc0b91180b14b940fccf09d49a8e7a8e7886a5a14af9d4f53add18e0a9eeaec764 SHA512 d7cb3ad990cc42f4057d4d868ddf1ebc90aa5b1078e7e0c9c7fe7f9d076e0c8f03db4b62086c5339f89ec54acbd0ddf4b3d68edd346173a7a3c474ad3adeba5a
+EBUILD requests-kerberos-0.14.0-r1.ebuild 784 BLAKE2B 3ab1e697c35f17c7f5080563aee5a30abb20dbe3886f708c09db4ec24802b25246d75eb5718f6c41970477d66314d87d00602fccd7f317cc9f281a8e69d2e330 SHA512 4117a4022b271364f2b407b980c0bd7875add7253aa83e7bed1d38dd34b3417e0a3a9bf4ec6a11d9b029ea34a902ed1b88d6d254c5d5697f10547b8fab805070
 MISC metadata.xml 411 BLAKE2B 06c28d67859801b83b28b32e12abeac09bb3a3d0ed02546ae211b8b8a3ac5a6b464ef3d5d6e6e5f6bac20d9201adc4e543ae02b701a374c50f8e475b7472e240 SHA512 656422babdd89a9afe5c96344c625ea5a5f0e541972636366176f77e39623773907dd0de9bbd53ed664b63bd3215ab40780e6010ea8f1febb73640920a800aba
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
index 14f7c689de73..8c42297bc26d 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index cbaae94e2266..959eaab95abd 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,3 +1,4 @@
+AUX requests-mock-1.9.3-obj-has-no-attr-url.patch 1487 BLAKE2B 39eb1825f81ec59cfff7cad41ac59d1474ee778c09fafeb75bbeecccb48048bc52c6bab6a92e3844306235a2f1431c1c2ac953b21b91f70796406c128c40dd74 SHA512 cff51875e8d437040c27dc4931ffcfb50869c19acd05020362c25696ed0cd961fdf7fa195e6198b71f5ce4ebaeaa5de40629ec2e60bcc90f63760b0d0791ea8a
 DIST requests-mock-1.9.3.tar.gz 67988 BLAKE2B 8ab651adbde9e18370641655589f5d209d2a9ae07d82108c64e4269757217cf01588066ebc3005852cf48527f911d3fb76cedce3e88bc74123db81725b4b5865 SHA512 bcded541d78670a1b1fc87f97d35286ab4bafd6946beb9d9b44886454c26a4d8c05834add18914f3f72b1d3c0534311efd1cc80e711b5085eb63053ae24cbb6f
-EBUILD requests-mock-1.9.3.ebuild 1284 BLAKE2B 35058bd62aa7959fc1252e78f7aa29b0a682278036349fbb75e4fadf538d342b375fb5e18e96cfae3cad0f0ad15e03748c0774a1c897770be70769b0ad92dd01 SHA512 49eeb4aba7c663320f2d2189e37e00abf96510e04d6a5dbe359d5fb50a1f22b54bfa592036ba6cd36e7794c93154b7bbbeaced49948ca34798330d977b21242a
+EBUILD requests-mock-1.9.3-r1.ebuild 1375 BLAKE2B 3edc56830426806a4148f18b77376ced1aaa3bc20ceb748ed76137ee211402636f154acbde1c52874c393f5f5d30399eee3e8592c8c80312707c0e1ea54d8f89 SHA512 ab33c1f5f5a43c864c97f202ecbe08db72c8d3e104af375fb2283ea01c916d3644a62dea1c4651e3cff8c8c6eb4436f699afca091811072eac2221ff61b726af
 MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa
diff --git a/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch b/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch
new file mode 100644
index 000000000000..d43b0b41e65a
--- /dev/null
+++ b/dev-python/requests-mock/files/requests-mock-1.9.3-obj-has-no-attr-url.patch
@@ -0,0 +1,50 @@
+From 7238c1148c756e6a27c3dbc1ccbff7a3e9a60d82 Mon Sep 17 00:00:00 2001
+From: Jamie Lennox <jamielennox@gmail.com>
+Date: Fri, 28 May 2021 09:33:25 +0700
+Subject: [PATCH] Fix failing pytest
+
+When you start a method with test_ pytest loads it and tries to parse
+the parameters as fixtures. In this case it's not a real test, just a
+matcher function used later on in the test file.
+
+We can inline it into the function as it's only used in one place.
+
+Fixes: #175
+---
+ tests/test_custom_matchers.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/tests/test_custom_matchers.py b/tests/test_custom_matchers.py
+index d49f72a..546a63e 100644
+--- a/tests/test_custom_matchers.py
++++ b/tests/test_custom_matchers.py
+@@ -31,13 +31,6 @@ def match_all(request):
+     return requests_mock.create_response(request, content=six.b('data'))
+ 
+ 
+-def test_a(request):
+-    if 'a' in request.url:
+-        return match_all(request)
+-
+-    return None
+-
+-
+ class CustomMatchersTests(base.TestCase):
+ 
+     def assertMatchAll(self, resp):
+@@ -65,7 +58,14 @@ def test_failing_matcher(self, mocker):
+ 
+     @requests_mock.Mocker()
+     def test_some_pass(self, mocker):
+-        mocker.add_matcher(test_a)
++
++        def matcher_a(request):
++            if 'a' in request.url:
++                return match_all(request)
++
++            return None
++
++        mocker.add_matcher(matcher_a)
+ 
+         resp = requests.get('http://any/thing')
+         self.assertMatchAll(resp)
diff --git a/dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild b/dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..f6ab5d2b33d0
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+
+RDEPEND="
+	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-obj-has-no-attr-url.patch"
+)
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests-mock/requests-mock-1.9.3.ebuild b/dev-python/requests-mock/requests-mock-1.9.3.ebuild
deleted file mode 100644
index bbb1ed73affa..000000000000
--- a/dev-python/requests-mock/requests-mock-1.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/requests-2.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Disable reno which only works inside a git repository
-	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
-	# Remove the release notes section which requires reno
-	rm doc/source/release-notes.rst || die
-	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
-	# Disable a test which requires purl (not in the tree)
-	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
-		tests/test_adapter.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 7d26e6b4fb61..660130fce8fd 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST requests-oauthlib-1.3.1.tar.gz 48367 BLAKE2B 0cc538fe7ed1ef12740b60bb8b3e32d84f0d45b6c231c70b8bbfe9db9c8775acc51f50e78589e43eb0644c82e919a5a124941986023de4432e0631ebf0764869 SHA512 86fe34d39ad7224fd44a1b0c4fbf3784032239b894ae73ba65043941cde9675c2f8abedf44ccc00b5fb1648b8e261de258464b311f3ace6392ab6202fb50aa08
-EBUILD requests-oauthlib-1.3.1.ebuild 897 BLAKE2B 87b1c98d9655981632e861c151bca06d431ba1b3c84e9139463890785ecf558c5b6de4e90d55f32f420b0bbb1c3fdf79c50c974c0401f4a322c2f54338c5b8d1 SHA512 c73b02fed039906960fafe061d1f71212b7ecf8ad10a28e5a9d85abee5fc9dfecd8d0a95b1009c8caaf0761d071e780de17569a509633feb98257cb3c0c3b7b5
+EBUILD requests-oauthlib-1.3.1.ebuild 897 BLAKE2B 64cfadc2f972775be17bb51f0b02e1bb2c030b4e02672bcb913ac923375d522ea2a1b1a3aa2fd336d3c8c11a23e5d4eb1704d1f6e63910b20111edecc93c53b9 SHA512 7e967974f7f23bcd7ded5eae8b228331c5d27d1a8d5543196e974be36e7e6aba6c07abe5deacd83d10b2cc028400b7d7df2e5efe04305c0c89c56213e8a2e5bb
 MISC metadata.xml 387 BLAKE2B b1f09234024d5145eb44490f5898e16d176b39dd5c5bc03a13b1a4d0801d20230348f0612132a7782d4055f908f52ac49793bd9ebd91ed8c832b0c9fdd6a3296 SHA512 d5aa59b6e4812e106d3c7aec130d630609fe86193abed686b5eb7381b26e54306fc4424afaaff6546fca241f551fa1631f732f75d49491bd3578052f80b99a0b
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
index e77016a91872..2e2962f4c0f7 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-1.3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index d8c632f5c866..fc67508bb143 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -2,5 +2,5 @@ AUX requests-toolbelt-0.8.0-test-tracebacks.patch 1428 BLAKE2B 6f9645f2a456cde3a
 AUX requests-toolbelt-0.9.1-py310.patch 1470 BLAKE2B 864c496f712b9667de991afe7d8db0071b15e6c546fb495c3df5aa25d354bb2873f697d5777f5e6f1a9890289bad192a5c5053d11ab71eb0967762b30c35a977 SHA512 3780eeef7835319d5696f1ac8273c682c4b2a97171b7fed889c1960e3887f1fa6eecf13d4c961a9c2aa9e02e919e885f18bfde8eeabf452e16267ff671d07703
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1555 BLAKE2B 5028af6ad3bed8ef796f4ec5bcb6aec35d10c385c5c8a19139cb1ff541eefd5a469dd8815591d4ffc6686c52571514586eabf2ed4a1b005078a76dd5d9aca1c2 SHA512 a139183863289c597e29bdbc553821bb80cced7e2957baa006ac9c04811d74a5e3d7afa55635f572c1b8bd16e5658e62d31ff1f9317e401aa5f83359aa7d4f2e
+EBUILD requests-toolbelt-0.9.1-r1.ebuild 1441 BLAKE2B ed064f4ee21e74de5a5474fd741e6fd047d4def4f1ce3c887dfb643d965a18105c4914395d9156353218b5a9e160dbe3ad6e84f7896f64ff8ffa4cd059a7cd7b SHA512 567bb53929f4e20ee443f882510f6c53a635e648206120a15da32c345fac935bb39eb8acc36fe6ddcd9f2f78f601458e14d3b6aead926e7be293dccca63bcc3f
 MISC metadata.xml 423 BLAKE2B 71af8f087b4bf8d805a70aed1dcb46128b0252f68a1e892530c5393bc6666c8d203e147558214935803a34b5be32bc90f6bb3fa103af4406c0fe6d974acbd739 SHA512 1c875ab992aa1d463fdd52468597f5bebb7aff54c6d665660d2b4df1d41b78e78575be4629b11eef10b783ef1dd4b048b86742ce20eb4584558bc8d87b17988f
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..a5fc91d08018
--- /dev/null
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility belt for advanced users of python-requests"
+HOMEPAGE="
+	https://toolbelt.readthedocs.io/
+	https://github.com/requests/toolbelt/
+	https://pypi.org/project/requests-toolbelt/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/betamax[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( AUTHORS.rst HISTORY.rst README.rst )
+
+PATCHES=(
+	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
+	"${FILESDIR}/requests-toolbelt-0.9.1-tests.patch"
+	"${FILESDIR}/requests-toolbelt-0.9.1-py310.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
+	tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
+	tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
+)
+
+EPYTEST_IGNORE=(
+	# certs have expired
+	# (if you ever fix this, look into git history for proper
+	# cryptography/pyopenssl logic)
+	tests/test_x509_adapter.py
+)
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
deleted file mode 100644
index 947110d8ae64..000000000000
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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="A utility belt for advanced users of python-requests"
-HOMEPAGE="https://toolbelt.readthedocs.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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/betamax[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-		) ) )
-	)"
-
-DOCS=( AUTHORS.rst HISTORY.rst README.rst )
-
-PATCHES=(
-	"${FILESDIR}/requests-toolbelt-0.8.0-test-tracebacks.patch"
-	"${FILESDIR}/requests-toolbelt-0.9.1-tests.patch"
-
-	"${FILESDIR}/requests-toolbelt-0.9.1-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_no_content_length_header
-		tests/test_multipart_encoder.py::TestFileFromURLWrapper::test_read_file
-		tests/test_multipart_encoder.py::TestMultipartEncoder::test_reads_file_from_url_wrapper
-	)
-
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			tests/test_x509_adapter.py
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests-unixsocket/Manifest b/dev-python/requests-unixsocket/Manifest
index 648c9a729566..26824c01c22b 100644
--- a/dev-python/requests-unixsocket/Manifest
+++ b/dev-python/requests-unixsocket/Manifest
@@ -1,3 +1,3 @@
 DIST requests-unixsocket-0.3.0.tar.gz 14478 BLAKE2B 5b46ea051729326498f50ba7a952429d271deb102060f8e3019d259ddc21dbffdca8960e140c7ccb25898034cf37fb90dd143c970e75bdc6e6442e9515f14d6e SHA512 21c887b0c3fa526a2debb3960e0ea4dc3b3015cdd517459b6484501176321408d1b4c87dd2840c7d8b71d08fa9114f655ae03f8bc9ff1fca33c914900ef82f5b
-EBUILD requests-unixsocket-0.3.0-r1.ebuild 639 BLAKE2B 2ae29f5eae052a44c2ce58dadf78acb4d429e2b71706074d8959263ffb1a88a644e306d12c34cad38010a86df2cca5b5f7ea6b34e094013cea49760aed9d5abc SHA512 a611e3787a9c1f9cc7713194c1738a5051399090347df90acd89daaa29a5d56f50b41c361726ae1d8e6ca9ad3cf30185d08c22b5cf03e64d813738c43451d3a6
-MISC metadata.xml 301 BLAKE2B ace08d89c89c1ba3494d4b9854d62d73076548f77d87f2047859af61f30dc94495fecd254baf8ff7243bc9d914fb832210965491e1e832ceb7390e47b784dce0 SHA512 66f048263f3bc94edceb5a0439dcdbd74b5c8dd362eddf77cfa2e888925f73cd4c74163c8cb935795310c317eadd989ecc3dff422bb3008e7fc15c498bcbffa5
+EBUILD requests-unixsocket-0.3.0-r2.ebuild 730 BLAKE2B 2a42cb5f15ff7a297c174e360f8ad96111f0883ae71b980e7fe8cf9eff4731120861021612ae128137a6c8c69fe7326635d496a9dc691820a7269c33113d7c5d SHA512 44ba125bf7bea5827fa5072d592265ad2a3c2bf360da9bd7b15203ff3043ec07d86d714011ddfc92e6c787aff387bda56e8e6b520a0f83a7569c10503338f38f
+MISC metadata.xml 325 BLAKE2B 46a5e54f9d40724197835a3b7b096cb8e79a0909ba761c6821256d7fd12994c8d9c6b01510b707ca84cb38ff1b0f62f0293d50c66303860903d785e4e65650d9 SHA512 dee0ea5e9dc5994c5d93a311f98561d2346e8e48aef4871102b8f75e4e40147c187bee52b5106351fd043bed9fc2d32de23038f62c6b90d2b1b4d60ffdc42ac2
diff --git a/dev-python/requests-unixsocket/metadata.xml b/dev-python/requests-unixsocket/metadata.xml
index 8049ecf173fe..6bec27a583fd 100644
--- a/dev-python/requests-unixsocket/metadata.xml
+++ b/dev-python/requests-unixsocket/metadata.xml
@@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">requests-unixsocket</remote-id>
 	</upstream>
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.ebuild
deleted file mode 100644
index 6d3b028a413b..000000000000
--- a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="Use requests to talk HTTP via a UNIX domain socket"
-HOMEPAGE="https://github.com/msabramo/requests-unixsocket"
-SRC_URI="mirror://pypi/${PN::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"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( dev-python/waitress[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..cedf1a2d0be4
--- /dev/null
+++ b/dev-python/requests-unixsocket/requests-unixsocket-0.3.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Use requests to talk HTTP via a UNIX domain socket"
+HOMEPAGE="
+	https://github.com/msabramo/requests-unixsocket/
+	https://pypi.org/project/requests-unixsocket/
+"
+SRC_URI="mirror://pypi/${PN::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"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/waitress[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 65bd39ea5528..0fcef0c396fb 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,10 @@
+AUX requests-2.27.1-unpin-charset-normalizer.patch 670 BLAKE2B 09d25ce8300c2dbbe57724bbb61362953602694d0c61b168e2304bf3c428264d40a5b306322f94119db0b27f0d25168bc401600ce0ed62cc0656f2c2126506eb SHA512 dd690477d181702d0a421794b98b8841573a6eb30402a8edc76e9f51b12365dbc2c3d72da1c261e370aa64eebab53b6aea99dfe5016aba0124fcd482c365c1ad
+AUX requests-2.28.0-drop-dependency-warnings.patch 759 BLAKE2B b2cc24d9d3137ad652ab9d8c14a08dd33af7d3f2968433a0f6cb09dda46ee5c98f428e495e5a565d32a142c22afb439e4604e09d2693b945bcceab0475381700 SHA512 2e486d399c311b81522d390ff9eb601fbc31f3ba64c7c3635aa0aa37e959acdba4f0cd4fd87d5ad51e1c50d83057c2f4ea02d9077702d51bda711730ea82e3ce
+AUX requests-2.28.0-unpin-chardet.patch 1569 BLAKE2B 8756805b4b8aea57bdc6e49d58195a7a4d98388cd54b919ec6135a23a3f0b5036cf419f7417699b83430cd2d24ad97d97b70fdd2e799bc6fc8edb1a37338fbd4 SHA512 e9be4ab64610dd3463709e293cba46987dc012d3b8643af57df16dc7add85b33da7bdcaf42e22dfaa9ae1f0c5bc7714aa10b016ce480d57531f7d7fbbaeadcfb
+AUX requests-2.28.0-unpin-charset-normalizer.patch 743 BLAKE2B ed605c62ac0d7b87f802c0cb80b64288d5a0de7f81e11c3a2e89513652f405b525bfcffaa603bd6b9eb4f394b7327fd78920c7c8525bc2968f33cd1ffea4531d SHA512 124e703a0d80d02bbc21c00fdbbdbd97d7e74469f6019cda338be6067994c9b15704e584649fcc91e88799801efd6cd41738115d61e099ef02869d006627087b
 DIST requests-2.27.1.tar.gz 106758 BLAKE2B a7fed53998fa61b3d03abd254a0cee76450c5b60d76f80aa6b91f32dca1dae5d2c51987b3d3f2138d72c50790e35c36cb03eb5974554ac4eb1a902eff79b5bdd SHA512 e51916abea8125254c5ee72c97e84a73e6981cab09961486873387522d2ce041ee3fe8fa2ff0b9bbe6707eefdc05145e9adcf127bcd999dea127acdfabd5312f
-EBUILD requests-2.27.1.ebuild 1731 BLAKE2B f2d6a0de3efa99d0dc5cbba9a57c4f4496a080340846a6423fb2528bf24b4eb14f4aafca22b81b49e466747e3fc203885e3c4920818cd148bddf7900250215fa SHA512 c0f589714e1488f2c89906e0e28f1d1e50de8d7024c4ba069a1aec603757bd44860c2231c8e89361f5f15cc7860904e245f1988693358b0c48d24eae49c5581d
+DIST requests-2.28.0.tar.gz 109748 BLAKE2B 1df85b90ab1f6c551e46593dc8640aa0629505c9b395ca2100c6af04435e1360503b215d9796c34fb09122ffd616e1a01ca3574ac4543b4857c76a3dd86f13fe SHA512 111cfd2d0b0267111ccad0a97b33c5e9565812e6e6728b7d5bdbe06c32fae9e637b220bda605d799409e57dc6aaf3bcc66a4a4605cdbccb439367dc492fb836f
+EBUILD requests-2.27.1-r2.ebuild 1908 BLAKE2B a953b0fb34062bae636f2dce4f31f6a17d2cb7b0d1bb6d1cc9093d0d14e50d11e10288df067e660a5b8abffeda281e57b2b2fa0986c152cd12f7b757e18f746c SHA512 03741ec47b5468e168bb5173b8652d9c619ce10c10186adc45a9f0bff1838d7e06d2503b9f6d62d869b85bc2fbeb86f939bfaa96948a1ffd734cbf8cf828a36e
+EBUILD requests-2.28.0-r1.ebuild 1916 BLAKE2B 467e0a6ef9a367b47fa241435437028c4194c1c031ce2109a7f81072061eab0a597f5d97c3122c3bd21cdcf6265eb297120557d1d4513ecc610cbecb190ac6a4 SHA512 88deb82e4c2e046c68d0ee67e676dbe25462a51f597d128dcf4c049ad8e93bdd8a38374758c3d95bd7ee317cd8e52b8a247147314b214afab412583dcce106a2
+EBUILD requests-2.28.0-r2.ebuild 2023 BLAKE2B bb5d65af66c29fb3fc4adde5afdf6eb79e0de26990c8336eaa98ef2592e8124b7d60e00ff6cdc963984d1858ac9e72eb45c4e3e6d3599baea5b4db5dddaae103 SHA512 3a46c51ea3fd58bc98b301f75d2e9748199862f8b408ba2a103c70c54a31afab805d7770a365b4920381a317cc6ef70bfd8deb3ef829cdbb99738db4306d41be
 MISC metadata.xml 770 BLAKE2B a085a3bdbcc34c2297ad7d5a0e811c553aa77f12bba1ee8164cf63af2cd86adcef7b6080c984ea73a417ec690252540a0fc6072ee97b068b70f0f695696fc65c SHA512 de5c6a99ae18955f25895a93911570d41cb458eaaa9dc8b6edd09021c6dff3dda7bc2611d090b933837f83b8a7035769bb275bb844e1ac91b89a088dde3c7222
diff --git a/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
new file mode 100644
index 000000000000..418cb519ffb6
--- /dev/null
+++ b/dev-python/requests/files/requests-2.27.1-unpin-charset-normalizer.patch
@@ -0,0 +1,25 @@
+https://github.com/psf/requests/pull/6169
+https://bugs.gentoo.org/853247
+
+--- a/requests.egg-info/requires.txt
++++ b/requests.egg-info/requires.txt
+@@ -6,7 +6,7 @@ chardet<5,>=3.0.2
+ idna<3,>=2.5
+ 
+ [:python_version >= "3"]
+-charset_normalizer~=2.0.0
++charset_normalizer~=2.0
+ idna<4,>=2.5
+ 
+ [security]
+--- a/setup.py
++++ b/setup.py
+@@ -41,7 +41,7 @@ if sys.argv[-1] == 'publish':
+ packages = ['requests']
+ 
+ requires = [
+-    'charset_normalizer~=2.0.0; python_version >= "3"',
++    'charset_normalizer~=2.0; python_version >= "3"',
+     'chardet>=3.0.2,<5; python_version < "3"',
+     'idna>=2.5,<3; python_version < "3"',
+     'idna>=2.5,<4; python_version >= "3"',
diff --git a/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
new file mode 100644
index 000000000000..ec3634966a07
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-drop-dependency-warnings.patch
@@ -0,0 +1,21 @@
+Minimal patch to avoid often rebasing.
+
+We already have tools to try check for these (`pip check` obviously, but also
+app-portage/gpyutils provides gpy-verify-deps).
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -106,13 +106,7 @@ try:
+         urllib3.__version__, chardet_version, charset_normalizer_version
+     )
+ except (AssertionError, ValueError):
+-    warnings.warn(
+-        "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported "
+-        "version!".format(
+-            urllib3.__version__, chardet_version, charset_normalizer_version
+-        ),
+-        RequestsDependencyWarning,
+-    )
++    pass
+ 
+ # Attempt to enable urllib3's fallback for SNI support
+ # if the standard library doesn't support SNI or the
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
new file mode 100644
index 000000000000..bd0451daaf13
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-unpin-chardet.patch
@@ -0,0 +1,37 @@
+https://github.com/psf/requests/pull/6179
+
+From 09483bae4f56e4f4c227e2d25ee920c538271feb Mon Sep 17 00:00:00 2001
+From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+Date: Sun, 26 Jun 2022 12:18:42 +0800
+Subject: [PATCH] Update Dependency with `chardet>=3.0.2,<6`
+
+https://github.com/chardet/chardet/releases/tag/5.0.0 was released on
+2022-06-25 with remove of Python 3.6 support, which also align with our
+Python > 3.6 requirement.
+
+Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -75,8 +75,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver
+     if chardet_version:
+         major, minor, patch = chardet_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+-        # chardet_version >= 3.0.2, < 5.0.0
+-        assert (3, 0, 2) <= (major, minor, patch) < (5, 0, 0)
++        # chardet_version >= 3.0.2, < 6.0.0
++        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
+     elif charset_normalizer_version:
+         major, minor, patch = charset_normalizer_version.split(".")[:3]
+         major, minor, patch = int(major), int(minor), int(patch)
+--- a/setup.py
++++ b/setup.py
+@@ -123,7 +123,7 @@ def run_tests(self):
+     extras_require={
+         "security": [],
+         "socks": ["PySocks>=1.5.6, !=1.5.7"],
+-        "use_chardet_on_py3": ["chardet>=3.0.2,<5"],
++        "use_chardet_on_py3": ["chardet>=3.0.2,<6"],
+     },
+     project_urls={
+         "Documentation": "https://requests.readthedocs.io",
+
diff --git a/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
new file mode 100644
index 000000000000..d4a4a1596296
--- /dev/null
+++ b/dev-python/requests/files/requests-2.28.0-unpin-charset-normalizer.patch
@@ -0,0 +1,31 @@
+https://github.com/psf/requests/pull/6169
+https://bugs.gentoo.org/853247
+
+From 9e9cd2a257392988e6fa417361c3085e5b85af85 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Mon, 20 Jun 2022 09:32:16 +0200
+Subject: [PATCH] Allow charset normalizer >=2 and <3
+
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@ def run_tests(self):
+     sys.exit()
+ 
+ requires = [
+-    "charset_normalizer~=2.0.0",
++    "charset_normalizer~=2.0",
+     "idna>=2.5,<4",
+     "urllib3>=1.21.1,<1.27",
+     "certifi>=2017.4.17",
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -5,7 +5,7 @@ provides-extra =
+ 	use_chardet_on_py3
+ requires-dist = 
+ 	certifi>=2017.4.17
+-	charset_normalizer~=2.0.0
++	charset_normalizer~=2.0
+ 	idna>=2.5,<4
+ 	urllib3>=1.21.1,<1.27
+ 
diff --git a/dev-python/requests/requests-2.27.1-r2.ebuild b/dev-python/requests/requests-2.27.1-r2.ebuild
new file mode 100644
index 000000000000..ecfd2cc3e0ee
--- /dev/null
+++ b/dev-python/requests/requests-2.27.1-r2.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="
+	https://requests.readthedocs.io/
+	https://github.com/psf/requests/
+	https://pypi.org/project/requests/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) ) )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.27.1-unpin-charset-normalizer.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet (doctests)
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		# require IPv4 interface in 10.* range
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/requests/requests-2.27.1.ebuild b/dev-python/requests/requests-2.27.1.ebuild
deleted file mode 100644
index 02c31e127a85..000000000000
--- a/dev-python/requests/requests-2.27.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="https://requests.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	dev-python/charset_normalizer[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
-	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet (doctests)
-		requests/__init__.py::requests
-		requests/api.py::requests.api.request
-		requests/models.py::requests.models.PreparedRequest
-		requests/sessions.py::requests.sessions.Session
-		# require IPv4 interface in 10.* range
-		tests/test_requests.py::TestTimeout::test_connect_timeout
-		tests/test_requests.py::TestTimeout::test_total_timeout_connect
-		# TODO: openssl?
-		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
-	)
-
-	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_requests.py::TestRequests::test_https_warnings
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/requests/requests-2.28.0-r1.ebuild b/dev-python/requests/requests-2.28.0-r1.ebuild
new file mode 100644
index 000000000000..b96762bee446
--- /dev/null
+++ b/dev-python/requests/requests-2.28.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="
+	https://requests.readthedocs.io/
+	https://github.com/psf/requests/
+	https://pypi.org/project/requests/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) ) )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet (doctests)
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		# require IPv4 interface in 10.* range
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/requests/requests-2.28.0-r2.ebuild b/dev-python/requests/requests-2.28.0-r2.ebuild
new file mode 100644
index 000000000000..c3c23c38db26
--- /dev/null
+++ b/dev-python/requests/requests-2.28.0-r2.ebuild
@@ -0,0 +1,74 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="
+	https://requests.readthedocs.io/
+	https://github.com/psf/requests/
+	https://pypi.org/project/requests/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="socks5"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	dev-python/charset_normalizer[${PYTHON_USEDEP}]
+	<dev-python/idna-4[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+		!alpha? ( !hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) ) )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.28.0-unpin-charset-normalizer.patch
+	"${FILESDIR}"/${PN}-2.28.0-unpin-chardet.patch
+	"${FILESDIR}"/${PN}-2.28.0-drop-dependency-warnings.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Internet (doctests)
+		requests/__init__.py::requests
+		requests/api.py::requests.api.request
+		requests/models.py::requests.models.PreparedRequest
+		requests/sessions.py::requests.sessions.Session
+		# require IPv4 interface in 10.* range
+		tests/test_requests.py::TestTimeout::test_connect_timeout
+		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
+	)
+
+	if ! has_version "dev-python/trustme[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_requests.py::TestRequests::test_https_warnings
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index 2f44c68b2200..510164266872 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,4 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
+EBUILD requests_download-0.1.2-r1.ebuild 649 BLAKE2B aa43af6ae7a386f425923f964ec8442b8127172bb19ee60b49e4876c3cc0afac1a0dc306b23fa83022cc3a76124041753b7ffad05adc2037bdc7850a9e54d024 SHA512 82c8fbf9e55d86728e97ca27e2cca1272fb150dcd9ab31f71964a3ed6e79a500e36ee9abef272e4dfa63058c4dccca761e0fb31be59825ad4c5b3039ddadce62
 EBUILD requests_download-0.1.2.ebuild 818 BLAKE2B 8796df05fc86245accc7895b49cda1fcb1bf715ee3117965a1dd2475869c77347f1077b03006614c9b6d2b4f491cdf2497b7034c6b5424de6c30faa5b025e1b0 SHA512 8bad3ae0fbaf9850ab6f97709a6df6041252cbe553ac0fb0c0f4c2a10a04cd7122e4f2ac9c1fce09d50543d290ddd08e57bba55159b4735473df7f7d523766fe
 MISC metadata.xml 434 BLAKE2B 55a4f9a132c3c50d9a9852e73dd24ff70517c9be1a2c4c7e84f04fbfd6a24aa250e165db5bff5959fa2e5a88f063f080a16c2b47e061d6d501b67dd0860714d4 SHA512 f7950fc65c69c3376caf4e7865e9517d75e7df1b054748d6ca4850707ec7c5fb7124dc2057f8131c20cbc9e2f1d7198fe2d25879250b0cf99d8ed7fd6dbc1fc5
diff --git a/dev-python/requests_download/requests_download-0.1.2-r1.ebuild b/dev-python/requests_download/requests_download-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..b9bb4886b279
--- /dev/null
+++ b/dev-python/requests_download/requests_download-0.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A convenient function to download to a file using requests"
+HOMEPAGE="https://github.com/takluyver/requests_download https://pypi.org/project/requests_download/"
+SRC_URI="https://github.com/takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+# there are no tests upstream
+RESTRICT="test"
+
+DOCS=( README.rst )
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 417fadb83107..f3c5b4b7fb29 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,5 +1,3 @@
-DIST requests_pkcs12-1.10.tar.gz 4284 BLAKE2B 46ebbb00921f356ccf5793fe486d3e0d71b9b1688cb49d1c846c2ef808087bb51b71c18e89539946bf4b0c8d47df5ae7acda342b0e1293bf8a031eba5ba0ace5 SHA512 139d1b1ae740db7667bb079f955610ebbe6327dd6f050d59a0e6603f21a9fe0afde8dcb2ec666bc83f6b4205de05948dacf39bdec2d9f26bf3eaa7d6998f2fbb
 DIST requests_pkcs12-1.14.tar.gz 4896 BLAKE2B a8a3f0796092c66c210616ace20fb15cd82beb3ff3c0c0d1f2dccbd1ed7d62092a1faa69986e4f23d0b94af54f7f9b8819730f0c04c251fb751256dbd4c6bb56 SHA512 2d97b44b676c9e6e6eef127494d6c4a34179b8f69d8674ad9ecd9aa4171e5eb46a29a45ad5b5e8fe9facf234c1b7645fc5c87cef2b336beab941ce3e684c6d25
-EBUILD requests_pkcs12-1.10.ebuild 540 BLAKE2B b74f2f720ce1cda280375b882e4583c130707ad8603d3790ed05b62c8d780ebfb713e6cf53df6f3f3416c570f4ce2e523aa0b50f0b568389a42a5a9a5ca407a2 SHA512 425166d2c5b3aa786c572df8a45ffd8e439490c43f0c976aa8d494477edfaa30b3f6c3f3817a8239adcf838e76bf5847a94fa9eb04fb867669de4fb0cab3e3b4
 EBUILD requests_pkcs12-1.14.ebuild 540 BLAKE2B 5be443d6d3969647f16f83df6763b91785b002df2a7c6501b83ca2b907daf11544041c621f18165fed22f7edc32ac21cd6933010d09e349ff6380b97583f471e SHA512 17205325fd6e2b4a02a033dacd0adcf81834989eb6ce122d2cd566b2841a0fd282ae12b5eed70548765bacf74191b3fc7bcc9bef01e265b6576718076544274a
-MISC metadata.xml 657 BLAKE2B 2050f6406bf1e4976c51f84b60f7e26d297d21d0d84c7d88ea809bb86916414d63cbd822c255a0f685fac194bdafd63fc1da6150cac58872fea4d9371ceb56e2 SHA512 aafcd6db53d6aa99f0e19a78a29154fb150e29a5732cdedcc785b00c16bd0c5502ed7d10ee2b556b6dc966e47096243e80629496df02626e84614e033040b47c
+MISC metadata.xml 556 BLAKE2B 36d568f8279e130486b6946550b2acce63e87f44f2b65f2c5df69d97880bb6fb053d30335a6ea6400e8d0290d44a79f7ef757cfea1feda109ee05c4e14ec8d45 SHA512 220eee0f3b7e87493ec2ceb7fa80b8a7dade81fd02eb8b39f7488946c41a861e9f57ebdacbae153d4e6ed05c7c9382c6796152b7561fdad0401952ad3b0406e9
diff --git a/dev-python/requests_pkcs12/metadata.xml b/dev-python/requests_pkcs12/metadata.xml
index 6417995dc682..1136cb253f34 100644
--- a/dev-python/requests_pkcs12/metadata.xml
+++ b/dev-python/requests_pkcs12/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
 	<longdescription lang="en">
 		Adds PKCS#12 support to the Python requests library in a clean way, without monkey patching or temporary files.
 	</longdescription>
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild
deleted file mode 100644
index d5fd9b39c41e..000000000000
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
-HOMEPAGE="https://github.com/m-click/requests_pkcs12"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=""
-
-RDEPEND="
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test" # no tests
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 67c15b969846..3103822a2967 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 497 BLAKE2B 1e4bd873c597108d615c6e4edf954eae02ccaa4a5a9dc9108b2f27020d0a28dca013410531ae56032f55d3a6c2f4c64e104f24504a91ddb7d01e7b2d86b56b44 SHA512 86c80409436322788d730cf6fca227fc5058b7cdab5973d79114fdc6379c50293ce720af8a287ef17011d1886855f775029c9c583b331b66e3854e19b2d543cf
+EBUILD requestsexceptions-1.4.0.ebuild 504 BLAKE2B 06d7a8d1b562bcabee364855b42d9f25ca9b0baadbd53708c9cb2baf892100fc481a7bfa3ae6288146c748b6cde90c97475f66ec7ce2be32ad7696eed0b44dd7 SHA512 366f0117f0e89d48a84a6bc414410732b111ccb5f4ec05c2aa719350abe3898d0389c26b184483bb89d5e59577ead7452c9335e80fb975f04938c2f26edfef8d
 MISC metadata.xml 847 BLAKE2B d56497e1b5b36d36f7155a4a01c5ff0bc591a1c2cf15de3108b8c0b9fbc46d583b1f035787b0f81bacdd3863bb0cc3bde1aaf1b8c953d1f30946bb241e0d24a2 SHA512 fbeaadea31ecb181c762d55714d32bce8039673e1d2e091354e2587631de7793e057a6501c475326060883e0604d4f7fd44d8c07884a2772972e057373427c86
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 2e3f56bca881..8009ee3bc158 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-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=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 ~riscv x86"
 
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 84f3fcf04960..dedd67649700 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,3 @@
-DIST responses-0.20.0.gh.tar.gz 45072 BLAKE2B 51864ae6de7328507e74f540f9546f16c5da950ebdb29a13760cc1ff4e1d3736f8e61efdd0ce5a427ea7814a9ffdb936496f9787af74ea2f6565d48f6ecbdfb4 SHA512 cce8d6eca05c23ab12ef7e66297dbe1f613c0ac7d46c20b5ea77639cf5be1807ef55e7c71eb5e915ceaa1bc51293a339f9e22a864da0c30c3a676c6c5bea03cd
-EBUILD responses-0.20.0.ebuild 806 BLAKE2B 7f1bbac17dbc5d0b63538769ffa302981a44b01231f2ddd27909b68e47776a9a78bb798a9f93296fcd7de98d35d0ae70866087bac881b6458181fed0a74fae16 SHA512 1d4b4fa7f957c11c56c977118f613fc660633ae3549b4e44c91717f0c1dda3e7fe925028e0f6e7ffb984950899d4973ebf5402e2ebc9d69fff92703bdce7f514
+DIST responses-0.21.0.gh.tar.gz 49551 BLAKE2B 3796fd29353f80a04b26a7348153902d959038e072bf512ee4ba8ffd434157c0ce5c37073d114e0d2865c827d82166ee1fcefe2f250c895c23c53664ab919903 SHA512 9e82f0fb7d2a2a4ea071a6384584ba58ebde13504408f8bac351d24df206f0f6815ce3b6d7e013fb87b04d3a1cdccbe7a5287f56f4f9bfb3d4567ad2eeafa778
+EBUILD responses-0.21.0.ebuild 806 BLAKE2B f05944f803ee4b3f8edef401fe5d67817b4f3a9946c7ae7d51539a68a79f83589b429d21fbbabbfa90fbc975e09c0c4e717b290b4c632dea353cf987daa86a11 SHA512 c18b3742a16d17962286e4d7a092319b0fb4e49fd5923cc23b3b9fb5503924d373bdad131b73b22c186f7d6a7651acdee4b27ac30550b17bfec30c9e04f8201f
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.20.0.ebuild b/dev-python/responses/responses-0.20.0.ebuild
deleted file mode 100644
index 4ea1233a6ba7..000000000000
--- a/dev-python/responses/responses-0.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="
-	https://pypi.org/project/responses/
-	https://github.com/getsentry/responses/
-"
-SRC_URI="
-	https://github.com/getsentry/responses/archive/${PV}.tar.gz
-		-> ${P}.gh.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-3[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.21.0.ebuild b/dev-python/responses/responses-0.21.0.ebuild
new file mode 100644
index 000000000000..8a9eb16cce78
--- /dev/null
+++ b/dev-python/responses/responses-0.21.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+SRC_URI="
+	https://github.com/getsentry/responses/archive/${PV}.tar.gz
+		-> ${P}.gh.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-3[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index d38789c195a9..5ed542249a1e 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,3 +1,3 @@
 DIST restructuredtext_lint-1.4.0.tar.gz 16723 BLAKE2B 2beaa565391fd1a130f8ef998b140e0ebb4695759a61c0526f066e71c3bd42e981115f267c48d30e19eb45c240907ea71d9f49a03d74e9ce1d4b80a2c0b511c9 SHA512 8e16e2a43cb1e52bb3b4ac60da53130bd4a8d0b823fc95b32e62068bed95728084de3b55820cfcaba70eecaaa93bdf3f956b8bb6c55155115b40c7151ef58a2c
-EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B 5c6a736fb2ef184fb2d8b55122cc6bf768117ea689445f59fc0236507e64b638e133598ed4ca9781b82cac807673aad0b6b69a7f34a98b6b7524187cc25cdd94 SHA512 39422db38b573904a85f3b62cb1924307652de63a29c8b48531f82ef8dec2e3f7b3af351c7b8d169560e4fd43944be85ac20d5065eacb0b51595d9a63fbf77ee
+EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B 574f969eaac64ed5a94a504e060939daf148b7ddbb73f17230ff66bc5afc2ac5fc8a59ccf6bdb27f00a37c2dcc3eb888716e447772ca5737f14be9aece4a8e84 SHA512 cfaf2b79b88dc9c294740c21d996b1dd73a5acb8999eac268f8805265f474db1baf1abc93dfd5b9c25ca7ac9173ff97eecbd543966382989886099008084ee8a
 MISC metadata.xml 464 BLAKE2B 25d6d2cbc0a5fa141d5102f0065fd2a1edb3027d75b93cbd421dc732b24c350ca04c4286abf324ce8bb86af9b48e1805cd737b8987852661942043749b818dd6 SHA512 71919795b1be966904361cf818dc689bfec9db3c48b03d30a8b13817fc3dbe0ada1b898c34bd5fb1859018f079f9cd3ca35a478ca0390d51a3da2baae703c337
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
index 1c41fb8575ef..b2eb200afff5 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index a542282ebc65..926de8ffc09e 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
-EBUILD retry-decorator-1.1.1.ebuild 468 BLAKE2B 614a2d00079e7a35914ad9d8980346f91ad73a3e9688954d37c193c14ade5ab093f635e19c380491739c57af1de7849f55f963a7f1b099a1e04066e21ee242ec SHA512 55080f646dd21da9b6ce34356fdaf79f7285b2e92af2976c8667fee6a5c92edc9f2a1fb8eef1533dd7b7bcadeb94c23544751945eadd49a5f422da0f843d9eb2
+EBUILD retry-decorator-1.1.1-r1.ebuild 500 BLAKE2B 70ad24fce22d90adca4b6b9f848470d43cab788514e130530a3a697b91629b75aecfad69021d21ad3b0c9ba62eb4557849329bb4edc517c086ff6b61a3af3720 SHA512 67a526be96f9f23a638672ec43ccc0885c4b39e830f421805f462b603ec0b4a2a9f3d964fc7eaea40e4b693fc5519180600b4f3d37824613da7d981e7390645f
 MISC metadata.xml 405 BLAKE2B 90863423065eb5179620db1812e96da7fbcea74be72b0c3a36db04d26ce08afabba8c4415faddbb09676b4bf5acffc7c3e47b0d1eeaaa4cdb98d935f881741d5 SHA512 078b9f2e7f24393c1c9950d9a5cb106720358ad72db46fb0a238354f1b1b9bacc2aa3b7d99628fd4ac0e52f8a8468b7fd94d194c6eede655f2d2442bcf587cac
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..4df00fb12433
--- /dev/null
+++ b/dev-python/retry-decorator/retry-decorator-1.1.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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Decorator for retrying when exceptions occur"
+HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
+SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~riscv x86"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
deleted file mode 100644
index 8d6cb60a8ce0..000000000000
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ /dev/null
@@ -1,19 +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="Decorator for retrying when exceptions occur"
-HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
-SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index bd24ee3d0847..757d6c87471f 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
 DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
-EBUILD retrying-1.3.3.ebuild 554 BLAKE2B b7ae606f564f5f77f31b21e84e49ffdcc29fb785f1ded8cda016567899c79a7b1c0561be7d632524fc0502c86a5633b4cb60928aff1cc4aade6210f020853da4 SHA512 fbd69fb3aeef3276b64758f12990c5565c65b7837ad610f334f3a2c91dd94f1d77d8f0da0ae9cc0aefaa27ed9cc888a859ca2ad68ac0f6cd82858f9dafed3bb5
-MISC metadata.xml 697 BLAKE2B 8e2dbc71defcaea67864b234838a8aa574219c61115fed0a7102edf68b457d2a4a69ebf2e2578c1d1e2bb47762b696350d846fcc1f467c8117f05efee552bef9 SHA512 381bf3359171a8860f0e7c6a485bf8ee6098bc9d0b29e1012bae9c911b775d09cf2228ad061b01184a4fa6c00f62fe2ba3e7cc74c9062bbc0766a017dbb59805
+EBUILD retrying-1.3.3-r1.ebuild 586 BLAKE2B b2a66c632d2b915f8c9dbd7e3baf9d551272cd0d15421ab0fdb8697e550325dd4f6e6cdc7bb3748e8cf6b2f6eee46301ea83e14d408a71c23a39252f29723d22 SHA512 a086ddd4dc8fcc2bd0bf5bae4c23fa89d9de9e5cbc3f7cec6e4804062d8e1144f0d86f81f1d844cbc79fade2dd11c0e87d25d0025f2eb03ccde5edb4c711d60d
+MISC metadata.xml 721 BLAKE2B 97982201487471cf660d1f4951834fa1fc5b8f85753e7f3b26576e3d20dff37225294d6cdc90c78fb6c8b716474c016cfc058fbd29aa433bda959924464da96b SHA512 767e6d31886933846ca356af0c867008c246e89dda1b1535837026c789fc63a854967ca0c9faed636ed8a829100107265b3c10645b83fd8fcb1a6bcaf2b52e91
diff --git a/dev-python/retrying/metadata.xml b/dev-python/retrying/metadata.xml
index 97e31b2d0e76..c8f6063c5ccb 100644
--- a/dev-python/retrying/metadata.xml
+++ b/dev-python/retrying/metadata.xml
@@ -12,6 +12,7 @@
 	<longdescription lang="en">
 	Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">retrying</remote-id>
 		<remote-id type="github">rholder/retrying</remote-id>
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..8d90953b7dca
--- /dev/null
+++ b/dev-python/retrying/retrying-1.3.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+
+RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
deleted file mode 100644
index a62d08a1890e..000000000000
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index ab7ca89d88cd..bef4b00fe817 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,3 @@
 DIST rfc3339-validator-0.1.4.tar.gz 7451 BLAKE2B f8216b2eb08cc7cd755a2a57dc6fa93da9aa664cc49f7e34c551d07eb61e57dc865de4a3e86ed2dfbf5a38ff99c149868762a3807e916c884b12fba7e98c3ced SHA512 ed593b31c4984cdbc313e42dc0432173eaa649712e29627ab462dfa262efb30cee97b74f589d3d211c2193623fac3baca560a52a7a3f718071a63482e06c4203
-EBUILD rfc3339-validator-0.1.4-r1.ebuild 776 BLAKE2B e250a6213326aadb6cd011c444044d285725b7212149284dd22ffdc4876f5f84446a4cdf348c34751d01349b93e088b78745d9d7f427ba3345ebf94fca1ac026 SHA512 faf9453d1f031c3516e82d2de9df2df4ae015f06e0f5dd2143812018976d004b8dadae0bc04049ba91ae0cad2ac9a5d511b3f9f5747f0d2629756ebbb6083108
-EBUILD rfc3339-validator-0.1.4.ebuild 679 BLAKE2B fe071d528d0ca616cfac8c2c7ab9bc10f84db07a358aaa0938373a410e081f5988d0077332a03f8efb8d3c7e24aee56d0630055dc32633c5f21fceef1b3e05b0 SHA512 5352ee9955f7ef6da5c9e86a947525bf096e35175fa0965d0dcd2f197a8111a067acca92a4f42aef14e266f4e1d6d340d80d54ef7843e4c3afee64921aec1b0a
+EBUILD rfc3339-validator-0.1.4-r1.ebuild 768 BLAKE2B 5a31b752ebd913d970a3e9693f4b40cbf11fc38d7739774b92b066cc91a39adbef2077391bc99b36f22acb3ab45d11fbe45a371727a2692520a619e1af0786b2 SHA512 33ca06e05d159a3c07de4d5ce1bb968861d7d06d9085b98ed27491799f18449ab211a781e5c00bba6d5f83823b4de6e3cabecaf38850b84424b7a1a24d781020
 MISC metadata.xml 411 BLAKE2B 9a256d99c97dbd11b05ffbc08351064fa12c64ef2df3e3903cd2193aff1a4cea6e70800d9f76a7fbb0ac4badfe93fd1392b950713db296cdc8339de6f023c58c SHA512 bae3f998329addf682d44d9709cb2261cfab68437191596d00b0c97d38ff7d17a99c0c545fd2205e118137e5795bdbad58c339fedd6cfce0578578637755a336
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
index 72cb16eb1624..3a8d4bdd91cf 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
deleted file mode 100644
index 9bf55ce0cb46..000000000000
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 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="A pure python RFC3339 validator"
-HOMEPAGE="https://github.com/naimetti/rfc3339-validator"
-SRC_URI="
-	https://github.com/naimetti/rfc3339-validator/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index c85247f457b0..e3d4c88b2304 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,3 @@
-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 691 BLAKE2B 093839a7023b6afe8f8817b0f5a12d76a8c943461a9f99e9e25c53203609658ce01726d0f2262203598ca22a0e11937a79d833e004e4a1788941dc16ee52f990 SHA512 931df82a33bd3c121ef41c08fae7fb47a712aba53f9c59c13af388cc5f06b55fc3141651c5d09b6b0d6d24ed55c1c468ef6af7a5f58d6931d3060c0483eb7b0f
-EBUILD rfc3986-2.0.0.ebuild 691 BLAKE2B d0ddeaaf5538f4681080e0dbbf7cb6547207c084b87c1cb368118cc1ae722c92d5f10a8660a37c2bbf30c69cb8fc177c2c90b40976281e9b06523668c626abab SHA512 b40cfd7710d7fe82e6f532c5670568cc84d283e497c00552a9e5e560e99658c0bb11e4bf5896c662fd81f8a97e578ec294b948575eb83a9f7c97a557c9e03ca4
+EBUILD rfc3986-2.0.0-r1.ebuild 771 BLAKE2B 609aa3dbe61111e6d71039d0c7f8f87cdd528ce8cd513501989c145fc99dd75ac022d1326ca09f7c0101840f91ec14154e77e0ee7435d1ea8d10595cb26a61a3 SHA512 6026452680d55d108d1dc4edce0ea3ac7b8bae60253ee1df8e11eca3bb1d4595fc2a0040c2a4ea0c03d0f193c9818fc0734a99cefcf23d7360c6b0ab4b9a771a
 MISC metadata.xml 741 BLAKE2B e493181d32969459e23997ab0d48e5c1fd42f2bbe61ed04a5107697a61090d109b6133618c5ef153c92b88eccad0eb93c02073f1ffa9e763aa8518a85de8a19a SHA512 34ef9d54aa2dd6cca1f4d3abcc45d3147c0fdca559a9d30b28ef86e6e9d908ef0fb82384f10abb535fab1a0aed2b81f78b517cce73e5b947501ec9be331af13f
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
deleted file mode 100644
index 298fa469b60a..000000000000
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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="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 ~loong ~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/rfc3986/rfc3986-2.0.0-r1.ebuild b/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..c07905483d49
--- /dev/null
+++ b/dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Validating URI References per RFC 3986"
+HOMEPAGE="
+	https://rfc3986.rtfd.org/
+	https://github.com/python-hyper/rfc3986/
+	https://pypi.org/project/rfc3986/
+	https://tools.ietf.org/html/rfc3986/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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/rfc3986/rfc3986-2.0.0.ebuild b/dev-python/rfc3986/rfc3986-2.0.0.ebuild
deleted file mode 100644
index 40aa4a295eff..000000000000
--- a/dev-python/rfc3986/rfc3986-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 ~loong ~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 64b2a791fa95..43957c1887d2 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,9 +1,3 @@
-DIST rich-12.2.0.gh.tar.gz 14884722 BLAKE2B fb3720724d2441cddd85ac22249aa232bd31f664019f9eb02e10fda913b98c0220a4fadff47fc0f6884ff77b7ee9f98a96e036fb76d0492e0c040d752a9e9c79 SHA512 8f8108557ca21e41b35c03242d203c229f7af0d7abf5b394fc894e71ae098bbc14e046b166e5452d7a9f9d7d6e8cc0e13784d64cd721d2f7acec9f624d14db77
-DIST rich-12.3.0.gh.tar.gz 14889665 BLAKE2B baa098e25768b4b84a269547c7726d281f67e333c0993513223dfdda7023001ea78b6edd10218726ae888e7216e18c6c4d5b9711268d083dfd0a41c3162658c9 SHA512 6df0ac70ffac7aca5726c9ea29c6eeada1ff955539842a1352eaa7f7e95c4c7ec57f4e2eaca6808e522d7e455efa80df2ccc3e20188f4646ad0e18294b59f744
-DIST rich-12.4.0.gh.tar.gz 14890620 BLAKE2B fe38abeec7f896053fc2f13259694dd90378db5318683243cf7b13add91c356992b9e4faa475aa282af70694b14e7c82e54c292bd3bcb4411d460dc831310b26 SHA512 dec7903854b29d13b31d3b17a592cd6b94ea1fb6626f7d8abae57927e8cd8021a51cf060b0f431d6fd8a358ae6938038f5aad0c695afa121e05ab3e97aa61006
-DIST rich-12.4.1.gh.tar.gz 14890981 BLAKE2B 7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a SHA512 ee02526c5e717976c2b4a8e750dc9f87d5b2d15a9b144aabb8e84de01ba4df78985ad5ed6bbcf9f6e42a76a63cab6da76c05da917aa8c09d678858fa148db76c
-EBUILD rich-12.2.0.ebuild 946 BLAKE2B 37b8aaf2777692d89a64830d815a1bf70389358690062d1c3321ad776ab862616c7a44bf59320d95222e21c50ec7aab0587773dc37cb346b2075afbf3d30f30c SHA512 0adabfe89691b8568c40ca368434e4f9dbcc979c1c6907450a46a3dd35a2c4a74d93cfddc3d2256678156a562a5210beae9b76882adc320e5ec0b4fba93e3946
-EBUILD rich-12.3.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
-EBUILD rich-12.4.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
-EBUILD rich-12.4.1.ebuild 1108 BLAKE2B 80cb4cf1fa8261a1b13a136ff50389ed99772a58c6776e689bda28abe4bc609b87ddd1c9bff2c5574e6914bf1dd2a59617346f4b5fc9c7ecdfeb67fa5ef4d995 SHA512 cae445c45ac2398917231d5bb4e8296a7709f573b1fec380eb92c4fe10d34d50581d7349dca1242e641037bc2781554467735fe4323f45f781660ceedee1d6c1
+DIST rich-12.4.4.gh.tar.gz 14891341 BLAKE2B 7829951edb77b8e78bcbdeb340fa6c96901d634fb59ab16b8866b898973a95bd38de9dd1a8f6c821cd2222447878a5d22773abec329f49753e207b5b358c3532 SHA512 c1d077bb1448fd436fea87697d31b484615f787c9259418d6ebd12da45bf14f25f192198e4522653c5bd4e5ba218da7d72597e20d04dbffce4a3ea8bd82ce27c
+EBUILD rich-12.4.4.ebuild 1484 BLAKE2B a51891d479aad08cb6b3077beaaebdc550917d5f65c254f6445b3ebf446a121e6789178e5c34febb707be699c7dface9c70df548b8d24d0e552b19aaaa114c56 SHA512 490be77fc00accfe30d9076464d5c29a61a838fdde564c94ecd9c42b2ad294fc756d75c89c9eba2fb206138f261b5ac8ecb7cdac0d96fc461bfee47b107443eb
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
deleted file mode 100644
index 88b8c0685694..000000000000
--- a/dev-python/rich/rich-12.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-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}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.3.0.ebuild b/dev-python/rich/rich-12.3.0.ebuild
deleted file mode 100644
index 6fb3f685440a..000000000000
--- a/dev-python/rich/rich-12.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-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}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken with =dev-python/pygments-2.12.0
-	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-)
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.0.ebuild b/dev-python/rich/rich-12.4.0.ebuild
deleted file mode 100644
index 6fb3f685440a..000000000000
--- a/dev-python/rich/rich-12.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-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}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken with =dev-python/pygments-2.12.0
-	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-)
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.1.ebuild b/dev-python/rich/rich-12.4.1.ebuild
deleted file mode 100644
index 9bbc80387ecd..000000000000
--- a/dev-python/rich/rich-12.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-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}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with =dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.4.ebuild b/dev-python/rich/rich-12.4.4.ebuild
new file mode 100644
index 000000000000..7bc3d6877b3d
--- /dev/null
+++ b/dev-python/rich/rich-12.4.4.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=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# broken with =dev-python/pygments-2.12.0
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# the usual deal: output changes that cause test mismatches
+		tests/test_inspect.py::test_inspect_text
+		tests/test_inspect.py::test_inspect_builtin_function
+		tests/test_inspect.py::test_inspect_integer_with_methods
+		tests/test_log.py::test_log
+		tests/test_pretty.py::test_attrs_broken
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rjsmin/Manifest b/dev-python/rjsmin/Manifest
deleted file mode 100644
index 0092ef25668e..000000000000
--- a/dev-python/rjsmin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rjsmin-1.2.0.gh.tar.gz 443279 BLAKE2B 7cb000485fd134fdc590b90766357b0eea5b33a9baf2fb12623ad5a882ac545aa7dd3f447a23c95da3cdf79f44e4f369d48b1cb2e08b790ef7376e9b6c9fa4d8 SHA512 bc40dd59d7dd4e106170db473ef3c3c6df74abdc93d098521f91212a08476541f13a97663c9f56498188c59b3876242c6c81a5633fea84d83e8ab2f7a4d918ad
-EBUILD rjsmin-1.2.0-r1.ebuild 468 BLAKE2B 88d5f9aad1960008995655fa8f1bafd1715a7e3489bace60d4cb7f3b37e466cf584a3f0ed8da1873afdc07991f220fb42ff661ee6c078126f0d88d1383eae2f6 SHA512 0535b0ce835fa5ad82bfd85b2fb419329290aa034c8f8619882ae9094f0a8b2721ed06515755d2ac4a8c1b5033b58b54cd6981d982177282618f8d91c1d0a106
-EBUILD rjsmin-1.2.0.ebuild 435 BLAKE2B 1cb2ae1521bd0e51ee203d6aaab4c0dab34b7c88fbe0aba829d008a0a15d27bce9e69961e37c84dc15b18dd855237d1c1605e38aae67f40627cb3496d270af3b SHA512 7df556c5c003f7fac744450e2b54b6e6b09e474ee75408e79179e2952a8f3e26358335f5b1eee8edbf146e517eb4a93ec40d5e2728c6a34151c989d45107abc0
-MISC metadata.xml 373 BLAKE2B ed34780363d87837465a1f22472a8e783244d2c7290ada38dc16a6dc8bfb60bfcd95ae22a691986dbbdbb5502f777dd181d2a3a5a19223beda0071638a4fab90 SHA512 37aa8f0c6ef5d81cec00473563ad5ddba64e2bac68a55e3ee3950f8d3fce9767b9fa6f2a624bb2b1b7771d173ef067b73b8ffe54f4d1f78e0ec4958d2476e7ab
diff --git a/dev-python/rjsmin/metadata.xml b/dev-python/rjsmin/metadata.xml
deleted file mode 100644
index 3989b79fd075..000000000000
--- a/dev-python/rjsmin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">rjsmin</remote-id>
-		<remote-id type="github">ndparker/rjsmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rjsmin/rjsmin-1.2.0-r1.ebuild b/dev-python/rjsmin/rjsmin-1.2.0-r1.ebuild
deleted file mode 100644
index ef6b0ccf82c9..000000000000
--- a/dev-python/rjsmin/rjsmin-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Javascript minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rjsmin/"
-SRC_URI="
-	https://github.com/ndparker/rjsmin/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rjsmin/rjsmin-1.2.0.ebuild b/dev-python/rjsmin/rjsmin-1.2.0.ebuild
deleted file mode 100644
index 1d82f9ac0ba7..000000000000
--- a/dev-python/rjsmin/rjsmin-1.2.0.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="Javascript minifier written in python"
-HOMEPAGE="http://opensource.perlig.de/rjsmin/"
-SRC_URI="
-	https://github.com/ndparker/rjsmin/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-distutils_enable_tests pytest
diff --git a/dev-python/robot-detection/Manifest b/dev-python/robot-detection/Manifest
deleted file mode 100644
index e0773d828fa3..000000000000
--- a/dev-python/robot-detection/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST robot-detection-0.4.0.tar.gz 81090 BLAKE2B d8422567119a633e1f97586895191a5f331e7800db596b204cc6e7a0b44efee1ffbc0e4941911a1410be329126997f59eebb63441e12196feaf5ac8000b1434b SHA512 10b1fbd2307c375e3cd067e43bee1bc0ff71f4b83ede9b92d2fb8d60edfd6d4a8d1a4d06d74e3c0653056f2e2b2cb81a7e997047093e925bd79bf4626d33d85f
-EBUILD robot-detection-0.4.0-r1.ebuild 503 BLAKE2B 5f8c186e95d48be93168d763a5283b7151ec2b8f3df5a216b1a57c594b873f512a5ad681014a0e6615d2f258917020640469fdbbb88dc314537c24c023233de0 SHA512 47336bff8bca04b66c6eae7bb45b7f47883c4e4d4324e27448baf58da01b9bc30cdb2c64ccb91dc0f43cb0d625442c8fcbc2721b3a22858b983cea379ca74cd1
-MISC metadata.xml 330 BLAKE2B 419eade94e8b94f4e84d847d89be6b787ae8d2b80194e8ff53b46b9976c81a2144ffc70c3ab055338ac3840eb758fb08a53c515bd4361d8f2a2804c37d3598b1 SHA512 59cb1b18bc59afb9b6812b30c9b4ceb1c2fca879ba9e36670448e4729da98d00cfbb12485406be04fef624eb322015a10d0e9dfb5917ddec137e32ec5f356cd0
diff --git a/dev-python/robot-detection/metadata.xml b/dev-python/robot-detection/metadata.xml
deleted file mode 100644
index ff64bfec115c..000000000000
--- a/dev-python/robot-detection/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">robot-detection</remote-id>
-		<remote-id type="github">rory/robot-detection</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild b/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
deleted file mode 100644
index 9619e2b5e7f0..000000000000
--- a/dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Module to detect if a given HTTP User Agent is a web crawler"
-HOMEPAGE="https://github.com/rory/robot-detection"
-SRC_URI="https://github.com/rory/robot-detection/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 1a763dd58622..6c092d40018d 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,3 +1,4 @@
 DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
+EBUILD roman-3.3-r1.ebuild 549 BLAKE2B 61088b601d0326164bbc375d2161077f0aaa86d229aae7ba0b6672ea186fe0ae0e108d89aac755a38153bf0f2fa340f2995c2668593c455ae5e4b828d519ecca SHA512 2959923f6095e42570947a6e6dcb8afe49b04e6343a3e6d18961490122da1c2967b66729fcb00bd995f876acd73bd96a1df7b4141d06a5feb127a2f5e1c7a530
 EBUILD roman-3.3.ebuild 515 BLAKE2B ef6d0ad6524858b9c1ddf3134f266078ab507dd678d7db6249196ce4cfaacc061d4122bbf4326bda91801cc67a85e85b5531713a245b79ed780723f58a5ee427 SHA512 d465fa7e7b830f97bd17c72194ddc6067a73efd85aff0e5915273ea166d0ef39b4c38419f7414a84baae92a45e55771eb5e10fad7a8999b4e11723ee6d75f8a4
 MISC metadata.xml 344 BLAKE2B 5e91211798d6c6f7dfb0c44686a7d2a0e26e0af4dd07d0bfc670166df0e65911a709211cf2a215954e1db0ee580ced70fc0a51f8e102b553dd0ab0b35c369bfb SHA512 8e60fa9f18e2a7b2ee0575eca3f20b36ae0dec512873e8f4278869e1cf2dcc2e57fb326684a806c37e860780cec81b307e89c83ddbb38a6eae71be118bb51dda
diff --git a/dev-python/roman/roman-3.3-r1.ebuild b/dev-python/roman/roman-3.3-r1.ebuild
new file mode 100644
index 000000000000..0d4cb9fcae38
--- /dev/null
+++ b/dev-python/roman/roman-3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="An Integer to Roman numerals converter"
+HOMEPAGE="https://pypi.org/project/roman/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	mv "${S}/src/tests.py" . || die "moving test file failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 7d95d15c160c..28b934e4c64a 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,5 +1,5 @@
-DIST rope-0.23.0.tar.gz 260990 BLAKE2B 34064f45f72d6c9c5613eb5d9480dde25aeb5426ab3ea9b56e7ba5e4da1d9930735bd87757e3e885d4504ddcb24b23aa96b0d5be7c23ca4969201aedbaa3aa24 SHA512 1ab0a36c792fdc4d0fd1e554deec0fb6d1e877d91164fb8ee2e5f99240087f8a8d4608d1975be100bca87be0321d672b91579cf36795acffc742aa021cdf5e1b
-DIST rope-1.0.0.tar.gz 263335 BLAKE2B 5a2ecb494c7ab7833a75e54887e863fc5b35c2564d9ebcabb055084f1aff189bbedd2de13b1f8e0c56736886687c25111a42e47ff5ea84c217bb81927495e1a1 SHA512 f4a011750dfe51f092f29d1a911e4ce6c0425a31839f6ebade834d57472beeee9bae49cbd1f46ebcb2f3fe5c6aaf16edd583fd3a701b51b0f80d221c5aa23aed
-EBUILD rope-0.23.0.ebuild 900 BLAKE2B 63c7cad00245d18aff4aa980e5b08d8274347945a9dc3309edbe9c2c10946bf3a759ba59d2767f72f7877294c0dec8a3ef1a1d62cd4c2ae4e882a714e8a270f0 SHA512 668782c00200534bcfbf52338c812034824eaea0ff6c55c7dc123a3a85a68980de65f011b8a5ae9c4ff1f3b0f8479ac987d129d29b07e53d0e0e803c273f57b7
-EBUILD rope-1.0.0.ebuild 573 BLAKE2B c4534f40f85ccaccafbfcd1579019175325f267485973297c33b3112c4db89a733f71d7e20520e238f8bf30e0b70271e4286c2d284bb51fb88ef1d2640d49300 SHA512 0421577c808c9ea8a4534bd44a4c19978d97e38a03a88d305fb5e46582c1c7e6d8631c7da7f5bad4113b5a20acdfb27684873d613e55608413c05f21d7bcd35b
+DIST rope-1.1.1.tar.gz 274610 BLAKE2B 52354453305ee58db70f86392f7ec27179e1e4a9ec677fb8875bb9ca24663e6dae26e1bac4a1ad62143fe3a419a7a1e1fd0b7d2f03ef556143d2b060b23300af SHA512 aaf664a63ef00e3c844d6999338fe6a3384ddecfe95ef9b7eb213e5c37c9f78f7d2ea59aa7e612487bac5eaaaf7fc8ba499c0d43c740f99a7b3be64c9d7f6e07
+DIST rope-1.2.0.tar.gz 289239 BLAKE2B 314cf382e76a448dcddff0b9c52ae437cde032b54f1c9edbb05c1d47832ecc7a0b35b8eb14cf48ef5b296011a273cf3e21c5433a70e2627c11f2cdeca885e1a3 SHA512 d34a47a6453a85fcaa253287224b7b5265e08d2cba46377d17502f78642d3468d074b43d4916758c2225f98e676080af2b7896ad6194e0ee0234661343259fd1
+EBUILD rope-1.1.1.ebuild 571 BLAKE2B 9ff4cef2258e69d043c2b4fb2140959f1c17418c731b5bd294aceb693015f7c8dd063565762019479cad2f8b4b912b9e8e565e86e61841f78d385936193f79b5 SHA512 93d08ddb4b985b5b749ad5fe47756dbfeb3b7c43bc25655d52d96a27c18a85bd5ccd2e979b73f40f9d92c9dabbaf195d7d3edd5970631458627fca780923a66e
+EBUILD rope-1.2.0.ebuild 923 BLAKE2B f7a62177405535b3b867bf15c9d947a89621b7f46f19153824cdc4faf116c686ac1a27ac74b9a0506f8c1de74769a63d8a9fc50e1bea7a742e8b9439c5926ffd SHA512 b0dec73b8bb520d95026ba92c730ababa70e08b2b84f9ee4e84792620c6d393bd22df39f79082b3249fb636930b62e3d76ed7d72bc546d1a843976f4ec72ddce
 MISC metadata.xml 452 BLAKE2B 6bee424d801bad8728f10ec3a1618e3a48776a7b0af2a04efafd07e6ae5ac8e0b88253ebc35e457c791e820f8c3b1dabde73aabbfd3636cac5e169e8aca75aa7 SHA512 4f88e1157e4838f321b6f208ba6b89fbf2b7a72ea6e038cdd6cf3e9e211c2788dda137e3adf76072c1d52026c554750193d9938054670dd995a91db24ea8da76
diff --git a/dev-python/rope/rope-0.23.0.ebuild b/dev-python/rope/rope-0.23.0.ebuild
deleted file mode 100644
index b78327bdeb9f..000000000000
--- a/dev-python/rope/rope-0.23.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="
-	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-		popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-1.0.0.ebuild b/dev-python/rope/rope-1.0.0.ebuild
deleted file mode 100644
index a59e2a961a63..000000000000
--- a/dev-python/rope/rope-1.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="
-	https://pypi.org/project/rope/
-	https://github.com/python-rope/rope/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rope/rope-1.1.1.ebuild b/dev-python/rope/rope-1.1.1.ebuild
new file mode 100644
index 000000000000..bb7f86c3ec75
--- /dev/null
+++ b/dev-python/rope/rope-1.1.1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="
+	https://pypi.org/project/rope/
+	https://github.com/python-rope/rope/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rope/rope-1.2.0.ebuild b/dev-python/rope/rope-1.2.0.ebuild
new file mode 100644
index 000000000000..67e1183ee5b0
--- /dev/null
+++ b/dev-python/rope/rope-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="
+	https://pypi.org/project/rope/
+	https://github.com/python-rope/rope/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/pytoolconfig[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# our venv style confuses this comparison
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_source_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_typing
+	ropetest/contrib/autoimport/utilstest.py::test_get_package_tuple_compiled
+)
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index b06efae3fe01..66a8236ff213 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,8 +1,5 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
-AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
-DIST rospkg-1.3.0.tar.gz 91442 BLAKE2B 9bf217ff103513471b1a2b0812e4b08519d667c0b883c545b23dd42f10216390f4fb618bf67baed0ba2aba71c18c13b0a702445425ca29568394c0cc5b4dff61 SHA512 bfd67eee80e063db45eb98b1b73cf1865d23a14a55d72639890d7ad3d01f4c85f07aa662d9d66e996340798c002f5ee9d1167cee32b20caff900fe527ed50d5b
 DIST rospkg-1.4.0.tar.gz 91707 BLAKE2B 02ee199a5f59d1256561cda0e9a6f05e40337a604bfba34d076cd09812fb4cd2f253785e894e9590de86226e8e250d77f50f18c4ffb2857c69095f329c7aa58e SHA512 4e4a40961ed1cfba0746069725378414dc61d3f55e479e7af5efa211419e34e44f5964f8ab41a8c4c9e9b74ae275fd29cf6ffda0eab66b6a0ec7fc7066719797
-EBUILD rospkg-1.3.0.ebuild 958 BLAKE2B 622a7a74e86af4252310ac69798913487cc1d03b19e9a10b730ed641069a65295080263b84edd9efe704c989671630d6ccdea607e77a08a82152fcfe06e35b75 SHA512 862bc13ed80cca8f4458f88cc4d2ff0decde07eb2d52f362aac907e47d4e351e9b5227f6fe95f8c7319b43a44d88983d1235af265ebf8cab64517047d10a96f9
 EBUILD rospkg-1.4.0.ebuild 871 BLAKE2B 9d61b87613fa6a7ee7eada58e78ff6ef55e365292b5d6f50b4ca6ff10d438758f2a90c3239047e79a26e25925c053587e8e750f3706ea6a9d0b74db32048e726 SHA512 47b138f98c7ee036366c5ab80c5476283a6ef15bafdc70ba2d7dfe35a3c1c1155c5387035a5b9ef531f60467cd67fcfdbd114f6c3c2f72f783d4c366e7c702ae
 EBUILD rospkg-9999.ebuild 871 BLAKE2B 9d61b87613fa6a7ee7eada58e78ff6ef55e365292b5d6f50b4ca6ff10d438758f2a90c3239047e79a26e25925c053587e8e750f3706ea6a9d0b74db32048e726 SHA512 47b138f98c7ee036366c5ab80c5476283a6ef15bafdc70ba2d7dfe35a3c1c1155c5387035a5b9ef531f60467cd67fcfdbd114f6c3c2f72f783d4c366e7c702ae
 MISC metadata.xml 340 BLAKE2B 317bdd9ae3ac0445b83c1beb2e31db348ed88da4498d6526be372e2cd71fd84b0d10f03015f414ae56701e080b12bf8b3630edf9cbc16b0290893213e3ef1c33 SHA512 0fa44f0f4a284d56873ac55d6744c437963a2e2428cbb2ed1060784b48f3487eb05d01f572e1ad5459d3181f5546090c650623405fa71f1c75d1818f20aee5b3
diff --git a/dev-python/rospkg/files/yaml_load.patch b/dev-python/rospkg/files/yaml_load.patch
deleted file mode 100644
index f56b6db59ad8..000000000000
--- a/dev-python/rospkg/files/yaml_load.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: rospkg-1.2.0/src/rospkg/distro.py
-===================================================================
---- rospkg-1.2.0.orig/src/rospkg/distro.py
-+++ rospkg-1.2.0/src/rospkg/distro.py
-@@ -192,14 +192,14 @@ def load_distro(source_uri):
-         if os.path.isfile(source_uri):
-             # load rosdistro file
-             with open(source_uri) as f:
--                raw_data = yaml.load(f.read())
-+                raw_data = yaml.safe_load(f.read())
-         else:
-             try:
-                 request = urlopen(source_uri)
-             except Exception as e:
-                 raise ResourceNotFound('%s (%s)' % (str(e), source_uri))
-             try:
--                raw_data = yaml.load(request)
-+                raw_data = yaml.safe_load(request)
-             except ValueError:
-                 raise ResourceNotFound(source_uri)
-         if not type(raw_data) == dict:
-Index: rospkg-1.2.0/test/test_rospkg_distro.py
-===================================================================
---- rospkg-1.2.0.orig/test/test_rospkg_distro.py
-+++ rospkg-1.2.0/test/test_rospkg_distro.py
-@@ -315,7 +315,7 @@ def test_load_distro_simple():
- 
-     assert distro.release_name == 'simple', distro.release_name
-     assert distro.version == '1', distro.version
--    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
-+    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
-     assert set(distro.variants.keys()) == set(['base'])
-     assert set(distro.stacks.keys()) == set(['stack1'])
- 
-@@ -334,7 +334,7 @@ def test_load_distro_diamondback():
- 
-     assert distro.release_name == 'diamondback', distro.release_name
-     assert distro.version == 'r8596', distro.version
--    assert yaml.load(open(p)) == distro.raw_data, distro.raw_data
-+    assert yaml.safe_load(open(p)) == distro.raw_data, distro.raw_data
-     assert set(distro.variants.keys()) == set(diamondback_variants)
-     assert set(distro.stacks.keys()) == set(diamondback_stacks), set(distro.stacks.keys()) ^ set(diamondback_stacks)
- 
-@@ -350,7 +350,7 @@ def test_load_distro_diamondback():
- 
- def test__load_variants():
-     from rospkg.distro import _load_variants
--    raw_data = yaml.load("""variants:
-+    raw_data = yaml.safe_load("""variants:
- - ros-base:
-     stacks: [ros, ros_comm]
- - ros-full:
diff --git a/dev-python/rospkg/rospkg-1.3.0.ebuild b/dev-python/rospkg/rospkg-1.3.0.ebuild
deleted file mode 100644
index fbd4db374f38..000000000000
--- a/dev-python/rospkg/rospkg-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="https://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
-
-distutils_enable_tests nose
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 5c3e557aaf56..1f0bc88339af 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,4 @@
-DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
-EBUILD routes-2.5.1.ebuild 824 BLAKE2B 4a91a08f3cbd77b124728a6583388d6b05db2fdf6be87780586bca9fc91e3be955bac3276ce1c8d0eb19d04ac5522c0933d43118c166670c280b7a9e53c07dcb SHA512 1ec411f3232c6c7dcd5b73d167aec0244d3918428689898b5d71e1b77d99bc7e3434353e19926776a830a2e0514029fe6ab3e43b80a1c4a2679dc567b303717d
+DIST routes-2.5.1-pytest.patch 229759 BLAKE2B 826a053e82b5cae9996c73c56948b24b8c508b33440c60aea62d8d2dfa6461a43377ee1748c8852dd8c2527b0666e9c4c64e38eeaea22fc67ee9291ddcdffb6d SHA512 e6dba07207bf52b931e2369ad32450ebbfbc26571502b9b827b6200f4ce7cfc7b784e4685f9f11472bed63b3711af10ed9833eda35003cc2010924eeeaae4235
+DIST routes-2.5.1.gh.tar.gz 198777 BLAKE2B ca3487af94677889c5249b501fc6dc07e155dd4a862df4f1c8391154598a343ee35b7e8be2b5200bdb234b606a837c471af806c9dc8aa39796b4f4db04bbb164 SHA512 939aebac11f5499ea5c4009e016c52b8b161e7d67c4a540cdbf456cb3db5aec80a4054e7bec9862aaaa02559b081b09cf699c6508e1ac9acffbc5706acd56f30
+EBUILD routes-2.5.1-r2.ebuild 1143 BLAKE2B 531cf918629dbc0ce9990f1b7b3a5249974bff79612748a9a70e42f2bd173e92d4a823c674ce9607295aaab631ac22cbb48bbc542ded4aba2772505b284fe3bd SHA512 664c47cb961e1b6098b80cab08940e1224239be63d94b4706297b49d6404d8f76e10fba22efb721143b40517ccba78959e8179da6cda3a099480a22bae6b73b6
 MISC metadata.xml 334 BLAKE2B c7aa5fdd9bd9a77881619a3e7fb7332b28d9fb024de346707c7a966d7ba4e1ca10d0db6106cbb528cab879ce23a2e96adb18059d71122302b6a7b0e5c10a45a1 SHA512 43dd546f7b29a6be542e1286b40941854edd22d782d80bbed0861d94a57bb09f8c07a273f1c518315b585f77223fb440c229bc4863e554bb569518f0cf15e265
diff --git a/dev-python/routes/routes-2.5.1-r2.ebuild b/dev-python/routes/routes-2.5.1-r2.ebuild
new file mode 100644
index 000000000000..d03227f17e9f
--- /dev/null
+++ b/dev-python/routes/routes-2.5.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
+HOMEPAGE="
+	https://routes.readthedocs.io/en/latest/
+	https://github.com/bbangert/routes/
+	https://pypi.org/project/Routes/
+"
+SRC_URI="
+	https://github.com/bbangert/routes/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/bbangert/routes/pull/107.patch
+		-> ${P}-pytest.patch
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/webob[${PYTHON_USEDEP}]
+		dev-python/webtest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}/${P}-pytest.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# fix the version number
+	sed -i -e '/tag/d' setup.cfg || die
+	find tests -name '__init__.py' -delete || die
+}
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
deleted file mode 100644
index ca648eda22eb..000000000000
--- a/dev-python/routes/routes-2.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-MY_PN="Routes"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A re-implementation of Rails routes system, mapping URLs to Controllers/Actions"
-HOMEPAGE="https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/repoze-lru-0.3[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/webob[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index b1baa8b4ef6e..8c584005052a 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,3 @@
-DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
 DIST rpyc-5.1.0.tar.gz 1260651 BLAKE2B 4be17e5de4b0475cd63b99bf20e55e3221149f974b9efec638e0387d71815a5a2e4ea782578152690e019e7b8a4ece17405eed6626578a9c9e379d0f4b589008 SHA512 e9783392f423abca6b488dff5be36dae066980004bd221ca5a1c451f0f9dc7e1daf749650106802f9159de619a8d5e2cd6dc90e9a5f49d16f01bbedd59b504cf
-EBUILD rpyc-5.0.1.ebuild 1641 BLAKE2B 47e8397bba1ad5cfa3a673411f279690f495cf45c3b85d728d21b8f437ee533376d58543835ba89398e505b1686e5e9c3826e80722539021a7c0454947b29ff8 SHA512 73b40edd8bc5683efd9a6ff31fa49fda929bb0171ec91d765166317184bf5a4c124716b04030a816b00ba6fe16c000310f94e4e7c75949ebbcf9f05a887e2220
-EBUILD rpyc-5.1.0.ebuild 1743 BLAKE2B 65a34e082274af61faba254f133dc7c749ab71dcbd27201d299249bbf873e55707e819d5c7954336c958e47654fbdac9ada79b9010c696a3bc1c931f5b456f29 SHA512 13120fdfb51f2b62ee6ff0725739e3e250053fa35220d2e9bb58db62eec6b4a37e6948175272b4a2db30af87a25e4b5392f4cc27ca480f4796cb2def918ff879
+EBUILD rpyc-5.1.0.ebuild 1741 BLAKE2B aff12ad540be96c4cc71c5cdf2d0f4c8494d6a41757a9e57e0e5ef0030768f0829d8c088611178ffa244d3f6ec6ce2db1b46c0092d3b7e4154a40ac1e44d654a SHA512 b84c7a5cb1e053a8fcb2722b7d66ebff5d4e9030462b2ab078301549c5a037360120dfebab6cb0c453f6efd7fb2a2e37bd47e6f97a04e3e7b023f6a174d9d325
 MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
diff --git a/dev-python/rpyc/rpyc-5.0.1.ebuild b/dev-python/rpyc/rpyc-5.0.1.ebuild
deleted file mode 100644
index 2a23003c5e7e..000000000000
--- a/dev-python/rpyc/rpyc-5.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_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
-	dev-python/gevent[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do ${PYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/rpyc/rpyc-5.1.0.ebuild b/dev-python/rpyc/rpyc-5.1.0.ebuild
index 9e44ad9daed5..1cbb2a594a61 100644
--- a/dev-python/rpyc/rpyc-5.1.0.ebuild
+++ b/dev-python/rpyc/rpyc-5.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
 IUSE="test numpy gdb"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index f90a7bb432d2..08a3a18d9360 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,4 +1,3 @@
 DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
-EBUILD rq-1.10.1-r1.ebuild 1375 BLAKE2B 23fc6b342eaa0af5a86150d6bb94f7de9306e72886f70d754f093e47204b868aaac9629fed672092136ce76922211051e0282f11ddd41ae8b6032f7bd4d74615 SHA512 b8d6ce91d2f4512fa0d052d6c7571669dfddb21cdabb6073fef3d97fde779d9e89435280297b4d3495adabee448988ae9f71bd9016f2f6cf651acea0ccfa5403
-EBUILD rq-1.10.1-r2.ebuild 1408 BLAKE2B a39c2958440e3590c5b091251052ba8bbdfd39918b61c6634aae83ae51a536badc1f71c1bf0c69806f8f098ef9df1ae74faf38042ed8cf3709c97b092ab10294 SHA512 85b06d8f262760be204f254b455da8bbfb597e552ddf7ff6ff891b94de4879861b540accc25da76c74bf3a6a157223068c8af89444dbde412e0368223de02dce
+EBUILD rq-1.10.1-r2.ebuild 1404 BLAKE2B 075b9a78ad5c728a9d1dcb878a321eb345571766135e8894deab7ff8a7ebd626c56892b5a7edfce6a41242d298ec6a82429aaeaebbfb784b367663f686b1dc6c SHA512 61c5d5351b791065b523eaa1be161a558806b9b9921a6a358aec548ecba720d454011f609cb01ac87395882fd7f7794fc9549e755b670b41a4fd14d98dd4a80b
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.10.1-r1.ebuild b/dev-python/rq/rq-1.10.1-r1.ebuild
deleted file mode 100644
index 54138db11b8a..000000000000
--- a/dev-python/rq/rq-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/rq/rq-1.10.1-r2.ebuild b/dev-python/rq/rq-1.10.1-r2.ebuild
index 92f33b0d0ce2..4eb54ea3094c 100644
--- a/dev-python/rq/rq-1.10.1-r2.ebuild
+++ b/dev-python/rq/rq-1.10.1-r2.ebuild
@@ -17,7 +17,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 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index db5686e4a780..34a7162b1bfe 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,3 +1,3 @@
 DIST python-rsa-version-4.8.gh.tar.gz 73634 BLAKE2B 55f25b6747f4f0bad12cbbb75c6e6fdbe6f913265866f11430644b46f9d3a2f615e6ed460d04cc732cfe29f0a4e47b14f2581f29d523b3018272ef976a6a04aa SHA512 d65e5d3c902508f4ea7424099471cd68568b052b9647a87ceb155ecc444ba6a8bd0ebef6fe1bf38720a19193cd494a8b64f744cca5812d1a3bec28f3fa3a9a3d
-EBUILD rsa-4.8.ebuild 732 BLAKE2B 43704af28ef6839d3ed1f649e66963c58fb31b93bfe42393e487545d842c01ed818a6a90e36aa02c74cf11a899b0c3a3325d74b65b3f90bdef32be9e3870cb21 SHA512 40b5c0e772aa9fafe43c86162588ad143222beee4d95044c230f7526c8c8a1e4492e588d988430959d9e7a67b5de8659b5fb7f48966d06e89972b130d4599bad
+EBUILD rsa-4.8-r1.ebuild 767 BLAKE2B 5181c8381bfba94610bd72f4ddfebcbd593cafcc98f60f3d57f6efff757b7e51935e8501f41da60d6f2b4521a2cbbe60707e9f0fd6721ed22cb2eacce94890a3 SHA512 89fc7151041c3524914bc56b69cf18a5706c3d60f17326b3ca62d3eb4923cec942a236d64ade37a79a3395a7cc4c5fe6ed46c7a1d73fa7ab698d911ca8e7edf3
 MISC metadata.xml 407 BLAKE2B 11c7f12e753a502ea5b508e0ca88f824819c3a2dbfbaec31532fbbe9bfdbda5c75ad853b14945a3f5baa4b1eb01a0c9526d3957eed0a573bd63ac792b93bc5da SHA512 df4960d9d61726ae45490adc1d682780539bf7f053a6db9af97e453261f1866a3e8ccb956c5c769b115e90ef3c336654a85114eac1b1256dab95fed7bdb88961
diff --git a/dev-python/rsa/rsa-4.8-r1.ebuild b/dev-python/rsa/rsa-4.8-r1.ebuild
new file mode 100644
index 000000000000..fffb3c5c50ad
--- /dev/null
+++ b/dev-python/rsa/rsa-4.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="
+	https://stuvel.eu/rsa/
+	https://github.com/sybrenstuvel/python-rsa/
+	https://pypi.org/project/rsa/
+"
+SRC_URI="
+	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	rm tests/test_mypy.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/rsa/rsa-4.8.ebuild b/dev-python/rsa/rsa-4.8.ebuild
deleted file mode 100644
index da0282e26d71..000000000000
--- a/dev-python/rsa/rsa-4.8.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-rsa-version-${PV}
-DESCRIPTION="Pure-Python RSA implementation"
-HOMEPAGE="
-	https://stuvel.eu/rsa/
-	https://pypi.org/project/rsa/"
-SRC_URI="
-	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	rm tests/test_mypy.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 47ee0a1b3e64..5c5b83afbdcd 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,3 +1,3 @@
 DIST rst.linker-2.3.0.tar.gz 10146 BLAKE2B a2c1a97a8e734644f5124f89878d770d186c16a44d1eaa98281592754e0a8db4be1e019001448890e712b4e4fea3f4a0f0675009d5285ae94483ef8e8d34ae6f SHA512 a4190c3349c85ee52d17498c99c7879be3f0a98cfc0b5966cc2f6161f9b374d52a64be7035691256d96d4c2ebb2272d5d10802e5e716efedf78859e418e561e0
-EBUILD rst-linker-2.3.0.ebuild 762 BLAKE2B fed75f3d5b46ba5bbe0e346666a588ae30ac530f0df350af4301a7713f1c3c5c2d462a8c7fa85dadc4588d080d573e0b561a310c89b0f70f8871b9d6190c5ced SHA512 9d93976b9d9c292498b6fb005b33fe1c87041c3c181b2bf5d82caf80deb64702220bc7df77666e9edba3de08b4363589062e39a362df76bdde7a96a2375651e9
+EBUILD rst-linker-2.3.0.ebuild 804 BLAKE2B 85233769a50031566cfb1e8f8567d50a32aa754c79f00960981ebad9e243f10e74546d2b4ac114c01c8997fcf263edb9342338ebed6409d67c8e91e52d7e93aa SHA512 bb48fac4d3d9d5b59850c99c3b8ec8f77863673b9445f961b79ed0a0c6a7815171ea8349db14f7e75952498b3294d4adf759df83ce6d051f65c77cfefeba18dc
 MISC metadata.xml 566 BLAKE2B 25dde9994c8bd1a39a9ca0f9a35d344730f43711d1b1219b834d3eee4232e5a1b2843aeac4f16cc780c96ec7537b750380d8adf4e06d6aa14eb4a2334c53db59 SHA512 31e07b2b90a0288af173214898a2f7589aa58c14a7641f05e18c4bd4a8623a3951d297337e9708a3c732649d23c74a22b1a1cd4cc7a18dbb28d0ead1a5eca87e
diff --git a/dev-python/rst-linker/rst-linker-2.3.0.ebuild b/dev-python/rst-linker/rst-linker-2.3.0.ebuild
index 566d326fa98f..80cbcd25e33b 100644
--- a/dev-python/rst-linker/rst-linker-2.3.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.3.0.ebuild
@@ -4,13 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 MY_PN="${PN/-/.}"
 DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="https://github.com/jaraco/rst.linker"
+HOMEPAGE="
+	https://github.com/jaraco/rst.linker/
+	https://pypi.org/project/rst.linker/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 04315032df2e..180105012adb 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r2.ebuild 539 BLAKE2B b0afbabb6a36d3f386ed519f96f4ead78fa7839cb939f7df141720ead585dc7fb4549d9f0648d9b78f4c0c3c91e17827fdc12ff979784ab65740ef2d88ab7e4e SHA512 182bed3ca73cd287a2969e6b300498c572c3fd4d14f658eedab1b0677f9090e142eca12e387160e83a5bbbd2d06dcbc413c3318a2a9d8bd847853158d63dba19
+EBUILD rtimulib-7.2.1-r2.ebuild 539 BLAKE2B cdc061bd46863c3664ec88a1d9df0b1c90738ac1df0c52c9e9abc0ca7799c844432ac2625df71b22eaa567a0de4e4fc04f97973a6ff3e74053bc04138394193e SHA512 c4f4a7f9671d41cbb06402fc49387723407c46320bc927d73586bdc229de566bf5f3facc6f698e6ce9907f2d9b3f91aab09d5b4dc45f8156d0ef8823a368c23d
 MISC metadata.xml 776 BLAKE2B 50b5d3f746747744be3e52260ec86e255ab41a5bc7f35226855260a9db9b68c206fc8c1b301ca90b672ed7dceb3290c92be6b3c6427f68e0c65258881cd6634b SHA512 8f6d8a0b7930e29eafeb2f047575f0d844e9e7b9e1e243b53e39fa0a6575c46cbe231d72d3ad8f3ff1dbb0e4801b3bbf17b0ffc61bb9299011d2292350d42bfc
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
index 6418b565bbdf..50a07f8ac85c 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index df780d03ba0d..e3d4b29381f3 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,4 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
 DIST rtslib-fb-2.1.74.tar.gz 73919 BLAKE2B d16527ed1efae379aa976929d8e6dd8a13cb1d47eb8efe8897ee495b0864225f520b42bd27fe502a1fad11369d20690b9751e54ae7a328c60917144114358d24 SHA512 b0b0722a5a7e10af698ae0570a65b51d7f091bfcc370850dacb3087471ca98bd229b4a5ed73760b7ed5bbee1b53dae4781cc2b3d5e7a1ff8ce37c5c144477852
-EBUILD rtslib-fb-2.1.74.ebuild 620 BLAKE2B 241f8592c90e6a617cd2a4684e890484e8b4835b7d314067eadb855c5f80b1d7bd988febff9c4b86c00a5e1371e5c1b400e136a24f11da0276e624aa06213902 SHA512 0c31d7fa55e427b8f2cdcef8841d3b4267ce106d890c146287e73c5b57dc2c7f8e16cd4c1d38532a89d822e62c2de48554a38681ca331176deb1e602c22e681a
+EBUILD rtslib-fb-2.1.74.ebuild 621 BLAKE2B 329b7606e820809708da3a1234b4dc2c2c68adc994c4aaf5a493b31b8d577c65c39f7fee4ab66d35c743d8c9de689efb477baf8efd5eab90f087470c3aa76eba SHA512 50103527131db8642a82bf2c437fd09c5b0436dd69ce586f61b88f3e76c70f204edac708dfdbe48c00d8177cb6c7762a4610af14012a7ca5a7a02fb5f37e5e74
 MISC metadata.xml 736 BLAKE2B 64b99b472db20ec267f4aa40915fe347e1e74d18ff8914707714cf73cadf7999bb81521b4a801b17bfd4bb4463c63419792e1b9c869deed9181de540a9c8e30b SHA512 fdec71348b4f944de9f009571f8097a1758ef0a6072571b3fac21b6dea7330626a06cc9e72447a8efe0425bbf7a24d08fe10b193653cffef9195c1acdc997a42
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
index e56087cc7806..853f1e8ad1a3 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.74.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_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 systemd
 
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index 997aa82b821d..752e04bd420c 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.9.2.tar.xz 19948 BLAKE2B 1d8d6b4a6703c22a578320d47258bca487376945fc5442716686b05aed78ab64b32022da7fe63f454396235c5782135d173892ab99fdcb857d42369732e26f80 SHA512 71077d2c979bdd5f9d4a2467f6d4a7c0aeabb3dab3f0657411b562ada955c859da619db1e8431d8065d7610b376a961244920359471a9c1358315c02a6b621e4
-EBUILD ruamel-std-pathlib-0.9.2-r2.ebuild 875 BLAKE2B 346a03f03605fcb26542dc9789609b60f8f194b72b116efdea7e2c23e09f234a5568df4f601436d823e00ac385a4f123c177a27fd3a515d946d9a0a38fa57009 SHA512 20fdcee89c7022a46184cd04cba306bad4abb8e8e087146764b742d5c1c7cdfe6360d5a8505403966fb6fb3066611d1e50c7d347f6adf98563cb54711ead96b7
+EBUILD ruamel-std-pathlib-0.9.2-r2.ebuild 875 BLAKE2B 6d91c304bc54be69e3762dba82e525d0abede354c3e5de2ceb4386bda3acf6f1d8a1c85d70e417894dd0579979a29d986fc58de3e9fdbf32dd024709ad419107 SHA512 e7d13cc0d11f862f1dd54a026b04617e48172053625b16cf31f6ad4f54023ed2ab61bd412b573afcf5330708650e4b5b8749bcf803537e7786eb7b6f54b33b57
 MISC metadata.xml 773 BLAKE2B da92f7a81821b07d2082a187c3b09e52552256a25404576676a10b92178f7ed75319b27a5ffd160631767dbed4e9ef699da57439d16ea4bc35a548f3c5978453 SHA512 5419f21c2f50d6d49bccd8a267d96cc230af41fd63fccf0391fcbce3f05197144bf731bc8f7b384c4eb4992ed0fe0824fdc7d2f6bc3e00553faad9d87c0bd6e2
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r2.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r2.ebuild
index ac94bd9aeb22..7ae8e805cc2a 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r2.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 1eefbdd62351..743c29dbd919 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,5 @@
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
+DIST ruamel.yaml.clib-0.2.6.tar.xz 140244 BLAKE2B 8bf4792e8145d8d6220ee1669ee8d87434be8fe419a41671ca4fc9432e219b22c5305ab3fe5388cbe982e2881218c29f45ddbd54e566faf8ea839ba0941d08f4 SHA512 8fb8ca1acf440791f0af96c0f3a9489a4d9399ee51fdfaedc446320852f569bf5bbf71a92b7a1372d0b3302dedfec89531c1726c03b8790997414feb11962731
 EBUILD ruamel-yaml-clib-0.2.6-r1.ebuild 607 BLAKE2B a8626bbe8125931d670ba516702345242b4f48c9d6e16ce48d8c9980563157c37ab71c3bb80c34c08a59921819c897b2ff205dcc7c1c65e09f0342f1171e7b5a SHA512 7b32ed0ab66468bea34ae4e89fb8dcde76b5e5a04871dc096143ab3392e34e86b3d6bafbb16d90164ca692fbf92de05c748f12b1f6738a434b19c02f3df6f926
-MISC metadata.xml 1072 BLAKE2B d681fbbfaa5cf7a101eb4483d0610efa6e3e37adc22dd424230c867a80d1c07c8bb9b276ff5bea2db11e60b08e622710bdc207a37324ee83c89612bb776b9ca9 SHA512 813b22a9206039deb939aa9d716c07cf8d1a29a29f10e0dd57a8846e494aaeff2b0471d1b641d8fcf0c3776fda7241541fc9375bf96ac1e2adbb994bb2b4ef95
+EBUILD ruamel-yaml-clib-0.2.6-r2.ebuild 1213 BLAKE2B 95dc5154c4339f2b4e0df03bb995352fa1d2594de4710aecad202f8bd3220c6dd6281ef57826d72bccc22be9b284a28b7c68e3c5c379b3e921bef683f2ded37d SHA512 dc8b82f6fe3f042b412557812eacc9b2c64dff7059996802e92ac3f10273ad48e0f6d9a7b7fc6ccc098a2421860e911683961b4cd67a32949dcf5253d6c211d3
+MISC metadata.xml 1173 BLAKE2B 349bfd2a189aa2761278b5083ced8eb48997128fc75e44d28cf2f64f73c8b8cdf2ee69758b05b3c0fbc80aaae9d03a4dcf2d6cb6d831a9f6fced7cd360ed04ec SHA512 61d55bada715046285892d29ce9779885a5fe3f808c9804da1246c39e7ecb32029ebf030686380305f24bea62b1e767edf882d60b9377eea38b5dc25f517d081
diff --git a/dev-python/ruamel-yaml-clib/metadata.xml b/dev-python/ruamel-yaml-clib/metadata.xml
index c8f51d87cb12..7454d15a135c 100644
--- a/dev-python/ruamel-yaml-clib/metadata.xml
+++ b/dev-python/ruamel-yaml-clib/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		This package was split of from ruamel.yaml, so that ruamel.yaml can be
 		built as a universal wheel. Apart from the C code seldom changing, and
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6-r2.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6-r2.ebuild
new file mode 100644
index 000000000000..7c1fa45c1171
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="
+	https://pypi.org/project/ruamel.yaml.clib/
+	https://sourceforge.net/projects/ruamel-yaml-clib/
+"
+# Lacks .pyx files for cythonizing for py3.11
+#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+src_configure() {
+	local cython_tmp_dir="${T}"/ruamel.yaml.clib
+	local base_name="_ruamel_yaml" || die
+
+	# Needed to recythonise for Python 3.11
+	# Can likely drop after next release (after 0.2.6)
+	rm ${base_name}.c || die
+
+	mkdir "${cython_tmp_dir}" || die
+	mv ${base_name}.pyx "${cython_tmp_dir}/" || die
+	cythonize -3 "${cython_tmp_dir}"/${base_name}.pyx || die
+	mv ${cython_tmp_dir}/* . || die
+	rmdir ${cython_tmp_dir} || die
+}
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 748f6ecf7828..c0314801abba 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml-0.17.21.tar.xz 184612 BLAKE2B cc7e2a336d3c77a9f2d7e5d7233ceb4d15fddca3a97ec0e54427469fd24c7c63fc70b258adbad92a816d99a1f9839d41eccb9f3224e7a23884914755fa424bc9 SHA512 87f4723bfc76b1b21168852aabe4b49921f175294ac05b4e3f292f2bcf23fe6595df3e066843d193f881b274be2a7b358bd04625afef913bb0e5811efe98b761
-EBUILD ruamel-yaml-0.17.21-r2.ebuild 1416 BLAKE2B a995b96e8218e1ce01f9f0348572a0b3f2c23fac30dd8f2ecfa46fca797b5aef77ed09232b050a2f6b14298c188e7ba3689ef63bfc2a19ea9ca052460b3029fe SHA512 396d0261de8b31850585de5c6827bdb8a4d1bdeb26de1fa7c315a27667b5aaabb10af3c6ccf8d6f7d86ec00579d970b28dd74528ecefebcb5c74de9d9f73803d
+EBUILD ruamel-yaml-0.17.21-r2.ebuild 1416 BLAKE2B ad32b8213a9285b634e6552d5ea1a63e2cbd1112462fa3432d238d5d39721dd6b6547abbbd7099446bd13ab232dd04e452bd034624f5c0a76dbdbd84c650782c SHA512 65bad4ccdde3e73bfe41f1d0136096cf217da550fd30dc318ead49b90ad274c5b3f74dc4cd1c5ddaca70391e5644890ddf5e5717d1d54431598d1a74295e1136
 MISC metadata.xml 759 BLAKE2B ce5ec2429c5fe84587d1b5e7744055e1e8e91eae8dec780a4654cab405df46350d1c8175827351948364255b8fcd62ea234239260c01b8ce23b8db182e6514e6 SHA512 faa587083ffa9af40108e2ca9cfb7a4e2c3e19a731b39241a7ec62d6fca051ace92bcff3fa9896a343fdc196a04fe1d132bcbb7bfa3fd96401ac996b76bba4ee
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild
index e8911cc77e1d..3e7e89d97b20 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.21-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index c92ceb6b633c..09867f19ed5c 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,3 +1,3 @@
-DIST s3transfer-0.5.2.tar.gz 134873 BLAKE2B 55adab89ca04a9ed1f0195237cab55f97769a8f865e645437df6d95effcf1a27a734f1577daa981261123b681044b540ebbb876e1a8a3b4cf1cf4e5018f2c213 SHA512 6b035ff5b33ba5c048f6921f72684802a9b12516c70c75bd153e481e62a768015f45f569aa88071f887839fd2e004b5f9202813926ca33d58c30793218d14083
-EBUILD s3transfer-0.5.2.ebuild 897 BLAKE2B ad4e72ab12bb832640d94fc57dd60c9a21248719b466c48b0d9feb401c26a75734fa47504aefb7a13679ae36ac81d7423185e9fb4472ce83ff1c46687e6ff5c5 SHA512 19fe1001c140c5ff7c582c5f61871e7626b25518c1bc2d26cbd9e4d3761996293481ac190f108b55d5e0ec0fa91c76329cc4ddcfb8a95afbeb2a674364da12d4
+DIST s3transfer-0.6.0.tar.gz 134871 BLAKE2B 7ab84f22dc20751dd461857f93d7f1aad1490432ed25e7506c5abe61f79d1f3cafd8ddb190a0942a2c5a9947c5068fcf397dce34f255a246381f4cf1f0d09e7a SHA512 0c1c3306015cab4a4436b1d2fec6708e17f4c5111f8a265fbfe134defebda33a43bd985e559be993b6175af9eee142e9f27da123f8d14f77cfc59e48ca1b905f
+EBUILD s3transfer-0.6.0.ebuild 939 BLAKE2B 6c9fe86ba2e2ed245148ab052aa2bd966db5936beabca4663c0b23bb3806a6a97fc02f25f37c857159bb412c10accfd3d4e02678e0b5cd57d305e141eeba04a8 SHA512 4390dac09ca6654e2a5f45f40ca9e37c38b11f718b8496817aaba9816e59fe286e956382bf618d4fd02731dfcee227b34ed82b6488c0ed0c5f1c282253b0b1f5
 MISC metadata.xml 503 BLAKE2B 7b8bc8c7e251064ab7becbccff47ab889e54362d3350cf2b78529b60a95a2f52f39b42451c2a26af30ea8cd3fddd9c950c3b40d07d1c72bc6b0730817d7f4680 SHA512 25529c55cc73bca86f770a069f995e2f6f6494d436b52ae24e5b7e1523bf8f62bcfe5ad8e3f727456897a5f9c0ff9b8752ccaba4d3b65b62b5d70b9a3c4b0b43
diff --git a/dev-python/s3transfer/s3transfer-0.5.2.ebuild b/dev-python/s3transfer/s3transfer-0.5.2.ebuild
deleted file mode 100644
index 16cea8f53c02..000000000000
--- a/dev-python/s3transfer/s3transfer-0.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# 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_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.6.0.ebuild b/dev-python/s3transfer/s3transfer-0.6.0.ebuild
new file mode 100644
index 000000000000..abfa397eeb38
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.6.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="
+	https://github.com/boto/s3transfer/
+	https://pypi.org/project/s3transfer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# 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_src_prepare
+}
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 7a2f148bd71b..c20d15482bc7 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,4 +1,4 @@
 AUX sabyenc-4.0.2-fix-segfault.patch 1133 BLAKE2B af92dbd8413437562dbdc96bdceb2c2422002ec29dd67b206aa249d8c6135325779ee7de3a352caca57473f5224efe9b9847159bbc2def927e7769e4976f1dbb SHA512 97e5b4c99091fc8bc0dcb975afd72a70b5a26d46e4543f55caada492ee5da1909b8bcc344592d228c678b6f4ff4df36d4ddf8fe485d23e170be5ed358f943cc4
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
 EBUILD sabyenc-4.0.2.ebuild 613 BLAKE2B 9c5a2baea3973fa4b1ae29868a74111f30fe0b658d119b14a0871f0e136f918a64ed843f3b40fe8e9f686a299e2bec1f9ff4486ae51585cec1ca5b9d8e3bd867 SHA512 7daaf7d398a057026a075f2b8ca5fed662541dc00d39094012d8a4719e63876f93e0ea66a4b640408fcab5f6fe85f4f0f60bae032f9db9254939d1a913712b16
-MISC metadata.xml 322 BLAKE2B 2c3fb412a3bedb26045d4e4d30de2c8d642a9936762861bf52cdb039a7a4fc0891be287d3e30d8f6074dd12d25547005e01a3ae0a0a03e32cea8384dd9a582a0 SHA512 2afb177d9ee6b4f7c445fd0614f260b2422087ac3c800c75efd786c0213dc7f9ebf99c9d66dc9faf998b53af17cd79186b510b3e85b94c002776b4d075fe8f48
+MISC metadata.xml 238 BLAKE2B 69a87380f32f24cdbfda57721fd4dd89008a7dff64d60dce645f350f6020c1045143178f0e587345dbcf6730b0143dcf9c8c1484f143586548c39ab0d84340ac SHA512 42c9ac3c3d0fbeb78931eda833c52ac6d6f79d43bb6e25f0a88450f51f8f3e15cb3dd39d1ebbade988b5af3c01c63953af95db5818689ec87c0ed60f25a590e0
diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index c8de1e3a2d14..ff36593f0fed 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">sabyenc</remote-id>
 	</upstream>
diff --git a/dev-python/sarge/Manifest b/dev-python/sarge/Manifest
index f0f502082b40..5f0d7063d7bf 100644
--- a/dev-python/sarge/Manifest
+++ b/dev-python/sarge/Manifest
@@ -1,3 +1,3 @@
-DIST sarge-0.1.7.gh.tar.gz 57029 BLAKE2B 4cba823073b6699d9a3152b55de63b8ea9ba7cafa0f50556d6c2115a863fd3cae44a9d8fc9e6bf14727aa312c90f69dd03ebcb73508c5a2cdb0d1f6ff190435f SHA512 f2017fdab137e1aebfcd60a125ea7ff057158c6bf6a277d3084db73ed62a07cfd3464deba883284980c9f6ea3f56810effb551e8e8523ab750a086895ad0297a
-EBUILD sarge-0.1.7-r1.ebuild 632 BLAKE2B 6a7212838a09fee479dd1e6220a86dd197e6432ace5bc1e3dc9daff8da158c7542c2f3760dedf96e2304cd15f3914bb1c67cf04196d7e65c75cda9857e95cc02 SHA512 6a1aa4d6763dbab82cd939bbe382a81f590ae43f435b5550d97551c8f399b737ca74ce20fb71cda3e06072fd31537fd9e4ced2abfcd3269051a4a7a616810c07
+DIST sarge-0.1.7.post1.gh.tar.gz 57121 BLAKE2B 4e7f9cf21e2492303fb7ae24d8f5da22fc6db4d04449e5e6063825d2c2163333456fed35af53b5107a80996ca4e036c8913c1d50ffd1d0386e4f3d3f0e46dbda SHA512 29e783287d9e2325e6183d3d56fb2247e3ec98e728dbb69c8391694b2456c1d9ce91a4a172d8ba66593d0553d016fca34b5253d7a4d4f02c1f2d6a3a19574097
+EBUILD sarge-0.1.7_p1.ebuild 684 BLAKE2B 0748f93dac0b89ef6d99f12b4b61af2f024b429791c19f00520767acf3d1a03c2de9dafe46d87b7a49b43d7ab3677bd5dfcac815f479621ebf5b3bba18c64e71 SHA512 00f9e22e65e210b48f751107bdc9b18731b6ce3051d04b07894dd11a472c462bdf43e284d3cff54137f539223b0f7f2688ccc65b094202273dfa69ff3b7f8d94
 MISC metadata.xml 470 BLAKE2B 157ea921141b74ec467c00c1b671146c2fe11efd7156146188eb5126739c789a6dffe1d2954c2c40d144258bc2e09be62e56b184504fddcc55e5fb5686fd835a SHA512 b211a65f489e20031ded07eb5908a04ab26fa9d5ba3a5c0d7cc4f134ee9233fb7519c60c9ad60c42ad444021de3fa32303d951a16cc3a6c41256761f15cfcba5
diff --git a/dev-python/sarge/sarge-0.1.7-r1.ebuild b/dev-python/sarge/sarge-0.1.7-r1.ebuild
deleted file mode 100644
index 57cad45bee8e..000000000000
--- a/dev-python/sarge/sarge-0.1.7-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="wrapper for subprocess which provides command pipeline functionality"
-HOMEPAGE="
-	https://docs.red-dove.com/sarge/
-	https://pypi.org/project/sarge/
-	https://github.com/vsajip/sarge/
-"
-SRC_URI="
-	https://github.com/vsajip/sarge/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-python_test() {
-	"${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sarge/sarge-0.1.7_p1.ebuild b/dev-python/sarge/sarge-0.1.7_p1.ebuild
new file mode 100644
index 000000000000..017e909afcc9
--- /dev/null
+++ b/dev-python/sarge/sarge-0.1.7_p1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Wrapper for subprocess which provides command pipeline functionality"
+HOMEPAGE="
+	https://docs.red-dove.com/sarge/
+	https://pypi.org/project/sarge/
+	https://github.com/vsajip/sarge/
+"
+SRC_URI="
+	https://github.com/vsajip/sarge/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+python_test() {
+	"${EPYTHON}" test_sarge.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 5e5edf8fca84..4f9ac9ccfb6f 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,4 +1,8 @@
 AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837da997024ee87bb3fd878a6492fbd63088aab294048e700652a82cd3e27bb8e55ea5fdeeda4240971a32b6c7644f2c51ab7c42da1abea SHA512 f52a6096a4840baa743b90296b98f55963c13990ce795cb0ff9ad11256196d9d5164d3118bb48e8e10779e55f2341309de71a3ee47cbde326280de0064f1b21a
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
+DIST scikit-build-0.14.1.tar.gz 266776 BLAKE2B cb674412ef000fa961b85b32bf7759430cc5ff1b175e29017219ae3b941bfefee5760742cf17549fe7868fa0fc80f72e027aa683cd07bec53c1578e27b1ea0a7 SHA512 c9c3caaab969e83739cb3be718fc7190ef25372fbbf689ea84f9b9725bfc8329640c26038d875ecf3ccdbab0637ef77d6a30c05dcdaaecf441f631c8601d3b63
+DIST scikit-build-0.15.0.tar.gz 268691 BLAKE2B f4cb51ee2367bd4ba6f6c1cada15e1e6be731998a914b28edcf703c5a92c409b78b17dddf04a29b24d40f249ffa06eb9d05d36dc30c0e62ee001519c3ca03f58 SHA512 4d9b1d06d48708ff4f2f5fa8c8f264c7ca85946d5842a1254930d9449d6b6386c17392473c3c85147f6573f7256c94c927962cb56fa23a90a5b442de8de8d727
 EBUILD scikit-build-0.12.0.ebuild 1528 BLAKE2B 5dc1e9936100a34af85ee5673f7bc2f453d016662f42177c92dd1958dfe5e26bf76b2a938c8f1b2d67c1af1e650060d5add8ea4c708a0ed2f571b3f261d3d993 SHA512 ef9d6485ed9966b09cf7ec2e05ecd4ee3857cf40c4d32f58e2a25cafc837bf601367757e0c14f957e0ca3ba66edab8708889ff07b59f933fce963131b5de9ba1
+EBUILD scikit-build-0.14.1.ebuild 1970 BLAKE2B 750f8acada7df5e61e813d39555fd50594dddaa8fa537ed79508f7f15ae72a2fd4f4f7256f8418ea91a6b6387d9f9f6f5de6e627c30b8c930ff2a00f9d98e11a SHA512 61b7b7e34e41a0ac06ee998afdf64833eadfcbe6a93d2dde6bb7eefb58584957314730cd701834c78e5ba30ba1a6d227edcc9ba3043b1f312933dcaff72a8cfc
+EBUILD scikit-build-0.15.0.ebuild 2069 BLAKE2B 0f215389b219868eae0fbefd68a83c616f16278d165a2a652e53c44479c6079c19cacfff9e1d6a6a14b6b2165f0b6419cb27608203e0bbdb0753fd3c59406b24 SHA512 7bdb56d699f90bf1f69aec0d34cd8bea1c7f9ea5da5bd1235f9e3830e7bb39b1548c5d77ec481388dbe4b340b7ff010b04b651a6027992c5c84d50f524e2edf8
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/scikit-build-0.14.1.ebuild b/dev-python/scikit-build/scikit-build-0.14.1.ebuild
new file mode 100644
index 000000000000..51a4443468d2
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.14.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	# no pytest-cov
+	sed -i -e '/addopts =/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+		tests/test_pep518.py
+		# This fails because of additional item setup.py in sources
+		tests/test_include_exclude_data.py::test_hello_sdist
+		tests/test_include_exclude_data.py::test_hello_sdist_with_base
+		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
+		tests/test_manifest_in.py::test_manifest_in_sdist
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/scikit-build/scikit-build-0.15.0.ebuild b/dev-python/scikit-build/scikit-build-0.15.0.ebuild
new file mode 100644
index 000000000000..c6cbed251700
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.15.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/path-py[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues
+distutils_enable_tests pytest
+
+src_prepare() {
+	# not packaged
+	sed -i -e '/cmakedomain/d' docs/conf.py || die
+	# no pytest-cov
+	sed -i -e '/addopts =/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# sandbox violations
+		tests/test_hello_cpp.py::test_hello_develop
+		tests/test_issue274_support_default_package_dir.py
+		tests/test_issue274_support_one_package_without_package_dir.py
+		tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+		tests/test_pep518.py
+		# This fails because of additional item setup.py in sources
+		tests/test_include_exclude_data.py::test_hello_sdist
+		tests/test_include_exclude_data.py::test_hello_sdist_with_base
+		tests/test_issue401_sdist_with_symlinks.py::test_sdist_with_symlinks
+		tests/test_manifest_in.py::test_manifest_in_sdist
+		# Wants internet to install things with pip
+		tests/test_numpy.py::test_pep518_findpython
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index bcb543e85532..ad84673471ec 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,9 +1,9 @@
-AUX scipy-1.7.1-pythran-tests-32-bit.patch 1201 BLAKE2B 5db911d23e45556cbcf84fec40a3abdaa3fd9859e2cb8cd08c77a8016aa798338b48dc7b4459b36702a94a94cb4d5ef3bf9ed35f7e4e6f97911a96a35e9e7179 SHA512 613db1a48864d6cd0d1c07c8e1fe898f0aa6db6030d843e2e7580e0d03d5c958be9b9341cd311e47a62f78c6f4114fa293d9beae9cb00042fe3894a98576359a
-AUX scipy-1.8.0-skip-build-revert.patch 712 BLAKE2B 3637bfe30dc1bc4caf9ed9c8eb24e8d92d6a715218ff472d72cb2ddef895309a95307e18f38524045ca8010c7ba2e0d5359c36e08d427244a5cc684accd89158 SHA512 3ca5fb6c44c5a20c09292b91aaf0a74464e4caaba628f97306a805a64aa2f5ef5bb4c1c5886735503d4859df9a1c30d4827d3359a1820f955ad992275a4dc306
-DIST scipy-1.7.3.tar.gz 36102562 BLAKE2B 9a605a45d8f03aae3411a6fa92e32c7f6d10373455493ead847d4ad01429b55dbbc33c1a0309d6c9d76d3e9ab1a06772df59c08d393377896c4b534599f9eb9b SHA512 83fe00cf708a13a08d28af7022ec645d8976c177f2fefb56e0a47bfcbec726330b973d1f44364e23c939ae708e239a05904346f515ea1a37e8b70ad160b81cee
-DIST scipy-1.8.0.tar.gz 38313602 BLAKE2B 3f071ad3dfa350bba7eaf8e06c8bdb660f9dc1ef0e0bfc1eb1be2c400f947b2b26d62066a4b0f603ae56244131aff6e4c5b7e87cfd2aa7b278e3071062a4bf02 SHA512 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c
-DIST scipy-html-1.7.1.zip 32435246 BLAKE2B fd8173da41aba95a14b1376f848bc668c4659bf1bbbdd0f87d926633d36f29c039957d38be145a5583010ebd83f6458090f75bdad773cc0f1591664e13c04c20 SHA512 ee59722878f6ef2d2319cdf4e6a60d3d1184f7c22752f9a8859eaa46fb677ebac9e8eef9c0826998e12bac9399e336799843341ef203224a82c9101347149672
-DIST scipy-ref-1.7.1.pdf 33542025 BLAKE2B 6c978f06b770805f0fae06db740e8596658d98bbbc93c865127eae909957503bb38e02a9c97319aed07608718f8f373374b1cf3a8c3bd624aa3143f1d21bc428 SHA512 45720dc299594bac5c7539f950a0ff135b125d86bfe9847032cbff1f294601fefd0a1ac3fd7e3928b2702390c318ae2f8adca6403ba06ea1ded705fcff94ab79
-EBUILD scipy-1.7.3.ebuild 5504 BLAKE2B 7ae97cc6ad67b52f498f142c1be014921409c660d4f424157dc520913027eb733bc76e25d63aae15b449dc0ec30319f7be88f3655f5f391f2e6d8eeed9cd936b SHA512 f3e37d183e960b0481522f40998d767d0a86e9068d87c3ab40dc33aeb269bd98981efba5f0494d153f86e28f43c7249edeab8b3a4e497407819e4171d2555fad
-EBUILD scipy-1.8.0.ebuild 5270 BLAKE2B 62533e27711741b099eee8c333f926d4d42a9d2af6574605ab94e2f2bdeaf03065b4ab45a8c8e57ed7c0ecb914baf65484818590de697eec7817dd413f84a098 SHA512 2195d6d4993b414c877b3594c8969a732012841f6d258489dae7f33b599d3d6ea70d1f7da21cd68c9212175298996e216fe54ac18dffbf6df055acd705dc09f7
+AUX scipy-1.9.9999-meson-options-lapack.patch 1013 BLAKE2B 04cb7b3bc281ef06fe4360f31ea6befe91134bc68ce2a981df704f52814487503d35100bf7fd429d854d0716eaac20f5d55aadad02a4d48eeed8ad55955232b6 SHA512 6d8f6e4c6399f5e8a641a87168b1e2abd31b69a23f90582cba5d8d22d46de0c89d7b0719a25f3cf4e6cd9f81c9ebe0c94d1ba8b6c6b0209020491603b1f548aa
+DIST scipy-1.8.1.tar.gz 38196215 BLAKE2B 180ae646adba2031a4bf99cd4feefe652b8e340110b3b2872e61aa1083054aadf369c7e3b3e3fd8fb71fcd831c95841d2dadd1c71e35e5f7d95800e5551173f0 SHA512 f6fc71c209991fe82baa4b10d8ade0deb1057f6f5942a91dfb7ae45f3eb78a4535efa2861badf5e2d37239fa99dbd99de760aa7e4854b95991ade0263004e7ea
+DIST scipy-1.9.0rc1.tar.gz 42045828 BLAKE2B 8ecb112f611d52a69564329764b63d6f97bdcf6ba2fedc32134fb9f0da0c7f91d8507136bd81e2193c8a796273019cf2cf1a0f6009f6ac0803924a27ad216c37 SHA512 74d0ec0b94d33da683549b9c56966ec58dc807a5b60101413530501d2b1e789209b1b0e6cbca0a3bd0317dd0911406efc900dee5f90f1ea71c9aefa00f4c2dbe
+DIST scipy-html-1.8.1.zip 37060661 BLAKE2B 2fa617c58eb47463f8a61f9798b32c6da255d26b8e86c1558e427a715093f5a29ced3847ab6ecfe88ce1017664f36ac3e9fa9bbf72ede7e0fd3812b5f41fe933 SHA512 95153dc1f404aa64898a700c94c0deea3ca842c3152167d0987edabcf4a8eba16b6c8e6bc38a6775a849dc621e6a21434baf53d1669b1865fa5049cffa4387ac
+DIST scipy-ref-1.8.1.pdf 35025868 BLAKE2B 9221755d2dc69b8623271f75ff3078a0a4410fe9ff69ee317b40bf145af7da21a7f5f4b6b67820d8bb2878f83b7014f1ea7c2f0e026afb716da0479d394505e2 SHA512 8f27dcb9dd1030e15266389af21a1475ecfec5ea777fb2dbcf8db8d3398ac6e45c7040b8d6dbaffd29be3920925427be7c55efdc8094d670c857edfdab7f7728
+EBUILD scipy-1.8.1.ebuild 5275 BLAKE2B 0b2f1bb8c37c253aae87941aa9cb15352d82ff5bc34089ae7cf93cad7d264b0ceaecd7f8f0ff02670d24282a61032eaa52bf16de03e1d25d8a18fbfe7d63c981 SHA512 d7ed5f3bc61e27f898937387f88cd934147149ba40ccc01b160571db97074ccba2eb68510899bb4ee70083e47cf3e2c5c6e53435f56933cc5652e9b21a231763
+EBUILD scipy-1.9.0_rc1.ebuild 1820 BLAKE2B 92723d62cbeececd71f58242ad0e5277461e989fc7c580134e4ab6debe6bddea21842e4a933d3bda4db1947a7135f317dc8bff16c165eba6d08e6cf6a2835a05 SHA512 2e4bb9668ce70fd343ebdcf8f1562ad7e7b816ba4c95f15784392ca92b4188abe599aa5f634aad147790143a9e95b4f9e72b8a084876078bf3e641a1bac9c00c
+EBUILD scipy-1.9.9999.ebuild 1716 BLAKE2B 792f32928ff5ab56eb65a750d93c73cf2d1fe3a36024582580c91f747d8b9ebaf3925aadd2eb9f1709021d11366555b1ed5cc403a5436eee931d80ccc0a7a76a SHA512 cdfa9cf32379faf35529a260f420a9b00e62c4324a0689315a3e9a7a6d6e6d289441ebf3fa90cb37a341afe2ca323c801da5a6c4a2c30cecc4e22b46c3706cc7
 MISC metadata.xml 1127 BLAKE2B 6019c7fe056a0198db927c1b149d5a60bd583a523d749e57c86ad899a880fd83e688e040cb693ec3f34be63cae1e5b785d5f6f7a378b98e992d6cb9368ea1b2c SHA512 f7c45d801c3344b3d8de3fabad26a95814cfdf92b604e8215bfac2cfd1cfb181cc8a9a9fa46c0b95c7fb55a34e44bab51c2d1cd7a5adcf421cd965a755722e73
diff --git a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
deleted file mode 100644
index 206d1d9fa3b2..000000000000
--- a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://github.com/scipy/scipy/commit/5b3a3b440525aa5038e2cead1f9b4f23a610cd9f
-
-From: serge-sans-paille <serge.guelton@telecom-bretagne.eu>
-Date: Sun, 18 Jul 2021 11:14:29 +0200
-Subject: [PATCH] Extra pythran annotation for i686 support
-
-Bug spotted on Fedora, see https://src.fedoraproject.org/rpms/scipy/pull-request/22
-
-The `int[::]` annotation is used to accept non-contiguous views.
---- a/scipy/optimize/_group_columns.py
-+++ b/scipy/optimize/_group_columns.py
-@@ -54,6 +54,8 @@ def group_dense(m, n, A):
- 
- #pythran export group_sparse(int, int, intc[], intc[])
- #pythran export group_sparse(int, int, int[], int[])
-+#pythran export group_sparse(int, int, intc[::], intc[::])
-+#pythran export group_sparse(int, int, int[::], int[::])
- def group_sparse(m, n, indices, indptr):
-     groups = -np.ones(n, dtype=np.intp)
-     current_group = 0
---- a/scipy/signal/_max_len_seq_inner.py
-+++ b/scipy/signal/_max_len_seq_inner.py
-@@ -4,6 +4,7 @@
- import numpy as np
- 
- #pythran export _max_len_seq_inner(intp[], int8[], int, int, int8[])
-+#pythran export _max_len_seq_inner(int[], int8[], int, int, int8[])
- 
- # Fast inner loop of max_len_seq.
- def _max_len_seq_inner(taps, state, nbits, length, seq):
-
diff --git a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch b/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch
deleted file mode 100644
index caefc334a973..000000000000
--- a/dev-python/scipy/files/scipy-1.8.0-skip-build-revert.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2b6392eeeb8ef5225ace15e8a1553fa87409272f Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Wed, 29 Dec 2021 22:47:13 +0100
-Subject: [PATCH] Revert "BLD Respect the --skip-build flag in setup.py"
-
----
- setup.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 002531fcc00..d91916e5894 100755
---- a/setup.py
-+++ b/setup.py
-@@ -488,8 +488,6 @@ def setup_package():
-     if "--force" in sys.argv:
-         run_build = True
-         sys.argv.remove('--force')
--    elif "--skip-build" in sys.argv:
--        run_build = False
-     else:
-         # Raise errors for unsupported commands, improve help output, etc.
-         run_build = check_setuppy_command()
diff --git a/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch
new file mode 100644
index 000000000000..23d29c31c2cb
--- /dev/null
+++ b/dev-python/scipy/files/scipy-1.9.9999-meson-options-lapack.patch
@@ -0,0 +1,28 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index 5935bb8..f8c14ce 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,6 +1,6 @@
+-option('blas', type: 'string', value: 'openblas',
++option('blas', type: 'string', value: 'blas',
+         description: 'option for BLAS library switching')
+-option('lapack', type: 'string', value: 'openblas',
++option('lapack', type: 'string', value: 'lapack',
+         description: 'option for LAPACK library switching')
+ option('use-g77-abi', type: 'boolean', value: 'false',
+         description: 'If set to true, forces using g77 compatibility wrappers ' +
+diff --git a/meson.build b/meson.build
+index d80ebc93e..c0c92c00f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -16,8 +16,8 @@ project(
+     'c_args=-Wno-unused-function -Wno-conversion -Wno-misleading-indentation -Wno-incompatible-pointer-types',
+     'fortran_args=-Wno-conversion',
+     'fortran_std=legacy',
+-    'blas=openblas',
+-    'lapack=openblas'
++    'blas=blas',
++    'lapack=lapack'
+   ],
+ )
+ 
diff --git a/dev-python/scipy/scipy-1.7.3.ebuild b/dev-python/scipy/scipy-1.7.3.ebuild
deleted file mode 100644
index 3a3cfc929a8b..000000000000
--- a/dev-python/scipy/scipy-1.7.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.7.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.1-pythran-tests-32-bit.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	# Skip known-failing test. Broken on all versions in Gentoo for years.
-	# bug #743295
-	sed -e 's:test_bisplev_integer_overflow:_&:' \
-			-i scipy/interpolate/tests/test_fitpack.py || die
-
-	# Skip a few 32-bit related failures
-	if use x86 ; then
-		# TODO: Tidy this up and switch to epytest
-		sed -i -e 's:test_nd_axis_m1:_&:' \
-			-e 's:test_nd_axis_0:_&:' \
-			-e 's:test_maxiter_worsening:_&:' \
-			-e 's:test_pdist_jensenshannon_iris:_&:' \
-			-e 's:test_align_vectors_single_vector:_&:' \
-			scipy/signal/tests/test_spectral.py \
-			scipy/sparse/linalg/isolve/tests/test_iterative.py \
-			scipy/spatial/tests/test_distance.py \
-			scipy/spatial/transform/tests/test_rotation.py || die
-	fi
-
-	if has_version ">=sci-libs/lapack-3.10"; then
-		sed -e 's:test_sort(:_&:' \
-			-i scipy/linalg/tests/test_decomp.py || die
-		sed -e 's:test_solve_discrete_are:_&:' \
-			-i scipy/linalg/tests/test_solvers.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-
-	# Let's try using pytest again with xdist to speed things up.
-	# Note that using pytest is required to avoid dying b/c of a
-	# deprecation warning with distutils in Python 3.01.
-	epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
-
-	# Old test runner
-#	PYTHONPATH=. "${EPYTHON}" -c "
-#import scipy, sys
-#r = scipy.test('fast', verbose=2)
-#sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/dev-python/scipy/scipy-1.8.0.ebuild b/dev-python/scipy/scipy-1.8.0.ebuild
deleted file mode 100644
index a3e3314b5819..000000000000
--- a/dev-python/scipy/scipy-1.8.0.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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(+)"
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-# upstream is slacking forever with doc updates
-DOC_PV=1.7.1
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc +pythran sparse"
-
-DEPEND="
-	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-RDEPEND="${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-lang/swig
-	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-skip-build-revert.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF || die
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-	cat >> setup.cfg <<-EOF || die
-		[options]
-		zip_safe = False
-	EOF
-
-	# TODO
-	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
-		-i scipy/stats/tests/test_continuous_basic.py || die
-
-	# Skip known-failing test. Broken on all versions in Gentoo for years.
-	# bug #743295
-	sed -e 's:test_bisplev_integer_overflow:_&:' \
-			-i scipy/interpolate/tests/test_fitpack.py || die
-
-	# Skip a few 32-bit related failures
-	if use x86 ; then
-		# TODO: Tidy this up and switch to epytest
-		sed -i -e 's:test_nd_axis_m1:_&:' \
-			-e 's:test_nd_axis_0:_&:' \
-			-e 's:test_maxiter_worsening:_&:' \
-			-e 's:test_pdist_jensenshannon_iris:_&:' \
-			-e 's:test_align_vectors_single_vector:_&:' \
-			scipy/signal/tests/test_spectral.py \
-			scipy/spatial/tests/test_distance.py \
-			scipy/spatial/transform/tests/test_rotation.py || die
-	fi
-
-	if has_version ">=sci-libs/lapack-3.10"; then
-		sed -e 's:test_sort(:_&:' \
-			-i scipy/linalg/tests/test_decomp.py || die
-		sed -e 's:test_solve_discrete_are:_&:' \
-			-i scipy/linalg/tests/test_solvers.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
-
-	# bug 721860
-	test-flag-FC -fallow-argument-mismatch &&
-		append-fflags -fallow-argument-mismatch
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
-	export MAKEOPTS=-j1
-
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
-
-	# Let's try using pytest again with xdist to speed things up.
-	# Note that using pytest is required to avoid dying b/c of a
-	# deprecation warning with distutils in Python 3.01.
-	epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_install_all() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/dev-python/scipy/scipy-1.8.1.ebuild b/dev-python/scipy/scipy-1.8.1.ebuild
new file mode 100644
index 000000000000..df38fbcc3ec2
--- /dev/null
+++ b/dev-python/scipy/scipy-1.8.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+# Upstream is often behind with doc updates
+DOC_PV=1.8.1
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 -hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+IUSE="doc +pythran sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	pythran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# TODO
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	# Skip known-failing test. Broken on all versions in Gentoo for years.
+	# bug #743295
+	sed -e 's:test_bisplev_integer_overflow:_&:' \
+			-i scipy/interpolate/tests/test_fitpack.py || die
+
+	# Skip a few 32-bit related failures
+	if use x86 ; then
+		# TODO: Tidy this up and switch to epytest
+		sed -i -e 's:test_nd_axis_m1:_&:' \
+			-e 's:test_nd_axis_0:_&:' \
+			-e 's:test_maxiter_worsening:_&:' \
+			-e 's:test_pdist_jensenshannon_iris:_&:' \
+			-e 's:test_align_vectors_single_vector:_&:' \
+			scipy/signal/tests/test_spectral.py \
+			scipy/spatial/tests/test_distance.py \
+			scipy/spatial/transform/tests/test_rotation.py || die
+	fi
+
+	if has_version ">=sci-libs/lapack-3.10"; then
+		sed -e 's:test_sort(:_&:' \
+			-i scipy/linalg/tests/test_decomp.py || die
+		sed -e 's:test_solve_discrete_are:_&:' \
+			-i scipy/linalg/tests/test_solvers.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	export SCIPY_USE_PYTHRAN=$(usex pythran 1 0)
+
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export ORIGINAL_MAKEOPTS="${MAKEOPTS}"
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+
+	# Let's try using pytest again with xdist to speed things up.
+	# Note that using pytest is required to avoid dying b/c of a
+	# deprecation warning with distutils in Python 3.01.
+	epytest -n "$(makeopts_jobs "${ORIGINAL_MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${PN}-ref-${DOC_PV}.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/dev-python/scipy/scipy-1.9.0_rc1.ebuild b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
new file mode 100644
index 000000000000..aa0db9c53032
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.0_rc1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+	MY_PV=${PV/_rc/rc}
+	MY_P=${PN}-${MY_PV}
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+	S="${WORKDIR}"/${MY_P}
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild
new file mode 100644
index 000000000000..a25a63827ff7
--- /dev/null
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	# Upstream is often behind with doc updates
+	DOC_PV=1.8.1
+
+	SRC_URI="
+		mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${DOC_PV}.pdf
+		)"
+
+	KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +sparse"
+
+DEPEND="
+	>=dev-python/numpy-1.17.3[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+# TODO: restore pythran optionality?
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.18[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/pythran[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${T}" || die
+
+	epytest -n "$(makeopts_jobs)" --pyargs scipy
+}
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 84634235af08..ae365506918e 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,4 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 582 BLAKE2B c54cf0618534b3578ce1a924e7135b3d929a074113a61ad5994b2bcb32a55c1ce2c8e9c6de0b73ad804ff8bbe80e3e1e775fcd969c2fe43859461af6a2ecbb92 SHA512 4def7da6dfdc84a07d5ca363488be043e994e81b4636b2a007474481dedb869e4e57bb66744e3a1a07db8ea48b04cfbb45a84e4d399ff1e0dc529c849f13c71d
-EBUILD scripttest-1.3.0-r2.ebuild 605 BLAKE2B 5c0bbaefe589ffce8edcab5c558b53981448fec428ec0a4c1122e2d97ab4c810884ec934696ca679ae824237505ab4fd2d728ce864824339b878f6a2d8a58d37 SHA512 8942160c6847688e32afe5793cde1e33bfb10893a3cb82dbf4ea77c9b97cb600dc328240d6a7e524434b4194db25d9119985516f70bb8373dab27a18876e83e6
-MISC metadata.xml 369 BLAKE2B a74d3242d3ead45eb3efc8ab6d63e782e8683ef0cae61172141720c0f51c1a98a9709be54c46d9328ad113f590dd82016ccf269f5954401b48394417da340d2f SHA512 2af70b358850dcf9cbd2b2fe427489c2d33ffeaf6b331b6e5fbdeb0a097f857c5a981f1170ceb68428c319e0225d6c7fdd9ff7bda75bf0204863e0acd67ef33d
+EBUILD scripttest-1.3.0-r2.ebuild 597 BLAKE2B 730f75d03f8b40f3db6af480451db9231f7e3c0f00d9be40480c634522d5f0eb162ae4e98026a09a55dd98005c630c9de2b092dd8d19180025859bd15c3d3877 SHA512 c2f4ddb12563debab92fe304de4d21a3c96b187f577b1f5dd1d72ab97ba2fab4faddc5b4ff360b596df61e74ea0f8e3a5b6100b240e2a09acb95df5ce6361c72
+MISC metadata.xml 393 BLAKE2B 749fa982e12a5c1864a6268a9d589fdf30888662f66a9f8391207282f15eb13f006a4996db23811d5641601bb8c92e554c1e2247e939e72dab21a18eb54a70d5 SHA512 edb02776963e15f752a7b8a4a758e07c8d649a18815fb7e61fa567df34d6e82c18f8889fba74334b8c3657cf8327b215647a1d99acd2b16b01c712b1d3f4f2d1
diff --git a/dev-python/scripttest/metadata.xml b/dev-python/scripttest/metadata.xml
index c615e4f43552..9a13f8026a84 100644
--- a/dev-python/scripttest/metadata.xml
+++ b/dev-python/scripttest/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">scripttest</remote-id>
 		<remote-id type="github">pypa/scripttest</remote-id>
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
deleted file mode 100644
index c89bf6e45053..000000000000
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 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="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/scripttest/
-	https://github.com/pypa/scripttest"
-# pypi tarball lacks tests
-SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/scripttest/scripttest-1.3.0-r2.ebuild b/dev-python/scripttest/scripttest-1.3.0-r2.ebuild
index 2735795f8652..fc115d20989f 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r2.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index c1cb47cbcbe8..74e200c27e57 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-0.8.20.tar.gz 55874 BLAKE2B b31c7dcec735944f6162709ba6ceb90160b3c9c403121a47e62563f8d2fc50f0505f180d7c18fa2c8e9037a097ca3bffea4c54c1f3b6861004f65a189a20b576 SHA512 da8d34755d4b6c98dc57ff7baf17839cf2434a6d7eb9f6fdc69b3e458d41b4fc49f7fd3a5631318b82bc4b2e46dedb806035897bf1be5a4670b4120f6b46efbc
-EBUILD scrypt-0.8.20.ebuild 597 BLAKE2B 192621f0c485bcc690796692ea11e2c9cf6b7f6256b76cd12cca122d85b1faa8191387c21e60606487d7f67650d01e2ae3298a90eca2dbd9d7a247e28d7133d8 SHA512 01a7733a9511988ef664de46045525dcddaa36e92277e2fad7728d8514296dad944e1397300dcc4508a30af033c0b72276f32c22c61592f1b39cb05153df8d9e
+EBUILD scrypt-0.8.20.ebuild 634 BLAKE2B 69ef1b69c9cc51e1cb29762fa9f262fab50ae0365ef001c665c77e1d1a0e3e04114a1a23ffa3f746a94778e9e86af379ced9eba6b5aeb44c22c3f56e9abd650e SHA512 f3765c280719856b7bf09f4bba1bfa62f7bf0de9998ffa06ffc6992d717a55b04e822cce37c3824128f62d621fc0895b18b3388f3ed69ba7de7286f75651ddab
 MISC metadata.xml 477 BLAKE2B eeb9120e1d43440497244d45f746ed7582d5a2fcbd3883bf72183c4164f63e87d57fc54d77be71bb873807b8bb6e0c878362aba21ca28a2c02209ef7aa2fb666 SHA512 151f92893c8b3b34dbf2f9145caae7e031be75f7f79f3517c9b645973454fe1910e0b5b2f4c37b6d3768038baaec126d8aa1a36626218f896a8f5b9cde82591c
diff --git a/dev-python/scrypt/scrypt-0.8.20.ebuild b/dev-python/scrypt/scrypt-0.8.20.ebuild
index eb66a3731b4f..cb9ef602fcd0 100644
--- a/dev-python/scrypt/scrypt-0.8.20.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.20.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Bindings for the scrypt key derivation function library"
-HOMEPAGE="https://github.com/holgern/py-scrypt/"
+HOMEPAGE="
+	https://github.com/holgern/py-scrypt/
+	https://pypi.org/project/scrypt/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index b75d7c007f17..364ab0f06a4d 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,5 +1,3 @@
-DIST seaborn-0.11.1.tar.gz 261397 BLAKE2B b281da14eea5e9038af0d79ed07531d0006294d63ff4cabc308a460f1107a7d045793383d200dd2dd63e18b43cea838dfe245b675dbc5c308960c105348e5e26 SHA512 ea33cfdad8c01986291e07b906011f4104995f26a88b2775e155fe4abc28f6f5e224b15d4150a246ef1e134d72bd3dc6f534f7c0d370ca99d5f15cd84e10ccde
 DIST seaborn-0.11.2.tar.gz 268839 BLAKE2B b1ba3a76431843921f01f714e601ebe7ed87a8c4136acb65a7cdb89059d67cb136484cb968efd713a5260caa552673efd5d06898a69624b36311fd3908f00179 SHA512 f08fe82b4ecca2b140a953c89bb7f811255d00ec819225809bb224aadde161ddabdeaf5cab53e3558bb84334cee828baafe0ee5efe465e80875a0513fb1ab9ac
-EBUILD seaborn-0.11.1.ebuild 834 BLAKE2B 44e550a9150479ce05a9789cb5bca3efcc586704dfbf0cb7f79ffce97eb80412067524fcf1770f1c5e87f9dedc6a3ba5108bff585e170221620ae5d7bccc4aa6 SHA512 5017c34e1d5b44c4d188db1d1efa5ab0c8eb74592792d1d2eac720537aa7a765598c7a314eb80e169b7136024d93fc5b16d441fb6d7dbf06e809b92211337c07
 EBUILD seaborn-0.11.2.ebuild 784 BLAKE2B 0e491be5c556e6384ab26af3c2d18294703024e71264c12c57116e2ee4f8fcbeb1e2013a3d41d225d2d030e68ea245f0fb5b1bf73adc24562fee863cf115b60b SHA512 65bcabff9ef6697ead2a435f19b18969caeb7466db1415269cd63f0f607808d1f09479d6e2a7ed3adc26f06e6ac7f425dd446345cd13cef7e0a5b9a1b6cc2427
 MISC metadata.xml 1766 BLAKE2B 7e449efa11d2101e2b6e5729ef66bbec42d51793e8543ad214578db7351e5174ac80a96e2b41c7715135c4af1bc4f6205ee9b43add6737279546e7c02251dd86 SHA512 074d5cc59baae5ea4333d735d19a9788cc7fd31e1cf0f90715ae623260853a1231d93663e975bb7c7fcafc116ea48ff6b4fda6900bec1093b0be3768cb3be6fb
diff --git a/dev-python/seaborn/seaborn-0.11.1.ebuild b/dev-python/seaborn/seaborn-0.11.1.ebuild
deleted file mode 100644
index d3f9dfe2719f..000000000000
--- a/dev-python/seaborn/seaborn-0.11.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Statistical data visualization"
-HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cat > matplotlibrc <<- EOF || die
-	backend : Agg
-	EOF
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 318b6110dde8..ea8162f11e41 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,3 @@
-DIST SecretStorage-3.3.1.tar.gz 19566 BLAKE2B 0b1ab822ee29f3d56148b558b3029fd882f1d10ceb3e026586de2e9bc72b7ac1b35df11052117a7c07524ca72d004ef56d99c845bc3600984fe84e5300f3dfee SHA512 5e874d08c9e00626a217db96b131884daf92429a91f690b32f62052747275ad0effbe2b4abe048e67fe7f81df97507f8375408898ff986e6f883b5fdfbf2a76c
 DIST SecretStorage-3.3.2.tar.gz 19285 BLAKE2B 17089e61a9549f4547faa8c6f7f711f5e4b3ba9ac0bf7787c3384d4920c5cd02704bab86fd4b7abe4ad9b93098b1668cf89901f4a0760023e274c8daf009d5a4 SHA512 f04a35925f86fec25435554083ac0d4b21b88cbc19b67a4c744247e659bc767675a52d18b33be557e99593922aecb0c261ec40803c61e089ff35b6c8b541ac63
-EBUILD secretstorage-3.3.1.ebuild 1143 BLAKE2B d34153ee1dc6c79c1365bfb44663797a43bf907dc38230557eda5a7c77515f9970a589e83f9f2317762810bf9461fa382005be6f86b756752fc6373da9ca35cb SHA512 d65e275870505972a8d2a2a681517cb7f0f00a10cca4cfd06bce51e2fd50b4c0636707a8b3fead1f74ead7bb3718a53af88b0872a0d3ecdac8fa362eb7395ac1
-EBUILD secretstorage-3.3.2.ebuild 1213 BLAKE2B 8254d55e4eb381381b683c491e0dbe08a118939ba466264f13994f5bc2336d346d0520fd4a0ed30960f8a3e3587bc08bcc8a002c9bb8469fd9eff53f313e1526 SHA512 f495f004959a1a5aaafde7ba3ef746750149931577eb396572c3c0023e47392be01de3ee5ef0f2b742a99398843d07033f124e7d00d03a567db477d0bf0a1636
+EBUILD secretstorage-3.3.2.ebuild 1205 BLAKE2B e708db158d78e3b9ac9ec7dd730617e05f671c51f7c6ebdf3fe0758053b8cef34916a0950c539dffbed5dfc4a558a574e66b7643e4e950604923539b1aa7d3ef SHA512 be2af605942956519d2f349ea74b5cec257d460b35751a0b00e8eef9bd05c4437d06ad52d17172a6d69cc1a4f00964c280335c65ad508bf807749314f97018c1
 MISC metadata.xml 402 BLAKE2B b96b0f7f9c4beb113d6df477d250d2b11c173b1832776569dbc74baffb460938979c78cc0eeffb91b357d1cc1f364d1e9f5b53f5339744715d0bdcba42b5a0a0 SHA512 66e94300f5450f6a6cd2999f23099f9821cc9a9855b4c52fbec54743a172c64dfad66fa184fec121ca1359bfdc1d2ff316fd9c3fcb100303537737dd5493d5ba
diff --git a/dev-python/secretstorage/secretstorage-3.3.1.ebuild b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
deleted file mode 100644
index 783105f6acc2..000000000000
--- a/dev-python/secretstorage/secretstorage-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API"
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( !hppa? ( !sparc? ( !s390? (
-		sys-apps/dbus
-		virtual/secret-service
-	) ) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_test() {
-	case ${ARCH} in
-		hppa|sparc)
-			einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
-			return
-			;;
-	esac
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/secretstorage-3.3.2.ebuild b/dev-python/secretstorage/secretstorage-3.3.2.ebuild
index 7c064df34f07..23a30f6223ae 100644
--- a/dev-python/secretstorage/secretstorage-3.3.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 356d5a5dd3c0..12fbc97923bd 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1195 BLAKE2B 6d9a19570d366f8d3036d08467a629e0d4589576260632bbae94437616c0470f0885e01f8c2035080b891905aae2729ed8ff11e53e2271c382a576831890858d SHA512 b2f4f172fb894fcb87c5276c86ed04e27c1191e716f753d8d9b27a557bebc64148804c2bfb07df3e37a82e77ed7f00a6fb7ec60eb8ee422762fecd2557cce203
+EBUILD selenium-3.141.0-r1.ebuild 1195 BLAKE2B 0a97439ce70ad9e9f529153d9a44928a524ab6556c32af02a9ee8c6f5302ad130deda4bd1a9ae93b3a81c117848c93b8cb84ca62d6d4a4afae367464703731ab SHA512 44f8869efe2e096ed45c3f64b716c96ac7594560a3060bf509760bb1002cc217887863f71eda4bcb8f268a8cfb847201426bfb02b93588c1479b797d2ab4777d
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index 6c466bc6025f..87cb9bb3c3d2 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 38657c0fa95a..d8d23dd2ed19 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,5 @@
+DIST semantic_version-2.10.0.tar.gz 52289 BLAKE2B bb26ac31e71974376b40893cf000fe0d85e1e3e4c7c93372f2bfca841a5d760a99ca49d67f80c6e8707e60e313162b786300109f6f8cd1cfaa0001c343bc4702 SHA512 869a3901d4fc12acb285c94175011ed03dc00b35ab687c67dda458cffab5666cea21bc1b4bf75ef4edeb83b8080452a1c1470248eee54bbd269614a8cab132dc
 DIST semantic_version-2.9.0.tar.gz 51123 BLAKE2B c487c49ad17e7ca224ca4b6602abb42d1406dad8d70a3f5d0c536160e5b2d706ff0e1497961e3b9e0391c6d773ab7d0e9699f171f5781cec1d36025450cb7019 SHA512 e08f8e83ad20e94ecd6393d88836e13703fec3c2f89dc7e44fae42d8a929b2460524053fd7440865fa136d22312501a1368b5c3e923997b02383c8227972aa74
+EBUILD semantic_version-2.10.0.ebuild 664 BLAKE2B 1bb189ac428af482c0ab85b0770c84f8ce6f16321dc2d20b8fb3a242bd97c5ebb445bf0b1330b6783c1d8c40ddb47a15467a437919fb0a4522f9bb98a8aacb59 SHA512 2a4c6f1edbe51d10fd56dfd1342020aab8fd03c1fc2ce98c4446219faa843f125eea82bc3a261c37e7021dae0923167afd5bfff41538cca54a3917b47255ae7d
 EBUILD semantic_version-2.9.0.ebuild 660 BLAKE2B aa361dbd4530f6b91b9d020129399e9b05288d85d65fe8145bbe4ccd69a75c56da2bc3ffe71b2ebd3864ceead4fb24463e87416804373c94144c7e9338318917 SHA512 93de61f8157c0d2ab2a7b676469c138448364e22ff90e5572972e29cfbfb1acad8fc18c19b8490f01dd5db66e0725fe0e49e9602c2741bf2786597f01ecded78
 MISC metadata.xml 820 BLAKE2B 83a7b2e1fb38295f0c33ae8167795a047dee861961557ffdf7ef464c37a03229b639e5fb30b1bbc9d85b30192d87a2894a29ba3b10f8ca8d59c9aff20c4e6f32 SHA512 98505d13a269954057c74ce70d2229c57ed5b6d912d566075a871b465ce4b511f2b04761f21627b91118866b23fd8e4b332d4d2506b476fb3695ea88585088fb
diff --git a/dev-python/semantic_version/semantic_version-2.10.0.ebuild b/dev-python/semantic_version/semantic_version-2.10.0.ebuild
new file mode 100644
index 000000000000..c0c7120df32d
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="
+	https://github.com/rbarrois/python-semanticversion/
+	https://pypi.org/project/semantic-version/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:django
+}
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index bb713cc0ef76..afdc1e045b68 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,3 +1,3 @@
 DIST send2trash-1.8.0.gh.tar.gz 15040 BLAKE2B 06f6b0b9e4e9316bc60332ea76426922db6d35fa5d4e0602e91a58996bb55a2344d7d56547bdf21151641c5ec710b78b2b11c8fda158eb911155994c86d10078 SHA512 9dc15fbd262eb5a05a355b436c0e582e5ef9b484f859b53faafe6af5bd08ef88b9aa5121485c2fffb7dbe5aeeef29f6719035e08c61da273fd4fa51383b062fe
-EBUILD send2trash-1.8.0.ebuild 549 BLAKE2B b3b74a851025a319b690d61c367773d4ade35b0d565c5c99bf6bcd827f9165f63e5709214acc87637ba133020226b3cc75353e0b5ecdac2db515f74152ca8b82 SHA512 0ee71665687a643b5135592bcba2384393f71897fac01566d56e561dc14bcbc3b6f167d93ac4a75a6895949b92b74ba1abc6ca75747c07cea886bbcf38000d9f
+EBUILD send2trash-1.8.0-r1.ebuild 584 BLAKE2B 9b57046e037a30e98e691aa820c0ab905751e7b1943a9510f341bb92dafea58df9bd1a1cd251847a2008d66a1b2e6f0fad9adc5a97008f25cc84f5388f48615b SHA512 d2b08d9964b040642a2fc8134eeb7d13f064adf4faf35e3ed5378f28a62ccfa5a084f5ed70bc2413df71a7b0c110b5aa33e609825d7f2ef48721eda4ebf151ba
 MISC metadata.xml 411 BLAKE2B bc650bdcb346ddb4c94fff51727b5ae9f2ae1cb62d0fe52709b531fd779fb4b5342f8c200a924816763b3b21354849b320a92050d62d243a48e862f46c997d9b SHA512 b5ba72495ce17919eedb91021749653ec411d1df1188520f95a4db28efbfc9c59d291c23e54014430be77fbf961a0662f25539805086b5b284b992520f5dcc22
diff --git a/dev-python/send2trash/send2trash-1.8.0-r1.ebuild b/dev-python/send2trash/send2trash-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..8b0851db162d
--- /dev/null
+++ b/dev-python/send2trash/send2trash-1.8.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sends files to the Trash (or Recycle Bin)"
+HOMEPAGE="
+	https://github.com/arsenetar/send2trash/
+	https://pypi.org/project/Send2Trash/
+"
+SRC_URI="
+	https://github.com/arsenetar/send2trash/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/send2trash/send2trash-1.8.0.ebuild b/dev-python/send2trash/send2trash-1.8.0.ebuild
deleted file mode 100644
index 3f1a258f5f59..000000000000
--- a/dev-python/send2trash/send2trash-1.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="Sends files to the Trash (or Recycle Bin)"
-HOMEPAGE="
-	https://pypi.org/project/Send2Trash/
-	https://github.com/arsenetar/send2trash/"
-SRC_URI="
-	https://github.com/arsenetar/send2trash/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index b2ce8df74d1e..d3e8d814792a 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,8 +1,5 @@
-DIST sentry-sdk-1.5.11.tar.gz 246628 BLAKE2B e19a9e7db3d952d8618d3e91f85833b3d0f8020a2e75477b26d4ef483cc2e2b4b81d16a098ac49bae8be5e5949f39f52445d089ce0d3abb138d9866b78d5fafc SHA512 580d005567896f23951bf9d9d6d9dc36cb3bee1952963d4026bb813ddf756a863a5aaf3896afb478c9b6d338d2b829a5fa30e759620d18470df9320d1b378c0e
 DIST sentry-sdk-1.5.12.tar.gz 247388 BLAKE2B 72dc4a5df97656074243045f20cfdbcb15b3d40bb58be06f458a31b52f0168be6f543f83d4641528cb7310f3f5ac1459218397e0e7c0a5131c9bf462e8cfcfb1 SHA512 4d39ba8fd2f490b4e8e5584207c17ace9055668d34a1c43e74a5f05c740b0f38d0794a90cd27edf221d35f5ad76aa6551e117f48167186ce630f7f64200cdad4
-DIST sentry-sdk-1.5.8.gh.tar.gz 245374 BLAKE2B 0a94db069786813ce38346d50c51173cef5a47099232d56ecc561ebaf7e9ff3ef1063f964370aaf0f184ec02af7652db59153fa1bf3425e6c75c0a4c73c4ede2 SHA512 992cebceb9b3b2a861b6f084a1ae88f93a8cf740b8f0407550c31af9a9332afdeeb6e64d0dd29b2f80ac1cdade942ada90756c6fbc3373f3ee1948b9d037b59b
-EBUILD sentry-sdk-1.5.11-r1.ebuild 2787 BLAKE2B 4e58cbd9979bf58b7bc4b87c3ee21c15d907b1fa912fb897d8e24d6dc931ca696f14947642704b87b3b1b673fab5b81b553661e9beeeceb0aba242cc4ec643ec SHA512 cc47cf14a290465302bb9f41952238389e22b82b683802ab1dcad116c64fef52b6f5727a4317191f24b31afb4ef7d6e6ff7f42a1dfcab26c8b0fce4982f4cdd6
-EBUILD sentry-sdk-1.5.11.ebuild 2787 BLAKE2B 8c449ff06e1d3fa2738e642500ab34fc057dc236a09bacbf7b513b6c8ee472b5cd1f7e5b5312bac06954d163bc6ecd3faf9b901cc043d65ee7a9efc87bd93d90 SHA512 270be7de62458162b7dcc05406fe1fdb8d160130b51994cc42820e77b036f57c0e50a5ba7505256735867d22ee8e3b8d8fbf76c477bae6335900933b91b99118
-EBUILD sentry-sdk-1.5.12.ebuild 2822 BLAKE2B c8d3e8de4c6ef13cd3c67e8d3ee1c47c0aff8927319c514ca5911807ce883da6c643500e787dcd044e4f210e25466dcc73dab98f151ab36e29bf0713297b8508 SHA512 f9e59fe1f57c4ab517de49d0bedd41baf611cd4e7af3b79918282c7f434f5e92de1cc341bfcea124202b9e29ea1eb7131abf773464e77154fa25bf96c60ad3be
-EBUILD sentry-sdk-1.5.8.ebuild 2705 BLAKE2B 4f20f427a140a31101b18f2c0ad0a238621cf7376d162e29970fcb43e3421596c60867cb1b99bd53755e87eaeb639b9217b0becbcac919a5960fc46109212e19 SHA512 4597992a3d8dbd6da6a9fd8daaeaf0411d59d39736180fd99e1b9bf8c0b2306d0efd64ba9c981d712ab27f855b7d0a8ea35f6a36e65c2cd01f53cc2397aa7f22
+DIST sentry-sdk-1.6.0.gh.tar.gz 249637 BLAKE2B c4d6788c80184ce9127ed85dfb5305363fd27bcbebd74763e4c14c4fed35dd05069ad4a244fa2d8a59f8cb618df22d4d864bf72510fe42600d23fcc6bf8228cf SHA512 d2999831af595ed7f1861ec78887e46887eea8c4c931f22bd4003aede508511287f67eb6100232362a110d16b7bdec892572225440be52a9bd37952c30478f15
+EBUILD sentry-sdk-1.5.12.ebuild 2867 BLAKE2B 713c54d0b7774765790baa3db1631023e16291796d33a1481adef9db6daaa5548a899393d28a68ff3dd1df2df86f6c935c53f410dd9a91d5d7837a0ed11ad0e2 SHA512 1a259533119f6d72f04229d48ad8ae33379c345d08f5ea2c51f75bdf44534de69da266a60db06dcdb6c3fcac21a592a518d0bdffbda8e53b664328919adceadb
+EBUILD sentry-sdk-1.6.0.ebuild 2874 BLAKE2B 499f352134ac1748e95c5b690a7b3848a4cfca4d532388ab4c056d8b59e37885faeed409c50d2764907280dfc83f2a015a72420f5620724026d7f418d1884040 SHA512 4ffa0cd99c29794138a199ab295e32817ea7fe8c7383a6f68598cd77c992a5ad7782bae3db5e52bf074351e061a2ebd3ab49f9123858e438a813627a82511cdb
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.11-r1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.11-r1.ebuild
deleted file mode 100644
index d03693f79ae9..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..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 ~riscv ~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
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-)
-
-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
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	# 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
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.11.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.11.ebuild
deleted file mode 100644
index 75e32346ce68..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.11.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~riscv ~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
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-)
-
-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
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	# 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
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild
index 51d4790601bb..8f71f6b3bddb 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.12.ebuild
@@ -4,12 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
 SRC_URI="
 	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
 		-> ${P}.tar.gz
@@ -18,7 +22,7 @@ S="${WORKDIR}/sentry-python-${PV}"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild
deleted file mode 100644
index dc9d2ef62a99..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.5.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~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
-
-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
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-)
-
-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
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	# 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
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
new file mode 100644
index 000000000000..45d775960169
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.6.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.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
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+)
+
+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
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	# 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
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+)
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 22500f8c6969..e34370bd2b2c 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,3 +1,5 @@
 DIST serpent-1.40.tar.gz 24140 BLAKE2B 8a790e3f0973e99840cbea6ad354012cde0b7c6ee09c50f31d56110e12cf848543a30a38900e821419c9a0aaeb2b55fe0161dbc9c233f236a21dc553cefce9e6 SHA512 9f8edebcd6e37de7442a00157f64b1dec6742cd198f45ab475be7f38aff4e090345739f7500181f0b0a4dbdc9241b2f11bca5ada7a89aa577d94646269d7ab28
+DIST serpent-1.41.tar.gz 88927 BLAKE2B 738c0e3ff3ff908514a54523aa41bcda3aa4426d0426037a0223ddb744995bf9175de96df2372506aaf45de664897e35cd7292b9aa58beab146f225ce02864f1 SHA512 cab6f9e36d2f777e58cd5f3d1dd6e11626e0f222ecb2adb8e5997338c76ed357c461dadd00010cfd43ffc6a0b1addd7de06d86b7a82ca796719e4bde2d9f4813
 EBUILD serpent-1.40.ebuild 608 BLAKE2B 61605e186d0d09de59684602bcbf7b55e841bbdd498eb2b7fd068e3effe3e16cc8585cfa530ec9434475a55e918a616fda348f64c66641d45d98ddfd1c81be10 SHA512 1eeec9e3ddf7b0e3e89ba9658e514a9a8cc475c377aeacedab3b721d116ce1a0d5d53f941e6b0f41cdfd0bb62350bef1fa70434131a112726eef17086593b5f8
+EBUILD serpent-1.41.ebuild 642 BLAKE2B 9abf46a0f90478236d96a1240d838be1ce248fcd84f4407d5ce6d38f8a675e2ff864e9c666ba81f2c9cf7ecdc50bc5483fe1626c569acf8808623750c3f93e77 SHA512 a7799b932f8e2986c1c994ad1933a5c5c5acd9e9db09649703b6b9256a97ca23bce2cc0fa90d703cf5fa63b0520a80651c22f1baef262d4b089e0dc935f26df7
 MISC metadata.xml 388 BLAKE2B 206deec11fe6808e269bee29bc9d3e6f6d60449643abfb03109fb35f6581aa7ead30339c7f8cecdcf89d98853fd4f10289969b19440caa39b398ef90fc71d61f SHA512 742d221049ba6feca1c30de79d67d13e3063a565d8819818d18fa778036d499dd61ef59763114c43adc523bcdaf3bd6b36ed59f5c8784562a02d2f303941f84c
diff --git a/dev-python/serpent/serpent-1.41.ebuild b/dev-python/serpent/serpent-1.41.ebuild
new file mode 100644
index 000000000000..9c183aa8a170
--- /dev/null
+++ b/dev-python/serpent/serpent-1.41.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A simple serialization library based on ast.literal_eval"
+HOMEPAGE="https://pypi.org/project/serpent/
+	https://github.com/irmen/Serpent"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest tests
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index a3ea6aba92cd..8d230207418f 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,3 +1,3 @@
 DIST service_identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
-EBUILD service_identity-21.1.0.ebuild 846 BLAKE2B 8e26c1b82ad2c014888bcd3734d3ea5bd66a5d84f7f883e73377e4dc62c98c2ed1941d9d13f18ff7d4209295a7e92436c37599a85f7b50247876ca0c0e2deb62 SHA512 dbe717e15e3ac6fec015b91c98bd803c1fcdf75e6d852a0186c3db685a48ea52cc73aa18ee195e87d4d29d1b1bbd24767f97722332a58177df534f5f8566a12f
-MISC metadata.xml 405 BLAKE2B 2a6deb86db693c641fe69aec2873f990f37c337ee407b008c4d790f0717a84e422e4700c950722ab4cc250289544c204da2bb8810414979b9e383610eec3570d SHA512 17dec050762526893368aa003c26ed95a0f5e6c7de2580275bf7076aa3ba66014019cc92b82692e6f8469eb5e1359ea385dc9a8e2b641ca15b704509d823f522
+EBUILD service_identity-21.1.0-r1.ebuild 952 BLAKE2B b94332852690be111c0695969ec3dedf6e539f298eed890dec2f5c1ac7605f1928a7c57a8a4adcb376d30989420df5d8423fce5639810c59e6a8b3521100cea6 SHA512 d4e74c18d5eea99d6940ea8956da4ed3bad8b694424ec701c6d0afe19ba09c2805281250e5616185b6ec975b30ebc24fc1c284f4723e61860775b2c0c31c8a57
+MISC metadata.xml 405 BLAKE2B 6cbc25ff47728a28c25dc7c28670486dc3eeb488931fcf3883bd278f72d7f7fcd5834087c811cbeab32fd85f4dc04afd7b6fd50571283b2e88df3cc5b36dbc3e SHA512 db97cac52d30f9e01f40b4e1629b7602f643bbc0947db6ad8d4112a158a2e1caa2200438354e903d6986219a782de131b1a0ad7ad05203242b31faef9fb242f3
diff --git a/dev-python/service_identity/metadata.xml b/dev-python/service_identity/metadata.xml
index facd487de72b..7331b1a5a602 100644
--- a/dev-python/service_identity/metadata.xml
+++ b/dev-python/service_identity/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="pypi">service_identity</remote-id>
+		<remote-id type="pypi">service-identity</remote-id>
 		<remote-id type="github">pyca/service-identity</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/service_identity/service_identity-21.1.0-r1.ebuild b/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
new file mode 100644
index 000000000000..c2e6bb4f8f5a
--- /dev/null
+++ b/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL"
+HOMEPAGE="
+	https://github.com/pyca/service-identity/
+	https://pypi.org/project/service-identity/
+"
+SRC_URI="
+	https://github.com/pyca/service-identity/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/service_identity/service_identity-21.1.0.ebuild b/dev-python/service_identity/service_identity-21.1.0.ebuild
deleted file mode 100644
index 724c9098b3db..000000000000
--- a/dev-python/service_identity/service_identity-21.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 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="Service identity verification for pyOpenSSL"
-HOMEPAGE="https://github.com/pyca/service-identity"
-SRC_URI="https://github.com/pyca/service-identity/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-# TODO: upstream made pyopenssl optional
-RDEPEND="
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index dee50dacf751..79f3b562195e 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,5 +1,3 @@
-DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
 DIST setproctitle-1.2.3.tar.gz 23618 BLAKE2B 58bafb30a9b0da9cd552c7ed1ccd197a2ee7a3c70ae02773e6a857e4f16069126d2507f30206c83a24d84d030a1fc9306d024f4e5b988f73d95df049fa9c055f SHA512 ae94e3f5e1dd10e80488f81250e979a6a15c7c3ae399bf557612b9b1edbdcb8aec4e68a7f44ff7375a399ab53d6319dfb5c5c4a1e3a0bb824c40f6921c9d9c6b
-EBUILD setproctitle-1.2.2.ebuild 569 BLAKE2B c7483a9b25218e159191807fb692a64c20f851f7b7dcf0037ebca99b4a6542bf957ae08e90524f2c96795647cee23d64b620ad9961e91f41d1a86a596831e009 SHA512 9651a530db06a95c5a82a795ab8b9b6bbfe3159a725e77509817cb05406dce02324da05c3dd05341b02e93244268747e22e1301e5e66200e509034b2502df622
-EBUILD setproctitle-1.2.3.ebuild 622 BLAKE2B d326f1558fa5b3d41745969276933fbd8042d33280ed62f340225e0a242d02ec8c2e486082e59b3a6302013be56925d94f49f7a2c743322ba5a5cd17246ba790 SHA512 42c7cea00efe56344ea8d75b6cd357d184c95039e4af7e4a835265bfde3a45fcb37f2efc8e3b1192cf0fe5bde41ebeebc98313199aaeac624c7871faea4079f6
+EBUILD setproctitle-1.2.3.ebuild 659 BLAKE2B 270ee12849c70a5cb3084c5d92a6cb71fb3ca89ffac5c2ba8fdb6dc48101bbba5eeeced0ed193dbb69a2b1c65eb05c12c27020762366df07cd5e3437ebf0ab43 SHA512 16413006711e1e2b0b75fd61e69f9465a8447be899539d0835166afc84806628ee55c734dbd0c6b82e3d6828cce9d1b14286513185656489148e58766117b7f3
 MISC metadata.xml 381 BLAKE2B 3d670d00f8ea402ac4ddb3a4f92f341f9a983a6dbd7d077523a7ecfea4bcd6ba398e7ccc5866ac2650a765b25a0e83b735293963598ef404af1f106cc629d378 SHA512 49e506f7044fe2ad49ffe16c7070da7fba8768f3e79b4c32e539a65ea94c73c19c7592021434a4ac7e10b7f401c255ae276ce8caa599a14dadb9e512765202da
diff --git a/dev-python/setproctitle/setproctitle-1.2.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
deleted file mode 100644
index aa3f6ffe1d72..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
index 73c34d078760..a66f942b8d4f 100644
--- a/dev-python/setproctitle/setproctitle-1.2.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
@@ -4,15 +4,19 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
+HOMEPAGE="
+	https://github.com/dvarrazzo/py-setproctitle/
+	https://pypi.org/project/setproctitle/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools-declarative-requirements/Manifest b/dev-python/setuptools-declarative-requirements/Manifest
index 0d44eff36eb8..a25e7bbc5624 100644
--- a/dev-python/setuptools-declarative-requirements/Manifest
+++ b/dev-python/setuptools-declarative-requirements/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-declarative-requirements-1.2.0.tar.gz 17936 BLAKE2B a5be2b64fc22d5a45136ec2b98c1d4cc6c20e17dc81070d12948b6f536a517ec8a660c105dfc13a4319d1de54409fb4f7a4c6bacaf1291afa13c7ecc27fd933f SHA512 ce0eeb8692ff2ea80db91cad981853da74c0ca80f58b698753de92f6df3ef5e1c158e314d0ac4d0b4fa99a2ad8ee2d7d80a9d1a13f334966c948dee1a0ae3d98
-EBUILD setuptools-declarative-requirements-1.2.0-r1.ebuild 1263 BLAKE2B 645eb85f4c189bcb08eaf1f00c61f80d3fdc07078b1ea40df8b5fcc64df626746601d2d2f7f2ca0394a490a3f77f32e377f0a1f1dc4e3a96ecaa4773b40b0e68 SHA512 ee6fb04d41a723cf9cb77175ede98c422c83ea0449a4dcf9eae4f26afb5170c9595ef6027bf2744493874575fb94a4f85d021a529aaf97dd1f0bf61e633c3ecc
-MISC metadata.xml 348 BLAKE2B bb75dc7a62dfbe1f2128ad84e77dbff5498ba9eac61044d8914ec119b42e53c1119082bf66fa980f2b14df9ba8c48ac13fb0cdddeea60c9d6b9260dea90a8c4b SHA512 8df4f211960c247df43cccb8d2c31ad12f3699c8ef790de81602cde2fb62917c441ec2a85743b194ab716e1ecd4c64a378b3e7139bfc8d6547b768b2acbfd7c8
+EBUILD setuptools-declarative-requirements-1.2.0-r2.ebuild 1138 BLAKE2B 926dce22a36f53b765295694c4ab89ca49491abb99c8d432229847d072679f5654e0f34c08608b25748439e9fa35ca677de7a9af51d1ca5cab8f28c94afb44d5 SHA512 4ab88af7c2fe995acf09196cb0f7779beb697fb0009bad8a52334035c5ae2533549492d39fdd6be9dce16346f43ed6791f42993d99e4256b50bea964e27e1c3a
+MISC metadata.xml 449 BLAKE2B e7161aeed6be695483f0d1ecd12d5dc2095255959babe854ef5b965bad0c68bd3f879e60d729f080c8f10bcf71d3880203f1a1cfff91e2d5020a2e566ebc88d6 SHA512 f764de1ee5b2dc29c53157c7c6683673623a7f491bd50afebc980a88d6af898a0d23898f49941ba7f14bdd230b0745085f279a22bd4397c1cc911098abbd4d13
diff --git a/dev-python/setuptools-declarative-requirements/metadata.xml b/dev-python/setuptools-declarative-requirements/metadata.xml
index 5e3f363fee8e..27e94aca3590 100644
--- a/dev-python/setuptools-declarative-requirements/metadata.xml
+++ b/dev-python/setuptools-declarative-requirements/metadata.xml
@@ -5,6 +5,10 @@
 		<name>Patrick McLean</name>
 		<email>chutzpah@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">setuptools-declarative-requirements</remote-id>
 	</upstream>
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
deleted file mode 100644
index 9e7e724e53ef..000000000000
--- a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Requirements Support For Setuptools Declarative setup.cfg"
-HOMEPAGE="
-	https://pypi.org/project/setuptools-declarative-requirements/
-	https://github.com/s0undt3ch/setuptools-declarative-requirements
-"
-SRC_URI="https://github.com/s0undt3ch/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/wheel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e "/setuptools_scm/ d" -i setup.cfg || die
-	printf '__version__ = "${PV}"\n' > declarative_requirements/version.py || die
-	sed -e "s/localhost/127.0.0.1/g" -i tests/conftest.py || die
-	rm pyproject.toml || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PIP_DEFAULT_TIMEOUT=3 \
-		PIP_INDEX_URL="http://127.0.0.1:8080" \
-		epytest -k 'not sdist'
-}
diff --git a/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..9dd0c2513c1b
--- /dev/null
+++ b/dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Requirements Support For Setuptools Declarative setup.cfg"
+HOMEPAGE="
+	https://pypi.org/project/setuptools-declarative-requirements/
+	https://github.com/s0undt3ch/setuptools-declarative-requirements
+"
+SRC_URI="
+	https://github.com/s0undt3ch/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_prepare_all() {
+	sed -e "s/localhost/127.0.0.1/g" -i tests/conftest.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PIP_DEFAULT_TIMEOUT=3
+	local -x PIP_INDEX_URL="http://127.0.0.1:8080"
+	epytest -k 'not sdist'
+}
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index dd8efe9b93a7..c1c2a3ca0aae 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,4 +1,3 @@
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
-EBUILD setuptools-git-1.2-r2.ebuild 700 BLAKE2B 915835782c2b83250c3419573b8497ad25084a5ddabd96cef9519519c812a6aef59f4e99b696ebf30871cd388287e4b383553087f1667419e7e7311c8ab9e96e SHA512 992baa3c7ab04cb5714b37b3ead1388d7be1605d5ab180cbafd166bdd1828e360e6996586c9015c6547bddbec7a12defab879344103f8815430ec578b93ad933
-EBUILD setuptools-git-1.2-r3.ebuild 828 BLAKE2B d4ed35c2d2bbe51f09924360b6f43f5f1f86d0c65ad940765cf730c24e018031bf4c3faa5fd551fbedf3242515bedff65d1cb897d20f219be904b850d52c2437 SHA512 323a809bb5b8c8a7d59a498fc22c14b33da99102f3fd468a09af72dc516a10b47e25cef4931b1316e652c9e3e9849cb06debc5acc88962a02eb80e29c605bf84
+EBUILD setuptools-git-1.2-r3.ebuild 820 BLAKE2B 31b5ebb8e3a151de04d001ca7f000128a03c354b3f926a00e6ec41bb9bbff3453b242675f1a23d4fa1769a859991a8eecbb7bf7af00f9352ad969d479c65ac42 SHA512 932ce8957dc11bbea349ce520d411672c5f3301bed68d1b69381083a036460b42df1e243cb641f8a162c932ddaf6b6efe7e454099ad4b7451cb463a101d0aa16
 MISC metadata.xml 539 BLAKE2B 532a6ed2ca3b252f7a5b6eb30fff3866c472d7f1a8adf87acea940783400d380e58e099d6565e5092eb6df5667c2623e1cbc2d2498bb266cdb48238807cae128 SHA512 b8aa2b4053880fa52bc64492f19993039ae384912c6f43bd093b98e3817757aa2fa32d0a1a9b586736487da112d65a162b7a466c79b1601e12b408c93c89527d
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
deleted file mode 100644
index db5bd97c33f9..000000000000
--- a/dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 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="Setuptools revision control system plugin for Git"
-HOMEPAGE="https://github.com/wichert/setuptools-git"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-vcs/git"
-BDEPEND=${RDEPEND}
-
-python_test() {
-	git config --global user.name "test user" || die
-	git config --global user.email "test@email.com" || die
-	esetup.py test
-}
diff --git a/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
index 6c63d36e5de5..0d0da6be1a6a 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index c210ea6e07bb..050f8ea5e92a 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -71,5 +71,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 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 setuptools-rust-1.3.0.ebuild 3098 BLAKE2B 90d42f5d2cd1ed06f4752b946e567d6ae03640f455a637e4e437cfb07088c7bf3e6210dbfce72eeb734c43ac3ef8f7ee8fb5a81dd11f54ad9e54cc58ae2d83a3 SHA512 1b28865fef78a1b9278a0e123b967504724191430a001d7672491fe9200deeb793149fe2cf9a029095a0f6919f02f2df502ea848a07baff0197b8bec9538a8d7
+EBUILD setuptools-rust-1.3.0.ebuild 3146 BLAKE2B 671ce00aa0426e11bbafd55fccb561e624b15b624427bcd34e424cceaebe9f70212d7dbf847b9a3b1a63c419b1efe74a99ecf0271a5c4d10d4ee647d550a3174 SHA512 96ef6d93b5d23f3479a958af6d4a3dc5ef24e94a2f1ad6110a360256faaf9b9bdaf245a9e014aaed08446b4b9568e1eb3193caa69f66fa4033d66a709b1c7f8b
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
index cb38febad267..75e5c081e272 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
@@ -96,7 +96,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -104,6 +104,7 @@ RDEPEND="
 	virtual/rust
 	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
 	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 96e4d3363b65..474ee029ff71 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,13 @@
-DIST python-gentoo-patches-3.10.0_p1.tar.xz 10068 BLAKE2B 1c9817b449831559f0a0b722c02a5f55d94b3dfde98e5882c1403fe24a4addf7074ab39c09b91cff6fd7ace2e4b6e8ed899d9a0b9ffd6612ce315c4c192bd309 SHA512 39aa41dbf17b6dc5255491c75031a3dae6962b44125e426dbfdce365a6533c5dae9856b1fff8016a189124b7cff72d2665ce99da344c2f9dff005ba685e8c2c4
+AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
 DIST python-gentoo-patches-3.10.4.tar.xz 8592 BLAKE2B 67fba3e1fedb17430e5cd93da995b4acaf714db512031b5a2f775a25f793f007941561663cfa413d645ccddc2e22d65d250a40fa166cafda8805488d877ff57d SHA512 3ed2b8ff8f1eb8febe7dcd4b5d13d6d54468be1d525f8f1118977d3bbc78f690a597b09383939d023b03380a306e4bff1693382e29ff562312d803305b1709b2
-DIST setuptools-60.10.0.tar.gz 2420706 BLAKE2B 66d7f3b648b1e3222736ddf46ff97441bc9ed4dc528e0d4ee32ef18c99b2d3488e7525a1598a18df4f2cbdac409a4096a40539807c343d99707068a15003111d SHA512 e679bd84d31cb68f92899e0b25d5a6bf85cf63d9c8e1dfbfe974d7bf819cb36f451596b8715000be6a93656b972dc6c4d90a8a8534a6c88874a0be8140f2f091
-DIST setuptools-62.1.0.tar.gz 2512885 BLAKE2B a26a6bd5001922885b623bc7f1d42da90c59e6d9e195e9dd292ce2e73cd35a51f07fc714261c12db2fdf4510fa1137f57e7f3f649312f6a75035b9d927936a7c SHA512 41f39b5aa22e908c123e8e04c11e505e23cd3aaaae72793e106015dc14b1a44ff3b17aa15ca3da34f34a4becc887ceea7f41932650e38d409f95d7227707d2e1
-DIST setuptools-62.2.0.tar.gz 2512927 BLAKE2B 34932917fb635aa434b574d2e47d1dd0dd742275dc577e7592fc7ad2b7892d7e0fa5281b687873a8a70ab44cb28ecc7a5b8889c954ffcafc2ce298e10a28f3f0 SHA512 4d5b9a88088ef6cb0a742bd708ab52798ee5202a0be33dd6102fa44975d121496edda1ddd9abd4a97e4c29fe804687a1d298d930004a53ee2935c0a15821917f
-EBUILD setuptools-60.10.0.ebuild 4150 BLAKE2B 1b4cf02169341ebf4a7ef6983258c7fe7c41dc230ed5585a224759b449f6b90c27402488a241e7a6e30fdd8c8b6520ff5864da5b49759a422c6350605e42e09f SHA512 26179a6c4094481eebe31b624884a77600f2fbead02d49b218cf15fc92cb68b908223c7884131cbdd60926d8abd7b346d96c661549db75e87ab907515a3cf1cc
-EBUILD setuptools-62.1.0.ebuild 4762 BLAKE2B 4243138914b83760f09fc5b2457946d78ccb5f28ee73e2e0a57e055ff8e7e85e6b8c9f47731ffb1546acc6050145cac57e37e04d672ecb1d73180468b993c473 SHA512 8781a83cfe1001927735fd7001ea3924d2613f3c6bb86ee916d84e3ca156a34b1ecd13ee0374b15b1dd7f84955556a71f469209e7e0c400b25579f5c3e507ea3
-EBUILD setuptools-62.2.0.ebuild 4838 BLAKE2B 0844896325c6b999217746e3858f4089063b528773ef4ea5a509717ec133a1d236439aebf67f758e0aa945bbf9e0efa1e6576a27c57d79aa648ac45df13761c3 SHA512 d411aec93aca16f8b092ef90d4d2b27aa79ad56d975945930a780dd96855362465d0e3beede0629002f400d83866f857f7a0e7447912ad47908390f7c43844b7
+DIST setuptools-62.3.3.tar.gz 2586270 BLAKE2B 764f90a5b2585f05b6ae0ad23568a08069bb4ca776c969635dfaceb6b3f64dc6d56291c3e9f0a4540f0416eab9122f5d7d6ad193a5f604949b5827f3cfc2d1a9 SHA512 a7ca81b3f7adedb15a4ff3607654d1a4615de1b30a22aa5cbe4b0a8077db8bdd9348167cbb6deb97e1076d320c2a2a4b0d30acda389905d6503786902eeb66af
+DIST setuptools-62.3.4.tar.gz 2590435 BLAKE2B 089bb185b65107d54b3a17b423caa28b0505566f8e19efaf34ac347e074492278699295b5e8856756312182a78d524ae5098e86783c5c6e089bdbe2de1d1f60d SHA512 edd9595971ee3cca2d1280e695401d8e4aa38796af89f24132d81b897004147ff4f4fc8daebf6fef0606512cc71e09487a2cb416deeecd851a82abed30f57887
+DIST setuptools-62.4.0.tar.gz 2592908 BLAKE2B 5221c32545d451fe9e80f6c78296044fc805e995578f32d2a8809483c00ea84f918a3bb5e1d1a6d184533282d96a68fab8b4d303d839255a640952d1c575f53a SHA512 552bb6c93793a438d8d319b1ef51932e7e15fab965b9fc81a4f15015e02f3e7318b9df9890c3fb59fac1ec443c17cd5cbd17b7227a6a82deb355230673ae9ec5
+DIST setuptools-62.5.0.tar.gz 2596847 BLAKE2B 62bfd0271404dd77fbc1085ce8f6b8977d1f2fd3b1ccf5fc260df8875a2cfab9570db466c29646e7123404d9308765ef6cc6b4524b8c8dd3df9912c11b989e31 SHA512 32a9511ed9b2973cd81641458f8e9172b97d95a7dc10535a670ee1fe2ea3cba27ac9f93909c1d508c83293e6a20ab816bb899aaccf449823b5d67ac98bdf2718
+DIST setuptools-62.6.0.tar.gz 2599326 BLAKE2B 7f4200f9d9e94fca17fad2c37dab6c2175f5562703d2913ac11cf34020e65dd6aa7d024536e5294de5fb5e9523419526f0b56282da62ba0ca40e7e164c97260e SHA512 d67c438d507fc7959162b5e8c2a15e9c36d37e5cd7052e16eeb58d8a9bcf19b725a0e7b840e101500799d725bbc4c1872d0f79eead66a538e891cc7cfbe3d979
+EBUILD setuptools-62.3.3.ebuild 4803 BLAKE2B 1b1c45e86f35f7993451244ceb1d89406867cb270100b56d5b61035d760c9a5ddd32126b8b32586b9cbcd7368bfacf770980a029cf9b516de05c6154c0f0d990 SHA512 b8e9c91c91418ac017f9c032c360bd430b9d43e23a50c7c317579b211c9d2f6ea805af3d3384a4a72766913d2e4ce3fd87d775291b9a91b195526060646147b2
+EBUILD setuptools-62.3.4.ebuild 4811 BLAKE2B 690ec6aab3b8fb8b1ece7e0c55a8e7eb92e6ab17270c260aef1c62abd63984bb1231678114a26fcee71c892153a91ed2b1ecf7364e1f0b7d4c550b81deab7c89 SHA512 6e9f1f18746abb4d6c1204eb9e104827d1e49964e296739527a1c64d9009c07f9bb93f9220917dcbb053f8dc74e3974a9fd77917eb3dd98eb887ec103813a379
+EBUILD setuptools-62.4.0.ebuild 4563 BLAKE2B ba1208f6c321c2905b96ecfd7cdc068ef87b5ac43db018c0790149aab910d902c39c35a65459c365a6a04fad7066a000adf0f450d01310b088f05ed2e721a27b SHA512 348b957cbf4f2b97372a2ec74d59b8e0e78bdd605b2c3275aa563f1e6e232b779f2ee569594b6a97776fadfcd251cd1b797ac10db03cc513bba0f2574ad61179
+EBUILD setuptools-62.5.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
+EBUILD setuptools-62.6.0.ebuild 4085 BLAKE2B 3e4892512482fc1bc3adcb90bfc4f1a44b698957d6486f078fb6629ee73d7603eeddd768b072bde066a968a7c48900518d87336318c21b809e5c408623f8013c SHA512 49275430700aa47bb6df62e10d0252190437334078a6728c2cd24e9f8157e00e7266ce4f887aa98789819fa19b5aea1f8997f74686800a98be074c87f711063c
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
new file mode 100644
index 000000000000..09d630b363a2
--- /dev/null
+++ b/dev-python/setuptools/files/setuptools-62.4.0-py-compile.patch
@@ -0,0 +1,86 @@
+From 8911d627245f4389488c5d65cce6d1258f4cce7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 14 Jun 2022 05:58:20 +0200
+Subject: [PATCH] make -OO enable both opt-1 and opt-2
+
+---
+ setuptools/_distutils/command/build_py.py    | 10 ++++------
+ setuptools/_distutils/command/install_lib.py | 14 ++++++--------
+ 2 files changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/setuptools/_distutils/command/build_py.py b/setuptools/_distutils/command/build_py.py
+index 1b22004e..88565bce 100644
+--- a/setuptools/_distutils/command/build_py.py
++++ b/setuptools/_distutils/command/build_py.py
+@@ -325,11 +325,9 @@ class build_py(Command):
+                     outputs.append(
+                         importlib.util.cache_from_source(filename, optimization='')
+                     )
+-                if self.optimize > 0:
++                for opt in range(1, self.optimize + 1):
+                     outputs.append(
+-                        importlib.util.cache_from_source(
+-                            filename, optimization=self.optimize
+-                        )
++                        importlib.util.cache_from_source(filename, optimization=opt)
+                     )
+ 
+         outputs += [
+@@ -403,10 +401,10 @@ class build_py(Command):
+             byte_compile(
+                 files, optimize=0, force=self.force, prefix=prefix, dry_run=self.dry_run
+             )
+-        if self.optimize > 0:
++        for opt in range(1, self.optimize + 1):
+             byte_compile(
+                 files,
+-                optimize=self.optimize,
++                optimize=opt,
+                 force=self.force,
+                 prefix=prefix,
+                 dry_run=self.dry_run,
+diff --git a/setuptools/_distutils/command/install_lib.py b/setuptools/_distutils/command/install_lib.py
+index ad3089c8..7f906a29 100644
+--- a/setuptools/_distutils/command/install_lib.py
++++ b/setuptools/_distutils/command/install_lib.py
+@@ -25,8 +25,8 @@ class install_lib(Command):
+     #   2) compile .pyc only (--compile --no-optimize; default)
+     #   3) compile .pyc and "opt-1" .pyc (--compile --optimize)
+     #   4) compile "opt-1" .pyc only (--no-compile --optimize)
+-    #   5) compile .pyc and "opt-2" .pyc (--compile --optimize-more)
+-    #   6) compile "opt-2" .pyc only (--no-compile --optimize-more)
++    #   5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more)
++    #   6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more)
+     #
+     # The UI for this is two options, 'compile' and 'optimize'.
+     # 'compile' is strictly boolean, and only decides whether to
+@@ -142,10 +142,10 @@ class install_lib(Command):
+                 prefix=install_root,
+                 dry_run=self.dry_run,
+             )
+-        if self.optimize > 0:
++        for opt in range(1, self.optimize + 1):
+             byte_compile(
+                 files,
+-                optimize=self.optimize,
++                optimize=opt,
+                 force=self.force,
+                 prefix=install_root,
+                 verbose=self.verbose,
+@@ -182,11 +182,9 @@ class install_lib(Command):
+                 bytecode_files.append(
+                     importlib.util.cache_from_source(py_file, optimization='')
+                 )
+-            if self.optimize > 0:
++            for opt in range(1, self.optimize + 1):
+                 bytecode_files.append(
+-                    importlib.util.cache_from_source(
+-                        py_file, optimization=self.optimize
+-                    )
++                    importlib.util.cache_from_source(py_file, optimization=opt)
+                 )
+ 
+         return bytecode_files
+-- 
+2.35.1
+
diff --git a/dev-python/setuptools/setuptools-60.10.0.ebuild b/dev-python/setuptools/setuptools-60.10.0.ebuild
deleted file mode 100644
index 642e67d25a5a..000000000000
--- a/dev-python/setuptools/setuptools-60.10.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=standalone
-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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' python3_8 pypy3)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	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/pip-run[${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}]"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# 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 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		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
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		# 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
-}
diff --git a/dev-python/setuptools/setuptools-62.1.0.ebuild b/dev-python/setuptools/setuptools-62.1.0.ebuild
deleted file mode 100644
index 933bd7378c51..000000000000
--- a/dev-python/setuptools/setuptools-62.1.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.4"
-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/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${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/pip-run[${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/tomli-w-1.0.0[${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}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# 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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		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
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		# 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
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-	)
-
-	# 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
-}
diff --git a/dev-python/setuptools/setuptools-62.2.0.ebuild b/dev-python/setuptools/setuptools-62.2.0.ebuild
deleted file mode 100644
index aa14bee46fca..000000000000
--- a/dev-python/setuptools/setuptools-62.2.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-CPY_PATCHSET="python-gentoo-patches-3.10.4"
-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/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	dev-python/nspektr[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.10.1-r1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${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/pip-run[${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/tomli-w-1.0.0[${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}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	# 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
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# keep in sync with python_gen_cond_dep above!
-	has "${EPYTHON}" python3.{8..10} pypy3 || return
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		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/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		setuptools/tests/test_test.py::test_tests_are_run_once
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-	)
-
-	# 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
-}
diff --git a/dev-python/setuptools/setuptools-62.3.3.ebuild b/dev-python/setuptools/setuptools-62.3.3.ebuild
new file mode 100644
index 000000000000..1546c3f5f21b
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.3.3.ebuild
@@ -0,0 +1,133 @@
+# 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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+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/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip-run[${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-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# 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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		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/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	# 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)" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-62.3.4.ebuild b/dev-python/setuptools/setuptools-62.3.4.ebuild
new file mode 100644
index 000000000000..66341af9f120
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.3.4.ebuild
@@ -0,0 +1,133 @@
+# 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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+CPY_PATCHSET="python-gentoo-patches-3.10.4"
+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/~mgorny/dist/python/${CPY_PATCHSET}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip-run[${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-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	# 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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		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/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	# 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)" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-62.4.0.ebuild b/dev-python/setuptools/setuptools-62.4.0.ebuild
new file mode 100644
index 000000000000..ac38773bebad
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.4.0.ebuild
@@ -0,0 +1,130 @@
+# 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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip-run[${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-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		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/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		setuptools/tests/test_test.py::test_tests_are_run_once
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	# 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)" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-62.5.0.ebuild b/dev-python/setuptools/setuptools-62.5.0.ebuild
new file mode 100644
index 000000000000..4133756fb9e7
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.5.0.ebuild
@@ -0,0 +1,123 @@
+# 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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip-run[${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-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/setuptools/setuptools-62.6.0.ebuild b/dev-python/setuptools/setuptools-62.6.0.ebuild
new file mode 100644
index 000000000000..4133756fb9e7
--- /dev/null
+++ b/dev-python/setuptools/setuptools-62.6.0.ebuild
@@ -0,0 +1,123 @@
+# 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
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_TESTED=( python3_{8..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="
+	https://github.com/pypa/setuptools/
+	https://pypi.org/project/setuptools/
+"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	${RDEPEND}
+	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/build[${PYTHON_USEDEP}]
+			>=dev-python/ini2toml-0.9[${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/pip-run[${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-w-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+DOCS=( {CHANGES,README}.rst )
+
+src_prepare() {
+	local PATCHES=(
+		# TODO: remove this when we're 100% PEP517 mode
+		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
+	)
+
+	# remove bundled dependencies, setuptools will switch to system deps
+	# automatically
+	rm -r */_vendor || die
+
+	# remove the ugly */extern hack that breaks on unvendored deps
+	rm -r */extern || die
+	find -name '*.py' -exec sed \
+		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
+		-i {} + || die
+
+	distutils-r1_src_prepare
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# network
+		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
+		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
+		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
+		setuptools/tests/test_distutils_adoption.py
+		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
+		setuptools/tests/test_virtualenv.py::test_clean_env_install
+		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
+		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
+		# TODO
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
+		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
+		setuptools/tests/test_extern.py::test_distribution_picklable
+		# expects bundled deps in virtualenv
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
+		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
+		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
+	)
+
+	epytest -n "$(makeopts_jobs)" setuptools
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 06a047fc5d9e..bd9cc6d81430 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,7 @@
-DIST setuptools_scm-6.4.1.tar.gz 61255 BLAKE2B 984b60de24e3090bfa7284ef91f40cfb8481cd9008d57012564e6631727dc1e1bb6820265a4fd3576581ce836224599bdd8ddef73446ddc3040e51ddad4b6140 SHA512 b4d16fc9f352d7fccf18853aee2e80c2bd048fe46753fe5c099542253cf30e0d087be6dfec846aed0b8182238494ef333363482dcd75781e285312a9f7547c11
 DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
-EBUILD setuptools_scm-6.4.1.ebuild 1146 BLAKE2B 02c030f32a27bb50204b2dd3cd3ca25a88c26ac8544bac4fddf740a1973f34a43392a91868d1bd0f891cad6f9678aab022abb8497975cdbd5f1dc94721beb414 SHA512 3b54191ac55e49f0781d1e5ecb1cbf34e3db2a72d111ba2196d09bd3481231c42ef0c08f7a097b01307f8fed7e6f01b9d501712c3a1ef2c3341218ad2bcefd4b
-EBUILD setuptools_scm-6.4.2.ebuild 1194 BLAKE2B edabf7e70fd37c7dc7413b04378caaf6af09ac361d20847634a4238dde12dd313ffc1bee09c027f5adba6a338b48f24649a12b82623cded292a06cb9c085a7b0 SHA512 354d31f089a7c6e407fef5a15b70d0705c9e235e74b60de58d55658680513e21edfbe7d39883adeacdb7e1aa615b4e5b214502e8e80c64e8851b0f622a9f3cda
+DIST setuptools_scm-7.0.1.tar.gz 67921 BLAKE2B 15a4a8953bb9cf8754fe465b53e11483ade33b09c5b407f096ecbdaed80081fa554e0c6da1accdbc629163019bf91968f4edae40166dc4598b25e0a51c5881d1 SHA512 49d296ca4af3175c47a385d9d935fe32371d39c31ff4e6d704ea6fc8dd512e7ed6b0136677e7768836c0ec2ae558c47f156adc5975ace30a396fa81644e61acb
+DIST setuptools_scm-7.0.2.tar.gz 68142 BLAKE2B 11bc3db134c3ee90b9262cf663036a6119a559e134b479a42e10c4b54005029c0e192d92e32d14f8d2dee2d09258b9cbebe9b45f07b553507b80ac7f2ecee110 SHA512 c9782a1b5bbfaaab2bbfc223477e92e8ee2fb0b2a393ff912f0c54fb99494d1c014a4e6c103a3f852d335733b02bcaa3b15eed8ec3a5c1ef54c4691fba7cb0de
+EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
+EBUILD setuptools_scm-7.0.1-r1.ebuild 1322 BLAKE2B 7f8e059beda99fd1f0c030a56f325cefbe2c1399ec0ea6d0a065e848c51aad7f19674f1e5b6ca742f05775d55aa6e20083550407088fe7dda1013fccdb7e1b5d SHA512 966bb2d39c8feafd545d62931e162c5e1f9d74c89fd56d3644d32d64e5104405cac2450ddaed6f686aa7ab7568a60e0abdfd4a177f4bb6ae73cc6e5bb5473623
+EBUILD setuptools_scm-7.0.2.ebuild 1310 BLAKE2B f405a051faaeb080d2f1a30b51da40517100e28e5b96932a6eeeb293cd32e457b73f0c91347a6f57018e283c2ae62764c1dc13a61a04336cba9e9ddb5447c54f SHA512 d38568331d425cd71c2f03377567fd4c0ad6795f03fbcb3c1df370c439a037a00e36ae9a2346f89c9bd126af009b3bae21f0d2444641ee70ee1dc0cbd239532e
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
deleted file mode 100644
index f910e738e999..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		>dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial )
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-)
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
index eedb7ab930d5..c5176551b20b 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
new file mode 100644
index 000000000000..91c722d47031
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+)
diff --git a/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
new file mode 100644
index 000000000000..a7e35478d252
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-7.0.2.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+	https://github.com/pypa/setuptools_scm/
+	https://pypi.org/project/setuptools-scm/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+		!sparc? (
+			dev-vcs/mercurial
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fetching from the Internet
+	testing/test_regressions.py::test_pip_download
+	testing/test_setuptools_support.py
+
+	# the usual nondescript gpg-agent failure
+	testing/test_git.py::test_git_getdate_signed_commit
+
+	# broken by... pbr?
+	testing/test_integration.py::test_pyproject_support
+)
diff --git a/dev-python/setuptools_scm_git_archive/Manifest b/dev-python/setuptools_scm_git_archive/Manifest
index fb9631bbd0b0..57331346fae1 100644
--- a/dev-python/setuptools_scm_git_archive/Manifest
+++ b/dev-python/setuptools_scm_git_archive/Manifest
@@ -1,3 +1,7 @@
 DIST setuptools_scm_git_archive-1.1.tar.gz 2584 BLAKE2B 7c7569a92300be966b5447b1ab6c30a982c837efdb7a125173f6014420d78cf28e0d8cb0f04c4349ce364219e1567bcbc2e13bd85cb7627d3bdbae9c7974385b SHA512 73783d60d33782fb18012e64685db6333a2dda1be41ce75e0cd74a81585d8ebb7c85f23371056a42974c93b2d4a0633338945cf2a2219b0ee2a21f063dad8809
-EBUILD setuptools_scm_git_archive-1.1-r4.ebuild 752 BLAKE2B b9c51b6a4a1719805522a0979a852264cf39475f2ffefa32d027e06008c7149b4e42251cf4b7187da8b1f065624908fa3f4967a1664b925910fdd27456915ae9 SHA512 8167f7388f31098b79204a3b978c2aa3fe01c3bc5b6e6867bd265afccb53690fc3e3e8a8c40bea9dcb1bccf789bee2d6fcc74a71ab1212180466ca79e176f7f9
+DIST setuptools_scm_git_archive-1.2.gh.tar.gz 2648 BLAKE2B d2a6629fa1eb8c413def6c7cb192afb47299cd1ffce3692951fb6f90e9b6b4d0f4f2286486a5ae7e550c4659ed3ef7289746ec48be2bfe43c6c3d80143cc4e46 SHA512 980a7463dd7a53f71c8f9f1fde0f14927a6063bfae386b85d42a2909e05de42339a3770d5cf0c22981f17bbdec52febf7041fb54628f2d8321e46401ef0beccb
+DIST setuptools_scm_git_archive-1.3.gh.tar.gz 2556 BLAKE2B 338c02b9b377a165b4bcd29790e04b9e3215f2f892a681888760e5bdd2bc2a5c4970646fff42d652a6dde8557602af4dbde0decf5ac0f0605cbb55fc1f3ec085 SHA512 28146bef914f310590d29a1c3c2a97f1fe33d19d28eb7477983b6164d99d2e40e02afe541e5ef3ca8b7ff3297cc002d35da1f971d5d2183f2c5634c10b098476
+EBUILD setuptools_scm_git_archive-1.1-r5.ebuild 806 BLAKE2B e040d7f8afc473ef5f5620962631b9bf03708acfae082bda46ab7182f9ad1b809ce3ed46fa4665587802e875b19c07efac1d81a52084e91649672d7c6992228e SHA512 427a2f6b275f42ba4fb59e93eaeffe9a8e644884fb363f3ef29b44c21b700cb76e246f2ecfc91dad567a35e756d08dba5494c265931a1697f605f64af21e2751
+EBUILD setuptools_scm_git_archive-1.2.ebuild 817 BLAKE2B cb7167f6de149edad817d92db25fa68727d3e673cb2095e4ad6e98488735d9b7d1fb42041727c32b94eda2b534f95981433532dd1acfdb0ba857848bc1e666d7 SHA512 0bd41bcde5e4704f58d9ca77a29d4d3f34d42bacde120bb82e1778cc44bd9826e2709ef0af0e4707f942a3a750f38b2b253b75c0a0c4c03773671fa977218dd6
+EBUILD setuptools_scm_git_archive-1.3.ebuild 817 BLAKE2B cb7167f6de149edad817d92db25fa68727d3e673cb2095e4ad6e98488735d9b7d1fb42041727c32b94eda2b534f95981433532dd1acfdb0ba857848bc1e666d7 SHA512 0bd41bcde5e4704f58d9ca77a29d4d3f34d42bacde120bb82e1778cc44bd9826e2709ef0af0e4707f942a3a750f38b2b253b75c0a0c4c03773671fa977218dd6
 MISC metadata.xml 357 BLAKE2B 3cdd316f50c6f2cab1dc88b7f1d00081c2021a12a4076efaf5c1188dbc650a594bf714d6653f62a1f58e7f816b4defd7774abe0cf6d3c4dbf77f7f90a064eae0 SHA512 475bdaf52720f484b4614d313ae74e6cffc68779460463d9409e683c997f12f9ef416dea6050e3adcc0c137f0ceb7f889ce440f808c697d34a8fd7776fd6cb60
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
deleted file mode 100644
index e43c2a27e214..000000000000
--- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="A setuptools_scm plugin for git archives"
-HOMEPAGE="https://github.com/Changaco/setuptools_scm_git_archive"
-SRC_URI="https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests.py
-}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
new file mode 100644
index 000000000000..4324185e7ee2
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="
+	https://github.com/Changaco/setuptools_scm_git_archive/
+	https://pypi.org/project/setuptools-scm-git-archive/
+"
+SRC_URI="
+	https://github.com/Changaco/setuptools_scm_git_archive/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
new file mode 100644
index 000000000000..394a9500b20f
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="
+	https://github.com/Changaco/setuptools_scm_git_archive/
+	https://pypi.org/project/setuptools-scm-git-archive/
+"
+SRC_URI="
+	https://github.com/Changaco/setuptools_scm_git_archive/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"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.ebuild
new file mode 100644
index 000000000000..394a9500b20f
--- /dev/null
+++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools_scm plugin for git archives"
+HOMEPAGE="
+	https://github.com/Changaco/setuptools_scm_git_archive/
+	https://pypi.org/project/setuptools-scm-git-archive/
+"
+SRC_URI="
+	https://github.com/Changaco/setuptools_scm_git_archive/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"
+IUSE=""
+
+RDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+
+python_test() {
+	epytest tests.py
+}
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 6ec4ed932f4c..a9fb10035731 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,4 +1,4 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
 DIST test_sgmllib.py.gz 3769 BLAKE2B 026a843eaeb698d87e0137453b7f82763dee9a1ca446fc2c2fa9af8324297176749b041dfc2fc4c1954d743d9cfb7e773a189d99f22f7dc55ea1de486da80dd4 SHA512 722b79aa8b38626540bc331f9edb36919a8fb2561c5526be19509a58901aa1e2582e312fc2ace09cae54cb62577f266fcb10a1d98ab10685e2c79a17fea2f124
-EBUILD sgmllib3k-1.0.0.ebuild 683 BLAKE2B 7187dd8d96547f5ead2a9e00495e66887c635a3e65a8e8dc1cb7bb01bef00980b02aba1f4c36489f7fef0580e749e268e832a8f4d486ff15e96cc476520e6bcd SHA512 cc13877bbc824cf2ff330223b69ec2d0a098b62f8d586bbd76b8c4122bb61692853a78284eaf117bcd14c8b4242c52738e4ef8644e224984cb840c5c9027887b
+EBUILD sgmllib3k-1.0.0-r1.ebuild 727 BLAKE2B 35ae1fb5bdcaa8d09dc855e9f5733a547cd3b66b01b273ee5d23fe0f4ef1669df9a0181b62406bab7a7a444a281d00455be78f39af39f2dbb95774495914c7a6 SHA512 c58921f7fd7537fea26cf245dc1e7897f07f1022a4279d157ef18c065b09417b990fd6aea3799683fa9a49c50b12e6fa091d17af08fe4bb35a34ea0448981876
 MISC metadata.xml 337 BLAKE2B c95ed9109d2ab27ccbe5311e23f4617d19c2b7489b805500d8bd2c8dff99d8a74054d3e2b0a455f12cd616673071d308ca404e6734fe1bf4b16893d1a2bee577 SHA512 05cbda57d5634c30f963382afc29ce0f7e761bb7e9f48d11457c5d10fea14d9df3bca07bcea75d02430b421fc5d87b6c083c2feddd7f46d9d841f6e403d1d0f9
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..a2575c494142
--- /dev/null
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Py3k port of sgmllib"
+HOMEPAGE="
+	https://pypi.org/project/sgmllib3k/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/test_sgmllib.py.gz
+	)
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${EPYTHON}" "${WORKDIR}/test_sgmllib.py" -v ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
deleted file mode 100644
index 4c3b8d3d0995..000000000000
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Py3k port of sgmllib"
-HOMEPAGE="https://pypi.org/project/sgmllib3k/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/test_sgmllib.py.gz )"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${EPYTHON}" "${WORKDIR}/test_sgmllib.py" -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 35ce30b28fce..e11bf78c4808 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.2.ebuild 638 BLAKE2B 9c1fc4ae2b43ca4b7d55106f940a09e26e59c673713fb0b8f03e2ff5ce8340fdc5f30367fb62a29d61d2ba430eed08d2d9aa05fd249a77cad246b9fc29b0d346 SHA512 bd9721fe1b73f89425ee7e36226c10ad5cae2c8454351c27a07effc797f1447ef216b1b86cb89ecaa63249a4829115c5038680762c5d0264df95321bef76d033
-MISC metadata.xml 701 BLAKE2B 313f610698f39483c7ed9a099cf9c0378d1720c5b2de272f96b3b51524f0661634a1c109fa2d2e52d6c3bfefd309966520e17843c65283887dbf1764595ef213 SHA512 583172c28986254e7f691b6c63e68bcdbfc566983f89e04a918b95a757b3b9512c5195c508605bae1e3216de69c0678ebb8191715f8dc084c9965883b864e2a6
+EBUILD sh-1.14.2-r1.ebuild 704 BLAKE2B 0f3c0a04c8ca495d757c3bf3c76dcd970b81a541046be3dcfeea8b0e603f06d1c81f4b915ee4ff305815c75100fcde4a99f6eb16a45bf168871b1bb6747a285c SHA512 a46e1a22e2bdef6cc621e6b63e2597b5b442e261c84160155e25f1153d844ff9804962c00b2df6cdd1b6d4ad94e9b5bb45c32287dc3a17504aeb7c37b5184df2
+MISC metadata.xml 802 BLAKE2B 4eb5ab2ef69633f88a1f16f226eb78a161632232ca2d127acd89e1271ab7b31d551aa9759ee5f327cd94f06a6b11e9463d6a6fe1432d4be84489afa009ce7f6e SHA512 b3b21507c5eb85f9289499ee87a2db852b254b2cd1e9feef61cb731a9cd035f0c6c8e3f7bcb4a1267fe97faa34655674354ba696ca26cc18247e7fd150f60816
diff --git a/dev-python/sh/metadata.xml b/dev-python/sh/metadata.xml
index 4c9215bf03bf..06d79e11c18c 100644
--- a/dev-python/sh/metadata.xml
+++ b/dev-python/sh/metadata.xml
@@ -5,6 +5,10 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 	sh (previously pbs) is a full-fledged subprocess interface 
 	for Python 2.6 - 3.2 that allows you to call any program 
diff --git a/dev-python/sh/sh-1.14.2-r1.ebuild b/dev-python/sh/sh-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..3e3501afdcd1
--- /dev/null
+++ b/dev-python/sh/sh-1.14.2-r1.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=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="
+	https://github.com/amoffat/sh/
+	https://pypi.org/project/sh/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
deleted file mode 100644
index 0d89eb85d313..000000000000
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python subprocess interface"
-HOMEPAGE="https://github.com/amoffat/sh"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=(
-	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
-	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
-)
-
-python_test() {
-	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index a85a40437aaf..63139d30ff52 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,4 +1,5 @@
+AUX shiboken2-5.15.2-numpy-1.23.patch 1180 BLAKE2B 744f36a26e934c31e5f499cb07b5c4384932392e4d55303dac0aeb932533a548ce3ac385b23f16f87f7d7705bed38fb863b92acb74ad49185831f60976bcbfdb SHA512 f775c5ac6a9a7a692645f33d8bb017bafacd297777f04f4bc581bd0810b1f7ec083ceb6eb495ffc0a9a9851f72658da7bad2ed3d1604a56e9fda042cc969cac8
 AUX shiboken2-5.15.2-python310.patch 4408 BLAKE2B cd1a5c3f8c473a6667f8c942c248285babb468339283a8cc97064bd119194b72bcdb47c758044774a415cec08562b7875fd7298dea50e23d7fc3830e8291a8c1 SHA512 10245617f1aea656d3ba2e8736d51fd119e4d01c4fff129f557203bd1d5eb40ca10b40eaf55a8bd98b56f8e2e7503028818e333fee8ec86cb7b050e48a5e0387
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.2-r1.ebuild 6510 BLAKE2B 5f402eb4fe6a2b4b620a1a3f715081cd0da78472ba1bde69a888fa1cdc37a00d3ca9feb661b0aa595f828094ee9a99a4fba4b3f85fdb4b479a6151a119a655c1 SHA512 141aff3720c7a8704f0e1b0a92ff87d3356b921b6f3535bce2d21be16758cd1745369e10568cb2339192e1d3d89a010f23648b4fa66b0fe738bd8591737a45c9
+EBUILD shiboken2-5.15.2-r1.ebuild 6551 BLAKE2B ba5cd749b4641a87c5d4edcf9c8e10d5c199dcd1f9888cd620b801f0d1e5c87d8988131011ecb5b4ea4077543f5a3c91bb5241ec21de091957b7e2cfe0b754bb SHA512 5a14af1ec01cd89b54652e6a1dfed547fcdccff6500ba221ab27796103605c5c9c16d812655478daa14be2fdc1e5a613223c44b9df67d47ef04a30882826e6b0
 MISC metadata.xml 576 BLAKE2B 567c84dbf819c5944e5b35146e3dff7b1581aa0275a732e8f2cb6df4b32001e2020eca2469ee422bd6fdd53b34c1453db4ecbdec6e85fe5ee3e4eea4a2283336 SHA512 f1c5964cb99b61c1913b7c031b994b71948e7b26f18d4119b7b3a536bbf7e659cecf539ec54992e157170159186ede2af3b31dfa03fbc1170bc7e12c25814a31
diff --git a/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch
new file mode 100644
index 000000000000..6cd9feab800b
--- /dev/null
+++ b/dev-python/shiboken2/files/shiboken2-5.15.2-numpy-1.23.patch
@@ -0,0 +1,28 @@
+Backport of https://code.qt.io/cgit/pyside/pyside-setup.git/commit/?id=1422cf4a7f277fb13fd209f24a90d6c02641497d.
+
+From 1422cf4a7f277fb13fd209f24a90d6c02641497d Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@qt.io>
+Date: Thu, 23 Jun 2022 10:44:01 +0200
+Subject: libshiboken: Fix build with numpy 1.23.0
+
+Pick-to: 6.3 6.2 5.15
+Change-Id: I885c332d6c948820140946c73ae1926e88834143
+Reviewed-by: Christian Tismer <tismer@stackless.com>
+--- a/libshiboken/sbknumpyarrayconverter.cpp
++++ b/libshiboken/sbknumpyarrayconverter.cpp
+@@ -116,8 +116,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o)
+             str << " NPY_ARRAY_NOTSWAPPED";
+         if ((flags & NPY_ARRAY_WRITEABLE) != 0)
+             str << " NPY_ARRAY_WRITEABLE";
+-        if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
+-            str << " NPY_ARRAY_UPDATEIFCOPY";
++#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION
++        if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0)
++            str << " NPY_ARRAY_WRITEBACKIFCOPY";
++#else
++         if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
++             str << " NPY_ARRAY_UPDATEIFCOPY";
++#endif
+     } else {
+         str << '0';
+     }
diff --git a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
index a8732bcfc06c..c8e150bc7ed5 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -60,7 +60,11 @@ DEPEND="${RDEPEND}
 "
 
 DOCS=( AUTHORS )
-PATCHES=( "${FILESDIR}/${P}-python310.patch" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-python310.patch"
+	"${FILESDIR}/${P}-numpy-1.23.patch"
+)
 
 # Ensure the path returned by get_llvm_prefix() contains clang as well.
 llvm_check_deps() {
@@ -77,7 +81,7 @@ src_prepare() {
 	# Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include"
 	# or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan".
 	if use vulkan; then
-		sed -i -e 's~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral("'${EPREFIX}'/usr/include/vulkan"), HeaderType::System});~' \
+		sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \
 			ApiExtractor/clangparser/compilersupport.cpp || die
 	fi
 
@@ -96,7 +100,7 @@ src_prepare() {
 	# PySide2 does *NOT* care whether the end user has done so or not, as
 	# PySide2 unconditionally requires Clang in either case. See also:
 	#     https://bugs.gentoo.org/619490
-	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'${EPREFIX}'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
+	sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \
 		ApiExtractor/clangparser/compilersupport.cpp || die
 
 	cmake_src_prepare
diff --git a/dev-python/signature_dispatch/Manifest b/dev-python/signature_dispatch/Manifest
index a4940e83c637..c603c5b2f3a6 100644
--- a/dev-python/signature_dispatch/Manifest
+++ b/dev-python/signature_dispatch/Manifest
@@ -1,3 +1,3 @@
 DIST signature_dispatch-1.0.0.tar.gz 15102 BLAKE2B d0fe384551136d23f815129849ec70c0d1bd8616dab571122b7407578f3cc0d614fc5c44f3de5d9541bed9e9e3a0887517fff1183fd6c782bde603d774fe09f1 SHA512 c13ac92f50a8bd7a9fcd0b231f74a14539fd9c0303fdb29860a93116512a20113708c3207c4b2d8f61a48a9632e8cd21f7ea3fcb49ae3a4b1c79eb6a71df4eab
-EBUILD signature_dispatch-1.0.0-r1.ebuild 561 BLAKE2B cff3565808446ea7b754048932590a53a5773e07e74baa2dcf91148d829ea2f779fc0a219c7d91a74c8f6e229d3dec182763682cb54475c1e5f14b8100560ba4 SHA512 1425ee42684c059decb51af74172ad7f5db66983014f3a85ba451d97c8a14b49b585c739f11395d6221261d80412fe1aa014ed1bfe2d0d0589f0c963efbc5c1a
+EBUILD signature_dispatch-1.0.0-r1.ebuild 634 BLAKE2B dc6df05c8dba793e1a11e359a575754e256823eb912d3b9ae444e39ebf109bba3d78c3571c38f80c078fdd992521d0a7ae0af99ed0825e280058a8214a79e879 SHA512 3aea9160af9593f7d2051652989e2f0164ae7c21dbb855e3a79ea3616e61370e28e5de860fe2b6a34bd7835669241d88350282c4dd5f94db961e032de291b44a
 MISC metadata.xml 394 BLAKE2B 8edd4cb637f99bc844dd55e0475c74887f04e272a1238985692cc40e89e45dec82599139c419b894a7ca7f9f35bd2603e78cec838cdbf870da80fed27b7b67d8 SHA512 ed7aa29b9c0407e8b786b75020032040fd127946429ee239a142a6cef313c46af2ba67e7c8d631e5fe3dd733318b0a4a0603ec2fda39de95df861f68084f2369
diff --git a/dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild b/dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild
index 04c1d7b39678..4e5245f7c9ab 100644
--- a/dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild
+++ b/dev-python/signature_dispatch/signature_dispatch-1.0.0-r1.ebuild
@@ -4,14 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Execute the first function that matches the given arguments"
 HOMEPAGE="
 	https://github.com/kalekundert/signature_dispatch/
-	https://pypi.org/project/signature-dispatch/"
+	https://pypi.org/project/signature-dispatch/
+"
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -21,4 +22,10 @@ KEYWORDS="~amd64 ~x86"
 distutils_enable_tests pytest
 
 RDEPEND="
-	dev-python/typeguard[${PYTHON_USEDEP}]"
+	dev-python/typeguard[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index e2d952f9c5a6..64ee84278981 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,3 @@
 DIST simplebayes-1.5.8.tar.gz 5972 BLAKE2B f942ccde5f449d0ef8ef56fb83a07a8ab0421f43e5af40a3be30822a5d7299b9a0cb1d46397a55bcf7fecc92e40f49404f5bf29467acf7957fbce8619625b58b SHA512 0e39110432db561208cf147bccbdb66f64176a78c0e9ce8495a423ed0d6a027b45deb111d3c872faa10e158fcdaa5380f03a5e0602fecea1a0f00e528e19cfe1
-EBUILD simplebayes-1.5.8.ebuild 473 BLAKE2B 119d403d1c8ddf4a35b728b490063997bad1ebaf5433962f17fe63f107c353843afb5284b3dfb58ee3f2f2a8f90ee853d159722d296c695d152da9ff3df0b44e SHA512 34d72b4f174cbecac73f7d3e3746f30621896c4f4ad6d58abfd0feb7e1030e1e8396c88eed46fe2e3a2800a2ddbb9fe100dee027b5cc60a46aaa7414bd5ff641
+EBUILD simplebayes-1.5.8.ebuild 473 BLAKE2B 8737c73a5069ee9275c97af055d2b4f586a5a5a662c5b3d7fc633945ffa2d7c547f4fcf0f775a71723b9aa1278d19e806ccd0f4b0e7ec6e4f63d747c0d194bb3 SHA512 5665c28fc8764ce5ee0301fe7b74e104e0a10f5e1ad0c4cb2d07b9c36375be5e126963bd41798ee5aa13158204cf79faf4399f5cf745805cd660d422064e4aa0
 MISC metadata.xml 663 BLAKE2B b89fe3d5fd63cbe1cc0176130cd917f8e926b9f8a6bfeeb96976148f7ae13e12057e977ae684eca6ff86736be8eba6bcf7ad422ebd6843a2f5192e88bfb19a22 SHA512 be59339b976745b89ca06a26f46577f0a9dbcf285dc1ea047a81d1323bea7527805c86d1c8a61ef1c4b74b6a9abb3fab993c7d79f6ef5771aa311d1648db751b
diff --git a/dev-python/simplebayes/simplebayes-1.5.8.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
index d91e3839c3e9..6eba77932096 100644
--- a/dev-python/simplebayes/simplebayes-1.5.8.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
@@ -1,8 +1,8 @@
-# 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,8,9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index dee30c4c1bac..d88e84e1518d 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,4 +1,3 @@
-DIST simplejson-3.17.5.tar.gz 83182 BLAKE2B 8fbaa83c81a7478b3c62c6625e717874f6dd3bef236b85504788a66d2b820dbf601e65edbcc7056528e67a66b806b3847b8efcc522464604bd4987dce9870643 SHA512 f5af32e4f9b4575323f9c0eb8163e794270a8607710d08a72cece953f57861e3619038798369ea049d82b9b53f293b9d9eefdeb4dd94ab4f043506bc3f1ddfad
-EBUILD simplejson-3.17.5-r1.ebuild 681 BLAKE2B 404388de6ac84f52a17a4d7d450c4f128e86aceda17b764894a260c84e9b1b58012f1659d95852dd75a35ac8ad9d669b05837d962c42ab80297bfe1f8838717e SHA512 73cd38632b70dfcd52e2f78733e58e3a1b63d140a3b8a7d94d5c839d16cab3527aa1225b1b7bd9ab16d46954e70d0200a55a97052d12d822bafa093d9cf8ad76
-EBUILD simplejson-3.17.5.ebuild 635 BLAKE2B 5e35845393c3bdf0e3220c86ac68bd3177286cab6f8a4afcef4ea132252bd4bb9b7664daab3d2615f815212d3248551d5a34818033c8d83fed596f0d06ff515e SHA512 b53626aca1805d05ffa5ef8140c878950b1dcd4039628fb96abe7d7e6b6e09e774c84356d5229e2506df6cb2b633b22c628c5b2c1bacae290376d1ee7562e049
+DIST simplejson-3.17.6.tar.gz 83134 BLAKE2B 5aa9275673a0c8feab2a86f1bc85864791a847a7eda77ea6f3e4f8d8677ff88d2277ff659285d183d2d439c58e78b25846badb3a2fddbc959d40eb23273dfa2b SHA512 4a25032fcc78025d82db571716deef8769f036a330560f92e14563687db4a42dbe60866b8afb57baf24104ef94fcbe938cdbddfc169542664957eef2d00d04e3
+EBUILD simplejson-3.17.6.ebuild 673 BLAKE2B 6900d97f50ed7c08a00ecafbe5698284d875c62c33d38d55dfe08dfc1fc817720adc1ae45f213670e12e3a9d0e41f50072b3c9f5dda948f0a7d194d33dbcb472 SHA512 2e817ebbcd60bb421b64efdd302880615c598b227c8caa2eb9057106a5ca04e9abd4ea5c073bcda421402c3529f553bd388fe96ae84c21f1b2fa2165455a1954
 MISC metadata.xml 375 BLAKE2B 2c3a0f98ee3f6c9ba41edf3e8e4d6536ac518a59234e6c602d46cbfcb8a5c760c71997b3c169dd2c0b3f9c5dcbea1cb36967e4d050933bd5e31d6f609a835e83 SHA512 6ad418641e64295566aa5418b9bead66e7ea84e0ca7aa454bfedf613cde7ed4d1cd17dff962963c3dda62ad9050e6348f9f53da21ba25b53cdeba2d91b8c551d
diff --git a/dev-python/simplejson/simplejson-3.17.5-r1.ebuild b/dev-python/simplejson/simplejson-3.17.5-r1.ebuild
deleted file mode 100644
index 84d4dee1f814..000000000000
--- a/dev-python/simplejson/simplejson-3.17.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="
-	https://github.com/simplejson/simplejson/
-	https://pypi.org/project/simplejson/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
diff --git a/dev-python/simplejson/simplejson-3.17.5.ebuild b/dev-python/simplejson/simplejson-3.17.5.ebuild
deleted file mode 100644
index 5390d37cace5..000000000000
--- a/dev-python/simplejson/simplejson-3.17.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
diff --git a/dev-python/simplejson/simplejson-3.17.6.ebuild b/dev-python/simplejson/simplejson-3.17.6.ebuild
new file mode 100644
index 000000000000..a61f4bbe1312
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.17.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="
+	https://github.com/simplejson/simplejson/
+	https://pypi.org/project/simplejson/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
diff --git a/dev-python/simplekml/Manifest b/dev-python/simplekml/Manifest
index 8321504ee5d5..fc48787e93dd 100644
--- a/dev-python/simplekml/Manifest
+++ b/dev-python/simplekml/Manifest
@@ -1,5 +1,3 @@
-DIST simplekml-1.3.5.tar.gz 39069 BLAKE2B 3aceacc028618e553cd7c9a9d7d4b9a9223c8942816c193a68e6e6b8ead41b68d6a55a89ae4811ff0eb5d5f167605e8e58686384b5981735569d6db34a1259b9 SHA512 5f9c57b953fa27f533905536c4abfc580098e912d937cdce543ae55fb8da22f31ed84a35a0a0526cfb208c050fb407445ee81ad8cbe4ec823c8d896179446182
 DIST simplekml-1.3.6.tar.gz 52999 BLAKE2B 6838a82c4459e7d223078dd668814c739e043a1201903f1103dfdb1763e7c8f90e45b9404ba91720683ebeac42597d4a764c92a40a1645bd6c9caeecb003c25e SHA512 0b589559141571f62936ac981c3970e64046169bd5444e1409594dcaf3245c674dfcaa35e607e9870b63b3eb806e5c7cd7a4600924dbb0680a03ff458e58bdef
-EBUILD simplekml-1.3.5.ebuild 395 BLAKE2B cdb931c24633486f1207482bde54317c0f496708a3e73ada16686ec7a30ab3dc960e9da765e015c59675107194f6713411ee9cc8a766077e153512e7d7a5d857 SHA512 2dcf356e8e6372102b6a5ca27b3ef5b6360726f94209db6a7352740842eca9ee002efee45e0cf8376e2b5668695440b316027ee6070ad2c8e32b5f7f96bf86ac
 EBUILD simplekml-1.3.6.ebuild 427 BLAKE2B 3601f01a66b5e12340674cfcb6fe31871f0d629b334b23cea626fc73218797dfe29a20e1d42982e4a9e6797d353104393456aac222da1048794c0985b5db88e3 SHA512 5fc630f9a5fd4304dc2330717aaaa76d6af123a3252d7105e6463581aa29d89869cf463f9bd598f59f868bde8099e579d6128f6ca6b563721b7da8e3a1de3ae5
 MISC metadata.xml 574 BLAKE2B be0103efd8d5fe7230109c1e16a9b8d0bf6fc86953c2817104072304196e0dacc1ad62f8ea30dca7e4c8f71036ff185bbef5ba2e0d59f7ced63e0c5af2f0c6ae SHA512 98ed44a8e45b74636627385c53cfd31fbff1e5258e05cc1d0cdb2954cd759432b155856775e3f092814c979d83a4128b1ef25a28998b28b8da823ac8cd73aff1
diff --git a/dev-python/simplekml/simplekml-1.3.5.ebuild b/dev-python/simplekml/simplekml-1.3.5.ebuild
deleted file mode 100644
index 83fa66411c64..000000000000
--- a/dev-python/simplekml/simplekml-1.3.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="enables you to generate KML with as little effort as possible"
-HOMEPAGE="https://pypi.org/project/simplekml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index ea39d1b2731c..624914e17efa 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,12 +1,15 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 AUX sip-6.5.0-pep517-args.patch 7397 BLAKE2B f29af4b2378c569b21e09b1659e1ebd4bcd2d0308cdfe82042c8830336090d55b0ac48c03b27c98a8488c183f4670f0333ef7b552e66f51432ea1db63025c851 SHA512 3aa8063c53f012bbc1d59d6c43c7053817ade8abb42918e32787faaa85d2bd909ed3760ac9d07d88e62780b35921e06711cd39fffbd2ac7671ac49c69d60ed3c
+AUX sip-6.6.1-python311-invalid-regex.patch 675 BLAKE2B 6f948473730ba93546948b6a597efd5df29df9f4aa18bb41b1eddb76a7a118328be6437185e63a3c5aa7a1c2c3be3eda6af716374929aae8039a07c2b63c75aa SHA512 2040bb54e700dbe8072f9a028b237f30e3256f566d1c7854c1efcef83bcad916b780b7a37a4e90682e293f064b29320fd7eb5deedbdff051be7bbbb75e638a00
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803
 DIST sip-6.4.0.tar.gz 1201890 BLAKE2B be5ccdfa7853eb2baa3b7c4e7f64a315e39ef899631e93569d75ed27bbf9752c97cca1bfd6c813efb0046d1d82fc8c5625a04f08c330a4e2c102461f3a42beee SHA512 eec1bdbe4ef3d8ba5152a2dcd888efc23498bcbee01c95b7eb72074c2a133d8e8599cc4bb6d6b2fec99f093a73705e0fea1c148c2e49058c0fd6f2ba97f40884
 DIST sip-6.5.0.tar.gz 1202004 BLAKE2B a67ba784c0851a528fded689cc2a84fa18ba906d23adb71fceab14e652c02b079ce7d3b40a3594251852d20875ac53571e851630e441b8846c302772933b1829 SHA512 3baa20403b668e5f02b2506a693522ce421080e073ac39f62a23823b3e023b0b88fc60ab79e2301ecc39304f6df3d8647adc56429641e91c217fecea9bfacb91
+DIST sip-6.6.1.tar.gz 1134991 BLAKE2B dec51bce80566ffad25dd67686a746134e032f3cf1696fbf256d000d266f9e3921dcafaead40bcf3dc67d42aa89c5982d090abde7d8b3c3f8ec6ddd4470b9a43 SHA512 49d03730819210f4239946da0ddd0694583dc13458997edc11895ef399d8017f38e3354a87bae495492c3cf3334b810c2d924ec0f5bbb129e88cc15eac720c01
 EBUILD sip-4.19.25-r1.ebuild 2275 BLAKE2B 89ea240194120bff7b9b3d9b2026f2343fde3bbd8063bb2070ca12c624db79e4d2582a9024cc011705a8f3dd78468ba3849dfd9f806706a20cd1d3c3c0f21b79 SHA512 9cfcd1c771a10205695e66316168e3b29cf4b2fe48212b6918152b988571ce944ee86c6b55f3d9531e7a624a1c7554beff403d76addc6645e4f92e73fb904439
 EBUILD sip-5.5.0-r2.ebuild 873 BLAKE2B 6056c5ce42dfc77adfef3e38413eb91d150edfd33704dbd0434d4bebb6481b34376768e6b106c26e606094983a548155d5d62315f9cd9483ac49f6ba506a1eac SHA512 b7e8751fd35c0447502819f21600ce4fd7a62adb24c28510368fff1c5d1e21b1d6993aafe2c4b9bc863e44b4999b7ce42ccd67f06203a3aeb25d8e508ac80f39
 EBUILD sip-6.4.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
-EBUILD sip-6.5.0-r1.ebuild 957 BLAKE2B cf070b6bcc095b772aaac961533110e7c515c21d28a9075ea18df3fc2b75ee1162a311dc2f83be1c7808c6f35343aa8ae178869526c7e08d0811d098822b878a SHA512 9326b339c717bb812ebeaf6729921086be3305e4c361200cc6f08c37cebf3e9761f41092e24ab460655309bcc7a1263bda513e7effc75874bbaa57dc6396f89a
+EBUILD sip-6.5.0-r1.ebuild 951 BLAKE2B fc58209330df4aa21762f5b687b687c87e6cab5102585745e75d28b285abe2c15bdfd8832d3b2432bf0160be4f30fcfaff955ed72603535f6f643b3532752b64 SHA512 eeb40447bb7f40ccb119d24b786f7ac2b6ae45c174b7e2aabab96c494c8c11298e6d77593f9808dd8707e3628253ba5207941b3a44e7e9a7137e89eef11c267a
 EBUILD sip-6.5.0.ebuild 906 BLAKE2B 983e093fda49cbb8ef2d9b99fbe27caa76c19348fef6b1133240c771dc69ac971a7d7e62a313ff6959bf226d09e0670a49616736c2a5791459d5733e851c9413 SHA512 b46a02396fe76b9ef983ca0f41e9c60ba7ce575a9bf58cdae25f425c7d4780e9f6eb0f58aa82f814820f5eb53404ec92e78da58b8ba1cbf948fd9df8f8705fa6
+EBUILD sip-6.6.1.ebuild 1088 BLAKE2B 0c73f6a20cdb5e2561773e3f9a004e37ff6f9d9fbc3d93793713f0f0be9d7fb97269d551587105322b9283f20ba3fc18b8bf749fe02d7a5891d2a9f01db643a5 SHA512 c6a07973b59602d967bf166fca28fa8a4a17ecaac10855cf5ca14e2858d0ca38cf23ead1126763acd7f741632ce2dddc978d5cd748c834766a8509b9b5a26378
 MISC metadata.xml 639 BLAKE2B deb4a3e534eaa966db932dc17bf7df6a04ed41ce707dc7f1befb272c362be06f222f976c4b0d526a6190d4954f1fa0e2c94ccc2e6cfceff6e8db5959e653fed1 SHA512 8c8e45d32587e346d4df067950aacbc767618418d42f4a5bf48a62706c9612007915ec643dc9fe7b7d083696b26795abb76d9cc475481c26782874f5116863a1
diff --git a/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
new file mode 100644
index 000000000000..908111627854
--- /dev/null
+++ b/dev-python/sip/files/sip-6.6.1-python311-invalid-regex.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1651507410 -3600
+# Node ID 3d656f0765f508ea9714b5e7c9ce00e304e6f600
+# Parent  c179f418c5bee188e3ec7a0c0e50f9eab34cf12f
+Fixed indented directives.
+
+diff -r c179f418c5be -r 3d656f0765f5 sipbuild/generator/parser/tokens.py
+--- a/sipbuild/generator/parser/tokens.py	Mon May 02 16:51:06 2022 +0100
++++ b/sipbuild/generator/parser/tokens.py	Mon May 02 17:03:30 2022 +0100
+@@ -174,7 +174,7 @@
+ 
+ # Handle directives.
+ def t_DIRECTIVE(t):
+-    r'(?m)^\s*%[a-zA-Z][a-zA-Z]*'
++    r'%[a-zA-Z][a-zA-Z]*'
+ 
+     # The name of the directive is used as its type.
+     name = t.value[t.value.index('%') + 1:]
+
diff --git a/dev-python/sip/sip-6.5.0-r1.ebuild b/dev-python/sip/sip-6.5.0-r1.ebuild
index 3f31cadaf6d1..b88e7aac4122 100644
--- a/dev-python/sip/sip-6.5.0-r1.ebuild
+++ b/dev-python/sip/sip-6.5.0-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-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/sip-4.19.25-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/sip/sip-6.6.1.ebuild b/dev-python/sip/sip-6.6.1.ebuild
new file mode 100644
index 000000000000..4e130e33eb13
--- /dev/null
+++ b/dev-python/sip/sip-6.6.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Python bindings generator for C/C++ libraries"
+HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	!<dev-python/sip-4.19.25-r1[${PYTHON_USEDEP}]
+	!=dev-python/sip-5.5.0-r0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python311-invalid-regex.patch"
+	"${FILESDIR}/${PN}-6.5.0-pep517-args.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 18b2b5862216..a05e47648513 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,4 +1,3 @@
 DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0
-EBUILD six-1.16.0-r1.ebuild 869 BLAKE2B feaef1b49f5654b67cd7eb965e3d4bb4f491c25ddd793394244ee7c1467b2999a21e094f8a807daeef26ede53970f145c148fc49397859ac2cd97557aefb787f SHA512 28e7e63b2c2a015b6bca02cf272afa36e651057d23632f01e85a11a2c6e7a9484bdfb0e5a5b74a5635d8ccb8d21e28ca45c79172cd3f28260b4c68f188271d02
-EBUILD six-1.16.0.ebuild 837 BLAKE2B da3b3723743fd72a6cc736f1a51d13c6c7ff7202798c5dc631188b62e668975d2cdfa8a818250329eb2d7413b8135393ad2862f95bf67edb8a362e7db7262918 SHA512 28007f4ee4ec13b6d50b7efed1a548c554a8b62cf5f1a2bc08195ec6fb6956326c97e5ddfa123b5423f5fa0aa5842099358fb19847ed3d70fe2e3acd4c4c9b06
+EBUILD six-1.16.0-r1.ebuild 861 BLAKE2B 4da3adf8b7a47c835830e90f6a1be0c281c747c26b76ffec6c037d0db8c28514c804439a2b4712d38e0d33e1c0c77815c2072a5bd7d36dbb8453200384d75843 SHA512 1cd41d9ddd0f410c17ab157430b2c20efb6424322ac9b38e8157d6517f806b5481c9978d528de5ad9ce86c8bfcbcbc78b6c2b49ff69812e9ea8b301bec2f85f4
 MISC metadata.xml 397 BLAKE2B ec6bbdf426ea83004d6c5eae83e650c6d601d639a51a08e58e9bc7d187877bbec9cb89f05f7b44ad521a2cc4f82269503cbd5f882c8e67d96a9018500803f931 SHA512 13d061df717192e9de816f03d7386218d8a760665d2d6ff2187da9152d0a7d7085df96cecbf47d76f9099b0eea8640506fce924d52e1f16300a6bcb06a2406b8
diff --git a/dev-python/six/six-1.16.0-r1.ebuild b/dev-python/six/six-1.16.0-r1.ebuild
index 5a7dc9923d19..93a91b8888a7 100644
--- a/dev-python/six/six-1.16.0-r1.ebuild
+++ b/dev-python/six/six-1.16.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~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"
 
 distutils_enable_sphinx documentation --no-autodoc
 distutils_enable_tests pytest
diff --git a/dev-python/six/six-1.16.0.ebuild b/dev-python/six/six-1.16.0.ebuild
deleted file mode 100644
index 601cf02a7860..000000000000
--- a/dev-python/six/six-1.16.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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="Python 2 and 3 compatibility library"
-HOMEPAGE="https://github.com/benjaminp/six https://pypi.org/project/six/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-distutils_enable_sphinx documentation --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		'test_six.py::test_move_items[dbm_ndbm]'
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
index 35c3ca71f981..caa1bf41a194 100644
--- a/dev-python/slackclient/Manifest
+++ b/dev-python/slackclient/Manifest
@@ -1,3 +1,3 @@
 DIST slackclient-2.5.0.tar.gz 49814 BLAKE2B 19f9e66af086d431494de0ef7f3569657eb769022223d0e9b0f74c0600858e20de397fd385dc1c41d416eb3a98a7437d2b0c1b5e156be6d98941b26749103c5b SHA512 3a7a1e741e81e673cb09f8b1d9a18ca3d0e7a0e41a7ac6062725b87752f3877548faa0f9150eb1b1775479dfe9035d03fd4d991ac108b0f634cc179f4b70e2db
 EBUILD slackclient-2.5.0.ebuild 790 BLAKE2B 7c648214f76763f58e759472ff53257ec3d8a08f3748f21ce49e8ed30f3b73f67d47e7497d8391246aeebd199c5cc32941837d621f50aa5d95c1c893df274ce9 SHA512 a3552841681eb0fa346767048356ccba9e8ac0b20112ddf15462546e8f41c34dd4386cb59ab320bd9ee6fb55eebadacc12c8cf14246d2d80b99203bd5db53171
-MISC metadata.xml 517 BLAKE2B 43640665896f09c4b3def5746e0b17ecedbc84804b787a33eeacff55957f2ff51843a7b82fa2669527340c56f8fb9ac690e65d727203107816d707bd55bc0dcf SHA512 e1f57504c8df6aacc5ab1973bff06d573711fe46ea2bc792c56e9afc61924645b2a62bed5283db2ab1da3dace36a9cc00470b3f1b9aec771d1b42f066af4d024
+MISC metadata.xml 416 BLAKE2B d7cad6c381983ec77b1aa4213696960f53bdfe27ede5fc61dd1d7518f0eef8ecff78748a2feba5f8934bafbd97469050d0db3fdc5454f56091a4b37c5fe8cf6c SHA512 a8ab6e05beaaef6ddfe6d7a40303281166c1caebbb79c87383b40455640e9d22230e90348945dc7de9e2cc60d4d6b53f031f17c040e3f002f4905c916b40638d
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
index 708139b97dfa..3d3c0d259590 100644
--- a/dev-python/slackclient/metadata.xml
+++ b/dev-python/slackclient/metadata.xml
@@ -5,10 +5,6 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">slackapi/python-slackclient</remote-id>
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 30e84ddfa90f..eed11b8bee8e 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,6 +1,4 @@
-DIST slixmpp-1.8.1.tar.gz 532622 BLAKE2B d0c12c240c8a14df0a0765f8bac02eb545951a0b9749ec9569d651caa3457af1a71f1c6b3a10db879fe25648b1c3c456b78e48042a83124b0a8d4d35df60134d SHA512 13b355592d564b7e211e6007fa19099e619480d0a87332b68163115852840ad2f0c70063b4260fc88d4da67e13ea97c88972fc05999c1870256b0de0257409f9
 DIST slixmpp-1.8.2.tar.gz 535672 BLAKE2B 8af0329083d5e8bb630bfbedddbe67a78eadcbcb25ed5c9b9b0ddbfbedf973702110d2b3558f5bcf25257d6a7029b1e6afba87c57a37c1f0d4d36305b246979b SHA512 243223754a7c84b653d0282b38f4df58fb5905865635c210bc78b444e85c3b8b964feda7d42b66e9c414ea7a07ecadfc3206c446cc1d9fa625308e783e3d3be5
-EBUILD slixmpp-1.8.1.ebuild 780 BLAKE2B 0c5b230859f98185cba66555bc3a6bdd07a4ee851846c37068b6d829e1372d3bbbdd023263933337e4c2c0173bbd33df16cb127e1e2f9d2ee5b7a31e4dc97304 SHA512 ca16523dde2654b6fe8a107ec313da73da94fad32dd337867b4f5f61b763c61cc385c8868f349634759674b903a71ac1be2c863a69cdfe02baeaa15f1fc7ee17
-EBUILD slixmpp-1.8.2.ebuild 831 BLAKE2B 83c90577e7a026e26f8923d254b520b2c0c0077aa976baa313f7552f9daad9b6410c75fbeb4184154f8f3799803a8c18718e2fac8dcdd82ef1c387348c78408b SHA512 34e2d8fd6935f73051e35fb622c87016ed5a0ba76e483f7b4a3c435675c14521cc5bfd6cc31bbfc72b3be9ec843027538cf4e2aef0cf5f564e4138abbb124818
+EBUILD slixmpp-1.8.2.ebuild 830 BLAKE2B 929b5f28b5ed11b3460ad309821b5bf2a82d0d84c929af7bd1d6e4d6e8820c75a3eefd989212a83dbafa986ece18ead2758a80d34a2e19663f9f3d073f1fba50 SHA512 93003a0aa351bf3614d70ffd4d569ef74a510c27c2dd0020f7f7b1d1aa19c377b912d9eb27ec4b6c0d24292be65661ed4c914c37293d389cd52cfe3aca80e51b
 EBUILD slixmpp-9999.ebuild 824 BLAKE2B 99f3e9d3b50214d74aa29594083bf0f8bad95984656d1573dcefa27ed1111a1688b47677998043a1c39c1af1d374ab4dd5e97383ba911951e0f155e125b743ed SHA512 0174f09ce11a568861a9578afe440d0c351832d3fe69fb330cf8c41baa277769b9e2def8d97d627ab8f76a7dccc4ad2e23ad8e519edd9b22883f3d4c4706d970
 MISC metadata.xml 418 BLAKE2B 24c02f722eda50cda05da1a70efe953324ec8a1ba91a755e356bc9953387cdb35876f072a7f045dcda9e4fd74e73fd5bbd4f0f7d921431a374543bb02d5813c7 SHA512 1c36a0aef8162cd0b19eadec95dcdd5ff8f742c7438097e198736ae4772aba3a6ff41553a08878d54d0c548900444e2d40187f669a46173dd4f89072ac234365
diff --git a/dev-python/slixmpp/slixmpp-1.8.1.ebuild b/dev-python/slixmpp/slixmpp-1.8.1.ebuild
deleted file mode 100644
index ab71fc2be310..000000000000
--- a/dev-python/slixmpp/slixmpp-1.8.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 library for XMPP"
-HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
-LICENSE="MIT"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-DEPEND="
-	net-dns/libidn
-"
-RDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	${DEPEND}
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/slixmpp-1.8.2.ebuild b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
index edc5f0abb059..2ec177c68b91 100644
--- a/dev-python/slixmpp/slixmpp-1.8.2.ebuild
+++ b/dev-python/slixmpp/slixmpp-1.8.2.ebuild
@@ -18,7 +18,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="amd64 ~riscv"
 fi
 
 DEPEND="
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index e5978b3d7638..d2aa0c8e3ba4 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,3 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1-r1.ebuild 773 BLAKE2B 8f1e13e943965cf88f13a79ede6b60027038212640aac9152ae1ac6d952ae6dfd1127df31a60e7068fa7495dbd918d0ab8e0ee690edd714e605670a470545170 SHA512 cc6aa6eb135152eb94cb924ff24b0715b6ffb0d92ae186c11c28faaff562378072927146aeb9dd7bf427bd55a029dfa803cad3f51f51f5732071a0a30f6dc5e6
-EBUILD smartypants-9999.ebuild 781 BLAKE2B bc1b39dc4d11c02a138c47c34ddca756cc5d84154cef879b1161986688cbd3db1b6c6525993f7f6afc2bc440239d3a9b3a8a9d23fe66f96caf2d04ee8936ba53 SHA512 bbf11645cd3f53d16b37faa859f9f58fc1d18d9b170a20831e646d045c575d0b5fa057dc15c8efb376a92520743d5e0718a85705073759c26e95b62ef16db004
+EBUILD smartypants-2.0.1-r1.ebuild 838 BLAKE2B 3855486c3f578e7558bf508296492b8cf6b0444e5e3e7f57227409d3c9a69c62538da71d72362d680e9b018ec620dcbcab620d3433cf800069f2d1ed351218bb SHA512 fe3f5dbce97891dbf5230e4c03635427905deb628767754ceae28ea48b08930761ce7601eb633bfdfc314bde0e0e04d23e95aa719ef2fc0fbb80f0df40b34874
 MISC metadata.xml 533 BLAKE2B fbdcaba39094feabf10101304a6ad33c261042a49adbfb0610f3c3c0c3cb210d16f5cf7b7033d0092b567029194b40af3470bab472d068883e4800c550c72d30 SHA512 72b1d23d6a0e0b25679cf5de859398606004891308a316e549cac1c615381e3c89bcb79428e21346856cddbd28740b9423abefbe9b55b397dbaf41a56d7763df
diff --git a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
index c4a5c111cae5..773d6e56c5d0 100644
--- a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
@@ -4,28 +4,35 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{6..10} )
-
-MY_PN="${PN}.py"
-MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
+MY_P="${PN}.py-${PV}"
 DESCRIPTION="ASCII quote-dot-dash to HTML entity converter"
-HOMEPAGE="https://pypi.python.org/pypi/smartypants/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
-	EGIT_BRANCH="master"
-	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"
-	S="${WORKDIR}/${MY_P}"
-fi
+HOMEPAGE="
+	https://pypi.org/project/smartypants/
+	https://github.com/leohemsted/smartypants.py/
+"
+SRC_URI="
+	https://github.com/leohemsted/smartypants.py/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_sphinx docs
-distutils_enable_tests setup.py
+distutils_enable_tests unittest
+
+src_prepare() {
+	# relevant only to upstream packaging, requires docutils
+	rm tests/test_setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	eunittest -s tests
+}
diff --git a/dev-python/smartypants/smartypants-9999.ebuild b/dev-python/smartypants/smartypants-9999.ebuild
deleted file mode 100644
index c5c6b78000bf..000000000000
--- a/dev-python/smartypants/smartypants-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{6..10} )
-
-MY_PN="${PN}.py"
-MY_P="${MY_PN}-${PV}"
-
-inherit distutils-r1
-
-DESCRIPTION="ASCII quote-dot-dash to HTML entity converter"
-HOMEPAGE="https://pypi.python.org/pypi/smartypants/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
-	EGIT_BRANCH="master"
-	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"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index ab11755b8da2..8f1fa429b083 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 537 BLAKE2B f7ad1a227797e81b38e9804d4ef103ad2f71455737e4f23f11974de4b01417c996bb36d00f524b7be2c97b218d5af2072c5f020f457672738422d7a4c7e2e348 SHA512 cd5d1173974b9c9af7c8b707815517a75fd71764de776755945fcd48a5f616564784ee4b5c15e184588a9edd76c397c8595e7f06bff11846abf929a6dc1a7581
+EBUILD smmap-5.0.0.ebuild 543 BLAKE2B b37b7d2cb77b4684e754835de7ef96be8dc9a59b0b76e06ba1f9834451a325dc68736b09d4d6942a08b6365192d08d6a52ab0a2390865f86531ec5190e75e7ea SHA512 aae60fee8b86da0f74652f6b6b959e5f7a7309bfbe7e7ba9093fec69fef9cb4ecc9d84cf94935c808f1a914320af16bd2f291315d04c768100046dbf6d667381
 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 7ad9fb65e343..b1d96a16fe66 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python implementation of a sliding window memory map manager"
@@ -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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index a20972a4a945..732ff2319b69 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -7,4 +7,4 @@ EBUILD snakeoil-0.9.5.ebuild 759 BLAKE2B 4b2243550b1524e10ac0aa8d29191332f1a8a34
 EBUILD snakeoil-0.9.7.ebuild 818 BLAKE2B 9a277b1bf46db92b87bcb1cd0f1857e9d0251b030c68173160a09dcac89f369c95e3813848a71a95480882c245e7e5461f57170532212d40295ee4f6245a7150 SHA512 1cb6b88b93954674debfeccd737ca9c6c3bad94d41e968dd3cbe13f4962b3f066126c0b603b6e52cd0088014fa1efae107dbfac1e815690c8a3117a7e6b15049
 EBUILD snakeoil-0.9.9.ebuild 826 BLAKE2B d6d2a8e60ffea1e329b6b648599d3d4ed87728fc3a17f919a91fc8572d9714dff0a04a1472f180d303bb46d4738ca8c07a946580da27a8eea1a15c25d7f7851e SHA512 7838449d2de1e5fc36144850e77d981441e342ff850186e353154ce7d527a363623378af155c4267526fa7a4e58b5d49fb510e9e40988bbe24bd06fedd965e2d
 EBUILD snakeoil-9999.ebuild 826 BLAKE2B d6d2a8e60ffea1e329b6b648599d3d4ed87728fc3a17f919a91fc8572d9714dff0a04a1472f180d303bb46d4738ca8c07a946580da27a8eea1a15c25d7f7851e SHA512 7838449d2de1e5fc36144850e77d981441e342ff850186e353154ce7d527a363623378af155c4267526fa7a4e58b5d49fb510e9e40988bbe24bd06fedd965e2d
-MISC metadata.xml 387 BLAKE2B 4c354736e65249bf938946eb845a8011161b5c7a3d8f30bb9c360bf762a9da8ef91bc7bc31c1aa6dbe709271a5ea1e6c4d0b5c540dc39c0dc7befb589b51c7ed SHA512 77684f8e5ad48a48eb613ec664905714a6caab10e7ab899b4877f87d88d5808ce4b734bd6f8610f294884a76bbe17d51444819ec58e34b70f48e60081e5c3ac5
+MISC metadata.xml 476 BLAKE2B 12af3376bd65c98f013d125dc634369dac090751f422e01f59a9014cb7a71b8eadde9783741574757a81eba31e379d058041b3029b0934846f74442a4fcd4961 SHA512 4d818c5993192a8edf0784d7444104764ea1a3cd40e680d32a502fb2c0792efc8aeb8e5c07e5b08b1e4c83b44ab659800e93618c250b4dd87d7739a2fbacad61
diff --git a/dev-python/snakeoil/metadata.xml b/dev-python/snakeoil/metadata.xml
index 7778aca7bd43..21474707a69a 100644
--- a/dev-python/snakeoil/metadata.xml
+++ b/dev-python/snakeoil/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">pkgcore/snakeoil</remote-id>
-    <remote-id type="pypi">snakeoil</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pkgcore/snakeoil</remote-id>
+		<remote-id type="pypi">snakeoil</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index aeed82b6ced9..110e283b503c 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,3 +1,3 @@
 DIST python-snappy-0.6.1.tar.gz 24110 BLAKE2B 66ba24aa1768084c87188dde6eb6c98daf90da39e49902bbc283226aaf28b8d267bbc69f3cb9f30d9aaf64b3e25cc0fae47113bcc65f18dbec2128294c0dbe4b SHA512 43301f568633068bbdcb3dc318f37efcabbb5bd3f61a06b3a3a476006c3cbc1dfddea4ac2de0876bb127b354aa81ccc55dc44631dc8fba06036a0b6c7dfbdb9b
-EBUILD snappy-0.6.1.ebuild 736 BLAKE2B 04f4ecd47b85047a5ba8ccb0d785af7ccbe2984e470c6fed1f36b7a28cb1a8dc7e0338df8464006422782199efeaf4e811ea47ec276e555c4e2b6280bccbc59b SHA512 c053b0d7e82f748777f9f66758dfe7e4c5fafd961485fc2828200ecdb3c5e8727d8446eabe0a26d3c06b8d9fc9ea400708a690c0ed2b70f473e759074d73eb2b
+EBUILD snappy-0.6.1.ebuild 789 BLAKE2B 501833808c3c29fb36334c8908c290a95f8fbda30f430b4a7f326d1156030cf78d169441caade60b60dcaf95a8d4192d9ba93f33f61851f6a5c90f8bbeec1980 SHA512 87fdba7b497e050f8701dced1769f284b4ea9543d0e40a769a701e5e8df7c70dddfd47db08c66cdbb37aeaa63ff81ec1070d32b87176192aa668e7643a7a66c6
 MISC metadata.xml 377 BLAKE2B 5f5e3a28de9581661a02df12064d6682c05849ff7e4c5a26cbada7cdea562bc6c4b086f6d68382d962cfe23e1b250e0a87873229f406d0cb52dff1df5606aa65 SHA512 1cd283f4145af830191d8658c7ccbcfe7866cc5d2c6861171320a5990e4e0de402ffb6b221013ebbf844b9022654c230040153f77d0bf2c77e92e427ea7b7021
diff --git a/dev-python/snappy/snappy-0.6.1.ebuild b/dev-python/snappy/snappy-0.6.1.ebuild
index 2d2b76271cae..3cf02af40dda 100644
--- a/dev-python/snappy/snappy-0.6.1.ebuild
+++ b/dev-python/snappy/snappy-0.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,7 +12,10 @@ MY_PN=python-${PN}
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Python library for the snappy compression library from Google"
-HOMEPAGE="https://pypi.org/project/python-snappy/"
+HOMEPAGE="
+	https://github.com/andrix/python-snappy/
+	https://pypi.org/project/python-snappy/
+"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
@@ -20,8 +23,12 @@ LICENSE="BSD"
 KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
-DEPEND=">=app-arch/snappy-1.0.2:="
-RDEPEND=${DEPEND}
+DEPEND="
+	>=app-arch/snappy-1.0.2:=
+"
+RDEPEND="
+	${DEPEND}
+"
 
 python_test() {
 	cp test*.py "${BUILD_DIR}" || die
diff --git a/dev-python/snapshottest/Manifest b/dev-python/snapshottest/Manifest
index c8830a316184..6bdf02e2e2f7 100644
--- a/dev-python/snapshottest/Manifest
+++ b/dev-python/snapshottest/Manifest
@@ -1,4 +1,4 @@
-AUX snapshottest-0.5.1-remove-fastdiff.patch 1978 BLAKE2B 49bbd2118bd8defc3134b1863614a6da7f45f8702c9b65db35329a74b270a511ef6c87952eafefa5e64080c136e21fe7abbfb1e304ff1744983bfa6fcbcc27ee SHA512 804223af644f67a7ad22996572bdb35c88d3c87bfd67ef821b4ebcfb581281f305f9d96edfda9d8a20d5cd1d07397899dc10b629f7d02b91c2b8804e02fd1ac0
-DIST snapshottest-0.5.1.tar.gz 19312 BLAKE2B a8acfb09de9e58c7a929f71d10f3cc68d7eec31a9fa1ea0fe74ae8a574ceec315f7eab2f9e7cd326c34d981b5ede4c398b5f1352bd59c23be219eeb9a2c0e861 SHA512 1541c327c4238c816b55cf797f6104ad54ff62a2332517b3bf9a455bbee0abd49f6983a54dc7510d1e1c659d88e5f7d6c6aa396c0ece19e19957ea8cff42c673
-EBUILD snapshottest-0.5.1.ebuild 1116 BLAKE2B 4105aa10a0b6fe8229eefed46bd4ac456041a53064552c442ed7618833aa0cda7808edef055bd868c33ba9a801710e65df8ccf1d292d7a082f768a56f216d476 SHA512 da6567fae19195269dc8b78cdda647cffbe1266a24e1f9eec3d900d08902f882aa272c71d2e600ffb38f7b48d605f0a1c6d111c5fdd539519e368d89af052fc0
+AUX snapshottest-0.6.0-remove-fastdiff.patch 1979 BLAKE2B 1645f9fe0d7a5ba9523f81c50f31c54d854d56d3137a8b6611594bb825ccc0c183c763dbf641b1517e45b4ae39979efc86d5fffaa6adc111ee937a8c2f4143b5 SHA512 da43e9d1eb27f66512e5c3f02a0693756ea1e6889c6a9c3871c2f53a80a6ab4cdd7a705cfbe523231b8496a5eca3587c71e57babeec89c653307923c045413df
+DIST snapshottest-0.6.0.gh.tar.gz 19887 BLAKE2B d85b3025731dbe80c04388f8adf755f48f428df5f15496ad7e47d436ccfba0f8955833f576b12a38a3565a56deb49a425b67f9040bce69a7711be05558f0ef4e SHA512 7477668c0a61b4c282deb3eb9105cf06e8f644c931e2860a9a60dc2f8ed6de1eaf1ab100a816de200a39db8b488bda6ad33472265eecca707360dcbc9d8fafee
+EBUILD snapshottest-0.6.0.ebuild 919 BLAKE2B 3bfc9b3e7e856099e7c7cd69e0851233138c90223bc3746dd12d8389f9bcad75b3ea361ef08eabd84fb498de8fa0c3b5245fe90f878db76b263c421504e64b28 SHA512 e4665614b1e5bba39429e3f147a89d1247622ffc9125b97ca994167085c921ffadc66c55bbb39c8243144d3e7f4e6c26dc637cc15a0620c854c90786f3096bb2
 MISC metadata.xml 380 BLAKE2B af864f451c424be42fda967811c0754d246ff7399a14d7344c967e695dd33ed060f9db19823f7f7c3a78f90f45b2817b843dff1832cae24a5c6c3bb6b183c63e SHA512 a755150b8fd1cfae3e016e97cceb9d9e32e58750a7fd01665087fa82ebba1124b38566bf6869898338319532956869a472c50dce9f4ad53f6329e4691197d7b5
diff --git a/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch b/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch
deleted file mode 100644
index ec12f15fe7a6..000000000000
--- a/dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3e31b54d349eb136f0d96eb81309fdaf4ad35fcf Mon Sep 17 00:00:00 2001
-From: David Shepherd <davidshepherd7@gmail.com>
-Date: Sat, 15 Feb 2020 11:48:52 +0000
-Subject: [PATCH] Revert "Use fastdiff for faster diffing"
-
-This reverts commit 56d9efdaa37c39c7f644726e0d34c89b09ff9568.
----
- setup.py             | 2 +-
- snapshottest/diff.py | 9 +++++----
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 1baefd8..690713e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -23,7 +23,7 @@
-         'nose.plugins.0.10':
-         ['snapshottest = snapshottest.nose:SnapshotTestPlugin']
-     },
--    install_requires=['six>=1.10.0', 'termcolor', 'fastdiff>=0.1.4<1'],
-+    install_requires=['six>=1.10.0', 'termcolor'],
-     tests_require=tests_require,
-     extras_require={
-         'test': tests_require,
-diff --git a/snapshottest/diff.py b/snapshottest/diff.py
-index 5fddf66..83c599a 100644
---- a/snapshottest/diff.py
-+++ b/snapshottest/diff.py
-@@ -1,5 +1,5 @@
-+from difflib import Differ
- from termcolor import colored
--from fastdiff import compare
- 
- from .sorted_dict import SortedDict
- from .formatter import Formatter
-@@ -23,6 +23,7 @@ def format_line(line):
- class PrettyDiff(object):
-     def __init__(self, obj, snapshottest):
-         self.pretty = Formatter()
-+        self.differ = Differ()
-         self.snapshottest = snapshottest
-         if isinstance(obj, dict):
-             obj = SortedDict(**obj)
-@@ -35,10 +36,10 @@ def __repr__(self):
-         return repr(self.obj)
- 
-     def get_diff(self, other):
--        text1 = 'Received \n\n' + self.pretty(self.obj)
--        text2 = 'Snapshot \n\n' + self.pretty(other)
-+        text1 = ['Received ', ''] + self.pretty(self.obj).splitlines(1)
-+        text2 = ['Snapshot ', ''] + self.pretty(other).splitlines(1)
- 
--        lines = list(compare(text2, text1))
-+        lines = list(self.differ.compare(text2, text1))
-         return [
-             format_line(line) for line in lines
-         ]
diff --git a/dev-python/snapshottest/files/snapshottest-0.6.0-remove-fastdiff.patch b/dev-python/snapshottest/files/snapshottest-0.6.0-remove-fastdiff.patch
new file mode 100644
index 000000000000..948f961aae0b
--- /dev/null
+++ b/dev-python/snapshottest/files/snapshottest-0.6.0-remove-fastdiff.patch
@@ -0,0 +1,57 @@
+From 3e31b54d349eb136f0d96eb81309fdaf4ad35fcf Mon Sep 17 00:00:00 2001
+From: David Shepherd <davidshepherd7@gmail.com>
+Date: Sat, 15 Feb 2020 11:48:52 +0000
+Subject: [PATCH] Revert "Use fastdiff for faster diffing"
+
+This reverts commit 56d9efdaa37c39c7f644726e0d34c89b09ff9568.
+---
+ setup.py             | 2 +-
+ snapshottest/diff.py | 9 +++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1baefd8..690713e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,7 @@
+         'nose.plugins.0.10':
+         ['snapshottest = snapshottest.nose:SnapshotTestPlugin']
+     },
+-    install_requires=['six>=1.10.0', 'termcolor', 'fastdiff>=0.1.4,<1'],
++    install_requires=['six>=1.10.0', 'termcolor'],
+     tests_require=tests_require,
+     extras_require={
+         'test': tests_require,
+diff --git a/snapshottest/diff.py b/snapshottest/diff.py
+index 5fddf66..83c599a 100644
+--- a/snapshottest/diff.py
++++ b/snapshottest/diff.py
+@@ -1,5 +1,5 @@
++from difflib import Differ
+ from termcolor import colored
+-from fastdiff import compare
+ 
+ from .sorted_dict import SortedDict
+ from .formatter import Formatter
+@@ -23,6 +23,7 @@ def format_line(line):
+ class PrettyDiff(object):
+     def __init__(self, obj, snapshottest):
+         self.pretty = Formatter()
++        self.differ = Differ()
+         self.snapshottest = snapshottest
+         if isinstance(obj, dict):
+             obj = SortedDict(**obj)
+@@ -35,10 +36,10 @@ def __repr__(self):
+         return repr(self.obj)
+ 
+     def get_diff(self, other):
+-        text1 = 'Received \n\n' + self.pretty(self.obj)
+-        text2 = 'Snapshot \n\n' + self.pretty(other)
++        text1 = ['Received ', ''] + self.pretty(self.obj).splitlines(1)
++        text2 = ['Snapshot ', ''] + self.pretty(other).splitlines(1)
+ 
+-        lines = list(compare(text2, text1))
++        lines = list(self.differ.compare(text2, text1))
+         return [
+             format_line(line) for line in lines
+         ]
diff --git a/dev-python/snapshottest/snapshottest-0.5.1.ebuild b/dev-python/snapshottest/snapshottest-0.5.1.ebuild
deleted file mode 100644
index c49cc1e8330a..000000000000
--- a/dev-python/snapshottest/snapshottest-0.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-# no tests on pypi, no tags on github
-COMMIT_HASH="4ac2b4fb09e9e7728bebb11967c164a914775d1d"
-
-DESCRIPTION="Snapshot Testing utils for Python"
-HOMEPAGE="https://pypi.org/project/snapshottest/
-	https://github.com/syrusakbary/snapshottest"
-SRC_URI="
-	https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz
-		-> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/snapshottest-0.5.1-remove-fastdiff.patch"
-)
-
-python_prepare_all() {
-	sed -e "s:'pytest-runner'(,|)::" -i setup.py || die
-	sed -r -e 's:--cov[[:space:]]*[[:graph:]]+::g' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest tests examples/pytest
-	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/snapshottest/snapshottest-0.6.0.ebuild b/dev-python/snapshottest/snapshottest-0.6.0.ebuild
new file mode 100644
index 000000000000..390ad2eb66f6
--- /dev/null
+++ b/dev-python/snapshottest/snapshottest-0.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Snapshot Testing utils for Python"
+HOMEPAGE="
+	https://github.com/syrusakbary/snapshottest/
+	https://pypi.org/project/snapshottest/
+"
+SRC_URI="
+	https://github.com/syrusakbary/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/snapshottest-0.6.0-remove-fastdiff.patch"
+)
+
+python_prepare_all() {
+	sed -i -e 's:--cov snapshottest::' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests examples/pytest
+	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index db5fb07fad43..f8c04285b88a 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 682 BLAKE2B bbfedd35293cce5894785fce6344d1678d4cdb4d5cc6ea6629c65e9ac2b6097a586bb5379e3349ef9bab4313b890a46a0bca775ef118f4fd42debf9a295bbde6 SHA512 781dd2d67b5b76be7371aeaab7f14baceda93612d9e9f211fc01628debb7e9064e628f793ad5002470a5cbf31cdfc54d0dc4145db1bfacf10bef4f77af77a497
+EBUILD sniffio-1.2.0-r1.ebuild 717 BLAKE2B 5b410a278421abfd0126c04071d2d62249686dd1fff1a1503b45e834f4d1af879bdfc97066e2193d5a130553738687281d65b9a6d1f3c4d3f7d10db849b64155 SHA512 f2c6fefe904047f3f69474bbc0dd3af48653d899235cbd7c760c5c5de8ef7e919536c15f63e2658609f6db6b79100826d92a6c660c322aa3defc982dc775369c
 MISC metadata.xml 394 BLAKE2B 46df2a6c1c3259a1ba932cb74918ee0f7651e942cdb2eaa76d063269417079459745fa80416cab8088b8f41699b3b509a4586ab828692698a6a04588ece79bbc SHA512 a1aebdbc40dab66e913aaa7dd848066197d8d53a3e5c4890953cf6e5ffd1df5f5acae5ed022b10fc9c6e9a51becd05ff31ac19d0013ad7786b6d038705696b73
diff --git a/dev-python/sniffio/sniffio-1.2.0-r1.ebuild b/dev-python/sniffio/sniffio-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..dbc7302ff47a
--- /dev/null
+++ b/dev-python/sniffio/sniffio-1.2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sniff out which async library your code is running under"
+HOMEPAGE="
+	https://github.com/python-trio/sniffio/
+	https://pypi.org/project/sniffio/
+"
+SRC_URI="
+	https://github.com/python-trio/sniffio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# curio is not packaged
+	sniffio/_tests/test_sniffio.py::test_curio
+)
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
deleted file mode 100644
index bcf388f307ea..000000000000
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2022 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="Sniff out which async library your code is running under"
-HOMEPAGE="
-	https://github.com/python-trio/sniffio/
-	https://pypi.org/project/sniffio/"
-SRC_URI="
-	https://github.com/python-trio/sniffio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# curio is not packaged
-	sniffio/_tests/test_sniffio.py::test_curio
-)
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index c58362b1017e..75d4e1724738 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.2.0.tar.gz 86699 BLAKE2B b106fac1587143c9e88f54cc982c573b227f9e2d0125d36391a95050b41e9c97e47c7c8dff890ebfcf4bdf7c97559908d3bd380c6659b0d1fef4bed111fbae4b SHA512 f1dee83e06fc79ffb250892fe62c75e3393b9af07fbf7cde413e6391870aa74934302771239dea5c9bc89806684f95059b00c9ffbcf7340375c9dd8f1216cd37
-EBUILD snowballstemmer-2.2.0.ebuild 562 BLAKE2B a8c7923be7c6e8684352ad0a7faf8d87759207ff2626052e872aeafb45c271900b44ce83668043d1e6100b5c410d87acb1176e527665fa011324a295ed580c0b SHA512 ddbb6c8eb89468057baaa578d38ce4ee67c97e170edaa7a61dfed6d09250ead2f1b78bc036c89029430b37d7e808f2a65453fdaa815cbaa56a39561977801b70
+EBUILD snowballstemmer-2.2.0-r1.ebuild 594 BLAKE2B 1f26a44c99c3bbae34deabf41469356f73b5546fc1fe54e2c286adbcce74c3e78f0d1ec4154468879e3500a3a1cfe8ff963a34cba73b0d291568be6050fdad75 SHA512 6638b267797a424b36d3b46d3a17e3595cda431b5d0d6da05d5c97f61c30a02eb2140b0b14002cbe65e49c8655c8a06894beb1f6ed7e2ca952acf7915c51df00
 MISC metadata.xml 404 BLAKE2B f30ff685b65c1bdfd69ad19bdefc080232e7e71310d036fcb55c587c0c9b2ec03775c7c3bea26574191398e78ffffcdab54f81bc57505aaf28ca9fb883613a67 SHA512 dfbc65c53a18187f6f19ae370abeb7c813b0f4449402641fd0eb2be378d0a6711bccedad128f8eb4eeb9d76c2fd643d9d89dd5e4fc93b2d7f8d321c54241afe3
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..ae0c6fae73db
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-2.2.0-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://snowballstem.org/
+	https://github.com/snowballstem/snowball
+	https://pypi.org/project/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild
deleted file mode 100644
index 536b3e65aca9..000000000000
--- a/dev-python/snowballstemmer/snowballstemmer-2.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 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="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://snowballstem.org/
-	https://github.com/snowballstem/snowball
-	https://pypi.org/project/snowballstemmer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/socketio-client-nexus/Manifest b/dev-python/socketio-client-nexus/Manifest
index 7d0e0d971e06..09559dc770e6 100644
--- a/dev-python/socketio-client-nexus/Manifest
+++ b/dev-python/socketio-client-nexus/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-nexus-0.7.6.tar.gz 20128 BLAKE2B 84b032fda25a7aec40a4223f18d446da563a4c46054e79bfd38d1871233c88a66cb0213e3e825e5c91f6f587e671f5cfed75465c6f6895a84e1f2409facd330c SHA512 5c0301118beba684e1220c8984052e619d29037ec2c819eec13ac2ec4120025c85fb5b410285ee8466a105330f4a47b87f80116d7ff292c6b3e47a19eaa46702
-EBUILD socketio-client-nexus-0.7.6.ebuild 693 BLAKE2B 83ed317e3035531fbb251f464ab18f6c374ef8ccf351a38884e8583a5f13eb56f4ddae82ccb4b9a8253715fa3ee2084d34454c4b0694e8310e6b9784161186c0 SHA512 b72be1f48d2635546b3778075cfe9ababdda11abfc26667ab8665ab7d08c3e479f2584285ea026f978ede317e20e5404d0d69170ffccc741a3d227a17202c635
+EBUILD socketio-client-nexus-0.7.6.ebuild 694 BLAKE2B 49ab5834235e60cdd2f4b6022245fe60058473467c791cc749e10c0ff14657754f7349debf444a9eccb9fe2d8f1c1fee295bc0cc647971a09574558bb4c678f6 SHA512 156650b12031654790840d271ddd2e9c9e0ab0b6e1b5e7e7f21bfb83a641e94da4d549fbebfdcc5777fe76046be2492f2201a928bbd5235073556f648b23b0df
 MISC metadata.xml 425 BLAKE2B 79911f48c4ca6aa46c9f231ebd868f9e61255d68905ff56bad1bc0131767474668f9594fcc0322a5d24b46894bc916ec90d5675a04ba3f98bcfa8f74f286e6dd SHA512 3a84b3252a4e6763b95813edf08302d3d6a7a375a1afe88197b91e6ea1f95cc1424e953bf4c5eef617de854b9ad8f17173204f90939cf5e65c1633437ffbe950
diff --git a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
index 1a81504b2899..1e9dbbc00dba 100644
--- a/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
+++ b/dev-python/socketio-client-nexus/socketio-client-nexus-0.7.6.ebuild
@@ -1,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
 
 MY_PN="socketIO-client-nexus"
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
index cba18f05fadf..09bb586b83f9 100644
--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-0.7.2.tar.gz 23488 BLAKE2B 8c638dcc8ed30fb01a31e36f8175ef7e6b77b37dac0a66f1ef663a372458ccb34bac2ed58fce31a3856eb3d067ad8dc20f7d4a332b2af10ae12717bbb786349f SHA512 850839f804953c706458467c9e35c4c3637d3a61ff55042ef0b6f98e39a277faa97a0a3d7b1e18210e68ec32bb4ca793cd404631e0e2b533e61ad5d05cbc18fa
-EBUILD socketio-client-0.7.2.ebuild 1707 BLAKE2B 07993eb5bc4922a5da3f338e749f8408137a79e3b6034ed79f35e4f2d99191ea0d88dc3152b06d90dd20734237aae4e6554cbb9f98187416e75b676abd4c0b03 SHA512 774f89698d07feefa3d7f49e8d00b8635ad5ffe40fc90a6d1cac67983b5eec610725f363ed28d2fd8b3ade2ca58aefe681157c88218c206020a653f086580f2a
+EBUILD socketio-client-0.7.2.ebuild 1708 BLAKE2B 21b0605f5e9f1f3ef94eeac7deb78e2048f32e221dacbf04e494e591a44adcdf53018de3a614fc483ce3da18789a6a2f1b265c6afecff66ab3b092080f6f22c1 SHA512 dfcb4f94bc4a82acbdbf82d0c98f6ccde29b09c1378d858d8e898c89b2ea282929285603ca1e30aa08eb9ddac248e9fb92e65a484291fa1596f226ec975f6cb5
 MISC metadata.xml 467 BLAKE2B 2b0a2483db2f4fdd351061d1131649ed92d345940dab6967de8ce51809a932e824595fc852abf3240a988e566ce5385cb232a1c2cb9c8e6c466f55d5b3f5e508 SHA512 f1997eeddba6cfa54edc7941e75e809b88c5f5f2e34ff739877d9f971118f1fd1cdf940176b8a4dcec4e4381e1fd127304f854dfb16a108893a0bed610de859a
diff --git a/dev-python/socketio-client/socketio-client-0.7.2.ebuild b/dev-python/socketio-client/socketio-client-0.7.2.ebuild
index 3f722105510b..85244b087217 100644
--- a/dev-python/socketio-client/socketio-client-0.7.2.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.7.2.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_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/socksio/Manifest b/dev-python/socksio/Manifest
index 85f35d57ad2a..5a1be2e21a37 100644
--- a/dev-python/socksio/Manifest
+++ b/dev-python/socksio/Manifest
@@ -1,3 +1,3 @@
 DIST socksio-1.0.0.tar.gz 19055 BLAKE2B aa6bff92ae19611151070fc8e9661d532bd970d5d9d7ab8752fe77f7b4444957710ceff09d76b9f69ff71b48daf54659b4d523bc6dd01a28580d25f1e0ac055f SHA512 89bce7294555e2623df68e99352c27b83af38a4fcc4e3b86c8826c9c4bf545eeaf0a6328b000cfe1d286fa442c756c4579b4887cff03bc9e559cd66414a7ac6f
-EBUILD socksio-1.0.0.ebuild 643 BLAKE2B 0bf229e587ca0c214553f3c75de7c0f95e0188226f56e8b73e03ffba07307268ab4448992df07988792dc2161f73e21e254696329404b1328230728bd37ce6dc SHA512 42b7a4399e73fa364d85824a785a209786514b9059b056f8f2893a38b3c29b9d9b876e7d01bdc172af466299a0ef2d55f1af47c97ac65c1153276fef60d93c9d
+EBUILD socksio-1.0.0.ebuild 648 BLAKE2B c0dc93be48c8323033a4c93373efa68c0b5007801e0c14f25623608e13809457fd50a6c7220cbb043978a5d201b887671ddd05a16149a6bc183536236b711ecd SHA512 ea5f476e231589bed175fbcc190d814f3680137eccde561bd161de527d66484a8acd08a5fca87e8beb85b59e8bfe57c36d2a0ec9e62a5b25e7bb8ae488d7a756
 MISC metadata.xml 394 BLAKE2B 9dd0d2bb0f8a21888f0b275729cced562c57eb97916e5c5d2735db22d9e2b7faff8a1da5254f9ab6e058f7eb7338d643621f1f9c8d6c9ba401ec9d17668a9910 SHA512 0a641cfb5fa10d7155eac214d9dfccf14f42201a1e5fbf82f58fa7e50533bbc01dda530228fa8fd70a89732c5fab1e78c4d85bc1e9f4c9e8ddee67e374a18d43
diff --git a/dev-python/socksio/socksio-1.0.0.ebuild b/dev-python/socksio/socksio-1.0.0.ebuild
index 804dbb675a42..4689d421843f 100644
--- a/dev-python/socksio/socksio-1.0.0.ebuild
+++ b/dev-python/socksio/socksio-1.0.0.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5"
-HOMEPAGE="https://pypi.org/project/socksio/ https://github.com/sethmlarson/socksio"
+HOMEPAGE="
+	https://github.com/sethmlarson/socksio/
+	https://pypi.org/project/socksio/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 53f157c7a882..570e404e977f 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,4 +1,3 @@
 DIST python-sortedcontainers-2.4.0.gh.tar.gz 9229380 BLAKE2B ca9348ab7d467b2a81126217451262bb0547901b953edc3bba7c87c67b415eef5c3d454a08d227ebc8b213c1cc7db6262e864511fe67beefe865014ae5fc5977 SHA512 f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770
-EBUILD sortedcontainers-2.4.0-r1.ebuild 838 BLAKE2B 22549b4c234d1ed872c781ca0d1f7a8d2e9aa0b5283e7805f8dcef8956176083bd029d9ae5d4c7f387e34b64e54424f5264a1011f95694d2b3e68dba12421c5e SHA512 a4651479a9bc1323112515fde4eb26c54a3595f084de29f6c6d2e7ae92af9a6b0bca94e683c4b9b12143fc95f0bd2fc64e1b20ead0c4b8f1f134de99503012ac
-EBUILD sortedcontainers-2.4.0.ebuild 809 BLAKE2B e69298d6b2208ee6cc133c5548a5f1f653b39917faec4d5a8dd2012a4b7cabd9be29e45f1cf1db4ba0d049d43f33b48bb0e2eec60a540bc65c39276afa566b92 SHA512 8a27fd894f0f6d24b229994fd06fe8e3e14e815d664d5948f81cb1c4efc87c120b4ecea626675b900465ba7cd3e63bd22784855e1b26107871a2ebc0b6fb4466
+EBUILD sortedcontainers-2.4.0-r1.ebuild 830 BLAKE2B c98f139bdbf9af3f71247ec1b151b9538a420b41b8e38fd7932ded53a5b683161171bc982a3fc1cfe209dc0dfec9ef0a35fd4f694db4a95c3fb01248cd487bc4 SHA512 b90f3a81793833cdba83d0187dafb5d4332e0cb1033ebdf8962be34249b2411cb52d57f030d8a4d3940babebbd19b818e4748cb2aaefeda30c5836e599a2bf6b
 MISC metadata.xml 418 BLAKE2B 570f73c8991668cf196d77b2a5ebec502a6ccc42322db114e2b82c9b798641c178481854bb8caee377b48888714509cc71edf335ea046748cd575ba293cc6588 SHA512 e1f7beeaea74e5f18b02ae8dc0a6ce776190c281317a963c151848078333e3fb8834b2633ffb8e96fe1fd455e3ad556721b1d3291228457ca059ca9c13cb99af
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
index 0ee6fc703b66..59f00df5eaf9 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
deleted file mode 100644
index 17aab8883a00..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	epytest --ignore docs/conf.py
-}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 82564a431e33..39a7723ddbb2 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,6 +1,5 @@
-AUX soupsieve-2.2.1-lxml-libxml2-tests.patch 2208 BLAKE2B 3948099554c06afe5b57b68bdaa52157311b15941f62f02256131a8b4f7189347b5754d3ea5c73372503362f3444dc3b6c63c04c52f0fbdad8506920b9f2557c SHA512 5725d0425e64b7150bef62ef81c2de06cb452554b18f4191a056f0c776f5955ddb572d939bc1a2f5e9d265a0e8a8d9eab17953896d9dfe288c59464cee66d9d9
-DIST soupsieve-2.3.1.tar.gz 104251 BLAKE2B c395b8dc0944457d6c5f217a03c6fc5f3895868a629eb72d86733fb0d9c6b1d1c41a2e035d5118c9c6fcc6a22e9ff79b9de8417131d30bbc6e1ba02c813ced56 SHA512 3f1245b27d67e8b37bce4cb0b21b2b3f4d6b7ae112cc66672e5406c0701b28e605ed12db1e111bfeccea15625b17042e398b075b7f026d3f3e15069f0cafccac
+DIST soupsieve-2.3.2.post1.gh.tar.gz 104120 BLAKE2B ddeeb357753981a55676a59285161a03759fd548a11950e87ff53df9433b7cb054084afe6dd4de01c316dc0a013e6f429e6e0868c140ec11a19627b0e1cb0177 SHA512 80eae1e7256cbcf2f2b8520779a5bdb68798e9813ed738ee933204ff1c23ad52553e21f3aa89ad61b900b906dcaa7a1eebd819300417304df782cda9e2d79c4a
 DIST soupsieve-2.3.2.tar.gz 103869 BLAKE2B 0820f3935aaf0bda436abf10ddb0d64d6b2de99d116fdc84518879ca468688918a0995f4666e04d4892fee4d221b2d6a843f200c4bf05c3bf5755004a3fbb7ec SHA512 a91c453098697d0b6120e80dd2cf56ec0359d9d3d98ef54e348e8f9832b3b70626fcdc7c21bc3abe0fba32a83cc62d05b750f2d2fa79261479bf89c0aa782caa
-EBUILD soupsieve-2.3.1.ebuild 935 BLAKE2B a2721ca329a16a28820a28088c5a4adbe5da4447f24cfba852c87e21d1d0e1d817baa3a50612a751005e4505b7257f1659f96fcbf6c3c3fae142bc9101b682f7 SHA512 703ec2d93c45a89e3129eb9f4436af7c054f5746b556840323e5262d244b0f6ceb10f7001d77445b9097c62358cc8a26d3db330f1ad338ac246605ef7b18fd4d
-EBUILD soupsieve-2.3.2.ebuild 759 BLAKE2B 9b3f1775d08e2ffdd8a366a92bc6ee6f13931aa6d58dd67a850dfd2f7e4926836b7587cda1c6454cb689408a429f859bfbccb6aaf0e704cd806374c6bc6ccdda SHA512 8d5bcbbadcde9f4d5456916f2f0e3ed968c6bf5246c392d12a399a5c38accd9f33396849eda4b88031bd5fdb2d191cfff9f06cdf23a66e0d201789505eaf5d0e
+EBUILD soupsieve-2.3.2.ebuild 751 BLAKE2B 0d9992d50bc86c6afd38c7f8b137d13403ff3e601cdabd06df0ee37c01dd7f96d0953150be9e817b4aff6514f82f8d254552f8360902b01b14bba6af6c760ce9 SHA512 85713d071d27f03640311a6938f57f4b3846f0d592e9dff799291b531d9ebaacff230de10a58d8c83e4274531394ee0f085f1299276e04bbca408af8078f9f50
+EBUILD soupsieve-2.3.2_p1.ebuild 814 BLAKE2B 256d6f610afd3f67e94627dd0295cdc8d3645e9f5207b4e9fdcd3e12843b5218b8204dddcaf629167ab75b0779a0d50e36a2d3995a1952edf82c0d578fa0ef8c SHA512 a3a35f45cc389aa1b90d50856829cc8d9ec8f13a29d237f21b2b0b5f723bf0214ff4554ff0728cc8b14d2234de0439822a52dc2c266fb8e5972bb7bf544993cd
 MISC metadata.xml 399 BLAKE2B de09909e906d138c664a0926eca614abf7953e16d5fb0bb0babed691906360cdb8c87b9a79ea5ddd2492b4e8cee561e5433d02ba47be5cf670fbde9e70dfed9f SHA512 0ca6cbc294f232ae9d0f5f0de3cb1c133f5742435d523a0481bd7449dd9a75aa950f08a668b4e1900e520461410e0eb864dc913361204909524805f1cb9e0a2c
diff --git a/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch b/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch
deleted file mode 100644
index a7075fa6fb6d..000000000000
--- a/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://sources.debian.org/data/main/s/soupsieve/2.2.1-2/debian/patches/libxml2-2.9.11
-https://github.com/facelessuser/soupsieve/issues/220
-
-Apply Debian patch to skip tests which expose a lxml bug that's
-already being handled elsewhere.
-
-From: Stefano Rivera <stefanor@debian.org>
-Date: Sat, 2 Oct 2021 12:05:17 -0700
-Subject: Mark test_contains_cdata_html tests XFAIL for libxml2 >= 2.9.11
-
-libxml2 changed CDATA handling in 2.9.11.
-Beautifulsoup supports this change, but lxml upstream has pinned on an
-older version so the behaviour change isn't standardised upstream, yet.
-
-Bug-upstream: https://github.com/facelessuser/soupsieve/issues/220
-Bug-lxml: https://bugs.launchpad.net/lxml/+bug/1928795
-Bug-beautifulsoup: https://bugs.launchpad.net/beautifulsoup/+bug/1930164
-Bug-Debian: https://bugs.debian.org/995459
-
-Forwarded: no
---- a/tests/test_extra/test_soup_contains.py
-+++ b/tests/test_extra/test_soup_contains.py
-@@ -3,6 +3,9 @@ from .. import util
- import warnings
- import soupsieve as sv
- 
-+import pytest
-+from lxml.etree import LIBXML_VERSION
-+
- 
- class TestSoupContains(util.TestCase):
-     """Test soup-contains selectors."""
-@@ -144,6 +147,9 @@ class TestSoupContains(util.TestCase):
-             flags=util.HTML
-         )
- 
-+    @pytest.mark.xfail(LIBXML_VERSION >= (2, 9, 11),
-+        reason='lxml parser changed CDATA handling, see '
-+               'https://github.com/facelessuser/soupsieve/issues/220')
-     def test_contains_cdata_html(self):
-         """Test contains CDATA in HTML5."""
- 
---- a/tests/test_extra/test_soup_contains_own.py
-+++ b/tests/test_extra/test_soup_contains_own.py
-@@ -1,6 +1,9 @@
- """Test contains selectors."""
- from .. import util
- 
-+import pytest
-+from lxml.etree import LIBXML_VERSION
-+
- 
- class TestSoupContainsOwn(util.TestCase):
-     """Test soup-contains-own selectors."""
-@@ -35,6 +38,9 @@ class TestSoupContainsOwn(util.TestCase):
-             flags=util.HTML
-         )
- 
-+    @pytest.mark.xfail(LIBXML_VERSION >= (2, 9, 11),
-+        reason='lxml parser changed CDATA handling, see '
-+               'https://github.com/facelessuser/soupsieve/issues/220')
-     def test_contains_own_cdata_html(self):
-         """Test contains CDATA in HTML5."""
- 
diff --git a/dev-python/soupsieve/soupsieve-2.3.1.ebuild b/dev-python/soupsieve/soupsieve-2.3.1.ebuild
deleted file mode 100644
index 442fbed6d41c..000000000000
--- a/dev-python/soupsieve/soupsieve-2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/"
-SRC_URI="https://github.com/facelessuser/${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 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Needed for now until something is figured out either at lxml
-	# upstream or libxml2?
-	# See https://github.com/facelessuser/soupsieve/issues/220
-	"${FILESDIR}"/${PN}-2.2.1-lxml-libxml2-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
index 2561589e4627..f62d0d1e340f 100644
--- a/dev-python/soupsieve/soupsieve-2.3.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild b/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
new file mode 100644
index 000000000000..f28204ec807c
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="
+	https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index 782cb6ea4c0f..2bde8f02b949 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
-DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 697 BLAKE2B dacb7e253bbe84f19ad2fc8410f3757dc8e4aa6663fab87f3489fbaa79cfa5cc6e1ff636f9191ea95164531c6afd7641d85814cdb8662952cf13f4807d92a6ff SHA512 aa33d5dfaac18691da36df51b43d4a5b9e83c43eab0b780d21396b8e70d1162ca0dc367dc56b8cbc877df11e2acfdd2f55f7f2db8656d3c5fb78cfa81bc42125
-MISC metadata.xml 456 BLAKE2B 270cc0b048d307dc0ca38d60e0c12757f3a6475827bb71f6b02d38dd4018d4e05be80f0c167a86d1b4e156d1bbb557d9426e33d26d36bb5fe1ddc2a2ab0708dd SHA512 edec8125ab7219b122b44918f15b168cc2edbfc9887d457ed50f4b4fa588f5bc67400e4a5a661623388e437a42d75a08cfa93738a8ce1615dc7c1f01ce2513e1
+DIST speaklater3-1.4.tar.gz 4309 BLAKE2B 6ba32926a81c978c7d001d0ebe39c74779e05dd0275ee4f0b9d06fb9cc8bdd8502417ff6b9adefd5df3d6030a2f1b26d461ba2a8afcff383af294f634a68dec3 SHA512 7603bc5852b870a9ada6d730857de32ff47b842dabe8cb2310bbcdefceaf3bc5021a02cab058e646ba38d5a46e831ad9ec7bb4db75f91e07e999a9917ac24251
+EBUILD speaklater-1.4.ebuild 539 BLAKE2B fa30968f481d2245297ebbd2574a174836be746d1687ca5d9e375931ee3b0269cc2b5d4e175322716ba048979e31ef99f8e1c042146022a73700aa907245cf37 SHA512 aa695620f3b036b713428631d0a7e341f0b04ec9888b4de244f9200d6206148278354ac97d1f25ceabd66f29fb5b129869a4cb9ad94c297d59d4e4cf3e0e34b8
+MISC metadata.xml 437 BLAKE2B a8db95c457da90706954974ef48de3df9fe61f6dd0b40e90d932364e742906fa9d5d10b5c594c42eb39f4ae41376d68a0057f1a39cf79b826ffdaabf116af8f9 SHA512 1720c8aad1f6f4653f855ac655853c101101456870cb9544827dac72c38d2db340b2b3b38e200fd0e1962533e66bc1d959b7733345f92784742a97797cc3fc56
diff --git a/dev-python/speaklater/metadata.xml b/dev-python/speaklater/metadata.xml
index e1dff1b30dd8..ecc091ea70c4 100644
--- a/dev-python/speaklater/metadata.xml
+++ b/dev-python/speaklater/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">speaklater</remote-id>
+    <remote-id type="pypi">speaklater3</remote-id>
     <remote-id type="github">mitsuhiko/speaklater</remote-id>
-    <bugs-to>https://github.com/mitsuhiko/speaklater/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
deleted file mode 100644
index d6fc15239d81..000000000000
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
-
-DESCRIPTION="Lazy strings for Python"
-HOMEPAGE="https://github.com/mitsuhiko/speaklater"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-python_configure_all() {
-	# https://github.com/mitsuhiko/speaklater/issues/2
-	2to3 -n -w --no-diffs ${PN}.py || die
-	2to3 -d -n -w --no-diffs ${PN}.py || die
-	# fix unicode in doctests
-	sed -ri "s/(^ {4}l?)u'/\1'/" ${PN}.py || die
-}
-
-python_test() {
-	"${EPYTHON}" -m doctest -v speaklater.py ||
-		die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/speaklater/speaklater-1.4.ebuild b/dev-python/speaklater/speaklater-1.4.ebuild
new file mode 100644
index 000000000000..cedfff974ec1
--- /dev/null
+++ b/dev-python/speaklater/speaklater-1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=speaklater3-${PV}
+DESCRIPTION="Lazy strings for Python"
+HOMEPAGE="https://pypi.org/project/speaklater3/"
+SRC_URI="mirror://pypi/s/speaklater3/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+python_test() {
+	"${EPYTHON}" -m doctest -v speaklater.py ||
+		die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/speg/Manifest b/dev-python/speg/Manifest
index 053f8a46a388..24d756d9d2ec 100644
--- a/dev-python/speg/Manifest
+++ b/dev-python/speg/Manifest
@@ -1,3 +1,6 @@
 DIST speg-0.3.tar.gz 2592 BLAKE2B 1b82d6e122783fbc58f2c711a67e9b8b721d69c08de5ac2815d1ae459ce337552d10bb747cd1e31363f48f4a50bbc967b650d7e6048668d28d4133b5875aed14 SHA512 9faed6af0eb1a6ff0a7dc2e2f5b885a58a5430938b463420ad52277fe2900ae98531057ebbcc21d8cd259d4779bfb0c919125043503635721afe574b4f1f99ce
+DIST speg-0.3_p20180819.gh.tar.gz 5771 BLAKE2B 1d0a97d65190cd26776509627cc2ada948390af3457d3967fa0a6a3cbe1bc0c566db8188a9bab3a28d5bd8cb85ce0853c903d2c7a7d6faf79766b9f48c229f4d SHA512 01f0913a59b0a3b32c72c937f948508e303121bd35a8d057f1c043ab77a8b5c3a63b696f5aa8a6bf300901131ae56f50d187e7259dcc7bbaf4d1368e6bdd8bb1
 EBUILD speg-0.3-r2.ebuild 465 BLAKE2B adbdec2eebc3b605c63c79b2d71e1503363ffae73a93c46d499899f8cf3861749aedf808249d85fd23e6c6ceb4d5423bedc0c27cccc07ed139183c9e87140ff7 SHA512 144207c110dbcaaf45b93986fe74d5d1cf670a62012bdb13ebec5951791f1571c2be0ae81f320dbefe2f76d2ae8db411fc3a578ed8dae92b75dd93293d2327f6
+EBUILD speg-0.3-r3.ebuild 466 BLAKE2B 561d78e9ced62c429203eba0cc6f3af02ef3e398723dfd2af9a226b200fe3ce1e8e8dd7ef758a2d1c42b89930565a8650b178fde3af4b5f332a506637c6332c0 SHA512 7877adc26b5745b6e8e1d3d970f99413b5f2862600c1f10a355ace38bcba5baca1d044b894df3b98a4e3e9f424aea44788676300ac87c67224ca21499bf07176
+EBUILD speg-0.3_p20180819-r1.ebuild 616 BLAKE2B 1ad45421de56714133601277e6902b57d75e448f1c1794a8b625deaa66582fdf95f7839ed2db9a7b9ce856fe8eae4e293a38cf0a7e796e8139b5666e8e04cfa0 SHA512 617772c823485826d6db114d41f71f17a56f1dee4575e1b4537cb578570a8a9d2b934e9b313fe94718e2eca3a41c65f9b8c4fb3c7b46673f80011b92d10ecc01
 MISC metadata.xml 402 BLAKE2B 75d9fb9dd5201d402fb66fb1802c838258efc61d164c1e353c65f5a9365351c2c553c4d792701a7d216eba80935e2f22b8647fdf51c8aea6bbf4c094f592315d SHA512 e270523cc4c5c534ac06286bd23cf56b20bff25a73572bc2e87f509242b5adf156e625040092c7beabf2f38b50471a5ec46838cf78c337fb5cc78a296b58597c
diff --git a/dev-python/speg/speg-0.3-r3.ebuild b/dev-python/speg/speg-0.3-r3.ebuild
new file mode 100644
index 000000000000..54f74fe9f7b7
--- /dev/null
+++ b/dev-python/speg/speg-0.3-r3.ebuild
@@ -0,0 +1,14 @@
+# 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 PEG-based parser interpreter with memoization"
+HOMEPAGE="https://github.com/avakar/speg/"
+SRC_URI="https://github.com/avakar/speg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~ppc ~riscv x86"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/speg/speg-0.3_p20180819-r1.ebuild b/dev-python/speg/speg-0.3_p20180819-r1.ebuild
new file mode 100644
index 000000000000..f2569a346940
--- /dev/null
+++ b/dev-python/speg/speg-0.3_p20180819-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+MY_COMMIT="877acddfd5ac5ae8b4a4592d045e74e108477643"
+
+DESCRIPTION="A PEG-based parser interpreter with memoization"
+HOMEPAGE="https://github.com/avakar/speg/"
+SRC_URI="https://github.com/avakar/speg/archive/${MY_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+distutils_enable_tests pytest
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index eb39432be55e..931d9c5cdd91 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autoapi-1.8.4.tar.gz 83541 BLAKE2B 05d706fda6da4aea55e535a995ef01dc54269fa8e452c51c9bf2cec2e596ccec20191b8cb3c0cde1b93daa4f5d85074a293c9fd449d99d3c494ba20c6cee2df8 SHA512 10b4d87e1046ad372a3491006cd4bece8334fc398025f98654781c83ee200045d707f3293a031f8cf0abe5d20a111e7ded864f2b6deffe5222b331ca8c9b688b
-EBUILD sphinx-autoapi-1.8.4.ebuild 983 BLAKE2B f5abf9afce95376f69f1f099edbe3fe142508b1ed2ff396f97d3be5a19b1867df585c4e4195ac8544a9793a8864b3576a013a6dc69e56bc0fae14d2c72d8f705 SHA512 b7e550caab6b21322431a3e45029871ffbb9b1f9fd3847f6a3a84f3e67cc07e41b25c9f659c5ad5f6c3eb030633b623c559e3cfa76313ee1f75492ce0f92f0ac
+EBUILD sphinx-autoapi-1.8.4.ebuild 979 BLAKE2B 5e32cd651f8490e4b15680b97a54a6fc357a2ccd492fe281ab04a2d14b58f3afb5618c3fa7f6460818aa62ba82341506d10ecebb72bdbd085fed361d0f6c0e1f SHA512 41ffe1a37865cb21bfb4aca259d21ade63ed64c24d9092aefc155346ac1fccd86010f9c12934c6f53fbb93bf38f7b4fd1624dcc5712987e7d5bb9664a5afe3f3
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-1.8.4.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-1.8.4.ebuild
index 2b40b485267b..47a5de5a7f8a 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-1.8.4.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-1.8.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	dev-python/astroid[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 8d0f39208533..3977d657f02a 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,7 +1,7 @@
-DIST sphinx-autodoc-typehints-1.17.0.gh.tar.gz 26087 BLAKE2B d2193378160404dd18ee066dd09c299f69d92b3b747edcd88910a8eb29a707b0ad3f7c95e56a0137c19010d37bddd3d72c5d378dcf72376ea36d69ab2eba52d4 SHA512 0b35cbc3a26cd084c7c741df1ad0a0887eca9943adc16980f7dbc3304c00854bb2861b1314c126e59b2d59cdbff22f5f466cc433e485ec05e40ed93e36ee9650
-DIST sphinx-autodoc-typehints-1.18.0.gh.tar.gz 26201 BLAKE2B 00c2be7d1a9770bf3c2a133ae5f810703e70afc0ce3372c5e667ef9e8783ce74c28fd796211a8bb38507ed1d1142c52461c6d6002069756961dc8d95e837337b SHA512 fa2202551365e929b5dda4c97f9565fec124cb1edda3a957953f4d59716d1c1e28adca769c3dbeadf265763cfb123bf6fefce0f9d9467daf4043f93d360195e3
 DIST sphinx-autodoc-typehints-1.18.1.gh.tar.gz 26424 BLAKE2B a30b966d26e89a7771404d4f9434038e4f201458bda439bf8fb3d2c2fc6dac0f12743622193edf45335d04148c96b6c3d51c2c7fe5437cb67b3b272ab19b2f18 SHA512 6c788949d1d3903ac589283e9188d5db3e0f173be1bb1a4740a88fc0383d7011fe60e57d25af74a2fc147b3c4d76c48770515bb8dbdf4ff18fb4bfb110a4a241
-EBUILD sphinx-autodoc-typehints-1.17.0.ebuild 1041 BLAKE2B 6abc4fe0f814eb37baefc1f11a80dab1040cd5c103c74e8eadc078a337afa2416723bb833f74183ec9e35d4eeae316013eb247374f32c6749349fa36d1a42610 SHA512 ae404ba25ca2959b8dff223421c59f7c0a9af09f59d58b1d4da531183e9186e46185b2f9d8ac3b590d211b7e37d4a9c2abbb0b3585798a6ed1438aff37997686
-EBUILD sphinx-autodoc-typehints-1.18.0.ebuild 1060 BLAKE2B c6f3ca2adc6356edfa56cb4299e0a9753bbee7ab09e7da4f1d3d27212a1452cd82b85bc5d316f11dc86ca5e472391e913536f6e042204bb10046f29213cc50bf SHA512 b0ba290e825116c0ef7e291d7d77aac4b0dbdaf02caa1db6611babd833f5feab922cf56fc3a4f4708bc29f5b8cf84591f561e5552a6fb66ba94458ae1658be6a
-EBUILD sphinx-autodoc-typehints-1.18.1.ebuild 1066 BLAKE2B 5a4b223c943a18707cf1c321a3e037d0d4d3589daeb230ceb19bfb8126adbc1d3795ba495d3c4668dcb29311f6e43803e0951a81eaeb78f24d2f458030a684e0 SHA512 9a606992b6e201fd4012e670cf2737bd6cba7ce7244de8188348c238a7f3985dd83bd4dc5aac9c7a1374867e5f96ae11d4d4f2606f511255e1297ee516e32387
-MISC metadata.xml 700 BLAKE2B 6e748d584e7640fa73a7f481ba91d37e983e97b332416acae73a87043693e5174b0f98c667e0a41abb7684a29b1136ccf681080b84a7bb8a7db73cbb14b85b69 SHA512 a149590e27acdc56ec0de8d57b5f378134480d24df0f0406a641b27b6cdff14a05dddb99a8e58781c23cc5112b1468fe06e9df28e8532a23b33ca817bd05c137
+DIST sphinx-autodoc-typehints-1.18.2.gh.tar.gz 26466 BLAKE2B d2e6e3135c5a60966338b2c8b143cab7c2a1b788abde0deb9cf3dc989ad31a1680ff07a9e3cb9bad500d053e7f0af2b5e099331bd92a2e01911333c6eb1589bf SHA512 5828cce6744a6a55e5dd25dc15b5bb6b28fcf430c5b65f8d610e24da426efe020e72af73ffee1f7929b3007fc76afc64f70c65d1f7e8db62b86ce52e2f836487
+DIST sphinx-autodoc-typehints-1.18.3.gh.tar.gz 26457 BLAKE2B 343a6ffcbca40f28a66c67266431f3a9b2292bd0d991de4287b9adf9e02b7d8fb24094646caa55790f32cd9081abca525f310367335d60fa1b7ea3bc9623bb1c SHA512 549bdfad8f5c07f5edb1c6cdeaff39df22cc7bfa475c70b5c54ff46b311d14c9f3682bf68663d852b95ebff8fd1b71038fc077495d99d870ae2efbf72ec99a42
+EBUILD sphinx-autodoc-typehints-1.18.1.ebuild 1059 BLAKE2B 7a7e7b7da90d2143b451cc4abe254c2b57cec23dede3ae085de057dd20d605630be9e06f18844ce76a8c043c9f23038fa461331a8b3224fb5cd87222ae024019 SHA512 cc756d5816a2f5ccbf5beb68a57c372bc23f7af079d416983d912eebc91d0a9207d5ba0d4604bdafd836912a009ed95ce9ba9b4dd95ffb099ba5f187fa274498
+EBUILD sphinx-autodoc-typehints-1.18.2.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
+EBUILD sphinx-autodoc-typehints-1.18.3.ebuild 1073 BLAKE2B b7579a2dbe8747265b60eed1d96627561447d2631279c5793f6eee56dfba83e74f21c21eaca4585de78380722da1ad567945c4053b058891172a2b91645f80e2 SHA512 a68916030b5b9a2b0b4e14ff548ba23a3f4df1baa7e0633436b91fdf4a1ba5b4d1a7d937fc44ed637c262192a1c437d4e78b698b6c1294967e078d955cdb3c58
+MISC metadata.xml 807 BLAKE2B 368714db91017473456e0854b7e2024ac6d24b4ba3d5ae2a44697546c4f96185a44ecc9da8dc816d9661f5815d7d31751d2d87d599c748d06db3f1dde32a141c SHA512 04882668dfa68354aa8ee5860db11963153fb29d9c26b3367fcef63da4ebbccf049909946e73fd06250bf784dcb783b1bc70fb29b9aaa1fcb19be9fcf470ebbe
diff --git a/dev-python/sphinx-autodoc-typehints/metadata.xml b/dev-python/sphinx-autodoc-typehints/metadata.xml
index a9f1912dc7f3..8ad8fe5bebfc 100644
--- a/dev-python/sphinx-autodoc-typehints/metadata.xml
+++ b/dev-python/sphinx-autodoc-typehints/metadata.xml
@@ -6,6 +6,10 @@
     <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 This extension allows you to use Python 3 annotations for documenting acceptable argument types and return value types of functions. This allows you to use type hints in a very natural fashion
   </longdescription>
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild
deleted file mode 100644
index 3a85de133abc..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nptyping[${PYTHON_USEDEP}]
-		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.18.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.0.ebuild
deleted file mode 100644
index f6640a67dbab..000000000000
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-
-RDEPEND=">=dev-python/sphinx-4.5[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nptyping-2[${PYTHON_USEDEP}]
-		dev-python/sphobjinv[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.1[${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.18.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
index e8e84bde8975..22d10ccb917c 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND=">=dev-python/sphinx-4.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.2.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.2.ebuild
new file mode 100644
index 000000000000..9eca6f1f4db5
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.2.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_PEP517=setuptools
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1[${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.18.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.ebuild
new file mode 100644
index 000000000000..9eca6f1f4db5
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.18.3.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_PEP517=setuptools
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-4.5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.1.1[${PYTHON_USEDEP}]
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1[${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-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 6b70af5043b5..d3b7d51ca59a 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 524 BLAKE2B 01127711ced20c1ca495a4e382859a03436707670f0090e169f6d878790722fcf308685e9e01c99359efc5eff8d0fde9659575376e9d9f775b3c1010de2b3107 SHA512 61a9885716069db2a91fb061272eccd775ae820744f801a52aee11c88a24ebd1cb3aa4eceb8c2b924d2de5da1a35e48310964752e3f470576c57b5766d727be2
+EBUILD sphinx-epytext-0.0.4.ebuild 529 BLAKE2B 0e33bbbcc6aaf786fead173158c1ac6fd77f80e19fabb320a71849811a2a7a33a1545d0266f51c058731d18f2767f6b3eed9c62d94d2b0eb9ac031d6ff08aa6f SHA512 c8bf6cda4fcfa308926780c4a91708c1b99205026a33ef13a217d6cd855e5ee9ff5bafab7cc855bbfd892241e032465f8f7a31912723976b65e426bf33f1e19a
 MISC metadata.xml 357 BLAKE2B 49d809900f8dbf0a7f8bf567c70c905556c36d0114fbbb78690cf7e2c312fedba8d386cb134e16e3f741a5b2b26bff99dc79d4c1818fd606954509bef852855e SHA512 7e23e07fb614fad124adb366bb05b457fa49b3c32f9e2e5a3fcd974e1be239075cb4600cb4bbf43fe843433c9c48248fde26b7221a319192cbbb846e4f97f4d7
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 604010ab6690..fd6bd21839a7 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 2953e22ba7b1..83290b5f2f00 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
-EBUILD sphinx-multiversion-0.2.4.ebuild 545 BLAKE2B f8983084be7fee57f30dd70deeb0cc8a7624971ccee025223b568e9d2dab41ef398892aac78320c00ccce6630ada8d1516b544bc47f3bc755a5814b19dcd6ee9 SHA512 df9094ed83f87e3dd7ea646d635cce555f80b1aa3bd8c274ed4b2195738ccce3f5dc0b66c01ffe32c0ffd4ca96cd2dfedef4089ed7895784348b0fe1dc31d100
+EBUILD sphinx-multiversion-0.2.4.ebuild 545 BLAKE2B 3aab276e813ea0e4a7af8f98b67315fd2342bd04546ec8f9eed7624e5290d23e32479ceea978423d6e4d85f0310f37def03c95faaf17b58899f00dd1dc57700e SHA512 49a9c91003050a535e2f4a792fe6f937dd7dc902c8863ddbe9f1ec52162396ee00915ff7aa00f5259d7bf70824852c28eec2fa4927f454fd9473d543a5460b1f
 MISC metadata.xml 365 BLAKE2B 49bd3da2d3e2d6413a8eecb440510dc86b3aee984800b9063fe0e2c0a33602c8ce01c1b3c837db76513d5c3677c34483704f73df93c84e76491f701173505612 SHA512 5b2495e893f30fc18b77e9bd66e0db8c9934972c378a98812cb0af3244eac2088f2dc7f079160cb9f879ee3afaecac207d6e1a3524bdcd1f2ea24aaf8bd8558c
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
index f936e03d0f5b..e22136266481 100644
--- a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 94156ef178d1..1a47c3543088 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
-EBUILD sphinx-panels-0.6.0.ebuild 687 BLAKE2B afcc996d884f5a86de6f7829d4e35c55c864a1941e944a2b2d43dd343aaccb4e404fbe5a99b39bdea307a775c566c5523c92d1af4ca5caf3dd08de43bf739cb0 SHA512 28a0600300123b6c10cfec8fdcea4f696b03babd0d57556766f86216e4a03bb9803b9ecfac1f5a31f7d6268d44b19900fe5a0f6ab09d153a745a24836ee9817e
-MISC metadata.xml 359 BLAKE2B 1368fabe2226a327d90fa1afe3070f0541a77bd4c85a014d5294cd43ca2c6e60fb7314a62bb17efb35bf7fe926b0fef77b955e2b1b229eb39b69114d42b00dc9 SHA512 34da0b542c1aa025ab949a00ba319ac7eb5ee4209bfb38aee398550dbad5e5189bc0ad38348f4dcb310740369cadb57c36255a3cfdbafc3c71fa543d09c3756a
+EBUILD sphinx-panels-0.6.0.ebuild 687 BLAKE2B d1a1e081572899df875f4e56ae59ec0ccd639554a3325c5253a6ca53ed05f73fa8bd3cb76821703954832c668cb77e0e39a52ec18fdc3f0deb9ea87bada861cd SHA512 227be4066cdb146e4de1343be1b80500c2294c399b8672dcdb1a441d31bfa953be704f99e8a3b07cb44af67f29e84fbeb1451e4dbf34d89c7a0e0e9376e2645b
+MISC metadata.xml 460 BLAKE2B 31c2437bd8621aed4feddc195b1c3e4462fdc07efdec108999ae5470c386cc048f513bc8805245f1dc73deefd241831c5daccf20a2f670afb0bcc1e107970a46 SHA512 c03140b7cf4bcb90e2c03cffac71ced33a4958406a93aecd031d33730de386dfd76129a8ed280757b28f935ef9cb18e8a54b891146ec83761cb4b23f27d009bf
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index 86198918786e..737d697e677b 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinx-panels</remote-id>
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
index 57a2b467cd5b..78513e157a8b 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.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=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-pytest/Manifest b/dev-python/sphinx-pytest/Manifest
new file mode 100644
index 000000000000..54bda157db61
--- /dev/null
+++ b/dev-python/sphinx-pytest/Manifest
@@ -0,0 +1,5 @@
+DIST sphinx-pytest-0.0.3.gh.tar.gz 5898 BLAKE2B 08fe98b3add1d76454c30a11f4d82bd04123e44fa5c28d420401014e5aef11354541781c0ba43a5d95c0c6fd35b12742ecf630005faae68125f5c6686c19ef59 SHA512 f1ee23fd5f320b5b4ac48638d509963638322374136d98516a17075e0d5b05cfa64107541c80daad424dfcd9e769a95dd5aa8d7f86d8ded214c9a3cdf901cf1f
+DIST sphinx-pytest-0.0.4.gh.tar.gz 6196 BLAKE2B 24b8be165a58b15a845f076b33fb7a2525afefa7fd8bf836ac679280d271716ff02bf3adfa9b485507bc3f8a6cb91b0458a0b5bdb62bf8920c09eb20468e8949 SHA512 25bf3fafddf02aed8b2478dc2beafa251027652d03f31bbac67eb98913e359f9497a9018561aff0fdaf568ece4bcfa15705dcfa2fd3734f4db6c613b24d6a568
+EBUILD sphinx-pytest-0.0.3.ebuild 657 BLAKE2B 0d1421e28be5e079fe5941416f04194308ae97cf78f8de661fad8ffe0a71300bc89ab5d30a667eea0b253d54878211b2b444e5cced3b32de987d1a9ac34e0cc6 SHA512 677961345eed6a5c4f687b85299f3271cffdb8df85216d192d8a822407d89bc7e792b5ddd041da9b54e62efb3caacde03194102161d85b37118cc0c87cd81a6a
+EBUILD sphinx-pytest-0.0.4.ebuild 663 BLAKE2B 14a4b1a8c3ae17ad68e607078b8d912259ee54b3433395adba816beede3146d28b21b8959764c3c472f3c7481c86b2dbdff526b03944961d45afe003a070efe4 SHA512 1d4f3a1fe717668e9b99d90d36898c1c2f769db871bc60069ff3ea23cf2e7422feedf13b809c0f5d36cdd0e83b6a3bd1e08768de6bad8509cc1ebb6b20b519c6
+MISC metadata.xml 407 BLAKE2B 13becabf5e4e4ebc10ca9e3db7fb4da1909369b6a66651b2f40da2e635c851a14ffc39b7a50e4650663746abe1aaeb32b0e332c04f413f223b458b646fb066bf SHA512 8aa7f61f15f906b26c27719b2745ddaad1bd5fe70f840a7dc2b729f3c6c4f9106531c3d52860a4f98a64746582592f370b59a409acf9f646dff5ebb578fda1e1
diff --git a/dev-python/sphinx-pytest/metadata.xml b/dev-python/sphinx-pytest/metadata.xml
new file mode 100644
index 000000000000..d0dabef2414d
--- /dev/null
+++ b/dev-python/sphinx-pytest/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="github">chrisjsewell/sphinx-pytest</remote-id>
+		<remote-id type="pypi">sphinx_pytest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
new file mode 100644
index 000000000000..5dda95b0b5eb
--- /dev/null
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
+HOMEPAGE="
+	https://github.com/chrisjsewell/sphinx-pytest/
+	https://pypi.org/project/sphinx_pytest/
+"
+SRC_URI="
+	https://github.com/chrisjsewell/sphinx-pytest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
new file mode 100644
index 000000000000..1d77e086683c
--- /dev/null
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
+HOMEPAGE="
+	https://github.com/chrisjsewell/sphinx-pytest/
+	https://pypi.org/project/sphinx_pytest/
+"
+SRC_URI="
+	https://github.com/chrisjsewell/sphinx-pytest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 2abffbed2665..976b4e1f9f5d 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
-EBUILD sphinx-tabs-3.3.1.ebuild 978 BLAKE2B 2e1a0ea7c9cec32d5252ed6f0a8c4c7f224494a41e1461e43a032000c4bb02ea97fb809830fe3a8eb35309d0d1392bc2a89602590e98605dd55962e88b1a7fb0 SHA512 ff824eccc7432a5b3ddc3b3baa8f0712ea41bb58d6189567953b729be912da41fe38ac7e1a2445d5e4bd6e017921d4691b64b13e14823918227a157e30564157
+DIST sphinx-tabs-3.4.0.gh.tar.gz 524212 BLAKE2B 18688d10d37e5794340ccfc5d798a31bf80374ed74e64dcb54ae53dc557d7538de39b4e29002d16735cab5ed4618189af54da2682dce195c503af442f554fef7 SHA512 2833586c7040e454cac65963a3dfb22ac7e09b0a4cd5cba9ea449d798a5d7120ce3d19ac0a9d638a9389d52773bd98ab4bde33d06924170757036ff3218f6d55
+EBUILD sphinx-tabs-3.3.1-r1.ebuild 1060 BLAKE2B 7fafee7e456db576410c3c1b11e0430c49c249869703477a694b0dd5cdbcbf2e7048955a6394248e267f9ea13b21d5951939b2dde5b92124159c8ca43f173e16 SHA512 19f543cd1b8df03b2153af99a72633ce617a784967821fd05a797f54bb3777a7a47626062732422bfc0af62235b8ed0f7547c172b45aafd7ce951c1666b6068c
+EBUILD sphinx-tabs-3.4.0.ebuild 1206 BLAKE2B c558985d64d1d66624a653754983bfc6b30dcfd96df8632746da9b918100ae056edfade7a57db8b23bbc4f1018063673c210af410e866fcb0e74609230f7ec78 SHA512 dbca25c37c953614b5ff253601ca2f6dba9d7eaa7dd5d9bc2adf6cac71e8c6214031d7e26f47b373c55f57a57eb23b1799e58b2de7a93afb0417698276b8a446
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..c396a7f60c23
--- /dev/null
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tabbed views for Sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/sphinx-tabs/
+	https://pypi.org/project/sphinx-tabs/
+"
+SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# Unpackaged rinohtype
+	tests/test_build.py::test_rinohtype_pdf
+)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
deleted file mode 100644
index 828e5557db8f..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="https://github.com/executablebooks/sphinx-tabs"
-SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx-testing[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.0.ebuild
new file mode 100644
index 000000000000..96c47dbd8305
--- /dev/null
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tabbed views for Sphinx"
+HOMEPAGE="
+	https://github.com/executablebooks/sphinx-tabs/
+	https://pypi.org/project/sphinx-tabs/
+"
+SRC_URI="
+	https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+EPYTEST_DESELECT=(
+	# Unpackaged rinohtype
+	tests/test_build.py::test_rinohtype_pdf
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# annoying, incorrect version limitations
+	sed -i -e '/install_requires/d' setup.py || die
+}
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 1eb07183e04e..8552e8c6eaaa 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,7 +1,11 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
-DIST Sphinx-4.4.0.tar.gz 6690021 BLAKE2B 5f63a6a70b8fb663ff1729766183f8936c9cd3bab81437526fb099ccc2a49c2abd42b602e2fc37af79254a9c8f1238fb4c99f2659142e9b9c2c1a2bd385ac100 SHA512 f5780a7da7a5d758b0e145ab9a7f191a9c65fd3ca4624ca3a04f0d161e3cd6c7133df53ff56e42f012687cbce0460178c2e7957974b5b929b341c98db996c640
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
-EBUILD sphinx-4.4.0-r1.ebuild 4166 BLAKE2B 9fd6579ff3bed3e17fe33f112b8d9bacd345f965e1f418ac33f7a72666fcbf24779300532cf9d6a3dbf0168397772a1365c9422ec7efe928919a3997a3dbe245 SHA512 8d6589dd0792bd6504568aa4e026894806cfc575ae15308f86449d6d7ee42b7e8d3497cc8397a7459f2d9198cdf91f4992082ba7b37721dd97e165ddfd615ed5
-EBUILD sphinx-4.5.0-r1.ebuild 4301 BLAKE2B 41ea4e97077cf516c7e121d366a3aa599e00c111c8fc73f9252fba7ed6b86f9c84716402939c813838c106195a29b3132909dfc5e4098ad906c5928ec9767ba8 SHA512 79bc2472c69da5f537fe3643301fb2b8c30e742f0ddd1fb6cd2beddc39de772a344b4d1e41b38a8e601ab56be0b4ebe956a4f6f0c1cd34ae5af6fe127f178052
+DIST Sphinx-5.0.0.tar.gz 6726986 BLAKE2B 95f2b85c7de6d900922730c3e431259e2333b3fe27e25cbe35e9584ccf1ac3442ca0949018e64ca8481e60f2298b46f6a77523a7a67e6aafe7492b62ff97aa70 SHA512 6b58427aa8a4d9e159f5b84366ab2193df5a9e940c9cb11b440dabd2c32dcdbadbb7eddbd9f6f8c53e577bf7bfb7c11f979835b5df75139b5c5315f88794871f
+DIST Sphinx-5.0.1.tar.gz 6728011 BLAKE2B fe75d6bae6c035ee8ce24e3edb8ed8df9973835bdc935170775a7e80e1420bb0dee31976343dd0c3791508cc944f7b9ea44793569a94dc03756ab02d313e26d6 SHA512 6a850860fd7a320c49f2d406c511d1e7e2fc0e044911f98be3a07b1d519e79d57cd2d16c0042926255323625f186a26509772b425611fea85dfbeaae7e8e06c1
+DIST Sphinx-5.0.2.tar.gz 6729086 BLAKE2B a2cbf8efca673d15e364d0db74a8c5e2c0ff469f2a102317fb9bf23aac12c12ced2593e3a5e2dd0ee2bc114f2018356d382d601a3c7ff9b2943e38b59fe45db4 SHA512 d564697f0b82a9a59dd6a81e7822dbeac00fb6cc98cdc2422f04ec87c5133b5e03057ccdfdcfe38dccff41f6c53262d49f4ee6f77047c579aa2e55370bfe2dc6
+EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
+EBUILD sphinx-5.0.0.ebuild 4439 BLAKE2B 096d95482be20107c06a5ab670def8c87d26b605584a1a92dab725bad1d89d30bee93b9edaf40995f4511a30e3af837adbfdf9f9a5769199bbe729f11d9f038c SHA512 cd625abbd6f2dd91c7232eb3e8869b6d8946ff92e622d2f80df39b61e8eb0212f287c305a31c5e493c9c9c8257780010696b720bfeee8f38ac4f59e35ef2a1cd
+EBUILD sphinx-5.0.1.ebuild 3896 BLAKE2B bab97af9df8eba09cfbc08e3a82fbdf1412e06fa11dab31ca828cc7ba97aa682316713f8c36b299809c2c073dde4c074c15c6aa8424df68de8300aa8d9b84f17 SHA512 30156ff177f74a4ad71a08726ad4a9a24ef4b28cd5a2d0abb9a9fe9a4d9002715f9a223afd002ea4c00f49ea0373e0706efd6a122e8a27c4467ad0ee53f8ef77
+EBUILD sphinx-5.0.2.ebuild 3898 BLAKE2B f1f2b0ae99aede0ec91e2fc13b32b0e024aaca69e2d93553af9b357b7ea80a626add54fd5355159dfba6034d530afb545675cfcfcdcec2386ece3011387ba048 SHA512 381bcda5554539bbef99845cc848f3fd6ac776a5fa1f5faa5bf2a05cded917cd483bc8c026eb798d2b09d79576f43e893c0c3dc4d19ebc35c755309386923377
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-4.4.0-r1.ebuild b/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
deleted file mode 100644
index 43a0b572068c..000000000000
--- a/dev-python/sphinx/sphinx-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	<dev-python/docutils-0.18[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
-	' python3_{8,9} pypy3)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/namespace-sphinxcontrib
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	"${FILESDIR}/${PN}-4.3.2-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local EPYTEST_DESELECT=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
-		# TODO
-		tests/test_ext_autodoc_autoclass.py::test_classes
-		tests/test_ext_autodoc_autofunction.py::test_classes
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-	)
-
-	epytest
-}
diff --git a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
index 671c9f094689..d11d1075493e 100644
--- a/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+++ b/dev-python/sphinx/sphinx-4.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-5.0.0.ebuild b/dev-python/sphinx/sphinx-5.0.0.ebuild
new file mode 100644
index 000000000000..adceb91af590
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' python3_{8,9} pypy3)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx/sphinx-5.0.1.ebuild b/dev-python/sphinx/sphinx-5.0.1.ebuild
new file mode 100644
index 000000000000..64cbb666842a
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx/sphinx-5.0.2.ebuild b/dev-python/sphinx/sphinx-5.0.2.ebuild
new file mode 100644
index 000000000000..f9cabe05dfb9
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx_ansible_theme/Manifest b/dev-python/sphinx_ansible_theme/Manifest
index eb2de2464871..52ce2a33489e 100644
--- a/dev-python/sphinx_ansible_theme/Manifest
+++ b/dev-python/sphinx_ansible_theme/Manifest
@@ -2,4 +2,4 @@ DIST sphinx-ansible-theme-0.8.0.tar.gz 34401 BLAKE2B 493663331e593da8d5668399176
 DIST sphinx-ansible-theme-0.9.1.tar.gz 34505 BLAKE2B 533e665b30f5aa450e4a2240c55c4992340b9f6ee03d27758bf119dfe2eef987fbd4b98136349af376557d8e9a78e5391a648b9886136995d05410b0c26561f2 SHA512 f78602af8affe7be59988f466cf6a2aa67e174086f338cad855369a7bbee5a76d07bcffa8406dea5a819127b26d69e29b0d90dab38b82524b3e317f9082d0379
 EBUILD sphinx_ansible_theme-0.8.0.ebuild 746 BLAKE2B 3a42d0e2c5df94b96941b931c8432af452c9e5f4efd436f68a9d21b76c6126e4772b4f644b489de7216fcc7982d45acf870200d8ef0acddfeb9ecbb3fc46a218 SHA512 433b01f1077e8b2fedb24acfb71d2f70f7dd8ca0546240c461a7e6503bac0cd0e363728ad6caf1a93e84c7d4b823df5917de3240e2a0c3a7825639c8ce38ec74
 EBUILD sphinx_ansible_theme-0.9.1.ebuild 780 BLAKE2B 0507e1b0a2166e4eded12ebbc8a022614ee44cff204632f414a178f8cf4da9795d673152256d19eb5e2f09359aa86fb86a2dd2499d9111d86c3ae4ca3a3d4588 SHA512 fbb6d09a9f737d083c4bbdc881eed15d4ecd5e3c548dd03beb1cb52f59b5188bf227e716eb78b76d421a8c813007d5ba867d7f2459e9ee4746b41e3c1fece2fb
-MISC metadata.xml 431 BLAKE2B 67a8ecd46eb70f203dbe1d988f4533cc8973b0c92958fb6c6795730c8662a714f0d4a8ca847c9ddb83df100767e6e2108e29fa512b109ecce8ed04724aad8473 SHA512 5689d031e76d4f2387ad0bed91d367a3f180b57f200ed74fdcafac600f0a3284946ba6bc722cf1cb3be66514c56c81d2eaed50c49497bc83feb6b4eeb903d4f3
+MISC metadata.xml 532 BLAKE2B a684e40deb310344be8b988f801674872c61052843664b13ce22e08d0c38f629a32749fbc31661fe56c997e2d8ad84d0bc689cb671d047025b8ebade6ed9b8c5 SHA512 6562c3cedeae7bf0097119c2c13dd6c6fbb230c5be33927fa101b8daf4f759c8356d2c760cb7fbc880c2b385a60aa314857d656cf02250c62232cebaf1787a15
diff --git a/dev-python/sphinx_ansible_theme/metadata.xml b/dev-python/sphinx_ansible_theme/metadata.xml
index 9c42a3e7defa..3e45ed16c521 100644
--- a/dev-python/sphinx_ansible_theme/metadata.xml
+++ b/dev-python/sphinx_ansible_theme/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ansible-community/sphinx_ansible_theme</remote-id>
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index 82852e72adef..5abae52b065f 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-EBUILD sphinx_celery-2.0.0-r1.ebuild 519 BLAKE2B 82c4a05b9a71324d7fa4ad4d92ef2d889acb5c0d99f45d39cd5f49a6d90050b12ae6b69d546ea1106eab5acac0fc00cd51f3b5cef5cb46e20600400d537f9294 SHA512 adbaf247f04f1d86226f4c3fb08447a9d68ab350be478fb6974209fe278533d940d744f4cd07bc3457fee8ef283f16236f6d7f3dae1fdfec538f961528855077
+EBUILD sphinx_celery-2.0.0-r1.ebuild 520 BLAKE2B 5540b98aec29d5121c4ce7556b08234c46a94b784e0df384acbceb570c43aafe56b30f5d5e2a50031d07fb5ee0b8c41db86a3413ada67500e435058c21d4ecd7 SHA512 9d3e6473fbbc811e0613321a9f5a76e64df3010ce14d267db1075031b77a7e334be2792d01cb284543d82fcaba9faa13cf2ccae14f570d075ee8c3db88db19e0
 MISC metadata.xml 355 BLAKE2B 0d353c76412b8b25cbc724593c1f882c3d13209fa57eabcce5a452ee72abdc66b196c1fac1c05b3b98943e1dd39fbfb7e49eeb4cf93cbef47bde4873012888e7 SHA512 e381d442b1de1a76436cf57722bfccac646646255a16b04061db9be15ffe1a10570e92b5830f0df59b0ed3a67c53317579a02156f1a878d8075813a2f5d65c9c
diff --git a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
index 62dd26081087..85de2bc0e770 100644
--- a/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.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_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 7dedfe65c352..c7745f3e0483 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx_rtd_theme-1.0.0.tar.gz 2780623 BLAKE2B 02e72ddade0632423d21e512ab86fbdcc9f18eddbef328ba766f1b06a49c838808af4ee000e57c8f0f40112569b35c1b62c9c0c8853c237fd2ddb6de76d48a21 SHA512 06025445e1358c994bf0c15a382ec8f8f3f2114dfac19f340585a3660d91a279100c2d16ef665d9eb8d38b0e4ed264e96d3ac6814dd01b9430d2f8a0d8275178
+EBUILD sphinx_rtd_theme-1.0.0-r1.ebuild 969 BLAKE2B 124160ff6d970e45a5116b1b8d8495975e5e28677b3f14fec48e0fec934032a87493f77f4624a9f4521ff1fecac4f967a0a7cbfb8d5757d6085899d0a92dba49 SHA512 84612a0543d3340aa0953d5047d25cfb52260551fabef3e8a4b2a5806e6479e955b5b0628c17785e2c9f2a6c8d2239b4d8a5a15c567afd8adedde34ada829fa0
 EBUILD sphinx_rtd_theme-1.0.0.ebuild 812 BLAKE2B 8cf2a133756d55d376f506d84b302771aa5750a3080e7e68eacd0f292e6cb3dd36ecc0a7c2054c1393dde68d05622b264c0542a4e03ad7174db7fd68080c3c52 SHA512 6b56a0c7d3bd87a91d8d6e4b3a796938f51561b93c347bc1a7a1b200dec341867d8b07034f752de763d1fd21d7f6e0a408bc8f76cb87e2ba72ba391c6accd211
 MISC metadata.xml 412 BLAKE2B bed5105c13db0478a4b6129d634b8028b80cfb4e7969705ed0a693286d7f1645608ba6e6066cd3219c267c097bc1bd7d1ee13531d91d8cb4fdf6a5f107ef2252 SHA512 a0e7ce66d5f68145471452e49c173aaddcb502c9ba35af543240e5fbe9b24c0bd94ecf5782d5d81c23b3e63b80cf0cab4e39d279fb635f17275702e9a56bd5bc
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..0a497b47627c
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/sphinx_rtd_theme/
+	https://pypi.org/project/sphinx-rtd-theme/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin docutils
+	sed -i -e '/docutils/s:<0.18::' setup.py || die
+	distutils-r1_src_prepare
+
+	# CI=1 disables rebuilding webpack that requires npm use
+	# yes, that surely makes sense
+	export CI=1
+}
diff --git a/dev-python/sphinxcontrib-apidoc/Manifest b/dev-python/sphinxcontrib-apidoc/Manifest
index fa72b7c35663..b497e907d420 100644
--- a/dev-python/sphinxcontrib-apidoc/Manifest
+++ b/dev-python/sphinxcontrib-apidoc/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-apidoc-0.3.0.tar.gz 15396 BLAKE2B de726316daa81eae1a8012c8be4acf3850f910af562d23dc17194afc86b40daf632bd5cdd61153299f35f3326b181c3b67e75925f0d95ce4cea81e1766c7828d SHA512 043f9b36eaff7b3f6d23c834dd3947e2b029c66010b3862f1658f03e0fb6c4aac3304f49465dd515a30107a685dc704a0e319675c9d7b27897445a2c315d07a1
-EBUILD sphinxcontrib-apidoc-0.3.0-r1.ebuild 815 BLAKE2B 5be8864a1015f613e47208dfe779ff13f3c3a38e588ad3d1b0706b81cc0aef832aa7770a6eb542e913a559ba584daeee0f108597542fa7a0e4f6f5e3a814d4e4 SHA512 0c8509a1b659b7c1bd9d40807fc3d03c576b6c096469f1fbb9f9541883e64808f7277e3ceee36f979b3debca82a8f14b929f3a4319f682dfa57e4c1bcfaea328
+EBUILD sphinxcontrib-apidoc-0.3.0-r1.ebuild 815 BLAKE2B f69ec2e03d80c2fb3cea09fe1b6131c60cd29d5929294291c336a28cd6277bb9cc2fbdfdaa1d5d2541c3347764f8c4ccb09fe5178c2e3ac75199c60ad9a7d3fa SHA512 8cc2a425b8cde5ca3890080f95a42e337005367cec12d1249f93cf9272f730808f36066f680274e0da8cde2f848fa3c35fed1fdb9b05b3c3d2077c0ead82b365
 MISC metadata.xml 419 BLAKE2B 554f4470c511dee1236a43dd21f9ee435939a55fd3e537f1520e5e957afdd6ddd20320634180f02a794e471d41fe836cb3dc008d68344231101aa9b2cae17e81 SHA512 8e4bf13e2bab7ebf14d97635bb1a66ef6d26ee6d00364c281722ffd51d1d0c1378b02844b560cd49dae9b9710ae4feef864ebb972aa0e0d9c13126ed29f2845f
diff --git a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
index 44aa452dc052..97b185b1d01f 100644
--- a/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index ddd2140dc2cc..d37ce66d8306 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.2.tar.gz 24548 BLAKE2B 9532cb990ed97c6773388a66895a066958187e9100d226e2274c26ba07fc5832e42ba407864b69b002da926a79e71ac2d6315125906156214df3920b585d9f71 SHA512 1325ac83ff15dd28d6f2791caf64e6c08d1dd2f0946dc8891f5c4d8fd062a1e8650c9c39a7459195ef41f3b425f5b8d6c5e277ea85621a36dd870ca5162508da
-EBUILD sphinxcontrib-applehelp-1.0.2-r1.ebuild 974 BLAKE2B 80eda57f753024a767368aaacc7f19270e0ff266fe9394445a412c501c1c4ac0273d970123f68f3055a8a255bf760cf27a50384ac7db2ce5996cddf8a71e8ed5 SHA512 7abfd630b35d9a55d2ff0de9e9ccbf0dc5aa42502823f43a868d786bd8abdedb3182a9b56a852443200e6142358eec6283a7f2ffb8a7ef2922ea0796a72802d9
+EBUILD sphinxcontrib-applehelp-1.0.2-r1.ebuild 974 BLAKE2B e90432e49f407f7885e4deb454c83720370efeaca2bc1c0bb5be3293fd7a839069961702f09109c58f9650ab641f24430e7e143cbd0980082111823e3c4e4e85 SHA512 39ad8083b2ad9491713c3ef8f4034e4191eb98e7f50f437fca94a63a7b4055ab265a638e2a733c7086ca08e8ac0ad18ec1e0819872a88fd827a27025bfe947a5
 MISC metadata.xml 425 BLAKE2B 69f933f9bbb268736b6d99ac9256c9b2a5eb53259e117a2e02dd5b2d284d83b947c9e58fee62f4b2bbf1446829f337319fdd4c1f703d6f6c84a4ca5799d141cf SHA512 76f9a4483e7899eff96173738d4c116988fbb64852a306359649dd882abbc6b574e685a7947e4636f517aeb4b4ff56a9f8f84d9aab8da63c45fcaced3ce1aa15
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
index 7218d95a7862..b11431d540dd 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index 0450654ab3f2..7477a5ce4fac 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
+DIST sphinxcontrib-asyncio-0.3.0.tar.gz 11622 BLAKE2B 8c3358ad191e12e79767be6e6f3800e5de423d9a5ad005bdb416aa7a601cddc5f115db3e9b27213c06dbc341b671cbacd00217b65496baada40bfe257069abfa SHA512 fa66a2a9b5f89327686481f46d8e5be0b674f6355c8c0eeb862bf0ca0b5bb848121c5ed153780f653242faf1b82debc6917c3f6046244cce0f1423303a324f29
 EBUILD sphinxcontrib-asyncio-0.2.0-r3.ebuild 908 BLAKE2B a6b3979a77ca6e00373cb1b6546e843657d195d23196033d892189754cbd686bf9e444bf931641baa21e51493b0f9bb9aca25956ca057302c58cacf63e0624d3 SHA512 592c3da169da3f3061b07d563515805dfca99bc90ee509d2ac251b959b8a888dd2ae53bd37d8b51253acff357273701ecdfb0ee43c7d3fcc02629f06457c63ec
+EBUILD sphinxcontrib-asyncio-0.3.0.ebuild 969 BLAKE2B 3e49eb341d332f5b01c2f661202b5eb61b4c9438e4af3e4a9686f1aebd35e119e6535ce3bb2485a6f89f99b84430012dda425000a48a72ada9126c7dd61923ca SHA512 35c5f17a139b97f659e3a1f583f471e9bbb103f5072eb9a3a7ccac685cefd27efba23a026667c5d337d922f8e4327b9d059fc422afd4b0dac82329137026e41e
 MISC metadata.xml 397 BLAKE2B 357224874a9e2de147a2cc2a85350092fcd6189b1a3cb6cd1934c7eb922a9e0fb289776b65189dac007be1e663c3f98c73e656b5ab3677524bfac9329d41a542 SHA512 558c76f15358bb40e1c0a68750772487a3176b44f4f8ab046c0c8173d2fc0535516bd5dc4606646467785014a3e879ed7e31d5ccd10097741b02009c53042afe
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.ebuild
new file mode 100644
index 000000000000..b4063a15cf88
--- /dev/null
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="sphinx extension to support coroutines in markup"
+HOMEPAGE="
+	https://github.com/aio-libs/sphinxcontrib-asyncio/
+	https://pypi.org/project/sphinxcontrib-asyncio/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs
+
+src_prepare() {
+	# fix for sphinx >= 4.0
+	sed -e 's/PyModulelevel/PyFunction/g' \
+		-e 's/PyClassmember/PyClassMethod/g' \
+		-i sphinxcontrib/asyncio.py || die
+	default
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	rm "${BUILD_DIR}/install$(python_get_sitedir)"/sphinxcontrib/__init__.py || die
+}
diff --git a/dev-python/sphinxcontrib-autoprogram/Manifest b/dev-python/sphinxcontrib-autoprogram/Manifest
index 3b0a7f5e6720..384bf97a2e3d 100644
--- a/dev-python/sphinxcontrib-autoprogram/Manifest
+++ b/dev-python/sphinxcontrib-autoprogram/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-autoprogram-0.1.7.tar.gz 18663 BLAKE2B c1ad18df1c9ccb8fb1947ba7abbe2bc52fb531ce8142340b71bc063a6a758831d2a46913fb969f52791c3a86cb86a8eddd378c6403e1be4eb23ece2380386eea SHA512 df416759e9d6bfc69780f864bfd2c0fb847515df1d5416e4c7fb78ea0feb9cf0e360da457414a6bed5a56f69fd8ece3ccd2ed5af5fc1f56b40063765ff04f7a5
-EBUILD sphinxcontrib-autoprogram-0.1.7.ebuild 618 BLAKE2B 3d2583dc38983f75ae51f43dcff16eff5d34c20009a4341281c9e21a8b9e6fb4ca1d3b7851113c616f61f52fece9637c227789c852d4c3f23ceee4056ec5e2c6 SHA512 962014a005c4d72dea9c24601ba2b54fe42530b875ff9c833bc20a035c656ee15b33d9f1b8d78d7fe5bba87c57bded3f982cd8cb6c7ccd226eae932126de2b93
+EBUILD sphinxcontrib-autoprogram-0.1.7.ebuild 665 BLAKE2B b83c881472603448c1a36620f6268b2e4025cb891b674b2e58792a744510f5d28a3e1b4a0a2724d81031b46fa36bf806a7e565f220b868a30543819e2758372c SHA512 db44ac3e7e10025c68347b093efbd2f0e10818682f5cbc640d8054958e80bb9718ef0217e12161754302a78c7283e42ccfb44ef38f8072706c901e62e0e908f3
 MISC metadata.xml 371 BLAKE2B 18613d832bd019781033faddd8b2f023387986820f3ead099562a15d324f930c5b1c66d9f7afddace013f8a80290c2b31948735a8cce989044c3e64bcc17c227 SHA512 2f1d4f8006eb4924bb570ab15b243d9ba9db0efa6dfda8e35209adec0d4dadce90044bf90f95fe140b60fb5e94c794c82080fe1c56dd028064e9f44d11441ccd
diff --git a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
index bd789b675d0b..0b4e74d67e69 100644
--- a/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.ebuild
+++ b/dev-python/sphinxcontrib-autoprogram/sphinxcontrib-autoprogram-0.1.7.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -20,7 +20,9 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
-distutils_enable_sphinx doc dev-python/sphinxcontrib-websupport
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-websupport \
+	dev-python/sphinxcontrib-serializinghtml
 
 python_install_all() {
 	distutils-r1_python_install_all
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index 63d897ff0d52..f229e9f1521f 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-bibtex-2.4.2.tar.gz 284061 BLAKE2B 06d9a868da621cca522c45998ce5f28a5aafc501127760c494e9e796d807800cccf3ee0cace7f4b824a00a76e8dd80e77d0ac5e037f2eaebbeec2ce4ea2ead70 SHA512 52d47bf0a20ef13f29b712bbe66cbcb98bd9531b8032a847375ff23180368decc3f89c2323b9ccff77c9bc9fdada63c521a81da6b701533973fcf627c2672e82
 EBUILD sphinxcontrib-bibtex-2.4.2.ebuild 895 BLAKE2B 5533d9858e42d8fcf23a9ba60f2a250bb0ff76745ce1ba1e3a96ed146e31493356468a2d621e320fe2c9018fa58418d0ff1b112ad034ed41df66c4e77e7c8ca1 SHA512 17928c553024121f85ad78a6071f75b12056aedb76314844211029f7f771658a4fa2a7e8a43fca7c435bbf1e176102e7dbb6dab0a57d9675a62e85eda8963fb3
-MISC metadata.xml 438 BLAKE2B 265a193a9152a7ba1974237391e9d6bad963df7634d1b6c9f28322c0032de1897c3f1ef370bfd036f35e752fa15209cd4e856d1cd3ca3a5294cfdcb3802f877d SHA512 450565aa679724dc0b99db698ffbf99f91e5c019b74bfe7772750eda72f094649ebb4ca815cbea26f4ecb795939ded7af8cb45cec2cd118e9e69d68f01c889fa
+MISC metadata.xml 539 BLAKE2B 9990d81362d6a2d5bb471fa2372b92d3ce4a4d08e57098dbe981b7a2320c46095e404a6077c5d5c57daf752c03bb4cb809461a05f11e1c2ecf771db201f8147c SHA512 421b99f9834ca4240a7959f99a8907379e0730b8c2ce608533ba4cafff3a8502738044675f0abed00f5f1cec195c18f5fd933404afff6f3c9b74c7cca02dba31
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
index cc2a93866978..de28e3ff7b05 100644
--- a/dev-python/sphinxcontrib-bibtex/metadata.xml
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-bibtex</remote-id>
 		<remote-id type="github">mcmtroffaes/sphinxcontrib-bibtex</remote-id>
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index c4fb8104320c..42d1232096e4 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,5 @@
 DIST sphinxcontrib-blockdiag-2.0.0.gh.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
+DIST sphinxcontrib-blockdiag-3.0.0.gh.tar.gz 12300 BLAKE2B 4bb6e83625095aab209b3f8eff3f96dd0c0ff37c542bedd03d7b56be282bdb6929bba7ef9cbbc458492b17bfbcf80d705cb17b3f194213c1416bf1ab090fcc6a SHA512 1d03296007b0b6455fa25b1c0d3f09fb76dfaeba43ac7155033ec6fda0aaae40b757f6b77b63725489f2360eb5a80ce8e9e55eb6460b73c3b3bca363afe8aeac
 EBUILD sphinxcontrib-blockdiag-2.0.0-r1.ebuild 1227 BLAKE2B 4111c11961945fa16b5e326014eaecb3d88b806a50eb2e377ddc94dff954497b6008d83e43313ce6f18306600ce9a41c74473a080648f977e3afa11f4469029f SHA512 2b98094fc3ebb15babf69712ac9a932b746ff126bf2f4c7f3628e693c47780c2b148f79be4e6b152294a8234d49eed1e7d448970fd7241b1abf7ed7e2fd3bfb5
+EBUILD sphinxcontrib-blockdiag-3.0.0.ebuild 1186 BLAKE2B 393b3b9201548d4b45e0b0e3bb8645b7d6d61984091e63583992ec59e45b03b4faeed12aaa695955bf6763ab5ea479149b3e367bf8f6cc2a360a4460b98fa385 SHA512 ce0cc97731545acaeecdca638f98d51e8815a2a80fc3d138fc7791701908c3382bb1ba5c3848ed965a5bfc6231753ee7df0c7f413db7bf6adaa3ebc0d467bca1
 MISC metadata.xml 502 BLAKE2B a9910c9ee4029937c23f98b7cab1b6d9b2ca72db3272fab0c11d8e3e851e249229a2749d74250c8717e83d90eab0613cab892e7218b70ab26b761a77c23bd4a8 SHA512 993ab6e8cd639af61f08bffe017bd6d12539d20f827b1992a8d99e9cbcc6cfb18b254b2b7a86ce16a2b87125254d801333f68469bc6bc6b576a70d27c605c6a4
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild
new file mode 100644
index 000000000000..63bb84ea4cc5
--- /dev/null
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-3.0.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
+HOMEPAGE="
+	https://github.com/blockdiag/sphinxcontrib-blockdiag/
+	https://pypi.org/project/sphinxcontrib-blockdiag/
+"
+SRC_URI="
+	https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
+	>=dev-python/blockdiag-1.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/reportlab[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	sed -i -e "/build-base/d" setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	rm -rf sphinxcontrib || die
+	distutils_write_namespace sphinxcontrib
+	eunittest
+}
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index a71d1469eba4..fb899dca156e 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.2.tar.gz 17398 BLAKE2B fcf04148bc4a77963517d9011c20a6b77eee499f1a5dcd4a9631b4f415f80a9f7091b254f74ba2fbc9b7106dfb741dc839e14813e088d5a0802793ed457e95df SHA512 83b46eaf26df3932ea2136cfda1c0fca4fc08ce8bca564845b3efe5bb00d6c8c93991f4edd4913d4ec796e2d85bd2c7265adf28e98f42e8094daeb5ac11a0eb1
-EBUILD sphinxcontrib-devhelp-1.0.2-r1.ebuild 972 BLAKE2B 01ffae3c4915af723e81edb851654dd19e1251ef7e46d42ae0706e38206b731ec9bde67de6fb419c684227dbbc6460ff2bea30f526d07611a98037e66c0e6d8a SHA512 22de5b21ad4cf4e3d563e713d1d491e975bcd666a49b35cc12c90961a7e0f6d09d79eaf5658e6f2222a084019511e7f1988ffb6b7cd7603659eb0358fee51c95
+EBUILD sphinxcontrib-devhelp-1.0.2-r1.ebuild 972 BLAKE2B 6e68e777d23b6d50faf5fbc201a01f7c0eb90bc9c09a137aa4c9c9457c2c4749d48dc2217ab0ef042a8b64f17cd22b7623d6c78b2b51eb2bc62cdbcb6d719321 SHA512 4f15dd8a4c8131e62ac1d7952e9e5ad7b94c99566dec6ed23c0da470b8600cd09f9d3a822029fa7f6a2befe0fdd7e9a8d820c1046132d887000d7111fe211fc7
 MISC metadata.xml 421 BLAKE2B 0149d4fd64eb705d8731df8aab1a95f29797e68db4cee2dc31b9c1e1cda44223d966e0ffbd1e5ec1b83952f18c3d9965d4d1d7df51fcf88d8549e30572b0ab91 SHA512 b4051429218926b1a0ea4cf02f48a1ed3014245baa2fc4704d4fff116234fa2a83cd8c229377faa8e2f613445df1391d292c77482c59bc5441289e7d92bb8dc7
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
index 7c3d92d32739..55798fd4310b 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 8e9ec54da9e5..01bfbd7c2836 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,7 +1,3 @@
-DIST sphinxcontrib-doxylink-1.11.1.gh.tar.gz 22087 BLAKE2B 2f59c2cf802f428459eb13dc095dea2422ee37f9fc93ec8ceb4e6d72bbb8d0381651ef348de77aa5362857ebae7ff9a92be0c868575e43cf4e6c3b271b05147a SHA512 5c86771aa064e3e9ffeb04223ff8cb90fe8c6b8ad8749f250a8a866b4204bece6b82388cda3ccefc83901966e97b3093d3d47bc60fbd8c9f84a5b162fd4d8c02
-DIST sphinxcontrib-doxylink-1.11.2.gh.tar.gz 22157 BLAKE2B d2c26675b89cdc9b22b1fae09adb935c1d3491b568d3c1dfcfe7c1dbc378ecbacbe1d202f1a77a90afaf9b7bcc9a1320b4cf3e6859bf631be42b636fd90810ea SHA512 6d470a3bddadf1e56b1ab77e366d5636de0d6ef84bad0fbdf57f903a7493f4fbc249ade7e2f41bd1bb24e39a9396b8a440886cb7766832a108caecb533980f5a
 DIST sphinxcontrib-doxylink-1.12.0.gh.tar.gz 22589 BLAKE2B 322fdd0968147abc480a88247ee724daa8c4da4519ff97280af1d81e9f36d4636aca358f5bb1ba08e5ff0f138cf8446194d1fe819a9d18a227eb463b20ee5738 SHA512 7626fad06613a614b5d6efdea088825732571c7ed45f6f2d69f34e0aede020df0930716cb34ca14260891a29aa152019c7bfae8aad729039642ea1c6bbf7d09e
-EBUILD sphinxcontrib-doxylink-1.11.1-r1.ebuild 1140 BLAKE2B 3576a73de6422258f9191838cf4dd450cd6c475b46823be32e117e87186e501a13654b6574bd0eb050bc2a2026e63a44824570b20564332e6b00d5ef69ed76cb SHA512 25252d14c424f71884701ed38d4ec8588df3252cf7cd5fc455eb5f64c8ee318def3a0bc9a1f74c029d765c15bf5292150270d62298042bc8fd256f122d3aa34d
-EBUILD sphinxcontrib-doxylink-1.11.2.ebuild 1142 BLAKE2B 6d1a1823a8883b6776abbbfb3b5e469cb001f66bb0ec28a5e83607340e19e3c7e9f684dc83014bc97393df1420e99650612759a0be59f9478030855114fe4072 SHA512 3f06fa07802b8a9f8fb462e2104f9d2ad51b8da0902f4d8321b9fda53dafbd96e7fa1fdd76a918896bf3a689d4ffcbb4b3ef81863250649c2626485ba7d8cae4
-EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1061 BLAKE2B bff1a940dddc0fc5be9741aad818d2b1995e57f4b47324102f3f440b48f2eb8c43997fa44d6fedfd6c8d12edbd5371c09cb1dc2189c620caf3751da6e0d3ee85 SHA512 8e7d45598356a73c789f933dbfb19fcaeb6f578b1e266b92153d8794afac3ede91a60713853c34aa66f62212446955814bb05db4dec364751db0d299ad48c58c
+EBUILD sphinxcontrib-doxylink-1.12.0.ebuild 1059 BLAKE2B 798ed1bcffcb23faffb634d7abbb27289989f0923ff76641f6ed15edca7ed2fa3eaf3917bf15592d93ee6d70ef24cef00cf125309635f7285a6bf1948ff88497 SHA512 09b4ca6a2fd0143e7c529540498918afdabbfac99cefa4a7bfe01c3419724249a99b013956bf4137098367d7bf68462bb5e1482c8458e1760a9ccb9636d7a1ce
 MISC metadata.xml 620 BLAKE2B e76f6c16f0f8280d0d7a99975a0dad33a76f93a634d99114df5eacf047e434c7356cb501c4021cdee1b17c3e7dd00e7ce4720d70c1ddddcf561c4e622b528549 SHA512 89afb14c72168f5a919347726c1445a205d5839925ead8b3969cc84f062caca0a666cc141f541c21d642f95c3c40fdfe677e3f1cce78aa1a5f6445e140ae7978
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
deleted file mode 100644
index ec13acaa9c47..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild
deleted file mode 100644
index c501831c06fa..000000000000
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.11.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to link to external Doxygen API documentation"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-doxylink/
-	https://pythonhosted.org/sphinxcontrib-doxylink/
-	https://github.com/sphinx-contrib/doxylink/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/doxylink/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/doxylink-${PV}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/sphinx-1.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-doc/doxygen
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild
index c5b515e21ef5..0f214cf2d915 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.12.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/doxylink-${PV}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 4c074920e1f9..7e741209015b 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-github-alt-1.2.tar.gz 3680 BLAKE2B afd5a20d073e58bcb657fbf100b28fab9d8cda2e1ae7e488dab42e8d4b12e4668185657673a56e9c410aa81cb65dbf4b706740511a8ed9d6c49482ea014c2fc0 SHA512 08f6738206232a5f37446ecac7b804178a57173efee58886623c7d2b43678c8acfd5a7527bacfe7c8f004fd531be9606f24a99c5665b78f97a5676398d2d2857
-EBUILD sphinxcontrib-github-alt-1.2-r1.ebuild 757 BLAKE2B 342a290880e5b0ce7d32a0a32d2730e4b6caea092014e5337d2903ad58fba318e10a873850e49ac93abacec45ad3a294caf6f68095117940d90b479707ac0954 SHA512 568142bdfc2ad85c65b282ec1d238cfe8aa4848a517c892549be726d376c982536194da3e5257284b5559279d1dc6639ccd77bb9fcc48a6dbe3749b850a5f546
+EBUILD sphinxcontrib-github-alt-1.2-r1.ebuild 757 BLAKE2B 5cc25b663872cd2d74b8d25504ce9d7a0eec29b2ffb24fdefbcecec1937148d881fbc9e6bcddce9562c028fba87953c4ca7d874153e4da30ee2e274a76462abe SHA512 ebd737976cefa96e0d7015e0cc9d1b94f4fab0e2a6374fe3e162c675a9c5588bbeae603f040bef1114b88ba50ca228f07faf8387fbdc65f63220e00f6ffa6dbd
 MISC metadata.xml 437 BLAKE2B 74c212e371aeaf70f1ad5d4b4a2afb0cb6cb1f3ecd5f45934675d711e4b01a878656ad154f517bd4100663ec7da232443625c8dfb79a6b0779a00abce35528b1 SHA512 5fafca03639f467b05a5f7cf1ab5a019817b505504b3d4e4fbc711ddd0cd679f9416e5773f032760b089398e8518291d179e8146c405e5e189e9c26f0a2de642
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
index 9562b2d4e793..9fe7b806baf5 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 094923edada1..8232a712ff34 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-2.0.0.tar.gz 28144 BLAKE2B 09b0d9bcec57140278c4476fa0bbc40d359fc167d8ea891a1585fbdeafe6eb0b52442dbbc8d1d5b6edb3953b04fc29a71f6f74e58a281ebb0d79e5a30cb02749 SHA512 6ed673966615f3e818e00de4b7e59c27f0a0d7b494294f804540777c580480870c36002c08d8ad626b7b41a676fe40edc0b0b5ffc6ad8080f38f59c24e157636
-EBUILD sphinxcontrib-htmlhelp-2.0.0-r1.ebuild 1014 BLAKE2B 3959aa2a599a2ce3e56f08a1dc854ea081f3f059a914867a80ca70438aa3fdfee972179f05feeb84d498c28cc9842481a55198fddb37c3a22711d2fc9559e93c SHA512 e729a89d684181a311f9dcf0c2a7954a90328add38da301b79bc4ca9d8bb54fe2ef14966df2b071a3afaba950993126a2a014d0417710b3ee5561ccb3771ad9b
+EBUILD sphinxcontrib-htmlhelp-2.0.0-r1.ebuild 1014 BLAKE2B 41045f7a88f3b1404ffc230484e6cbbb09cfd34fe415b75194cd9a8a7d85a6947890238f45386f69f0aa6eadee92872cddc4b6215897bee38dbcd55c15786678 SHA512 7e26472c4ee17e5d2c3bc89684671e00d798a05d853282b286cd8abeb8015f2e7a6f53e2ba235b601685c2a03eb46f888d4af2a2b74cb65abed397a4e27861b2
 MISC metadata.xml 423 BLAKE2B 49685b4a452f9f05a9f385c7c1913c282bd0714e1c92e42347960bdfa29ae01ed4eba7f43e3d1b7241d6bca4ddf4f8d3e0a1d0820a8af5edb7caca934908ecdf SHA512 8f497fb7ea0724be086c8a564481cf4d46ecf048791f76ed5494a7b0c0f46bf5eaf46875f0695b9add2914430c78427a5a77113a5f379052922217b415bfdb50
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
index 792c39e7ec5f..60072db33248 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 34b2f36af4b9..88d2d583505a 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-httpdomain-1.8.0.gh.tar.gz 38228 BLAKE2B 46cbe5ef0689777ef560c167c49af5830e38c7efa3a536dd36702114eb87f3c0f2f1c0c9de808738ef081e09c7d47754bc49a039b04184696ee4389acbf18454 SHA512 64d916d58282e94a4fa2b2d0e8abad5c50106b739e6e15015d347af339f517c2c7457c9bc8dc74258cfc371910d1a02b582a2c94f6f98c195a366f68c5b108c4
-EBUILD sphinxcontrib-httpdomain-1.8.0-r1.ebuild 1046 BLAKE2B 9b22cdabc0f6acd55c29e6eea6c32e216a16369f42a3a11b4ef03317b52123abbedba0fbc87bacf7e0a0d4fa560b7477ac3edad10a3e724ed72c6823527acff3 SHA512 9fc3fca8f9556cf7fd5aaa26409fad41498fe83090c1e6f57b73f2879bad1f206085c5a5ed1fd0c3e5768c9798a34942f1c2b33e9bd52ee845c67f6ebde1b1b3
+EBUILD sphinxcontrib-httpdomain-1.8.0-r1.ebuild 1044 BLAKE2B 206eb2de1d5e4880f69ec58867f66803ad6be11f2385f1e8fc0660f9fc07114ad4c478ca9741228e64da906491a3932499685bea3edc1e5216acb887ddc0b288 SHA512 ec8f122448c999e0dcc6085273479cbcad1ac421fff40d8821d13d1963d233f63b1fff2f49e14bd2dde1bdeb5959245306b4567d268cfa76d403b371f1148988
 MISC metadata.xml 417 BLAKE2B ecd20ec2d0b0f8dd3cc1ada969a171268f068f60dc698d644de42e2088f58cc66da59a73c735371d95a22d65a5699a9082e452605ab4d7e4a793d9311aed4a82 SHA512 b92a4542db033a1291b2983539597e651853a4faac6f8144796f59d13a7d75186f96a31c17dda30e280d246cd754a7696c1d1e6b330bbded25a23bb901ed3870
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
index 05b2426f0c28..e4822f5f221d 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/httpdomain-${PV}"
 
 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="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 1bef2dcde620..502403527679 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1-r2.ebuild 988 BLAKE2B 355a6a8427b576841642dd14bf7cd1f05f53ab580ffb2410e7c6a2087f5e79ddd1a39dcc6f4ea2340c455a16da229482f1d4410a3e5e4a4279c4f33d6dcb4258 SHA512 551b72f5c95ebadd820c1f190ca313193eb829d0915f1153bbab007e773fb63ca83df0b90143a17a49cbfe109f7ee2b15661a3f6fc25ab02f8248a22e48dc11d
+EBUILD sphinxcontrib-jsmath-1.0.1-r2.ebuild 988 BLAKE2B 5c405e823e30022d86a385dfbcde0d6784612340a68797f2e9aeaf52d174ff0004b8db67c136156d85d03efcfa8d6e198dfaa17dfa8fdf610314ea90aa94c7fb SHA512 a087e811e9c1c61b05d41057bc50eba9d1008cfb50b53c6605e1a4c76d63d26fb4aa70a903fe5bac2485098ce6e574d10bcb5af4b2e1f16fa025785ddf6d0373
 MISC metadata.xml 419 BLAKE2B 7b22df905fbf04eb026a37a8bcf2512508558a000793354a80fd7cb06bcacbb032291c24b1edd40cf884248bb761f9e9638b5ff55c6d59aa406777dfe2361214 SHA512 3fec9aaa8e570dfb8c4559dee30b71bdc479d5ac18431fcf85d1fd415adce54b8f2783ced3a5392a08ed083570622e500bf489c7b168f65a395248aa2c235629
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
index 1826623ad02b..940a154e6fc2 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-log_cabinet/Manifest b/dev-python/sphinxcontrib-log_cabinet/Manifest
index 063af1ec41fe..193621182804 100644
--- a/dev-python/sphinxcontrib-log_cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log_cabinet/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-log-cabinet-1.0.1.tar.gz 4072 BLAKE2B 6e237bee5ddcd13dfa0cf5151446a1d3924534009cf8c4b11c064dc454e0687ed03e9b09052332bf8c299d340a3522718704d65ac0fd7bd5eb22d18403b3b369 SHA512 c8529872c4ee783330738babd5027e64a813698ed38fbc693b23e65e5bfa2be815a7e6acfae42bbe003e542002d7d298ee446cab5dcebb3b65d2a25691bde18a
-EBUILD sphinxcontrib-log_cabinet-1.0.1-r1.ebuild 685 BLAKE2B 97d3585a03581dbec151d38f0f9fc3033d64f71f64609c864b5da038959912bc0311fc3a4f42925ea5e38bbeec2d3661aadd9ee314680ab2f18f040ddf8d0206 SHA512 5b668481bc76972371e8b9a801b91f435ba95d46c6249a701eb14135151f7a869800497c59a9e8c27394d19310c320c582709539a084424e3f241a678c87650e
+EBUILD sphinxcontrib-log_cabinet-1.0.1-r1.ebuild 735 BLAKE2B 76ad94cfff4be5e54cf62cad3aab1d00a7aa2d6b10c2d94489ae83989cdc5c4d301910e977ed87f4fc90a12fa441b816c49456311585b6844432908e88244dce SHA512 b5c085fc905b7ee31e9dac2f6cd35a672dfd244546ff630cd62e70528b727a28d8012cc968cdd1c7ce80e9f6ba95e20f6606e71c4211ee90c19ef89516d53739
 MISC metadata.xml 427 BLAKE2B 0eb6089bfd52a11b5ba031d7e6808283a373543844809bde35eab1a8320ab885531d516a09793c39993bebb03c1cd9bc6fb0bb40d2d425a0f213d9b6e5db76f6 SHA512 a58d1124d0153095c17bf1a1e002d7f3b25267abbe82b8fc7830fba79be8a01fbb83b708145672459f92b144fbcf71cc754f1990327feee1ce28dce48d32a8e9
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
index c8ce6d85d88c..0434d7971d7d 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -20,6 +20,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
 python_compile() {
 	distutils-r1_python_compile
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
diff --git a/dev-python/sphinxcontrib-openapi/Manifest b/dev-python/sphinxcontrib-openapi/Manifest
deleted file mode 100644
index a5f8023122b1..000000000000
--- a/dev-python/sphinxcontrib-openapi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-openapi-0.7.0.tar.gz 193897 BLAKE2B c0f1c46c6e8c67ddf95d163a68f5e22e6f2dff6622a3c21651b301dc1266b53b088d1b882e5e3347fad6347b86392bc9428b56f537c1d2320e7d9cd113c478f7 SHA512 36a7b6473b43af8d6fe2cf1bf22fb90848343911f69414cd742b942ff2ea33ac5ffba79c516dbb076b87c2a6e7e44d6958796daf06c9245a7184bfb6fdb53569
-EBUILD sphinxcontrib-openapi-0.7.0-r1.ebuild 1151 BLAKE2B e59f5bfbf2c397bf9a779ada92bbf98be82ff93a49412dc40c448b190332e4b119e50b1215d1e25745ca1e39422f7847e9ea4803260a5dec32fae077a9989ddd SHA512 500372fe7bf4f62e41623546434892a5fc8fd6bc237c1a3816aa5076424fe6581a5d90c9fc8fa1b7ddbad1f4c9f3fa27b5f459d058eecd8e2bcbb68a95574370
-MISC metadata.xml 411 BLAKE2B 9f2dbd78b774a2e1a7c3223dd3b53fdfdda65ed4b09fff4ed0fe3b7ab3e8fb14a817cba5084e1e3979e80c386bac251bad94fe750701c3781d5c6aab7773d892 SHA512 a1ff8b1e5ae27a9cce5677f38129f01213881e99a60a6f77b860a6931330c9c924575b881726a1d3048059e3974f6015d6201aaa5c739ad6cdec5c3576398b9c
diff --git a/dev-python/sphinxcontrib-openapi/metadata.xml b/dev-python/sphinxcontrib-openapi/metadata.xml
deleted file mode 100644
index a019e89fd495..000000000000
--- a/dev-python/sphinxcontrib-openapi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">sphinxcontrib-openapi</remote-id>
-		<remote-id type="github">sphinx-contrib/openapi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild b/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
deleted file mode 100644
index c3f2a174bddf..000000000000
--- a/dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI (fka Swagger) spec renderer for Sphinx"
-HOMEPAGE="
-	https://pypi.org/project/sphinxcontrib-openapi/
-	https://github.com/sphinx-contrib/openapi/
-"
-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/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	dev-python/picobox[${PYTHON_USEDEP}]
-	dev-python/deepmerge[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 1a8ae087ca30..84ca53587205 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.3.tar.gz 21658 BLAKE2B 7a82e8941d49836cf3e64aabe05ba65b34596f7ba0287b4dc7ed2c5940f6944d1853790d1d52637b03d934effbba8fc5094089e2924322cf1b373432c60bce6a SHA512 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
-EBUILD sphinxcontrib-qthelp-1.0.3-r1.ebuild 969 BLAKE2B c4edab9253d5aa0a4e5b5dcc39ae1d30085b187dcb6ffb1ecf5b3d139111e835b6338271ba27b7729de24e4d33112c404a1a0dc4cfcd96e55de16e705b94299c SHA512 8fee332276bf80e055b90ea23280c7cb5681391203fa1b294b5fe373e7c845460f532994baea333bd45cfe0d8d2ec678f1cefb1d3ed7b750b7955e0bdf84b3c7
+EBUILD sphinxcontrib-qthelp-1.0.3-r1.ebuild 969 BLAKE2B 8a61e35634b36c11fb4b13d072842f9c9a7b735bf25af0fb7236cc321082f1dde31911eea95282a43eba82cdd19a4e3f05dddfc23f43684930dd48bb34930544 SHA512 0181f8b7e4d4067a81515dc6388e757e09af6bd2b7cb2597df925a8c91e705412398c6d2d7354722db83cf05091c9930780b80806f58e2fd327e68ca015cdca6
 MISC metadata.xml 419 BLAKE2B 5a559b50428f6425568dfbae01bce3ada0905cbea24542e75122f1f3fce9e04cec6861f4d662515c7efa8c15a5b2347a83af5a2ea38326c069f9253436e7199e SHA512 559911ed37cd63368b2783fd6d65aa9b5fecc7b58422978f9d86b32eb8f50275f6b52a910ea4c73ef2ef3d081373862eff8a8e0e4098bd83c6b1cf4f06cd1af0
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
index d9bc0c5e4e9b..009a3220f32b 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 514acce9e73e..bc348e72f7a5 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.5.tar.gz 21019 BLAKE2B e2da8b1e1300a327b8d508ce98e7c0d3eff1e0cea28cd874df4fbd9ed0bd4de6c17e107e622ec72e00bb237025ae26b2c5aaa33b2156cee2fad7c8f8d2c65ed5 SHA512 c5aabe4d29fd0455c269f8054089fdd61e1de5c35aa407740fc3baae4cfb3235d9fd5515c0489b0becd12abc8f18d0f42aa169ed315c00f30ba87e64ce851667
-EBUILD sphinxcontrib-serializinghtml-1.1.5-r1.ebuild 1000 BLAKE2B 2f24ad66deffc597d0f698ee3633fefb0e7604286b401dc6db85d58569c0fa80937f295b25b4eaaa646eb76315ac687605b599855e883f4d44fdf3844fce6140 SHA512 d74849685eceb957661111bc3c2d6e0c7d089deba2345eb11cdd33ca1966302ed6d84fd07eae612951d0ebb4804feddd0ca0c5427d86513b26f6ac5cb9ecae64
+EBUILD sphinxcontrib-serializinghtml-1.1.5-r1.ebuild 1000 BLAKE2B cce6158e208c1ea6822c1d0be6cba3e420e09c48924b8c8019215e34e8ba0c68be5118a73ee7dd6f3becbc86e948bf4d5193917fd93e4f31777fa590d7c4ac46 SHA512 7c7b169f537a1baea4c150b7f754eb6f294eea40d912da28612ae49b387902cefbfc292c68aecfb0c3e415b4a97f6cd281e76f2bc747d2f71b893828034b9b8a
 MISC metadata.xml 437 BLAKE2B 6b040f2d00f91a4f275afa689de0eb172fe59e4b16685f30181901e4abc6d72bd8684e2a5503a5712a22cd2eead81d1433a504568d9d596ed109afd632b8b575 SHA512 7606411699692a843b2ac349d9c60905009c02691e94c73dd6a271ea4ad9f2c1c5c972ff54f45612977374e7e850457dbd7ed63b2fe5f16b11c7fa45999b9f63
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
index 67cc434cc8a9..95b287b4927d 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 17e7e4d57a29..2f6a1a0c9932 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,9 @@
-DIST sphinxcontrib-spelling-7.3.2.tar.gz 51813 BLAKE2B 7c96f3b102fa33ea4d9e35100930a157200a1c01c51d8ec5145c45c5a24e3b5de35f6c4669177363c6098cb96275e10c39ff660c36d209cb6fa658e50cb8e169 SHA512 043a50f694366de4a3aedc24ca2ea7d89c85087097264f4e4fc860f68a3df5a67f19ec7172e4a67074377846d013d24edecd751885136c7263bc30b034c0f0e9
 DIST sphinxcontrib-spelling-7.3.3.tar.gz 51912 BLAKE2B 6a9bd90db2298beb78686252d555dd5e77d0c9042eb0986dd2eeab9e413a921c5f5f594c539c2cfe6315002c2f2892241b789b10976e634158f3ca1d8be1b627 SHA512 7406bd846c5eac507f8e4481ada4d0d725d0a3ad8cf2f8fd3328389128cf54091bb0e304dfe23fdf771a26d9103d2c028d2f7f29e1949ca59fcf43de5bac9cb1
-EBUILD sphinxcontrib-spelling-7.3.2-r1.ebuild 1026 BLAKE2B d498ef4a02c1d7be3e797489a6b307e0a8d9a63baef574de29ab383fe4c9fd46e934c89303bd3021ba5021d15a5819b281e49c9645e43d087b02170d45fc5dc9 SHA512 1e9b4b9eda19f5be2e233d2c6c660328eb4ee2856a28d069cea8f12043a14cb3c254de748f3b1da2010aa1dbfc7e2dc1aec94801c9e9a3e1996bf36d5af07f84
-EBUILD sphinxcontrib-spelling-7.3.3.ebuild 1033 BLAKE2B b9770b8ec9cf57bc0a9708a32d1d60d00bb649c5dd99f571a699720c6071def6a68ff4dbb09a1451f3b5d84ea1f9c4dd138aff83793d5e03a6b343bc34150e12 SHA512 8ac245f8c2512d7c0fcae2a1ec83cca009593c0262a7db421cb50e92edfbc30f99c4c0427278134fb2a4f190469c34a207abd2afa582d0c3b881f40bcc29da0e
+DIST sphinxcontrib-spelling-7.5.0.tar.gz 54978 BLAKE2B ed56e27434a43d688a63ff6ca8aa7889a80a0a750abdebc5e9307c68fae8a14ae7ba065b127c583fff11499e75750aee6f017b4d442204b1a2308a5c8692e73c SHA512 d306d19664990cfb6ceff947f3a34243a8ead95b0e6076f9da924cd0ef43e2621178bd374400f805970592f803d6a129c74a32a6c6837d41e4f72118da667138
+DIST sphinxcontrib-spelling-7.5.1.tar.gz 55547 BLAKE2B 61415fb62b0d47672901048276897d7578f891732278d9ea0b4fe0ca5f42654114f76d600ffcf0f602afe1c0d46f4bf466c326337accf910090f768c1cee1c69 SHA512 d38114421e519ed127eae712637677a8ae75cc640087d2e7740d8c106a0d7058e633f65fb1ac9ee2fa75d295b218aa98d3a3279b077f2a89ea947a3b4c0fd05a
+DIST sphinxcontrib-spelling-7.6.0.tar.gz 56329 BLAKE2B e26a3fcb39edf622b20bce0d79d1ce2d2a13e4dd8bdef0bb5cc31108a8ee42afd728975fd65e840c91bc6c6510a57904ebc478b458a52a96031bf44f1cbfa8b6 SHA512 102202eb73767ffface2aa5555c8ee2658bcd3c1eb7f3a925e8713e2f233d1bcf0eb307fed6c264c4e4e6503c30d83a3025b0c39ef608451d2fe86664aeb48c5
+EBUILD sphinxcontrib-spelling-7.3.3.ebuild 1026 BLAKE2B d498ef4a02c1d7be3e797489a6b307e0a8d9a63baef574de29ab383fe4c9fd46e934c89303bd3021ba5021d15a5819b281e49c9645e43d087b02170d45fc5dc9 SHA512 1e9b4b9eda19f5be2e233d2c6c660328eb4ee2856a28d069cea8f12043a14cb3c254de748f3b1da2010aa1dbfc7e2dc1aec94801c9e9a3e1996bf36d5af07f84
+EBUILD sphinxcontrib-spelling-7.5.0.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
+EBUILD sphinxcontrib-spelling-7.5.1.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
+EBUILD sphinxcontrib-spelling-7.6.0.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
 MISC metadata.xml 451 BLAKE2B fa659ac4949e98ca8c5a11a9b72ecba8a69ca94d95f8ab5f07c0d43d9684cd1cd21dbd63f42928a9920001904a6f75aa5663a3d924b02910c78b7894f6011722 SHA512 fead100dcd4c1d85e29260a60178e1b866ceb1f944c73fffcc051e2cfb1e96cc2e61bcf94379c0dcf84bed1349abaceb86ca9a89f2b1a8ddd384c14997d1a159
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
deleted file mode 100644
index 5cdd12d99504..000000000000
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx spelling extension"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/spelling/
-	https://pypi.org/project/sphinxcontrib-spelling/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		app-dicts/myspell-en
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires the git repo
-	tests/test_filter.py::test_contributors
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	rm -rf sphinxcontrib || die
-	epytest tests
-}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
index b0c435cd27a2..5cdd12d99504 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyenchant[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
new file mode 100644
index 000000000000..834977197c58
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="
+	https://github.com/sphinx-contrib/spelling/
+	https://pypi.org/project/sphinxcontrib-spelling/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires the git repo
+	tests/test_filter.py::test_contributors
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	rm -rf sphinxcontrib || die
+	epytest tests
+}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild
new file mode 100644
index 000000000000..834977197c58
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="
+	https://github.com/sphinx-contrib/spelling/
+	https://pypi.org/project/sphinxcontrib-spelling/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires the git repo
+	tests/test_filter.py::test_contributors
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	rm -rf sphinxcontrib || die
+	epytest tests
+}
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
new file mode 100644
index 000000000000..834977197c58
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx spelling extension"
+HOMEPAGE="
+	https://github.com/sphinx-contrib/spelling/
+	https://pypi.org/project/sphinxcontrib-spelling/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires the git repo
+	tests/test_filter.py::test_contributors
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	rm -rf sphinxcontrib || die
+	epytest tests
+}
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
index 5eee1a560f2e..9a46c0130947 100644
--- a/dev-python/sphinxcontrib-trio/Manifest
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
-EBUILD sphinxcontrib-trio-1.1.2.ebuild 1010 BLAKE2B f62d40d7993e660f9cc73a87faf1f4b24a7b1af1b4a52c4ac8708200c006709353dc851461c01a5f19f312df855a02cd60ba183814e9291ce3394f3de6445595 SHA512 f029ab6eecd9ea03754fc93b3113081500a9afd919f194692a7e5d8426c555b35306cc7c47ceffd565049c822121b66f7590929b6732066b415fe945dfccedb6
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 1010 BLAKE2B d9cf25213f40bcc2823efd2b975a1004ebcd64dc443a9531e97137cd79beaa2242bbb7e5c2ac5c4f273c73c7d01becec3d238980a8e4cc010a47e4f1c734c449 SHA512 fb0786c827dad6cf71fa35d9fff6bd50b68c7c2352a435aacff5598ac33a7abd00dd4eca70c1bdc3aecb0b045e3b7b8a7af42a69fe967d0f29075daa3b290d95
 MISC metadata.xml 1118 BLAKE2B f86bb065d9a5073e419a2c34c88412f0340de6e444afc26ee316a05b962699dd744a790758e2409d3d0b32378d865f66d8d7e8392fdd4523b393566caf67e65a SHA512 a16c4e89c6be00a81c3278f8c8ebe6cd75d1b1cba1e8c9f9d1aa4d2bd318073687556adf91f44c1cd39c2e26a179153b1bbee501101fe26d154f1d69a1a2d376
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
index 00cced7a2fd1..441ce266fbea 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Make Sphinx better at documenting Python functions and methods"
diff --git a/dev-python/sphinxcontrib-websupport/Manifest b/dev-python/sphinxcontrib-websupport/Manifest
index ec567134cbe8..c9a8c1d44882 100644
--- a/dev-python/sphinxcontrib-websupport/Manifest
+++ b/dev-python/sphinxcontrib-websupport/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-websupport-1.2.4.gh.tar.gz 599695 BLAKE2B 909fc3dd77377769b6242963c2228a01dae4c73b2c1128094ecb5c113517ddb103498fa8615a0690cc41333778a21ba62a7638e36e3d82ad89c74b76156580a4 SHA512 4b5a382037988079e12e5c022ce0351c953e65dacfee7e3a63852370deddcee083cb65914b0bb9a8dc42481015f33d1ac2b5fea61c676ab947f8b0cbe331d7f6
-EBUILD sphinxcontrib-websupport-1.2.4-r1.ebuild 1415 BLAKE2B 0e3eb3fd0a4dd47528e641bc12070c5c115a0571959589f5e3fa613fc5a433a17bfbd5371f50ad0cc2398d7202114cd7ca7338d5747a28180f1bb49041a6a264 SHA512 6845324ac82c0a62f34ca6898fa89387593162fa3b32d982bae5c91e6a11da8430fb27b11d87cb715263cd6aa7825c645647ad69c91858c1fcdae652aaec138e
+EBUILD sphinxcontrib-websupport-1.2.4-r2.ebuild 1494 BLAKE2B d30a13d73a5b2e7b73285c66f2da7db504cbdb513e10ef27cd996ea7bfa14d6ed2b2bc3634fb445efd7646f887cff064a231eae26fae5e8096994c6c2581dc61 SHA512 c5a117a82a0cd12ef795598451b7f25c8b3e9cb47565ce1ebea97580bfaff2506ba5d22e76919114b94307aa2f34f18034f762859dc9d9d0debbf0000544e7c8
 MISC metadata.xml 614 BLAKE2B 4029475965c4514884e0ca09ca1ba257806fa222367acdc77caf7878d8564f46a6050a06e7f43a5483d9c855e746818c037dd80889fba245c3626537722281d0 SHA512 014e0efd914a7fc32fbb8bb432efd5d7e4b2efd6e189ec33da2c409281e67529de574f7708c9963723d314d45d1daefd33eeabb9f25e5af389ac0d0ed6f37d51
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
deleted file mode 100644
index 97cb4e352fe1..000000000000
--- a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx websupport extension"
-HOMEPAGE="
-	https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinxcontrib-websupport/
-	https://pypi.org/project/sphinxcontrib-websupport/
-"
-# pypi tarball is missing templates
-SRC_URI="
-	https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-"
-# avoid circular dependency with sphinx
-PDEPEND="
-	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${PDEPEND}
-		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
-		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# breaks tests
-	sed -i -e '/pkg_resources/d' \
-		sphinxcontrib/websupport/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
-
-python_test() {
-	distutils_write_namespace sphinxcontrib
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..5de0c967feaa
--- /dev/null
+++ b/dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx websupport extension"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinxcontrib-websupport/
+	https://pypi.org/project/sphinxcontrib-websupport/
+"
+# pypi tarball is missing templates
+SRC_URI="
+	https://github.com/sphinx-doc/sphinxcontrib-websupport/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+RDEPEND="
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+"
+# avoid circular dependency with sphinx
+PDEPEND="
+	>=dev-python/sphinx-1.5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${PDEPEND}
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# breaks tests
+	sed -i -e '/pkg_resources/d' \
+		sphinxcontrib/websupport/__init__.py || die
+	# strip the .dev tag from version number
+	sed -i -e '/tag/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 85939bd8092f..6e09d40a0c6b 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,3 @@
 DIST sphobjinv-2.2.2.tar.gz 1188094 BLAKE2B f693254f3746b0e5cb6cc863be381f41d26465eab2e1494c29f30f1a72374e8d03dfa5c433958dfa1dcbaa0a7da1ff454c42da5c09011fa67264c26e3623a302 SHA512 36e7667b071f30d4ca066422b21d298c5691321d813ba6ad9eb7a69cd4107ceb18365ee2f95865fad64ab872428b035661a3f513df2e4aab1124b48f49c7280b
-EBUILD sphobjinv-2.2.2.ebuild 1547 BLAKE2B 376bd4808746a1bdd86deb7ab3d504d9850784b14ba94c698a7ec8ae0db70486767ab92c9b7ada7570104253ed9f3ca4ad63383bd187f58c8c0163d1af6d2180 SHA512 bad5b960a16c20ad66ff29c19341302e5e62ea086421536fad9d42d887d1af79fc1e20a0b9b96b43c965b6be03853aa5c207fffbfc2c5d9f19091ccc937e722b
-MISC metadata.xml 894 BLAKE2B 9e3b9ad864c23cd1cf346de1c06bf25035de4566733c1716846267aeba3aa09c025e04b15b67369e74f703e4b3205d89e35fd6614627d9f5630fd233320843eb SHA512 f5407da0c6c12279317b17d7174627d1fc3a42f249c1e63acd73c0367c526aab6b62fd358a34760c4986d3d487839905e2ddf5e40c62668933280c5278fefd9e
+EBUILD sphobjinv-2.2.2.ebuild 1547 BLAKE2B 3d1f79e41b940c4b5e731f00cb9590bdec02dd7a1f93ce2dde342201efbf8d660b58e25cedc17319154c786a10f8b354debd656046b464835125e103a23542df SHA512 0744f1df18515793d5163c0078f3c7e737540a0ae82763f70d44377301313fbd9ebd3cb50efd2d7bdf3a704bd58047f6a1be0ea386a2f1330d3522d300bca3c5
+MISC metadata.xml 1001 BLAKE2B e271c6f8d53718c583d948c0c88d190f626b902ec605de77c213624eb7dee43bad5a44aa337c3908aae774ad9c3cb169281e14670d18ae0d89978327dd4ee6a2 SHA512 25a6ab1636ffb88d9f26002d16bf3b4af24fcee2772fd37778bc448c9d4a66cdca77919ff2e97e41fda51ffce4adf0f4f2d62dd8a6b48390c24de32ee381dcb2
diff --git a/dev-python/sphobjinv/metadata.xml b/dev-python/sphobjinv/metadata.xml
index f375a97e5f20..5a144cda92e3 100644
--- a/dev-python/sphobjinv/metadata.xml
+++ b/dev-python/sphobjinv/metadata.xml
@@ -6,6 +6,10 @@
     <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
 Using Sphinx?
 
diff --git a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
index b7cc214a3bed..87713d62173f 100644
--- a/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/spotipy/Manifest b/dev-python/spotipy/Manifest
index 1179d9026743..ab94dcbf6073 100644
--- a/dev-python/spotipy/Manifest
+++ b/dev-python/spotipy/Manifest
@@ -1,3 +1,5 @@
 DIST spotipy-2.19.0.tar.gz 102703 BLAKE2B bc132edb972236b43097c0bbc9d86932a3305d8bd3807e44e20767b123455950b8e01060efd83c87b3a162e329f5c48614205f131686af7f9312a44894a7f1e7 SHA512 fbaecd1a2cab3ef458d30de46cb89462021dfc3cfc85516d8bfe509af016a0b19af2f8de4f5cae36188b1ce1f5718c75edff0e71af2a87f4d720ee99d4541a6a
+DIST spotipy-2.20.0.tar.gz 103437 BLAKE2B 78b026b9de04b0115c5621345e4f4c0ee47a51980221c77da8754c54fc8c321a1826983ceb9bcf9c415690906f3b3ea4657243e6b5d351d3edb48084baeca292 SHA512 8b5d0704fa84974ea0728dda0fe89d021b7b1550b464026d2b087671102745c7edcab116246399dd97de42d9c0cc7411295297c328b301712b6536aa6a3cd6fd
 EBUILD spotipy-2.19.0.ebuild 1142 BLAKE2B e5758cedfe1043cdd44513808189a9414f51779f213488bf8fd10f047caff435329a1fb4f1e51c731d63e3cacf817c7f2268205cda6d1a46eff49472dcaf00fb SHA512 060ac664853b219996e5fa75f82601c07bdcbf25c657d6a22c17cba3c38c740caa0d5eda4513b336e69c82d4f22209982dcfe37ce8836a416f55968c6409c7d9
+EBUILD spotipy-2.20.0.ebuild 1181 BLAKE2B a024f14e89eb0a9d5afeb94548a28cb97db5bc85592c7bff6e72e257c74732efa8d304276b39ab1b274ffdaada00252b17933c3bfab6ec7764aae3ea0da18f47 SHA512 89ac69abc71a80de8951768e14a65a812b3fc513e910fa5d305645b169241372dad1efeaff60022d8168465ed8343186f9ac1db62c6dacf3c1c319346ceb400d
 MISC metadata.xml 448 BLAKE2B 2307d0b3ca490bcd41c1bf6f6c5a9b12ec0325781125bc68bb17ffb8408873243a9ce224c9405e5d998d1158376eefc211b0cb2575b8ef7dfdaf018d1dc58eba SHA512 17a5a5b1829478029810b46d448d03a74466ae2dc68bb83f295e71cf26c3b5c68a9f5c255529d7d19681986c8ed9f2386c818c73d47f94e85201123cf3ba6243
diff --git a/dev-python/spotipy/spotipy-2.20.0.ebuild b/dev-python/spotipy/spotipy-2.20.0.ebuild
new file mode 100644
index 000000000000..3409dd977e02
--- /dev/null
+++ b/dev-python/spotipy/spotipy-2.20.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A light weight Python library for the Spotify Web API"
+HOMEPAGE="https://spotipy.readthedocs.io"
+SRC_URI="https://github.com/plamere/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Requires user credentials
+	rm tests/integration/test_user_endpoints.py || die
+
+	# Requires a spotify client ID
+	rm tests/integration/test_non_user_endpoints.py || die
+
+	# Needs internet access
+	sed -i -e 's:test_spotify_client_credentials_get_access_token:_&:' \
+		tests/unit/test_oauth.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 16f1cbe5a0b1..ae3d537090f1 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,3 @@
-DIST spyder-kernels-2.3.0.tar.gz 89425 BLAKE2B 60f9894ef83e1e4df828b35da4a1453721bfe4fe5f9c5655a120835e936a10c90cfc0431553b57e89e1a4cd81b5290709d9b0389bf961f29e5dfdc3caabeb190 SHA512 86b523b8c5a873ded6f222a42a0137143d134f1cdbe54a2d3d7019f4514eea9c117d7e56586092c568eda5eb101a7779b4e9b757d50649bb7ba314b1afaaa836
-EBUILD spyder-kernels-2.3.0-r1.ebuild 2211 BLAKE2B b2e7f377a5bbdfcd8ba462e43ec520893b80b6c60bf5fad81a31f6896442fe1051840e9679b42bc888ff0a2b6c0bc7d19cc8a72f540ab84aa9507d19e5aa6b37 SHA512 18ff4f51ff69fc669a8429bbe7655c9378abaed3d82117e0c35f1d87337ba5ea9eaaaeed14987448c6fa204234b1d783020c2ed133fe521e65b4a8d3468ee4e9
+DIST spyder-kernels-2.3.1.gh.tar.gz 89715 BLAKE2B 567101be14bc759a995b5753ecf129a1e3fb466a16e4d84d55cf19223d8e3bbd439bf519376bd0dfad13b076fcd29aa3f4f7ab66dfa2525f300e7842b7aa2bc7 SHA512 e8831204f242b68a8aff29f3e66c78f38a8b09542d651754c557af7333e7e3d9fa85ac1dd048972cd1f7eadedee3017afd5b2d012b1473b261603e9990ee12af
+EBUILD spyder-kernels-2.3.1-r2.ebuild 2299 BLAKE2B 7cfdb3e34e291f0fd4a533f566ae00bd2c51aa853b6ba082c33ee45c202e23f89fca53071d7c77c21e3d55037555ac23f8cd4d35917b51119d5ef5597b0f2178 SHA512 a9ec26bc612831e27953263b2b303f686a4eb667009a55029c7f75ea14e3e29b9a6cfaef59cf6504bb0cb34f29790b15dead7e2fa6c07020946f837aaaa6dabb
 MISC metadata.xml 545 BLAKE2B 52be79edfbfdd86e7f895c53d088399b649901b76c7b69cf6363dfba6954971ce75b14624c2fc4254810112e32721e215255d59035f70850e1c1073f9784e65b SHA512 62ad725aab52d7071ccd5297bd15fcdd5e02e97854fc412a43b5c97b7995c77661251994850616743ce39eee0d0673b3bd4189b00876ed6124bf1871f6fb100c
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.0-r1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.0-r1.ebuild
deleted file mode 100644
index 714ef48a5dd0..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-7.1.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/dask[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No additional test failures with ipython-8: 843251
-	sed -i \
-		-e "s/ipython>=7.31.1,<8/ipython>=7.31.1/g" \
-			setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=(
-		# we no longer package distributed
-		spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
-		# RuntimeError: There is no current event loop in thread 'MainThread'.
-		# https://bugs.gentoo.org/834893
-		spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
-		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
-		spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
-		spyder_kernels/console/tests/test_console_kernel.py::test_runfile
-		spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
-		spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..0745e08a1548
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.3.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/
+"
+SRC_URI="
+	https://github.com/spyder-ide/spyder-kernels/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.9.2[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.31.1[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-8[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-7.3.4[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/dask[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# we no longer package distributed
+	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+	# RuntimeError: There is no current event loop in thread 'MainThread'.
+	# https://bugs.gentoo.org/834893
+	spyder_kernels/console/tests/test_console_kernel.py::test_cwd_in_sys_path
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing
+	spyder_kernels/console/tests/test_console_kernel.py::test_multiprocessing_2
+	spyder_kernels/console/tests/test_console_kernel.py::test_runfile
+	spyder_kernels/console/tests/test_console_kernel.py::test_np_threshold
+	spyder_kernels/console/tests/test_console_kernel.py::test_turtle_launch
+	spyder_kernels/console/tests/test_console_kernel.py::test_matplotlib_inline
+)
+
+python_prepare_all() {
+	# No additional test failures with ipython-8: 843251
+	sed -i -e "/ipython/s:,<8::" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index e1304e142e00..ebf20182172e 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,6 @@
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
 AUX spyder-5.2.0-doc-theme-renamed.patch 356 BLAKE2B 666ba289498026ab0679776b8af8f6efe7561a9a736ff19b32eaefcac87d142a55a055556c09f94373869711e81a35ef90832fbfe68acc6cee0f2023742de0be SHA512 396944e6f242bf3b6a27ac9d47f0cc07fd99a55c50f174dbee2fccd1f0b3edf355347bf6291943c3003f55996304d96ce2d2fe45ae7c4291e8425bff73a3a861
-DIST spyder-5.3.0.tar.gz 24404638 BLAKE2B 558c0d1ce8cda61786a772bf7ea471eab69755e3852f5701363b3c52cf1cac388a3800d2e59f266ca9e99007c7096582fbd341956752385b23c3af12ef097204 SHA512 c556deb8bed91ad6c59761e70e1e69f2402a216d8c87a57b3fc55f3624418d95114b015f5fc5baf0cb7e405955cd2ae82372105830b405ea52c50d7329ba7f42
-DIST spyder-docs-f99196cc267b07fa7ad56f0134744b545fa21fcd.tar.gz 90037460 BLAKE2B 8d279e2c2e397a63919c4ba8723ce674d2c5660793330dc578b9a6e05034af016085faedd73894f16241c0ffe1f734217d9e237f7589e59fe2186511552cefe1 SHA512 6c7d35274fd2f627b3b9371c7a2a9f0446c8aee3754b7c7dda6c5a2b9fd4ab04e73637648a188960c71d43f348c6f9ef1911979fec4c281515937e1069e68500
-EBUILD spyder-5.3.0-r1.ebuild 7745 BLAKE2B 29ae6405c4a5290fe8efe1c6647b59bd081d6515c68462b950bf7f84b2642699aeb11bee319a74135e03ab82dba49634a473f97a2721eeba5f30a09f5f94829e SHA512 ddaaa7f9d19843bdd0dce0217f2e9939b9e0e68fe0c12e3ea83d98942232f38bbb1f4015c2e6bd8858209843954b9b450d4a8ef9801020a9885d4f088e2de1bb
+DIST spyder-5.3.1.tar.gz 24415110 BLAKE2B 368179c6ba6d355ca56fe3eb3ed8b24be3e986f1f2d0284f0f5739bdecb21225bce10802883b54dd888da54515bd8477adf6c0d3e38a3c549bb10407534254b0 SHA512 2501ddc45df11671b1a318eb33b50788b334ab10fbafb97a9491775a0efcc6a57814672068ab84314f9cb43961d6fabd9b906fb164cd58c77b6d6ecf0d6621e6
+DIST spyder-docs-d43d6cd46b6eb7675ec690b0dff573ca03f2e301.tar.gz 90037375 BLAKE2B 2faf8d2d07b10aec750534c73ebcfc9146533db4223908ecabafb214d7e0a85416aaaf4359f95768572bbd8806f13bd707124f9585299527af5bd5bc735293d4 SHA512 00f12af5298f5b90eaf9a4ea8706b5bb29445ca344b5117801dbac54508eefa29c807e0d4f36524fb5d8b6208204533dc657da63849cadaf13f4aa3652612cb1
+EBUILD spyder-5.3.1-r1.ebuild 7575 BLAKE2B 70df83b94e59f4a805bee4db29ab529f04853e3435ba813407d83be4c558463b6ed810298fb2a08ecd0d84729cd0e2e3173b0999ccbf3c89d26f0507d256501d SHA512 336b7f8532442c36078719b88bec0d0fb0da1619b319100482034e9edbf57dbec375b264d2a81b2d08bd7874f1bc5519d451199ba841bc8632cc71d7375081df
 MISC metadata.xml 1316 BLAKE2B 996e794aec3c0a7f3b192fb9a66ebe7afaddc3f1ef2057d36a007770becf3d11ec0d05cf30a520cfb8537c1ae34bc9d89e8bc54224def1f4f2f4b30c657ead53 SHA512 b3cd21a16e51414d22b0f102f88da30ca1c3e596eb032ee7bde3c0d7b396659485c2565f0ed79c437eaca07b535fa3305796386e6023606ad1896edf7d347493
diff --git a/dev-python/spyder/spyder-5.3.0-r1.ebuild b/dev-python/spyder/spyder-5.3.0-r1.ebuild
deleted file mode 100644
index 868ae5625d61..000000000000
--- a/dev-python/spyder/spyder-5.3.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# 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_PEP517=setuptools
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="f99196cc267b07fa7ad56f0134744b545fa21fcd"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="
-	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# The test suite often hangs or does not work. Technically spyder requires
-# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
-# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
-# several hours I spend every single version bump checking which tests do and
-# do not work. Spyder itself works fine with pyqt5>13.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
-	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
-	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
-	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-black-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
-	<dev-python/qdarkstyle-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
-	<dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},svg,webengine]
-	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-ordering[${PYTHON_USEDEP}]
-		<dev-python/pytest-qt-4[${PYTHON_USEDEP}]
-		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc \
-	dev-python/sphinx-panels \
-	dev-python/pydata-sphinx-theme \
-	dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these dependencies are packaged separately:
-	#    dev-python/spyder-kernels,
-	#    dev-python/python-lsp-server,
-	#    dev-python/qdarkstyle
-	rm -r external-deps/* || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
-	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
-	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
-	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
-	# Do not depend on ipython, this dependency is carried in spyder-kernels
-	# The explicit version requirements only make things more complicated, if e.g.
-	# pyls-spyder gains compatibility with a newer version of python-lsp-server
-	# in a new release it will take time for this information to propagate into
-	# the next spyder release. So just remove the dependency and let the other
-	# ebuilds handle the version requirements to speed things up and prevent
-	# issues such as Bug 803269.
-	sed -i \
-		-e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-		-e '/python-lsp-server/d' \
-		-e '/parso/d' \
-		-e '/jedi/d' \
-		-e '/pylint/d' \
-		-e '/ipython/d' \
-			requirements/conda.txt || die
-	sed -i \
-		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
-		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
-		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
-		-e "/'parso[ 0-9<=>.,]*',/d" \
-		-e "/'jedi[ 0-9<=>.,]*',/d" \
-		-e "/'pylint[ 0-9<=>.,]*',/d" \
-		-e "/'ipython[ 0-9<=>.,]*',/d" \
-			setup.py || die
-	sed -i \
-		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
-		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
-		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
-		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
-		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
-		-e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
-			spyder/dependencies.py || die
-
-	# do not check deps, fails because we removed dependencies above
-	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here test results
-# should be checked for success manually
-python_test() {
-	"${EPYTHON}" runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	# optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	# optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	# optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-}
diff --git a/dev-python/spyder/spyder-5.3.1-r1.ebuild b/dev-python/spyder/spyder-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..15fb63a0e467
--- /dev/null
+++ b/dev-python/spyder/spyder-5.3.1-r1.ebuild
@@ -0,0 +1,202 @@
+# 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_PEP517=setuptools
+
+inherit optfeature xdg distutils-r1
+
+# Commit of documentation to fetch
+DOCS_PV="d43d6cd46b6eb7675ec690b0dff573ca03f2e301"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# The test suite often hangs or does not work. RESTRICTing because IMO it is
+# not worth the several hours I would have to spend every single version bump
+# checking which tests do and do not work.
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-22.1.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.1[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.3.0[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.4.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.3.1[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc \
+	dev-python/sphinx-panels \
+	dev-python/pydata-sphinx-theme \
+	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# Do not depend on ipython, this dependency is carried in spyder-kernels
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
+		-e '/pyqtwebengine/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+		-e '/pylint/d' \
+		-e '/ipython/d' \
+			requirements/conda.txt || die
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+		-e "/'ipython[ 0-9<=>.,]*',/d" \
+			setup.py || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+		-e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+
+	# do not check deps, fails because we removed dependencies above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly makes the tests freeze after completing even if successful
+# Exit code is nonzero even upon success, so can't add || die here test results
+# should be checked for success manually
+python_test() {
+	"${EPYTHON}" runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	# optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-autopep8 does not have a release (yet)
+	# and are not compatible with >=spyder-4.0.0 at the moment
+	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+	# optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	# optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
deleted file mode 100644
index 454169121041..000000000000
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sqlalchemy-migrate-0.13-disable-sphinx-exts.patch 497 BLAKE2B d66dae755df49a2347e09045b72e85559278011c814c4ad209a193fd2912effab5a281e449e72e3185380e50371eba3eab5f3199cc280c4e84487fbcd02ff74c SHA512 8a8d3f4b075cb2dfd46ce32b228180826b93436da7cb9bb2ebdae14dc74a0a82817af1543862ef11d980efe7f37e3b838f3170cde6bcf2e03c388d91f2bf018f
-DIST sqlalchemy-migrate-0.13.0.tar.gz 131424 BLAKE2B 925ee05144360c469d714342005c8b79dc0f1ef7c07ec641c00ec39e4aa18046b3afa7524f4e5afeb292cf78b2b85bac714f44102e0daf799ce09f0af40f3047 SHA512 1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6
-EBUILD sqlalchemy-migrate-0.13.0.ebuild 1323 BLAKE2B 6c00615747c71b8031a9e6e307ac0a5467a0b2f2b8873218cc98bccae69b3ac2127443d9b68e07268f4f5a1edc1a700b0ec64f09ac88ce3d23d46e62ecb6f1b6 SHA512 d5873a5b55ebcfbdecd3cfe1162ca5f68e840c3cbd0dbac401098ed3cebdaa24145de65235cd267a09fe8fc6054cf178bbe91b0bdfd80af75d69217d7be88dc6
-MISC metadata.xml 332 BLAKE2B 84715fdc8553788eccafaf5d37c518d0b4745a79332e7cd74de1aa48a93459dd0a091000c75ddefc64c3e73eda3f87b82db4291b2e1a5258d43418f934d53e07 SHA512 ecdc9d0ebd0f936ba32bf802dd958d8ce4c84efbe191a8b262e379f22939f2b4ab6991cd0af12230c44e10c8d89a75a540f5ff564dfb2f49a37725e2fc8c8c70
diff --git a/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.13-disable-sphinx-exts.patch b/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.13-disable-sphinx-exts.patch
deleted file mode 100644
index ad11435a8434..000000000000
--- a/dev-python/sqlalchemy-migrate/files/sqlalchemy-migrate-0.13-disable-sphinx-exts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-intersphinx: prevent resource downloads at build time\
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -28,8 +28,7 @@ sys.path.append(os.path.dirname(os.path.abspath('.')))
- 
- # Add any Sphinx extension module names here, as strings. They can be extensions
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
--extensions = ['sphinx.ext.autodoc',
--              'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.autodoc']
- 
- # link to sqlalchemy docs
- intersphinx_mapping = {
diff --git a/dev-python/sqlalchemy-migrate/metadata.xml b/dev-python/sqlalchemy-migrate/metadata.xml
deleted file mode 100644
index 19928d8f7211..000000000000
--- a/dev-python/sqlalchemy-migrate/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">sqlalchemy-migrate</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
deleted file mode 100644
index f344260c10f2..000000000000
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="SQLAlchemy Schema Migration Tools"
-HOMEPAGE="https://pypi.org/project/sqlalchemy-migrate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/sqlalchemy-0.9.6[${PYTHON_USEDEP}]
-		dev-python/decorator[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		dev-python/sqlparse[${PYTHON_USEDEP}]
-		>=dev-python/tempita-0.4[${PYTHON_USEDEP}]"
-# Testsuite requires a missing dep and errors with poor report output
-
-PATCHES=( "${FILESDIR}/${PN}-0.13-disable-sphinx-exts.patch" )
-
-python_compile_all() {
-	if use doc; then
-		einfo ""; einfo "The build seeks to import modules from an installed state of the package"
-		einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo ""
-		emake -C doc/source html
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/source/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/sqlalchemy-rqlite/Manifest b/dev-python/sqlalchemy-rqlite/Manifest
index 16243a107c0b..c3f44514a467 100644
--- a/dev-python/sqlalchemy-rqlite/Manifest
+++ b/dev-python/sqlalchemy-rqlite/Manifest
@@ -1,5 +1,3 @@
 DIST sqlalchemy-rqlite-1.1.1.tar.gz 4285 BLAKE2B e644238621bb0115338e31030895b4da2d250ddc6cdc7dd8bd093862debf5b59d6aa01c10d8ee19387db03420cdef9edb95e1c445e465ac838f43f80b4a23f5d SHA512 5cc37f09eb1e5c7baa370498ba1d07b0255bf18abbcb1b5213eb0acfd83990024f5f5030ed20cac1a2b240c26b799c00f2400fffd79455d14d122b75406614bb
-DIST sqlalchemy-rqlite-1.1.tar.gz 4281 BLAKE2B 09cee627790d15715c0124a1065f5cc2c72820a652a99e4c2088de21c980071f27c451e438e84d4c92222d19b651b0e239fac8280c2bbb33c55e76c9b77868b7 SHA512 da11cadd2b6dd0f3501bdf717ad7dd7552edfcf7f32a57ce09b6dadc7eb7fb31fd92e7143151a3e3b2d5f75793f6e5096d13dbe446cb71cfa901d6ff8d4c6e12
 EBUILD sqlalchemy-rqlite-1.1.1.ebuild 773 BLAKE2B f78078415ca69a0948811f9a4082d03eda899abcc4a3635f334f3f23662ad3106d3fee9768ab68421e7e919f57c242355ada159263fc81bca56e76a187256073 SHA512 59dccb6014f945105300cc8e1758b5b8f5d61ff6667f7ae0fe26ff68933766f5f03a22bfd9bb297b63182954771a01464ec2f851cdd6a7af8e496fb1c621232f
-EBUILD sqlalchemy-rqlite-1.1.ebuild 772 BLAKE2B b5cc55a78de3a54dab08584b82342948496218ca90903bcc0fdb57d5b48f1c5a63ae3b633dc54ff77d4df5cb7f2042bb12e2e7821d15246546eaece4c4b2c280 SHA512 05ada04c7c54c0d9e1e678f8174b59a2d8eafd2eb27838835cedca1c2aec8499ac5c2781e0d3173e5412fdfbff31b0a7a55b1b57ae28a0a1d8c2b67a38dfec4e
 MISC metadata.xml 308 BLAKE2B 10cc92a9033a3aa1544e83b21d88209e36cd3b55ed276c3a54b4aedd124aedb5bec54a1590e9ab4152a3ab93aa54b079eb2c0450576d760c7ce23221d38919c5 SHA512 eb181638d55ff8dd2575ce2fc8aaf5a832f7b9ca8b2e7006eed52e1a9a8493d5dcc48c7575943728026dbcf8e78a46fa9edba5550a78f0907b097b6efff4c19a
diff --git a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild b/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.ebuild
deleted file mode 100644
index 01430eebf3e6..000000000000
--- a/dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.1.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..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A SQLAlchemy dialect for rqlite"
-EGIT_REPO_URI="https://github.com/rqlite/sqlalchemy-rqlite.git"
-HOMEPAGE="https://github.com/rqlite/sqlalchemy-rqlite"
-SRC_URI="https://github.com/rqlite/sqlalchemy-rqlite/archive//v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/pyrqlite[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e "s:^__version__ = .*:__version__ = '${PV}':" -i src/sqlalchemy_rqlite/constants.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 18970f625373..049f8bfebd40 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,8 +1,9 @@
-AUX sqlalchemy-1.3.20-pypy3.patch 7321 BLAKE2B 706ff7da1f25a667784f462effb85593e8ad9a3fe893000866e487ec32328a571f4440ce4dcce61e2b5f1ded5c8145f5cd12a141c40f4bb64e87135aa18a8274 SHA512 40944c59cc6cb17f512d0df1e2cf50626dfa6a53e2e8b182c0ccb4007c2338d8058459a9158e9e72ee6aa89394275cf818f0c7572b249175d3acd52f5a1c2827
-DIST SQLAlchemy-1.4.31.tar.gz 7999646 BLAKE2B 4c394aaa4bc5636cc90f06017466c227b5e16fc54c3a9a42b18cc13906640e4710146325e870598f8905074bf6dad42ea524febc029b1dd5f063e978ebc9a442 SHA512 e54261fcf992845b2e6be47d23f530aec28c7517e6741b1b6a101b9888d3dc3162c1eeab0acc1edb33f56f1360bae3cdccdbcbff0e1e88e477c93d0cd910c17c
-DIST SQLAlchemy-1.4.35.tar.gz 8136388 BLAKE2B 01a47eab8e11daef133a218a7ef13fa149fb4616b531c3c6d227cc26e3264c259f42770b72335a9fbda5e66ae1ce242fcbe676a528ca1af896d990a84a1f1a57 SHA512 195ab35934bca36e7c4c2127f153eff31775f7f150163912f79143efae63911eded67d8645e08ede2c533c675d18c3c5796235e0c0f6d1e6ebb97664ac13f171
 DIST SQLAlchemy-1.4.36.tar.gz 8146415 BLAKE2B 62560ac2f2c542d60588a24eef225d39f1b6c4cf6feddfac4631e06731206a837cc0f76b88b40c73600361243857e9e1768b4b4ac0bf5ee8e28736d81028ae58 SHA512 c9bb38ce5eeb7817727e93695f10cf5c247710b809f3298b233ed8be4e2cc08e5a14581d0c5aa2af02d7a49f036fe3a0bb7a88120b58bdce0f115016bdaf2c77
-EBUILD sqlalchemy-1.4.31.ebuild 1904 BLAKE2B 0e84fa418b508f4793ceabbe655c227b3f2cd92bd626e5ecde35a9996182f24690db87cfaf5172eec8d0ec27e425824180fa1f5fddf4b68ed026d7c6ad95a373 SHA512 9dad795092985c87f6929f9e8f4184ec3ae99458e2bf2518da13769c059bb24b91782d8fb4d5b00e7eb5e477428cd1eb7c1dc2dfc03c521bc7576aafe52153a5
-EBUILD sqlalchemy-1.4.35.ebuild 2658 BLAKE2B d625ac04a292116546425a8e6f958e03f968c5008305d62cdaf6c266705b0f6b2694027bf0b35244479ca8368cb5a2527c4966dd950e225b18428a38a3d7af57 SHA512 30c78ed65b85379acbaeb3f06b505a4ed8ed73a6027e009b9dafbf37383b2ff0a68d988c7bf65355bc87c80916403c2ff7bb12bde04947c692fe2a15b37e345b
-EBUILD sqlalchemy-1.4.36.ebuild 2672 BLAKE2B 868685c76e5db4f863006002b84cf660492fd86ee38ea7e941eb2b1b917777a4aa037e96ddd56336d3d2c2ed238886354aa2dbca64743040a1008e63de158045 SHA512 2894b255260a6143d9e9a1789db08980e84dec7e6b6a8428aa170668bee0186afb5d8273ca7c7b49fb7f96bdcced9c23602b27572d20fec43a0f127646988bc7
+DIST SQLAlchemy-1.4.37.tar.gz 8155965 BLAKE2B cf21c2ab73a5ba2576a857a12f30ea516265af946e25c1b137e57019d862bf04f4757b4755cee28e6f53642d1f1b58f43c99cd1c69f87640e47ac8a1d1ff8d28 SHA512 3f8a814f9bb6fa273f7b210c4567bf7411d0cf2e5caf010a5387fb946063704c342072145a858fb906545dfb1b959155d041e6073273674e51715356fc1f39e6
+DIST SQLAlchemy-1.4.38.tar.gz 8211925 BLAKE2B c65a8bddfc77bb6262e24a9b191344da312641dcd759de8541439e13cc532d9c2ef92da50c0b46ace60f2fd8582dfa6ea37b2f393fd979b3f122d962c688ede8 SHA512 4f54873fe2ba14b00cfa900251bc81d4fbbd62ed2b0f5f35bd3d5157796b869a3b7a9acf162f65da3f05b4b43cfc8bba437600f7fb81887a1839043a6ad516b4
+DIST SQLAlchemy-1.4.39.tar.gz 8212369 BLAKE2B d65993c4342c2cb5bc76ea4ecc986d0ec521a6eb785604ceeca0c9c22187e4af29fc8bd940a130162ca9dd5c30d58b5d0999472285382c6f6bed3863ff9f20cd SHA512 a7c6b73250044289add492b2d7df9010f3b9a3a5126c8b3448d7339cf743c4be3f1c08d238107bb12c579b2bbd7d20e216e331d3ee10dcf79c0f23ca44d496af
+EBUILD sqlalchemy-1.4.36.ebuild 2839 BLAKE2B b19eea5aad1cb6309d4b8b93777a0dbc9bafce964aea03a3cda6a80acc603fc1ff18cfcf324b6a9a65faf00354f49c778203e02277b8c277dcd484cc381654b5 SHA512 881a5a1b470dcb2c15ce0dead3ea454ec11a130202bb243e14c0622a0d7ab424747b42ac349eb3d7b4f68c27495e273f23d5d1d4c0f8d5fa4cd1efedec785e6a
+EBUILD sqlalchemy-1.4.37.ebuild 2847 BLAKE2B 2f86c2ac04799d1f99503d37ecf027aff9197ba4eb2f2c739b4d6d66ce69ac83e1c12a621563a44a07b0e150ba2f3702446684f70a7808e57fba81ccc5458304 SHA512 802c09ba8a51a6d432cf7b5e7df0a7e970702659eafc6cba108605a66be8004aec2cb867da1646c194dcbcedb77d6d819109d8ca0c3572eb2f5f2adf80314d13
+EBUILD sqlalchemy-1.4.38.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
+EBUILD sqlalchemy-1.4.39.ebuild 2625 BLAKE2B cb12c0a41a713cad62ed92c4232a24a3ef0293e5d48488ed3ebf9cb70106a9febab2caa70bfbbb7c22e281d6db222f1a0e3cc5ce782272880effeda6a4ae2fd8 SHA512 dec936b66e10c04ce2c9eb2af65cf48c64a5e9b04ef1279c1133fb56d9a424853544ef5c3e7412d5cd5bc58c36c3697f34e2ce05cf847335872891d5f397e16c
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch b/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
deleted file mode 100644
index 3455534eb35d..000000000000
--- a/dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-commit 1607c5c19f8ef362be7182b0ee0fddc6a3d3140e
-Author: Federico Caselli <cfederico87@gmail.com>
-Date:   Sat Apr 18 18:10:59 2020 +0200
-
-    Enable pypy tests on github workflow
-    
-    Fixes: #5223
-    Change-Id: I0952e54ed9af2952ea340be1945311376ffc1ad2
-
-diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
-index 6f3170a9e..0427eeac5 100644
---- a/lib/sqlalchemy/orm/mapper.py
-+++ b/lib/sqlalchemy/orm/mapper.py
-@@ -1326,7 +1326,7 @@ class Mapper(InspectionAttr):
-             if key == "__init__" and hasattr(method, "_sa_original_init"):
-                 method = method._sa_original_init
-                 if isinstance(method, types.MethodType):
--                    method = method.im_func
-+                    method = method.__func__
-             if isinstance(method, types.FunctionType):
-                 if hasattr(method, "__sa_reconstructor__"):
-                     self._reconstructor = method
-diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-index ad4ebb656..dc47f671e 100644
---- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
-+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
-@@ -340,7 +340,7 @@ def %(name)s(%(args)s):
-             code, {"target": target, "fn": fn}, fn.__name__
-         )
-         if not add_positional_parameters:
--            decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__
-+            decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
-             decorated.__wrapped__ = fn
-             return update_wrapper(decorated, fn)
-         else:
-diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
-index 7de16bcdf..e256d7764 100644
---- a/lib/sqlalchemy/util/langhelpers.py
-+++ b/lib/sqlalchemy/util/langhelpers.py
-@@ -151,7 +151,7 @@ def %(name)s(%(args)s):
-         decorated = _exec_code_in_env(
-             code, {targ_name: target, fn_name: fn}, fn.__name__
-         )
--        decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__
-+        decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
-         decorated.__wrapped__ = fn
-         return update_wrapper(decorated, fn)
- 
-@@ -751,7 +751,7 @@ def monkeypatch_proxied_specials(
-             fn = getattr(from_cls, method)
-             if not hasattr(fn, "__call__"):
-                 continue
--            fn = getattr(fn, "im_func", fn)
-+            fn = getattr(fn, "__func__", fn)
-         except AttributeError:
-             continue
-         try:
-diff --git a/test/base/test_utils.py b/test/base/test_utils.py
-index 8356de61b..c04dea7cd 100644
---- a/test/base/test_utils.py
-+++ b/test/base/test_utils.py
-@@ -411,7 +411,8 @@ class WrapCallableTest(fixtures.TestBase):
-             lambda: my_functools_default(), my_functools_default
-         )
-         eq_(c.__name__, "partial")
--        eq_(c.__doc__, my_functools_default.__call__.__doc__)
-+        if not compat.pypy:  # pypy fails this check
-+            eq_(c.__doc__, my_functools_default.__call__.__doc__)
-         eq_(c(), 5)
- 
- 
-diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py
-index fe4ff44a7..e14c3a37d 100644
---- a/test/engine/test_logging.py
-+++ b/test/engine/test_logging.py
-@@ -8,6 +8,7 @@ from sqlalchemy import or_
- from sqlalchemy import select
- from sqlalchemy import String
- from sqlalchemy import Table
-+from sqlalchemy import testing
- from sqlalchemy import util
- from sqlalchemy.sql import util as sql_util
- from sqlalchemy.testing import assert_raises_message
-@@ -460,10 +461,12 @@ class PoolLoggingTest(fixtures.TestBase):
-         q = self._stpool_logging_fixture()
-         self._test_queuepool(q, False)
- 
-+    @testing.requires.predictable_gc
-     def test_queuepool_echo(self):
-         q = self._queuepool_echo_fixture()
-         self._test_queuepool(q)
- 
-+    @testing.requires.predictable_gc
-     def test_queuepool_logging(self):
-         q = self._queuepool_logging_fixture()
-         self._test_queuepool(q)
-diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
-index 3b989959e..c8cd89555 100644
---- a/test/engine/test_pool.py
-+++ b/test/engine/test_pool.py
-@@ -608,6 +608,7 @@ class PoolEventsTest(PoolTestBase):
-         assert canary.call_args_list[0][0][0] is dbapi_con
-         assert canary.call_args_list[0][0][2] is exc
- 
-+    @testing.requires.predictable_gc
-     def test_checkin_event_gc(self):
-         p, canary = self._checkin_event_fixture()
- 
-diff --git a/test/orm/test_deferred.py b/test/orm/test_deferred.py
-index f8817bbd7..2bf466c15 100644
---- a/test/orm/test_deferred.py
-+++ b/test/orm/test_deferred.py
-@@ -1700,6 +1700,8 @@ class WithExpressionTest(fixtures.DeclarativeMappedTest):
-         c1 = s.query(C).order_by(C.id)
-         eq_(c1.all(), [C(c_expr=1), C(c_expr=1)])
- 
-+        s.expunge_all()
-+
-         c2 = (
-             s.query(C)
-             .options(with_expression(C.c_expr, C.x * 2))
-
-commit 8d3ac81a8794bdd3532ad07427edf9f48493919d
-Date:   Wed Oct 14 18:25:45 2020 +0200
-
-    Skip a failing test that got removed in master
-    
-    https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0
-
-diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py
-index 156898f..0d6dc72 100644
---- a/test/orm/test_deprecations.py
-+++ b/test/orm/test_deprecations.py
-@@ -560,7 +560,7 @@ class StrongIdentityMapTest(_fixtures.FixtureTest):
-     def test_prune_imap(self):
-         self._test_prune(self._strong_ident_fixture)
- 
--    def test_prune_events(self):
-+    def _test_prune_events(self):
-         self._test_prune(self._event_fixture)
- 
-     @testing.fails_if(lambda: pypy, "pypy has a real GC")
-
-commit 1a1cc0e623698a75274f1525d2d14464ff738b86
-Date:   Wed Oct 14 18:28:56 2020 +0200
-
-    Fix PyPy-related tests
-    
-    Partial backport of https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45
-
-diff --git a/test/base/test_utils.py b/test/base/test_utils.py
-diff --git a/test/base/test_utils.py b/test/base/test_utils.py
-index 8356de61b..c3d25b824 100644
---- a/test/base/test_utils.py
-+++ b/test/base/test_utils.py
-@@ -1725,7 +1725,7 @@ class ArgInspectionTest(fixtures.TestBase):
- 
-         assert_raises(TypeError, get_callable_argspec, datetime.datetime.now)
- 
--    @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw")
-+    @testing.requires.cpython
-     def test_callable_argspec_obj_init(self):
-         assert_raises(TypeError, get_callable_argspec, object)
- 
-@@ -2154,10 +2154,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase):
-                 grouped=False,
-             )
- 
--    @testing.fails_if(
--        lambda: util.pypy,
--        "pypy doesn't report Obj.__init__ as object.__init__",
--    )
-+    @testing.requires.cpython
-     def test_init_grouped(self):
-         object_spec = {
-             "args": "(self)",
-@@ -2181,10 +2178,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase):
-         self._test_init(None, object_spec, wrapper_spec, custom_spec)
-         self._test_init(True, object_spec, wrapper_spec, custom_spec)
- 
--    @testing.fails_if(
--        lambda: util.pypy,
--        "pypy doesn't report Obj.__init__ as object.__init__",
--    )
-+    @testing.requires.cpython
-     def test_init_bare(self):
-         object_spec = {
-             "args": "self",
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.31.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.31.ebuild
deleted file mode 100644
index 811eb0d99f70..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.31.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
deleted file mode 100644
index 01bf4fee6568..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.35.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 optfeature
-
-MY_PN="SQLAlchemy"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
-HOMEPAGE="
-	https://www.sqlalchemy.org/
-	https://pypi.org/project/SQLAlchemy/
-	https://github.com/sqlalchemy/sqlalchemy/
-"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="examples +sqlite test"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# hardcode call counts specific to Python versions
-	test/aaa_profiling
-)
-
-src_prepare() {
-	sed -i -e '/greenlet/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# warning tests are unreliable
-		test/base/test_warnings.py
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
-	)
-	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
-			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
-			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
-			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
-		)
-	fi
-
-	# upstream's test suite is horribly hacky; it relies on disabling
-	# the warnings plugin and turning warnings into errors;  this also
-	# means that any DeprecationWarnings from third-party plugins cause
-	# everything to explode
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=
-	# upstream automagically depends on xdist when it is importable
-	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
-		PYTEST_PLUGINS+=xdist.plugin
-	fi
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "asyncio support" dev-python/greenlet
-	optfeature "MySQL support" \
-		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
-	optfeature "postgresql support" dev-python/psycopg:2
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
index f6015bde3b33..7c460a84d5da 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.36.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 PYTHON_REQ_USE="sqlite?"
 
 inherit distutils-r1 optfeature
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
@@ -52,6 +52,10 @@ python_test() {
 	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
 		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
 	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
+		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
+	)
 	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
 		EPYTEST_DESELECT+=(
 			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
@@ -89,6 +93,5 @@ pkg_postinst() {
 		dev-python/mysqlclient \
 		dev-python/pymysql \
 		dev-python/mysql-connector-python
-	optfeature "mssql support" dev-python/pymssql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
new file mode 100644
index 000000000000..d5071298604b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.37.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8019
+		test/engine/test_logging.py::TransactionContextLoggingTest::test_log_messages_have_correct_metadata_echo
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
new file mode 100644
index 000000000000..b9b2ea0d21f1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.38.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
new file mode 100644
index 000000000000..b9b2ea0d21f1
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.39.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlitedict/Manifest b/dev-python/sqlitedict/Manifest
index 1a7b2cc9552d..7e121cf37e22 100644
--- a/dev-python/sqlitedict/Manifest
+++ b/dev-python/sqlitedict/Manifest
@@ -1,5 +1,3 @@
-DIST sqlitedict-1.7.0.tar.gz 28234 BLAKE2B f67187ee27acbe5525b5f0efb8fd85b68e820439e273af8f9ac4e2f223a2c267f252cb0d60366bd51ba9b55cf36d892e02bdfe727a366bfd266005d98d477c9f SHA512 1ef5e0caf81f7ac17eac0d8573c3404ea043c0c5700fe6b4b9f28ac86ad8d97416bad561318898967cf1af0d7e616684ee3044018e24dab3686d43554c74fef1
 DIST sqlitedict-2.0.0.tar.gz 46266 BLAKE2B c320c5b61e535ff668462fc079cd501e8aae4fb334230ed0b9c5eae0c53f569c8971a8484cddf85575b1e2d28b051d2f0fa8376a1176e3116a1a0516e36202aa SHA512 3ba84676680e5e9408804618e4ae871d09fcfdc999f06c1143f42329059e6033abb2d897ed485d9d84dc2761032fa07f00f08b259f1d9e6426c4ee0068446ed8
-EBUILD sqlitedict-1.7.0.ebuild 603 BLAKE2B 5fe8a999dcfec17922ee3abc2daeacabb2ced2408904948821115c43111796998d9b22b63808973ee45bea870905f77edb8ec81d5d42d18215b11318e1ff9508 SHA512 898bbe8716bd5c370c4f87bdb75c600f828e7678d595000f1b7c46104ed4260522d5f088dd7a1e92b193c2109143d4145f5270dea89ccbc038bf62111a4981df
-EBUILD sqlitedict-2.0.0.ebuild 643 BLAKE2B 0862cb5815835372f80e9a7874a9f547485cfdc58aa1780e5b672aa80454df6459df0161638e3cf37920251dc7999856f66d90bf1a43dddd679f7663436919a2 SHA512 060cb12faf56b5edccf966a80a77dc7695a9acc275d89dddb3af54ae372d514c37927798ba7f3df952bfae3969b5eb920e57762e30caf1e09b30b646776f106f
-MISC metadata.xml 381 BLAKE2B 4ec66462c1f2882e0d9b14d5383b1c5f63db7f98dfe89b1107229b09850714dfaa0eeeb52d2c2e3e680a0eed0646a44796907c7f1183e2486b42d6b18ad00d40 SHA512 ca83b3fc874ff355ff70f410ce448e19813b891dca85f51787f1c10044e76069eb473fe9329d38ca04991a9523c695cdc2507f28f6a37728076bd2bed222279c
+EBUILD sqlitedict-2.0.0.ebuild 693 BLAKE2B b22457230f5986ca39f3304e46fede0872ec643b1a09b7c4b46af405c399107749626c0187e8c7ac1fdf14bcb223992e87ed39c482f763cdc8d972889be47b52 SHA512 9df59156e55736e8f71e853da70a58dbe598254c2a3295f4224b9c1e57f5f0e0c2088325ba1dd269f3aa706197c48f1a436f6d48b7db7a28231571c16dd7f854
+MISC metadata.xml 389 BLAKE2B 6ed74bdf480286f5361446e635025d40f8fa99c80543cbb8a01e744656c4d2aa0b65725b65743150b85162295baf511ae3741c43f299ba59fbd7debdc4160c43 SHA512 e84563debb7ea6128b4eb19bad06caaf7f967a73ab1ae39b5569990611c13659ea9b757164f429d5022030c85e7d7a3222be715af5123d514310dccc009bfcdf
diff --git a/dev-python/sqlitedict/metadata.xml b/dev-python/sqlitedict/metadata.xml
index e0f2a7f3644b..0405d36bf449 100644
--- a/dev-python/sqlitedict/metadata.xml
+++ b/dev-python/sqlitedict/metadata.xml
@@ -6,7 +6,7 @@
 		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">piskvorky/sqlitedict</remote-id>
+		<remote-id type="github">RaRe-Technologies/sqlitedict</remote-id>
 		<remote-id type="pypi">sqlitedict</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sqlitedict/sqlitedict-1.7.0.ebuild b/dev-python/sqlitedict/sqlitedict-1.7.0.ebuild
deleted file mode 100644
index 599cb922409c..000000000000
--- a/dev-python/sqlitedict/sqlitedict-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent dict in Python, backed by SQLite and pickle"
-HOMEPAGE="https://github.com/piskvorky/sqlitedict"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-DOCS=(
-	README.rst
-)
-
-python_test() {
-	rm -f tests/db/* || die
-	py.test -v || die
-}
diff --git a/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild b/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
index 1d9e040051c0..ec3a8162d777 100644
--- a/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
+++ b/dev-python/sqlitedict/sqlitedict-2.0.0.ebuild
@@ -10,7 +10,10 @@ PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
 DESCRIPTION="Persistent dict in Python, backed by SQLite and pickle"
-HOMEPAGE="https://github.com/piskvorky/sqlitedict"
+HOMEPAGE="
+	https://github.com/RaRe-Technologies/sqlitedict/
+	https://pypi.org/project/sqlitedict/
+"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index a73d766de7a7..a19eedbfe79d 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,3 +1,3 @@
 DIST sqlparse-0.4.2.tar.gz 67771 BLAKE2B 790ba224ed04ce1952602e7d01a2f0bd7e830e62a38c35d69c3fcd2b5b1016560a1e23c24ec82ff4b2e7021cbeab17968b9cff01acc8674fa18a05ab88efb84b SHA512 8136e5c14650b5286616958bfb19039a6981e4c84bf955b0f668053f5427202eff9a6472f71820293ddbe55c0f793fb690d42d0e0134135aed7eb6e13edca01e
-EBUILD sqlparse-0.4.2.ebuild 611 BLAKE2B 0fd60b34fcea4cd4810935258e58add208a34e80a03bb6be2551617a4a2164d6a8747d492a932c83fb3817d209e44005e521f227bcbcba14f7892e74e3e7fbdd SHA512 9fac2a725c31400037bbdca5b8b487d02e5b9726f7ede4bdb10240736c7808dcee0b1a0a2bd8ee02d94cbf14927f9581ccd96a98d130cb0942a8852288fbebbb
+EBUILD sqlparse-0.4.2.ebuild 611 BLAKE2B 58e58e52e89a875adac6914b03ece0f16a0bbabf27c013a819c022fd9f4bd496dbfb4989b7840f096b8ac27fa1b112448c9818f6e31fbbd1fea49e6476fcd38e SHA512 22d45dd864161602392e866343cd8a700bb7f3e44eeaee504e04b45f95d9d634e1ad3ca9f6a5048c85b240a64dc33a007baa36c8808224ff6d2878bcf53530ea
 MISC metadata.xml 410 BLAKE2B 97f37f1bbd08aa14f30b7057399220b2f94d0e3d28261beb35b8572a8bd54edc7d5cb20a6d66f3e4d37a629b350f452899a12f76c59e71796bfed61e071da18a SHA512 a55605ca5c16014efda6f2c489d8598bf355fb776f1f7972d734b533291dce3f39996a86cd4d6f86296432898e54086cca614e89bc04b200b6fea80ae7a1ccee
diff --git a/dev-python/sqlparse/sqlparse-0.4.2.ebuild b/dev-python/sqlparse/sqlparse-0.4.2.ebuild
index 5a568a5306b2..fa28d5c85917 100644
--- a/dev-python/sqlparse/sqlparse-0.4.2.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.2.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 MY_PN="${PN##python-}"
diff --git a/dev-python/ssh2-python/Manifest b/dev-python/ssh2-python/Manifest
index 41e91f5fd6c5..e05f34f7c008 100644
--- a/dev-python/ssh2-python/Manifest
+++ b/dev-python/ssh2-python/Manifest
@@ -1,5 +1,3 @@
-DIST ssh2-python-0.26.0.tar.gz 1147243 BLAKE2B 56ee98fa8694d6c9e0c163ec0200c96d8330172c0ae4612f40805ac26da02c7cf64fd4dd49841733c36ed7112c62baa036c901a9ef74a33a92a3d8dc66dc27cb SHA512 35f1a5486bc54bf2242d5b1d2fa24bd5365ffa864a8ae0f4a9f8d96f155ba0877e7dafdf87ea9988b146d8a36c203e44ca9a36a83a5060568bf798468e4a8116
 DIST ssh2-python-0.27.0.tar.gz 1146845 BLAKE2B 18512ca23da628ab9f590cd796ee38522116b133ad537b868893276b083b53ca3647b05e47585a26cc667d39b6f796cfae31f1a8cb29d74fe185e8b837453612 SHA512 f215fa11a99c58350d832680ebd1b96cb9e4b4f90621737595c526af083403379b3529361dbfea6ede40c911c267fa2a6d49becfdc55f5604b9a9f903d6d6208
-EBUILD ssh2-python-0.26.0.ebuild 553 BLAKE2B 57be3faa26e8e0c0d701006e1d0e0ae3a99ac45dcc6edd5a883ffd7ab806765654190e35e7d578586f96274378591edbf686fcee7c45e59dac285163fa0ac7d5 SHA512 8540f0c62bd1c390144156dc0e35f87e94d3eef4e084d7bffd2f1b99a6997c8b36899d3b64fa8be6695869b01c476207d4957424ae7c36885aa99bbda054d53e
 EBUILD ssh2-python-0.27.0.ebuild 554 BLAKE2B 0320940c8908a4f7ff9b4329e33a90c1b98a1d0d376e5dcd225fcef54590601c747497c781c53652cde7edd6f1595244d7abde3ce28c1af183b3f61a5677f1f7 SHA512 882a4d2102b78010e3af6b24dbc8af2b916d15506c56c49c1c2b4354739434bf5d4ed5d9435907c0f80049890634f5970dfd8c4c4bd994df39beee2922f66178
 MISC metadata.xml 390 BLAKE2B 16662f7900956299c0c2c315542447d56f459909eb48abcc718161eec0240cb8f0e98f870d0a4d18938fba7a6cff5ba47850ad7cb431517289a885aec8ab178c SHA512 f4c93eb1e6adf1d7fc855dffa8298a84d7005a465aa11762439185a28ddaccf7076005c7253423fc2d9ff88aee1d358548b23ca4f9b9768c162a70cc2aad828f
diff --git a/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild b/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
deleted file mode 100644
index c23977ec892d..000000000000
--- a/dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Super fast SSH2 protocol library, Python bindings for libssh2"
-HOMEPAGE="https://pypi.org/project/ssh2-python/"
-SRC_URI="https://github.com/ParallelSSH/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libssh2
-	dev-libs/openssl
-	sys-libs/zlib
-"
-python_configure_all() {
-	export SYSTEM_LIBSSH2=1
-}
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index de72e1167828..a464f79bf294 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4-r1.ebuild 966 BLAKE2B 3587e48ca7b4142d7277e9f60b74aa18214d1f309448ea818850c99e4013b7a003dea090295f37eb3688217aad30d07c645b74a3a5ffb2b59337e2273ad5d2e4 SHA512 caff2ccac34ac8140b921925f7d9db95492426d3242b85cf4b0c7f229d5c73862dbf698109f319427b3bde954fa3bab9e2e2a99f6f2bf38fd1793839ec8d90c2
+EBUILD ssl-fetch-0.4-r1.ebuild 973 BLAKE2B 02e41a7c170690a99f758d3d2f34c512bb7f1d553f41254ea161f45af7e807306ab08866fd2df73034a33796a0b95234c26ffbdbafe421f03ecdd52ea18ba892 SHA512 a4a01f53f22548305603ec03bc85f5b79639d412c004a4b5752d3790fe8b69902367bd55c024b75340a3f1712b9a870a04431f0e8179e02602dd2dd71baf18a5
 EBUILD ssl-fetch-9999.ebuild 817 BLAKE2B 5ef253f92cd5917f54aaa3559fcf36719b40c8e0896284c22cf96c3ed12e279946820c7aa61e0cd7344aef909aea470a82e7cd3b374e1221d119aafe34436b12 SHA512 a90d9681875f57907ad6ba47be7e788523cb2a40a0840e4198cddc71ee1eaa5c1cb721bdc7a48c40af779e3b8959f249a39d0ff7b701a124c9eed6a4e8e5a17c
 MISC metadata.xml 384 BLAKE2B a6d808e54df2c5b89dc5c0f4a92f38f188a7f7ea8d512f014e6c372203688d8d011582c4c275df70225ed11e3205126a660eb89fd67c9a07da6958bda3360b73 SHA512 c4d2c22a3b9d98e262db31005022c763432d5c11ff020481e69d931086d3871d9c278d502a7625b6d15e148c90a40eb4dbfc1d537b7a94794241acdeb5f12946
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
index f78be363d1e9..49c0ec042f98 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND=">=dev-python/requests-1.2.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/stack_data/Manifest b/dev-python/stack_data/Manifest
index 2b7f4e2af18c..7862c46ec886 100644
--- a/dev-python/stack_data/Manifest
+++ b/dev-python/stack_data/Manifest
@@ -1,3 +1,5 @@
 DIST stack_data-0.2.0.tar.gz 36618 BLAKE2B af79e5c46d03967a8ea6a992a0672a5bd3676a8b088be412782b8c6be6f58a14de1c6e6ff0cd4ae764a65c539a83aa4d7491bb7fe81761452d430d30f70d20fb SHA512 7d6a1a0ffdc667b3ac428b378f1c4f14c5ded99ec244e3cb558bb39ba0c319e9e1657188cb686c8eb788e1af2be6c0b51beae825b73f2685d7b0bc1341ebe5d9
+DIST stack_data-0.3.0.tar.gz 41061 BLAKE2B 9202ddb2e6e8c8c9e050e085cfe6e1bdbf26124eb85c19516558336d46876aba5ede1b6a87cf17e09c2b44629063a8f5e1f558fdaf64db2db029978a5860cd99 SHA512 648b6fd0dbf43ee974c15de85aa530034c6c67a3a7c297c1ea3f1ddd59bf13d331f8db9f8ddf54f69e59385ed2c0c2a24b48c5a93330df62082c333610d8a6bb
 EBUILD stack_data-0.2.0.ebuild 824 BLAKE2B 14592d59e199555514f8057c5d04a7ce663d05d25c763233ca680becad59f602a2e66831980270d79827bd86047810319a5d8b4cb29e1891053446556709fdf9 SHA512 2ec55cfcf15b6e26a3b7c7d002b14ce5b19c7945eb3b9e909afa1638b74c9b6a0c509ecc73aed22b3b7cd1eefd55a522c807fb92789d6bf6b417158044da1971
+EBUILD stack_data-0.3.0.ebuild 833 BLAKE2B eed18bbd3e49a5073e55b067a6da1501ac772d1926138e6d23f811ca4e6a432da534caca90e2a9214ad55abc7f210b3d8b385e39a27458ed9e1efdf7aae27911 SHA512 0a5c559e764428f8e4f85e31b15ed725c96d77df9de632e069e51e076f0d9063262522b67a86a0614f5609c863a8141a356c284445f6f03028ac025a6d1dadac
 MISC metadata.xml 375 BLAKE2B af41ba2f7058da9de0e1f8be741c3de7581d895246c1c941f0dc27ed2e708ac2cb64b5a6fcaea82ff79e7a8bd4e0b424500a373957019d9e62f53babeadc166b SHA512 be539ff023fbcdf96761cf06429efc4cc2d0d2ee38b3bdaadbd73665798c123591b9543ab4fd3ccca9c80820c71b010f8fd34646d2001a940df0a61fc4e0639b
diff --git a/dev-python/stack_data/stack_data-0.3.0.ebuild b/dev-python/stack_data/stack_data-0.3.0.ebuild
new file mode 100644
index 000000000000..354f429fa75b
--- /dev/null
+++ b/dev-python/stack_data/stack_data-0.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/asttokens[${PYTHON_USEDEP}]
+	dev-python/executing[${PYTHON_USEDEP}]
+	dev-python/pure_eval[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/typeguard[${PYTHON_USEDEP}]
+		dev-python/littleutils[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/stapler/Manifest b/dev-python/stapler/Manifest
index 9f7715b44d85..be3d448e5b9d 100644
--- a/dev-python/stapler/Manifest
+++ b/dev-python/stapler/Manifest
@@ -1,3 +1,3 @@
-DIST stapler-1.0.0_p20200531.tar.gz 42840 BLAKE2B bfa909e25dfd65101321e153f5129d28bbb360845d6a3622c53ec3921610b9987a8e5c85c4428ee1cd196c0ee42b5a2eefdca7c4a75be223867fad4d830b148a SHA512 7c5f76240f1dff67eae3eb25d29087c7bbff3aace65030d10836f60769798d653b30acb6cc89355ba1eb590dbfc3236cb4ae95c02db6e779ad474781a17bdbc8
-EBUILD stapler-1.0.0_p20200531-r2.ebuild 633 BLAKE2B 24fe1e6ec4a145892567a42e63d4ea3a58675820f2c085757f0577cdb2abef146c63827f2fcd8bb5b7ded2131bf88fc47f0d3216b0f90e699325a5eb1dfd25ad SHA512 aee1c8001f135303c3a428f1234da7a15e320891622787388c5931bec2a02a311287c864f2bf49b102f72905d85d03d698c3ac8239c088789391b75673edd1cb
+DIST stapler-1.0.0_p20220330.tar.gz 43659 BLAKE2B 10c24868d51086b37dd2d517aa84e3c3fc0b6becc7a29ebf496646bdd65494eb0c43488f725241d7bd7b3083ce5703538db3e05de9976a2e5029731fc2e645d2 SHA512 acd2dfec0dfab46b2cf6b440cba6c0db5399be2ba2194ca12530c311c6c5a8028614164af45b850061e7d22cbec33458ceff7757f1b104c722228dc2d02cae0a
+EBUILD stapler-1.0.0_p20220330.ebuild 621 BLAKE2B 01c30866aa79b870e016fe51210ce805909313f8f0e73e7b97a5e79bc8d085096510cc0a901bf7263026d8b00b22dbb8cf06f4dfd7b514b0d15d89e6b4688540 SHA512 a1aacef1793416e6dbac3c411fa2afce1f55421164a7fcfb9320fe0a79868297b9fc04b397f50d8ce9da393ee5e3ef09aa829ded010893f5733fca17b1bea417
 MISC metadata.xml 398 BLAKE2B 3c566702150e77dd0ba58f667336f57c0347422496edeb4fdd53e0f131cb966d15781a5d5b5e13211b2385e410a1d12c064c3ffe66056395b6eeeccdcca1cc72 SHA512 802c118d28a07f7fba6558aaa8f60aef0ebf137395af566e273ba1d218712d1835c74f82c5160f12d120d8776cbaf4fe7d09827a84c1a5e234fef307e0835a18
diff --git a/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild b/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
deleted file mode 100644
index 2ded93bb400a..000000000000
--- a/dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
+++ /dev/null
@@ -1,26 +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="1cabc85521e2badfc1e0d690086e286e701c2d9e"
-
-DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330.ebuild
new file mode 100644
index 000000000000..b1ac532be99b
--- /dev/null
+++ b/dev-python/stapler/stapler-1.0.0_p20220330.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} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
+
+DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
+HOMEPAGE="https://github.com/hellerbarde/stapler"
+SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 98de4aded70e..c751edbf35b6 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,7 +1,7 @@
 DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
-DIST starlette-0.19.1.gh.tar.gz 415049 BLAKE2B 15842a521b9cef2ed823e857f984d7d8db7a9fb4c0fb06d811fe29336a104c600b9c4f0a14b535ad1a84743cb4a1452d87f3ff0ae9245270b765af89254be86e SHA512 3fd721e4a8accfd4f0c1c87b4b0eb62b559066aeeb7ddd31dcacb73c2b4e8619fe727b10f2e3053199e710a561063ef7bbd73ad65294d0ce5db778d458ffbd91
-DIST starlette-0.20.0.gh.tar.gz 414497 BLAKE2B 47c6ef632a600bd18075c8ea65811ed18e08c285ed01cb34e5f74c00b2349430703ac041beacb35b91d941501001d2b93b79b777b403f5b6bef4682f6c13b02a SHA512 f28aff53732ec5950b2432ea644667d408e80cb4b51a177652a9bfe6731c6fa1208cba644fcaa84405bf51ef00f500a277c86e48f5446e2014369c1d1edda357
+DIST starlette-0.20.3.gh.tar.gz 417054 BLAKE2B 5564026142cb45075aa3ea3fabbc3e0eb39d4e2d776c6577d79b9c28522befaa92869e5f4211bc77235f6d25102f8d90e3811c972b74bb295abd0d186e29ceef SHA512 fa7f8de299ee452a52bf43ff6c39851fc7985775e1938b38cb564d5cb19705a84fbb173229a090295bca3be87b71214fdf7c80e3db0f870cf018510e1bd06b1b
+DIST starlette-0.20.4.gh.tar.gz 2819634 BLAKE2B 265ef6b88ebc5cee4361601198891cbab9e92e354942a06622bdac46dc63d2644557bef952730b455157ee83b15035016039f8a88f17e673487e9a3571d6180c SHA512 481a095ada3140164abae89026da36c90657d8ccabb0a6753094bf7fdf47ce6f789320ed15e94d15dedffaf302691e204cb541c26a4c779848aa6505dfe52b2f
 EBUILD starlette-0.18.0.ebuild 1156 BLAKE2B 2c31219a2ec2d15ff2c2771e321aa36371d61f79eefb3bee6243bd22bbc27da479329cc36beaf4d4b231f7854808682c4885169660a5890b1aef7cd95175832e SHA512 f23e3ea3bbb5bb198c517195dee9bf6210b0dc714d5e86ffdb0831d15fd29b8be8a9be0b2700ac189bb37e1b2a61503893398f85f1026df71829c044a12a92e0
-EBUILD starlette-0.19.1.ebuild 1204 BLAKE2B 558be21f845261ea32d4387ec37c8c3652c6eef3b574e5e4aaed2a5cef5a5b39da24e708495fba46bf89e6725f3da139f8d80adc2ee74531d3072b2e4ddc4ef1 SHA512 890b60fbc7fea6dc1d6624077e87838cf1566e03525c54947c13417ee17e67ffde55c89c5a8b089ef4f2429e5a55b3db65d489e2d86aefdd3b5ad13ee8e01e1f
-EBUILD starlette-0.20.0.ebuild 1422 BLAKE2B b69ac68faf2c8a1df9c5c544cfc00258e639c193f5ec2a3211593e9ad22eacaed5fbb9bdd45057bea573257953fe92718dd934f8a0e7ec031155c2bbb161163d SHA512 ec6e970c536574dc59e46fb7cccf7a974514f0e2bb503a2daefb69a2604c9b9bcf798c525e834d8162e8a5b68a6527bb1fc45c4b9838138b45df1082edbcb77a
+EBUILD starlette-0.20.3.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
+EBUILD starlette-0.20.4.ebuild 1422 BLAKE2B e9ff6263f72feaf2bf66271d683b079c7dcee52214496ad024e4e99e41a9b7f5fcba743deec75a79139660ce19c0dd957c11e9917441e514be1bd23238d42d71 SHA512 8595dcda16195a945b80eb31b7a9b1761d60e0d1dfcf64fff43f7f872725c91e7eeba552093dc40bf83e49f59bacef74500e83c65b8a644e6ec927c9c9d126a8
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.19.1.ebuild b/dev-python/starlette/starlette-0.19.1.ebuild
deleted file mode 100644
index b006d8c4552e..000000000000
--- a/dev-python/starlette/starlette-0.19.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="https://www.starlette.io/"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9 )
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fix accept-encoding, as new support was added with newer versions
-	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/starlette/starlette-0.20.0.ebuild b/dev-python/starlette/starlette-0.20.0.ebuild
deleted file mode 100644
index 2d29021cef28..000000000000
--- a/dev-python/starlette/starlette-0.20.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-# brotli needed for consistent test output
-BDEPEND="
-	test? (
-		|| (
-			dev-python/brotlicffi[${PYTHON_USEDEP}]
-			app-arch/brotli[python,${PYTHON_USEDEP}]
-		)
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-
-	# Unpackaged 'multipart' dependency
-	tests/test_formparsers.py
-)
-
-EPYTEST_DESELECT=(
-	# Unpackaged 'multipart' dependency
-	tests/test_requests.py::test_request_form_urlencoded
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fix accept-encoding, as new support was added with newer versions
-	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/starlette/starlette-0.20.3.ebuild b/dev-python/starlette/starlette-0.20.3.ebuild
new file mode 100644
index 000000000000..2a2de474dce5
--- /dev/null
+++ b/dev-python/starlette/starlette-0.20.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/starlette/starlette-0.20.4.ebuild b/dev-python/starlette/starlette-0.20.4.ebuild
new file mode 100644
index 000000000000..2a2de474dce5
--- /dev/null
+++ b/dev-python/starlette/starlette-0.20.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 529dfc7f1397..fdd77ccfd104 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.3.0.ebuild 510 BLAKE2B 33691fa546f94f42ca6640cd1eb9fc4ec539ecececb28b456fb51ab1b9f8a717fc8db74d8c29bb2749716118f05d2e6ce7f31a6d7f837d179bd705939cd0bcc9 SHA512 51d38f29728d673aac17c4fd0c645d6861848a97dacfe04c911cf55147a3737ebb8bf2f84f7ca6e6951d46f7cdc1261fe078b3577d80f3ddd4aa2f2cba5c945c
+EBUILD statsd-3.3.0.ebuild 517 BLAKE2B 0efdb8a2854f0a1db43a926d3f0c86e6821df7fca10ef366e8bb85a9090ca718c4133e92de05183c92bbfa5634e612c57e54a98805a27851b9bec94b2e84e408 SHA512 56b7bdd8721f2470badc40d09b9f9bed8db2c20121f16bfa1bd9f1e7dace7e2a517d9b1785276401d8f8f9f8a89abf2e68b9d158924c34c4ddd35579c47da984
 MISC metadata.xml 499 BLAKE2B 051f5627c5346348db815cc04cb6424767df8c5d0356db4d21a315f3f13acce3389d4f6015f185a24f302a4e768c135eab5255a453791df75f56c966d048ff02 SHA512 3f32abbd1912837281894a52edc7220d52e6324c5ff07c9800e0df86500ac41039225aa0c82b8fdc9d1923200fa4b2bce59ad6562e6d46aaeb4cf502338c18e8
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 32f619417936..98a4c9d68639 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 0e1396106611..5c3c4a819f3b 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,3 @@
-AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
-AUX statsmodels-0.12.2-new-pandas-scipy.patch 4730 BLAKE2B 2543000c15af63874a8d23ce8ef998e5a29ec8a6181181d22f84691cd6e258749dc202140d73d663d0a9f16cec5097df93d2e40e832e324a391f45f91613ea44 SHA512 51393795a79dda5a7d2a02b4ff7c0a0c669559774114ce5aa7030393eb25747671569331dcc48be9cae7dd98d53a95fd0368dd999e35619295182ddc434c49c5
 DIST statsmodels-0.13.2.tar.gz 17874260 BLAKE2B 93f7a308217ba938b3cd2e11d75e8f5ad19e2d4e6ab2abbea702143129bb53e7b9be54864375dbfec805624538bc73850357eb944d6c9a4c1252cc8a7606b904 SHA512 79d8dd63f667d4019e462d93e007a5ef8e11972fe35fb4d657931d6d68f3e35d29978a865682133db12fd6742f3362c2d77dfb5735c82ae454570388dd84d59a
 EBUILD statsmodels-0.13.2.ebuild 2165 BLAKE2B 0ee013541fc993d9bdff9e0ddfb756beedae828680a2f94793ca723571ccd59659123398c3cbe4bc5d497760dd0712a96393a056ee1aa8d9eb50481dbd4bad63 SHA512 58a1c0605040d7dd217fbfea2595d96e3363f7229bde53d137de5cb0a0624ab73053649fb447220596b2e147c00f7d9a965d4b0ae9f01ddab63f72a43394a0f2
-MISC metadata.xml 1344 BLAKE2B 9bf8a6aea4058c34598e450ed56d15e86830819dafe3fadb98c0e9a986a431319291cdd48d6734014f99008d1ee4a434244e142b2412dc49eac74e312ab51f60 SHA512 e87e712b79b666ea207584ef647fb61dc9572a0a4ef2a94e9dd4eae30bca8347d12635fb568483dbbebc483238cfaacea155e7d9711617d7eff4e4624e738ad1
+MISC metadata.xml 1356 BLAKE2B 0eca47b1f489954f26e6a726216f678ea5f9284ce52c00df51117d3414c549e9e43f5f307cff8fc17eb897f00abeb23cdeb4f70c2ec594860875464e0955f13a SHA512 a59057a6fad33b7dddbf7ad1b822934c9f12a45a829bea039f8773c5c778639aa3273d623ec78df653cfb2c4e88355f4a8cb809f4cb80b9dd3e7616cd06cc376
diff --git a/dev-python/statsmodels/files/statsmodels-0.11.1-tests.patch b/dev-python/statsmodels/files/statsmodels-0.11.1-tests.patch
deleted file mode 100644
index 9a1a258d0779..000000000000
--- a/dev-python/statsmodels/files/statsmodels-0.11.1-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur statsmodels-0.11.1.orig/statsmodels/base/tests/test_penalized.py statsmodels-0.11.1/statsmodels/base/tests/test_penalized.py
---- statsmodels-0.11.1.orig/statsmodels/base/tests/test_penalized.py	2020-04-28 22:02:47.150938650 -0700
-+++ statsmodels-0.11.1/statsmodels/base/tests/test_penalized.py	2020-04-28 22:03:24.468704937 -0700
-@@ -73,6 +73,7 @@
-         y = np.random.poisson(mu)
-         return y
- 
-+    @pytest.mark.skip("Broken on all impls")
-     def test_params_table(self):
-         res1 = self.res1
-         res2 = self.res2
-@@ -380,9 +381,6 @@
-         bse = np.array([0.028126650444581985, 0.033099984564283147,
-                         0.033184585514904545, 0.034282504130503301])
-         assert_allclose(res2.params[:self.k_nonzero], params, atol=1e-5)
--        assert_allclose(res2.bse[:self.k_nonzero], bse, rtol=5e-6)
--        assert_allclose(res1.params[:self.k_nonzero], params, atol=1e-5)
--        assert_allclose(res1.bse[:self.k_nonzero], bse, rtol=5e-6)
- 
- 
- # the following classes are copies of Poisson with model adjustments
-Only in statsmodels-0.11.1/statsmodels/base/tests: test_penalized.py.orig
-diff -ur statsmodels-0.11.1.orig/statsmodels/tsa/statespace/tests/test_structural.py statsmodels-0.11.1/statsmodels/tsa/statespace/tests/test_structural.py
---- statsmodels-0.11.1.orig/statsmodels/tsa/statespace/tests/test_structural.py	2020-04-28 22:02:47.207938293 -0700
-+++ statsmodels-0.11.1/statsmodels/tsa/statespace/tests/test_structural.py	2020-04-28 22:04:02.871464429 -0700
-@@ -243,7 +243,7 @@
-     run_ucm('rtrend_ar1', use_exact_diffuse=True)
- 
- 
--@pytest.mark.slow
-+@pytest.mark.skip("Fails")
- def test_lltrend_cycle_seasonal_reg_ar1(close_figures):
-     run_ucm('lltrend_cycle_seasonal_reg_ar1_approx_diffuse')
-     run_ucm('lltrend_cycle_seasonal_reg_ar1', use_exact_diffuse=True)
-Only in statsmodels-0.11.1/statsmodels/tsa/statespace/tests: .test_structural.py.un~
diff --git a/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch b/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch
deleted file mode 100644
index d11cd08ecf6f..000000000000
--- a/dev-python/statsmodels/files/statsmodels-0.12.2-new-pandas-scipy.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 4f32f3990fbba0ee440af47e23a9354fdb7a0285 Mon Sep 17 00:00:00 2001
-From: Kevin Sheppard <kevin.sheppard@gmail.com>
-Date: Fri, 12 Mar 2021 10:52:38 +0000
-Subject: [PATCH] MAINT: Fix issues arising from future changes
-
-Fix issues due to changes in SciPy and pandas
----
- statsmodels/regression/tests/test_rolling.py | 6 ++++--
- statsmodels/stats/descriptivestats.py        | 8 +++++++-
- statsmodels/stats/stattools.py               | 4 +++-
- 3 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/statsmodels/regression/tests/test_rolling.py b/statsmodels/regression/tests/test_rolling.py
-index 050de605f..f02e076d6 100644
---- a/statsmodels/regression/tests/test_rolling.py
-+++ b/statsmodels/regression/tests/test_rolling.py
-@@ -1,5 +1,6 @@
- from io import BytesIO
- from itertools import product
-+import warnings
- 
- import numpy as np
- import pandas as pd
-@@ -261,8 +262,9 @@ def test_plot():
-         res.plot_recursive_coefficient(variables="x4")
- 
-     fig = plt.Figure()
--    with pytest.warns(Warning):
--        # Just silence the warning
-+    # Just silence the warning
-+    with warnings.catch_warnings():
-+        warnings.simplefilter("ignore")
-         out = res.plot_recursive_coefficient(fig=fig)
-     assert out is fig
-     res.plot_recursive_coefficient(alpha=None, figsize=(30, 7))
-diff --git a/statsmodels/stats/descriptivestats.py b/statsmodels/stats/descriptivestats.py
-index 96d455ca1..d5ad2f2a5 100644
---- a/statsmodels/stats/descriptivestats.py
-+++ b/statsmodels/stats/descriptivestats.py
-@@ -446,8 +446,14 @@ class Description:
-         else:
-             iqr = mean
- 
-+        def _safe_jarque_bera(c):
-+            a = np.asarray(c)
-+            if a.shape[0] < 2:
-+                return (np.nan,) * 4
-+            return jarque_bera(a)
-+
-         jb = df.apply(
--            lambda x: list(jarque_bera(x.dropna())), result_type="expand"
-+            lambda x: list(_safe_jarque_bera(x.dropna())), result_type="expand"
-         ).T
-         nan_mean = mean.copy()
-         nan_mean.loc[nan_mean == 0] = np.nan
-diff --git a/statsmodels/stats/stattools.py b/statsmodels/stats/stattools.py
-index d349c472d..2ee1a6e0b 100644
---- a/statsmodels/stats/stattools.py
-+++ b/statsmodels/stats/stattools.py
-@@ -118,7 +118,9 @@ def jarque_bera(resids, axis=0):
-     where n is the number of data points, S is the sample skewness, and K is
-     the sample kurtosis of the data.
-     """
--    resids = np.asarray(resids)
-+    resids = np.atleast_1d(np.asarray(resids, dtype=float))
-+    if resids.size < 2:
-+        raise ValueError("resids must contain at least 2 elements")
-     # Calculate residual skewness and kurtosis
-     skew = stats.skew(resids, axis=axis)
-     kurtosis = 3 + stats.kurtosis(resids, axis=axis)
--- 
-2.32.0
-
-From a9e21aef508ea98da8c5889547b8e5748986dae1 Mon Sep 17 00:00:00 2001
-From: Kevin Sheppard <kevin.k.sheppard@gmail.com>
-Date: Wed, 7 Apr 2021 09:52:25 +0100
-Subject: [PATCH] MAINT: Fix descriptive stats with extension dtypes
-
-Add special path for extension dtypes to remove N/A
----
- statsmodels/stats/descriptivestats.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/statsmodels/stats/descriptivestats.py b/statsmodels/stats/descriptivestats.py
-index d5ad2f2a5..0fd3eb542 100644
---- a/statsmodels/stats/descriptivestats.py
-+++ b/statsmodels/stats/descriptivestats.py
-@@ -441,8 +441,20 @@ class Description:
-         loc = count > 0
-         mode_freq = np.full(mode.shape[0], np.nan)
-         mode_freq[loc] = mode_counts[loc] / count.loc[loc]
-+        # TODO: Workaround for pandas AbstractMethodError in extension
-+        #  types. Remove when quantile is supported for these
-+        _df = df
-+        try:
-+            from pandas.api.types import is_extension_array_dtype
-+            _df = df.copy()
-+            for col in df:
-+                if is_extension_array_dtype(df[col].dtype):
-+                    _df[col] = _df[col].astype(object).fillna(np.nan)
-+        except ImportError:
-+            pass
-+
-         if df.shape[1] > 0:
--            iqr = df.quantile(0.75) - df.quantile(0.25)
-+            iqr = _df.quantile(0.75) - _df.quantile(0.25)
-         else:
-             iqr = mean
- 
-@@ -493,7 +505,8 @@ class Description:
-             return results_df
-         # Pandas before 1.0 cannot handle empty DF
-         if df.shape[1] > 0:
--            perc = df.quantile(self._percentiles / 100).astype(float)
-+            # TODO: Remove when extension types support quantile
-+            perc = _df.quantile(self._percentiles / 100).astype(float)
-         else:
-             perc = pd.DataFrame(index=self._percentiles / 100, dtype=float)
-         if np.all(np.floor(100 * perc.index) == (100 * perc.index)):
--- 
-2.32.0
-
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 468454c6be33..539db809506b 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -28,7 +28,7 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">statsmodels</remote-id>
-    <remote-id type="github">statsmodels</remote-id>
+    <remote-id type="github">statsmodels/statsmodels</remote-id>
     <remote-id type="sourceforge">statsmodels</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index b008f4cf10e6..29de0355b210 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-EBUILD stdio-mgr-1.0.1.ebuild 830 BLAKE2B 4d2637fca5b1e83089843465188479c8bd2a85f7885ad9a3fe924ac8855c575684a8cd31f9bb1d1a07620ed1703df980cd7dd5968c0fa062f801eab6500e7b39 SHA512 536613dedb17ca617b44c93f02cb76ea817cc69cb766c62d7a8dee30c717959f8b9b372aad5e694d6cf265ec99a7f461d4f744a7655531ff74d62a9adcffdd6e
+EBUILD stdio-mgr-1.0.1.ebuild 830 BLAKE2B 784475348a4bd76422a06775b40be2f222dbd643e255522776ece922b788392395118a06a13216680b2b8f24fff0d73523a10d8ae795538821b8ae4012e2e362 SHA512 dcc279b7e91704d6e20559c8ab699623b0a3f51a065d7e1bd9c4cb10fce990eb5e18d1fa9ca93a4b0712741edb832073fb2a1703aea1523ce0bf23e42f7e54c5
 MISC metadata.xml 939 BLAKE2B 5de63d07f8d39fb1af9bae43810bd958128b73b71a3dca0add2fa222443b2df8dc0e5733ac566fa2d9bac22d7c4418e51b7353a5ea34577803052ff4050d775b SHA512 c1be4c8396e71317c0d21bcceadecab10c5cc98014523954d39fb9a8f687667c7970bdbf152462090bcd20e462fd8bd6f1ab6cec410d5d53393f04bd6df669a5
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index dbd58c573389..c6457905e464 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 607c0ce8ccec..9001c5079cce 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
-EBUILD stestr-3.2.1.ebuild 1100 BLAKE2B 9c2f52a83b48747d2fd7ca4cef49b1118387148eb505b8d01b97a45052b203f87efc762b464ee62cd242267400318eb9cbabe720ac0762d7e95e09391a7e019d SHA512 725ba212d16c6ad2ca71420b62f9beb75e3d390e3b1d6a5acb86c446ad2d314edbcfae4cde68845c6af9f53f2f2f83f157dbcd86e3d4ea140a274397f3a25685
+EBUILD stestr-3.2.1.ebuild 1107 BLAKE2B 23c6e2563af4069538c9053a08694f191ac65df0b0a50c3997c9ad17119b06b92245f5cf5892d21db42df0a3e3f693277a9601751a9e32530118ab66ecc9a0b5 SHA512 7949f06c03edea2e491216af9b72b88b11ec5053c6e77dea77c42911e40a485815c02c4ce7e9dbcb8805ed0fb3a7e5a7c6100bfd33a7360dd31ca59d05239afe
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-3.2.1.ebuild b/dev-python/stestr/stestr-3.2.1.ebuild
index ed150fd8d1ef..68b581ac3aba 100644
--- a/dev-python/stestr/stestr-3.2.1.ebuild
+++ b/dev-python/stestr/stestr-3.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 387f3a13d0e1..0ba7b5fda33a 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,3 @@
-DIST stevedore-3.4.0.tar.gz 513360 BLAKE2B 17030d1aa3cfb566e6f589120eeb6241a1bc0a0dbac0825c48fc96b16316348e7b5e87c6c7fe428faf46cb9e2abbb0da6465f404d5a1fb767fb07c5d8078e481 SHA512 a63897c65fe8deb1b900c4279ce38856863a2581f8e0dec3fc082d0bd6daa5f346bfc6af978b73c3ac24215953c1376a973b800ff8dbbdc1a99f52c99bed7d6d
-EBUILD stevedore-3.4.0.ebuild 998 BLAKE2B f34223be4d4ff0d1c2d7d372247354f7160f649da7044eecb6b9f420041a6a7fe308aad767ac340dbe13361a83539f44c65eef53decb632fdf3218a950d7a9b5 SHA512 2f110950be41992100abe8225423de1c9ea1121e12815afb7107459531aaef231c697e35a078a5faaf8416598412d8f7eaae58f1224187163cb096af526c1b6c
+DIST stevedore-3.5.0.tar.gz 513548 BLAKE2B bb9b1968dbfdbce0764b0c2030e5d555e159e04a88d8fbdb151d3146e7940643c761ff476f7d950c2e83501b9b125e8323a8463d8b4b93b79cc76ddf2f71a362 SHA512 be0f82230d7d4d3cf18dd913e11093ad90744e32a3021d9f88f0be244f56d0e3606af0adef67674c569c41d885837be3f0fc4d58009e036151cc67963a4f2ab3
+EBUILD stevedore-3.5.0.ebuild 1363 BLAKE2B 0cb8470e708b39241344715f9b94b748db6d9f2db043c6c547fce4fad8abb8a47cf46f4a298bff41ddeaf9c7ab5b37de45731dc742ea20ab6e30741c1955c37b SHA512 dfd1ab0f730270f83e50293092e6a5be1aafa01273694c40b34d42409fddf919545e1a032b7a36a9b785b00836204ecbcbcfd134783550c80059365806a48d97
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-3.4.0.ebuild b/dev-python/stevedore/stevedore-3.4.0.ebuild
deleted file mode 100644
index fb6171da6fc8..000000000000
--- a/dev-python/stevedore/stevedore-3.4.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/stevedore/stevedore-3.5.0.ebuild b/dev-python/stevedore/stevedore-3.5.0.ebuild
new file mode 100644
index 000000000000..f7b722d6adc9
--- /dev/null
+++ b/dev-python/stevedore/stevedore-3.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="
+	https://opendev.org/openstack/stevedore/
+	https://github.com/openstack/stevedore/
+	https://pypi.org/project/stevedore/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx 'doc/source' \
+	'>=dev-python/openstackdocstheme-1.18.1' \
+	'>=dev-python/reno-2.5.0' \
+	'>=dev-python/sphinx-2.0.0'
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+
+	# Known bug in tests
+	# https://bugs.launchpad.net/python-stevedore/+bug/1966040
+	sed -i -e 's:test_extras:_&:' stevedore/tests/test_extension.py || die
+
+	# Also known problem, inside venv
+	sed -i -e 's:test_disable_caching_file:_&:' \
+		stevedore/tests/test_cache.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index d56cb00f6481..67b2098449bc 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1,5 +1,3 @@
-DIST stomp.py-8.0.0.tar.gz 35146 BLAKE2B 65f15e0145e1fc48d4f9ccf37ce81f1f7464e9179d63d6f22e96dd99ce35692dbcb6056730c35255428b0ccf0d744debc39e2c12e6e2b6675ac20c7ec0ff3efd SHA512 068694e9bc42e45dd769275296a1ea817153cb0318b08377be5e0b9563989a83bff35c4bc424e00939b7521938aa34f485401f07a8a51c3d9a90eea3f00c1ea1
 DIST stomp.py-8.0.1.tar.gz 35300 BLAKE2B 12209e99066fb5bb1f3015398f5eb27186322ce9d92feca46adc4d275aff1d5138908da69abe3be512325bd30a3a21773886ba5fa21917c71d13bc53b0977de4 SHA512 009189cd07c379641c9fa3b3af1df70c9e26b77bbb6d2443a78b56ff9895b4382e90a753db83f4a863fae5ef5765c660d2f82ef14ab6e74817bc83e7ea8ba6d3
-EBUILD stomp-py-8.0.0.ebuild 1060 BLAKE2B 452fc19c202c1b439547811a6fe2d14634082f19535c4bfdeb85fca2b2efcabbcce4d1b2cb1a6abccb1fdeefd969a5a22b0ebcdaf4f75740f560cc85b393fb16 SHA512 d511761b4348a8ef292fea1bace34be4d25065d214bef9010778bfc824e2c4438b07b5a710bcc4bf6f3d5691f13fb4898ef5c2664ede2264c32e18ce9cfb5016
-EBUILD stomp-py-8.0.1.ebuild 1061 BLAKE2B 8f0c9d8fb9d0dd5c2389b8c42445d5f59e03c346d5c3f9addb42b9f8f70cd16dd31e888dfd6d53cece83505a1030b137742c46c1056ec2d103bc0c1d274c170c SHA512 20039328ab68d2b54fafc3a4b2de8206433d654947e1f5d845dcdacc05a16340f0a9ac2ab5d369104b5e2c3ca025e84318cddfbf8b4779a9514bb26a660aaf64
+EBUILD stomp-py-8.0.1.ebuild 1060 BLAKE2B 452fc19c202c1b439547811a6fe2d14634082f19535c4bfdeb85fca2b2efcabbcce4d1b2cb1a6abccb1fdeefd969a5a22b0ebcdaf4f75740f560cc85b393fb16 SHA512 d511761b4348a8ef292fea1bace34be4d25065d214bef9010778bfc824e2c4438b07b5a710bcc4bf6f3d5691f13fb4898ef5c2664ede2264c32e18ce9cfb5016
 MISC metadata.xml 402 BLAKE2B 2cca58b54cd707a4c0db87e034f4e6387e9243aabe392cd0046d11b6d2074c57285798db5a81d7f3f6854a9a43436a193678d384ccde45af0552bc50b26e77ba SHA512 770aac685fa99c5e3a01bab4864d6af4c9c810ad52c4f8a2a0c32a4303f0e5e9a1573d7ad6220737e6fa4093c5a1430fb2a7765a151bcd5aa9925e059d5bed41
diff --git a/dev-python/stomp-py/stomp-py-8.0.0.ebuild b/dev-python/stomp-py/stomp-py-8.0.0.ebuild
deleted file mode 100644
index bd1012a4f420..000000000000
--- a/dev-python/stomp-py/stomp-py-8.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python client library for the STOMP messaging protocol"
-HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
-
-# stomp.py test suite requires quite a few appropriately configured
-# messaging servers (as of 7.0.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
-# stompserver). Upstream relies on Docker to provide those servers, however
-# doing the same in src_test would require both granting the portage user
-# extra permissions and packaging the base image (trying to download it
-# on the fly would violate the network sandbox).
-# Side note: PyPI tarballs do not include tests.
-RESTRICT="test"
diff --git a/dev-python/stomp-py/stomp-py-8.0.1.ebuild b/dev-python/stomp-py/stomp-py-8.0.1.ebuild
index 9b841f321106..bd1012a4f420 100644
--- a/dev-python/stomp-py/stomp-py-8.0.1.ebuild
+++ b/dev-python/stomp-py/stomp-py-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 5a2b86c8bf39..a7b385119575 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,9 +1,7 @@
-DIST stripe-2.74.0.tar.gz 240731 BLAKE2B 68d80f0dab200087f454c98bfabf483ce7b6db06061d5dce81bc258e0425576b54a5e9c6a9134d59064ae978db4bdda407f12eaa8ac48b51a87722473732a8b9 SHA512 f7f549e5b5eec38248320f7852f0c5fa3476f3d68aab646f04f207e0d6be20cb54ed13e4093d40313502c9aed7b60392c20c1baded4bb845703647d8c022342b
-DIST stripe-2.75.0.tar.gz 240179 BLAKE2B db5c94bc21a584ab5241ebf639a7e78f8de56f46e9460dd00cecb8907fac701f4edae8adbdad249eb98921a3dc81ce670ad846784d7c5743b02eb28ee2f1c034 SHA512 e4ddc675cffa6b1fa087c8d68c9717f55b59016a22605d539a2c9f4d6b5746e166e7efb38d5a001b5c00d32678b3b263fce9a27537b6a3edcdd8c6f2a60eb5a5
-DIST stripe-2.76.0.tar.gz 240679 BLAKE2B 983761ab25f2a5b0206e4c2261cfd42a07e4e9d0e76f655e06f2cfb0fb41fc18787a04e8c2652632b6060b573a2ca5969fb629fd23e631b951da6b72728e86c9 SHA512 e416043dff74791d3f06809ed611ea1e250b9dae9404092915a674c6fe65eba546eb020cfdb7635fde8d0626e2c1fa4176cec7362870fc02bee619216b58cec2
-DIST stripe-3.0.0.tar.gz 240569 BLAKE2B 82e4d7ae131af395922f0af33344b74e374380e935362c5a25f116be136ff85316b5f4f2a092b5e03c1041addfc5562bb248ac4ab89efd6fb5f5fdc9728637f5 SHA512 2d0adbd3fe3c79317305153597d4302fed657876701aef332151d10b2370405373c9aaeee696ffac4ca8925d02391215523b95ca62bc67f801ad52da5b125c9a
-EBUILD stripe-2.74.0.ebuild 1816 BLAKE2B ed3eb878b027385d4164c94aa4c12df2880819ff377665abde98479148e22929222e1ab59321353e9a3db297fb2e4e324f06db7eebe847aa39f05aa2dae4f509 SHA512 884b6f086f3c8d299ca0a0f7edbdb1409a52d927e45f6696c1b87d30ac531f0b639620b8f50dcd6b2adfee00a27883cc95adb9a0645c9cee28968287c25184d0
-EBUILD stripe-2.75.0.ebuild 1818 BLAKE2B 1b23ee02c2182954c19d58dd68a2a439f2351b6cc51d23976aa4256f7dd0e089579bcf76847312a7ea4d1080f5ca7311fe158ad1e67c2361cd2c2bc75d237b20 SHA512 1586f2b6c9e276938a210d55cf11b493faf64e5c68a5e44aae0726d591bdf527c2aad7a9ac315a8a7d201164cc532e5c4145e701a354faf45d182a2be52622f8
-EBUILD stripe-2.76.0.ebuild 1818 BLAKE2B 1b23ee02c2182954c19d58dd68a2a439f2351b6cc51d23976aa4256f7dd0e089579bcf76847312a7ea4d1080f5ca7311fe158ad1e67c2361cd2c2bc75d237b20 SHA512 1586f2b6c9e276938a210d55cf11b493faf64e5c68a5e44aae0726d591bdf527c2aad7a9ac315a8a7d201164cc532e5c4145e701a354faf45d182a2be52622f8
-EBUILD stripe-3.0.0.ebuild 1818 BLAKE2B fe5da6a4a03b66a53e7f9d02add25e9bf12e9f5f90b401f381f7ce95016764d272ea8fcf8d0dc4683806b7850e7727964458909c8ce2fc2ae79f4f8feb3b48cf SHA512 5ec53dc90a6c5165413ad4d0c91ab30a2782afc17742955efc12fa93af88f0ad6c3081847d045c589734fe32f788a77f2b361961067f29f252d9939ab470b3dd
+DIST stripe-3.2.0.tar.gz 245873 BLAKE2B c75864cebc4b62c116138bb3b9fcc7b521a7c89c7252bb2ad03520b0904ad701bab27fbe1a0ae500a2782bf737295218180991fe0d5f224038f7bdcfd2596598 SHA512 dbeb846294928fd608d547b8e4aedf188345ce68ce6e9b4c046e86e5a622d96281cf0507db4d1ba5834c68252bda573da7dac725aa1d7cbeb820c65e166f3a1a
+DIST stripe-3.3.0.tar.gz 246317 BLAKE2B f734df83509b6c77f865d52b2ec17ac5ac271661478706787616afde1f85cb356f05c2fff63289b3bb180658abab546d39245563f18f4f7a3e8b72a0e578fb34 SHA512 4f00fd9901a5b4d873c4a9a00483f57f4cd9359f8a440b3d783e7aeed250e33400a7405ca8ea5af29fd1b44bc84c65fa59c8121e4ffb4852584ffd3fc2099910
+DIST stripe-3.4.0.tar.gz 246528 BLAKE2B 81af648356734400c109d674e1f62f45c3b0540b0ed0bd94e407f5072f5bb996270b4edf12bd00e61bb790ee2c12d3d0fa633287a60e27087e64c15aa421650a SHA512 81a391b2fef02028a5680df2240238bd18cc31f522790ee72fd77c861d2f389be3ead9bc1de261ac7bced3061235ffc25b6baadb69a20a2a53ced75aee0119ba
+EBUILD stripe-3.2.0.ebuild 1816 BLAKE2B 846a6eea171f1d73863f6516db4721a7144180ca414467a9dd6cc815f6d29e7968158edd5b2bed7d9fb46b6245264f7957c715e1ed97439a2c51a7b7bc2af448 SHA512 cb4da8684e5f88a360274f02b300e52f3e741d2e71eadba00217f5ea61f7e443ee60c9efdc7270abb79558e10e61bc217816b53f30cdaa566dce19e33cb21297
+EBUILD stripe-3.3.0.ebuild 1818 BLAKE2B 07faeb2dbdcec4ff86156c6d77c0f036ce5fa03cd0d554a3b6b9d2038fdb61989aab488e8b79a7c3346b6ef30e308aa064c607ad7dec92f3b52392cc11a8e9d6 SHA512 864157a1a6bd6a34ef80b9f1c731c8e9d0a0b1d6f16134b42bf34cdf70ad80449d3e0197458c831018192d314a239123b4e0ff9243d75093a3310554168876d8
+EBUILD stripe-3.4.0.ebuild 1818 BLAKE2B 2e62e84762c936b0b92e13f72426398be3642e9ffd2f8147abe9cc4d67122a2d0141457483af3874fe1c2beffb44233a62d9bad44e9fb2f9e0a05eb96105820b SHA512 207206c66e98be9137b9a450e1d778ba75c311f7044c91949473cd5479eb64802205ef4580086865039a542eabbae4851cf74ed908436a63514f69f30f263ad1
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-2.74.0.ebuild b/dev-python/stripe/stripe-2.74.0.ebuild
deleted file mode 100644
index e8f6184959c9..000000000000
--- a/dev-python/stripe/stripe-2.74.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.124.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.75.0.ebuild b/dev-python/stripe/stripe-2.75.0.ebuild
deleted file mode 100644
index a0b230f30493..000000000000
--- a/dev-python/stripe/stripe-2.75.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.124.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-2.76.0.ebuild b/dev-python/stripe/stripe-2.76.0.ebuild
deleted file mode 100644
index a0b230f30493..000000000000
--- a/dev-python/stripe/stripe-2.76.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.124.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-3.0.0.ebuild b/dev-python/stripe/stripe-3.0.0.ebuild
deleted file mode 100644
index 760cfebe22d1..000000000000
--- a/dev-python/stripe/stripe-3.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.126.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-3.2.0.ebuild b/dev-python/stripe/stripe-3.2.0.ebuild
new file mode 100644
index 000000000000..015f0bdf3317
--- /dev/null
+++ b/dev-python/stripe/stripe-3.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.130.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/stripe/stripe-3.3.0.ebuild b/dev-python/stripe/stripe-3.3.0.ebuild
new file mode 100644
index 000000000000..1dc081924988
--- /dev/null
+++ b/dev-python/stripe/stripe-3.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.130.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/stripe/stripe-3.4.0.ebuild b/dev-python/stripe/stripe-3.4.0.ebuild
new file mode 100644
index 000000000000..cce5111d957a
--- /dev/null
+++ b/dev-python/stripe/stripe-3.4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="
+	https://github.com/stripe/stripe-python/
+	https://pypi.org/project/stripe/
+"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-util/stripe-mock-0.135.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
+
+python_test() {
+	epytest tests
+}
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 7b6aa94ee6da..e08451c4db99 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,3 +1,3 @@
 DIST subprocess-tee-0.3.5.tar.gz 16887 BLAKE2B 6eb25085eb2b2ee4557efd556d8035ab8f6b781b47783f24f227db04b3f82fffcfa29d69f0e3588c3fa6188446a3d96d4421e6b1ea5b3292f42635e19a404bab SHA512 47de075e7b6c75598dac0ad1899e1cce9dc1131b49c35ccade2b67c8d2a2d0248ce22a20c336519ff00bfd57269613bc663012e48cf0afa087c93ee74e18e4d4
 EBUILD subprocess-tee-0.3.5.ebuild 912 BLAKE2B 69cfb68207fc4dc69ea1343ab5beca0108e70fa45a2e8a933df0182149d755f22fb283d5ccd34be82c309e89322de52a22fe916e13e9b1593176b3fd9b519229 SHA512 b8a1b3bedcbb0ef5941503150a1b5c9aef496aae4b77563aae0430d7a545f1192d62e980e60a57ebce1163ea1e248c47554246bea8e743f3df8c651b4e503414
-MISC metadata.xml 632 BLAKE2B 5764da49dca8c701e0fc0c3446d82bc24b361450df134cf5abe1c72af30d124da17186bda4a775b101e9ff7def515b45a42936ffeb8baf25dec69dd5f6b887a3 SHA512 4d71f7ced279578327551ca7913f02c8a88be17a841c7adb8e2c3e931a879560e12b54f387a714dd8bb327181549c94fb0fd00028aecd7eb4dc6e4f35c4ad4c0
+MISC metadata.xml 733 BLAKE2B b18b79649744580db9298cb069dbf3b4c23d10983f012206199f6049752a5a232ed7068daad0716add206cfbf811d3c30e61c90d465e9f2a7f5c444f415d5dad SHA512 a3458edf61b355dc98f05602aa0a98c56d553567f85644ce5157f6a36f8947f8fb11971992305074c1d00a00e38481d4b34048ccf2312f51b477f33498cd792f
diff --git a/dev-python/subprocess-tee/metadata.xml b/dev-python/subprocess-tee/metadata.xml
index b512ef6a1174..143a4000daa5 100644
--- a/dev-python/subprocess-tee/metadata.xml
+++ b/dev-python/subprocess-tee/metadata.xml
@@ -5,6 +5,10 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pycontribs/subprocess-tee</remote-id>
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index de034d9dd78c..86df533ce4b9 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0_p20210729.tar.gz 112644 BLAKE2B 56e785c029f3f2896d0ed3d8005c37403e6aa32d05b653db0e3b679d2157820558e578b53133f4f79404a660f37a710aeeec03ff941fd7cd0819020a0d474515 SHA512 90b1ad071fb5246a7446a4c999142566b9d96c39838905e9020b80f2f0aba0b86dd5185bbd25ff7fc65f69ae68e1e53dfde5b2de05755aa97db9248c6faaa9d7
-EBUILD subunit-1.4.0_p20210729.ebuild 2254 BLAKE2B 09976c2aa980f00374df734a4878a8fcd6eff0bda77036ef822da095d0620e59819cb0a4caecb5fd59c91d3cee1ceb853612dc010e7236f619cbbdf05f8c9db6 SHA512 1708f2baa610aaba4190947117fc90c6d90f952cb22d183adaa376057fbdbef4054c6aa71659c3c7c041c707ac3522ccfd98cce1037718ed7e618df5b7e2155a
+EBUILD subunit-1.4.0_p20210729.ebuild 2261 BLAKE2B 2410af5e778188b366f43b48f9f4f5c9108fefc1de5fe4ae383b31a48b71d2655ff4ed2b5a33ebc0f5d9c8eb4ac8fa801e8253599d51b727f4df4b0fb39beca4 SHA512 8b83a4743b1d9b6b0a16f193c040da6294e000e7eb90f8bfead175b85470c5bdb2c792251ac7c5378610278ef81576df20227911b0880929a93282175a603dc1
 MISC metadata.xml 536 BLAKE2B a2d8868bf91b862ea393f908c5ae6924dc70fcfa5e2d58692d61c1a45ae33bb9301c82fc032c5951491857da923bdba56f2ed11c149df7b11a4fd9037d1e5a23 SHA512 15d6a7804d14048e959dcaee03bcb2069110ab930368b2b9c31c78b610fd35beb1f714e3d109de2903dba62600b0013d6ef7f5794e828dcc6b34755e35d1836f
diff --git a/dev-python/subunit/subunit-1.4.0_p20210729.ebuild b/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
index 7260b54bee91..1360e973fd44 100644
--- a/dev-python/subunit/subunit-1.4.0_p20210729.ebuild
+++ b/dev-python/subunit/subunit-1.4.0_p20210729.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 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/suds-community/Manifest b/dev-python/suds-community/Manifest
index b35a1e7195b3..42cefeb745c8 100644
--- a/dev-python/suds-community/Manifest
+++ b/dev-python/suds-community/Manifest
@@ -1,5 +1,5 @@
-DIST suds-community-1.1.0.tar.gz 284545 BLAKE2B b5f6f6f46a35df3263664c9893745a2e723f3eef543cb1a9e9fd061956b0c00c219e818228de9bf11b2730ad0a8fed90ad731199ffc7ca9fba9f22c5c0c8dd41 SHA512 2c8902e16c3513c99ce6d8bdf58ef4f5c4d704f1bf2480ea2b23ec2adbd9e8919928bfd5e3fd6859028b7fbc3788d067b9b71bad2a20c2f4907e6e56f3f15350
 DIST suds-community-1.1.1.tar.gz 284934 BLAKE2B 9df1a5f6b4dd2ca060c639147a090cef6a194f275706e03a3fdafa46c4d18b890f7c94249db8db6202e95abea71948e0c42fe42f14f659ca14bb0aca11b4b5f5 SHA512 9b343d704b2db123ff44685fb03da8f6912cefb32d38e9b79f9f84aeebff32ba26936a0f70a6121628c6f2c5388e94d380f08ed546f55fbf84fdc8e4fdbd3d0a
-EBUILD suds-community-1.1.0.ebuild 504 BLAKE2B b7e6b2fc3a582e811327946133cf6dcd9d08af4cc9f0b558c2d9463fb630b59b817a629348e591b88867a16ed737d128a92d4ea40ab28d3e26bf58bbcb4d316d SHA512 3b37365768eaadbcfaf566bf4575002e766d8693221878e566d55cebd150b38ca6646de319b2f8c1cb4f105992bb3954a6d2ae54e4da0324e608c3ca2388fdb0
-EBUILD suds-community-1.1.1.ebuild 612 BLAKE2B f8a0ab7825954557ca1bdea42d7479ce65217044010992ef94e34337906513b5f64bc137a82c8ffc0d033ece8d4c886bfee4ef41e05e7b02a238a07333974024 SHA512 81fc06d415a6ee1e4d7791268b0636a37cd9d7a7e3b91b777afe045316d6a3c15c169585feee4e26d41267e55b241c2020a99aa32ca7ef75c5999772806b6245
+DIST suds-community-1.1.2.tar.gz 285409 BLAKE2B 6cf047bb6fa6aed147fa519fee4300f52195c94a409aaa769feffaaf4d43552a566efb0162e440092c3dcb8ec21cf441325db449e5417b81a5f859133a078b83 SHA512 9f26ebbf36fcbd915281f3c3afd4ea776ca409ede4ba9e487b746ef4e527171ee2fdb44075100d52b5bba0658fafec817eea2cbf64b8d2851bdc974aee430d57
+EBUILD suds-community-1.1.1.ebuild 610 BLAKE2B 0914b63f53741520b75f314e386cf18b3a4bcafeaa5a050d42775428c0bc7f2fd31c0317bd3aab059797b33aafb2c96723ee428139aa37d6193e791e484267a2 SHA512 dad8a96f411d6398b8be48fbf87ea65c90fe6fef5ff91402a29ede0cd7f25207f12c9923f20251ca110e7953010f2320a6c569a6a70a1ad3be117c53af64af3f
+EBUILD suds-community-1.1.2.ebuild 612 BLAKE2B efeecefe9b4a5cc5b78992ea3ddb4f1ee3e9ed9afc7b146a4dd0f662576be10c83941edbc90b8c6861856a0eb63d2abdd71b6120821c56fd844f9cddf34c43d8 SHA512 cc9e6ab41c9acb73fde1ab3d5802403dba89fb411f1edd07512676521fbcc874bc9a5209922b08f8f9878f5fba8f619ac6b264f9a17bf2ff0326841cb661aca4
 MISC metadata.xml 557 BLAKE2B 1ae35931a85cfdaf853e47471764926aaf69ecac0e4d0fb208278dbe2324bfb141d1f3a870eccb94fa10c4450c2c7a141a4c007cd24d65f51a52536f7b9839e4 SHA512 232676d84079a770034e67f6d23592375998b5940a46efb7f1a654de6a78df8296a3fef694e65a7767add3dcf3ccf0b0d947d0733c85a68f5c4ff802e09b0bec
diff --git a/dev-python/suds-community/suds-community-1.1.0.ebuild b/dev-python/suds-community/suds-community-1.1.0.ebuild
deleted file mode 100644
index 28052a8d1ecc..000000000000
--- a/dev-python/suds-community/suds-community-1.1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Lightweight SOAP client"
-HOMEPAGE="https://github.com/suds-community/suds"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-DOCS=( README.md notes/. )
-
-distutils_enable_tests pytest
diff --git a/dev-python/suds-community/suds-community-1.1.1.ebuild b/dev-python/suds-community/suds-community-1.1.1.ebuild
index 5edb87033f52..3e6e1382baab 100644
--- a/dev-python/suds-community/suds-community-1.1.1.ebuild
+++ b/dev-python/suds-community/suds-community-1.1.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 DOCS=( README.md notes/. )
 
diff --git a/dev-python/suds-community/suds-community-1.1.2.ebuild b/dev-python/suds-community/suds-community-1.1.2.ebuild
new file mode 100644
index 000000000000..a41f925a470f
--- /dev/null
+++ b/dev-python/suds-community/suds-community-1.1.2.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=setuptools
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lightweight SOAP client"
+HOMEPAGE="
+	https://github.com/suds-community/suds/
+	https://pypi.org/project/suds-community/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( README.md notes/. )
+
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index dd396752d725..3613f233de4f 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
-EBUILD sure-2.0.0.ebuild 837 BLAKE2B 2a7e4fc22802a46281ac702ea3f2a11ca8593f37149d23428a34ae384a855dc69e4a6513cdbb9a58ebd2089d39d458d4344b016c0203d8d59b6fbd6f0054c6b7 SHA512 207318358e92724eca2cf9905b27ac531b511db0a07d5117961a31be12945755161f25e644eedb8fc4c31c06d60f5790ea420d34367100e8b5ee96345419be65
+EBUILD sure-2.0.0-r1.ebuild 773 BLAKE2B 06ca39dafc75f7c94b42d52257538c3d60b6892a74486bddfe6b2f158092054c5976d9d310844c66d2451d869ad1d362ee2a2f03c4032d4ac9221da59f95a2ca SHA512 6cd4de4b91c697aa7c4206ea55a97e388087766a65c6d1739c0dac350689f0a30e0e6c4d3226986ee521703299de57889499e64c991ca686a9f27accbc31b0e6
 MISC metadata.xml 583 BLAKE2B 3a551f125c9df8f77a05b69cf54b30d94bace7869decb608b3685e06a7cb9f1462d4e674d06d59d84100e06ee95cce30a68c4777632bb0691397f1e6faaa26ef SHA512 57b87cbde1f34395fbd42bc8f7712aaf193aded2248815cb6919cb51387227f1cab46dd0d1595be9a55bdd131ac554e401366c3740c3d01782b8329a6f8e6588
diff --git a/dev-python/sure/sure-2.0.0-r1.ebuild b/dev-python/sure/sure-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..6fdca046fed5
--- /dev/null
+++ b/dev-python/sure/sure-2.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
+HOMEPAGE="
+	https://github.com/gabrielfalcao/sure/
+	https://pypi.org/project/sure/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+
+RDEPEND="
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# requires dev-python/nose
+	tests/test_old_api.py
+)
+
+src_prepare() {
+	sed -i -e 's:--cov=sure::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sure/sure-2.0.0.ebuild b/dev-python/sure/sure-2.0.0.ebuild
deleted file mode 100644
index 974c93d4926c..000000000000
--- a/dev-python/sure/sure-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
-HOMEPAGE="https://github.com/gabrielfalcao/sure"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# remove unnecessary dep
-	sed -i -e '/rednose/d' setup.cfg || die
-	# broken test with python 3.10, but when manually run, passes
-	sed -e 's/test_context_is_not_optional/_&/' -i tests/test_old_api.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index add1e0692482..70ada484020f 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,7 @@
 DIST svg-path-6.0.gh.tar.gz 39195 BLAKE2B a2fd54705a1c41057325a8d9f1151ca7393b4caf496157b4860dd8fb9cda05dcf5bdfe0d601b59c3e25a70e2e01042864936dc5e87b45b7a94e03f4861899884 SHA512 3d51b4912786a5d2bb38f1a98b8b7f4dd0b8e62cdd5e899802eff19bb95d43f4f4c278fbb02951e03e32eff031247a92c95699950be775076d24be37bb6ce70f
-EBUILD svg-path-6.0.ebuild 651 BLAKE2B 3f67c132d4b18c20280210510800a735743d4d7e73ae3a6663c681857fde3bdefb3ac28151f52fffe3d9d48e95fd419e61ac3edae168fb781919ea9f63f2ee9f SHA512 36acef5a5f6a04ee948db55730e3ccad6fbf140407d37f578d2250f67c9aa65f4603da50caa8752e3601b2e8abb48848f4414b26d814d13c77a8fa5a23be8a1e
+DIST svg-path-6.1.gh.tar.gz 39240 BLAKE2B 4f7751f436086f4a01f158b59b446272c7d1b345c1f04d9e2d0b543a2227def4e271cc80ef9040fe4ffdcfc42a2572293fc5f1a6a427b631cda3392d18dec478 SHA512 1149c099f2fbc55f4ed4996f8c7c797e65ac6bfad478caf75d15c79f6b2f0bcc055b16254e8d9093c13748c1b44222069fb5e924975bd55aab4f56f3f087600e
+DIST svg-path-6.2.gh.tar.gz 39478 BLAKE2B ef5a5c7aca3dc0e3f383f5e2810bad8960e32a55d00b6300e30c81fbe837f380d073bae60b891d371f8a9be3ca556ef11821d5b7c2fe5db519465b099d35e3f9 SHA512 7c9a67467e888f4961d54daf2706125c4ae21bb0cd1010f335eb072df78f12b1da99ddcf64a33a85a0e82a8b347f19e876161e3da8ebf43e5e7b45bbaf7d3325
+EBUILD svg-path-6.0.ebuild 682 BLAKE2B a6f8bce65bc32aca14f6566ab36ee355850de0e350bd6664040b1801bd9213db212fa4c0a50ee970151d9a9eb4be986cd74bc57bc85b7d8bd2e0e48be5086ea3 SHA512 46af4b9e49304692498ee181452af3f02fd63c6b6c06cad6407a78b1e69f142bd62a0d3a281f66961d57bc599829c11cfa5a05455940d34db9c6e665aa1b6231
+EBUILD svg-path-6.1.ebuild 604 BLAKE2B 497f003a91718fe084bf3a3dc8bde93335b71da040e227ff3ff337d3a3046826b0406cb35e33289c7743041587a385b6e73d4a0a55cd5dcea1869df72cc11ab4 SHA512 6f29310f1097d8720feba3fa64c816ba1eda99b5d4721c32e49700fb1e301a910800463ed1ded8002b03307377e876429d8ee37d4723a080716748b9f8769c24
+EBUILD svg-path-6.2.ebuild 604 BLAKE2B 497f003a91718fe084bf3a3dc8bde93335b71da040e227ff3ff337d3a3046826b0406cb35e33289c7743041587a385b6e73d4a0a55cd5dcea1869df72cc11ab4 SHA512 6f29310f1097d8720feba3fa64c816ba1eda99b5d4721c32e49700fb1e301a910800463ed1ded8002b03307377e876429d8ee37d4723a080716748b9f8769c24
 MISC metadata.xml 861 BLAKE2B c1f1d0ab41fdc21c6134352e7261aef6f2b277aa94f9a5bfddac3281c8aef4111e1a3bd83e949fc5b7ffcc92b23bde7ede101552a06cacad9c7b82063ba64353 SHA512 5ac8a5bd6e6c46d9c5d9d320c004d2f0536acfe5cdaafad5288246a9a442a0bb6491746c767adf0d441417172d6e9ed995d4891f6959fa2b6b5b804c1c68d413
diff --git a/dev-python/svg-path/svg-path-6.0.ebuild b/dev-python/svg-path/svg-path-6.0.ebuild
index d34abd9823bc..ecf93697e64c 100644
--- a/dev-python/svg-path/svg-path-6.0.ebuild
+++ b/dev-python/svg-path/svg-path-6.0.ebuild
@@ -4,17 +4,21 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
-MY_P="svg.path-${PV}"
+MY_P=${P/-/.}
 DESCRIPTION="SVG path objects and parser"
-HOMEPAGE="https://github.com/regebro/svg.path"
+HOMEPAGE="
+	https://github.com/regebro/svg.path/
+	https://pypi.org/project/svg.path/
+"
 SRC_URI="
 	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/svg-path/svg-path-6.1.ebuild b/dev-python/svg-path/svg-path-6.1.ebuild
new file mode 100644
index 000000000000..d66a95747a1d
--- /dev/null
+++ b/dev-python/svg-path/svg-path-6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="
+	https://github.com/regebro/svg.path/
+	https://pypi.org/project/svg.path/
+"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/svg-path/svg-path-6.2.ebuild b/dev-python/svg-path/svg-path-6.2.ebuild
new file mode 100644
index 000000000000..d66a95747a1d
--- /dev/null
+++ b/dev-python/svg-path/svg-path-6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="
+	https://github.com/regebro/svg.path/
+	https://pypi.org/project/svg.path/
+"
+SRC_URI="
+	https://github.com/regebro/svg.path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/svglib/Manifest b/dev-python/svglib/Manifest
index 4be912e8f0d2..33e8ce97f9e5 100644
--- a/dev-python/svglib/Manifest
+++ b/dev-python/svglib/Manifest
@@ -1,7 +1,3 @@
-DIST svglib-1.1.0.gh.tar.gz 2403896 BLAKE2B f3f45c526897cb64c44ab3dfb314d61faf190d482e0ce7c255ca51a45c2944393ac7ed0f83c9721648885ae7e477b87bf40040a01641c54ca31dcf85f97bf0fd SHA512 cc4eed96f021e9399e1a25bc477bdc91c037393b492ecd1eabb31c1163c8374499bc50b63ca60b038c61c7a799f4131183464f6799077875dd73a4e97a1246cf
-DIST svglib-1.2.0.gh.tar.gz 1261904 BLAKE2B 5516699609904b680a60972eb6ef4d36fbc0404bf9a4f03ddedb3b20531eb55893f6b88fceb86c0304da71371661d8d46bcb94f9f71bbe67fb1f6007561f7501 SHA512 636a96ed3ec49273250c7476c989cf2b2c98f8918eb851f6f6c4d7a02d2f06cc952741f4ecaf419ce48b6085fc0dccc3b491ecca9119cb713e1dae726144b8fc
-DIST svglib-1.2.1.gh.tar.gz 1261918 BLAKE2B d2c35dfbd45f3c509674e0aa49d015ddc554d1e9d2ccf584a5ada019d9af5e7ee2ccf8c983c30e9107cb83468db6521153fa8340f0dab3b4b1ae5a839628e186 SHA512 361dec376eec6ed9bc52e2217a28e09bcfaab8e302c4ee574a320a8f84963852cfc10d3f6890d379f624a5855122f869eb9698fab89d76018af7bbf70aa587bd
-EBUILD svglib-1.1.0.ebuild 811 BLAKE2B f7a7524a2ac9e2afe58296a0ffda65e32287fd5473361ac63343893d11c67f984b5785cc4d9da790be3d40cc4017b8d4a4eeeaac0e82f1c1a79d601be3e86e9e SHA512 d2d0ed74e3c598bdd9a1359613f189c9639b9f71f552b83e9103f18755c64002972bc7bc889170eff21a7192c5b13094df76aac4cadc37e07e5c24b8051071b6
-EBUILD svglib-1.2.0.ebuild 816 BLAKE2B 97cbb4e5ddc18b28bd7dc90451ba2984282e8318081562b2491611e783e524ac8b66edb0a5debb10b6ff5d12d8f05e470f237b69521a270779da0ff6a7dafb5a SHA512 60de58e4cb3decc7ecf8b12e08e608226eab42ede7c51f470ac0d7879d95b2613a3626f1f1a5d11e2060ad6438fe948d5ce569029c52a8b94acd209d5a37061d
-EBUILD svglib-1.2.1.ebuild 876 BLAKE2B 2c678fdbaffb396cc5628d50b71927dffa09adbb2f47b78c42c60a9ac3284d5c59c63bef1447cf9abf7e4d905c1b2cea558b7c5954d92c552e585412b00a3176 SHA512 d30499a623fbd7b12a70793b34050ecc5a04be5555cd37b11b246e6bdc059d08c7ce63f7264146ceee35233d7fa9495b8c3f43b9964be64062f94e6ed112bda9
+DIST svglib-1.3.0.gh.tar.gz 1264820 BLAKE2B f53bda781479ddc5d4b04fd122b5141620db81756308973cb283957615711e62623baa74b69af954936be24970a4e4a6f026667c4069d62bf1705a839ecc52f3 SHA512 457fb69ba1c298079888f200502c7099cf5ee674857ff8682948011bf8e1544715e6196544212f5c0ddef1202d04f3f05d01edb4351e673ceae16a85ca0d66e5
+EBUILD svglib-1.3.0.ebuild 854 BLAKE2B 8b980d7056d29a7174e92605d345cda90495febc4a9e55f3bd326f3ff44cd444bdfdd43da3904b445b3945c12ce36cc117767ce25c7401e8e7d170f33075b6a0 SHA512 4701a88800bd479183b9b84152d5ca82dbb687e76434df028a38133753296819cbe78c642af81a9040645cfad25cb27f7b2109b8f1610626c58bc6095ef16a49
 MISC metadata.xml 389 BLAKE2B a63a478393f24f78e31793e4ec841749fb600c0d4ae0b71dfb0f63dbd23fdeab7cb531f4e287d97c1b5f65decd8668cabe42eee6f1fac92f40f203a8cc500a70 SHA512 71a266a3fe1432a966fa52a691f1472f269a04e413c52abc7c7264f9acc233abe6ca86c44f35051fb960a7805c62e2ae12ec6e9799e25b2e89f401c6972c15f6
diff --git a/dev-python/svglib/svglib-1.1.0.ebuild b/dev-python/svglib/svglib-1.1.0.ebuild
deleted file mode 100644
index fbcf162cb4cc..000000000000
--- a/dev-python/svglib/svglib-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python library for reading and converting SVG"
-HOMEPAGE="https://pypi.org/project/svglib/ https://github.com/deeplook/svglib"
-SRC_URI="
-	https://github.com/deeplook/svglib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
-	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
-)
diff --git a/dev-python/svglib/svglib-1.2.0.ebuild b/dev-python/svglib/svglib-1.2.0.ebuild
deleted file mode 100644
index 0da0bd1bb894..000000000000
--- a/dev-python/svglib/svglib-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-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 library for reading and converting SVG"
-HOMEPAGE="https://pypi.org/project/svglib/ https://github.com/deeplook/svglib"
-SRC_URI="
-	https://github.com/deeplook/svglib/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
-	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
-)
diff --git a/dev-python/svglib/svglib-1.2.1.ebuild b/dev-python/svglib/svglib-1.2.1.ebuild
deleted file mode 100644
index b14fdc7c368f..000000000000
--- a/dev-python/svglib/svglib-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python library for reading and converting SVG"
-HOMEPAGE="https://pypi.org/project/svglib/ https://github.com/deeplook/svglib"
-SRC_URI="
-	https://github.com/deeplook/svglib/archive/v.${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${PN}-v.${PV}
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/cssselect2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/reportlab[${PYTHON_USEDEP}]
-	dev-python/tinycss2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Needs network access
-	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
-	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
-)
diff --git a/dev-python/svglib/svglib-1.3.0.ebuild b/dev-python/svglib/svglib-1.3.0.ebuild
new file mode 100644
index 000000000000..b7b7af262730
--- /dev/null
+++ b/dev-python/svglib/svglib-1.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python library for reading and converting SVG"
+HOMEPAGE="
+	https://github.com/deeplook/svglib/
+	https://pypi.org/project/svglib/
+"
+SRC_URI="
+	https://github.com/deeplook/svglib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cssselect2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/reportlab[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Needs network access
+	tests/test_samples.py::TestWikipediaFlags::test_convert_pdf
+	tests/test_samples.py::TestW3CSVG::test_convert_pdf_png
+)
diff --git a/dev-python/svgwrite/Manifest b/dev-python/svgwrite/Manifest
index 5db2baebc953..a39e5b34aeb3 100644
--- a/dev-python/svgwrite/Manifest
+++ b/dev-python/svgwrite/Manifest
@@ -1,3 +1,3 @@
-DIST svgwrite-1.4.1.tar.gz 251446 BLAKE2B 21ca55911f6ac1be949c1a714bb61ac58b4b1c04397b1e9076a626080a8420c18a63afb5989c48c7ba6cb843f73bccebd9bd00ae0b032894096135c0ad366cd8 SHA512 74015ed4a72cd781a577ab8c2f38a30a1f6561ca0379e62ecaac8136f40998c926597d97a0c1006fdab69ac4a23ce1841bda296881ede511f3f1b4a2e8dea06f
-EBUILD svgwrite-1.4.1.ebuild 572 BLAKE2B 5ab2a54c34e83de9b89799b3617ff99072a05e5ab196045291b1f16122eec847c36d783ffd1fc7cd1006657230f29c55e36f89acf65079e62266f21fbf88a6cf SHA512 49856f2fb7f0ce5eddabc80e74dc6a8fa25042062da52f2eabeb9e7ebeb766dea21096586a838031e848cf077a07f457ff5221f3910983110aea2de5e0248049
+DIST svgwrite-1.4.2.gh.tar.gz 251587 BLAKE2B d375b45fb1ae4c06c4511975777cb5fc25d5bd949853e99c8213b60857992deaf1355d397b7a3377a288892863c6305d1a96892cd2230d9fcaab2bcdc849c7a3 SHA512 bf853da84f24f8d63d045797519d6c02a0e33cbcb549ae2ff09464c35eb85399920a5ffd01e2cd25ebb58b6daf851d6840b7ec927d3573fde02b6ad4e5812ad7
+EBUILD svgwrite-1.4.2.ebuild 655 BLAKE2B 9140d01e8f8c323f630055e94338c03230052d7e9f12a491a5fe40cc5bdda89af5c07e44f81b288e73c34fc636beec9f48f6e14b77b531970be7e5b4f5198083 SHA512 bf0d7fcbcdc867bca267da4f28f1bab0b4be3225327041b0c1aae120765f2cf3a2c9af593293908445a88c530af97298562677bae3f7926250a71d87016df7f2
 MISC metadata.xml 336 BLAKE2B 7a98647cc502e0dfb0b956344c4987632a27b20c855b787c6cc3bcb204e2cc1b33b51e3d752fe65ca39feee2660c921de36f5a4e6986933ccdd54d2331709c6f SHA512 a82063fce426a8818e0ec7b902e97fcf37a0f10ab81743074fb610a90af612954dbaa091370abbce489b5e4dcde3b97f35086aa2b64b0700c02085b12463ce08
diff --git a/dev-python/svgwrite/svgwrite-1.4.1.ebuild b/dev-python/svgwrite/svgwrite-1.4.1.ebuild
deleted file mode 100644
index cc4dd367e2ac..000000000000
--- a/dev-python/svgwrite/svgwrite-1.4.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Package to write SVG files"
-HOMEPAGE="https://github.com/mozman/svgwrite"
-SRC_URI="https://github.com/mozman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# fetches from the Internet
-	sed -i -e 's:test_embed_google_web_font:_&:' \
-		tests/test_style.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/svgwrite/svgwrite-1.4.2.ebuild b/dev-python/svgwrite/svgwrite-1.4.2.ebuild
new file mode 100644
index 000000000000..7df25c70cddf
--- /dev/null
+++ b/dev-python/svgwrite/svgwrite-1.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Package to write SVG files"
+HOMEPAGE="
+	https://github.com/mozman/svgwrite/
+	https://pypi.org/project/svgwrite/
+"
+SRC_URI="
+	https://github.com/mozman/svgwrite/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fetches from the Internet
+	sed -i -e 's:test_embed_google_web_font:_&:' \
+		tests/test_style.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/symengine/Manifest b/dev-python/symengine/Manifest
index 1dc23473b06d..88386a809a3e 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -7,4 +7,4 @@ EBUILD symengine-0.8.1-r1.ebuild 1056 BLAKE2B bd814c938fb24bb0a1364120f9e26167a1
 EBUILD symengine-0.9.1.ebuild 1162 BLAKE2B 91494f4a445353378f5663dd3bf2572dcfadf549ff5ca2edc48a78e464360d57b3202762d66234665e303b2324398147a1ac27f09bb3cd2f64bb730d5d8c3c9c SHA512 4929ae2ea4d4879bd516a4d3ecc828a65e7a4b8cb004133a152b8aa27a22207c6df628fe3b5b3c3aea012954bcd583a0ee1d89ee771a2b2d28d9f1bed97adf63
 EBUILD symengine-0.9.2-r1.ebuild 1203 BLAKE2B 7ea8884108fe19397ca33bba2dbc339af3eeac20b943d09d17fd3f8b7f1a18000f804ce812ac55774c8a801255e5ae47099bc715eb2701d7dff231e63ecef152 SHA512 c2b2b14406c72f6e90e528d2759a9cd78159daf2f03e2069653a68019ae559aa82cb8a1d3f171951f475b12d3530ccb504347b40fcb2128682862ea64df2876b
 EBUILD symengine-0.9.2.ebuild 1100 BLAKE2B 4693049f2ff325cc6aa7c20b01e765fef54ecf6690674806479975045ca691d984033cca5f0e048f20b6fb6a3d8c358c623f309070ab6b0ea2480c396d7ebe1c SHA512 cc031fc4770b67d955122b1cad1a113e2211a820949334809ac5d1b0f4afd7cc16c9f614edb1abd7265e24be970f007dbba427f9e4d5f7dd6d473d7c6c087c7a
-MISC metadata.xml 404 BLAKE2B 5ff5d7b399605db96aeac08c73ce653dd7b24354e49fb316e4e943ceaa51b272d5f6bad8d44f8a6f4ab6d23a2b322b96b21f4600335d169ef8c1ad3bf0b1976d SHA512 73306bcbdecf7935f187df67b4ff819dec323f4ae8cfadaa4e1d99fef4165af7f085cc2a0b8ade29a68cbcc3e692d5b278e33fcc06303d6c54a24fe6470e792d
+MISC metadata.xml 505 BLAKE2B 9c9b44455691ec31e5eed2f355dc4633ba05548c6e00fe49e665ad7fd1867bd6a7345f84409ea14049cc01818ef67d7795afff4e01fe88c25b1977f4d6f0fbff SHA512 6a774984cef49d82908bced7cf61bb5550207503335ae09abd9c08cdde5396cbf123d7ed5d49934ccf7dbc5167f0c13f2e6ecf31bca9f5af0a2f7c46f22bf9df
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index 6756e34830ca..d83f26f37e0c 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -5,6 +5,10 @@
 		<email>sci-mathematics@gentoo.org</email>
 		<name>Gentoo Mathematics Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">symengine/symengine.py</remote-id>
 		<remote-id type="pypi">symengine</remote-id>
diff --git a/dev-python/tabulate/Manifest b/dev-python/tabulate/Manifest
index 0c8bf8119f1e..bd03041d48f4 100644
--- a/dev-python/tabulate/Manifest
+++ b/dev-python/tabulate/Manifest
@@ -1,3 +1,5 @@
-DIST tabulate-0.8.9.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
-EBUILD tabulate-0.8.9.ebuild 1171 BLAKE2B 7452d7fc3bf7715446a0d15eb94f7142a691f09acaab3ae1c74363f79e32af65c49ab74ecec8d0b908d2a12a3eb544fdd9dd9db4689615484c0dec4e1d3fb850 SHA512 c8e93d12c29881c39631b92fd428fae62d90d01a3fcaaad7324ee4646a5636a194fee3903f8492dcf18c5a50f1129916ec8e8af90ef5833b66f8817d7ec797bf
+DIST python-tabulate-0.8.10.gh.tar.gz 49453 BLAKE2B 9bf5c9e937f8ef051792fc57dcd56f1150636bf29493fabe56d4b706df04add41fdffbe1108cb93aa561edc96245ba85e621d4a8b402ace513b55710e6e5498c SHA512 d216076112c0d0f0879c1eeecf2d2c0c30edc84d7289396f1a8d24bca862ef90fcf221a09812b409547696c3b7d4472d431043e359c3a7f67bb8392ce1e95ddc
+DIST python-tabulate-0.8.9.gh.tar.gz 42562 BLAKE2B 6e6e1017379d07d5ede0cdfb6a8e3142f60656fd5d5b409c1259239e62637824c3bab0bb0f6b03f8733a24e9e3ac074a80a56d44939a8c6eeab8e9a830ae8277 SHA512 68a4d194068f692b57b2cca0fa42a58ba571b46adaef7f8b1a8cea7e34c78ea0a1c523286c3f1df631897cc60ad39ef6b11bfee61d46c04e2de1fb9ec0b497dd
+EBUILD tabulate-0.8.10.ebuild 1289 BLAKE2B 3f663b2d1094d20ca3b634cfe4439c8c2cfc4b9f5cb274b276f49210df63f01f5bd158397cfcdc1e10d0d89a7f1c8092eb70b6a762b02ab82e732bbe0fcb3638 SHA512 2ad30f43fc0e29c40093da2626b1adefe59c188a93db6e5c5253c29206f7a4c04bab07975693adff661b4c4d879368c5819df9d5fa3ef53d96a9dd9c6672f91f
+EBUILD tabulate-0.8.9-r1.ebuild 1287 BLAKE2B f05fe2089ed8092f04ca65d90e1e1fdbbb0870bed8cc56948f16e30a5200ccec8a6379734c68c07b9989a55185d1fad682cb7f17096948ad39abdc613697cc72 SHA512 00b891e8cb2a64e594555a94dfdddc604ba18c587f680664762d9279004d1f38d75525421e080d27e32de702b11265d7fea374c34ac15a1d6cac38a3c930b220
 MISC metadata.xml 399 BLAKE2B b92bc308afead78cb604ddc6bc288fb28ed5a2a523c890270ee87eb5bfee21133748c5861829bafcc8a7b3401b430dff84dd99264ebf3e7ea74342f99ee8cfc5 SHA512 2d8c4dca9558e5a5d6413a6bd5e2cd6e15d1d0d447e6c692af84c8575be899f3d78246782e6c908a626326662aaffde56b2c3f96f4e9cfa0473c976109e3dcac
diff --git a/dev-python/tabulate/tabulate-0.8.10.ebuild b/dev-python/tabulate/tabulate-0.8.10.ebuild
new file mode 100644
index 000000000000..699b1e2f6b7c
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.10.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="
+	https://github.com/astanin/python-tabulate/
+	https://pypi.org/project/tabulate/
+"
+SRC_URI="
+	https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep 'sqlite')
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/test_input.py::test_pandas
+			test/test_input.py::test_pandas_firstrow
+			test/test_input.py::test_pandas_keys
+			test/test_output.py::test_pandas_with_index
+			test/test_output.py::test_pandas_without_index
+			test/test_output.py::test_pandas_rst_with_index
+			test/test_output.py::test_pandas_rst_with_named_index
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/tabulate/tabulate-0.8.9-r1.ebuild b/dev-python/tabulate/tabulate-0.8.9-r1.ebuild
new file mode 100644
index 000000000000..8c3e9b4a5657
--- /dev/null
+++ b/dev-python/tabulate/tabulate-0.8.9-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Pretty-print tabular data"
+HOMEPAGE="
+	https://github.com/astanin/python-tabulate/
+	https://pypi.org/project/tabulate/
+"
+SRC_URI="
+	https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep 'sqlite')
+		dev-python/colorclass[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/test_input.py::test_pandas
+			test/test_input.py::test_pandas_firstrow
+			test/test_input.py::test_pandas_keys
+			test/test_output.py::test_pandas_with_index
+			test/test_output.py::test_pandas_without_index
+			test/test_output.py::test_pandas_rst_with_index
+			test/test_output.py::test_pandas_rst_with_named_index
+		)
+	fi
+	epytest
+}
diff --git a/dev-python/tabulate/tabulate-0.8.9.ebuild b/dev-python/tabulate/tabulate-0.8.9.ebuild
deleted file mode 100644
index fd5ed0277274..000000000000
--- a/dev-python/tabulate/tabulate-0.8.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Pretty-print tabular data"
-HOMEPAGE="https://pypi.org/project/tabulate/ https://github.com/astanin/python-tabulate"
-SRC_URI="https://github.com/astanin/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep 'sqlite')
-		dev-python/colorclass[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python3*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# avoid pandas dependency
-		test/test_input.py::test_pandas
-		test/test_input.py::test_pandas_firstrow
-		test/test_input.py::test_pandas_keys
-		test/test_output.py::test_pandas_with_index
-		test/test_output.py::test_pandas_without_index
-		test/test_output.py::test_pandas_rst_with_index
-		test/test_output.py::test_pandas_rst_with_named_index
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index a58180f3263d..2e08a6685370 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -1,5 +1,5 @@
 AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97d605cb22dfa0b9695374260658f8dde0d49e84de0e7d289bff705beed1244215e70cc7f9d8d587d505322a20 SHA512 0d9cd79986a16ad78e76911f9d3c1b36fb706c74c58e9d29dce817bcf4bbd8b29c9596f1228a0524fdf6538f2c685901a159fd9bd0b629d0dd1d60c75c2820b0
 AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
 DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
-EBUILD tagpy-2018.1-r2.ebuild 1189 BLAKE2B fc61427e82816e54bf27e1514d5e5b2ce76ee19873a0f3d45a4ee3ae1973d0772682111b15049c7bff3c5fb8778535429de4dc4dca3e394b997a394077319dd8 SHA512 303087d49160c8c62e56d4a27d2f2c403977b28e02327d750294724753c2db5236be59bcafd3f86a222c991b7d54f861a85176dc190845b58fed063afdb59de0
+EBUILD tagpy-2018.1-r3.ebuild 1101 BLAKE2B abe29c73119ab171bdd96a4f4dad3fcffe1d7789cf40aa9e9f1bcb7aeb194d10b6fd8b4b51a541e5f97560e801dabd0d6456615bc90cb4c819182cdc2958227f SHA512 19ecd9817309c9c1b3b014eb42908cfebd2999e004627581c2bd6ddf57874c911b99da3b3aedc399ca2efea0c655b1ed86e922b2ef59dda545268bfe9101842f
 MISC metadata.xml 548 BLAKE2B 09356a368b0d4c31f10b55afd41560e273fcf85559d7613581be149d41692c48a5441be38f783cacf241925314e4c808309cb68569d8d78d130e8fce7fe539c3 SHA512 39098fc39a9f32b45b95410cb406e0a755dc8d3906168e356253ac14d35fb06a7d68c5ca37f63516d7803442986e4c8e61831f3721e52dd094374dca12d331a0
diff --git a/dev-python/tagpy/tagpy-2018.1-r2.ebuild b/dev-python/tagpy/tagpy-2018.1-r2.ebuild
deleted file mode 100644
index 1d343447f936..000000000000
--- a/dev-python/tagpy/tagpy-2018.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-DESCRIPTION="Python Bindings for TagLib"
-HOMEPAGE="
-	https://mathema.tician.de//software/tagpy
-	https://pypi.org/project/tagpy/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-libs/boost-1.70:=[python,threads(+),${PYTHON_USEDEP}]
-	>=media-libs/taglib-1.8"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}"/${P}-taglib-1.8.patch )
-
-python_prepare_all() {
-	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local boostpy_ver="${EPYTHON#python}"
-
-	"${EPYTHON}" configure.py \
-		--taglib-inc-dir="${ESYSROOT}"/usr/include/taglib \
-		--boost-python-libname="boost_python${boostpy_ver/\.}"
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" *.py || die "Testsuite failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r test/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tagpy/tagpy-2018.1-r3.ebuild b/dev-python/tagpy/tagpy-2018.1-r3.ebuild
new file mode 100644
index 000000000000..92001e25ca96
--- /dev/null
+++ b/dev-python/tagpy/tagpy-2018.1-r3.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} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit edo distutils-r1
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="
+	https://mathema.tician.de//software/tagpy
+	https://pypi.org/project/tagpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-libs/boost-1.70:=[python,threads(+),${PYTHON_USEDEP}]
+	>=media-libs/taglib-1.8"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-taglib-1.8.patch )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local boostpy_ver="${EPYTHON#python}"
+
+	edo "${EPYTHON}" configure.py \
+		--taglib-inc-dir="${ESYSROOT}"/usr/include/taglib \
+		--boost-python-libname="boost_python${boostpy_ver/\.}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r test/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index 9279da11c926..082c7514b2fd 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,3 +1,3 @@
 DIST tap.py-3.1.tar.gz 133208 BLAKE2B a41e4d6e06cfc4283ea8e1df1895569a35d7041721760a16a626d99e60bde0f4b45dc517408b67c893d1eafc3aebe9e7fab4eb158d1e13a0b99a85602beaf440 SHA512 4a3b5c5fb54ee1343cfee9bc154e812066d745c020a2c3391761c3e407b7b8428412c799df4963a385e4563ffe3b31e16055cb76ab5940ab6156e57dcf4a4d3a
-EBUILD tappy-3.1.ebuild 858 BLAKE2B 5c2c7a596611fdbbf0ab38865b331e78aee7469871d80a607cf08d05874f46d85ea1743725cefc8faee1d28151121842f57acb34eb387d5b55f68e0bb8123cfa SHA512 c625625d2430c7c7a264643198e0e3a2fa32f199554cc0fc9a9d7869a2500dc02650073255276fb2cbe01a9e08d26f790858dfbc14fe4b9861cf1b8170975908
+EBUILD tappy-3.1-r1.ebuild 890 BLAKE2B 08b3749672daef50d84df4ad38a6aad0acfeddfa49504a57f1760efd4e0a46d700b11f1459570a35f970bc8ff615c70b109f81b770a060ec14d0e31f885a2488 SHA512 6a2bc64fc78040add984b6f848f97d259b05cdc3856aac9ad7b018e9a98479849cbb10479cdc98b4c7f09e51e9851b603c93f09aad55cfb2fc040cf14a1f3739
 MISC metadata.xml 368 BLAKE2B 86f05d0c5e93193bdb928c3346c4e9dea9b3fba04afaf4c7417ea2292897248e6f21bce6e05e5183f5e763b19c929dc94e3b4f349d5e56817b58cd030d980adc SHA512 77e683438ccfb0c1866394b4118bbc09ce90144b8635ef9352ef4fcefb24840f2d1df0cfa86ef9032183bd49130fa5d7e1e87c9146cd520045061d730b47b6af
diff --git a/dev-python/tappy/tappy-3.1-r1.ebuild b/dev-python/tappy/tappy-3.1-r1.ebuild
new file mode 100644
index 000000000000..d8f60d87e9c3
--- /dev/null
+++ b/dev-python/tappy/tappy-3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1 optfeature
+
+MY_PN=tap.py
+DESCRIPTION="Test Anything Protocol (TAP) tools"
+HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
+
+pkg_postinst() {
+	optfeature "YAML blocks associated with test results" \
+		"dev-python/more-itertools dev-python/pyyaml"
+}
diff --git a/dev-python/tappy/tappy-3.1.ebuild b/dev-python/tappy/tappy-3.1.ebuild
deleted file mode 100644
index 4e5fca1a66f5..000000000000
--- a/dev-python/tappy/tappy-3.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-
-MY_PN=tap.py
-DESCRIPTION="Test Anything Protocol (TAP) tools"
-HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs
-
-pkg_postinst() {
-	optfeature "YAML blocks associated with test results" \
-		"dev-python/more-itertools dev-python/pyyaml"
-}
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index eff8e34f54a7..4dde691d4980 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,4 @@
 DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
+EBUILD tblib-1.7.0-r1.ebuild 720 BLAKE2B ab59d724826424d11a57abaf221d41c059cd1d1d1103b5b855d83f541972391c24704c598782905a3b612e5ff0f8af98cd6662bf7ba49c5a61b90c53b29e7b32 SHA512 2e20cf850ed6440f309c53dae3aac8a75a42ffc8d0e8ef8c5e2fc0d93facc46cf09b8620b29833e9155db029142157794ff211cdc43a4cbda99f2196b560a97c
 EBUILD tblib-1.7.0.ebuild 567 BLAKE2B c68612a4dbed8a4e643ec6de7a15a601958115b509ab655f1c807bd37ba5957714b7699d113d9a37efcb7c50523a05384593e5669205a4764ae12b3068b25b29 SHA512 10437a883c71293eca6dbbc347b4ebf2db0b1fe32c99f4c2b585d70d93e0865db7d232c1eb78b25cac281afe8f1a06e115443222a756bff5e4509548b6ca759b
 MISC metadata.xml 406 BLAKE2B 196dcfaca9d242ddf68db2f831720a877f9aa1ec0f1d8aefb4d20f03a8399370ac62e5c009b1538c7f20512bc17ca23c5286544081a8f15512a95e1b4c754e9e SHA512 0e82fd782c7532e0f1877aea67c3171847469f7c0669664b8d9b1a22bdeca9daf6f6159f202041d3f1d83c3bd9871ee084564df0e7b64c8c2230d8b5aba2a91f
diff --git a/dev-python/tblib/tblib-1.7.0-r1.ebuild b/dev-python/tblib/tblib-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..07098eb74f9f
--- /dev/null
+++ b/dev-python/tblib/tblib-1.7.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Traceback fiddling library for Python"
+HOMEPAGE="
+	https://github.com/ionelmc/python-tblib/
+	https://pypi.org/project/tblib/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/twisted[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/tcolorpy/Manifest b/dev-python/tcolorpy/Manifest
new file mode 100644
index 000000000000..b0a86a843718
--- /dev/null
+++ b/dev-python/tcolorpy/Manifest
@@ -0,0 +1,3 @@
+DIST tcolorpy-0.1.2.tar.gz 11024 BLAKE2B 7d2b8e525f507f2061c7401e452e06b76e3f85db1611a579b6f80d3a781c640b0379c22da85b4ec5878bf9762e1c471303e5bf79f51393c3a0ae8ff8fa3bcd51 SHA512 e5a0b26439291d0c7a045cf92818ad50a5c9fcf5d31e8140231ce8bb4c52a1ce163d125a2094e3738a6a14d29b99036ee7a9d5014ea8578f09307d4a4e5674e8
+EBUILD tcolorpy-0.1.2.ebuild 425 BLAKE2B b4aa1046165e33d485ca11fc5692b6e5851220949460aac4117050b536fe74445d9f7b73a8c40d7a75720cdabcb87ee12c8e155357e9c413aa7c1aafaef0e518 SHA512 57dbe0ab1fabf5331c28cdeb9bc4d0db097a772f022ec59e060b08cd862c571b1d6366c81e36b439977ee8bd908f1427b7b73fb79729b6886fec93b8639ff8f6
+MISC metadata.xml 372 BLAKE2B 83814ee2a7eb02f03e516b528f52d482d8ebf6d95923c03cf527a797f66f71a22de1f498578e1288251cf461d1b0f81f1c069a734e4b09dbd3b87ad82a5c7cb5 SHA512 ab4767ee7d098a9d99ad8a806b2079ddced2dbb650d5e9b5cc1762cb20ffadba4807524a05ae19acc3a469601420562ce1b31cccf966550869d4fd79360a7689
diff --git a/dev-python/tcolorpy/metadata.xml b/dev-python/tcolorpy/metadata.xml
new file mode 100644
index 000000000000..e29901e8df70
--- /dev/null
+++ b/dev-python/tcolorpy/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">tcolorpy</remote-id>
+		<remote-id type="github">thombashi/tcolorpy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild b/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
new file mode 100644
index 000000000000..4913643d8c01
--- /dev/null
+++ b/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
@@ -0,0 +1,18 @@
+# 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="tcolorpy is a Python library to apply true color for terminal text"
+HOMEPAGE="https://github.com/thombashi/tcolorpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
index 39ec94301ac2..976281342f1b 100644
--- a/dev-python/tekore/Manifest
+++ b/dev-python/tekore/Manifest
@@ -1,3 +1,3 @@
-DIST tekore-4.3.0.tar.gz 261287 BLAKE2B 1ac6f828e20d2aa4e591a7b53f6178d1c9f8b760d2daa1f7705d7a45bef5a4973b65fffc1f7571b1bce270efc9c4e8c6d9dd258173cdda94b06e92a4c14352a2 SHA512 bb0aafdda47d5ac4baefc3c057b8ae91d3a243d913f332f69d7dc00f716e6403daaf8d8382e9b25d2810fd65e139f6d427b9749746c8ac61d67b02dc24620969
-EBUILD tekore-4.3.0.ebuild 921 BLAKE2B 472bb17fc33863cc3c9dc7213eb3024d73ddf8862248569d1b55f530ebd60ebecb80138e831c377d39d7b0d7945ede1d452edb97ce7cea1090223fb48a03b2ad SHA512 3611ceb2a049f6248c7c50a2c6aa1e31bbab18d4276a0ae5cf2caa3f2c5942c1a443afe29d23b62b2a9112dbe1703bd2f29edbbcc63b4f2e0e41e5a44f6bcee6
+DIST tekore-4.4.0.gh.tar.gz 261768 BLAKE2B b0da919bd0feb32fa5770eb02cd817142d80f63e29602695b7cc6e9099203e502e61aab816ec3586595ab06f7f493243b13dd98cdb9e89913854e7cfcefcfd61 SHA512 86ef782971f1ea9d9f49e9683b27a8d9f70511e89a7fa7c8cffd01ba716782b1d91adcde2e24a52e42ec5b5b936005545ea1e15b067d1f109d2ecd2cebbd930d
+EBUILD tekore-4.4.0.ebuild 966 BLAKE2B 7ef834293663507e03df1e0d169d6d38877f9b0440844a8ae376e6314b9ccf69c3c7647a7a779c0975434e1f5fc9516b897299e9064752eca44eb7cbd0e65446 SHA512 4545bfdbedeb1c8cae1739a0ea21f6f0d37ed25797267cf0f8f4521a3d4dcc0e09eba6b463d4371cff9fa31456ef49171296d227b97c1b161b58add4964718a2
 MISC metadata.xml 513 BLAKE2B c6af854b6f684809ccdf1fbf573013580f9d56ab644913d3a095734867f654ec42b4d694e4197418a20e5fa7291737e14c3189bfad9e5cbe0aa9182db2197af6 SHA512 4d7fa6932a8d832226a080294177e08f7891e39fbd5f379f269268b1c21a8e28129c91f7f2c3b32e56de49c0a2d0a3365a5f57dd7445dd3ce09eae01b21409d9
diff --git a/dev-python/tekore/tekore-4.3.0.ebuild b/dev-python/tekore/tekore-4.3.0.ebuild
deleted file mode 100644
index 9af5c3e33ce6..000000000000
--- a/dev-python/tekore/tekore-4.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Spotify Web API client"
-HOMEPAGE="
-	https://tekore.readthedocs.io
-	https://github.com/felix-hilden/tekore
-"
-SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
-	<dev-python/httpx-0.23[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( readme.rst )
-
-distutils_enable_tests pytest
-# TODO: package sphinx_codeautolink
-# distutils_enable_sphinx docs/src \
-# 	dev-python/sphinx_rtd_theme \
-# 	dev-python/sphinx-tabs \
-# 	dev-python/sphinx-autodoc-typehints
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
-)
diff --git a/dev-python/tekore/tekore-4.4.0.ebuild b/dev-python/tekore/tekore-4.4.0.ebuild
new file mode 100644
index 000000000000..cd7308b5ca24
--- /dev/null
+++ b/dev-python/tekore/tekore-4.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spotify Web API client"
+HOMEPAGE="
+	https://tekore.readthedocs.io/
+	https://github.com/felix-hilden/tekore/
+	https://pypi.org/project/tekore/
+"
+SRC_URI="
+	https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/httpx-0.24[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		>=dev-python/pytest-asyncio-0.17[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( readme.rst )
+
+distutils_enable_tests pytest
+# TODO: package sphinx_codeautolink
+# distutils_enable_sphinx docs/src \
+# 	dev-python/sphinx_rtd_theme \
+# 	dev-python/sphinx-tabs \
+# 	dev-python/sphinx-autodoc-typehints
+
+EPYTEST_DESELECT=(
+	# Internet
+	tests/auth/expiring.py::TestCredentialsOnline::test_bad_arguments_raises_error
+)
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 36fb76163020..0f43f4e05fdb 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,5 @@
-DIST tempest-30.0.0.tar.gz 1110715 BLAKE2B b697ecbced21124719e6b1d7ebd2c4f8ba83528a84da0b8f8109c155b61124581b97c180bbdc6885ae53850fb28daed25772d12be5026c44ecc3fe4f0dad98a3 SHA512 fa9be713ccb130ad065628592f59bebda3dc1fa8222ab3c382ec5b299504dc0a730f2110ef80f98bbdd1288b5785ab745fe39b721b77f7343983c1bc0a036f19
 DIST tempest-30.1.0.tar.gz 1112219 BLAKE2B 864dbd01a843b9c480656788a3a673ea6c089af8bf67e66837fdb77ee46eef00f2caed3ee08722b113db45d1e39fee167dcb344676543ec82fe5f022ae8c713d SHA512 3c4469d5ab590fe2185dbe77cc1ca1179022b75b4da9f2fe0d43956b14598d56328dd4e62e8445197b25f93017c812edd75cb9fef2d81ae183aea478fd817b15
-EBUILD tempest-30.0.0.ebuild 2080 BLAKE2B 08756fd5379f4accc888100a62ff0fdc1cc498dc538537603bc9c860944f543d0562c40550feba5b0c1a38483d80118c3f938531f01c380146a7495d426cc712 SHA512 80a1009431495512478aaa8a749156a2ff12a09ee8cadf6ec68fe3a715a52b14e4db1325ee666c1514086fe30e3a9dc2e5a27b338ac186ec176fde81ea580a6f
-EBUILD tempest-30.1.0.ebuild 2095 BLAKE2B 75b6870291b66b6c341067cad00154c141e88dd83141d09d823e0aa736250dbf863b56045a8c14dc798b9f670481b73e785b6facfbba737e3c5dd1b3ef88f591 SHA512 7662dcd27592e150f9e8198edc40049fb19a3e6ae496a5db98aa2e771ff66493113697c26be291add5f06e6fcbad1cdbebfe0ac21b1046825d2a04eb73b1b20b
-MISC metadata.xml 402 BLAKE2B 9a28d185d29e8844299c1f6276b80759cb0ba7d0b9de14f70cb92f4bd69a4604aaffb7ed0cd0e65764099007a87de3e15c519dbdbc8a247d8ffe884613c7af5e SHA512 e9ef089f055cb4d6bb527f58d2e386d7796b2df34a8bb850c90f86cb98d08259b5ecd5e785389cfa6351f1319502c6822e3cf6a6250ac7dcd1838923b3deac87
+DIST tempest-31.0.0.tar.gz 1110051 BLAKE2B 9c3c87db902220e3e8de6e88e0d282eae07cb3b155eaa415156e83aff9d52523416fbfcae5b49a335eb81ae3488e4e2aa4cf86d10a35820aa3e24184466576d8 SHA512 9f8cfae192a5fe0fd5d6c1659ae42b5f2042392945e2c91b3bb96cecc412a1e6e582bc46ab481452012dc2440d13bc8298ca875587d5b1592dc95971d9adf4f0
+EBUILD tempest-30.1.0.ebuild 2099 BLAKE2B d827660f46e8465685aa5f43318144f63a58f3dc1a953c96eda99ab04e1389bee8c831fd5ca3e221e82ac73d272a0d001dbcab628b7d27d5a672a700b8b1145e SHA512 b3ce789584d6cb181841b6c03dad3ffe6342bc4c87819060fe954e3eda0b2fd4852d6ddb865312b42e77e2a73e422428f8da7cdd6f7b07e099c758b34d488655
+EBUILD tempest-31.0.0.ebuild 2138 BLAKE2B 8554290fadc5064e44a27d78908a6872ff5c27f451d16b8a48d9c9f153f7927d725aa384be5a5e5f9d33f8e5c6a05fa08123c6f58831b751d4342a68c92dff2e SHA512 76670d5c3d9cd00f967b2951b02adfbec1dac6d412fa43cb856cbdb88368c9b3479df1176156dd759d27ffa504d2bc4419253d09500a858e6679c5b096bd7954
+MISC metadata.xml 503 BLAKE2B c048e018345a8d306f22fb944e8f04db6fa8ab0e9e7099b19e0fd24ad69632d9dd1dfed9620c092f2f740e80e06556617b59cfdd0121101fa030dd6415aafa34 SHA512 39986e26bad2304333d43fd0ed1b12db5d9c56059d30ceb3868b6967f6655f50edaa232a86059da3434a4e219847c8f74e98972cecfa074a8bd28b76b3e3ccbb
diff --git a/dev-python/tempest/metadata.xml b/dev-python/tempest/metadata.xml
index b260fb53bd80..8e745082126b 100644
--- a/dev-python/tempest/metadata.xml
+++ b/dev-python/tempest/metadata.xml
@@ -5,6 +5,10 @@
 		<email>arthurzam@gentoo.org</email>
 		<name>Arthur Zamarin</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">tempest</remote-id>
diff --git a/dev-python/tempest/tempest-30.0.0.ebuild b/dev-python/tempest/tempest-30.0.0.ebuild
deleted file mode 100644
index 94fc2e0d97c9..000000000000
--- a/dev-python/tempest/tempest-30.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
-	eunittest -b -s tempest/tests -t .
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/tempest/tempest-30.1.0.ebuild b/dev-python/tempest/tempest-30.1.0.ebuild
index 7e06788117ab..4aba0be12cb9 100644
--- a/dev-python/tempest/tempest-30.1.0.ebuild
+++ b/dev-python/tempest/tempest-30.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tempest/tempest-31.0.0.ebuild b/dev-python/tempest/tempest-31.0.0.ebuild
new file mode 100644
index 000000000000..8550c5388d90
--- /dev/null
+++ b/dev-python/tempest/tempest-31.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Integration Testing"
+HOMEPAGE="
+	https://pypi.org/project/tempest/
+	https://docs.openstack.org/tempest/latest/
+	https://launchpad.net/tempest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		dev-python/stestr[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Small subset of tests, which fail as result of not using specific
+	# testing environment. Others expect to run suite using stestr.
+	rm -r tempest/tests/lib/services/volume/v3/ || die
+	rm tempest/tests/test_list_tests.py || die
+	rm tempest/tests/lib/cmd/test_check_uuid.py || die
+
+	# remove dep on hacking
+	rm tempest/tests/test_hacking.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	mv "${BUILD_DIR}"/install/{usr/,}etc || die
+}
+
+python_test() {
+	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=320
+	eunittest -b -s tempest/tests -t .
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 7b98584f128a..3378d04270da 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,3 @@
-DIST tempora-5.0.0.tar.gz 18532 BLAKE2B f3d59b7d7d2974564b0c7cf25d5bf8716610aa09dd134e37289648e71c4dd6989bfecfafd258da01875de0560cef31fcb8ee0ec85e16d642ff56d10915da6132 SHA512 e95fff8c460329c8369f8f819a95341ec4e1641d2ecc88251c9681ac5e9678eded0f320aa1bff98a980fc552cb214ea3f40c249ea25b54d8fbe34849fffff7b6
-EBUILD tempora-5.0.0.ebuild 908 BLAKE2B f0bc43404b495b39bb57ad95ebf959e1930eff0964f84301d3cfb5df066fea49f9d0f90dfc5025c01db7cc62b74bd6338d357d517e96a7bf3b7e37d3e857dcab SHA512 e329461bf7bdace0d80d9de84a4db1188c14f384ffbfdd3eb0e62229058ec3573fe529aea06286a755cca2508f5a2fd0833ec4bb366ed5e212ad0b372db74cae
+DIST tempora-5.0.1.tar.gz 18456 BLAKE2B b21d60dc8fa5ff9701bbdf66cc9f657c9e4bc779a4a564ea788b201034f818a688c53bcd94f315ef4650b62cce1866fad4a196e2ab724e89670bbc36e9ea15ac SHA512 941b1a231bfae6cf2321325ada785806578643dc9ae215116393623f780de7a409f918c215aae353013bd89c6866ab870ac61470af09f281af0953ce6e20ea3b
+EBUILD tempora-5.0.1.ebuild 839 BLAKE2B 7dad3842bad0320e8ef27b0379184c379f5b04ed3132c74b8de567d0d238edfae732d67bc0f9544eb878770dc60369cbbc679d7e2329c271e5e7e6ccd13b5657 SHA512 42507151bc2b9241c5fb02abd141160e0cd2969f81b1a9365e2a7f1ca9894a1256c69ae33e1996b820df16321ffde96c023ab84120566ac510111b6e4793ea76
 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
deleted file mode 100644
index 90c64ac01635..000000000000
--- a/dev-python/tempora/tempora-5.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 ~loong ppc ppc64 ~riscv ~s390 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}]
-	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/tempora/tempora-5.0.1.ebuild b/dev-python/tempora/tempora-5.0.1.ebuild
new file mode 100644
index 000000000000..9a7003570d5a
--- /dev/null
+++ b/dev-python/tempora/tempora-5.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+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 ~loong ppc ppc64 ~riscv ~s390 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}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 3d2ad4e130c9..f7d1746e277b 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,3 +1,3 @@
 DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
-EBUILD tenacity-8.0.1.ebuild 695 BLAKE2B d1e237c8dac54fc033a5918c6172fb28d1121a5554e33a6bc632541ef05ad95ece7f416c09d09f025c113cbc0fa55920578a9c986fecd92a68d734cd3e9ef569 SHA512 5016feae5ca37d9b79ee6f9315826667b37e9e09110e172eca177bbbbebcb2e1d3892f8adbf6bac80bdc3ed35586e860b36241f6877b2f3ebf996061d17f8324
+EBUILD tenacity-8.0.1-r1.ebuild 814 BLAKE2B 122c2bc7038e4c29da0a17b5228ec76409fab09b80c52d5c66f1f05657638f572c3139b0b6cd951c349a8b61a5bd36191bd80777b9e14c71a922854729f9471d SHA512 ab74ea742872306f8ffad9942bc38ae92c0846390e20f9efb284135ca2056f5447f36e1a22066aab775ea52433326a66e6e857ef253dd5b93546d32432f62f05
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.0.1-r1.ebuild b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..d868c572a81c
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.0.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="
+	https://github.com/jd/tenacity/
+	https://pypi.org/project/tenacity/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+
+	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/tenacity/tenacity-8.0.1.ebuild b/dev-python/tenacity/tenacity-8.0.1.ebuild
deleted file mode 100644
index 1bb3fdfb5e08..000000000000
--- a/dev-python/tenacity/tenacity-8.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="https://github.com/jd/tenacity"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: package typeguard
-		tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 35cb837309ee..245e8b696df8 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r3.ebuild 547 BLAKE2B 5ea42bf0f414d1fb5374fd7c34d31c58816f57e2ef12752b7bbf380551b6483e9b137c9a7f3d12f3a004955e73b52390edff1b75a31c13ed7184ee8c5aa1ef85 SHA512 fd4f3e7a8dbda794a26866b85370d70014175fd93a98c4cffc24db0c010ada84aa4bde07c5a6ce80cefe78310be07d30a468643b6cee2de43cc74bafd8f3b4f7
+EBUILD termcolor-1.1.0-r3.ebuild 547 BLAKE2B 17a7d7c1abb51c1135317a5730e151167374fba5d4e586e09a5d1e02ed8f9b7bdb2772cb61b15cd68661394de6d971f428b02bb6e61080197a162ba8548b09ae SHA512 29d4fc140d1c01815bb6e3f0e71ebe94671d5118df54370787344eafcdb88a4cc9ad4f82d4de508495832924f902350af15a260711d662f68ff1631597bcdadf
 MISC metadata.xml 469 BLAKE2B a9da957ef444f9a2537616c337073c53f3d00d2b35f9b52116c6ffebdea617014e058c66ee97afafff37841c1f6f9cbce4400236a18e9037791baad21705883e SHA512 6664c1026a6c7eb63df6d668a2ba4b4a4fbc23c5737db9a01e915b562d15d3c18196b963805ebf7a09e03ead51316d71b1a0c035813bf4c9729e0cb528e1794f
diff --git a/dev-python/termcolor/termcolor-1.1.0-r3.ebuild b/dev-python/termcolor/termcolor-1.1.0-r3.ebuild
index 5d7de662b70e..206ba967ef8f 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r3.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index d543e1d0ce6a..a3f9407e355a 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,3 @@
-DIST terminado-0.13.3.tar.gz 17060 BLAKE2B b91358209f190a831c45b73b06616d6101cda0ffe2768dea2e60e679e631d523335eebde46f721efc304bfdc3b6da329081219f1eb07bd1b306cd53b13465eed SHA512 8dfbf917f4700b1ad8d18a16439d66c0d98e6b115591cc453041d3132c349037fcdab281668519d2af2fa314830fc9d2366030fd69917385e7df23ec87b46a8f
-EBUILD terminado-0.13.3.ebuild 854 BLAKE2B 075f233ef1482f6abaaa6d1a335a740b2dba48a0e9766ed38473b71eb4420ba70adeabeee93a3ff40eac3ea766e3f7cc4d1278cffce600c199b134692a6776e0 SHA512 de2f711067fc2a9106f9e262029378ff5f5705eb192d30e53d071cf7050c2ecb716bc3c4f610e45ca3e71464468eecf3de8e74a5e340b9f6c1f3006e4c3a126d
+DIST terminado-0.15.0.tar.gz 29599 BLAKE2B b287e5c28fccbf9116d727e11e0a9d3d89f45a16374c7ee950b30427c8f52064dbb59c36fdb7b4d1457a3526e51254708ee13ef3505303c6052da050460046d1 SHA512 9aa00b7e6d442a7358f007be9d45c6a5326243e64d51a2e9fda863ab5ac8f12b72b1684aed91da376e2c45347635fe64a66da5ff2792b2b15d538080fa6f832b
+EBUILD terminado-0.15.0.ebuild 831 BLAKE2B 71c146d720b86b1a9f0a9125d9e2eb60f33609c3fafc1b385666726e4882b262c7793e83a5f15b7331aacff4a775b127997cf395d9f33bc33e95da357bb643c6 SHA512 e0dfd35003be521b181a1eee3bc12b1c43a0ba39b779448fe7862da32bd4a1d71fcba128706ed6f0a6b0ce31b930dae2f7d1c8ec534903bc5ebf109b06fbbcfd
 MISC metadata.xml 407 BLAKE2B 11da32addf98212561629b99650880eca0a6c057414d8a97f535f40b046c6587d326e3193eab264f439caf38e5d6d8f3f5d1a5891746262494ced39effb2651f SHA512 6c993bf16c0413aea33e06efef79dc6189d3b62b71574fffb2bdce7ddb27b4b12f1d5c0d2a3a80a51ae8894c60efb83a9966cabd53662d358f3f1ec52d27590b
diff --git a/dev-python/terminado/terminado-0.13.3.ebuild b/dev-python/terminado/terminado-0.13.3.ebuild
deleted file mode 100644
index 2e8f8cb8388f..000000000000
--- a/dev-python/terminado/terminado-0.13.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	www-servers/tornado[${PYTHON_USEDEP}]"
-RDEPEND="${BDEPEND}
-	dev-python/ptyprocess[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
diff --git a/dev-python/terminado/terminado-0.15.0.ebuild b/dev-python/terminado/terminado-0.15.0.ebuild
new file mode 100644
index 000000000000..5c0f71ce8180
--- /dev/null
+++ b/dev-python/terminado/terminado-0.15.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="
+	https://github.com/jupyter/terminado/
+	https://pypi.org/project/terminado/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/test_server/Manifest b/dev-python/test_server/Manifest
index 1bfbd2c9df9b..8975f52d50b5 100644
--- a/dev-python/test_server/Manifest
+++ b/dev-python/test_server/Manifest
@@ -1,9 +1,3 @@
-DIST test_server-0.0.36.gh.tar.gz 16663 BLAKE2B fa3e6a00aef11727271dee9c3e06ac878da4aac6098df6d9de56049f175af143bb858e2bd8d91cd1acfffcdf59e8d3dd1bc0fa840c1431ab162a599d103e37f7 SHA512 699abef74e5589396e45309b140da15be82de49383d5c683b729343f83a2e369a6e2bd4383ae442369dffe777100099abaf4f917cd700ec9926f2bcdfe0b84ce
-DIST test_server-0.0.37.gh.tar.gz 16873 BLAKE2B ee2a086e9199e1b5d42b1487d3dd2ecfa5ec0e4ab081369c9e7b626a4cdcdcee4ab15a664e3eaf958bd1285c9a3908c366d5b74958d575016a9040d463b71339 SHA512 5c77b6d2b9bcb971af2a563e5a1c840abe429394d2a870f7caa5bd8a5edfb9488a30faf6485bb5a7105a83c36b6547abb1c06f98f44d66af8ff86469bf4125e3
-DIST test_server-0.0.39.gh.tar.gz 17084 BLAKE2B 9891cb1ca63ee9be99ba4926c243ee06785c1bfb7dbd4ef70dd4cd978e81cb83e6cd44850d8fc3dd8f688b83e0a7eaf2370598145f852ad9eaba5b4ea345c460 SHA512 c7567568c0a606d00b94b29a32cb1f2aefff3f59e6e27052eaae0f0f0ac75082cae30797434900492fcd580bd0246aa7292ace7f2bd68e426278dc5ab0c42398
 DIST test_server-0.0.40.gh.tar.gz 17104 BLAKE2B 7bc9211e4c16ddd210d7a8b2973d173b217fdef419a708e377225cb5da194d7ba5a31eea39ac8a4f1607e0354d440f4f07f00a64bad5ad5e1c37ecf71ce076d9 SHA512 3bffccf66d49d996e7175d61f9ac2d3575c102fda84e48763331cc39f84656661bd6deaae80a016483be6aad7c8ed4eaef5f7433ab86e9bdc52e846cdcbbcd83
-EBUILD test_server-0.0.36.ebuild 513 BLAKE2B a64985cbc827bb0def1b1a01213623c788ca181c8611c8b5c11d90cad454c0c6cb33054fac9ac1cd7b088ff5d4c319035a3870c888889b98bd2cb715e0afb69c SHA512 c3c707b7cdadc1a688a649c0e4bca43e2324fd60c27f3bc127e119fd2018273ab2d9e60a0ac1826ab3cdfb856d5394ebf8118ea84a4ec3e77eea909adbc737c0
-EBUILD test_server-0.0.37.ebuild 513 BLAKE2B a64985cbc827bb0def1b1a01213623c788ca181c8611c8b5c11d90cad454c0c6cb33054fac9ac1cd7b088ff5d4c319035a3870c888889b98bd2cb715e0afb69c SHA512 c3c707b7cdadc1a688a649c0e4bca43e2324fd60c27f3bc127e119fd2018273ab2d9e60a0ac1826ab3cdfb856d5394ebf8118ea84a4ec3e77eea909adbc737c0
-EBUILD test_server-0.0.39.ebuild 513 BLAKE2B a64985cbc827bb0def1b1a01213623c788ca181c8611c8b5c11d90cad454c0c6cb33054fac9ac1cd7b088ff5d4c319035a3870c888889b98bd2cb715e0afb69c SHA512 c3c707b7cdadc1a688a649c0e4bca43e2324fd60c27f3bc127e119fd2018273ab2d9e60a0ac1826ab3cdfb856d5394ebf8118ea84a4ec3e77eea909adbc737c0
-EBUILD test_server-0.0.40.ebuild 513 BLAKE2B a64985cbc827bb0def1b1a01213623c788ca181c8611c8b5c11d90cad454c0c6cb33054fac9ac1cd7b088ff5d4c319035a3870c888889b98bd2cb715e0afb69c SHA512 c3c707b7cdadc1a688a649c0e4bca43e2324fd60c27f3bc127e119fd2018273ab2d9e60a0ac1826ab3cdfb856d5394ebf8118ea84a4ec3e77eea909adbc737c0
+EBUILD test_server-0.0.40.ebuild 513 BLAKE2B 6f6631d237bfe5e172deea77ee05844f97edbca38ae650661e26c044e90bc33751ceba8d511bca78e6b59b6f95c708c1f2ea179547c3983c65b9d7b333ebf2cf SHA512 da6725f9b7b2fb540dff135d50059682f8fa8224296f5d440c5b2d22696d11684828fb9f63c5889e5b2589813c503cd5068ce8dcd58557edf3249a5e3ffd7c14
 MISC metadata.xml 397 BLAKE2B cf4130c636326a66360a51bcb203ea5d6d0e40d82e9051627219f75dc4315f8b3fd42dad361eb8579d740d119e94e0f096276a9bd835b6f502c37057a66f6f4f SHA512 564e112c4fdab07c190c77db6dcf0374925629f4c33e2ef23f552ada318de653c46de6a1658ed8d095d21c759b7e14f7f8de642d32d96ad8beed8aa2d04f378c
diff --git a/dev-python/test_server/test_server-0.0.36.ebuild b/dev-python/test_server/test_server-0.0.36.ebuild
deleted file mode 100644
index 570cb9dabfb9..000000000000
--- a/dev-python/test_server/test_server-0.0.36.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="
-	https://github.com/lorien/test_server/
-	https://pypi.org/project/test-server/
-"
-SRC_URI="
-	https://github.com/lorien/test_server/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/test_server/test_server-0.0.37.ebuild b/dev-python/test_server/test_server-0.0.37.ebuild
deleted file mode 100644
index 570cb9dabfb9..000000000000
--- a/dev-python/test_server/test_server-0.0.37.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="
-	https://github.com/lorien/test_server/
-	https://pypi.org/project/test-server/
-"
-SRC_URI="
-	https://github.com/lorien/test_server/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/test_server/test_server-0.0.39.ebuild b/dev-python/test_server/test_server-0.0.39.ebuild
deleted file mode 100644
index 570cb9dabfb9..000000000000
--- a/dev-python/test_server/test_server-0.0.39.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Server to test HTTP clients"
-HOMEPAGE="
-	https://github.com/lorien/test_server/
-	https://pypi.org/project/test-server/
-"
-SRC_URI="
-	https://github.com/lorien/test_server/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/test_server/test_server-0.0.40.ebuild b/dev-python/test_server/test_server-0.0.40.ebuild
index 570cb9dabfb9..0a3b82120f33 100644
--- a/dev-python/test_server/test_server-0.0.40.ebuild
+++ b/dev-python/test_server/test_server-0.0.40.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 15854fa7b86f..b946405086c2 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,3 +1,3 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1.ebuild 821 BLAKE2B 4071197715cc11cbe986bd6fbcd80c1a9b1239a6cb642078aa5565ad86709bc749caa48e453958e89ba604a46b551a7ade6f0e02163534ad073dfbc9cce50414 SHA512 515250b688ab2aa632c666529ee80f9028c70e60a78de1d891c73ac0ae1baed73dd748af608d66ff00ff7031fce8492320777363cd86d42d195d9448ef71179a
-MISC metadata.xml 940 BLAKE2B 482d6fa661c25db8138eec79df831557f634853374a3bb6080adf0486aa8043092d716cb4fabd3e8cba505afdebf183d83cbd622f2be4d88a0d944e188aa5fcd SHA512 d009ebb49c2d1a28e22edc86aab7c2be5c8ca00261aa3076999680656c68a693be7b953d6d0b32b7213f08d2f3122113d89d50b43e68eb3000136c9cabb1ed51
+EBUILD testresources-2.0.1-r2.ebuild 1002 BLAKE2B d8a9872935b2ddf234c8469f64326e19f093894e4f43ccc06832d547e11e1222a927ed6380c8e2a395b7b720e7948e6a8b7e79b8790f1c8bb0fd1b1f0fedbd3a SHA512 bd90a25af796cdd4cd3f4537e895b011260c87f51dbc3f5235f54ec6431eb7542d589944e8481db3cd959a060e2afc50905f7b90241429935265eb51e1331f38
+MISC metadata.xml 964 BLAKE2B 6857a30f001cc619ed460c6cea5e60e31bb4653a7f5a6b3f357da0dd8649728bb152efd742f2db1541cb283dfda5bb2dc07f8bb61482c6b0522562046b6a5d67 SHA512 b63c926db0afd5d651a8470c9e4e34cd032c83634a067846c91a3ea12649ccd0c3a7990739bb741766b37b739e91078ea367556a84de6eeefcc5ff697424ae9c
diff --git a/dev-python/testresources/metadata.xml b/dev-python/testresources/metadata.xml
index cf54c26c3d00..db9726aac1d4 100644
--- a/dev-python/testresources/metadata.xml
+++ b/dev-python/testresources/metadata.xml
@@ -19,6 +19,7 @@
 	for example sample working trees for VCS systems, reference databases for
 	enterprise applications, or web servers ... let imagination run wild.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">testresources</remote-id>
 		<remote-id type="launchpad">testresources</remote-id>
diff --git a/dev-python/testresources/testresources-2.0.1-r2.ebuild b/dev-python/testresources/testresources-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..05d03edf42a8
--- /dev/null
+++ b/dev-python/testresources/testresources-2.0.1-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="
+	https://launchpad.net/testresources/
+	https://github.com/testing-cabal/testresources/
+	https://pypi.org/project/testresources/
+"
+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"
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+#	sed \
+#		-e 's:testBasicSortTests:_&:g' \
+#		-i testresources/tests/test_optimising_test_suite.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
deleted file mode 100644
index abee2d1e1311..000000000000
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-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"
-
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	sed \
-		-e 's:testBasicSortTests:_&:g' \
-		-i testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 5a0f60ea5242..8a9dc229cf90 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0-r1.ebuild 765 BLAKE2B e55ea9b94767db3614a172f49b10746adaabfdb74dc1114e31cd8e9fa51a7496cb1594401ce17f2fca03a47b5d8f4199b025ff7572c8855aa531e8d7624721b6 SHA512 a5a732ca6d62fbc4fbc5dffbbb94b1e1530d9072c3ed6676d2dbef0d30fed4bcba91275e036365eb4d87a0107cdf9d5554e94c64e111d8741389f2c4d3d6ad31
-MISC metadata.xml 980 BLAKE2B 2cc14564ee68d2ae042db7ec07616d1b7dc2b8355183c81111c965e73be351cfd49f8c23e1d60828b714d308297134e712be0cc0e5b1bb6b98eacd35ac753bdc SHA512 6de28a56b63cf6d191c6875cfc1e3cea247bb3ebfa7fc4b8bc19283317bf01f9451b08f175d30eb3e07f225932a3eebae7dd4f85d319472b77e85666e4940f24
+EBUILD testscenarios-0.5.0-r3.ebuild 919 BLAKE2B 42cd66967e984387cc358fb3331f748fd73721d2aa9e308eb2835e87e98609d55d88538701838e7756d5b738baa3c3bdbdd64273ff004664b4130fcfd1f483bf SHA512 53dbb18dbc673bd5ea4d4623bed96ad9440c98c0ce7a519fae1be0fa11ad1a39bc6163daaf6d8100734fa96db91c6eb3497068fb10637d7a9727c0110f330367
+MISC metadata.xml 1004 BLAKE2B 0c59a0b59cfd0cdca9e8460cb677511978561762c224c0583ad02e21b88d0a1aa0a1973273e71f6dfc7de372155a4e6eca9c14747e8c0749cd513ec921ec0b1b SHA512 23f6bb47cd7ed020626309ff41c94929c4cc136ed68be7ff8c45db7f28901bd575e5585a2c5aa0c06c04134edeb184f8034cea5756c4919635f76c744f9d0235
diff --git a/dev-python/testscenarios/metadata.xml b/dev-python/testscenarios/metadata.xml
index c9c0112cc913..97c52ec91adf 100644
--- a/dev-python/testscenarios/metadata.xml
+++ b/dev-python/testscenarios/metadata.xml
@@ -20,6 +20,7 @@
 	dependency injection (provide tests with dependencies externally to the
 	test code itself, allowing easy testing in different situations).
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">testscenarios</remote-id>
 		<remote-id type="launchpad">testscenarios</remote-id>
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
deleted file mode 100644
index db9786403f7e..000000000000
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="A pyunit extension for dependency injection"
-HOMEPAGE="https://launchpad.net/testscenarios"
-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"
-
-RDEPEND="
-	dev-python/testtools[${PYTHON_USEDEP}]"
-
-# using pytest for tests since unittest loader fails with py3.5+
-BDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --deselect testscenarios/tests/test_testcase.py
-}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
new file mode 100644
index 000000000000..c443176e7cab
--- /dev/null
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for dependency injection"
+HOMEPAGE="
+	https://launchpad.net/testscenarios/
+	https://github.com/testing-cabal/testscenarios/
+	https://pypi.org/project/testscenarios/
+"
+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"
+
+RDEPEND="
+	dev-python/testtools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+"
+
+# using pytest for tests since unittest loader fails with py3.5+
+BDEPEND="
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	testscenarios/tests/test_testcase.py
+)
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index cc945ff2e7a8..afa5fe8c3675 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,3 +1,4 @@
+AUX testtools-2.5.0-py311.patch 5238 BLAKE2B 204a5a14a214c18ec62131810d83393789ae290b1430d154eab009e1cfc23a39828ae8a6869cb00dfe529d88d107fae46487ca137489d2adcc9c3f27b5e5d006 SHA512 fbf14268169696608dd2a27ed32ed9fe566b060b9a6d74dc1985199a4ae28267031e0a829f47dc76b46c70ea389aa4296cebb3e8445cc31e2eaaaf117995ce85
 DIST testtools-2.5.0.tar.gz 235399 BLAKE2B 62d62cd12f19eb3fad419dc06e7f0152bf8f70a9f60927b1d791f2905b34e13199ceac93b3d30735acae2c5db1e8554cc5a7f6c8588d1f05fb213c424e90a12b SHA512 6adbf9e90f0647a44130e99cd94e4c0cbfab3a1b5c28b6bb124d061defe69d8043186cfe554099936effe16a6b07d59927bfeb6820f5a0fb34970ff243030fd4
-EBUILD testtools-2.5.0.ebuild 1116 BLAKE2B f8df5f1ed4842db37fe0ab74ac07fa5278fd8fe700233a1b457313c9707a4f10049933ed696d5217113991b45b6731eabdd2c8932da1e440a85991254d74bdd0 SHA512 0b39068383f2369c617aaae9288e9dfdbf3ee0832f3acdcb34bc4649df3903db3fd5b304a16e30fbaa1642927d0ed5894161cfe34ec51113e172acfda50597e2
+EBUILD testtools-2.5.0-r1.ebuild 1495 BLAKE2B a1be4225ba36fb675bfbca2771146217497601c1f923c4520a1fa325f5cf8450f8fbbb87871303f262b74dabf99b047c387846e327e99ec3889fa7b37eb07c97 SHA512 bf20c0dded9290c33127ee800c60bdf8e2a55d9b34029b9685966b5eba4769508127bc082bd07e743bcbfe677881de2879d2c4dc96e0f7e735d664c2c69b250a
 MISC metadata.xml 580 BLAKE2B 5068f4abc80612e7a92fb65865612d93cc4d4803a9cda3555cee34eab48da20f6fb22734b09adeaa068cff135d592b5fbd607157a60052a68e127750f6082b24 SHA512 5807608ef5c6d3fa1a86c715c59afb7c4f3913f69739a0c4ea9b6cf85976077280da6ce019ec4fda6dd6bd490379ee0570d5c98f9d719c0cdaf60a550e01e555
diff --git a/dev-python/testtools/files/testtools-2.5.0-py311.patch b/dev-python/testtools/files/testtools-2.5.0-py311.patch
new file mode 100644
index 000000000000..ee457f6119c3
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.5.0-py311.patch
@@ -0,0 +1,116 @@
+From 77953cf633ecd149b2c29e616f8d9d4e0cf8e5fa Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Sat, 23 Apr 2022 22:53:48 +0100
+Subject: [PATCH] Fix various test failures with Python 3.11
+
+The changes for https://peps.python.org/pep-0657/ require a number of
+changes in our tests.
+
+Some tests still fail due to
+https://twistedmatrix.com/trac/ticket/10336, so I'm not adding
+3.11 to the test matrix yet.
+
+Fixes #325.
+---
+ testtools/tests/test_run.py        |  4 ++--
+ testtools/tests/test_testresult.py | 23 +++++++++++++----------
+ testtools/tests/test_testsuite.py  |  2 +-
+ 3 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/testtools/tests/test_run.py b/testtools/tests/test_run.py
+index ee96eec9..9808421b 100644
+--- a/testtools/tests/test_run.py
++++ b/testtools/tests/test_run.py
+@@ -202,9 +202,9 @@ def test_run_list_failed_import(self):
+ Failed to import test module: runexample
+ Traceback (most recent call last):
+   File ".../loader.py", line ..., in _find_test_path
+-    package = self._get_module_from_name(name)
++    package = self._get_module_from_name(name)...
+   File ".../loader.py", line ..., in _get_module_from_name
+-    __import__(name)
++    __import__(name)...
+   File ".../runexample/__init__.py", line 1
+     class not in
+ ...^...
+diff --git a/testtools/tests/test_testresult.py b/testtools/tests/test_testresult.py
+index 4fbf15d1..7824ff46 100644
+--- a/testtools/tests/test_testresult.py
++++ b/testtools/tests/test_testresult.py
+@@ -1266,11 +1266,11 @@ def test_traceback_formatting_without_stack_hidden(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...runtest.py", line ..., in _run_user\n'
+-                '    return fn(*args, **kwargs)\n'
++                '    return fn(*args, **kwargs)\n...'
+                 '  File "...testtools...testcase.py", line ..., in _run_test_method\n'
+-                '    return self._get_test_method()()\n'
++                '    return self._get_test_method()()\n...'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 'ZeroDivisionError: ...\n',
+                 doctest.ELLIPSIS | doctest.REPORT_UDIFF))
+ 
+@@ -1283,7 +1283,7 @@ def test_traceback_formatting_with_stack_hidden(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 'ZeroDivisionError: ...\n',
+                 doctest.ELLIPSIS))
+ 
+@@ -1322,17 +1322,17 @@ def test_traceback_with_locals(self):
+             DocTestMatches(
+                 'Traceback (most recent call last):\n'
+                 '  File "...testtools...runtest.py", line ..., in _run_user\n'
+-                '    return fn(*args, **kwargs)\n'
++                '    return fn(*args, **kwargs)\n...'
+                 '    args = ...\n'
+                 '    fn = ...\n'
+                 '    kwargs = ...\n'
+                 '    self = ...\n'
+                 '  File "...testtools...testcase.py", line ..., in _run_test_method\n'
+-                '    return self._get_test_method()()\n'
++                '    return self._get_test_method()()\n...'
+                 '    result = ...\n'
+                 '    self = ...\n'
+                 '  File "...testtools...tests...test_testresult.py", line ..., in error\n'
+-                '    1/0\n'
++                '    1/0\n...'
+                 '    a = 1\n'
+                 '    self = ...\n'
+                 'ZeroDivisionError: ...\n',
+@@ -2645,12 +2645,15 @@ def test_unprintable_exception(self):
+             "        raise RuntimeError\n"
+             "    def __repr__(self):\n"
+             "        raise RuntimeError\n")
++        if sys.version_info >= (3, 11):
++            expected = "UnprintableError: <exception str() failed>\n"
++        else:
++            expected = (
++                "UnprintableError: <unprintable UnprintableError object>\n")
+         textoutput = self._test_external_case(
+             modulelevel=exception_class,
+             testline="raise UnprintableError")
+-        self.assertIn(self._as_output(
+-            "UnprintableError: <unprintable UnprintableError object>\n"),
+-            textoutput)
++        self.assertIn(self._as_output(expected), textoutput)
+ 
+     def test_non_ascii_dirname(self):
+         """Script paths in the traceback can be non-ascii"""
+diff --git a/testtools/tests/test_testsuite.py b/testtools/tests/test_testsuite.py
+index 65cb88d7..01abb23c 100644
+--- a/testtools/tests/test_testsuite.py
++++ b/testtools/tests/test_testsuite.py
+@@ -178,7 +178,7 @@ def run(self):
+             "Traceback (most recent call last):\n")
+         self.assertThat(events[2][6].decode('utf8'), DocTestMatches("""\
+   File "...testtools/testsuite.py", line ..., in _run_test
+-    test.run(process_result)
++    test.run(process_result)...
+ """, doctest.ELLIPSIS))
+         self.assertThat(events[3][6].decode('utf8'), DocTestMatches("""\
+ TypeError: ...run() takes ...1 ...argument...2...given...
diff --git a/dev-python/testtools/testtools-2.5.0-r1.ebuild b/dev-python/testtools/testtools-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..bb2db0ed321e
--- /dev/null
+++ b/dev-python/testtools/testtools-2.5.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="
+	https://github.com/testing-cabal/testtools/
+	https://pypi.org/project/testtools/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-mimeparse[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+	dev-python/pyrsistent[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc
+
+PATCHES=(
+	# https://github.com/testing-cabal/testtools/pull/328
+	"${FILESDIR}"/${P}-py311.patch
+)
+
+src_prepare() {
+	# very fragile to formatting changes (broken on py3.10 & pypy3)
+	sed -i -e 's:test_syntax_error(:_&:' \
+		testtools/tests/test_testresult.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
+		die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testtools/testtools-2.5.0.ebuild b/dev-python/testtools/testtools-2.5.0.ebuild
deleted file mode 100644
index 15f3a2741dbc..000000000000
--- a/dev-python/testtools/testtools-2.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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="Extensions to the Python standard library unit testing framework"
-HOMEPAGE="https://github.com/testing-cabal/testtools"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	dev-python/pyrsistent[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx doc
-distutils_enable_tests unittest
-
-python_test() {
-	"${PYTHON}" -m testtools.run testtools.tests.test_suite ||
-		die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index 9dc29b57a75e..43b35ccf5703 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.3-r1.ebuild 529 BLAKE2B 7031c1bd70dd09c8dfd516e0c67940b09323ea51128b1680f6b781eb65d2298717386455a18bbd5506e21fde3bbf8c8fe34a9117b349546a26f547b14498e4a2 SHA512 dda8100d6731f68ef733f11b13ad404a86333ee7e105e2b517630fbcdaefab24e56edf16beae0bfbb4e2a6586529b6728e5109adc036f180085a219e32c72069
+EBUILD text-unidecode-1.3-r1.ebuild 529 BLAKE2B 3d6fec6bfb8d182333254e3af0ce707f94dbc5f91481ccb090b0e6141ad30c52f5a16b8c0c77b31698d14d7c7b39aef5ec59ecb2116f6799f7c22528f03fce88 SHA512 025e993661449f60155a8a52f01b365c09dba48de4574b687bd45556a92f09eacf732b4befcd74ddf538573e94772041273d3fb1d3734a2dda5fb9221653527f
 MISC metadata.xml 356 BLAKE2B bc31b0dfed91be054b75af4688b79ed74e6b55511377248068e2bfa54da07eecef31bbc1abeebb7e55fe2e5eed7594bf13b0169cf61ff16c522fef08535223dc SHA512 0769235a37895d6778dd153901bbe6424effe034e1847b686201c19eb81bf16439e10ecf8ef9442149a08cce6d4dcd695cd286ec48d36cd1744f256cb03d8e40
diff --git a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
index a18b4f9b5dba..ab324ea45131 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/textX/Manifest b/dev-python/textX/Manifest
index 75ab901ba719..f793560da02a 100644
--- a/dev-python/textX/Manifest
+++ b/dev-python/textX/Manifest
@@ -1,5 +1,3 @@
-DIST textX-1.4.tar.gz 21967 BLAKE2B b9e5b15715e370795470be855e0425075b1f704cab0ea2f24021345d8748f9f1a36e84618207c7684cadf86dae2ee0d613af3aaf217a881ba922385a544064ba SHA512 7783f4dd1358d8e0df126f1be893c58e32f57015fd577bd20d00a17b63111d6e48222c9b78420a307fcd0833f6d9ac3a1398d55986681251f7c378cdcd68c8a4
 DIST textX-3.0.0.gh.tar.gz 1827894 BLAKE2B 1b4dff3919838b8aa27faee9387fafd6771891b730c221e10a5f2593d138634950d6ced5a7344944913d99e591ed87adfac403add582baa50b0b94c9c6498572 SHA512 59b175a3f68b0a5b9b3522e814602c791df3fa7dffb8fabffdeed79ce746ae698ee61c748ce991d8cfee15e094c9437530912e84bdeed4531d0bd96d07477c90
-EBUILD textX-1.4.ebuild 737 BLAKE2B 4eba28a3a84eef41c63d8190c552e6e4eb216707cce8b133259cc48c1c47aec5886ef4583733efae1691ec38001bb0980e549e2283da00840d8d26b8fa4340db SHA512 3b33a1401c3bd9fd6acbf3d5d14b01fb921b059c3a0204863c15abe6bcea85eddb2c665bb7ba6bac7416c7f2877c1ee023fd468e7e7e3d57e44357e88c078b2d
 EBUILD textX-3.0.0.ebuild 1275 BLAKE2B 8a5af7a334b3fcf7451a4ffce669b4a70aadfc9fa906c70f9107954b6d22730d4b6c33502a864f21c477fb128bcbf07534f969f5374010f58ca6425dbb55bb2c SHA512 f9cdc85d0860af13a1f0d877cedc4e0a7b3c12bf31faa0a2111c5ff5aff84697689d97a9ef4579632bf6a6f5b1d9b4f23b74a4a30269a4728e96f654637292eb
 MISC metadata.xml 338 BLAKE2B c8501a0068d2c612d598ce4b6a381693def6cfa5ef548462db75edbd1697651cf74909b9d93a8f2aa0055f3a4a05eb0ff06e7d72e59e453af5d76f53a5bbf137 SHA512 8ad3cdd270107b756aec1341799fdac495c3d8bf31a722e378df596f8d842867e2e4509e9eff0e31da5ad54a4e107d09268ade15cbcd47ea67eb14157d89b939
diff --git a/dev-python/textX/textX-1.4.ebuild b/dev-python/textX/textX-1.4.ebuild
deleted file mode 100644
index e32c8487351d..000000000000
--- a/dev-python/textX/textX-1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
-HOMEPAGE="https://pypi.org/project/textX/ https://github.com/igordejanovic/textX"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-# pypi tarball omits tests
-RESTRICT="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/Arpeggio[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	py.test -v tests/functional || die "tests failed"
-}
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index 63a0451bee7b..f20fdcfa4973 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,3 +1,3 @@
 DIST textdistance-4.2.2.tar.gz 45089 BLAKE2B 8b08db743a56c289cc10a9ceb606612acb2a13d12cd12f9627870a4748c415804bde7c3f1aee54d59a49053731727827dbbd5f4ed6c2cfcc302166575ba382ca SHA512 f181686153e6e8f1541a15ac752e6a86698445713732858e63b6465c96dfeb582d2ea6cad1f7c526a3dc60796d58064355480bc6ced7dc69268a5c0abbfabdb7
 EBUILD textdistance-4.2.2.ebuild 820 BLAKE2B 666b87245e2d9ff6b5a074d4e4a615024ef928e1b8551ec1c02e6474991d710be1ba9081bbbe0c5fde3bf2c0bbb7cdb46995c485c18dc3ed81e07b5e655a8ebf SHA512 4c64c8b0acb9295218411d1448767fa48e8ae51cf6155da7443535cc2a367d71fb3acf9e55f4e0d6aa8ff2f86d6ce6bf8087e0f4c5b8946b274ccec7c5e5f015
-MISC metadata.xml 416 BLAKE2B 1ec5c20084081151a55fb38838a0144b49f4dd4af41d0e37e7502c70bde2e9760d4cdf9b3619a54eb41e6c380a10c33ce4efd99dd4c1b5976c2e5779271e970c SHA512 359187938c0f1d3b75c246fe1614cfd7d8ede4bb788e5bac98772b14ef10327bc69de6ec541d5196ad960de7f99dc7ad94f2435879b50d57acefb2384b99b504
+MISC metadata.xml 517 BLAKE2B a429684151f5700f148c5350b16026e797fdedc80b950d3c79c050a4d7418763918a05936eaeeed07b9756d9ec39602128570cd8c27049234bbda27e006ff00f SHA512 be445c2c21f5fd0bee241f8f76094b51c2fcbd7fe0d2175f7455beb881c3b83e8070c8a14817695d2b7a7dfabcdb856e12d7749aadc91ca31f7af8187e9a409e
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
index af927b8a2270..6f62e32b1677 100644
--- a/dev-python/textdistance/metadata.xml
+++ b/dev-python/textdistance/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">textdistance</remote-id>
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index 2597ad5d6116..82827b165cc6 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -1,3 +1,3 @@
 DIST texttable-1.6.4.tar.gz 11611 BLAKE2B a97a9beefc9547fe7487af5b6411effd7391e303a13161d7e1c9304a1b580cf47bb10c8649dfea5c6f8ba05bc6c3fd7595662e8b74b282696d9ee3a110746212 SHA512 300b02f5b682f1c09a3eb5abfd4ee9c724354505a3f9e8f68207fd7d244402f234437807d68b6b526c3d4ade9e527e66c921bcd47a5e86d680698d559da3fe1a
-EBUILD texttable-1.6.4.ebuild 659 BLAKE2B 3c62d947889229f01c5bdb5eff363221f9f63facdde893ba9cf57885dfbbd3a0ba88a702cd32a56ff75cd98f25df6d209554d2ce1220b6a3f6960500c955d474 SHA512 857dc931ae7432e85715bf31f71a711f585fa9a0aa9daca8dfc826ddb5b7806d006b1cdc6c74045cc1336dc83607fe61d97fb0165deaad6bcd6a2aa31289e1c8
+EBUILD texttable-1.6.4-r1.ebuild 691 BLAKE2B 87a2345c50c2067a8a22973aa0aa7e3ef7311825b629b8f3ec221aea5049862c33fdc6e0b10fce32e5c43e951bb071e3d0e43b13fe7df99eccb1a52498becbff SHA512 6cdd88c38326a5c7890e641752d7a94874e07cdd5447660268ee5e30a1ed90a3fc73d3842d369d4858b6f4632cff9b9e214144e098fa5dc412f28dc40fc5b85e
 MISC metadata.xml 416 BLAKE2B 5b62e938b6e8769183d1dfc146896dd74166fd18b04c774de1a0f839803fb7f118298ef10524f8bd64d998beaf3c442381cc5575bbae3d0954ebaa51def0b97f SHA512 679d6e3d889b245f143ae2684e97ff97e79be06f0bdf23df9382798ae9b5ad09995ac9c1d020eff057b50040ef8e90d1c3ef3f9ebb62de91490a3d6bb6a7ee95
diff --git a/dev-python/texttable/texttable-1.6.4-r1.ebuild b/dev-python/texttable/texttable-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..5639bd1f80f4
--- /dev/null
+++ b/dev-python/texttable/texttable-1.6.4-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Module for creating simple ASCII tables"
+HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
+SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+
+RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests.py || die
+}
+
+pkg_postinst() {
+	optfeature "better wrapping of CJK text" dev-python/cjkwrap
+}
diff --git a/dev-python/texttable/texttable-1.6.4.ebuild b/dev-python/texttable/texttable-1.6.4.ebuild
deleted file mode 100644
index ec0eced974cc..000000000000
--- a/dev-python/texttable/texttable-1.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Module for creating simple ASCII tables"
-HOMEPAGE="https://github.com/foutaise/texttable https://pypi.org/project/texttable/"
-SRC_URI="https://github.com/foutaise/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv tests.py || die
-}
-
-pkg_postinst() {
-	optfeature "better wrapping of CJK text" dev-python/cjkwrap
-}
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 44cb1bd92e1f..578f86ce684c 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,3 @@
 DIST threadpoolctl-3.1.0.tar.gz 29899 BLAKE2B 41bddace1231107a108fd57e281541a4e9f04c9bee957d16cfbff49361f9dcb0b879bf376617480b1ca2929c09d07fd1f8f704afa4ad85e34e38c4a82fb48a3c SHA512 551dad4c93a62382583a96187f795aaeb6954700647c984ad618d3d1bede50d6859e75f676c557fa875db37c798c0347131f6b136148f71b8208783c7f8f717e
-EBUILD threadpoolctl-3.1.0.ebuild 571 BLAKE2B 0e2a2e060813bb96a198af7a6c508603c65663a38c5627a6de447ececcaa416aa859f4bdf370c5d2ca86c4c0227234890d9f9a07cf38208a78c579d01c3684be SHA512 f986ea7854101b0ad3a38b92aab3ef86b1e2197468d84bb171e8e72f0a98f68498506db8d3eff04e3ff3d8f3b4d58e7a7b227d5b825cb2b6d1996643efe5b347
+EBUILD threadpoolctl-3.1.0.ebuild 571 BLAKE2B c34d1b10a2135ee2aafacf494653d767abb6ef74292b2454e3e9b8c39a742605452ed198ac5d90ec12e4f10d5c3e5b55e477fab608a9869a871e7b0675b006be SHA512 7a2396e22b907fceb2a6f8325b7ecb56b4fb414732935510d105f9e1e7fbf779b54d2e2f518666ed7d4075dc2a7b2ed1e560069a86f5ff3a6a0e66fd1a7e4ff1
 MISC metadata.xml 429 BLAKE2B 85d3a98dd9d79c2e11cc44fd2e474d1278ce744a8c36887e9d458125eef41a231cce19ddd8b9fbfdb605ed9e5c5c7bbf35f2844cdbb7d7e557693ded1c1663bc SHA512 f7d15360b5cec34491ea88db7919aeaa0c353bbeed2958a25c34aa93b23a9fdd97c8c910f2623454eb78d74766e0aecde58852b9528dfd0f635ea5c6aeb28f8b
diff --git a/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
index e64479500a67..e60f6c77b65d 100644
--- a/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
+++ b/dev-python/threadpoolctl/threadpoolctl-3.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 0878c318ae57..df23538e63b7 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
-EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 08971e38b78287d94cab02879d9e69413e88082b4260b2300d327b2ef799f14b0fea33ad06ffda2d5aed458f7a50c7f64acba70cdf6f59d67cb5a0fa080dbaf0 SHA512 75c06be587e7d91021cd69f613865a0b9eb6bf44876f4d84ed837f8a07feeff4ab2e9b4509b8269992cb5ea5c02261c692b65fc97f14ded9d364825e03bd5302
+EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B b211bfa2232b40b8a3334c9a4aee418defdb0a77210219272e8369e44738b7cf5ca919c88c42959d8cd64af52c858ada59f7c6155a624a05a75de81732fa0c6b SHA512 c9020bceb0a32ef5ba749b0d6cbad9e9c3c484297a6d47ee86b0d2a0a9c2c12154912977a8b4ee1f01af720c4108000507839c8a65da353131988c2485c7470d
 MISC metadata.xml 432 BLAKE2B 85741fa3b4c10a6a3ebea91bfc5f91d82377e48e77553b72aa1c15bd42865f8c77e8f267b713ea3b3a0240c10ceb54dfe59f8e112735feac2f33fc9d7d141757 SHA512 af883c75dc04ad12092166db8b97c0028ee662abe6ca1bafffa478843616cc9033725ae3b6f696e82c8dfd323a1889ff9ccb3dab0637d2fa8e1cfddf1341a531
diff --git a/dev-python/three-merge/three-merge-0.1.1.ebuild b/dev-python/three-merge/three-merge-0.1.1.ebuild
index 2d478f1a011a..cc2bd0c6cdf5 100644
--- a/dev-python/three-merge/three-merge-0.1.1.ebuild
+++ b/dev-python/three-merge/three-merge-0.1.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 513cbdd5b357..ee8f5f9ab643 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,3 +1,5 @@
 DIST thrift-0.14.1.tar.gz 4311458 BLAKE2B 00c0b77c3d722b0db833f03848df0b74ee64712ed1ff06e0b63b926eb493f43ffd9c316422b6044f74685471cdbd2ccea7c6305fd8dbbc10614f2151a3e16237 SHA512 e09e53b2ea3cad01ef81ab4b5a87bfed443cfda849a13c4f00ba0ed1cd1a1f9742faf95adb07f279506cc5f866c13fdce57149de1bc9e71ab5c40238037e8b22
+DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
 EBUILD thrift-0.14.1.ebuild 593 BLAKE2B da6f8d820e0f6936906f9f4f13a2072737f2ae9c6c77de2464ca2b8b5e8d62563e6b4abda6600af78fd6d5d8ce06a8dbebcff887054383726382f0bd9b6e0d7b SHA512 1f2511a7ac57737254df5c12a528687b4f62f3ddb78c00888d4e7a2123f1df86e5872587076b2743f29d749c71148f59a5c3f37fe33b5264ec3ef28149af7eff
+EBUILD thrift-0.16.0.ebuild 509 BLAKE2B dd695922a315b078f764ee05b77db4f414dd428c413e9d9dec5b5cdef275ff54b0d3f5b35e11560022b7f311441f597b99a0f4e0265fa94a442c53a5a4f496d8 SHA512 8a6099105bd1053947ae87f7535e92d62ce2728f3d2d1b4b228ec7678aa944548c1206d08699498136c64f10fab9aafd85eb3ccda6098d96a475ea70bad35184
 MISC metadata.xml 328 BLAKE2B 945425132ceb24c1286fff7b9b64eb814e331e9df732251040f444efed2740e06e76d44dce88c338d7ffec243f4ef0f2c5ce661cfada5f027a50c79624d35fbc SHA512 271fa461589f5a148fcd06c76a6d9a7dd1469ab090536e858bfc9f43a5039d5836bd2fa77da2dba947d7d85ed6ed30d7ab36bc2df36c5a321bd29389495f90fe
diff --git a/dev-python/thrift/thrift-0.16.0.ebuild b/dev-python/thrift/thrift-0.16.0.ebuild
new file mode 100644
index 000000000000..7e8f3240e62a
--- /dev/null
+++ b/dev-python/thrift/thrift-0.16.0.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Thrift"
+HOMEPAGE="https://pypi.org/project/thrift/ https://thrift.apache.org/"
+SRC_URI="https://downloads.apache.org/${PN}/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/lib/py"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="test"
diff --git a/dev-python/thriftpy2/Manifest b/dev-python/thriftpy2/Manifest
index c84e60522a9b..921740daccd9 100644
--- a/dev-python/thriftpy2/Manifest
+++ b/dev-python/thriftpy2/Manifest
@@ -1,3 +1,3 @@
-DIST thriftpy2-0.4.14.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
-EBUILD thriftpy2-0.4.14.ebuild 880 BLAKE2B 8b711aa1c10aeedc3e4998f9fb50a3ebbbefa96513b4f7283b75854b961566e51e291847541accf91fd9aff58b0640a7fcff656968c44af8f73191a111fe5e22 SHA512 cb62288b5b9ca13d4bf0739effe56e5dab8c1a727b3a4955ae081e8a0a3e4d6430e6dad8872bb2ab1044e5393287cee345d0e52d17005149da8bc24e857291ff
+DIST thriftpy2-0.4.14.gh.tar.gz 127552 BLAKE2B 4061642fb14b60ba53e0c4e6342ead25f781ee923b718a6c557235fcbfe4219b4d8944894afe9783062e7950b689b909af6be5cefe3b634a476ec582adfefbed SHA512 0b248c4999b0a97287d8db3e5b79ac687bc7e25a5478ef125b479e0baf9be9d0aa5f9eaadf0612c228133295743ba913bfe69e7fe59a8d5f854a682da9d31c50
+EBUILD thriftpy2-0.4.14-r1.ebuild 939 BLAKE2B c4c817d423130a110a4a4b69d18f068f6757b0b443bf9e851486473d2323ed9af9f752cf684e2e32f2caf5ab95b584e18dd8d0795002f4e59d9d47f68d7b94a2 SHA512 36cfc0e63170e2b6308733d0674e16390cc31c2b11b7b68d258cd06e1e6b470a63fcb0326e8dfb006889741ac20b1041d4528155b4d5633cd881e7fd214a5493
 MISC metadata.xml 380 BLAKE2B 570746c7985eab098e590e49d267c406ce02cbf612dda6bf2a60439aee62cbf6eefebac14af29bf5fa52c8b5fd4846b2872beb7034364abb722f706978b55987 SHA512 d20d8641eea699cfa6d1930b8c5a9a8edfe76b5ef837551c52105d2fe8d70d481862c5d5cdbe389971588b3bdf62e9fb7e1cec2e89d635650cbabed7f7f53070
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
new file mode 100644
index 000000000000..d71392dd16a7
--- /dev/null
+++ b/dev-python/thriftpy2/thriftpy2-0.4.14-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-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 approach of Apache Thrift"
+HOMEPAGE="https://github.com/Thriftpy/thriftpy2"
+SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# tests that need network access
+	rm tests/test_{tornado,rpc,sslsocket}.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing --via-root
+	pushd tests >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
diff --git a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild b/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
deleted file mode 100644
index 16727441076a..000000000000
--- a/dev-python/thriftpy2/thriftpy2-0.4.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit distutils-r1
-
-DESCRIPTION="Pure python approach of Apache Thrift"
-HOMEPAGE="https://github.com/Thriftpy/thriftpy2"
-SRC_URI="https://github.com/Thriftpy/thriftpy2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		www-servers/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	rm tests/test_tornado.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pushd tests >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 21162609f573..8ffe4e558228 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,3 @@
 DIST thunarx-python-0.5.2.tar.bz2 348120 BLAKE2B ddb098857a7411c1ce4dedf8b406cf6583e78f2ca4b012a9e0346c5a7132c40fd9cf279dc5d054ec827028cdc67321a65fab5e9d3912287ea9ed1f0cf4e72248 SHA512 49d009c84d69f0a1938ed6cb46fe04326c7323edecd79f6d9978ce2306fb95f20c901174f1cea31d5e436c85537efcb79c8613be857a3e4143f7b55b895616b6
-EBUILD thunarx-python-0.5.2.ebuild 755 BLAKE2B 4ba369507cbaa93f0f5189ffb74f0cddaf4501ae847822ff7d04dbdf503bc2e3c5c36ba0c65709d9ba0300c1962fa689c7f6d3ba8636164161bf910e5b4ad2c9 SHA512 ff0ccb01a740845aa2fcf816e287f2e90b5c95ea17ed42ce69ad3a2b4092a3bd69e2f8c5d005fa79b5b10aa590a0800d953e19e06c814c38fef7f32ea56f28a0
+EBUILD thunarx-python-0.5.2.ebuild 765 BLAKE2B 3e6aacf804c8ccfd52a37e3683f10dc3c39a7053a0c5fd7111bc56e660b8161eece2af44ccd13dd3761807bebfb4a60e4553d976b493a61644b8cee32178cf3a SHA512 1ed251b9330babfaa10ec00c2cd50e06641396282a3ae5d120136b76b784d04fb1526d0117196ee2a8e430a9290097cb6ee0bfedf3b900bff7a5d6277510eaa3
 MISC metadata.xml 250 BLAKE2B 45f00db829bdb7f8fa733a57e5a7cd394a41f94d2d565c0e9c3f1a8d289fc603c635c4e1fd6aa8845f3a01d061fbab8282c183f0fb5f080fde1fd259ac29234e SHA512 6dcfc9f53fb64615633612f733920d6781d70df5c2fe0ca941db8be2c71cce97b2550c1ec5100f7e7ef1dd5b1b7a21f07804aa76490f06a575cbe49e9cdd785b
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
index e6c360683a7f..20f6bac54822 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
@@ -1,8 +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_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1
 
@@ -13,18 +14,23 @@ SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	>=dev-libs/glib-2.30:2
 	>=x11-libs/gtk+-3.20:3
 	>=xfce-base/thunar-1.7.0
 	$(python_gen_cond_dep '
 		>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+	')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 src_install() {
 	default
diff --git a/dev-python/tifffile/Manifest b/dev-python/tifffile/Manifest
index a1bffa4049c8..94467726fd82 100644
--- a/dev-python/tifffile/Manifest
+++ b/dev-python/tifffile/Manifest
@@ -1,5 +1,3 @@
-DIST tifffile-2022.4.28.gh.tar.gz 285773 BLAKE2B 245f24762d8b77166122440e205df4c0f4d5e55334ed9a30986d2a1baf21aba663ec126a0ac44f21931572e186f779f915ba4a3d6ae43d9c4897d5aa9a231440 SHA512 18a35e27976c88173931d2898a1a3d62d96d5ab844b2a585922f26838e1b4574277dff3ccbc2baa7898165b0312699a857da251b00ad8050624f49a3d29d00ab
 DIST tifffile-2022.5.4.gh.tar.gz 290116 BLAKE2B 4c608ad38ad7ada0e1b41512eae7b4109680cab1f5623ea3cd6c01dfe17b534b518868ee21879ecfa9909f7680a04fbb63967b5c8064062cc325286baaaccb6b SHA512 cc6139872c42e0e2840a9774989b5cba57ef8957e2efa4349e7b224c61ebb8ad34287b9305dddd85b1239d03be4ada73526259b038c19c73513007e5f63d224d
-EBUILD tifffile-2022.4.28.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 EBUILD tifffile-2022.5.4.ebuild 1307 BLAKE2B e8d54bd2167e36d459d27d5d661339fac170426c90b0cc061d01a312b93563af890e0e342ebb287557a57eeb6e64e373243e1b04630ca42f80c16c2eb5cc5906 SHA512 9ba9172bf4621a59a8518ddc5caa6e5f0968a79373f2cd487b4510a98ef6b9f78380707bd4afedca2d0202dbbdc49574101e39dad961fdf2fd0d584e2f265e56
 MISC metadata.xml 346 BLAKE2B 8cecb51fe01826a2a190c4e3020836f5706a918515a3ef5b4624fc3e9985411a8fd3c261fb7b6d8ad4f4486164487d11bdc2b071eeb5a95083db4c5323ae2dbe SHA512 81f8f6f5231d6cc9a8e7f95416a63cc52027f58fa54ce16bacfaa0ae285a48c5a3850d83d5ab50ca89be248ce386528db32811b23d61fa0d0e1e0cc737150465
diff --git a/dev-python/tifffile/tifffile-2022.4.28.ebuild b/dev-python/tifffile/tifffile-2022.4.28.ebuild
deleted file mode 100644
index c7b39355f0d6..000000000000
--- a/dev-python/tifffile/tifffile-2022.4.28.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read and write TIFF files"
-HOMEPAGE="
-	https://pypi.org/project/tifffile/
-	https://github.com/cgohlke/tifffile/
-	https://www.lfd.uci.edu/~gohlke/
-"
-SRC_URI="
-	https://github.com/cgohlke/tifffile/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/dask[${PYTHON_USEDEP}]
-		>=dev-python/fsspec-2021.5.0[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/test_tifffile.py::test_class_omexml
-	tests/test_tifffile.py::test_class_omexml_fail
-	tests/test_tifffile.py::test_class_omexml_modulo
-	tests/test_tifffile.py::test_class_omexml_attributes
-	tests/test_tifffile.py::test_class_omexml_multiimage
-	tests/test_tifffile.py::test_write_ome
-	tests/test_tifffile.py::test_write_ome_manual
-	# requires tons of free space
-	tests/test_tifffile.py::test_write_3gb
-	tests/test_tifffile.py::test_write_bigtiff
-	'tests/test_tifffile.py::test_write_imagej_raw'
-)
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 64c117c4349a..96eaf468b4b9 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,10 +1,3 @@
-DIST tikzplotlib-0.10.0.tar.gz 98266 BLAKE2B 28c49f937af5f70830218dcd3215ab5b7e56077cdd87e0e3887b48a63903314765adc872dc5c7f55e1bd5770541c8f1f3950033cf54acdf8a38be3b14bb6ac4b SHA512 661291a975132ac18066dc8af310da91847f0fed289256944bba1f374c61cdb95c72a942527a92906c935b5af1131069212109eb25f531bac7ac72f6a1d9d773
 DIST tikzplotlib-0.10.1.tar.gz 98265 BLAKE2B 7664e702afb38580af78f2b0887000215a5a0c2ef57e4f9ca5d1100bcba257365b89aee805e800e3a9b5a992487c1ee9733088dadc53941405c0055336478130 SHA512 13a750d9929db1d4ce4608a296523be55878c702846b0b339c6c002cbdf4e8f7b1ffea84db612d8932a379fafce9b4fe6ab6ce4325bf780f211cc0b885a15818
-DIST tikzplotlib-0.9.16.tar.gz 98162 BLAKE2B de32064cd8cb6f3fbd8e067c8126a86da6d9836dc42d91d42fd8ad6ba9f8fc2a1001904d370cb756e76112a0d746247f6235fe40af277a7142bdc6264b1ee531 SHA512 7633b7e8ee23aed8da3df249a7dbc4e36667950d2c5caef5845b5468a61f5cb0191cad3253cc7940d19be56a7981d33c70c9d45ce0d9329286266af6f36c2d94
-DIST tikzplotlib-0.9.17.tar.gz 98194 BLAKE2B 746bd940805fa7bcef56398f974ad13c54814c7192ed8c85bdcfdf2fbeb93a0016d810a0b532120a404053e0666352c07f5f0db97b3241574fbcda3ad464664f SHA512 3708eba0d77890a919c7e974569fcf4cf1c798199927bd2771e8952f6ea49a10a6b85d605c3d6c4969e16bf47eb1683557f8bbefdf986f043049aa6b0c37a8ff
-EBUILD tikzplotlib-0.10.0.ebuild 960 BLAKE2B dc2a722fc45f0f40cf471dbdd0d633d6005f8e2699a19032b415f3b244b315dbe7e87595182666097399c3929e68bc6a129831a5e9be6044ad5ac1d2ac39263c SHA512 8c644f6b533805966a98d9eb0471ced98afbf9f30fd6e5facf9d82e166afb31317b18ef80491f59ee534d970f341dc5b4815998445fb9966146e9ed1762cd578
-EBUILD tikzplotlib-0.10.1.ebuild 933 BLAKE2B e3e4aee199cb0a961a378dd7c052e4547f6525a80ec560136e3177f86692e8d19972605eb37aa96d0b8b95e59a39637a861b23cb71114c9ad2d35d9dacad7ad2 SHA512 0d6114829dc4fbe35b8d456b7be0bd952ca3c3ae62e90c235c50002316742bcb6125735d43c115fd86cbc27cc170bfe334f3906ba727a39f924f5d4d373f02c4
-EBUILD tikzplotlib-0.9.16.ebuild 900 BLAKE2B d750feadf10fcb1f1be0a5bcb92af717c1a939f2f122c410610308a738321a483c91f3817d347568d7ad45037f3d97bb54b173907fd4e1dc47e7bdeeb202c335 SHA512 d7ea3ed59ef06533a5af3ea699c99314f0287e79b373b7e82dc39c27e08c0459da2e36b213ca440fd1c4858a84a0be2560519f6c29ffe93bb0ea2e11b778e2a9
-EBUILD tikzplotlib-0.9.17-r1.ebuild 904 BLAKE2B 25b20bdf26d81c9d16ca9f6d68d48a5ad6816f5825d57bf1d8f09111d25cf5db17c8dc8e76e6a001996b083bf4ab82acd069cc806f543090253d18aa3c73e64a SHA512 3ad017560a623614e9912935237ece3fa8e5a6139a97d609f28a13d18aa8448d63f2849545f477a69f7cf08f43c16c6e55857d3738dbf52c1dee1ebd1903b560
-EBUILD tikzplotlib-0.9.17.ebuild 901 BLAKE2B 88ed2ed61f5cdcafee4e2f6ad95171d7752c2dfd27b667798b3333bf3b603e135dd38681e939c4d48f1621edc46a1d6d5b3ccde5a874e788c7669b7cd517c63d SHA512 325b64f89a34571e8ae6f0735e3b57dec6cb0fc7e998e635484f4fd7d732e347df249dfc8de045dc26e74fec552863abffe6f5965e5f2ed343d889400da62a08
-MISC metadata.xml 853 BLAKE2B 0ec911e216c935c5168e8ab6e0308199d98bbb2f7800232a69e49070322837a344a388954f7cccbdc318310bb5cfc58984b70824342c8394c009234763ec7724 SHA512 da21bd761606e54cbb0301687b6a5e850ec5c3fb0caaaa63d48905178d35fc1add9a035b74b68ee4cb09570285ef952919b7e29a1af0c4bd0bc2099562493d0d
+EBUILD tikzplotlib-0.10.1.ebuild 978 BLAKE2B d8646719ccf8fae50e3e70bcae2f495d9d4ece166cb40d0d3fef95dd5e3258a55e4e98f7096de000f22de5cbc9116fc9f748ab0ab64c8b8c210cb5680dcd6800 SHA512 36949307ac66ae2ef7a8f2e298a9bd330c9a0e0c18d995634bca29d8ed071d840110b890eccbdddba3958f26eef222795e449d3e5fd0141b688a6d60742d8f40
+MISC metadata.xml 854 BLAKE2B d3cd2be01b5f729857c8957a875caa3f42574634daa75dd9249fdc4497d63bb9b0a7501ed06429b4a3d3a0813406a88403c70819581be92948aa52f95a148352 SHA512 609fa041d9a99edd80118743464f39ee4ea00c3de665e6c4ce72b1748f83f9e0828439af61b2d090207e04776a312e65c653036c5309e53cd7823ca581116c07
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index c10a398c7be5..c432fbaf0427 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<longdescription>tikzplotlib is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of tikzplotlib is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of tikzplotlib retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
-		<remote-id type="github">nschloe/tikzplotlib</remote-id>
+		<remote-id type="github">texworld/tikzplotlib</remote-id>
 		<remote-id type="pypi">tikzplotlib</remote-id>
 	</upstream>
 	<stabilize-allarches/>
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.10.0.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.10.0.ebuild
deleted file mode 100644
index 5268fc22a843..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.10.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	>=dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/webcolors[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock dev-python/alabaster
-
-src_test() {
-	local -x MPLBACKEND=Agg
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild
index 6a3cdf0843a9..4fb1107300d0 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.10.1.ebuild
@@ -9,8 +9,11 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 virtualx
 
 DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/texworld/tikzplotlib/
+	https://pypi.org/project/tikzplotlib/
+"
+SRC_URI="https://github.com/texworld/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
deleted file mode 100644
index 5083ad4fc9fb..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-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 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	<dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx epytest
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.17-r1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.17-r1.ebuild
deleted file mode 100644
index 1bb7175ea0df..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.17-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	<dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-src_test() {
-	local -x MPLBACKEND=Agg
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild
deleted file mode 100644
index 32636893a831..000000000000
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.17.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-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 virtualx
-
-DESCRIPTION="Convert matplotlib figures into TikZ/PGFPlots"
-HOMEPAGE="https://github.com/nschloe/tikzplotlib"
-SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-text/texlive[extra]
-	<dev-python/matplotlib-3.5[latex,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-codeblocks[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc dev-python/mock
-
-python_test() {
-	local -x MPLBACKEND=Agg
-	virtx epytest
-}
diff --git a/dev-python/timeout-decorator/Manifest b/dev-python/timeout-decorator/Manifest
index fc2ad1f1c347..4b45f4699530 100644
--- a/dev-python/timeout-decorator/Manifest
+++ b/dev-python/timeout-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz 6178 BLAKE2B dc89ba8c4fb861d3e69322b531a944ce6587800ea1f6d871fd5bd95e69ce4fca74c403cc430adefeda08675972a11e872e2296e14b7d7819c78a46fa08db5fa9 SHA512 2e691d40fcbe55a3d6be81f9744c2a06c436b61a17d701ad0e9df7003e7cf41b6e4876b48d4bd4a5b429ae2139e8f6ef8ae05092b599d80b3b5aa05716bb124e
-EBUILD timeout-decorator-0.5.0.ebuild 644 BLAKE2B a9c29d14a4b0483d482934dd435376cd2fae92e845a21c9e447a9ca1486d627047a15b2bd870435c26d0584c3959002bf653297128fe4ee1c75569fb54e10eda SHA512 a88df61a68c3d7a0de649986547265720361348bef79c2431c822251e56a3a73b933eb78707b9f24c1c323ea4a099d0afd2430998eca17e3cc52fbb74a0fbdf5
+EBUILD timeout-decorator-0.5.0-r1.ebuild 679 BLAKE2B 3e3402286694c7dc5030d801a491abc55127558695aaa6ff6cbf85b151b341f7236c72f46c5b3a5f37413643e859c44f6a76dfdf3d442ef528271db1add9c814 SHA512 02b6c4a3093259f78f7656869ca866a39226ec330d7b1d2c56ff2fab5afa848fa0c64e5a4d7299fce56b2ab9b9507a570cb182a09a010079e2d7fa4e3ff0223d
 MISC metadata.xml 387 BLAKE2B f4ed676c78147180ff8089ef4b36ac54c5faf15f991d9af8221f80e439d230f66630c21e36522635464edc29f23ef1028115151b0f3c41241e4a30dc1d4085e7 SHA512 86970900d9533e98fe8d935eb8fcc47335e3bf3b2c9b4ae4b2168b294acf4436b121f89c8e631e62e70340320a1a7aaba9c2d7502f45bcaf0508abfa44f25f53
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..2921710f8039
--- /dev/null
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+EGIT_COMMIT=9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265
+MY_P=${PN}-${EGIT_COMMIT}
+
+DESCRIPTION="Timeout decorator"
+HOMEPAGE="
+	https://github.com/pnpnpn/timeout-decorator/
+	https://pypi.org/project/timeout-decorator/
+"
+SRC_URI="
+	https://github.com/pnpnpn/timeout-decorator/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
deleted file mode 100644
index 2c52a28d84a3..000000000000
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-EGIT_COMMIT=9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="Timeout decorator"
-HOMEPAGE="
-	https://pypi.org/project/timeout-decorator/
-	https://github.com/pnpnpn/timeout-decorator/"
-SRC_URI="
-	https://github.com/pnpnpn/timeout-decorator/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 5c5089690745..b37ecfcd987f 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,3 +1,3 @@
 DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
-EBUILD tinycss-0.4.ebuild 720 BLAKE2B 778aff15644d2f751d19ef8d1d388c7e9884a7b45c640f5489885cdbbc545d047ac136a2f0f37e393a09f177765c05c3215f859d3bac99b4a51d7c9f0cfc44e7 SHA512 6a75c8c1f161754830219bd68016d98948d2be03e632ac3fd15a3c7733ab3be1f6fa0ed0af8fc7660a82001e88b864c647fb4b7503708442a1fd4685b0b1d8df
-MISC metadata.xml 406 BLAKE2B e6294e550db6947012bb590235a54e6f2ea8aa29a2ab2a8f925b2290751034a4942c363ce98525cb8e611e351f0038f4c9dde87009f74a72df6f14a88a60c05c SHA512 5998bc429a9e919fbd2a2a793485e07a3ebec6bacb716df0d7c013164def4b7363168a874777d019909feb61de3faa71858a71d4da5e7cc972ce8e665e206381
+EBUILD tinycss-0.4-r1.ebuild 787 BLAKE2B 51c67b3ec9506bf7b9aaddc07e258b7a4a15bc577ba3720729947b8c4567c88a583621a8545b05baa53257f14a4b69930124cf056d303018733ff2f72d8721ff SHA512 2637707e7e610903da8473d7be19d8d0e6041a303f37949b422ea248a2877295418ff9ad4f4267d709fba7b493331c363b8121a8ca2deb2eeb71f8db444dfed1
+MISC metadata.xml 401 BLAKE2B 8e7a198b4bc6c7fd387b1f18e2c76ce8bc2c2f6bfdfc15f1ed6e673caf86010cc66c98dbf9dbc7437e37cba5349954e97a12c065a07776e75728c5064d68caaa SHA512 72f1b22602d53dd54fdab707778add59c221e1451062fdcbc1a76a08c43d9db9254a36e8fa91a87045d533864517947790a015ecfcf6f07f9e370ebcd0457fa5
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
index 06d019ec10f4..73f2cab917ec 100644
--- a/dev-python/tinycss/metadata.xml
+++ b/dev-python/tinycss/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">tinycss</remote-id>
-    <remote-id type="github">SimonSapin/tinycss</remote-id>
+    <remote-id type="github">Kozea/tinycss</remote-id>
   </upstream>
   <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/tinycss/tinycss-0.4-r1.ebuild b/dev-python/tinycss/tinycss-0.4-r1.ebuild
new file mode 100644
index 000000000000..fe3fda3233c8
--- /dev/null
+++ b/dev-python/tinycss/tinycss-0.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A complete yet simple CSS parser for Python"
+HOMEPAGE="
+	https://github.com/Kozea/tinycss/
+	https://pypi.org/project/tinycss/
+	https://tinycss.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+DOCS=( CHANGES README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
+	epytest ${PN}/tests/test_*.py
+}
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
deleted file mode 100644
index 0a904322af03..000000000000
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/SimonSapin/tinycss/
-	https://tinycss.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-
-DOCS=( CHANGES README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	export TINYCSS_SKIP_SPEEDUPS_TESTS=1
-	epytest ${PN}/tests/test_*.py
-}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 59e4b194a3c3..4f606a2e2fd8 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,4 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.1.1.gh.tar.gz 28261 BLAKE2B f86b25be62c4c107dd6dca0b9e49605bc0c04b6ec48c4283fa7a5a33249032dcc3a42bdb9910d6235da4c4ddbf581ef8ebdc404c3bb32eeca7f355c0081e6fb7 SHA512 788b57fbadd299a4d4745bcc1814a2ebf6db76e337f2de2637ffc1610a3dac5a70f01bb9ffbb2afbdb0c638a6b23cc1b2f199eebfbb77d84906a9da5dfecada6
-EBUILD tinycss2-1.1.1-r1.ebuild 1055 BLAKE2B c41399aa74da9c6c7aff15c3a372d3feab24e01526a59777c5541c246045dbf104f3a7c3040c82ba4df6414a36b65776b14882130450c7ffd6280d5f0523f232 SHA512 a6b9a13d869ad9e66ddee694660f8207b6a059df059abc4c55c2c7198453fc48cc75a55552e5555dc22a1732e786a7728fa7aeffd803ab7dc0ae8fed50d71ae5
+EBUILD tinycss2-1.1.1-r1.ebuild 1102 BLAKE2B cf3ae12b43a4f1c6e21d3e2e2ded40bc5e056539621b69d9001c2574ad23a11c4a55bcd0ae34e6b6c1e8977a51459e71de61c85438919b7d5e7f14f24c40c0af SHA512 10714a22f87ad4f59d06020a46e5756520b2e84a04dbeb4adf070223e9a5238aeda61c3d7724c645d3a3f3ee06ad20e5a7e465b27f41974560c6919bcfc48d93
 MISC metadata.xml 523 BLAKE2B 1590e6af6e994f20bd2087eb2ad0d9a05736f983a123cf5a7373d0f8e2608dbdd8886fe90fd62d978e0abcdcb9deef30a9cf9622302fc2d3d20a137ce1d4b563 SHA512 04c0ea9aa7b4d9317a262bda5486c1495a7978b44e6c87c1c67a44f7846807c2ba5dae6a55f32c21237adb8d25426746da0b0c63dba6668ea2e0f35223859a6c
diff --git a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild b/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
index 42d1e5013d13..7587d8fb8b54 100644
--- a/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.1-r1.ebuild
@@ -4,28 +4,34 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
 
 DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/Kozea/tinycss2/
-	https://pypi.org/project/tinycss2/"
+HOMEPAGE="
+	https://www.courtbouillon.org/tinycss2
+	https://github.com/Kozea/tinycss2/
+	https://pypi.org/project/tinycss2/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="
 	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
 	test? (
 		https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
 			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
-	)"
+	)
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
-RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/webencodings-0.4[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index 19afa3af971f..0d19fdf84d05 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,7 +1,3 @@
-DIST tldextract-3.2.0.tar.gz 103653 BLAKE2B 74b85da2e5a8c953075636f908bd32ba825c53fbea145a691cb681596376318b63729e2c6b7291f1ef21a55fa927d48e31cf0db241bb94be47f706fb68239515 SHA512 4e0731792793eb0a6d0da8387d15e8b9de17f20108361230703fd9f66f2aaad6260073b611e27135e571b1899844b271f3dae4e77122186cc78fbb05f3b3f237
-DIST tldextract-3.2.1.tar.gz 104364 BLAKE2B 6bd16ad4af4b3d7f92286f09ff265ba83f3661aa17976688e741bc3d8a2c386f695edff85f15f94fe203420cf44e5ce76ff8cfb047c3eeec1b6a8056b4a48cd1 SHA512 545013f5f25ea2e207e8dc65caeef3999f0f3a5abdaad09f5a599dc25a9344c9fde9a816785a20df8a137c082e37329f3984fdf6a80789d5976c0bef244d9095
 DIST tldextract-3.3.0.tar.gz 110388 BLAKE2B 4f60f35de9bf774b3cbf9a67e17a5724197521b1ff1ec072fe4487608165c265ba6de736140e8677eca47229fc68d6c634ba1013a5bee294e7e1990925703938 SHA512 530e8592c2813c297355cdea591a772fad3e4cdcfccf72844c49ad68ab1acd57e6050828f78fe3bbfb9d54d62f33c63fec70dfb81d9955abf971703f53daa326
-EBUILD tldextract-3.2.0.ebuild 802 BLAKE2B 8491f4cbad91fcd225ea5c3165281e00b81b281608a058c86809f48613a59c278ce79122bb2e25255bb5044fb3b5b33dcfd65678d06dedc50880f01a67004862 SHA512 6293156ffb7b880fa379edb0860cce5d51c2d29372726c41ab38070b581a416a41a292732f751470b36ccad67ef6a26d0d0ecc03ab3aed0a4bbf21954a436d36
-EBUILD tldextract-3.2.1.ebuild 803 BLAKE2B f7dcf8234d9ba6fcfa8d177635c555bbd2a2095ebd645d5ca9cb15f5ff6d8bc86d02623a2bb1d95acbefa51bac665341d62e84957f047000c7a412ecfb15e22f SHA512 c311e1c94bd2189a456c920e03a3cc1dd3495c4e63be9dbff607e0aad4f2ff94bb5f8467aa13947ba3c3fa846f5423315c96c7876b9989a226bfad9fbf0c4187
-EBUILD tldextract-3.3.0.ebuild 803 BLAKE2B f7dcf8234d9ba6fcfa8d177635c555bbd2a2095ebd645d5ca9cb15f5ff6d8bc86d02623a2bb1d95acbefa51bac665341d62e84957f047000c7a412ecfb15e22f SHA512 c311e1c94bd2189a456c920e03a3cc1dd3495c4e63be9dbff607e0aad4f2ff94bb5f8467aa13947ba3c3fa846f5423315c96c7876b9989a226bfad9fbf0c4187
+EBUILD tldextract-3.3.0.ebuild 802 BLAKE2B 6d7fa552d193ee908dfd772a52d520f48e321b22598a95e72528a38323807a7e8a843fc41c352ebfff7831fa5a47b89e8d4e93628efef1ce8da47eddff794551 SHA512 a8b488ddd8468259464c428c5468d83eae68dda9590994c494fe0a6ad0a8587d2724c86c937052e62c6df4dc87978f131d7f121c73f11d810d5e3fcaf0cd5466
 MISC metadata.xml 560 BLAKE2B 4d6e6aa7507ce4734371e8b8442e8d4840db0d2896f7e7430438bc9b700edf6c8546fc3beb1e17d489013b6cc49d1daf805581d6fda29f51109e7a643b0e8965 SHA512 4e7ed8a1876afc62954ee58937557182099ea2289633d2d279a2982bb32a8de261163f0b83ba44c257b8c087c007b1bb462ecad69df1115a024a3a9c8ea1fe9e
diff --git a/dev-python/tldextract/tldextract-3.2.0.ebuild b/dev-python/tldextract/tldextract-3.2.0.ebuild
deleted file mode 100644
index 07a0d69c5bdb..000000000000
--- a/dev-python/tldextract/tldextract-3.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.2.1.ebuild b/dev-python/tldextract/tldextract-3.2.1.ebuild
deleted file mode 100644
index ef7d2500fe3e..000000000000
--- a/dev-python/tldextract/tldextract-3.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="https://pypi.org/project/tldextract/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-file[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tldextract/tldextract-3.3.0.ebuild b/dev-python/tldextract/tldextract-3.3.0.ebuild
index ef7d2500fe3e..feb404aac8d8 100644
--- a/dev-python/tldextract/tldextract-3.3.0.ebuild
+++ b/dev-python/tldextract/tldextract-3.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
new file mode 100644
index 000000000000..e9ecc06b743e
--- /dev/null
+++ b/dev-python/tlsh/Manifest
@@ -0,0 +1,4 @@
+AUX tlsh-4.8.2-setup-sources.patch 1029 BLAKE2B 6b1a252693940df0856361aa38553a6a684566c4ab80ac4e01b7151a611b5d27bd9065c5560e958931108399b9b860405ab4119615f8f6ab6f8d05e8ce2f4c89 SHA512 04fce865f3a7e73a9a6814596255f86eb1d24086372479ed993b7faa362973808d2d45f4d81506c1bf87bfc534caa410a0c8758250ccb3fa4337c0952610be5e
+DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
+EBUILD tlsh-4.8.2.ebuild 791 BLAKE2B 10bfc9448a9641bfe125ec08161b51159117c48c279ac65134e920a3f01ea09efbbecd04fabeca919ec60c38a5390235732b6f69580987e06b9fd2292b0ad048 SHA512 aa962f6b2850cc64bdc6477dea1b9a06331116c75a7d97c0224934438ddb776c4bb68d3580680a581f9c188e042b764e65fbdd03cf2bd66aef99b25834de8f45
+MISC metadata.xml 520 BLAKE2B 97d64e94859345f4537e1a95dac94190cf54cf608cc851a8cdf24f5f4b71c0821c778d24f99fb076ed08247a085270d4c36aaa66583916c0a420733b7b8543be SHA512 95dc94ca2c08d71246453ccee139901e675ec84b2c4af224b90057270f4bf5494ffb761e2d3b4dff25cfcac47185d4f7d2f4b3080182f8c9526b746e99519211
diff --git a/dev-python/tlsh/files/tlsh-4.8.2-setup-sources.patch b/dev-python/tlsh/files/tlsh-4.8.2-setup-sources.patch
new file mode 100644
index 000000000000..4cdb0f864b5b
--- /dev/null
+++ b/dev-python/tlsh/files/tlsh-4.8.2-setup-sources.patch
@@ -0,0 +1,30 @@
+--- a/setup.py
++++ b/setup.py
+@@ -21,26 +21,7 @@ with open(join(realpath('..'), 'CMakeLists.txt'), 'r') as f:
+     if m:
+       tlsh_3b = ''
+ 
+-if os.name == 'nt':
+-  tlsh_module = Extension('tlsh', \
+-    sources = ['tlshmodule.cpp', \
+-      join(realpath('..'), 'src', 'tlsh.cpp'), \
+-      join(realpath('..'), 'src', 'tlsh_impl.cpp'), \
+-      join(realpath('..'), 'src', 'tlsh_util.cpp') \
+-    ], \
+-    include_dirs = [join(realpath('..'), 'include'),
+-                    join(realpath('..'), 'Windows')],\
+-    define_macros = [('WINDOWS', None),], \
+-  )
+-else:
+-  tlsh_module = Extension('tlsh', \
+-    sources = ['tlshmodule.cpp', \
+-      join(realpath('..'), 'src', 'tlsh.cpp'), \
+-      join(realpath('..'), 'src', 'tlsh_impl.cpp'), \
+-      join(realpath('..'), 'src', 'tlsh_util.cpp') \
+-    ], \
+-    include_dirs = [join(realpath('..'), 'include')],
+-  )
++tlsh_module = Extension('tlsh', sources=['tlshmodule.cpp'], libraries=['tlsh'])
+ 
+ if tlsh_256 != '':
+   tlsh_module.extra_compile_args.append(tlsh_256)
diff --git a/dev-python/tlsh/metadata.xml b/dev-python/tlsh/metadata.xml
new file mode 100644
index 000000000000..1bb03887e81b
--- /dev/null
+++ b/dev-python/tlsh/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>t@laumann.xyz</email>
+		<name>Thomas Bracht Laumann Jespersen</name>
+	</maintainer>
+	<maintainer type="person" proxied="proxy">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">trendmicro/tlsh</remote-id>
+		<remote-id type="pypi">python-tlsh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
new file mode 100644
index 000000000000..a9f0bf677081
--- /dev/null
+++ b/dev-python/tlsh/tlsh-4.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Fuzzy matching library - C++ extension for Python"
+HOMEPAGE="https://pypi.org/project/python-tlsh/"
+SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P}/py_ext
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="dev-libs/tlsh"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-sources.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i -e 's:#include "tlsh.h":#include <tlsh/tlsh.h>:' tlshmodule.cpp || die
+}
+
+python_test() {
+	"${EPYTHON}" test.py test.py test.py &> /dev/null || die
+}
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index 72880c319c2d..d13471784628 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,5 +1,4 @@
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.2-r1.ebuild 1095 BLAKE2B 7a8a2b12555aa358b6d2d3ee161532accafb036562bd72b596d9ccd4fedf710fabedc2e931ade256e76dc2cd3c42378f46aeaa7ccd81cdd8cd32b91145847db9 SHA512 d78095161078e63d18f218836845aef38e8eb0c3eb08e13ce03a86c2e30b6f299bf40503787bd69b47466f60e5e85ab68e7856481f007bebcf35589da3bf255b
-EBUILD toml-0.10.2.ebuild 1080 BLAKE2B 7356eeb13d8cf80f82d2ade781d99a6243e60661150b50006b47b85822c761790ab4e2c9c4ba3a500fd137cbc432fc17053f38efcdce66b55d8ed8fd57ef1b4d SHA512 7aef770ef12ecabe9ee703b14aecd44c6e82c82d339447c53b8b32907b6d87ef2fc9bd7d21dcd5f69eafce47aa04038fe3c05648e7c2b9baf0f21634bb740cae
+EBUILD toml-0.10.2-r1.ebuild 1087 BLAKE2B aeafc898c91e55f69adc7d8bbc471a17be1183eab54d73dadcd53071f50124847f98aa52ed392efafe89d95f72aea11e29aa21027ac7ccbc8a603dee70bb93ad SHA512 ce96b18f852ee408d94186eaadc795ba793aa9ce5d583d1ee8740e890cc0ab0279c94f1ad3003a00ac0a3d0e1cc3c824ded1fbdf24837d771077b179aa11220b
 MISC metadata.xml 381 BLAKE2B 2f26693e1f2db544e88e909a23330671d311aec78a8cadc2b53808dd1d639ddb806d1a5e05ca68c93f70d4a8e49a7797fc1c7dd81914b323a4399583cc461f3a SHA512 002007822c8760366eb26599d01e37070904bc4557b218f1bf35774350422f300334dc1d40945adeaa97b4f5ba97ef762ec0717a7b311fb24215782df149b880
diff --git a/dev-python/toml/toml-0.10.2-r1.ebuild b/dev-python/toml/toml-0.10.2-r1.ebuild
index 3485279561e4..b57cbf0c63d0 100644
--- a/dev-python/toml/toml-0.10.2-r1.ebuild
+++ b/dev-python/toml/toml-0.10.2-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
deleted file mode 100644
index c9dad0c3e918..000000000000
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{7..9})
-	)"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index 43d80bbb58b4..a4043bb5aa8b 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -3,5 +3,6 @@ DIST tomli-1.2.3.gh.tar.gz 123142 BLAKE2B e8af1618aa962d7ff56d319c3a789c7655d9cb
 DIST tomli-2.0.1-py3-none-any.whl.zip 12757 BLAKE2B 0a33773bc0409831aec6ee803ef0ef9d6b6b441213d549184068e218b73d6178d617bc2b58d11db98f0e6284baaf81663723fbc6eb89f7466608f0d89aeb1982 SHA512 b6164b03d3db360093f92e644e87a37a0ce20d63d7e9e271fcafd727f4fdb73ad6b301aaf32b3d2839f6eedbc8ea499dafba7335b8fdfc4667e30ed50c9805b4
 DIST tomli-2.0.1.gh.tar.gz 133685 BLAKE2B 0d3a1f4ee4e74eeab6a7e7c3d5e866ce1baf9017136cdc8ce1f6275f8d6d151239e5a00b97b6409872fac0e8558a49120adf16f0ae21f9d92ae630dfd39cd6ff SHA512 a467f8d48cdbd7213bd9b6f85fd48ba142ab7c9656c40bb30785e1c4b37a9e29eaed420f183458ad20112baee8413ebbec87755332795c8f02235d1018c3aa5c
 EBUILD tomli-1.2.3.ebuild 976 BLAKE2B 6089f88bf9143bf531836df76bcb6a9202d2be4122474c252882d805617e9fc87de0e755e7200aa3ce362addccd4ce1f2ec263e58505c3bacd26840e603a297f SHA512 7317aeaddea22a988f790a9ed7db914867a0343c0e1e081b4ecf7a32d719b795026a34dfa6ada1f17f4a9fd0980e2128151a91e907525f25a603f31e55344ae7
+EBUILD tomli-2.0.1-r1.ebuild 872 BLAKE2B 0fb60a44c1ed2331f2d9b45cb95227abfd13cc5ba78e9036d068862355312d8ec3596b2b3d3bd1d87f3f59cd4fe88d987b21207b736221297ce993e8e8ebcd1a SHA512 e37e319fce47a9083d334df886b70e28a9e55b7f901b4c09f2bf2d32fc910cb9fb9f6770edff621d72e88ec66a85112119fad636313ded779c68d44621c43463
 EBUILD tomli-2.0.1.ebuild 986 BLAKE2B da93f0ce9f160ebd1834a7bb70633494e05cd32673467b06f25da2709bbb9707b7aa6cd5aff64319eed84c9eb20e559a3868786186f52861c2c4ab5dfbd18ca3 SHA512 18f205520c77e430942577c193b00766c412420ebd748582d51fb89c81736d330810deebfddfd6f848db6a7cbf26e73a475c6d65e45d5fe878d3b9daadae0601
 MISC metadata.xml 363 BLAKE2B 2c80a2c2a8959a93e392da0e03303ffdae0a3291624c284f91d747d13983cbc188d8a64f8763ea484f792d5a42e355381034f69fa0acde382779e4ae53ac2154 SHA512 42e8d4b4d1ec773b53e8e119ce6afb74acd64de998c372c6f6ab64f70713dd825420d1e1af83b5f647dc03a917b1904d65f0cd06cbddea47a33a558be2c89562
diff --git a/dev-python/tomli/tomli-2.0.1-r1.ebuild b/dev-python/tomli/tomli-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..338d877a350d
--- /dev/null
+++ b/dev-python/tomli/tomli-2.0.1-r1.ebuild
@@ -0,0 +1,36 @@
+# 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
+EAPI=7
+
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A lil' TOML parser"
+HOMEPAGE="
+	https://pypi.org/project/tomli/
+	https://github.com/hukkin/tomli/
+"
+SRC_URI="
+	https://github.com/hukkin/tomli/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl
+		-> ${P}-py3-none-any.whl.zip
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	python_domodule src/tomli "${WORKDIR}"/*.dist-info
+}
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 6a2a597ee972..b627808f1db8 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,3 +1,3 @@
-DIST tomlkit-0.10.2.tar.gz 184537 BLAKE2B ab912e1c45d641e7c57f1121a6281ed0609c3ddf18c55eb887a67ac8a4df669a3e958e769a07f7ad456c80713337af4b892d4bb73671ce12e4b2fc4d09af0734 SHA512 e1d5353659f9a0f4ba2f6a0b82980f0b50b012e3b299c2c6b12aa8a63fc4772649bdc2b5a755c21acc46fe2d226241918fb09a4202cca596b6e9633be95e79d8
-EBUILD tomlkit-0.10.2.ebuild 819 BLAKE2B b6edad59101ca0aaf277192dfcd7f6437f07e8cc200481d77580aa9a8a45754ee42b827916f55f9539e1968af615b33f9635ae808324f99d1117968a109de2b2 SHA512 af4f05b4d651cb485f9913f19d38cb57bb498cd28d74535df959e5734dd6176677b7b83f6e73eed6ae1c8bfb23fc6616344a1f46bae4deb08ad06b02fa55016f
+DIST tomlkit-0.11.0.tar.gz 185695 BLAKE2B cd2a22afb8ea445e39567cdc65f636d8d9f2aef07575a2dd989c19abf1a6f7baf2e9adb78003576af9cdefebe4e8c6031efdabcc9487e10770565589a67b0c86 SHA512 2e89748140cfdae217ac3ac999f0b718414d28218d61fb5219adc503ede2ea1f4003be9ef4453f189b0ee86df463c59520244b9fd26553bd4d8047674cba61c9
+EBUILD tomlkit-0.11.0.ebuild 810 BLAKE2B 37d3168a8b555cc7e4b3116e05dd9f9d554dee22322e0796cd379ceb1f39d7f09036fbee267e82f318da1bc3e5940ebe9e9edbb30fc42265c7c1953ecffc853c SHA512 726e6c2b38ca8d736a1a9fd093092d691d0d750f593be44cc7d79b58873d80c1dbf52e9f85c61413681306581df8abcb79d6c1ed49abca31a0a42f15c56f4490
 MISC metadata.xml 525 BLAKE2B 663169c851817eb7368c49d678119f1f2dfebe642325d3dbc59498f60b452710a257ca5cd5173a4fc8391d33038cce079b3fba112ad7e9c0caf0c1872ee43f13 SHA512 5a6cf412fc06854557d001ae4a6f654b36d351c8c0b4bc08c1a7c40f49d8dceba931598f5eed6c75e1d7797570fcf8fb7799f5f035931f80d05b1e9bd0d258c0
diff --git a/dev-python/tomlkit/tomlkit-0.10.2.ebuild b/dev-python/tomlkit/tomlkit-0.10.2.ebuild
deleted file mode 100644
index efdc6369cdae..000000000000
--- a/dev-python/tomlkit/tomlkit-0.10.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	# use setup.py to avoid circular dep with poetry-core
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["setuptools", "wheel"]
-		build-backend = "setuptools.build_meta"
-	EOF
-}
diff --git a/dev-python/tomlkit/tomlkit-0.11.0.ebuild b/dev-python/tomlkit/tomlkit-0.11.0.ebuild
new file mode 100644
index 000000000000..ae58bab0c59b
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.11.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 1ede7b4cde97..511b09d0cd66 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,3 @@
 DIST toolz-0.11.2.tar.gz 65928 BLAKE2B 3a2baddae437272e8f3efb665b63df127b3ec6bc2a68f3381651a1a3a3b45e4de6e575a328306fac95e9261228ee91193effd4aeca8d115f1608cb2561d50f13 SHA512 67e8aaea3f9fb8811027f19aa9cf56ab980e4f9cea43978ed9515662c78a7bea12314054b2c26da483b055382d4b080125c011fc43bc48b0965a6ff8415f7168
-EBUILD toolz-0.11.2.ebuild 537 BLAKE2B fea45c072b52b5518af6b57699a5785b6907501a15d9e1c6e134db1fd87d35ce2448acee7c443eb91f2bde493811cfba5c136e86d30ad153f05455315548cd7b SHA512 74b612e47928f964258e03b4acfe7157638a06c3a32d88fbeaec8cf206e4be3e7bf05731feb837a6c26ae8ac32c010e872f312860ad28ac708b493e20b0ea0d0
+EBUILD toolz-0.11.2-r1.ebuild 516 BLAKE2B 6edf754fc8464671be8cc7d9a11ad178ce4f96eb6679f026d51de8fe587b27a400dc7bf28d8a0f53b5bfe2f2d6defb1c16461896370a40a1933fa2289d68d09e SHA512 eec8fe965902bd8d44afcf13effbefb005aa9d2c7012663ef42464a98bacfebcf8ae2fb63cc6e2d3b55d15996bb1dacd141b50781e9f3b6456279e313eae08aa
 MISC metadata.xml 333 BLAKE2B eb9425478d9c8d007d609994b4cb8eb6b6a71dc4ba5f6c25252575a9eb43a8415457e4d51051a65bf1d5a4cfd638a1467258849da0314d5ec54ee3c7e4a7b331 SHA512 9e29b105592f2c423ac284af853060343d60f491f9e468a44859ba2fe491db835fb3fe18ffe74b3135b56b015234c37e824ca6953e56db1cb5c811409f730bc5
diff --git a/dev-python/toolz/toolz-0.11.2-r1.ebuild b/dev-python/toolz/toolz-0.11.2-r1.ebuild
new file mode 100644
index 000000000000..1f4e04582f0f
--- /dev/null
+++ b/dev-python/toolz/toolz-0.11.2-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.11.2.ebuild b/dev-python/toolz/toolz-0.11.2.ebuild
deleted file mode 100644
index fe5b9691cdad..000000000000
--- a/dev-python/toolz/toolz-0.11.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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="List processing tools and functional utilities"
-HOMEPAGE="https://pypi.org/project/toolz/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/toposort/Manifest b/dev-python/toposort/Manifest
index fdf53b430ce5..e254dc9166d9 100644
--- a/dev-python/toposort/Manifest
+++ b/dev-python/toposort/Manifest
@@ -1,3 +1,3 @@
 DIST toposort-1.7.tar.gz 10671 BLAKE2B 89da22e803c334cec77d5ac8ad6a9ab8013f7516555c2822bd6d511edf28230c85c2eaeabad3dc4a24a58ae3ce3850d407ad957d0e28491574557140a286843a SHA512 a585d1c103b2162fa3f37f6b0ef60a8709f08d9543d7fab619af3718bf9f752a293e50061d370fd08872b2d8a8db504cb9d9c1cce5446885b46fe8e833813833
-EBUILD toposort-1.7.ebuild 521 BLAKE2B 4d6875baf0dc19305bab782173d709fb144efc181bacc452bb6ae45ae78513ba088e75e05a2854bce4089b0a16851b6c342a5edbbd96e30a7857294d708d18af SHA512 b0e5dd3058eaf010a22d2337ad1c9a9fc3169e1410e5e207e0511864524e3b07ea08387d8ed666f338be4eb6650b59275785f52b78ffe2bc594941fc7c8fbc71
+EBUILD toposort-1.7-r1.ebuild 508 BLAKE2B f68c0a9713b45f374f4582aef04c1bc60705738a83bf653f052614b611c04aa4d1ddac45086e29281b62823f0afd080dfee17e68998798c9cb256991e5052cbe SHA512 5ad562f9231d4441fc85c3fbc67f80de4d76d6c3ceea02df72ab5d1544f3efa3fdd1ea8b2c417d78769bc6acf890a7a644fb134039564f60d20df509a76d8261
 MISC metadata.xml 552 BLAKE2B db94a324a1d469b39cab84355fed6b2f2b76e3e74deb7704d7c2628bfcb280a1e45f3f148de790fe955a238992cdf21c371eded3dadae8499fb7b481e05960a6 SHA512 3e717a075efacf2f6c6e80d8d857f3efb30ddffa856f06fe83581673951f14d662e52e69a868f91daaa3b84f639a97c909eddbd984b8f2a66b0120aa377a001d
diff --git a/dev-python/toposort/toposort-1.7-r1.ebuild b/dev-python/toposort/toposort-1.7-r1.ebuild
new file mode 100644
index 000000000000..8ef124f887c2
--- /dev/null
+++ b/dev-python/toposort/toposort-1.7-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements a topological sort algorithm"
+HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" test/test_toposort.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/toposort/toposort-1.7.ebuild b/dev-python/toposort/toposort-1.7.ebuild
deleted file mode 100644
index 3002de7baf9a..000000000000
--- a/dev-python/toposort/toposort-1.7.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
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements a topological sort algorithm"
-HOMEPAGE="https://gitlab.com/ericvsmith/toposort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${EPYTHON}" test/test_toposort.py || die
-}
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index ce10e9d8b816..f8e43fd26043 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-21.9.0.gh.tar.gz 32161 BLAKE2B 9160feb1d7fa8b70350a266b91f0ebca81287ac2c25d1a586cc4db6dc64d55534e39a75aba3407fdccff83fca336cb559d21604299ecb2c01aa168e8fa75fcb2 SHA512 d58e5c9f916144085bf24fd2062bee24a1a577e283350f81bdfcd42b797fcefeece6988659b75ddc8b0701ff40a070628a548f0d4fbfb9d7c5a8c8f9cfdd29a3
-EBUILD towncrier-21.9.0.ebuild 975 BLAKE2B f38a6277a50d368a0efdf12bedd241c35076d7ac6c4162eb3d20fb0646f7e340f850d0daf26329a8a8cd01763c441c714af1cdedfd0832aeeae76ae8ac256db6 SHA512 1062dbae8cc6e62db2848afcad7e0cb2b7a420eb8afaad499a8ceef6eec654eda9087c93fa6d355ac9ef7ce565a2f325e5b6d8a226c8b6799cc556ec2243ddc6
+EBUILD towncrier-21.9.0.ebuild 975 BLAKE2B 9ae322e671cfb556069bafe9c4510033b100ba8e4727f2c80dada82fa7458d4a1d1cf9f311bc06ae82121334a0d93c79cafa7cbbb7f690be4de088d47e1d0f6c SHA512 f8aff4dd5b4dcb846a7b02eea099517473e9283167db92e0ab46dac07938edae00639cc12f5f872868d37eb8aa57e9611218eb41eafec7c3b8bd8a231d2caa4a
 MISC metadata.xml 394 BLAKE2B 52e7e94b46ca173b3bcb91b6a5733304c367783f45fb60beaf775a35cfbd3e1f3a7558de3c79fa96681b684998c9a9d51ba064839824f8e35ff7d86e32dcd477 SHA512 23aa7a3a20c418e6a6b06502cfc2c6a8c8a0556118a6c4a995ea3c95e49c6ef31ec8daf6ad66e69471f1e7eaba1607b8bd0a0950c70efdd735d2141be852fee3
diff --git a/dev-python/towncrier/towncrier-21.9.0.ebuild b/dev-python/towncrier/towncrier-21.9.0.ebuild
index 42e362f4efc2..9ed09581b725 100644
--- a/dev-python/towncrier/towncrier-21.9.0.ebuild
+++ b/dev-python/towncrier/towncrier-21.9.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Building newsfiles for your project"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 140d2f97b4d8..c638bd3ffd2d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,3 @@
-DIST tox-3.24.5.tar.gz 306305 BLAKE2B a6d3338d21068d9123505a29da3beec4fd5a15c263bcaf5ba62f65a253d04e11d453bef159d06e88b2cbac9a895d786d0d9444cc16cd3de7a868eac6919b82ea SHA512 4e1ef81c978977e905edbdc00ff971eb4132b9009ce21456fcebf95d8ee2c583e04e464f1db5ca6e5454f4f1ad0353ffc9df7898f6389fe8084dc5b9726ca59b
 DIST tox-3.25.0.tar.gz 307073 BLAKE2B 2dda34fc6d6518897bdc587ca6a31b92f2add463c3bcce9df3f4e511d2588dc75265b60809195c2d78a9c1b0d08d79c32811aab1e2c01934faf40019a1882042 SHA512 9c10524c5a67b32a01cb0dd4d25cc01d0641e46ca4e0c03a4c76eb8913f6038075aeb21e647a94d6b8d99c80edb7701b1c62893ebd6a20584121fdf33b9d9010
-EBUILD tox-3.24.5.ebuild 2135 BLAKE2B a84e8f10804ae79620b42d7c41a9653234e84a4713dde8d298326f6c728e86e9d541c9561b8888ea00b3af411c186abc735fabef2980e9a3fd515aef20a6fa82 SHA512 7938df52c3d4f4b20b05db6ee4c585d3d5bfb5f946a3fda7e02e134d259e937c0a00dd78d1636cab5abdf23ebe855fe9160af8b47055e2bfbd4d6e80b6a42991
-EBUILD tox-3.25.0.ebuild 2192 BLAKE2B 4f1ad22c5cb015e59eda3047c751a7780d3935b271f2c68c9810008ab4e6722a700df4611029f76ecae10dd97c5b06528a4627ec02df9220ea6381a3d7dcbf75 SHA512 e817ad9c8eac18eded5ad4c4b44bbe195767ab7ab3c19f509636a808ba1fc182cd3be1904e8e88adf1f336f9ef1c0db747f8100306bd2a77292af8addd6fb171
+EBUILD tox-3.25.0.ebuild 2184 BLAKE2B 4e0f8e9386fd2cdfa09d0e2f506fde89b2e0aa3fd12f9fd787478eaf8a45c3570e6c5da73b546d18744e5b3231cb8be96dfb29ecb93bdca26257cbe70757f95c SHA512 0529e0b5ce6819e82e2c4733234ab9a459449843e45d3296a3e0836bd795f279aa8bf109a65b7a673f9370b6b312b42247ab6fab886e8e225ea218e89e7849bc
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-3.24.5.ebuild b/dev-python/tox/tox-3.24.5.ebuild
deleted file mode 100644
index d7b3ac765449..000000000000
--- a/dev-python/tox/tox-3.24.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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="virtualenv-based automation of test activities"
-HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-# doc disabled because of missing deps in tree
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/py[${PYTHON_USEDEP}]
-	>=dev-python/six-1.14[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
-# TODO: figure out how to make tests work without the package being
-# installed first.
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# broken without Internet
-		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
-		tests/integration/test_provision_int.py::test_provision_interrupt_child
-
-		# expects python2 to exist
-		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
-
-		# fragile and relies on checking stdout
-		tests/unit/util/test_spinner.py::test_spinner_progress
-	)
-
-	[[ ${EPYTHON} != pypy3 ]] && EPYTEST_DESELECT+=(
-		# TODO?
-		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
-
-		# broken without tox installed first
-		# TODO: why it can't import itself?
-		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
-	)
-
-	distutils_install_for_testing --via-venv
-	epytest --no-network
-}
diff --git a/dev-python/tox/tox-3.25.0.ebuild b/dev-python/tox/tox-3.25.0.ebuild
index 71dda6586496..469205b08b07 100644
--- a/dev-python/tox/tox-3.25.0.ebuild
+++ b/dev-python/tox/tox-3.25.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tpm2-pytss/Manifest b/dev-python/tpm2-pytss/Manifest
index c748037fba57..7d7dfcb6c198 100644
--- a/dev-python/tpm2-pytss/Manifest
+++ b/dev-python/tpm2-pytss/Manifest
@@ -1,3 +1,4 @@
+AUX tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch 9788 BLAKE2B aa0d9ec46a92aaaa1a26ccd632ad6fae17386f31f36cd411110632507c09622f8e4fff390b787d8b33af4cbffc18b298e2829565408d14fa54deedab227688df SHA512 913170a4bafc4c059d4ea6c3d855ad2c1a10a70dfc780e493964913c26156a6f08be969b219061d8e93341279641d38aac71ddeaddaea7c341e09e30823dc4fb
 DIST tpm2-pytss-1.1.0.tar.gz 162559 BLAKE2B 2c9b34c323b96b3a8ded82a04accac9647d7f0b1cf05d269ed4bdf225d785fd8454dee82f054a5085f9d49d0feabacc8c5b72a7ee8af7bc9da8473d5689501b5 SHA512 71da9e005a3f645c0528a96bb96bafde9c262c5778646a19841af6323edaf889ede7267317ea96b7d44c7901d7bea04ca15fd1b5c86d61d33e49b34f5d0e2e94
-EBUILD tpm2-pytss-1.1.0.ebuild 1050 BLAKE2B 0ee3ab2564cebf3b856de8dc6c9df1c37c23bc5c82bc1e82d0cad1cfda7cbebaf47ca800ee5b50d4e2d5298012a5fc11b488c308e0ad7af5cb92bc320bb9ac0f SHA512 6f46a149ffadb7bdb5585c8ac83f5dc1c4a05a6756fc011a5b5be67a0c095b42564ae3c5661fdbc452096d6130f60e5174828df929ea310d0d836988d25549c2
+EBUILD tpm2-pytss-1.1.0.ebuild 989 BLAKE2B 336eb07b9c14a7395a978619c12044e59d98e3fe6ec5d3cc0cad53d8b2c88fd8a3652510437d80bd747bf335b0bf33d83aabfc55f8a785f33744c7d333d22a1f SHA512 5ecf1883c8b19953445d5da4da4e971cae8caead8356e6b6a1251143dc8ca3cf6547f4785a703e2e80f0652032a9bd08bda1a8a8ef98311c09f38f349c77797c
 MISC metadata.xml 511 BLAKE2B b59b0da52736f7042c9357f3422cd0d3181d0dbea315b4ebdedf038c6e7c367a402a9ef4deac20940c6126977d756f6557fa5a8b2f8f4bc95b40a7510e8ea19c SHA512 6d7659472f076746cd4edae6a5413f4e34b4996ae0ac3af345ed720aabfeb991895b8dbc3f24160017bbf2633c77d8721507c14604c4cce9a8d407bf699ce635
diff --git a/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch b/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
new file mode 100644
index 000000000000..6e6342cac5b6
--- /dev/null
+++ b/dev-python/tpm2-pytss/files/tpm2-pytss-1.1.0-src-move-package-under-src-directory.patch
@@ -0,0 +1,239 @@
+From a03b66dd73a2ff58ebf847864102585aa3d11af7 Mon Sep 17 00:00:00 2001
+From: William Roberts <william.c.roberts@intel.com>
+Date: Wed, 11 May 2022 17:07:53 -0500
+Subject: [PATCH] src: move package under src directory
+
+Issue #341 reports that building a wheel and running the tests fails. I
+was able to reproduce this behavior with the following commands:
+
+python3 -Bm build -w --no-isolation
+python3 -m installer --destdir=installation dist/*.whl
+export PYTHONPATH="/home/wcrobert/tmp/installation/usr/lib/python3.8/site-packages"
+pytest test/test_types.py
+
+Note:
+  - Current Working Directory is the repo clone, so tpm2-pytss
+  - The export command may need to be updated for your specific version
+    of python.
+
+It fails with:
+ImportError while importing test module '/home/wcrobert/workspace/tpm2-pytss/test/test_types.py'.
+<snip>
+E   ModuleNotFoundError: No module named 'tpm2_pytss._libtpm2_pytss'
+
+However, this issue is a red herring. This really has to do with the
+fact that the relative import in the test code tries to resolve to
+non-built package in that directory rather then the built one on
+PYTHONPATH.
+
+Proposed solutions to use full package names also don't work, becuase it
+has to resolve to the built package and it will still attempt to resolve
+the non-built package. The least finicky solution to fix this, was to
+match what bcrypt was doing and move it under a src directory so it
+forces the resolution to not occur on that directory and inplace (pip
+install -e .) installations still work as well.
+
+Fixes: #341
+
+Signed-off-by: William Roberts <william.c.roberts@intel.com>
+---
+ .gitignore                                           | 4 ++--
+ MANIFEST.in                                          | 8 ++++----
+ scripts/prepare_headers.py                           | 2 +-
+ setup.cfg                                            | 6 ++++--
+ setup.py                                             | 8 +++++---
+ {tpm2_pytss => src/tpm2_pytss}/ESAPI.py              | 0
+ {tpm2_pytss => src/tpm2_pytss}/FAPI.py               | 0
+ {tpm2_pytss => src/tpm2_pytss}/TCTI.py               | 0
+ {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py            | 0
+ {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py     | 0
+ {tpm2_pytss => src/tpm2_pytss}/__init__.py           | 0
+ {tpm2_pytss => src/tpm2_pytss}/callbacks.py          | 0
+ {tpm2_pytss => src/tpm2_pytss}/constants.py          | 0
+ {tpm2_pytss => src/tpm2_pytss}/encoding.py           | 0
+ {tpm2_pytss => src/tpm2_pytss}/fapi_info.py          | 0
+ src/tpm2_pytss/internal/__init__.py                  | 0
+ {tpm2_pytss => src/tpm2_pytss}/internal/constants.py | 0
+ {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py    | 0
+ {tpm2_pytss => src/tpm2_pytss}/internal/templates.py | 0
+ {tpm2_pytss => src/tpm2_pytss}/internal/utils.py     | 0
+ {tpm2_pytss => src/tpm2_pytss}/tsskey.py             | 0
+ {tpm2_pytss => src/tpm2_pytss}/types.py              | 0
+ {tpm2_pytss => src/tpm2_pytss}/utils.py              | 0
+ 23 files changed, 16 insertions(+), 12 deletions(-)
+ rename {tpm2_pytss => src/tpm2_pytss}/ESAPI.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/FAPI.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/TCTI.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/TCTILdr.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/TSS2_Exception.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/__init__.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/callbacks.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/constants.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/encoding.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/fapi_info.py (100%)
+ create mode 100644 src/tpm2_pytss/internal/__init__.py
+ rename {tpm2_pytss => src/tpm2_pytss}/internal/constants.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/internal/crypto.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/internal/templates.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/internal/utils.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/tsskey.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/types.py (100%)
+ rename {tpm2_pytss => src/tpm2_pytss}/utils.py (100%)
+
+diff --git a/.gitignore b/.gitignore
+index 07e277e..396cfdb 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -40,5 +40,5 @@ public/
+ *.rej
+ htmlcov
+ /.pytest_cache/
+-tpm2_pytss/internal/type_mapping.py
+-tpm2_pytss/internal/versions.py
++src/tpm2_pytss/internal/type_mapping.py
++src/tpm2_pytss/internal/versions.py
+diff --git a/MANIFEST.in b/MANIFEST.in
+index 6bc43ab..7bbc96a 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -1,8 +1,8 @@
+ include README.md
+ include LICENSE
+-include tpm2_pytss/version
+-include tpm2_pytss/config.json
+-recursive-include tpm2_pytss/swig *
++include src/tpm2_pytss/version
++include src/tpm2_pytss/config.json
++recursive-include src/tpm2_pytss/swig *
+ recursive-include tests *
+ recursive-include examples *
+-exclude tpm2_pytss/internal/type_mapping.py
++exclude src/tpm2_pytss/internal/type_mapping.py
+diff --git a/scripts/prepare_headers.py b/scripts/prepare_headers.py
+index 0864a3d..7eb0a57 100644
+--- a/scripts/prepare_headers.py
++++ b/scripts/prepare_headers.py
+@@ -11,7 +11,7 @@ import textwrap
+ 
+ # import tpm2_pytss.constants
+ constants_spec = importlib.util.spec_from_file_location(
+-    "tpm2_pytss.internal.constants", "tpm2_pytss/internal/constants.py"
++    "tpm2_pytss.internal.constants", "src/tpm2_pytss/internal/constants.py"
+ )
+ constants = importlib.util.module_from_spec(constants_spec)
+ constants_spec.loader.exec_module(constants)
+diff --git a/setup.cfg b/setup.cfg
+index 89a3c7a..5426a07 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -18,9 +18,11 @@ classifiers =
+     Programming Language :: Python :: 3.10
+ 
+ [options]
+-packages =
++package_dir=
++    =src
++packages=
+     tpm2_pytss
+-    tpm2_pytss/internal
++    tpm2_pytss.internal
+ setup_requires =
+     setuptools_scm[toml]>=3.4.3
+     cffi>=1.0.0
+diff --git a/setup.py b/setup.py
+index f10fe73..b7f1c96 100644
+--- a/setup.py
++++ b/setup.py
+@@ -200,13 +200,15 @@ class type_generator(build_ext):
+ 
+         p = os.path.join(self.build_lib, "tpm2_pytss/internal/type_mapping.py")
+         sp = os.path.join(
+-            os.path.dirname(__file__), "tpm2_pytss/internal/type_mapping.py"
++            os.path.dirname(__file__), "src/tpm2_pytss/internal/type_mapping.py"
+         )
+ 
+         vp = os.path.join(self.build_lib, "tpm2_pytss/internal/versions.py")
+-        svp = os.path.join(os.path.dirname(__file__), "tpm2_pytss/internal/versions.py")
++        svp = os.path.join(
++            os.path.dirname(__file__), "src/tpm2_pytss/internal/versions.py"
++        )
+ 
+-        print(f"generated _type_map with {len(type_map)} mappings")
++        print(f"generated _type_map with {len(type_map)} mappings in {p} and {sp}")
+         print(f"generated _element_type_map with {len(element_type_map)} mappings")
+         print(f"generated _versions with {len(versions)} versions")
+ 
+diff --git a/tpm2_pytss/ESAPI.py b/src/tpm2_pytss/ESAPI.py
+similarity index 100%
+rename from tpm2_pytss/ESAPI.py
+rename to src/tpm2_pytss/ESAPI.py
+diff --git a/tpm2_pytss/FAPI.py b/src/tpm2_pytss/FAPI.py
+similarity index 100%
+rename from tpm2_pytss/FAPI.py
+rename to src/tpm2_pytss/FAPI.py
+diff --git a/tpm2_pytss/TCTI.py b/src/tpm2_pytss/TCTI.py
+similarity index 100%
+rename from tpm2_pytss/TCTI.py
+rename to src/tpm2_pytss/TCTI.py
+diff --git a/tpm2_pytss/TCTILdr.py b/src/tpm2_pytss/TCTILdr.py
+similarity index 100%
+rename from tpm2_pytss/TCTILdr.py
+rename to src/tpm2_pytss/TCTILdr.py
+diff --git a/tpm2_pytss/TSS2_Exception.py b/src/tpm2_pytss/TSS2_Exception.py
+similarity index 100%
+rename from tpm2_pytss/TSS2_Exception.py
+rename to src/tpm2_pytss/TSS2_Exception.py
+diff --git a/tpm2_pytss/__init__.py b/src/tpm2_pytss/__init__.py
+similarity index 100%
+rename from tpm2_pytss/__init__.py
+rename to src/tpm2_pytss/__init__.py
+diff --git a/tpm2_pytss/callbacks.py b/src/tpm2_pytss/callbacks.py
+similarity index 100%
+rename from tpm2_pytss/callbacks.py
+rename to src/tpm2_pytss/callbacks.py
+diff --git a/tpm2_pytss/constants.py b/src/tpm2_pytss/constants.py
+similarity index 100%
+rename from tpm2_pytss/constants.py
+rename to src/tpm2_pytss/constants.py
+diff --git a/tpm2_pytss/encoding.py b/src/tpm2_pytss/encoding.py
+similarity index 100%
+rename from tpm2_pytss/encoding.py
+rename to src/tpm2_pytss/encoding.py
+diff --git a/tpm2_pytss/fapi_info.py b/src/tpm2_pytss/fapi_info.py
+similarity index 100%
+rename from tpm2_pytss/fapi_info.py
+rename to src/tpm2_pytss/fapi_info.py
+diff --git a/src/tpm2_pytss/internal/__init__.py b/src/tpm2_pytss/internal/__init__.py
+new file mode 100644
+index 0000000..e69de29
+diff --git a/tpm2_pytss/internal/constants.py b/src/tpm2_pytss/internal/constants.py
+similarity index 100%
+rename from tpm2_pytss/internal/constants.py
+rename to src/tpm2_pytss/internal/constants.py
+diff --git a/tpm2_pytss/internal/crypto.py b/src/tpm2_pytss/internal/crypto.py
+similarity index 100%
+rename from tpm2_pytss/internal/crypto.py
+rename to src/tpm2_pytss/internal/crypto.py
+diff --git a/tpm2_pytss/internal/templates.py b/src/tpm2_pytss/internal/templates.py
+similarity index 100%
+rename from tpm2_pytss/internal/templates.py
+rename to src/tpm2_pytss/internal/templates.py
+diff --git a/tpm2_pytss/internal/utils.py b/src/tpm2_pytss/internal/utils.py
+similarity index 100%
+rename from tpm2_pytss/internal/utils.py
+rename to src/tpm2_pytss/internal/utils.py
+diff --git a/tpm2_pytss/tsskey.py b/src/tpm2_pytss/tsskey.py
+similarity index 100%
+rename from tpm2_pytss/tsskey.py
+rename to src/tpm2_pytss/tsskey.py
+diff --git a/tpm2_pytss/types.py b/src/tpm2_pytss/types.py
+similarity index 100%
+rename from tpm2_pytss/types.py
+rename to src/tpm2_pytss/types.py
+diff --git a/tpm2_pytss/utils.py b/src/tpm2_pytss/utils.py
+similarity index 100%
+rename from tpm2_pytss/utils.py
+rename to src/tpm2_pytss/utils.py
+-- 
+2.35.1
+
diff --git a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild b/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
index 7121894df275..d7f07c588526 100644
--- a/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
+++ b/dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
@@ -7,8 +7,11 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for TSS"
-HOMEPAGE="https://pypi.org/project/tpm2-pytss/"
-SRC_URI="https://github.com/tpm2-software/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/tpm2-pytss
+	https://github.com/tpm2-software/tpm2-pytss
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -29,12 +32,10 @@ DEPEND="${RDEPEND}
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]"
 
-distutils_enable_tests pytest
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-src-move-package-under-src-directory.patch"
+	)
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
-python_test() {
-	cd ${T}
-	PYTHONPATH="${BUILD_DIR}/install/$(python_get_sitedir):${S}:${PYTHONPATH}" \
-	epytest ${S}/test --import-mode=importlib
-}
+distutils_enable_tests pytest
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 2b476b00653a..fbc8f9db2139 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,3 +1,3 @@
 DIST tqdm-4.64.0.tar.gz 169499 BLAKE2B a6b9587a366c026716c63af4358ddba693b52be3490a161071bc750fffcd50429bc639255635d96c950a130d9fe994dc2abc98f3fbaf0a0c344140c8ae972596 SHA512 84d243b86ea3665e915e6a79e7887a4d0487b166971d211e34229b7a46429f4e4f5808c03f24420b20fb85d274e1e6b36ed852af99c5c9d177c8ce71f0ce0c17
-EBUILD tqdm-4.64.0.ebuild 1027 BLAKE2B af0457f83ae96fdb7d5feef7d3f86f45e6d1f5dcd67180f521d6598a76d98a4ec1c92f356f5d93c844fbdbdc245df3768638735ead3fc8ba35d8fef3cf4ab78a SHA512 679fa6c09148fe359e9bb54f5bc36f68e4b368bdf99c83d5294436e89fb2fd045393057d56ac10e7d66c90eb20d4496cc93fdea4021c71873e98af02748b4e41
+EBUILD tqdm-4.64.0.ebuild 1027 BLAKE2B 041bdf83495e00ae3f9f61ffb4bb21b567ee090e65b0fa9fbaf171adb2f84c15bbc1057738e8a0f11fe8e0eb4afafcb9af14603f7f436edf8b0e1681f32ff346 SHA512 25f63eac901dd11d00b40a962c08dbcc44fc793e9bc33d5e5cdf2aaa893412e9dab34c524d1ea099b4ac5f01af16d7335a27edba1c772fb5a5281e39a868a5f6
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.64.0.ebuild b/dev-python/tqdm/tqdm-4.64.0.ebuild
index 32cdaf0a2e13..41de10518a23 100644
--- a/dev-python/tqdm/tqdm-4.64.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.64.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index f9cddcf04d86..7e72c4709f79 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1,5 +1,5 @@
-DIST traitlets-5.1.1.tar.gz 130629 BLAKE2B 75a6f11d95e3989b9faffd576a1c9c45aa413b0b8c6ac853368902a60aad735ffd9699e721878af4e449d07ca6c2b0fae584fa2ae17707408ea9ca7591d38f75 SHA512 6ef5fcde81e1403b4b28c80e636c75f49819e319863dfa654aa5bbb96d18cca82ef8e7878cc8cccdb988d75201c3912fc49c31b673d7182a1f7d3cc78c115112
-DIST traitlets-5.2.0.tar.gz 97379 BLAKE2B af0d3b45803c7318139cc2efe2308db1c0c1ddbec9bcecf328db62681a168f924a21d2495e1ff8d8ea5aca2aad9fcd34f7f961b5a6937f2cbefb4b00f4eb7d67 SHA512 d052c00e6dcb83a056a015f49244230ecd82d9cbcb7ea7cee4f543229fe725cfb80d1b8d055ec5a466b8d16a5f42e6a7aa962f0f12d3f47b9d2edf2a1590aa84
-EBUILD traitlets-5.1.1-r1.ebuild 556 BLAKE2B 7ee0d4391ca1233111228254bd54d8d63fb4577f1f96d1d57ce2d6ad3f50981a05892c5328f9d1568859c9fd9887ca8e65a2386996b61485fbfab19172ea1619 SHA512 1a9af1e692d3ef7697ba9dcfe4185936c29114aa1f4f8ecb89f261b0d0abc8dea1601af5bdf0f6aee17da38ae519ed2e55c7e512f768bb23d25ada11f8cbf9ea
-EBUILD traitlets-5.2.0.ebuild 670 BLAKE2B f78b193150859f5605cdd1ed71ce71bb2ea16cfe72ee69b9c157251acff9791386e412f6eb6fc42d2e496c5c812ff37ca64ebc4cfc4f8a8c3a3ac886f69e02e3 SHA512 4527c741b9b9389432937696f32c16ed0836fd3510399b3e1f1d14bf1e67e2e9b5cf36ecc1c28e6fb8c3e7b6e6098e2c843b1554784d9c093f4045b08b09a03f
+DIST traitlets-5.2.2.post1.tar.gz 136827 BLAKE2B 8e85704bcb704ea6e3bb270abc62ba6739c1f9c4d3dccf182c129d7f28ad3f71882be26504762a57ace19ac58885b88f86ed1dedf9c4e34a080f57431b7d0cd9 SHA512 3651a383c8f761bc5ddf3c3aeee2848265c7c891c7af30111e12968069381e2d571ab57091b8c9c4e0deb7faa06a6338697d65054931fc6f512531f103cae99e
+DIST traitlets-5.3.0.tar.gz 136916 BLAKE2B 72f1a8ec9524a2a77046e592206ca0fd5c788daf67c673b8335f840272ce49b6b82735b272d29e1a507096dc2c65b82350b1ccbf925864a643918ff813e8a888 SHA512 1c6c74b18b1a4d37fb61f466b9018b5612a8cf8b7a52c58bf0d3f576d0a94487f73c9d1005458d2b56ac9e86083bb5f1ef67e107ceced1009fda442f1fc9aa44
+EBUILD traitlets-5.2.2_p1.ebuild 710 BLAKE2B d420b7d8b56dfd26d40317a2dfe62b10ec3eda865fa14fda5149b9802f0f3acba438a99cbb4f11132b5f088c576b16e9c3d0ee0af616dc04adaec4b1e8ad6261 SHA512 143e2722f6edbe7f62f32a4097927eb004d14e61cd9bcb1b70c426d2032aff6ea9c98b4d2441884706e0e882fe90cee47f62a6097547401a5855a5d6a7a7ceaa
+EBUILD traitlets-5.3.0.ebuild 674 BLAKE2B e9e0521629151df6b172090de835d5c4abe06aba01c73f6d30cc3cac3d3c6556b972682ed28c1ed317f200a169527bef4e2ea0c6a64f59d341822d1760b0137f SHA512 b83f7b65b9d7d3c1952fa8407416f96d2b837d8592ce4678433b7507570ab95a63ccc444d20ccb1f36d59e4a85a8888276546f0c01039df9f9098c606963ddff
 MISC metadata.xml 737 BLAKE2B dadf9c19ed06cc70940023c180cb2256534ccba2881b4a0b5d7673ae9959838c129f82b1a5d2b9c13e408442ef2f9ec906484b01baa4408417143a712f4bfa56 SHA512 3a9e54cabaac875c27747642794f54b90216ee103e5de336d6e4e76d3a08c045ec08eabebe59c47b6fab2dabdeb43f16a8579a9448cbc19ab169ceb08740508d
diff --git a/dev-python/traitlets/traitlets-5.1.1-r1.ebuild b/dev-python/traitlets/traitlets-5.1.1-r1.ebuild
deleted file mode 100644
index 0558c1c7ad84..000000000000
--- a/dev-python/traitlets/traitlets-5.1.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="https://github.com/ipython/traitlets"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
diff --git a/dev-python/traitlets/traitlets-5.2.0.ebuild b/dev-python/traitlets/traitlets-5.2.0.ebuild
deleted file mode 100644
index 64b4f5a33c9f..000000000000
--- a/dev-python/traitlets/traitlets-5.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configuration system for Python applications"
-HOMEPAGE="
-	https://github.com/ipython/traitlets/
-	https://pypi.org/project/traitlets/
-"
-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"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/traitlets/traitlets-5.2.2_p1.ebuild b/dev-python/traitlets/traitlets-5.2.2_p1.ebuild
new file mode 100644
index 000000000000..4a34e0afe386
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.2.2_p1.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=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${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_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/traitlets/traitlets-5.3.0.ebuild b/dev-python/traitlets/traitlets-5.3.0.ebuild
new file mode 100644
index 000000000000..08fe26572c56
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.3.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=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index b6a2d031ee19..84afa5206b08 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,8 +1,6 @@
 AUX translate-toolkit-3.3.0-no-install-docs.patch 652 BLAKE2B 202cfd408059115cfdb5933320b5a560eeee37e2c045cedcdd80cf808ab1e1a5569a964e9eab8114a2ab27e2c470285b254406c754b5289f7cff2f22afcebb6c SHA512 d98e2d7519ca630d41407d01f20543a84c3f408628832d4e79a5a52437d204f872aaef8eca80687565e6981dddb59480a313217eddf8a4084d8b6d71c3d2c0da
-DIST translate-3.6.0.gh.tar.gz 1150765 BLAKE2B 0b69d21782d8d6b3ae322b480ad2205e577d87a3a9448f8a428f666d3d141063ad06f83eaa38f5d5903cc4263bbdcf261523fef57111c1ba705b640835c11416 SHA512 3ce371cb688dcfa656676fdc3ca920d76088fad67dbfb112511a0439250913e1f4587df681752bf1b288b9c4af3e4ebd11b8f8db51670f0fe14e9db68d7917f7
-DIST translate-3.6.1.gh.tar.gz 1151674 BLAKE2B df730fe08f0f52c41acec8429adfaae7691a2776032106acfa4f14dad65d38cf3e3ee5288b992f4aa481e12e6bb8ae42aedff9da007c5396df7a4d45d5a879cd SHA512 4fb433ce9b39a53ab0c9a809a5dc509a678f06907a6279835b077740a5b39991e42db372953c3c51d39d9a9e5754a3d6747a87b53b3594f2a93aac8760083078
 DIST translate-3.6.2.gh.tar.gz 1152569 BLAKE2B 44c9a5878a177b53d34e48d8b642f293ed475c90de8a530f53462384420b8afaaf107cb62c0cdd45e6d0633f53cd8eedb73dd0dcd81d6f876dc5389ba4230c94 SHA512 fb1fc2f6abb766814269d7051f571cbfb25ecd6b7267e2080e5ab0bb41338ace430a8bb01084abe176e2fd0a934cdf6492bf79f5e27c1f8ce99b021175efcec9
-EBUILD translate-toolkit-3.6.0.ebuild 2521 BLAKE2B 415a34c66319672dc9ce3d0bde31824d8ed0bcb13d728795650eda5332ff8f2fc496fb5293805f9d08ab418bb403263b2125ae20a697741a6aad7581af925a33 SHA512 ec024534b6af2e1cb0f99444540a6d897f53543bca2cfd7145a87b13732492d62e3dd51b799b75b69124a24d7114c245c35a0579770ae46dac61bcf311954169
-EBUILD translate-toolkit-3.6.1.ebuild 2524 BLAKE2B 75c253a5bfbd770ec6dfbc21c359014ce4f7df779d14d75902f55ef2dcbc51ce526f921666d7f39afcacd083a0716222b7f73cc9962b9b5946aa15102584bb46 SHA512 1158fc636df324981fb53303a112bcb6401255b6f1ea7ddb4aaaf47fb0bfa4538c52631493b945c296f595db1faae490c21d305d5a88ed49b58dc395be2be056
-EBUILD translate-toolkit-3.6.2.ebuild 2561 BLAKE2B 71ada327f3447ea74d457bc6fb93414c2069f1a347af4805be74829c54a21a84e92bf5d60650dd4cd9a3abbd278aa79edf6dd7722031cd4970e88c984db18d04 SHA512 cc8f7a7cb4e933b0fdad96d65e361df0f2ba79d04cf4c698b5874efcfbb7cf99ef289cd6b7b5b0be57a4ce2b2fe27c9dfac55aa882cadc62a6d26b484fc999c8
-MISC metadata.xml 746 BLAKE2B d11f99224b1dd6ccb5a64b2f3346f3963f7874197fc5cd13a9bc84036d7f6d78e62d4f92d80b41b3a71426978c605d599207ba7d20ee94ca195e6be3b60f41cb SHA512 07dfd2ab55c6eb0ab346e66a3f03dd82e193382c6bdec0d2b8826cde7e4e11bb5d6f3bc1a5885b08d9c2aa51f8afedc6ec6684f224951e6dd80bc500c783cbb3
+DIST translate-3.7.0.gh.tar.gz 1152162 BLAKE2B 75d3b0a7f2a840766f983d6e1484aab16de2aa2bab74d0753910be9ad0d1c76ebfa553188318920a7d5a6f1ce6b72e755147eb45c501cdeb79246472c0329449 SHA512 18159f85d94768c32fe5a44f3d3e586038b281a0f3e386621bd57a5be64a9ae21a4272c05de8a2ea2a2467c98935205a8ef49a714dc9aabf9ed21de4f533fb93
+EBUILD translate-toolkit-3.6.2.ebuild 2558 BLAKE2B 05380bb89b9fa0965dc5e07b531322b67964fba289bb3f259b99289dac530d88dddce1fb73edcc42c5a3c02356b40e972fde3870999114931a229745eaf7c6ec SHA512 68d840c4a2364bf3252e589cc93f912a39cb6509648e93045cbb08f43d088d8b10c04d597cbd708e58d0bc19ca44001b84020128f510b088c16fbe2b53207816
+EBUILD translate-toolkit-3.7.0.ebuild 2421 BLAKE2B b5c818ed8fdef983bf87d3103c58e4bb6bbb12a555213d40c40feef74402588db68fdf14caa958aea3f0a8d64ba39af06c46239afd61652c17f409f74a2a2fe2 SHA512 ab76f4b06f9b1e73b2cd83e85e5d82b50b5427327b999735abcd8537d15a2ddf30a43b626d345731e5fb038334acbf69c84c60f3991c2674a91ec23250cd8350
+MISC metadata.xml 756 BLAKE2B 06f64f258d362954f99f7e9eee241eb3dddc6b00b9069df2ad977d28b5cf06f9c8ee2246ee5958600b5ac86297968d7aaced6b6420dca4ed507c441c58c61ca9 SHA512 80374c40513ca450f97e3930929c1450e7438ea15830e60937952a6fccfd999675f2ca2056c5aa4e287ba256c6ec08a09d8f7adb8b2c5af8ca0cd595f34acd85
diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index acb06f15cb31..85db5e138a19 100644
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="yaml">Support YAML format</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">translate</remote-id>
+		<remote-id type="github">translate/translate</remote-id>
 		<remote-id type="pypi">translate-toolkit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
deleted file mode 100644
index 476d408a194d..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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"
-
-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/translate-toolkit/translate-toolkit-3.6.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.1.ebuild
deleted file mode 100644
index c9ba581f8597..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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"
-
-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/translate-toolkit/translate-toolkit-3.6.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
index f108ce0993e6..51e65be5f670 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.6.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 BDEPEND="
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
new file mode 100644
index 000000000000..6de2eaa80e92
--- /dev/null
+++ b/dev-python/translate-toolkit/translate-toolkit-3.7.0.ebuild
@@ -0,0 +1,99 @@
+# 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/
+	https://pypi.org/project/translate-toolkit/
+"
+SRC_URI="
+	https://github.com/translate/translate/archive/${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"
+
+RDEPEND="
+	!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
+
+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 1b46b0211bd8..4f435139fb33 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -2,5 +2,5 @@ AUX tree-sitter-0.19.0_p20210506-unbundle.patch 674 BLAKE2B 3b7f4efb2a0064c6682b
 DIST py-tree-sitter-4f39f6919ca3be8efb420a338fd2cf9b8b68b156.tar.gz 14075 BLAKE2B b9a7a2247114c34e211f5098f04c456b25a3aee6cfde6d75bdd83427a379c5f339f1e897a3246ef7dafb2b512442bd0e7da18f391bc8283545e060dd00481421 SHA512 21629a147cda0c95a054c31223b082afa2d12491fee7a0d720187e5c390d9771c2e9b7d85fd35a56a2cf97a7addfa5332b58b3a36893aab2d7487f9522c5cddc
 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.20.0.ebuild 1323 BLAKE2B 44e72ccd8c455600b2237a66d008ce2b3fc8ebad1cd6aba37adbc4af84b3b69bfd1586c36664afa1faa822b44f43584792bed2e3dcc9a0794935fbc87e7c97ba SHA512 1b796c7407e4806ba87ddc3b9aff89b0f7ba9b5835b99a299f7d7b9379b79acc776934c0e77df32c31e276316fff8351a3370caf1e8f31ad60841d8ac63b577e
+EBUILD tree-sitter-0.20.0-r1.ebuild 1472 BLAKE2B 853d53b52651ec093da779c37b2febf324be0fb20d3730ed08f5f9261df9f4bf587cc4245345938202f82175a24a088b0a6588559c1442526dccced38266007a SHA512 33db84798dbb1502c28e4e9eddf816db6d6eb5f7f02feb2a5ef21e28c45ea79334e08abefc8807cc93489fcccda7324e78a2d131b9ddd6abd15f78ea24036a81
 MISC metadata.xml 393 BLAKE2B 15f673391ad9e9aab93808392449ddf99ccc35fe1b345010a4373b46a56c8dad461042e0a2dd735e4d53f77059a5f7920fc3215f939aacd1455c61f0ecdfa3c0 SHA512 519fc8d6fbbf3709820b26b1f4786b16f6679e569ae4adafdc5e37b2dfbc03351bfd9c6750264300a0309406ffe20868d48c3ff488dde22f900d59e1813c15ef
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.0-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.20.0-r1.ebuild
new file mode 100644
index 000000000000..704c7cce3413
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.20.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/
+	https://pypi.org/project/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 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	dev-libs/tree-sitter:=
+"
+DEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests unittest
+
+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
+}
+
+src_test() {
+	rm -r tree_sitter || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
deleted file mode 100644
index 821f1434776b..000000000000
--- a/dev-python/tree-sitter/tree-sitter-0.20.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 ~loong 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/treq/Manifest b/dev-python/treq/Manifest
index ca6f1344dde0..3f871dcaee5e 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,6 +1,3 @@
-DIST treq-22.1.0.tar.gz 72634 BLAKE2B e59271bbd53124fa6c01cb9fba03d83ba8cdfc1b2be065c649e26dbcd0202473b59fc1762ce02d5d016d1ac5a6a848568b248c316d7ecde8e3f3521cb213d532 SHA512 6c9a49bc4c9e73365275bf841a5a31873c092e33c4978571caae3601d02e9b8d161dcf684c40ccd297d8a8c4dafe62eddb7872a86513598260fe38c98c7c44f5
 DIST treq-22.2.0.tar.gz 72922 BLAKE2B ab4637c801e5e777f81f6e6a6e12e36ef47e052a4103eb70bf4e10d3fb44b60f144f32734625b4babb375acc96e3cad1895634d3d2fc08ac3095769180e65328 SHA512 465a02481a51ac246ac85f561f2e7a59d97aeeda9f0953dd83678ff836802a187a6aedcce830a9e3095a9c72227bd06113610c3be0967f1362a645a31278bde0
-EBUILD treq-22.1.0-r1.ebuild 1060 BLAKE2B 70b169a5f5fd4f3fc848a2c2bf092bdc6eb2eba8680559c2a2518105dedd91c1cf3d52f80b5bae595c6a77754cb70f6ec4a92b9431db5ec2091c6a2a8e29795b SHA512 1d4e7d7e9ef8e27bcc851f9593d5cf5a21d5596f35c02a642497894fa88d7d0997b30d21d20a616b3750a5c8feca209d00473c38777b960155df1d56aa79871c
-EBUILD treq-22.1.0.ebuild 1059 BLAKE2B dd778daca0cfb5fa8232e9b455d717881c598e3a1ee02cf8c0fe5f3865eedd391b7bf37fdf6db3380b9a27ba01a5fcbd2fab0f2f546bff5ae08830f52a9a23a7 SHA512 8b5e4cc99722ffce4e0d653c8a868fe0c1378bf2b3769dac1c886a3b572d1bfa1eed7a60ce3219967518717ed78c46dd033e49b152a82fbef7591db3277c8844
 EBUILD treq-22.2.0.ebuild 1067 BLAKE2B cdba14493694224d87e18f069a535afc1a29a26ea3de698f3c08897e08cba3de17e2056cbc638fbda2c84d6fb4676cb7c576237c7e0f93c3f9b0fbfd6634c65a SHA512 16453d7c55d8eb73269002e74ac9860726b415eab82c5907d65d3fdf692aeaf512d0f62fd5be1bfdbbe6d57cff54f2576e42216d53add7b8780e4b0593897381
 MISC metadata.xml 781 BLAKE2B a50fa9d74c53d5c948cfd940ff1e454a2aa9c44bf29c8e39495007ddab02e212a979f757335fae531ceae43743342a02a4ae049b5b12425ba779293c6977eb07 SHA512 1d45744f461efe3cd03802e3886dee60a19eb508b681e3235817f478dd98ca164c822194f03b05891e0000e3d09af4790e8b10e07f3e303abf9ad308712ca9b6
diff --git a/dev-python/treq/treq-22.1.0-r1.ebuild b/dev-python/treq/treq-22.1.0-r1.ebuild
deleted file mode 100644
index e5e1a9824053..000000000000
--- a/dev-python/treq/treq-22.1.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# fix relative path for docs generation
-	sed -e "s@('..')@('../src')@" -i docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial treq || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/treq/treq-22.1.0.ebuild b/dev-python/treq/treq-22.1.0.ebuild
deleted file mode 100644
index 1ca0af3cfc5a..000000000000
--- a/dev-python/treq/treq-22.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
-HOMEPAGE="https://github.com/twisted/treq https://pypi.org/project/treq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	dev-python/incremental[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[crypt,${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-src_prepare() {
-	# fix relative path for docs generation
-	sed -e "s@('..')@('../src')@" -i docs/conf.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	distutils_install_for_testing
-	"${EPYTHON}" -m twisted.trial treq || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index ab0c20d5fd21..ae2341347f8e 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,5 @@
-DIST trimesh-3.10.8.gh.tar.gz 10741790 BLAKE2B 2cc8573e01395fb95f192cd64370b32d63b3ebd3505008c67fc9530641060b127ff42b8892634bf61fd91dbc37098e0da9fa169199d257a0345494cf9996a764 SHA512 c5cd6a6abcf8b8e6cc157a76607d4db090c574a86450956577d81fff310448bab140007eefc3b2c2cea6873a1ef46eccb18834c1593aca40f3d7868b3ce3992e
-DIST trimesh-3.11.2.gh.tar.gz 10745738 BLAKE2B 59a13c2133f7cb0ad22ca5b03af9e61c4cc1431e8d058566b854240fe0b1e28229c427c69aa16aec8b79f139a0c2a3c5202ce2f6d4750f813325e591e3a671b2 SHA512 f9b3643c221ab3f112d4c5cf07c8cf23c5809d7c0ea733b6cda0efc973a78fb4ebd8be9cd0f52bb65babeb5a3dc448b15b738f3089fffb8a32c1af1b01dc8da0
-DIST trimesh-3.12.0.gh.tar.gz 10751006 BLAKE2B 544dac08bf214a703fe00666269f64aad280232245665d544b52eab33e44dab8369bd068c638c8088792e9f62cd54724d2f5758238e4c95e8d74c3f266d86127 SHA512 6c054c92b50e1b3c85c0022969b752d3c97b73f797883a11967645fcab462f8008684a371145cdd0c01896c508eba4f98ac5e3bafd74c9f0b363c2d62275f0b7
-EBUILD trimesh-3.10.8.ebuild 1870 BLAKE2B 39af2219414044af45146cde9136cb680caf29efa1c581e9a8f148eb7a3e3ff1ed96343820bf3d46eb85e20aba7e02ecbdf28d2541b133f9c654fff72af45abb SHA512 8ec82ca2f70165885cd35b2a141c7767f133f070b6d2b89e2bef46e3a362f740df90255e2095e4bed918bc7d9a0c75c09121d72d99d9e8c6fc1b6cdfa6afc02a
-EBUILD trimesh-3.11.2.ebuild 1911 BLAKE2B 5fcc62d4b48d27980a203f1fc6cfa511fd2cd017d07a5a7ac5703e3eba08f8a70b008e3869402476b29d3e137372cc1094f6140262f724a6b9f31387470a09a1 SHA512 d42bffb67264de189eec19aa7ef281769a84bec26c427bb8a31cf21f626e43405c344fa466048aa730432a46ce7a798cf03e54b327d26af7fb208f67a47e83af
-EBUILD trimesh-3.12.0.ebuild 1911 BLAKE2B 5fcc62d4b48d27980a203f1fc6cfa511fd2cd017d07a5a7ac5703e3eba08f8a70b008e3869402476b29d3e137372cc1094f6140262f724a6b9f31387470a09a1 SHA512 d42bffb67264de189eec19aa7ef281769a84bec26c427bb8a31cf21f626e43405c344fa466048aa730432a46ce7a798cf03e54b327d26af7fb208f67a47e83af
+DIST trimesh-3.12.5.gh.tar.gz 10755276 BLAKE2B ced596c4182b085df8c59bc007977aebb94702edd364ed67ee0114376b235fe020bbeee130853e1e0fbabd1f1d0f6523faaf268ffba1b4c7c30f3f794b64e51b SHA512 d467bd6ceb5b567182ac80ea38374f28b85b9ab983edf98428e09c8f799c206d23e282c03c808227c92e2dcb37f3faabea8d5db74b8ac419265751bcbaa396e1
+DIST trimesh-3.12.6.gh.tar.gz 10755102 BLAKE2B 69336781530f0195c71e65d67ba3362314ad39c3dd349e9b88174136d85b3f72c5e64c93a0ca64572c1595292e2b241bea6552c1e33671fea48bc0aa42f21d13 SHA512 2c6d64ba3307cb50148f345db0f6fbf8f94838ba2171698fad31b2d26205860afa98cc803ccf7264422ca3cad65cb8cddb0f55dfac45f430d012a4579d5c08de
+EBUILD trimesh-3.12.5.ebuild 1853 BLAKE2B 8de3aacd8779c21d4642a94a6837215931601463a2908666b5f7645522ebf86def6db510a122c41dd82d002577a2a4ad6023cab744dbc091bc81a3f96582283f SHA512 2034954a8cb7701184d7e75d4cf9007a229732f166d110595bdd820eba289e0a12da44dcd83d6c6f8c9ca4027bc65ac5aa914c25aff2314000076bdaa20b184f
+EBUILD trimesh-3.12.6.ebuild 1854 BLAKE2B c1c62bbe27b6542bc9bac8d9b633bf3373b3f8e714eac7de4b23e4c8c85975e86e7c98d30bb9f71604174eeb6f9ae316ac221af4b451f65fa5350d4a38672b36 SHA512 e871fb00a7690a3cbb029e7ea8598deb9b193c646628df39353539dd0e37aa34e86699900a7ea3f898ee99224a172ca564292083d166f051e904f7cd57c4daec
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.10.8.ebuild b/dev-python/trimesh/trimesh-3.10.8.ebuild
deleted file mode 100644
index cef3a3a7573d..000000000000
--- a/dev-python/trimesh/trimesh-3.10.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="https://trimsh.org/ https://github.com/mikedh/trimesh"
-# No tests in PyPI tarballs
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.11.2.ebuild b/dev-python/trimesh/trimesh-3.11.2.ebuild
deleted file mode 100644
index a3816df1ff09..000000000000
--- a/dev-python/trimesh/trimesh-3.11.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-# No tests in PyPI tarballs
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.12.0.ebuild b/dev-python/trimesh/trimesh-3.12.0.ebuild
deleted file mode 100644
index a3816df1ff09..000000000000
--- a/dev-python/trimesh/trimesh-3.12.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-# No tests in PyPI tarballs
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.12.5.ebuild b/dev-python/trimesh/trimesh-3.12.5.ebuild
new file mode 100644
index 000000000000..3d5249af810b
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.12.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+	sci-libs/shapely[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/trimesh/trimesh-3.12.6.ebuild b/dev-python/trimesh/trimesh-3.12.6.ebuild
new file mode 100644
index 000000000000..ab4e31971d7a
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.12.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+	sci-libs/shapely[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
index 36f364bac934..0a6b7c0a4301 100644
--- a/dev-python/trio/Manifest
+++ b/dev-python/trio/Manifest
@@ -1,3 +1,6 @@
+AUX trio-0.20.0-py311.patch 957 BLAKE2B 0f8bdb92644a5bba2ad4f00a03920fd67f421ac07617f0e830a471608bb5b141d32f545d17847bb7b4f8aa5fb08444be45e32b1306561956ca585b8c1b449e7f SHA512 07e2ddd315bfc449e14dad2b67a4735c625a4c765abf4fadaa8dd4b904b723613831e7c65cbb7aea7e3bda5a5558e3951e8eb2d86398754ddea7844ed857de7e
 DIST trio-0.20.0.tar.gz 491254 BLAKE2B 354e8019d1ba8ac35bbb00477806ab87d62de0e9a94b1ff3a4d63c024af8cd40261c46a2c9449f38550e809938f3c6ee620a47e866bc31203c3c4a4984446fa5 SHA512 9aa431d0bc28737dd48a7358446acaffbf34860dc467ac121166f7241ebf4a4ed8bcdc8dc0277034e3c3fd70f1f8a57d790e98bdda7a1141f2c53c6b85a97a3c
-EBUILD trio-0.20.0.ebuild 1715 BLAKE2B 330a9bd53d97975c99231b42e3fcf26ffa0ed5dbc7bc00a097077ae7712214288c7af0a044c8ea63f079e6017e6ec6625cbbfadb3078dfb8392b1b9b959fef4c SHA512 f479abf2433d86c62ae5e0693a2a522117f656e547d3319422cce729d132740a0f3fdd3b14038c24c4e44177854a57d89f79125a275e253fdd4a2bb3d5842f76
+DIST trio-0.21.0.gh.tar.gz 491228 BLAKE2B e5f65d3aa9e4bc0c449e3986048d63fe3001a2eee96dbe5d8c088e0fce786b1d50861b47170baa7cced097938b16c92f0efd51518404a5e0ea6a17a48d656823 SHA512 383b11f264ddf4c78eb75829472826ebacf32d063790e8d4681d5df2f21c4f9287884db1752fd19976b674643adf7299816d4404e3032193ef90f522ad9cfa79
+EBUILD trio-0.20.0.ebuild 1955 BLAKE2B 0cca3b4b1ce120da3704f831316db9027d507557825b05e15d171d2e20061dbd9dfdf96a26d2ee16e1513ac4040f5973d626e6616781622273ed1b849428eb27 SHA512 c7b612dc393ca7887835b22549f93cc981bfa4e7779b153ea04989766b2bf1fd3e4d1c3761382233d4fa67d36a50da9079300e3c36802f367cab310cb12ceeaf
+EBUILD trio-0.21.0.ebuild 1750 BLAKE2B c4cd4732d186f2731695cd8788719ab366b7bb3ca8cba0a4098392fe2f354c74091d064ee46b70907ec9cfab61d3e369e333df1ba934e34f6d6fd8e8c84df39a SHA512 2e57a8f7c0d1aa15b0462bbbc0778569212e3f532173f8a9918052b9176da9d51de5e115b5f6ef514e7eb26cae54bf67eeaf2c8353cd4d4ee6c4a12be0e2a4f7
 MISC metadata.xml 2060 BLAKE2B bb6ddfddfb3c19038e5982227a8c5f9999b93868c343a9a5bf7af5963006b5b719ef960f65b91747dfddf19544134db9e1a2d65e94192c079c64c303cdc8997a SHA512 4b86e7cccddc200d5616550e309ad46587f900ed13c38196e874e5110974b856d65e18745b8b7b42858cb672940ba280b0c2ea54d33f9b5bf32a375fa1232088
diff --git a/dev-python/trio/files/trio-0.20.0-py311.patch b/dev-python/trio/files/trio-0.20.0-py311.patch
new file mode 100644
index 000000000000..f7d447825a16
--- /dev/null
+++ b/dev-python/trio/files/trio-0.20.0-py311.patch
@@ -0,0 +1,26 @@
+diff --git a/trio/_core/_multierror.py b/trio/_core/_multierror.py
+index 6dfdaa7a5..de0d56d46 100644
+--- a/trio/_core/_multierror.py
++++ b/trio/_core/_multierror.py
+@@ -383,11 +383,10 @@ def traceback_exception_init(
+     capture_locals=False,
+     compact=False,
+     _seen=None,
++    **kwargs,
+ ):
+     if sys.version_info >= (3, 10):
+-        kwargs = {"compact": compact}
+-    else:
+-        kwargs = {}
++        kwargs["compact"] = compact
+ 
+     # Capture the original exception and its cause and context as TracebackExceptions
+     traceback_exception_original_init(
+@@ -421,6 +420,7 @@ def traceback_exception_init(
+                         # copy the set of _seen exceptions so that duplicates
+                         # shared between sub-exceptions are not omitted
+                         _seen=None if seen_was_none else set(_seen),
++                        **kwargs,
+                     )
+                 )
+         self.embedded = embedded
diff --git a/dev-python/trio/trio-0.20.0.ebuild b/dev-python/trio/trio-0.20.0.ebuild
index 721a7b11a297..10ace0d68090 100644
--- a/dev-python/trio/trio-0.20.0.ebuild
+++ b/dev-python/trio/trio-0.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
@@ -38,19 +38,8 @@ BDEPEND="
 	)
 "
 
-EPYTEST_DESELECT=(
-	# Times out on slower arches (ia64 in this case)
-	# https://github.com/python-trio/trio/issues/1753
-	trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
-
-	# incompatible ipython version?
-	trio/_core/tests/test_multierror.py::test_ipython_exc_handler
-)
-
-EPYTEST_IGNORE=(
-	# these tests require internet access
-	trio/tests/test_ssl.py
-	trio/tests/test_highlevel_ssl_helpers.py
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
 )
 
 distutils_enable_tests pytest
@@ -61,6 +50,26 @@ distutils_enable_sphinx docs/source \
 	dev-python/towncrier
 
 python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests require internet access
+		trio/tests/test_ssl.py
+		trio/tests/test_highlevel_ssl_helpers.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Times out on slower arches (ia64 in this case)
+		# https://github.com/python-trio/trio/issues/1753
+		trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
+
+		# incompatible ipython version?
+		trio/_core/tests/test_multierror.py::test_ipython_exc_handler
+	)
+
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# test for functionality that has been removed from py3.11
+		trio/tests/test_util.py::test_coroutine_or_error
+	)
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -m "not redistributors_should_skip"
 }
diff --git a/dev-python/trio/trio-0.21.0.ebuild b/dev-python/trio/trio-0.21.0.ebuild
new file mode 100644
index 000000000000..6fc1ee37808f
--- /dev/null
+++ b/dev-python/trio/trio-0.21.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for async concurrency and I/O"
+HOMEPAGE="
+	https://github.com/python-trio/trio/
+	https://pypi.org/project/trio/
+"
+SRC_URI="
+	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/outcome[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+# NB: we're ignoring tests that require trustme+pyopenssl
+BDEPEND="
+	test? (
+		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/immutables \
+	dev-python/sphinxcontrib-trio \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# these tests require internet access
+		trio/tests/test_ssl.py
+		trio/tests/test_highlevel_ssl_helpers.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Times out on slower arches (ia64 in this case)
+		# https://github.com/python-trio/trio/issues/1753
+		trio/tests/test_unix_pipes.py::test_close_at_bad_time_for_send_all
+
+		# incompatible ipython version?
+		trio/_core/tests/test_multierror.py::test_ipython_exc_handler
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not redistributors_should_skip"
+}
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
new file mode 100644
index 000000000000..95fbabb0a460
--- /dev/null
+++ b/dev-python/trove-classifiers/Manifest
@@ -0,0 +1,5 @@
+DIST trove-classifiers-2022.6.23.gh.tar.gz 14950 BLAKE2B 7203b8edb6f8a8886371a60f3c273b02b7fe045230a3a0c89a7282a896e513535a47fe06834fd6e33b98c480695b69be524dea1402f463f3c82fc80ddf8ac320 SHA512 c2c186b5d13f626a43f29a1eff6ebf2f17f8240af554f27ffdf05b506d428dd59582e7357a85b62f94714e024ae98ea216487726526639371c24c6b46b96df4e
+DIST trove-classifiers-2022.6.26.gh.tar.gz 14966 BLAKE2B 360a8a01d710456a7edf2f56ce5ca4645e0f5e79db09087a888556e6555a15fd6f6b0aa3112bf0f6c2652759fce93e76357775ca57e53615dd99c4f1b929303d SHA512 1857d53e7731ada3ca811222bab2d0734da0e18fdf36dcada166bd15b1f397cf8575963d8432eb2d0de571646da6b0b18299af3bb7e44fb225586aa76f6de35f
+EBUILD trove-classifiers-2022.6.23.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+EBUILD trove-classifiers-2022.6.26.ebuild 659 BLAKE2B c50af928a84398969b7e57b00688ab13dda9ae3a476560222ba27590ded65d6a1eafbe79b2d1730a8fae8e714a7b39ea0b892808b46941e81a862cf02885ec82 SHA512 9081abb9b701b392d6528fc0242c79d72e145a2e6f620b965148e8bbdab7faad10034b23f8557ae16a08ef45b10ce9a9814e386ea0c5e8d6ed82daf710629d34
+MISC metadata.xml 361 BLAKE2B fd91e587a440e18c3030c6ae2992cda3d70ddb506eb78dfdff7b3e8b2d6456fd0cb13b56a7cb360bb80cdb38686d52938b5d6e9d873071e20a0802b11836181e SHA512 d34a508b050c6f1148e8ff6175b7f5f3dfa8aace0be8c02a01dae94b3824e7c1995deef16e5ad518e4260f51814dcab5f2afbc8b13126b1babe117746bf99ab7
diff --git a/dev-python/trove-classifiers/metadata.xml b/dev-python/trove-classifiers/metadata.xml
new file mode 100644
index 000000000000..210953a4e27e
--- /dev/null
+++ b/dev-python/trove-classifiers/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pypa/trove-classifiers</remote-id>
+		<remote-id type="pypi">trove-classifiers</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
new file mode 100644
index 000000000000..964617661415
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.6.23.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild b/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild
new file mode 100644
index 000000000000..964617661415
--- /dev/null
+++ b/dev-python/trove-classifiers/trove-classifiers-2022.6.26.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
+HOMEPAGE="
+	https://github.com/pypa/trove-classifiers/
+	https://pypi.org/project/trove-classifiers/
+"
+SRC_URI="
+	https://github.com/pypa/trove-classifiers/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-python/calver[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest
+	"${EPYTHON}" -m tests.lib || die
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index ca44666e5c15..f9ca9db8e509 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.9.0.tar.gz 30081 BLAKE2B 5623fba91f07027032f48ee355b5c4f853518bc6a5c1e93b4ea387ff25838302efa42476db8eb64e364980805aa1c3be97f827260efc31ffb536c53fe30ba988 SHA512 f0d983a4c52374f178c0bf96f758fdb5f132e7f7c4bac187c84fbc8dc82dc36d6c801c340bf8871e872178f7b2ac66d6159b5462d073beec9a13a086f64b58b7
-EBUILD trustme-0.9.0.ebuild 823 BLAKE2B 0c85647803c6a412d050ab4d511fb1a35fe59e0a5e8e2e62a75537b2d8cf471c39cbd3556584d74ecd235b3d2322ba51f9f81ade6ad6cd83e9aa480a24811a85 SHA512 5437b70a988507ab7d8be7ca9d91c644b318981f0cf330fc31d00e64ff0e8a77bbdb868ab701063e461fb4862ea2cbf8513e44f4268801d38e7428c7aa4ca03c
+EBUILD trustme-0.9.0-r1.ebuild 1052 BLAKE2B ad9bc3f5db5f37ab46b634d01dd8c93936bc33d7ddd22f3bd2364d1a10a44145a3bab6e8441441c0bd1705838e016ebba2cd234d1bb7a6d5bc8fb5a64eb40e63 SHA512 99778298c35e854e4d7533989ecec7bf1ec9098026fbaa9c5dc0e9f9df755032cdf0757475304560dd91243f6341e9899941a7c0e897b93ca39836486488169d
 MISC metadata.xml 444 BLAKE2B a8db99f28b98a6f6c9afa9479e4b568632aa76959c2dcb24b038e72b756d23dd15ed5b0aa408168dc65bcd3733a0ef58ea6b3a1e67a1c93f9d969f43e7d5301e SHA512 32a0d2b8e347a863394c94e23ff25c50ccece6bed2eede6ec0d8a05ee321948e3a79f5b7821ee2fba7276b6259cc55dfbf5b117ce74d87ae32bb655e95674cf9
diff --git a/dev-python/trustme/trustme-0.9.0-r1.ebuild b/dev-python/trustme/trustme-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..1f3c50321641
--- /dev/null
+++ b/dev-python/trustme/trustme-0.9.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
+HOMEPAGE="
+	https://github.com/python-trio/trustme/
+	https://pypi.org/project/trustme/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# unhappy with new tls defaults?
+	tests/test_trustme.py::test_stdlib_end_to_end
+	tests/test_trustme.py::test_pyopenssl_end_to_end
+)
diff --git a/dev-python/trustme/trustme-0.9.0.ebuild b/dev-python/trustme/trustme-0.9.0.ebuild
deleted file mode 100644
index 62cfaeaa9269..000000000000
--- a/dev-python/trustme/trustme-0.9.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="https://github.com/python-trio/trustme"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tubes/Manifest b/dev-python/tubes/Manifest
index 28abb28484ab..2cfd84807a67 100644
--- a/dev-python/tubes/Manifest
+++ b/dev-python/tubes/Manifest
@@ -1,4 +1,3 @@
-AUX remove-unnecessary-dep.patch 555 BLAKE2B 9e5df1bd6bf31d7081361ca67fcc3a439d2544a6d8bd8371c3f8b040d97579c192624d6599a6ddd4e4fd73e577dd3d29ebb5c6506d02e4b33d9b95ae74c98030 SHA512 d71688663468110b1e7eef0b536e7c4545894992f46963186c98c50ad5a4e305a536eff743ff9b6d17b8aad748ed3154aca200eeed82b53eb29063a37893c073
-DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
-EBUILD tubes-0.2.0-r1.ebuild 619 BLAKE2B 84a64ac84310e3f7cb9e4258ae2a640f9a5fed3d657a9291644e8ebcc3db3349650216179b671e6f7e36ad0d20caa29c19c798fbaa3f06affe95f58954d1ab3f SHA512 f2cf22e80dde86c21e65b4fa36c1924a79833d80a175f66c1e1770ed4a7fd33f1ff039a7d7932206a5749db88eb13397cea37ab255648121f0defce60a4897d2
+DIST tubes-0.2.1.gh.tar.gz 66899 BLAKE2B 21127cf21336b6bbd2acf794bb503a987f7fae63defc7de04d554c7f55f617a23daae105ef756fdf5e8e1b208907388745c6485179f9010339de717853ea8b08 SHA512 6f4666f1591c96d0d7f0514f511ad700f6c3976fcf561f0d967f26aead089e682540b74f85b26a68ff6877d5d7775654c9f6959d8a41c25804375ca837ac1815
+EBUILD tubes-0.2.1.ebuild 610 BLAKE2B a865eb82ccb9276f4982fe2c25d7322c92fad919012f744e68e41ff6c1c7d4ff4d41952af7ca81e99c9f401d19710402862da2c3f5237acc6b0e4e1a12c4ca88 SHA512 f07a17b73d61eb95543ca55a3df73d5bb2fc1a487b8446984b783f115b51e77897e685c2655b040e367aaf3992764b5364bc7753fd99371aec46044d0d0bd842
 MISC metadata.xml 761 BLAKE2B ef257b921d8ff36da6eb239ee72ae9f85a9ee01b58e54c0028d5b741f964a08a25acd39514615df05af1e1ce0873f579c99d83ab89224dcc3798f22982632c9a SHA512 e1f031965ba85c371d71ae68eb2e7e9926058a153ea1ab2db5bead6a3db9a0edfbbb12a9f229f991b244943fb59729ccb36f7a10bb4d06dee06e47cf58e8b5da
diff --git a/dev-python/tubes/files/remove-unnecessary-dep.patch b/dev-python/tubes/files/remove-unnecessary-dep.patch
deleted file mode 100644
index 678f3c27abd8..000000000000
--- a/dev-python/tubes/files/remove-unnecessary-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2c05dd8f27c97ebbfea18706ff54d2406448b09a Mon Sep 17 00:00:00 2001
-From: Glyph <glyph@twistedmatrix.com>
-Date: Tue, 3 Mar 2020 01:24:13 -0800
-Subject: [PATCH] remove unnecessary dependency
-
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index c647927..e9e3134 100644
---- a/setup.py
-+++ b/setup.py
-@@ -16,7 +16,6 @@ setup(
-     packages=find_packages(exclude=[]),
-     package_dir={'tubes': 'tubes'},
-     install_requires=[
--        "characteristic",
-         "six",
-         "Twisted",
-     ],
---
-libgit2 1.0.1
-
diff --git a/dev-python/tubes/tubes-0.2.0-r1.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
deleted file mode 100644
index 2263c3fe0e1b..000000000000
--- a/dev-python/tubes/tubes-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-
-DESCRIPTION="Flow control and backpressure for event-driven applications"
-HOMEPAGE="https://github.com/twisted/tubes https://pypi.org/project/Tubes/"
-SRC_URI="https://github.com/twisted/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/remove-unnecessary-dep.patch")
-
-distutils_enable_tests pytest
diff --git a/dev-python/tubes/tubes-0.2.1.ebuild b/dev-python/tubes/tubes-0.2.1.ebuild
new file mode 100644
index 000000000000..94bae2b54e46
--- /dev/null
+++ b/dev-python/tubes/tubes-0.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Flow control and backpressure for event-driven applications"
+HOMEPAGE="
+	https://github.com/twisted/tubes/
+	https://pypi.org/project/Tubes/
+"
+SRC_URI="
+	https://github.com/twisted/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index ac172e2e6e4c..6bff53ba22e1 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,5 @@
 DIST twine-4.0.0.tar.gz 214420 BLAKE2B 0a1dc91ed9308252d5db3825c8b642e015720bfe7a95dd9a92ba347cbf1eedede85b18b9c310fe20322928db8e44f988bffb3845748ce9817ecbd5b521fb25c8 SHA512 c97a4315bd2a923979aa3a6cebf826ef022a9e510383f7f1debf941b6eedc47642c999702bdc3377a9740f381ed4dc442a542f02a44e521040cb67fb342e9b7e
-EBUILD twine-4.0.0.ebuild 1898 BLAKE2B 51f3004c20742bdd889d30e09f4fcf814f886401169cce2a0474d00c02d1f5306db01c185339acc00b2d621673283996a4cc3530de45ba65b9c9ad3b22d05e99 SHA512 9508def7777185c777af9fb1c37a4ad2a577fc43f21cbb81b0c9553df0d7f658a1355d73da5bef0b4b10f29f1b3e30a23d4de9d7f5b79f794dba4676f934d5fe
+DIST twine-4.0.1.gh.tar.gz 214569 BLAKE2B 82c1793718cfd7d81d9745d16dfe21f59fdfd8b157840ff29629f8b7b86c1e36281f1ed9ba613ec0048c8eef8a2c80d2b9b160893ed953b06c9bfb027f5299e0 SHA512 0b5d24c56731239400b6713e0e52d1cfdb399a84e886b02ea4b59e7af69cc1578e03bf442cca4b2ea5f400995955d27c8d9d3cc17a6ea59013bdaaf6ac63a567
+EBUILD twine-4.0.0.ebuild 2182 BLAKE2B 813ecbfd27340c05b50d1feeae61ae25fced3af9d192b5b5ee223c02b7e79b5e87cc15a77fafe83af34612f68f6c3da10f42e1757ff623cc6560df52b52e2cf8 SHA512 4a445e832be4ca6e626f02a2a76a0ce005fe38eb4c9d54097f92b99c537de800b14dd7a7bfb2cba334a22c88f449a38f02ecc7d5b33dea411466745e564a4e6f
+EBUILD twine-4.0.1.ebuild 2198 BLAKE2B 69fb063735521e9c5e25de4ca207c91317b1c4474792dce45287cdb346f33a910cbdcd57352782b28d94cce0b586acacdfae6749e8a419a38dd6682962db1439 SHA512 d9a45130c98bbf8016137de28825269ec18c0248b4a71c95656c63c0b418d0349030fbf0cd828094b2aec44a54ba96ea7b2b0889501ec83bf78e52455106e8e0
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-4.0.0.ebuild b/dev-python/twine/twine-4.0.0.ebuild
index 61e10a8a17e5..da2cc7fbd587 100644
--- a/dev-python/twine/twine-4.0.0.ebuild
+++ b/dev-python/twine/twine-4.0.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Collection of utilities for publishing packages on PyPI"
@@ -48,8 +49,6 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	# requires internet
-	rm -f tests/test_integration.py || die
 	# pytest-socket dep relevant only to test_integration, and upstream
 	# disables it anyway
 	sed -i -e '/--disable-socket/d' pytest.ini || die
@@ -60,6 +59,19 @@ python_prepare_all() {
 }
 
 python_test() {
+	local EPYTEST_IGNORE=(
+		# Internet
+		tests/test_integration.py
+	)
+	local EPYTEST_DESELECT=(
+		# regression due to deps?
+		tests/test_check.py::test_fails_rst_no_content
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# confused by extra log entries that don't seem relevant
+		tests/test_auth.py::test_warns_for_empty_password
+	)
+
 	local -x COLUMNS=80
 	epytest
 }
diff --git a/dev-python/twine/twine-4.0.1.ebuild b/dev-python/twine/twine-4.0.1.ebuild
new file mode 100644
index 000000000000..7f4803fc0f57
--- /dev/null
+++ b/dev-python/twine/twine-4.0.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="
+	https://twine.readthedocs.io/
+	https://github.com/pypa/twine/
+	https://pypi.org/project/twine/
+"
+SRC_URI="
+	https://github.com/pypa/twine/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-35.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/build[${PYTHON_USEDEP}]
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Internet
+		tests/test_integration.py
+	)
+	local EPYTEST_DESELECT=(
+		# regression due to deps?
+		tests/test_check.py::test_fails_rst_no_content
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# confused by extra log entries that don't seem relevant
+		tests/test_auth.py::test_warns_for_empty_password
+	)
+
+	local -x COLUMNS=80
+	epytest
+}
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 3510584a72be..7471acbf2f52 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,12 +1,8 @@
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
 AUX twisted-22.1.0-force-gtk3.patch 2634 BLAKE2B bf297589d56a59149e1a269aef416a9aef26dd2123cd9fc87358d19b279bd2924e84d3e9fffe5e6edb70f7268c19b4053cfdf6362b04dd6e91b3a2c997e0f92f SHA512 85b1678cf6c73e78004a015424f2e092b42bf4f5899ed607093b4c26ff1411fe22267df09c331f80086f9d46e5a6dadfad7fe62cbb04e3edeaaa05f40c96239a
-DIST twisted-22.1.0.tar.gz 3883519 BLAKE2B 0b438481af94fbfe08c7470a71421e176ca4994efaf7144b2bd3bc7e69c774295e04831d5356af104d087d970856c1c153b30331cb1598226f83e761b624a53c SHA512 1db52865d00e07044bc755b25bef2fa260cf269a8b51512bec97a015fa484d0b331b41154b52f97b5e8c477d3e5ad1d003f5ac15c7361988d073d097c6e7355d
-DIST twisted-22.2.0.tar.gz 3887750 BLAKE2B 43b50aa33f9a70f2123930ebfc0e9fec08a6faa791dc8fb73c1252fc1de3e00844e421f653d920e5f651aff89557750c6dc6c4557689e01bc9a0793c15de8eea SHA512 a2f66055f0ea6658a04888316b9eb90bd0f389c72db8315fe1722a70f16bb290805d98acc8cfd8a5d22b4817683603aaea50bb04a204927898bd74fc58a1db6d
+AUX twisted-22.4.0-py311.patch 2166 BLAKE2B d81ced5ea6e669615ce8ae677a40f22f6abe27a238f81de8f5d0d907b2831c12d37b3365083d15f5d395ecb75b00e2e1d66cc2a61673afd6b6ea80ddcb3fba13 SHA512 3a1a23beea84df6f668b96d962c78a2d4bafb114b9a18f18bf15391e0ca66647a4b702212cda8ab4e1e162ccb274d07b525c712f248c9f3a267c80c7ecc4bd34
 DIST twisted-22.4.0.tar.gz 3896724 BLAKE2B 830a724156473a28394e6c731f6cec184c491410dc880bc2e37a99cb460c7fe040219463f224941532b12478abe953aa0228c70676e5baecda4a3b2bdd6a0a32 SHA512 776d36040bcefb9ca65e471d9058fe1067ffc8171a501cb451e9d4824a88dd83f79dc9b27a127ca898451587454ee661000acbce6c4c39b069aeadd64710f103
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-22.1.0-r1.ebuild 4696 BLAKE2B 9391c59f3de7d47632180b7a04040b493f08598cb14ad637b8640832b84270fa18ef2c2eabb02258b7877bcddef4e006a466a25e2d56283406026e458df4a328 SHA512 d438f9b45e84be4a06464f0445d9812ba1407ff37f0c817e8ff4e599a3aa88641f772013d603147a552dfaae28e35b713f14913541ce82d0da2ec18e8897aa5b
-EBUILD twisted-22.1.0.ebuild 4740 BLAKE2B 20fd3b47a7880c92c2d44ff6509147b3a7fe66a27bd960236b14b5d1b31c51cbf8ddd0b0ddacbd41cd18920a4da07c102deab13643bf2e82e62a49027e6887c7 SHA512 717b0f7fc47f8ff0a5b470b5a9a0bf21f4c76d75681aec55763d8b0bcd0996c75242950fe7498e07e46046fa383fccf6f572ad6f83db97fbfa11da0b3111d575
-EBUILD twisted-22.2.0.ebuild 4328 BLAKE2B d8106f754f5244bf13d1e3b9c1a3be76c1b36816a2e36e0fcfaceea9b193ecfc6da4e4b5fad53b8c13f5bf84d787cdcb90c51a5457134f6c18cc27ae2221c508 SHA512 a5049f1f33c2d765708ca836bb62f081931572ff57669a9aa13c04d4d117642276e257fc848a4b9699811492eec497250be3c4741eca67b8815aecde3ace6387
-EBUILD twisted-22.4.0.ebuild 4450 BLAKE2B fbade8a9c7fe3e7b23fccbf858f70002d8563796d0799a4efa7fe23a7520ae942b3e7ce18de6472eb253ced328e769ff2d9f9e4cf55494826125cba258b04b31 SHA512 7adc711818f9943c2f617022032e9139f0bb0da56984e3bfc0f0feeca0a0423444b85e2771f6292927ca5b063531d6377b3a142835d2aa889b16a1e5cf5dcbf1
+EBUILD twisted-22.4.0-r1.ebuild 4762 BLAKE2B d7a1d0a333cbc3536fd489f6dd3addf5e0a3eb619891ff56414bf687152d9a21ae1efd21ded5432f98269ca6c5dd3abb30d9f6f1d841f2675109acdc5f7505ac SHA512 8dafe34f63c19906290b2b5db3457b2fe0691ff80c2472dddfcead28370315d9b06c3afc9ba417afdb62ba99e1e42b87a071206b4ac8a199ee513ddb4485532e
 MISC metadata.xml 1352 BLAKE2B da3eecfbfd73709ff8fb48b985d64fa80d134c38a0c04d8c7b08e0ebd936cb2179f579deb6f91f38fd08b74e9454b693b4a89c9ab194296104c519e6f80ddc8a SHA512 f244db7eb7a13e35f8825e2b16cf3cb953c47e68be234efc9d922462cc7ee66e1748e09bf4735bee59cd1016eb38c64ca23f70a25da5bb7311f869cebbb45569
diff --git a/dev-python/twisted/files/twisted-22.4.0-py311.patch b/dev-python/twisted/files/twisted-22.4.0-py311.patch
new file mode 100644
index 000000000000..ed8ded87d4de
--- /dev/null
+++ b/dev-python/twisted/files/twisted-22.4.0-py311.patch
@@ -0,0 +1,55 @@
+From 074fc742a699278ea5266b34aace1e34049b3de3 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@canonical.com>
+Date: Sat, 23 Apr 2022 22:29:07 +0100
+Subject: [PATCH] Implement twisted.python.failure._Code.co_positions
+
+This is needed for compatibility with Python 3.11.
+---
+ src/twisted/newsfragments/10336.bugfix | 1 +
+ src/twisted/python/failure.py          | 5 ++++-
+ src/twisted/test/test_failure.py       | 1 +
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+ create mode 100644 src/twisted/newsfragments/10336.bugfix
+
+diff --git a/src/twisted/newsfragments/10336.bugfix b/src/twisted/newsfragments/10336.bugfix
+new file mode 100644
+index 00000000000..a7ffab3627d
+--- /dev/null
++++ b/src/twisted/newsfragments/10336.bugfix
+@@ -0,0 +1 @@
++Implement twisted.python.failure._Code.co_positions for compatibility with Python 3.11.
+diff --git a/src/twisted/python/failure.py b/src/twisted/python/failure.py
+index 6471e7bca59..c5a359e405b 100644
+--- a/src/twisted/python/failure.py
++++ b/src/twisted/python/failure.py
+@@ -130,7 +130,7 @@ def _Traceback(stackFrames, tbFrames):
+ 
+ 
+ # The set of attributes for _TracebackFrame, _Frame and _Code were taken from
+-# https://docs.python.org/3.10/library/inspect.html Other Pythons may have a
++# https://docs.python.org/3.11/library/inspect.html Other Pythons may have a
+ # few more attributes that should be added if needed.
+ class _TracebackFrame:
+     """
+@@ -202,6 +202,9 @@ def __init__(self, name, filename):
+         self.co_nlocals = 0
+         self.co_stacksize = 0
+ 
++    def co_positions(self):
++        return ((None, None, None, None),)
++
+ 
+ _inlineCallbacksExtraneous = []
+ 
+diff --git a/src/twisted/test/test_failure.py b/src/twisted/test/test_failure.py
+index 6dd7c682bf9..6fd82c868ec 100644
+--- a/src/twisted/test/test_failure.py
++++ b/src/twisted/test/test_failure.py
+@@ -825,6 +825,7 @@ def test_fakeCodeAttributes(self):
+         self.assertIsInstance(code.co_nlocals, int)
+         self.assertIsInstance(code.co_stacksize, int)
+         self.assertIsInstance(code.co_varnames, list)
++        self.assertIsInstance(code.co_positions(), tuple)
+ 
+     def test_fakeTracebackFrame(self):
+         """
diff --git a/dev-python/twisted/twisted-22.1.0-r1.ebuild b/dev-python/twisted/twisted-22.1.0-r1.ebuild
deleted file mode 100644
index 60f40b4e8081..000000000000
--- a/dev-python/twisted/twisted-22.1.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc ~x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' 'python*')
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${P}-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-22.1.0.ebuild b/dev-python/twisted/twisted-22.1.0.ebuild
deleted file mode 100644
index ab2a590fca6d..000000000000
--- a/dev-python/twisted/twisted-22.1.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' 'python*')
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${P}-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-22.2.0.ebuild b/dev-python/twisted/twisted-22.2.0.ebuild
deleted file mode 100644
index 6c2dcb735c72..000000000000
--- a/dev-python/twisted/twisted-22.2.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' 'python*')
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${PN}-22.1.0-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]]; then
-		python_foreach_impl python_postinst
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-22.4.0-r1.ebuild b/dev-python/twisted/twisted-22.4.0-r1.ebuild
new file mode 100644
index 000000000000..9863bb3ab1f5
--- /dev/null
+++ b/dev-python/twisted/twisted-22.4.0-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+HOMEPAGE="https://www.twistedmatrix.com/trac/"
+SRC_URI="
+	https://github.com/twisted/twisted/archive/${P}.tar.gz
+	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="conch crypt http2 serial test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+	conch? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
+	)
+	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
+	http2? (
+		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/h2-5.0.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+			dev-python/bcrypt[${PYTHON_USEDEP}]
+			>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+			dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
+			dev-python/idna[${PYTHON_USEDEP}]
+			dev-python/pyasn1[${PYTHON_USEDEP}]
+			dev-python/pyserial[${PYTHON_USEDEP}]
+			net-misc/openssh
+			!alpha? ( !hppa? ( !ia64? (
+				>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+				>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+				dev-python/service_identity[${PYTHON_USEDEP}]
+			) ) )
+		' python3_{8..10} pypy3)
+		$(python_gen_cond_dep '
+			dev-python/gmpy[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+PATCHES=(
+	# https://twistedmatrix.com/trac/ticket/10200
+	"${FILESDIR}/${PN}-22.1.0-force-gtk3.patch"
+	# https://github.com/twisted/twisted/pull/1723
+	"${FILESDIR}/${P}-py311.patch"
+)
+
+python_prepare_all() {
+	# upstream test for making releases; not very useful and requires
+	# sphinx (including on py2)
+	rm src/twisted/python/test/test_release.py || die
+
+	# puts system in EMFILE state, then the exception handler may fail
+	# trying to open more files due to some gi magic
+	sed -e '/SKIP_EMFILE/s:False:True:' \
+		-i src/twisted/internet/test/test_tcp.py || die
+
+	# multicast tests fail within network-sandbox
+	sed -e 's:test_joinLeave:_&:' \
+		-e 's:test_loopback:_&:' \
+		-e 's:test_multiListen:_&:' \
+		-e 's:test_multicast:_&:' \
+		-i src/twisted/test/test_udp.py || die
+
+	# These tests rely on warnings which seems work unreliably between python versions
+	sed -e 's:test_currentEUID:_&:' \
+		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
+
+	# broken by new expat
+	sed -e 's:test_namespaceWithWhitespace:_&:' \
+		-i src/twisted/words/test/test_domish.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	# the test suite handles missing file & failing ioctl()s gracefully
+	# but not permission errors from sandbox
+	addwrite /dev/net/tun
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	# please keep in sync with python_gen_cond_dep!
+	if ! has "${EPYTHON}" python3_{8..10} pypy3; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	"${EPYTHON}" -m twisted.trial twisted ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# own the dropin.cache so we don't leave orphans
+	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
+
+	python_doscript "${WORKDIR}"/twisted-regen-cache
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+python_postinst() {
+	twisted-regen-cache || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]]; then
+		python_foreach_impl python_postinst
+	fi
+}
+
+python_postrm() {
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+}
+
+pkg_postrm() {
+	# if we're removing the last version, remove the cache file
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		python_foreach_impl python_postrm
+	fi
+}
diff --git a/dev-python/twisted/twisted-22.4.0.ebuild b/dev-python/twisted/twisted-22.4.0.ebuild
deleted file mode 100644
index 65b454179630..000000000000
--- a/dev-python/twisted/twisted-22.4.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="
-	https://github.com/twisted/twisted/archive/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		net-misc/openssh
-		$(python_gen_cond_dep '
-			dev-python/gmpy[${PYTHON_USEDEP}]
-		' 'python*')
-		!alpha? ( !hppa? ( !ia64? (
-			>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		) ) )
-	)
-"
-
-PATCHES=(
-	# https://twistedmatrix.com/trac/ticket/10200
-	"${FILESDIR}/${PN}-22.1.0-force-gtk3.patch"
-)
-
-python_prepare_all() {
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:False:True:' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# These tests rely on warnings which seems work unreliably between python versions
-	sed -e 's:test_currentEUID:_&:' \
-		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
-
-	# broken by new expat
-	sed -e 's:test_namespaceWithWhitespace:_&:' \
-		-i src/twisted/words/test/test_domish.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	# the test suite handles missing file & failing ioctl()s gracefully
-	# but not permission errors from sandbox
-	addwrite /dev/net/tun
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# own the dropin.cache so we don't leave orphans
-	> "${D}$(python_get_sitedir)"/twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]]; then
-		python_foreach_impl python_postinst
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twython/Manifest b/dev-python/twython/Manifest
index 95207641a584..1bb5bb8a7691 100644
--- a/dev-python/twython/Manifest
+++ b/dev-python/twython/Manifest
@@ -1,3 +1,3 @@
 DIST twython-3.9.1.gh.tar.gz 372933 BLAKE2B 3db7f37e284ec83546e4f93a23e34c21ce9853e6206b62353e36b738ba591acadc55fd3dbbdf8cf7d74e63ab9966b9cdc7f49c5caa06e165bb7107b350509835 SHA512 e64d623dfa7ba2e81e09f9d8e784851b44201493d128ec576c4b5a9abc88debf1ca78f8a12933e0cd0a6b495012fa951bb62ea5d92db11186b37747b8576174f
-EBUILD twython-3.9.1-r1.ebuild 1255 BLAKE2B 76b5f3183fe108204acfc7bec8bb41ba85b2e190d0b7c31ee0424dd4afc75d5d18779194d6fcc9c0428817513641921dbc3684f67ceda331327844933afc2702 SHA512 0c71bfa0a9c1eda2e9a673524d235638fea83d5ce4e4a80169d1ff3faa08b8b03852d158513b92932f09724bfe39ab0a29a11363542aba8f95e1abf24ae0a16c
+EBUILD twython-3.9.1-r1.ebuild 1255 BLAKE2B 3490430c9ada260540bb606e5cfa86be9f5b2a68af2fbd448df864cc0a78ebbba911254bfc1da7a3536344a93a5097f93cfd441be11e98430ab4b04d6d4c5f8a SHA512 e614b9c53a079637c8b8e3c69f08438c767214a0510b8b9f62a93a7c2a3d505220eb8622dbfe3dcc76f3c01de838e954607b6f3c5dae75eda8eecca94dfc7799
 MISC metadata.xml 407 BLAKE2B b4aac660a7929463899fafba57aab22c8175ae0f72587bb28fb765a8b0ec326085730bf3931562c27666917fe4d6d1ffa44462cb0856f46997f72d917201b7dd SHA512 cb71d9c30b5639d240bbb046479415d6520d42e3cff07fc30f8fc35366bcb188bf12f3a1088e8447964c824f264f98df29384f0ddc3fac7e11d1da0279df6414
diff --git a/dev-python/twython/twython-3.9.1-r1.ebuild b/dev-python/twython/twython-3.9.1-r1.ebuild
index b2e6b5cb4936..cf9ff0e450af 100644
--- a/dev-python/twython/twython-3.9.1-r1.ebuild
+++ b/dev-python/twython/twython-3.9.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 6bb775168e21..5244b0be49dc 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,3 +1,3 @@
 DIST txaio-22.2.1.tar.gz 53645 BLAKE2B 375203ddbe65d293ba0bf85e316880d552f47cbc9008bd41e50976ee097940c626ec66ad25e0b5322493f71f77141d03f543ce9c9d83268a1a896b16f434ccaa SHA512 b5e33ba671ab215dadf4c348b01e9d5057d080c21707d31e38912fe596aabd7b388e8c5e0f2dd2b7d0d09fe0a175a0906e2a2ee428c1a943e786afa79182631e
-EBUILD txaio-22.2.1.ebuild 908 BLAKE2B 56c146ed48878542cbcc90a73bd939ccbc57401eae379ab032f089e50f387a3f5eff5ed91c5d6422b1ec5f1552349f6a6bd3a52003dd2397bf026d70d5c8604f SHA512 568b6cb21bd45b0e6832c3e64d23f1c0dcad94663ca1a2d728603d724342c8e14c1cd313fc3e4207d5d06c2003d6c01f4724b6f7cbe6be4c022077896ff399e1
+EBUILD txaio-22.2.1.ebuild 1152 BLAKE2B 62d737aa0bf4f23fca32e15049ef88fabcae57d98ea4bdc2c82bba3d5da648aa40b03999701eee02fcfe32fb3233ee5910e097e487960a0672c9eb5c82cedc0f SHA512 b3cac6ae13833a8784cfa897ecccdd543f55f6ce429adaf89ac80256d50a7863f6c49ee2d6532deaa30f43763f4b8eac204077ec21de939198ea22d8dc204860
 MISC metadata.xml 618 BLAKE2B bd097fc800fd543169f113520e8579f6514a355de3d68548e48e6037812b192bb4f6f8d4c2956934ee9cf88e6d13a11f8a2f95a3cdbba95f66638593734087d1 SHA512 fd8817810ff9ee6ab874f8bce30c1a1834caa0c5b22139d2c1317722155ff87e15a05c3f95b6f23f03e7b98807d0a71b0e2081518cc5e2086718cecea42b0c42
diff --git a/dev-python/txaio/txaio-22.2.1.ebuild b/dev-python/txaio/txaio-22.2.1.ebuild
index 173b2c1b92f6..9b967afe9b6f 100644
--- a/dev-python/txaio/txaio-22.2.1.ebuild
+++ b/dev-python/txaio/txaio-22.2.1.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
+HOMEPAGE="
+	https://github.com/crossbario/txaio/
+	https://pypi.org/project/txaio/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -21,11 +24,20 @@ distutils_enable_sphinx docs \
 	'>=dev-python/sphinx_rtd_theme-0.1.9'
 distutils_enable_tests pytest
 
-EPYTEST_DESELECT=(
-	# Take out failing tests known to pass when run manually
-	# we certainly don't need to test "python setup.py sdist" here
-	test/test_packaging.py
-)
+python_test() {
+	local EPYTEST_DESELECT=(
+		# we certainly don't need to test "python setup.py sdist" here
+		test/test_packaging.py
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# tests for removed asyncio.coroutine
+		test/test_as_future.py::test_as_future_coroutine
+		test/test_call_later.py::test_explicit_reactor_coroutine
+		test/test_is_future.py::test_is_future_coroutine
+	)
+
+	epytest
+}
 
 pkg_postinst() {
 	optfeature "Twisted support" "dev-python/twisted dev-python/zope-interface"
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index bd0da9b203c2..2be65d677d63 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,7 +1,5 @@
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
-DIST typed_ast-1.5.2.tar.gz 252310 BLAKE2B c36ab31e4c266de38a07935fc72ece62087bc52a6ebde401f9b2dcc641af064828572fa6e903dbdfb0c573ced10686b8dba995d316a5f7a7ee68efd3a4e9520c SHA512 7da72fc0c4fcb74cb41914765baea5c7f52b1e8a5c58883877e702765be59d3dd8c7f73bd5759a65781d04fdecbcf46160ff4402578a92685f25163e12b93558
-DIST typed_ast-1.5.3.tar.gz 252510 BLAKE2B e258b6c931d31a528091be2e5f7f9bf55f7fa48a14221a95e77924c18879480a34cd8293f9c1125810a43ab001195da2b36637aaee2c9b895b346cc94cab6577 SHA512 481fffc79d99f1f7c0009a9a4f9151745d17269827ea6306f35a015dc9e4cc3d85068948e157076fecff87d9301c18f637edfe7f26d63779ccfe38bf10105969
+DIST typed_ast-1.5.4.tar.gz 252491 BLAKE2B 07a97a881cd4c015897ca85e0b46acd6f63c48dbc69f4d73ad5e3bfd42b1b995a614d97b81c8d21c8d5dcbdddc838bffde033e11b55d866fa8e8db0aa8048731 SHA512 1ff27316d8e07219ad5b3744c167b7a7dfebb992f8ebc4623bf510f8b5d2b939cc9f659428e3228a42cdec0e63215cca973458aa914f2efdc59d5f33c150e153
 EBUILD typed-ast-1.4.3.ebuild 600 BLAKE2B c5bf2d281d2678b0b8c84377ed94fb030c27d5458e6d1de25bf7d6cec22fae095cc3c3177b2f50e6d8c3c3858f75a90108ff791804e4836699f5b2b5202935c0 SHA512 125c63b109886b55c4d6d233bda6dd863a01a35d7023430c75db2a2a4298436826776c7550bc2a1d5a9c814428872fd7a8676d3fa36bdac9ab38326c9b07313b
-EBUILD typed-ast-1.5.2.ebuild 619 BLAKE2B 740331d8b7198c64dccae7cd3d48ed4e10979b4f87d945d5183cec613340a6a99cb169ad31cc545bac24569f58047a8aee497c342ecac62e6f6e351bcc116b2c SHA512 53a94a3f717298e65713f511536422f600065862481b31a6524a78253b932a6a5f2970f8d3bf06ef4e055e39639671549b95bb19754f6b33d5d59f9c580c6ed5
-EBUILD typed-ast-1.5.3.ebuild 633 BLAKE2B cca1a23b2d7eeab70d3133bd2eab7c1b549090deee174076ba2407917b24f458f141c4b736ade495f758461fd4a9708658ffbe77dc6b28218ae4ca7bc1e27b25 SHA512 dbe37206d2191f3e4bcddb8befa375eca6d9ace3ce0b7124893274fb9aad0bdd52d326c2f244de3eea7607412f8c13e7096977fed7e9edcb4225c1b8915b1999
+EBUILD typed-ast-1.5.4.ebuild 631 BLAKE2B aaa02e8c08e08567a169dfb1ffabc249a562eec5f471d4103763b63498efa1728862cd0fed0cd689c63b4d79013dce66d9981151f4833e0b3d30be8852251dd4 SHA512 b99c36da109a1fff0e46d37853b85f07b4a032c81f20e684a25369fb2e92fbbd58c27356bbdaa083d8329ed4b5a9e7471c5a935dfd54409f055bede879aa17c1
 MISC metadata.xml 369 BLAKE2B b92a11c32ddd0afacac11717dacfa997976da54d30c6330873eaf36cf1f9a748ab089b5e5d586302abe57d1579054df38a036cbd8534779f7daa59ed92e7bdae SHA512 fc1961ab74c1a975ba3423568be93e6bff1358cb29e3e7209043d890e1d6a9d8659b21a6a5d5c04f42377e608d547c55d008d77811d37bf46c6ccb44d5b931c0
diff --git a/dev-python/typed-ast/typed-ast-1.5.2.ebuild b/dev-python/typed-ast/typed-ast-1.5.2.ebuild
deleted file mode 100644
index 2699fccee1a8..000000000000
--- a/dev-python/typed-ast/typed-ast-1.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/typed-ast/typed-ast-1.5.3.ebuild b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
deleted file mode 100644
index bc287c6d0671..000000000000
--- a/dev-python/typed-ast/typed-ast-1.5.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/typed-ast/typed-ast-1.5.4.ebuild b/dev-python/typed-ast/typed-ast-1.5.4.ebuild
new file mode 100644
index 000000000000..83c8d1e17b58
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.5.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="
+	https://github.com/python/typed_ast/
+	https://pypi.org/project/typed-ast/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index ce392780834e..bae61decc5e2 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,7 +1,4 @@
-DIST typeguard-2.13.0.gh.tar.gz 36849 BLAKE2B ef9b724bdd5ef127b6ede4ff4cb1d4f4794b0e921512d2cbf474145bf64de0cae85b7f5283dfc7f0b750e79e1c44c03ce6b4c0f24a33ae961c428aa57f3b6ae5 SHA512 48df7a9d6ee2cc11b5118432afcda5e0939712ff66d67f3945e26047c0880a05c133b505869ebcef59ce438260b9f6d1806121d0d4828853bc3b9c3468769f39
-DIST typeguard-2.13.2.gh.tar.gz 37142 BLAKE2B 0aa3f53bc0d1aa485d071cd52d2458ab83c4d5eba88708240c100a3205a2714f39465cb48d82118eb6bcf1e30579e50bb5dffb31b3f2b673573481772d650a23 SHA512 a11c1b9ee417a99a8bd09f4b5b05c7cdf319748b8221a49d1ff76854e2f432768224437f82a41c0166e5b148a550b58afbabfa1935cdc2a049cda3010edd052a
+AUX typeguard-2.13.3-test.patch 1436 BLAKE2B 993cde140e693129636598fb2245bd3db3ef2e90a0e369b84f13bb1e268de01da6fce0887ce5f8773c94329004a572f6af0faa9d8e9615775ac039ccc860e20e SHA512 5ee8579344ff5a5356d157933cb67b25a3854ef2e64abf2a6864a49f8fdde7ecc8aabf31baa952e10a986f04235f1e2214947a7f064eaa155e40f60249350e68
 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 846 BLAKE2B e1baeae595157360ca01503c75327f9a8105d797795ceca35fa6c0ecb4b8d7bb47c3b9ea2f728e157acd9e43b5316da6e6a1213114df827b656ce11f6fd1c737 SHA512 4292f277d7251c86b559d21be26346a8a55bf047da85cdd1a78199e9fa697a0e7ba7a885a4dbd41ecf843e3d5968f7025bc4b255036da753da79ce49d9b28f27
+EBUILD typeguard-2.13.3-r1.ebuild 991 BLAKE2B 51aff6cc0d422148a35805e2da530b6cd90c3997968d80aa791fa2599e4f6d729b42e82c48698c757aeffc8093e681c0ce0d246039605f6eb5d1b05bdb79ad00 SHA512 1ea080ed184cec3007b4583f7890045dcb8e15f9b3f5d36afd25d8cac202b3f7f1a1eb39ff907a208b125d59d8323d60aca28d15be53b9ce129460a7326bdd25
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/files/typeguard-2.13.3-test.patch b/dev-python/typeguard/files/typeguard-2.13.3-test.patch
new file mode 100644
index 000000000000..3c01c018ea86
--- /dev/null
+++ b/dev-python/typeguard/files/typeguard-2.13.3-test.patch
@@ -0,0 +1,44 @@
+diff --git a/src/typeguard/__init__.py b/src/typeguard/__init__.py
+index 5684d63..27fa30b 100644
+--- a/src/typeguard/__init__.py
++++ b/src/typeguard/__init__.py
+@@ -61,22 +61,25 @@ except ImportError:
+     from typing import _ForwardRef as ForwardRef
+     evaluate_forwardref = ForwardRef._eval_type
+ 
+-if sys.version_info >= (3, 10):
+-    from typing import is_typeddict
+-else:
+-    _typed_dict_meta_types = ()
+-    if sys.version_info >= (3, 8):
+-        from typing import _TypedDictMeta
+-        _typed_dict_meta_types += (_TypedDictMeta,)
++try:
++    from typing_extensions import is_typeddict
++except ImportError:
++    if sys.version_info >= (3, 10):
++        from typing import is_typeddict
++    else:
++        _typed_dict_meta_types = ()
++        if sys.version_info >= (3, 8):
++            from typing import _TypedDictMeta
++            _typed_dict_meta_types += (_TypedDictMeta,)
+ 
+-    try:
+-        from typing_extensions import _TypedDictMeta
+-        _typed_dict_meta_types += (_TypedDictMeta,)
+-    except ImportError:
+-        pass
++        try:
++            from typing_extensions import _TypedDictMeta
++            _typed_dict_meta_types += (_TypedDictMeta,)
++        except ImportError:
++            pass
+ 
+-    def is_typeddict(tp) -> bool:
+-        return isinstance(tp, _typed_dict_meta_types)
++        def is_typeddict(tp) -> bool:
++            return isinstance(tp, _typed_dict_meta_types)
+ 
+ 
+ if TYPE_CHECKING:
diff --git a/dev-python/typeguard/typeguard-2.13.0.ebuild b/dev-python/typeguard/typeguard-2.13.0.ebuild
deleted file mode 100644
index 9ea46fa44506..000000000000
--- a/dev-python/typeguard/typeguard-2.13.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/"
-SRC_URI="
-	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest
-}
diff --git a/dev-python/typeguard/typeguard-2.13.2.ebuild b/dev-python/typeguard/typeguard-2.13.2.ebuild
deleted file mode 100644
index 9ea46fa44506..000000000000
--- a/dev-python/typeguard/typeguard-2.13.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/"
-SRC_URI="
-	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest
-}
diff --git a/dev-python/typeguard/typeguard-2.13.3-r1.ebuild b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..d7652e57ad9f
--- /dev/null
+++ b/dev-python/typeguard/typeguard-2.13.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Run-time type checker for Python"
+HOMEPAGE="
+	https://pypi.org/project/typeguard/
+	https://github.com/agronholm/typeguard/
+"
+SRC_URI="
+	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+PATCHES=(
+	# backport from https://github.com/agronholm/typeguard/pull/243
+	"${FILESDIR}"/${P}-test.patch
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# mypy changes results from version to version
+		tests/mypy
+	)
+
+	local -x PYTHONDONTWRITEBYTECODE=
+	epytest
+}
diff --git a/dev-python/typeguard/typeguard-2.13.3.ebuild b/dev-python/typeguard/typeguard-2.13.3.ebuild
deleted file mode 100644
index ea613cada856..000000000000
--- a/dev-python/typeguard/typeguard-2.13.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021-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="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/"
-SRC_URI="
-	https://github.com/agronholm/typeguard/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest
-}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 507b5228c333..b57d29ed98c1 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST typing-extensions-4.1.1.gh.tar.gz 78687 BLAKE2B 94a486a746ff76d8ad1c416b61ec3e22864246c531536d7db6f0aa5113adf0f4bcb9e8e843b9c7fdbbbe915375fa303211d66b9f838629ac0d43a768a4bc82cc SHA512 251e7bd0216d0b2a83d963bd528d94700f113cc0ccc98959d5512faf5c738e1332673f42709ce8b3b7f5c7573edb794c34f5c02d82fef8d4bbae03db50b1ce92
 DIST typing-extensions-4.2.0.gh.tar.gz 77169 BLAKE2B 3b7e91d0b410daf749d61213e8dc2bce069c05db7626a6c3a380fe1955ad97871f3c90782a8ba5114b11c42e0775558fd6fb1fd28a7cc0fbf2ec97480ef72298 SHA512 52e67eaeb3159e5effdcf180fc43d9881453c7efc00546335a8f31d5f7ab9859c2f89b29612861015ba490cdfd596720aa577630b424323256930b036b119776
-EBUILD typing-extensions-4.1.1.ebuild 784 BLAKE2B 0d99b1927ceaf5c206cb0a502b052af07ed02d0270a2a00734f6d9ffaa3cc0ee237b73ce72f6d3048260837dd7b502ae852dc4a6de02833078f028f206f5a62f SHA512 ed462ac9b2f54ae5acf87d46bfa9ea80954687a2d79a0a5489d5e8e4c1499fd6092c9598bb8e0905214cb931a89396b94fcd70441df03aa4fd7497447d217a74
-EBUILD typing-extensions-4.2.0.ebuild 808 BLAKE2B c449a0fe078904cd56c789c00bf2857329626747267d8ba82124db4cc6942f1e2fd287c381a34596a486bb9cecf6cde36f51ce0e52adfbf47845d5e0056c0c75 SHA512 4189354209c6af70eb6eaede4c113fcf5bda94312ffd4366874a16d4e1e5717c375a8132a6721178fcabbf57ff9ab4350e7bb0d61f5d31f0b75973f820312092
+EBUILD typing-extensions-4.2.0.ebuild 800 BLAKE2B 3a6eaef06790c8545f8b3fd14bdf3687cab9eee3c6c58891bf0f560413e223fc2adc4bcb3dae2b3c68f661bf484ef8f8765026edbe3bd65947d85001f661af80 SHA512 3af6e1ca2970b3adafc8029245bc6c2c205c32f31f201158ebee9aa1913f00e791d0106b94f45f5737620936411df6245b7bcd16ed763e8d6ac80421e496bd6e
 MISC metadata.xml 398 BLAKE2B bff4c130e83d0e2e21739d4767f4edda2d40b649943dd7c8138a5e4d9308d876abc0c2a8a93f875e84711abf00fcf2bce03668b40c5ab4c07342e4c8476d907f SHA512 abd5fde69521deed87ace92128fde7ed147c19e5cf60034fd4d82c7fe5c532e497034ccc15b00198b996f5c6d75504f38a3df3616162344fe142dba7a2783cdc
diff --git a/dev-python/typing-extensions/typing-extensions-4.1.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.1.1.ebuild
deleted file mode 100644
index 3205b1ad2b89..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=typing-${PV}
-DESCRIPTION="Type Hint extensions from Python 3.8 backported"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing/"
-SRC_URI="
-	https://github.com/python/typing/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}/typing_extensions
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-python_test() {
-	cd "${S}"/src || die
-	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
index ac5534869fda..a1cf51297725 100644
--- a/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.2.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}/typing_extensions
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src || die
diff --git a/dev-python/typish/Manifest b/dev-python/typish/Manifest
deleted file mode 100644
index acb52c4a0b9f..000000000000
--- a/dev-python/typish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST typish-1.9.3.gh.tar.gz 22997 BLAKE2B f399f5d9b3ae8f85f3b719de77d675b142ac45b6535f66d9d0d999411bc5bfc9100523667ea4c1d2be60c15a4bf35ec931ded9e1181a4545bbaa9b96fb27d0dd SHA512 baad9d2229ac289c4eb1d6e64bac0313efd4680f42a95270e0c1141d511392e6a95a5fea767943ddf432f5f0d48d95a05bbf26e06df188079ac177d321e4fa5c
-EBUILD typish-1.9.3.ebuild 613 BLAKE2B 452ad0e842a0e2a63d472ebbae19f5cb527dfee826680b085983425073907a2232689660c9f023d351db03ad874924405962470303b571dccf393776b26e6523 SHA512 26307eeaff4d3fded59ffe032e04bb47b7b2698ca6fdf629b55095058439e56d5407107a66c266314d25b98c1da69d039cf837b234396fc1ec37ddfd56ee3438
-MISC metadata.xml 423 BLAKE2B 094bd43ee9c6fb0d84dbe0a392dee0e22840c7050adb5efad4a499169a6a3a0e2d5312f9f1939c9d218de704033f7298d2675bccce907f093a7429d84316c3b8 SHA512 1066be7e2ae4bc4e3b313498055a9126614e73d63a6b9782feed0cf7232ff08f83bc51bdace70e4af1fbe6158256958b38a5767b3e80b7ffc390909e15bca78b
diff --git a/dev-python/typish/metadata.xml b/dev-python/typish/metadata.xml
deleted file mode 100644
index b498a186d60c..000000000000
--- a/dev-python/typish/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Gentoo Python Project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">typish</remote-id>
-    <remote-id type="github">ramonhagenaars/typish</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/typish/typish-1.9.3.ebuild b/dev-python/typish/typish-1.9.3.ebuild
deleted file mode 100644
index d78be374c291..000000000000
--- a/dev-python/typish/typish-1.9.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="Functionality for types"
-HOMEPAGE="https://pypi.org/project/typish/
-	https://github.com/ramonhagenaars/typish"
-SRC_URI="
-	https://github.com/ramonhagenaars/typish/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/nptyping[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index bfccc80725f2..52b8d3a0d502 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 687 BLAKE2B 418dddafb7e0a4a56ef2d814be9e57fb838a0c968dad89b831d4f6f21de7d5a8515878e2265ff6ba7d0d54bd4a5285ed280ba188406bb25294ccdb8f0ae50278 SHA512 d28cf6b3c515255513f73ee5df3891a1f783c81a7ab827549a3fa18583341c5c89658959d5c4f277efa5bda38e322948c78287c94c8da76d5f08eb70c6df988c
+EBUILD typogrify-2.0.7-r1.ebuild 732 BLAKE2B d94debdd48ef7674cb06ac5b3808993e4c762150f9c289a9f5664914daafd8ab706d2c0bff4336f8fee95741dc4058e6bca385776ae085a45fb59d787c6cbda2 SHA512 539088d3450ee08abb445f2e5ab40d0682b0e387df7380a8c79c0a7c6683b4dd4a90039fa517f9fcce92a1f3a9fe3290f3f66c66b050045add72f6805cd11a6c
 MISC metadata.xml 464 BLAKE2B 444a374a2f105a3ca17c78e8ab53300ecf6ea64669031e493a5a211d035a40104a1b97306817f0d9d02bed770100a8cd39b73ebbc273dbfd9f8dae8922ebf92a SHA512 1016d229071882740becd626c26283fb113205c2e327d668aee7ad47a512618a9e5820fe795298bb44ac54d602fdc8b55a7062e84936d79a01e7dc3271f574f6
diff --git a/dev-python/typogrify/typogrify-2.0.7-r1.ebuild b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..523c52bbe2fc
--- /dev/null
+++ b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Filters for web typography, supporting Django & Jinja templates"
+HOMEPAGE="
+	https://github.com/mintchaos/typogrify/
+	https://pypi.org/project/typogrify/
+"
+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"
+
+RDEPEND="
+	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules \
+		typogrify/filters.py \
+		typogrify/packages/titlecase/tests.py
+}
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
deleted file mode 100644
index 4528bdc47264..000000000000
--- a/dev-python/typogrify/typogrify-2.0.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Filters for web typography, supporting Django & Jinja templates"
-HOMEPAGE="https://github.com/mintchaos/typogrify/ https://pypi.org/project/typogrify/"
-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"
-
-RDEPEND="
-	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --doctest-modules typogrify/filters.py typogrify/packages/titlecase/tests.py
-}
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 89bd011b8595..63735e2cfada 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-4.2.gh.tar.gz 23649 BLAKE2B 8b50f13854543a3ba5506bf7562ef0f3a7e7b5a20c7af037dd6eece0af16ead2b762b652b9bee0aaeede73178137293773e428a347e78ae7df999be609a34e3b SHA512 574c2f886fa6d1f2973e1ce817bd3347a77bd3beb0535bf5ba93e028e31388987f3f55369bd5a4a4a86c72af226256cdd7803f5bbe3ca6ce891b5adefdce776e
-EBUILD tzlocal-4.2.ebuild 759 BLAKE2B 9f52364fb22c077174f3887c7571e1087f6317fef38ece6da59d70173050a635f13dedf5dfc13488020176728c67c5d1a62fe8a89b5276549a9ac3ac1b8cd921 SHA512 8f1f385e74eae2ecb9fe22031cb333af6afabca152f8c102ff11e4a47b00478286a52c017b1ffef46596e70da2b040dd90e0a61d5fcfe2198be021c4de5c94fc
+EBUILD tzlocal-4.2.ebuild 798 BLAKE2B dd00aae66784cfd7ac47468d9375f319e9af3e2ecdf509c2d84a11135a783b56887d863235c9e168e2ca1037504d51b2ef211900abc80d5f4353cdd44d3df4e4 SHA512 0f5821b7f65c9d1d6971821da7a36f398d658c9f93151784b0e2cb03a41c18d6a87b8161a9d0818bc1adc2ab0e28ba42d5e4419123c557ca23df92e7adc72e0d
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-4.2.ebuild b/dev-python/tzlocal/tzlocal-4.2.ebuild
index a266be3c8fb3..24e6796390c5 100644
--- a/dev-python/tzlocal/tzlocal-4.2.ebuild
+++ b/dev-python/tzlocal/tzlocal-4.2.ebuild
@@ -4,12 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="https://github.com/regebro/tzlocal"
+HOMEPAGE="
+	https://github.com/regebro/tzlocal/
+	https://pypi.org/project/tzlocal/
+"
 SRC_URI="
 	https://github.com/regebro/tzlocal/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
index 0df6e57b2ec8..5bf1c01d93dd 100644
--- a/dev-python/u-msgpack-python/Manifest
+++ b/dev-python/u-msgpack-python/Manifest
@@ -1,4 +1,3 @@
 DIST u-msgpack-python-2.7.1.tar.gz 20631 BLAKE2B 10008f0653f969f1f5655c894be5b2497d692bf7ebf6d50de221695cab9c3a973c0870a8162efe6b61f2d9d4fb062c4130c07cddff8d64d6258d7d832efe4021 SHA512 0825b9edee28db2c954c9c0d64987a4640f11af52570c1ad834882a5fcd2e3a76eab3524cc3bb639cacfaf9eef27bf0a75656b4d02bca42b2d35b708348691d6
-EBUILD u-msgpack-python-2.7.1-r1.ebuild 625 BLAKE2B 9f1ba57688d8538a1a001fbf113483c04935e574ed0ba242722b0b7fcfc13261b3966ac7604283fc5069de85a7fa080a586e1f4b992a04c6b6080e9c89f08fa9 SHA512 5572f6b22ac7e9e3ad1a70234f6e98fc3aeb4ffb3f2436ea2add4d85b045646a646b52fa53457ed0a330745eb9f5024c1264ca4641537d2f668fa8cf0fa01fb0
-EBUILD u-msgpack-python-2.7.1.ebuild 579 BLAKE2B bcc786d246e032aad792076351a83fdfab66416a66e3732eb9aed16edd5613c26f7e59c1b6735e253b1de39412c68888c06dfec1dfee831db9f0466248a99c87 SHA512 90e783256ccad33e6846f210560cd845c7e7adf6e62e6b216d7a50b0916d51a5007ea6ef4e8fded00df3511a50f0fa6e8a01fa2e3f6d651d0d90025324579653
+EBUILD u-msgpack-python-2.7.1-r1.ebuild 617 BLAKE2B a1f2c314652b07fad55cc7351e29b50bb35bb8715aa3f74213cfa7e5bfc69923cdbaf05c824d60c9e2846125af69d5186e56e878e5a25e2c8e37451c0edaa3c4 SHA512 f8a9802f2bdc4c6f46265ce4439f2999b8de6141467fa4898f58b7c9e9add44dbf2fa4ca1084ae0dcfb790b555bf3738adc94c04f854f5457ef2eefd89768dcc
 MISC metadata.xml 932 BLAKE2B 6c35c0276d1f132074198ec85c5b80967dda5eceef914b3e8c444c50926a83638a97754a483fbadd6246931af2eaf5de86c97d48ce6346da55dce1e577ea47eb SHA512 cdc35e790e2c454af8e82456fa438bfbe0c9e569001bd94d416b48d37f6ca8e78540fb76ad37c72c1cd632eff2f66d782e28265c5825f94f989786cebba59e67
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
index 71f7b6947b7c..a979a5962182 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1-r1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
deleted file mode 100644
index a7c25b1b23c1..000000000000
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="https://github.com/vsergeev/u-msgpack-python https://pypi.org/project/u-msgpack-python/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
index 857f7755aa91..ee3164d49fa2 100644
--- a/dev-python/ubelt/Manifest
+++ b/dev-python/ubelt/Manifest
@@ -1,13 +1,3 @@
-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
-DIST ubelt-1.0.0.tar.gz 242813 BLAKE2B 31376e56000c73db1173b930027b62c7dd465f9fc329b6016ae8678c70aaa376faa7eb1894060a663574651d517563cdbc67daf4171f3777bea368bc02d06b0a SHA512 718e52ac453cffa9192cf5aa70eb36d6aa09b75abaa0ae6e8ef861025cf92a4d0392c48e64d453f4d42a69aefc59da371e4b8cbab16410f34dee9700cae4b97c
-DIST ubelt-1.0.1.tar.gz 242552 BLAKE2B da4ceb039b926f942c593563e77b42ebfb39a75bfc2953a6eadf2430bda8ebe25faeb4a00714fc110486715da15515fa316d3705d9853a7eb93320ee694d1127 SHA512 150f1c76b5814441fe0bfd50017f37ede4d463cc4e23f152ac634e7531d83f28560415ad26527cd40a7ebdab546d7edd711a1ba0c728ef63791219bf4866099c
-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
-EBUILD ubelt-1.0.0.ebuild 663 BLAKE2B 179ce7bff10f356c1c1e3c1906756388b70fc1aa61386ad10905102198bda4e3e4815f2202285c99f44ea93b2325fe4326600f8e59d8a393dacd4c0f730741cf SHA512 3d3e9511114beb1011b5ee2206a385e2bb9b3be9c800186d8f54f48bcfb583068e16b45cfe314c4996cafc33e0460c282f1413344674f08053fb9b24fee3dab1
-EBUILD ubelt-1.0.1.ebuild 663 BLAKE2B 179ce7bff10f356c1c1e3c1906756388b70fc1aa61386ad10905102198bda4e3e4815f2202285c99f44ea93b2325fe4326600f8e59d8a393dacd4c0f730741cf SHA512 3d3e9511114beb1011b5ee2206a385e2bb9b3be9c800186d8f54f48bcfb583068e16b45cfe314c4996cafc33e0460c282f1413344674f08053fb9b24fee3dab1
+DIST ubelt-1.1.1.gh.tar.gz 263082 BLAKE2B c146cfa7084b1d04d5a16443e5f8bdd4858992c2de1ff68a28c0febc74728da6320f45661cea69f88530a2fb88ca421cfc103f7f9f6ff420cf65152cbd61576d SHA512 d4d77013920563f3b2e5f47365624a4a794d84047eeb2eccaf2888f8d574c38b047393e550399e0d7ea7df373dabd40acce05ac56db4f0099da8f2a39113fc5c
+EBUILD ubelt-1.1.1.ebuild 910 BLAKE2B e54c0a82b1b0b881cb42008ec7ed95fe931ec28bf910562fbf8c98f980ada79a2c61f9735e1bc50cbd8d4bbffe5ad2a91a2207c3463e7c8740a271ce3392b668 SHA512 bae44559a7367a187d032c306920c41382ad7f912a8319ae922de94caa5fdac9319a016c8da0f034214d13b61f2b698485d238ed5e7e3c9b050d1a765f976e39
 MISC metadata.xml 423 BLAKE2B 3327e3ecc16b8971759b84617779a2b4d5072a34547815c8314809a911e6d557fdea620c90a255ef7f89cb2c941a46a7e1dcbc62e5e6b46f19255758f42890fc SHA512 967c14f809f73fc1bb48d730406512d3f87531486701ad4be8dfb4e5cd0c1265c082596768d36c4950734c653cec56484fb3e5b79ce13dddde38977f88889124
diff --git a/dev-python/ubelt/ubelt-0.10.1.ebuild b/dev-python/ubelt/ubelt-0.10.1.ebuild
deleted file mode 100644
index aad8e9f06c5c..000000000000
--- a/dev-python/ubelt/ubelt-0.10.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=( 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/${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
-
-python_test() {
-	local deselect=(
-		# relies on passwd being equal to ${HOME}
-		ubelt/util_path.py::userhome:0
-	)
-
-	epytest ${deselect[@]/#/--deselect } tests
-}
diff --git a/dev-python/ubelt/ubelt-0.10.2.ebuild b/dev-python/ubelt/ubelt-0.10.2.ebuild
deleted file mode 100644
index 67d4f2466be8..000000000000
--- a/dev-python/ubelt/ubelt-0.10.2.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} )
-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/ubelt/ubelt-0.11.0.ebuild b/dev-python/ubelt/ubelt-0.11.0.ebuild
deleted file mode 100644
index 05531fa0f9eb..000000000000
--- a/dev-python/ubelt/ubelt-0.11.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ubelt/ubelt-0.11.1.ebuild b/dev-python/ubelt/ubelt-0.11.1.ebuild
deleted file mode 100644
index 05531fa0f9eb..000000000000
--- a/dev-python/ubelt/ubelt-0.11.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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/ubelt/ubelt-1.0.0.ebuild b/dev-python/ubelt/ubelt-1.0.0.ebuild
deleted file mode 100644
index 0e9c2987b85a..000000000000
--- a/dev-python/ubelt/ubelt-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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"
-
-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/ubelt/ubelt-1.0.1.ebuild b/dev-python/ubelt/ubelt-1.0.1.ebuild
deleted file mode 100644
index 0e9c2987b85a..000000000000
--- a/dev-python/ubelt/ubelt-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-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"
-
-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/ubelt/ubelt-1.1.1.ebuild b/dev-python/ubelt/ubelt-1.1.1.ebuild
new file mode 100644
index 000000000000..04c09d5462ff
--- /dev/null
+++ b/dev-python/ubelt/ubelt-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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/
+	https://pypi.org/project/ubelt/
+"
+SRC_URI="
+	https://github.com/Erotemic/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		>=dev-python/numpy-1.19.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+		dev-python/xdoctest[${PYTHON_USEDEP}]
+		>=dev-python/xxhash-1.0.1[${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/ujson/Manifest b/dev-python/ujson/Manifest
index 4555fb780a71..bffa60a07818 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -1,3 +1,3 @@
-DIST ujson-5.2.0.tar.gz 7135591 BLAKE2B 1207e1eae65f859018bbb7a868c2b2010c0e4b41214ea63c1aef00a41600f69e941a1a02d22f1702f3974a3f12e90a731717681e6e9a9e782fc49716b4b13cef SHA512 c0ef90bdaa2d5e02109ea3e01288ff9ab4e4bd865ea0a33d915de2878cb13a04f24fe278f86582e042b430e6b20077f2b337d6a4349777a803e9725666952fd6
-EBUILD ujson-5.2.0-r1.ebuild 825 BLAKE2B f90044fcc282e40cc78e7f042693349bca92d3e61a1ff49e1ffb8a03b1723b862eb62aaa680b6feb98622f5fc40ea33870afd69779a11e53127b4acec69d291a SHA512 2d228a0b483c039844e0f562c40dcd2eb64d8fc8e63da9d3a5c4e888f179d2a31bb84e6f9d2bf0e557feef1341f0c2291a1858e00ceb650c8a25b328427138a9
+DIST ujson-5.3.0.tar.gz 7137499 BLAKE2B 5aa61c465156c02aab6095acbd9764fec9cfdc1c42312852e804573b0f0e677591812d31b362f671468caea8159d0c5719eefc49847b993cf571ab40416f8652 SHA512 7342ab3548980e14ff7a931b40aa9886703c167b3f079d01e1d07c9f6408b2994a84cf157ff8966400af057cdd8f332d6f47e2747b918efcd67129727434c501
+EBUILD ujson-5.3.0.ebuild 869 BLAKE2B b5296542bb62998cdf588e8582998be06313286e4bf28a6fbe9d3a9b4b74c5e3ff7b8a59eea15e1d619a96ed9862beff96e17fee41e6cad4cf2ec29d35de7849 SHA512 f8172bf60dcad79c0c59086609abc46d9f516420c9e66b55d71a267fd2a14ace201f8c8c679348c6726655a5763d0b5377e3938d16d116e9c9bf0216de83cd31
 MISC metadata.xml 494 BLAKE2B 8e20150926d62643e7ff2110cba22313db0c0e3112290ce08302d57103aa35c42a56921d0b46e0acca2ef83756eb4f7384f23ddb06fe41ef6c4a28921f11ec33 SHA512 d9c0a59f916b84d50e51a21152c1815fea90a909dc9bd44ea620b2a33ca6a92ee237aafe29debcc9d1a2bf63c84112300845309eb0ab1265e5d2b0c05dd313f0
diff --git a/dev-python/ujson/ujson-5.2.0-r1.ebuild b/dev-python/ujson/ujson-5.2.0-r1.ebuild
deleted file mode 100644
index f0755a0c8f37..000000000000
--- a/dev-python/ujson/ujson-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
-HOMEPAGE="https://pypi.org/project/ujson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-libs/double-conversion:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export UJSON_BUILD_DC_INCLUDES="/usr/include/double-conversion"
-	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
-	export UJSON_BUILD_NO_STRIP=1
-}
diff --git a/dev-python/ujson/ujson-5.3.0.ebuild b/dev-python/ujson/ujson-5.3.0.ebuild
new file mode 100644
index 000000000000..4b3de22aa5d0
--- /dev/null
+++ b/dev-python/ujson/ujson-5.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra fast JSON encoder and decoder for Python"
+HOMEPAGE="
+	https://github.com/ultrajson/ultrajson/
+	https://pypi.org/project/ujson/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	dev-libs/double-conversion:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export UJSON_BUILD_DC_INCLUDES="/usr/include/double-conversion"
+	export UJSON_BUILD_DC_LIBS="-ldouble-conversion"
+	export UJSON_BUILD_NO_STRIP=1
+}
diff --git a/dev-python/ukkonen/Manifest b/dev-python/ukkonen/Manifest
index 74598ebabcdb..90a88a24984c 100644
--- a/dev-python/ukkonen/Manifest
+++ b/dev-python/ukkonen/Manifest
@@ -1,6 +1,4 @@
 AUX ukkonen-1.0.1-musl-include.patch 427 BLAKE2B 23170cd4a78ddd157d1230c2a072180a472394a06ce7afa702c1ed0bdafccea726405387dc65bd963cb8a6e7ea21cc7179fc4b9d36622f28952ea6c0aa003760 SHA512 4146508c56ecbe4edc3f77a92536098f93152e8cd68a0c710a2af7a6ded357795a5cc015b31cc198f66939e9cf0a258cc9db41a0458209ec0458bd19332b1494
-DIST ukkonen-1.0.0.gh.tar.gz 4541 BLAKE2B c93623523fc57b27bb68a2bb41fca51a967910c4936140bee628b4270e343e7902b9e7a6fb85bc89c197e2b0c6897c2d3f788886541bc8b6b7758a6f158a5c6c SHA512 87e3078e8cd4807af3f91c1be7766454705b077cb093eadac34d1af4d56b458813c1062eb086232bffa43b5ca7aa07ed88192e56dacce96c6781f16129111d79
 DIST ukkonen-1.0.1.gh.tar.gz 4547 BLAKE2B e574f21c0e26751e48d16409747b1979ae903c0cd812d52b1715eaa2025cf21c9d24aa3963de61c6ef4126eb4ace8fe974966e768d05c5db8372e0ae96941123 SHA512 23978b8e22454155e7d8a0d2dbb963f4aa5a6be6cdd75a74e8ec5e06fe32a96b6fc14f0f6d03089726bf761ad6d833dc68ea3fb6cad1ad2ee5b259043072875a
-EBUILD ukkonen-1.0.0.ebuild 625 BLAKE2B a8dadfe11d9d1a4eb8e927629c579f7512664f366c3cc4f2d4f2d60668f582205aeab77eeea2ad526a9319545fda87536ee38cf6186fbd1fa63efb75d7958f5d SHA512 139930ed1b1e9c748a0c4a6cf4e702e1556768d3ad82495dba99eb6e8f76994829c2b7a864da7fcd0dab25f88e1e2e132943d90fac8c715de36743ced3a0e86f
-EBUILD ukkonen-1.0.1.ebuild 677 BLAKE2B 5e54f75ff39a2843230d107950f9e11416709a1cbc4164a4a4fb278c78d40be4dc3158b01612f2fc625b38e427322686a4f04b518cb36decb2be4515d954004c SHA512 5eedec0bb864ce87bfaa444d61e74bc340dfa0058b664c68172fd58bca7817b0a68123d4f3a9dc7ee9576cdccbcc0b556b5531fd81c838032638abb04cbc32b8
+EBUILD ukkonen-1.0.1-r1.ebuild 714 BLAKE2B 51b09fe710b9e0eaacc6af5723954771788d99eee68d580fb24015c452d950dbe20a2824ae1328412e57aeaa8ee2710a53e6c3061b88fbf0ed175c740e29df2d SHA512 c1409ab1635fd16efbb955bb35c0b495327881b7b29aea26b421e99a128fd80a05acdbe7e24545671695cc7b97d0c6064dd4b646353629b7ae552686856d4d82
 MISC metadata.xml 345 BLAKE2B 316467291e5dee76baeaaed62a17e6c5e6216dc8eec5ffbd0fe7465e8c70cd47a2b1ec0c15f082c4bc17a1794ebfec01ab65d6260b0bb6d7af9830e0233e379b SHA512 891214a8416169a7cffc49b0682d1e2e471da4683a7dd528da6d75045d11d16c18fe4bc9ad0c883fbe4a877878e7a0434af1244353910ccc3aa1c193fc2d7a16
diff --git a/dev-python/ukkonen/ukkonen-1.0.0.ebuild b/dev-python/ukkonen/ukkonen-1.0.0.ebuild
deleted file mode 100644
index a4cc21241192..000000000000
--- a/dev-python/ukkonen/ukkonen-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of bounded Levenshtein distance (Ukkonen)"
-HOMEPAGE="
-	https://pypi.org/project/ukkonen/
-	https://github.com/asottile/ukkonen/"
-SRC_URI="
-	https://github.com/asottile/ukkonen/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-	' 'python*')"
-BDEPEND=${RDEPEND}
-
-distutils_enable_tests pytest
diff --git a/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild b/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..f01ec2986b4c
--- /dev/null
+++ b/dev-python/ukkonen/ukkonen-1.0.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Implementation of bounded Levenshtein distance (Ukkonen)"
+HOMEPAGE="
+	https://pypi.org/project/ukkonen/
+	https://github.com/asottile/ukkonen/"
+SRC_URI="
+	https://github.com/asottile/ukkonen/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cffi[${PYTHON_USEDEP}]
+	' 'python*')"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-include.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/ukkonen/ukkonen-1.0.1.ebuild b/dev-python/ukkonen/ukkonen-1.0.1.ebuild
deleted file mode 100644
index 1fbfd7a8edd0..000000000000
--- a/dev-python/ukkonen/ukkonen-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Implementation of bounded Levenshtein distance (Ukkonen)"
-HOMEPAGE="
-	https://pypi.org/project/ukkonen/
-	https://github.com/asottile/ukkonen/"
-SRC_URI="
-	https://github.com/asottile/ukkonen/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-	' 'python*')"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-include.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/uncertainties/Manifest b/dev-python/uncertainties/Manifest
index 7b780e6960f6..e25c237e9afd 100644
--- a/dev-python/uncertainties/Manifest
+++ b/dev-python/uncertainties/Manifest
@@ -1,3 +1,5 @@
 DIST uncertainties-3.1.6.tar.gz 158419 BLAKE2B 09582936a9b982efeee6cf3c99de568ebc820940ca2bfa1e4fd10edbcbd9447e7711158f8b98567a506d6c5a9ecf63b6e21d296c7f8d8dcbbaf4c2fb6a571355 SHA512 8835ed851d00bbe830770e57bc89ce57acf291e6cef2fca59897adb75e1e2de456da3631f73242ade20f567358b1d727b2b7f5df02e2f3e0cd8d861e81a6a211
+DIST uncertainties-3.1.7.tar.gz 158727 BLAKE2B d68b74d291b1f6c4505a47f6fa19653eade43dc1ccaf78e02bd320df92d8bdaeac1b0808a21dceb046a6e2acd076836728b4014d39ca8da17647582320ce50e8 SHA512 24576415265df22459d83bb28e632195e6760204a6e11523821afe25222ea3e035bf7f10c552ec456bb2cdf42a09e296865f9bf0d13ff44beb88c11ebc479ff9
 EBUILD uncertainties-3.1.6.ebuild 668 BLAKE2B 0b387a85d90f1747c800cfd635fcac300c131322028424ad6aec80fdd296add92c5c0ea48ef2b4acaf38dddb3fc0b4161f130c3c781fe8825abce91c1026d524 SHA512 85b3879624d8ea6baec85c6ef2dba6e7e409dd11bcd788584bcbd443fe3e19700f650f447352bd138f66b3e7274404268ec609dcf834cdc037cf37d4c9efc303
-MISC metadata.xml 860 BLAKE2B 4877fe2c68a733a741d7b4cc3d0543695939de825a1a5311b38a9c82d3fe2693607d34d431894da96316040bd5b619d95ee7c87b9fb036744b33860e10a2b0c0 SHA512 a26dcc38b7e2a8ddfe26052615032409ccd8b8a83b767f3477e08e41d4f215f07ba784652af6b49ea18c8bbcea24853566af3103848e7be8131ddaa81537f20f
+EBUILD uncertainties-3.1.7.ebuild 700 BLAKE2B 5d64bc3bff06a8f4ebb1a78d7f226fca944530737f0292e85beadf9aadffb373304b3f9e8f07958a6298d10e285d4b17439bf119021fe40dec279df58725439b SHA512 a92a1c70573a9a20c1be2e224199781f674e762d494523c56d5a1e5d3ab54ccc6d81b6daabcb8b10ba837d89ad4f805d81dde556d33e1c46950ac11ff61c7d1e
+MISC metadata.xml 967 BLAKE2B 9a034d38b92f106bd05fff4c4e30830dd76ff91af3c6e9a7709a84f9ade8d9ad1b51979c45537a98e6088cb7c7a187aec37c64256a750389131f12d1b7361451 SHA512 c6fd9c00ca9f320ed433308918e1f0917c7548817b1ea4dbcf50044854e473c6657300550fb7aff0cd3b68be5c26622a4fe5a7995155485f1588e658ab51b7a8
diff --git a/dev-python/uncertainties/metadata.xml b/dev-python/uncertainties/metadata.xml
index b9b57f692bac..7c343d7bf1e7 100644
--- a/dev-python/uncertainties/metadata.xml
+++ b/dev-python/uncertainties/metadata.xml
@@ -5,6 +5,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <longdescription lang="en">
  uncertainties is a Python module, which allows calculations such as
  .
diff --git a/dev-python/uncertainties/uncertainties-3.1.7.ebuild b/dev-python/uncertainties/uncertainties-3.1.7.ebuild
new file mode 100644
index 000000000000..6a0cd2fa7e53
--- /dev/null
+++ b/dev-python/uncertainties/uncertainties-3.1.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python module for calculations with uncertainties"
+HOMEPAGE="https://pythonhosted.org/uncertainties/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (	dev-python/numpy[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc --no-autodoc
+
+pkg_postinst() {
+	optfeature "numpy support" dev-python/numpy
+}
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
deleted file mode 100644
index 2a593b05ed87..000000000000
--- a/dev-python/unicodecsv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r2.ebuild 689 BLAKE2B 353911f8ad52c6ef6f6fe9234bfb7562a7649b282152e53f1294299f102ff0cff149508d89d4b95dd18bbd49aa00ff1e7c703d482e8eadc69dcd42700a73505f SHA512 d8be3f0ce62dcbd490310c21355faf74b5d1b9910e17c612dd5db8a9587cd31f41d3787630cfeed92b9f01e8c4f9454c1cce50a6771b70ac10109cb78be1af9b
-MISC metadata.xml 402 BLAKE2B cfdc79e02e047edae2f1b9542ace868ff7103131bd85d2563ea4a97c7bc82811cc93f523832502ad61d2f6bddb591a2d977e02154b549565a3914ae2388d5b9c SHA512 7f60cf22a3e47d85311905d0ced4a1efd984bc95dc351ae529dd016cc34ae70f88a38901625967cf15ba42895830693ed43976a93cc5cb1644884cf725bc7a95
diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml
deleted file mode 100644
index cf5fcf2ae833..000000000000
--- a/dev-python/unicodecsv/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="pypi">unicodecsv</remote-id>
-		<remote-id type="github">jdunck/python-unicodecsv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
deleted file mode 100644
index b049015f550d..000000000000
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode"
-HOMEPAGE="
-	https://pypi.org/project/unicodecsv/
-	https://github.com/jdunck/python-unicodecsv/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# un-depend on unittest2
-	sed -i -e 's:unittest2 as ::' unicodecsv/test.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index c09852058420..cdffe7e32673 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST Unidecode-1.3.4.tar.gz 192346 BLAKE2B 34edea805896022fa42f47929a55ba01850475cb49431c4c50329caa2f198455704224320887ac7dcad5fba3517ab42cafc8ade726e785be0d0141814a5ad455 SHA512 bdbf482abd0d93ea8d891b95aea9f95cca6f85dbe71cd2bef4664216b3aa1d672c2f4ecf3b8bf356cdb1d8e4a1141c296728498473d9d0067d9774d0a7de8d48
-EBUILD unidecode-1.3.4.ebuild 554 BLAKE2B efb1600b24baaddd38e4b47bd4db352f6f6ac772f07bae722b9a93496b1eadf242ef912095c2558bb87300bf38951b99b9e0853c8e2cc2c0c2f48832379f71ba SHA512 6c55e524ac4b758fdd5d15f5967bbdc7cb5e2422bd43a966c3565913b4cae0ca0d86a89b8e41dbde24f05cdcd18c4c43cb2a8b3ac3f774a99d76d86cdb6aa3b3
+EBUILD unidecode-1.3.4.ebuild 554 BLAKE2B 67782efa40c5adaa4ba476ef32b0e63b615911598a092f8b4edcdff6bbc9a877f4f2d6531843476f94002888137024b0cebc18744b9e4491b87e94e05b3b8574 SHA512 86deeca9109ecab541fe07dc4f4ea16366ea29b692c8333776459917ab43df7e992c1649ffe95bb99cd59f48692fa734e49b01f8e0fed4ef14871544c2b22bed
 MISC metadata.xml 457 BLAKE2B 43e1b676ecfc82f845bfc1b3dd2409756ca419086ccb693b39f73e2598b5de9a463fecb3dbda76d7e375b23a6ba06589231d6184a92872bd4f3c16080bef6353 SHA512 7cded888473c7a7829aaba7d63d5a54bc22f5e9829733d961d520a7d3f0ff57ee00e16c42811a6b63c0d02f9e3f93a1d0f539c8c79242038bcdfd594ab7d07c6
diff --git a/dev-python/unidecode/unidecode-1.3.4.ebuild b/dev-python/unidecode/unidecode-1.3.4.ebuild
index b672c007a086..d30a1472394b 100644
--- a/dev-python/unidecode/unidecode-1.3.4.ebuild
+++ b/dev-python/unidecode/unidecode-1.3.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidiff/Manifest b/dev-python/unidiff/Manifest
index ec8dbe9a5bf5..0058e8a4ffa5 100644
--- a/dev-python/unidiff/Manifest
+++ b/dev-python/unidiff/Manifest
@@ -1,9 +1,5 @@
-DIST unidiff-0.7.0.tar.gz 18883 BLAKE2B 815c578ea02fb9e8a9a6f79e02ba8c35981f49d93b615d198bf5365df11552da84519a6b732986867dca3c329e7b43e9c79e7b158e17ec6921611a8d80aa3af6 SHA512 4f6f249219e4f36d7f753bb117123c508420ecbe6ef4f78936ceea10a5df00a4177ae45d8a56c62d824ee17ddfbc5a41ffc1f45ce1a7add9692b9c86813c2aac
-DIST unidiff-0.7.1.tar.gz 19547 BLAKE2B 71d3d8b187846f16e2fc1672c8b2624b4be29ef09b142a2a6c30f32c1812887d764f36ec16cb6d231f32fb84257cdb1abef3c571265f457ad2793bffbd043a74 SHA512 01a2467a10798a5427ae7d40644c881e7ed4775bab5b2bd7948d1153f1941417e2a2fd9beaa313e308900bffe8c8c1cb542d4f18e83786f9638ae20c72f1ad32
-DIST unidiff-0.7.2.tar.gz 19862 BLAKE2B 908bc7f3c33193fb5659add921c6ce4065f10026fa20df2f4bc4eb6fc56ed8d974bed1282351e094b8791103e3b93ad439dd0636fb1dc36ece2e3e62a494bee3 SHA512 fc5465db931384f4744308e155d558998d0ef393d3091e6cb3ac141525a9caf4cb4604ea00bd7f205318280113481fb987076ae6423ea29af685d482a7b3bf41
+DIST python-unidiff-0.7.4.gh.tar.gz 17582 BLAKE2B 9b674d5b1bc434464c5b7b08b4b6527e1394633abcc6211b9f459fde545fef1c6418ad84dbe9cf7a3a308deeb2221749f50f25458306046f2930d0fcc3af9526 SHA512 b8e1d8165efcc5788707432c3c3236d97ec86ae577ff3dd7ec405809dbaef3153a835572844f7ef2a4d5d2c9b60dee586717e4cf0acf4db8049ab7c5af178a07
 DIST unidiff-0.7.3.tar.gz 19897 BLAKE2B bc29b912855955de08fdbc186bdf9edf63a0a622262f36a54160f2c61e6604a40d093d43261101864c209e4d2cd5c1db0e48d0dd76174b02a71f89199e00e31d SHA512 451bc765532329c0963961afd15e061e3bcbd85a16cb799310ae0fd34b534f6222514ed4825f90c5ae9ea1b3b0e11a8e169b7991ba9ed82c33325ccb3b10a3b0
-EBUILD unidiff-0.7.0.ebuild 453 BLAKE2B 3f53de61b5699c7550cb46d5f1ef345fdcda17d1528fcd34638928c956f75c31de9b22d18839e8abb81eba52a4d44902fcc2697e5768cc5b788aa80b150a49ca SHA512 08e842ba30a89412292b73ba8ccdf0893a79d0b68f2937d03cc276259dece59cdf9db35ba53900c5b6bfd9f44c6a838def2df95157a85679fb64e3059b6a278d
-EBUILD unidiff-0.7.1.ebuild 491 BLAKE2B 3bc36c5cc4b054e2bf22d7dd71058d4678504f5b67c4dc49ed47bfd893cbc42532132878f6c58905f1c06f5d210b9b86f261add5a65d981d764c0dd81a590b24 SHA512 177156158510ca8585da810bf5db62d2fc8c5a579873c8d127e65327c1c0949fa08c7548cdf85a28a6a7cdfee7a469089b3c304b927593e4c5ddb487669a93a3
-EBUILD unidiff-0.7.2.ebuild 491 BLAKE2B 1567aac5f4c58d4d2d6c74bac944401883de8a5169ee651867cad4982dad39545ee57726d2154095f38eefe001cd867c00e84e41a4f0c59bdd827d7d26cd3ad6 SHA512 1e176efdc1bad4a4932c61473a4b94c04081949c1cd24f6e14af91fe52f0ea5d355ccebc23fd95a83c1d19de1e93ee353c49205e86aaa6c9a231ac07a0003c91
-EBUILD unidiff-0.7.3.ebuild 492 BLAKE2B 593254e3fd34d6102206ee8949499b023836a85dbe31f2d2e40933fdf4bfb6a3baf33c9a6843e67d98cf94f3805caebec6b095e3d7357680011facab6cf054f7 SHA512 5d5b5ebc49e04705380bd2b09ee27c9449c878f9ec9af0e609e53697405739ed578a0f440c7687ff1e62d36bfbe30b20037aad4b7ceee49a8b35a6df6cac25be
-MISC metadata.xml 501 BLAKE2B 489c8ee78b4a2631b57441474c919904239406f9e9096dad4667c7b6d19470bf9eae727d2bf3ab1293b50db40e9d5f7ceac94bb60b04e7ee7bae24e47eefc5fc SHA512 9da7cfdbcff40439edd325ecc8813b682a9c7eeaedc850d6605c21b87614a12048168f74bca3f4a7821f7e58715954570051ce6d2a3c426d6a0898632b4468e7
+EBUILD unidiff-0.7.3.ebuild 492 BLAKE2B 05dde5310f92603238d310fc829bdd47b88899f3a9074daab85666fce94f3c77936835844920461e26cf749f441b790c04127d77b1617f671005b633c84b88de SHA512 bc75d96efac95d284d95f5803587c97abad4710459ac32e1fbf4f9dac8d3c59d54cf85df15177f84546d8c083c9f79aa1b5c38a32140521d464f474c19e11868
+EBUILD unidiff-0.7.4.ebuild 627 BLAKE2B 58ff002bcd2322d251c7b68c3476e9bece03b4a3fcb3b2d856df823545bb545a6851e970b69f61d3e977598bd568075c86c1cf0956e72fecc40aefe86f0db3cc SHA512 b5679f11dd11d1f38b6b3d1c77e84636ae06ca54adfadfab8b9e476a78ca476c7aaface3b7bac4deec8af3a02fe1c16458310cf32ff8eb16dfdd9f742752b02c
+MISC metadata.xml 602 BLAKE2B fbe6b86abaff50821e3ca66d9c2299a0ae879addb0027f1ad34ac158284f7c14d2b89dc88c2e96502dd2a6060f13acd83a6400557b10e10c351be18e0a6fb160 SHA512 987e1820271799cadc60240b43901ea4f132de0b3d1187ee194b94f0531283a9ea4bf69b5caacfd414f142aafbec096370503f65774d9b5801765b3555b3170e
diff --git a/dev-python/unidiff/metadata.xml b/dev-python/unidiff/metadata.xml
index 6fceb0444b9c..a10f3a6a0b4b 100644
--- a/dev-python/unidiff/metadata.xml
+++ b/dev-python/unidiff/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
diff --git a/dev-python/unidiff/unidiff-0.7.0.ebuild b/dev-python/unidiff/unidiff-0.7.0.ebuild
deleted file mode 100644
index 43ecf5b9b6db..000000000000
--- a/dev-python/unidiff/unidiff-0.7.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Unified diff parsing/metadata extraction library"
-HOMEPAGE="https://github.com/matiasb/python-unidiff https://pypi.org/project/unidiff/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidiff/unidiff-0.7.1.ebuild b/dev-python/unidiff/unidiff-0.7.1.ebuild
deleted file mode 100644
index 8cbc80ac7f31..000000000000
--- a/dev-python/unidiff/unidiff-0.7.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Unified diff parsing/metadata extraction library"
-HOMEPAGE="https://github.com/matiasb/python-unidiff https://pypi.org/project/unidiff/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidiff/unidiff-0.7.2.ebuild b/dev-python/unidiff/unidiff-0.7.2.ebuild
deleted file mode 100644
index 8e71a14fe537..000000000000
--- a/dev-python/unidiff/unidiff-0.7.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Unified diff parsing/metadata extraction library"
-HOMEPAGE="https://github.com/matiasb/python-unidiff
-	https://pypi.org/project/unidiff/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidiff/unidiff-0.7.3.ebuild b/dev-python/unidiff/unidiff-0.7.3.ebuild
index 6cb631f66217..66c1699a2b3e 100644
--- a/dev-python/unidiff/unidiff-0.7.3.ebuild
+++ b/dev-python/unidiff/unidiff-0.7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidiff/unidiff-0.7.4.ebuild b/dev-python/unidiff/unidiff-0.7.4.ebuild
new file mode 100644
index 000000000000..a7d91e8e1903
--- /dev/null
+++ b/dev-python/unidiff/unidiff-0.7.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+# TODO: rename when the old version is gone?
+MY_P=python-${P}
+DESCRIPTION="Unified diff parsing/metadata extraction library"
+HOMEPAGE="
+	https://github.com/matiasb/python-unidiff/
+	https://pypi.org/project/unidiff/
+"
+SRC_URI="
+	https://github.com/matiasb/python-unidiff/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 31813e3e378d..7f3072f9c7be 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,4 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6-r1.ebuild 651 BLAKE2B 7be22ad1c1fb240b8e4fd219d933877b08b95376a09ac4fcfc7f2f90942eb491f20854df6e5338f7325c0ef64626a1d74f1a411493dafdfed0e1af98db28395f SHA512 d3218149cef6013735a8ed4b3d40770ab43095e1266ddfbfb81fcad410faded4385422943f66dcc773329d15e0f0ea53fbfeb5a461a0f967cda3d37d4e81faca
-EBUILD unittest-mixins-1.6-r2.ebuild 705 BLAKE2B 83c28efe3e8d9c1de506a98f7aa4549c35c675e9bc2ac28dab3d4f6faf7af30c53e0fef2374ebaf20baa9fb2ff346fd39940e680cc5b2b57b3137210075c6c01 SHA512 2eebc6fc0111cb87a5ba465775e83085a048b28e69eb10a85731c848f0b2bc78dd7121a136ca30fb3f7f68bc50204ff4e9d4cab3730a4e5c0f57209c8806ce1b
-MISC metadata.xml 381 BLAKE2B fa596fc79e8bb175dd45af988d78f22d1cb8001d2b51d39bf0046f39ca39aa014438346c6eef5ffb6d12bd4922f5e571f01bba9fa69e075a116d227d08075516 SHA512 3843b63973b330f3d53964ceac7a06ac99fee59f3cd2b220cb3faeb1d442f654fea15f7e46cbb88178e78ebd3a5d40932620c009a77034cff6f7e599a7d50e9e
+EBUILD unittest-mixins-1.6-r2.ebuild 697 BLAKE2B 6c7111f97dd7c4e5992bdc7cde3851f8fcae4e38543099c4e26b3a55e45dca0a9715a3a1a141dd7e334278cafc351097eff55a97d160f14ee7c9eb5575aa133f SHA512 2eb02b5908f4c55e2022eb716399763559a8d508ab5925b10862a140319b7a8d25ba384a6dfc22fcc4829540344854a269369f371483c90aad8835bdb32f282b
+MISC metadata.xml 405 BLAKE2B f41a778a860e26c7c1028f12a215cdc149233794b16874c6831d5c75a59748d4bc3810deced41cdb5979747f82443c9218d1e7b1cd51fbfd3870e07e65858844 SHA512 d067b0a4e23b648b03c8c38ec60788dd222e02e2c0b5c5517fbcf07bc91b5e20348a0daeb437e46b6a3b1611860d2b319277757bc77e10cfc3369b985c55a188
diff --git a/dev-python/unittest-mixins/metadata.xml b/dev-python/unittest-mixins/metadata.xml
index 6e33b6e3494b..d12b504862d2 100644
--- a/dev-python/unittest-mixins/metadata.xml
+++ b/dev-python/unittest-mixins/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">unittest-mixins</remote-id>
 		<remote-id type="github">nedbat/unittest-mixins</remote-id>
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
deleted file mode 100644
index 3653d0547adf..000000000000
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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="A set of mixin classes and other helpers for unittest test case classes"
-HOMEPAGE="https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/"
-SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
index 15c57de282c4..ae7bc4f3882d 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/unittest-or-fail/Manifest b/dev-python/unittest-or-fail/Manifest
index 46e3a35c46b4..fd2e594e8569 100644
--- a/dev-python/unittest-or-fail/Manifest
+++ b/dev-python/unittest-or-fail/Manifest
@@ -1,5 +1,3 @@
-DIST unittest-or-fail-1.tar.gz 2739 BLAKE2B 781fff33d12e2ebbf408875d8677a73fe3d5025c6d7e5e67ce23e1f5a36479e7680ffafc9ec73830a70114ddb8bb0c784095f15e8ee13fcf95fe4712c2d8a080 SHA512 c58a2b6a3723d1327d74fb528a5742f576a70453c81bcd55b551a6eac05bb6af4555b9274ca939df70ada85a0be42edd258ea7644ab1d24fbf897a1e96b23055
 DIST unittest-or-fail-2.tar.gz 3177 BLAKE2B 862a406f3faea7bdf47b8e3f9dfa0057cb45669d9ed47f94dd51b2db107be62d1a332e7e6f0fc8f8f1f6719db90a9ebe19a8379d12a3f0908b073f1dd1dc4643 SHA512 f5b34ed5f312618e174147d1717142fe817fca3f993606f572a6e3f7481f055f793c3b4bc56481e259513ca7ac1b94b8a27ac6e319ccf909f55492edd5f14951
-EBUILD unittest-or-fail-1-r1.ebuild 843 BLAKE2B d062094a965ba4276131b5f987d624530d432e4db4220ccb08789ad3de4beaf7ae4f872acf40f117495eab68116b6789c753ebdbd1a63aaeeb7f240238aec3e3 SHA512 ebfcabcb3853c9a7ecdba29d31ebcdcb3836a14751d9aeaa255c05ac00ec5840c25788b87fa549201bac31e9994f501970cc79dd549a30e55d12358e1b0765d2
-EBUILD unittest-or-fail-2.ebuild 853 BLAKE2B 4c47308b6b9df45a5cb448c3fd7f85b8f2da44a3c0125bf80e69ae81a444a0e5cb8eedc56d807dfe87f8f154844b9896b6e5f295b22c7b1272a4c7a5db41544b SHA512 72ea3fe63da1d6cc6c72dd02f543876aee66a782ee834793e2fc64d5403d445d9adcf04e4c5b645d673ba3c9e0254767d46edd51b4a850909144820a3e9fae44
+EBUILD unittest-or-fail-2.ebuild 845 BLAKE2B 569eae97ab5e32a25bed3a42ed1be2def55b4db43f0946f416d1978b1ab320da849c53137e79faa2b01abde20f3c2671275abedee7331a1d850c2feb2a5ed059 SHA512 0821ef568a9803acd2a394abb966f15bc4a72463a98cfca5657f6c502e35d407be852c7a08bd953f4cbd733a409cbc2f4712829a2030369b6d71814260aa6e1c
 MISC metadata.xml 373 BLAKE2B 3ad42807c91c3c0d7cbba503afc38ae94534c8fed72986c171a16f5e8a59630570b647aff0ae0237cd95a9ef8a202e022aa95cd7161f310b84cf75867aedfc54 SHA512 9f4e48a463886ae1b99fc6d16451e580ed8e861248233c0aed47d874323ffe9bf3a9b11079640f9e15f17d34950a0dcc80b93113ca623fb35e419ddca3851783
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild
deleted file mode 100644
index d4f4c26bd57c..000000000000
--- a/dev-python/unittest-or-fail/unittest-or-fail-1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Run unittests or fail if no tests were found"
-HOMEPAGE="https://github.com/mgorny/unittest-or-fail/"
-SRC_URI="
-	https://github.com/mgorny/unittest-or-fail/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-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"
-
-# Warning: do not use distutils_enable_tests to avoid a circular
-# dependency on itself!
-python_test() {
-	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
index 406103e1dc02..8bd236e3b5a0 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
diff --git a/dev-python/untangle/Manifest b/dev-python/untangle/Manifest
index 914ecafea455..2a80196193e4 100644
--- a/dev-python/untangle/Manifest
+++ b/dev-python/untangle/Manifest
@@ -1,3 +1,3 @@
 DIST untangle-1.1.1.tar.gz 3089 BLAKE2B d8b8ffe1adb2acbcdcde8e6f67231315b9f318c9e8e1496dfa23b0ac6dd68651e75e2d2e67f6d7d521002ad6b0e9c4cc30c155685b9df60b6b223d137add0632 SHA512 252c3d0ed8d004660adad8f37a179a4d1b2b46e9d7127aee59b596eac3f65684a7a8b5b881bec97ddaf5470aa678df407b903209eaa069a40f53dc2dde9a94b2
-EBUILD untangle-1.1.1.ebuild 433 BLAKE2B f9bd5c9c7b3cf9a3f99e33e8f061d29fd5ceb065dfd7a4b1fd886d01146c7f33399d06fa4b3e77882c776855a44fce311114e9ddd3b1f9e08894106a43995110 SHA512 2ee871dad33285537b050d511801df36993f67bc821e300c355a7d1bbea85b21f5d27d4e2924ed6a5c6dc324eed9d3e7dc171a4838433b762af3d997958eb2d0
+EBUILD untangle-1.1.1-r1.ebuild 465 BLAKE2B cbc207a7f31822265c858cdb9d8278ab3a96aef3ad7e373fffc4705cc6c412ee795d006522a9ed3d76ebc63e67e0f2b96cbf70828cbc501cd9c6a98c2b5caabe SHA512 70b45081f1ac73df3d5bff701d0357e2b65e8a154d3ff9e12339b1caab4a9ffa02e50e7d134b6fbd7e8d8318c8eab9ce77c973adc964be193a24092773133ed0
 MISC metadata.xml 405 BLAKE2B cd3f424ecb68f2eb04d98d92282d7b1b486fac1b341d2febbf8f493d7f503b2831a4f1c6f9796d052676388d3a9b283de48893403477f05da6e96cc488ef2b37 SHA512 e7f7e07b58ac27d0b540220b43b0127ce626a3cf4c9a6524587437cac797f292a33a6cf10e56bc2db68b3835df42a7f5051981dc984d2cccbfa6d151f004b13c
diff --git a/dev-python/untangle/untangle-1.1.1-r1.ebuild b/dev-python/untangle/untangle-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..0f7f47c3b9cd
--- /dev/null
+++ b/dev-python/untangle/untangle-1.1.1-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert XML documents into Python objects"
+HOMEPAGE="https://github.com/stchris/untangle"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/untangle/untangle-1.1.1.ebuild b/dev-python/untangle/untangle-1.1.1.ebuild
deleted file mode 100644
index d0db794f674e..000000000000
--- a/dev-python/untangle/untangle-1.1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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="Convert XML documents into Python objects"
-HOMEPAGE="https://github.com/stchris/untangle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/uri_template/Manifest b/dev-python/uri_template/Manifest
index d8827c895c7f..8e008a0b41f5 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1,5 +1,3 @@
-DIST uri_template-v1.1.0.tar.gz 18014 BLAKE2B 01ac4439b6661d0d1e7adb5b5ebcc594497cdaeef24b33cbfc8a26f607e779a72ae20838dbbcce28278886c87df475adfd53c73287a4768d848f65b95ba2ce58 SHA512 b6d34931e750acc6c160e7157fc000984acc099023e9794163777679cbe706b8a646bab89e82171c0318827b7a7b9cfcfb997768120cabcf36e7982214321665
 DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
-EBUILD uri_template-1.1.0.ebuild 658 BLAKE2B 7f4c44c92a22390f610a16ee6f067973040706c2d468ac2fcd5c65a64771e5e97584ce761dd5b12423ddb64d18b85343556424ebab74083c47590d63e4280d14 SHA512 67841fd510d2703a616d47a80544d43a917524ad997872fcf81729a0aba268a7ea30ca5fda04c43df802146ab14487b5f57960fa48a71f78ce86eb87c001c7c5
-EBUILD uri_template-1.2.0.ebuild 709 BLAKE2B 4e0ac649ce6e2620c296b9128f31a512935b227374e48c8684b2f06ac79e303cb2b21adc719435826eccc0c7963e6bbaba3ea3a7477c2359e025827a409c0f52 SHA512 c86bfc1d30a2230e7aa878d943e3f5656d22085b68d55cbc78d8aa003ff2b9cd7d4badd7f856a111cb2f965f6b1592983c6b1dc8e37e5888478144b003baf7b7
+EBUILD uri_template-1.2.0-r1.ebuild 835 BLAKE2B e22f184da083b2801c45044709ae6596dd76d33f85bcfbfe32428fdf5701ccef7833b6bb6ea7cfd16bae3baead49d432661aa4b1bbdc4ad2495cca74dcf452f3 SHA512 fdd587c0344fd62d6f1b643f50ec238563677493fa77585159d96134d16f8207f1c8314c714a758ddf1338f660332437911c37f5daffe0785f607ba17164eebb
 MISC metadata.xml 596 BLAKE2B 3dd78f11c031a0810c2386cd362bba5563405d3bc9347efdbea8a54a29b76f72dfc0343f59c82f46802fa80437fc24e96477ae64626a12a46ca21a85e292682c SHA512 39d59df7ae7d6c9b3ad84406abd93a051418ee0b82b008e28c3e872697bcbf0ff89ce27684bb05225b65e79655256e0c44b38096cc5e7b2eca224370721e744a
diff --git a/dev-python/uri_template/uri_template-1.1.0.ebuild b/dev-python/uri_template/uri_template-1.1.0.ebuild
deleted file mode 100644
index 2aa659f49c57..000000000000
--- a/dev-python/uri_template/uri_template-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
-HOMEPAGE="https://gitlab.linss.com/open-source/uri_template/"
-SRC_URI="https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-python_test() {
-	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
-}
diff --git a/dev-python/uri_template/uri_template-1.2.0-r1.ebuild b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..6338f0309acd
--- /dev/null
+++ b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P="${PN}-v${PV}"
+DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
+HOMEPAGE="
+	https://gitlab.linss.com/open-source/uri_template/
+	https://pypi.org/project/uri-template/
+"
+SRC_URI="
+	https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# fix the version number
+	sed -i -e "/version/s:0\.0\.0:${PV}:" setup.py || die
+}
+
+python_test() {
+	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
+}
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0.ebuild
deleted file mode 100644
index 90ea54cc924f..000000000000
--- a/dev-python/uri_template/uri_template-1.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
-HOMEPAGE="
-	https://gitlab.linss.com/open-source/uri_template/
-	https://pypi.org/project/uri-template/
-"
-SRC_URI="
-	https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-python_test() {
-	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
-}
diff --git a/dev-python/uritemplate/Manifest b/dev-python/uritemplate/Manifest
index 336a9804bdf1..20d19cb39254 100644
--- a/dev-python/uritemplate/Manifest
+++ b/dev-python/uritemplate/Manifest
@@ -1,5 +1,3 @@
-DIST uritemplate-4.1.0.tar.gz 273924 BLAKE2B b21115c6db8f94c635dda1033b4650dd7d2d54b6f52f51bff31ae8cf89e0b3dbcfc1bd029eadc68f5f94eecbd167eabc652c24be6f0bb807beecb5f254520626 SHA512 e62812a4e9ff315a1b06ba9e88f3dd47aea8353cae4ead9ce7bf59b65c83cd6ae7c973cb29b8ddc25266c264f229df8f2d9e982ab489f2f37a5dbd460b87a5e0
 DIST uritemplate-4.1.1.tar.gz 273898 BLAKE2B 08a9179da7ccdb8b6d1a85ccf34f44f8282e6b5a00ddea541364272816588c238f4f8f960a197a7e8074607bcb8d1b52226740bddf0b92fb3751cb2d4b8fad51 SHA512 7682c7dcd9c8d4428b047e3adbc283b78f755face4d8dd1b0cd11df9583bd0435543640ba79229d436aeecad2b5b29684befdccc84ba71f72769ee130cb6576a
-EBUILD uritemplate-4.1.0.ebuild 513 BLAKE2B ce36068850d1c9eac5e40bf3ae1cbacd84d118e8ec43f997e2278c2e03ec2cc4352f4571bba6be10b26012ded5e389574e3bf61080a4d1661ec797e27364c25f SHA512 bcaee804d03a8a9e6ab86d4673af16f6fc6677f22fe013f4d9f56dcfd88fc148631ce894d594238cf9901d6d54a405ca4774edd1c6683b5ebe404f5558e0490c
-EBUILD uritemplate-4.1.1.ebuild 650 BLAKE2B 019ef41029c1443bff9ab32a6048f994752a08b0f61d2b4567d7546f59216747a011d27eff154eec600fd5bc1d9856588a15503064abba5e995835b0f5d80fbf SHA512 0aa238f2823b4c9de9bf7a8af8f6f215227d02b60a0900bbcd960f46d76763e74e456649b488298c1c6b58594589d589e96cafad4877693fff439cda11b38e78
+EBUILD uritemplate-4.1.1.ebuild 642 BLAKE2B 29633981e3e5afe25dfb6993d021bcefc03599645b39400ace8429dd15686b88d52d8146fb4ea3cd1d3d0d003a5a6668dd4876d42b7c49065c99615f552e15d9 SHA512 9cfb24657986777c3cfb8dca1873cf4fb175b233df98446fb3d62c493ea609a191bb996c28edc3aa06de52cf670fa4818ce75fbdf0b8a621b622cc92be5e9d2c
 MISC metadata.xml 391 BLAKE2B 3d72ae9fdba0af92def6107d3ef88d5ab86c93d6339ce7fbedc4753d2b3c5895759b52149f89aff878b95a233e542c59788ea211b0dfa3cd1b26f5b1e8928d5e SHA512 43c40af393e160f826012162f8d7c3c03171ba07603b8ac9e43d89997c564bdb841185d6ff7d6486a7f84bcecc0901292cf4798f582fc69697077b8f8a256736
diff --git a/dev-python/uritemplate/uritemplate-4.1.0.ebuild b/dev-python/uritemplate/uritemplate-4.1.0.ebuild
deleted file mode 100644
index df2fb85f3cd1..000000000000
--- a/dev-python/uritemplate/uritemplate-4.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="Python implementation of RFC6570, URI Template"
-HOMEPAGE="https://pypi.org/project/uritemplate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/uritemplate/uritemplate-4.1.1.ebuild b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
index 03074a16d07e..0057169782fc 100644
--- a/dev-python/uritemplate/uritemplate-4.1.1.ebuild
+++ b/dev-python/uritemplate/uritemplate-4.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -18,6 +18,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 ~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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/url-normalize/Manifest b/dev-python/url-normalize/Manifest
index beca6b5c2ba1..c2ad494bbb69 100644
--- a/dev-python/url-normalize/Manifest
+++ b/dev-python/url-normalize/Manifest
@@ -1,3 +1,3 @@
 DIST url-normalize-1.4.3.gh.tar.gz 8478 BLAKE2B 2f15a597642626653c96f378b67794819645918473d17faad18187abe35bf7892b11c0bc78451e78f1146389beb3a6470fb3ea1610e60157fee7fbadd9863614 SHA512 46eaa1753b37e89d56cb19818144a7cf5b38653811720eb506732c35bb3732ef0c556420b22a9ee2c08e70e5b408aab7f44cea5e15d1ebe3d717c0c77706bfb8
-EBUILD url-normalize-1.4.3-r1.ebuild 752 BLAKE2B 4f547c6814c9937dcad0160a0e44a2771fdae139accff5ed380dea1bc288eacc80d0427de04ce124e010a06e1eacbdb0ecae2c3b2eac7363685eabfb2a408188 SHA512 266cfae7d4941bee7edf5da8a9d5fbe87c0577536f20503f0d27c1f582fad2e602a75e1f1093f1958c44a2493a8a6676476e1a5ea7f88006a013cbd2f65d15ea
+EBUILD url-normalize-1.4.3-r1.ebuild 752 BLAKE2B bd9e05624fc971f66f82ebabb415ba3010ad207e5efb0d798e2ad1c4fa2fd17ad6213c058482c861fcd3da34714619bdbf7b1d978270a215fff79cc763afbd8c SHA512 fa163d9419029c036470eb1730850d11429b25233c82b5034ba9d32a5aaff7bc3fb1e6ece49328266f883e67f8a37e02f636a2cc864cea9798bb242d659bd7c7
 MISC metadata.xml 380 BLAKE2B 946417a87cb302150d2cae0224f977f73614783006c53b6731844b43ad5ea3aaf006e617a3d8599d3bdfe33ebc69a490dfdb490b7a0b9443c5a162adbbd6e914 SHA512 16d3480c32f65fde3a9eca563e791136a7f8a70ce9c2506e00f6948f3f25ed535fe1cf82fcf49f8e22d9e0b99d9c5bc4f49fce21d4e755817db7ff0a53d15f73
diff --git a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
index b0e1fab3336f..d2096e37231e 100644
--- a/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
+++ b/dev-python/url-normalize/url-normalize-1.4.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="URL normalization for Python"
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 1a607ee51fc5..90eabc6cc957 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,4 @@
 DIST urllib3-1.26.9.tar.gz 295258 BLAKE2B 1c6b51e4243c18c25bcb53158e645ea71fe33e0d09ca029256bcbe05bf178ba600dd8911c71730bdefc3cf9f65cdfd5740f579d17d293f9ac7c5d3cbff478b6f SHA512 ac384291b02516dee781c98182625356ac7bc03972612577de5286e159cf161b541cc610b103e0eec1c9f40503049b41e972a9e0998fcd834efe2f40af0e7394
-EBUILD urllib3-1.26.9.ebuild 1924 BLAKE2B 056029f71386bf470238cbe71d1944990133f480167458c9c07a416742c1177d04379adccf15eda5e8c337f1d8af45b97beeebf825e497af40668747dbd71502 SHA512 f499f5762b9afec0657ab2ab6f49c8864ab7e8f1fa057a13683c71f4f18e309fb4b90436c0f5fa5995edeff2bab303908c039a9f7ef90557608a96a276dad5bd
+EBUILD urllib3-1.26.9-r1.ebuild 1856 BLAKE2B e683674af3792d09dd991f44519fcb6d32ae3f6778e93bacf3f7f7aa6d21392d9c269b49123ae3204b7797cdf91bb895c5ca100e12d67bea17abe82d325be952 SHA512 2695a712964571c14a98f156b663c9a57fadb293ca2aad6d7ff969f1d03486d3e5783c139870a242d5992068d2e33437664676fd742b18896b67634364d6c8d9
+EBUILD urllib3-1.26.9-r3.ebuild 2315 BLAKE2B ec115b8e76fca07a4b2c8405a97187ff99cb69647275300a0ceb884709ea311010b7f605db8076969e2c8db5682b3c5a8cda0d04e197ad97b698c1579e9e7c9e SHA512 ddef2fb641fa2cd8b4e1679716b8b914eeba0f7f0f38e10e7106bfe6487eb7d9bf93fe50142fc627bf8cb9f3b79297684276f92bfdcf71ffc1d56f40f4ee00e5
 MISC metadata.xml 531 BLAKE2B 3ddfea4b8817c827437a79abae8cf4e9cda95addb1c6505ef13018587720bba0cf0788041c0b4cc8b25f319e7cb1c94117ae25b3cbb567f24373e8e89bedaa7b SHA512 7e7191f0338c4c47f01bdceb3d2c6ed94de2241e77fb3be6cbf3ecf8a0682730392a9ee5adf24304d9a322acc06bd84f4f90f1dddcb258cb2e9ba0de9952b693
diff --git a/dev-python/urllib3/urllib3-1.26.9-r1.ebuild b/dev-python/urllib3/urllib3-1.26.9-r1.ebuild
new file mode 100644
index 000000000000..fd8db275e223
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.9-r1.ebuild
@@ -0,0 +1,63 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{8..11})
+	)
+"
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..11}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=()
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}
diff --git a/dev-python/urllib3/urllib3-1.26.9-r3.ebuild b/dev-python/urllib3/urllib3-1.26.9-r3.ebuild
new file mode 100644
index 000000000000..47fa4076e5a4
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.9-r3.ebuild
@@ -0,0 +1,78 @@
+# 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
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
+		" python3_{8..11})
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle urllib3
+	rm src/urllib3/packages/six.py || die
+	find -name '*.py' -exec sed -i \
+		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
+		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
+		{} + || die
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" python3.{8..11}; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# unstable (relies on warning count)
+		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
+	)
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}
diff --git a/dev-python/urllib3/urllib3-1.26.9.ebuild b/dev-python/urllib3/urllib3-1.26.9.ebuild
deleted file mode 100644
index 11ae4683d2ad..000000000000
--- a/dev-python/urllib3/urllib3-1.26.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{8..10})
-	)
-"
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	if ! has "${EPYTHON}" python3.{8..10}; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# TODO?
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_3::test_verified
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-
-	epytest
-}
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index d0c2023d056f..2beb4f58f0a0 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,3 +1,3 @@
 DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
-EBUILD urwid-2.1.2.ebuild 1160 BLAKE2B 93edcc0d3f078c320dcadcb1da9112e723debd20e3187efb07686379dc2800e21106f0f1bfc199ec00a227209f3e5913b9e33a7202d50d08469d9fb02d2e93df SHA512 1c374995e430211ec79d4f79addad30e768cb868641fcf8a24a32119b94768930d55a8bb704dd067ce6abf7e8b4b1665248b39b4b0e3c7ef0e75f80eee969c29
+EBUILD urwid-2.1.2-r1.ebuild 1198 BLAKE2B 08237716376497f3a0e86b7a4b6fa2ad5fb5022f9c781104b600ff556b4ed2e5e655365a62d7e0d70e5b7aee6be2605f2feda03af8d6ae83413070d7aab9d8ba SHA512 cd16096435b45fce0fd6371c6e409b5127e3e494f872f5797ba10219dc4bc06707889933f7a7ee23e426a6db63f4fd81319c5bc6ae4d9282c641dc68ba2224e3
 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f
diff --git a/dev-python/urwid/urwid-2.1.2-r1.ebuild b/dev-python/urwid/urwid-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..d0f82d7ae433
--- /dev/null
+++ b/dev-python/urwid/urwid-2.1.2-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Curses-based user interface library for Python"
+HOMEPAGE="
+	https://urwid.org/
+	https://pypi.org/project/urwid/
+	https://github.com/urwid/urwid/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_sphinx docs
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# optional tests broken by modern tornado versions
+	sed -e 's:import tornado:&_broken:' \
+		-i urwid/tests/test_event_loops.py || die
+
+	# Fix doc generation
+	sed -e 's/!defindex/layout/' -i docs/tools/templates/indexcontent.html || die
+
+	# Fix for >=dev-python/trio-0.15
+	sed -e 's/hazmat/lowlevel/' -i urwid/_async_kw_event_loop.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Trio event loop" "dev-python/trio"
+}
diff --git a/dev-python/urwid/urwid-2.1.2.ebuild b/dev-python/urwid/urwid-2.1.2.ebuild
deleted file mode 100644
index 9664ce89b878..000000000000
--- a/dev-python/urwid/urwid-2.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Curses-based user interface library for Python"
-HOMEPAGE="http://urwid.org/ https://pypi.org/project/urwid/ https://github.com/urwid/urwid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-distutils_enable_sphinx docs
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# optional tests broken by modern tornado versions
-	sed -e 's:import tornado:&_broken:' \
-		-i urwid/tests/test_event_loops.py || die
-
-	# Fix doc generation
-	sed -e 's/!defindex/layout/' -i docs/tools/templates/indexcontent.html || die
-
-	# Fix for >=dev-python/trio-0.15
-	sed -e 's/hazmat/lowlevel/' -i urwid/_async_kw_event_loop.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Trio event loop" "dev-python/trio"
-}
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 39930ba0295d..d7237ed39074 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -1,5 +1,3 @@
-DIST uTidylib-0.6.tar.gz 15771 BLAKE2B 9d4fe57d985ea6e52680bd528862d3236137221227a23fe05b886d01d240e21d7159dbf7d6da3af8020009ca45c60c2297e374bb7aa05cb6b5a8eaf444710c58 SHA512 a85506ef8824f66ee326ad651020dc3b4e00190e20dcd3814984fa27ff319f492fe5bac781b7c43c8694cbfc63409e3abda18981969c9be2c3cd023fe7a4f2f8
-DIST utidylib-0.7.gh.tar.gz 15203 BLAKE2B c32f23ab3a94191423655f9b6a99bd85aca7072fcfea7507c5d4efb19c4ee22114afe136c6299e8322e15195c4f938094e49483b1a40d05522f2d232dd9a6acd SHA512 69b22671223cc9e1888a1be19b418e883baa79401bcf3856fa48cca441ae7fa414047c296f8fc9ff35aa7407901fa64cd8ddfcc56657a98e8e188073dfc72172
-EBUILD utidylib-0.6-r2.ebuild 947 BLAKE2B ab2f8992859158a7862d7ced5989e8ed14ce07bc191b0e618f475185873aa4470149d04f49869665d30614447c3877edbd7a25f0a5138703be7d46890a99b9bd SHA512 8c0011ff066ec75ebb7f1ebadfd2d9eba9ce181fbf7fda45c7902db4cb816706fa50a896f34d8b6c0e5a77782a8e831bc8cb7de2297853fdbc65e1244f030c5a
-EBUILD utidylib-0.7-r2.ebuild 682 BLAKE2B eab3b36cc8cd0e48da36d4d481a445f52b196ed033899228cf10d105d18f1804d2c7235904d90947fe66abdb21f3c4de717f30788b4e2a6f994ebfd54800deac SHA512 975c635db3128c22311058e30c97d6ad1498ddd960189bea6f368eecfda6c0f69de1cc4506bfce605c59f39a2860bca1a34e0d526d464020dbfd64de0b38ad3e
+DIST utidylib-0.8.gh.tar.gz 15285 BLAKE2B 85f0ec1a969f31cb952e326a5bce5f51d9a5bacdf33d7e703cc3a464621df86f568921a9dd17755be67d49c02631782cdabb4112ee7cf8e321079656bb362122 SHA512 cb9c868337e1bbfa80ac36ca1b3f85c4e35f62acb67dbd321167d568da17d9e562fdca6b777d88c08e03107401fbadc7cdebf243654bcde9825259117e36392f
+EBUILD utidylib-0.8.ebuild 739 BLAKE2B 5be301b3c591c5390e35a0cf10463952436a73fd40c4ff1feba8a96bb7c89290d65e19c2b3ee868237f249e0fd23c4bef301d7d699adf30a83df96a5ab9920f6 SHA512 7417a9e7ae3157b55245164036b28fc9ae76a560ff3743f167d6c7f41cde327214b2db16e48d46b36113e99c9fbc8d4b681f881f7e14e6af8340de467f6e67dc
 MISC metadata.xml 366 BLAKE2B bc4aba05448508a1d0a5e6972d253a3389a445627679c7946350ddf7e210b5b1232301e2b5c36822d946c1deb6669a763957982eed3440ab1c517747005d27af SHA512 7a68b5c21f50d81401bc5f0eb1d334679b71891d6aad08c7f1001140e15392482077b554a19e82f0ef451bc0c082b48300d54c32160f07bfb0d9ef0ab700c29a
diff --git a/dev-python/utidylib/utidylib-0.6-r2.ebuild b/dev-python/utidylib/utidylib-0.6-r2.ebuild
deleted file mode 100644
index 688f03a99a99..000000000000
--- a/dev-python/utidylib/utidylib-0.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-MY_P="uTidylib-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86"
-IUSE="doc test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-DEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=app-text/htmltidy-5.0.0
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/utidylib/utidylib-0.7-r2.ebuild b/dev-python/utidylib/utidylib-0.7-r2.ebuild
deleted file mode 100644
index acc23f255f9a..000000000000
--- a/dev-python/utidylib/utidylib-0.7-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} )
-
-MY_P="uTidylib-${PV}"
-inherit distutils-r1
-
-DESCRIPTION="TidyLib Python wrapper"
-HOMEPAGE="https://cihar.com/software/utidylib/ https://pypi.org/project/uTidylib/"
-SRC_URI="https://github.com/nijel/utidylib/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ~ppc64 ~riscv x86"
-
-RDEPEND=">=app-text/htmltidy-5.0.0"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-EPYTEST_DESELECT=(
-	# https://github.com/nijel/utidylib/issues/9
-	tidy/test_tidy.py::TidyTestCase::test_missing_load
-)
diff --git a/dev-python/utidylib/utidylib-0.8.ebuild b/dev-python/utidylib/utidylib-0.8.ebuild
new file mode 100644
index 000000000000..fe3261dc7a97
--- /dev/null
+++ b/dev-python/utidylib/utidylib-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="TidyLib Python wrapper"
+HOMEPAGE="
+	https://cihar.com/software/utidylib/
+	https://github.com/nijel/utidylib/
+	https://pypi.org/project/uTidylib/
+"
+SRC_URI="
+	https://github.com/nijel/utidylib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv x86"
+
+RDEPEND="
+	>=app-text/htmltidy-5.0.0
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+EPYTEST_DESELECT=(
+	# https://github.com/nijel/utidylib/issues/9
+	tidy/test_tidy.py::TidyTestCase::test_missing_load
+)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index d556cfb35b39..49707d1e7fc2 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,5 +1,7 @@
-DIST uvicorn-0.17.5.tar.gz 707840 BLAKE2B 70a5aa4c084f63231b2c4f11c9a4add6a84362789243fe59b4c954665b67f859dcd92076454cac7b960d30c878bccb52e6da5232e052d70ca0a71f4035804b96 SHA512 b73c99d03957bf5f37957386da77cad68e0c9603fb0bfe48ab81f1066953ca01bc75b2eb458a20a587df4f2e1f591fe1c56f26d8df84070c833ccbb912d55ca2
 DIST uvicorn-0.17.6.tar.gz 708048 BLAKE2B 83b06907c8109b38e13930d8b73584682fa4e34fe7e51fe14b6ca1ddc7ef8122d950a09e31cb364a02f5f12eead5d0522b41cbf428509c6900604d4e2776dfb2 SHA512 d5c5223759d59648f279e22f7e6af728fe8117ed75488d125c1db3e5e9d385a50d574cff72ac46db4eb0a78d0e4f690096cfe78c774674dfba61860e55b7494e
-EBUILD uvicorn-0.17.5.ebuild 1363 BLAKE2B b0810c5d062adc3ebfe579d99debdb4a6bab5b1d4935d9cb59e43bb82e341916680d84a070c910e17b63a5416c79625e1754422154a6a3ee3443f134c7264dc4 SHA512 5cea073561c1c1ce551a0d48c25d6655b6e1a79cd56653c8a1510d01775473eb0276f7f0878f808f07c283f0636160fd9b5fdbb4c95b79fe3f384928bad1961f
-EBUILD uvicorn-0.17.6.ebuild 1402 BLAKE2B 855b49eb5fc0c8c27f8366be7612487e8bdc41838001d6b8c8f15d5d041c361ec1de7959f5d89be03cec3adcb39b9a263287289c34e28b8df876d42882d51b3b SHA512 2fd187bdced5a62ff4b96440515ea9c36aff9ccc0712fe7d81dd94d4d27b34eef2a087e2f9612e3b5bf83858bc6dfc3fe940731c299bccc1c0f259ae6981fbda
+DIST uvicorn-0.18.1.gh.tar.gz 712588 BLAKE2B f99c173015d3efdd6f7d6257384045542cbf95ab65fdd84f47ee5df4677865d0b4d6de5f23db0bc2713cb286242a029b056c4076268b14d238a3e9f57c02fc42 SHA512 d8650ace78d19c44d03de8413bf06b2dd3208c7e47c4d9e17ecbed99eef938ec08eb249b204713139b985ae4b117c7da64836c25bf8d20610363bedcf1ebf990
+DIST uvicorn-0.18.2.gh.tar.gz 712706 BLAKE2B d8d300579d945a5c2f51b7746b93cd64710c103cd0b7694ce858ec0f4e9dc09f89e9663529dd84c13c9f6334d0f4543cc9442e94aedf8dbddd72a6a0394ba370 SHA512 d2e05198cd833efbe7dddffc30f9a52be3168192269cd493816df8a7d4053e312f534988ee09c5270d63f52dfa48d0b105862c9e05acad41ebf3a40e5fa1aa76
+EBUILD uvicorn-0.17.6.ebuild 1394 BLAKE2B 1f9eb4a37f3476787f643dd1b06c846ee2d4f0aa08aedfb74589097e9163b24a4b5642bf8fdb672bbb61537a15bdbee3ecd69962bd5edb42f969b94202307320 SHA512 7e478a4e05e4ae6b097eb018ec4bc105812a368389e0b663100f1ae0abad5c11a9ceb8555119d01c1d5397bc56df9af801129ed83e246a69538aa262fa39157f
+EBUILD uvicorn-0.18.1.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
+EBUILD uvicorn-0.18.2.ebuild 1681 BLAKE2B 3197c880ed7f44d0610a270db52c07957bd377388abac1a19991a324782523c7c26669575fc6195ee403ecfc12cad7b85001e4920f6de5dbc237c03dfe42570d SHA512 2c32dcbe9e0eaa273f7908a6208751438951959756ebae3924c21039a30b0815e5cf0131bb9c1631b869cec033c1a32740d2a9b68fc1571c2145fe30c6425e1e
 MISC metadata.xml 451 BLAKE2B af9be617c95128297e3455b503e198e13c373244094f6aa9c80837945c3f9f023f1874efa28d4ffa8b241feb9a4e8c7f3d3534e96966733bd5593bffb90904a5 SHA512 4d76bab5c20f7cad81fa56a28c9be07bf2c2ebc412fc647f073215d437a2550eca247b8419df71d04200d0fdf545520684db0b6f4953e73848f69a4f4ad6931e
diff --git a/dev-python/uvicorn/uvicorn-0.17.5.ebuild b/dev-python/uvicorn/uvicorn-0.17.5.ebuild
deleted file mode 100644
index 7e04b9e21958..000000000000
--- a/dev-python/uvicorn/uvicorn-0.17.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 hppa ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-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/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
-		dev-python/watchgod[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-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]"
-	tests/protocols/test_http.py::test_fragmentation
-)
diff --git a/dev-python/uvicorn/uvicorn-0.17.6.ebuild b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
index 05df8e9b4929..f69e2acde09d 100644
--- a/dev-python/uvicorn/uvicorn-0.17.6.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.17.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uvicorn/uvicorn-0.18.1.ebuild b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
new file mode 100644
index 000000000000..de246a78f9d4
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.18.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+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/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local 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]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}
diff --git a/dev-python/uvicorn/uvicorn-0.18.2.ebuild b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
new file mode 100644
index 000000000000..de246a78f9d4
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.18.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
+"
+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/python-dotenv[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		>=dev-python/websockets-10.0[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local 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]"
+		tests/protocols/test_http.py::test_fragmentation
+	)
+
+	local EPYTEST_IGNORE=()
+	# love from Rust world
+	if ! has_version "dev-python/watchfiles[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			tests/supervisors/test_reload.py
+		)
+	fi
+
+	epytest
+}
+
+pkg_postinst() {
+	optfeature "auto reload on file changes" dev-python/watchfiles
+}
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index f13edebeba5d..f6a635eeebee 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,6 +1,3 @@
-DIST validators-0.18.2.tar.gz 30299 BLAKE2B 96be7c0bed74e32143d2ea9de7b595599d567b6a8c81b85d92ba7be035e7fe26361240896ada08b2b5f30ce5519a6828dc4350b6ce7ecdb27525e40934a10d31 SHA512 8213736508e56b5d4ddaa9c8e707a7ceb398c8b2c41b938d626459d8bf134aa113116f49cef0cd317033a683d18493448ac4107a5f50151899946bbd48197411
-DIST validators-0.19.0.tar.gz 30548 BLAKE2B 11dbd5636ea47c340175243b91bd56f55a71e833454e1f2781c879a23cfc097b3c2ee6e86ea05e47d4aeb4175dd6ecafeaa98dffc05ea55f44c8dfee23e49f5a SHA512 6d5f1913f2067670258a669a7333319a1a41f556aa8d013fd445aa301fa2dc112a1fc580b542887a60cc17d9811f262030df470d2785a3490c108b07062ddb63
-EBUILD validators-0.18.2-r1.ebuild 533 BLAKE2B 0d95c49f2df1177aff2c6177b8053a482ecaae0e0a3d26357e507a43490efbc1579621d672f2726adb083e2947a4a9109bd30ba80c6b2b531b06db5acfdca202 SHA512 4322c58e8089d215324413768915556faba7503eba10966955cf2dcac6e0a2c3c6a148a3834f26d9676bdf0781e363758bec09ede5eaf0665ae847e9c54ac83a
-EBUILD validators-0.18.2.ebuild 502 BLAKE2B 1b85433796983bd3d64947f7c0c14aebde337f6b5010b0607bb278abed2443ce271f9c565a6c75ed3b39fc4a36a722a61199dc51005a822ea62a5933d085f983 SHA512 3ec5b333581b53cd35f5d16602ff6b4792da22867216501658d895e5c79d05cf52665b17d0e7fa175d331db27e8fc890511375e3dea033df1f299965506e556b
-EBUILD validators-0.19.0.ebuild 491 BLAKE2B ae15ffbed5f13f5460785e426a13020e4ad67b3f049df819d6a784c35138507dbe0f40b8aeaa14b96fc52992535802708ff8424f6aa8c72717cd46bdfea4179f SHA512 f9445479b3106ad5dea66dca07d65f338fdad8e4397417b2e798c1358b0f67840d72aa89a27da7555dbbded2b8fe9533f90e402bb7997ff8ea0492a1ddbd8ed5
+DIST validators-0.20.0.tar.gz 30665 BLAKE2B 7534c4970ab288cc02794176e0b3368ed2d4035d602d36ecadad84fb4a41407210b22a8ed1230650f4f247ba1552634aa500fea5c2f03f5e13d6e1120e62b15b SHA512 2f3d9caac9246b346e10604758168092ac483fe6e4a0c9470900e49719fbbebfd18e03aca525f8cca33cec224589aee28de3ea9bf5cd4941a49715d4216dba20
+EBUILD validators-0.20.0.ebuild 533 BLAKE2B e56f9915dfa8a1a7821c8215a9f532671ea2fe9c18d7e0d632cc42564aba9b9b6eefb6af4ba7a61e91a7958ccafc8fff848a92ddd54d15dbd4afd80633f4600a SHA512 d5c29c9b7563cd99ff02bc5b0e2e1c958f5c0fc24a4a3b17e412fe77deecf9a822b2269de184f1d28859ed3c7236ff9e486c4447363a872e0cb17f9e4ef0e714
 MISC metadata.xml 486 BLAKE2B 2b994e57709609f59cffcbfe21c7fdb62788a6188dfddb6e2b2f034f07c312303ba9f3bd19cbfd66b46f2df913da3ee1397f444ccdc40f0b448294c07de1737b SHA512 bca153c237710afd5b407f7aa14c7f6983075fa016beae8ad0494a0ec860f85c6db1f28b24e6edbbf5785b8210dce0edf492cb0521c734b6eedad71b46d8e0ca
diff --git a/dev-python/validators/validators-0.18.2-r1.ebuild b/dev-python/validators/validators-0.18.2-r1.ebuild
deleted file mode 100644
index aad8e5e3f921..000000000000
--- a/dev-python/validators/validators-0.18.2-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="https://github.com/kvesteri/validators"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/validators/validators-0.18.2.ebuild b/dev-python/validators/validators-0.18.2.ebuild
deleted file mode 100644
index a8c4d1504694..000000000000
--- a/dev-python/validators/validators-0.18.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="https://github.com/kvesteri/validators"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
-DEPEND=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/validators/validators-0.19.0.ebuild b/dev-python/validators/validators-0.19.0.ebuild
deleted file mode 100644
index 53c5a29883b3..000000000000
--- a/dev-python/validators/validators-0.19.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="https://github.com/kvesteri/validators"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/validators/validators-0.20.0.ebuild b/dev-python/validators/validators-0.20.0.ebuild
new file mode 100644
index 000000000000..937621790e02
--- /dev/null
+++ b/dev-python/validators/validators-0.20.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Data Validation for Humans"
+HOMEPAGE="
+	https://github.com/kvesteri/validators/
+	https://pypi.org/project/validators/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 663f58b5ff0f..842a8e17bef9 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,3 @@
 DIST vcrpy-4.1.1.tar.gz 329508 BLAKE2B b6981150a8fd742301e0d7897d84855c741c97307bbb5c5751680f3d33d69d6333a18d714fcc14cb018f5dd6c02e840e1313136660c4459e2755d448fc0b07e9 SHA512 afa1904bff37bfd2d278ed49fa3982a357eb6bb113818b532044da0f11a9dd877cc152d7f0d81d88bdc0f870521b1241f6aecf959f668211904e3c6c7cea4ad8
-EBUILD vcrpy-4.1.1.ebuild 1797 BLAKE2B 87e84d360a0d88724e45bf24d096becc6254598d588cd2192aeb477da649288ff6f62fb27b21e5579ffef5a73c54436e4c803e35e2d7d24c3b3e5acf3821b6cc SHA512 10d6eb6e92d2278caf9a3cb35b7e9cbf2097f73f416e23d36252852f596d6f4a98054643bbe95080330b731a92252a23c095bc0056844eb0d38e915f47e8f3db
+EBUILD vcrpy-4.1.1-r1.ebuild 1798 BLAKE2B 93f6511d7b8f36910b79d61fd68333e2c1b912d099c011e2eaa6b8bb33462b640f7b319ad3e110bf826892507e9413e0c9e364cc92f8ef70829562f47f423750 SHA512 2ac1af65fdd13d862898dde4771f7dc5ac1e3e9c1236e85c6be171c13dc54af9445a59a33cf8bdc6e5a84b290ac568630d3296b8791b1ae14185196232e33049
 MISC metadata.xml 388 BLAKE2B fd31293bd6085e6a93816a1813a8c3a9d046ed3d932fba5b32b454a71e7535606ba92815699b7ca10fc837b07a5335df54d5fae8c860a7ea88c6ea72891d0620 SHA512 0360ac6f113035ffd1991d2a42000f290c9d0a3fa8c4dac9abfde0eecafd23e1ff9929d8ee521f83a924c523992fabc5cb4353079bf7c52dac9f906a31d4da55
diff --git a/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..e1d011d9d398
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.1.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="
+	https://github.com/kevin1024/vcrpy/
+	https://pypi.org/project/vcrpy/
+"
+SRC_URI="
+	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# these tests require Internet
+		tests/integration/test_aiohttp.py
+		tests/integration/test_boto.py
+		tests/integration/test_httpx.py
+		tests/integration/test_wild.py::test_flickr_should_respond_with_200
+		tests/integration/test_wild.py::test_amazon_doctype
+		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
+
+		# probably unhappy about ssl module being more strict now
+		'tests/integration/test_httplib2.py::test_effective_url[https]'
+		'tests/integration/test_requests.py::test_effective_url[https]'
+		'tests/integration/test_requests.py::test_redirects[https]'
+		'tests/integration/test_urllib2.py::test_effective_url[https]'
+		'tests/integration/test_urllib3.py::test_redirects[https]'
+	)
+
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	epytest
+}
diff --git a/dev-python/vcrpy/vcrpy-4.1.1.ebuild b/dev-python/vcrpy/vcrpy-4.1.1.ebuild
deleted file mode 100644
index e54023e451ac..000000000000
--- a/dev-python/vcrpy/vcrpy-4.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="https://github.com/kevin1024/vcrpy"
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-	"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httpx.py
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
-
-		# probably unhappy about ssl module being more strict now
-		'tests/integration/test_httplib2.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_effective_url[https]'
-		'tests/integration/test_requests.py::test_redirects[https]'
-		'tests/integration/test_urllib2.py::test_effective_url[https]'
-		'tests/integration/test_urllib3.py::test_redirects[https]'
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 410f8ed8edee..5c256fb2a690 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,3 +1,3 @@
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
-EBUILD vdf-3.4.ebuild 476 BLAKE2B 9c60bccb0716277c6938b2d004b030949d4eab49ed1a855a8c96ab7d75df8dfc3a16fdb01fb275ae620ef0277afd79f1a0930902b4b70470f0c402817bd8da20 SHA512 f9c220fc61de3365b8929bbc9ce8c1a025264d82b8d8fa0eacfc573dce4dfb1dcc5eb03bdb5cb05f0adefd938794dc291e706046b0e47d0a765fbc0cd6f525e1
+EBUILD vdf-3.4-r1.ebuild 508 BLAKE2B 39d355ad4c7e7a539cb318a073cf645e5b2882b4b6cd41bfee66c111ae888cb7871b9b2eff42415dbfb8303434f068a5da7d4ee5e05b99c5ae14b7e19f9c56f4 SHA512 e363694a6eb5be7d592f045a5a0b13cdd62212c04d6328d346bd20be89dce9cfaba8d4823f0fb2239ec718f0ac1072ce68c6d9725c3f4df562cdf120b1100d9a
 MISC metadata.xml 492 BLAKE2B 80437b1fc798d5bced980530bdd88ce168cf568f6be745d0caf7f8e12e05b856f653d7fa3909ec6f3a1860d559584214ce1f9761e0429107650af755c057ed01 SHA512 9182e1920b00061daf94286473a9b755e7a55048ecf06cfcd2d835dd75a958c15c0bfd294ff3a674af794c225468bf829f7171e64275ef44658e13f60d2b4198
diff --git a/dev-python/vdf/vdf-3.4-r1.ebuild b/dev-python/vdf/vdf-3.4-r1.ebuild
new file mode 100644
index 000000000000..b4f78940674a
--- /dev/null
+++ b/dev-python/vdf/vdf-3.4-r1.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
+HOMEPAGE="https://github.com/ValvePython/vdf"
+SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
deleted file mode 100644
index fcd95494598b..000000000000
--- a/dev-python/vdf/vdf-3.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index 6e040b1ee089..8c5e35b9cd56 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,4 +1,4 @@
 AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
 DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
-EBUILD vdirsyncer-0.18.0-r2.ebuild 1671 BLAKE2B 072eb0a183166206ed3999275c4f86299ffd1f6328ab9ff9850363335b0164c5186981172a1c96a18a80e74622c806e9a5e8bf38505d2a719c64bffc9afdb30e SHA512 3043ac90a62d25a8c9e8c29407996dd9b80239d3de47cab4d9036d35b2ff83970c2e5cef06e8e6d585636b263da069c8dd7c91635958e1551879600b1a497c68
+EBUILD vdirsyncer-0.18.0-r4.ebuild 1888 BLAKE2B fa68609647879e119364897ef7888ef1a426b060a039f443b5d42873663d1bf31baa255f66b4e09e6b0cab50dc86e9965efee8ed9380eeba7a3dd399ddb3ac7d SHA512 e204d9d7f6f255fde83c3c76c4395a88541c75e5f19ec9a47c077735d72eecf15a3900fb2797fd37fe093f8d8832c6eefde0e86e1e61dc933d397b5ae942d4ee
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
deleted file mode 100644
index 3b59e15c6a33..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r2.ebuild
+++ /dev/null
@@ -1,63 +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="sqlite"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="https://github.com/pimutils/vdirsyncer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/click-log-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
-)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-
-	local deselect=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_douserunit contrib/vdirsyncer.{service,timer}
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
new file mode 100644
index 000000000000..8dea04b86044
--- /dev/null
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Synchronize calendars and contacts"
+HOMEPAGE="
+	https://github.com/pimutils/vdirsyncer/
+	https://pypi.org/project/vdirsyncer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/atomicwrites[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
+)
+
+DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin click-log
+	# https://github.com/pimutils/vdirsyncer/commit/ea640001d0ad6e56369102e02b949c865c48726f
+	sed -i -e '/click-log/s:, <0.4.0::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# skip tests needing servers running
+	local -x DAV_SERVER=skip
+	local -x REMOTESTORAGE_SERVER=skip
+	# pytest dies hard if the envvars do not have any value...
+	local -x CI=false
+	local -x DETERMINISTIC_TESTS=false
+
+	local EPYTEST_DESELECT=(
+		# test CA is too weak for modern python
+		tests/system/utils/test_main.py::test_request_ssl
+		tests/system/utils/test_main.py::test_request_ssl_fingerprints
+	)
+
+	epytest
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	systemd_douserunit contrib/vdirsyncer.{service,timer}
+}
diff --git a/dev-python/vecrec/Manifest b/dev-python/vecrec/Manifest
index 864b75302c28..c026d4e9f447 100644
--- a/dev-python/vecrec/Manifest
+++ b/dev-python/vecrec/Manifest
@@ -1,5 +1,3 @@
-DIST vecrec-0.3.0.tar.gz 118946 BLAKE2B 04ecb6be616b0d65e93feb3e238f068e68d95a2d90e9ab7c0b0aaf3d257924cf14f46cf403661b26b74691ed41afad9f16c52b426da23e0209d8849fe01bf42b SHA512 9208bacac7e32380fce3d0e3fca8b3353776d4154ffe2eb2360020f76eace5ced38ad30253cad377716c9a0979ee0d038debd0e6187bc72caeb17505225597b5
 DIST vecrec-0.3.1.tar.gz 18893 BLAKE2B 1b04e2ccda949d45aea083c03f963efbe3f52cf23e4c73b66b4bbe2084ad0d2690b13db9ccbd852f60e01384e85131aa36768bf26d7722f85db7856f0238fd5e SHA512 8fb8257036204efde07e739c698586e4cff81b391d21db79413002b35cffb9e02f5348acbbb374208be1c25eb96d1d8877b6a8b20be501a7541b46c43eb1dbfc
-EBUILD vecrec-0.3.0.ebuild 454 BLAKE2B be9d2a577e5d1e73a8d1b97ea9d685fe95a7e72bf9929c41cc381d0789a883177d0012e859b44e46493f0c719d641d2208efe8fbf3eb6739f8ea6130e87e3452 SHA512 6e48eb64e9057795bd916aeca01ea5b7285970cbcbab318e5d9ddc43567711cfe9030b1b0e43fbed9af350a9b466391ad5d8d125d176f4fbe34635ca1ed1ae86
 EBUILD vecrec-0.3.1.ebuild 654 BLAKE2B 0e0477ad86c8484dcb4c0d0b4f5e69185867002bc3d2957ce23cf0534c8f847bba4234bfcee44efb2a3847f0d8f240947a792d6c30c3d30e068e5e48543eb9a7 SHA512 81cedccf4deed1dfdf772195d9499aeb4763e1f8119bfcac8412a219524d0b18398eb78c18a8f72f470a4242b383ef7f530a550b007f4b11bcfc5e61fda5f81d
 MISC metadata.xml 767 BLAKE2B aec0262db4d0adaf1c3a829b973860ca035f74d2e8cb1ab86af5cba9700ece310c532c58c83b4aabcec940bd42da774f95179f6bcae6749c44717a4550e6e4d5 SHA512 69e1cc79fc85bde614dd7556addf550cf31384371dcb740f3925f81d0475a3c920679b9c3d62d0e51b115a78a26cf1d324c2cc86ccc4af2d66b341409fca37aa
diff --git a/dev-python/vecrec/vecrec-0.3.0.ebuild b/dev-python/vecrec/vecrec-0.3.0.ebuild
deleted file mode 100644
index b0729371a7bd..000000000000
--- a/dev-python/vecrec/vecrec-0.3.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="2D vector and rectangle classes"
-HOMEPAGE="https://github.com/kxgames/vecrec
-	https://pypi.org/project/vecrec/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests
-}
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index e8716c471a25..3f7d319f0574 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,4 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.7.ebuild 676 BLAKE2B 419c82833e5bbe2dc7fd14f90a19807424f8bd0459722e0db9c8e42538f5473fd9fddc3b394c33efd064f7c8f8609aa75c4e2b4bf4cb807998e8876046ece292 SHA512 87f0d0c5bae489bf856b052474887ceb167ca27ef7b00d85be89761fe81621eb6efaddbee1e0cb3c5d632f631cb486518dc80e3eac007975c948dc66361b4010
+EBUILD verboselogs-1.7-r1.ebuild 717 BLAKE2B f4c68d8b8441aae84bee1763e91dfe26fdf8ecf8ed8fdb241a6d9fd3a7d6844fcd51b1379d9524202cb6a8ae8e73ae71c1294f50c3b670da8207687959a926dc SHA512 5aa6a417374fbd1a25542478f5ee50cb797863c94f717df05e912d5d83fa0e838ff8f7d058f80510f6c45bd6aea5365f9abf1cfbcb67fdf211d403f569ae502d
 MISC metadata.xml 379 BLAKE2B 9bb7082fcfc86cafc4e7138060638b305d5245f1d5d685fee68e715fabadc17ed30662285d2cd46905046c60c3f7066944f86fecb57510b03c92f01ff8ce4a35 SHA512 eaf3d7f9f54657064ce8fed91a69dce7b7136bb628673f55e892c4c76ffd51564707b6fba1c2e538080d1348b4c3f0da8b471dc8422e39ec38271a6af7e9c60d
diff --git a/dev-python/verboselogs/verboselogs-1.7-r1.ebuild b/dev-python/verboselogs/verboselogs-1.7-r1.ebuild
new file mode 100644
index 000000000000..f855d7e4bb8c
--- /dev/null
+++ b/dev-python/verboselogs/verboselogs-1.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Verbose logging for Python's logging module"
+HOMEPAGE="https://pypi.org/project/verboselogs/
+	https://github.com/xolox/python-verboselogs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-skip-sandbox-violation-test.patch"
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest ${PN}/tests.py
+}
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
deleted file mode 100644
index 4f746ac0c6f4..000000000000
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Verbose logging for Python's logging module"
-HOMEPAGE="https://pypi.org/project/verboselogs/
-	https://github.com/xolox/python-verboselogs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES="${FILESDIR}/${P}-skip-sandbox-violation-test.patch"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_test() {
-	epytest ${PN}/tests.py
-}
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index ef31482f117f..43a879de28fb 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,3 +1,3 @@
 DIST versioneer-0.22.tar.gz 50847 BLAKE2B 3508ac89e65df7a936168fefc1a557191d9362ba69fc9b79eea495cb340c9e314ba5fbac28041bc502aee3adff555e56b43e4ff7fb0d682e96fc3e2ad6bddbad SHA512 f02d50a47c1990275ebf9e720bdb7f13e5fbfc344b361197ecb7602e5ff02e438e43983b4e1cbfde5aa6fa4328a1ffdac60009d6925cf027e484b0ce12587484
-EBUILD versioneer-0.22.ebuild 894 BLAKE2B fdd4700ed42ab331add43b2ea1ba82405b61b18becb54ab30602318734db057f94eec902ee8993a2fb496a1d3387e9b24c6df2b3390c90c49480f7783ceb20d7 SHA512 74ed4902d77d694bc3983c1711fc42c4aa609e51d944b3e355debbba7c621de29bc6c1647b9325c69da59c3b37494e06e60c4ecb866dd7322141dbe3c5bf8820
+EBUILD versioneer-0.22.ebuild 894 BLAKE2B ad692a44028ec1026bf61f8659e56e82cadf86a07397ae090dd10b237ba5e39607b7510b24e7c01fc1a97dac875eac822f75b0c997d95e89ee8ed7bc656f1516 SHA512 6925b7959a352a7dcb509accd930015034d296293aec1cd387e08d68c6a598159b069ee07657716a45fae03c92a663ac49bc25434d5fb5a6acc5adc2d3bcfe61
 MISC metadata.xml 426 BLAKE2B 050a6c51f12ce466d0149041e103227c176f792326f859474c996a38f510544f09a594b6a70036b3cdad78013ff9982316c671e77be6ed2e7f0fa643bf89d320 SHA512 da99aef0b58491715dca230579ecba68bfe357909dd8bd122e790d7f0300e0b1d11cf224ea3a3c76763d593f45013cca6cfe27cc774c6eb90dd6da562a061c38
diff --git a/dev-python/versioneer/versioneer-0.22.ebuild b/dev-python/versioneer/versioneer-0.22.ebuild
index a4f1e0b313b6..d79ea33ab270 100644
--- a/dev-python/versioneer/versioneer-0.22.ebuild
+++ b/dev-python/versioneer/versioneer-0.22.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Easy VCS-based management of project version strings"
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
new file mode 100644
index 000000000000..0427be43f5dd
--- /dev/null
+++ b/dev-python/versioningit/Manifest
@@ -0,0 +1,3 @@
+DIST versioningit-2.0.0.tar.gz 735138 BLAKE2B 59247c0a2ec85f828b1b36c7f7ff6981fdd430b242c262f7325586e8ab35410083e0a795e72204c9ad9c0c50bb02c047f8baa01c556f74d69a8ddfc9e911474b SHA512 d700e25f3b58efd87943a950ede66ad8814e3aeea1927bb68b51312a636684b16695c44492f4357595305a5a85a3fc8c411d80a02e9b157162844d731dcab93f
+EBUILD versioningit-2.0.0.ebuild 860 BLAKE2B 5b99a6099f118843506107b7738b12588971c23e63a73f9394457b364bbd852cb9af74d69db6226d94ab219cde4549bba8a6e4887b5ff6df9956fbc01e7cd1cc SHA512 fa0ad9816f14251306d7564691737a54e1f29a59be9f420a307737092c774a53eb920d3f0c5380f8c5c6b7381b0fb276be0efecc81201af7fc90f49c08350ef9
+MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-python/versioningit/metadata.xml b/dev-python/versioningit/metadata.xml
new file mode 100644
index 000000000000..edc0e0bb524d
--- /dev/null
+++ b/dev-python/versioningit/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="github">jwodder/versioningit</remote-id>
+		<remote-id type="pypi">versioningit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/versioningit/versioningit-2.0.0.ebuild b/dev-python/versioningit/versioningit-2.0.0.ebuild
new file mode 100644
index 000000000000..392e4e954b30
--- /dev/null
+++ b/dev-python/versioningit/versioningit-2.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A setuptools plugin for versioning based on git tags"
+HOMEPAGE="
+	https://github.com/jwodder/versioningit/
+	https://pypi.org/project/versioningit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Tries to do wheel/pip installs
+	test/test_end2end.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i \
+		-e '/--cov/d' \
+		-e '/-cov-/d' \
+		tox.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index 3ec91f18b6d9..445238ba7f78 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,3 @@
-DIST virtualenv-clone-0.5.6.gh.tar.gz 8723 BLAKE2B 2bac625f85a26ac2224fb982230fdf592963ac462d6d86c59100bf960fc37dd4ae7ae9da0e6234e1b2952d77ce55e0a0c60c06c7db4868709638f21479e8150b SHA512 5788a3d2994b3cbf4ec4668e2d0597e7a033a5eb13465b3964aeb2a38c5798a879e818a88a9cfa37b87a9aae534416c157cd82959af556b6ec94ffbc755ba844
-EBUILD virtualenv-clone-0.5.6.ebuild 542 BLAKE2B 2517a446c43be2c54a21a6f3e3ed81602b6869646d17a970de0944b4e92abaf7174c5ba2c74b613e280aff05a3c8f22dd4e56b297f25f79df5841ce39d37cdef SHA512 d7e7d5f02ac680f4fcac9c37c66551d7fb78505d8323689807d931392d5e28a375089497845bd327049046d2e09269c044ed7f7c7407b0dbde5b1313a09252c6
+DIST virtualenv-clone-0.5.7.gh.tar.gz 8749 BLAKE2B 584f67c5a1921667ff2daf3b632ca6661d60ace166c6d05e22783a37c4387a92ec1a97990eb7a0c1a687d3e14d258df54b8b81c560458e33c31657c2c378382a SHA512 a71cc1e02ac70fb41945a505297ae894a0bd17e397f90b7cc9ddff599b2f649ca24d3e767a2672e8c27c387e5a235ec6bcbbfcdeb9a0c6e6d4600cf7f4149f4a
+EBUILD virtualenv-clone-0.5.7.ebuild 627 BLAKE2B 7d9020004abce7695f4c5f25b14d4d342c4e7385861ad3f00ec962c48c4cb8eb0a484da97c0ff776e78b6c43d4ce0596c8d868d6aca4ee29a23b4fdd79a971a3 SHA512 c8e2feb35a85f4e4761478823b5fe36f7805479823bbab6c380a20fc7263e38c3e9e54d056926d06a18ead1ed7d05ebdcad42f13f0ab57df766ccbea1b5d3b32
 MISC metadata.xml 426 BLAKE2B e1f7d7fac506cfd33a89fc1824aecc183c8791629fba4d5dd807042b37b22cac47eec7e4ee8f3cdfc721bbeddb675f8174f97d53f68f64a4ee96370f4b13fa57 SHA512 b3f17e3ad784a814d5107944877612f80353fd0719fdb9875430cc0c327a4b8bf8d62ae9dd5aecaa300b56e2c85d8f8b8ea8b54d1e7d93392a38f0645e1319f2
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
deleted file mode 100644
index 2a8e50329b7f..000000000000
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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 script for cloning a non-relocatable virtualenv"
-HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone/"
-SRC_URI="
-	https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-BDEPEND="
-	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.ebuild
new file mode 100644
index 000000000000..2d8fc5c2f597
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.7.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=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv"
+HOMEPAGE="
+	https://github.com/edwardgeorge/virtualenv-clone/
+	https://pypi.org/project/virtualenv-clone/
+"
+SRC_URI="
+	https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+BDEPEND="
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 3731e473961e..a58ec9976c07 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,7 @@
 DIST virtualenv-20.14.1.tar.gz 12216889 BLAKE2B 7d06b47629dcf4a60299b9b0a192478b20ef820b8a7516569e50b57b2df383781e7e14fd4beda14a3425164997e69c8ed922edb593f86eb3bd85e4ee3a9f2ac1 SHA512 149e78787db23eabd4238baa172bf023ddcf87d59284fdd090269acfa15991aab182f9e168851f88ef810d5c50dd7cdce69d132c46ebedb10080d65a308e63a1
+DIST virtualenv-20.15.0.tar.gz 13523195 BLAKE2B c5d4b1fd78998ccdc7a041d11e0fcb569bfd00151975170260e245726eee03b4ef1cf758d43175312e69e4b482f9ec17b4e93e6854c3bfeafa2304eef2688a20 SHA512 2e3cddae926f89ef986a85ddf592b38d53401212e974b65243b9f47290b653798ab2405920c28d3a7961aeb726f25ed6401e19661f1e9ce7afd195e87a0524ab
+DIST virtualenv-20.15.1.tar.gz 13523736 BLAKE2B 4f8d491fae7c0c28ae349845c4c5ddd27e53b9007a427c8a36e66a427269b519829f1c351f028b63fe38b49e934f4e209bd2cf2e07363171f732c6b0a052a3bc SHA512 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a
 EBUILD virtualenv-20.14.1-r1.ebuild 4636 BLAKE2B df586e00a1dfe68aa3eb6f1757ced244836475eb4795dfc5044f78ea612f15226fa50186d7441cf01f4b7eb3f58fe166e49dc46cd9f71e8ec1c400ee7857338c SHA512 4e307ce1dc6b604f71423942f8adc2277fb96ca94584922982cbbae801ea22fb55e2b5b4766c783f1ad39606a366539fafdbc939dffb8e4cc946f640f690d0b5
+EBUILD virtualenv-20.15.0.ebuild 4644 BLAKE2B 360e3be683b1a652b43d4776d4dd20ad0525982be0b4fcf4f36c23c5b65e8b2fb239433233821395f9e90eb6dad5a4918b47ab33d8e93b83a1054c0910a7d530 SHA512 240ee0635b462bc050cad1f239135e76acd3823fae25f44c2a9f786072c53d4e801ec300c421e4dbdf8ba79a93c2164b43e3a37a2e8a95eb7c26b9be64da82d3
+EBUILD virtualenv-20.15.1.ebuild 4644 BLAKE2B 360e3be683b1a652b43d4776d4dd20ad0525982be0b4fcf4f36c23c5b65e8b2fb239433233821395f9e90eb6dad5a4918b47ab33d8e93b83a1054c0910a7d530 SHA512 240ee0635b462bc050cad1f239135e76acd3823fae25f44c2a9f786072c53d4e801ec300c421e4dbdf8ba79a93c2164b43e3a37a2e8a95eb7c26b9be64da82d3
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.15.0.ebuild b/dev-python/virtualenv/virtualenv-20.15.0.ebuild
new file mode 100644
index 000000000000..f5652cdcd1be
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.15.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/virtualenv/virtualenv-20.15.1.ebuild b/dev-python/virtualenv/virtualenv-20.15.1.ebuild
new file mode 100644
index 000000000000..f5652cdcd1be
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.15.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_py_info_setuptools
+		tests/unit/discovery/py_info/test_py_info.py::test_custom_venv_install_scheme_is_prefered
+	)
+
+	epytest
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 8d3375843e7b..0755a34ff673 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3-r1.ebuild 500 BLAKE2B ea3729d1ebd0259aeaca491045ab849a5d6f64516c8980b9d6a7141fc951ab085381b5f68fd5f00c171edbf5feecda6a7ecf4e20b42684d112596028590180b4 SHA512 d4f30e3576aca0915bb640eff58921daa4a4cc2ef3fb8a8242c36a7f2a8e470b024ea687edb79ad341c0e332f0c44200df644fabe6f3a9834cb2b55955eb51d9
+EBUILD visitor-0.1.3-r2.ebuild 532 BLAKE2B dd99e8795d6824bc18da42603695f81767e83f0df46a3a151168072d39eb2b6f087427d7375c13fc1dd4b32d3f5207c75670ddcca70196651832bf62dde103fd SHA512 d7becd3376c79c6fcedc1eff4dabdd44b7078997f936835c66e9a98ee56644f9b391f0dce35479b2e917ab02bda290dd8810366105b6dddef55644fe84d9d983
 MISC metadata.xml 426 BLAKE2B 266ee59525ff4a25ede53707d3d208150768837b2cef64b4111840f8a5053ef4e211c29b88849887b32d7571d09bea3b3850ed78af4e89d670056c99a11bec79 SHA512 10c116b75398a39c9a8dcb20edac2e136c0da9b7c8bb0c1bfdab594c9bbd23dfbdbd63e6203848063abcea24d788a5273ecbcf54470d42fc0345e3c308fd510f
diff --git a/dev-python/visitor/visitor-0.1.3-r1.ebuild b/dev-python/visitor/visitor-0.1.3-r1.ebuild
deleted file mode 100644
index 7deb9bd59a3b..000000000000
--- a/dev-python/visitor/visitor-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tiny pythonic visitor implementation"
-HOMEPAGE="https://github.com/mbr/visitor"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/visitor/pull/2
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/visitor/visitor-0.1.3-r2.ebuild b/dev-python/visitor/visitor-0.1.3-r2.ebuild
new file mode 100644
index 000000000000..7b3e44ba3ce8
--- /dev/null
+++ b/dev-python/visitor/visitor-0.1.3-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tiny pythonic visitor implementation"
+HOMEPAGE="https://github.com/mbr/visitor"
+# PyPI tarballs don't include tests
+# https://github.com/mbr/visitor/pull/2
+SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 1bbb172fcee6..f244fa61495a 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -1,5 +1,7 @@
 DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
 DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
+EBUILD vncdotool-0.13.0-r1.ebuild 1152 BLAKE2B 7fe856a1cffec18944b25bea4e9703ba701a07b9ad02c7ad9704a23687ce2e9a5df6f77d0033a56318fec8e9d40879e66f230f675750ee3516253ce99eed3eb6 SHA512 df03f9f475e3040aaede947bffdc2ed676dd4fa9a01aea0bce05eaf00e8cbafc577a82cb49ef45138c4e7f4e9f3e2f43e78ccbf1414d2438317f36421256855d
 EBUILD vncdotool-0.13.0.ebuild 1153 BLAKE2B 57a12db59df8d3cecf77ab04ad9e7b15bb0093d5ba9bbc8a1225c57daa0092bf7d6a52848749866f5a9efb5cd44511a4812628aaea9a00dfd170a4f2c2624a0d SHA512 7105ba13d3aa170ccf54417efb13b9479e0622f872a04d694006d7e0a79cc8fda807a3547f535ff42de9b0214c8d74533a04ad45db9b1b2ebacaa50ef5a2bec5
+EBUILD vncdotool-1.0.0-r1.ebuild 1152 BLAKE2B 7fe856a1cffec18944b25bea4e9703ba701a07b9ad02c7ad9704a23687ce2e9a5df6f77d0033a56318fec8e9d40879e66f230f675750ee3516253ce99eed3eb6 SHA512 df03f9f475e3040aaede947bffdc2ed676dd4fa9a01aea0bce05eaf00e8cbafc577a82cb49ef45138c4e7f4e9f3e2f43e78ccbf1414d2438317f36421256855d
 EBUILD vncdotool-1.0.0.ebuild 1153 BLAKE2B 20c3849cea515ea151a0808e34920017c43c700c58d8e58841fa7d6ce54fab5b8c151d58da3d3f3e50c035e67b271e4194117951d6b12fb8eb95b83a40303ee2 SHA512 19513558be0ec5b5ac10ca25432882a1b761ce7cc16aa28f0201d40e6d3ea5bc35917365049acabc262ade52d389d12c19f81e5ac4630cff7c9798b5b30e9240
 MISC metadata.xml 411 BLAKE2B f56300952068ded2038b9366bc314e31f9f4b8d576a73b022403330be66f7068bbff1c7da0f71dda79088d1364a60ad008b7183ea652b76578c52484b2ce18f7 SHA512 4738b4949de46df665517f4cd639e630cee8ce1eb13b03c547b9b6193aad09bebdd9dc05e1e2282d8ce17b31e14e0734c879d44ed290b6eec46654ccd97dc8aa
diff --git a/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild b/dev-python/vncdotool/vncdotool-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..ffc8761dd794
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-0.13.0-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# A lot of errors such as the following appear
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild b/dev-python/vncdotool/vncdotool-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..ffc8761dd794
--- /dev/null
+++ b/dev-python/vncdotool/vncdotool-1.0.0-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Command line VNC client"
+HOMEPAGE="https://github.com/sibson/vncdotool"
+SRC_URI="https://github.com/sibson/vncdotool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# A lot of errors such as the following appear
+# pexpect.exceptions.ExceptionPexpect: The command was not found or was not executable: vncev.
+# to install those, a manual compile and install of examples from net-libs/libvncserver is needed
+RESTRICT="test"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+)"
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 9babb64c0c2a..0d5a1d267d2f 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,3 +1,3 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.6.1-r2.ebuild 758 BLAKE2B db3bb19cd5c8bc8ea6600cbb846385f8dc6532be66fe8e450095d3fe5b314c0dc4f81361fca575be8c222ac2cb07ad419228e009a2a212a6adcddb331ba9dff0 SHA512 0494966e3e8728942c57302dfa2e6b3f21dbda22daff519e59af8e81b6c89b8033f67cffaad2916476070db8a1ad32f20dd731dede81fafb687cf5486c4b02a6
+EBUILD vobject-0.9.6.1-r3.ebuild 662 BLAKE2B 9c884f114b6d373111262262b370155f550d1e4a563bd493a9e335f21f54953bb46fe1abd3dd5cd8f4e7bbab17b32e45203003afc4ded58f90d88672d3b1d090 SHA512 a3c16a44b38345b2ff138817fdc8c385ff54890366f14b83e6859c0d43dc864bf2cef08835939c20eb9668e2b5153e128438540352762ce1a15729f75541b721
 MISC metadata.xml 392 BLAKE2B af963f0dc85251c0ebdfee0109feae11f147a3cbd847e598eaf48cd82519599d7609c58b10ae8c441df783344d53a253eed09c434b116cd4b26a9fd46d9ecdf0 SHA512 e71184a7032073df710046d0c48af2a5cb01190a9a95d678ca9915f5b8b4885b4c47af7f499b9e11adb11e1df1f195f50b1ef55bd30dc8a5f6c77551b57c668e
diff --git a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
deleted file mode 100644
index 2ef9c8f66f0f..000000000000
--- a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="https://eventable.github.io/vobject/
-	https://pypi.org/project/vobject/
-	https://github.com/eventable/vobject"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/vobject/vobject-0.9.6.1-r3.ebuild b/dev-python/vobject/vobject-0.9.6.1-r3.ebuild
new file mode 100644
index 000000000000..16c3884a49b4
--- /dev/null
+++ b/dev-python/vobject/vobject-0.9.6.1-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
+HOMEPAGE="https://eventable.github.io/vobject/
+	https://pypi.org/project/vobject/
+	https://github.com/eventable/vobject"
+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/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
+
+DOCS=( ACKNOWLEDGEMENTS.txt README.md )
+
+distutils_enable_tests unittest
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 87a172232714..9340ac057e86 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,4 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.13.1.gh.tar.gz 42466 BLAKE2B ee66abe131d5ed6f49fb6ecc0227c6108617cadc694132826c88abf33b83538db1c97d38451983d2fb1191d5e7066491194fb01399e920b21a9e75d54df2d3fa SHA512 874960bdd3fce213e46f8017fbc56ede02133de6f8cb439d810db38ca06d9c5fcf5496150ef4c73fd19d9e06489ba08a510fd96aa16b8825564a52fd01cc3f4f
-EBUILD voluptuous-0.13.1-r1.ebuild 616 BLAKE2B 6e5dcf940c4f1f9475bb2dadde7940c883df05fd4eb71376bdb7fbf03da139c55d5c95e711c2d91ba7f3b61e18ec9494a2937945f26c00af0c53cf2c06541434 SHA512 8618a55feae250277eb9243d45dc3d562a16335ab821153a7070011a60217febbc8396403c59718ba7e268e5e3c16f4190c8ce985e41521a5126783d5b2ffec1
+EBUILD voluptuous-0.13.1-r1.ebuild 623 BLAKE2B ff81e27102c870c84438827a1bd0f5788ee48909f48b12c6345f8c23ed132512fe3772a2e7ba1476db9819c3603fe61f8228bcea0e0851b3fcb5de3d1472fc27 SHA512 738d972f4d78210910eba56debc5716b02ab4cea4d5bc3b9355e33742de55e7595e44a75a412536419aa93ec4c1812833932ac0668e87bdac451fb8d64112d1a
 MISC metadata.xml 716 BLAKE2B 1298492f8a89ce4babc23481dc56da06e4d9007546ed2804fdf42906f6d90d3b1327ee2d54724fa3621a387429544931d30a0334312a68a17edaeba735c9d7b8 SHA512 80636ea29257b1ff070427dc759f9d0abf02ba2037676725627308c69a1e9bc49353c09507523a739c3f07a4cb284e2df76d3935f4f9dadb64005ad7204ddf60
diff --git a/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
index 567be14b9dc1..28f3950346b5 100644
--- a/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index d156679908e3..8ac77d84d2c2 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,8 +1,3 @@
-AUX vpython-7.6.2-fix-python310-detection.patch 1871 BLAKE2B 8c9a0a818fd0a8ea9ddc2f5f149c14cf17d691f928badcca8c05a643f7f40eed2b6a2f0c0dbdac0831a02e5acfd93108589db5e5ab9bbc0651915a0ede6138ff SHA512 d5b08fcc87a6dd449718dc848174a24f321582a57b582c78eb35427daf57a023420a0935b8bab9b97dd3c2b2397efffa1956def749acf978f616b8c52aa93b9f
-DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
-DIST vpython-7.6.2.tar.gz 4461606 BLAKE2B 67e59d5ac8e061ffa62433bcc1c3285cf659482e298b706d2b59ef8160c154c42efa8677fce19856a88024af06fb71882ff280ba2e1312a18da272168a4eb1a9 SHA512 fb8f0e9219950cab6d800a44a7fa473bd39e67895170b5cd7636a78cefd83f740d5b4da245b3f252402bfae6e576948b5831d230bf365ac7141ba6bf5f1ef6d6
 DIST vpython-7.6.3.tar.gz 4461187 BLAKE2B 4698396fb9f846db59233bb6795748cadf7a0c8c4b1969dfe439965fa29db703806197a6e91b5d91935b8fdcf5c626dac6613a73e06b88c899bdddd0b19ef69e SHA512 0270103eb5c67ecbf7461e1821e3502295976f430d290fbefc5281643802963bf6ccd729eb37b19e50b2403f7cf0dc09f869d4cd30726ccd086bacb6180f868e
-EBUILD vpython-7.6.1-r3.ebuild 668 BLAKE2B ddf9e620a85b5425427c348a35642877552b1270ae2994364d7e3e8bd5950aaa0c96f17d77ca715b18283154d0b938805971ea7d2d86fbae8375dafe10c40286 SHA512 160cf59afcc603ca7a179b82a3cc19a8528561a52f9ddb77877fc3c32d8feacaff74a1db6bd7d7199cf81ab53d23f92b8b580d64c8fd4d1cc7821ecac155d709
-EBUILD vpython-7.6.2.ebuild 913 BLAKE2B a7ab6b22924c8826a74952eccb9a0a4ed5372bd06e200374c7a54fd677bbfabe228c07a8d14987dbae079f7cc0341a38110e1faba3161fd5aa6b9d7e9ca2bbdb SHA512 1a19852780c7dea1363893eb54d980d9e2d08b8d15c748cdb99be215ef263ad3141c562f34d133b2638a8a81752c87dbd5ab4e252c362444e379ce6b618e941c
-EBUILD vpython-7.6.3.ebuild 826 BLAKE2B 1daccd439bbdc7afbed7304acec34f31577eeb7006120ddb69868dc72dc35bc07cabb0e85bda82a3eabaadb0525dcd026545fa55bce5f2c7f0e16d25e748d65e SHA512 f46f43dc52c180955b56ad8b0cca7580f1305e38f369adf6d6f54491b74ea214e44011b17037b3289705e858886719b6b4667df7719785734983597644827962
+EBUILD vpython-7.6.3.ebuild 785 BLAKE2B af2a51fa6bd5201efee6ae144db9dd3a95cbec1a2860067e34caaca772a0d517b3ab2b326dce7c613e581208e54ae2fedf8f20ec618566140b0f940058a320bb SHA512 9bb052adaa29f1fc50a434bd893782a9aec1b3d748a10ad399e2b508aff4db3f8107be7669102c0bc6d9cfa95b74a577e3cc926c817df8e51d55ceb31c4cb3e4
 MISC metadata.xml 755 BLAKE2B 5dcd80ebf6280ce667a184f4126adb8302cffbd498395a3c2c53e0774c3b3633b97ea498cc1456a318cb9640f845690b99dac23f154a1045ed0342eb6d068eb1 SHA512 99adc64719b3b0691e83aa1b6140ce3a5ea8894572405c86eac365dfe3009bbe73ec7694be78887250de81fa718a20ba3246a7dedbddc97a4ccdd3523904e20d
diff --git a/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch b/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch
deleted file mode 100644
index 5cf5b2fe000a..000000000000
--- a/dev-python/vpython/files/vpython-7.6.2-fix-python310-detection.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 426eeae74eb67934bf7ddcffc07677d93a7ea191 Mon Sep 17 00:00:00 2001
-From: Mike <Axe319@gmail.com>
-Date: Fri, 8 Oct 2021 17:22:52 -0400
-Subject: [PATCH 1/2] Fixed version check to encompass Python 3.10
-
----
- vpython/__init__.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/vpython/__init__.py b/vpython/__init__.py
-index 3fc6ce5..c09f697 100644
---- a/vpython/__init__.py
-+++ b/vpython/__init__.py
-@@ -10,14 +10,14 @@
- # both of those.
- 
- from ._notebook_helpers import _isnotebook, __is_spyder
--import platform
--__p = platform.python_version()
-+import sys
-+__v = sys.version_info
- 
--# Delete platform now that we are done with it
--del platform
-+# Delete sys now that we are done with it
-+del sys
- 
--__ispython3 = (__p[0] == '3')
--__require_notebook = (not __ispython3) or (__p[2] < '5') # Python 2.7 or 3.4 require Jupyter notebook
-+__ispython3 = (__v.major == 3)
-+__require_notebook = (not __ispython3) or (__v.minor < 5) # Python 2.7 or 3.4 require Jupyter notebook
- 
- if __require_notebook and (not _isnotebook):
-         s = "The non-notebook version of vpython requires Python 3.5 or later."
-
-From 405062dcca5a9a8656b99afb52cd13ce885f8bd1 Mon Sep 17 00:00:00 2001
-From: Mike <Axe319@gmail.com>
-Date: Mon, 11 Oct 2021 18:16:50 -0400
-Subject: [PATCH 2/2] Added username to contributors.md
-
----
- CONTRIBUTORS.md | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
-index 1f627bd..d608966 100644
---- a/CONTRIBUTORS.md
-+++ b/CONTRIBUTORS.md
-@@ -30,6 +30,7 @@ We are certain the list is incomplete; please let one of us know by opening an [
- + Kyle Dunn ([@kdunn926](https://github.com/kdunn926))
- + Brian Su ([@brianbbsu](https://github.com/brianbbsu))
- + [@0dminnimda](https://github.com/0dminnimda)
-++ Mike Miller ([@Axe319](https://github.com/axe319))
- 
- ## Full timeline of vpython development
- 
diff --git a/dev-python/vpython/vpython-7.6.1-r3.ebuild b/dev-python/vpython/vpython-7.6.1-r3.ebuild
deleted file mode 100644
index 1d56387d3f84..000000000000
--- a/dev-python/vpython/vpython-7.6.1-r3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="VPython for Jupyter notebook"
-HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-RDEPEND="
-	dev-python/autobahn[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="
-	${RDEPEND}
-	${BDEPEND}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/vpython/vpython-7.6.2.ebuild b/dev-python/vpython/vpython-7.6.2.ebuild
deleted file mode 100644
index cbf767586bd9..000000000000
--- a/dev-python/vpython/vpython-7.6.2.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
-
-DESCRIPTION="VPython for Jupyter notebook"
-HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
-SRC_URI="https://github.com/${PN}/${PN}-jupyter/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-jupyter-${PV}"
-
-RDEPEND="
-	>=dev-python/autobahn-18.8.2[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/jupyter[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-proxy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	${BDEPEND}
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-PATCHES="${FILESDIR}/${P}-fix-python310-detection.patch"
-
-distutils_enable_tests pytest
diff --git a/dev-python/vpython/vpython-7.6.3.ebuild b/dev-python/vpython/vpython-7.6.3.ebuild
index 3c1262029dc7..2c0cd2303be8 100644
--- a/dev-python/vpython/vpython-7.6.3.ebuild
+++ b/dev-python/vpython/vpython-7.6.3.ebuild
@@ -25,7 +25,6 @@ RDEPEND="
 "
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/versioneer[${PYTHON_USEDEP}]
 "
 
 RESTRICT="test"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 960e30bd9076..47b0b774db29 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,3 +1,5 @@
 DIST waitress-2.1.1.tar.gz 178336 BLAKE2B 3d0668b71d1f8b6ec3c89ca2817f41c09fd35fa0ebe39c0494fc4154bcee4e25e104263080a41b6b97d523b509699f54874a196c84eab60bf99e4204d52432e7 SHA512 443d0b5d22e0efb49bdf4beb228fc0584caa52f3351ff678da748ce2f1d9e89462f5d69e21bed2d535abefee8712f2071faa15d0e64485bad4b0fb467a1b38ed
-EBUILD waitress-2.1.1.ebuild 689 BLAKE2B be86e98f7379d77b180a041efd352c355d1b834266c9406e8d3cf2f2bf92d68c1a86ca84a10bcaa249f23d7ad10fe46ac0209df2d8049cb834f5c6b9203c737f SHA512 7cf196125c50148dab22f2ac99ae093defbd3380bf2631e108dfbe6b846abab6c3012078837afad1311dda0a5e48428e1b16cc9c4486b33fcc8f927a8c144f68
+DIST waitress-2.1.2.tar.gz 179823 BLAKE2B 0cbd172050f1da845c47b3a084cd5d7558c736c416372f22af4d4b6870ef6cd9050f4779fabaa5069b6b4783d748df98e2484eaed09da4d2cfc2d239ce15a05a SHA512 4ef487e116b34eede0f04a02ca7a78116a91664814067a8562d1cd15a4ab702e5faf4be7c122478324d017b6bb1f5315633b74405d00e900b34cc8f1a068da59
+EBUILD waitress-2.1.1.ebuild 689 BLAKE2B f1368db32e093841c63698c97b22dc37206daa152adbdc191c54e78eb53c7e27a1e223e21335fee03dc7a8de546f6e8b62b5e8e514499e1fb3452b27fd9280d3 SHA512 ac2b48ba21d2a43d74e0bf31aa4f86836f42980c790719b41231048dc9dcf0a5cc4974d4a7b0863a044164a5a1fd39edeb04861131a4f9157f46a2c9df7188f1
+EBUILD waitress-2.1.2.ebuild 697 BLAKE2B 6af82a3afef7bcaa7e4cb69da0a8206562b5907ad046d219f86839ded96e619327f815cc85f74199c531bde510f25458b89b680cc9b2836c84db1ebc968970fb SHA512 52cea9ad77a6d0340755b5c7d857b5357b964391f3b0829d4b427d00e311873cfe21b739f75395827adec91377b3c47af29d670ef0f6395ca1d331aebfd55226
 MISC metadata.xml 404 BLAKE2B 384598e80742dbc76ff25fab9b93b3e5ad1f730c9c55782257a6e7ce2724f631213301d4a213bd1a20ffc0bc97bfbb2ae4759cf9ac6e31d9728f645fbb69cb9d SHA512 5315d60706055e2def0e41f4d8ed99bcb54f99524fc6d23ffbe36a28faa315801dbbfba02042ae217e3a9db2dbac430085500603d88cfb0fab25d0a587ccee0e
diff --git a/dev-python/waitress/waitress-2.1.1.ebuild b/dev-python/waitress/waitress-2.1.1.ebuild
index 69eb6fd6a447..a8ede63daac5 100644
--- a/dev-python/waitress/waitress-2.1.1.ebuild
+++ b/dev-python/waitress/waitress-2.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/waitress/waitress-2.1.2.ebuild b/dev-python/waitress/waitress-2.1.2.ebuild
new file mode 100644
index 000000000000..1040cf28ad09
--- /dev/null
+++ b/dev-python/waitress/waitress-2.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python WSGI server"
+HOMEPAGE="
+	https://docs.pylonsproject.org/projects/waitress/en/latest/
+	https://pypi.org/project/waitress/
+	https://github.com/Pylons/waitress/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index 340abd132504..127fddd096f3 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,3 +1,4 @@
 DIST Wand-0.6.7.tar.gz 11686093 BLAKE2B 58abbdc22eb1603ed42e2e2473c0ed2b9026c9c0a499bb885512b56ecf01fb4ffe450979808bba2b4c4466994f86bea9a9c0ced216f8338c845b96a755f39c9f SHA512 e79ecb909f6ad7b3ddae217bb7b27f3c010d22a40eb99866e2a6eb07346000acbead280176e3352da13c20b68a341c751c55d6203bef7968522c8dbcfcab0b06
+EBUILD wand-0.6.7-r1.ebuild 725 BLAKE2B 744d613a797f5234560def501a49e49f97800148600c46a1a17338070e6370b279ae8cb30bb86a8c9129647be4c353fd7ec3576a7b5f29e589258bd80afc2e29 SHA512 c60ad6aabd3e2ba297f8394d5741b00360c689d35b02934bb319b633819267aae126e863db7c85beb0643dda380e323e3ae0c2de77bed2485b015777da41fb0c
 EBUILD wand-0.6.7.ebuild 693 BLAKE2B 2fb65a5aafa6af1e39919bde33b704d3dd06f3974b472b8bd2eddb13a8d267a4541afc46d857adc6cc6100f81247e12defa0119320216e2a8bc2d5dd78e5e7e6 SHA512 ce87a3e330c250fcf8a5e02f02db6532e93958288fd26904921ae8ca370690871ec6c1a6f0c2d72e7400a4b5b12dd1cfe0a6d393033f55dbb93e9af187bed7f0
 MISC metadata.xml 534 BLAKE2B 0c2295ce9b9805ceff22c9549adfa46578a5d5d1d4f13b7af416ad23f305ee24275deb7204a68076901e6060d41a3935580e24578d2fe56a2c32817ab83165b5 SHA512 68f30bc7ad8cf6a451acf550c02b76e1f71a8c66c9ffc8832995bd292bd460d16c9526e5bb2daaed9cabece9591499f9dd3b0f11d748af247c78654d6104ee13
diff --git a/dev-python/wand/wand-0.6.7-r1.ebuild b/dev-python/wand/wand-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..1e2ac9121025
--- /dev/null
+++ b/dev-python/wand/wand-0.6.7-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+MY_P="${PN^}-${PV}"
+DESCRIPTION="Ctypes-based simple ImageMagick binding for Python"
+HOMEPAGE="http://wand-py.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-gfx/imagemagick"
+BDEPEND="
+	test? (
+		media-gfx/imagemagick[fftw,jpeg,png,truetype,xml]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# PDF support is blocked by the default ImageMagick security policy
+	epytest --skip-pdf
+}
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index a7081c529c1c..2f5058548e92 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,3 +1,7 @@
 DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
-EBUILD warlock-1.3.3-r3.ebuild 1078 BLAKE2B 7576aa9dfd4f451836217e93294b753ca3befdb51008d1c0143e66ed5b591e62391b15d1261a71d890b2d1c0cd0bcd2f8c4d87f55b9f9973c4e5bd657624b9b9 SHA512 3860477675b907dbdbe2fa217e801e7a8678a6f5880d3a981e0752009bf81133397bb020398cee248fcef52ad9542df953cdd215273554e13fc2f2491e55cca7
+DIST warlock-2.0.0.gh.tar.gz 19823 BLAKE2B 538f0b8797277ab067c22a5c43a0fc236fe9a5e1117a00d93fc390100f48503415e7db73bbf4639f7ffa08933b026aafc009eba3a2719f42727b78a4f4ac862d SHA512 56ef0aaf8d7bb706e79832d606eaa2c927dd43880a09d339388cae0d629815b2c31bf53ae6005d02fb4d91708ac889586e635b2cdd068f6498c97f6b2276b1b5
+DIST warlock-2.0.1.gh.tar.gz 19850 BLAKE2B 3ac4f92a68b4e1142a2baf0a0b5670c8b6ee89f22b0b48c061dc5bad8ccbb818ee8a4d7d27f2300562c6e3369662a1d1c8f12135eac1046b87187d1aed42cc54 SHA512 f354f0dd2af524a9e09ed03b072e1f68859fc70bf5ec083f8853fde2f1cec3172bef42318df176a3cf5fa48d93f030010db81d710961f2b05a092a4ee25041c1
+EBUILD warlock-1.3.3-r3.ebuild 1085 BLAKE2B ae84d28e0f3a4334bde91a9e31ef85ec10da2c7d99ffdc5d4a4fc007096bc79e90840af0718c0fc834b7ded2e59b2d55d767fa3ce1df88142267aabc2e734e1a SHA512 fed7734ca9fd360c511b926889e15f84b2e16255b46026ea1b6253d538718e154a2b0f0f897371cbfa15150c5aa6800119e7b9bcfe59a6f6e1304a895fd5d809
+EBUILD warlock-2.0.0.ebuild 848 BLAKE2B 9f3876d87499c8ce31ec220ec66c7f71220ddaa3d8b2c6310d3547dfd74de1e4a4607ee9105c999264a2ef2bc833bf54de0857fdcc73a7669026561c4524ec87 SHA512 9884047cd29091755882f10e7cfe6b7ee87906251c56dc326b6df061a1f310862b01b56804bb3823fbfe5b998681d77e7e96fef59f636d54dde425eb016f3f89
+EBUILD warlock-2.0.1.ebuild 848 BLAKE2B 9f3876d87499c8ce31ec220ec66c7f71220ddaa3d8b2c6310d3547dfd74de1e4a4607ee9105c999264a2ef2bc833bf54de0857fdcc73a7669026561c4524ec87 SHA512 9884047cd29091755882f10e7cfe6b7ee87906251c56dc326b6df061a1f310862b01b56804bb3823fbfe5b998681d77e7e96fef59f636d54dde425eb016f3f89
 MISC metadata.xml 482 BLAKE2B 28941971c8e9ae4f5d1685ac1b9e53497235a62180a4c18093b54c576211b39f3048433d317ffb587a1335042b3894b8bee32cd903a97eee249c4864cfdec357 SHA512 99840c6ff45fdd5a4cb6a06a9322cfcd167b89a540d092fd75851ceb5a03ebce26c7c4adf702b41cc209eb1efd924aab50809c2840799fbb711578185cfbd61b
diff --git a/dev-python/warlock/warlock-1.3.3-r3.ebuild b/dev-python/warlock/warlock-1.3.3-r3.ebuild
index 7949151efc2d..6d98dc033bee 100644
--- a/dev-python/warlock/warlock-1.3.3-r3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/warlock/warlock-2.0.0.ebuild b/dev-python/warlock/warlock-2.0.0.ebuild
new file mode 100644
index 000000000000..90b6658386cb
--- /dev/null
+++ b/dev-python/warlock/warlock-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
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python object model built on JSON schema and JSON patch"
+HOMEPAGE="
+	https://github.com/bcwaldon/warlock/
+	https://pypi.org/project/warlock/
+"
+SRC_URI="
+	https://github.com/bcwaldon/warlock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/jsonpatch-1[${PYTHON_USEDEP}]
+	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/warlock/warlock-2.0.1.ebuild b/dev-python/warlock/warlock-2.0.1.ebuild
new file mode 100644
index 000000000000..90b6658386cb
--- /dev/null
+++ b/dev-python/warlock/warlock-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python object model built on JSON schema and JSON patch"
+HOMEPAGE="
+	https://github.com/bcwaldon/warlock/
+	https://pypi.org/project/warlock/
+"
+SRC_URI="
+	https://github.com/bcwaldon/warlock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/jsonpatch-1[${PYTHON_USEDEP}]
+	<dev-python/jsonpatch-2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index d383508d8c67..cc9f2a7e1ca7 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,3 +1,5 @@
-DIST watchdog-2.1.7.gh.tar.gz 100442 BLAKE2B 21247e1790077eb1eb2f1dc2bb8ddebc1b7f6a2c503238c52c660246fee8c1d3483119184a62114efb81c44665321d4e3aa18ffd73b3244a44c4c6df5204c834 SHA512 f69265aac6e8a840d230c15cfe88c803f043cb540785446113617c0fd1a3c5dce8a885a376bbadc75372a718800948dd4b00c618e18e033d510b8e2bc2bbb36b
-EBUILD watchdog-2.1.7.ebuild 899 BLAKE2B 9835e3672e0f3513810e0c7cf1bbcde5554e79005cbed4d7402ccb35b76c5a6d9837d111144ed09e6065147be570e6a1d0de7a8a93349175192ee3e8d2944bdf SHA512 77dd8501c129a6d9a4acddb1c227cded36315517797a74fe6b6a094e8522efcdb9c3486a927284b4c4436cb6ccdaf3e6314843d07a3a92192873b345f793c282
+DIST watchdog-2.1.8.gh.tar.gz 101828 BLAKE2B ca14534af888154652951abb7e5f7f1bae1f2e072f113a034638f6384fc9b9044ab99191c6dc0ce38d7ded3dc6629a7aba1e1765f85ec5410706bd669411b929 SHA512 3182cb28701403e799c3850e5cd44acf6dc1aa7e98b1c4bb22b21de98fa4372c74a041e2f3be8d10ae77fe00018e460b98ce2fa5b0779edb84d15f952c407030
+DIST watchdog-2.1.9.gh.tar.gz 102882 BLAKE2B 601c94541846e0d63a39367040ac9b6a24c2920c70638ee3887a51838dd75bf8dfef8afae34c9566047c27502026d944f01c6f6249090f4a233a4892fc1e7c59 SHA512 1005c48b08968db7705acbb8a94a0852c72d8bcf45ac935e7e0b49daa6e422adb081cf431485618b37bcc1b2d3429369af1672b826bf9c1ebfa7aff91a88175a
+EBUILD watchdog-2.1.8.ebuild 1094 BLAKE2B 9c692090a747bc669bd3296c608c01fa50d889216e4ed152c31b2c0e6c38c572d1ab1bb17fb2aa0b2ab2e0d80b338d63f6389bcbc34e4fcb4551f7f7b9ce5da4 SHA512 c67611b8b375860fd2057748a016611e1e2f1c917ea8ac5bbff6ae46335f8b945150b297e26bdfb2026fdf31465b7b6f34280c3dfe2898952884e14e332f5d6e
+EBUILD watchdog-2.1.9.ebuild 1102 BLAKE2B eab43a7bffcf96e4098563d94c31c40a4f4615edb162adf53d9b3403ff221794e475920cc8c0ae205ab4a7f13b35832c5d48979bdfb4b6e029d880ddb6faf416 SHA512 c89ac458c878f968b6a3923ba51cf22668c0ecb3c9b3ef14582c3a93bd787802689acf7c15421f8b65d6ecb5f52f26b9780901f3d751dbacdbf1664729f3e104
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.1.7.ebuild b/dev-python/watchdog/watchdog-2.1.7.ebuild
deleted file mode 100644
index 45363e1024da..000000000000
--- a/dev-python/watchdog/watchdog-2.1.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.1.8.ebuild b/dev-python/watchdog/watchdog-2.1.8.ebuild
new file mode 100644
index 000000000000..858b84c59fb2
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.8.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+SRC_URI="
+	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchdog/watchdog-2.1.9.ebuild b/dev-python/watchdog/watchdog-2.1.9.ebuild
new file mode 100644
index 000000000000..0ea71e3c1a55
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.9.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="
+	https://github.com/gorakhargosh/watchdog/
+	https://pypi.org/project/watchdog/
+"
+SRC_URI="
+	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires root powers via sudo (yes, seriously)
+		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
+	)
+
+	epytest -p no:django
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/watchfiles/Manifest b/dev-python/watchfiles/Manifest
index 46f2383f8390..ea03efe8a796 100644
--- a/dev-python/watchfiles/Manifest
+++ b/dev-python/watchfiles/Manifest
@@ -1,51 +1,53 @@
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
-DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
-DIST crossbeam-channel-0.5.3.crate 88179 BLAKE2B 4fd2b35e36ee9176341e336096d717d649087b8605d81871ba9642a9ad827569e60769cfebe8a96a55e5c79a5180cf42e79c62fb1418d50b0c65f4c711181a66 SHA512 2c1033f514a6c0cffa247031b0aa2d3a8e52bfab9b2a04d9f11c0b5050dc3779fad2325589b52c8d33c7e8d15f74b04ebf802b262b6d8d03b976619525a65bd0
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST fsevent-sys-4.1.0.crate 4620 BLAKE2B c203c774d5038d4c4abdd7bb9407a6b5f2b203a609bd92a7fde38afaa71248f4610e89c73eaf982a5d76560f9503081b7b10573046b1a91f09de4b642709417a SHA512 e702686629557b879efaccd37b03a7ec515eeea29d8f8ba46f82b8b68ad157ef9d6b188be031f806d8fd27d4e9d2689cdd6bfa14e4ff77493a7d0be3ef1238a7
 DIST indoc-1.0.4.crate 13122 BLAKE2B f7a352bc2d19f3f2d1479b6add45daf841e02bba563ce9af115118b9bacea6bd39ab2a663bc992b2302de73b52bac1024130aab3dcd79c5b4286c93dd7305928 SHA512 b2d90f074f9a34e330d7d6e6313bd569cd857c791b8ff79191a70f19064fa53ea2ede30bbd16587fb438e69ccce4c3e2fbb127610ba8e470daf076d7373f0213
 DIST inotify-0.9.6.crate 22971 BLAKE2B 7a6cedd29b2503911fb42324fe3b4f4f20abb62a6b4370f8a7f634d9988f1b3053a70d69d6bbd7b850aae2590ded7548b73326a598d31e5b579e19ac3cc781d8 SHA512 39c3db1b6da620df9eaaa41cc20c2f22b9a372e181ed7d8ba0c7ad4e711ba4486bcec7ff86bb4d814d9c53e071cc4e43845567069e45b897c562cb677fc872b2
 DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003161234b40542ca86c407ecaac1785f3eca98e9fd2914dababbc3f47a0855c99c9f19245d1f2cd5312739c802af SHA512 dae749f32c533b0c9f99963d97a77dcbfcacf173ec8fd7a02f275804f9925e867b4dfdf6be52c3c3c3de136d64e6e7d6b30a3bf804a01608cf974b0cc2e346da
-DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
-DIST kqueue-1.0.4.crate 11771 BLAKE2B 3a428dc381fccb406ad4f6cb040a5ffc5371386c1abf552e8edd8e24977584fd028d865998b7c9b04b1a9c38b756fe4ddbdea4590b9ce7f847bbee48b14cb96e SHA512 b836195dedb4eca9022c24b95fd74d4c2fe473ee5c05d10a2c3db3e512c3fa49ff78e23d4853d4214c44ce29a68f1882ea84267bdc0f05400ced6c958db33910
+DIST kqueue-1.0.5.crate 12654 BLAKE2B d3d420a1fb2928af7e67106caa90b37fc09c5fae52e90df252b1f87bb8495a523ff248005670ad751e5cf4fae7a36923c2e9564ff267370699e07c5d5f97d22d SHA512 fb39f411e8cc40c7ac85dc679394d8fa02978da29666c15a8a303be75ff24c4e228d918ad9314313c8ee94c8b51dc4f8611e6e2706bcb76722ce0f406d5599f9
 DIST kqueue-sys-1.0.3.crate 6673 BLAKE2B 79254d667b4cf1fa556f1773db23b00ac431bdea6c8ecf914e3c0837fe4e25a45c9b6fb76259d628e4c76a20f749df3fc285b54ea63ce3b52d21529358e81c3f SHA512 76023295abaa4415c1d7b37c844432ece522b762f78983cdf58106f65ca553ee96193bd8c93f3fd0af029d266d8414f2ba4d1b8835bcdc180acc7defa6269731
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.120.crate 574677 BLAKE2B e9deaa26d610c1085f12acc6bd9d3c71ad9d7586d1749141066ea47f14df7143f8dad8173020e549fe81aef65a72d7ba189fdd3ee0038f62bde75dce362f4f5d SHA512 42aadea2670f63d6a2c38d4d6949d9071c535395ecf458a694751a7a17f2a4a6495ea1dbdcbcb5340cb62e3a40419419141ca39c4d4dcda8cccbe480aa34a014
-DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST mio-0.8.1.crate 88205 BLAKE2B 88bab5a31b35fccd6fe52145e937d533bd16ac0929a4fdaab46583d7ed65bb0dbd1620e3bdaaf6ebdc2230131c5793836372f1092f662ecd7e78c45e178609d3 SHA512 945e0970bdfbc0293248c3a26dfb84aa789737bc6e8101ec711da6006130eae5ea221e9c15b8f680f04a6b43b1ee1f42fe2d02035a8e2ccd94d78a759489d681
+DIST libc-0.2.124.crate 577742 BLAKE2B d39356e89647df6a0468c2fe7ec351955afcddd38064fb64215833c716bc16636001b6d377d21cf31b773c3f392d19ec5c665d450e81ce09a55bfd6a080c82ca SHA512 19fed1eeac7ffbbe36ecb5beb3816b5244d3017b72376e84e532f253e07ee7bc310f6f636aed46174653232fcdb532c2506bc070bef31699db20572df0c45de3
+DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
+DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
+DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
-DIST notify-5.0.0-pre.14.crate 54485 BLAKE2B cdc8a9caee303a1f7b6e25eac9febb30ed04f1a4bb0a2335e9a4021bd5f9d08f9cfd03c83ff9e57bad33f8d9db2ead3a8583f9298571ae4d5cd3bbf83b678b72 SHA512 8975d11b6caede53129ec17184ac484d122bb093ab6d7f291f81a3c91164d873b2b8d598eabcc09e7199729bacb080f75bc6f008ad83b83f3cf8173968c7cf1a
+DIST notify-5.0.0-pre.15.crate 57624 BLAKE2B 0f07e7ba2e6b431769e69730dc81c056ab1098a905855d6edb9866e36fb33dcb123c1a464c667d0130322d3810255edf62cf8f3f4e3fc9307782bc050c2913eb SHA512 31c7313c53654ccb76d14826511bd9a687f89cdfe832b0e85adaae22aeba98776fcecabaf321e26fde060357ae52e358b1b48d118e70e562dde98944258d055d
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
-DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
-DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST pyo3-0.16.1.crate 350244 BLAKE2B 4d46e905224ce3a148d714d9a93d610dcfcb9b5aa5b8688af16c9d39868f0a2a28fdf030c5686803696cdc92c260ecda544f5ce1f5356cb787d030219c02aeda SHA512 f3d166e2bc613e87758edf7a2a8dae0c2a551c73058e2fbb2459d1b68eca80b8da13d66667271c90d3fad97230dbf5fa2acea0c0c2378c4473608a03b343df5d
-DIST pyo3-build-config-0.16.1.crate 23508 BLAKE2B e5b38783e74d3104d2e05ce5122e06b4a3bdc19f6b273d548d5726b6ab67ceb4d96c75bafb970ffb13b17e7a5929846fb657c2c51c9cf6d47caf2b6846d207ba SHA512 1103bf5d668b6c67c036629c9b74ad6ebc0b58f3392db03aa1b0eec200686e23febb93fa543c1b19f2734dad450831286c81dc4472eb194e55fa0ad66fe05cf7
-DIST pyo3-ffi-0.16.1.crate 60233 BLAKE2B 55031bc3cf445b41f701ed6b20d9ca056bea6226995927bb44646545d320885ecaf496cd5b12201a78f3486f69f20cfd014f6623abc27e07d34172535352cc8a SHA512 edeb493c8a5665d99a98bb2f67624240d91317454b7ef89ab585de424bbd291418a9ecad4d95431bc5fb73c68f99e2392d79a31c06645fd478741544bcac9e56
-DIST pyo3-macros-0.16.1.crate 8028 BLAKE2B d002f59724c1a73938aef69a3d2ec29c38a2895266225382293a841b9b020ba0957df915d0493066e4c76ee73a76fc2c0bfeea9aa9bd7f585aca76eb857e10d6 SHA512 b102ec88aa82d112fa5f9d43ce375181b35f49de2a3d959f5b163aec11dc020d054a1c91f01abd96b79de1ded7bda14a530d6db874c1eb2c8e3cfb76bdb14c13
-DIST pyo3-macros-backend-0.16.1.crate 49383 BLAKE2B a59c5dda51eba714842307c5d0f792e706ef2a88ded0dc52023f6a8e455334bdd5ac27e77bbbaa0c9eb88e3bbcb7d701e07aca36bcf16e0f83653f12fff48363 SHA512 36aa72129a60fc9b4b0d189549061a1b3226e805bc6225e6ff5a2e0f794f76758bf2e6dbae911d45fa0e103f09caa804ce35f3ad6c05aff932288a2d58287e04
-DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
-DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
+DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
+DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
+DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
+DIST pyo3-0.16.4.crate 362007 BLAKE2B 8a24115b71cc075c76e82170038133d955b5e0f3a5bf73224148bf90f48b8134054edbd567a99f740fbc671597f1586faad2ac2956c965b7d58be5fcfad585b6 SHA512 189eaa8472b0925d69c959e1b365b4c3a5f258329021384d402deb9fd03a3ce5b6637076394512a05eb858d2e53382a6b7c933df68f36a5cdc5326e26ae97968
+DIST pyo3-build-config-0.16.4.crate 28562 BLAKE2B 973df4b148acf98cc92145fb732da33a3c1ff5e5e62bea60ca60fbdc54b8135bc5f6cca0b397a9fa949ad74644d41db777fc0fa2197313abd4fb63488f9020c3 SHA512 60044e707e4d15176b02069994950b2a0557801ddee7ec9fbbd839e303b15facef62f2b07f81925c921aefcf341ecfae9bf4ce86d23da931d14698d48529f660
+DIST pyo3-ffi-0.16.4.crate 60544 BLAKE2B aa76de43d9f83a5c5ce08158e7ffb882a84a98d10c9bb19bb62c833dffc296175fbb6a4b0f31daa8ff44a425b299818fb6ae77a725e024be70f08f38c69d4f5e SHA512 d41868fec5e850bf6b1a796a2d1119310ebe1765a750581a8fdcd83fabf92587fa6eb91a32a85f8084cd41a92b7741c2a266928c5658536fde7f76ed20b844c9
+DIST pyo3-macros-0.16.4.crate 8455 BLAKE2B 94cac5c6838ba49aa3842583dd2227685b26e0bdd6e828401ee8ea147a74a17804f8e5c24f3d0df27c6a62b6e5011ee6e5b3f3d558e1abf04056fea2aef584a9 SHA512 5620588a3e3538d00f0b86d5badc1d9929d8f044eb17e6c30cc73e414d68c04d9a90a66ab163a0dc261516fac80443db763f5981f70549ef57a13571a36dcad5
+DIST pyo3-macros-backend-0.16.4.crate 49218 BLAKE2B 48ced6e30c2b0c936e89483f007771120430e67751d4baba524baf4c575ae6d6177f50b06802a29456f1fc40352999f3736733a4cafbf2113f6f4942e804281a SHA512 216a5b329ef19e45ca2c8a09b3047aa00a0de6aa0d77fc8509e515952f6b82512bae6413d2649ce50b00f29b3371494128b59cedfbc9b81223b706723f640e15
+DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
+DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
-DIST syn-1.0.88.crate 236112 BLAKE2B 7d652d9685cfe275c57154a6f3e2b0ec741e498316a512f73664de67aa85541c3ac135007003d72a912714c7a9040c710a6292fe95fbba70dac7a4b185248e97 SHA512 a342b635859cba36b41bc82c204b76c83a3032c5cceddf3aa11137b21238a4f4ebd75f3bffe39eecb9aab9559b04639891f02d77b38011b268b5ddcc8d9ffa61
+DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
+DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unindent-0.1.8.crate 8326 BLAKE2B 3123c6b540b152d89cc7a9a76ff1315549f973c6a26adc6ca1b40518973fcc95a9f8da94d1c52ee551f2870181a265aac7e4339a3d46ba5280021b49ad842df2 SHA512 7752f4a29306b3c43f768bc400d610d1537457b22cceae8a5ebba31c857e219dc433a10a676d3cf94316a7cd6c7013c8960c825c6f1f9db5a3c2edd0a60591a8
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST watchfiles-0.13.gh.tar.gz 35738 BLAKE2B 60b4bd11cbbdb200a3d4dce35899f0c87650e9cabc4ac95b45003b1b8b2bd9960a1b5794d5366a0761ff310830faad801f82a4523ebf870a187cfde0d3b692ff SHA512 0f98ba01af0fa218f09c3903f92eaaee309297161b31520c05e122336222e46dce1299794deda15fcf1cf598acfa6acb93c7e13c7da89fe6908d7b6fac10a3f1
+DIST watchfiles-0.15.0.gh.tar.gz 38496 BLAKE2B b748904540c28bac3a3be3a1a236352bdba316d1230b196ce1d0ec90324299664c065d1644f7eeafa232e197493aba5b8685db5583c9899f57262651f0e53dc7 SHA512 1398c3337cd0f36bfd489dbca4c968bae2c23949d43567777411c1e9773ac633962164d61dcc84d462adba9d79e108ec98fc31866f364bfa72c26599d12a6fdc
 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-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD watchfiles-0.13.ebuild 1989 BLAKE2B 4b611fc8b0854252ed1938d7f376d59a9e01e5ccb14f5fd1180617e1bb66cba281c9f56b4a789a78ad559986b1cc4d1e07dfefc055f983e63a770bef0443c22d SHA512 53cd92e77bbff45779a30c5b61a9d668b500426e6909b4b6ef44099c6829fdcd5fce59d5071848a3402d6a83842550ed30c4f89524b9413fbbb252a861311ddb
+DIST windows-sys-0.34.0.crate 3369228 BLAKE2B 301f89dd2cc7e60980269deeb7f328d8895c80acad9f0056b3c510e339c7eb6963a152d7dd2c69380c802b17a630cd6df269399f18c298aefd8e9cc53e19042b SHA512 e12b2ddac3e1b841630639c6896f1389e6bb69c33da278e6499e0d31fde5d5b197ac636f430a52ccea6c3bc622e4410618d13819ba4d4c272ef2ea599be356d8
+DIST windows_aarch64_msvc-0.34.0.crate 674445 BLAKE2B cba324bb4fdcde12f4d89384450c5adfbd6f728ac47bd162b33a12c5adf0654c8374d4b0f1e9347d48d2e7d014f701fe85763709824f75df21b42d01341b53a2 SHA512 974c6f3c4bdbd217d9deac7e973b00c115e8b9b831f8b9d933455b11b8b6eb59782f7c7a06c9a4d81fdd41729858e303051eb0d56b971fea1025e86d2b702710
+DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c912a5286236a6bb8bb3c5eb68013d527dde064c368e1d452e73e26efcb1b832933b2891c2255673824c27045be9edd954d SHA512 e388b214d45ec14182af4c72e7b27f22dc7ac17725ce833e05cef9770b677dc929a20ffc1c28f604d5c8100f68d7bf4427feb2aeaf6edb776dc5bc1b505a94fd
+DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
+DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
+DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
+EBUILD watchfiles-0.15.0-r1.ebuild 2191 BLAKE2B e35bf13c5d94f165a23fb2a5eaf04f46c6963142aacf39714336f3b60fb6162bfbfc3fecfe4cf3cb9aa8f23c731af307916138a2d25cf264cd3905c9e473587f SHA512 2ddd215db029b9706a4bd630b35de55d0bd09c9c2552cf4afa997e9648145cf34df42c8821cb0a3a8c8a7b712d25cb505a8cadf984352f5dc32dcbf553166a71
 MISC metadata.xml 355 BLAKE2B 95253406e11c30a7a3b5462d3c835010313bed3122f9d16ff73d6959a5c1f4c8922e324c839fcae9f541c7b1d84544cd38718ffcaba039b8c61292eaefa37447 SHA512 e1c11224e0129eb696e4e92a41ec0e35819febee2eb967982e016f7a0d02d95df8465867e0202d8e7ac59cc579f73c79d9ed6b87eebd44b3b64d63a5642ac458
diff --git a/dev-python/watchfiles/watchfiles-0.13.ebuild b/dev-python/watchfiles/watchfiles-0.13.ebuild
deleted file mode 100644
index e9c8913d1a1f..000000000000
--- a/dev-python/watchfiles/watchfiles-0.13.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	crossbeam-channel-0.4.4
-	crossbeam-channel-0.5.3
-	crossbeam-utils-0.7.2
-	crossbeam-utils-0.8.8
-	filetime-0.2.15
-	fsevent-sys-4.1.0
-	indoc-1.0.4
-	inotify-0.9.6
-	inotify-sys-0.1.5
-	instant-0.1.12
-	kqueue-1.0.4
-	kqueue-sys-1.0.3
-	lazy_static-1.4.0
-	libc-0.2.120
-	lock_api-0.4.6
-	log-0.4.14
-	maybe-uninit-2.0.0
-	mio-0.8.1
-	miow-0.3.7
-	notify-5.0.0-pre.14
-	ntapi-0.3.7
-	once_cell-1.10.0
-	parking_lot-0.11.2
-	parking_lot_core-0.8.5
-	proc-macro2-1.0.36
-	pyo3-0.16.1
-	pyo3-build-config-0.16.1
-	pyo3-ffi-0.16.1
-	pyo3-macros-0.16.1
-	pyo3-macros-backend-0.16.1
-	quote-1.0.15
-	redox_syscall-0.2.11
-	same-file-1.0.6
-	scopeguard-1.1.0
-	smallvec-1.8.0
-	syn-1.0.88
-	unicode-xid-0.2.2
-	unindent-0.1.8
-	walkdir-2.3.2
-	wasi-0.11.0+wasi-snapshot-preview1
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo distutils-r1
-
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchfiles/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris ${CRATES})
-"
-
-LICENSE="MIT"
-# crates
-LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD CC0-1.0 ISC MIT Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-# enjoy Rust
-QA_FLAGS_IGNORED=".*/_rust_notify.*"
-
-distutils_enable_tests pytest
-
-python_test() {
-	rm -rf watchfiles || die
-	epytest
-}
diff --git a/dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild b/dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..aeab77a1d524
--- /dev/null
+++ b/dev-python/watchfiles/watchfiles-0.15.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+CRATES="
+	autocfg-1.1.0
+	bitflags-1.3.2
+	cfg-if-1.0.0
+	crossbeam-channel-0.5.4
+	crossbeam-utils-0.8.8
+	filetime-0.2.16
+	fsevent-sys-4.1.0
+	indoc-1.0.4
+	inotify-0.9.6
+	inotify-sys-0.1.5
+	kqueue-1.0.5
+	kqueue-sys-1.0.3
+	lazy_static-1.4.0
+	libc-0.2.124
+	lock_api-0.4.7
+	log-0.4.16
+	mio-0.8.2
+	miow-0.3.7
+	notify-5.0.0-pre.15
+	ntapi-0.3.7
+	once_cell-1.10.0
+	parking_lot-0.12.0
+	parking_lot_core-0.9.2
+	proc-macro2-1.0.37
+	pyo3-0.16.4
+	pyo3-build-config-0.16.4
+	pyo3-ffi-0.16.4
+	pyo3-macros-0.16.4
+	pyo3-macros-backend-0.16.4
+	quote-1.0.18
+	redox_syscall-0.2.13
+	same-file-1.0.6
+	scopeguard-1.1.0
+	smallvec-1.8.0
+	syn-1.0.91
+	target-lexicon-0.12.3
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	walkdir-2.3.2
+	wasi-0.11.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.34.0
+	windows_aarch64_msvc-0.34.0
+	windows_i686_gnu-0.34.0
+	windows_i686_msvc-0.34.0
+	windows_x86_64_gnu-0.34.0
+	windows_x86_64_msvc-0.34.0
+"
+
+inherit cargo distutils-r1
+
+DESCRIPTION="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+	https://pypi.org/project/watchfiles/
+	https://github.com/samuelcolvin/watchfiles/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="MIT"
+# crates
+LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions Artistic-2 BSD"
+LICENSE+=" CC0-1.0 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+# enjoy Rust
+QA_FLAGS_IGNORED=".*/_rust_notify.*"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# fix version number
+	sed -i -e "/^version/s:0\.0\.0:${PV}:" Cargo.toml || die
+}
+
+python_test() {
+	rm -rf watchfiles || die
+	epytest
+}
diff --git a/dev-python/watchgod/Manifest b/dev-python/watchgod/Manifest
index b0030ed3a562..e170c79cf772 100644
--- a/dev-python/watchgod/Manifest
+++ b/dev-python/watchgod/Manifest
@@ -1,5 +1,3 @@
-DIST watchfiles-0.8.1.gh.tar.gz 15405 BLAKE2B ea5d6d59b930f00d6b4b8d6236a38dbb2463866246f1ff4cda828a99a7383fac9c47b131417d8f375a105733c7567f32895759a8dc4503f5671b524977e282ed SHA512 2f611786d267ceae5d6e9094400f5dc6eb59a008f047a511b58b329762e63bbcd83a56cc95cca54c8480b1702c160548baa30549e907e6b85c8bf176ba339fb6
 DIST watchfiles-0.8.2.gh.tar.gz 15515 BLAKE2B 97c17737c6970c8b799707547cef760c307cd000d09cf3a338e47c0735d537e0321643066eab592f7f7e6ccc25272ea1e7e0bbc02f6274864f7cc39a177b83ba SHA512 a44b831352ace03c450781bc815b1813c44c386d666a9b724b562ff69228705651bfc23e81b7344d0f79c62577d4f910b323c734298e2a609f85bbc4a0f0498e
-EBUILD watchgod-0.8.1.ebuild 1289 BLAKE2B b674459b7943b48cacbe424bbe3a9f71289febea1072190bdee4579b678ed2a6854a23145ec97ee0d121e5c8febf82d5f40b4a61587892730e7e29c3fc0c7287 SHA512 e243f4ef4b52ba92fb4859c708344d2f2e834d8f5fae0bc2599e99465b5f99cd437977ada48f030390e6e068b69d1d252ea5259e9ee46763c61fd8f8bd737fee
-EBUILD watchgod-0.8.2.ebuild 1310 BLAKE2B 1e4ff7d7e08e599f465270faf94dcb13b916bdb75de579bfcacbbb26f844d6c8a3836b746014b5ba22f57d496b6a12f2596feb2e36b558c4957428f04eeb4718 SHA512 7c071b9c7eeb2d98cd050b9df083db4b3dd15f6397200a7258611b2f30c40c54800c338afef1feb24be2d673c66c5e204ed0c5673a7dba4b889f62f80313de27
+EBUILD watchgod-0.8.2-r1.ebuild 1396 BLAKE2B 02d1a30949eff5193cfa07751044f4eb068fbe3cd85114507b5fdb683641b6f94641604f99938de8ef46e6b36571545ffb143a6695f45e6a233a11e9b0debe25 SHA512 df3a4f91fb9cab84864405b670c27246564812ae7eb5c82574c8853c1bb69b0efd4efe93629944f5e24ca96596c2add167af1c251aee1de60d37cef692f99a66
 MISC metadata.xml 353 BLAKE2B 9fba49b9fcbfb15db8c5709ba52b803063c010ebeaed0ab6ee715e776a7da16c295ef6ae6495dd94372835970b34676dbf5b05d96b6bfc737bd68f504384d9f1 SHA512 ca0d0d4135e2ce7678ce004a48389ac614f512f502194ec542d461592ab73d63d68ed5d9a4f9ccc1a37b74435bfb6c75d309bccc43eba8d53fdc36520199d751
diff --git a/dev-python/watchgod/watchgod-0.8.1.ebuild b/dev-python/watchgod/watchgod-0.8.1.ebuild
deleted file mode 100644
index 2efec4c90eb0..000000000000
--- a/dev-python/watchgod/watchgod-0.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=watchfiles-${PV}
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-		tests/test_watch.py::test_awatch_log
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_watch.py::test_does_not_exist
-	)
-	epytest
-}
diff --git a/dev-python/watchgod/watchgod-0.8.2-r1.ebuild b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..a19fe1d0b4f5
--- /dev/null
+++ b/dev-python/watchgod/watchgod-0.8.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=watchfiles-${PV}
+DESCRIPTION="Simple, modern file watching and code reload in Python"
+HOMEPAGE="
+	https://pypi.org/project/watchgod/
+	https://github.com/samuelcolvin/watchfiles/
+"
+SRC_URI="
+	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	=dev-python/anyio-3*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# increase timeout
+	sed -i -e '/sleep/s/0.01/1.0/' tests/test_watch.py || die
+	# fix version number in metadata
+	sed -i -e "s:0\.0\.dev0:${PV}:" watchgod/version.py || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
+		tests/test_watch.py::test_awatch_log
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_watch.py::test_does_not_exist
+	)
+	epytest
+}
diff --git a/dev-python/watchgod/watchgod-0.8.2.ebuild b/dev-python/watchgod/watchgod-0.8.2.ebuild
deleted file mode 100644
index 1c0a5bceb127..000000000000
--- a/dev-python/watchgod/watchgod-0.8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=watchfiles-${PV}
-DESCRIPTION="Simple, modern file watching and code reload in Python"
-HOMEPAGE="
-	https://pypi.org/project/watchgod/
-	https://github.com/samuelcolvin/watchfiles/
-"
-SRC_URI="
-	https://github.com/samuelcolvin/watchfiles/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	=dev-python/anyio-3*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-toolbox[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# increase timeout
-	sed -e '/sleep/s/0.01/1.0/' -i tests/test_watch.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# flaky test on slow systems, https://github.com/samuelcolvin/watchgod/issues/84
-		tests/test_watch.py::test_awatch_log
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_watch.py::test_does_not_exist
-	)
-	epytest
-}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index b56ff8cb7245..fec8f689490c 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,3 +1,5 @@
 DIST wcmatch-8.3.tar.gz 116600 BLAKE2B 8576a546278a69ba46af262bc925370e6d8b1828975d54fe3fe1a2e39fc8456134c7f7986e1674883ca0f0298c223be7efc67c7296a29d9a4f1b64e42614ce17 SHA512 64cd84e69ceb6c5953f281711d026540ac198256cda3ca32c90d2acb01b18c93ceaebd3440b395c3e77fc7ec38f350821b0095518ab5c065e698cfe0f2df4c1b
-EBUILD wcmatch-8.3.ebuild 1298 BLAKE2B be2d3367c2123854c41eb251a53a2cb0adbdb92546c0796df93571a0be702f8323a727d8ff67d6efeb33aac3d585f24b3e72e2290b5ea68f5a530f7141f27da3 SHA512 3ec7ba1eaf35a80a709af752edfd64275021e540324574876ba21b3c80486580c1cd0393c0c13df5b544fdc67a57cd0c74d957e9d50fbd3e303fe61f7a3ddd79
+DIST wcmatch-8.4.gh.tar.gz 116596 BLAKE2B cdfbc243fa62f4854490510a563163f99dac09eed16248fa7a72d0a2a7b96484fab4edf3ba497e96a46dca1f734b9c1b098da4d71784775f51b48fcfa5b8a24c SHA512 92478a769be129f9997ef75a384b9978d0647bbd7f2212aa058f1438e698a0a77d069871daf20889455f6e9bb73266d4e312f29f61c704a708fa48fa565d7614
+EBUILD wcmatch-8.3.ebuild 1330 BLAKE2B b05d8e357c50748e0402df20cefce7b03ecdcc5ddf5fd785b31587fecf067d62614508b5b7a13a79de886e2f86fa12c2cd7c3f1522458dc3dbf6a034fabf6eb7 SHA512 32e2997af18b5328353018dbcdd67b9039ecc9186575c4cf28e9155686d157b4b3238a2c471663b69275af2e5c9cd2acb3e4e74f13d981370c3ba804b886ccfd
+EBUILD wcmatch-8.4.ebuild 1263 BLAKE2B 2125764d0c698c86ce21fb7ad8e22bdacf4d346985cb72deb067d51e62b8f3baadab6a779ba480a2174d4f4c75dc0c281e2d13734a14c117a889cb8d623f303e SHA512 89ee0906631c1f604c81f78cd7cefbe3729ce6d9cac401dd8458073060268358b9ab0256c4c70b08eea5d9794705a9088f55f35d3e351452afd855f7c2bc28c6
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.3.ebuild b/dev-python/wcmatch/wcmatch-8.3.ebuild
index 8a9fe29ef3f2..7648775293cb 100644
--- a/dev-python/wcmatch/wcmatch-8.3.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 DOCS_BUILDER="mkdocs"
 DOCS_DEPEND="
diff --git a/dev-python/wcmatch/wcmatch-8.4.ebuild b/dev-python/wcmatch/wcmatch-8.4.ebuild
new file mode 100644
index 000000000000..c5bddee62f3a
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-8.4.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..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	>=dev-python/mkdocs_pymdownx_material_extras-2.0
+	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/wcmatch/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		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/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index d786cf46444f..e4b498d22547 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,3 +1,3 @@
 DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
-EBUILD wcwidth-0.2.5-r1.ebuild 988 BLAKE2B ac38a6cc244cf49a4d06a748b80240c258cf281dfd3e6536f432034b8871a2dfacf15a475c6eed3bacde2bf7ec8cb4835e0a178257a1fa078bf834e40ca2d8ed SHA512 e9382916349bcde10263c696d36ae656320a9b866e2dcbcad98ca3c41430d39d3c30527bfd7a200398cf0775a48fc77c4da2b1241f3af774ae49868568969306
+EBUILD wcwidth-0.2.5-r1.ebuild 988 BLAKE2B a581ddde998678120d712d2171fa77dac0615564d95e270b1eb74fbfbe44669853bd492356f00bf8922f446002c2c54289f0ef1f28831addd03a12368b9e20db SHA512 98b8fccd6b4021eb654c88b7fb8f27790a3f8366190d8c97fbfa28fda1c93d85fbe5028d4dc78e380f63dd5c5292503359c52eb97db6806c533734b2949fc27a
 MISC metadata.xml 402 BLAKE2B 86714d496f80fe46cb313bed026135b2712ddfb47fea5994d0021516aa6ad28eb5fc52d37b37a7a224ec0613681b27ee039f4ac734430d94aafe4ec8946cecc7 SHA512 85c0e684f66a5582ca63d6f72c4e69101e8ec30f8e03c52e972fa36a2e6b6d2a8f019fb33a1e39e73fb37de25c82b906b18ac626afdd0a93d97db2ddcf485063
diff --git a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
index 8f548b32b4dd..b9a7436a25fb 100644
--- a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 744572dc228a..ac8a685400ed 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,11 +1,3 @@
-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
-DIST weasyprint-54.2.tar.gz 403906 BLAKE2B 47fae441ed7186d30de3c32d20fc9503624b06ee5b6a76ec499914852e198b8e85234a779e5f96a48dc310883b8870afea734006dc2a20545537ad66ceff435f SHA512 fd7d07085f104958872a7ccf82d3ffc748936a4fd2d7757847b54de5248e1517a5f244b406cb052c809daa8194d0fa0701e05703b66afe8a809eff70d2cde8f3
-DIST weasyprint-54.3.tar.gz 404544 BLAKE2B 52eabcab05a6806fd137648ab1a9c0cf00865f98c59a7ca43052b98b6eb54c503465285a4ceca86557a5461cd737ce9174fcda0fead08ddcd8cf632e09108bfa SHA512 4b11a2fedb2ae41b0752093a9af26c23122337ade0289e36045c2e666677f2234c43f27f12d22d571365294705458c7b34f8b2656ab3d9337f145d5b0292e92b
-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
-EBUILD weasyprint-54.2.ebuild 1063 BLAKE2B 32e90f633885f2907121412b9899662b9b6b9de3d15762e6d49301b8f5e4c02e32a1e274f983acdf8dcd6f7c8e9b600e64ecfd2192ad71f76053fa1d854d89eb SHA512 cbdf16f634644f5aa14c6e0ef35b33c152f0ae5e2594e1cba4927563486eec067c31239fbbe5f3ba8045824507e2124390811d3a1f4198ab1845af251c105ed1
-EBUILD weasyprint-54.3.ebuild 1063 BLAKE2B 32e90f633885f2907121412b9899662b9b6b9de3d15762e6d49301b8f5e4c02e32a1e274f983acdf8dcd6f7c8e9b600e64ecfd2192ad71f76053fa1d854d89eb SHA512 cbdf16f634644f5aa14c6e0ef35b33c152f0ae5e2594e1cba4927563486eec067c31239fbbe5f3ba8045824507e2124390811d3a1f4198ab1845af251c105ed1
+DIST weasyprint-55.0.tar.gz 410970 BLAKE2B ba77f249c3568031eff9b7110864b69113f71ea197d0c7136de01bd40155a437b5e540e87219e6ca49428b98d8ec471dcf9ed1d0224d68a3b320e5fffb568239 SHA512 96cc6de5af86da47aa0b5a84c3f00679690774574f3370ca319afe77f3eb9c9725f3b0a6cbddf589f23f444972bc77b07cce7e27ee2c466484636b3cb30250a3
+EBUILD weasyprint-55.0.ebuild 1069 BLAKE2B 990b3ea546068fbbe204bc328df21f9a63d8ffe031cf692bbf8aea6a6c21ba42f42933e96351a6ed27c0e71288668639854926b2007e889a3bd08321880c3bab SHA512 5df31ae924d16f392e372bca733ebc5b5089960e11d161a192d6a69c18a1f01d6ca9c7b810725cf22dae7817617d3d4229ea399fb1280f200df02b352c1d24e7
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-53.3.ebuild b/dev-python/weasyprint/weasyprint-53.3.ebuild
deleted file mode 100644
index f201ef75f8ef..000000000000
--- a/dev-python/weasyprint/weasyprint-53.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/weasyprint/weasyprint-53.4.ebuild b/dev-python/weasyprint/weasyprint-53.4.ebuild
deleted file mode 100644
index f201ef75f8ef..000000000000
--- a/dev-python/weasyprint/weasyprint-53.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/weasyprint/weasyprint-54.0.ebuild b/dev-python/weasyprint/weasyprint-54.0.ebuild
deleted file mode 100644
index 93af36f9311c..000000000000
--- a/dev-python/weasyprint/weasyprint-54.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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/weasyprint/weasyprint-54.2.ebuild b/dev-python/weasyprint/weasyprint-54.2.ebuild
deleted file mode 100644
index b59226baf8d9..000000000000
--- a/dev-python/weasyprint/weasyprint-54.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-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/weasyprint/weasyprint-54.3.ebuild b/dev-python/weasyprint/weasyprint-54.3.ebuild
deleted file mode 100644
index b59226baf8d9..000000000000
--- a/dev-python/weasyprint/weasyprint-54.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-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/weasyprint/weasyprint-55.0.ebuild b/dev-python/weasyprint/weasyprint-55.0.ebuild
new file mode 100644
index 000000000000..32e507b45ff5
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-55.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_PEP517=flit
+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-9.56
+		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/webcolors/Manifest b/dev-python/webcolors/Manifest
index fff13a8936aa..8ca536bf1676 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,4 +1,3 @@
-DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.11.1-r1.ebuild 673 BLAKE2B 431241ec32a5aae38fa356f5c2f87afa46d0fbbfd273ec6930d74977c4d1ce29c73f18c79a34898f675d03148f75b8055ac3c102e6d5b2d2e78a44616f50ca2c SHA512 bdea163dc714efdaeb756d7caadb783dd7709741020405ef4d0291e447cf87ce70d31ef06462d728c1cd0bb16c04c79f8e86eec5488cfe8fec5ef3cda70eac12
-EBUILD webcolors-1.11.1.ebuild 621 BLAKE2B f02d0ec7d4beb665b0b9d49afd4e305379a79e4d265efb7a40b4affc6f6987343fa3520132c96aa4544e22dccd78ee3a361ab38c350c72500d0c532472d3f84c SHA512 30aa90d4feb810ccd9197c701590d5bce8a15b1467053d5c880ee1c1ff1a9daf1e1ee2b5573b96749d0283cadcb7c457f390efa2e82769d6c075c8c69f0b8cc7
+DIST webcolors-1.12.tar.gz 38112 BLAKE2B f229ec69c91ae83bd36194bc85a03e34d1ceedfd98ffd8b5e3583956283297bb9c91f947646d67cf107bcddc6c6c0d655779672fca22c0e4d8452007c8dbff30 SHA512 2c1e46ba2036ff960a973b9f5b4cec06241e9385fa0de876f66a6cf742d5b11bc212fce262011968a612c1446b78a6f50b3e75d04584c3b2b47f3ac3d66fdd51
+EBUILD webcolors-1.12.ebuild 618 BLAKE2B 4c6ca54159b053e32bd2f0d7278f5224934f49b8d33fcf1a8853169665cf717b3869aea68a9a2bcb5db977a7d5287f97d762a561a961835ffbdec82b79dcfae7 SHA512 f1291ec21fb8f31fe2db11243a00a67d2ee16fbf03aa465357ce2e500e53e51304c7f35bc71500c297992e5d5641c8799a9ba65919f92c47af657721afeb3d17
 MISC metadata.xml 398 BLAKE2B 051ecee1b66000baa637f8cb769dd94753c64b97aa3b7bc0bfab424a2a3f311f6831e36e01c7a8ec752dc0f92c25fc9a3a23482347bc34a4d92641f1295b7fca SHA512 b2e6a3d0f210e11a2b28c50444b0e4aa573eb47bd59c8a3b21f570fc02da1d1f95dae7c79400673214fb82ff98108e29e071276b1314f2d40f78813513e0d83d
diff --git a/dev-python/webcolors/webcolors-1.11.1-r1.ebuild b/dev-python/webcolors/webcolors-1.11.1-r1.ebuild
deleted file mode 100644
index cc3ba1e2ca54..000000000000
--- a/dev-python/webcolors/webcolors-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="
-	https://github.com/ubernostrum/webcolors/
-	https://pypi.org/project/webcolors/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
deleted file mode 100644
index d99848383a1b..000000000000
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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="Color names and value formats defined by the HTML and CSS specifications"
-HOMEPAGE="https://pypi.org/project/webcolors/ https://github.com/ubernostrum/webcolors"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
diff --git a/dev-python/webcolors/webcolors-1.12.ebuild b/dev-python/webcolors/webcolors-1.12.ebuild
new file mode 100644
index 000000000000..9bd9954136e2
--- /dev/null
+++ b/dev-python/webcolors/webcolors-1.12.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Color names and value formats defined by the HTML and CSS specifications"
+HOMEPAGE="
+	https://github.com/ubernostrum/webcolors/
+	https://pypi.org/project/webcolors/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index 06f55bff0cd2..ef2639a64c61 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,4 +1,3 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 713 BLAKE2B 6f0dc43dda5f11ee6e96dbc0f4d0e99633a52e0bd8f35c92caef082c33b87ac66cce99a5c629fcfe5b1af8f05accbced27e4a964029929a3c024279d5c31104b SHA512 bd154568842e3aea1690ce08110cf7d434c181e040a3c42474d7c05c5cbea1568768d584f7e6a7e175f3f91a703087190616466b8c8bf4c2488c584503249292
-EBUILD webencodings-0.5.1-r2.ebuild 759 BLAKE2B 6d255a65c78cdfd690e003f9252bff7a4cb2b6937777b94b517fdc88a6ea6a053a9070284ee11ab13b4e90620bf720bf850867a2ea4e27590fc5a477da2228ee SHA512 652a44d07f738f52d8faf493203e960db964a475bbe585395942ca84827c41327743d389537770443a565278228b054df6ad379b98822e88604705f50228d418
+EBUILD webencodings-0.5.1-r2.ebuild 751 BLAKE2B 2114221946035f99eed165c32c1a48a47515e89ef3a030a3596a12b5e09a1e22885ef08d89e0288f71fd235cfca0914935a1476f829ee098e0d5c4cdd373fd3b SHA512 289f0fa85a66d6fecde50924742a9aafbb46d66d78c2bbc6d08aad1ba37c7ba6620db961b2c426460e130a50c61fa202311ef1683eeb2ae6768ec66df765a936
 MISC metadata.xml 476 BLAKE2B dc58a60145a5cdbc0c901f4fcfcbce6ceb56c59cea3b5fa25938715582e93ece0736fc18b22fe7b8d5011e8959e6ea835fc872dcc9c5b694ab08e28e4ad4793a SHA512 3145cc3f9b865825c08dc7fbb80ca45308b2b001495143939e3fe07af382050f3e1b026d81daea6706f85de59311d139090d16c082e3ad637394a4801dfba8da
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
deleted file mode 100644
index 2187cc2c6d44..000000000000
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 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="Character encoding aliases for legacy web content"
-HOMEPAGE="https://github.com/SimonSapin/python-webencodings https://pypi.org/project/webencodings/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	cat >> setup.cfg <<- EOF || die
-	[tool:pytest]
-	python_files=test*.py
-	EOF
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/webencodings/webencodings-0.5.1-r2.ebuild b/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
index fce592eb65af..ba597a9bf4cd 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 8a2caa5b97d0..60896e81c078 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,3 +1,3 @@
 DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
-EBUILD webob-1.8.7.ebuild 720 BLAKE2B fc329fa8774d4f75d47b81246c79fe10624e1f315aec166b23c42632796bbad4dbcd897174a95b156b30b75b84cda7458c251c2a59cf0c05dac77539d9a243ed SHA512 1eed8e67d64191a88630ba41b702e873144c8108dc41172034635abe6a68c80fa2d0d0f8e703b4f8484b2c05b042c54d7444017ce33144b5b13cc2096537242a
+EBUILD webob-1.8.7-r1.ebuild 822 BLAKE2B 9762f1a627a53271ab99372f2718049e92159168dd657e13b081d860cb1de0732fce7f7256beb49702a0c5b620f78749caabaa0f72a0edf427d0637231fdf48d SHA512 9427fdc1585eebd3a3065a5059bd63ade6af2bdc0cac6c75c07409ad0e23d257ea57634afd0e2dc682078e782d79a1ef95afa05ca5a9def43353f8ae278c0e0d
 MISC metadata.xml 445 BLAKE2B cdb3eff689afc9b236ff09ab4035cf30dbb1a22e26ece748bcb3fd4022b6cdfbf20e04213951f79b2259b2794104025dd7aca3f3348fe95bb032bb51c3f3f80a SHA512 6cfd7bbddb887bd8c64b34087ada4c9f099adeb765dbf935761b1dabb2fb4d2134e67062110399400e45070a8330ea63ff61a0af6b2c11d261f7cc0e894f5f7a
diff --git a/dev-python/webob/webob-1.8.7-r1.ebuild b/dev-python/webob/webob-1.8.7-r1.ebuild
new file mode 100644
index 000000000000..cef16dc02f0e
--- /dev/null
+++ b/dev-python/webob/webob-1.8.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="
+	https://webob.org/
+	https://github.com/Pylons/webob/
+	https://pypi.org/project/WebOb/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+distutils_enable_sphinx docs 'dev-python/alabaster'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# py3.9
+	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
deleted file mode 100644
index ba47d746d75d..000000000000
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN=WebOb
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="https://webob.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-distutils_enable_sphinx docs 'dev-python/alabaster'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 47462dd33992..e3841a4e8bff 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-client-1.3.2.tar.gz 47821 BLAKE2B bdd398885f1c76646e094f6e2efa3c886bfddb0d5f1a2961ad2586444c9bff7272f61d880567e7826aa49c36ac48d6cad1583d0cc4bdb73d0f1702e9b4bf2e2b SHA512 c2a38aa3fff0e7f94433cec1939ce75074d9f89d403c0627f34e3a0486dc35fe00230ba7c05f9172a89d3ee49f0ef53ae367eca864f34ec95932966b31d6c3a8
+DIST websocket-client-1.3.3.tar.gz 48250 BLAKE2B 1d6027d7ad2f45ad774da8c4d5ad9c19c084998429cbd0ad5ade89700bcc21dc7c2ac452d0f4238432c0af16ca82d01442d002f988204c96e655d810906730b7 SHA512 e70b6c074cbcac1e97dc11b0ccf60dc67fc066f8394b6cbd20349c1d41d625966c03645da5ccd0a81198c80e2e40fdc267ac599bc5dfacadad4c511a83e06de1
 EBUILD websocket-client-1.3.2.ebuild 760 BLAKE2B 337853a44a530b579af732fa05bd06791b68d9eb1f6a3d5cab5196d8105e516bceec83c2f82183e9d217b23d9cad706390b922779c2df0322973b67f24ec6148 SHA512 a23f3bb351133e73099fda4441a567bb68689689b72e2a06375a04b482436ec1e0d5b5fb9f7909cee85d6720a05d5268e773cdc5920c888b2c01bd938ab8500d
+EBUILD websocket-client-1.3.3.ebuild 768 BLAKE2B ac6058810797ef17701f1dd88408dd9a3c3370dff30a7d0e1965dab286bab26e26fb7893008bc9f89763083a48f9cbd6bb6330b4bb970f20c100e4996f09a057 SHA512 00768aa12367da003b02bb15557d83582e36bd66cf66a734bf9f62634e771d448799aa5ad63086d5742d6c854198cc03eccb537991d338fc0323f633166299fa
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.3.3.ebuild b/dev-python/websocket-client/websocket-client-1.3.3.ebuild
new file mode 100644
index 000000000000..ec8a093a7efb
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.3.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~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/websockets/Manifest b/dev-python/websockets/Manifest
index 7c06b81a8603..00868d572959 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,5 +1,4 @@
-DIST websockets-10.2-src.tar.gz 302766 BLAKE2B 2313bab904de3671f973191f1c43d275ede44c87811d82f22c6bd76145610ba5d4ba4d7a1b3a564bfc8c4a9b7921b2edc640af9304733e85deac1e728f0050f3 SHA512 b8c7fbe627e1c411112b0d66e561aa9bcf15d6de07a9cccd203211e0e6af49762774e09f8c5f4523fe214731ae7a96ed4b63639c7ed66fee062cdda3e5fba350
+AUX websockets-10.3-py311.patch 1065 BLAKE2B 16e66f28b0b1bd68b28bafd91ff83fd72d295ff52fa53420ec4a9be31ae66c4b0f4e515b8c62feba616cd6d3650af30566c97f157dec469f2f3de5e584eb0b7f SHA512 94c34e96b9d6ee75599be33bb246ac21a41763f51dc59255632273f8d46d0553f275c9e888615adda93047ab65eeb577dab64a5153c1cb3155c27f9618c0c961
 DIST websockets-10.3.gh.tar.gz 304375 BLAKE2B db6075304613ff74ad5928a0c57e90a7d418ac0b9532adba4c6a17b3c3f1982cc94db8ac4c0da5f65343a915f3b2e7ccedce4e6d5d4960cb72fc93c3db6e041c SHA512 75a11dd7605808954c5f59decda5b115db73de96ed4023d8d7ee3c9966551a9ded2d771f76b086c76f49b0787f19349dadcd9010eb5fea8eeddf3d9bba1c6cbb
-EBUILD websockets-10.2.ebuild 950 BLAKE2B 4e304c034032266851bd97e317baa7cadced76323d98557a151625b46daa33835254f54ca16ab4eb18fc3442ec0700fb7d1f9d5f1f669696b00cf21761fc64bb SHA512 3382b8cf490a986eeb288da00e37daee9e03f0076c48d972e80f1d01c0c7e7c35fdb1dc55789cd45a6a1632d832d2f9085f438c89b3167caa4593dbce24f2e5b
-EBUILD websockets-10.3.ebuild 834 BLAKE2B e5b15bbd2ab7bca7b35b806cde51d742082b7ad144ca74c7147c0edd8a9a822707ce0dad9a4ee6149931f39612b419cd491cbb35b10a5e649d1ffaa62c66de18 SHA512 80272c06d6e25b49d6a2f6500d62663138d479e59871e3ebf227b0c9de756e227dc4cb212f6fd8dc62159cea2284e484b85e4a2dc6ec33df6a30fcafedfd2d27
+EBUILD websockets-10.3.ebuild 871 BLAKE2B b97e0aee91257ce1bb254f0e81017bc49d488d332d6206ad3dd9a429218f6d7f9ba0d185b6bc59160f638a4e0d1b81caa046e70afa9829bd3f615a1006f420c6 SHA512 d25050228fe2fcffad26943fa4b54e4cefedb73e4894cdab4e301e5f5d942e53edb769daa7cea808e09c29c85f0da202f52fa209339dd6ada1e87e56a2682154
 MISC metadata.xml 488 BLAKE2B 06ed81aa4ffa49d1951a8ef639752bc701d798fa531737d4cb367ca198e65178f430d6b1e7f3b24ffcc332343dd58a0cc8ff5f2632a225e6c0f36ee50148aebd SHA512 8335bde47d396c018b32db406e18636edd7f3fe5704c901888d56690ec726aeb7d6f9e42fb7dbb1869c78b494c9cbc17ded3ca78b7576d6fdc0a8097bf996f60
diff --git a/dev-python/websockets/files/websockets-10.3-py311.patch b/dev-python/websockets/files/websockets-10.3-py311.patch
new file mode 100644
index 000000000000..d15eb2d32f81
--- /dev/null
+++ b/dev-python/websockets/files/websockets-10.3-py311.patch
@@ -0,0 +1,24 @@
+diff --git a/tests/legacy/test_client_server.py b/tests/legacy/test_client_server.py
+index f9de70c..05070c8 100644
+--- a/tests/legacy/test_client_server.py
++++ b/tests/legacy/test_client_server.py
+@@ -426,6 +426,10 @@ class CommonClientServerTests:
+                 self.used_for_read = True
+                 return super().recv(*args, **kwargs)
+ 
++            def recv_into(self, *args, **kwargs):
++                self.used_for_read = True
++                return super().recv_into(*args, **kwargs)
++
+             def send(self, *args, **kwargs):
+                 self.used_for_write = True
+                 return super().send(*args, **kwargs)
+@@ -1299,6 +1303,8 @@ class ClientServerOriginTests(ClientServerTestsMixin, AsyncioTestCase):
+         self.assertEqual(self.loop.run_until_complete(self.client.recv()), "Hello!")
+ 
+ 
++@unittest.skipIf(sys.version_info[:2] >= (3, 11),
++                 "asyncio.coroutine has been removed in Python 3.11")
+ class YieldFromTests(ClientServerTestsMixin, AsyncioTestCase):
+     @with_server()
+     def test_client(self):
diff --git a/dev-python/websockets/websockets-10.2.ebuild b/dev-python/websockets/websockets-10.2.ebuild
deleted file mode 100644
index 4287b1679bd3..000000000000
--- a/dev-python/websockets/websockets-10.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for building WebSocket servers and clients in Python"
-HOMEPAGE="https://websockets.readthedocs.io/"
-SRC_URI="
-	https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# very fragile to speed
-		tests/legacy/test_protocol.py::ServerTests::test_local_close_receive_close_frame_timeout
-	)
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		tests/test_utils.py::SpeedupsTests::test_apply_mask_non_contiguous_memoryview
-		tests/legacy/test_client_server.py::SecureClientServerTests::test_http_request_ws_endpoint
-	)
-
-	epytest tests
-}
diff --git a/dev-python/websockets/websockets-10.3.ebuild b/dev-python/websockets/websockets-10.3.ebuild
index 8ae85335baa3..d71d754cb413 100644
--- a/dev-python/websockets/websockets-10.3.ebuild
+++ b/dev-python/websockets/websockets-10.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,10 +21,14 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# very fragile to speed
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index 2e32a7c70eab..eb624ee9eec6 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,4 @@
+AUX websockify-0.10.0-fix-jwcrypto-1.3.patch 4944 BLAKE2B ec1c42458d09082b0f2c98abee8bc922e532571d2550dd0c28ca95331e9c3f5097aaef2394d72d4c89213e7c386b193897cc204fa304ad8de098eb3d8bbac1ce SHA512 f9df762236b961549bd8ee127d7363e1942a280a892676d82bd8e32d43434cb30efbcc15ef345a5a15ad9f08759861caf6f009a8afc98a15021126c8051b8da0
 DIST websockify-0.10.0.gh.tar.gz 53402 BLAKE2B e909dc316d6dd0ee03ee23b07ca2d78cc60994a8f361b3968759c382c704637357848e903fb12af002b5d5b2bec957f9a4c2b0ddb0e6d008ff9b4a462f3e8871 SHA512 262071f4858e5e3b6471c6f3731d8715c5c13fcc5f43738a330323958a8f0cbe7797847bdc676f1c6c34055c6f8afb949d005a5607d6b220b893910ff973ddc5
-EBUILD websockify-0.10.0.ebuild 867 BLAKE2B 9a6ce47d15e07be20da727247b20a51f02999443c71897b4dabfa4cde97a85fd7386d3bd7f0564c307f12f2fcfb79dd2cafb0d6497fec925b5b0128be0b1aaf2 SHA512 2dc15e1900011c3dbbc22b17573b60c971a0116ebe23f817d884abf8e8897f342011334a801bc65eab2c80635c9b08a06c9ad3e038c43e099a2202e44cc6f9c6
+EBUILD websockify-0.10.0-r1.ebuild 865 BLAKE2B 868a2e3a02892500e64ec3f56a987812d9196a38fa9f267b7cd1b45b8299e592ba05fd16972186f3696fe28f118861b39ad3ecf53999851d0561055085c24fea SHA512 dadcf10c2e6c7afdb7e789a1796eedec63424618f2f9999e0f8da4a5e333110e4d286da1c02c57377f23fddeb6fde0192208fa7d1629246b58f2c37334c4d008
 MISC metadata.xml 509 BLAKE2B 225c838d2cc6350daa72ef825bac2332db172d6790623b154a49d48fc71de06b2d4b0c732b297e93514b8b088f3b7a17fb5ade431afc28fd8893f2617a67e5e1 SHA512 c70bc93e2869fd4a85a8358ca3489d0d0e6f6d8355e616e8f5d62e2922af2d2cb415e354f91cb97a1e38633ab7bd955378f7a40fd71d5f3bb51411526d2a6c29
diff --git a/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch b/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch
new file mode 100644
index 000000000000..9da2cfe093dc
--- /dev/null
+++ b/dev-python/websockify/files/websockify-0.10.0-fix-jwcrypto-1.3.patch
@@ -0,0 +1,114 @@
+From 0f175003480b666fba78a5eda8dbc1dee07917dd Mon Sep 17 00:00:00 2001
+From: Javier Cacheiro <javier.cacheiro.lopez@cesga.es>
+Date: Wed, 25 May 2022 12:40:29 +0200
+Subject: [PATCH] Support for jwcrypto>=1.3
+
+---
+ tests/test_token_plugins.py | 20 ++++++++++----------
+ websockify/token_plugins.py |  4 ++--
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/tests/test_token_plugins.py b/tests/test_token_plugins.py
+index 00078c7..3e1fd19 100644
+--- a/tests/test_token_plugins.py
++++ b/tests/test_token_plugins.py
+@@ -4,7 +4,7 @@
+ 
+ import unittest
+ from unittest.mock import patch, mock_open, MagicMock
+-from jwcrypto import jwt
++from jwcrypto import jwt, jwk
+ 
+ from websockify.token_plugins import ReadOnlyTokenFile, JWTTokenApi, TokenRedis
+ 
+@@ -56,7 +56,7 @@ class JWSTokenTestCase(unittest.TestCase):
+     def test_asymmetric_jws_token_plugin(self):
+         plugin = JWTTokenApi("./tests/fixtures/public.pem")
+ 
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         private_key = open("./tests/fixtures/private.pem", "rb").read()
+         key.import_from_pem(private_key)
+         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
+@@ -71,7 +71,7 @@ def test_asymmetric_jws_token_plugin(self):
+     def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
+         plugin = JWTTokenApi("wrong.pub")
+ 
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         private_key = open("./tests/fixtures/private.pem", "rb").read()
+         key.import_from_pem(private_key)
+         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port"})
+@@ -85,7 +85,7 @@ def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
+     def test_jwt_valid_time(self, mock_time):
+         plugin = JWTTokenApi("./tests/fixtures/public.pem")
+ 
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         private_key = open("./tests/fixtures/private.pem", "rb").read()
+         key.import_from_pem(private_key)
+         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+@@ -102,7 +102,7 @@ def test_jwt_valid_time(self, mock_time):
+     def test_jwt_early_time(self, mock_time):
+         plugin = JWTTokenApi("./tests/fixtures/public.pem")
+ 
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         private_key = open("./tests/fixtures/private.pem", "rb").read()
+         key.import_from_pem(private_key)
+         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+@@ -117,7 +117,7 @@ def test_jwt_early_time(self, mock_time):
+     def test_jwt_late_time(self, mock_time):
+         plugin = JWTTokenApi("./tests/fixtures/public.pem")
+ 
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         private_key = open("./tests/fixtures/private.pem", "rb").read()
+         key.import_from_pem(private_key)
+         jwt_token = jwt.JWT({"alg": "RS256"}, {'host': "remote_host", 'port': "remote_port", 'nbf': 100, 'exp': 200 })
+@@ -132,7 +132,7 @@ def test_symmetric_jws_token_plugin(self):
+         plugin = JWTTokenApi("./tests/fixtures/symmetric.key")
+ 
+         secret = open("./tests/fixtures/symmetric.key").read()
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         key.import_key(kty="oct",k=secret)
+         jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
+         jwt_token.make_signed_token(key)
+@@ -147,7 +147,7 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
+         plugin = JWTTokenApi("wrong_sauce")
+ 
+         secret = open("./tests/fixtures/symmetric.key").read()
+-        key = jwt.JWK()
++        key = jwk.JWK()
+         key.import_key(kty="oct",k=secret)
+         jwt_token = jwt.JWT({"alg": "HS256"}, {'host': "remote_host", 'port': "remote_port"})
+         jwt_token.make_signed_token(key)
+@@ -159,8 +159,8 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
+     def test_asymmetric_jwe_token_plugin(self):
+         plugin = JWTTokenApi("./tests/fixtures/private.pem")
+ 
+-        private_key = jwt.JWK()
+-        public_key = jwt.JWK()
++        private_key = jwk.JWK()
++        public_key = jwk.JWK()
+         private_key_data = open("./tests/fixtures/private.pem", "rb").read()
+         public_key_data = open("./tests/fixtures/public.pem", "rb").read()
+         private_key.import_from_pem(private_key_data)
+diff --git a/websockify/token_plugins.py b/websockify/token_plugins.py
+index 4dc29de..19005d3 100644
+--- a/websockify/token_plugins.py
++++ b/websockify/token_plugins.py
+@@ -103,10 +103,10 @@ class JWTTokenApi(BasePlugin):
+ 
+     def lookup(self, token):
+         try:
+-            from jwcrypto import jwt
++            from jwcrypto import jwt, jwk
+             import json
+ 
+-            key = jwt.JWK()
++            key = jwk.JWK()
+ 
+             try:
+                 with open(self.source, 'rb') as key_file:
diff --git a/dev-python/websockify/websockify-0.10.0-r1.ebuild b/dev-python/websockify/websockify-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..6381a4b18ee4
--- /dev/null
+++ b/dev-python/websockify/websockify-0.10.0-r1.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..11} )
+inherit distutils-r1
+
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/novnc/websockify"
+SRC_URI="
+	https://github.com/novnc/websockify/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jwcrypto-1.3.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO: incompatible with current jwcrypto? (not a regression)
+	tests/test_token_plugins.py::JWSTokenTestCase::test_asymmetric_jwe_token_plugin
+)
+
+python_install_all() {
+	doman docs/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockify/websockify-0.10.0.ebuild b/dev-python/websockify/websockify-0.10.0.ebuild
deleted file mode 100644
index 2998d8ecf9be..000000000000
--- a/dev-python/websockify/websockify-0.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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="WebSockets support for any application/server"
-HOMEPAGE="https://github.com/novnc/websockify"
-SRC_URI="
-	https://github.com/novnc/websockify/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO: incompatible with current jwcrypto? (not a regression)
-		tests/test_token_plugins.py::JWSTokenTestCase::test_asymmetric_jwe_token_plugin
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
-
-python_install_all() {
-	doman docs/${PN}.1
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 123aaf43b319..af83e8da4853 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,4 +1,4 @@
 AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
 DIST WebTest-3.0.0.tar.gz 75871 BLAKE2B e97d050c1077d74e463e3409580d021424f755933bb9d5ac5e119c70c76890d5632e565f03a02f3497e21fed95158c56b199a877fc4575968f6b4af2655db8b6 SHA512 b97a6311d7e3bf653bec93c2390fb75c991d0dea6148680d8b6ff87861c130518a5d150dd157eab9b032b278566ad12c0ac8f5fc2ddbeba31e35de1e1f06f747
-EBUILD webtest-3.0.0.ebuild 1018 BLAKE2B 70275e44e464318952d11b9d544493b1a7015ad14408e0160eb26211c946c76ac40fe8b6840926f564994be931898737edd7ed9b068717fc3e2fbb814b25d498 SHA512 97a8266840e72851ec7c680560cf335999c6c34ec3ad80775de806df96d955260548545daeb6a7d5af9d022a45d1c45fc44f25204448edf5451365898d4316b9
+EBUILD webtest-3.0.0-r1.ebuild 1094 BLAKE2B 712d192b8dde275b91a646581419699f91d03fa5d9df6d1e64744f6b16b8de5f90690c5bf84aff3b6c42aee326d667cc318835f4ea185d4dddc715acf988789f SHA512 0b7692b41191ea3f9eb4160eff2b3588bd2aa3b19b6e7707f6fdde54d308415216df1d44ef3b8e973bd4c812928420b1f362d8a907f4aec591ad0092f793f5b9
 MISC metadata.xml 335 BLAKE2B 423ef6b809d06fc79897080a0a1d99beb5c8ed05ea68b0bb9d93076d21407b75f332478de3462a7f267b495b7d99d0ca8b05fc04f2420ad05df7151048655b95 SHA512 c4f686825404a8be87906b4492ce190e9dd350eed9a9ddbe765f48e296e771be0db4937c608e49ff2b8a7d82c63e1d62cd84a67cfe57bfc1622e2223f8b8ee70
diff --git a/dev-python/webtest/webtest-3.0.0-r1.ebuild b/dev-python/webtest/webtest-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..e630a7ea4cf4
--- /dev/null
+++ b/dev-python/webtest/webtest-3.0.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="
+	https://docs.pylonsproject.org/projects/webtest/en/latest/
+	https://github.com/Pylons/webtest/
+	https://pypi.org/project/WebTest/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/paste[${PYTHON_USEDEP}]
+	dev-python/pastedeploy[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/webtest/webtest-3.0.0.ebuild b/dev-python/webtest/webtest-3.0.0.ebuild
deleted file mode 100644
index 8a826aad32b8..000000000000
--- a/dev-python/webtest/webtest-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
-
-MY_PN="WebTest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Helper to test WSGI applications"
-HOMEPAGE="https://pypi.org/project/WebTest/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
-)
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index a126478c75de..1e726347a3b3 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,9 +1,3 @@
-DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
-DIST werkzeug-2.0.3.gh.tar.gz 897523 BLAKE2B 1f97a2f7184e8e11bb85722becae7cc032ada38a642a2f925f7b81e89c881011889189999d50dab4591fc2e874aac4ab92b0f1531c211468cf352e31b0b8c8d0 SHA512 a205cd981b3e1b481436e483190427ff3808a5ea80abc616ca08d899d0e6a39893a5cb60adc65c99dcab3af47c24b321c71996d719cb7f224de7942b44b1fd69
-DIST werkzeug-2.1.1.gh.tar.gz 833268 BLAKE2B 28d922f99259b606c431b224222fe6474c68f8a11f9910fe9e4eedbdf30d18a101c25490dee205035ea7b3675e644f619a81cbf493c7d5540c6141ff3840d84a SHA512 992b5b0a95db5266d025e06683b04f932def72c3967b2c9903f718c5f2672cf0abadb247cf77029d99b567c9588f5ae03b6b07d566bfd764c738ede53501ba1b
 DIST werkzeug-2.1.2.gh.tar.gz 833667 BLAKE2B e045f566862bfe0f86185cd10aa26bf94a4fc2f7b23173c6a28c9b55d0f239fbba5c66071fab5df6102717b51a1c1fada872e9d9383b9d3b34ab92ffcfd96e59 SHA512 28c4a794a3dbc8423e59244fbcf192b60b53f378444aaaf60330bdd62cec38a4625033b5d72b55613c8b26053a60153ddcb816331ff28ad3ee03bede74d8b1b3
-EBUILD werkzeug-1.0.1-r1.ebuild 1391 BLAKE2B 38d11b9aa090f534d7b48d796281d517b9e9f109b587d52f07aaf87404a58c67f3a59b1b5494ad3fb1636327bf705f8fc90d1657c49456530ef6c54c8334644c SHA512 abd534057abb560b7fe9809c3575c17529b255cf6a1aca65a159f8b46b6e3d9f4e21a226f1d5460e8a49ec1dcd9224bde5d27df468922d487044fca3891462a3
-EBUILD werkzeug-2.0.3.ebuild 1384 BLAKE2B f2e1407bb9826c6f715e51fa8e71d22e6978f64d568994d887cd18570078501f5ce432eb9ec8e8c0b787d85653b5cccd718d3401f8e39e5a7ef1d3e7d9e9622c SHA512 c5c0ffb9e3daa37ebe0f006b2e3a6d9bb515323f326168924d84babb8dcd449de3cb234f9f909b5570914be570ed0c3069f3b418d46c7d8922f4545998e2196c
-EBUILD werkzeug-2.1.1.ebuild 1435 BLAKE2B 903d13f9da6d7183ad848ec1071e780710d8e743673808ea7bf191235e0188c241ae4eb2a0051c39f4e75ff94fe07a9cea6e8b0c901040cde8cf411104918f0a SHA512 5bdffe9e459eaf5cc8b69335f016ecb8e44840d6616df404c6f1d1ae614ca0774751b6bc9acc7b29d055ab888bf3f33bacb1ca93cc32a1f3bc41659f53d11947
-EBUILD werkzeug-2.1.2.ebuild 1696 BLAKE2B 09965f5c65a3eccfff58a1e50729cd36744b529aaf8b74c83922e6d920dd83db732177c6c1c8c3065a9ba643468932dc22f58651154fb8e2722285a78bbf4639 SHA512 0bac28b33608a1b02040ff584a61b327b563c245f6b5487ad3c24a2446d0069377555dca1c522d2971602e2b11be00742eab1d9e255da7009b45fc64897d2c37
+EBUILD werkzeug-2.1.2.ebuild 1688 BLAKE2B b5a505d2d7ed2d06c56d134db4d416a8967035135316fa236007326899c4fe3615b9b8984031bdb0ea5940e8f92c024c70d112bafd7638006addb494ab9888cf SHA512 250f7ebc38731326ab3bfef9b27b444a2c7e7540e5e5459b94749f720bcfbd2ec8868f8011129283e0c48fb6047bc5996f0a2e14050485adf0a0f9384f4d4a0c
 MISC metadata.xml 368 BLAKE2B 81932229098620395623f9149ac974f19fae9b65ad09943ee5c5d8d03c1e37e76061291c959fe5f004f531a244b3bb335c2a43dd66949c0be43493e45674d0e3 SHA512 67e5b5fea8052c0723820125271ea031ad984e0fe2af21d2423fc559bdc51dfe1d40f2fa5fe11e6d2b8b32216e716900080b859aad146c079ad2b390dd9844cf
diff --git a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
deleted file mode 100644
index a22e39af6191..000000000000
--- a/dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# this test is very unreliable; it may fail randomly depending
-	# on installed packages
-	sed -i -e 's:test_no_memory_leak_from_Rule_builder:_&:' \
-		tests/test_routing.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv -x -p no:httpbin tests/test_routing.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-2.0.3.ebuild b/dev-python/werkzeug/werkzeug-2.0.3.ebuild
deleted file mode 100644
index 2ac5622c4f00..000000000000
--- a/dev-python/werkzeug/werkzeug-2.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		!hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python*')
-		) )
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.1.1.ebuild b/dev-python/werkzeug/werkzeug-2.1.1.ebuild
deleted file mode 100644
index 905fbc093217..000000000000
--- a/dev-python/werkzeug/werkzeug-2.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://werkzeug.palletsprojects.com/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		!alpha? ( !hppa? ( !ia64? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		) ) )
-		!hppa? ( !ia64? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' 'python*')
-		) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.1.2.ebuild b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
index dbf7e6f714bb..22f3f897aebc 100644
--- a/dev-python/werkzeug/werkzeug-2.1.2.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.1.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 # NOTE: remove the loong mask after greenlet gains support for loong
 # see https://github.com/python-greenlet/greenlet/pull/257
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
index 10628ec50486..2476cc1281aa 100644
--- a/dev-python/whatever/Manifest
+++ b/dev-python/whatever/Manifest
@@ -1,3 +1,4 @@
 DIST whatever-0.6.gh.tar.gz 6003 BLAKE2B 410093960b8e17b1e0a7f91d7692bfd9e3f88a73cffb17a9a1763d42674cb1ec75da2b0a6575279c93451f24504086bdb89487bcc44bb116cbb2af89b9a7521b SHA512 f982100f0d6a8bf4c30e452a083c75f4cb2bca07e57e40ba4fd66baca752f039aea9519ffb97b3d43708df0ff5e981d0c4d03773f225106aa2f43e7770ee1975
+EBUILD whatever-0.6-r1.ebuild 485 BLAKE2B 0372669b2862429d5a346f05d4b4f36b0bc5b2dc2e245dce7fea9a2cd0cfd6a67d823dae86c98a82005bc96f85626c6cf8750bdb4d551d1cd68d5c4e17d6edf6 SHA512 ce358baa5ecc2243854ba760dfd81b6ed39fbbafdc119d234f2578404e893185eed82ffd04295c1f3b871de1f9dd430cbace368109fc5f591f7b796bd341f0a5
 EBUILD whatever-0.6.ebuild 448 BLAKE2B 9cf9890a0b1cbdeeabb9971ebc7e1371c12586bd49a675b59cf508be3b29a1b7b490f1201e217cc7c547ce9308007196b3925dc77d3ced752f7e9b5c6fc6c543 SHA512 1e1ecda69708cccb04076d8171db7cc6c9d03bf62db89e7591b8ea017e1a34c09603e6eca0c73b7beb9b05dc9f4f39b7fb3c35b8561074dfec101adaef16572a
 MISC metadata.xml 420 BLAKE2B 41c4f20317bb859b027aa397e6aa9d370ee72453dbb52f6d91b6b1214ea7716144cb43c8d63f204899302f50205d2253464f356f8849328588c11a1e2d245f39 SHA512 db6115bbed26216bdd3dd32e6f5b38573bce984f314a8076e80de1da3824cf203fe2fa8f81bf54c6c339db26e8ef37ccd6cf9963b7a33725181509a789570a98
diff --git a/dev-python/whatever/whatever-0.6-r1.ebuild b/dev-python/whatever/whatever-0.6-r1.ebuild
new file mode 100644
index 000000000000..269e63debc39
--- /dev/null
+++ b/dev-python/whatever/whatever-0.6-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Easy anonymous functions by partial application of operators"
+HOMEPAGE="https://github.com/Suor/whatever"
+SRC_URI="
+	https://github.com/Suor/whatever/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index 49ce327c6967..8bc20db5a874 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,4 @@
 DIST whichcraft-0.6.1.tar.gz 8676 BLAKE2B c08dc453b1143da9c46f63d894526784724bff4861c1862a460f557c74e64bbde72c0127f9df0f6547a5c2183fe770e3ceaf417fed88ce70691ec28605f42e75 SHA512 3a8bf524437f3ee0b5b6ee16e4516ba1c75bee738edfef03316b1ef32a58d036734d75e626f113ad434acc29ccc0cce145668867148af7aa10de1fd5f739d5f6
+EBUILD whichcraft-0.6.1-r1.ebuild 532 BLAKE2B 7bd661352f50b533de246f6dd93d5f830e81a889ee0686e4f045e2cf41f19d7ae8e74df08f97ca5135484baf287ac6840f7147e076d2f9589ccdf2b65bf057a4 SHA512 06afe0ebb354f1cb4a4e986fc1e52b35de091227162d9fa4e5b0c0f16c14b05c00d2ab0b6f8c7b276d794c1ef52b6a0a509c9810c8127ee3b8232b448feb80f1
 EBUILD whichcraft-0.6.1.ebuild 499 BLAKE2B 4b6c8ce9a519e31b4fa8b4bf57fe31bf3b687beed68bc107d080cabf1a4ac169a82e348e720bb1afdb54c7d0a511efd0d231da51200bf15e8bcd7e5ac1a85da0 SHA512 ac0a93e6f1fb8f3fa367a777de6273706f17784e6f42afd6e05eab53aee74292082d849c0146ab950fea8c2272be2e0a246c0e8f9c9d9e47d7a10f3d8a12eb91
 MISC metadata.xml 377 BLAKE2B 0e64ac75928fec2fa40bcba33e66b75b78cdc17607e1c4353e576caf248af20dd66ba03df350b22d54cdc099ad421090c28df247f66a21316286316501d250a3 SHA512 5ec43d9139790080cd0a50a5177ff3ada2a1becd847dae4cbed62a419f2558d55240dbe193a93d1d70d79187a9d47183cc1f41e824a48927999f0f7505b3c0f2
diff --git a/dev-python/whichcraft/whichcraft-0.6.1-r1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..6a4e14d9828f
--- /dev/null
+++ b/dev-python/whichcraft/whichcraft-0.6.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Cross-platform cross-python shutil.which functionality"
+HOMEPAGE="https://github.com/cookiecutter/whichcraft"
+SRC_URI="https://github.com/cookiecutter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index f512b7e5c221..cda355793297 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,5 +1,3 @@
-DIST whisper-1.1.7.tar.gz 38289 BLAKE2B 05c5ed972c6dbe8ecc29731d206a44e4db2605aa1270d0eba63c90390062f3cee81a6076a571e6b18cc54f8b1a0ffbc9800c91e9aa7cf3cab862d7e6bb8217c0 SHA512 2dc4f15a91b518495da120af4ad2af4b5f81d04fae6028ca1d7505046b93082a9294452a703c8de87dc89629c35dca0809c4ee7c0df1a7a6bd5ec527f3126df2
-DIST whisper-1.1.8.gh.tar.gz 39117 BLAKE2B 591a3529725f300c6d8bab40444bdd41bcfe3d832893e954295d5387e047e2a639db4235131cd90fdb686395d51afccf30f64a52e194e4cd8e00b86e38f841d6 SHA512 0452c684128a750e30e926aee0cfd6c94f129eeb561246f9e1c66d7cf1f27f139df84f91e935237f89d0b4fac98678108568cfb94c2ab4138480f4db31471ab4
-EBUILD whisper-1.1.7.ebuild 590 BLAKE2B f960bdc65f64aa267d41bd61ef2bb721f0656e3bcb37cc463d8606e59b3a9fbc19bb2c0cd5f10c35a51716bbe9deff3d9daa16c622779f8678ca68eba91a0f6d SHA512 cd7480680c22d7a64c0a80fb9550f0bd3afd1236b9b33790b910eeb635e4bc958ad70aa370a32a2bdd7f6d7d6977add282ddee2b1868019bb67443117a7802a0
-EBUILD whisper-1.1.8.ebuild 608 BLAKE2B 9c03b7315b46c5db44cf13c384c61e226fa1608b1bc9d381b445bbcc3bf343e82c492187a210684c1b3dbbfe1f3fc126b5274fbbcf4ade996405c22fb865aa8a SHA512 a944b6e748575e26243fd9ee0636d9c1979e7404eb19400ce3b8c8d76dba0d4808d9a7f4c476973ee53ef9815b3a83684395e6f6219be073fe888fce314b52ef
+DIST whisper-1.1.10.gh.tar.gz 39459 BLAKE2B 998c4335236ace6b28f11b23fe74d3b618ba2f56939a3e9766e7010eb6b5d9bbdb46de83ba41dd926d3d38e738851133dc9805a4c79bd80dd67897e627147550 SHA512 291d441287ba090157fa01a7feb6985a6e1f057f4dae0f9133e2355e00f5fe219e10de339ecad3438a56b8dec97def14496d85c7a5fc5fc7611771bb3de08de8
+EBUILD whisper-1.1.10.ebuild 629 BLAKE2B 45c3e838266832a96c3db3f04c674a5a6e744b01cb707181985522db46665d8697ece6d017ca558007af8889be834a409ee3f5c5f4cb51d3f21cd271724d6c34 SHA512 dd1edef606060c39bfef4ad175f221eb9df5ccbfe90bc49423c5f7e9e6100e3b5a50fa316921f525172293e1894b3efaacf68202ddeca35f188022978a9e086c
 MISC metadata.xml 680 BLAKE2B 070ec3c5c71cea8d95302162acda73a61d7c0fbd195ec4edb8cc34c496be8e89d8254be122dbb2797de2fc5255fcc69a26f308aaf5058088b9df14f06a8e1e95 SHA512 3de2424fa3cf4c2482fc5ce743b37b53cd354424b0c11823918f64be6ab2ff5195794d73a0504a4e119e861d3f5f0f6a0dbb385cf37641e7acbf96812d752702
diff --git a/dev-python/whisper/whisper-1.1.10.ebuild b/dev-python/whisper/whisper-1.1.10.ebuild
new file mode 100644
index 000000000000..7c5e02c4610f
--- /dev/null
+++ b/dev-python/whisper/whisper-1.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixed size round-robin style database"
+HOMEPAGE="
+	https://github.com/graphite-project/whisper/
+	https://pypi.org/project/whisper/
+"
+SRC_URI="
+	https://github.com/graphite-project/whisper/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x TZ=UTC
+	epytest
+}
diff --git a/dev-python/whisper/whisper-1.1.7.ebuild b/dev-python/whisper/whisper-1.1.7.ebuild
deleted file mode 100644
index 0b3dd86386f4..000000000000
--- a/dev-python/whisper/whisper-1.1.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-# PyPI tarballs don't contain tests
-# https://github.com/graphite-project/whisper/pull/253
-SRC_URI="https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/whisper/whisper-1.1.8.ebuild b/dev-python/whisper/whisper-1.1.8.ebuild
deleted file mode 100644
index f960a40caf88..000000000000
--- a/dev-python/whisper/whisper-1.1.8.ebuild
+++ /dev/null
@@ -1,24 +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="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-# PyPI tarballs don't contain tests
-# https://github.com/graphite-project/whisper/pull/253
-SRC_URI="
-	https://github.com/graphite-project/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/whoosh/Manifest b/dev-python/whoosh/Manifest
index 65443922813b..3b9060e96f76 100644
--- a/dev-python/whoosh/Manifest
+++ b/dev-python/whoosh/Manifest
@@ -1,4 +1,4 @@
 AUX whoosh-2.7.4-tests-specify-utf8.patch 319 BLAKE2B b889ccda8723208af56659616ead64b1779c1bd96abff594a099ddeaa9aac3be86603dd0825507b30a900f38d80b184dfdbddfa42087969ec7fbce43cc8c1617 SHA512 53dc8336ac9895659d92001cb22137011d9da753c299bc3fecd34ed6b42f0f169967dfd41b0403462e54e62af1f6390c58386a91a89ddc880a4fe0a4e05ce14b
 DIST Whoosh-2.7.4.tar.gz 968741 BLAKE2B 698ec603eb1201f2b1a934785f84108cb5d91114c9a4e1943cfcd2c8c878f7fb0a0868d54d3a11f8aa30890179c555bdc11cbf34962f5f4781c6d43a090ba872 SHA512 7cdefdcf52b704ffe50c00718c42677e2ddfe879f81ad2d14b580b0e026cc0ebb6b9ddc99d8709eaff4eb9b83f654b042c8792821e1ed90aa85cfa6f82845074
-EBUILD whoosh-2.7.4-r1.ebuild 951 BLAKE2B 44614c3141871f95690ca85f3ea395f313e23787db959910c8030ffeb2cc6f3ad58788dbbc37c00e99512b6a1bae57e75a5ccc9255d831e990204e4642baa8a0 SHA512 b2ee09d070fd3bde49f01e778309e5d34b6c2fdd9524bcd295995944380c9ff7d1d2bfb7785e190b2f0859a848f12d4c234507a4be2996c7eb9e02c8c6938a19
-MISC metadata.xml 761 BLAKE2B 5d3afd52974b702eb26f977f515504376f882070bf446569394569c7a08729d360d0a36ec6be4105388efdc573ed0149c04c6663df4370230b03652ac8cf57c4 SHA512 40e03c23018f70b331f168e19b78b54f1ad74b516227c2d4a8274dbd6b9fb058bd073a041d897253838c8f8ff9bfcfaeb1f6dd5312c4c4d6592acfbca4099fe9
+EBUILD whoosh-2.7.4-r2.ebuild 982 BLAKE2B 378c9b403830696d115895f599d4377b0f6d7fcb9d8f052f71b1feaaf7158a37c03d33080058e81526184e99b51417f1ec2c726cbfc8aaeec25244976c4b7aaa SHA512 b48f2a26b891c81bd0c9c72e44564fddc14f07d8f70ebe2e68e9a388193f96d291909eb8fcb9b62d50b09bf549bb6cb30f9490b0b1d3b930c5b785446b85b998
+MISC metadata.xml 785 BLAKE2B 2ac7c8f0d06f362228b5a9a34fef5f5127bacbf11f0569edd70b0f90733ba14a43abbdec3e503b809e75b8ca09da30b08e4671aaa6fd648c5fb8a1f910418739 SHA512 ee5f1cdc409cf433c5e7ead9ae11f67fbc8652e2087cb359e41b3e547ae31b680f6d1bc9da194fcc70b197eac34a10636847aa5bf0775e816ea23ebceb7f282d
diff --git a/dev-python/whoosh/metadata.xml b/dev-python/whoosh/metadata.xml
index 4c79be83af60..88829be92af2 100644
--- a/dev-python/whoosh/metadata.xml
+++ b/dev-python/whoosh/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<longdescription lang="en">
 		Whoosh is a fast, featureful full-text indexing and searching
 		library implemented in pure Python. Programmers can use it to
diff --git a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild b/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
deleted file mode 100644
index 0630af64ea82..000000000000
--- a/dev-python/whoosh/whoosh-2.7.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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="Fast, pure-Python full text indexing, search and spell checking library"
-HOMEPAGE="https://pypi.org/project/Whoosh/"
-SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
-)
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# (backport from upstream)
-	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
-	# fix old section name
-	sed -i -e 's@\[pytest\]@[tool:pytest]@' setup.cfg || die
-	# TODO: broken?
-	sed -i -e 's:test_minimize_dfa:_&:' tests/test_automata.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/whoosh/whoosh-2.7.4-r2.ebuild b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
new file mode 100644
index 000000000000..a84125c4a715
--- /dev/null
+++ b/dev-python/whoosh/whoosh-2.7.4-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Fast, pure-Python full text indexing, search and spell checking library"
+HOMEPAGE="https://pypi.org/project/Whoosh/"
+SRC_URI="mirror://pypi/W/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.4-tests-specify-utf8.patch
+)
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# (backport from upstream)
+	sed -i -e '/cmdclass/s:pytest:PyTest:' setup.py || die
+	# fix old section name
+	sed -i -e 's@\[pytest\]@[tool:pytest]@' setup.cfg || die
+	# TODO: broken?
+	sed -i -e 's:test_minimize_dfa:_&:' tests/test_automata.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 26140faa1488..5e7b83d838d2 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,5 @@
 DIST widgetsnbextension-3.6.0.tar.gz 802154 BLAKE2B ef6b56c9ba2e40dde4a6ca40687488fd823886ab5eae474558b994f8a4206c4665e3ed4d953deb93a6261d3f55f3b514ec44eae3aa10bf699e8d2378f1669631 SHA512 d00b0e8d5edfc85ea1a9ac036dbdbe0b0ac6cb0eb694fc999f81e8f615e2a637890a2d5383c0f0ea041d886dbddf2e7036f8163fae0b8c3b5aa315a072b3ff7a
+DIST widgetsnbextension-3.6.1.tar.gz 802619 BLAKE2B 8b1d829137d418d35386d64b71050627ab8639ecae76fa0dbda46925ed495405f234f16b29213d3520e20f8021f139064e1e844c2a63004ab2bd0f3830af2a80 SHA512 0c7a723648299b2839d04b85bec0909f780f32a1181940b8b6ee985b0703732cd6ee57f904ebcbb678c069bd4fb2c27f94a554ffca91890176a7147ab7fd8faf
 EBUILD widgetsnbextension-3.6.0.ebuild 539 BLAKE2B 829fca499c345d0c9eb6914b3a058dc55ee5629c0bf4da6895d4d29fd29c270be9b6063d5bc581a72cb54e7540e5822b43c941680192bfd1af446b0d773a6287 SHA512 7606eb9764a1f690bbfced2278da4bd6a5239f40741874124d2248fc13be1f24e95dfa6c6be5e529b5173cfebaff2be12c031cb4dee7634a2d973b9758059f58
+EBUILD widgetsnbextension-3.6.1.ebuild 597 BLAKE2B fc2f2c035550f21c5bb3941c071932d4f3c560ecea8084285228912607ca4f2ba9d5669fd5c79deef77721a6fae147e160b838fb83799de37694df289ee32cdf SHA512 c65d30470bfcc3e2182b4e8524192922e706828a8efd73bd66b99771d91cc977cdaf7b91a2165d6da09cc88c61ee0edab47b07ca402d7f80a73a323d83ddfde9
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild
new file mode 100644
index 000000000000..d890ca129178
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="
+	https://ipython.org/
+	https://pypi.org/project/widgetsnbextension/
+"
+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 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/notebook[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 2275966f2e32..0694d422a39d 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,7 +1,3 @@
-DIST wrapt-1.13.2.tar.gz 130624 BLAKE2B 7ad74653208042326630ae4464494fcdd5299b35a42d495a16a3cbd68bb60fe5ea17f3e95eac85d98142fe339a593a8cda7e3182ce2a6e96f6ba2bb204a1fc46 SHA512 14648465745af7972ffd449783a24a4b5bf8187cbee517d3427825409bd5d073e3153a0c61f5583b84fc6ca2c48479ebf112977ce340369019a617559d09dfc0
-DIST wrapt-1.14.0.tar.gz 133565 BLAKE2B 7548183c4b0b566df3a96cb309b44975a633976f6b56a332d87587dbce5bfaf80cbbfc692ef163118794c1d8e44995ef4750748990ab3e6f5f87968df44f02aa SHA512 ef31279873688208bb17d875a3bbdba3d506f5d9febeae28f1bdb740830395d86aa21dcbe747d592f098b745e5a599c352e122a642f923eab0eb39a30f19695d
 DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
-EBUILD wrapt-1.13.2-r1.ebuild 731 BLAKE2B 3ddc82845bfb1d3b9d3772c5dadba7251d373f57970ee6b88f0f14f00607552cb9d3969862178f7ec14fbd693fa488b74f24dc0af7b367aead78a8774f3ddb6b SHA512 657d6983a892deb69ebb395e4882b39bcbd4917cde336d7e4663ff56c1b96656b826ade7a54f2abd06fe9e11a8e7bf6b603485d9d06316af4e9a5d5cd5a2210c
-EBUILD wrapt-1.14.0.ebuild 731 BLAKE2B 3ddc82845bfb1d3b9d3772c5dadba7251d373f57970ee6b88f0f14f00607552cb9d3969862178f7ec14fbd693fa488b74f24dc0af7b367aead78a8774f3ddb6b SHA512 657d6983a892deb69ebb395e4882b39bcbd4917cde336d7e4663ff56c1b96656b826ade7a54f2abd06fe9e11a8e7bf6b603485d9d06316af4e9a5d5cd5a2210c
-EBUILD wrapt-1.14.1.ebuild 794 BLAKE2B 3d28358758ab88633fb6116fb1ebf8c0027fc4feb3580e0d10a5ca189ac15c1410425daf624652ca4e6a07f6bb7fa7cda7ac4cf38ffbf1cd064656a676c9e687 SHA512 c98419c5dec82a9faf14c10832d2bad170c4cc102c82a3524051399a848df60071dfb5aee0400a94e34c16a2a500bd51be74fe3b7f6ed518d9761b38c47c0673
+EBUILD wrapt-1.14.1.ebuild 786 BLAKE2B 7d42ea158f8869582b5f75f673e9842be8c7e0ac96936691c862669603a26fcfff967343a00eb49e12d2d468bbeb632248ee631f757723fb283c4dd753573f6c SHA512 717e5af0eba88038d13e38150c66b7a7489141ba37fc67a303dcbc44bd5a260c3c4a0b0eabf77c350c17d7ecf56236f2f50aca7b746c1f5e6f42eb74d4cea277
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.13.2-r1.ebuild b/dev-python/wrapt/wrapt-1.13.2-r1.ebuild
deleted file mode 100644
index e0c4a5aabb78..000000000000
--- a/dev-python/wrapt/wrapt-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/wrapt/wrapt-1.14.0.ebuild b/dev-python/wrapt/wrapt-1.14.0.ebuild
deleted file mode 100644
index e0c4a5aabb78..000000000000
--- a/dev-python/wrapt/wrapt-1.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="https://github.com/GrahamDumpleton/wrapt"
-SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-
-python_compile() {
-	local WRAPT_EXTENSIONS=true
-
-	distutils-r1_python_compile
-}
diff --git a/dev-python/wrapt/wrapt-1.14.1.ebuild b/dev-python/wrapt/wrapt-1.14.1.ebuild
index 7fc371b0cbc1..5b24a02156de 100644
--- a/dev-python/wrapt/wrapt-1.14.1.ebuild
+++ b/dev-python/wrapt/wrapt-1.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index 7274db1f7792..51b4ec2ad5c7 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -2,4 +2,4 @@ AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.5.1-r1.ebuild 1745 BLAKE2B e73eb3b3e414bd90b989f40d5d6daabf1d254dfc6f0aad892a97d1ad24a25d3999e06601883d52405f99f52d80cef135ae48d48fdd9f6b55a80244bda39e30ae SHA512 f341e9a11778273ff584fc7c2cd3f20809ed3f28f96694b7d3b5887d8213ce70e686ed895c780a2df6f279718c75b729f60016a82255c7ff6ce1c0e517ad8603
 EBUILD ws4py-9999.ebuild 1747 BLAKE2B 6f0a6094dbc9974b37cba29097c99894fcb869f981a6881bec2e30a68b7c8bb66cbde8e26cec2fc22bc8f455967bcc4de90db1480730409ea26efaea4ae43c46 SHA512 8f9117dcbb745096140dd1fde0ee932586f07413011498961c6198dc6fd2f6da66849305350b086c10941b9238f820d5b8c187cf9941e55a1cd328833c90e8b0
-MISC metadata.xml 508 BLAKE2B 23d7c22c24d9ea999ad9ceeccec478a4c85b2e2aff383185a31fc1dbd764ed40f0f29ad8ce29ef93804ba29631438099a9e160a1a53e823ae01c0b8460bb37f7 SHA512 f3dd62e3f0b73ccdc03e5eec7c39f07a34b9752a7be1899f239b3d0345edd6818c14e41db805af290117eeda915442e6d49d8bfd0387edc078348be0bf579a83
+MISC metadata.xml 424 BLAKE2B 7de8ba5be6abffa07db15ec9bf768480c63cc74485965890c14926964690be45d8a244bf859646413f30432b7beb70fdf085dc73b4542ce8d26f0a7498a555b2 SHA512 2ce66adf4df239dfbe6f80b0b7a9489163798f2f1352360a3018f409a699a48cb0da919b71952678689c49279655db9b98862ee27a5c420563f01068f0320ae0
diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index c304c231f167..bcbb23469491 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="client">Install client modules</flag>
 		<flag name="server">Install server modules</flag>
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 5eab3cf37f70..e1c271a25874 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.3.tar.gz 9723 BLAKE2B 75da0f27e07b52ed730d239ef807da7ba9dd342144ca2e78c32dc09b20c1ebfc006aa9969b1f811d172ca18b75533a4560a29112e56d6dfd472117a0d072fc8e SHA512 0fe97c7fa94cec1b9cf019507f55ce633a9b4bda86329937cddcfa25ba94755010813688cda77ee4fea1c50918e45cd50770bb27e7583e630c46e84d27c155da
-EBUILD wsaccel-0.6.3.ebuild 605 BLAKE2B 3608414cf26d2ba964fa2201cefb086adb42075e2f46e89c5d7fe6fff0151dbe33d2803020d48abc690f65e26842e7d2e48986a9bc7959494513e7522dba771c SHA512 89a54cacf82287df96c130b1de81797ca3915244eeb3cbcd0cb4c8c92a47d8fadb64c5f8acca8c43631c5c973e42f01e7bba4611452066783a048693bb7a4ed6
+EBUILD wsaccel-0.6.3-r1.ebuild 651 BLAKE2B d49489a50f84fc3ecfa00c1dc82a912c1cc11604b32030800598285865418aff20f176c123c811a27b346e7deb7db683a78afb4df1acee321e089eaa7a477e5c SHA512 2dd5d48d5ac9e8edb3d1a492506733eea8395e25a55996352280dc61d6ee53a03bf31a4e9874936a1d07a53a5760e98768d450ae2f76724504a3a296aef0e1c1
 MISC metadata.xml 378 BLAKE2B f92892d9a32a400a15444eecd45057abc95cc12b53277dc0c9336e9630422511ea4dbb27d73f61a7fa65adc76259154d383027c1b2cd0a2b18327976d953d053 SHA512 36f858807cbad0a4a4911b1bf2030946ec7c79b51165926996f72c63e468378b9663d19794b1842542f49e272f3d74d391acccc1e997884bed75f3ee587415c0
diff --git a/dev-python/wsaccel/wsaccel-0.6.3-r1.ebuild b/dev-python/wsaccel/wsaccel-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..087d7886b9dd
--- /dev/null
+++ b/dev-python/wsaccel/wsaccel-0.6.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
+HOMEPAGE="
+	https://github.com/methane/wsaccel/
+	https://pypi.org/project/wsaccel/
+"
+SRC_URI="
+	https://github.com/methane/wsaccel/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/wsaccel/wsaccel-0.6.3.ebuild b/dev-python/wsaccel/wsaccel-0.6.3.ebuild
deleted file mode 100644
index 65ff11815391..000000000000
--- a/dev-python/wsaccel/wsaccel-0.6.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
-
-DESCRIPTION="Accelerator for ws4py, autobahn and tornado"
-HOMEPAGE="https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel"
-SRC_URI="https://github.com/methane/wsaccel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd tests || die
-	epytest
-}
diff --git a/dev-python/wsgiproxy2/Manifest b/dev-python/wsgiproxy2/Manifest
index 3858a740c0a1..708cbe7cdae6 100644
--- a/dev-python/wsgiproxy2/Manifest
+++ b/dev-python/wsgiproxy2/Manifest
@@ -1,3 +1,3 @@
 DIST WSGIProxy2-0.5.1.tar.gz 16565 BLAKE2B 54bdc404111d910af61a59a7da5d47924e1950162dfb79dc0fd221a417c4fbb717dc4e7cf521589e3d087ffce1917449a199f5278bd4410ccce391b9c551eced SHA512 6be9d4893515cc70ee1c5d7b7a29895a8c8b5afd316e2ad05f92fc1fa93e26da22b93440994ec9782f0663ff7073e476f75351fb7955bde93a2b6fbf9f4bf78a
-EBUILD wsgiproxy2-0.5.1.ebuild 767 BLAKE2B 3c34feaa97c96509ff4dc76af2f9a3f4329db69c4cc38567646080ac94769578a367977487d397371fe550699aace291cb151e3de21ec2c1995f42e69e12a7fd SHA512 75353c8e861c128605710c82285893ecb73ecb5a202bc89fa91250f7e65a0dd798a5074a6b150317cde73534af6e7570fe9cecc6ac60506aeab41be5a3a81829
+EBUILD wsgiproxy2-0.5.1-r1.ebuild 842 BLAKE2B 4e520a2f784db92e661ae3397437001ffefc6dbe78276699f258d831a9f057e64fe8f0de8c4242793604924e830520ce509932ed21470bc68979d55beb53be6b SHA512 94f5c76d833406420a4119523869f14c245a3a25efc26125c5bf9a139501cffb51d5680be4c7de30c86a54fbeeec59341e453cf79504f823ab5b56a4ec002e7e
 MISC metadata.xml 338 BLAKE2B ad788fd89f5187ab162da326b7d3351c92f99a61f2a947832ae91c692f2202803fa6a754b05ff8f4ce9d752d28a490870dfbf630ecae510d03b24b2725329261 SHA512 38439e1fe9b37f8b911f42bd7e49b2f9455c7486551a8553e3b7ce91ef2f18ae50a93d535673bbff00b3faccee2082df96ac5e6da076dbc91fcecaf35c803f43
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..94bff3150d2d
--- /dev/null
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="WSGIProxy2"
+DESCRIPTION="HTTP proxying tools for WSGI apps"
+HOMEPAGE="
+	https://github.com/gawel/WSGIProxy2/
+	https://pypi.org/project/WSGIProxy2/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/webob[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
deleted file mode 100644
index 0c2ddec03054..000000000000
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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
-
-MY_PN="WSGIProxy2"
-DESCRIPTION="HTTP proxying tools for WSGI apps"
-HOMEPAGE="https://pypi.org/project/WSGIProxy2/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/webob[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/webtest-2.0.17[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index 7e560c5993a9..085ea1546d0b 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,3 +1,3 @@
 DIST wsproto-1.1.0.tar.gz 52928 BLAKE2B 837f5d8411a55b026d8c5df8b03b44c92f71fe2856884e5199e639a5c060fabbe8eec39cb6861e8f88ae7fc366cbeef4f9d62dade2c95857d27339fa73e90638 SHA512 0cd726bc62ca4d11e96f470f51511008bd43dbb9e99a17633d2a40da7bdaf19716e0a1c995350f5c8f418f906848dd6f2b9b0a853c1b6858ddafa1cc02fab710
-EBUILD wsproto-1.1.0.ebuild 611 BLAKE2B 6a1abce36fde88b914c9dca0640638a3ac93b8f78636042aeac606a7c6eec6dc80f9d4d35e428b994e9069b1f5860ccfd41c342104cf63d3bed57300f53060fe SHA512 a28857e65879f120dab94924c2e37f7c89c84a0d4e2abfe4beaff6fc6bb78c3f5a68f39fc5f02684eb74fcac1a5927c80f109f82a68f1630e3fc8f0dc90687cf
+EBUILD wsproto-1.1.0.ebuild 611 BLAKE2B 60015f4a5f0bd4185e6144e288b4480cf4271a92d3c9900aae381ddaef6ac0cec492568099224084760c700b5c875df28452c9d5bbfa05534dd8ae33776d4828 SHA512 b4e2af51d6a6c3e1ba99ac5b992b5414b70cea6ed05ee6402a986094ab6cab04eb5dbff137f39a30dbb3485543a091dc2dacc9c4c489e830a361e9dad94b34c0
 MISC metadata.xml 494 BLAKE2B 144d8a2efbedf70327d0f862e9e1b9d70d8ec72939cea4239e877f183485c9d4075cbadb9423f74b08e8c0ae806b8786467363ff0aae0845be227059e33304ba SHA512 c5818f8c26a0aa8b88b54259ed81c570bee27ca44a20a2f487109477608724f857a306c2b9b82a2a8a03d5852edbfe4ec27f81b60ccf743e58dade14ab992da0
diff --git a/dev-python/wsproto/wsproto-1.1.0.ebuild b/dev-python/wsproto/wsproto-1.1.0.ebuild
index d87d1193033e..77b63c9f278c 100644
--- a/dev-python/wsproto/wsproto-1.1.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index d6a4af04e232..5b2b47c4c634 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,7 +1,4 @@
 AUX wstools-0.4.8-fix-py3.10.patch 932 BLAKE2B 48d67a79f12a35fd93e5e493f3f488055b7be491790a3bb9bc2e4e823c329d3eff2f1243b85e84d137f386e29cb32ffc1185d6dc632bcce62da9e3454d33231b SHA512 cd6a16c72a7b3a565add77ed07e7864e5085dacd22891113d30920f336fc92628d75adf46f5ce684b502a0a03a88220e37966eaddcd53ca06a6911a3c967edeb
-AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.10.gh.tar.gz 204095 BLAKE2B 8d7652729846e991d84bf3c2b64394bf3954ae69cb1ed49ea7822432b965e5cfabd02f8d4ba7caa0cbf9df57def062b085aae75c5d4af1f9be078e2fd8031e0d SHA512 1acd8e62d71c7d330f1e953a0da1956291c5dfb25ff9b8b8799c83feaa4230e384955735b131bab7b430b92ae6c18498927d416d2d1e11fb5c5dad93417c671a
-DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
-EBUILD wstools-0.4.10.ebuild 1106 BLAKE2B 86eb49d5a1c243c9f5570667ac7647094916b7ced27eff7572925d182769605b23be12720eaa076716fccc907b0ee835ab38b01cc1f744444651ef15e5849661 SHA512 49ea1227347ab2045e8424def5bcd328f096486a7e8751f06d7701486f9c226547ac458c1df251b6c34fb1bbaf5b5797b5fa2e6a492796982a9aa461dcf464f7
-EBUILD wstools-0.4.8.ebuild 822 BLAKE2B bf2c734584ec582d4e8e3f99ded708defd575affbeb2b3d604d8c6132994b697a1b3c751d19e5093c0190a958b193f2330cfe5fd99b1a14f11a4bd80754b142c SHA512 8c369002ff292e187ed5a1978ae248bbbf5871cf0941b0e0bf38d81740e86c90d6caed400aa5465e1561ab41be1d204052bd4d36948fb3171da36ad9bdc31be2
+EBUILD wstools-0.4.10-r1.ebuild 1141 BLAKE2B f9c43d6b35e24f65f348e18c46f654d04b287ddd1ef0ece0baa0a38baecbbf3da1de493e6774b171dce27ecad27218d1b502351ed61e286dca7a8f5f55eff314 SHA512 8e61e8dc0ac046fd72b46a3d959be6290964ed4fcbcc6dfbd93013667c0e268e28ee6a2aea110e0d597fd65a7637db069d8ae59058c37543e7e424e95aa9c5d7
 MISC metadata.xml 406 BLAKE2B c08ab496c34bba9eb3e7d29283823fa8b2898921e12026d32bbf137df9f0a7aa0d55c2a31c1c28770472db5b0f94fc3fe37adcaffc1d6879d9272ec7c1ea60c5 SHA512 53227904b908d921e3f89ae8955e1334838436058bee7a1b286844b6fd0bf6290fc4e197e268725be7c5e075f07da7303d652b2729374ccdf108982a52647c32
diff --git a/dev-python/wstools/files/wstools-0.4.8-setup.patch b/dev-python/wstools/files/wstools-0.4.8-setup.patch
deleted file mode 100644
index 3d8c168037a8..000000000000
--- a/dev-python/wstools/files/wstools-0.4.8-setup.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eb57ef5ad6abeaf8d9daf4914f95bcd86670340a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 6 Apr 2020 13:00:31 +0200
-Subject: [PATCH] Drop dependency on pytest-runner
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index d9887a8..8a63a13 100644
---- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,7 @@ class PyTest(TestCommand):
- 
- 
- setuptools.setup(
--    setup_requires=['pbr>=1.10', 'setuptools>=17.1', 'pytest-runner'],
-+    setup_requires=['pbr>=1.10', 'setuptools>=17.1'],
-     pbr=True,
-     cmdclass={'test': PyTest},
-     test_suite='tests')
--- 
-2.24.1
-
diff --git a/dev-python/wstools/wstools-0.4.10-r1.ebuild b/dev-python/wstools/wstools-0.4.10-r1.ebuild
new file mode 100644
index 000000000000..ca9fde70b010
--- /dev/null
+++ b/dev-python/wstools/wstools-0.4.10-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="WSDL parsing services package for Web Services for Python"
+HOMEPAGE="
+	https://github.com/pycontribs/wstools/
+	https://pypi.org/project/wstools/
+"
+SRC_URI="
+	https://github.com/pycontribs/wstools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/wstools-0.4.8-fix-py3.10.patch"
+)
+
+src_prepare() {
+	# remove the dep on pytest-runner
+	sed -i -e '/setup_requires/d' setup.py || die
+	# disabling xdist breaks random plugins
+	sed -i -e 's@-p no:xdist@@' pytest.ini || die
+	distutils-r1_src_prepare
+	export PBR_VERSION=${PV}
+}
diff --git a/dev-python/wstools/wstools-0.4.10.ebuild b/dev-python/wstools/wstools-0.4.10.ebuild
deleted file mode 100644
index ae43a5fb3904..000000000000
--- a/dev-python/wstools/wstools-0.4.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="
-	https://github.com/pycontribs/wstools/
-	https://pypi.org/project/wstools/
-"
-SRC_URI="
-	https://github.com/pycontribs/wstools/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/wstools-0.4.8-fix-py3.10.patch"
-)
-
-src_prepare() {
-	# remove the dep on pytest-runner
-	sed -i -e '/setup_requires/d' setup.py || die
-	# disabling xdist breaks random plugins
-	sed -i -e 's@-p no:xdist@@' pytest.ini || die
-	distutils-r1_src_prepare
-	export PBR_VERSION=${PV}
-}
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
deleted file mode 100644
index d6450a8d82fc..000000000000
--- a/dev-python/wstools/wstools-0.4.8.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_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="WSDL parsing services package for Web Services for Python"
-HOMEPAGE="https://github.com/pycontribs/wstools https://pypi.org/project/wstools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-setup.patch"
-	"${FILESDIR}/${P}-fix-py3.10.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 67fe1bf5a1d5..4504f7ef0d7b 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1,3 @@
 DIST WTForms-3.0.1.tar.gz 137513 BLAKE2B 17fbb385a28baefaf3fe368b7c7dbd3d6671aaef887ee89617e60e0537ae060248442d4990e7ea926b15d4b85585a1c80ffb61c0fdad2627e5cca90799eb01d7 SHA512 a6db54a7ef9bc96b8fdf69cd65d3810fab9436ff9c056e1cfc580f5ecd0ed8837dcbb7c2adf92419cc5f74e865bb3a023e316407a87d5c5277da5d30e6836fb3
-EBUILD wtforms-3.0.1.ebuild 807 BLAKE2B ead5fdbf4b9e5db6482f8226ee1a43c8649488d071faa6a1de62ccc28b7a9fe9f168e89964140c82b3c59b0dce384759f8ff84d7b913f68e7d5cda47a00e006e SHA512 551abe4ea16ff680a2ca2ddda3049da215ecf8beddcb2601a4f55fea512b41ba1b2e9c0134bb895a26a3fd6c27d97d2ed92d0cd6d1094ed4679b77ee6ea80ef3
+EBUILD wtforms-3.0.1-r1.ebuild 913 BLAKE2B c979da782d759cec1772d6b6767394503c3e2ce865888d6ac3b96f8e5d5b5c1d9068841c3dcbaa61b1f58e624e7a510711a304b9d6b67d0ef6491ac150bfee6a SHA512 c0dcf732581b9600f027f897e174b4df8060ce3e65b13c5a058bdf8645fe53de4aa24245a1d2971c4ba2b93040008662a9778259c6a32f05d392fcb394ddf671
 MISC metadata.xml 453 BLAKE2B 24b826025af54d17f8773a9583b369eabc3be6265d26d5fed67d562ff5e2abdb6318e8905d1c1173d399587017c35efe68486f1616e3c1ebb08f1283e2c28985 SHA512 de936c361da6f4b1e64374215c3d2502c77c083a7544e77c77d5b7dc8e6570622a218047651845907d26fb60ab972dc00cc70979df42b888c0cd3373f63e2ebb
diff --git a/dev-python/wtforms/wtforms-3.0.1-r1.ebuild b/dev-python/wtforms/wtforms-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..8692bb98c2df
--- /dev/null
+++ b/dev-python/wtforms/wtforms-3.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="WTForms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Flexible forms validation and rendering library for python web development"
+HOMEPAGE="
+	https://wtforms.readthedocs.io/
+	https://github.com/wtforms/wtforms/
+	https://pypi.org/project/WTForms/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	test? (
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/python-email-validator[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/wtforms/wtforms-3.0.1.ebuild b/dev-python/wtforms/wtforms-3.0.1.ebuild
deleted file mode 100644
index d10688438784..000000000000
--- a/dev-python/wtforms/wtforms-3.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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="WTForms"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="https://wtforms.readthedocs.io/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index 3277f4504632..2f593cb1b93b 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
 DIST wurlitzer-3.0.2.tar.gz 9846 BLAKE2B fe3223d1305891b60b9b3c361e05047d227f5682c63a47135b0d3e95bc373918266ec4cc141c947ff68795da12a8ea0c3c9c7e7a6ea31de8af22766b3354bbca SHA512 b0398699a15910511726053d32aa883fba249df9e7de393d645e4ac927d6ee9950fb459d27129d2806e39494245250b23ddf41acd349af514056dba1739cb1c8
-EBUILD wurlitzer-3.0.2.ebuild 473 BLAKE2B 2960ea9ccea6fd094203a218bdbb3a44b460b1328a9ec7583f2d73d2aef72bbeb7e47c42f69a8445e4cb1ab2e1279e7dd8e6f90b818c8d7691a69ccaf9589466 SHA512 c43a89401f61bb4cc8e9b1fcfd2adba3d31e63be205199bb5d0367b8351b89e7ba491778bab3c474c20dae13d1111d8f732629b3d04d3755805244d9798e62b2
-MISC metadata.xml 410 BLAKE2B f4b2bf2a0b40dd3bc003c4f2b8538fda1da58ec272854b16ba14350f4a19d5e775f6bd7a804e4bac5cc9f6d45120a838992e35e263caefc2c34ed57f773c73db SHA512 3460352689742cd8a132c3d5261c7d3bc47ad311fa51343c47d991eee2ef9fc6107767a05c1d628df24ab68c946abdf1a5181c046b104e741d6597937102b2b2
+EBUILD wurlitzer-3.0.2.ebuild 473 BLAKE2B 3eabcc80cd0fa27e3f15e22b02b77d8577ceb4c086354ab013c9edb57acf25163fcf83e477f02de2de9b94774f27351d34486199dc73842dcb7f657fd9250e1d SHA512 94ae7d0a6ad7b9ae9a24ac4efff359cc360cdc8fd48f396c01a604a3e704531d01a08c79afa29b5825e22cf4caa7efcd24190b8486e52ed2cd1f1fc5734f2f36
+MISC metadata.xml 511 BLAKE2B edeba987bc614b3c48f4bb8bc8535ad345b48e2fe4fd9efae19ed6df05c04188ca4a046d821941a7f6bd6284beb7a5c3281b5e9ebe6c3ad325e8707c1120baba SHA512 4e641fff5a9a209bbf65b7170bdc65f94d88d3bc4720ca5e105850671ebb286627c3fc2d90d8a8c25097c50f2be92cb29f1d61f4eb1d482b9baa3a80b79e6e60
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index a1f5b452a608..5fa478a2f8e7 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">wurlitzer</remote-id>
diff --git a/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild b/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
index 57afebf51516..de7ccaf02dbc 100644
--- a/dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-3.0.2.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Capture C-level stdout/stderr in Python"
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 75c975ad1433..3ff7a46a8fdc 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 712 BLAKE2B 9220f9eafbf59aaa59d0d28f8672fc9d50880f454f02e89918945d575bf9bd5ee91b05e9e1a428a80ae1280518b3e8875778ba9c2485e61e7a094834f73452f4 SHA512 46360d6b61d11283badfa437339222670a09e2ca7c3e5ef11baf2f7638c4563d525ebb5603c88d5ca121d2c3a4ebe99df04fdfd582811d3a85ae43c7625b2625
+EBUILD xcffib-0.11.1-r1.ebuild 745 BLAKE2B a0e3c87ace0f3dad3d9759b8ec6ed0c5b288899a13447e031f97be66d744a8101f6d10b0d4995c1559c837664d6662eb3e0f3f992a7bd7d0dff2e91c25222168 SHA512 0790044af8566cad69538bd6c3044b64861b1a2610e40cf0fe3d30c2d2be4998c94fe777ac9cdb6dbc3fc8089d45b2334a80ecf02842f30e030870ffd228e3ca
 MISC metadata.xml 374 BLAKE2B 7f2845d0839dff2568de08f86ce6b8387e76ff450467e14b5c291ad1f55256cb9eff1ff318973e54846ad394b56a3e1e6aa8574fcc0bc39a1c9f7d3b42a1109d SHA512 9403d3d706b5281d6abe2d2fca33b1a70983c7c205f8a5899ad0469fe9a1cd0ceb6c9b27916e1e152467d029d86fc9e6dc28f967bc108499ed901582ad1bbd00
diff --git a/dev-python/xcffib/xcffib-0.11.1-r1.ebuild b/dev-python/xcffib/xcffib-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..1cbeb6eeca07
--- /dev/null
+++ b/dev-python/xcffib/xcffib-0.11.1-r1.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..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
+HOMEPAGE="https://github.com/tych0/xcffib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+DEPEND="x11-libs/libxcb"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]
+	${DEPEND}"
+BDEPEND="
+	test? (
+		x11-base/xorg-server[xvfb]
+		x11-apps/xeyes
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
deleted file mode 100644
index adbe92f9e203..000000000000
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-DESCRIPTION="A drop in replacement for xpyb, an XCB python binding"
-HOMEPAGE="https://github.com/tych0/xcffib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="x11-libs/libxcb"
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]
-	' 'python*')
-	dev-python/six[${PYTHON_USEDEP}]
-	${DEPEND}"
-BDEPEND="
-	test? (
-		x11-base/xorg-server[xvfb]
-		x11-apps/xeyes
-	)"
-
-distutils_enable_tests nose
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 6ef80869df1e..f0b8a1146b35 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,5 +1,3 @@
-DIST xdoctest-0.15.10.gh.tar.gz 191579 BLAKE2B 4836b773c3cf664c825433199b13ab7d3fe2c68538517bf5594797ad3f2f894d0132034fdafbc4502a00ec7393c19473fafe15fcf0257e3565592dc9907e3d71 SHA512 18c1a2774ae9331582610e3459a02f4e4de838218e7250af071570b2318f4c14330084b9fb903d88651fc40a4ba12b686ee6f2ca165edd8155e908ae4992a840
 DIST xdoctest-1.0.0.gh.tar.gz 193294 BLAKE2B 95725757faafd2a15652557e07753ad8c4a8ee57b545169ba29b6e8f0ef5c7a021eff3c092cfe123da91311db98ef7700b29d52b1418a8160869402fb4ecfcab SHA512 8c77fbd8fcd1a3030b33651d35567dd4506ece3aa2c6155223d5cdea6e16510b59bcbd5b9ebb6dc13e20af92c5d07dc205485566b836874e835b18a53cbe7355
-EBUILD xdoctest-0.15.10.ebuild 765 BLAKE2B 76106ed120b3af56642290aa67371e3390daee4881b9d64f4b376a365a3723c57981327108b8e37bf80a2b875ae2981e2f5c4e531e581c9952c000d141fa7aa6 SHA512 226ade6502c30804020c18ac7707105cf0aeee16a0e08382d4dcafaf8590da738880f7e391edf64ea1ed8da7b6affdd1c6c280fad26c978bee0d4d9d97b65805
 EBUILD xdoctest-1.0.0.ebuild 793 BLAKE2B 6bd200b884b62e4f6e378a60e071a6a5689c35e0a0520623e0497a57db4e8ec5acf89afbd93e30a8d5a74f9fe62ef06ed53c028e8b34f668bddae48953b8e6dd SHA512 83c4d2e75cf7e7bd059c3ba50ab24a3c3256efb380c802df97b8bf27f4a675f0485051cba7f53cd00cce808ef124bd79cb2f692def1e523ce40089dfbcb5ee05
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/xdoctest-0.15.10.ebuild b/dev-python/xdoctest/xdoctest-0.15.10.ebuild
deleted file mode 100644
index de12e44c0541..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 0b7af25ba8c0..c7ad50d84f84 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
-EBUILD xlrd-2.0.1-r1.ebuild 635 BLAKE2B eedc9817d3b0f00450cbeb9c545704f791d3b565e095f591854c171bae37f673b6867c17fd60e0ed951b997709da3bf30cc337bf2e0814e399a4713de404b55f SHA512 b0b21e9e3d967388887f92e46859971ab4388e8494d8437b70fed0b6bd1318c749b01c23aca4f687e1b17807adfe86d65250244ef7fab8e64c62b89b891599e6
+EBUILD xlrd-2.0.1-r1.ebuild 667 BLAKE2B c77c90e1714c06d103a65e395bea27b83718281f397d8275157162bf281d9ff2e2604d2be027f0aa9ad2664406a1af472c18b75f59ce8dd8f8349f6d67976e83 SHA512 be5d7049399a88331cd788733e9616dca626628998e0cc3cb7449ff413e7847059119bc61659414eeda4af6e23cb39d249278efcfc8991319538d59d77f83ef6
 MISC metadata.xml 576 BLAKE2B 7146486fa8a2bab5361906374c81a7557837ba2408b34178f1c30c48dcb09a696151b9a4a14c98ae80108bab329215d13fd57695cbe710cf4da0d9fc10fb3030 SHA512 db59cf6c70ffb69390c0f9a7b9682c48ea3b786aa53e7fdd92343efee0c2aaf8791529237fa826cc041eeecf290d95fe69b6ff099b304da945cb62b4e3452832
diff --git a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
index 4ac0074b5408..a00ed2b3d082 100644
--- a/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -12,6 +12,7 @@ DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
 HOMEPAGE="
 	https://www.python-excel.org/
 	https://github.com/python-excel/xlrd/
+	https://pypi.org/project/xlrd/
 "
 SRC_URI="
 	https://github.com/python-excel/xlrd/archive/${PV}.tar.gz
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 7d0e71336183..39ddfad06e50 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,3 @@
 DIST XlsxWriter-RELEASE_3.0.3.tar.gz 35519702 BLAKE2B f4dfa6b286dda94a1a44d8168b8e17f7a37f2f59a23aa3a5ed0efa46b5d8bdcdb831e99a61924e22755c6a921c23f5c540c048152cd07363841ff09a49549c79 SHA512 92a53226aa9ee9f8493fe7171ce752f3a13ef8f3107aecbef896f17022e93bd7dbccb5e619fcbbb3598102030b190d75508d4dacce20b9643eead59a4441f6aa
-EBUILD xlsxwriter-3.0.3.ebuild 633 BLAKE2B 928c42c2d8a497583c2b1e62102d06f6ce68c11894ae40d8c5340c81410620fbb802645803a310bc067438b87d2f23eed119a8f76e05e94b9012e9571fecc83b SHA512 bf9814e74eba56260bae3795685b0f5f2cd0d15c2a0e6cdc5c660665e523688edfdc8d5011d9c4346b5a405d7a73b6a6d1fc9557db2554c026ccde2da7c6ff97
+EBUILD xlsxwriter-3.0.3.ebuild 675 BLAKE2B a0fff006355b3943d8b5193c7815f86897a767e6473a038e630ac4340b2d2ff169e85144f6dc1839fec56163f15928606301bb193d300676d81361f73fadc32a SHA512 4ab779293014b580a8d7602441d706e5a14d4de3db5dae3d8e5d9f6856f3d99239eb66adec86a58669053ce9e695cad2c2a166d4e6b0251942859701ecfe4bca
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
index 1b8cf78574f4..78fe056c1bca 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.3.ebuild
@@ -4,14 +4,17 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 TAG=RELEASE_${PV}
 MY_P=XlsxWriter-${TAG}
 DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+HOMEPAGE="
+	https://github.com/jmcnamara/XlsxWriter/
+	https://pypi.org/project/XlsxWriter/
+"
 SRC_URI="
 	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
 		-> ${MY_P}.tar.gz
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index 3622b1f5301b..51f55f1854d9 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r2.ebuild 740 BLAKE2B a92761f7bb13fe908fb68599de206cf6019b59e5efaeaf537c91804adb882bdf3a52906487655643fe432819aa54a56fca97c9dde50b0d170612263e458f4ea3 SHA512 1bfb83f89313f764476f432cb4346a187200dd477c1e057d3aaae2cab5c6d90fa509aa150443a6b25181bcb77ddba910ffe36ecaf70d4b609e5373fd5635459d
+EBUILD xlwt-1.3.0-r2.ebuild 815 BLAKE2B 2d4bff512a1a28410a3931683841dae6209053f4cc3fc0f08c698ddede2c6a34decfa8abef767ba21537c93b22f6bd599641d922981dfeb82ced3f1872ecf2c4 SHA512 adf240f414f5a9158240159e4758c4ef4de8f8e5e5037e85a1137c353c69ce385e408076ab29c6e18e8dcd16a48c41c6e30bbcafee58bffa60c8bb05de3084cc
 MISC metadata.xml 684 BLAKE2B 7069281bea7b838c27970185e2cd1702da78b66083ec0bae258aaf694d0a6dc73053b4acdc53523341dbead4a8c91fe415cb0a9bdada435e29b7aeb1f1b739cf SHA512 b7daf40465334b500fb65a753f737b41f0b5fcafa58c90fbf693f48dbed8fbc8c6f044ba6af02ffc57303c7ea7aa40182afba75731148450054e700de69d7cde
diff --git a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
index b44e9116c0b8..22ebd92f8225 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r2.ebuild
@@ -4,12 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python library to create spreadsheet files compatible with Excel"
-HOMEPAGE="https://pypi.org/project/xlwt/"
+HOMEPAGE="
+	https://www.python-excel.org/
+	https://github.com/python-excel/xlwt/
+	https://pypi.org/project/xlwt/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -19,7 +23,7 @@ IUSE="examples"
 
 distutils_enable_sphinx docs \
 	dev-python/pkginfo
-distutils_enable_tests nose
+distutils_enable_tests pytest
 
 python_install_all() {
 	if use examples; then
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 23fd79e07a59..88cae0ce6e11 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,7 @@
-DIST xmlschema-1.10.0.tar.gz 396057 BLAKE2B 44facdb16e79ddf16ca798b937c4cf35444f9d31278c26121f179e5055134b82d425cc5b69a8a2e4fdd44388cbd3e96534b55794a267a3b4c0b606752ede533e SHA512 c4358b210cc96e46617cc11b1b7e2a4d69c1bd6489cc73602552b184f209eb90b13eff353741aa7b1dbc3ff8514f90b7bb331ac18ffc466b3ce36f42f7497899
-EBUILD xmlschema-1.10.0.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
+DIST xmlschema-1.11.1.tar.gz 454932 BLAKE2B b80885b7bde87115caece3cdcd036c5ef7cc225acb01ca610c97b2759142a6deb1c29e9fbaf08f60ef4ec80ac4d7dd4b382dd5cd0b74f0f766101664a3cb7fca SHA512 58800377e4bdec70608286057093827fd72bce82117424753a37632c2dbccf2b4e354bfa6e62c3dec06ec98ff262eff258e18c0c6e6af2b5fd520ad11118531c
+DIST xmlschema-1.11.2.tar.gz 476302 BLAKE2B 61d194ae9d269c2bb8231b8ce9068cf0fb0019022abdb24748c4df8ede8821e1c197ea040e07bd267c060944ea1dcd4ada300995287f47e617daf2f923c54abc SHA512 777743e1a0711ceb3aa752b33d65b79e56252284cb911c504751152a86281fba9a39e96271fd8058093c65d69badecdd8e30d836578c9138ff988843fbe9b90c
+DIST xmlschema-1.11.3.tar.gz 477008 BLAKE2B 30e0802e271bf82a1baa8f38317048f4ccda994e2dd04c2fdbf70e4240c2227e821bd416326347d0817b27635dde2c67f446adde2cdf443301046f15ac84175c SHA512 5920573900f0cfc159e3239883aaada18502ac0d33dc7a9aaaf4ab63b41f6d37ba68989aa931e0e2e3e546d335788cb55b1d350d5856d06f12904549cf3cb723
+EBUILD xmlschema-1.11.1.ebuild 832 BLAKE2B 17e3942b555bc419a77695077c676163ecb80be93436724601c3d414d7c530a87e4845384108a6f99a5c8ce8895416aa5173f88979f4bfb771c357c1f2051ab4 SHA512 1b232654938e4bdbc443f080f7cd80793a52ac483ecbdf5540debb15cc16657fedda7845f7d89d0f2ef4a944c4cca9ca8e454710ad4c744f7cab2318e960a46c
+EBUILD xmlschema-1.11.2.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
+EBUILD xmlschema-1.11.3.ebuild 840 BLAKE2B e9d3ec065b1e72a9ad47329591f125f4ed683105f98cee1590d21309a357eb56794c8d9a3efb01af87819beef145aa3cc652d19e14d638bbfaf497a7860149a1 SHA512 d3c02d15745686e2aa0690a530a31eb57e83a3487fd09450fc7ed8cbaa089114bba443077fc3195e5ecc7b3eb7041a8b05b998c39337af71b937e34197cad4d9
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-1.10.0.ebuild b/dev-python/xmlschema/xmlschema-1.11.1.ebuild
index f3be2f731360..f3be2f731360 100644
--- a/dev-python/xmlschema/xmlschema-1.10.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.11.1.ebuild
diff --git a/dev-python/xmlschema/xmlschema-1.11.2.ebuild b/dev-python/xmlschema/xmlschema-1.11.2.ebuild
new file mode 100644
index 000000000000..02ebb8c6be86
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.11.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmlschema/xmlschema-1.11.3.ebuild b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
new file mode 100644
index 000000000000..02ebb8c6be86
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.11.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="
+	https://github.com/sissaschool/xmlschema/
+	https://pypi.org/project/xmlschema/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 170ee0cb4f75..42ce76437559 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,5 +1,3 @@
-DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
 DIST xmltodict-0.13.0.tar.gz 33813 BLAKE2B 54fd4532323d8682e81e8db9ec811c772aa1b772ee5a9fa2debb93030a44a165e282901a445f76c8a477626b151ec9ed210f1e790bd9426b5f071c9a4ad60bdf SHA512 fea256017e9806074f0b1dbece393a6e90cdb045842970015daeef2c035d210b3333196a57635192f889b1d2e570731707f7725e020c678db34f590f8c9ad400
-EBUILD xmltodict-0.12.0-r1.ebuild 526 BLAKE2B d54834107c7270f39cf1c38c7dc8b927fd7b789c2ded71e0f249d85ddd0f218d98c6a7ea2b4d749aed699268bed7c6975c2dbae731182554c2fb5ac4aac467c1 SHA512 7ea3116284da548ee977ecf104c99a81f66a9a46d99101273b848aec5a466e852899f91bc59147956f453ba4a9c67f4fd57c24c16e645e2dc8184237e99ae626
-EBUILD xmltodict-0.13.0.ebuild 535 BLAKE2B b1affae960ffa88fc0190c835fde8f96243beeb1e81138c563e866f2acc9e2b570c2668feae84a957b1699f15af9c75dc29a0645b726d03d3f1b0e868287d061 SHA512 481938156d59718d89e0f0c869a057adeabc6cb6183101442b46eb173df4d9455e1130a2444781fa5ac916f8fe9c17c678e1dd827453713d006cf2fcb486e1e8
-MISC metadata.xml 386 BLAKE2B 96f391df846bd8aae4cdf22e5c2538b46617c619c5586e27abb6d56b9f6d3c58de5cd7f1066dc104ab2d9fd7a05bcf26cb926518cbba0d3beea8052266e6e78d SHA512 ad9d3c8f9ea70359c27e7cef9ab3c583059a1150d8a2b1151855525b5386e363cd41c26790120ac1b446e37654be1a0c242d3d53d7b309ba1cf18697b1a2f0c2
+EBUILD xmltodict-0.13.0-r1.ebuild 562 BLAKE2B e80844317eba1935c583416cf281a8bab148bb027469f433ce8b55fdd965ccd6ac22f24cf69ef1d88ee42eea5ee50f6c12295b491c2cc761cc3bedecdd58a8e8 SHA512 e0b6e4af613c84813d64ac8ddadf9d1f6ad413ef4a782e9f02c0401d072c5845e226c2a16a788c693811313d5372e526c81f7511f15d3782fac63ca8d4409985
+MISC metadata.xml 411 BLAKE2B 2d0ccbedbfc7291b518e636b38ab4c897e5d4b5ab80b3ed46d75f50ad4083166cf9b0837a2253e18d2d1fa6821c7bfb30c1949bd6ca818f3195ba0cead20c849 SHA512 f69f46143c440f39cde7b27206b7c262191e268f2a010faaa97a985c7285b1d0f2164584a7a81281791bfd55f935e5276bd750f2f788be2f9e2b13a91bcf342c
diff --git a/dev-python/xmltodict/metadata.xml b/dev-python/xmltodict/metadata.xml
index 47437dff3e2c..b2ce00bae4b3 100644
--- a/dev-python/xmltodict/metadata.xml
+++ b/dev-python/xmltodict/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">xmltodict</remote-id>
     <remote-id type="github">martinblech/xmltodict</remote-id>
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
deleted file mode 100644
index 9845a926f1c0..000000000000
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.13.0-r1.ebuild
new file mode 100644
index 000000000000..c98631ff11e0
--- /dev/null
+++ b/dev-python/xmltodict/xmltodict-0.13.0-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..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Makes working with XML feel like you are working with JSON"
+HOMEPAGE="https://github.com/martinblech/xmltodict/
+	https://pypi.org/project/xmltodict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmltodict/xmltodict-0.13.0.ebuild b/dev-python/xmltodict/xmltodict-0.13.0.ebuild
deleted file mode 100644
index 14979b23dc33..000000000000
--- a/dev-python/xmltodict/xmltodict-0.13.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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="Makes working with XML feel like you are working with JSON"
-HOMEPAGE="https://github.com/martinblech/xmltodict/
-	https://pypi.org/project/xmltodict/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests nose
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index 021f1963d261..11d25f344fcf 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,3 +1,3 @@
 DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.9.ebuild 508 BLAKE2B 3115adb93d87ad33bda74a5c476a537230538d67d0bbd66df6482b4fa4509f3c7191cb1c7e7859901628dd46884472832fc28029b000149987890279aafa9f9e SHA512 9d5b6814de999d392688d8b143ae0001c3bb53f27f540fb06a46505ac081112b6e3c4df8f428bb20c8db4a525d71081266dc5141b81ba800dc66c312299bac7a
+EBUILD xvfbwrapper-0.2.9.ebuild 508 BLAKE2B 26b970f9bc1d89bfd6bd2e6d62f877996dad740834a0ca1a1f1fa67026c3b6079ab6a42eda6c1d603e5c427615eafadacca6158b564654f5b27ccfa4b04727f1 SHA512 828bec6d01640af9b65b7cbac6b80852d953adb775a4964bd25d247bf8cb9e14be30bbbff77052eebcc22664de18b5cf12816c9e21faf09a939d88fd7ca0f831
 MISC metadata.xml 388 BLAKE2B a0091cb6b81fb47d0ddf6833ac096228e8b300817707efd392a88e165794438392b3e7eea118a9a2329f0396471ab2e4a4423ea43bc9f9269f06247deadbbf56 SHA512 99983bef60e393369b500810ac1aa7046d1011b7d59f94abbc8bfe0dd513fb2c29fb3c3a19ed5566c55d48645f0363a78e5f2a16501de8d1750c15b5763f01cf
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index c49d2aeb70a1..7c5ef54f0f4d 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.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..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xxhash/Manifest b/dev-python/xxhash/Manifest
index 5b6c2588c3d6..0102a6c4e268 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,3 +1,3 @@
 DIST xxhash-3.0.0.tar.gz 74279 BLAKE2B 4c3d68103a7145aa1fd99da955b206c734c7882f1f6f3020d8bce9e5f2eb9714b9168b28918595bbb60445a024ec50d606e387358e6db8f4e575014763dece65 SHA512 170bfbacf0c4f8136550a257328d71dca096d996a52993a54442a7c5a54d48c51bb7997b3a718d73ae6c8e25a672ed4de664e7a651e02c43eb5f3fd135a59a80
-EBUILD xxhash-3.0.0.ebuild 632 BLAKE2B e71110c83b8d03e097514bb78abf48cda76b7cee3c91254b359430bf4e50085e4f1b796bb54c174b8fd41e418c59e2e5c1ec559715eb1532576326d1706ac5af SHA512 373b1469517217360ddcd6a7b01b628443e43cdf4f19a69d314e17f4882f9a3e7159284d63611b283174774595b1725474f16bb6d44275b329726bec919d5858
-MISC metadata.xml 460 BLAKE2B 9be46212c7e4609718cb6e310be55378c6eefe5aef11a508b60abaaefb4341cf88e29a32bbf41dd05999ad1ba3951519bc749730ea7f5c3bbc437d7a9c3a3b25 SHA512 0ca1062c40a5a4e58ae27f9ba05c64c7289475bb126e015d74e1a5faee6c46a15f791e1545806506f28b3d1414d6d84d5c0472d7a99c9feed28bcdcbe97a0eca
+EBUILD xxhash-3.0.0.ebuild 642 BLAKE2B 780e793bd61bc77ca61cde7f81478e4fce42643e27f7d420cd4d231f65a4b3d597a61b585a5649a77c2ecfe71901257e95d5009a04cdba0506cec2fb175218a7 SHA512 3eb9a4d78a37c42fd23d9e605f2a6d039e564f6de7e91b62a09b2fba0c56f5726bfeb476b681a3b6aa9b8ce887992b350ef24657c2280af944c3f0dbbae0173f
+MISC metadata.xml 561 BLAKE2B 80182c778f9e8055e3d9c8a0adf1eea293724fac6706eb76ace27655a6e6ccaf7ab0fe8d4b0dbaf411183ae10da34b0452dc461f12faeb35e06f3253ea5ab48f SHA512 d2bd317bff748d00be51a87bd3cfe93ed3ecd2e758262fea0042cfd3c70051fb72940fde06822fd1ba972b8ce21c33f4a1a5bb5ae14c7c68e25c661e24d7ff68
diff --git a/dev-python/xxhash/metadata.xml b/dev-python/xxhash/metadata.xml
index 85f088ba6e0f..9f0ee86b2317 100644
--- a/dev-python/xxhash/metadata.xml
+++ b/dev-python/xxhash/metadata.xml
@@ -5,6 +5,10 @@
 		<email>3dprint@gentoo.org</email>
 		<name>Gentoo 3D Printer Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/ifduyue/python-xxhash/issues</bugs-to>
 		<remote-id type="pypi">xxhash</remote-id>
diff --git a/dev-python/xxhash/xxhash-3.0.0.ebuild b/dev-python/xxhash/xxhash-3.0.0.ebuild
index 22add56750f2..851eca3965af 100644
--- a/dev-python/xxhash/xxhash-3.0.0.ebuild
+++ b/dev-python/xxhash/xxhash-3.0.0.ebuild
@@ -4,20 +4,27 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python binding for the xxHash library"
-HOMEPAGE="https://github.com/ifduyue/python-xxhash
-	https://pypi.org/project/xxhash/"
+HOMEPAGE="
+	https://github.com/ifduyue/python-xxhash/
+	https://pypi.org/project/xxhash/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
 
-RDEPEND=">=dev-libs/xxhash-0.8.0"
-DEPEND="${RDEPEND}"
+DEPEND="
+	>=dev-libs/xxhash-0.8.0
+"
+RDEPEND="
+	${DEPEND}
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/yamlpath/Manifest b/dev-python/yamlpath/Manifest
index 1b34ff7b3c96..5bb36b5f19db 100644
--- a/dev-python/yamlpath/Manifest
+++ b/dev-python/yamlpath/Manifest
@@ -1,7 +1,3 @@
-DIST yamlpath-3.6.1.tar.gz 214053 BLAKE2B 5c72ffc4e4307f1a3fea7a697782c432402acc1ee929de34a702188d51287fd7187b688354533163b7101dc17ed394f0e2681a1a194807f00762bf6c71387292 SHA512 8ef8e1931118ed881d52b6d7f589b1c671694c211cb1c988e7e6945b7ff5408163bd402f52c1815b453bf8ccc61e8b8ed5c19a00be076d8e76e0a037461a12e2
-DIST yamlpath-3.6.3.gh.tar.gz 214734 BLAKE2B fd36d276831771c81272a2bb60a9fe7995c63f1026143925e34167ee397b56725ec9ba5d5afac2a85121512b8f8da3f988fd022dc2378ee80b91567f15d95c1a SHA512 b6c41b550339809e3a0bcbd7dca190956f06799303c1c12bb68eed567c56ccafd2acc2a8a6ab33fb03abde61b3de25673ee2d459f6d66e6782f9325212653ade
 DIST yamlpath-3.6.4.gh.tar.gz 216016 BLAKE2B fc6537b7c80ecfb9f69c646970e43935374bb105df007c123cf837eb1de6827ac2cc443294b69500c966ea6bc5d7f56498aec13340238c7660118f17cc6685e5 SHA512 eb1ac0d5861818f4f4b57b07f9fa7f758846982abbb3ac4ec58a1adaca8ec36deba1e21ce3e13916e74a946512f4d66e341a9d45392ef7133d0293e5fd6f66c9
-EBUILD yamlpath-3.6.1.ebuild 1364 BLAKE2B 9365a26e0db3098c76da2b803f1f30cc34126622d40c8946646cbba71568153d5639ed759303f08d3771f1c03f8de9390236da9c8bbee24427a94eb85f00d5ed SHA512 f64320f092cd60d8f15978c297b95fe28bdf4895c680865566d4500d537dc34b38abd554e6e662e7e70ba60edd9397ecf2a0fd555a4606b64892652580c1aa34
-EBUILD yamlpath-3.6.3.ebuild 1151 BLAKE2B 9cf93439ae4046e2b1b279804a7c434761048fe54de1142c1544e876cebf998ef1bd45f0b81a7f9cf8126cc68a1a8f97cba0a606ecc27542bd793a60b12583f1 SHA512 868e70308e51d795853c6aff2453626900e21f699f1a167fbe09490d02dc80ee67ef2caf193d2a1ae88dbfcf246796bfefda562d40e04c194ba3667d0bf9863a
 EBUILD yamlpath-3.6.4.ebuild 1151 BLAKE2B 9cf93439ae4046e2b1b279804a7c434761048fe54de1142c1544e876cebf998ef1bd45f0b81a7f9cf8126cc68a1a8f97cba0a606ecc27542bd793a60b12583f1 SHA512 868e70308e51d795853c6aff2453626900e21f699f1a167fbe09490d02dc80ee67ef2caf193d2a1ae88dbfcf246796bfefda562d40e04c194ba3667d0bf9863a
-MISC metadata.xml 563 BLAKE2B 5b63f4324ccc2685c7e11f4a75b105f9e97b860a983ffba37f1ae862082ce4654d0114ecde9fe7dc66e1c8121e607ade520e3f34192d2e85ebd538ff0631f355 SHA512 f50a3f78e2fa6d4f06fb1f52267202781d189942135112b45f17ed620025b87637925d3205f151573fee635b5f7b4d2ef1de5106223cd13d2f8e2963a31d29ac
+MISC metadata.xml 664 BLAKE2B cdf919f6a46dbc7ed8f2546509a623e0e784da711afaade20ec79b2861e8c83f54f755ce68ec2944bd0edb92f2e05b18a9c0ff93430c185574c41de2d789e03d SHA512 8020ca58f464e2aed71c01c29375b95dda238be6cdb94468a0abe50c7ce0270a42d723318f34cb4eb8728184cbe6769c7e666f43cffde37e6e9f42cab4d7292e
diff --git a/dev-python/yamlpath/metadata.xml b/dev-python/yamlpath/metadata.xml
index 2e66798ac25a..b4a77c52d5a4 100644
--- a/dev-python/yamlpath/metadata.xml
+++ b/dev-python/yamlpath/metadata.xml
@@ -11,4 +11,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/yamlpath/yamlpath-3.6.1.ebuild b/dev-python/yamlpath/yamlpath-3.6.1.ebuild
deleted file mode 100644
index fcffedb6f449..000000000000
--- a/dev-python/yamlpath/yamlpath-3.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="https://github.com/wwkimball/yamlpath/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="test"
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	local sed_args
-
-	sed_args=(
-		-e 's|\("ruamel\.yaml\)[^"]*|\1|'
-		-e '/pytest-cov/d'
-		-e '/pytest-console-scripts/d'
-	)
-	sed "${sed_args[@]}" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}" py.test -v tests || die "Tests failed under ${EPYTHON}"
-}
-
-yamlpath_post_src_install() {
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}" || die
-}
-
-src_install() {
-	find "${WORKDIR}" -name tests -print0 | xargs -0 rm -rf || die
-	distutils-r1_src_install
-
-	python_foreach_impl yamlpath_post_src_install
-}
diff --git a/dev-python/yamlpath/yamlpath-3.6.3.ebuild b/dev-python/yamlpath/yamlpath-3.6.3.ebuild
deleted file mode 100644
index caea22ecdf53..000000000000
--- a/dev-python/yamlpath/yamlpath-3.6.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Command-line processors for YAML/JSON/Compatible data"
-HOMEPAGE="https://github.com/wwkimball/yamlpath https://github.com/wwkimball/yamlpath/wiki"
-SRC_URI="
-	https://github.com/wwkimball/yamlpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
-		dev-ruby/hiera-eyaml
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	sed -e '/ruamel\.yaml/d' \
-		-e '/pytest-cov/d' \
-		-e "/find_packages/s/()/(exclude=\['tests'\])/" \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install and optimize yamlpath/patches/aliasstyle.py
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	insinto "${sitedir}/yamlpath"
-	doins -r "${S}/yamlpath/patches"
-	python_optimize "${D}${sitedir}"
-}
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 459a2b5fa7b7..5b5f45c708ae 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,3 +1,3 @@
 DIST yapf-0.32.0.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
-EBUILD yapf-0.32.0.ebuild 599 BLAKE2B 1d567a44e29bc7ebe8b87791b6f9d682538516f010e8bae213d681680564dae398135141884991970d5c73e4642533421a37f2735bae9893dc19bac55912c696 SHA512 884a1e304a7ecf8d3c48bc31050314f55489c658526fb104139fe49c062dd876c3fc9ba80ecac632fc84688dae8aacd883dd7e16d9b378a1ae51ca4a305a78dc
-MISC metadata.xml 758 BLAKE2B 2e4d045cb5089ae9ea63a8b7da05321bfc31c5d6596a46c64e5f773acba2b2ab760f0752574d2b6f29dd6c36003cbb490e719077a17861503be065c1bdc7f410 SHA512 7e34f52c84180a59791281ffb7dcca3522c352a464ab76b7aa1771044b2b49eb1655180ed7c9e3d051ef63286d517f241643fd726388c6885784d1f0791de1fd
+EBUILD yapf-0.32.0.ebuild 599 BLAKE2B fc28b2be312ac549a2de0a119d607f045df2e56e7a380e824267f074965bf5374b066dd93301c45af2ce82647e5ab19d8f4a7782778cb6acc714a9fc04304cce SHA512 392ab53c70accb2adad48b44b1d81651f1cf2b237fd8e8f9984b549790be20c90618e3652bb55c24a7fc2cc84800960e34296e67877443c7f1c9d02abe5d96fc
+MISC metadata.xml 859 BLAKE2B b35769deed68d491ee273b537a7299c75797033667e72972974580e4dfdcdd0091cee2670e8abeca2fcf8bba19dc7329059d58db50a97f66a958d2c11a6a1d80 SHA512 5e4bef85bd64c73b61fa34b51dd5a01e762bc271d0a6716edbe8ee70193171dbcff0aaa5a9b59f9e1f8f8626611b1b1c6ac53f59877bdc6674dbbcac5c0f40ad
diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index f0b7080c8e79..94288e5a8672 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		YAPF is based off of 'clang-format', developed by Daniel Jasper.
 		In essence, the algorithm takes the code and reformats it to the best
diff --git a/dev-python/yapf/yapf-0.32.0.ebuild b/dev-python/yapf/yapf-0.32.0.ebuild
index bb7498981455..e9d4651bb9bb 100644
--- a/dev-python/yapf/yapf-0.32.0.ebuild
+++ b/dev-python/yapf/yapf-0.32.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A formatter for Python files"
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 49dba1ebb624..5aab906888ae 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,4 @@
 AUX yappi-1.2.5-warnings.patch 483 BLAKE2B e084ebde1a6769ace82ed1d1b878f656ffd283678acf474af866f26951231a823a930323c1d7fbdb06c01b4b06b98522ba1bfb427973261627cb9967949d8b8a SHA512 81dde3661720814ca89fb3cd20786601ae7a5362a288c7f9ebbafd4095006b863dfa3c544821b917d9abb8a2532b08d415440a21f19e14e3a67c517064f1ab61
-AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3ed8c7cf0878fab338996d386916db07fd82c4ce2e3eee32889e40a76f63b383b2a3ba4e2de9f7a9fa383cbdf1 SHA512 4f112e61bd3b38aa997b84af581d1926ae0b3078c59ec14979422a182a825a2e6e108c1066a67d7f6cdd4eff9d70b9f46f3e5c66a054b114eef9bd241a214865
-DIST yappi-1.3.3.gh.tar.gz 936700 BLAKE2B 45e974949dfeaf6487dd76ef13a1b7f4456e805e50d85d089a366c5dc4ac852ccc117224ce5f17affa1f1ba1950a86b6f666cbc8e76edf51bf21cf2f527b877f SHA512 5634b8af997a082031ad1ec12eb83498949f1a56be3a324137d118f55ee51758af8c129da30138fa54f165eafed1572fb2289476e6d0cd838a884ee9118fd8da
-EBUILD yappi-1.3.3.ebuild 851 BLAKE2B de825a8be1efdbe55587c7911774955efd9286258f4f1eb37b1c9e6ef6f5345ae84d3b94db26320b57813c80bd703cb10f56f1154ba08e98d5cc5262e419b933 SHA512 b63ef3ecf8e3d558cd55d5e37f6163ae6dfdad0361ead365e00333c79ed9d829905389680d0e135dfe1a95d987b75264c8564a8b05b915e2c5fc0e43fa073a70
+DIST yappi-1.3.5.gh.tar.gz 936884 BLAKE2B a33ea0c506b3e0d05e141b01ebf4af158c6c794c0c504e52c19c00295f105cfff8a6aa8964ce07e13b87cd60164adfd1107da2c286e17dc0d779e7f9e916fbf8 SHA512 2fc243522414626ed6327b3f6b26c4001f01e288700df62cef81e73cf4077af238836b100167df3c4cfb4e0091d4de14385d349b9821759401cc3666e6fe94e9
+EBUILD yappi-1.3.5.ebuild 682 BLAKE2B a9a95f532928e5452a4ff7a7b3f932e2f7fc16883b9c9022006af70eda254c855d8771b6b6d6c1cc0b7fd07ea19fa49902ead1530cea1385f7dd0b4949645154 SHA512 88ab39d551093ce14267f409489d62ba337afb4dc064263faa2dcee4652eb81d61e5b3aeb253d235da5496f176fca70cc980b7c1efa697339bf5e11db1152b4e
 MISC metadata.xml 489 BLAKE2B 243541f7de9fca044073eb0f35d32b751738c9172dc1ef15599eed56c0c8b2e9758d703e555aadfbdd4d1f96def39f88798be495d80fcbb763e0f1e0f3590822 SHA512 2eeeb6c6b73f5077584150d05e9c1d8bef00d0fb83283c6f5804ec31151f3e59d2de91ecd86508a2fc2a61aaab7e82455c633487f64a4c6dcbe5ca9229fe20ed
diff --git a/dev-python/yappi/files/yappi-1.3.0-tests.patch b/dev-python/yappi/files/yappi-1.3.0-tests.patch
deleted file mode 100644
index 866db78fac10..000000000000
--- a/dev-python/yappi/files/yappi-1.3.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/tests/test_functionality.py b/tests/test_functionality.py
---- a/tests/test_functionality.py	2020-04-27 12:57:09.000000000 -0700
-+++ b/tests/test_functionality.py	2020-10-30 18:08:35.619553108 -0700
-@@ -338,7 +338,7 @@
-         fsa = utils.find_stat_by_name(stats, "a")

-         self.assertEqual(fsa.module, os.path.basename(fsa.module))

- 

--    @unittest.skipIf(os.name == "nt", "do not run on Windows")

-+    @unittest.skip("does not like ebuild environment")

-     def test_run_as_script(self):

-         import re

-         p = subprocess.Popen(

diff --git a/dev-python/yappi/yappi-1.3.3.ebuild b/dev-python/yappi/yappi-1.3.3.ebuild
deleted file mode 100644
index 5f43f725efa2..000000000000
--- a/dev-python/yappi/yappi-1.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
-
-# no tags on github, no tests on pypi
-COMMIT_HASH="8bf7a650066f104f59c3cae4a189ec15e7d51c8c"
-
-DESCRIPTION="Yet Another Python Profiler"
-HOMEPAGE="https://pypi.org/project/yappi/ https://github.com/sumerc/yappi"
-SRC_URI="
-	https://github.com/sumerc/yappi/archive/${COMMIT_HASH}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-BDEPEND="test? ( dev-python/gevent[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}/yappi-1.2.5-warnings.patch"
-	"${FILESDIR}/yappi-1.3.0-tests.patch"
-)
-
-python_prepare_all() {
-	cp tests/utils.py "${S}" || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/yappi/yappi-1.3.5.ebuild b/dev-python/yappi/yappi-1.3.5.ebuild
new file mode 100644
index 000000000000..e05f16749821
--- /dev/null
+++ b/dev-python/yappi/yappi-1.3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet Another Python Profiler"
+HOMEPAGE="
+	https://pypi.org/project/yappi/
+	https://github.com/sumerc/yappi/
+"
+SRC_URI="
+	https://github.com/sumerc/yappi/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+
+BDEPEND="
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}/yappi-1.2.5-warnings.patch"
+)
+
+python_test() {
+	local -x PYTHONPATH=tests
+	eunittest
+}
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index a050e18ae662..f7aff95853a8 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,3 +1,3 @@
-DIST yara-python-4.2.0.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
-EBUILD yara-python-4.2.0.ebuild 801 BLAKE2B d3bc9bb4b97035346f9ba9044157e2041c8c6aef42c019fd1e9c96840794d39a60ad65a6a2e15aab7ca1dced6f17c38910633023dfaafca890c26b6c6f13a0e5 SHA512 8704c04cb423c518c454d3128d0fca22aef5b0f1a5481d5bb259e90587801eea38f952eb5624f7434c8894167afaf4d293fba53337e1fc5d3d9bcbec569147ed
+DIST yara-python-4.2.0.gh.tar.gz 34459 BLAKE2B fce460385eaa75dd1779fe49c7937ff36d7604433deb310b6fe9e66af9ea521952f92bee61829372cf19c7efee170329609530f1f9e863991720e4887c3c1349 SHA512 ba08d709fc51679ec9fe36165e0864b79fc241f85c681bf59823fe7bb0e34e928cded050ff296147eb5bcb837485f39949aa93425a0eb9ca8b3730e60fac93f4
+EBUILD yara-python-4.2.0-r2.ebuild 773 BLAKE2B 628b2f73e6c9267383fd174b1cf51b934ce4913a369f4d1b095de44716c3dde86cebcb5144def6c7c06ff474e82aa57d51afa9ba41915907dce8d88d594e783d SHA512 0d379b146930496b2932f319923789d723f00d65586bf0eaa5d51b50a1031522dc4af97b3fa4c26da598c0e8614150cb4ab74e3a79b62b4dfb27ce17471d8a3f
 MISC metadata.xml 735 BLAKE2B 43ee6948356d63c37a63a904c1975c0698c5f5db1cc2087108e060a2a0b071900eb6615b8a7a8cea67589cb2dae17cbdd425d2e518785c45aadf490773fe88fa SHA512 d18530850cca51e764c8b3c1575464eabb23beea351d464358ab243dc463b916ed8a28c8ff958ce82486791575343d9be2083f90ab55aa11d342032d0ec1d3f0
diff --git a/dev-python/yara-python/yara-python-4.2.0-r2.ebuild b/dev-python/yara-python/yara-python-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..c812ebe88b86
--- /dev/null
+++ b/dev-python/yara-python/yara-python-4.2.0-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python interface for a malware identification and classification tool"
+HOMEPAGE="https://github.com/VirusTotal/yara-python"
+SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${PYTHON_DEPS}
+	=app-forensics/yara-$(ver_cut 1-2)*"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+python_configure_all() {
+	cat >> setup.cfg <<-EOF
+	[build_ext]
+	dynamic-linking = True
+	EOF
+}
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yara-python/yara-python-4.2.0.ebuild b/dev-python/yara-python/yara-python-4.2.0.ebuild
deleted file mode 100644
index c9eca9c95ffd..000000000000
--- a/dev-python/yara-python/yara-python-4.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${PYTHON_DEPS}
-	=app-forensics/yara-$(ver_cut 1-2)*"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-src_compile() {
-	compile_python() {
-		distutils-r1_python_compile --dynamic-linking
-	}
-	python_foreach_impl compile_python
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index b7baff6e22a2..f83c99c28f8d 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,3 +1,3 @@
-DIST yarl-1.7.2.tar.gz 168562 BLAKE2B 7da82193e9fa0d317bd4ba46d63ce04a36c95fc3a389d6800d12e0ddecaacb41c07a665db9e731a9112d98a0f3133861b174dc62523da202d0d06f4cb995c354 SHA512 ac5b630dd592ffa8b095e4d7eee2facaeac8ab578e55fd8856c6a6349f514081020c707cd0b33f250c0e78133e92ed6156835660f14c5ae54d60b4fdf6ea50ea
-EBUILD yarl-1.7.2-r1.ebuild 690 BLAKE2B f93b9addda1ad069ce2a3f301e60c6b377d26dd4f04cbb03236256807160c75a5157e6de4490ca7c129936cb9d6eb038b2a9fdb855c3cc423827560e2fc47bf5 SHA512 90012b9dab794efd3d197e25fa339232cc73b81808a69455d61e3ae2e5f3f571cd00604d13d8fbf202e19c58a655732107b4166f90d035c341ab775328501df7
+DIST yarl-1.7.2.gh.tar.gz 108115 BLAKE2B 7bd212b652a77ac29fde4c6565c48c4067f2a24db6bbf735107f3dfa5ee8b6ad2e5a5c3c6206e8dc7692e4cfd5c975d4304dd93280087574bddd73a337417c52 SHA512 bf69c5758f523259757ff84a8737e28931f46311f12f6e141329a5074d34a0cfb45795bf79cb7b78cb676ca7bc38042a2fbd946a5f41bf1d149ada50b88b31ae
+EBUILD yarl-1.7.2-r3.ebuild 910 BLAKE2B 68d8fc7b158dd40cb8dd08f9a2b39544b17ade53772f742ddf951d29dfcb55daee99bada90676a797d8ace257092842d72cd3cb3abfab2fe99203cbf6d4b0a88 SHA512 ecf4dcc5136ed7fa3c2a3c937d61466993cfef4e0408086a253340deabe8f46e9cfe56bfc8cdce8560cf12ba84d9904515ec4d783ed85d49ac04daf7ac01ba2e
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.7.2-r1.ebuild b/dev-python/yarl/yarl-1.7.2-r1.ebuild
deleted file mode 100644
index 6ac973120c06..000000000000
--- a/dev-python/yarl/yarl-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-python_test() {
-	cd tests || die
-	epytest --override-ini=addopts=
-}
diff --git a/dev-python/yarl/yarl-1.7.2-r3.ebuild b/dev-python/yarl/yarl-1.7.2-r3.ebuild
new file mode 100644
index 000000000000..94d7e677756f
--- /dev/null
+++ b/dev-python/yarl/yarl-1.7.2-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+SRC_URI="
+	https://github.com/aio-libs/yarl/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+python_configure() {
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	cd tests || die
+	epytest --override-ini=addopts=
+}
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index cedf061bfe07..385c594c705b 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,3 +1,3 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
-EBUILD yaswfp-0.9.3-r2.ebuild 391 BLAKE2B 53b02e947ff3a6330fd35a79a5a81f7f7ed0689ec5251a3eb9f38471179051323ab1b907c06c107cdf1f88a78c6b96b7e9a59c6804cb54770d61c19919af81e8 SHA512 90c7ba7b90ffe58a4e6d4d665c3950a3ddab671a7f4167a60e2b7c1a213fb6326e678c08b8dec6c6e9927d6bbde3e7cdbfbe7bcb0317ebac5b6f50603cf0ebd4
+EBUILD yaswfp-0.9.3-r2.ebuild 392 BLAKE2B f0aebc7e0b7e7345a504af553f4100e7a8c6af848c286e44d99c08fd2f8233be30c2994222fb77ccf83fd1300425c024ce1bb6667fe84e3d202bd4f0444f53fe SHA512 eb932f37d5bf816741a5c6457d9f2a194b47a1e56a15cc4fbe06fe6600e9f796782ff9d5c4dee45f77e33faf1cfdbe05b6d03fa11506e3d5a27cc033a0786a04
 MISC metadata.xml 484 BLAKE2B 4fa5be54bd2a548f1661c7ddf67dd11ab870896719c0b5abdf3378ee55841b89e5eb3f7a0759a34ca742d8acb5da0cbe7ef143f3c434f532d6f6949df46af7b5 SHA512 a69f339a22e5208dcf557a3d0187ebdbeb24d0c4688377c84b1192398d1e4366ac700ffeec4bdc753dd07f21b60e9952060081e6449b0da4fcc8902919ea031b
diff --git a/dev-python/yaswfp/yaswfp-0.9.3-r2.ebuild b/dev-python/yaswfp/yaswfp-0.9.3-r2.ebuild
index bcf78c26bde8..b3f6b9e3d7df 100644
--- a/dev-python/yaswfp/yaswfp-0.9.3-r2.ebuild
+++ b/dev-python/yaswfp/yaswfp-0.9.3-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/yaxmldiff/Manifest b/dev-python/yaxmldiff/Manifest
new file mode 100644
index 000000000000..88fedfd23a33
--- /dev/null
+++ b/dev-python/yaxmldiff/Manifest
@@ -0,0 +1,3 @@
+DIST yaxmldiff-0.1.0.gh.tar.gz 8938 BLAKE2B 9fd9b9ede1d5c28c7d5a47967748de411dbc56b0191c4bcb7f2ee6270093523172497d470c6b99e87ccf50c8a70310500b103ecc3d28a49046f09c70055564b0 SHA512 3b853edd13a95f92d82f563d784d30df4f2876d0a9bf89ad67b3e53228a908fe32407386c221725b30668ac2b98be98623a2fb6da8e268380ee586b49e5ae78e
+EBUILD yaxmldiff-0.1.0.ebuild 724 BLAKE2B 1751663db22bc18661e56069febf01f051a7b591bf0744c4b13636ec0ed09753d63522f15684cc91c156cf935a13c77ac36fbffa0218893d9a71ae7bf2af9cb1 SHA512 d15e27c0f0dd28cb37c4b7ce2da72a42cd2c5262d148b8ddcf1cd779629446b2f352535c23948f4aa50476aced393941497658e78b6a224bcba3c4e5915b6630
+MISC metadata.xml 322 BLAKE2B d150713c55bd5a505278eab1b3912481dc9450ac4aa0e71b5f91807e967ed342e35763dc3a9dc6edf19ce31b6ce93d94aa6b751e2f88d58d01a30c0e3d6a0ffd SHA512 91346390be609364c482375fbef62e11ea5d1d0b9da9b36c1dd8b0a45f2f01b682c3fcc67035d1e6ac45e6468c6c5b63cd365b672a8adf170ecacc5bdb43fafb
diff --git a/dev-python/yaxmldiff/metadata.xml b/dev-python/yaxmldiff/metadata.xml
new file mode 100644
index 000000000000..a0414b1c10be
--- /dev/null
+++ b/dev-python/yaxmldiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">yaxmldiff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
new file mode 100644
index 000000000000..36841a23fede
--- /dev/null
+++ b/dev-python/yaxmldiff/yaxmldiff-0.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Yet Another XML Differ"
+HOMEPAGE="
+	https://pypi.org/project/yaxmldiff/
+	https://github.com/latk/yaxmldiff.py
+"
+SRC_URI="https://github.com/latk/${PN}.py/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}.py-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+# no tests currently
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i '/license_file/ d' setup.cfg || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/youtube-search-python/Manifest b/dev-python/youtube-search-python/Manifest
index 344403608087..425fdbfe6b14 100644
--- a/dev-python/youtube-search-python/Manifest
+++ b/dev-python/youtube-search-python/Manifest
@@ -1,7 +1,3 @@
-DIST youtube-search-python-1.6.3.tar.gz 115934 BLAKE2B 1151a29da0d66206424a88a2ac3839269f11d970b4a829f9d33ede4ef7ffec39c6762bfe138edd5da9c57308444021be93054c34cbc71e12a031a8d798d94975 SHA512 16d0dfbc95387bb3ccac9224e53ea087cdfa41d1330abd96fc3ad0136af227359fc2d8409a2eca81ae2fe9790efdb86a42e409748ba1a49c595df2629216e331
-DIST youtube-search-python-1.6.4.tar.gz 116117 BLAKE2B 297e171cf72381994ed93804833b49182c5099db8584937258867ec9f9e14c680a5cf4c9f09fe186e1d5405481afb6656dab35f204c09bcf2f77d07de9b4103a SHA512 50109d5704ceabe101b6190a157a656eb3690bc29b95112526fc1363935d14afc142af6c5bf512a38c3938f06db06a50a26f9a13d1601abd0fa224a0cd3b84f5
 DIST youtube-search-python-1.6.5.tar.gz 115469 BLAKE2B 80e3732155113ee6764f370af894c3cf261812dc5ae6d44a1a7f614645a7a85482c4c35736d8319246f3b2e3cb66188908253bfed910700ad6b83d7fd2d9d92f SHA512 1d319401fb6e24064c3235d82680fd6f156bc600155b4d8157cb1b69ae61cffb587d5ac59ea5b5a353657cd3a1275b038dd9af9939da7fe7ac81c7866de10832
-EBUILD youtube-search-python-1.6.3.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
-EBUILD youtube-search-python-1.6.4.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
 EBUILD youtube-search-python-1.6.5.ebuild 535 BLAKE2B 878846d79f99acecef667a7942eec2304f87529f97c7cfe250682ee37add76eeb5ccb2285ca50ec9cef97eb53ef1cb3503a1c38f61d8d8673a61f64d2ea55b43 SHA512 c43886ce2d34f39ae3c41a80d94f1823cc77efd550ece662e5408f1f8804ee1bde59ccfe63c12f4ad30b26fd4e54b710fd2a05eeeb2e41e8f33d78cdea1aff4f
 MISC metadata.xml 502 BLAKE2B 584aca713a2a0a26f8ccf19180a3f4d5b557234af2eb71cb107104bed143434e0320c5a3438000445e5770766ac09ae35a870063c06aa3a8c6d3b560fcc7b000 SHA512 b756db4567df28dd49a214796019f50fec6d5aa9d83fa8d3c9f8268275b0a7420166a0e4b2cafb500a1c87b2551ff0825c1ec5824ebd8fbfe54b8121e34baee7
diff --git a/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild b/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild
deleted file mode 100644
index 923cfa88f17f..000000000000
--- a/dev-python/youtube-search-python/youtube-search-python-1.6.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get YouTube video information using link WITHOUT YouTube Data API v3"
-HOMEPAGE="https://github.com/alexmercerind/youtube-search-python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-	net-misc/yt-dlp[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild b/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild
deleted file mode 100644
index 923cfa88f17f..000000000000
--- a/dev-python/youtube-search-python/youtube-search-python-1.6.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Get YouTube video information using link WITHOUT YouTube Data API v3"
-HOMEPAGE="https://github.com/alexmercerind/youtube-search-python/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-	net-misc/yt-dlp[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index dbf7de8a9673..073be04b8754 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,5 +1,3 @@
-DIST ytmusicapi-0.21.0.tar.gz 48457 BLAKE2B ace8818c2a6859bb17d98fa608ac8cf7a806745741e634f639f4022527021089dc9b0b7bc48c0f999937a4599847a144afcb9f7e5585daa5d7b0ea1d5d12e399 SHA512 c34abbe8ba8d3b92ac162ffc9679ab21ce6c618a349aaeaa6c06b5597a3aed14e9b9f78a6b351ba545729da1c0bd57c2b7f999957bd8e56b0b453c04624bca4b
 DIST ytmusicapi-0.22.0.tar.gz 50474 BLAKE2B cd0d3a0c45a754560cb70b1766888d76a4b4c1b956f0112d761b1ee8663d7ed792c2befc71c5430464daacb19b7bcff48b7e2d079fd5de08db4583a110b4002a SHA512 3286e67e80c5b73e18b7d30040faca76d790b1b4ac45e635d721f5465379d525af89e6f6635353d3849c43d67c8b59a632423d3bee5a24a2e9c993cc009f2286
-EBUILD ytmusicapi-0.21.0.ebuild 535 BLAKE2B a58ef20fb67c130a7b70d53c2c47fc4e92db5526161cd98f7b518d145f6c15489b33759f2e4db135676f960c50b31daf46f1d0a7b0194c15b4fcfd1ea0ef0390 SHA512 d604121b1ed2182763677998afdca3aab24dde4ab0cf4b5c019e652d4aa6e2dfff9bc2000010ed539eaa9185dcf7efbbc4ed4a4950e5813a7f9406ad4f3d477f
 EBUILD ytmusicapi-0.22.0.ebuild 535 BLAKE2B a58ef20fb67c130a7b70d53c2c47fc4e92db5526161cd98f7b518d145f6c15489b33759f2e4db135676f960c50b31daf46f1d0a7b0194c15b4fcfd1ea0ef0390 SHA512 d604121b1ed2182763677998afdca3aab24dde4ab0cf4b5c019e652d4aa6e2dfff9bc2000010ed539eaa9185dcf7efbbc4ed4a4950e5813a7f9406ad4f3d477f
 MISC metadata.xml 457 BLAKE2B d0c47a8419447ae65b9d126c3e57283790e48e97099b08ddd6666c51e3d6452412d7df7caf2c6ca538a34f2de81309cf1e1c9468d932feea51fae9047e8592df SHA512 843a8ef31306802557af79c2f7bffa00c339f1c17600d95cbe55ac12de89cfc07127c4efd57002ae27a2899c5b39d9b704c56c03223734545dd0608def9a4711
diff --git a/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild
deleted file mode 100644
index a7e9f3db10d4..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-0.21.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/"
-SRC_URI="https://github.com/sigma67/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 5c5c53b4d745..9494b55b39bd 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-2.0.ebuild 1020 BLAKE2B 2b150a509369a49a2c4dd40bb64f4868a63f4e93e85020f40583a26ec9083aff5e5a473baf3c5a028d248e45575adb40096a383142485319af366cb3dbb86f6d SHA512 967116fdd5c559eb94730716f13353ccfcaf9fa4903b5e2fc6cb1c08d1d89bf74926c3c910250db915e638664adb33b25b77d3d904dcc913cd2a17878bcc662d
+EBUILD zc-lockfile-2.0-r1.ebuild 1092 BLAKE2B 3c89b077108765df8f8a0fb3361dea6699ee7115cb39096115aa5cab5e03dc940d572d4e510dae627a575e3925dea12fcfdc3f60904d9e1f397b12be15a6dd0f SHA512 7bd0f55c8900d4da3d99792a35b5c107bcf0e38962b0bab9454ed560ecb125ab040648cbbf4d3175c32bc591ad079b2c6e218c08444045138531fd5a9a6182c0
 MISC metadata.xml 424 BLAKE2B 91d244951c549a683899bf54f792936273ff3e444def80249e6baeb9e3dfb810cd35fd822cec023574994dc06ce3168061832b31f489df3e0ee7c8303e80d4c8 SHA512 cb88901bf9146f663211ad373b2cd83ffe35ef7c30b87a13336143e0543f5f2aa38651079f92be17b05edf5f156bf4823cb58b1b69df6282c35a0007356098ea
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0-r1.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0-r1.ebuild
new file mode 100644
index 000000000000..603b85c2ee94
--- /dev/null
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${PN/-/.}-${PV}
+DESCRIPTION="Basic inter-process locks"
+HOMEPAGE="
+	https://github.com/zopefoundation/zc.lockfile/
+	https://pypi.org/project/zc.lockfile/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# rdep is only needed for namespace
+	sed -i -e '/install_requires.*setuptools/d' setup.py || die
+	# use implicit namespace
+	sed -i -e '/namespace_packages/d' setup.py || die
+	# do not install README into site-packages
+	sed -e '/^    include_package_data/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest zc.lockfile.tests -v || die
+}
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
deleted file mode 100644
index ba8a0dc845db..000000000000
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Basic inter-process locks"
-HOMEPAGE="https://pypi.org/project/zc.lockfile/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
-
-BDEPEND="test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests nose
-
-# Prevent incorrect installation of data file
-python_prepare_all() {
-	sed -e '/^    include_package_data/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	python_moduleinto zc
-	python_domodule src/zc/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 044acf4870b6..4f4f96b1be66 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,4 +1,3 @@
 DIST ZConfig-3.6.0.tar.gz 134559 BLAKE2B cf24d055a88c552311e5837b0caba143a9d4122caa0319ad31de89177d521ecb3f8fb7f463618f35410cc25169865103ff5957e9484e347ebd7e1b7cacb20b35 SHA512 a5cca99f324007a14f4738be1c9f7424538d8a13f7171fbfa979ce9273b29679eb18b0e905afc96d38abcf042af222e3e86acad6912b9eb8b71b6c8122c47031
 EBUILD zconfig-3.6.0-r1.ebuild 803 BLAKE2B ad1717fcc2a24fe54a0e2776297c0a4a388a7e04f6c10202a0789f74bb515f9f429dcb4161679b6ebf010741ec6964a74b457c0f077561d36b0ed75aed240cd2 SHA512 0603b3c5708860835887fda03178bf1f1d24fb2a95801180e59bda767b3994444828177cdd76c235af186a3c66619038b602d68079b43d6dc0da961a5f2e7532
-EBUILD zconfig-3.6.0.ebuild 784 BLAKE2B eddd4cd185af57c1dee3215638b406841e0afbf64d8d7331b4aa7bf3a82ea754de1c8d314e8793230a37cf874eb377f7beac3994fddf325503c147b116f253ee SHA512 b57edc502d219e1867a66fc79d24b9c8dad2dd6013bffeb10204023fe6ca161b4274662b81ed73af95aee3d4bf44f3d62771ddb34ab773747bb4d52d8b657eb8
 MISC metadata.xml 1382 BLAKE2B 217d504c7a0eb0298f70194d81723b0dfef3cfd366da12e715ef625f219dea3b29ee230c476c937318c3030912ee5727ae7945f594d088a2fd71aa9f4ccaba81 SHA512 150596d061f8723bcbff7ee7bb67c485a27baa91cce4b505283d7c0d53a59ac0a034d22333e9a4ab98cb1eae076bafce28dd7d24df1b89c2bbcc5cd844db8518
diff --git a/dev-python/zconfig/zconfig-3.6.0.ebuild b/dev-python/zconfig/zconfig-3.6.0.ebuild
deleted file mode 100644
index a0c3b599938d..000000000000
--- a/dev-python/zconfig/zconfig-3.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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_P="ZConfig-${PV}"
-
-DESCRIPTION="Configuration library supporting a hierarchical schema-driven configuration model"
-HOMEPAGE="https://pypi.org/project/ZConfig/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/ZConfig/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/manuel[${PYTHON_USEDEP}]
-		dev-python/zope-exceptions[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests unittest
-distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 19d3eed32856..22ad29943997 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,5 @@
-DIST python-zeroconf-0.38.4.gh.tar.gz 133770 BLAKE2B 2b7b01112957ed9456acd7ef842a010d38b2a6e589b1714ed3fd47d2b51f448bf716bdd8511b0a3f4560cdcf0cc16bad06ac73f9a42b5c5cf4154b48cafdf97b SHA512 6b0df6fed453dab2e554d4af4d807eed1108fe50fdcc41096a11944577ee8cfa0a0b30491a1ebe6d95ddc5b78c3c0cb07bd34ef279fbfca70775628667f40212
-DIST python-zeroconf-0.38.5.gh.tar.gz 134146 BLAKE2B d1ad69e8fe9f236c95862e1e415c5739a5627ed6d96b71f7af418e1f5cc9ca9c57feac34fa18d3928bdc6cf54c7d28dd30c9f259038e018746ad6a3671101225 SHA512 68ee397b567795f55e9374906761682e404ee0428b8b104c3dfedac473bbda780c086d50b598be9940a9b14e58642960dc29280036d3ff8e3fb76660806e0f54
 DIST python-zeroconf-0.38.6.gh.tar.gz 134795 BLAKE2B 839d59d7c46d9ab16145e37bb58acc7a71072b00507ee0ae8325fea9a3ebc0e567f9e257937675f8eaf44095c7449f96e6bc42b82d34f75a39cc87fd29be2766 SHA512 274db525751191b0188a4f00505c795420f975de3f714f84f2207271ff484bb5de1c881c0ed00b1ad3a6265d5d461519cf46041ab907026d9e6937844bbab6af
-EBUILD zeroconf-0.38.4.ebuild 1191 BLAKE2B 4ca78e9ce862079cf574933de24a22f692f90b71e1b377a137c108a289b418a77e794eddfe4c8ddb19a1e58346f03ad833116091fce9a773784889d5454b763a SHA512 1b02d8deba87834c152222c58d19f7c46bb3ada77cd2da974735bdfb227037cee6193c3528decd5fc3c1fe401f2c2316cafc21cb037266788c90a467ef2ecf35
-EBUILD zeroconf-0.38.5.ebuild 1211 BLAKE2B ce5af78b00dcc07ab807cc9948d98235f935df364137b69fca3517355d70bfb472be65b5cd367b420952d61a2ba17851d5a0722b7abf0aa8c186ff38a96580a9 SHA512 2c0ce2e58978ca410bb82814b225347031c75da51a918c22addf0b00f8c6d04fab001488364cdb61513c135014bf62ad4474bb0b9b32f686a7c5979b9ed903fe
-EBUILD zeroconf-0.38.6.ebuild 1367 BLAKE2B 0e9b3c433f753ef3ab8b78e59073f845ee99a735c3b759a4c7b390b544dc9ec37dd1021214220fdef0e4b4d5c2ed123f4cad73379c947a58c0aae0a94782d685 SHA512 341c442dd65546432f2bba1030fc210e4ba7f471c873490ee9f5cb4f4f45b18e00db0478e94d0e0f3b6ab0f27b6d0f518233ab67d9f320e5d02f5879be134bca
+DIST python-zeroconf-0.38.7.gh.tar.gz 134866 BLAKE2B 060ffdc45d4ec8092cd278b99a74561fd1ea06aba3cdecadbd35c1c5e3f608befe3ced18009d8d64c5b37388ee57900b4b00a44c90d87923f259e798da5bb962 SHA512 a0ab90f30b843bc889daf95eab6d806a5e3fb4ffe5e3857c435f14a85de7b659b8386159f6428f05a34f2e3010f4582f7d3a55bbd6e6ede0008247821f666707
+EBUILD zeroconf-0.38.6.ebuild 1365 BLAKE2B 0d2b743e81200bb4a3a2cf7053fd572ac6cfa1cdd8a32cca98ed0d2338a264a2d02782c8352746e5041aba9d518755e018277eabc3e33bf9302f826f03acc3ff SHA512 d8f8fdb6f2bca9dea6b2a1901e9cc84575222b1585e8c0eb1339cd413cf303e95487592582fb8a27cc982a015ef40e8886a02d6120c1c828a042081d828be7bc
+EBUILD zeroconf-0.38.7.ebuild 1367 BLAKE2B f9a582d3632ec0ed395de8c7413b3df552f770489683fbccba02a97d33ee1432e90a15baaf85c98b0321cbdfbc20a636c8525a7aa59feb08e57359b72b77b34a SHA512 642de855934c35c1a60d430679b2293cb7652cbcd2267c2f682bdc66ed595a9e1bef30f68e5ce07808afa59d3ea3d960cb1d4a9206df49a2b86bad0c7df7e729
 MISC metadata.xml 413 BLAKE2B f93eceda07029400d2fd7ab38f234e5a1747e3d86f228adc973bbd6cdc71456778a7d926457f976cb2c6f55678b2c671d2415e5c7a480306582f1e70f6f733dc SHA512 d228e198b2f495dd02cd3d9d948aae123461c70c8e0185a47b133000f0316a84ff33d9b6f4cc0196bca5cf638e53ae58a3cd746338c33729d957a1170a5f08dd
diff --git a/dev-python/zeroconf/zeroconf-0.38.4.ebuild b/dev-python/zeroconf/zeroconf-0.38.4.ebuild
deleted file mode 100644
index 440d8f1d868d..000000000000
--- a/dev-python/zeroconf/zeroconf-0.38.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	tests/utils/test_asyncio.py::test_run_coro_with_timeout
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-)
diff --git a/dev-python/zeroconf/zeroconf-0.38.5.ebuild b/dev-python/zeroconf/zeroconf-0.38.5.ebuild
deleted file mode 100644
index a8279caef7c4..000000000000
--- a/dev-python/zeroconf/zeroconf-0.38.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P=python-zeroconf-${PV}
-DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="
-	https://github.com/jstasiak/python-zeroconf/
-	https://pypi.org/project/zeroconf/
-"
-SRC_URI="
-	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# network
-	tests/test_core.py::Framework::test_close_multiple_times
-	tests/test_core.py::Framework::test_launch_and_close
-	tests/test_core.py::Framework::test_launch_and_close_context_manager
-	tests/test_core.py::Framework::test_launch_and_close_v4_v6
-	tests/test_core.py::Framework::test_launch_and_close_v6_only
-	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
-)
diff --git a/dev-python/zeroconf/zeroconf-0.38.6.ebuild b/dev-python/zeroconf/zeroconf-0.38.6.ebuild
index 3a0da3f79c8e..51704d814c2d 100644
--- a/dev-python/zeroconf/zeroconf-0.38.6.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.38.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zeroconf/zeroconf-0.38.7.ebuild b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
new file mode 100644
index 000000000000..5fbfc422a51f
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.38.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# network
+	tests/test_core.py::Framework::test_close_multiple_times
+	tests/test_core.py::Framework::test_launch_and_close
+	tests/test_core.py::Framework::test_launch_and_close_context_manager
+	tests/test_core.py::Framework::test_launch_and_close_v4_v6
+	tests/test_core.py::Framework::test_launch_and_close_v6_only
+	tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+
+	# fragile to timeouts (?)
+	tests/services/test_browser.py::test_service_browser_expire_callbacks
+	tests/utils/test_asyncio.py::test_run_coro_with_timeout
+)
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index b851179c7945..d0268512955d 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,3 +1,3 @@
 DIST zipp-3.8.0.tar.gz 13344 BLAKE2B 0da3ca4ff683ac840759030b6ee5125bb1a1b1b8737f0ff0499f3193d13dc3163c6c1fd29c5f1667f347728c991930e3d9e3a325ffb89b6fecb9f6590887bcaa SHA512 d677f941dc92a784b8bd197ca2e1f6f3a570dc236c9eeddcb6108d6f55ad3d35a82462abeeb4bac6ea434442737aea960d941c2a7d0bd416da9abee153c99bb8
-EBUILD zipp-3.8.0.ebuild 1539 BLAKE2B ffed5a1829cf1186e2e3f0fd447c906e9979a26817c07851a465502dee4ab3e73611e8d37f820d673dce975f7372cd59deb8583a656e123df904bab9d838d055 SHA512 48ea61eccbc3ca25d0c9f0fb802bcdb43ff22055586fb27e7ec2af9e14acbe988aa05620ead01f8036f21843feb832f519b1521782367483b2bca05f478753e8
+EBUILD zipp-3.8.0.ebuild 1438 BLAKE2B d6857903252a23d0d802fc48c13dc5392feaaebf46f754ef1ce8ab608c3ad999feddce0338bc03aacfe9f19598f22062efb2e43ccaf50cb1e6554f59b37998f3 SHA512 a078ba1974f2339ca3e79f879bfd641f4b09a07fb83dea1a10bd24a63d51d9861d03a2d53d4c516dfb421d9dbecd82edfeccd0f900088dabfe6000e29195d8ad
 MISC metadata.xml 548 BLAKE2B 0bcd7b95c50e9e14ada6f3f02145bec64ee365beacf3447659276c1a5454355714f83fd2dc81a035a56d11ba1eb989f32bc0209a540b28fb72c3126d4d45a5fa SHA512 f214f6711b3197a44ec5c03b418aab3c9b907e0b3a297cb1c4e2ac3a499acefeb4de411443495db9678cbfd75460f89c9c40a57fc1bc404acbab844223a129d2
diff --git a/dev-python/zipp/zipp-3.8.0.ebuild b/dev-python/zipp/zipp-3.8.0.ebuild
index 2d971df8ff38..893e60caacaf 100644
--- a/dev-python/zipp/zipp-3.8.0.ebuild
+++ b/dev-python/zipp/zipp-3.8.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=7
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
@@ -23,9 +23,6 @@ BDEPEND="
 	)
 "
 
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index a1cc605bea7f..996e0a6125ec 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 DIST zope.component-5.0.1.tar.gz 91130 BLAKE2B 4dbd78b003ba3688c0468573f4552c87333fd5fb7e0cd89d4844633f28c19443b3ea884438ff7f7ba8b056790f008c246c1e7ad52403d7b72b146d0d53edd8ad SHA512 fad011816fe5bb869bb2e43e11a66841a6be2abf9002e41207ef1dfe69b1afb5ca486d275daeddf71d2a0e79e1a9c839c4735190dddcd118b675a976bde07a64
 EBUILD zope-component-4.4.1-r2.ebuild 1224 BLAKE2B b9e1b8010bcdaf9c0ef54751c812439887fa86649af66065cb6f51f6710f1c9b8c100c55a72318e1a31a3a28621bbfad7454311caafae5a3e19f5a332f7b61b7 SHA512 73a3b1173a18d61ada6dc728ba4f8755c4b4fc0de97f6ad5b5047fcc834ba564041038127e6687a4ca1c437d2ae84d3a4229e81b4d2a9448a0a9beb3f1af415f
-EBUILD zope-component-5.0.1.ebuild 1262 BLAKE2B 7e475e088c1955e597317b7d1dce3d3b49b64327b8bc4f0228b75f4ce7569d56ad10b2b359f1483e523cbd2903f72c15e4745b42fb1de5d35e2b7f48d4da54b3 SHA512 9e6c208c59ed7ef6cbcf467e55d09390aef9424575e133795c9644aa7bb98b6db8bf61bab6293fc87a3da4ef952d24ee1232647c45999f61f69720a2d88aaa6f
+EBUILD zope-component-5.0.1.ebuild 1277 BLAKE2B 256e34c44d0b53c8a4ff9c2df35ad090f6f33d34eb126260ee9c1be3e1a32db3443b7aea10a2ae18c49cdd3a2fb644eb9cf46e57ef09a5a91d971266549f8546 SHA512 0aa0222b285db04d71a98c1ca34e2d8d6b343278eecc32a65ab9dd62a16e4726481da8efccbe9ba6e817c64ad4ad88eeb7440c7278a911cb4c69880bf1ad6b44
 MISC metadata.xml 411 BLAKE2B a02a8232c9878cc8c569bf818b81e1b0c2d3cd5e18386f14d8fa228a12c9745a68644e362189ccca52673ca6071f196ebd4603d6f12d6de7839e732f63e4d2ef SHA512 ce4f88684c8c16affe79487c03e5ff4d06fa26c27dc6dc4ffebae514bf498b1f794fbe86f038ea342f08e6ec62eb3722ed118134bca27b0110ef43b155c4cadf
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
index aea2e49928de..345dcc41784e 100644
--- a/dev-python/zope-component/zope-component-5.0.1.ebuild
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-deprecation/Manifest b/dev-python/zope-deprecation/Manifest
index a840494b4a9a..d072daf1b86d 100644
--- a/dev-python/zope-deprecation/Manifest
+++ b/dev-python/zope-deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST zope.deprecation-4.4.0.tar.gz 24737 BLAKE2B 993959f47e7808ad9d024d5df9d141cdbce3a1a3c281acc0d90bdb20747743936411714b52a29fcac6968cea50d5ab54820954f74c3f59081ce98f097715b9a3 SHA512 62371dc45fad6715f24cdcac1d25b559ed5248da774b5ecd215fb4d0b6fc0ab655bfb9e0fbceda964e8ffb7d70536e43f8fcf09d9f2742904717a6473869fa4a
-EBUILD zope-deprecation-4.4.0-r2.ebuild 947 BLAKE2B 2fc43897d209e2137eafcb70cb2f6d68b837f81e201684869e0020f108a15ea6b9e97c62fe1043967216d3e3b4f50b13ce741b713762542a64ea7adb102f37e0 SHA512 13e657a95747f5276cfa6677d7deb22bf0364fc81d3bd5477f7ed743bcd5cc1df695eeb1e5cd290747a5049ed1c4b886d2bfede3b65a3964876207b33b71888a
+EBUILD zope-deprecation-4.4.0-r2.ebuild 947 BLAKE2B 1023e54d66a9d864088ecf9122d34134815bc2b7cc613d843287beeac31049c35890d0b6565974351fb1f3f0b40cf225039bfd76bffa8f5410dac5fcd12ea350 SHA512 bc9edc30466c6b925686d112d0f523a3f349fc736fc6463cf23c78f1b4f405872525365b5e64243d0e2b33e9452d851207ad97bcdf72541602c5e91c458494d1
 MISC metadata.xml 393 BLAKE2B 3a9283473a2a27feff409049cf8efa86ccb89585e74d73afd0bc2ec21f4b4801b2e331ade960885a7d23c50bea831b91b1a6a232687e005614bdb5e24d371919 SHA512 a196fce434c1df3bf4184c115425f698d15f8aee6eeabba64a2277247f6e731c87a2411702d415f127a1237ea2de0a2a25895b09e989d7b38a68816132b6131e
diff --git a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
index 64c907c487d0..5c779791734f 100644
--- a/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
+++ b/dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 891924a10e36..758f33710a96 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,3 +1,3 @@
 DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
-EBUILD zope-hookable-5.1.0.ebuild 958 BLAKE2B 31d3b9ef39333ef6906530929216e062da8249392658b44df1559d6dc831477b8314e84d1c78f61086febabfa8f5c1ffb6772ca1a8ef9f682dfddcc96c7181db SHA512 8c6003a73c1bbfe46382d27147e7f00d5795561c910005d78e7cba607418a6a6b339e2a0c0a991ca505d5f6a5b53f7c34469577112ff1a134ecd047b72791155
+EBUILD zope-hookable-5.1.0.ebuild 973 BLAKE2B d1325d1ae489dd9c7c9f757eab994cf01a2bfcde734b841b5cb771d7970eb5086fd3144786ecd8db19a667ce54700acbccd4859369bbd279b08d8287eda2ec1b SHA512 13b12baf36909a19225011ffbea033a4de5fa4176649c41dfcbb57acd9dc38dc7083538e40bbe11def7051c3bd3b983c3287834029d46aea5d7a72c8d60e28dd
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
index 8a77b13c2b81..6907af03c507 100644
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/zope-i18nmessageid/Manifest b/dev-python/zope-i18nmessageid/Manifest
index a25562e0573b..3b22400a1f56 100644
--- a/dev-python/zope-i18nmessageid/Manifest
+++ b/dev-python/zope-i18nmessageid/Manifest
@@ -1,3 +1,3 @@
 DIST zope.i18nmessageid-5.0.1.tar.gz 28217 BLAKE2B 67e31a18daa8c2d5ccc16b173d37188fc6154cc75b1fd7cd908d6ee3ebeca0092316546587103f01aa6b39d074aaa207bec86401c4d50f664efba179191c9719 SHA512 31af16581d59ce1b7d5d8fd86c715c56b84aee9a7a0756bb2b7ceac6db30903acc5fdff85d844c0250c0a112cb45ab03be2f56d3d4ca6165272ff76c09d40d8c
-EBUILD zope-i18nmessageid-5.0.1-r2.ebuild 1045 BLAKE2B 18b3dc5e98a38dae8a5bd806add2dcd5d4c61f10be83a13dec53d756f4c2e3e4dc6e67cfc2eb2e127a4140fc1f8fdd7a4e4de40468631f6e717731b73a5931fd SHA512 123edb5fd0bd5ed0f35a156458961ff637f42dfa1a36dda487f44f6320b04ecb1023f80d0e1a29b9dd58bd677a2706927b1842ade52a49edca1d542dc97c1d81
+EBUILD zope-i18nmessageid-5.0.1-r2.ebuild 1045 BLAKE2B 141a258330eb1a5e8d3df595149cce4d00284dd7bd13c4bdda0953e534c682854ea09d25add4dd931119f4e6cf39653e30479ae2abeb72264d3cf316a09aa9dd SHA512 f0bef6e95c94d453f9f2e27b59e2bd4e7e4bbebf844c6d1a4095381cb1486b15004942efa386a32c949df3eff27feabad5be6f45d479339d51ac154df831a630
 MISC metadata.xml 488 BLAKE2B 2b413d726016bdcf199974f77972d7800a4d5f169463d9587f9d0563ee94f8f0cdafb9c384c387b7bf9c2f1814807a8ab32fae796275bc51d624133788df44c8 SHA512 3459883a636540739ecea197d7ebd1429dd6e8fb20d0df2337691e1742995edf50dd0fee6340695b6dc493d0d5fd7ea8d3f55277172cd7385df0b057f376fdbb
diff --git a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
index cbb4c9fa189c..a598245d5c23 100644
--- a/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
+++ b/dev-python/zope-i18nmessageid/zope-i18nmessageid-5.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zope-schema/Manifest b/dev-python/zope-schema/Manifest
index 15f0d609238c..891102d076b6 100644
--- a/dev-python/zope-schema/Manifest
+++ b/dev-python/zope-schema/Manifest
@@ -1,3 +1,3 @@
 DIST zope.schema-6.2.0.tar.gz 104068 BLAKE2B 10d300b925f57a028b40bbcdfd7b0eb330815b63c86d6ded60fb594d549b1459cb67a99bd19e6d1782104a8bab204d8033ce422b5f9ebddb00e2fdfc1ab7d529 SHA512 f3083e4fc1dc54160c38cf7033519f9f37fef3e39f2f15b53fc4475d0989932448a018d77f8562870f4df85c5bf35bc756aec97868cd35ca07b733cf5796f00f
-EBUILD zope-schema-6.2.0-r2.ebuild 1165 BLAKE2B 5cc07b632fb4bb40db46a25b1b1018e626fc90c7282e4b0c1345de7e2fb23b231bf88a059f77ff033e2eb287a464c26d560477a09b2fe472ba90d998261579ae SHA512 65cb4379dfce0fe76b6e3370408314120c23ad4a1bb64c213c8f1c07c041c9d6bb02ed0bf1194bf4f17ba7bde9f582b578c9c348a54f746ba3f7b78a5f88bf72
+EBUILD zope-schema-6.2.0-r2.ebuild 1165 BLAKE2B b8668eb96c657b600d555bf0e8d2f1b89e3604013290d286881fc26adb653a17394b6ca5c573a0171ce553bcff756f91c0ae21bee9d210d77e0facd37a124ab3 SHA512 9a4aacceb011b05c5972b985ff8d15b08090b11de8396ab62548458850464926977ac934f69b7bd65c374ef5f35cb90d2f605de375be860811e93aa6a8d12aa0
 MISC metadata.xml 498 BLAKE2B d5386b7a400de71c5c02d2b9788682d35dd34eaa6a132aea45432aa2d53ec47e54fee9f880cf6cc5abd8184e28cef0795fe2f58dfd47f619b4120ce914bd7c45 SHA512 5a8021ec0348af5929d3284f172f5b5fb26007df9064f5571a0cdb07c1259c24b9b352eb048811f5e4f68ab75b9fabeba49c93a0cdd6e8655b509a248447b794
diff --git a/dev-python/zope-schema/zope-schema-6.2.0-r2.ebuild b/dev-python/zope-schema/zope-schema-6.2.0-r2.ebuild
index e43531a8e91f..27ac8e5cd6eb 100644
--- a/dev-python/zope-schema/zope-schema-6.2.0-r2.ebuild
+++ b/dev-python/zope-schema/zope-schema-6.2.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 48c881c62c7a..dce816b1dea7 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,3 +1,5 @@
+DIST python-zstandard-0.18.0.gh.tar.gz 678765 BLAKE2B 7a297e76d65c6f5adbb87cc615f474d58c66bc9ee4050eb10277b596f7efda9109de815188b6efe55beb7aa637ec4779359a573c87094661ae28a080c9619576 SHA512 d573da893e3a372143271c7d9dec15cd4e9dd7355d2069e283df8b3feadbf999dddcc0aa37a2831a370526b2b045497f46326dcf13d3680dd8ee624bca1e7666
 DIST zstandard-0.17.0.tar.gz 629456 BLAKE2B 2b19c017b6255eaa22037e633f1f1dea1322c21dda3f1129e9593c5782b6cf3dbba12003711f6192bfa474a918cbf1eae2b5dd21fbf78731b8dfc62e69a27048 SHA512 312aa02c7309fac64cf70ca901942118d4b3f12f27d20cc18dcaba5ce155ad81ea8d7657501a33a5fb6cdc8bcca11f91141ea9d6c3fc09c28a84d698b9050391
-EBUILD zstandard-0.17.0.ebuild 1177 BLAKE2B e4fa6fb7020231148ecc9f5b01a24c00b72320b1c53adba141365ecc92388d877c473f7812d155db637c3049481f99e9f93cdf9b7bcc7bc99a907f4164be3f9e SHA512 a455965caadd81b368f1c3cad8827e01b0cc323c18fda910c02eec5c41844fd0a0ea9a96635a95a13cb4088d21614a2dd203860fcb716a5cedc9fa38dc4cb68e
+EBUILD zstandard-0.17.0-r1.ebuild 1289 BLAKE2B 87e499d2f68d68d1a849fc68141b7d668e06fede1e08274fece25fde25cf5d432080e5fab45b8691e6757aad5107aa0bbc351673f74b59b0a7e3859610027c95 SHA512 71bfd3942fc904e2818b8614588cf891f4735cec1942a239d2ca64be48a42263eee8b06cf80a8cebd0a766495f266701b8aaf1ffb08da685e5ef453fccff0c80
+EBUILD zstandard-0.18.0.ebuild 1616 BLAKE2B 6d1f0fb63b3aa7a66feacd5f53a9935f6c6af57e1b1179aa222a9cc990081cb53d3f74b0e35ab9553100af423f438ba675f42b2fabab6c1a4f03d41d4f57d2ee SHA512 84c3c467577767193da1fd6f952a9b58f4fc713e8976ad2814be0abbd9e66fa2d0f1f488500c79da0e2f964e858cf723d78a125267776af029f545dd7e98221e
 MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/zstandard-0.17.0-r1.ebuild b/dev-python/zstandard/zstandard-0.17.0-r1.ebuild
new file mode 100644
index 000000000000..a0df0997b930
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.17.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="
+	https://github.com/indygreg/python-zstandard/
+	https://pypi.org/project/zstandard/
+"
+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 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
+
+	distutils-r1_src_prepare
+
+	DISTUTILS_ARGS=(
+		--no-c-backend
+		--system-zstd
+	)
+}
+
+src_test() {
+	rm -r zstandard || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/zstandard/zstandard-0.17.0.ebuild b/dev-python/zstandard/zstandard-0.17.0.ebuild
deleted file mode 100644
index 17b3938e7fb1..000000000000
--- a/dev-python/zstandard/zstandard-0.17.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
-	app-arch/zstd:="
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]' 'python*')
-"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unreliable, fails on x86
-	sed -e 's:test_estimated_compression_context_size:_&:' \
-		-i tests/test_data_structures.py || die
-
-	distutils-r1_src_prepare
-
-	DISTUTILS_ARGS=(
-		--no-c-backend
-		--system-zstd
-	)
-}
diff --git a/dev-python/zstandard/zstandard-0.18.0.ebuild b/dev-python/zstandard/zstandard-0.18.0.ebuild
new file mode 100644
index 000000000000..24b3d7e8d9f0
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.18.0.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_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-zstandard-${PV}
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="
+	https://github.com/indygreg/python-zstandard/
+	https://pypi.org/project/zstandard/
+"
+SRC_URI="
+	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# the C backend is repeatedly broken, so force CFFI instead
+	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
+		-i zstandard/__init__.py || die
+	# unreliable, fails on x86
+	sed -e 's:test_estimated_compression_context_size:_&:' \
+		-i tests/test_data_structures.py || die
+	# unbundle zstd
+	: > zstd/zstdlib.c || die
+	# it does random preprocessing on that, so we can't use #include
+	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
+	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
+
+	distutils-r1_src_prepare
+
+	DISTUTILS_ARGS=(
+		--no-c-backend
+	)
+}
+
+src_test() {
+	rm -r zstandard || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index cd8b06c23ebb..0746b82ccd8a 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,11 +1,3 @@
-DIST zstd-1.5.1.0.tar.gz 604039 BLAKE2B 5f3e2f2848d67d2455bab721d011946fa8138729566243046e2b294e51c1144a0a0576f9e64e15472c8da4b45514a052a751b2ac3d87f17301ab634f560bf19a SHA512 4775f9db3b924116272060fd46885a601ec5153b350974ef5fe41878f10aad0fee428f053ce71aaf881eb73bfc11ae1d89148f65447fc6febe3f53a50ffa0a63
-DIST zstd-1.5.2.0.tar.gz 605453 BLAKE2B 1564bf6f5d37ca5c55a161373f10ff99ffc942abf3d177bf15943570bc30367f0d6aee88cbfd28f1a57483945e0d3de5fde0dfc78bc2b0066faef12de2684fbd SHA512 99df709b889732dc5d6e682e79c52731b918458ccf720431a6afc757dd4cd58bd3ffe1ad45158d28a87d7baaa883fd074cb94717e023ee80eef1561d651504e1
-DIST zstd-1.5.2.2.tar.gz 605458 BLAKE2B b302edd73d303dffe66564217b03c4477e2679788ab58782bd620ae8e5e0410da3c672715622ad5cff1bfd24835bfe61255b1df4ba7c6d452c08dee42d45a1e0 SHA512 fc5d60db491adefbf9af5d46600701075418986ffe5042d74eae75e2d1ec3347141dea3bf0a384f87ffbf833be398157f9b3d7277e6a30994b1287b14b6a2d21
-DIST zstd-1.5.2.4.tar.gz 606443 BLAKE2B fcde9a6cf7195fa9ab50ae93c5401a2d92bafa3f1a8f960ad30f107cf8b63c8b7c8c78bf74bba21d33163df311dcff9d405ad4fb15c7b6ef3e6aeb3596236f14 SHA512 387055d86998c0eca22c8037e2c2e6a85b5e82e5adae3a5bc67f84c4f808b9493817fbc5c94929776a400cff1b7859302db1bd128418ab22e6c0c0f9276e2ff4
 DIST zstd-1.5.2.5.tar.gz 606492 BLAKE2B 072f3e3c89f7e2c372bf020bcb3766ed264c26c0bdba424feb70753ffcf4232eecfcce96a389296c01c961408c05008373d65d9ac790f3b82e3567aa3c6c806f SHA512 8b1e79ff00c8dbf71994c4a9af4e88e749d11c101137c31013d7678aeb9c9a9b7cfa04989e0a68be32a4c4ae56907711541025233078b82fb313bfdb056cb150
-EBUILD zstd-1.5.1.0-r1.ebuild 704 BLAKE2B 38252eaecc49c7b3f2f74ff1a419135eca7f58857ae598af4a673e858553dfe1338e51d19ed721c53ea7c445b0f1c59421447146a1ab00ef62d9ff9ceda3eb21 SHA512 de3c26ccbaea54c28b11a393fbd8c5d80c5a67f5a7cec941a1d1604ba264e425708545b6bac257f52338ffe70a88cc97a8780e387a7a569a09ad0d3cd57ecfb2
-EBUILD zstd-1.5.2.0.ebuild 706 BLAKE2B 0db3dbf006c699e33357c6553feda137335e67590eacd3a017bea0c3bb48ee48b1a7c5f2b349508d127b667847670728bc6deae25484447802123f9a08e691a4 SHA512 71a1b448f2e8cf17d31b7a7741632d1adbdb99bfcd0b2979408f6a5ab3be9901cdcb92ae88e8eb0188d48092dec3203b67f8a8cb521e2a2a75ce34fef168686a
-EBUILD zstd-1.5.2.2.ebuild 745 BLAKE2B 0888d174e5d4e6090dec06a1b0bb4dd3aabd407616d0760552ba1adf9852e779936ddd87865b6e291b7d9d1cc5179ddaa7c8a32138b7bfbccfab776b81341ff8 SHA512 2a6d9a9aecaac53c03b8ad6eadaf06b8b3f0a7ebeb409adbb925c795bb1ece8c269153a6b976ad85462016a2e8f9703827f83279551b57a239d5022ecd3fc8cf
-EBUILD zstd-1.5.2.4.ebuild 667 BLAKE2B 651e915e27861a83a2664efc7556e3ebc2eca79294453cf5d536ebd20f4e3dcef2456dd54df1371b5e7cfaa024f6f557e771786b3b638452b47ed6c4a27c1bbf SHA512 a21d43ee0ea4ce5704a34694f0c8baea7b8a2cc0881394cfae0e7788e6aa465bc9218a09aa3bb396062a1c296d7cc8c46a12465be8d9fc389aa0547ddf6e04c0
-EBUILD zstd-1.5.2.5.ebuild 667 BLAKE2B 651e915e27861a83a2664efc7556e3ebc2eca79294453cf5d536ebd20f4e3dcef2456dd54df1371b5e7cfaa024f6f557e771786b3b638452b47ed6c4a27c1bbf SHA512 a21d43ee0ea4ce5704a34694f0c8baea7b8a2cc0881394cfae0e7788e6aa465bc9218a09aa3bb396062a1c296d7cc8c46a12465be8d9fc389aa0547ddf6e04c0
+EBUILD zstd-1.5.2.5.ebuild 665 BLAKE2B 3f0d6189a14c8e793fd5133a24622588563b1a43626c05146d8bf24e9557843c2fbb0be76f012dfcbff83807255767c8ebd07e1b2b5de0e800d653c3170f93c8 SHA512 50e45d9917e741b935c3d334815756a8b4ec36670592596e5729d7686ab33ed6ad9c645e309b369df267a63808da1becd298e4343cf9aa2563f5eedbbb1e299f
 MISC metadata.xml 472 BLAKE2B a4d69b294f26714e9f5211408f01222174c8dd9b0e990840c4603f70a7080fd41a6f3ec74987e40b330a19967f0b90447446b6d5fdb1179ec3be0406592f6b3e SHA512 0cb6b445a84c48dc909eca438bf3908bdc08309f27314692fc2a3fa5a21b3cd1af92e06a593fb2a2cb32c3f0f70db56b7177abcc1fa4348c664e779f0e277cda
diff --git a/dev-python/zstd/zstd-1.5.1.0-r1.ebuild b/dev-python/zstd/zstd-1.5.1.0-r1.ebuild
deleted file mode 100644
index a4b4dee4a1a5..000000000000
--- a/dev-python/zstd/zstd-1.5.1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	DISTUTILS_ARGS=( --external )
-
-	# for tests
-	export ZSTD_EXTERNAL=1
-	export VERSION=${PV}
-	export PKG_VERSION=${PV}
-	export LEGACY=0
-}
diff --git a/dev-python/zstd/zstd-1.5.2.0.ebuild b/dev-python/zstd/zstd-1.5.2.0.ebuild
deleted file mode 100644
index e50d05d945cc..000000000000
--- a/dev-python/zstd/zstd-1.5.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	DISTUTILS_ARGS=( --external )
-
-	# for tests
-	export ZSTD_EXTERNAL=1
-	export VERSION=${PV}
-	export PKG_VERSION=${PV}
-	export LEGACY=0
-}
diff --git a/dev-python/zstd/zstd-1.5.2.2.ebuild b/dev-python/zstd/zstd-1.5.2.2.ebuild
deleted file mode 100644
index 8dd524a01c03..000000000000
--- a/dev-python/zstd/zstd-1.5.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	DISTUTILS_ARGS=( --external )
-
-	# for tests
-	export ZSTD_EXTERNAL=1
-	export VERSION=${PV}
-	export PKG_VERSION=${PV}
-	export LEGACY=0
-}
diff --git a/dev-python/zstd/zstd-1.5.2.4.ebuild b/dev-python/zstd/zstd-1.5.2.4.ebuild
deleted file mode 100644
index 50e49e6df52e..000000000000
--- a/dev-python/zstd/zstd-1.5.2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
-HOMEPAGE="
-	https://github.com/sergey-dryabzhinsky/python-zstd/
-	https://pypi.org/project/zstd/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	!<dev-python/zstandard-0.15.2-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export ZSTD_EXTERNAL=1
-}
diff --git a/dev-python/zstd/zstd-1.5.2.5.ebuild b/dev-python/zstd/zstd-1.5.2.5.ebuild
index 50e49e6df52e..78b4bf5b67f7 100644
--- a/dev-python/zstd/zstd-1.5.2.5.ebuild
+++ b/dev-python/zstd/zstd-1.5.2.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	app-arch/zstd:=
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index a642b03dce0b..d18854a6763f 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
-EBUILD zxcvbn-4.4.28.ebuild 488 BLAKE2B b177efc88ecf5373f5cf9f32df7bed73469fc8ee7cdf0d7b76abab56da06f21e94ee68688ea01413cb3b25d324cbc4f4be2fd945126a4cbe57ad6650bce5fd9e SHA512 9ae7e22020052433d7f8a6bd0363c4ee75e16edfaa0a93ec9373d4c029a51eae3d576cad4b45aef815193d67ac7f1f59c9a7a44abc00cdc6f76cfa50f108c7fc
+EBUILD zxcvbn-4.4.28-r1.ebuild 560 BLAKE2B c8f0561fda9c94065a7f31e583989f7ed5ea79cb5bfb8d2ca2097641e4c7c0c708fa7e8434e6c209cae60e35d480e6ca2c6fff247c76b485a732172d1f28b5bd SHA512 4e0a191a6829aa4923a04c2c253fca1960fdb861e80767a550110c2a1a70e6c9c0b27efda2fcab0faeae4bab6d29ccd1e57d9cdfae3b5ea19dea5c254d004ed2
 MISC metadata.xml 288 BLAKE2B 403df6aa04290e4479aaf55960dc96232729c30172d8b84307aebd658451123feb6c913e0e5bfcdb126060df13ce49ffc7c9aaad648ba5b648f058871c759798 SHA512 c227ff9a49fb729298a1f05f6385557cb614c78b6b45f663f17fd90183dceed644f4d86f6306d921955a92d0f60f9d99f34fc1545f12303b71612a8f6f504ced
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28-r1.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28-r1.ebuild
new file mode 100644
index 000000000000..6a0661bddc58
--- /dev/null
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A realistic password strength estimator"
+HOMEPAGE="
+	https://github.com/dwolfhub/zxcvbn-python/
+	https://pypi.org/project/zxcvbn/
+"
+SRC_URI="
+	https://github.com/dwolfhub/zxcvbn-python/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/zxcvbn-python-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
deleted file mode 100644
index 6493a5eab967..000000000000
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A realistic password strength estimator"
-HOMEPAGE="https://github.com/dwolfhub/zxcvbn-python"
-SRC_URI="
-	https://github.com/dwolfhub/zxcvbn-python/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-S=${WORKDIR}/zxcvbn-python-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-distutils_enable_tests pytest