Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-05-24 18:44:23 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-05-24 18:44:23 +0000
commit: b8de162d8ddccdbffc26f279e208af94479024e2 (patch)
tree: e0fed93810ba81535abcce35e659a7e93b4d8eed /dev-python
parent: c1de40626918fe5b72160d4699e5dc64ba0b79eb (diff)
download: baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.tar.gz
baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.tar.xz
baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.zip
204 files changed, 1552 insertions, 4340 deletions
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 97a4d25f7608..b25cccf5cc50 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1 +1,2 @@
+DIST appdirs-1.4.4.gh.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
 DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
diff --git a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
new file mode 100644
index 000000000000..32cd19fed512
--- /dev/null
+++ b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://github.com/ActiveState/appdirs/
+	https://pypi.org/project/appdirs/
+"
+SRC_URI="
+	https://github.com/ActiveState/${PN}/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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+python_test() {
+	"${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 7d49a31d16c0..83a75d400228 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1 +1,2 @@
 DIST asgiref-3.6.0.tar.gz 32748 BLAKE2B ce3facb2d026551df31ab28a3d9c4bb22be6828664d3b341369eb5dffaec1f2a519ab84356ec89dcfe112a96430be66c70c53d7e36586a3b2f4ee1db61a9d617 SHA512 b74d71e3a5d129117293512ed93e06a9ac0f681766abfc074be6c8deec7160995dee23947da861715fa47e2b9921669b6b5bf247f8d895ffbea7007ea956b9d6
+DIST asgiref-3.7.0.tar.gz 33247 BLAKE2B 512d497d57e45b2ea8d0db1d7bd12ebd850087291698067b050988137e4795eb784796ac8ec6cfcce3a67d9cbf11fb88d4a441e5dfd4e9d177400efe979837e9 SHA512 f4672a1ec652e4f05114caf19e1036a6bc71b137af48214292d5f5348340563a450e13520424aae74d75a58c9dbae7acf4f2debf54acbf5c24310e6bf911ac3f
diff --git a/dev-python/asgiref/asgiref-3.7.0.ebuild b/dev-python/asgiref/asgiref-3.7.0.ebuild
new file mode 100644
index 000000000000..5ab2e33234ef
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.7.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="ASGI utilities (successor to WSGI)"
+HOMEPAGE="
+	https://asgi.readthedocs.io/en/latest/
+	https://github.com/django/asgiref/
+	https://pypi.org/project/asgiref/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 0503ca40deba..13dfaa36481f 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,2 +1 @@
-DIST attrs-22.2.0.tar.gz 215900 BLAKE2B 9cb96cec022735ecdd7577f9ee06b2e16b9be05e9df1183c101bef186a66f2c4505224f1047b4b4cdca2a05641279199ab54c7b2e26a9599c3cd8b9ab4543845 SHA512 a7707fb11e21cddd2b25c94c9859dc8306745f0256237493a4ad818ffaf005d1c1e84d55d07fce14eaea18fde4994363227286df2751523e1fe4ef6623562a20
 DIST attrs-23.1.0.tar.gz 212878 BLAKE2B e562c22e7afdf50a9cf8deafc221d0438b8f3fb6b379c6eeb7f9e5ef182b69d5aa9bb886f4b7f69818ba2f1e9bf2ffa2831571a61c3521ab1c56f9c199b411a2 SHA512 1fff41da90668601b29412f71b4419dd9ffb9f2a8e54ce2199198557729167d6d7574954dc998818caba0d6bc378ab2ce068541df9c1c0d4ab1b071758d4a38a
diff --git a/dev-python/attrs/attrs-22.2.0.ebuild b/dev-python/attrs/attrs-22.2.0.ebuild
deleted file mode 100644
index 32a59d87798e..000000000000
--- a/dev-python/attrs/attrs-22.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/python-attrs/attrs/
-	https://attrs.readthedocs.io/
-	https://pypi.org/project/attrs/
-"
-
-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}]
-		' python3_{8..10})
-		>=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/attrs/attrs-23.1.0.ebuild b/dev-python/attrs/attrs-23.1.0.ebuild
index b28abd2cd0f9..d1e740dca78b 100644
--- a/dev-python/attrs/attrs-23.1.0.ebuild
+++ b/dev-python/attrs/attrs-23.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
@@ -26,7 +26,7 @@ BDEPEND="
 		$(python_gen_impl_dep sqlite)
 		$(python_gen_cond_dep '
 			dev-python/cloudpickle[${PYTHON_USEDEP}]
-		' 'python3*')
+		' python3_{10..11})
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/zope-interface[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 3d4f1234ddc1..93368d0e65c9 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,2 +1 @@
 DIST bitstring-4.0.2.tar.gz 211208 BLAKE2B 75ba6de71ac1a4ea384aad38405ccef21a101c641ee244096d67aad9b46315ee5dab9099b928e3300772c6f15637d4b54899c0a40f6a7ab4e48cfa1c66f310ab SHA512 11d7cddc7372ef9dac92d97df6e9972d7e75e4b02ad1e777357bea667e096beb405871b6cc9baa0522e2251278ad8c11a34724932efb2593fccf572857a608ce
-DIST bitstring-bitstring-4.0.1.gh.tar.gz 413983 BLAKE2B a4b424d2c139b34ce5ea81522486d0e42d82a06cfc64ce664505a2c1f1a626939b57b1755642220e2fb4219ead3a2a368006878ea05bdae59a638948b24e8b8c SHA512 f036a042f83c70b830f987114e7eb54754145296c60cd6486f398247a069c50588f3c86395a849a99e3c9b94364f1fcf4fedf4b59b80f03b6aecb38d992f5490
diff --git a/dev-python/bitstring/bitstring-4.0.1.ebuild b/dev-python/bitstring/bitstring-4.0.1.ebuild
deleted file mode 100644
index a802d7606927..000000000000
--- a/dev-python/bitstring/bitstring-4.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=${PN}-${P}
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="
-	https://github.com/scott-griffiths/bitstring/
-	https://pypi.org/project/bitstring/
-"
-SRC_URI="
-	https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	[[ ${PV} != 4.0.1 ]] && die "Remove the hack!"
-	cat >> pyproject.toml <<-EOF
-
-		[build-system]
-		build-backend = "setuptools.build_meta"
-	EOF
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd tests || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/bitstring/bitstring-4.0.2.ebuild b/dev-python/bitstring/bitstring-4.0.2.ebuild
index 48f8ce8dd102..a8319efb0dba 100644
--- a/dev-python/bitstring/bitstring-4.0.2.ebuild
+++ b/dev-python/bitstring/bitstring-4.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/boltons/boltons-23.0.0.ebuild b/dev-python/boltons/boltons-23.0.0.ebuild
index 5ac09fcb1f9a..6efe62c92e2c 100644
--- a/dev-python/boltons/boltons-23.0.0.ebuild
+++ b/dev-python/boltons/boltons-23.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mahmoud/boltons/archive/${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs \
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index a98fd1aef60e..ffc2416a62b8 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.26.129.gh.tar.gz 645918 BLAKE2B 2de3833e60f8a8b91a35c863fc67e1b098b
 DIST boto3-1.26.133.gh.tar.gz 648114 BLAKE2B 97c71216d92baffb9e07f9c112590a1fc7828dc90b66364c9f344cb5f95aa927c80c56426c679e9bff8b3fa82d203d527d529cb337e786b471c1df120a9fb186 SHA512 66270dc31b85860320e5dbffc77d2f51e1d4e6d413624269171e3824020ead0cee842cea0e292748127c0584ced74f835cd46554240bd522787e77ad939dc69e
 DIST boto3-1.26.137.gh.tar.gz 650777 BLAKE2B e4a7d02ccefbda53b33558dc107457eaa1df0871bb2fc548b348246192cfdd6760bc43a6e6861622de6376244b80a94a387bbb827be2f5b749bccf6b8ff5af58 SHA512 de5d29a4139650f0527e93a9e223b7d41b285b6c263a5bc7ec9ebad1eee19373b1f2093c03414f7b575f8a7402734b4076cfaf0fa5be34ff54b55d8960e9c836
 DIST boto3-1.26.138.gh.tar.gz 651104 BLAKE2B 58c7c71c97567b167d9c0afc376161b60155ce31984e2b9e0d72a152fe8825fe50258ea2b917489d7b041ada1212c6516ed5176e61fa9fc900a1ae9306fe382c SHA512 81c3873afca46cfcc60559236ec61db92a9d040fb7e192c2aa0c663416ff954740d2aea2ab5d8e417fc2909413fed6dd3684d7e0b05c863bbed9abac4d02a1d8
+DIST boto3-1.26.139.gh.tar.gz 651459 BLAKE2B ba1c0c45c0cd78622ca34bcbfb3c8961c0555ed9fa16d8cb89363880d8cf6911183758ed7e4f44a098413b47d2d6b3c1ee4e57f05561947d7660a969e4e7be2d SHA512 971ce067318642e2f4a13cb77b29410d97b5c8e7cff28e76d7983f95bb5f593697bebc6d744517b5c7e760b5b30980370befe86a97d1162882a13428833b0a5b
diff --git a/dev-python/boto3/boto3-1.26.139.ebuild b/dev-python/boto3/boto3-1.26.139.ebuild
new file mode 100644
index 000000000000..2a4a7643203e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.139.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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_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/botocore/Manifest b/dev-python/botocore/Manifest
index 52605315b093..8db5f957a77f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.29.129.gh.tar.gz 11476185 BLAKE2B b2601ecd28263e44f4830ccad24402
 DIST botocore-1.29.133.gh.tar.gz 11484789 BLAKE2B ce1acc51ffada796e594090e7b4d73029df362459a562116ad9dabc56b926f7beec5644e5ce7d175e8901eac28420b57b758be266aa61582cac7e4b91b794e05 SHA512 62631be4f9bf07803e193a8a7ff3b04a806d6dc7668317765b853bba1f1c66cf49c8345f7640f829622c3c8ce96c775bf00bbfa943ff175a6c9a479a888e85db
 DIST botocore-1.29.137.gh.tar.gz 11508178 BLAKE2B 2f74fd2f3923672a4fcd501f1c5ba48cd09965ea0f70689bd6559a4c4a6fe8921f783ef86f28ac57893c8b1366d8fca2fc79f0216747e04142ed33880f07fe39 SHA512 b800a1b73170b5fcbbf1b17477bb8f04b19f5f250a68bbb3b993b0e058d8df870eddf932f79d94eaa3255b976ce136adbdd5b359757cd79f2cfe2a16b3cfa2f4
 DIST botocore-1.29.138.gh.tar.gz 11516247 BLAKE2B eb8195ff412de996fcdd9cb2f44f20476b1418f328016721099ed7dc2a7159a5bbc819f752ea2188c46edb0d701a0481f7823cb50d0da5712d61f7b9a5f0799e SHA512 02bf92e2481aa27796186f8c457ce1e3d833bcf5d647dab3fe6347760106ccc8f73a3c7d55700ad72fc0210e8229c905e617a8d65a63542eaadab01e1c798bb3
+DIST botocore-1.29.139.gh.tar.gz 11517015 BLAKE2B 4c765477aae729788325fef1a7f13bc5ed641883f5d0bfa423bfa942a229c15a8d3e87a7670ffae673fec5dcd25416d9f77072bda41af9e18a9784668aea54a8 SHA512 374054ff9006c2deaf1b7d5c796ca0d1473bd6313402bcbb9b2d1ae25fe97b5d3d02e015952fb9d9dfdda3aaedae02359e943dbb8b0f9acb50595a98ca20b8b6
diff --git a/dev-python/botocore/botocore-1.29.139.ebuild b/dev-python/botocore/botocore-1.29.139.ebuild
new file mode 100644
index 000000000000..3ced99abe4ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.139.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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_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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 9418f03e5512..5682210b6d6b 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1 +1,2 @@
+DIST cffi-1.15.1-drop-deprecated-py.patch.xz 31244 BLAKE2B 7c8a6ca1166335fbd385de35ebb636f21049a4dd9c52171ec58da08a61dc64c271b4afa2d69bf8b877a8c9747dfae6a8529615bbed69f5a8ab30ba5fc99c61f4 SHA512 9aba4b172b070a1a1719de2c35667abe4c7b27208b8ca3ecbf90bf168ed694f4524154e69fada5ff6f141a94b8a438db16239ba353fa9914b318b77e41dfd920
 DIST cffi-1.15.1.tar.gz 508501 BLAKE2B accc317385d9af7dbed3397afde63fbab63bfc935376d951802055c63796863ed102a940f192789924480b9b16751c8cf3d21caf9b262c479c61ffc977aac83c SHA512 e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
diff --git a/dev-python/cffi/cffi-1.15.1-r2.ebuild b/dev-python/cffi/cffi-1.15.1-r2.ebuild
index d2a2f33c1cdc..36df28585ac8 100644
--- a/dev-python/cffi/cffi-1.15.1-r2.ebuild
+++ b/dev-python/cffi/cffi-1.15.1-r2.ebuild
@@ -4,11 +4,14 @@
 # please keep this ebuild at EAPI 7 -- sys-apps/portage dep
 EAPI=7
 
+# no py3.12 yet because of:
+# 1. https://foss.heptapod.net/pypy/cffi/-/issues/563
+# 2. https://foss.heptapod.net/pypy/cffi/-/issues/562
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit distutils-r1 toolchain-funcs pypi
 
@@ -17,6 +20,7 @@ HOMEPAGE="
 	https://cffi.readthedocs.io/
 	https://pypi.org/project/cffi/
 "
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-drop-deprecated-py.patch.xz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
@@ -42,6 +46,7 @@ PATCHES=(
 	"${FILESDIR}"/cffi-1.14.0-darwin-no-brew.patch
 	"${FILESDIR}"/${P}-hppa.patch
 	"${FILESDIR}"/${P}-python3.11-tests.patch
+	"${WORKDIR}"/${P}-drop-deprecated-py.patch
 )
 
 src_prepare() {
diff --git a/dev-python/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index 4fcd6edced39..cd1915ccd79e 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -22,6 +22,10 @@ LICENSE="MIT PSF-2 PYTHON"
 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}]
+"
+
 distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 2f9e6b63207c..199c3b27e751 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1 +1,2 @@
 DIST coverage-7.2.5.tar.gz 759465 BLAKE2B 79670165a2516047ce3b28c331ec62c7c578fbfe14bd1179be65e52c5e57923ffb0d365f9153a78134ed5d95e4e04a8eadb6df3cbc49559659cf8cb77aa9d611 SHA512 3c4ec5aaba06170c860baa23ba61fe6f19b95a433430f045272839c13cc5bf4fb12a2a030d987ad5713202c75273646639da1257c0a618658f090c8a9fee41a7
+DIST coverage-7.2.6.tar.gz 762287 BLAKE2B 68fbd5aeecb635773b509647d3d2ae3e0a46dbc34061ff0bc22ee96b0aedd77e9d9cc772f5a10ce6dbd33035765fb61325e39674804174c10a4f8bf930e5697f SHA512 b4ef257cb2ed4297e7e3f18193bec7f0ad3e81735ce4406f96fd41b0fd2becb9f16c65f3699ccb11f145f14c1c144b9d987308353d15969e47ce0b956cd8f8fc
diff --git a/dev-python/coverage/coverage-7.2.6.ebuild b/dev-python/coverage/coverage-7.2.6.ebuild
new file mode 100644
index 000000000000..bbd159f97106
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+"
+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::' pyproject.toml || 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() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${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/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index d2716bb79d01..a30dab99c55c 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,3 +1,4 @@
 DIST cx_Freeze-6.13.1.gh.tar.gz 1486207 BLAKE2B aa0151fed482714e41a859059f9672950249ad7fe50fa2accaa9d6af7ddc183a8f74d87337f274849a34a404dda0c732300343b58cd872f3bd03bf275c2f4d97 SHA512 48d569fdce5c6cb100232ce3577f0a55a40f3d1dcafa884a4d62af7f27200a21eb892504b47fb7cd106f410354b70d98a8e5245382431bc1f6d990510c77cb36
 DIST cx_Freeze-6.14.5.gh.tar.gz 1648095 BLAKE2B 81707d17c2118a8db4d768b2fbe83278c6b01509a5a1d3e7f3a41efaa29607fc4b254e9d545a4697b77d4932100f344a8013ac59084bb74d97d1b12cb927ec6e SHA512 52233a138da3250e97668a5c225e78b864bebaa43ea2b30de01af2de7739f48a25030e10d36ccec609240822de308ad030eaa26c2ede8b29318d2b30647cf1c8
 DIST cx_Freeze-6.14.9.gh.tar.gz 1649748 BLAKE2B 08fefea6ed9610b672ca8a4a6e480cedf8fd75c967880e74f94c12368ec1ff71a9d34baae02342f7c4484e65beda5dc71dd39e13b8c340c5b7dd2e89b38ba0f1 SHA512 bfe3e5d3dcf96cff448b034a779b93c37dacda489ee4eabd92e8f4708c6d7a9fe2430bc512f40c6af8c6f851fff24a3626b80f10295af1357e4a58563474e8eb
+DIST cx_Freeze-6.15.0.gh.tar.gz 1650636 BLAKE2B 9d99a78bc4d6b6498e10c54352a6fbfce3f2ee9bba9cc5b7fa752eba465d29355c6e4222e4f3c3012793820f435591f2e3e634e512765720d0c96a7799ab5998 SHA512 90fc3fba50ab7a9a263371fc9e57df768792b78175cd7ed39f2308b2a5e6bf0eb992616d29ff0d34c8bf040d167bac1882e0e1d2425d2f248e4de2e755c72503
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
index 8da7b8e64700..f8101885276d 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.14.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.15.0.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.15.0.ebuild
new file mode 100644
index 000000000000..e169791b001a
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.15.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="
+	https://cx-freeze.readthedocs.io/
+	https://github.com/marcelotduarte/cx_Freeze/
+	https://pypi.org/project/cx-Freeze/
+"
+SRC_URI="
+	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib-metadata[${PYTHON_USEDEP}]
+	' 3.9)
+	dev-util/patchelf
+	virtual/libcrypt:=
+"
+BDEPEND="
+	test? (
+		app-arch/rpm
+		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
+
+src_prepare() {
+	# remove pythonic dep on patchelf exec
+	sed -i -e '/patchelf/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# rpm test expects .pyc
+	local -x PYTHONDONTWRITEBYTECODE=
+	rm -rf cx_Freeze || die
+	epytest
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 46dd0ff7bd3c..b97f9744914b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,3 +1,5 @@
 DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d
 DIST cython-0.29.34.gh.tar.gz 2114639 BLAKE2B c5f70fd3e6074d9030a1035bc98d71b703e0f391b61bd91f3ffba2c35a29a98b9ff8ef2047e7c75743ead280f0f06a924abe84ae8bf7696b65da662a3c58ee0c SHA512 51679d1304d0f87dfb51e60c753f1ce60027f855a91cf130a5dcf84353884a7dcf09c01701945ae2f9173f8f095890c377d5faac28c2f01d7f764609c0130411
+DIST cython-0.29.35.gh.tar.gz 2115190 BLAKE2B ac23abbd2b560ee52a79840d995a4cf36ddb3a8705b9327010f1ad6add8028185c15703efcc1d59b581d65b5de38e123c0f07c36fe6ffe54a6efee7512161344 SHA512 35d679d94e1f731e004b83fb4ae0d569703b0800c913012308146b1c54463ce12cb1cf3733e24162fb357f179444c5ca31108a37850e6c749ddebac5175119f5
 DIST cython-3.0.0b2.gh.tar.gz 2669448 BLAKE2B 87602a43f77f8005adfc71ec0598a12212db917071dd2ae9a7d0d909411e38525290d860a8606600a5e1b07b014da65d2398f04818837fb15f66bcdba0cad965 SHA512 2095a556bc83669a89902a71da2164fbfab2b75cec2de95c91f95b6b3639bc5802b09808059896ed564b0d6e0539e497051614572bc8ba5d678d0410ccc3914f
+DIST cython-3.0.0b3.gh.tar.gz 2688784 BLAKE2B 933bb48b2bf5169c973a36c877a36eae28b80409a7ff395b82a14ac0740247496df3c9f2d69884c823b7475069f0c75d6cbbb964b88de60b38082e6e36659bff SHA512 f1d0fdcec4bc6b0f6cb66078592424fdcb7a028b79c5b9d41280ae112235736d11c9f4f793e810007e880ae0def195ac25999db59065c7f7bdcfab84b06bf7d3
diff --git a/dev-python/cython/cython-0.29.34.ebuild b/dev-python/cython/cython-0.29.34.ebuild
index 59abf5330878..503551031bbf 100644
--- a/dev-python/cython/cython-0.29.34.ebuild
+++ b/dev-python/cython/cython-0.29.34.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 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 ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/cython-0.29.35.ebuild b/dev-python/cython/cython-0.29.35.ebuild
new file mode 100644
index 000000000000..30e24d6be963
--- /dev/null
+++ b/dev-python/cython/cython-0.29.35.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing 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 ~arm64-macos ~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_{10..11})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.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; 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 -j "$(makeopts_jobs)" --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-3.0.0_beta2.ebuild b/dev-python/cython/cython-3.0.0_beta2.ebuild
index 8788205dd0d7..ef4c9da84930 100644
--- a/dev-python/cython/cython-3.0.0_beta2.ebuild
+++ b/dev-python/cython/cython-3.0.0_beta2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1 toolchain-funcs
+inherit distutils-r1 multiprocessing toolchain-funcs
 
 MY_P=${P/_beta/b}
 DESCRIPTION="A Python to C compiler"
@@ -34,7 +34,7 @@ BDEPEND="
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{8..10})
+		' python3_{10..11})
 	)
 "
 
@@ -57,7 +57,7 @@ python_compile() {
 }
 
 python_test() {
-	if has "${EPYTHON}" pypy3 python3.11; then
+	if has "${EPYTHON}" pypy3; then
 		einfo "Skipping tests on ${EPYTHON} (xfail)"
 		return
 	fi
@@ -65,7 +65,7 @@ python_test() {
 	tc-export CC
 	# https://github.com/cython/cython/issues/1911
 	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+	"${PYTHON}" runtests.py -vv -j "$(makeopts_jobs)" --work-dir "${BUILD_DIR}"/tests ||
 		die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/cython/cython-3.0.0_beta3.ebuild b/dev-python/cython/cython-3.0.0_beta3.ebuild
new file mode 100644
index 000000000000..ef4c9da84930
--- /dev/null
+++ b/dev-python/cython/cython-3.0.0_beta3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing toolchain-funcs
+
+MY_P=${P/_beta/b}
+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/_beta/b}.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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' python3_{10..11})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-pythran-parallel-install.patch"
+)
+
+distutils_enable_sphinx docs \
+	dev-python/jinja \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	if has "${EPYTHON}" pypy3; 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 -j "$(makeopts_jobs)" --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
+}
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 9f1117798d06..22b9f00fa8b8 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1 +1 @@
-DIST defusedxml-0.7.1.tar.gz 34709 BLAKE2B cfe69851e0ac6472cb9e66d1b577831eec37b0a01129dcb43cec151aa939029efc194220f3c7b481d306a77db710a639bdd56f3fd1f7ae46fa4ab8f308b8036f SHA512 4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864
+DIST defusedxml-0.7.1.gh.tar.gz 34709 BLAKE2B cfe69851e0ac6472cb9e66d1b577831eec37b0a01129dcb43cec151aa939029efc194220f3c7b481d306a77db710a639bdd56f3fd1f7ae46fa4ab8f308b8036f SHA512 4f536794b814291520c7db27765014c57f415554cff569cddab596b33e1aa03799aae9448fdaf07417d1a9f4d8782aa827d1b68aac6881ffe5c2ca9b8a40d864
diff --git a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
index d78f1fa51533..e9596a9b305c 100644
--- a/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/tiran/defusedxml/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
+		-> ${P}.gh.tar.gz
 "
 
 LICENSE="PSF-2"
diff --git a/dev-python/email-validator/Manifest b/dev-python/email-validator/Manifest
new file mode 100644
index 000000000000..b28949611faf
--- /dev/null
+++ b/dev-python/email-validator/Manifest
@@ -0,0 +1 @@
+DIST email_validator-2.0.0.post2.tar.gz 45253 BLAKE2B b213ebab2a10acf6c2ab95d382fa78ef92f41ff85ce25c1cfa5a65403e728fd05c66df3dccbaec77eea469d0665701ad5d8047c31e69b57ed8e6fe52f3a1f9c5 SHA512 8c4abc955d909ef05ca89d6c6931bce06de199c33c5f8d0744d44ff00ee69c1841f295882af3da03963cc90ef031da46cdaef90249f73e0c7b47f19dfb816b62
diff --git a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild b/dev-python/email-validator/email-validator-2.0.0_p2.ebuild
index 25784d4729f2..729663045570 100644
--- a/dev-python/python-email-validator/python-email-validator-2.0.0_p2.ebuild
+++ b/dev-python/email-validator/email-validator-2.0.0_p2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 LICENSE="CC0-1.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"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/email-validator/metadata.xml
index ac9fc4b42e3c..ac9fc4b42e3c 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/email-validator/metadata.xml
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 12a58f37d3c4..08848bcb7330 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,5 +1,2 @@
-DIST setuptools-67.6.1-py3-none-any.whl 1089263 BLAKE2B fe1ca817d2743e5edefac47230aa2cb5f4e75945bcdb821ca2d61011a419653d8b0880d846e11e4450cb19fd22fcd45d570b6c33fce640a8515df6e65f7a1662 SHA512 ad7a81c60b2b3f190561178531123a0e2d278c4cd9615930d5b0276fc79bea390f1cc92ab37061378ebee09fc36c21440a4db00f20029093570b7006cd14b25b
-DIST setuptools-67.7.0-py3-none-any.whl 1093434 BLAKE2B 76e91b7353f75f4c2c3eaa0222b1e846c82fb24a7c7220408cc3f547d8243bc0e306b19661f26e5bd5b2a82b3f8e58c60b3906869011477fbc2db82152baeb94 SHA512 22428cf43932d4a16f704adace5e6fa9ddff15c2715c9ba2c0f47c2e96d5fa95e5fbd21e2e55cef9c43a41d29f6cd2d09500b1cb81daedb64820e388ead70346
-DIST setuptools-67.7.1-py3-none-any.whl 1093433 BLAKE2B a28d3fa5fe0229e681c9cdf846f387b57e77a31a3d20f18a7164af6d6e5832ce65c71c8dc9326bebae2e2c5d80498609acaa315999133b320972ca4f6dc988c8 SHA512 b9ef9fbd268f48f5c585deb4bd5ee9d47fc4633832fb52dff61663ce045b05d67d9aee1eab0482a34dd7b55aa42a1eb0948ac6bb94fbb050435c73f3b63439f9
 DIST setuptools-67.7.2-py3-none-any.whl 1093536 BLAKE2B d267f3aa3006e1a50ba519d1461b168d288741158d53bcef95075a16e35145f846bf72337bade5343b0be5ffdb9794cc15a68284841a10628b4c26d49b7b4141 SHA512 ef9041fd899e3f138e6ced79de2a52e15f1bf44dcfe6566b9b6ebf071fadad5b7b94f1a07ec81607170b34dbbf2126b4e0c2337314c8597883740c6786b54230
 DIST setuptools-67.8.0-py3-none-any.whl 1093916 BLAKE2B d02bd5ccfe27c116497f8ae46603e5863c88795a489523d4cdaef3bad1bfabd5dfccf7a00f17290e58cce89a6348fbc194c00ae5ccb4c5e89a083fbb84c2cca6 SHA512 a80fc8d632ee6d1947689bb3f27ffb85206e518bf6c153ad43dd5e9f1825fa6e45d9df2baedd1fa9a8afb12a7854215bc4f56bb73d9033704745954890267c9a
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild
deleted file mode 100644
index 9c395ccdc387..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild
deleted file mode 100644
index ef453bce3899..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.1.ebuild
deleted file mode 100644
index ef453bce3899..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild
index ef453bce3899..9c395ccdc387 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 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 ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 9afeb8c0269e..a26a49831638 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,8 +1,2 @@
-DIST fakeredis-2.10.3.tar.gz 94025 BLAKE2B faf178d53e783c4475513bf9f485b6eaefc63bc45c5ebd95ecfa1aaed982e236877230ea19526d8d12f152f1c429c5003b04abd2cc4f7ed43dbde581b07fbdf1 SHA512 694b1b540e8b9b32a5a44e3094b8bab307c5af400335efe9eb034c5ed161c1583d4700c08ef16991a1f03502aeb835d89b327448c3385de548dd39aafdbcc2a8
-DIST fakeredis-2.11.0.tar.gz 94957 BLAKE2B 0f1e5e226793fbeb86c9d7b894832652dca65c2ed21b0f0c86c228df3124f97aebc1540619fdb484dda93a78f7c7d6e1fbbcd07a24ba0e919ba9fb718074c757 SHA512 7669fa06737f47440b85a369ae00429da7ee479dcc0fed3c5a33f700b3ddbe3660bfd1098dcefa4b29896dc552cca950fa8305f1e53b44fd82f8375e15d25031
-DIST fakeredis-2.11.1.tar.gz 94897 BLAKE2B 18798d30eccfbedd70d13fc4a9883d2ab4b06eb2b4de900ced78202a3ba0680380dbd6989e7c51ce524eff73b4b5177379c941d9bb00015afe32d12b716b4ba0 SHA512 1ee9ed1eb2563de702bb76f01546338ccbb477b9546c8e9ff65644efbdb00c2c14cb5f2488d800071c083e0eaa638b41ec492ca618d3a5a0e190212e6e8313a8
-DIST fakeredis-2.11.2.tar.gz 95532 BLAKE2B 5edda6d3573bd589c8144664dbf115f257b68f59f002d92766b4c9ce1a9adcefe727812835d01d4efa42676056e9c050175c423cca166f1063e4ee1a6784ee94 SHA512 a5f0428949f3527fc189ecf4744f2f2310fcb114fdeb718299608defe7dfaeee9720d84debaa1e0e0eeeff11f6426e72452b3e7e772690aa48336996ae5a8716
-DIST fakeredis-2.12.0.tar.gz 95952 BLAKE2B 87e27851e2c68c07871990e3b1e73c2c614a902a4e086753308f2abcf01cfe08532c1c04136ebb1fa5aa36ff8b36616fefe70ab3b59860d15e89be5af83d1a9d SHA512 a4c1eb27cb846a769ed5fd10966df77064d0598f7b556c36c0ea48cd298c261f222601a0071652ec279b03e04537aac211710edf1597f6d57a48ca3a53e9a7aa
 DIST fakeredis-2.12.1.tar.gz 97486 BLAKE2B 5207d9b946eb5720083b045e29b960cc2eb3ab5ed7b633f00106d0777186cfb02ecc10607d24a67d7b2eded35915e6710a4880f560e49fbca470c487ec0a2b87 SHA512 99e4e0bf7a4be9cc9dc96eecfe2fd1f106664bab2eff4f575468933809cf306c36237ebc9d86efdd9c0823e05a08d466f35a7e43359602b47c582ab16d7bb7ef
 DIST fakeredis-2.13.0.tar.gz 98084 BLAKE2B c147332f2575be7f63aef48199920480d550efbadeee9de255b17cb9c7d6791a059ee3d4bdc500ecf44dcc22de6fdd11d170daf3e19de8e910833b1de12232c6 SHA512 30335e456f7ac2498fc175f9fd154a766064a05e6eb996df9d533412525a3d4279c9359ac5e43a2b9ec9bb1d653639aa10d4e1765a4e4c1bc84f764fa1efdb42
-DIST fakeredis-py-2.10.2.gh.tar.gz 159702 BLAKE2B ec385c01af9e32705435148c1c61d74c14d7b22a60b6a3466f1831f557bfe997af6ee96429cfdba00a1328db3cabe1579d65411e7c2b9972e5421963cd66815b SHA512 2a3a87dcbe136465ff0465585562a5b8b0bc73504f491d3ec9c6e959b6cffaa3edbaa1c2e5199138f7a49dfdec3c3da6a2ae338228a8fe21c670a82c062c544a
diff --git a/dev-python/fakeredis/fakeredis-2.10.2.ebuild b/dev-python/fakeredis/fakeredis-2.10.2.ebuild
deleted file mode 100644
index 81404aa70226..000000000000
--- a/dev-python/fakeredis/fakeredis-2.10.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/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-5[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.10.3.ebuild b/dev-python/fakeredis/fakeredis-2.10.3.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.10.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.11.0.ebuild b/dev-python/fakeredis/fakeredis-2.11.0.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.11.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.11.1.ebuild b/dev-python/fakeredis/fakeredis-2.11.1.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.11.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.11.2.ebuild b/dev-python/fakeredis/fakeredis-2.11.2.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.11.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.12.0.ebuild b/dev-python/fakeredis/fakeredis-2.12.0.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${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
-
-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]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	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
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${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/fakeredis/fakeredis-2.12.1.ebuild b/dev-python/fakeredis/fakeredis-2.12.1.ebuild
index c5a052a0d4a2..27992fc254a7 100644
--- a/dev-python/fakeredis/fakeredis-2.12.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.12.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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/redis-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
index f08b240d1f90..d6902f2eea4e 100644
--- a/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.2-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	test? (
 		dev-python/asgiref[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/semantic-version[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/flask-login/flask-login-0.6.2.ebuild b/dev-python/flask-login/flask-login-0.6.2.ebuild
index 4d85e92c0bb5..297f1bcb48fe 100644
--- a/dev-python/flask-login/flask-login-0.6.2.ebuild
+++ b/dev-python/flask-login/flask-login-0.6.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	test? (
 		dev-python/asgiref[${PYTHON_USEDEP}]
 		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/semantic-version[${PYTHON_USEDEP}]
 		<dev-python/werkzeug-2.3[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/flit-core/flit-core-3.9.0.ebuild b/dev-python/flit-core/flit-core-3.9.0.ebuild
index 28d074d9423c..57a3fda3c9ef 100644
--- a/dev-python/flit-core/flit-core-3.9.0.ebuild
+++ b/dev-python/flit-core/flit-core-3.9.0.ebuild
@@ -20,7 +20,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{9..10})
 "
 BDEPEND="
 	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index b302e46388af..7be401274c05 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1 @@
-DIST google-api-python-client-2.85.0.tar.gz 10747605 BLAKE2B 832017bbd4427a70c6c3dcce215a1e23442eb5c5bed069261da1ec85ed7ac838cea530e45f794c6142beb40b188d685cf47b6a96bd8e959421d2f8edd504b736 SHA512 491fffc8911361fc69b9490e0615046668c07d4d878c16a50ca4f0bed9f0815fa14cc34930d3a1c47a54f6f32de584ef7617fadb8f0a4b6ca92cd11926b35952
 DIST google-api-python-client-2.86.0.tar.gz 10767816 BLAKE2B 532b86d49dfec724237a07c6d6c4dccbdf7a4f9d8c6a1c7f96548708c55e5851bca3e1f0f28da65edbde68a6d760498af8936be177ce5c0dda3e6809db218188 SHA512 2d1aea4a6735aeffbc4aba05affaa3c4389e2f9f121185d5a5d47e818e33ae3506bebf2748d7a14b374310531c7c3a34325524c5c48df3c882c6b2a4ce579e8d
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.85.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.85.0.ebuild
deleted file mode 100644
index 9eb8248acd2f..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.85.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-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/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.86.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
index 0194f9640998..9eb8248acd2f 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/gpep517/gpep517-13.ebuild b/dev-python/gpep517/gpep517-13.ebuild
index 204c0de20cc9..c5a85a0cca5b 100644
--- a/dev-python/gpep517/gpep517-13.ebuild
+++ b/dev-python/gpep517/gpep517-13.ebuild
@@ -25,7 +25,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 
 RDEPEND="
 	>=dev-python/installer-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.2.3[${PYTHON_USEDEP}]
+	' 3.{9..10})
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index d2991b3f3898..ba8e2b54fbb1 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,2 +1,2 @@
-DIST grpcio-tools-1.54.0.tar.gz 2259685 BLAKE2B 432b682514a52d0ef2e5244b30e85200a3048e0bab3c87c4b8412d73794aa398002e571363de778acd55679d7765967705c2140ae39abd021cfd2cd77e575902 SHA512 c360ac7f211abc46ebd70ff5cbe0c78fdc1798ec6b202d28628f27e67e508a478a8cb9cd18d5ed0c219c9c8e024d8758d851593cfa2a215082b8e9546f164431
 DIST grpcio-tools-1.54.2.tar.gz 2259586 BLAKE2B efa99e32d3bea5d176856d5befbebff27cef5d67355c4fb6600ec0a05e141d09750ada427bb8a82ecea713e48094b589cee247463a7b1f215c1f56eb346a571c SHA512 7dc849db2fb9d769d66e140d5841fc894acd05d4c20f3a67e472b85121c9718afa56e30175d889eeb76e9f44aea6553a7e915d1502eb7aca721091f5bdd60da9
+DIST grpcio-tools-1.55.0.tar.gz 4481863 BLAKE2B 62ff9201dda6c4c078690ac15db411cc95a36c71863a57510add59beb27db0f11726ff6f8aab0da0f2ba131a7574e2ae27640b0ed2448bfe162db3282d57bc96 SHA512 bcd55e71fb752cd0bbee47fa237db6a1ec6084eaa95fceb2e0f3950b8655ace36edaf4edcdeacd66a5fcf22f163f5bcda710d6b50f0c6b3b3242cda7a019bfea
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.54.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.55.0.ebuild
index 1d09f1f18a92..30447e0420c2 100644
--- a/dev-python/grpcio-tools/grpcio-tools-1.54.0.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.55.0.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 multiprocessing prefix
 
 DESCRIPTION="Protobuf code generator for gRPC"
 HOMEPAGE="https://grpc.io https://pypi.org/project/grpcio-tools/"
-SRC_URI="https://files.pythonhosted.org/packages/e2/a9/4f4bdb13e414474de9ae770700e5450f8beb981282af171255c9d4cbed25/grpcio-tools-1.54.0.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/ab/57/0a02eb41926c19809e40217f2b8499243db77c683f6f8e24ee6a3d0c7407/grpcio-tools-1.55.0.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 99084380338e..a726e40a8baf 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1,2 @@
-DIST grpcio-1.54.0.tar.gz 23450621 BLAKE2B 45344fb0fd1ef4729d21c6ea2c2200771b92ecd35432d6235c68f506569f5891bf27321c639515459de053528276e61fd6ecf4e6893f4122cf1f0dd10f960039 SHA512 e4fd9d4370c0df5d068f0fd1f1e852165cd58cd12270faac8c68cff69eebc9e1ea13f2e87e681cdd36ac0d6158f03a0b54f2c040446f3eb622acbdd463460221
 DIST grpcio-1.54.2.tar.gz 23458404 BLAKE2B f51be300817e4a253ab6d29d2497991487c348ffa7591c494fa98b4a8cb9d764eed393aaad8650e328e3c18f100a45cf22e4a23d8edd5ec7087e984919e74d66 SHA512 1c7f0df6e8bc86bcbb1edfe53164eed59453816e4c70702b918dccf2f64c902ebd415636ab8848eae90de6e51ef3d2b0c1e2955bd30dbb89972df1e881e66848
+DIST grpcio-1.55.0.tar.gz 24163903 BLAKE2B 43d643a42f1048ed3ed423672bfcba2a896461201154e2f106d7773dc2700ca618ff1dcee94828342675701030e1f5c17325931d1d22637833977f7940b93860 SHA512 a1a879fc1fa12cc84fda62aaf7ee6b366b4a8a9fb9ec7912e41269a61dc0390e5583dfbb916e5bc5c0bdc07534fc20aca719a448c9acc8a8923d39d11df1bcde
diff --git a/dev-python/grpcio/grpcio-1.54.0.ebuild b/dev-python/grpcio/grpcio-1.55.0.ebuild
index 9eb989069a44..3c2df0802839 100644
--- a/dev-python/grpcio/grpcio-1.54.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.55.0.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1 multiprocessing prefix
 
 DESCRIPTION="High-performance RPC framework (python libraries)"
 HOMEPAGE="https://grpc.io https://pypi.org/project/grpcio/"
-SRC_URI="https://files.pythonhosted.org/packages/ef/e4/5c717f3c6c65b7c5ff2542ca25d6c2ce0f99d9ee9119620c6e2325a6da79/grpcio-1.54.0.tar.gz"
+SRC_URI="https://files.pythonhosted.org/packages/76/63/d025fb7599379765d6437e5aab3644955248ea89d2f84f4f8a9762d99c52/grpcio-1.55.0.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
index fbf461b6a977..b188da6a6d9f 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
+	' 3.{9..10})
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 10befd7b1145..3e682900fdfc 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1,4 @@
 DIST httpcore-0.16.3.gh.tar.gz 79132 BLAKE2B c06d55ce1390085db6c15d3e96160cfb037a935d1298304856defd1778783ad1954924a48653ce165dae9cde18abec157aa72865f57e97d91a564d1b823c863c SHA512 d889da0a3fee4f190ecc3981b8af34fa9b285d00f4ad92158a085c65f3ad8fa5a97a8c711bd51f8b9518b9d2c90ecd457dee1a3d7bbf853715473f4707cc421a
 DIST httpcore-0.17.0.gh.tar.gz 82103 BLAKE2B a12d2843cd19f98d86868802fbb5af37f7223e6cbdb64ec4a36bda93237543d940cc7e71647ffbee67de57b46900a9496f2d3019d9bf0ac4cb74f5d13232708d SHA512 4bec9830df75b35a470e745955058e86cb4cc59c0eacef8d67d76be91c9297009f9af2bf745bf553607a60ff5fd2eaee5b8a497bb8b48ba3daffa08e80188ef4
 DIST httpcore-0.17.1.gh.tar.gz 83752 BLAKE2B c534ce92d11a719a5049677a9d73269a991f607460d4560a3faad0917a992a0d609f91e6f98f9fed87a52e215e1a53d8287cf84268042ae17300ba7d1091e5ee SHA512 73935a22e6f91a4f9e49865066badc9b6f4ade342d294a2e419d5381ead18d2bd5f4e9cee4bfabfa66e8d0a0796d62a3def906dd0e9924b9e5c1d682ceb7edce
+DIST httpcore-0.17.2.gh.tar.gz 85086 BLAKE2B 74f748c0135cbd0551b3d1cf22b655e9d8e26f517790d08e9cb10f10cc7eecc09187e755e429fd9620f6f845be1abc3a7fde2a4d8ce557d57296d1777aaebc81 SHA512 429451323b31006eddae88b2f5575bb4b672206056d466e274f0667c185f196bedc06e82ed3a824836d56360004ba368370bca88656c3c998d61f7382c990296
diff --git a/dev-python/httpcore/httpcore-0.17.2.ebuild b/dev-python/httpcore/httpcore-0.17.2.ebuild
new file mode 100644
index 000000000000..98686208df69
--- /dev/null
+++ b/dev-python/httpcore/httpcore-0.17.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.15[${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
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/hvac/hvac-1.1.0.ebuild b/dev-python/hvac/hvac-1.1.0.ebuild
index 91dde046d2ad..5ac3568acd74 100644
--- a/dev-python/hvac/hvac-1.1.0.ebuild
+++ b/dev-python/hvac/hvac-1.1.0.ebuild
@@ -33,7 +33,7 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/semantic-version[${PYTHON_USEDEP}]
 		dev-python/werkzeug[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7a54f5b6a126..48d45714bd27 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,9 +1 @@
-DIST hypothesis-6.71.0.gh.tar.gz 9357031 BLAKE2B e4a83a94bb6971c3ecba4cc69655f9da23a83ab48332a7a748ca7364d9e549a671bf466e32f6e65447f809a9917fc8fd2548dd26764173ea5849a4df3e027b54 SHA512 dea1d5ec1b753649345edd784183f171531adb583e33d0e5d12b14554169fa054e05f4c16135171c708c208b42968082b3ce79cc0441efccf1eff6da37c59f97
-DIST hypothesis-6.72.1.gh.tar.gz 9358351 BLAKE2B fbb760194c944cc939e9a9b83a461be22f9e5081d865f0dfa3834375d464714178dca64b9e1993fa4b0855e90f6e133a81d22699acc91560f60f137e8589798c SHA512 1a9d4b103f714e27ec5e33efbdfda0cc3febbe77caf6f605db7fb3b2df857712682a3cce80e75f45f9cd88b1715789d7fc2c5a7d50edbf66a699f5381e2671e5
-DIST hypothesis-6.72.2.gh.tar.gz 9358396 BLAKE2B 0f93935523f0f56ec570f1434d33ac7fc51ef57a37c439a8982f6e4be9177fb3eeaa997861541b79857f70d2118501a4ee8feb106face33fc714544c176a9729 SHA512 b7dc8832fc487f263c4bfa3ed1d172bbb1e5ecc4b5bf82cdbe456dd935b2c2541bbd663b16f51d1bacf47caec864ba970f470f68557a72e808d1e5a3067e7531
-DIST hypothesis-6.72.4.gh.tar.gz 9358883 BLAKE2B c877e98140d767b7ac5c9c968f21f1ae26fc7405a740fcdeafb3191a7608da17791b49ef769f0373efeb39a1ef16a519335072dff2a6b88a71b300eea4266dad SHA512 e94b7c70f775337084f43cfd8088a43919383a66f4e8896e1a9bc27e282a718083b3a38c49c25e57eb22688a7fbd8f76fb8809a42cd0d7c4dbc69a415cbe952a
-DIST hypothesis-6.74.1.gh.tar.gz 9364092 BLAKE2B 917b98aa86319c902aff8dd7603b02e94722a4d4b22428bd981f130d2dfac3c85eb5a15c98486ea709ce9f4f6ef2f882a6c3263b650128349a2fb0737b134728 SHA512 ad6e53579434c15ae843d827590275955848575e8f10899178289f19ae7b5c23a60bb2ac329ed782e2018635ac5c62fc08336c3454ebe1987fdf64d4ec4cb5a6
-DIST hypothesis-6.75.0.gh.tar.gz 9368603 BLAKE2B 8f98fc5b2cf24feb8ea9e417d7d75930ba7cc1ea889222ead0b1a4992ac6e7968542263d2da595598f3dd22a8c60803d10d2657c46df5784a901f382f3f8c4c7 SHA512 d4214511da6e6a628c7fe81a756d2462448d01b0c45fc7816156859ed28cc405c9b64aa2c38aa55602d6d977a6366a3423bbe8dbd00f9e5970091ccfc63dfddb
-DIST hypothesis-6.75.1.gh.tar.gz 9368674 BLAKE2B 4a25c1537a5aecf0cd06850fdc8d034621a1f0a1593fb957bb671a4cd463d6ae0013b1e1b3906505f7eba7597ffda2bf698ecf594e1de6e37eaef57201a83094 SHA512 3f3b48ec93f26756c760859af489783ad2df3c93e76b9110d40fec74ffd23de07ba76f897262950f0d97b36daff7ac1f2e319f9f75b6132a9113932e3982ec5f
-DIST hypothesis-6.75.2.gh.tar.gz 9369020 BLAKE2B 48ae323b529eb9fcd2b77be03b4fc5e60ac9f0b7854e61a42000f2cf0e33bd8afc173bdf25a4350f1d134f53944042b9ef13e5dbe1aa10cc5a95228629b5f34d SHA512 ef5eeb97fba78d769f97b3855665dcca842d7ceec4b83f2ae99e0f4309e00ab91e4ab603454868499b654fba29314d0bf9523ad3db3d322ffa7aedfad86b3c64
 DIST hypothesis-6.75.3.gh.tar.gz 9369491 BLAKE2B bae51e4f280a0773d4101b5b136ad994cb7eaca64a0a030bf3a9346d15a3caf7864bfc2f92bdff9eaabe83abc492b7e6cf31b19771470f6d680dbea9c83b31a4 SHA512 2e31f2f5483abf4c749dc3ef2758e51b62072e36f257777cecd71ea8f67a08987f5547bc9476dd2dbf8e9a6488fbe76d3d8ae83666bc2e80a2f26ea807cb15aa
diff --git a/dev-python/hypothesis/hypothesis-6.71.0.ebuild b/dev-python/hypothesis/hypothesis-6.71.0.ebuild
deleted file mode 100644
index 3161f387e515..000000000000
--- a/dev-python/hypothesis/hypothesis-6.71.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..10} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.72.1.ebuild b/dev-python/hypothesis/hypothesis-6.72.1.ebuild
deleted file mode 100644
index 891854a7fd81..000000000000
--- a/dev-python/hypothesis/hypothesis-6.72.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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.72.2.ebuild b/dev-python/hypothesis/hypothesis-6.72.2.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.72.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.72.4.ebuild b/dev-python/hypothesis/hypothesis-6.72.4.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.72.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.74.1.ebuild b/dev-python/hypothesis/hypothesis-6.74.1.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.74.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.75.0.ebuild b/dev-python/hypothesis/hypothesis-6.75.0.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.75.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.75.1.ebuild b/dev-python/hypothesis/hypothesis-6.75.1.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.75.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.75.2.ebuild b/dev-python/hypothesis/hypothesis-6.75.2.ebuild
deleted file mode 100644
index 941ac3080747..000000000000
--- a/dev-python/hypothesis/hypothesis-6.75.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.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}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-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
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		EPYTEST_DESELECT+=(
-			# failing due to warnings from numpy/cython
-			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-		)
-	fi
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-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.75.3.ebuild b/dev-python/hypothesis/hypothesis-6.75.3.ebuild
index 941ac3080747..a66805b00e50 100644
--- a/dev-python/hypothesis/hypothesis-6.75.3.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.75.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{9..11} )
+CLI_COMPAT=( python3_{10..11} )
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="threads(+),sqlite"
 
@@ -25,7 +25,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
@@ -59,13 +59,30 @@ python_test() {
 
 	# NB: paths need to be relative to pytest.ini,
 	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
+	local EPYTEST_DESELECT=() EPYTEST_IGNORE=()
 	if [[ ${EPYTHON} == pypy3 ]]; then
 		EPYTEST_DESELECT+=(
 			# failing due to warnings from numpy/cython
 			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
 		)
 	fi
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		# these look serious but affect hypothesis only partially,
+		# i.e. many revdeps will still work and since this is a test dep,
+		# we don't need it 100% perfect
+		EPYTEST_IGNORE+=(
+			tests/cover/test_type_lookup.py
+		)
+		EPYTEST_DESELECT+=(
+			hypothesis-python/tests/cover/test_complex_numbers.py::test_allow_subnormal
+			hypothesis-python/tests/cover/test_lambda_formatting.py::test_can_get_descriptions_of_nested_lambdas_with_different_names
+			hypothesis-python/tests/cover/test_lookup.py
+			hypothesis-python/tests/cover/test_targeting.py::test_disallowed_inputs_to_target
+			hypothesis-python/tests/cover/test_type_lookup_forward_ref.py
+			hypothesis-python/tests/cover/test_uuids.py
+			hypothesis-python/tests/quality/test_discovery_ability.py::test_one_of_flattens_filter_branches_{1..3}
+		)
+	fi
 
 	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
 		tests/cover tests/pytest tests/quality
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 3c8f0527759f..e3bc5a358deb 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,5 +1,6 @@
 DIST imageio-2.27.0.gh.tar.gz 405391 BLAKE2B f013de16f460e04f5d30c7bcc3c64dc05cd2ca74b359ffe43f2f84e850bec907f899f8c2cc8bcd2a6594767746bd52bd8ae8f2f0c7bd9a3fe6b5450ef043830c SHA512 28d42b59d5c59c679786fced4d3f616d8ac832da0f76da31337875404a8382e66ead6531e02ec94099f481ce84aad5271199b16eadef03bcd5db9978010a7132
 DIST imageio-2.28.0.gh.tar.gz 406506 BLAKE2B 4021f872cd156461f216047d612ee985779e3cd1bb4d05e82ed12eb7582737ca60d1462a4d8fadeb56dd2aa197763f70f9aac5a1dced884276cf13bf43fdb990 SHA512 ba3aad7e32dd0468b9fc8ddc76c79b89be3e805a0d903b5fe6ff2279996db288b6809be6bc231f95751e1f55c8b12dedaa8b6c7635ba24a43f902f41f9bccf0d
 DIST imageio-2.28.1.gh.tar.gz 408022 BLAKE2B f2ee9f9e7daa875393c0f3fe11539cb50bc56e88aeb3d0362e1cf5aa01322c2a211779d2b142d95ed483a53a896605b2e0c557d5d05c4e295c8d3a403a392f31 SHA512 82b14db674de5b03b5f303acabfb94768278b635fe70fd09623c73ec5dcad5965ad7341a07cc41af71bbb0e5548bc4d79d20e510095a2bbaed50061b435bfc7a
+DIST imageio-2.29.0.gh.tar.gz 410455 BLAKE2B 537f732383b7fa90b07c66c37c1f4f4d6f8934df990730b35c2232088f6a177c971247551c8019c9f4d5ee0b70fd0a7af308530368f2a29a01675585d8119bfd SHA512 3214274ead4b84a88a3bf40eb6e6ae4b0b7fa2819ae87ff3aa2cf9b19b3c57b6217d88bf9a81609ea746ac534061642164c9c5780388a6f6c7c6f4431459d0a5
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
diff --git a/dev-python/imageio/imageio-2.29.0.ebuild b/dev-python/imageio/imageio-2.29.0.ebuild
new file mode 100644
index 000000000000..30875e33909b
--- /dev/null
+++ b/dev-python/imageio/imageio-2.29.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+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
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+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
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+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
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index aaa199db0a2d..92c8e44158d3 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,4 +1 @@
-DIST importlib_metadata-6.0.1.tar.gz 49963 BLAKE2B 8f915035334965ae373977814d335b66028f85372f96a9815fe3e59ca346b60d64c16e147e8a9d1ce44e26b31851dcfbda84002fc1a0d93c0d154115f5acec4e SHA512 9ee241a8865d181fae103e643ae618f46541ba9aab299df32892739db991d78b4199df436f77d7c28aeb736e4c2cfb38301cb7133d8baff3c149f4421e0431a1
-DIST importlib_metadata-6.5.0.tar.gz 53101 BLAKE2B a22b48f3ea927c9588fc15f4731c8ffd2a51fb3544c0c74ab48d44a3949f2d981c63aa3714914e02ac3a8035ca0a0e726f790672fbad9e39e3158e251d90f7c5 SHA512 c581ff46d601a239ba9e83114a18b1fc5c0245c215752b8313624fbef6b441eac7cebd4e021d09f12d26ba30715b99475eeeb66befc49bcd609f1b53b79f9bfd
-DIST importlib_metadata-6.5.1.tar.gz 53080 BLAKE2B 9227d37e6e74e255cb93f3daecc4c1fbb34c4b7af5ab172f454aa514d41bcb061f96dd94757984da979192ec72e8fb7d8e02b688d834004ec077c8e0fdd05dfd SHA512 e7d0db1d16f31be3613aabae74d5fa2d75b122f622d87aa9e20e65662244f108af715f2cb2dcaeb43f9dccb1ad7c8a6f7f7ec1f17fbcd1ddd1b4c4febb9ef8e8
 DIST importlib_metadata-6.6.0.tar.gz 53379 BLAKE2B 1de02ce55dc4996d5c7cb221c77ce0b7203ab38e37d0700b5044fc44727737332e02d9da052210b687da817b467eb40708621e85ee5b2501fb2228a9890f259e SHA512 19a24ff5cd7a81caca09b6d273f509880f5c84d5f1683422bb2ec201eb15866ee0f155b7885eec97ac5e53342bb860767b1125c62bc44b7d5c1984f62068c6b2
diff --git a/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
deleted file mode 100644
index b04cfe1fd8e7..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-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-6.5.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
deleted file mode 100644
index b387e95796ee..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-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-6.5.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.5.1.ebuild
deleted file mode 100644
index b387e95796ee..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-6.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 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=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-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-6.6.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild
index b387e95796ee..b04cfe1fd8e7 100644
--- a/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-6.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 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"
+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}]
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index ad645e1c84a7..4d4fd5b5fcb4 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1 @@
-DIST inflect-6.0.2.tar.gz 70830 BLAKE2B 8faa09c53f836429b6e1a2965da3c4315260e1cb3ae7dc40fe226d7f4595e9bd54498167c044f67fed5f79e2997af5425cc13680b9c2b722ffd702095f60b038 SHA512 ddb0439eeffbd21b3293208eb7e89f97fe556a3ba1e88de7e15d1c6bc5a59cdb25a224d7cfec5a010dd384728b15317c1dc752e3a8d4d95dd6eea8224a4f2877
-DIST inflect-6.0.3.tar.gz 71294 BLAKE2B ead85b2e17cbf82a1a8cd4a7a0948b43462ab40dc2bd457eadf02c4cbc4e1295c6195da4baafa84cb5d8c6c4df0bcd6439ff2004fc424bc21e786f2e423632f3 SHA512 5bcd40b71301cba7890b31720aca3261224ec909ec3bbe6830e847f040b10daf91ff73cbe8d46c8835aa391a76c88342b268142393c5b96dafee90e668dd59ba
 DIST inflect-6.0.4.tar.gz 71131 BLAKE2B 24ec6f25462594fde4558f7a4269c68d31989ead54c982f3a4382b5f0c192fd5fcac7544413fecef0abaf7c3fe2f9b4a8049fc7dc7d324e4397fb6a81763ef8e SHA512 96aaa74b3e8c5dcc91d81af336af73535826f3cedaa556d6baf540ca54db1a7c1f17a372c240446c0d81697520eab154bad4f0aad6195c6ab8e131ae443d3811
diff --git a/dev-python/inflect/inflect-6.0.2.ebuild b/dev-python/inflect/inflect-6.0.2.ebuild
deleted file mode 100644
index dc7a9f941e77..000000000000
--- a/dev-python/inflect/inflect-6.0.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-6.0.3.ebuild b/dev-python/inflect/inflect-6.0.3.ebuild
deleted file mode 100644
index bed66f9efd9d..000000000000
--- a/dev-python/inflect/inflect-6.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="
-	https://pypi.org/project/inflect/
-	https://github.com/jaraco/inflect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/inflect/inflect-6.0.4.ebuild b/dev-python/inflect/inflect-6.0.4.ebuild
index 1b37465c68d2..cb6bab791d43 100644
--- a/dev-python/inflect/inflect-6.0.4.ebuild
+++ b/dev-python/inflect/inflect-6.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
index 9d8748ef3ff3..0c97430b866e 100644
--- a/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.11.1.ebuild
@@ -7,7 +7,8 @@ EAPI=7
 DISTUTILS_USE_PEP517=flit
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+CLI_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_12 )
 
 inherit distutils-r1 pypi
 
@@ -28,9 +29,11 @@ RDEPEND="
 # needed only for CLI tool, make it PDEPEND to reduce pain in setuptools
 # bootstrap
 PDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/inflect[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/autocommand[${PYTHON_USEDEP}]
+		dev-python/inflect[${PYTHON_USEDEP}]
+		dev-python/more-itertools[${PYTHON_USEDEP}]
+	' "${CLI_COMPAT[@]}")
 "
 BDEPEND="
 	test? (
@@ -59,6 +62,19 @@ src_configure() {
 	EOF
 }
 
+python_test() {
+	local EPYTEST_IGNORE=()
+
+	if ! has "${EPYTHON/./_}" "${CLI_COMPAT[@]}"; then
+		EPYTEST_IGNORE+=(
+			jaraco/text/show-newlines.py
+			jaraco/text/strip-prefix.py
+		)
+	fi
+
+	epytest
+}
+
 python_install() {
 	distutils-r1_python_install
 	# rename to workaround a bug in pkg_resources
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 42afb08ebdbb..e111ea29c882 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -7,8 +7,6 @@ DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
 DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31
-DIST jellyfish-0.10.0.tar.gz 125949 BLAKE2B 6d6d532e56d9a93d17fd999ab9811592ec070a9913a261a9a2350624ee2d8831b7587854fc3f467e03875f325a2ea1fd7d6c66b2e8295a87f43560ea3c8dad99 SHA512 e28fef7ed2c3408c40ff9b8384c8252fd48f026f5683efead50b4fcc41063c0f1d402ed399ed0b69e512a1c86633eb9c7bad44d7093e5b63ca1ed1bc1594518c
-DIST jellyfish-0.11.0.tar.gz 261664 BLAKE2B 89f110644abbe3c62df29e6591a11316202720f9da90ff0320598bd6c71690a0cc42e6453824e2835d45751e5714f443f334dfe1aeb9871a87cd4484fd1909b4 SHA512 6454c46a2df30bdf2257a854297c8c9f50b430ece333c54698e5296594ab65c6822051af0b10d0d64b911f30451f231663bc27c903e9b3e3dd310ff5d895671b
 DIST jellyfish-0.11.1.tar.gz 364769 BLAKE2B 4850075d026b39bb30894187a11be00a08a48116f118b945a820805681aac8ee1cef748c2d2cdb21896cdf6bf4145f4464d3df4c5266d622994bf72ddf75a1b9 SHA512 f62da9eb1c567c321ee996eb4fe6b856bb77e60d1723ad013fddee484804655492c3ff9a44ff37b04275638996d233c1606ea34c893fd419615c0ac0113c3dca
 DIST jellyfish-0.11.2.tar.gz 362969 BLAKE2B 6090aa17d581142b7aef539e899bf47f486602bedb5be55877fd088579d74145beb3a2c91854c9785317b97d1f926efb9943c693853efb613120e332ffc6dc5a SHA512 083b1cd4b3048b5a1d1e9bb48805e3049e00a65c8f92fabf28e6c788164c77a22f207794ed00bb16851bd3e6255fa9b38a36d0467bc027db49a379d50e9d2335
 DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b6905666fae04e2879f975f0129788898ca2ccd214d721af42a8b2fa86b26355d6baa0a81c223b56c658ee66dd5 SHA512 f450fe619ea2f45e4ada2567981987f19d35a9f13f88a0ce3a53e1751c6fbff708ca69fa6a64d807cce5dfe18b08751f0695d8a01e68e269da1aafc831528b7b
@@ -29,7 +27,6 @@ DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.158.crate 77018 BLAKE2B f086e91674f37c0601c36c28362a74875a710bdec890b2839e29ac3f5e99e419bac37c0fc29539ee117d47d26b1a400ac6909d42a6da85c47535aa52bf261079 SHA512 9b8a416206f774ed2e2d82883a45a8e55ea954a2ffb3064c9a4b1241cec6c2e455e40a2a4a53efbb3d63ccf17a274408a9acf9bb6fcaf9caa7ac97404bfc4982
 DIST serde-1.0.159.crate 77014 BLAKE2B a377be7b7a0624ca9449d962693100d4ee892a252b4fe1326dee2057a214029ecacde05aedb7f0adcebc9815e6b4ea7ec2096ef4db4c55526defdef88a20cc25 SHA512 4e5373b940b5328fabca35759e8a02816c89692b83996c6224be39365b6409688ef2db0eef24219381003133a31da93a41b500a76aeb1b84c05df9a91ff4844d
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
diff --git a/dev-python/jellyfish/jellyfish-0.10.0.ebuild b/dev-python/jellyfish/jellyfish-0.10.0.ebuild
deleted file mode 100644
index 803262c299c1..000000000000
--- a/dev-python/jellyfish/jellyfish-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="
-	https://github.com/jamesturk/jellyfish/
-	https://pypi.org/project/jellyfish/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-src_test() {
-	rm -r jellyfish || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	epytest --pyargs jellyfish.test
-}
diff --git a/dev-python/jellyfish/jellyfish-0.11.0.ebuild b/dev-python/jellyfish/jellyfish-0.11.0.ebuild
deleted file mode 100644
index 61437f2a2948..000000000000
--- a/dev-python/jellyfish/jellyfish-0.11.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-CRATES="
-	autocfg-1.1.0
-	bitflags-1.3.2
-	cfg-if-1.0.0
-	csv-1.2.1
-	csv-core-0.1.10
-	indoc-1.0.9
-	itoa-1.0.6
-	libc-0.2.140
-	lock_api-0.4.9
-	memchr-2.5.0
-	memoffset-0.8.0
-	once_cell-1.17.1
-	parking_lot-0.12.1
-	parking_lot_core-0.9.7
-	proc-macro2-1.0.54
-	pyo3-0.18.2
-	pyo3-build-config-0.18.2
-	pyo3-ffi-0.18.2
-	pyo3-macros-0.18.2
-	pyo3-macros-backend-0.18.2
-	quote-1.0.26
-	redox_syscall-0.2.16
-	ryu-1.0.13
-	scopeguard-1.1.0
-	serde-1.0.158
-	smallvec-1.10.0
-	syn-1.0.109
-	target-lexicon-0.12.6
-	tinyvec-1.6.0
-	tinyvec_macros-0.1.1
-	unicode-ident-1.0.8
-	unicode-normalization-0.1.22
-	unicode-segmentation-1.10.1
-	unindent-0.1.11
-	windows-sys-0.45.0
-	windows-targets-0.42.2
-	windows_aarch64_gnullvm-0.42.2
-	windows_aarch64_msvc-0.42.2
-	windows_i686_gnu-0.42.2
-	windows_i686_msvc-0.42.2
-	windows_x86_64_gnu-0.42.2
-	windows_x86_64_gnullvm-0.42.2
-	windows_x86_64_msvc-0.42.2
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="
-	https://github.com/jamesturk/jellyfish/
-	https://pypi.org/project/jellyfish/
-"
-SRC_URI+="
-	$(cargo_crate_uris)
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-# this version is missing test data
-# https://github.com/jamesturk/jellyfish/issues/180
-KEYWORDS=""
-
-distutils_enable_tests pytest
diff --git a/dev-python/jellyfish/jellyfish-0.11.1.ebuild b/dev-python/jellyfish/jellyfish-0.11.1.ebuild
index b729142f6683..22134f7be341 100644
--- a/dev-python/jellyfish/jellyfish-0.11.1.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.11.1.ebuild
@@ -69,7 +69,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
 
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index ba4e36dadfe1..62752d0b4b86 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,3 +1 @@
-DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
-DIST jupyter_client-8.1.0.tar.gz 335241 BLAKE2B d9491f958b21ba09494bf42ff5a3bae786388a16c007f5756df8900fc53c6fdb4d67bff09b16290338d07fc3c3466483f20ab82482fb235e0e55481294eaeef1 SHA512 21317e5ca61b72408e94116f0be545753088d891742579fcf7a451be179a7783dc153d2898e0ff50ce06017f90cb48f907a5bb056090b13ec0da2af7287f6dcd
 DIST jupyter_client-8.2.0.tar.gz 335567 BLAKE2B e02f8813d12ec8ba0e15291dad04cfaeeb98ea524050a10d142d74af203e43aa1c2e22e7fd7b071c05831b3dd644985a42e38f59fee65f4570e5eb88bbc9fbb1 SHA512 1337c4f2d93d9cd2ae5e3d8f30a8e4af69dad6e09c97e949d9300df0668be4da91134c73da06eb417c10ff2c09fd7beb28699e7a17502ceee3453cb9323b4363
diff --git a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild b/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
deleted file mode 100644
index 163bdc2ea71f..000000000000
--- a/dev-python/jupyter-client/jupyter-client-8.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.{8,9})
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO: times out
-	tests/test_client.py::TestAsyncKernelClient::test_input_request
-	# TODO
-	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
-)
diff --git a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
deleted file mode 100644
index 8e6e3ec2c32c..000000000000
--- a/dev-python/jupyter-client/jupyter-client-8.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_client/
-	https://pypi.org/project/jupyter-client/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.8.3[${PYTHON_USEDEP}]
-	' 3.{8,9})
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		>=dev-python/pytest-jupyter-0.4.1[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO: times out
-	tests/test_client.py::TestAsyncKernelClient::test_input_request
-	# TODO
-	tests/test_multikernelmanager.py::TestKernelManager::test_tcp_cinfo
-)
diff --git a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
index 1caf33879312..9eda37c88a20 100644
--- a/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.2.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="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"
 
 RDEPEND="
 	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index d6d4146edd2e..ce1418c30da9 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,3 +1,2 @@
 DIST Markdown-3.3.7.tar.gz 324130 BLAKE2B 4ecf804b81181a9895e15d2f54881544648939f2bb772b036aa84dc8bf57b7976c6ebdf8549041b39a303bd7c68c16df3c126463a8da19b3c92f99b420e9ffb9 SHA512 39b9f45939be9e842e90470307c3aeec88d1389439b0c7a0c5b39f6e203b51d3a52ce431c4d5c278f399552c4218fc1a619b0efc56883de50a9f300f42120f4e
-DIST Markdown-3.4.1.tar.gz 322554 BLAKE2B fd7c8b930097f9b1a52d210e22d49311579b952f758d071ac3105badcbca19f798bcb195cc35acbe6224e1f7ac916ae5fb1baa35b30464e4c243b08168007be3 SHA512 73b0006ac8aaf281a2dbc2c14534853dbb7ab26a620f3961975279feb83334b6868fa4bbcd30767189201a0c84e502dacd16783de3808393699ace0cbaab30a8
 DIST Markdown-3.4.3.tar.gz 322175 BLAKE2B 628f6808f16299f22853116da94d7918d19b6195981f591faedda6a2ad15751df2d1e209eff922ba921dc6309cf35b7b82968a0c444544b8014918c73f8bad8f SHA512 9dec3f9e13ae73c45aa23a9ddd62d8103af83357e2c4fe447f079281bf3917d1ff43d9abf1903aa146baa46249e7f83b9e5f05756862f0de068304d2290e77da
diff --git a/dev-python/markdown/markdown-3.4.1.ebuild b/dev-python/markdown/markdown-3.4.1.ebuild
deleted file mode 100644
index 2f9b02409000..000000000000
--- a/dev-python/markdown/markdown-3.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-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/
-"
-
-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"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/importlib-metadata[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-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.4.3.ebuild b/dev-python/markdown/markdown-3.4.3.ebuild
index d76acee98906..433541e586bd 100644
--- a/dev-python/markdown/markdown-3.4.3.ebuild
+++ b/dev-python/markdown/markdown-3.4.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 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"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/markupsafe/markupsafe-2.1.2.ebuild b/dev-python/markupsafe/markupsafe-2.1.2.ebuild
index a0606f33c5b3..dbecf75460f8 100644
--- a/dev-python/markupsafe/markupsafe-2.1.2.ebuild
+++ b/dev-python/markupsafe/markupsafe-2.1.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN="MarkupSafe"
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index ea4869bbe749..b7aad1714850 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,2 +1 @@
-DIST mock-5.0.1.gh.tar.gz 84539 BLAKE2B ac50d187974a671db096222af0d0f27add771959553387ca8402951c17ed8e2b9669fff7b147fbc7aca25abc4b5006f5f9d3c2b13f6626a9bea140f6738b3f78 SHA512 b387137632237fa9079a0f70d8724e28bc1833c49d6e14f8fbc357064cf495f6177c783db9448343c0bea98936fc5c3667ce625f5dcdaca851a2f9cc7e3e5639
 DIST mock-5.0.2.tar.gz 77477 BLAKE2B 1a85d7af3b6444343495980c5169be0373d09c2d91cc68674a1d221edd764642b4de42ec7b58973e8ff9748089f61795bbdec00eee1ab216df77ea42b6c47b1e SHA512 f1fecc4ade7eaeb158f3b4dcb5a9e5ce28c666727722f75946bdfff2600f3c590c2833f972cfbd928fc42bcb05b5bac11790ef9f8ff6389a80bfa121f232686d
diff --git a/dev-python/mock/mock-5.0.1.ebuild b/dev-python/mock/mock-5.0.1.ebuild
deleted file mode 100644
index b05e69e67a0b..000000000000
--- a/dev-python/mock/mock-5.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="
-	https://github.com/testing-cabal/mock/
-	https://pypi.org/project/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"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	local DOCS=( CHANGELOG.rst README.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mock/mock-5.0.2.ebuild b/dev-python/mock/mock-5.0.2.ebuild
index 64aa58d1513e..89f819f18d2d 100644
--- a/dev-python/mock/mock-5.0.2.ebuild
+++ b/dev-python/mock/mock-5.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/orjson/Manifest b/dev-python/orjson/Manifest
index f5ef3fdc4886..fdd5e26c22c4 100644
--- a/dev-python/orjson/Manifest
+++ b/dev-python/orjson/Manifest
@@ -16,6 +16,7 @@ DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b690
 DIST libc-0.2.141.crate 671145 BLAKE2B c0e37825ac3fba376e942a0e2c2aeefcab384b24c50a453d1948376cecb3f953d59735e37aef8a9ca7ae707fc6b4818823fae7330f213bf084e5460a82dd3ed5 SHA512 29d81f440d62fa1c9f7983c38138994e61f4897761a50a4f14abce1ced85a8994c6f0cc0ce86f77113b74495e36ddbebae6627f0b94c44621620a395a6723cdd
 DIST libc-0.2.142.crate 679343 BLAKE2B 4168a8c3766bbc4f5adbd4babd84757cb81bb3c8cc806b8b5c1381a88ddccbb8bf55ae84f2879ab26adda09a3d44d21e2708dc9bce5d4868663fad8dd0f0e086 SHA512 8eb465fea8bfa865aa592185ea2dd89a6d89252b0e44fb7398ae82c9fa031d501fc3a1c37e50d1971be528c6e1a4ca416da224ba82e5a8766ec598464593afdd
 DIST libc-0.2.143.crate 681601 BLAKE2B edce6a36697c4c0f9b31e6c380235c0f36c39b98316cc35ed341ed2d4d95aa2a50dad3e9d0d44330e6a5cea77191f97e79703f298f3e1cbebed1a0eaba71014b SHA512 245590127b37b5c3f66392f8f143f872f769f283c77b68b88e23d5e14aa1b9770347021f4d81e81225ca4ed09db6e925d47602131edd83c6d995875766824b6e
+DIST libc-0.2.144.crate 682092 BLAKE2B 1f699cb880a65baf9210527789abb35fe8be9565828d061e12b5c76330e21babab67b21e9a44be6a706f643f3c8b98503a3b40482183188b49f33f96a2489a68 SHA512 576da68e3845a7149f64bee425529ffec4bbb8df0272790182e49c8bad5b9744de21ffb5c1206753b57b7fe45af02c6c429e16522b72a77e5262482d64df5692
 DIST libm-0.1.4.crate 110593 BLAKE2B 5018f4efbc8fd45ff88a28e92c273bb3b48724009e17eadd0d4abb8e34b0fc8784607f71eebaa2f308dedb3185969f092d4305cd1d2cef7a53f7d8774390e38f SHA512 6bc647425ec8be5995ad4798427a86e28282b06532b8e6a53745e2a2ac16652d087b84c0946a4858a49d98995b9e543e1764765d270bf5569cd2ad92d52b81f2
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
@@ -23,6 +24,7 @@ DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295e
 DIST orjson-3.8.10.tar.gz 836541 BLAKE2B 90c7e1a298ffd4af93f26312f501c558a642116c482ee21e9304aa363d1ea95aa817021dc7e5d150c94b5fa8b174c489546e364dba434add77eccfaebe969572 SHA512 68828e9b4dc2c8e2c8675ece61e366e38f027a7eb3058d0ed1f3a65916964ae67bbb11fcea3414c330841b79208fe52b2c18263493f09092c50d73ac0b549720
 DIST orjson-3.8.11.tar.gz 659654 BLAKE2B 3e55bdc18447cf181e580797c96c132070a35790acc25a9d46228e072d3f259622c45bf0310f3d69692520d009dbd7f27a0a40dc53e933ce49eceb591f148b7e SHA512 a6e898ab83abe45f1f285343985c7e638579cfefd5c453ac184a54d02b44f1ea7ab13ca5a3a20ac149e3b93da6a194e963dd816006c49c21abcf8aad9cfb13cf
 DIST orjson-3.8.12.tar.gz 669172 BLAKE2B 7b3b57a5a81c9d77f39f07d5c3349aff65f0628b7bf0ad8aeba74c9b0c18d3a173aed4539db81f4d00c666eca933bc0bad511ecf6e82c9001f520c076653f4d3 SHA512 c2a6a106721e5c84d52ccc255b60fb3da67d442604c5dd5e2dea63a6d52eece87fd3d1d81a2691c1f93b4c21a0f608a8c1ea6b19d8ba4995584a562780ff39e9
+DIST orjson-3.8.13.tar.gz 4213635 BLAKE2B 3bc934f7a851e6d1f7e888fc8d095c40478f372a4737972c58a95c0c50874a9bd0ad8d379782cad2f460deb9af8606aac23743123c7acad00d6f8e1e111aa9cb SHA512 9b458f4a9aadd5985ffc7f2cbfc07485a89c101b5053987995d47e4f574131dcaff8fafa6c132764067bbf33800a2a5fe5040f9884e52c28ca6c87cd9c26ddb8
 DIST orjson-3.8.9.tar.gz 657071 BLAKE2B 7486ecedd2c80e9fd7a7de907f18b3ebea2f7aa992d81f3ac21caa0e515167ad94c516081a0e2a0059dc9ac734f3d98b0da2381db10574f6e35475e9ef824be1 SHA512 a1409de1b099011ac8566110c08502708b42339ab7ff3b1e6600840aa32d655ddf4960128e50fe174278ded119e3996f662fe2faa3d3284ca42c56f2f8bb5d7d
 DIST packed_simd_2-0.3.8.crate 97388 BLAKE2B 89d2a1401efef8e0a665d883b41a587601cd4704a6acf80c542f3e6e274a6fa9c975a03799857c409c8764bf6698784cf85f1fb73b4fab2c4f98b368326760c4 SHA512 de1ff7cc43f6d0f6e2a94073ab80bd178864d375d334c4d8aaf30f8ae3320b6aa470f14b25babc264d9032af0c4fa7663e442321fc91acbd7adc7550b5177984
 DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1
@@ -34,6 +36,7 @@ DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854
 DIST serde-1.0.159.crate 77014 BLAKE2B a377be7b7a0624ca9449d962693100d4ee892a252b4fe1326dee2057a214029ecacde05aedb7f0adcebc9815e6b4ea7ec2096ef4db4c55526defdef88a20cc25 SHA512 4e5373b940b5328fabca35759e8a02816c89692b83996c6224be39365b6409688ef2db0eef24219381003133a31da93a41b500a76aeb1b84c05df9a91ff4844d
 DIST serde-1.0.160.crate 77010 BLAKE2B 45d2585bd7e5dcd368b72c29046bd595c577826da4aea6d019adaf07d23adc096db7aba952037dfdac9dbf08a1e92ababd44cc784ace557fe2cfe83beca446cf SHA512 b03eb453ac01a483843829952462de4e8f6d0fa4a244d38a6f476a911e2e991a508121265befd108134ae7cce8a7a40c4d217f80f3e025f9a612a0bf80862306
 DIST serde-1.0.162.crate 77030 BLAKE2B 27e6a9bfabcd66a2250be36ac9987ec12a864c15eabea4bb793f796a19d85db097bf46426462fbdd22ccde24af3581638c2e14634701a0b14a3bfcc624c40a8d SHA512 e9b112999b69a14f1d05cce985448378c889a497dfa00f86e0c611b17d98fe7d942e9142fdf8c95c6d0a32e2016b3f384b52efae3bd75012c12299b02d055578
+DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34
 DIST serde_json-1.0.95.crate 144618 BLAKE2B beb05d7c37fcbacf4cc7dc04380e818a144a81e20e09ac9aecf6488bc18b142713bd1e9c7bc2ff4d10dd2385ccd280207cd992380bde4616db54f0852141eb0f SHA512 ff9f3f9e9a0e07956923bbac02288915c31f5ee24fc618808bfd4aa4b36ec40ec8d0e4426d926bdbcd019c9a4a6608dff5a651bf92dc5663eaf69c7c060223ba
 DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
 DIST simdutf8-0.1.4.crate 28621 BLAKE2B 94ab48bc899e603acf3805dd45ae8489d565aa39ff79606e80a1731b59d11f429d71bb6c65becf3ceab123767f2d20612cb9f86410fd1aad00d0a796091ad045 SHA512 9f821035e147c035707910227b51e01d3f761ab8b578d95a86a776b2a4da01bc4d8ef28df7ea2c16ca125a2699d8903b826ad07a5937728e33dd58753ebd704c
diff --git a/dev-python/orjson/orjson-3.8.13.ebuild b/dev-python/orjson/orjson-3.8.13.ebuild
new file mode 100644
index 000000000000..e365a9c5c5ad
--- /dev/null
+++ b/dev-python/orjson/orjson-3.8.13.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.6.1
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{10..11} )
+
+CRATES="
+	ahash-0.8.3
+	arrayvec-0.7.2
+	associative-cache-1.0.1
+	autocfg-1.1.0
+	beef-0.5.2
+	bytecount-0.6.3
+	castaway-0.2.2
+	cc-1.0.79
+	cfg-if-1.0.0
+	chrono-0.4.24
+	compact_str-0.7.0
+	encoding_rs-0.8.32
+	itoa-1.0.6
+	itoap-1.0.1
+	libc-0.2.144
+	libm-0.1.4
+	num-integer-0.1.45
+	num-traits-0.2.15
+	once_cell-1.17.1
+	packed_simd_2-0.3.8
+	pyo3-build-config-0.18.3
+	pyo3-ffi-0.18.3
+	rustversion-1.0.12
+	ryu-1.0.13
+	serde-1.0.163
+	serde_json-1.0.96
+	simdutf8-0.1.4
+	smallvec-1.10.0
+	static_assertions-1.1.0
+	target-lexicon-0.12.7
+	version_check-0.9.4
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
+HOMEPAGE="
+	https://github.com/ijl/orjson/
+	https://pypi.org/project/orjson/
+"
+SRC_URI+="
+	$(cargo_crate_uris)
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/arrow[${PYTHON_USEDEP}]
+		dev-python/pendulum[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' 'python3*')
+	)
+"
+
+QA_FLAGS_IGNORED=".*"
+
+distutils_enable_tests pytest
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index c12a7c4f9561..ffd93c16226e 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,3 +1,2 @@
 DIST packaging-21.3.gh.tar.gz 80471 BLAKE2B a16ba1e74f0c868816131a7cb07b7aa0c14760cf3ad4c3d6737ac30ef99276c33b1f018d29e710f28e8d0cfb0e3e6b91e375d1d17e2b7ec6302164377cd503d0 SHA512 8960deacda26877b73d98a3b632e760e902a16ec7a04707f84044980e4d4fb33e4f584db115c9008066aa876079f28633bafe37fbd5ce9a23830b6b89eb4ae7a
-DIST packaging-23.0.gh.tar.gz 84318 BLAKE2B b600fc124e368ce583e16c3f4ee478e5774a830818884ff29c797410675c206b37e3cbac8e9ddd724b40ce53c00b1f0b6a58a9dacc1988e3bf59165b656b134b SHA512 5dd2f4a596e5a1ed01b461a37e063573f5ae08e181df40377a167fe2483205b3d965e10dc403cd173d0f87e0bdcae3cde05bd39024783fbe44541d0f777d94de
 DIST packaging-23.1.tar.gz 134240 BLAKE2B ef7ef320a98592769078581e32fcc355d05f6fbb7611e7bd83fd2ed64d5f5f5d9c1f89c2a4a91ace1221214a9047e233d8d6a339fd29066b3695137ec5a870bd SHA512 0f2246b8bfeb467623ee72e6fdb7c0416e3b4ba0e00102c1528581e0835cc8e731a812b15e2e429d3ebb0001713d95cc2675f443f4597b092e305a3ef2e9137a
diff --git a/dev-python/packaging/packaging-23.0-r1.ebuild b/dev-python/packaging/packaging-23.0-r1.ebuild
deleted file mode 100644
index 6ebb5ce535ee..000000000000
--- a/dev-python/packaging/packaging-23.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
-	!<dev-python/setuptools-67
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --capture=no
-}
diff --git a/dev-python/packaging/packaging-23.1.ebuild b/dev-python/packaging/packaging-23.1.ebuild
index 4dab086abccb..4fcf678a9637 100644
--- a/dev-python/packaging/packaging-23.1.ebuild
+++ b/dev-python/packaging/packaging-23.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/pyparsing-3.0.7-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/parse/parse-1.19.0-r1.ebuild b/dev-python/parse/parse-1.19.0-r1.ebuild
index f5a439b5a2bb..ff89f7a1ed99 100644
--- a/dev-python/parse/parse-1.19.0-r1.ebuild
+++ b/dev-python/parse/parse-1.19.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Parse strings using a specification based on the Python format() syntax"
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 5eb6e4932c7e..d1eb47495063 100644
--- a/dev-python/parse_type/parse_type-0.6.0.ebuild
+++ b/dev-python/parse_type/parse_type-0.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1
 
 DESCRIPTION="Extension to the parse module"
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index bfdc50ac4435..ab7e14ce8e98 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1 @@
-DIST peewee-3.16.0.gh.tar.gz 1085430 BLAKE2B 3acfbbc9d8cce7e4bd1c0027905f4ca44431f376a243adffbfadd4d3f15b4e729c4736076e8ec72c40261ca269c66d811afb6c25b9d075d5913a13869da4f4dd SHA512 f77a040831bd3189135196ede9748c92af9db21127839dfacd7712586273bdd22c688ca22bfa373805fa1b64f770b7cea850cba53e73f324f25ced1305830409
-DIST peewee-3.16.1.gh.tar.gz 911668 BLAKE2B 6336d2edbf85b54dd98b3a67fc9507c626eee1d85293b12cf60d3a733d243d70a7df0583cd6024cb0550f8f31229702404692b0bf588e3c46e104ad64a095f37 SHA512 e89f1a2f25c2675403a560d3fa8eade833f9ef8b2fecfef00769a9633e99cb40feff7c4e1d2e9b001d4e6f50a8dae4594ffe22adfbe64a93035c47f673d5557c
 DIST peewee-3.16.2.gh.tar.gz 912162 BLAKE2B d865a63fb0eeff064b6655029741291ebd002ffa428fe98f87b319874713064eed9500fb45e3710b7e1223ea2537408d51dc4a6f40b525467f074f225c05bf20 SHA512 7e507d9f2ace45c5ec482d657e7722812fae10eea9a23b12caf2611d3739bc6dc70800f21d606d5e854e3209dd6d2ff73b93f004515f6549c3bbc423bce650d8
diff --git a/dev-python/peewee/peewee-3.16.0-r1.ebuild b/dev-python/peewee/peewee-3.16.0-r1.ebuild
deleted file mode 100644
index 43c2a7437311..000000000000
--- a/dev-python/peewee/peewee-3.16.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-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 )"
-
-DEPEND="
-	dev-db/sqlite
-"
-RDEPEND="
-	${DEPEND}
-"
-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/peewee/peewee-3.16.1.ebuild b/dev-python/peewee/peewee-3.16.1.ebuild
deleted file mode 100644
index 6c9f635eddb9..000000000000
--- a/dev-python/peewee/peewee-3.16.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-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 +native-extensions test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	native-extensions? ( dev-db/sqlite:3= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-src_compile() {
-	if ! use native-extensions; then
-		local -x NO_SQLITE=1
-	fi
-
-	distutils-r1_src_compile
-}
-
-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.16.2.ebuild b/dev-python/peewee/peewee-3.16.2.ebuild
index 005ef44d7d46..cc31b5fcb56b 100644
--- a/dev-python/peewee/peewee-3.16.2.ebuild
+++ b/dev-python/peewee/peewee-3.16.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 335b751b7e95..59920b3f9b8d 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1 +1,2 @@
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
+DIST pexpect-4.8.0_p20230402.gh.tar.gz 169420 BLAKE2B 4780621f5876506c5ad2dbf03656d8c336d5aadef99b1ae99e841b5d0a945ab54177cb04a79b526e422cd4df7393c723000e4a28960bd5f57a5e0173b0a3bc69 SHA512 72cdf226ec5c7d60a10fbcecf81cd1ae422467652e104bb818908bf6d1a4a4bcadab9a06d58475a9609580d973956e18e2ab144ab13a0b700072474ff3087259
diff --git a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
new file mode 100644
index 000000000000..6b9f2101054c
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+COMMIT="2532721644781543ca660e52d48a35bd93872fc1"
+
+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="
+	https://github.com/pexpect/pexpect/archive/${COMMIT}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+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"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]
+"
+
+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/pip-run/Manifest b/dev-python/pip-run/Manifest
index 05678f5745c1..90ff1b0efb2e 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,2 +1,2 @@
-DIST pip-run-10.0.5.tar.gz 32411 BLAKE2B ce633d003fa869f199dfdded46efb6bfa9fc4e24327cb99b0176d8e6e6bcff552c6f84589b77907a063fba3315b3f9c64d6c182d70dc39d59a1342ee9fe62193 SHA512 55309445793c101d54fd61303e770ae271cfe2be20e7bc084ca0f4e6363a8de28ffdd7cd1b8c595c88d5c0a99863182053d00d3a4175fa5465ef958401601d66
 DIST pip-run-10.0.7.tar.gz 32869 BLAKE2B ea5dfea09def536eced9436a114f12cbefccf26c4b37376a560dc1fffdd8167d019ec52d57666d7b4d77dc9c580a5f48455d945aa9ddb4340a7dca88f0ded309 SHA512 cd8780372f579005e40c77b3c2d9e582cd1a144e871eec205fd0bd2ff64eac837918211d3479088f56bd3043dbfd883502b2d6f7b01dc24448888f65fdd6920b
+DIST pip-run-10.1.1.tar.gz 33010 BLAKE2B 5a3dcd1e119b65718b465ecbd118d80de776252ecbd438344eb78abc2e4a69073417310ed096f0b604740762aa24af2788041476c93d919ea72812e1597327f5 SHA512 ddf61aa31012567ff21e943739a1e29066875db3c39ca77abfa409fd75abc599756ca8aeaf9bd23d19af46ad2747e7dec4a7d3cf76a444f59c19e769419dc59a
diff --git a/dev-python/pip-run/pip-run-10.0.7.ebuild b/dev-python/pip-run/pip-run-10.0.7.ebuild
index 38206b632c9b..aaab7496c0da 100644
--- a/dev-python/pip-run/pip-run-10.0.7.ebuild
+++ b/dev-python/pip-run/pip-run-10.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pip-run/pip-run-10.0.5-r1.ebuild b/dev-python/pip-run/pip-run-10.1.1.ebuild
index aaab7496c0da..b47278ab67da 100644
--- a/dev-python/pip-run/pip-run-10.0.5-r1.ebuild
+++ b/dev-python/pip-run/pip-run-10.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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/autocommand[${PYTHON_USEDEP}]
@@ -41,6 +41,8 @@ BDEPEND="
 		$(python_gen_cond_dep '
 			dev-python/nbformat[${PYTHON_USEDEP}]
 		' 'python*')
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index d81f6c1fe096..d70f495e3f43 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1 +1,2 @@
+DIST ply-3.11-py3.12-assert.patch.xz 3832 BLAKE2B 5872a2f6c71ee093dfcb12a3a9b80c54091ba2a3d331948ccd88918fd263569a413e87962c607368f23f79abefd0f98738f1e1a33413832983ff3057c1ea021b SHA512 bc145cef28a0947773ee13df4a86fd60b04ebe8a06e563059a32eff55475f54bb99fb7cf7ef73c463d92b8795013b7c9f1aebcdf5a6c4f98d71675710f496b97
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
diff --git a/dev-python/ply/ply-3.11-r2.ebuild b/dev-python/ply/ply-3.11-r2.ebuild
index b861629c8405..c1ae36544f01 100644
--- a/dev-python/ply/ply-3.11-r2.ebuild
+++ b/dev-python/ply/ply-3.11-r2.ebuild
@@ -15,6 +15,7 @@ HOMEPAGE="
 	https://github.com/dabeaz/ply/
 	https://pypi.org/project/ply/
 "
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-py3.12-assert.patch.xz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -25,6 +26,7 @@ DOCS=( ANNOUNCE CHANGES TODO )
 
 PATCHES=(
 	"${FILESDIR}/3.6-picklefile-IOError.patch"
+	"${WORKDIR}/${P}-py3.12-assert.patch"
 )
 
 python_test() {
diff --git a/dev-python/pretend/Manifest b/dev-python/pretend/Manifest
index 08e5f598ee9f..11d840f13f4a 100644
--- a/dev-python/pretend/Manifest
+++ b/dev-python/pretend/Manifest
@@ -1 +1 @@
-DIST pretend-1.0.9.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
+DIST pretend-1.0.9.gh.tar.gz 5656 BLAKE2B 1a8e280fbbf147f502f1148b9e3685630e0f5cd270dc8b6fa8fbbd8177aaa08efe401a6684b669a976d828e7fcdd48d686170bfa3cd3d8a857b78af473a5b6f8 SHA512 976e3272557aecfb11e4147a868ea96e23546e277d57d726f41b945103bef3451039716e6bbc5082d691fa1fd331c06b3d0f8b254deb0510948153571326eaf0
diff --git a/dev-python/pretend/pretend-1.0.9-r2.ebuild b/dev-python/pretend/pretend-1.0.9-r2.ebuild
index c4e5f5d4c692..b984add8fe12 100644
--- a/dev-python/pretend/pretend-1.0.9-r2.ebuild
+++ b/dev-python/pretend/pretend-1.0.9-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/alex/pretend/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
+		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 62ab5e70905c..e5451dcc1576 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,4 @@
 DIST psutil-5.9.3-tests-r1.patch.xz 3648 BLAKE2B df56e3b11da307fdd4441284d1a7928c928b36c512ef05d313ac71e76545eabaca1f6a1ea9dab301c86005ef4c9af9622e0d1c6d7be858b92b0dce9d6031440d SHA512 0d8b35fe76b1caf1265ab4ecf182c92b71714be9612418c945f39c58f384979ed36e47bdf11b11a8cf2fc3925fed60abadf4f3eaea083f6bcd6d2cddb81fb5f9
 DIST psutil-5.9.4.tar.gz 485825 BLAKE2B ce5257e653876fc0c4bb005c964f677c0b4010f853cc7b8ff3451aa1efd7fde6b7e5d2150fb936cd38b667d5c167f180d5cae0792bdf50a8aa2e528795ed9897 SHA512 ff8d6213b153b5a3428e4f65ddbc41cb1f37caae4acab02760632107d95a50a74d3ee563f0cb2d623b37cdddd16425d2084e7f841e4a46af8988a7676f6975e6
-DIST psutil-5.9.5-tests.patch.xz 3664 BLAKE2B 9dfa9d8d4075c19939057a10be318292cae3feecd000aa594d3352fb92c3531c5bf491ce4b3807102181025975b21a9b88592eae7211e6717519a054a5030ddd SHA512 f29e4c6d8325a145b3f9768b98977b990bcc312c1323e189976163c1263b609af0d9b26b3bd7bf1ffe22468067a343822fde9ef765f7b48701fdf62f1774027b
+DIST psutil-5.9.5-tests-r1.patch.xz 3824 BLAKE2B 8e0e704b206c3a05af2fe81f5526b29140e0885929eea78a0df3599ec26d5669289a680056234aff2aca2258c13b292e79362c291a9cc106c2c0c13d7596684c SHA512 0f6cf315a80354495b6d77e1acc92de7130ee62109886d78f8a9241f2ebaa7943384c7f00c05f7bdd3d37d3a7a1fe60c00056600a9765f1cd6ce4d30a324276f
 DIST psutil-5.9.5.tar.gz 493489 BLAKE2B 3db8ce374d9d81dcddc08f03418675318c5e447f9a3347154d025537ba090811926ced822f83ff5fc9239665b091803a30d167465495049569c3c820f7fbb32d SHA512 2afe1bad5359aeac90378faaa609bab855dfcaa58519c939fdadb02e6e2c8157c77f961ac0f90d104626cef3429e1ea2f686e4dc4c9dccf975e3e73e9b08872c
diff --git a/dev-python/psutil/psutil-5.9.5.ebuild b/dev-python/psutil/psutil-5.9.5.ebuild
index b5cf7e029b82..6c36fef1df89 100644
--- a/dev-python/psutil/psutil-5.9.5.ebuild
+++ b/dev-python/psutil/psutil-5.9.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1 pypi
 
-TEST_PATCH=psutil-5.9.5-tests.patch
+TEST_PATCH=psutil-5.9.5-tests-r1.patch
 DESCRIPTION="Retrieve information on running processes and system utilization"
 HOMEPAGE="
 	https://github.com/giampaolo/psutil/
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
index ad9e64d30b90..a70794a3ae08 100644
--- a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Run a subprocess in a pseudo terminal"
-HOMEPAGE="https://github.com/pexpect/ptyprocess"
+HOMEPAGE="
+	https://github.com/pexpect/ptyprocess/
+	https://pypi.org/project/ptyprocess/
+"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index 649eaa476534..8c1f986ed2e2 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,2 +1 @@
-DIST pyasn1-modules-0.2.8.tar.gz 242864 BLAKE2B 22b6cc27d45d19d8e7f5b12c8aeff1fa379bd567fda6b1dc0fafd00c0f4367d32f21cd48cf3cba140f2f11ba7d258140e8014c8420300451ab1acff475d28da7 SHA512 fdfcaa065deffdd732deaa1fa30dec2fc4a90ffe15bd12de40636ce0212f447611096d2f4e652ed786b5c47544439e6a93721fabe121f3320f13965692a1ca5b
 DIST pyasn1_modules-0.3.0.tar.gz 307901 BLAKE2B bfcfd1442b3e9cd542d4f47160b54308ff5ab0373394f55007a1a3963342b8217bd89b5b71dba9e4a69071e805610c3060a28df40249c9b8a1898f941d40e35a SHA512 fedcf95e0452e133fc0735a1be29fb5e7df563243203463c66b85d9af6194a550c78a96fec2d915be1aa6b98428f51b6ed4feb7ed3838c515d044fbafeb2cb46
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
deleted file mode 100644
index 38d806928b08..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.2.8-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1-modules/
-	https://github.com/etingof/pyasn1-modules/
-"
-
-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 unittest
-
-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.3.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
index c07fba634b56..b2d10901e054 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index ab867c625aa7..57a8e949c090 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,2 +1 @@
-DIST pyasn1-0.4.8.tar.gz 146820 BLAKE2B 5c00b47c2014e599d1aa2e14c3004b3688786c7afd160c85709d5a0f324166abb1d29ebbd9f3e13100166e7176710e4dc6e1b8fcf80db5f5bdaa202912f8a023 SHA512 e64e70b325c8067f87ace7c0673149e82fe564aa4b0fa146d29b43cb588ecd6e81b1b82803b8cfa7a17d3d0489b6d88b4af5afb3aa0052bf92e8a1769fe8f7b0
 DIST pyasn1-0.5.0.tar.gz 145117 BLAKE2B dbbec0bebcfe11b8de983716fedf1bf28e6bcf7d5f89e3dcba929884347cc7cd3a8ef8b5ec44bbc799a7bae3de39c90cf5e48111384de571dc2034a79c3bb52b SHA512 763690184ce891555564d76902042791865815e59e1325100fca692140110e5e182ef3da84ffdf96b1876edeb2757bbb09c06d26e752a8110760dafbf9e3ca00
diff --git a/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild b/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
deleted file mode 100644
index b22b2d401b74..000000000000
--- a/dev-python/pyasn1/pyasn1-0.4.8-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1/
-	https://github.com/etingof/pyasn1/
-"
-
-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 unittest
-distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pyasn1/pyasn1-0.5.0.ebuild b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
index 64011b6f4dd8..b22b2d401b74 100644
--- a/dev-python/pyasn1/pyasn1-0.5.0.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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/pydantic/Manifest b/dev-python/pydantic/Manifest
index e7a07de2a6a3..13c1421ab749 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1 +1,2 @@
 DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d
+DIST pydantic-1.10.8.gh.tar.gz 765592 BLAKE2B 0b4cc273ce6fad20baa7c8bd87ef32199cb003f52b8e9aa19eda6359ca0e5c30152c7f25d2bb146ec23027011895cf44d9eb051c6ca609fb00e3d7b5f6089e4e SHA512 3ac41cdf0eb70fb71298131a043966b85387bc953ef2f463ece80728b46251d5d5f66c3f030afc3cdf4527918ae410fcd733a774cbe0c3b7ba9fc806a76378e4
diff --git a/dev-python/pydantic/pydantic-1.10.7.ebuild b/dev-python/pydantic/pydantic-1.10.7.ebuild
index dbff0d90deb1..4aac3a22611f 100644
--- a/dev-python/pydantic/pydantic-1.10.7.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.7.ebuild
@@ -34,10 +34,10 @@ BDEPEND="
 		dev-python/cython[${PYTHON_USEDEP}]
 	)
 	test? (
+		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
 		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}]
 	)
 "
 
diff --git a/dev-python/pydantic/pydantic-1.10.8.ebuild b/dev-python/pydantic/pydantic-1.10.8.ebuild
new file mode 100644
index 000000000000..34a1e86cdd62
--- /dev/null
+++ b/dev-python/pydantic/pydantic-1.10.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_beta/b}
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+SRC_URI="
+	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		<dev-python/cython-3[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/python-dotenv[${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 ]] || ! use native-extensions; 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
+		# mypy linting causes regressions with new mypy versions
+		tests/mypy
+	)
+	case ${EPYTHON} in
+		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/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 4727acc3ce96..e31f19e52701 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,2 +1,3 @@
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
+DIST PyOpenGL-3.1.7.tar.gz 1896446 BLAKE2B 3fd4c84bb59157b4a6ee09c2a5ecd0e4f548bf03a84d735acfd92453eafb92102677a2b9c98831a92be33e873630c815dee453745d630a4d6b044771a13c945c SHA512 add1b4d02e7297f00f82a9c9249d6665029073fe620a1650491af9102a76a16e9320b5f227275b0c273ff5a616c284fd9f25f0f425848676c37cab9f3c22ae2e
 DIST pyopengl-3.1.6-glut-font-egl.patch 1430 BLAKE2B 4b8962045b1efce2b4ec8ca759689d880e8df074e98c8c680172fd01d6cfbae33148cef41c46c7d1231674836d0009626ccedd873fcfe35f644fe9a2aaab2d5e SHA512 a0c491bca31cff312a2f431f89109cbf3aff276aee375325cacc5c6ebe37ad2119072ad7658e11b56efd62b18b8ed2642de999c79b0c999414e44c2b1ec7225b
diff --git a/dev-python/pyopengl/pyopengl-3.1.7.ebuild b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
new file mode 100644
index 000000000000..eb23b2548a26
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=PyOpenGL
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 pypi virtualx
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# The tests need an X server with the GLX extension. Software rendering
+# under Xvfb works but only with llvmpipe, not softpipe or swr.
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
+		!prefix? (
+			media-libs/mesa[llvm]
+			x11-base/xorg-server[-minimal,xorg]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index a236a5a28149..66e8b48655db 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1 +1,2 @@
 DIST pyopengl-227f9c66976d9f5dadf62b9a97e6beaec84831ca.gh.tar.gz 3296655 BLAKE2B 74aca52a9566eb667a36e4e75470da8eca0d4aaa42dce246bcfc4b28e3581235ca6119efaadafa4354c915046931d30bf0b2cd2d0fffb9d87611468a34704b24 SHA512 dad3b4377708d7c7331384e0b3aa3ca69ac943bb22e4136f93b7790092e29ee4cdc254295bd9243203981834bc22a7a02163523177b7f7c581f9384d55ee13c8
+DIST pyopengl-release-3.1.7.gh.tar.gz 3310131 BLAKE2B 37d64a0e0f3ced1965a7285ac7a0afb774b1e5ef630e42d86e40bb65176af7f0aa44accee50d3b32eb87a13c76535a3239359ea2c5bea385e20f1b1ec1a8b636 SHA512 a6cd28b15964e55e8a808477138ad03eb212501d9f4723603c405932963aedca83b91ff19e510ca181cc9800f2a22968b2913b70a975b7797f3bcad112c6c0b4
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
new file mode 100644
index 000000000000..eaea9eacd1a6
--- /dev/null
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=pyopengl-release-${PV}
+DESCRIPTION="Accelerate module for PyOpenGL"
+HOMEPAGE="
+	https://pyopengl.sourceforge.net/
+	https://github.com/mcfletch/pyopengl/
+	https://pypi.org/project/PyOpenGL-accelerate/"
+SRC_URI="
+	https://github.com/mcfletch/pyopengl/archive/release-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/accelerate
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	rm src/*.c || die
+}
+
+python_test() {
+	cd "${T}" || die
+	epytest "${S}"/tests
+}
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index fef86e5a9f4d..27ccb2046679 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1 +1 @@
-DIST pyparsing_3.0.9.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d
+DIST pyparsing_3.0.9.gh.tar.gz 967771 BLAKE2B c13c74661b9e0d53b4886c9949b01951d220991f916362a13ce0c32c0ab05a6b1cab4d5e5a626acb7563c0ec1716348ede205cb67bf22c0710904f07404ad82a SHA512 1158f27e31f8eced540217b7234b09005eac416fad74faf59678fdae93fe2f76e0e3b5f4adfd3ceb42c8aef19150950293e989c9a5189741175073eb7a03cd6d
diff --git a/dev-python/pyparsing/pyparsing-3.0.9.ebuild b/dev-python/pyparsing/pyparsing-3.0.9.ebuild
index 0b239f7a471f..eea27f96ae1e 100644
--- a/dev-python/pyparsing/pyparsing-3.0.9.ebuild
+++ b/dev-python/pyparsing/pyparsing-3.0.9.ebuild
@@ -11,8 +11,14 @@ 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"
+HOMEPAGE="
+	https://github.com/pyparsing/pyparsing/
+	https://pypi.org/project/pyparsing/
+"
+SRC_URI="
+	https://github.com/pyparsing/pyparsing/archive/${MY_P}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
 S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 924c00dc2ffb..97008c313139 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,7 +1,3 @@
-DIST pypdf-3.7.1.gh.tar.gz 7508532 BLAKE2B 917eb7a825781f966d6b268cf3471935b9d245de5465acd428f87cc387a01bf1739d1cddb504498e4e7505a098508a1e12d686ad21ef73960f11bcddd4acca57 SHA512 5834a5738860c341e231a0ba79d9ffbc14d1f683bc781793d962fb8303aac5e6ec825492cd2e470d47fdd166576c5c4be64bbb7a03f7f79b160d456667ce8f15
-DIST pypdf-3.8.0.gh.tar.gz 7509837 BLAKE2B 2acf12b5c43799252641f2c7d0ebd24c1f1eb02b655b0c458eef1049b660452967ff613e17b2eb70330d67677860b58b0f8f99d3af2c2794c4aacb30646b3244 SHA512 a4f33c8f940303958221a48ffbf088c363d7cf9360d5c9d27829b5703735216c32af63262313a25598c3479c4584999a23ac6bf77daa701042ef65314194dab3
 DIST pypdf-3.8.1.gh.tar.gz 7516880 BLAKE2B 87d8cd66c7efcf9624205da904290fe82f51eeb9b521903ec564467755cc9a824ab0660a41d0cbd4a1ada2e20b4b35e16ce3a73a9933aea9fc5e0f315e613709 SHA512 8b78ccc210b8f34b9556cf69cac8f2af207de9a42840a0b4c822c0ab2c0b2d468c5c20a14704d3f54c6b57bcc451c3f0b7ff54b8149616b539cb07be57482e58
 DIST pypdf-3.9.0.gh.tar.gz 7516907 BLAKE2B 12c0a13ee1ca897966bcd2f6a93b50ef1ead8d471ac9543544988a9c03c26a135a91c07b443d3a7b89fd38c302f5c2323994407fdadc23638832ca07eb7571fb SHA512 da9489bfd7c91c497852ce71050548d99fbca8118575c5eec85d55611fdafbe471c1cf7c4c8ef0e46165a89771e557c868f133af325d4672ba897fffffd43c02
-DIST pypdf-sample-files-0c3b1d3879c5cd7d913b3d931fa33b37529d7346.gh.tar.gz 9028862 BLAKE2B 7c72b76724e7b0fb4069c3151c13342d66cc451f398f6826b09dfb5b57e2d2b625118de1f431b5759466c4e6afb5d0c8682c4c28ec2f3b700a6cc39787ec6ecd SHA512 342562a711673030eb729135f27c241f5f37305b0d6f30f555667881e921089b801a3376330d840b16d4a3683d0b6f07824d05e4d208d32a3771ca83a0b7f22d
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
-DIST pypdf-sample-files-d3d250321b01ca1194e16a814d24508897862fe8.gh.tar.gz 9030851 BLAKE2B 63e5778763315aff0753e5a0f06cd55432a494efea921c73e765567aee63223af3f3d81436e22d089008bc38c917e10eb5da7988abd458fd3f3488e8faeed70e SHA512 a8e77982ad78aeb58db7a5a722c9e072d7c55bca7290f448ba388b70256137fc6b9919c8079d8b548407c88b8befe7caeeb65217eb52b6d9bbadfaf652d89e0a
diff --git a/dev-python/pypdf/pypdf-3.7.1.ebuild b/dev-python/pypdf/pypdf-3.7.1.ebuild
deleted file mode 100644
index e4728b9bd7e9..000000000000
--- a/dev-python/pypdf/pypdf-3.7.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=0c3b1d3879c5cd7d913b3d931fa33b37529d7346
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/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
-	)
-"
-S=${WORKDIR}/pypdf-${PV}
-
-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=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.8.0.ebuild b/dev-python/pypdf/pypdf-3.8.0.ebuild
deleted file mode 100644
index cb96da3010bb..000000000000
--- a/dev-python/pypdf/pypdf-3.8.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=d3d250321b01ca1194e16a814d24508897862fe8
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/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
-	)
-"
-S=${WORKDIR}/pypdf-${PV}
-
-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=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.8.1.ebuild b/dev-python/pypdf/pypdf-3.8.1.ebuild
index 77dd5d1c6cfe..56a18c7c7360 100644
--- a/dev-python/pypdf/pypdf-3.8.1.ebuild
+++ b/dev-python/pypdf/pypdf-3.8.1.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
index c18dac5ae907..cd3aa5111254 100644
--- a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
@@ -32,5 +32,15 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
+	[[ ${PV} != 1.6.0 ]] && die "Recheck the deselect, please"
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == python3.12 ]]; then
+		EPYTEST_DESELECT+=(
+			# failing due to warnings coming from pytest
+			# https://github.com/gentoo/gentoo/pull/31151
+			testing/test_xfail_behavior.py::test_xfail
+		)
+	fi
+
 	epytest -p no:flaky
 }
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index bf5af2cacf98..d7f45743003d 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,2 +1 @@
-DIST pytest-httpbin-1.0.2.gh.tar.gz 18727 BLAKE2B 56a7fa1c1694cad98815fc6c6f676b509942fa1fca192ecb4cb5a0d9f325d7df6ddb3a3ac67d884c8f8caba807677351c42c28a3bcba80b9196e74d666951cc2 SHA512 b4adac1c37506391d83f7772814b4a9ce5134cc6834d8758e71d39610f8b29e57e72b11b2233be51e41b2c36bc305d40fc4b260a7f83d10390f4e940df8aa366
 DIST pytest-httpbin-2.0.0.gh.tar.gz 19799 BLAKE2B 7725bc958417c076ee920abce83bdad8295bc4c9551500040867650d54c306e79a1ea92b013124b793058103fc9685dbb2202be5f1b2da935509f68457d63d68 SHA512 62876590bacae6601739f5cc2eccb087024e16731afc9613b5e6928c2a2f64b73418ddcb3c4f13a4bfe1f074510f922d85411d05ebf66f123a4a09d535771b64
diff --git a/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch b/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
deleted file mode 100644
index 02f63bffa72d..000000000000
--- a/dev-python/pytest-httpbin/files/pytest-httpbin-1.0.0-pypy3-hang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -dupr a/pytest_httpbin/serve.py b/pytest_httpbin/serve.py
---- a/pytest_httpbin/serve.py	2019-02-11 20:54:14.000000000 +0100
-+++ b/pytest_httpbin/serve.py	2019-11-22 15:50:17.407769297 +0100
-@@ -116,6 +116,7 @@ class Server(object):
- 
-     def stop(self):
-         self._server.shutdown()
-+        self._server.socket.close()
- 
-     @property
-     def url(self):
-Only in b: pytest_httpbin.egg-info
-Only in b/tests: __pycache__
-diff -dupr a/tests/test_httpbin.py b/tests/test_httpbin.py
---- a/tests/test_httpbin.py	2019-02-11 20:54:14.000000000 +0100
-+++ b/tests/test_httpbin.py	2019-11-22 15:59:53.955324547 +0100
-@@ -1,3 +1,4 @@
-+import sys
- import unittest
- import requests
- import pytest_httpbin
-@@ -40,6 +41,8 @@ def test_httpbin_join(httpbin):
- def test_httpbin_str(httpbin):
-     assert httpbin + '/foo' == httpbin.url + '/foo'
- 
-+@unittest.skipIf(hasattr(sys, 'pypy_version_info')
-+                 and sys.hexversion >= 0x03000000, 'hangs on PyPy3')
- def test_chunked_encoding(httpbin_both):
-     assert requests.get(httpbin_both.url + '/stream/20').status_code == 200
- 
-Only in b: .tox
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
deleted file mode 100644
index 967b1ee510fd..000000000000
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,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
-"
-
-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"
-
-RDEPEND="
-	dev-python/httpbin[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pytest-httpbin-1.0.0-pypy3-hang.patch
-)
-
-EPYTEST_DESELECT=(
-	tests/test_server.py::test_redirect_location_is_https_for_secure_server
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
index 4d3332fc577c..29db51b49ab1 100644
--- a/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.10.0.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
 
 inherit distutils-r1 pypi
 
@@ -25,7 +26,9 @@ RDEPEND="
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
 	)
 "
 
@@ -38,6 +41,11 @@ src_prepare() {
 }
 
 python_test() {
+	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
 	local EPYTEST_DESELECT=()
diff --git a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
index f732e8763d81..46da8ed75951 100644
--- a/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-2.1.0.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
 		!hppa? (
 			$(python_gen_cond_dep '
 				dev-python/pytest-cov[${PYTHON_USEDEP}]
-			' python3_{8..10} pypy3)
+			' python3_{10..11} pypy3)
 		)
 	)"
 
diff --git a/dev-python/pytest/files/pytest-7.3.1-py312.patch b/dev-python/pytest/files/pytest-7.3.1-py312.patch
new file mode 100644
index 000000000000..62a32e0cb7a6
--- /dev/null
+++ b/dev-python/pytest/files/pytest-7.3.1-py312.patch
@@ -0,0 +1,197 @@
+From b1ba5ff337300e4242fb961d8496474e4b739c9b Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Wed, 10 May 2023 10:36:09 +0300
+Subject: [PATCH] Avoid ast deprecation warnings on Python 3.12
+
+Fix #10977.
+---
+ src/_pytest/assertion/rewrite.py | 44 ++++++++++++++++++--------------
+ src/_pytest/mark/expression.py   |  8 +++++-
+ 2 files changed, 32 insertions(+), 20 deletions(-)
+
+diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
+index 8b182347052..2f9038ee132 100644
+--- a/src/_pytest/assertion/rewrite.py
++++ b/src/_pytest/assertion/rewrite.py
+@@ -46,8 +46,14 @@
+ 
+ if sys.version_info >= (3, 8):
+     namedExpr = ast.NamedExpr
++    astNameConstant = ast.Constant
++    astStr = ast.Constant
++    astNum = ast.Constant
+ else:
+     namedExpr = ast.Expr
++    astNameConstant = ast.NameConstant
++    astStr = ast.Str
++    astNum = ast.Num
+ 
+ 
+ assertstate_key = StashKey["AssertionState"]()
+@@ -680,7 +686,7 @@ def run(self, mod: ast.Module) -> None:
+             if (
+                 expect_docstring
+                 and isinstance(item, ast.Expr)
+-                and isinstance(item.value, ast.Str)
++                and isinstance(item.value, astStr)
+             ):
+                 doc = item.value.s
+                 if self.is_rewrite_disabled(doc):
+@@ -814,7 +820,7 @@ def pop_format_context(self, expl_expr: ast.expr) -> ast.Name:
+         current = self.stack.pop()
+         if self.stack:
+             self.explanation_specifiers = self.stack[-1]
+-        keys = [ast.Str(key) for key in current.keys()]
++        keys = [astStr(key) for key in current.keys()]
+         format_dict = ast.Dict(keys, list(current.values()))
+         form = ast.BinOp(expl_expr, ast.Mod(), format_dict)
+         name = "@py_format" + str(next(self.variable_counter))
+@@ -868,16 +874,16 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+         negation = ast.UnaryOp(ast.Not(), top_condition)
+ 
+         if self.enable_assertion_pass_hook:  # Experimental pytest_assertion_pass hook
+-            msg = self.pop_format_context(ast.Str(explanation))
++            msg = self.pop_format_context(astStr(explanation))
+ 
+             # Failed
+             if assert_.msg:
+                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
+                 gluestr = "\n>assert "
+             else:
+-                assertmsg = ast.Str("")
++                assertmsg = astStr("")
+                 gluestr = "assert "
+-            err_explanation = ast.BinOp(ast.Str(gluestr), ast.Add(), msg)
++            err_explanation = ast.BinOp(astStr(gluestr), ast.Add(), msg)
+             err_msg = ast.BinOp(assertmsg, ast.Add(), err_explanation)
+             err_name = ast.Name("AssertionError", ast.Load())
+             fmt = self.helper("_format_explanation", err_msg)
+@@ -893,8 +899,8 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+             hook_call_pass = ast.Expr(
+                 self.helper(
+                     "_call_assertion_pass",
+-                    ast.Num(assert_.lineno),
+-                    ast.Str(orig),
++                    astNum(assert_.lineno),
++                    astStr(orig),
+                     fmt_pass,
+                 )
+             )
+@@ -913,7 +919,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+                 variables = [
+                     ast.Name(name, ast.Store()) for name in self.format_variables
+                 ]
+-                clear_format = ast.Assign(variables, ast.NameConstant(None))
++                clear_format = ast.Assign(variables, astNameConstant(None))
+                 self.statements.append(clear_format)
+ 
+         else:  # Original assertion rewriting
+@@ -924,9 +930,9 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
+                 explanation = "\n>assert " + explanation
+             else:
+-                assertmsg = ast.Str("")
++                assertmsg = astStr("")
+                 explanation = "assert " + explanation
+-            template = ast.BinOp(assertmsg, ast.Add(), ast.Str(explanation))
++            template = ast.BinOp(assertmsg, ast.Add(), astStr(explanation))
+             msg = self.pop_format_context(template)
+             fmt = self.helper("_format_explanation", msg)
+             err_name = ast.Name("AssertionError", ast.Load())
+@@ -938,7 +944,7 @@ def visit_Assert(self, assert_: ast.Assert) -> List[ast.stmt]:
+         # Clear temporary variables by setting them to None.
+         if self.variables:
+             variables = [ast.Name(name, ast.Store()) for name in self.variables]
+-            clear = ast.Assign(variables, ast.NameConstant(None))
++            clear = ast.Assign(variables, astNameConstant(None))
+             self.statements.append(clear)
+         # Fix locations (line numbers/column offsets).
+         for stmt in self.statements:
+@@ -952,20 +958,20 @@ def visit_NamedExpr(self, name: namedExpr) -> Tuple[namedExpr, str]:
+         # thinks it's acceptable.
+         locs = ast.Call(self.builtin("locals"), [], [])
+         target_id = name.target.id  # type: ignore[attr-defined]
+-        inlocs = ast.Compare(ast.Str(target_id), [ast.In()], [locs])
++        inlocs = ast.Compare(astStr(target_id), [ast.In()], [locs])
+         dorepr = self.helper("_should_repr_global_name", name)
+         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
+-        expr = ast.IfExp(test, self.display(name), ast.Str(target_id))
++        expr = ast.IfExp(test, self.display(name), astStr(target_id))
+         return name, self.explanation_param(expr)
+ 
+     def visit_Name(self, name: ast.Name) -> Tuple[ast.Name, str]:
+         # Display the repr of the name if it's a local variable or
+         # _should_repr_global_name() thinks it's acceptable.
+         locs = ast.Call(self.builtin("locals"), [], [])
+-        inlocs = ast.Compare(ast.Str(name.id), [ast.In()], [locs])
++        inlocs = ast.Compare(astStr(name.id), [ast.In()], [locs])
+         dorepr = self.helper("_should_repr_global_name", name)
+         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
+-        expr = ast.IfExp(test, self.display(name), ast.Str(name.id))
++        expr = ast.IfExp(test, self.display(name), astStr(name.id))
+         return name, self.explanation_param(expr)
+ 
+     def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
+@@ -1001,7 +1007,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
+             self.push_format_context()
+             res, expl = self.visit(v)
+             body.append(ast.Assign([ast.Name(res_var, ast.Store())], res))
+-            expl_format = self.pop_format_context(ast.Str(expl))
++            expl_format = self.pop_format_context(astStr(expl))
+             call = ast.Call(app, [expl_format], [])
+             self.expl_stmts.append(ast.Expr(call))
+             if i < levels:
+@@ -1013,7 +1019,7 @@ def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
+                 self.statements = body = inner
+         self.statements = save
+         self.expl_stmts = fail_save
+-        expl_template = self.helper("_format_boolop", expl_list, ast.Num(is_or))
++        expl_template = self.helper("_format_boolop", expl_list, astNum(is_or))
+         expl = self.pop_format_context(expl_template)
+         return ast.Name(res_var, ast.Load()), self.explanation_param(expl)
+ 
+@@ -1099,9 +1105,9 @@ def visit_Compare(self, comp: ast.Compare) -> Tuple[ast.expr, str]:
+                 next_expl = f"({next_expl})"
+             results.append(next_res)
+             sym = BINOP_MAP[op.__class__]
+-            syms.append(ast.Str(sym))
++            syms.append(astStr(sym))
+             expl = f"{left_expl} {sym} {next_expl}"
+-            expls.append(ast.Str(expl))
++            expls.append(astStr(expl))
+             res_expr = ast.Compare(left_res, [op], [next_res])
+             self.statements.append(ast.Assign([store_names[i]], res_expr))
+             left_res, left_expl = next_res, next_expl
+diff --git a/src/_pytest/mark/expression.py b/src/_pytest/mark/expression.py
+index f82a81d44c5..9287bcee50c 100644
+--- a/src/_pytest/mark/expression.py
++++ b/src/_pytest/mark/expression.py
+@@ -18,6 +18,7 @@
+ import dataclasses
+ import enum
+ import re
++import sys
+ import types
+ from typing import Callable
+ from typing import Iterator
+@@ -26,6 +27,11 @@
+ from typing import Optional
+ from typing import Sequence
+ 
++if sys.version_info >= (3, 8):
++    astNameConstant = ast.Constant
++else:
++    astNameConstant = ast.NameConstant
++
+ 
+ __all__ = [
+     "Expression",
+@@ -132,7 +138,7 @@ def reject(self, expected: Sequence[TokenType]) -> NoReturn:
+ 
+ def expression(s: Scanner) -> ast.Expression:
+     if s.accept(TokenType.EOF):
+-        ret: ast.expr = ast.NameConstant(False)
++        ret: ast.expr = astNameConstant(False)
+     else:
+         ret = expr(s)
+         s.accept(TokenType.EOF, reject=True)
diff --git a/dev-python/pytest/pytest-7.3.1-r1.ebuild b/dev-python/pytest/pytest-7.3.1-r1.ebuild
new file mode 100644
index 000000000000..3a9d3278f6ce
--- /dev/null
+++ b/dev-python/pytest/pytest-7.3.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 multiprocessing pypi
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="
+	https://pytest.org/
+	https://github.com/pytest-dev/pytest/
+	https://pypi.org/project/pytest/
+"
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	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}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.{9..10})
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+			dev-python/mock[${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}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+PATCHES=(
+	# deprecation warning fix
+	# https://github.com/pytest-dev/pytest/pull/10894/
+	"${FILESDIR}/${P}-py312.patch"
+)
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	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
+
+		# TODO (XPASS)
+		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
+		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
+		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
+
+		# setuptools warnings
+		testing/acceptance_test.py::TestInvocationVariants::test_cmdline_python_namespace_package
+	)
+
+	[[ ${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)"
+}
diff --git a/dev-python/pytest/pytest-7.3.1.ebuild b/dev-python/pytest/pytest-7.3.1.ebuild
index 3bc6dec039a9..2cea68960302 100644
--- a/dev-python/pytest/pytest-7.3.1.ebuild
+++ b/dev-python/pytest/pytest-7.3.1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
 		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
+	' 3.{9..10})
 "
 BDEPEND="
 	>=dev-python/setuptools-scm-6.2.3[${PYTHON_USEDEP}]
diff --git a/dev-python/python-dbusmock/Manifest b/dev-python/python-dbusmock/Manifest
index a0bee08f8030..aaa30b06a558 100644
--- a/dev-python/python-dbusmock/Manifest
+++ b/dev-python/python-dbusmock/Manifest
@@ -1,2 +1 @@
-DIST python-dbusmock-0.28.7.tar.gz 91302 BLAKE2B edad30e569652b2fc8e2f7437e818eece2b88be460ca31eab0be6a6951f0690a295fa1af3f7a490794bcc454e021cea3e153b300ce55883a9cf8010aac8212a4 SHA512 d0fea9ad3a9f76af75f48a4e645f8ed70efde880043c9b843bc8cac53eca891c45fa9c74cefab63a820397886757ac0dc9c5f43aaf7604aa302c794aedb7bb46
 DIST python-dbusmock-0.29.0.tar.gz 92406 BLAKE2B e23a7e81584a94532258237e75f35d1c7fe2cba901d30e1a211d61ce48db2992f1c19d08401059b60b80a3aa7bf6c1e21d096bd30eacb27d16c3189b1f9b7938 SHA512 618f6069802cdfcab41e09c9ed27f2c55c35f072bea4c0b38c057297ff3de0759b1b37128fee8d331d058f3c2a4607f25f0d8b42077f5b4fc155c6e5a4cb94c3
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild
deleted file mode 100644
index f47abc37e8d6..000000000000
--- a/dev-python/python-dbusmock/python-dbusmock-0.28.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="
-	https://github.com/martinpitt/python-dbusmock/
-	https://pypi.org/project/python-dbusmock/
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# linter tests, fragile to newer linter versions
-	tests/test_code.py
-)
-
-src_prepare() {
-	# dev-python/dbus-python uses autotools, so no .dist-info there
-	sed -i '/dbus-python/d' pyproject.toml setup.cfg || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild
index 75941c7ce188..f47abc37e8d6 100644
--- a/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild
+++ b/dev-python/python-dbusmock/python-dbusmock-0.29.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 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/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
deleted file mode 100644
index 7fb2462944b0..000000000000
--- a/dev-python/python-email-validator/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST email_validator-2.0.0.post1.tar.gz 45136 BLAKE2B d800462f55ee0693917a5348107bd68af2a9c0b6e1a3ccbf28aa22716bbf6da2998bbf4b16352e719c13761b895a85566911bfd4422a516d77214a729da41aca SHA512 0e72d88dea00ade9a8727a4d3ff9a239f581afc14bf7c7a22a582d69e70c7653371c035451493b89fc1a49c70aab8cdfe6159285ea5e8976e645199319004029
-DIST email_validator-2.0.0.post2.tar.gz 45253 BLAKE2B b213ebab2a10acf6c2ab95d382fa78ef92f41ff85ce25c1cfa5a65403e728fd05c66df3dccbaec77eea469d0665701ad5d8047c31e69b57ed8e6fe52f3a1f9c5 SHA512 8c4abc955d909ef05ca89d6c6931bce06de199c33c5f8d0744d44ff00ee69c1841f295882af3da03963cc90ef031da46cdaef90249f73e0c7b47f19dfb816b62
-DIST python-email-validator-1.3.1.gh.tar.gz 28691 BLAKE2B eb69028066e969a935117f51a32d75595468797a82608bcb7f6ebcbebada01aac29e3e223efc849dc519d85897a375cdc584760f3cb5a431e2c39aa566c20514 SHA512 7806ef35c07cf0cfef3d8c6c7fe6dd3cb58da091a134b57d879a2cfcdf6425f8729ab8b03194135749ae47b369da47434c1d130432cfaa8eeaf5d07149c15dc2
-DIST python-email-validator-2.0.0.gh.tar.gz 39007 BLAKE2B 319fa94979fdb6b701c1c8f754f2915e02a53de7ee6f06a5409980b1e4dedca75d08cd24e4f5ee35e7803c7ff4dbb03c1e75645dd7e0443ccaa2b26b6035648a SHA512 6448c55dea3d43d1d457f4b3f24360aaaa6e4ea8f81db891e94d2ff685ae1d8bc1023d4a6329fc495ff6069fc1a6861185e66eada9d2ed6546e6c6b8716df802
diff --git a/dev-python/python-email-validator/python-email-validator-1.3.1.ebuild b/dev-python/python-email-validator/python-email-validator-1.3.1.ebuild
deleted file mode 100644
index c194151fc5c5..000000000000
--- a/dev-python/python-email-validator/python-email-validator-1.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} 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/python-email-validator/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 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_found
-	tests/test_main.py::test_deliverability_fails
-	# these tests rely on example.com being resolvable
-	"tests/test_main.py::test_email_example_reserved_domain[me@mail.example]"
-	"tests/test_main.py::test_email_example_reserved_domain[me@example.com]"
-	"tests/test_main.py::test_email_example_reserved_domain[me@mail.example.com]"
-	tests/test_main.py::test_validate_email__with_caching_resolver
-	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-2.0.0.ebuild b/dev-python/python-email-validator/python-email-validator-2.0.0.ebuild
deleted file mode 100644
index a3a059c60d42..000000000000
--- a/dev-python/python-email-validator/python-email-validator-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} 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/python-email-validator/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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=(
-	# Internet
-	tests/test_deliverability.py
-)
diff --git a/dev-python/python-email-validator/python-email-validator-2.0.0_p1.ebuild b/dev-python/python-email-validator/python-email-validator-2.0.0_p1.ebuild
deleted file mode 100644
index 334431da6cb1..000000000000
--- a/dev-python/python-email-validator/python-email-validator-2.0.0_p1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=email-validator
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A robust email syntax and deliverability validation library"
-HOMEPAGE="
-	https://github.com/JoshData/python-email-validator/
-	https://pypi.org/project/email-validator/
-"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~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=(
-	# Internet
-	tests/test_deliverability.py
-)
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index ff89847b28b6..0ff86da8cb06 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,4 +1 @@
-DIST requests-2.28.2.tar.gz 108206 BLAKE2B fe6c5d78e6abd36b7134c6e424b5a1c4052eba62b55a01b5842f289b94df3af039a5beba71374db563dd52ce42471d5e3650763b9324533ea6ab3bfd8013379b SHA512 3c4ba19a2bb6ba38a4118cf246db3855401869d54ee7ebd9bee40b435420381fb737d4c69768f2bd97914a30d66233c7058cec51aa629af0dff3b04e6f997a3d
-DIST requests-2.29.0.tar.gz 108279 BLAKE2B 34f4f25be325944415cadf17e99f106fb696882667853455f2559748d0cd2562bdefaa0fec2ac3dae6c34ecc4a50e6f91d00fdada27ceb6e0d4232faf7bf77bb SHA512 22c7c9e6ae44abe60cf7cc2108d42d9a0952ae317936995f379155d24013c24a2c654469a781a61b2ae6488429e337d31b565a91f1266eb1c038a4c8a9069642
-DIST requests-2.30.0.tar.gz 108411 BLAKE2B bff0559fe279daf89e44826eed6bd1036aa53c6e0ac0a7513b4edd7e04c7826dc3d6a8c61cf466399145f2eac1b6ac386bcf00427fc3820a0b16c397ef51ef68 SHA512 a950a156ac78e5e315b95619f8753f7ba837c63198e256ea69a53f9492f7be1cecb295fcacbf091f3d5ae077ea02c67056d753f99c2b95cc9d233c3ca77f2905
 DIST requests-2.31.0.tar.gz 110794 BLAKE2B e4e2781b272ccd94230c5b8c1bea83901bc8c28a34880709dbb95b887417b47833512e25045dab6e4226295294e2bf56fc821b6f636ae28aefdeee6039f53d44 SHA512 ce50d64973752f4cf7f7c7c91401669854b55c66d7465bea3689772fae8a6b646cf6720d84a2984bbe6fd78fc8b9ce0aa377f291fb6d7c20c7c2a4be8193acdd
diff --git a/dev-python/requests/requests-2.28.2.ebuild b/dev-python/requests/requests-2.28.2.ebuild
deleted file mode 100644
index 76922f7279df..000000000000
--- a/dev-python/requests/requests-2.28.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 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_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="socks5 test-rust"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	<dev-python/charset_normalizer-4[${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}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${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
-		# flask-2
-		tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
-	)
-
-	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.29.0.ebuild b/dev-python/requests/requests-2.29.0.ebuild
deleted file mode 100644
index c0d99bc6a33f..000000000000
--- a/dev-python/requests/requests-2.29.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 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_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="socks5 test-rust"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	<dev-python/charset_normalizer-4[${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}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${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
-		# flask-2
-		tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
-	)
-
-	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.30.0.ebuild b/dev-python/requests/requests-2.30.0.ebuild
deleted file mode 100644
index a64eceec462b..000000000000
--- a/dev-python/requests/requests-2.30.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library for human beings"
-HOMEPAGE="
-	https://requests.readthedocs.io/
-	https://github.com/psf/requests/
-	https://pypi.org/project/requests/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="socks5 test-rust"
-
-RDEPEND="
-	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
-	<dev-python/charset_normalizer-4[${PYTHON_USEDEP}]
-	<dev-python/idna-4[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${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}]
-		test-rust? (
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-PATCHES=(
-	"${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
-		# flask-2
-		tests/test_requests.py::TestRequests::test_cookie_sent_on_redirect
-		tests/test_requests.py::TestRequests::test_cookie_removed_on_expire
-		tests/test_requests.py::TestPreparingURLs::test_redirecting_to_bad_url
-	)
-
-	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/semantic_version/Manifest b/dev-python/semantic-version/Manifest
index 8aabf18478cc..8aabf18478cc 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic-version/Manifest
diff --git a/dev-python/semantic_version/metadata.xml b/dev-python/semantic-version/metadata.xml
index b6a8501286e3..b6a8501286e3 100644
--- a/dev-python/semantic_version/metadata.xml
+++ b/dev-python/semantic-version/metadata.xml
diff --git a/dev-python/semantic_version/semantic_version-2.10.0.ebuild b/dev-python/semantic-version/semantic-version-2.10.0.ebuild
index d3a775262e49..d3a775262e49 100644
--- a/dev-python/semantic_version/semantic_version-2.10.0.ebuild
+++ b/dev-python/semantic-version/semantic-version-2.10.0.ebuild
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 1768563cd406..79af58891add 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,8 +1,2 @@
-DIST sentry-python-1.19.1.gh.tar.gz 345933 BLAKE2B 0b6912553b41fe14b14a4199756f54e9870819c9bf15a91253889c43b3b93d63d09d9cbe96ec35b83a2d966990549e2043543506abeefa0320ff6098e8ea8304 SHA512 ca2f701904fc9d38ce89a2e085d30b4d4f532878a383a20016d0b5763b4d1e34fd1f6bd87c8aecb46f40e5b5bdc6b8021fb6154df28d1cd50f634326c1b3f499
 DIST sentry-python-1.20.0.gh.tar.gz 345505 BLAKE2B e95225188a74f4d9e67f6044bcf3bbeccacc31c455a652d8233350d138c20ee9f356e56aab98a1c2f764917d79426e10a810cb6c18cfabcc5f606ec21c42f7e8 SHA512 6c162d44cc3b38a9aa192a7153d52e93424950e1020cd2d6ea8e61d23b3d41ca169e3dde7c0355e5da2ed45ce39c41322d6e0f239d6e00e30a55540db796f968
-DIST sentry-python-1.21.0.gh.tar.gz 346948 BLAKE2B 7d4d9d537d567c930187d74fc46be2868a91c7d7fbc09bb6e63aa5b87cc272689ab3510dd2328fedd6d78a30f8f514efcaec5f6b99ce95cc2fd1e517f6c2330e SHA512 45e0f646b058488e8642e9ab6e8f80c7085adf39247baee78cb388a722114e2f72504951789cd49f6cdade77a930dc69756afaf0c69c69eb680878b2f2fc53d6
-DIST sentry-python-1.21.1.gh.tar.gz 349021 BLAKE2B f467ba16484d0807734deb7d2544f32addeac254dbac02d5c56d5c9d05081d1c38665f7a5eb14ff59dd4b39ecb25d922b60a0d18fc98290c0127142cf5bb89d0 SHA512 04f56fa1a53ad42baaf09fb4b19a29c009e2a956ee363d6003746d993d1d8b4af37b8458bf8b04255cd72083bdf0c35b4244d6aabf26110ff6a0d245ce674c58
-DIST sentry-python-1.22.1.gh.tar.gz 351929 BLAKE2B afcdd6293ff1e96f2a07e6d6ad5fb9bfc8715cf4d7ca30237d92cae9f48abf4cb849ad8f86f3ba3f0421198dd2fdbfe25b95c9e50c2abab36d1fed4bd71181fd SHA512 2796620223476d8996291d2f2ff88a128a86fe8ded40f44ffc575f09e8b390d9b0e77e186d153decb81f33aa050eeef5b2ce707ad381d226955ce18315a0e3ee
-DIST sentry-python-1.22.2.gh.tar.gz 352403 BLAKE2B 7dcc1583904ac7ca2349b153c13ffd2098e888fcf18a7150efa8e99e0bdc93f40c2d91a0044b85d64e21116e2503173e8a0b46dcc227f7e5cf7deaf2fe8abc64 SHA512 71d4235a0a5f6df0e18f0f0e04530ce225c218cc1018d48c7a419f3a118ea9d89df3635d62ae2a5a34632a58163ac317f41167e40b2ea172f2bd0467de3a8196
-DIST sentry-python-1.23.0.gh.tar.gz 355085 BLAKE2B a0cab2f69177325a28b6fc24aa311f3ab9bdb20b43c9cbcf809a67aaaeb51306cabc2f7ce413ec9e85de6d1283a2f0d7c3cf7c0d3f8df84c54cf8f685025e127 SHA512 6cb0fda5c73e7f3a3e33458479ab40f6f33c661b9ddf69eaf6630c22004ff8a21157a3be454e583717b7d1999bff26bbe8d8e3d719e42c42612f1c5ddf0767b5
 DIST sentry-python-1.23.1.gh.tar.gz 355099 BLAKE2B d4aea7fd4746f1ee7873382f6a8545a1e21583e12b241ecc9ccf210bab95aa07051e802199c1c225756bb4fe9b8b9ec4bb76d737f2c19216df1b30e33614f54b SHA512 3d7237c0d624c51cf7a99ea1c480fb67d0dee7ae48cefd7322d870881ecc6b25f5fa481c6cd86b75fa7f1a4acf54f9c0f576021bf75cc8e8b9be99ec05453e2f
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.19.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.19.1.ebuild
deleted file mode 100644
index 2ddc9b179d6a..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.19.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.20.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.20.0.ebuild
index adaa1c27ade8..2ddc9b179d6a 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.20.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.20.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 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.21.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.21.0.ebuild
deleted file mode 100644
index 256c0a6e8bff..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.21.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.21.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.21.1.ebuild
deleted file mode 100644
index 1fa205132314..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.21.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.22.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.22.1.ebuild
deleted file mode 100644
index 1fa205132314..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.22.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.22.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.22.2.ebuild
deleted file mode 100644
index 1fa205132314..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.22.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.23.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.23.0.ebuild
deleted file mode 100644
index 8095ec3baba2..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.23.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=sentry-python-${PV}
-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
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-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/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/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/socket/test_socket.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
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-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
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_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
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-)
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
index b6249f8b9690..3e038ada4cbc 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
@@ -106,8 +106,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
index 51457a57732c..14000e94ba1c 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
@@ -107,8 +107,8 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/rust
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 7393c222a08f..af75d90824b2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,2 @@
-DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd6aa67a14f0cf42ece78463788d74b97bd951b75c48c185c5c33d5bea29c44c8660649bf79035012bc75b915e9d0a42 SHA512 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc
-DIST setuptools-67.7.0.tar.gz 2491327 BLAKE2B 3d1e89cf5b2753883397ff3a668dbfcef41c57775bd1871ada69c11a7deffe53fd4c4036b5c98146ec0496b1be86df1522c64cc981acb5ec192bd93bd800c2de SHA512 39502337b5d7f710c55219ab970a5cab23e8987598af722ad231d2dea2e1dfaaddb09dc698a5746a719b36e5e3065c48ecee2ac428e4d41470bec6ad3c99daf6
-DIST setuptools-67.7.1.tar.gz 2491346 BLAKE2B 2eb89badcbfec51fb3deca5f4267036305569bf42677b87c9eeb7cecd902c121ffc6725506bfa0ba3ac50e06c036a520dd14b6193ff048e21ed80dfeb1c93602 SHA512 c90a6ad0c215540dfd93d5c88126dab15499deb80ed601f4a90c92dfdff5fed6ff168fb8e6b9dc5ba8b1f067114d383400df390b2eebd934e2e728c3b56886af
 DIST setuptools-67.7.2.tar.gz 2491608 BLAKE2B bd77a85081e95813cdd8fc1f63b768c73036b2f49103defcfd09ba9df7b2c5dba84d4f1aca553e0642ab8d764ae390310f1c6bebbae31736d1b5c16802cdc0e5 SHA512 06db096193ef52111f064c327daefb12ea2bb2ebc6712436bae01f986165455fe89a1d2220cbaaa6391a182e2aee19b9cf7a709c158af8c5ab6232dfbc258bd9
 DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d
diff --git a/dev-python/setuptools/setuptools-67.6.1.ebuild b/dev-python/setuptools/setuptools-67.6.1.ebuild
deleted file mode 100644
index 7cb37f2ea7d9..000000000000
--- a/dev-python/setuptools/setuptools-67.6.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-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/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/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-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/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${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
-	)
-
-	distutils-r1_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
-}
-
-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_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.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
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.7.0.ebuild b/dev-python/setuptools/setuptools-67.7.0.ebuild
deleted file mode 100644
index 617e61b823a9..000000000000
--- a/dev-python/setuptools/setuptools-67.7.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-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/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/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-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/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${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
-	)
-
-	distutils-r1_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
-}
-
-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_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.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
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.7.1.ebuild b/dev-python/setuptools/setuptools-67.7.1.ebuild
deleted file mode 100644
index 617e61b823a9..000000000000
--- a/dev-python/setuptools/setuptools-67.7.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-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/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/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-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/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${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
-	)
-
-	distutils-r1_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
-}
-
-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_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.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
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.7.2.ebuild b/dev-python/setuptools/setuptools-67.7.2.ebuild
index 734c47cced02..56878b0bc43d 100644
--- a/dev-python/setuptools/setuptools-67.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-67.7.2.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 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"
+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 )"
 
diff --git a/dev-python/shiboken2/shiboken2-5.15.9.ebuild b/dev-python/shiboken2/shiboken2-5.15.9.ebuild
index a5d6c55568b1..3ea87c229a06 100644
--- a/dev-python/shiboken2/shiboken2-5.15.9.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.9.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 39fc5df20e75..1d50cb39e822 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
 DIST soupsieve-2.4.1.gh.tar.gz 105158 BLAKE2B 73ae01835ac7edf17bd1be1eb33cae5d06a7ef21c63fac50d61fd0f3246f734cd76f70245da19334d65746cf6e02a5a4c970ba2fbfb1a79de7fcda0bca1a38de SHA512 71ed91beabd9afef5756dddbb259f2607ca5109b8ff3f0a25bc3d4730f2948e160c20334b1c6e9f9095362f2b9e601e1ccfee09854e000b2f9f83af514790caa
-DIST soupsieve-2.4.gh.tar.gz 104437 BLAKE2B cca6185980473245e2c08181142f497584ae01928b4a8569f9436d30df339b93b92c33818dab93b6646f6e1dbeb52242822fffa193be87c18a25324cc03b9e1a SHA512 68885307d8e6731d47372af5130f2fb88567c7d5b5995c84fb11116007b2360dea88aac1b5c8cadc41f99ef71704c4fe710c45318be0be727ed9145ce009e4fd
diff --git a/dev-python/soupsieve/soupsieve-2.4.1.ebuild b/dev-python/soupsieve/soupsieve-2.4.1.ebuild
index b8af70d15f67..62e2941fd4d6 100644
--- a/dev-python/soupsieve/soupsieve-2.4.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.4.1.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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/soupsieve/soupsieve-2.4.ebuild b/dev-python/soupsieve/soupsieve-2.4.ebuild
deleted file mode 100644
index 62e2941fd4d6..000000000000
--- a/dev-python/soupsieve/soupsieve-2.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,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}.gh.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/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 271f8acba8f6..2c9ab84301aa 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1 +1 @@
-DIST testpath-0.6.0.tar.gz 92307 BLAKE2B 320695b4224803214759a74e64e969a244814f4767eb6092b758ba9fcbfadce81afa3fa5eee65b8c8fe9c54e486d9abf75a18b867883740052c58d1eb2671e23 SHA512 fe13523138c1e67f33a3aa707e81b8cc8b5a720ab231ea2c2407da003178d779a649f664213822022e26325fed4ddf468cf727737b94eb2ebf7315aacbce6857
+DIST testpath-0.6.0.gh.tar.gz 92307 BLAKE2B 320695b4224803214759a74e64e969a244814f4767eb6092b758ba9fcbfadce81afa3fa5eee65b8c8fe9c54e486d9abf75a18b867883740052c58d1eb2671e23 SHA512 fe13523138c1e67f33a3aa707e81b8cc8b5a720ab231ea2c2407da003178d779a649f664213822022e26325fed4ddf468cf727737b94eb2ebf7315aacbce6857
diff --git a/dev-python/testpath/testpath-0.6.0.ebuild b/dev-python/testpath/testpath-0.6.0.ebuild
index fe35e927ccd6..e01854bafd1a 100644
--- a/dev-python/testpath/testpath-0.6.0.ebuild
+++ b/dev-python/testpath/testpath-0.6.0.ebuild
@@ -9,8 +9,15 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Test utilities for code working with files and commands"
-HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/jupyter/testpath/
+	https://testpath.readthedocs.io/en/latest/
+	https://pypi.org/project/testpath/
+"
+SRC_URI="
+	https://github.com/jupyter/testpath/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index b42ab31091f2..3d7c2685b9eb 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,2 @@
 DIST tox-3.28.0.gh.tar.gz 309472 BLAKE2B 9896411426f6aebb3efa468c01696ecc5f17ec3e67825672d0efc74c1b1468bc8b8d9c14b6177c181750ba4b9a5e77d616068dd83e21f5641acfc8e2a271cc1f SHA512 64816754e6800661bb564c5c7d21c4139522d540a04fafe3c4591d596072d48d1cbe0ee2abee9c8faf3d5007774f5371431b5a7a8f49912bc879c7b168aab2ca
-DIST tox-4.4.11.tar.gz 170069 BLAKE2B e2e560462cbb6081c27ff0268fa8a6b0239caac0b237bbd66709ce578996800728346bd22491cfade85d7d04d2c00a769179efd4a160decfd97f94fcedc7ed24 SHA512 7a0a39ac55482aa423368fee6621aef9d95c58afd5d38975bcaf67edfebdc817aacc33efdd1f0f459953c25bceed73c6ef03ce789aea7f82f3ab1dcc6546118c
-DIST tox-4.4.12.tar.gz 170092 BLAKE2B 03a1d1ddd8c36c88e3b30f464df9b20d516ef282664b138f64a969195901d353d678d9c1e4ca2e61d73fed891b942105dbeef97e281e219fe2110ba92517adf2 SHA512 896ecef178b0625246ffe4ab3a9a0c03650eb78633fa92706e93475d6589ac29d65bbf91b9ecfacfa8154739eefd463aeb1252be68998cdffddc270a4f89edd0
-DIST tox-4.5.0.tar.gz 170132 BLAKE2B fbde455d90791b81ba8fb47b2c00a0c931e56bef39749a324e16b12f2955441371c74983d3c77b98f04f5a0e95ddf78678ff96fc2f99f42a87bd0058a3aefb98 SHA512 79e3fd7308a3da0df5859437ff7842a343578a98211a6a936f72caec857dbdb5e0bd4b80fd68a3a48fb0891d4608875ccc1b09d7127416aaa7109a8aa314979c
 DIST tox-4.5.1.tar.gz 170137 BLAKE2B 38ab00eb577e66211db0ecf8931087a8c5a14f8219eb7ebecb7be9938221d1c680edc09a38a5c72b9ec63825d4cbb2d4fd9157a52aed8cdb0d22a1c1bbb70cba SHA512 75d495d6dba134c3fe537fc190c1f428ff188ee67c346911c02ee151a8369425b22956eea52be5d434735e1590edce57b3487d5f4b277022bf8cfe8bf4660cf8
diff --git a/dev-python/tox/tox-4.4.11.ebuild b/dev-python/tox/tox-4.4.11.ebuild
deleted file mode 100644
index 45f89c46e329..000000000000
--- a/dev-python/tox/tox-4.4.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.10.7[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.4.12.ebuild b/dev-python/tox/tox-4.4.12.ebuild
deleted file mode 100644
index b01bb2bcbd30..000000000000
--- a/dev-python/tox/tox-4.4.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.11[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.5.0.ebuild b/dev-python/tox/tox-4.5.0.ebuild
deleted file mode 100644
index 5369b90d97a4..000000000000
--- a/dev-python/tox/tox-4.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/cachetools-5.3[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.11[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.2[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.5.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.21[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-vcs-0.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/build-0.10[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.2.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/time-machine-2.9[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-		'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.5.1.ebuild b/dev-python/tox/tox-4.5.1.ebuild
index 5369b90d97a4..c5db778f265f 100644
--- a/dev-python/tox/tox-4.5.1.ebuild
+++ b/dev-python/tox/tox-4.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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/cachetools-5.3[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 6130b6d04e22..db6db46c34b4 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,3 +1,2 @@
-DIST trove-classifiers-2023.4.29.tar.gz 15824 BLAKE2B 5a1dc9494f38fc20d54361976ba3abf873128455311f518f195878fad1d5f41e1e9e50f0ea75e3b534ef9d07e8307370e74e3cdb9a47f4d4a36f97a3b30ce556 SHA512 132f723273355ce8dbcbf544b4d0809f1e1f2e390289f3e862bf471aa28b95c0cd67f4c440c412d579be7c4ffe30769f8cbb0ec4f224a73e6deb7b1a8fe4844a
 DIST trove-classifiers-2023.5.2.tar.gz 15835 BLAKE2B 788c6e05c498dcaa21cc51f0bfbcd5e3637b56c5cb0f481b9c9c746caa092f578ff7b8947f620518bdbca8a7fbbe67b8806b0c56c219a9b25d2f44647dbb0f60 SHA512 6f1e9e31a40ddd701048613c128b765a6b920480f5f3f2f678102277ac0b230ecd9dc135f9dda5ed115abbdacc3098ac2d75564004df0e8cae04b12335b309bb
 DIST trove-classifiers-2023.5.22.tar.gz 15853 BLAKE2B b7170a53287ffa6086aa5223128a9d66cb9cc6d7a3b76f8b47cb5cab835d9f47cb98cfd1436ba8bbe057043751e5685899dfda9fdd61c6a14e4d04f00789b227 SHA512 c665b2255afc2e9acc537a7d650648d34ab3438baaf33bb0c9a535942ee8750c0795fda89fa28d29f5232e62e957795947b0d908fc7e06bbdce2cc7dd1cc26bf
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.4.29.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.4.29.ebuild
deleted file mode 100644
index 6f8834546ce3..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.4.29.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index ca5e339b1262..90c3022514e9 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,2 +1,3 @@
 DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
 DIST typing_extensions-4.6.0.gh.tar.gz 70037 BLAKE2B e5a287e839dc932b3f5777a8c575e725d414cbd5ff1444a9f67c8898866eb3863b0de4f107c5ffe73756d37e47b7a1dae4d69fead42fb887126479891bff5b17 SHA512 d78188c52ea6bf77852c5ac3e4601f9fca6fe3247974269ced8dc53e9b8c971446ff5501558200000757336a84d73db1e6e9fe89afd7cc26e025a97426475bb4
+DIST typing_extensions-4.6.1.gh.tar.gz 71263 BLAKE2B 4c4b91fd92620f9cbefd807103d035ebad46f3c384fc4a5b7f6fc9f0209ad267e2b752992628fa537f6ef2191e598223794ddd915d4a3ea89fd6a67dead346ea SHA512 c75553e7e5ade1f9e60a5432c76207452ede2c39533e9cd696e10ff36068e14bf0fe809a31a4a5d0a228228300e30d221af698c093c35dcc67338615ac77aaf7
diff --git a/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild
new file mode 100644
index 000000000000..259e46499b02
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/-/_}
+DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
+HOMEPAGE="
+	https://pypi.org/project/typing-extensions/
+	https://github.com/python/typing_extensions/
+"
+SRC_URI="
+	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd src || die
+	eunittest
+}
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index a095fe3ecaf2..82ab88956954 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1 +1 @@
-DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
+DIST unittest-mixins-1.6.tar.gz 14901 BLAKE2B 0b63fd102395e61b1cfdbabc8a7e71e5cfabe71830a5fbefaac5bb2a4774b838dcad5f7d8c46fd7968f7ea35eee913aaf88d7cf8666aafc247859246ed2eb664 SHA512 6f78be17c53ec22a680b49a7541e2159c8f504dbc0b39c3c11e7676e20d3c6201be6cc722929017781658f0f690d1c258e0b148fa5dabb5af25e63b28dac5ffa
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 cb0a3a5d152b..d825fcaba769 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r2.ebuild
@@ -4,19 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 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"
diff --git a/dev-python/vcrpy/vcrpy-4.2.1-r1.ebuild b/dev-python/vcrpy/vcrpy-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..e56176b8fbc5
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.2.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,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}.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"
+
+# <urllib3-2 for https://github.com/kevin1024/vcrpy/issues/688.
+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-2[${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_httplib2.py::test_effective_url
+		tests/integration/test_httpx.py
+		tests/integration/test_urllib2.py::test_effective_url
+		tests/integration/test_urllib3.py::test_redirects
+		tests/integration/test_wild.py::test_amazon_doctype
+		tests/integration/test_wild.py::test_flickr_should_respond_with_200
+		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
+	)
+
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	epytest
+}
diff --git a/dev-python/virtualenv/virtualenv-20.23.0.ebuild b/dev-python/virtualenv/virtualenv-20.23.0.ebuild
index bbb4b8c78be3..b85b75dcc4aa 100644
--- a/dev-python/virtualenv/virtualenv-20.23.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.23.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 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="
diff --git a/dev-python/wtforms/wtforms-3.0.1-r1.ebuild b/dev-python/wtforms/wtforms-3.0.1-r1.ebuild
index 9067b3b12585..4056ade0d865 100644
--- a/dev-python/wtforms/wtforms-3.0.1-r1.ebuild
+++ b/dev-python/wtforms/wtforms-3.0.1-r1.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
 BDEPEND="
 	dev-python/Babel[${PYTHON_USEDEP}]
 	test? (
+		dev-python/email-validator[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/python-email-validator[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
 		dev-python/webob[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/xarray/xarray-2023.4.2.ebuild b/dev-python/xarray/xarray-2023.4.2.ebuild
index f64c9aa706f2..cd1e2bec6ff1 100644
--- a/dev-python/xarray/xarray-2023.4.2.ebuild
+++ b/dev-python/xarray/xarray-2023.4.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/yapf/Manifest b/dev-python/yapf/Manifest
index 9ac9e3466b70..c78dfd41330c 100644
--- a/dev-python/yapf/Manifest
+++ b/dev-python/yapf/Manifest
@@ -1,2 +1 @@
-DIST yapf-0.32.0.gh.tar.gz 178621 BLAKE2B b2132e3fffb96113700e322bba3f49ded0fe417de901522793564d5830951e9f2017c576fb89c5e423f4f547c95659040c2a4fc923887d9fb941e219b21f0cf6 SHA512 c1a05a04f7558a5b51899c29010bedc105c4a4bad4b5358a903a22a39f451e03369d2b4e670ecb44a857a8fef2bf438d9da0afcbdd3a336cf037bbf480d19878
 DIST yapf-0.33.0.gh.tar.gz 186345 BLAKE2B 0ce1b0ca9e3838eecacf36c8f666ad58c0f35fbee1384ae5e02f3294892dd23003c39af954ed9deb3aac70397ed9924b92233e229362da1907a9cd2c692fb7e6 SHA512 82846900a9aec22ad2519ebb29fcd3d6e5a787e71e93f80c0169cf796201ae5e970ad7307f2b528e6454264cf61ca96ac4f99442ce6a52b7cebf78ceb2c9a395
diff --git a/dev-python/yapf/files/yapf-0.32.0-tomli.patch b/dev-python/yapf/files/yapf-0.32.0-tomli.patch
deleted file mode 100644
index bdbfd96112a2..000000000000
--- a/dev-python/yapf/files/yapf-0.32.0-tomli.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 5909ba87f79ea1d687e5836c62dc82a116f4229f Mon Sep 17 00:00:00 2001
-From: Eric McDonald <221418+emcd@users.noreply.github.com>
-Date: Wed, 30 Nov 2022 14:23:50 -0800
-Subject: [PATCH] Prevent crashes against valid 'pyproject.toml'. (#1040)
-
-* Replace 'toml' dependency with 'tomli', which fully supports TOML 1.
-
-Co-authored-by: Eric McDonald <emcd@users.noreply.github.com>
----
- setup.py                         |  2 +-
- yapf/yapflib/file_resources.py   | 15 ++++++++-------
- yapf/yapflib/style.py            | 25 ++++++++++++++-----------
- yapftests/file_resources_test.py | 10 +++++-----
- yapftests/style_test.py          |  4 ++--
- 5 files changed, 30 insertions(+), 26 deletions(-)
-
-diff --git a/yapf/yapflib/file_resources.py b/yapf/yapflib/file_resources.py
-index b5e2612b..6809ca9f 100644
---- a/yapf/yapflib/file_resources.py
-+++ b/yapf/yapflib/file_resources.py
-@@ -49,14 +49,15 @@ def _GetExcludePatternsFromPyprojectToml(filename):
-   """Get a list of file patterns to ignore from pyproject.toml."""
-   ignore_patterns = []
-   try:
--    import toml
-+    import tomli as tomllib
-   except ImportError:
-     raise errors.YapfError(
--        "toml package is needed for using pyproject.toml as a "
-+        "tomli package is needed for using pyproject.toml as a "
-         "configuration file")
- 
-   if os.path.isfile(filename) and os.access(filename, os.R_OK):
--    pyproject_toml = toml.load(filename)
-+    with open(filename, 'rb') as fd:
-+      pyproject_toml = tomllib.load(fd)
-     ignore_patterns = pyproject_toml.get('tool',
-                                          {}).get('yapfignore',
-                                                  {}).get('ignore_patterns', [])
-@@ -127,19 +128,19 @@ def GetDefaultStyleForDir(dirname, default_style=style.DEFAULT_STYLE):
-     # See if we have a pyproject.toml file with a '[tool.yapf]'  section.
-     config_file = os.path.join(dirname, style.PYPROJECT_TOML)
-     try:
--      fd = open(config_file)
-+      fd = open(config_file, 'rb')
-     except IOError:
-       pass  # It's okay if it's not there.
-     else:
-       with fd:
-         try:
--          import toml
-+          import tomli as tomllib
-         except ImportError:
-           raise errors.YapfError(
--              "toml package is needed for using pyproject.toml as a "
-+              "tomli package is needed for using pyproject.toml as a "
-               "configuration file")
- 
--        pyproject_toml = toml.load(config_file)
-+        pyproject_toml = tomllib.load(fd)
-         style_dict = pyproject_toml.get('tool', {}).get('yapf', None)
-         if style_dict is not None:
-           return config_file
-diff --git a/yapf/yapflib/style.py b/yapf/yapflib/style.py
-index 233a64e6..c8397b32 100644
---- a/yapf/yapflib/style.py
-+++ b/yapf/yapflib/style.py
-@@ -746,17 +746,18 @@ def _CreateConfigParserFromConfigFile(config_filename):
-     # Provide a more meaningful error here.
-     raise StyleConfigError(
-         '"{0}" is not a valid style or file path'.format(config_filename))
--  with open(config_filename) as style_file:
--    config = py3compat.ConfigParser()
--    if config_filename.endswith(PYPROJECT_TOML):
--      try:
--        import toml
--      except ImportError:
--        raise errors.YapfError(
--            "toml package is needed for using pyproject.toml as a "
--            "configuration file")
--
--      pyproject_toml = toml.load(style_file)
-+  config = py3compat.ConfigParser()
-+
-+  if config_filename.endswith(PYPROJECT_TOML):
-+    try:
-+      import tomli as tomllib
-+    except ImportError:
-+      raise errors.YapfError(
-+          "tomli package is needed for using pyproject.toml as a "
-+          "configuration file")
-+
-+    with open(config_filename, 'rb') as style_file:
-+      pyproject_toml = tomllib.load(style_file)
-       style_dict = pyproject_toml.get("tool", {}).get("yapf", None)
-       if style_dict is None:
-         raise StyleConfigError(
-@@ -766,7 +767,9 @@ def _CreateConfigParserFromConfigFile(config_filename):
-         config.set('style', k, str(v))
-       return config
- 
-+  with open(config_filename) as style_file:
-     config.read_file(style_file)
-+
-     if config_filename.endswith(SETUP_CONFIG):
-       if not config.has_section('yapf'):
-         raise StyleConfigError(
-diff --git a/yapftests/file_resources_test.py b/yapftests/file_resources_test.py
-index 31184c4a..f54f393d 100644
---- a/yapftests/file_resources_test.py
-+++ b/yapftests/file_resources_test.py
-@@ -75,7 +75,7 @@ def test_get_exclude_file_patterns_from_yapfignore_with_wrong_syntax(self):
- 
-   def test_get_exclude_file_patterns_from_pyproject(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
-     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
-@@ -93,7 +93,7 @@ def test_get_exclude_file_patterns_from_pyproject(self):
-   @unittest.skipUnless(py3compat.PY36, 'Requires Python 3.6')
-   def test_get_exclude_file_patterns_from_pyproject_with_wrong_syntax(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
-     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
-@@ -109,7 +109,7 @@ def test_get_exclude_file_patterns_from_pyproject_with_wrong_syntax(self):
- 
-   def test_get_exclude_file_patterns_from_pyproject_no_ignore_section(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
-     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
-@@ -122,7 +122,7 @@ def test_get_exclude_file_patterns_from_pyproject_no_ignore_section(self):
- 
-   def test_get_exclude_file_patterns_from_pyproject_ignore_section_empty(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
-     local_ignore_file = os.path.join(self.test_tmpdir, 'pyproject.toml')
-@@ -192,7 +192,7 @@ def test_setup_config(self):
-   def test_pyproject_toml(self):
-     # An empty pyproject.toml file should not be used
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
- 
-diff --git a/yapftests/style_test.py b/yapftests/style_test.py
-index 8a37f953..d2203d9a 100644
---- a/yapftests/style_test.py
-+++ b/yapftests/style_test.py
-@@ -230,7 +230,7 @@ def testErrorUnknownStyleOption(self):
- 
-   def testPyprojectTomlNoYapfSection(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
- 
-@@ -242,7 +242,7 @@ def testPyprojectTomlNoYapfSection(self):
- 
-   def testPyprojectTomlParseYapfSection(self):
-     try:
--      import toml
-+      import tomli
-     except ImportError:
-       return
- 
diff --git a/dev-python/yapf/yapf-0.32.0-r1.ebuild b/dev-python/yapf/yapf-0.32.0-r1.ebuild
deleted file mode 100644
index 8a008725e63c..000000000000
--- a/dev-python/yapf/yapf-0.32.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A formatter for Python files"
-HOMEPAGE="
-	https://github.com/google/yapf/
-	https://pypi.org/project/yapf/
-"
-SRC_URI="
-	https://github.com/google/yapf/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/tomli[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tomli.patch
-)
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v -p '*_test.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/yapf/yapf-0.33.0.ebuild b/dev-python/yapf/yapf-0.33.0.ebuild
index aa950634d2c5..ef5cb50d7966 100644
--- a/dev-python/yapf/yapf-0.33.0.ebuild
+++ b/dev-python/yapf/yapf-0.33.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/yarl-1.9.2.ebuild b/dev-python/yarl/yarl-1.9.2.ebuild
index dcde76d04404..c13506687073 100644
--- a/dev-python/yarl/yarl-1.9.2.ebuild
+++ b/dev-python/yarl/yarl-1.9.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 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/multidict-4.0[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-05-24 18:44:23 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-05-24 18:44:23 +0000
commit	b8de162d8ddccdbffc26f279e208af94479024e2 (patch)
tree	e0fed93810ba81535abcce35e659a7e93b4d8eed /dev-python
parent	c1de40626918fe5b72160d4699e5dc64ba0b79eb (diff)
download	baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.tar.gz baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.tar.xz baldeagleos-repo-b8de162d8ddccdbffc26f279e208af94479024e2.zip