gentoo auto-resync : 22:11:2023 - 17:18:34

author: V3n3RiX <venerix@koprulu.sector> 2023-11-22 17:18:34 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-11-22 17:18:34 +0000
commit: fd87b7c771378b2116981e3924bee5805148e118 (patch)
tree: 91ed28393c7b534787d3c073e269fe598d0fd535 /dev-python
parent: 77b74be093bdf4a0ed4121acc3f8e229103cf004 (diff)
173 files changed, 192 insertions, 2528 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.37.ebuild b/dev-python/GitPython/GitPython-3.1.37.ebuild
deleted file mode 100644
index 0040351ab7e1..000000000000
--- a/dev-python/GitPython/GitPython-3.1.37.ebuild
+++ /dev/null
@@ -1,84 +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..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.10
-SMMAP_P=smmap-5.0.0_p1
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="
-	https://github.com/gitpython-developers/GitPython/
-	https://pypi.org/project/GitPython/
-"
-SRC_URI+="
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimpoortant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
-		test/test_quick_doc.py::QuickDoc::test_cloned_repo_object
-		# requires which(1)
-		# https://github.com/gitpython-developers/GitPython/pull/1525
-		test/test_git.py::TestGit::test_refresh
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_git_submodules_and_add_sm_with_new_commit
-		test/test_submodule.py::TestSubmodule::test_list_only_valid_submodules
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest -o addopts= test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.38.ebuild b/dev-python/GitPython/GitPython-3.1.38.ebuild
deleted file mode 100644
index cc252e9af748..000000000000
--- a/dev-python/GitPython/GitPython-3.1.38.ebuild
+++ /dev/null
@@ -1,84 +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..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.10
-SMMAP_P=smmap-5.0.0_p1
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="
-	https://github.com/gitpython-developers/GitPython/
-	https://pypi.org/project/GitPython/
-"
-SRC_URI+="
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimpoortant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
-		test/test_quick_doc.py::QuickDoc::test_cloned_repo_object
-		# requires which(1)
-		# https://github.com/gitpython-developers/GitPython/pull/1525
-		test/test_git.py::TestGit::test_refresh
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_git_submodules_and_add_sm_with_new_commit
-		test/test_submodule.py::TestSubmodule::test_list_only_valid_submodules
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest -o addopts= test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.40.ebuild b/dev-python/GitPython/GitPython-3.1.40.ebuild
index d3e26fb0db5f..65c7929430b6 100644
--- a/dev-python/GitPython/GitPython-3.1.40.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.40.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index b59cf960d330..76534f3eb139 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,13 +1,6 @@
-DIST GitPython-3.1.37.gitbundle 9744035 BLAKE2B 57f16e0ebfdf6e2078c8a8fa220185add124431491b0959649c5fca8cf234cf4f3bb86b46937a04de33b5600a3c50dc2c46acff69dfbb03973d48663f8a45bc8 SHA512 b18e2cc7f97f82ba7f36181bb76bb58797ac0c13043f44b9ffdb31523ffafd37cc916986a8a358c85c867937145ad58da052bf650fd346fdacc80b89feeb8d8c
-DIST GitPython-3.1.37.tar.gz 200076 BLAKE2B b5db83f6712a94464fec98229af739ca7eb71eb47bd03164e94bb680c03bd84e49c7956e3a58937464c6fd6e4254a24d5e89150f40a59c5d101d7e56daca8fba SHA512 c036b5a12b2839a152d21cc6163445c067d70b18984888e799b0900449bea0a5290f6520fae5cab83fb8553af9c6bb0150c9b28103311deecb3686de30dd35f1
-DIST GitPython-3.1.38.gitbundle 9830368 BLAKE2B 4a0e5c9f7f859b49d36d8d8deef79aa59615698416586d2802d428d21b959bd80da78555588f51db4833f35e2cc63d56ef9188a59916693af484e6e6ccc4c6b9 SHA512 5fff695ac828bb0495fb8dd9bc75f57e44d721ad8010577d567c34638e75855d22ce6560649cebe26a84f1baa0f245b82b9369e19ce6e3af36eadcfd51049c23
-DIST GitPython-3.1.38.tar.gz 200632 BLAKE2B 56c9b0f96c70e9f021d9830b220a43902de58271c38b25886c93d33706bd5a4dd081ca3cc3c126c7d5da24ed715a36b570b7a81f9d71aa3c1bfc77f2f7865730 SHA512 39bdf3dc3b1b1467a6f5426817977a353d54d4798451126f847911039de84d7d8030bc4d4263fd7584685a5a8113fc62d29f6c98c0bc95b646ee4f2f0ef60862
 DIST GitPython-3.1.40.gitbundle 9832215 BLAKE2B 2aa1dac889267bd0b81f9451bc347b842cc5ad542a490fcc6f951cc1ee40f807c7cb5a178772c8abf43893fd9815aa570d2e53a561a0c8bf431dc5fa6429cdfd SHA512 25ca1f1b620e72a1c58a7b609dc6e761afdb1502d35ad26411fde47d5d2099b6bf6160ce85288bf280e28b3c8f30471c9f791cfb66878bc1ef7d46f58f880e81
 DIST GitPython-3.1.40.tar.gz 200655 BLAKE2B c95cd864bfc664eb704ac3702f5a6c78fc0f2288af945001622cb78c2e855fdf3af068736c569392a29b201dc3952d0574c7f7c39c0531269b6efb55f5506344 SHA512 e8ade266002aa6fcd4b12e3828e7ec45b4dd894c897f31946dc29461b7e81b380ea832a9ea270533e7491e006c92948c62bbc21ab960467cf6287d0bac5228cf
-DIST gitdb-4.0.10.gitbundle 1485461 BLAKE2B 5a217c609a402cd7888da1502b25d217812503cd703cda8bce3c7159732c59d7f4bcd52688a5da457f43fde1645a6db79588a6fc8cc8dff5c58e9dcbaef79b9a SHA512 98dba48f75e28eaded791f91c611e07bef73c28a7f8ac58889b05d04f4b3699a85a5be1c829ea3e2f380507a9009f35bc552bb4260564127e2863807f9b4712a
 DIST gitdb-4.0.10_p1.gitbundle 1612782 BLAKE2B 9a424df0afd174da722c4721a5a52db83dccc5a2d69dd186622e5e21c48a6fdb6f20d84ad959f2070d8ff4cfa1e9be8f99b97e2a6ce5aab1696737858429e018 SHA512 b52a978ffbda8fb048fa0920cc2cc597b077b468dd77ce1a8e784ca7c724760eee75b168ac98f1051b03d364ba88812e8cacd5a7f6fa658cf312e626d0b2ad0a
 DIST smmap-5.0.0_p1.gitbundle 324544 BLAKE2B 69098c7644abaec7f32226cad7ff3008e49d94c9f7349d0b815223249c20bfd2b51a50474e51864821f30c98f5982e5c35ce9217145a1e5d11326492c41faecc SHA512 4f36ca2c94ddfeb949c880fb52c3b1905d144dd59b95f2f05c93ed7b694dcb128218a2800ca23b721fbeff9a1920e8c3326675098e2ef0361ff6e90c8c2850ba
-EBUILD GitPython-3.1.37.ebuild 2329 BLAKE2B d1624385cbbb707a699a0cbdd0c79267f081ce759c01f8a2aecf998646ae4183d7e7e6d22b969d3926ffc62e2ee7956089c2a3a2f801f884d8ede62e22076990 SHA512 dced81b22474510b093621932d72b99c6447e84499d48f113f4dc7170b621cc8bbe0a6c46ac1f3ea5fc9451dfab0076f44e03e69e446c5a1ba89427cbe474a55
-EBUILD GitPython-3.1.38.ebuild 2337 BLAKE2B c5065e57ccddaccdc1371f692705d0febced2c4ffa789436785e90f49b5267abb887f82a4d1659f3982eeac2c3cf514d1d0b2e7dab85e08acbbdffbc22f60e3b SHA512 8eecd47587b3c70221c0c9920b576f36688868825942eab369f64a88dccb9c0ff9c23a12111420ad3084b31d9c849bad4846804901c37ece50f6ab3b59d86a8e
-EBUILD GitPython-3.1.40.ebuild 1983 BLAKE2B 1501c3c9ceb6dd14b66346a35c97b2be298e5dee7992c27f08fa7c3b79141fd359d00f52533f726318fe09ab0d9bafc513eaf0494c1b258bea9adb997db29786 SHA512 9d637623c527adb6ca11faf013dbbeb38b2391e6c1003ab4192265e8e41f011bca5abe7e6c8f1fc44731a74d79d472b020a08ae2f6e784f045281e294fdff99d
+EBUILD GitPython-3.1.40.ebuild 1975 BLAKE2B 2ed7715f36a75a96aa3363073336e7598fc4246fd469bd7a8b14707ae9422f8f6593f2d3fe5d347e154b0fcd36b737c474aa3c2789ff061bdb45fb5185750622 SHA512 9119a3d53a0b522ab4b055786b488f2264568dff031067868a72fbd3a51832ea07cb72fab35600b586d509e0f3a0e026971eaacb9a2f969672e36c53cbdc6bee
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 944b20798e8e..7769adabd636 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index c9990f417f20..e2469d6f5e38 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -5,5 +5,5 @@ EBUILD QtPy-2.3.1-r1.ebuild 8521 BLAKE2B dc1f6cea1837cf3ec4e00b5ad716ad0395a6ff7
 EBUILD QtPy-2.3.1.ebuild 8246 BLAKE2B 1c711d5a69b52f21e69d52a8059b21effc2ddfedf1cf426fe86b682d42d9b6a2869e23187ae78fa8513131dc49df5c0970ba73b8f32271f9d41ed5aa9d398ac1 SHA512 5a606d51c0d73560833a72e5eeec6c6487b902a4303bff86e8f1266d4e24c527836c9fdc4f7a981d2d7e298eb106655dc275481b063ce1951ab109d6a03820ce
 EBUILD QtPy-2.4.0-r1.ebuild 8822 BLAKE2B c0c5ae7c439d813b7b00b99fe0228fbdf7c4c153664654503c43321cab239175c4c1a27da70424cb2d4cf88b0cbf246032c883f1cefa362e586175d50b872e94 SHA512 4c6cb624ac751f8a397a346eb3e55fc6362063ad20c1bc8d2008312ff0d1430486df4160bbfad2d811dfc9413683dcd0d0c51876c68c25e84cab97cf656696f7
 EBUILD QtPy-2.4.0.ebuild 8589 BLAKE2B cdc3997f440cb75c1873f86ef40fb01de85fa73bb27cb5e4db2f17051329d5cfa9febd269b542b0e39785d99be986859446bbb65ccd285469e41b5b4cf87610d SHA512 1a8b975a9420d4306b49e5dadf0773ec2c2dc4e01b8b373a86e51f5ecd3cfdda73f0cf038208a3a6aa06bdfc34db49371a6ea9183f6bdb52fd4773b5b5156244
-EBUILD QtPy-2.4.1-r1.ebuild 9483 BLAKE2B 021bfc74c13c94e91250d4d5556ea610cc85bd66a32644dec10f2bc8b4f436845f4b78a86a5abb214b6f545dc267365a728fe4cce1282dbb42cad7e939d4f52e SHA512 958da8845b46f9cc7c05b6882c194f6de471abd530bd2cfa3b4c9a3541a0ac3926173757a3ab4b931177a8bdee15b70b8d824d5f9d629a5e807a04b0c71463bd
+EBUILD QtPy-2.4.1-r1.ebuild 8532 BLAKE2B c2932c35a19e2c8f1ce0eed76cd4bfc6d2ee4cc99956bd3f558efd515d99bc43b1dd255a99e60ed18ac530e5a2f2c49c0fff847788ae7dea1c2ea98ebd91254f SHA512 03962f29e5f8b0a3ddf398768b23870e7e1ab9c47acc040c308779efd894e82644a5e291a76dfcf3210491f2169d767ea2d6d17450692492499665e78d8a8edf
 MISC metadata.xml 2864 BLAKE2B f1ed249b3864a0c66d02e0aeaf48dfa8ae18ee452a75a1932ab621d86902f602c511bb113fd385ad9d6b57d6d7a07b350f1ba25ab07cc0f646281d9d41e03134 SHA512 bf065ae2c73b735ad7f501e5a525718d506495a7ce4b415e79f67b52c166082f53272a1295fc325d8a98f050bc01d2a5bba1e85ef7e1e8dfcc738b837f93bfbc
diff --git a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
index 2d5fc3255ee9..ae81a1be637c 100644
--- a/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-2.4.1-r1.ebuild
@@ -200,41 +200,34 @@ src_prepare() {
 }
 
 python_test() {
+	local -x QT_API
+	local -a EPYTEST_DESELECT
+	local other
+
 	# Test for each enabled Qt4Python target.
 	# Deselect the other targets, their test fails if we specify QT_API
 	# or if we have disabled their corresponding inherit in __init__.py above
-	if use pyqt5; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt5"
-		QT_API="pyqt5" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyqt6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PyQt6"
-		QT_API="pyqt6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PyQt6 ebuild
-	fi
-	if use pyside2; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide2"
-		QT_API="pyside2" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide6]
-	fi
-	if use pyside6; then
-		einfo "Testing with ${EPYTHON} and QT_API=PySide6"
-		QT_API="pyside6" virtx epytest \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PySide2] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt5] \
-			--deselect qtpy/tests/test_main.py::test_qt_api_environ[PyQt6] \
-			--deselect qtpy/tests/test_qtsensors.py::test_qtsensors
-			# Qt6Sensors not yet packaged and enabled in PySide6 ebuild
-	fi
+	for QT_API in PyQt{5,6} PySide{2,6}; do
+		if use "${QT_API,,}"; then
+			EPYTEST_DESELECT=()
+			for other in PyQt{5,6} PySide{2,6}; do
+				if [[ ${QT_API} != ${other} ]]; then
+					EPYTEST_DESELECT+=(
+						"qtpy/tests/test_main.py::test_qt_api_environ[${other}]"
+					)
+				fi
+			done
+
+			einfo "Testing with ${EPYTHON} and QT_API=${QT_API}"
+			nonfatal epytest ||
+				die -n "Tests failed with ${EPYTHON} and QT_API=${QT_API}" ||
+				return 1
+		fi
+	done
+}
+
+src_test() {
+	virtx distutils-r1_src_test
 }
 
 pkg_postinst() {
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 3cb85922f3af..98c8057d59b8 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,13 +1,3 @@
-DIST argh-0.29.4.tar.gz 52694 BLAKE2B 6d2b75200ea7b570ac199139ba7bc92b5bfa41fa4e21d19eff17d8506c4a28c6043413a25679cab52f9d81b8bb9a1f35b77ffee3beaa98c43660ad9e5c6b8dfc SHA512 017346afb237429de1228f604a763f919528fd359edfabb7b5a5c3a48c5e5be5a5a385672d54299cd15e5bc82257d8c33816fbc463873ffb9b3c3a54b40fccfc
-DIST argh-0.30.0.tar.gz 59803 BLAKE2B 2e0a5d9dfbe5177ac434224b78b0575f4b2b4373abee8ba97cbb31617e855309ed152e83e84c03c3b5666705493011bc4a0c86396ed5891914e9af3436d9b058 SHA512 a16fa32cd1fdcd842335ebecdaefce48d248a0a6449b592a3e83dbeb02543123e36dc057f457d7bb097c1b4e118d11a800ecc40a3847e81533d8dcf1d292111d
-DIST argh-0.30.1.tar.gz 60275 BLAKE2B 24e80f51f2c2f76d605b4282045ffe98f274f3e4692a3dfc26e35aa32a97a79fdc78b795622a2cb593ed83657c1cb1ecef562b43f5b8dc3097f4909403aa98ce SHA512 a24bdc92180ebce217433842e223e958ef222dc81feba8ee22ba0b219b5c259f3d2e79f8ebdf7334b624f69c83814322aa1e768cc72f644c0b16fb2863910035
-DIST argh-0.30.2.tar.gz 61528 BLAKE2B f4ef544c67cecaeaba63ca7c97425be0924712c380081971cbe67fbcfeb4a723b5a3e9bca4c33db02fb6466a4a632d756282f8e49a2c69dad4589004c3f83acc SHA512 68950e521fb6c98dbef8c1df334c2a0ae8253f6874a64d8b891c94608ac959344bae0ba65d61379796f304197f5b7f55ab8444957d1b230aa2e4d19bb080953e
-DIST argh-0.30.3.tar.gz 61908 BLAKE2B 5a35d34df18c9f9bc59ca0966b034a3dfb9e337e61023c84bfb06ee4f7bc568f4c66408baf009ed4a84670bc4d13cd147cfd30ad917901fa711f7f88ee83c391 SHA512 1b3b1b9fc72794f3aa92f76fba8c24e38e1a93979a203b2d0f724d57ad6af32e3bc015ca017fd97a92e2eda9c96d5687de174133f5f7e9f2e0a736a2d9d87584
 DIST argh-0.30.4.tar.gz 62618 BLAKE2B e95ee9219d2b8079e4b9548f68811832ed9ca699c1dcfeabcf31a9a0c3fd35c107896f088a64efe430347fefd1424345753bc4e0341155a92d99a5327f4a137d SHA512 6a17fcaef3a1a400426cc53339e07583734b0b68ce9202a7b3655f5cababa495aa5269f66cde2d0b2217874ddb730bf7d1c7636dd915e4e778058399b9b9a44c
-EBUILD argh-0.29.4.ebuild 568 BLAKE2B 101ad987971dbdfb496aecc1c8e0be5aa19a67df9e89accd4c0ffb000cde38a0238567d69935ce0acdb51bf2280cf88be3ab66253d09d10d07e561981f868a67 SHA512 3eb461338244c4f5a2c487c932aecaf185b3f2717fea8223b6de9353adf0d629863eb9ebf463601db19c0302d69dc09854dc823652c539d01b09572085f5cfdd
-EBUILD argh-0.30.0.ebuild 576 BLAKE2B adefc58efa7542e9e97e66d22aacbf443549eb9c97c6cb19b9cb4ed25e474016f6a60620f47333f06d17ac19183d25f1be348c97a87a13d051452c07c5cb90ba SHA512 cacf7a864e4e581f06ab6834014f67aa96e08d2dba09d8de5db00daef3dd6011e16a843a5afb5ad1c183ce85308a8e660eecd135dfd26959ba64c35ace6caaf8
-EBUILD argh-0.30.1.ebuild 576 BLAKE2B adefc58efa7542e9e97e66d22aacbf443549eb9c97c6cb19b9cb4ed25e474016f6a60620f47333f06d17ac19183d25f1be348c97a87a13d051452c07c5cb90ba SHA512 cacf7a864e4e581f06ab6834014f67aa96e08d2dba09d8de5db00daef3dd6011e16a843a5afb5ad1c183ce85308a8e660eecd135dfd26959ba64c35ace6caaf8
-EBUILD argh-0.30.2.ebuild 576 BLAKE2B adefc58efa7542e9e97e66d22aacbf443549eb9c97c6cb19b9cb4ed25e474016f6a60620f47333f06d17ac19183d25f1be348c97a87a13d051452c07c5cb90ba SHA512 cacf7a864e4e581f06ab6834014f67aa96e08d2dba09d8de5db00daef3dd6011e16a843a5afb5ad1c183ce85308a8e660eecd135dfd26959ba64c35ace6caaf8
-EBUILD argh-0.30.3.ebuild 576 BLAKE2B adefc58efa7542e9e97e66d22aacbf443549eb9c97c6cb19b9cb4ed25e474016f6a60620f47333f06d17ac19183d25f1be348c97a87a13d051452c07c5cb90ba SHA512 cacf7a864e4e581f06ab6834014f67aa96e08d2dba09d8de5db00daef3dd6011e16a843a5afb5ad1c183ce85308a8e660eecd135dfd26959ba64c35ace6caaf8
-EBUILD argh-0.30.4.ebuild 576 BLAKE2B adefc58efa7542e9e97e66d22aacbf443549eb9c97c6cb19b9cb4ed25e474016f6a60620f47333f06d17ac19183d25f1be348c97a87a13d051452c07c5cb90ba SHA512 cacf7a864e4e581f06ab6834014f67aa96e08d2dba09d8de5db00daef3dd6011e16a843a5afb5ad1c183ce85308a8e660eecd135dfd26959ba64c35ace6caaf8
+EBUILD argh-0.30.4.ebuild 568 BLAKE2B 101ad987971dbdfb496aecc1c8e0be5aa19a67df9e89accd4c0ffb000cde38a0238567d69935ce0acdb51bf2280cf88be3ab66253d09d10d07e561981f868a67 SHA512 3eb461338244c4f5a2c487c932aecaf185b3f2717fea8223b6de9353adf0d629863eb9ebf463601db19c0302d69dc09854dc823652c539d01b09572085f5cfdd
 MISC metadata.xml 385 BLAKE2B e1fc25e92c45fbd0183634cc645085fef5223a59975a5000557c1a2ef497c6f9ce017e462a9a881e61b4578c90859f51e5471d197ea884b7dc4ce90786a0987a SHA512 97719df6c0b48c7348bf25de9016dd1de373d6b9e1fd7f52d87eb6e0935608719c726aa3f4ca4aba8fa1211d1234c2b959dd821d241cd65b6cb47b1a06481df6
diff --git a/dev-python/argh/argh-0.29.4.ebuild b/dev-python/argh/argh-0.29.4.ebuild
deleted file mode 100644
index 982f7e9655a2..000000000000
--- a/dev-python/argh/argh-0.29.4.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=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.30.0.ebuild b/dev-python/argh/argh-0.30.0.ebuild
deleted file mode 100644
index 32a100a7ba11..000000000000
--- a/dev-python/argh/argh-0.30.0.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=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.30.1.ebuild b/dev-python/argh/argh-0.30.1.ebuild
deleted file mode 100644
index 32a100a7ba11..000000000000
--- a/dev-python/argh/argh-0.30.1.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=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.30.2.ebuild b/dev-python/argh/argh-0.30.2.ebuild
deleted file mode 100644
index 32a100a7ba11..000000000000
--- a/dev-python/argh/argh-0.30.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=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.30.3.ebuild b/dev-python/argh/argh-0.30.3.ebuild
deleted file mode 100644
index 32a100a7ba11..000000000000
--- a/dev-python/argh/argh-0.30.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=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.30.4.ebuild b/dev-python/argh/argh-0.30.4.ebuild
index 32a100a7ba11..982f7e9655a2 100644
--- a/dev-python/argh/argh-0.30.4.ebuild
+++ b/dev-python/argh/argh-0.30.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 20d0433537bb..83aab793b8ac 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST Bottleneck-1.3.7.tar.gz 103067 BLAKE2B d260263fc05b6806203c09555157926f288c60ebb88105b9ad73191c220be0e08370d7a96cb829ec8dd9ac0c2d243aeca62eb1a871e39fe8c85ba6ab507849ac SHA512 ffeacb13e5a99db85e1580b9f2ead98239b4fd0b253a3c242a5507a026b439b9927ea49becec7e4d2d8f8e4ced15f43514c0af99379389db141ae50c4513e011
-EBUILD bottleneck-1.3.7.ebuild 893 BLAKE2B ea35047427aa0581c352885ab3ab7b4fe51b6b652c0091d5ccf2ff08c03bb89199b0a289086c228a642768d95ea0718ef3b9db65b653841a366f2c178524c3ad SHA512 28eec707c34348e40e48b5f628df2a6c4c959e630db01caa2910351dcb773b239ad8130ef11292fba06105c72149ae3d83e1c0c17ceb5d37b3f1299139442d79
+EBUILD bottleneck-1.3.7.ebuild 899 BLAKE2B c64e426426be067222eb8ea4063b1f070ea19179f0a83c6c57d015eeb61b764455036ca5cbab1bfd23b08b948ffd1647a9fe26d85e66bd668fe2853097b3a76c SHA512 0fea65ce38cf36472df303cfbc00ce91a544116722e033def976cc448704d471c0255fd9965f52101e44e0a677a08126e8c11f112e02a1ed95add5478b0c4c58
 MISC metadata.xml 519 BLAKE2B 5e5e712122fb0bbc898942cbae15c7cf623aa8462257f063f65a06bc9caae6662c373963f0945f99c5fffe01270e2792e8e5d01af93b49a04f5c3c22cd3a30f7 SHA512 55d2c03dedaa48c8f802d1e4d1d7db4e829fe7357b501c3b2955d28da501eae00675b2775ab36d1131cf2ef0a3d037183bde8df4c85e986d81510df4e234b0ae
diff --git a/dev-python/bottleneck/bottleneck-1.3.7.ebuild b/dev-python/bottleneck/bottleneck-1.3.7.ebuild
index 83ac40b49dac..c07b0bf1cdfc 100644
--- a/dev-python/bottleneck/bottleneck-1.3.7.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.7.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index de852680dea7..c4cd66a39885 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,8 +1,8 @@
-DIST alice29.txt 186314 BLAKE2B f60a7e91e95b65a94c2ca8be35f53e0978d39116ff4bc69ef630787e52f9ea4e8ee06bd1f96bc051c894ddda077b4a14c51ca4bceb31f8be6954f4bbb89f27aa SHA512 16d436a3be97882a21230fadd51963d11bda69a9532c048e12f1f3c8579ff69bdd8221d70f77600b85ad3c0e69d9fef172755cabe5a1476dfade5a30c8b1b03f
+DIST alice29.txt 152089 BLAKE2B ea900856d3ae0ed2fea1923e557824bd09583f7c1be25aa778a43812d945318e1d911e682e318861979b5a479765b34e15a926d257f883ff2fb0df418ebf9966 SHA512 d93d674d66b227d7b3f4e1b7c35b102c40800e728bff68c7821109e7db7adf2f0b76a67bc9bd53b0202ac8daa0b22145f004dbdc6b59a48a6c8c72061bf1989f
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
 DIST brotli-ed738e842d2fbdf2d6459e39267a633c4a9b2f5d.tar.gz 512305 BLAKE2B b646e4565386870443d006a97a13b295c2c66de448e501f809700c303bb3daf5e4f84a2dacec16c43a534879243e4cda9292072630f13d5f7ca54f2c4372e560 SHA512 f493e7f15ca2804ae8715e48bdc954680f527533e684ec3762a7d49d05890915194289ed948c8cce95644274e1dcab952dcfbc84c0108aaf79f35f20270ffe6a
 DIST brotlicffi-1.0.9.2.gh.tar.gz 22714 BLAKE2B 463cff7aed04718d1c77e6b3477dbbdb40cf61f0e045a7759bf1e8656e3b07e7b9f3ff5c5356069e752d750774a6ab203588a4094d27ad7ab9ae80f091c6ea3a SHA512 3d200f606c9851f0049835b53dd1f117727786505b5887e246934f41a978d375e1fa5a078e0811f130c009931e41c51575bd9d55b602ee7b6daebe9759ed15d5
 DIST brotlicffi-1.1.0.0.gh.tar.gz 22736 BLAKE2B 013eec22fcc83da838020c97c4610f80d011a47e6f2c6e35cc1fb062fc0990030349ec59597951003a15c5b4b373aeb91b3caec2a645bba2956e950727b7ae39 SHA512 5b53a2fb8a8a98720e1b9e52816954c2ac478dc31d174aca64b86b86aebb4ffa42e8811117a48ea6bde597846325326624f34178cb0bb1843670e8bdbc742c75
 EBUILD brotlicffi-1.0.9.2-r2.ebuild 1444 BLAKE2B e545110ee44263c56d5614b51743a279990d95382d31afdebf94732ff61ac44a96a3b04ec98800daf3b5c208ddc0b5def480198e9ea13692246896674e0fc113 SHA512 232c868d152eb1b158e5d1fffcab7d8c28a0bbc5fe038160914c76d8b0ba5e526a4d5e80edadd38142c9d3554018499ac91821a5fdbf756e2b166363a3eeed2b
-EBUILD brotlicffi-1.1.0.0.ebuild 1679 BLAKE2B 726a9afa3cd396ba574ceedf388f95065a8be2df3a4654404cd9f82ca14068366d4e6bc4106391af6f45ddddaaef8ae2d0d84a990d43497ba2f1b05b59e8dd1f SHA512 8560850b16754d07dd3a6fa20850d3834aec55eaa5044613f554f10ac2fb83a73e359cb30deb58d8aa8a1ab08ccefa3b00a8ffebe356f41dd22ed81f3659054f
+EBUILD brotlicffi-1.1.0.0.ebuild 1675 BLAKE2B 1a9dd217e20467a831ef506dfac7db319ec189c5347cbb1bef06f0eb6abd1788bd4b365fe1b619128c53dc76578d52e2653ffc79e547879c1368405004a5a2e0 SHA512 f0d92baa1045faccc3893aae9aa74bf7278242cfe0c699b96590a3d22a9a125715e210a5ee373486e23e08332a06a6c89cd91d69a82cc57da08d5131505981ae
 MISC metadata.xml 377 BLAKE2B 13782cfbd514306140bb23753666679d94d15f89f0c2c84c13972151bd17d5c4ccd88930d60d732632f5e9a263d864b7aa5dcd741aae60508240e0f6d6f29230 SHA512 e440ae16d42ea9ab96317d26d88bf2955e0d8d5b4a6c41aca96a46c4f1e1c149d710d4cf52a569d6eb6d34ead71007fc2b2a7f67ff3c241e83d9573fe4d41e38
diff --git a/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild b/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
index 876a942da11d..4233b87426d9 100644
--- a/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.1.0.0.ebuild
@@ -24,13 +24,13 @@ SRC_URI="
 	test? (
 		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
 			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-		https://github.com/google/brotli/blob/ed738e842d2fbdf2d6459e39267a633c4a9b2f5d/tests/testdata/alice29.txt
+		https://github.com/google/brotli/raw/ed738e842d2fbdf2d6459e39267a633c4a9b2f5d/tests/testdata/alice29.txt
 	)
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index c0ada0f638cd..1181b84be44d 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,7 +1,3 @@
-DIST cbor2-5.4.6.tar.gz 86909 BLAKE2B df24c786f32819f9a93a2db28536b78349db6185108188d0a20e7298ff8c083d1feb59110865b4e21190e0363b113201ccddaa0d36b49bd7bbacf9d5ee7695f4 SHA512 44fb3e2e2249c79b1454487670d53eb672ffae4c22374d2a2bb9e314ac15470e4e7913e4eb1981a8bd4d722e6827328dde7e57c5f0556843e951c4723ae5bd8e
-DIST cbor2-5.5.0.tar.gz 94286 BLAKE2B 01c3659c161d47b3e0fa5c9e8833989e448b60d40f408f8c9ebde0a4e3d388dd047aea1666a93f3bb4be1e49695a4089e869d658b594456839c71e2bfe17cb29 SHA512 64b9ef0e358ac02113f85a2e633ed52900c4d5d6c89f889d9322f181e29fbdf9462663b5eaec7a255d5e6d47c82c4902cb7ff56999251c5ec070c7b610e615b3
 DIST cbor2-5.5.1.tar.gz 94221 BLAKE2B 651d229c9a4e5fda2ae61302f8bd72a165f15e008333525a301f2fc94dc81259698f4ae9b8c1f3a0b5fadffadd4d55f2ba4bf1445938a10342997bca64ceba31 SHA512 7878b997ae5bdf44cb04b7cef8445a94f11c1722819ea85073bd56f99976cf2c1c1180e72d9ae9cd7dd7d06a6aa55dc1cb3f919a869098a9feede210f8355fb4
-EBUILD cbor2-5.4.6.ebuild 1007 BLAKE2B abeefeb2f1534bce671981faaa9d85595030b06e72bcd33f77fe22de87247fe5cfec7b4c58929681ed75bbcffcf48c515af834c9fddff98737bb979700f6bb47 SHA512 9f733c41454188c86315e42ac8cffd03e7c4a916018236a17ae1abfe7e20fba747470811770bcc50c5a514c6bef8abcaa1be19862702953649c7416afddb9bf5
-EBUILD cbor2-5.5.0.ebuild 1054 BLAKE2B 71f7d0de700de61d5ec09bc547953c74f9361389ee2a192a142fabd977577a6420b9c3ef63f46401dccd55ab0e4355c6c5b62bf9b32fa9e302fbff1017ccd57d SHA512 af1dae5c7b960ffed8016361aec9e212dcc100c89563478bedd59f18b0ef8dcdf8d4af549a278f7e6f8400efac05ff20856727678c307f56b7bba35fb3a282ee
-EBUILD cbor2-5.5.1.ebuild 1054 BLAKE2B 71f7d0de700de61d5ec09bc547953c74f9361389ee2a192a142fabd977577a6420b9c3ef63f46401dccd55ab0e4355c6c5b62bf9b32fa9e302fbff1017ccd57d SHA512 af1dae5c7b960ffed8016361aec9e212dcc100c89563478bedd59f18b0ef8dcdf8d4af549a278f7e6f8400efac05ff20856727678c307f56b7bba35fb3a282ee
+EBUILD cbor2-5.5.1.ebuild 1049 BLAKE2B 89ef72e5ba8ee48edb39e803d25f205408cd34dce89dc66a8cb77adb43dc02e65eece330e8be2dc4001c6cb9ed8b705389a7b3a51b0b19d6194a944a6ca64873 SHA512 41a2e7a50674fbdb0b0ee47c99d5ad0e0d163a35f190465d4ec2fb78412149fc914f12060420d62464deac0deb15470688369251a6b1f6588e1ba9a828e3161d
 MISC metadata.xml 1142 BLAKE2B 689bac6d11c7cd4044b2528c5a6bbb183accdada7865efa65ffa6fb52160bf34d4e3629101eb9ceac88e842caae92f4df1e9ce2a5c3ffaa709ece08786267f96 SHA512 82647cdf6d750d791a46784b92cc8ef2f4ead08227f266f6ad782fbaea2e90fea0cfabe5d79848b3c9253a38af1e105b9a279d9e7ca4e1edd3aec79aa5897a1a
diff --git a/dev-python/cbor2/cbor2-5.4.6.ebuild b/dev-python/cbor2/cbor2-5.4.6.ebuild
deleted file mode 100644
index f067b92a3f61..000000000000
--- a/dev-python/cbor2/cbor2-5.4.6.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x CBOR2_BUILD_C_EXTENSION=1
-	# pypy3 not supported upstream
-	# py3.12: https://github.com/agronholm/cbor2/issues/171
-	if has "${EPYTHON}" pypy3 python3.12; then
-		CBOR2_BUILD_C_EXTENSION=0
-	fi
-	distutils-r1_python_compile
-}
diff --git a/dev-python/cbor2/cbor2-5.5.0.ebuild b/dev-python/cbor2/cbor2-5.5.0.ebuild
deleted file mode 100644
index 891987b304a0..000000000000
--- a/dev-python/cbor2/cbor2-5.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="
-	https://github.com/agronholm/cbor2/
-	https://pypi.org/project/cbor2/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+native-extensions"
-
-BDEPEND="
-	>=dev-python/setuptools-61[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -i -e "s/--cov//" pyproject.toml || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local -x CBOR2_BUILD_C_EXTENSION=1
-	# pypy3 not supported upstream
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		CBOR2_BUILD_C_EXTENSION=0
-	fi
-	distutils-r1_python_compile
-}
diff --git a/dev-python/cbor2/cbor2-5.5.1.ebuild b/dev-python/cbor2/cbor2-5.5.1.ebuild
index 891987b304a0..259decdb3e40 100644
--- a/dev-python/cbor2/cbor2-5.5.1.ebuild
+++ b/dev-python/cbor2/cbor2-5.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 841cb33b7cdd..e473e99fede6 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,5 +1,3 @@
-DIST construct-2.10.68.tar.gz 1190512 BLAKE2B b41e5b3b62cd1568c78ac4975b0d66e7a7ad4489e97031d3e866ff8eb98eea4eb387041dce15210304c608e0c419548cddea3557c2f53d52ecbcf6eb5be67749 SHA512 2388751323b16b69a06457c4862e7d1334580c201050734f150ab4437e2066ed18ff5323f7d81b8bb93124ae0f57a2ae91d7c64ffefc6e0369d6e625b7fef4eb
 DIST construct-2.10.69.gh.tar.gz 1195652 BLAKE2B 003353d4be4992ecb9e32b845a35a4850f451e3ead40af2c1b9d3380c27b58088e75e20ff76c733e573594e1ae08406c188868907c0f335c13e23cb01bf7481f SHA512 c94a1b3a62c9bf4aed30eb262d4439452f98fe909e399d79ece8da4aa707f95c754d540672c2cc9c307425914e43384b5455eb7970ab5d7830af1c0b06313f9e
-EBUILD construct-2.10.68.ebuild 1055 BLAKE2B 2380d81ef2b94cbcb2db726ec97b541cb05c3047a37cedd21f0436a418e2755c8af5b24a954891e0532bb11849a3e01acf59a28704c260d510e1fde579d05573 SHA512 d7768d6adfb2da2a756cb6acff0e4b3b40a4ed5420d44029b34f9f40797650d3043c51e7a0819498b0e7d7700a9d55cae42f6b44d8d5794002f46d0ba47e7792
-EBUILD construct-2.10.69.ebuild 1155 BLAKE2B b907ded227c64fafa1ced4cb53339c6a451a48e92109e790900c847fda5e3e10f789c2e2285be9af210c4a8b27c568bfd8bd13899f47e0c87bf5a323961f55ba SHA512 7af83bf417487300dfb2b50b399700a94e84760ce2f106e8b5c0d114b6b088154d381efcffdc50c8faa792686641041b0ec6618b383ffaa6e213424116d6f297
+EBUILD construct-2.10.69.ebuild 1153 BLAKE2B 2ff09659a640dca974f1209dfb6ffe5c9bfb3709d453e0fb969ef274a18f2792fb3023a8b576572467a0c9e44b415841faf28bfc28f7458132c275d97f403c42 SHA512 0963af9c67dfd124c20020319cae8541d4e36de3c05752202020fdf9f1f1f819a5f69f178bd959112422942ba85f143cceaeb94d033403958cf81c86026715a9
 MISC metadata.xml 530 BLAKE2B 841ba440080eb109449759509abcefb1449a87e3aed1f63a2acf021e6bb8c18e67d4e7e6c85d530877b7a2eb3de167708a728ad35507e3e6268f2d3f202018a1 SHA512 6c0e4d31dfaf335a7f94bc21866791100f8e96f5d58aaf988a48c55a054f5ac5d7ef579943a01d68e1403432b33f62c241b2a06dcf874278a1424f3cf60c8caf
diff --git a/dev-python/construct/construct-2.10.68.ebuild b/dev-python/construct/construct-2.10.68.ebuild
deleted file mode 100644
index 6b813997bc99..000000000000
--- a/dev-python/construct/construct-2.10.68.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
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A powerful declarative parser for binary data"
-HOMEPAGE="https://construct.readthedocs.io/en/latest/ https://pypi.org/project/construct/"
-SRC_URI="https://github.com/construct/construct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/arrow[${PYTHON_USEDEP}]
-		dev-python/cloudpickle[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.15.4[${PYTHON_USEDEP}]
-		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_benchmarks.py
-)
-
-pkg_postinst() {
-	ewarn "Version 2.10.x has significant API and implementation changes from"
-	ewarn "previous 2.9.x releases. Please read the documentation at"
-	ewarn "https://construct.readthedocs.io/en/latest/transition210.html"
-	ewarn "for more info."
-}
diff --git a/dev-python/construct/construct-2.10.69.ebuild b/dev-python/construct/construct-2.10.69.ebuild
index fbd37620a64c..454fbc030cc0 100644
--- a/dev-python/construct/construct-2.10.69.ebuild
+++ b/dev-python/construct/construct-2.10.69.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index e362b6cec801..3a90b97ec98c 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,5 +1,3 @@
 DIST css-parser-1.0.10.tar.gz 349673 BLAKE2B 30ba106620e488532d3cfbd84fc44b0bc15f1e98c7ca3db5a04476810f1bd7ff62c425a052e141a2f13d15e30bd8d1ad83bf769ccce256bef5b723560e230810 SHA512 1f339eb5771fb1ff2f2fc5dbcbe86f6ad09d0ae1abeca96194e6d3c0c4e385ae7366618f28d01010e764fa81d30aec7ccfcbeea2a084c8528be33812307149c8
-DIST css-parser-1.0.9.tar.gz 349482 BLAKE2B b3ea0e6f10179882827e614837fc109fb9fe926a05fb497c1dd6239e289cf712512d86bb3974adba41cc4bbd0babf623a637604a676b6725dd1e9b49c53c3170 SHA512 487213f870066b2264ec4d7ee4a41819fe2c92187c64557ea011c1a24fbdf623e802ab6a3a828e5e5d23c3d684344b64805676d15837d421a85fba28771af664
-EBUILD css-parser-1.0.10.ebuild 569 BLAKE2B 68ae122d265f25ae648a82c6cfb4897021b0f01c0ec2623c51643ab97e1b0d0e32b321a670fc286a6ee8f41e6d14509eb924fb9b54039707f19fb5b14d5c2919 SHA512 5545aaa84cd292081bf9e6ecf41235e399e88c2588e0d70557c6eceb4ae1f400a06ede22d15bdd2d7177503b8d32fc0b71aede881ef26c8279942f33c1d24502
-EBUILD css-parser-1.0.9.ebuild 567 BLAKE2B f792c270afbb26e0139668ec44db58322f1f4a53af6130a6e55b2fbe1b90723897b9affe94551ca1e72c252d5d8e96bd539a4bbdd7d937da4a4bd07e23efc728 SHA512 10b79d20749a7f5d74bd6fd252af74b0b1e3b1e9605f4f59a72afb4b1885cd04ef0cb42ae952459d432b16278145e2dbb2d93eded93d4a9397b613b36765144a
+EBUILD css-parser-1.0.10.ebuild 567 BLAKE2B f792c270afbb26e0139668ec44db58322f1f4a53af6130a6e55b2fbe1b90723897b9affe94551ca1e72c252d5d8e96bd539a4bbdd7d937da4a4bd07e23efc728 SHA512 10b79d20749a7f5d74bd6fd252af74b0b1e3b1e9605f4f59a72afb4b1885cd04ef0cb42ae952459d432b16278145e2dbb2d93eded93d4a9397b613b36765144a
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.10.ebuild b/dev-python/css-parser/css-parser-1.0.10.ebuild
index 2473bba51393..6bcc477147b8 100644
--- a/dev-python/css-parser/css-parser-1.0.10.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/css-parser/css-parser-1.0.9.ebuild b/dev-python/css-parser/css-parser-1.0.9.ebuild
deleted file mode 100644
index 6bcc477147b8..000000000000
--- a/dev-python/css-parser/css-parser-1.0.9.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="
-	https://github.com/ebook-utils/css-parser/
-	https://pypi.org/project/css-parser/
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/csscompressor/Manifest b/dev-python/csscompressor/Manifest
index 9c721a4672e6..b940e03d4ef9 100644
--- a/dev-python/csscompressor/Manifest
+++ b/dev-python/csscompressor/Manifest
@@ -1,3 +1,3 @@
 DIST csscompressor-0.9.5.tar.gz 237808 BLAKE2B 26d9e433513577a2b76660eef2ee0fc0fd3b95d28bcfb06ccc38dfd6f524d63414ba9bda297c8e4622cbd663e4752051717af506064509bdee14f0360ffdc481 SHA512 aee16b5af8b1b780a0fef10d359864a5a21a90b7196740c8b7efef25d1ba4d8197e9fce03483d0e2331abc736290cc6b862e43ee65d1b76260310aea65fc6eb6
-EBUILD csscompressor-0.9.5-r2.ebuild 461 BLAKE2B 448957e64c7ed19d662d91edef8e982da71e562a033ead90c66267e0a8362ace8c5b382204a408f8512741440f0a033bc315784ca3ce48f140c747f6a709b9a1 SHA512 38823d64a2ce0fe93daaef8eff84eecb702f73f9516d52d038516c2001077f0d2e402ad3f2faef59f035b052d84c228d9a8ce51ecd64411b62e52436a4f6ad5c
+EBUILD csscompressor-0.9.5-r2.ebuild 467 BLAKE2B f03e5154af2a3116e4883917da1fe11cba3eda66a45a827dc07b7e3b50cd4d0f94a065c2eaaa39de314b3ade99c6a079a66cd7aa96fbce8779e143f22cde7556 SHA512 c39788b3cc1ca535103f03a86ad81c0773019af1e198e06f64ccfc9d911ed80da4c02e37d09e8fd046d72d416f1890fc1ed4e2559291b4987e6b94ee9774f0b8
 MISC metadata.xml 402 BLAKE2B f1cc451a52cade36de3a7311417e31831d67ff14d9ab770dee735fbe12ac58d7431446a1c19ad93866732992257acc4737eb0a633f13b511b3595a7c6a3baa1e SHA512 04ecdec5f3d281f51faf5c4d399c21929947fb6eda5f0ba568f23c1690b6e146c5000ef9bdabbb06c2c7c0b464d3cb17164c768e18dab3ad68eb59ac0a3514a4
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
index c72edcfd6409..f7edc5b027ae 100644
--- a/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index d1e43f110184..8ccd47cfd97a 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -12,5 +12,5 @@ EBUILD cython-0.29.36.ebuild 2232 BLAKE2B 437729f1c61680b7d7f4d6cba1bbfd85e8ae6f
 EBUILD cython-3.0.2-r1.ebuild 2085 BLAKE2B e8a78a6d020acf7755d6cd2ab0c9cb5f9a704eb4aa3bdff6761fd6a9cacde72374fb49f270bb98eab7d9754a7f03d0a43f863f0eb7336f5b7af405f884887eaf SHA512 3685d1eb1d4766ddca4220a750c13ad978bdffb168bb3ab05671c22e58f1860ace6ca60c3d8a55c74226942c711124a2953f51861ff2ce05f7fed21aad626620
 EBUILD cython-3.0.3.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
 EBUILD cython-3.0.4.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
-EBUILD cython-3.0.5.ebuild 2017 BLAKE2B 0416cca96aa1e5ff9ef31fbad4260b348aa33f7422b0092e26a8a7564613fc0b2681d3f1a3345775e0941e863c96624878f7acf3bd47f3b28a67a113daeb5434 SHA512 933421ea06e3ca92c8a635b73e474e783fa4456870f63f34bd55f706e8e97bdff918b9cb03c1723389839f2dfd16de3e869b87336494327f7abd3cbd60d87776
+EBUILD cython-3.0.5.ebuild 2016 BLAKE2B 5e82329611dc02a725ae301685450c9c657fefde91cad46fc503a839221ce1c40bc897ce1f7445e1c2671ba897884b37566f5e1474c99bfd6cb55860179e9560 SHA512 11e623725998e0d243abfa5b4e39de804ac0eb661d5ac3fb9fbea8cfba3093165f972d32fe037eb5ceff5b98e92376600cf2c35a60f12cd413fcbb2f10d9a449
 MISC metadata.xml 606 BLAKE2B 1ee3fc75852383aa0618afeb7521c3ae0e95b518c85b2c58ff958905092cf68017d313a09d25031a50b649f9dd1b452e751036f2552df9d91447baaeff0a8f0b SHA512 b7917c2e417cee9e59c8011246f7223f5095c87f0294ea140dbfc8fda0b09cf61c9f055380a9d3f74a07e71bb49d75f219d6224ea95f1f4d4b451e5688c13f78
diff --git a/dev-python/cython/cython-3.0.5.ebuild b/dev-python/cython/cython-3.0.5.ebuild
index 4223753eab93..2a629f01a13e 100644
--- a/dev-python/cython/cython-3.0.5.ebuild
+++ b/dev-python/cython/cython-3.0.5.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index b5e04c498c29..3c234373cbbd 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,5 +1,3 @@
-DIST django-configurations-2.4.1.tar.gz 42952 BLAKE2B 3ed30642b256a648ab5932edd9b2cb5b2a82e69bb1107a5c2bd20d230cbb598f21eddcf52956bf80d6fe3c6e6336c70dfadf2fc5a646dcd32782abc782fe8e32 SHA512 ab35216b326d50d779344efa915d516ffa4a1d5e627c77b27071f6d51c54ea367a0f7ec5a7b768cabd69929499dfeb3e5719ba8fbe690f6854d92ee45a04bf1d
 DIST django-configurations-2.5.tar.gz 43152 BLAKE2B 35976466132f9b78a031955c891733cb0a01f20d39d53708ed5100492b3a1963e50228f3175437f54201fb6d992312c641e08562a85cf57cb089f2c7678101e7 SHA512 a6e3f301bf6123234245a5fe88f4b0eecfc021230c593d2864a969560d52c70b6932c0fac64cd83f21fb06b83821d37320181f0601450d6f3cd4e4b06c4ae9f5
-EBUILD django-configurations-2.4.1.ebuild 1099 BLAKE2B 15756f69fe4617139e65b6e9d4ec8ad0e36c0a0567469251674314f26fbdcd97c818463f6c3064ab7225f1cbf1d6ed949e9ddc14f80226891648c5943718cf69 SHA512 9e310244a8b3cb63c83b159942a98333264f119a7ec3427219cb02379f0e932718061a2fc848e8f91d3f3ca775cc9859dc1f65e08e6c2b2f7658487a9f49e3ac
-EBUILD django-configurations-2.5.ebuild 1104 BLAKE2B 938c0bdc6cbf0b4a67959788a4a8ed1349d76764a7137e0b98078af7ceaa2fb1a3cc9e6c95965e4cfed3bed091947b33bd68adb2b5cfa590aa70e85ec47484df SHA512 45afc12ede5232277df64db486ff1fb26e74cf9df0eae9cbca6cfde2015a8064c5509e554495c15e06048274e50442dc1aec0641c4ae14e9e954a3c172bf6c3d
+EBUILD django-configurations-2.5.ebuild 1100 BLAKE2B e48bd277bc106e3d2fa417958007a22272dd880d132442f47124407cad050546185acb3fd8746945a289d1a84b00684c1784ef2f46cd551e50e1c0889a5749de SHA512 f903b4cd0144c5ae73c5a26661ff68616dc81fed838d971cb103b51a9f2113e5a6a508158d06219522855869d0d098a9ff11a72c67ecb06f047e41586f6e022b
 MISC metadata.xml 397 BLAKE2B 704a6d38af3df4b99f24a394dce870ce4f3e1e16c2a30b87ab25ab4b3603451651db062d2aca6669b410bf5350b0edc7b4848ef55bc60c69edc3aedeb8a7c0fc SHA512 a37389a326e763452c7ea138da3eb33dad53bbce24fbd9229e58020063d4e726e68e482500c87238bc0c53b9ee335f93f2d89f39e7ce3e2a087175a2393c66e4
diff --git a/dev-python/django-configurations/django-configurations-2.4.1.ebuild b/dev-python/django-configurations/django-configurations-2.4.1.ebuild
deleted file mode 100644
index 0e47cd0c0c88..000000000000
--- a/dev-python/django-configurations/django-configurations-2.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2021-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_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A helper for organizing Django settings"
-HOMEPAGE="
-	https://pypi.org/project/django-configurations/
-	https://github.com/jazzband/django-configurations/
-	https://django-configurations.readthedocs.io/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-3.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/django-cache-url[${PYTHON_USEDEP}]
-		dev-python/dj-database-url[${PYTHON_USEDEP}]
-		dev-python/dj-email-url[${PYTHON_USEDEP}]
-		dev-python/dj-search-url[${PYTHON_USEDEP}]
-	)
-"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE=tests.settings.main
-	local -x DJANGO_CONFIGURATION=Test
-	PYTHONPATH=. django-cadmin test -v2 || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/django-configurations/django-configurations-2.5.ebuild b/dev-python/django-configurations/django-configurations-2.5.ebuild
index 40507eae52db..051a95a4e16f 100644
--- a/dev-python/django-configurations/django-configurations-2.5.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/email-validator/Manifest b/dev-python/email-validator/Manifest
index a848018520b1..bd4447eddea7 100644
--- a/dev-python/email-validator/Manifest
+++ b/dev-python/email-validator/Manifest
@@ -1,7 +1,3 @@
-DIST email_validator-2.0.0.post2.tar.gz 45253 BLAKE2B b213ebab2a10acf6c2ab95d382fa78ef92f41ff85ce25c1cfa5a65403e728fd05c66df3dccbaec77eea469d0665701ad5d8047c31e69b57ed8e6fe52f3a1f9c5 SHA512 8c4abc955d909ef05ca89d6c6931bce06de199c33c5f8d0744d44ff00ee69c1841f295882af3da03963cc90ef031da46cdaef90249f73e0c7b47f19dfb816b62
 DIST email_validator-2.1.0.post1.tar.gz 46288 BLAKE2B 0321869435485f69bb31b5eb59b778e72add7df4c24815fded9f71740a3fabe48b0a2cf705df692a699d4370f8ab25af946c526b4cec2d9d04777fcb4f37f9ad SHA512 a9ed642bf3c8f80b3a5e832f31e4ea114dcb012afe162439803a499a7ad016b10f6a25092cc61e445f91a1fe1ab6cfb7eb0aca054fd5458c0b935baf92735739
-DIST email_validator-2.1.0.tar.gz 46254 BLAKE2B 2bb1740a4c205d159cb968c405e18384b9c34cf38477919c1f7b5a42d0677e6186769445cf516b0aa142e9aeeb0a800bb80d59e32219fc78fd9a199f78683da2 SHA512 c53d1700fdeac5e1e4240916647d6dc406174f1e249c94e0127832177e549ad8aa4115d4d238947e7a3da35e2748f788695ac22d0dc66a3d135b01de825a8356
-EBUILD email-validator-2.0.0_p2.ebuild 725 BLAKE2B 6525517f62dd93e8cd715c0d073bfd4a183d0693e2574154423b055e4cdfcd0583f2eebce30eaeb0ae5a2afa51ad04a81385b6200555dfdc75b5d37d3808f088 SHA512 c935abf30cc5a64ed7ad8c29baa390c00eb16ddcf75ecaa2068a152cec4524cfd40f166747114c5e677650fa47d3ab953b1e9e6646bbc3492c2bf12391d1aa6a
-EBUILD email-validator-2.1.0.ebuild 733 BLAKE2B 11e7797b1b7e8bbdf4d300ad120bb79b7677af7c26a6d36af62fe676cde9bf4df5983e61f6d4408ae71d2ec684f47af5c22ed0743682dd5bb322f212596c9fa4 SHA512 dcc3ad256e54357b0e93842dbbe2b8873e4757b4e0510dc4032bcc5a23ba77bb2c47fd979d31042bf253a14c29e345a6f9f5473ae90e32d550575dd738b1dada
-EBUILD email-validator-2.1.0_p1.ebuild 733 BLAKE2B 11e7797b1b7e8bbdf4d300ad120bb79b7677af7c26a6d36af62fe676cde9bf4df5983e61f6d4408ae71d2ec684f47af5c22ed0743682dd5bb322f212596c9fa4 SHA512 dcc3ad256e54357b0e93842dbbe2b8873e4757b4e0510dc4032bcc5a23ba77bb2c47fd979d31042bf253a14c29e345a6f9f5473ae90e32d550575dd738b1dada
+EBUILD email-validator-2.1.0_p1.ebuild 725 BLAKE2B 6525517f62dd93e8cd715c0d073bfd4a183d0693e2574154423b055e4cdfcd0583f2eebce30eaeb0ae5a2afa51ad04a81385b6200555dfdc75b5d37d3808f088 SHA512 c935abf30cc5a64ed7ad8c29baa390c00eb16ddcf75ecaa2068a152cec4524cfd40f166747114c5e677650fa47d3ab953b1e9e6646bbc3492c2bf12391d1aa6a
 MISC metadata.xml 792 BLAKE2B 8655d15948883c5b7ad17e943028e0ab70e09d17fe7591c5e094bb46cee2595db382a008fe9d20121cee7473f1cf66efb1b71cdd345828be125c36fe67f376c6 SHA512 9065dee947add0fa203dd9a092910c165944dfc7ecee69c17092526fccfdccfa7864d4402314d9c25389f26b161251dfa58eaf2b21113da0642a62976abd50d7
diff --git a/dev-python/email-validator/email-validator-2.0.0_p2.ebuild b/dev-python/email-validator/email-validator-2.0.0_p2.ebuild
deleted file mode 100644
index c29250773727..000000000000
--- a/dev-python/email-validator/email-validator-2.0.0_p2.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
-PYPI_PN=email-validator
-PYTHON_COMPAT=( python3_{10..12} 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
-
-python_test() {
-	epytest -m "not network"
-}
diff --git a/dev-python/email-validator/email-validator-2.1.0.ebuild b/dev-python/email-validator/email-validator-2.1.0.ebuild
deleted file mode 100644
index 2de9d92d52cb..000000000000
--- a/dev-python/email-validator/email-validator-2.1.0.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
-PYPI_PN=email-validator
-PYTHON_COMPAT=( python3_{10..12} 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
-
-python_test() {
-	epytest -m "not network"
-}
diff --git a/dev-python/email-validator/email-validator-2.1.0_p1.ebuild b/dev-python/email-validator/email-validator-2.1.0_p1.ebuild
index 2de9d92d52cb..c29250773727 100644
--- a/dev-python/email-validator/email-validator-2.1.0_p1.ebuild
+++ b/dev-python/email-validator/email-validator-2.1.0_p1.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/expandvars/Manifest b/dev-python/expandvars/Manifest
index 6c9f161d93ce..2794ed248f9f 100644
--- a/dev-python/expandvars/Manifest
+++ b/dev-python/expandvars/Manifest
@@ -1,3 +1,3 @@
 DIST expandvars-0.11.0.gh.tar.gz 10663 BLAKE2B cfbcb8bedc61cc8b1e88d4774784518e15846f7ea5ddbf58bd016ea2043dd5b1c9e55af117f6482e05e9ae4ba07e01d0fb471a72719f38191f1a29a9f66387a9 SHA512 e8de6544f2d369728e35c8b862662f348f46673f836f8b14dbdcfdc3dbcb7efda80deb55f8bcd597037ac974752e2463d429ddda3b8502fe19c402c253babf7f
-EBUILD expandvars-0.11.0.ebuild 820 BLAKE2B 8b1b80e7c35d747452526b4065694946216bf911192a619c849a62f8cca9a4f70927f27edb72eb2bdda73853abbc8021bb77400a134aae104f45626d5f41f8e9 SHA512 59eb3ca0dc28fd86daf4098787f0daf9e428133686a8e20ebc659e14a3c5a35a6dd80aa08eb9bbf40669bdd6ea742f573481e1b54f6f725d6e08048354686563
+EBUILD expandvars-0.11.0.ebuild 825 BLAKE2B a63774d31a8519bf914a3f2e3d3cabc1c6e16c01d15062f0abf74d6e14d88eb2e41698ffb95c2154bf760ed3eefef4a0e8ebc453e79f7846c6a0932dfc11d176 SHA512 405afb56a47ea3d9f5faaddb455ba3735e8be50f939e9cf810cdc4355b1d32d3b1979c64ad135e00b3c13e3af4669edc173920a35d811201256b411d4b93d441
 MISC metadata.xml 378 BLAKE2B ea984772fa8cd80ee947c6a950e90357d88fee179f2c389ac904b73aaeff153537f662f3f21604772c341e89b6d8ad772cf0e2ac253cd0a2a0038ab93d056dd4 SHA512 6fc7c7d666e6dc0d342525d9cef241a8cbd3f3f3725570dd3819628e1967c6a9a536a6df93266a55cafafd2e5cf0b1588fdc2fc1c9238919fb155f7b833cb212
diff --git a/dev-python/expandvars/expandvars-0.11.0.ebuild b/dev-python/expandvars/expandvars-0.11.0.ebuild
index f1129ff1bf35..218cff5308dc 100644
--- a/dev-python/expandvars/expandvars-0.11.0.ebuild
+++ b/dev-python/expandvars/expandvars-0.11.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index c4f98ac1e0e1..75a5ee5df345 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,3 @@
-DIST fakeredis-2.19.0.tar.gz 117030 BLAKE2B 05976b1011bb3933b275755498cf7b893afc93cbbb0bfcce67d01692f1ebc4bee1b6cddd406eaca4d46f595cde2805f43e767aef1ca491ccfc4afcf7b983b444 SHA512 1800933b86369c7b857e7609e2a6af8d469c713a23bfd792fc8df2695e8aabcb2cd1fa6138f7eb908fbecc9c6e2c242f7da47864067498c5e180956b578985aa
 DIST fakeredis-2.20.0.tar.gz 122679 BLAKE2B 2fd982761fe6e8bd66d2d93b7140b9b97e20d33e40827ac9ab7d050d6e9814891e8a1f95a4f789bc78a1589fe215b40834876da5a3dd0a0ea6f8f7a3489ba400 SHA512 3c71a42df92a92b02c4774cf120c697a5e7f376768923b74561fb4cbe10605b4d57ea826d2b8c4d304ff1e12cf4c84d0fbebc34edd0afa0b0241ff7cb707e5de
-EBUILD fakeredis-2.19.0.ebuild 2127 BLAKE2B e3034eddb918580ab4b263f41e0a2b3cdf24883306a9228229ececebc6874959dc71a880442c587196e1a294795a4451a424dd714d516924146447323546d78d SHA512 75d48c18b7b24dc53f4b3d07b8fab7195f78e6a80a74800b042577e47bb7a428382574178fb90f912ea76e10efca5a107d0bbefe764a77cdda17a9b327625020
-EBUILD fakeredis-2.20.0.ebuild 2175 BLAKE2B 9830a9452a9843e65fd130f4e4be4d93ceb9c6efbeb2c3eee9dd9e9ce63e9f210cbe596b16a5c9920d2ce5cec2a84fab2e63c799feeb7476efbe9e7cfe310f69 SHA512 865a9fd584d8ddefe9d0e842f6f7aaec087ca87b1562977aef12f86d22a0ac30e8c59ab411fc8a15dd84b255b4ca26b7d047752ff4e3d20b1f18157e7df0f127
+EBUILD fakeredis-2.20.0.ebuild 2171 BLAKE2B b0256730e5f762a00e3c4c21117472ccd3d504777ea8818e8c307ac6c51c4f7c1c8df6ada1f37cd12fba6fc09a86a42c96a2432afa91733b73ca2e9919110050 SHA512 a126938165064e57617c544c3dff73174198f26bf2cc5f219a0959d40262f080dfb773a794a5935017eba2446648bfbcf2691a5bd8ac960cea5d9990e387bbea
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.19.0.ebuild b/dev-python/fakeredis/fakeredis-2.19.0.ebuild
deleted file mode 100644
index 04003ae5a380..000000000000
--- a/dev-python/fakeredis/fakeredis-2.19.0.ebuild
+++ /dev/null
@@ -1,83 +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=( pypy3 python3_{10..12} )
-
-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/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${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
-		# new redis-server?
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_shardnumsub[StrictRedis]"
-		# json ext
-		test/test_json/test_json.py
-		test/test_json/test_json_arr_commands.py
-	)
-	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.20.0.ebuild b/dev-python/fakeredis/fakeredis-2.20.0.ebuild
index e7ea729b1da1..96f1eacde523 100644
--- a/dev-python/fakeredis/fakeredis-2.20.0.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.20.0.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/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/ghp-import/Manifest b/dev-python/ghp-import/Manifest
index c444d62340d1..9b9f1a30dba2 100644
--- a/dev-python/ghp-import/Manifest
+++ b/dev-python/ghp-import/Manifest
@@ -1,3 +1,3 @@
 DIST ghp-import-2.1.0.tar.gz 10943 BLAKE2B bccff70a8ca6c58a3c768b143b0545a61080a577dbbef3021233134b8536df1788ec9a88aa8454865cfb83491b70fc6fb53caf04514af3d7845204cf2b893cad SHA512 10665a1a6392fe047d1e42d7f107511b1a31de02625200e7db1c637f33dc8dc41ec71c2db4f562c6e94a4efb4836efef8a29177d953d99fe17a889169074050c
-EBUILD ghp-import-2.1.0-r1.ebuild 484 BLAKE2B a08654e96b99713b2a60a497e34d8f42f0a348eefae8d8f51840169c3e046ba55e239825b04fdb037cc2c222fb2f4e5479ec03e71a3a191715a9f1401e7108fa SHA512 dc0f64f94e17264f41c16ace2172fedabc927f54d6d0e97a2a0747557fdacacb255cb6370687ad73955a363e635c6e239e20c21e9b4e990ab7f753c6c59c0c0e
+EBUILD ghp-import-2.1.0-r1.ebuild 490 BLAKE2B 604c8aefee4ddae3ec46f9550f9796a9c6171c9c546b611111b78d021e0a7214d01ca7f4e8492f066797f8cc1b8e7acf9fa53d526c952febbaf7d7b906175b36 SHA512 174b7088fb11948e0be9973e05a4bc4347f72e4daf84d886b0471b0652501f78d7798e366c0980458dc4a785b0c1ed8297c7df37ebc97b84206d365ac6ff88b6
 MISC metadata.xml 410 BLAKE2B 0caeb18e5be64053ac585560860e830d7f8cb78ea6898f29c71457469000a7bca01fc07f48ae0ef4224925d73ffd7f3149c812d37d4d7f5d0003b6adb1c4650b SHA512 8bfccec4ffea700f9094231fb0adbbeb2575d3dc329a6bea4df391ccf3294a6386898307f77e127c76c9ea85a07acee0ec7e79e9a7d3725e9cc7fbe73cad67d3
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
index 97907ba36d1d..fd15fa926833 100644
--- a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
 
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 15aacf0909b0..cfb0fd9d3148 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,5 +1,3 @@
-DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b
 DIST gitdb-4.0.11.tar.gz 394469 BLAKE2B a79caf7def6094f1c99ff8621d7a01a9bc438e3ff54c73e5e9f598fada892e0209334edf73415476e31aef1cd0cd344fba6c8fe11c80cc157fdef5b9d2cda292 SHA512 024256481c553cd8e4b7fb0c0adc735aa6485c396e43aba73873cd4ad950ca686c3df7000a85acd1ac4f09db3f6ab613018739d24a8a69b4708150c171acf13d
-EBUILD gitdb-4.0.10-r1.ebuild 1242 BLAKE2B 80552946ef1d4324461b36cf4289b010076ff2fc8b3d309ffa9ad791fea1702c64384eccc90d3f0bdccba5667d22c291fe42f62e6351820c2cdb5533915c7708 SHA512 258bb112fa6b8e8e43703bb8f874c0af998f6f8a6911c119ee6ac65e79050c3d12a6f7af47a7c6a3193a5b0764e055917cf7002ec23f6200f715702cd664c71c
-EBUILD gitdb-4.0.11.ebuild 1250 BLAKE2B 368749bf5a7a71405fb0059174dfee54e9f5d5a625ae6e18576eb3785643782cc4e19d5b6e2eb12572b13ba977bbebc84aabcfbe0b6eddcd84a40c2b1d7ce543 SHA512 b23fe3ad1b56e207881bcfc848806bca09a52f4efccd2a095968c108784672ec75faaa3867d521ee73175befb1743d6115b7000095173260ba3b9680343754ed
+EBUILD gitdb-4.0.11.ebuild 1242 BLAKE2B 80552946ef1d4324461b36cf4289b010076ff2fc8b3d309ffa9ad791fea1702c64384eccc90d3f0bdccba5667d22c291fe42f62e6351820c2cdb5533915c7708 SHA512 258bb112fa6b8e8e43703bb8f874c0af998f6f8a6911c119ee6ac65e79050c3d12a6f7af47a7c6a3193a5b0764e055917cf7002ec23f6200f715702cd664c71c
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.10-r1.ebuild b/dev-python/gitdb/gitdb-4.0.10-r1.ebuild
deleted file mode 100644
index 29f1be530228..000000000000
--- a/dev-python/gitdb/gitdb-4.0.10-r1.ebuild
+++ /dev/null
@@ -1,65 +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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:,<[0-9.]*::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		gitdb/test/performance
-	)
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	epytest
-}
diff --git a/dev-python/gitdb/gitdb-4.0.11.ebuild b/dev-python/gitdb/gitdb-4.0.11.ebuild
index cfd013ef6a52..29f1be530228 100644
--- a/dev-python/gitdb/gitdb-4.0.11.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.11.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
index dbee2109eccd..a4e9253aba4a 100644
--- a/dev-python/jsmin/Manifest
+++ b/dev-python/jsmin/Manifest
@@ -1,3 +1,3 @@
 DIST jsmin-3.0.1.tar.gz 13925 BLAKE2B bfce2368f622cfcc34e716f09638850c773d2381c539fb72a2aaf45830bb7eaf152dd7111f36815b0a067778f617fcec434ac19d7c5278bc963d94ea9d195285 SHA512 f65ead107ffcda67bbea1aea2070d1012139043cd1094d95c0393b1370e2e11a6c6e09af2f3af6f32ab0acc35fd702431954175d930a1898a142808fc3d57b71
-EBUILD jsmin-3.0.1.ebuild 430 BLAKE2B 88e11b165402aad624ee42a6fd9a73d7330e9e383ac642c5f82aed222eaa10a69e0fb26fb3dd916c4c26118537d4baaeb789810d01f229784e6addf56735bb7f SHA512 f3b9400d2508c41a9a5af0c74926f036a07c5fea81b01f2529736e54ea9269e75e92890bb1585a006bdea9db3fd306225f8673c82f216e58f84341b0b97299ba
+EBUILD jsmin-3.0.1.ebuild 436 BLAKE2B 6e83e58d15682a3893ed146e0349d035e1163a38715cc6c6f272cb99212ca4f670b368656e747874fcf54cbdb2820dafbe8321efcba1175dc68d1e1760cc8987 SHA512 9c11263eb86814fd3f9bd25a9809e8229d687eba2c2c7be578ca2d9b2cc1b3de33cd917d8c335ee1f9b1a641019c871bdc4ac7c2858940f76e29d69b0bc3e2aa
 MISC metadata.xml 398 BLAKE2B 93a4b03ba0d137ea56bec7154a9313bca465b2ea839a446d1d6ec2a9e9b2254d5dc832374438edcebfe211c7579050319acb9552633c4de82432c760ecb91100 SHA512 dae9577169fcbea94ed427a6218e0b41a8abe17f01e5870e246760381b3d355b75b4985728cce4d88474bef222ca2fb6dd30b84264f7e10fbe077736698e30cd
diff --git a/dev-python/jsmin/jsmin-3.0.1.ebuild b/dev-python/jsmin/jsmin-3.0.1.ebuild
index 9887ae9751a8..25dbaa88eca9 100644
--- a/dev-python/jsmin/jsmin-3.0.1.ebuild
+++ b/dev-python/jsmin/jsmin-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 inherit distutils-r1 pypi
 
 DESCRIPTION="JavaScript minifier"
diff --git a/dev-python/mergedeep/Manifest b/dev-python/mergedeep/Manifest
index 22922474c5bc..f7b8e63ccbf5 100644
--- a/dev-python/mergedeep/Manifest
+++ b/dev-python/mergedeep/Manifest
@@ -1,3 +1,3 @@
 DIST mergedeep-1.3.4.gh.tar.gz 26627 BLAKE2B 334f5ec6948185e3f7758e079e65d92fb04dd3ae3bb208cb8fc67d2fd2d90ce16fecb28562d42eea75db978d9d323983efb85abbf7e5ff18e40c95fb066c47e7 SHA512 24cb1dbae9be715045b66b6d3a3c3deb98a41176ff2fae405f254baeebf5f45b69c948f7780b67762e613e20b5df3c5987e730c5cd91fe7dd1fbda6408906559
-EBUILD mergedeep-1.3.4-r1.ebuild 589 BLAKE2B 446a4d06be5d848959eb924a4f5b9cde85589452702f995a91c2e63a2f2609d15348b6d42705eeae47831e8032a351bd51647b52307c667446151cf3a7338b09 SHA512 f99df793a4a397bf6403c7a604d583c6e589fdb2c47dfe66351f30a1762d15659bfb59c5a1411f58d0497288614a3271fac70fcb19ddd94429e0b47bde394f05
+EBUILD mergedeep-1.3.4-r1.ebuild 595 BLAKE2B 01d679aaad73a8411a5aa255efa4711793c00301a0fbff1aeac96ba649263131accb52fcec10118e91f479bdc28763ded63c5b9b62dc0a14ffc93f5a2e9dbe55 SHA512 d63a2db15f3c8d644ad1a0a5052757b236e371bbe8edc5c5f69d143ab0d0983b2ae9a9108eb6d4a218cfae31b0de5455d2637151d5cf8f7c62454dea3f8d28a1
 MISC metadata.xml 413 BLAKE2B e71e80d2c461b4e06c5423d8a62aeba828d15e74546208daaeddde8cdacb2d29410f7ec2c6502886af026d94e829da42a9ebdfb3db84ba3a3f20576afe46a8df SHA512 a7959c7245826060b771e422e1272ee8dcf1f2c8fdca7e1648d87908249a772b5509cddadf70053b0a109d91f6357fbb88b4fd89e71c588b0400444e2d3bba5e
diff --git a/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild b/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
index b156286cf3b0..a2a2f7202926 100644
--- a/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
+++ b/dev-python/mergedeep/mergedeep-1.3.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index 9833ef52c002..ccbd919972cc 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.2.0.gh.tar.gz 6914 BLAKE2B dc00da8415933775dba4d3dd1e2082b74c1c32da5953e68e1cf01727c6ba0471b83b9c45641975945a914a2403159f96c347a48f0fd743bdf446da2ee3f9e801 SHA512 d0151294fb530c0bf1f10fbf026426487acc68c5b2da0067847ade86a4327a0c826a0f51e7cc0f519594a3a38a1a1d3d304bd5be47bdfc1979b6fa20eb57187f
-EBUILD mkautodoc-0.2.0.ebuild 716 BLAKE2B d679bce27a0daa063612a1b4277468d4de034c08707df83e06dd3c0436e7875452a70d9c106057751e0d5f42f451fcd194462d5b472cad38f7645392faf4d468 SHA512 82121012a61a40e6c11f2b5c302abee42402b26adecfe50c43d1374fc0f1d18726163800d2464ecdabd0677dba9f45526420a4a6f26b15825eb98f3701612a32
+EBUILD mkautodoc-0.2.0.ebuild 722 BLAKE2B 4e1b75c2c1cdc4b47042e2eb065807b656aa9a9bef8dcaa675a185bc4a9b79b29f4064b4ac09b64dbe23210c7f2ecdae88994b019ab71fedcf3b2becbf6f88ab SHA512 3c720b08cc00842bd4053a2213218182b1aa863288c060c34ede0b66001695e0f5dfc2f359d21ad158904eec174422fdffa86a51b5a4dff44a2d56adf82e5154
 MISC metadata.xml 517 BLAKE2B 982eb0e73c28e8565ebcd08f9822e5d35258e8cb1f44b57a3218b928c6d9873b1d5ae8890d4688ca4775806aa140c3be3ba52c9af8afe87f7ba2e89ae09c1e97 SHA512 640db2d746a27484dcdbd4d84951dd207a0ec6ce9047346432fddc1b08ad98f19077d320c603a85297161c8202dd1c5328486280c343987976a3108667978a51
diff --git a/dev-python/mkautodoc/mkautodoc-0.2.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.2.0.ebuild
index 21a8f0916c1f..a07445870186 100644
--- a/dev-python/mkautodoc/mkautodoc-0.2.0.ebuild
+++ b/dev-python/mkautodoc/mkautodoc-0.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-ansible/Manifest b/dev-python/mkdocs-ansible/Manifest
index 66e9c03b1f18..6fec3e97c2c8 100644
--- a/dev-python/mkdocs-ansible/Manifest
+++ b/dev-python/mkdocs-ansible/Manifest
@@ -3,5 +3,5 @@ AUX mkdocs-ansible-0.2.0-prune_deps.patch 465 BLAKE2B 630427ef0be26647f36aa2df22
 DIST mkdocs-ansible-0.1.6.tar.gz 27829 BLAKE2B ee1248c2301d841876abfde43e0a883d553f7848b9be367634c4332ceccff4f9aa5e22b58c38f997ffc9c861ac36a0b9e40e4ca445aff7dc040f953f83f3fab8 SHA512 96235bc91d86e52781ae190ab6bc83fc086fa5fdd2ecb21a544549bd49d94b0ea99e56956442884930a6d20c975970942ca3bc0c62cee23b17a3884989420672
 DIST mkdocs-ansible-0.2.0.tar.gz 29254 BLAKE2B 3d9582c50a3e6abad56bae2f78ff2970b96b768fd8dbc0aa60d15a0acfc23535acae42b7b7f585db3165bf658b3f18c483484b630b350aff97ebb97edb2abcae SHA512 8e0a3b447a4a31f3d48fef5e381d01e0f2ebee2dd317a699b30e83e483234ebac1ad265f66f15dfa92c52f6c1c4a0a77aacef2915b0a60b11ffe5960cd774820
 EBUILD mkdocs-ansible-0.1.6-r1.ebuild 1255 BLAKE2B 5315f52af1831f9cd8d62463c9a008fd031fc81a09aa537442d6e07a6bb1e5158c7f3463a39ed4704525c6829340748f50df92ca535f518791eedfac3299409d SHA512 9ddbdb58891fb6f97021cd03a15fc87643e3ec64417e2912beff013248fb7d24656a0bb4ce4be2374552f8f6fdaa18dcdf0a6dc858d39fd08a7355345fbf7c65
-EBUILD mkdocs-ansible-0.2.0.ebuild 1255 BLAKE2B 6bbf7f6f9aea2e07f587104b96dbe702f24b9771c901eae2bffff987af89960e7ed324a9351e6855d676d846797d4c18599966c290599f51d2ae38ebc67a4ef8 SHA512 565660dbdd6dfd8fe2358726c85691308f0384ec3d4d9a46790ed29a6817f94b0d6ca1aa1361c58b6093e37c51cae33928b66467cf24aa4c099b69b75c7fddc7
+EBUILD mkdocs-ansible-0.2.0.ebuild 1255 BLAKE2B 5b6a49a0742a6ccf064af59d2b88cdf89d1fea0d4bfc265ea462d4672b9f4ecb9e8936c57df099fb936ada5860eaf4f7e5f8ac9ac69bb0a95bfd2f36c49dd381 SHA512 30cd062968228cf60d8432cb227d24d8cb0e2b068c72345f845f1a17c40ff97d2e780d9962a803569691de260219a09fade16c86c745875a0fdd690b9c96ebc0
 MISC metadata.xml 409 BLAKE2B 7552f90e363cbe4b38bedae3630074db6b4b3fd75a13d3e34740470490b49f3cc553cb76d87bae5bfdf247b5e8ab57da2888ff12723bac72999c23484350485f SHA512 70fb7dfda89462823c26b7058a941d405015a46bd0445f0c75c5adeb659122d5d558b6e757ab20224725e8eaff5390bc3b0ce7e2bf7b56dd9982c04fc59a59e7
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.2.0.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.2.0.ebuild
index ea46f6f62663..c0105064a6ad 100644
--- a/dev-python/mkdocs-ansible/mkdocs-ansible-0.2.0.ebuild
+++ b/dev-python/mkdocs-ansible/mkdocs-ansible-0.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/mkdocs-autorefs/Manifest b/dev-python/mkdocs-autorefs/Manifest
index ead7e46e97c4..82fb1699def8 100644
--- a/dev-python/mkdocs-autorefs/Manifest
+++ b/dev-python/mkdocs-autorefs/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs_autorefs-0.5.0.tar.gz 12517 BLAKE2B 34672364f158a3cae5786cfe8576d0bd8cfad4fb21ecd72a29eae11a5d74994ae68920232ba07f306b87f8f7b8523c37e8557f537b98c3be5fe3e4bdee1ecb80 SHA512 b7bdf1b7d085fdf167d13a776369f1b9a2fd220d6e6c7061ab6c8386e734a34ce522fd69b9b16910bab51c80deac1bb820425f4b42c2d89e59b0ef5db95ffcb4
-EBUILD mkdocs-autorefs-0.5.0.ebuild 574 BLAKE2B 903c0981c79d4ec957c55f160ec9770a218d22a915e03e2ae202b64587370a0cf16028dd716b013e37e32fb498413f8500fc8231227661964712a36098d9ad83 SHA512 da1165bcec2910a049a007f7e6796bda6b4618a7f415802801f0fdccddaa224bafafae3ea56894ead67a62dc8e45be401f2b474dba7ee6bc6d345131160bbbe5
+EBUILD mkdocs-autorefs-0.5.0.ebuild 580 BLAKE2B 3affb04ce265dab013965e89eb5ae85e407e916780a9846a87ad41177164650fe475bd7b63729c94fb26f8f75fa868b6c6a8a7ad32e89b710cecaac9d4c35c04 SHA512 f0af383d16202989390e2649b56031b8fdd6f0a22baaeebfd7992bda5b0e3073c53a48aa0a409e29ebce5481db737f51136b3bdf7f51421650be7c654ad0c063
 MISC metadata.xml 409 BLAKE2B fd2eb4943b6229ae1eee9468b8923714474662645f968653506c1e685f42f3eb133ae0c035b943d2be639a88e10babca1f18b3d4330d812057ba8e7f57628f50 SHA512 8079217df9a9d4db4bb7d345ba9508b7275fa77e43d3b6a23969ba23cf8c348a15782ba71bb66f7a3fa8f15a05bf4993dbca7e8137c02838f36274e245726391
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-0.5.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-0.5.0.ebuild
index 8b0ef8e59cce..966502814794 100644
--- a/dev-python/mkdocs-autorefs/mkdocs-autorefs-0.5.0.ebuild
+++ b/dev-python/mkdocs-autorefs/mkdocs-autorefs-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=pdm-backend
 
 inherit distutils-r1 pypi
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index d5d727c26873..cc188db5c048 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootstrap-1.1.1.gh.tar.gz 233329 BLAKE2B 58292946d0985ae60d8d9784bcdc3e9f71640d23fd81efae06b99ce644aefc63d53d21bb65a0b4c4d6bb0b077cbac82bcd93da3f5d05f244bdcfa54750478fb7 SHA512 9be5c29961c09436332f902fffd49aee38f99fe8b7337e2add7d6190b1ed487b16a0d2dc3ebd486691719bffd1009207885b3880238a64bc6d2baafa43b0fbd9
-EBUILD mkdocs-bootstrap-1.1.1.ebuild 618 BLAKE2B 8a923bb4c0b276b06fcfc29eb7758e6db1279e05bb7a17f784d6a1656665f94338aa7b502895a0fbf07e2586031272a2ac44a7ec8a7e7b143339031d6c2b8ccf SHA512 cf00043a302d69384f31a589f9ffed4d1004d9080388fc25d36d3e401e2aa1c1cd77f132cc2e275a0acdfdbe23a2459bf400da26883ab0572bd08b55cb3bb5ce
+EBUILD mkdocs-bootstrap-1.1.1.ebuild 624 BLAKE2B eebb60f07656870c7a314df02bd81b01dc5847a01ceaf32a6d116f359ebc168d42d763f55443557e7f32ca5445bf29f4f513fe7af46dbbb57b8e06f18c8f0176 SHA512 a8e0e3f512a2846774ad1b737cbe56e8cc1d0e2f4f998474277d88aa247511c7c27d5eb8d3814f65182f81e7333569ec0856276f0b1386d22abdfd011d348953
 MISC metadata.xml 449 BLAKE2B 991a60ba78b90e5b405993269c325a7724fe2c8977836ad2fb15e5c4b429236e7e03be4f6f91dc81a954403036e39cb30ea419a1a79589b1b33e63b3220630ea SHA512 ce0378db70f5c4d524ae77bdc4b40c99ede5741c49d59669d63ad026ad85dfc57e11880fd9476021f2d1d080ff8e4540a07bfb2f50fe34afecfaa77bec78a1b7
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.1.ebuild
index fd397269a151..7c3847dd7097 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 DOCS_BUILDER="mkdocs"
 
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index 5284a02e32d4..718dc742b777 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
-EBUILD mkdocs-bootswatch-1.1-r2.ebuild 503 BLAKE2B 9002ffe0e9ac2a1706552234ca58bb3676dccd295b4bce2f4806d330f37595d5276555621231ef0f1b1fb1501b63b8cd0b5aaed9898ccf5238c26de784d1faf8 SHA512 f3f52cabb139bbfa07cbdfd0a55698bb4d91814e87906c276f3b1a38c266d2e444131fdf63057bf763277bd86d3cc71c2b4d09aa92d21be88ffd69192d0d7a7e
+EBUILD mkdocs-bootswatch-1.1-r2.ebuild 509 BLAKE2B 687809718477cea8a55fae886f0bdb6eea60f3a8bcc08103e52d772fb935e45c66ac131ffeae6d3e96d9318b0e01ed9c5a2a9738102a615d7295a08aedfeced9 SHA512 fe48520e62c45a08f9da71ac93ccab84965294e492b9ef81d16f7000f7f842b0265a483e5a0873aebe4758f818583fe12dae8d6b35add4800ed8656bf97ab6a7
 MISC metadata.xml 451 BLAKE2B 6604531dcf8e275e499aec87bcb7ec7de57ea73912e4178b40d342a4958832952f8f2c5ad5c3b45fc2aa71f9afbdfac0fa997c8fd2a49adec7a20937781617d6 SHA512 2edffa466941d9b6c5cf6572d785e829bb41dabc6d55ade2cc4752cee2ef4fb232a1731d81e173b40c89453a04cfd061b59d6a9bf99a9e21296bbf89a1628fba
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
index bcfe58a5acfd..b604fd186298 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 DOCS_BUILDER="mkdocs"
 
diff --git a/dev-python/mkdocs-htmlproofer-plugin/Manifest b/dev-python/mkdocs-htmlproofer-plugin/Manifest
index f5ce88bd7fc6..f13587e69c18 100644
--- a/dev-python/mkdocs-htmlproofer-plugin/Manifest
+++ b/dev-python/mkdocs-htmlproofer-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-htmlproofer-plugin-1.0.0.gh.tar.gz 14534 BLAKE2B 361c422e985dd00c12ffa6bcd1ba02df0ef18fb37f7290660963832b38dd0f2c8e79662780224588f626eaa9215afa9852aed59fc6771a3877f779f40493f54d SHA512 083103ca8a1e1f63a22fb877ec3d123549745157f3f8bc3b10364c271b7975c09222b850ddef4bc9a1aa9d168711764f74c91bed50d8a48c4c7415f894df5fb3
-EBUILD mkdocs-htmlproofer-plugin-1.0.0.ebuild 798 BLAKE2B d8c848ea694aa00acd80627f55051e416d4c15d434742ba481422d3998e1cc56c01e9e1a0e3d390c66687a093823b1ca03c64bdaf6ed72f897049895b196da7d SHA512 184dc784a04a9eefd2ae5ec9c7dde9afcb531ee0925a9a29b8c8b9f448ae509b3e0432485847dd9d51413cc431a5e3f8150c696c6acf26f561ba73bf9f3934da
+EBUILD mkdocs-htmlproofer-plugin-1.0.0.ebuild 804 BLAKE2B 1cde4bec1ea614adc2fa2eae2e2084f21d2a1043ef4dbdf0b5f71a185f8f036c61d822df718177241a03707047237f45615a2d9505fec02d3857b4bd65384d57 SHA512 059d161584841f5017df615ec6ae724c040009748a4c7a474f082c0e71b7853fb803d763aaec67cd11846ca8ddf331711384dc28800c19b854a92028f04b433a
 MISC metadata.xml 433 BLAKE2B 7360acf66ca76df5707abd33383ccc97ef7777cf31bf81e7cbe675d2f1619cd5ac51b122ec752d8bdc8d14f909cdaa06d0adba35eb77172739dedac36d3414f0 SHA512 08859e3d04cc5b13c39955b0b92974f15b7d1938badf276d8aa331d83d96767b45213851903a3fe401beef21045339bb9d33739285cc4a861fdbb8dc2439c785
diff --git a/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-1.0.0.ebuild b/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-1.0.0.ebuild
index 829d351767c7..1819318d9e61 100644
--- a/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-1.0.0.ebuild
+++ b/dev-python/mkdocs-htmlproofer-plugin/mkdocs-htmlproofer-plugin-1.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs-monorepo-plugin/Manifest b/dev-python/mkdocs-monorepo-plugin/Manifest
index c48b887e6b69..af309288880c 100644
--- a/dev-python/mkdocs-monorepo-plugin/Manifest
+++ b/dev-python/mkdocs-monorepo-plugin/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-monorepo-plugin-1.0.5.tar.gz 9510 BLAKE2B 96b63fabe344f99aaefd0d3d0f547f0695fcee5b7f6d5ce027fc52ef27c1a70353c3835d0a0d02c753c48a67123bc6776a8060fa0a07640ca26f008df8f3611d SHA512 ed3c011d9a7b5a32868a4a16cbdfa1fd4ce036da2d73d59645aa5f42895f12ce7fe6d1681b53d72248b09fbdb343b2cfad3846e7005dbc8977c7ae40b8e29b30
-EBUILD mkdocs-monorepo-plugin-1.0.5.ebuild 883 BLAKE2B 28f8a22e4c6c8be76a94220f42946f28a6944eb025563de4353ee435cf6c2834aca1e9ac5c21e7ea720f5249e95c735c52db3a2431db7c0bcdf61e4ffa4e30c8 SHA512 ab66e9b7b409dac46fda54637db25b8b07c31c702469cbfb4687ec6921af31814f81c3ee67a55d07b250eedc2294737a5d266f7e9ef19e561307d8765d8fa700
+EBUILD mkdocs-monorepo-plugin-1.0.5.ebuild 889 BLAKE2B 0ae41d1137c8fa607b6db12a2321dda56d0948e5555b01060189cea8a9df3c55eb3b01454562203d690770c2fd19677f795f290ec7b3d795056ac75b4f395d8c SHA512 8319e70a0544233088c33ecc7616bc9416f843f2641b8957bf54a9595233f4940df61381696ff85a1929fdcf6d3da700f9a8fdbc96d199aca5b295fb0c0bd67b
 MISC metadata.xml 427 BLAKE2B 547ba024501ca9073fbd53d272f3fb1992ca0f0e3a9bf640d077125735f9792840b21b40165532976ec14a63d30722907c318008ea224f82a14dd4c2d32f0ca2 SHA512 663c49070591ec88eb0c530cd18a1c2b8a19ad44902d71251d147505658b6779e5c13507419c0a9688a8c454f2d3c58fa43e898f0a47abcbe715ca8c6285d3c7
diff --git a/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
index 88c96750c18c..948b707b9839 100644
--- a/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
+++ b/dev-python/mkdocs-monorepo-plugin/mkdocs-monorepo-plugin-1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index 65fbbf5732f5..070fd52dd510 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-redirects-1.2.1.gh.tar.gz 7420 BLAKE2B c91701b5aeff6998d890d44fa9286b0a7924a2c66ee9d54777495b338152be0cde3f897e4516327e63a38ab362a156a0e44f041bc4af5bda32d7ae188a20369e SHA512 52b078f75fdf950780fd9f295cb528607aff641c46bd2d00df0a38ca2817280b1245c006b6bae6f63c37f4e61857aeb0271ca9fba4397e3185b173016c3ea437
-EBUILD mkdocs-redirects-1.2.1.ebuild 733 BLAKE2B b7eac92ea6de520a89f4c82d331f5b9105a18097aec850fcd0509575d530c5489697a3b8f8a9376a53a2276e6329187ce836570915b33ffa8ac93e732066436a SHA512 f76cf1ea9f7f81209d5d4612ffc3beb1ede7d469779d57a1cc3a7bfa2e56f5d93100c18987eedd61615f1316d3167cc55e20914db3ca0718ff998ccdffa3d573
+EBUILD mkdocs-redirects-1.2.1.ebuild 739 BLAKE2B 5aec8665ac0496d92cdd2dc9093e7b5e8f0927d890b2cb0500175834925184139ac4ee80497b18abe71a1011edab2aac4c132bf8a8368b8944cc0b52d16c3b2d SHA512 924b52ebb50ebb2555bfdf89d4a734c401f31e4e5e667ec38d9928b588f601c1c1f0fd5441f116c73a6c9fbbc905c2b37220d5bf8101930469d98396e44f324b
 MISC metadata.xml 425 BLAKE2B 0dba3e4e60feb48ee0e2b7bf308a6f8ba4f4c6bd6acf3f1cd9e61015fc550c1bc1dcfced21d42ae722286afa65a40b7491a73a159bc3d6244aead5104ab5fa68 SHA512 13a924e44d6c9689783e1c01473c055992a2b2b2357523e587ce1603c71928265045c306ecdee95de524f80dd5581a4dccd49e048369f128c37236744d1345d0
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
index 76f80f411a9b..24c8f904b827 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 762135f7eae3..367979182e9e 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-1.5.3.gh.tar.gz 4057780 BLAKE2B d1e7ac739ea3a78f2a2d294a28c721f95cb8be6c114a5131893e346254ed1937218cc0d247e75092876d7f42dc04c8060fdc8d7535326f26a8f68ec11bc7045b SHA512 3f7d0af4b071ac6998e82cefb18df27f1cc98d91c7902d2943acdaa08c56f90e36c1c5d1df1c1f61a1c50d8fecc2fb0014497f2436be89d52b17959808c31abc
-EBUILD mkdocs-1.5.3-r1.ebuild 2357 BLAKE2B 606a51421299dd8b46cb01c3483c0862b22363c88733ccf69dec53576abb337dd2ee15091b4fb73f7005305a8c8ca25051b54fd8a3484366a2021f67064695a6 SHA512 3332d27f2b9fa15eab74478bfecb84740631a09ec86d5d09e249c3bd84b673f1948207023b7d989d231f63c58c956e2cfc0f552a7a6510045d2844e86c45f395
+EBUILD mkdocs-1.5.3-r1.ebuild 2363 BLAKE2B 18194fce25a9337596a599f56f1ca16f9c995334a17e03a26419710763e3f6895e918ed3fea900a2893ef656ab7e055703c04caa6ce8e214eca346e2a09b0fad SHA512 1cc5c13f6add3acb313462bf46daffbdd447b6a9d360e2bdf10071f6797fec54a962e20f1fa6de32849f8391bb3caa75b04e8e5fdf7a1462ab8a172d8a8043d0
 EBUILD mkdocs-1.5.3.ebuild 2410 BLAKE2B 8b38e4956c5b11fe38bf884d99e9750b125d4eab418247d9e6971467b8c779807357e2a5de535b29b9e8b266bcfaedc7c114c69d4dd8948e8cd7214a6750ba76 SHA512 8e1475318968ba65f07ee70d655a6854b6913b0210c053650f4d7a8b25d93957523b849b943e4e056b83eaaf683b472d84c6c9432956535d7cbd86476c389448
 MISC metadata.xml 405 BLAKE2B de9dd789fea13afc3622c6961674d046806db1025e9d0475c0ff8bfe1c6d91a741b6112ccaafb46cb19b9dac971c50095ac89b13353c7c0e1571961a19a90387 SHA512 7a19785dbacb67aa5679d6e7c9617b52b25f724430fa3471b645e31df04157efc4060dbd4fccbfc37b5709138164d8ec89c2e94cddfd727b3ee4c705ddd38dcf
diff --git a/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild b/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild
index 9f68c7326b42..3d6d031a3430 100644
--- a/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.5.3-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mkdocstrings-python/Manifest b/dev-python/mkdocstrings-python/Manifest
index d568ebd317df..aad429c0fba9 100644
--- a/dev-python/mkdocstrings-python/Manifest
+++ b/dev-python/mkdocstrings-python/Manifest
@@ -2,6 +2,6 @@ DIST mkdocstrings-python-1.7.3.gh.tar.gz 136488 BLAKE2B 470f7d69819222a9c1620f5a
 DIST mkdocstrings-python-1.7.4.gh.tar.gz 139739 BLAKE2B 31e88172d745c165aa13b27078118e0a877f1bd70336d35d43ce57ec1ac5ca8b019a588491e2544b8413252a236d872c91af41b63996d8d6878975d45f3739a1 SHA512 a6445ae3e20117c73b3f3d1bc673fe6824790622931cf1fc0f1178456a9b331a514146e56c279cb046a6e50bb43da2f20abab93441359a183f06ffa794d8b1b2
 DIST mkdocstrings-python-1.7.5.gh.tar.gz 140386 BLAKE2B dec768e60ca09befe8f790bf211960222b45319cdbf00a97c072cb18b42ccfd71ac41079a7a0bdb9a94ff562181290d309a3e69f3cebc4f7b86e05553381d655 SHA512 6d595b777d4ff1661301fda7fa198bdafb7f62b356bdf5e579b808dda1f33a8f29e266be0bf51da52bc41cbbf3b0544a65750fc67d545b3dae7634798d0f3bf9
 EBUILD mkdocstrings-python-1.7.3.ebuild 859 BLAKE2B 926a9c55b502d6313dee12dfe777e90ca9573eb787b2fe5129e29c99a034e42f649ef64bead7de1beb3f4a97d1b1b1a5ed2a18bb7989e7d62e750a4f39b72cff SHA512 6a66967c086389d4d6cc7573a1b3c55926fb16cc1545f0c4fa3c89aeb94d4639edeeb2cafe7002a4a28e4eb68f8c8d90e0960a5620f2f3810b4d54df2540d578
-EBUILD mkdocstrings-python-1.7.4.ebuild 859 BLAKE2B 4ee21a97dc9f86543ea87b2dfeeda75bdf55358a647c6bdf786c0eac9dceda695be8beb87ad373b136af783431c0262f8785f93a4a22a1466bcabcd961b39f43 SHA512 36c9c4459afeba6b9c4556e3679bdc7b0b2dc2710054dc9df0b30343df32ebd440932242fccd3e7a86eeead12aa2152a1a07b9537c3e0e56379f2ecb49a3086f
-EBUILD mkdocstrings-python-1.7.5.ebuild 859 BLAKE2B 4ee21a97dc9f86543ea87b2dfeeda75bdf55358a647c6bdf786c0eac9dceda695be8beb87ad373b136af783431c0262f8785f93a4a22a1466bcabcd961b39f43 SHA512 36c9c4459afeba6b9c4556e3679bdc7b0b2dc2710054dc9df0b30343df32ebd440932242fccd3e7a86eeead12aa2152a1a07b9537c3e0e56379f2ecb49a3086f
+EBUILD mkdocstrings-python-1.7.4.ebuild 859 BLAKE2B 5595f03023ea70e7165564bc416ec9f04478f245422dce67183bf9f4793eee0a840a2514c1f15de6d0810616646d66eb6f9795961d71b98fb71e654aadc7e3e3 SHA512 65cee1fd76eaa6e4dbaa2a8fe689fec31bfd100e80eaab3fc15c31dfc796801a62e664cecd83897667bca03df34170415600f0400674e56c8c684fd8b5c58add
+EBUILD mkdocstrings-python-1.7.5.ebuild 859 BLAKE2B 5595f03023ea70e7165564bc416ec9f04478f245422dce67183bf9f4793eee0a840a2514c1f15de6d0810616646d66eb6f9795961d71b98fb71e654aadc7e3e3 SHA512 65cee1fd76eaa6e4dbaa2a8fe689fec31bfd100e80eaab3fc15c31dfc796801a62e664cecd83897667bca03df34170415600f0400674e56c8c684fd8b5c58add
 MISC metadata.xml 411 BLAKE2B 0ac98abc8de945139a73e2083e8c04df749bd8c0c26c446df65218057182391ae025885fa5c5bde2d1139dde9916aa3baa0426d70b57326563c3fdaf466a20d8 SHA512 c7ec032c8ae7197452714dc2b541ccad1cf84d7844dafc4e7581ffb00c62c0fd2c38d453e62a7706d74d2d20146acdf1e99e502ab8bd8976acfd6f5a605e1c56
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.4.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.4.ebuild
index 4d15ba60abef..d5b461fb79c9 100644
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.4.ebuild
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=pdm-backend
 
 inherit distutils-r1
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.5.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.5.ebuild
index 4d15ba60abef..d5b461fb79c9 100644
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.5.ebuild
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=pdm-backend
 
 inherit distutils-r1
diff --git a/dev-python/mkdocstrings/Manifest b/dev-python/mkdocstrings/Manifest
index f847828fe548..8679a465b5cc 100644
--- a/dev-python/mkdocstrings/Manifest
+++ b/dev-python/mkdocstrings/Manifest
@@ -3,5 +3,5 @@ DIST mkdocstrings-0.23.0.gh.tar.gz 80975 BLAKE2B fb561b46f98372093846d28890b3d7e
 DIST mkdocstrings-0.24.0.gh.tar.gz 85474 BLAKE2B f43c0842bd5c8f52700e572964948f362112c073992c8aa7d6df8ecc0a266b22122988c944e36d5edf6d227a2cf9e2a9a95222146139d8577001833c729ad7ca SHA512 0cc03cb68679958d77a5f1d10e96411271de2db2c89b1c27d151d7d6673a94c967024c377cb22a612a8079a0ea736b921384518869e1475797ed94c8c92d4dbb
 EBUILD mkdocstrings-0.22.0.ebuild 1593 BLAKE2B 5339b28197469a2494b8ee767267c335c4ab78d7e2fa74486cc9906cceb1db84d343332290a051c404d0dfd73805776c6e016737f197ff1bc8811182eb36196f SHA512 73ea512110294cb4a62245b08608b4bf86deb9ca7692ecf1ede3d4235f76e506a1e9b52739f62d5b688772dc079fcb6e0073fd5d7a6cb3e700b988d819d8d2ba
 EBUILD mkdocstrings-0.23.0.ebuild 1757 BLAKE2B f2a03870420883d46e7915929ae17c4080526ad05ec15bd3c25224f1caf7265e74a288c320dcb8630e05d8bfc832a953ef70fe8158c33ea4ccf73866681557d8 SHA512 8d0236e289e41995108a843e286b1b35c4a1af8b04b344bde4ae6148bfe4d955df3ffd4a9e2b1fc43b1a78d4738dcbaf55208b5b91fb461296e04e281b673a82
-EBUILD mkdocstrings-0.24.0.ebuild 1850 BLAKE2B 0343a4694c9139d5dc4187f53ea23ec2fa02d1885d86525ad3e0982ec3a66c125b7f1c9712647d159223fd7418b4c4efce8d228fce5cb1b087efbf7880baf408 SHA512 a0f221f2d50d6c527c8219962a0810d4c5a76e1f91f4576ee9275874d51bfde4338250f18ab3a1608d31fd6b1d40bd7a4f10e2bcff373d6db9d09b7665962d1a
+EBUILD mkdocstrings-0.24.0.ebuild 1850 BLAKE2B 40df96b889963d0190b5147d6c6b80df87b97a7f47678a2f0a905921a97b6fa9ba9bda313900c1a0023067b80ccbd8c005e2931760b97a5b79b2d0c746e18b50 SHA512 6be4b6e40fe6648e3bb3ca773931ca940da16382f00f79aac0553e740e2fe1a24babc2e1504839ee0c2ac79f187076de3f5f2ee4087bce2d0d7f53abbd846245
 MISC metadata.xml 410 BLAKE2B 896cd2e10ca1ef3d76b5cf37b5f2a89f12df1f068a5a423c27e51e4f1d60261ed0198ee11ca0b838cae0dfd2891e3ea7ffbe071d72c69f9f83a89ae42ae656a9 SHA512 3b2e9deab0dc2f17bc6e2e5c25e5b27c084cc5027fae2f84b31f16da9409fc28bbc75a6ea0ee96bb51555e6e61275a472bf7d0c1b2ae4a4d8ca469f0d0280660
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.24.0.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.24.0.ebuild
index d4ae33769ad1..d2dd5f17a0c0 100644
--- a/dev-python/mkdocstrings/mkdocstrings-0.24.0.ebuild
+++ b/dev-python/mkdocstrings/mkdocstrings-0.24.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # py3.12 blocked by mkdocs-material
 DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index f8ca8024df67..81580f3c7d82 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -5,5 +5,5 @@ DIST mypy-1.7.0.gh.tar.gz 3001996 BLAKE2B af29475dc4a24d75700144b8b2643de65d88d5
 EBUILD mypy-1.5.1.ebuild 1548 BLAKE2B a8aedcd6bbb5efe0cdebd4451ea3b0ef2eba9d66c89802d73fea4785c97fb75f748267431686325e22217321b5d8d3f3789b83a0b349b4b159ed0bd87e5c3f9c SHA512 a1d829e224dc3b12d0ae50fa8774c5414cbd5c13106a8d29004a525295ef11cbede074052b4fd71af2cbcb69c9bf330c7d8cba487b8ec00e9d1de8d3915557b4
 EBUILD mypy-1.6.0.ebuild 3047 BLAKE2B 47e8321775ecbdcd68ca64217e764eec6105adf76bada0a9e6316d173623e2fb98d10c77bf3f6626e08a446c4186dc273853c0462fcac5a88c1da3706c8caf3d SHA512 a4a0d8ae29098db19427d35515117157e1af29f6a31f4250528d6d3d2cb8803cdc0510f9dc7d7f1ce3fa2deba3036a7234e359c34c8e2af68463c1fbe2c1515e
 EBUILD mypy-1.6.1.ebuild 3435 BLAKE2B 1922312d6e597c00acd44ef3b4504a762a33c54916035c3a5ab6aed8c332b18365a89171fc070071718e8e8ee1130a5e60ea2a859851301315bb3e61c769d665 SHA512 d4f40c28a0165082fa3b187d6f52f17bcf5909f9f9ba5a312a84670c8cac668a2c198b52fe9ef81268d1fd67e49df86d0b850d027f217976f7f9f3630fe4cbf7
-EBUILD mypy-1.7.0.ebuild 3511 BLAKE2B 0083060cc295b39dd451006b24e363bbfb0ea9e15bd514d22a0998ed9b1cf842bb320bd6504e6814c762e172b2530ee571118879415a3a8993d02b291f71e141 SHA512 2ba0ec932b7dbbf145d70ac06e2033617ceb1596aca5bbfe868c5b1d0fae4617f6f7149316d0e82cd84339018ab534749d028a90df2e8e9b69edc4ea39b6ae3b
+EBUILD mypy-1.7.0.ebuild 3505 BLAKE2B c39533f71ebfd9d082724d1ceaa6dfa940581cce9994f377ec5219adf4fe5451ed8de72cd10b40b3b8306f437acb985c5a070a0eb71fc665e13c01e77702f69d SHA512 60b693a8e7dcdc6acef3b3a2c92573115ef4cdd8c9e889d177c84c519977e08762f1dbce1baf8bfb630c847f2ce498faa69e62c01fc3b6f742ec6d96ec8505e4
 MISC metadata.xml 661 BLAKE2B df57cc2dfde5b112f8c26b51ca5cc9e7727d318ee274ea7e1abf448819daf0307f471aeb7c32b19f20e87ce1ccffd47a5529415003765c275523e1b5236f3bb1 SHA512 eddd19c4b0b5211f73f9619f388a799ced108b62bb43d852ed2d01d0b1717e7b9ef118d34b9d61db543c7b47080fb8058c3d35f7359cc456069636f357e080c9
diff --git a/dev-python/mypy/mypy-1.7.0.ebuild b/dev-python/mypy/mypy-1.7.0.ebuild
index 49d077bf8578..bde4d1b90a80 100644
--- a/dev-python/mypy/mypy-1.7.0.ebuild
+++ b/dev-python/mypy/mypy-1.7.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 9090c3ee9d08..7b6b9ed07ab5 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.8.7.gh.tar.gz 118268 BLAKE2B eb4dec3a3fdf23617d499f4902022450de9b44fb99feff70b35443fb1797d3d0de31ae44841056651969a6ec4c47a1f1e060ac04b513b857fb47ccb82e04d677 SHA512 979b9df2bbb32b8f79aec0bb5b94e86c3d13c546aea7c9d81da76ab94fe93db0927dff16e497f4521f0c10df0243553ba6ee3f3b692493faac9a14f658044113
-EBUILD numexpr-2.8.7.ebuild 1031 BLAKE2B c342d1c2ddd6e167dd49626da38a84ac8f936b546a8ea5e7b6841b0d11a1f548c8e85417552d908ea282c166ae0e6d2b834cb69df89c2f25dd4e7a2feb35c0d2 SHA512 305ac4e5c93cb527c78d36dadbe207333c1f7addb3ae6909845e7a33b043a4c023426e67a0f1882a6e1649d759df249bd08eb1673942c186333ee2e021a30d67
+EBUILD numexpr-2.8.7.ebuild 1020 BLAKE2B d0565415398d6e7ed1177968347c9bd9b260b7463387dbb7b831cdbcce0a931854e96f60f1151ba53438d8dbeb66933ded6cfecccf3f0a8fd736a4216400f93f SHA512 644207e821fec29f5e2835e39b3a11cc0d13f4faf14957e3e0b060dc96ab6d78402bb6988432c691eaa559edad51a9004036ff80c0543b6783cd2f2c182daa26
 MISC metadata.xml 963 BLAKE2B 054bf0762161cf275c8898c5ceb15af773f9843bad7ca9624880c9376cbb5e34104dee891287c113dc1762b1e3d642b9b7a39a200fda55211158af30c57521b7 SHA512 9f5d054d0f7f1a7eb1f10f638d9992c72652d5fe8b94664ed189630e9516374bb9fd28db2972212c350b8804aa79bfaed09e12ea4d3bc7836140e805c2fb3ac7
diff --git a/dev-python/numexpr/numexpr-2.8.7.ebuild b/dev-python/numexpr/numexpr-2.8.7.ebuild
index 5e14c17b6ffa..fc5b7013cbbb 100644
--- a/dev-python/numexpr/numexpr-2.8.7.ebuild
+++ b/dev-python/numexpr/numexpr-2.8.7.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 "
 
 python_test() {
-	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
+	pushd "${BUILD_DIR}/install/$(python_get_sitedir)" >/dev/null || die
 	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
 		import sys,numexpr
 		sys.exit(0 if numexpr.test().wasSuccessful() else 1)
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 3d290854552a..8497392a7ceb 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,7 +1,3 @@
-DIST openstacksdk-1.5.0.tar.gz 1194014 BLAKE2B c1855c6000452d3909b8dfc1990941d8f6c440cec8bac95757ea66023a44696ecda2c049cb1d8252696b2e1be633e7855f9a01ccb5ff52b50766803b15e34b23 SHA512 8c65700b08ddf2b8eaad627f98f84050b1fb3495030e2a43f78378b3a040351ce41bc1b74ee1344612f1b61cede7ef45d8a15c70d9ef7a69fc696bf9edec384b
 DIST openstacksdk-2.0.0.tar.gz 1201657 BLAKE2B 5b1f2cf4958ace5b90b95b8c4789f70b3ab53809792ddb0337dd87d0ebb0a1bea93a3495f20e7413222cee63c1b60536c704405f683910099272ca46033e9810 SHA512 29f963aa5dce97b6bf7a90b9e82c341b6e027fd6e7937e76d98e87d05933890b0f110efbae2d03c7bc0a04feb3acf954ff0ec7d0ad28af5f0373a27e8d956683
-EBUILD openstacksdk-1.5.0-r1.ebuild 2590 BLAKE2B d5e4f3f9a81f425058a7e04320b54bacaecb50877d2b4b81712ba9f31888f651bd7589f4d297e02d12e5e0ab4b900f1b2553b3e7c902ae95f4633cf6958cdda7 SHA512 c69933efd3833e912783e741e37dc6637c926c3c08541dfa9bb5c7d745980ffb9d7d3c1cf7c384a3ff39a2f34c03e09836835be5b24c9acb1fccd251b446c74c
-EBUILD openstacksdk-1.5.0.ebuild 2636 BLAKE2B edc801b7ad004d2ac164850b9cae4074c24d0c9617b0ed56ef447ca76b26e27f8c5aa857d3c2dd1de57707e545fff96ce2ae46d9d21b7c6cfdf9265ef0b61032 SHA512 46754f9e5e1ac4080ec27cfda788c55e4a0dbd41fd0677d9d544f5231f6083c214dd79a77322c870025aadb49c5c49f4caf4abe511359d0d7e9b9bbbaca1722f
-EBUILD openstacksdk-2.0.0-r1.ebuild 2828 BLAKE2B c5294f19ab9ba3b50c9d7ea1e0055f65d1498ff968d080ea5fdb91caa5814df041b68ec1372b42261c6bd8e696a2fe400a58c6180859623bba1f77f2ff6e6415 SHA512 142eb39406dde1e308f298c9f9d6733f644504811029470cd03708bae3b07d442d811326396ee22c227ba0a4785e6bdbdff686afb704535949d3e6d0c4813e9f
-EBUILD openstacksdk-2.0.0.ebuild 2640 BLAKE2B b9d0a2bb6d45a1f13466ae1c0252a6d023f493e5d8083c6b1efc34dff59ab7479249ab6edc460612975041986d7a4614bd189b97957847e3999651ec5233fbc9 SHA512 df96039af0a5ed4ccf74114291ab2c93af8c273a9692dd05df4e47bb604316b951dc5f220763744f07e3ebecf34fe013f9ee16d6cb02929b417466c0fd163a08
+EBUILD openstacksdk-2.0.0-r1.ebuild 2825 BLAKE2B 5e33ecbd52b2c864731cadd8b2bbbb409ed689b663b6cc945530354b9eea1f687b85233dda2578299204c7523ea06b9404659e60fb973632c42372ae2f18d205 SHA512 8a21b44f2f8228422c4a425b3669afdb37b30eb782cab838458f09ea3907817d392c0386f858c496ee65e295a4dceb2abc7d7266bc2099467d34fcc384f19135
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild
deleted file mode 100644
index ad69b175b930..000000000000
--- a/dev-python/openstacksdk/openstacksdk-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,83 +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 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-1.5.0.ebuild b/dev-python/openstacksdk/openstacksdk-1.5.0.ebuild
deleted file mode 100644
index a22b4563b210..000000000000
--- a/dev-python/openstacksdk/openstacksdk-1.5.0.ebuild
+++ /dev/null
@@ -1,84 +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 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
index 3ec8a5c1638c..bedb73a3dd6e 100644
--- a/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-2.0.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/openstacksdk-2.0.0.ebuild b/dev-python/openstacksdk/openstacksdk-2.0.0.ebuild
deleted file mode 100644
index 82c8c46ed07a..000000000000
--- a/dev-python/openstacksdk/openstacksdk-2.0.0.ebuild
+++ /dev/null
@@ -1,84 +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 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	dev-python/importlib-metadata[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.20[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index 7872535228b4..b4578642b750 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,7 +1,3 @@
-DIST outcome-1.2.0.gh.tar.gz 18147 BLAKE2B 19e99c8beb1c537a15040211e2fb2f30e425dbb6c81225f2b44720d52e26d8065f434949cd22f97d3a44b64d404077118842a7c85d38f1b7b01ec60d26ddaa39 SHA512 ac8f8738b000e50ace5fbf2c373c9d28f05e88fe40a11602dbb08c48d369f28651ca6c1269ce9ba4ebf1aa9701525e966c061f75313d8650e739934e3ad15003
-DIST outcome-1.3.0.gh.tar.gz 20685 BLAKE2B 5bc6bd82a855cdd009b5613bcdf371d7f946b58567c436ec89db4511fa17ac15508498bfac90ec4ee4e1e60abe80f662c1e75f6da03ca087cca2264988a0b488 SHA512 0f8278db3dee0c15f82b08a172a6b1b2f360f5bd91d894338b24c6eb38884bf59f0a18d29af51b87857c41b25a81079fbffd87190392002ec9250c2d97b71965
 DIST outcome-1.3.0.post0.gh.tar.gz 20749 BLAKE2B d094f1c7c67b890fff20b81ee77d9b06616e0e3e89ce62b3936b6d2a6964cc95355f81feb82acf8d9a3f63c6af4b219bc4abafe1c329d2a5963936a9d3a7a827 SHA512 d01f6d74e883b112cd589f9e8ed05770db9b1f9ae48e84e2cbb1138c33c1496d3bae559e2627a4fe736496740866c1a9589cfc611d1c8218add1ad27f8f033ed
-EBUILD outcome-1.2.0.ebuild 826 BLAKE2B 79d399c4d2e222f2eb55834549a70869c4430f6a2542e6a092aab45898838b48293ccd65903c16acf6c4ffdd0c0c310f2dc5be73989037b897734934f78a46cc SHA512 7b25c2b67babb686bc3389914513eca151e67409299e428fb671d9d6f56341d25ec77626c962c271c604194ba7931aa63327f989588e114a78a58207e3119f01
-EBUILD outcome-1.3.0.ebuild 834 BLAKE2B c28b35a0a6fd7f384c68a1bf7a35e5c68b3e913a5d31e21125a6aa03a274c31e36471c3223855773d193e3f16e550b09f3ee8161e6f8339c4d265033ad7271ee SHA512 f7686173a5b788371b1a3243ada02c252e8da10d1821a9f09fa0debe4dad8e9e3bd58b452296546abe0a4f3c2573adcda4edebd343a4ef85553d4e297a2cf616
-EBUILD outcome-1.3.0_p0.ebuild 894 BLAKE2B a314c24890f400f404337ab2e6cefdb1180d0bfb7869c8a32c6979eb8a11ba78d7d01716d1a6f3f39fdd010efcad2b55e024311bd146902a1fa56aae73b5bbec SHA512 4c019c9dda6bb7f3bac86a399a1a795eb03e6af7b9281adbe69040e13128df6e013a1681477c178184cac8bd6257a5ce301dd5e81414215c78cd95e587e943da
+EBUILD outcome-1.3.0_p0.ebuild 886 BLAKE2B 61ce73b42202e9a9196833590f567901bc4f5aeef73b4c938d9b473eb6af9dcd7cbb6a7cf821b50643a2a425afb39ab810fa7092f99c9fbf6950b10f6ea99351 SHA512 1c1559d8da71a06a445b52598e496e616bd7cb81ae0ec99390bbb217d9f16f061e9e491c35fc30b97c8b9d544401a40063295820e1cfef868702ed451024c449
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.2.0.ebuild b/dev-python/outcome/outcome-1.2.0.ebuild
deleted file mode 100644
index 43fe259253f1..000000000000
--- a/dev-python/outcome/outcome-1.2.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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture the outcome of Python function calls"
-HOMEPAGE="
-	https://github.com/python-trio/outcome/
-	https://pypi.org/project/outcome/
-"
-SRC_URI="
-	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio dev-python/sphinx-rtd-theme
diff --git a/dev-python/outcome/outcome-1.3.0.ebuild b/dev-python/outcome/outcome-1.3.0.ebuild
deleted file mode 100644
index cb55f06f4835..000000000000
--- a/dev-python/outcome/outcome-1.3.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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture the outcome of Python function calls"
-HOMEPAGE="
-	https://github.com/python-trio/outcome/
-	https://pypi.org/project/outcome/
-"
-SRC_URI="
-	https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio dev-python/sphinx-rtd-theme
diff --git a/dev-python/outcome/outcome-1.3.0_p0.ebuild b/dev-python/outcome/outcome-1.3.0_p0.ebuild
index b04944710329..49f02152543c 100644
--- a/dev-python/outcome/outcome-1.3.0_p0.ebuild
+++ b/dev-python/outcome/outcome-1.3.0_p0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 47a344e613fa..9e458670d1e6 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -4,5 +4,5 @@ DIST pycairo-1.25.0.tar.gz 347794 BLAKE2B d05c1f505059c181d176b533ff4753e9088818
 DIST pycairo-1.25.1.tar.gz 347088 BLAKE2B ba4eedaf47e514bd7c3ad5ea738d099428958988a708255f59df48372d112d0195fe746be03de56aa25ccce9c2366b8898fcdd568b427372d0340c5edd550a5c SHA512 f2b93a09cbe9cd7c2885794ff58a48df6cf59fbe2dbeabf7c6e9d99e68c71ac220abc866ac0d756c7ffb3f821ef63b65dbb8963f0bf7d5bd21ee0efb800e7b23
 EBUILD pycairo-1.24.0.ebuild 1236 BLAKE2B aea95e9f30aaed453d16742bb76d65d14d4f096b072ac52ec17fb74e9abefed183a633dae265ce34e018f5c0f1fb96d6732c5f9ee75003ebd8e0cd13cd72e21b SHA512 fa792fc7a89962c9e0ccbfeabd0845838be04de7e46ee0a2601de8cd36bc8eb77fa0652f1cbb2255f66333db128cebe212cafe202a0861a444c4fdf76641e397
 EBUILD pycairo-1.25.0.ebuild 1582 BLAKE2B 553d84520a56452099ca7c8869c66266fcfb5a2d6665613b8bf32dfce8f6f2d2131841ae1526bdb3eea0a7b8f413f85bd4ee6e6701c41ca6ce5aa3632dcb820c SHA512 c937c8249a4c904f301a6e0ee959dce0c58a8c848bfe957a36a42f7d9f3b6278f4902ad49efa7c6113a04624cec09c745f7d1718747bc9c5ad58dd5de6fc5ee8
-EBUILD pycairo-1.25.1.ebuild 1538 BLAKE2B e0f3b8d2024201fd58077d315fb71def03c97c56a1632abff0528389ac6264bdc668e044cd650b3c22b6fe36e8d53d4ad1023904816447b6731e8ee5b3549cb4 SHA512 28deeb8378af83af8ee55884aba65f199454a6e9876306c89f34ab29cf9d7233f744209530e745179c8ea324baed657189ca69ee85aa2b8d4797bc594757fb7d
+EBUILD pycairo-1.25.1.ebuild 1532 BLAKE2B ac5d6cc983773e81e01a9f2d916703edbb3189ed0542a395658c66fd3fcb0f266565ae29d997770e329121b2cb7a69f4e4df0ae322848920cf6803551207cae9 SHA512 f419d56f26651938e582f5e5e65148105b6f738d499e3e1d90d118409ad6b58d3af88a1546784ba4c08f9b5e38184255e085d174c38386b3b5fdc606adc6e761
 MISC metadata.xml 368 BLAKE2B 5e0f85e23bc56113927d28072c7178d27fc058b1e90851150c55e9e713edb96dd5daa79df8423f6719032538c9448d8afa9b750961bd82a5bcfae2d5e228c6b6 SHA512 c1e81ed2f535c8050f18950a57b71aa871b965c57d1e5ca8e8a4c48ecd643bc9ec326e046c1aea9f3f41124b9fe765a0b9b46a541c28f325cae7038cea66d086
diff --git a/dev-python/pycairo/pycairo-1.25.1.ebuild b/dev-python/pycairo/pycairo-1.25.1.ebuild
index 7635d9cdf398..0f80864403f4 100644
--- a/dev-python/pycairo/pycairo-1.25.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.25.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 9fbb8265cff5..c9a704cda9f3 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,5 +1,3 @@
 DIST pycollada-0.7.2.gh.tar.gz 3526845 BLAKE2B 3d8b4d2478fa4937756db69afbd8716ccd2dd4e0bec8e7dc045e84f06573605c0872d31bdee3d6ccca4b800699746877530f2fa81b5790c3f5c0cb3e7583fa66 SHA512 5c21155d52d54de62d192d4da0385bc7110ddd3962fe3e0e9e5904bbcd0e66cb1a95765c9996cdc5beef0edb30ee2123ae23b904d029be1c119e902d2fc4e7fe
-DIST pycollada-0.7.2.tar.gz 3526845 BLAKE2B 3d8b4d2478fa4937756db69afbd8716ccd2dd4e0bec8e7dc045e84f06573605c0872d31bdee3d6ccca4b800699746877530f2fa81b5790c3f5c0cb3e7583fa66 SHA512 5c21155d52d54de62d192d4da0385bc7110ddd3962fe3e0e9e5904bbcd0e66cb1a95765c9996cdc5beef0edb30ee2123ae23b904d029be1c119e902d2fc4e7fe
-EBUILD pycollada-0.7.2-r1.ebuild 1122 BLAKE2B 3909b9c6b394d54c3a2c5374e3f53746eb4856e5e8f4c888d671bd375b78a5eff9e2a7f25b3c3597f773aef3568968a26533a032556787ea058fc8848b34d6ec SHA512 f650ad81ce14d648b772bf1596065cebbde93dbd4af91cfd0821e3d54c41271e48f536d0183eda3a88927a2dac12cbb85c82b1153633402761b21a30ba87bcfb
-EBUILD pycollada-0.7.2.ebuild 990 BLAKE2B b8d308a8a089efc86b02ed958f11693bc9ed1ac6c941b7ad09481ecb9bcbe8dcdc1ca24b4dc250cb360576c298072b5995bb09877052f02837f07431f2add4f4 SHA512 822e30636e98e3667cf3ecfd1af2ef63849d1c4c628617bafd77ea2186d9e162f4534bd4d023b4a286f3da09c2ed17e09a226f0b48f116e2bf3b9aefd6207fc5
+EBUILD pycollada-0.7.2-r1.ebuild 1121 BLAKE2B 676fb50aae5ab6cb1838395413be095fa4dd921efc0bd5cf3a4e242413927136611bd10411d9058392a719a428842153a18cd3a2e99e2a3828aac93c11f70a0c SHA512 27586613a41790f6b03e4a16de4a1ecf1b560ae37fa8dbc019224bb4bed2b517b5a6500e4a74a5bf7b77a154684f969501e3a84b2663201180e7c4fd91684a50
 MISC metadata.xml 905 BLAKE2B 9e1283685c76cd27ff971ab68ef51f56cf296aa44fe3dbb5bf74a3e6b4ea69abb927603acc16747bd1bf8db906b4437cf792330df5e7803a211b1699a01034d3 SHA512 686ffa6bb798bd4387106cdb461f0abdc2a685c53c4552c95c86febd6789e4b323ae1ac9717109fea96287ac100a93b33e3ce37eea37e6de3e4f4e704e40e9e8
diff --git a/dev-python/pycollada/pycollada-0.7.2-r1.ebuild b/dev-python/pycollada/pycollada-0.7.2-r1.ebuild
index 82a1f408170a..5773a6526984 100644
--- a/dev-python/pycollada/pycollada-0.7.2-r1.ebuild
+++ b/dev-python/pycollada/pycollada-0.7.2-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pycollada/pycollada-0.7.2.ebuild b/dev-python/pycollada/pycollada-0.7.2.ebuild
deleted file mode 100644
index a34c60185bcb..000000000000
--- a/dev-python/pycollada/pycollada-0.7.2.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
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Python library for reading and writing COLLADA documents"
-HOMEPAGE="https://pycollada.readthedocs.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS.md COPYING README.markdown )
-
-distutils_enable_sphinx docs
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples ; then
-		insinto /usr/share/${PF}/
-		doins -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# ensure data files for tests are getting installed too
-	python_moduleinto collada/tests/
-	python_domodule collada/tests/data
-}
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index 084407e01abc..c4cbba0d94d5 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,5 +1,5 @@
 DIST PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz 4019265 BLAKE2B e72c96576588ac3cbfcdd71a1a8e96d41b9d6757b3468c372b45a9c91a887c693f7309467fe8ea27d29c4775cc8df9ebd610b015cecabaaea43c8aa75229bc25 SHA512 a475e4f4cd9f883307d30b0bb2ebd5095de426b52f0f70b1a557095c06241149ad105ca4cbb31d311fa54e4387bbed27e5cf2712ba7447b19720d46dac21a101
 DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
-EBUILD pydevd-2.10.0.ebuild 4033 BLAKE2B 03301333d3be639483c3d930e28f959ca15dfe15e5e011b9cebd4c7acf09ca0e6c9d1a82a338398ded973311801444a1e52e6eb107a7c89485a57d53a2e032ce SHA512 4790099587b1b0acfebb6b995b5685339e4d116c2f994a53a1e7c0c3f4614464429b4e7c00544a120cd2e36fc0b0944b2af29988ad92b98c510760c99d8d2274
+EBUILD pydevd-2.10.0.ebuild 4031 BLAKE2B 18aae1353ec0cc67f3efa57d86e4494863bf49b4eb4355f11b4e82b53626c9c1c910c4ec5b5a99c66edce81823b59041818367a199748c47e6b050aa8c4a3b34 SHA512 066a382f26eebb4b932e81d5133fd170b23ca5f7e466e0263a10826b1b3cf17dc35ae0a883d2ec1ab205b0fc1a10d1b02af7e189a3e1201e995a50804376f2fe
 EBUILD pydevd-2.9.5.ebuild 2486 BLAKE2B 9cd5204a2d55d776fdd7aa76d25ae3a80389030ee7ba2afcae7744f97a193cb061854430d6c2c245c5e17bbf9af6ecc32290090bd2223d1c03ee27019ea7dbe3 SHA512 dbaba2eff4f733601794436640e65381fbf5476da5215436e06db165aaaf96e5e3eda2847e293ab3a163cd54ebf860eb689c2c961d6a20152d9a3598be2633c6
 MISC metadata.xml 384 BLAKE2B 37a4caa01a28f98ec8d141129c08754e6ba4dee5910a81c26f3eafcd7ac832962e91d3e39783e4859ac7e5ae5754837c89e496c4c2c205d12626359adf7dddae SHA512 5cf80b2e0eaf21e900c83341e9bef5c74a36d3c0a7354e3b6a832184cc60c42eeef6a22236e4fd9d484dc8834e5d4f98facd2578c223da2cc187dd76f91db764
diff --git a/dev-python/pydevd/pydevd-2.10.0.ebuild b/dev-python/pydevd/pydevd-2.10.0.ebuild
index 39f771c76b73..541036552232 100644
--- a/dev-python/pydevd/pydevd-2.10.0.ebuild
+++ b/dev-python/pydevd/pydevd-2.10.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	sys-devel/gdb
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index d4b7d1e4c277..670a015b59f4 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -2,5 +2,5 @@ AUX pygame-2.5.2-error.patch 3723 BLAKE2B 3a3196e5eb4fa24f7246c05f016d78a94b40d6
 DIST pygame-2.5.1.gh.tar.gz 6854761 BLAKE2B e137f73a3bb718213ef92e938ed1b065f5568d7dd2ade6edd973bc55d06425874da0e89e3c102fad39adac25f977ac97025a0c59099702cfabeffd0d3b8f109f SHA512 d7aceb2bc6e40c5dc2d7a19fdc7af18abf021b79dd98b859975f99ec10895e1b09e11fbf17fd6ab925d3aa6c64e5b3dd56c0d857ecacc67303d92fc0efb2630c
 DIST pygame-2.5.2.gh.tar.gz 5970857 BLAKE2B 523874926a8fd868f5674ed2997a44decb928fcfe246d551249ed7320a0e908ce46d00f459d187726edf74a4c1038cd56821f6466559fb7d24aa75d16769cbfe SHA512 b54e9b80951c8a9e75666621aafc26874c6dbdab27330146f7217346c76be5627a5464a0102a5968eca0dbd7cced4b2143cd2ff1b6227e3e17e5634854b27f19
 EBUILD pygame-2.5.1.ebuild 1926 BLAKE2B f08e24fb19733c2272d19122702b553b7509c852719a6ef852e76a31f3e10756effd36ae709ae0e44a820645471e1f0be0973503237ab05e197dc5a950cf4e22 SHA512 09f4845aaafb9026bf0f8f5dfbee9133b610f1ee0e8f046c1380258ae82cf9d463e221a96739e0110e4f68c44ef624771d0d0db6e7a069d6b5961c588a01b1e1
-EBUILD pygame-2.5.2.ebuild 2226 BLAKE2B 697ad49a3919641abb582503030b0ee4e67bdcc50ca252c657ea5ee6e489a3fd40ba0830da6b7fe6bf108dbf62e34d033c07c8ca4e71f6cdd1d8b124ca0c816e SHA512 599ade460dbf0cf5ca2e1bfe85fd4b284cda55c6beeefaed5e8b088436ea97b7bf64c6eacc1627837d7078714c6a0c5dca7067a2bb5ec3855885b8e500a84eb5
+EBUILD pygame-2.5.2.ebuild 2224 BLAKE2B 224bbb70a34b28d0a327940911ce03591d73330cfb698e776e887583b29cb63b3ea1b411d3bfcf93e721a20b588c5de1360a064e309ef8f7747654528d976168 SHA512 88f92b18737aad9b944886bdc46ff1227739c4769c0c059e825964541edf29ffe3a7e2f3e2669a732e35e775e8dc8c7228d8ec37d265613a3a53ddbd6577578d
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/pygame-2.5.2.ebuild b/dev-python/pygame/pygame-2.5.2.ebuild
index 6d89ed769186..5b38e2a07ae0 100644
--- a/dev-python/pygame/pygame-2.5.2.ebuild
+++ b/dev-python/pygame/pygame-2.5.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index 6c14fc479a26..74f47f0dc28e 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,3 @@
-DIST PyHamcrest-2.0.4.gh.tar.gz 59952 BLAKE2B 76d8bbe2581c178f26cabac5207b6f26f0e86d66848a51fb24d313fdafffc75d40a02f02a73462358ca55a6b50941f849c542340b854aed83a37cef5876d90e4 SHA512 6ee558fe04dce839d5d5d20b90ecf82fed96570e1c5b3a827fce19dba167bf4702ea707560b19e2d6e82be20913deb6cf17fa7e140733899a92abb28e9f2aa56
 DIST PyHamcrest-2.1.0.gh.tar.gz 62526 BLAKE2B 5f4a836c6f0e61977fe0d572987a75fa9803d2362afb95d27d22aa8a567844823452b99c40c8160cca4407a60dbbeff3f6fdf03163da9ee643e082a64e83c512 SHA512 99017a75954b346622f9bd261a4f8827f82eb42a19551a7f96f9097a763e57afcc367a41a4cca742bda60ee0e7c3bcc2ca7025348e318f41e67c97c7a60961b5
-EBUILD pyhamcrest-2.0.4.ebuild 951 BLAKE2B ec1d6abdf7b06f08b4a3c13427fda7e1eb9a289eb9ac26b584edc073f067c5deca04b67abc6e7bce187de8b5446405fbec4e8cfeade2d203ccd992f599914e01 SHA512 b737091f9fcc6dceb976f5310349c4f78d2501516fc1c899e7f8aab4e9397530e0e6061782be13ec1d8d05fc1d8e007c412a4aaa9591572adadf1a1255de447e
-EBUILD pyhamcrest-2.1.0.ebuild 959 BLAKE2B 06b5316a8cffd6963eb383f87ac622d27c2ce26651cd49b1a97fedd8dd9c474bc37182344c1e4e069f5dc4436c20005c26d14f138166f5e1f975bd1c3e3d7c9e SHA512 70f515e4c85fa4ff09c68faa748ca29ee5477122e85896c6c50adba4582c2f74b34c6690fc89950ce8f625ce6b9d21337e860a9488a4c1c44f1753f45b06d592
+EBUILD pyhamcrest-2.1.0.ebuild 951 BLAKE2B ec1d6abdf7b06f08b4a3c13427fda7e1eb9a289eb9ac26b584edc073f067c5deca04b67abc6e7bce187de8b5446405fbec4e8cfeade2d203ccd992f599914e01 SHA512 b737091f9fcc6dceb976f5310349c4f78d2501516fc1c899e7f8aab4e9397530e0e6061782be13ec1d8d05fc1d8e007c412a4aaa9591572adadf1a1255de447e
 MISC metadata.xml 397 BLAKE2B cfdb950c34749dd9fa17d822df0194a8f35e477902947cf568f76aed96588c0e5a903ea5448f9772faef06ddc66df3c3c971978c6f4431861bf3586702d610db SHA512 024f24f466f0212a7ac599638bcd42b858e2cc786b7bf2641d0e0d4cc3df5dc97c958d4d85930cbd1c32e023f755f844a2675e2c820839729c54ad5e8fb40cd6
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild
deleted file mode 100644
index d524a8ae4ccd..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-2.0.4.ebuild
+++ /dev/null
@@ -1,41 +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=( pypy3 python3_{10..12} )
-
-inherit distutils-r1
-
-MY_P="PyHamcrest-${PV}"
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="
-	https://github.com/hamcrest/PyHamcrest/
-	https://pypi.org/project/PyHamcrest/
-"
-SRC_URI="
-	https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
index d4de03edcdef..d524a8ae4ccd 100644
--- a/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-2.1.0.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pylint-venv/Manifest b/dev-python/pylint-venv/Manifest
index 803f484815b9..671d829aef3e 100644
--- a/dev-python/pylint-venv/Manifest
+++ b/dev-python/pylint-venv/Manifest
@@ -1,5 +1,5 @@
 DIST pylint-venv-3.0.2.gh.tar.gz 15046 BLAKE2B 3c07e00739541c4b9b7c28c9b6cf91e8dee27885adcac8ec88b347f6c580ee0a0c905271eb5b5256ccf0ea975604bf98560ce271a27cbfd2d5790d1143ba6af4 SHA512 716491ffbb5e6642cd61cee62c720a594d85b4cf44feb2d53d3e120dbdea813234776a95341ac10acbdd64354cc3875659f1d3bbc5f45a87ac5232e1e7f89473
 DIST pylint-venv-3.0.3.gh.tar.gz 15432 BLAKE2B 2a0315967aa7ac9628a7633360249d3bf5904d2e9939fe1c962ad7066694fd5b073df71e89f0ff4a6c278c3ccf6b41cd70c0b2928b58bbaa19a7910f18f7b697 SHA512 83632d7063f8e14bcf9213a059e8e6e20222518e5cc3d19a7cc3761e11ece2aaea9b2e648f0cacdb37e6995fd85371920ed8bcc7a28545c571d12da8e8b3d795
 EBUILD pylint-venv-3.0.2.ebuild 918 BLAKE2B f48ac18775a4d4f1fda88f53023288cc3877d656a9012aa24981faa4d545eb0a14bbacab706215b5022d509c37478e33d15a1162824752839234a3624f5e0440 SHA512 ec9f890f8a683186cf1c387fefe6086f294b389d2990f74d708ba197abd620f088a619675122a101d0fc0392161c2bd812fd533fba9d4f57b3982062b391d3e4
-EBUILD pylint-venv-3.0.3.ebuild 918 BLAKE2B 2500ef3d5c4d5c2c11fa5c4bd0f1521020055f116cc4352af79753a4161bccf20bfd525240040908aeec848f7788650a6203d94055ea1c4a287ceda76504032d SHA512 4148a7e847520616cc481832ea382d17f4ce5054e4a76b67319c1a262faa282b67cb7789029445d43741fa54aa5dcc3358705703e50c53c42a56dcbea23a672a
+EBUILD pylint-venv-3.0.3.ebuild 924 BLAKE2B 37969d94657ad1da74fc95762428983c7338c7373fdf3d3446e8216c85b0acbe17dc809f1c42e553a6f66355e8d52bfeb729c0770de8362c44b308514561221f SHA512 2d1e6c25a5340af3c39aa8c9449230462a5195a1a04aa4801455fe5dc25bc6b5f7d50d21ccd9f994884f06e62c68496588054075b46099c6644548603a966404
 MISC metadata.xml 412 BLAKE2B 8dc1e28ad5e2b21a9483906e776a96d598e294fbc4dbf669ecea9357055b1a7439e0046353ab39b3c2bfaab7924f43a89c309db735e44a00838dd1bed2f5c088 SHA512 4e7963aa4cdcc168bd4755f21cb58cb084c185e1c71ef9fdfe168feb1ec65fc4848c99801e449f253e420b9e34d49aab396d2e02bb60a7cbd3733dd2a899c6cd
diff --git a/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild b/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild
index 9efab9fa4687..8aa0af3d7fb3 100644
--- a/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild
+++ b/dev-python/pylint-venv/pylint-venv-3.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 7007aedd7875..7c7fe79b2ac2 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,3 @@
-DIST pylint-3.0.1.gh.tar.gz 1419203 BLAKE2B 6a1c3db074c39a6cd838b39db13650192eb08b95210b95a78e518f9a2cf6c22b92c691f52c6fc08fff5363b12f028897d512f92de7fafabcbdfaeb18ae5535f9 SHA512 c8eca77f70a794e9dc764a70107afdd684a873ab00d6f51d400b96f6e06a39db014a27ef0505f2f7a370e5457e5061c78d2aab4fe1bf59746db4bbe3ae102423
 DIST pylint-3.0.2.gh.tar.gz 1420866 BLAKE2B 2679810940ee5b4a4dcde5a4a3d70052901d6ca8dfd025708fdfe3fadffc7713d3507eaea9a67a2fc0748478e8b6e2c2e66e487bf93749fcd9fea7d070197b16 SHA512 923fab3681aa266aa633cc122cd2076dc73588191ed116da0e83d9d0cff253c93634dd420d32b5ea780c25a8e9ff526d8393d4eae2e046a2ff82df3f5f9322a4
-EBUILD pylint-3.0.1.ebuild 2115 BLAKE2B 8947c56cc1751a4cfbaf5510f2aa97b0f06bd80204808887cc756dd66e283e30069c6730d0f25d33d78a2d48ce7b929a7b49a8c704b5e1eea5ca56417b24c309 SHA512 74ef9f80b447f85089c077408b78966afbdb37f1ace84b07075725b594785dfc485ca7c23716e90921061a42e694af9d1fb7a2e30a08db189189e7be96260451
-EBUILD pylint-3.0.2.ebuild 2123 BLAKE2B 5ca1c0cf2fd831abe792b6f63bf655a0910aa33bff9f66373b59e0e70e32c659fe1a2539c8a36f434bbf39ecb363c0264fc0f385804668d1286dc67f2b79db89 SHA512 5700b0c5a42e647a479c8ca236e1fe8a80604db9d7352cab3ed56609051bd3c20c98c5003a5acc66af9ef1cf242359297548922ba5c690361da18e1321a99c6e
+EBUILD pylint-3.0.2.ebuild 2396 BLAKE2B c986caa5a26385d265a5a3ebb152b7f3a6570c39f61cddd39acf0ee2acf18c8246b6d66799e809151ccd7eaf819d0d48bb159ee176aa35348d3d7c39bc1ec726 SHA512 bea3b36f79cead5e51b251503c5c28e70abf686be72d18605fe473e81532c8c23bbc8b9bac792f6641dfd516c77b52b851fd9f59a3b2a0c9b02ff9974685a0e4
 MISC metadata.xml 1105 BLAKE2B aa9d049b732f9198685901a0ec31f4a615da8398ce1741558e7b2c3840890da0c5ac6a2a23e0fd4cd45fb443b92f69b3fe4fb7f9d7570b1a75a0d0784231f392 SHA512 5f5bb3e31554bdc0cdcdaf1d7df9194e32da649784124714783c5d280c7ab4a9f65317b5d5e6de47698b2f30a019051191cb7ef3066902b606e2582a31f01c05
diff --git a/dev-python/pylint/pylint-3.0.1.ebuild b/dev-python/pylint/pylint-3.0.1.ebuild
deleted file mode 100644
index 789ef0ed3637..000000000000
--- a/dev-python/pylint/pylint-3.0.1.ebuild
+++ /dev/null
@@ -1,83 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-# Make sure to check https://github.com/pylint-dev/pylint/blob/main/pyproject.toml#L34 on bumps
-# Adjust dep bounds!
-RDEPEND="
-	<dev-python/astroid-3.1[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-
-		# incompatible versions of numpy/scikit-learn?
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.0.2.ebuild b/dev-python/pylint/pylint-3.0.2.ebuild
index af67a8803049..45c911979549 100644
--- a/dev-python/pylint/pylint-3.0.2.ebuild
+++ b/dev-python/pylint/pylint-3.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 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="examples"
 
 # Make sure to check https://github.com/pylint-dev/pylint/blob/main/pyproject.toml#L34 on bumps
@@ -44,7 +44,9 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
+		' 'python*' )
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
 	)
@@ -66,6 +68,15 @@ python_test() {
 		tests/benchmark/test_baseline_benchmarks.py
 	)
 
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		# Requires GitPython
+		EPYTEST_IGNORE+=(
+			tests/profile/test_profile_against_externals.py
+			tests/testutils/_primer/test_package_to_lint.py
+			tests/testutils/_primer/test_primer.py
+		)
+	fi
+
 	rm -rf pylint || die
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 003c9e3eab94..ee1af118b11f 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,7 +1,3 @@
-DIST pymdown_extensions-10.3.1.tar.gz 785369 BLAKE2B ac87db5df4505cd59663a2b9e770250522444e7dca6964625cd5fe4a969f5eb4efad1a2469ab2086f73fe2d7534386843167fb3e787d5bb300e33e98952c319a SHA512 07703acd18d018ece3f35003e65111482976ed1eb0473e39037dc5051b94a9003591c72b518a62a25219833dcd795d5bab5e961245998c93ad7277c00cb189cb
-DIST pymdown_extensions-10.3.tar.gz 784920 BLAKE2B 25b859dcba00d690bea3c9830542af52391f4941e8470d541e9bc0fdad12b6f20cf7350df237962fba502dbe72c8e4934446e3e5fdb6712ef9701f3654a4fda5 SHA512 28f1942baf0ed67b4d6bf80d1ac095a034d0afecd508ce13c8a8deabde4c7f6f89895c1a0509c576fa4884fc04f8800839b4a9a622910d3ed8914e0ac7f0ca27
 DIST pymdown_extensions-10.4.tar.gz 785151 BLAKE2B 90d49b16e3656262eb7a591e9cd53ebd1350aab8ed8522711c595169db078924d67e23a71c63001089744166f9ee2039622bd1b847facad64503a27a6b783104 SHA512 efcd958fce5d0445ecb9c7a844caa8306998647376cdb8c04d3bfcbff45f12f949230048a0fb9be50c59e814a445e38c1e57f749c5fe7f64f82f36853ef77cf0
-EBUILD pymdown-extensions-10.3.1.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
-EBUILD pymdown-extensions-10.3.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
-EBUILD pymdown-extensions-10.4.ebuild 642 BLAKE2B 5a878c454af0f5cb0f0217db1ce029ee5b1441661605679bbcc9983f4fa72db6f144372811bc0db0d1822d8bf7fc3c02499e4244f3b0d1679ab8e13ed895b639 SHA512 5ee2e2d766f37c6f64e28971818c83d9475ceda1eba3fadd190ad5312ef67ed5a16a6ae8c15bdbccc9e0f600e763a0995c1c4beddaeede484da65eaa1b533a31
+EBUILD pymdown-extensions-10.4.ebuild 640 BLAKE2B 804f63296878b5a901189b5d27919da2994c00f8999fbe2b5515b6a356e629838fce8e03210bc2024dde140641812ce079724376308e91538406c728c3d5341a SHA512 3221a9dfdbf6e6d4ebe23d9132b2f5718a0515cf9d7818fdc42a413f739f1173cb3ae2cb721f427c6d13f7ee0a505e053b4203f044439382b9049c091eb68e8e
 MISC metadata.xml 536 BLAKE2B f417ab2132b06eadbf1785654080084c4ef694f983e223ade83d5c77213e4443203a498a168efd68e4a3b1cccbe019c5b88716ac851719b9197deba9d2fd5411 SHA512 51304b48f9e296abea376be300053e041ea331f93e1ec7a2a3cdf10eea0ed6e9b8f04cdcbbed7920b46c60d5f6ce9337e3e25635516871d7b080eb54bfa16f57
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.3.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.3.1.ebuild
deleted file mode 100644
index 4ed08497d644..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.3.1.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=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.3.ebuild
deleted file mode 100644
index 9129aa82ebda..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.3.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=hatchling
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.4.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.4.ebuild
index 4ed08497d644..9129aa82ebda 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.4.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 3ab1ed676a5d..bf362d40b1f0 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,5 +1,5 @@
 DIST pyparted-3.12.0.tar.gz 106440 BLAKE2B 824223e385a6f1bfd9c01dc4c665ddeca5b73bbc2e65a9ade8086393f3dc0ebdc11528beabe7eeec8d0b8172b49db15ad8c34425efe4db47439f1b5617f9c55c SHA512 c1779c16868799bbff0905ea908db668823d1c238b9a06bcd62b24f9681fdd1e9378e904a91eb5e426a6e264cf1f2feee984a514e9098bf10147643bf58aa918
 DIST pyparted-3.13.0.gh.tar.gz 105838 BLAKE2B 37ba0004a36c6e9d417d3400bb2a91b2903050fa81e4deb0ef0f34232a1d59278f5074ce83e9ba03dc598fb9dae632a01d4d620837600543b130754dd0284463 SHA512 26819e28d73420937874f52fda03eb50ab1b136574ea9867a69d46ae4976d38c4f26a2697fa70597eed90dd78a5ea209bafcc3227a17a7a5d63cff6d107c2b11
 EBUILD pyparted-3.12.0.ebuild 654 BLAKE2B 32171c6f0515f9222de5503e1df9dfe21ce2fa8b66f389832c374e9925344464abff6946000412d94cc5736c8d12c7cdd9c5304c7675fd71188ae3da1a580abe SHA512 212ade6367a378da13e821b29472c728fd95f65987bedeabcc5cb89a5dbd3bba87075292a9121d7a765a7fe617131215c0081ed2218a7df180e0c76ad23c4609
-EBUILD pyparted-3.13.0.ebuild 663 BLAKE2B 6fa701eb3253e1f0d732e631be0b36f3954aa9fd3f567caf56511c1ce1f2126527d5f24bf5126900f887b1f928fb9c8dd8aebf436daf8049338c0dc559930368 SHA512 552337b6acd650b0f69b0d06044f6421660b17f42a6705c8822ec602d30db03865723f21cafdd536f6a940216d38da413c5e4e579e2b9ace27d3254b1707df01
+EBUILD pyparted-3.13.0.ebuild 659 BLAKE2B a707beef322dd21e07484bdd024fdbf51c4674120c361847ff2222d6249f48f2e3908d5bee11b7235e789284da57f9157a1dfb41d640814cfb8ac65defd3b6d9 SHA512 8c2a86aa36fb7d22bc2d8f52ec3cf16107b122158070abeacaa66dc2c3795a930d0d28cb62c7c7a0ddeb9b4939b88386a804bf801c1aeb94065989b3aed9b0f4
 MISC metadata.xml 478 BLAKE2B 52dafb612bb937b1451b00fd15b1f97609f0f9033c0a2dcbd080c73025e0d9cbdb1132c30803fb4e923811d852a2ea1b70c55d6cca13bc1c92777e0198c5bca3 SHA512 1e0ae2f7e920fe05c66940dc10c7e12e7c0d50de276c5fc530a8da09c336c458402b5ae773d09baba8fd68b7c09ee5cb369f3b675017a45e0ce8f6b1beafe0fc
diff --git a/dev-python/pyparted/pyparted-3.13.0.ebuild b/dev-python/pyparted/pyparted-3.13.0.ebuild
index c2c64b39a2ca..36a8ab3d7670 100644
--- a/dev-python/pyparted/pyparted-3.13.0.ebuild
+++ b/dev-python/pyparted/pyparted-3.13.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 DEPEND="
 	>=sys-block/parted-3.4
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index e3ecb592d876..4aca20be3776 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-mock-3.11.1.tar.gz 31251 BLAKE2B 26655487947d614483f082f17c9f3a9fc2688c016d07c6d4c4e34c369f87f3d914cf82d966a655e1eee501088d27d711f1b65f0c777678254dcfffa5c8c7585f SHA512 f52147498657d35f4616ea788b500a68ffcf1c2c066047fb973308b54e11bd7fe5a3961115bab99ae6858000ebb68b35cc489e81221a0bd26afae8426092ff6b
 DIST pytest-mock-3.12.0.tar.gz 32139 BLAKE2B 4bc2289579686b8ca9e840440b21b7299817e803f108726692cda6f1a138564462b04b9ae6a3038a5e36ec4d665bb7c8f54c26d231d6b17188b8d830d553b20d SHA512 6da429e646a4e3a825f699969dbc87033136918bd9aa111ff334fac324e5ac89ef6516e82ffeeb20cb6a857fbbe904d8ee985acefba2d2b7bd0ffe4b9227ad82
-EBUILD pytest-mock-3.11.1.ebuild 1235 BLAKE2B 86631d6db534c3f1387249cab08f14907b3bde25b80c12569d016cb56f3154db7b214f5bd95f88f4af15d82cb29c9ae36cb6c2d57ac4bfdbb8e36a0bb2c93496 SHA512 e467081ebfc9673a5dcf9ccfd9f1a96a8b5df6f82a7e8499c980376c5e2b781f8398877068dc97f00da2387185756bf2ab1aaeea3a979545abb512c5001fb263
-EBUILD pytest-mock-3.12.0.ebuild 1243 BLAKE2B fb567b31625e3346e23791c20630ca1d95c7deb795d30575c68e990bef2af8a82f3cc953b447efad681a5e7f1a0c9197478ae31eab76da0b50fe156cfd66e197 SHA512 ffcb06e96ccc9bc7056ea9d051f3e0e821ac30f2516a696d7514286cb67ca464c4cef946af0136bcc66557bb3e0201bb38f00ab60ed16ce42f690db9a63769b6
+EBUILD pytest-mock-3.12.0.ebuild 1235 BLAKE2B 86631d6db534c3f1387249cab08f14907b3bde25b80c12569d016cb56f3154db7b214f5bd95f88f4af15d82cb29c9ae36cb6c2d57ac4bfdbb8e36a0bb2c93496 SHA512 e467081ebfc9673a5dcf9ccfd9f1a96a8b5df6f82a7e8499c980376c5e2b781f8398877068dc97f00da2387185756bf2ab1aaeea3a979545abb512c5001fb263
 MISC metadata.xml 379 BLAKE2B 47a45606cecad3ecc9b902d9ec690c33a89728ce93038433f11ab8c3369089ef12e86c793ab06dedeef7a816dc973ae8ea2a6b717b13085c7912d69bcd68db65 SHA512 b5e43e5e0a1cfba50868ca542b00d40084aeb38f764f203ed112a9359e966e94d34a99bbb072b98f9401a0383d3fbf834b8b87572e073592263f18d73f09db2e
diff --git a/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
deleted file mode 100644
index 21e83bfc0670..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.11.1.ebuild
+++ /dev/null
@@ -1,54 +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_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-mock/
-	https://pypi.org/project/pytest-mock/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock,pytest_asyncio.plugin
-	local EPYTEST_DESELECT=()
-
-	if has_version dev-python/mock; then
-		EPYTEST_DESELECT+=(
-			tests/test_pytest_mock.py::test_standalone_mock
-		)
-	fi
-
-	epytest --assert=plain
-}
diff --git a/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
index fffc7a4e5350..21e83bfc0670 100644
--- a/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.12.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-6[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-plus/Manifest b/dev-python/pytest-plus/Manifest
index 035c898fefe7..96db09f2aa55 100644
--- a/dev-python/pytest-plus/Manifest
+++ b/dev-python/pytest-plus/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-plus-0.4.0.tar.gz 9987 BLAKE2B 11b8f17630601f52ebae11b7a660c8d97b4c9f1699096a376c162952a03b9f1b580ead6ac0b040b15c267eec1123bffe07d128eb00aec7414e996275ebc4c4e3 SHA512 4f4258853280cac8e03c0477763fd588d2b3cf11e7746d2b8e7d3cf5774b845412bc8779d74d232e4b3473470c39753dc788ac09faf8e8b7c9fee22d7164bab7
-DIST pytest-plus-0.5.0.tar.gz 11444 BLAKE2B f42a7d9abc934635414959263a85399ccdf5377eb58790339d816a8ed8b3962ce11f088e0e074163c6ea9498ae07cbb9422586cbfad572200f1fa628f1b9620f SHA512 02417b2b02ec44d505ea8b6a4217c55b88d1b1383ee36c51b4480824816eb57513b63da36b86004a777ebbbca462bdf40ac3b18331010c10ca6d6259c837f705
 DIST pytest-plus-0.6.0.tar.gz 12795 BLAKE2B 6e618f29e679cf1c71018ab4993606add89a4e3fe47a78b3cb4a17908c2bb0192646108918786183b330016a8e8d5458e87900d8bf4b9b61e90d3e24feab43a8 SHA512 7798a4e53a4ca95b24f9039accea2657746982370cd99f5d34d5dceccc08640214241f1e81f3e354f03782f013bf1b375a4e16a69d23e211948232eca678f98d
-EBUILD pytest-plus-0.4.0.ebuild 590 BLAKE2B e5da07ec57aa02b818057be4f9c6451bce53a35be54bcb26ecce6bab4fdca4c0758a246853a359c0987b3aa5f9a8059ff6f14ee698a28bdd9fff05a73c2ae414 SHA512 efdf001d394baa8638b950208e8ebc7101e1b2c09ef4bec3f6096ea233ea85ccdd4242ab64fe3c64b5c9700ae0d8956db76985ca2a3f977e0641d4a3fe4d9fb7
-EBUILD pytest-plus-0.5.0.ebuild 591 BLAKE2B 202a74bbe5afc518caf33586710b4aed75061b332274aaa9b4af699f54621258b5532434e331c2616a025dd2b8563b96c937d5d57e5622ce45e62f3eb7510111 SHA512 f49ae3d42a199336256e9a51bd6f93f77bab01a341458f796871fafa2561d42f17c6d950c648edb29542a85e9d999e1f3e9518d5cb68ba1e6713dbc42e41a281
-EBUILD pytest-plus-0.6.0.ebuild 591 BLAKE2B e1f67de2f086d3793ead4a945fe2585ee59cedc69932409c4566cb359964207532b0b4c7e9901e1ffcc5f215f8b5b65ef4988dc25741a05ddb0d3a54faefe941 SHA512 f265366fc08b8bfe59a507a916f9604e95df3b23ff01b9dc5e406f0fc2a9e485b50a288ae1646b3824cf4ef6a6d7fd275b5b8896e039e2166a8ce31b61a3063d
+EBUILD pytest-plus-0.6.0.ebuild 590 BLAKE2B e709774603c0e84fb6595aea65fa650fb84d070fd5c3c60bd921e212269b5a4a88ddb6e7a9a7aa6c739c039e97c6c79a5a5f54a335876ebe61b7569b5b1d384c SHA512 15d022807d2b76a95f8185629714ed4fd2c6fc33ce5c8df946e382e4d3741eb0dcc3422e8a2f36e2286ff062a6ee994f718c31f62fc75534c86ac65a0ab6b68c
 MISC metadata.xml 406 BLAKE2B ae1b1a2c28f45b4dd7f752125161396de88cf2ed3881f37f72dc7938cd2ea6485c995d0409c6fbaebeb7b1d4cf59736496549702d7a9d825a2ee5eb1e6a65fdf SHA512 33668115e05810055fa79f5d74c5d3b6eca5bb53e0108a257cb57bb496ebd0292c1dd3f5b33feee58c20c2c381a926c870f9576355171a91106c21fea41d6ab3
diff --git a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
deleted file mode 100644
index e62215763e85..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-plus/
-	https://pypi.org/project/pytest-plus/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/pytest-plus-0.5.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.5.0.ebuild
deleted file mode 100644
index f579173ce992..000000000000
--- a/dev-python/pytest-plus/pytest-plus-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PyTest Plus Plugin - extends pytest functionality"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-plus/
-	https://pypi.org/project/pytest-plus/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=dev-python/pytest-6.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild b/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild
index 0b918725bd74..d1c860842545 100644
--- a/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild
+++ b/dev-python/pytest-plus/pytest-plus-0.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/pytest-7.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index fa448a86b31e..b2f7032a6ced 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-qt-4.2.0.tar.gz 120749 BLAKE2B 1986bbf4ebc578ad548d2fcc8888b0d0fb42f75ad8a03f315f51c04ae466587d3299fca8ec3a49bc5d023fc8ca76cbe6c45728bc88609e20d6f68ea8c6ea204e SHA512 57e175bada0e33101eeb7d85579f6e804658d74168714b117b3a1ba564826405e70860b258caf28c917ddca7acd1842de2133a55b342862762fc37ca1a758b69
-EBUILD pytest-qt-4.2.0.ebuild 2047 BLAKE2B 4655996c3fbd5c0a8afde7c8b2658c7217e0464f29026d291c2690293d2e01762b62490e2f6a496d776bb3677d8db4b84942fcf06c8721f403251808a358972f SHA512 2bbef88799f425cee754e76a40fe7cf74d414e448c840922c2825edc0568a72c2967a5a5c4dfe27d25b837394abba09c589f33a6ca23457dbcd6d59353790f55
+EBUILD pytest-qt-4.2.0.ebuild 1964 BLAKE2B da1736ae878d459ba15c719c936f2f4d43e41dc395818054264609d617cf85cd8ec942129763c06039ccd369135833b8d7867d18109a0fdb1f8f25571ec0f5f6 SHA512 81021039d3291725476e1519ed4b1a68cec8744dda127a148d27c88b86c3418170c56522ee7c24fdea3cbb649bdf2236060574d53675f70af3901d4c7ad29abd
 MISC metadata.xml 516 BLAKE2B be5241e39f672681b27a003d02eca0e047644cad7da57de6b3393f58760c094c1661b9d168e44bea4efd56b38225d49abd5be6e71031a0d854b878716286d3ed SHA512 77981d63d3214fd2c052f8a7eac1a439899318973807299237a9105730893ce01d4423b060f532bd4f4496418683fc5128508c7d8747ba6ee6ed0eae67e5569f
diff --git a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
index 6c843c8a73e3..69e99e252e64 100644
--- a/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-4.2.0.ebuild
@@ -25,13 +25,13 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
-		' "${PYSIDE2_COMPAT[@]}")
-		amd64? (
+		|| (
 			dev-python/PyQt6[gui,testlib,widgets,${PYTHON_USEDEP}]
+			dev-python/PyQt5[gui,testlib,widgets,${PYTHON_USEDEP}]
 			dev-python/pyside6[gui,testlib,widgets,${PYTHON_USEDEP}]
+			$(python_gen_cond_dep '
+				dev-python/pyside2[gui,testlib,widgets,${PYTHON_USEDEP}]
+			' "${PYSIDE2_COMPAT[@]}")
 		)
 	)
 "
@@ -53,25 +53,23 @@ python_test() {
 		# to be possible inside Xvfb
 		"tests/test_basics.py::test_wait_window[waitActive-True]"
 
+		# TODO
+		tests/test_exceptions.py::test_exceptions_dont_leak
+
 		# we are forcing a specific module via envvar, effectively
 		# overriding the config
 		tests/test_basics.py::test_qt_api_ini_config
 		tests/test_basics.py::test_qt_api_ini_config_with_envvar
 	)
 
-	einfo "Testing with PyQt5"
-	PYTEST_QT_API="pyqt5" epytest || die
-	if use amd64; then
-		einfo "Testing with PyQt6"
-		PYTEST_QT_API="pyqt6" epytest || die
-	fi
-	# Pyside{2,6} is not compatible with python3.12
-	if has "${EPYTHON}" "${PYSIDE2_COMPAT[@]/_/.}"; then
-		einfo "Testing with PySide2"
-		PYTEST_QT_API="pyside2" epytest || die
-	fi
-	if use amd64 && has "${EPYTHON}" "${PYSIDE6_COMPAT[@]/_/.}"; then
-		einfo "Testing with PySide6"
-		PYTEST_QT_API="pyside6" epytest || die
-	fi
+	local -x PYTEST_QT_API
+	for PYTEST_QT_API in PyQt{5,6} pyside{2,6}; do
+		if has_version "dev-python/${PYTEST_QT_API}[gui,testlib,widgets,${PYTHON_USEDEP}]"
+		then
+			einfo "Testing with ${EPYTHON} and ${PYTEST_QT_API}"
+			nonfatal epytest ||
+				die -n "Tests failed with ${EPYTHON} and ${PYTEST_QT_API}" ||
+				return 1
+		fi
+	done
 }
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index 366e6f9fef11..477fbb20b312 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-skip-markers-1.4.1.gh.tar.gz 71828 BLAKE2B 2abd097c529a6db51f36de6f5ac705da981e87196da4ccf99895b24277e9d4d717c80ebcf6b8d72959b7f76a10f23c2be11608c390845cca215472d2d4e99326 SHA512 c54cd2cafbe29648cfeccc2dc25b245e2e1a226ca6eb9e1c77e6aeb705e06c4b67854dd81673955fb77e16d1128c247d92d38d19dbedbdf01924a95c01721f3c
 DIST pytest-skip-markers-1.5.0.gh.tar.gz 73142 BLAKE2B 26575a1a7880714b3af4fd7b02b5c5d56b99e0ad0947012823e6c917afe7ca134e930f2bf75b3504fe3fd1516d39e82acd7dae799255b30c370ae085d0cff402 SHA512 217fae64013a0d0f4b91d33a22576df9dece1bdda28beda0919e3638ed6cddcf24715971fb1da8e8c62df50510c969ce24716044d6aa05f8a0b4891082e83584
-EBUILD pytest-skip-markers-1.4.1.ebuild 1110 BLAKE2B 569d45515091b0cddaf64cf69994583044f1983581216a532d072d28c349d79ba7e23c26d7d2c986e753e7263eb6966487541dca605b9ca41b9faec44e4bad50 SHA512 fec00fc2afb791663729c6d941ce319682972a949d2cd28936a7a7a66cdd4f219fc2e3c08effdbad9458dfcfb596744c30d95611627d70bb1abcd66e0ff38024
-EBUILD pytest-skip-markers-1.5.0.ebuild 1112 BLAKE2B bd3861691492ef5ae66b890269871cd6ac1b87c4ccc35b86f9da5eecdec330be65b56d75ead0c66baf2ca3ccd31fd7294c68061cf4920f2a755e863c21c3d0e8 SHA512 8c277bcca05191c26a26678b14f2e6f8be775a408656bed169d29a658544f6694c0272008439d0341b318c53d54a7dcb72030565ca58731012a57c1639b81b3b
+EBUILD pytest-skip-markers-1.5.0.ebuild 1110 BLAKE2B ce277dcf6b326bd4017e0dbc657c2eaca6a5a2e174cdffeabaff91ab9cf4b17c3f1f4f6458508220a8039e29ab19b12bed1a25ca12449df4d0c0a7bcfebd0ae5 SHA512 d0926a8eec2ec07c48007945f19b9fa055deccc16ddb8785281fc4659f6f8a9d529211b7cf6c2450fea721b5dd2217d94fb5d0a414af848ee1f1b9159a0629af
 MISC metadata.xml 502 BLAKE2B 7bdc44ea13e9ebfa8d021af8a1dc4d83d391d4e5432ca0c953fef593861cea852b76817214ccf80a8bef9fd481641b1eaecccabe839c6378d84d198d172754da SHA512 439a3664c428abd1796d33f15c7791ceb33ba65428b7bde27a42c181bbfda099d7a8c28e723fceb9bc5caa094072c77d6b84831b152d50653f4ef3d4dd54e412
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.1.ebuild
deleted file mode 100644
index 84ed222db58a..000000000000
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-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="A Pytest plugin which implements a few useful skip markers"
-HOMEPAGE="
-	https://pytest-skip-markers.readthedocs.io/en/latest/
-	https://github.com/saltstack/pytest-skip-markers
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-skip-markers/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytestskipmarkers.plugin,pyfakefs.pytest_plugin
-	epytest
-}
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild
index 1ede21a80147..040a65631dc6 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 2aaf0c563122..c3b8d1cfd93a 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -2,5 +2,5 @@ DIST python-lsp-server-1.8.2.tar.gz 107104 BLAKE2B 8a525e25f94c97cef23e6e9fad4ef
 DIST python-lsp-server-1.9.0.tar.gz 111176 BLAKE2B 8143e7e294e820114d2752ef2a3afe3d0494aab7a3bbc785cf543585531bdb5e7df681f446f2db7d2c05271d06fad94e6850fa0eef244c6ed5d36efeb7606597 SHA512 052ee7b9cf042afc64df34592b4daa2fb4113d78fe538a72db0426618f13ce6a453173a343b62fefeefb47ffa5a026ae0e7d029d65a5a1b235f52dd4b44c6067
 EBUILD python-lsp-server-1.8.2-r1.ebuild 2977 BLAKE2B c25a6bf88a74c231b123688b7c27069797156549494028e4678f5c97aa29a33e983903b761422a28c8da787e34b9719734a33e440dd9c89c0fd29347893136c0 SHA512 a22b551a67f1a0e2edad4df80c6fd203817386fa7226f4aa9d1fe32e82bc9bd211aaa9af7fc53955ed1576f520dbaa50c5351906086850f1b7c104ccdae6f8d0
 EBUILD python-lsp-server-1.8.2.ebuild 3055 BLAKE2B e5c30c137f3ebc6d13e9ffbb55f8fe6a92a469ec89ddc8788a3952329332994d405044f29d9557cf10447eb4eddb17d90d471645bf28db7dacaca40a0e41da16 SHA512 20dda84a529abc5da3e1bfdc42baccecfd774ef62d2f939573a05c36ab5b3b49ce9edb420279525929fa7b944deb27455d9f4fac5bc1094e5022705b979666f9
-EBUILD python-lsp-server-1.9.0.ebuild 3437 BLAKE2B f1d12a510cadacfa6553836ae99e8635e72cf76857acfb98ea6e64f0d4610f4eaaf789d6d42b80e738926e1f99fb8cd5a7d31852fa43e6df8b7c9e8b5767c380 SHA512 9b4280421b435a9dae0e1c2b2ac162b2a0ea7fdd6c31db82538e1c414804e52ca216fcc2327599b3298227fcf1692a9ee1e5a96288abe2ce70c25af391c2e55c
+EBUILD python-lsp-server-1.9.0.ebuild 3324 BLAKE2B 3b2db8ec0945371faeb1a5e72c8c02e51964b00da659752f99f684cf9d4899a22e8a29d8bb04ffadb8608eb5e5708ab3fb69453d76e106d28b227712b1917358 SHA512 b2593cc55cf372ba913dca63fbc19ed318db406159942eb4a49c522a5030014497eb22242f1bbcdd1ba531ad863fcbc8cc8b7fb348291680988c8076995b4d80
 MISC metadata.xml 610 BLAKE2B e111007adc2612409df72955babe0c4725fd5726449435988cf13c1142049d78089d38e54783712e2c70c74437157ffb2049bd9d63322cec084204eb5038e724 SHA512 5e1e4b43a5bfacb6a2fcae57413ebf79c6aed917b00022140d855acd773d82e56b2d73ae8270d42675a34d9f37f9ad53c8f61930c3f447d8a9e45a521a20e9bb
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.9.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.9.0.ebuild
index 878ce3b4f5d0..8bc53bf67357 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.9.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.9.0.ebuild
@@ -31,11 +31,11 @@ RDEPEND="
 		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
 		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
 		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 			>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
 		' 'python*')
 	)
 "
@@ -44,18 +44,18 @@ BDEPEND="
 		>=dev-python/autopep8-1.6.0[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
 		>=dev-python/flake8-5.0.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-python/pycodestyle-2.9.0[${PYTHON_USEDEP}]
 		>=dev-python/pyflakes-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
 		>=dev-python/yapf-0.33.0[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
-			dev-python/matplotlib[${PYTHON_USEDEP}]
 			dev-python/pandas[${PYTHON_USEDEP}]
-			>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 			dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
 			>=dev-python/rope-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/whatthepatch-1.0.2[${PYTHON_USEDEP}]
 		' 'python*')
 	)
 "
@@ -86,10 +86,7 @@ python_test() {
 		EPYTEST_IGNORE+=(
 			test/plugins/test_autoimport.py
 			test/plugins/test_completion.py
-			test/plugins/test_pylint_lint.py
 			test/plugins/test_rope_rename.py
-			# whatthepatch required for yapf
-			test/plugins/test_yapf_format.py
 		)
 	fi
 
diff --git a/dev-python/pyyaml_env_tag/Manifest b/dev-python/pyyaml_env_tag/Manifest
index 1a1ee74ebd2d..8d5e142310bf 100644
--- a/dev-python/pyyaml_env_tag/Manifest
+++ b/dev-python/pyyaml_env_tag/Manifest
@@ -1,3 +1,3 @@
 DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
-EBUILD pyyaml_env_tag-0.1-r1.ebuild 495 BLAKE2B 0e5d5bbd37181eea6bee0ce96213f48d099adec4914a1f17e13db4a842f37111aa4e93389c37c73cd104402c41b32f3bb7699c145ac7bb36efac9abbfeba7dfc SHA512 da6f77a591f276d620f3e4f28b5d08f06ddd1085d264e9034b93a0687f0fdbc9076b4cc58d6d6be5c4460ce057f3dee037026e0351400bdd012176bd9dc297b8
+EBUILD pyyaml_env_tag-0.1-r1.ebuild 501 BLAKE2B be14f40a842d5636bdbf0c40652e586b4166f3f03f909f70125e5d198477f6e1e8a48ace1648a77f7a0daeb41110e8db27ae74ae18f9586fabdb07e9dbc66481 SHA512 003fa25b4374765b191e1981f79ffa9bbbe39a1b1f072d4764ae3bf53b294f54241f130c85b1b61b8ef4b4523c15186c139f155d6b380271c94d7ab133dd0e4d
 MISC metadata.xml 421 BLAKE2B 944e5cd6817404e00303896bf56c698f37fbf90843d454d087ab929657cbf26a66f287aed9649044bbbaf70e265b78ba8612daa18adc2136f6e4e5e209e3e6e7 SHA512 c2a508a66f08dc1fb6532ca60c49d2053500e592eccbe0d808f6107130fed73348edf9399f3e880dc8d5969f8a42b55492eec03cb4e85de009f62e5575e86b76
diff --git a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
index 3cc407016ba2..4141bd112c1e 100644
--- a/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
+++ b/dev-python/pyyaml_env_tag/pyyaml_env_tag-0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 330bffc44c83..0a9dd18c3a0f 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -3,7 +3,7 @@ AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fb
 DIST regex-2023.10.3.tar.gz 394659 BLAKE2B 2a842b307efb32c87087991312d09a03f0772729ba290222c9917073a6335c7d6cc76bc0d193352d9904ce655868d3415f75b93861de612fceeb8507080da1fb SHA512 c300f5c8218697362a15ec9bcbef60e510743ab098d8f2fcf1c8e9e39c19f848c60ae85def93780a1696a7ed864a69e704e045e995cd5bafb26bfec117a16609
 DIST regex-2023.6.3.tar.gz 392247 BLAKE2B c7735e19df80e919fd577723c54f6761698adf014dd4e936cda6a1ed745f26f083abd59ed2a772a70e16bec742f8d29a1e76a726b28e1395265c9941ff4e7b99 SHA512 092f316621a0237425a6e8124b289f4156256424b28cb36c590b8d89d731cfa363a97051199b16ede6520e12e99659497f230338a6f913587f578ededdedc408
 DIST regex-2023.8.8.tar.gz 392505 BLAKE2B 0d0f582e42c93ec4497f82ac69aaad6a69dd4bbb482bef6e06a51340a67b8d041ec554d878d8f0dcb57dce08b708fd87762ed8451f0221019f38d8188031711b SHA512 81a8421df5ab2db0eb4a5d1c434933d1513f634f32f57a48b32dede3bfddb379345baf7ecec0241338c0fc0f96463489ffa64c3214ee58a92ab5592cf9893bef
-EBUILD regex-2023.10.3.ebuild 877 BLAKE2B f259b1ff19e1438b06edd85ac67728f576c44396dea6d56f5b64eb1fd9765d7ef5cc7e40a4118b3cfd4910a05e77af9a1ff987f6aff65d00b3d2803d65b0eb99 SHA512 c8fc361f0017b6f74c6ba8d8b436bd6f6cd5b436764c3364f59593d6df7fde1be14115c7fa7ee52634ce88c1d59a6d16f9bb4b16d43b54373b3484fdfc9ec29b
+EBUILD regex-2023.10.3.ebuild 872 BLAKE2B 4eba518e3a04d258decc022d3cef38461d5a7ab8a8d92e10c417a1837fa5ff8b3ea5630dde325090a620d2273b68f717e96c7a3ef5ea7298b3b116712da6f22e SHA512 bda7bee01d43c6b45b9a6adfed477601458d5c3a185477c36b1fc7f4f1a0d7778ea8d74b2418ea87d801a86e382c89a1f8f62582c5eebd6d4a0b9a967f2a31de
 EBUILD regex-2023.6.3.ebuild 869 BLAKE2B d663ee6efdb0e594489f14b2582a31ee19fc0195ab38b9bdf129bad76002e9ca31d379c51ecaec40b5d159dca6f657d976b74fb988ac376b3ff42dba80f9bcb3 SHA512 63560ba290178a1cbf5db138b5d5ac47a92747973f5ae8f47d3767baf1d485b8c066e6bbe823f0cc38b088d5e80874d98d6098893570b0c4bccaf8bba26215eb
 EBUILD regex-2023.8.8.ebuild 870 BLAKE2B 55152e34c8be38601c250e1239e118292c6405a3601c2feafa9884a1213686b98a4fe69d37616bdbae735722653af0bb1274d2a571565c79c9cd8185643cb66b SHA512 b5ed36559b7eb7b0ea3ce17819d2f6b8c842e3aa23298db8af81e915ea9b8a52214cd617b3cce78908c7623ee9e6176fd1052043fa4c6bcb559d97cbcde6b834
 MISC metadata.xml 448 BLAKE2B ce92d069195d11c558d338d4f21cc9bb48e50f21a44aacee610f88283aeae0319b9a31b987fc1b6206832f7b251bb1f64b0d9bccd3eefd6c54953192911eb5e9 SHA512 a9b18af0c107005e8a9e0e7bc4e1dd44891faa9a5234365ddc39ecac2e3dc197c58b31087b4d97d94b48644be7c984d773e50ddb03063c6c95b1f94884483dfc
diff --git a/dev-python/regex/regex-2023.10.3.ebuild b/dev-python/regex/regex-2023.10.3.ebuild
index 69354dc06042..af264a22bbbd 100644
--- a/dev-python/regex/regex-2023.10.3.ebuild
+++ b/dev-python/regex/regex-2023.10.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/sphinx-lv2-theme/Manifest b/dev-python/sphinx-lv2-theme/Manifest
index 773d30093066..58ddafa8b360 100644
--- a/dev-python/sphinx-lv2-theme/Manifest
+++ b/dev-python/sphinx-lv2-theme/Manifest
@@ -1,5 +1,3 @@
 DIST sphinx_lv2_theme-1.4.2.tar.gz 14331 BLAKE2B 3d0e40af9a48c0595b1b99b87ca6fc35a557d0f7543609ab71deb277563c9c460ac6310179f0384510143fa4056bce1c1338e481f812393ffa82e063c14bc067 SHA512 51c9cca9cd28878496706a4716ec722b695257392ab09adfbfe70e3dadeb72c7620cdbb56562411e8b99d3af942cec63a346781512ead188c6b2d6eae3623336
-DIST sphinx_lv2_theme-v1.4.0.tar.bz2 10368 BLAKE2B c4ef7bb51965ebecb193d13b6d3866db6234bec8387c9e532550cafb14bf404711715f60831912770998e4cd9feb21a7d3ea1d8e987e276ec644ce51f63e6be6 SHA512 fba7af83bbc7e47a3a87e7b819cd83009b4b2e04e6280efe56b0f7bc348f784a85f004b7124a5c3704329be95a0432ca690f9675e6b9330ecf493994258ddc8c
-EBUILD sphinx-lv2-theme-1.4.0.ebuild 617 BLAKE2B 31ad39b3714d1f7abbde77e95f94878fa5efb727cb1faad22df202806081ceb65ba962015b0c213ce9a628c7f48c05c7165fe7e9860f98c7714cf62d1838fa34 SHA512 bcddfd7ad0ade1e1a1ea82586010cd4ef3fe3104e84edd922e1031b16ccef0b61a8105f93a7c47449f22b75827356aa60eefa40e057f7c6cc7004f2611270f47
-EBUILD sphinx-lv2-theme-1.4.2.ebuild 502 BLAKE2B dd842330baa79230c76f0cc2591f60d53987f33bb2f2e2d6984e04ae3c9774f99351ede08ccaf5c4a6de1f724cf5c74e7df9b747a02ff01ad29f7774c068ec74 SHA512 40772ba7b23aeed9739dc4a9fac8972305eed32d7e1955c138b9c1dc305a21029d05b95eac6b84e5281801a8df4ab47aeb63686959470ffb0e633a76adbbaa8b
+EBUILD sphinx-lv2-theme-1.4.2.ebuild 495 BLAKE2B 13ae8e0d54e20ccee4bf6568c77a40aaebd07132efcb844623fa7fd77a2d9c185248894d81fec5bd1d6e5471ea20a38df48fcd51066d6c303d7475366860fce5 SHA512 c9830c5c733b490a48d7e7369ef560467a3aac305f57033666993d7b5efe4096c8e02043052027c3227fcd8c27a914398af6aede4cc8a40487321a875e0abcc6
 MISC metadata.xml 429 BLAKE2B b4e7eb03faabacbb5a7b41f1b0b04ae1580f7a00959b0d0e575577cf0b93f1551773c492826c7635c6cfd18af0e608a23e7fceedb76ef99920c1f09fcd51ee17 SHA512 ac2b159c1a66cf08d5d4990150b0e930b40bfe8ab7f016e3b7d0d479110c0b8c402f33b46175dc31b56e6136a26fc84223e82fe5bdd87cf3de1a6b175254c62a
diff --git a/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.0.ebuild b/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.0.ebuild
deleted file mode 100644
index 786fa8d85e64..000000000000
--- a/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.0.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_{10..11} )
-
-inherit distutils-r1
-
-MY_P=${PN//-/_}-v${PV}
-DESCRIPTION="Minimal pure-CSS Sphinx theme using the LV2 plugin documentation style"
-HOMEPAGE="
-	https://gitlab.com/lv2/sphinx_lv2_theme/
-	https://pypi.org/project/sphinx-lv2-theme/
-"
-SRC_URI="https://gitlab.com/lv2/sphinx_lv2_theme/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.2.ebuild b/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.2.ebuild
index 5ddaa0365e87..c461f24ad8a0 100644
--- a/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.2.ebuild
+++ b/dev-python/sphinx-lv2-theme/sphinx-lv2-theme-1.4.2.ebuild
@@ -16,4 +16,4 @@ HOMEPAGE="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index b338bf6e89ad..2108965b78a4 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,5 +1,3 @@
-DIST sphinx-tabs-3.4.1.gh.tar.gz 524071 BLAKE2B 5aecb9c22a298c1347bf82cbbc16709f3f6cd38b0f0f6e4948411f1fdd79ba17d3e75178b8c092df7b8abc812dd4b0102879774708552a062aad0fe0b0653717 SHA512 b6079d3ae91479d40aaf35926226eb7dd783de7cec0e721cb13a036fc520bb3afda0dffb0669dc5054fc665125c3620261b1ea7ffe685d5b177bc980e3b4d7e4
 DIST sphinx-tabs-3.4.4.gh.tar.gz 524297 BLAKE2B 5361006ca99be157f01a7efd6ea50bbd87c1672caf0badbbde11ef832dddfd40232723fc5900a37fdb18112c5e4ddd9717829e96fd6e3afad8205c11c209d439 SHA512 365c472e88016e5c2d83a509d617ff13fc2c8c0a35fa9626244de9af2a242c2bbc4941241b3d1d863d261b15967a5694a0edb6c1d5614dce9d72531ea5138e03
-EBUILD sphinx-tabs-3.4.1-r1.ebuild 1154 BLAKE2B 625a16eefdee3171715602ec94bbcb4a2b9b8233ad5026a4156a71b2186bb9ccdd8c1c9dc1fd1b54a8aca48acc4ba47d92f4283b7b48da5fd08966a116fa9c0b SHA512 e3f85cffed8ad0416dc6c2136b2c1cbbc413d7ad5e8514531a00e9097c1b3b122ea242f4dcc9261c56ee81440d4c6789d80da574f203feb87ffac9f00d25acd8
-EBUILD sphinx-tabs-3.4.4.ebuild 1162 BLAKE2B ea9354de52dc5777625e55d3cdcb062fd3ce8e1450faf12e6fcd9f1b8e581559df713e46aaafa7f5aab730172cf1ad24617469517e053e38fe8a5290efd363f7 SHA512 c96d6519db7b917fdcffa1769ff45898df36ae483a2374d08c637914512274ce63e666b761aeef4864a70afaa707caecc9aba3a5299be89a470a8af87e4613f8
+EBUILD sphinx-tabs-3.4.4.ebuild 1154 BLAKE2B 625a16eefdee3171715602ec94bbcb4a2b9b8233ad5026a4156a71b2186bb9ccdd8c1c9dc1fd1b54a8aca48acc4ba47d92f4283b7b48da5fd08966a116fa9c0b SHA512 e3f85cffed8ad0416dc6c2136b2c1cbbc413d7ad5e8514531a00e9097c1b3b122ea242f4dcc9261c56ee81440d4c6789d80da574f203feb87ffac9f00d25acd8
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild
deleted file mode 100644
index 27ddebbe3002..000000000000
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,52 +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..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/sphinx-tabs/
-	https://pypi.org/project/sphinx-tabs/
-"
-SRC_URI="
-	https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-EPYTEST_DESELECT=(
-	# Unpackaged rinohtype
-	tests/test_build.py::test_rinohtype_pdf
-)
-
-src_prepare() {
-	# annoying, incorrect version limitations
-	sed -i -e '/install_requires/d' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.4.4.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.4.4.ebuild
index 6980b27acb71..27ddebbe3002 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.4.4.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.4.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 7e23dd4bd676..8bbdf255afcc 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,17 +1,5 @@
-DIST stripe-6.7.0.tar.gz 293207 BLAKE2B 5c07b6f04aa72045cccb4422b1f163cf6351f100d2245a4f93952d641ed8e4735c964b850179906bc7af13730724f596cd2cfa85c3d8fb8792f6a4e561337b0a SHA512 778c3ffa177e52b62bf4821b2f0aaa5eef01d8690526c42015d192bb06332a2a5fd143c8dab82497803adcfed963b7ccf06dc77908b21a7a7c77f9ef39b39c12
-DIST stripe-7.0.0.tar.gz 378521 BLAKE2B a53248162b44776f0c457064c3d2d99e7f6ec8561d1a88ee7bec655d20ff9dada3c92d7d764b3775950902a908f1d9d82c0002483cd168646f1cbde19640ca92 SHA512 154a772880522e5567907c3c9c6024f18ee1e81b4e192f30dbe8ea4b0fa3d1cf4b04d9de7ab9f0911e2a3d9c5f65207fd4d499b4e5ea3c606c738506d2eb15d5
-DIST stripe-7.1.0.tar.gz 737411 BLAKE2B 9db3d016e0a4180b377b9a7e4251f622ff62f2fd29e8fa6680941e4ce4b8585f675ab46eb46ba02b3f7e07679f048a3b6429a7ca0ebdb23ef41cd159111e6ca1 SHA512 240e0e0ba275e255e64d91036dc6489c60079d1ae031135b3fbb7f0db1aa12bf7251a303dfd56e1eac45bb0c667d76b64f4866b558ac3b78ccc0b9ebb8016bff
-DIST stripe-7.2.0.tar.gz 738081 BLAKE2B 9d46139f989b9c5d50989ab21bc4c4d2f825b1bbba08d23e1826646c30beb1e8f04385fda200921cb08f0af4146e64f26e0f880cd1ac1d83404b4c743f62b07d SHA512 93aa2762b41c0d2e277a50609c58c7e7f7aedc2c000bb6951d252279bd1568bd4a459769d631b0473f1d7b6f82f50adbf53781c5d9126124426ba7a287638860
-DIST stripe-7.3.0.tar.gz 745559 BLAKE2B 01bb0f1eda5cf844331d5883f7224c11bc7f90b0e179ba4df31bec88d35988031968209322022802e3c7cbad15314ab48ae185acd6485def5a2280cc391373cb SHA512 a80af0fd3e49819bef9d8796ef817b0d58105f7a91b160beb4ff7a30ea9aac1590d5ff05fca5334b9da1dd125a4500e5cb32afbe990a8d15463d913a967e78e5
 DIST stripe-7.4.0.tar.gz 743353 BLAKE2B 30246bf8c5c922fe1ab906757fef064d4f6eea6989825e1ddabc1ad3fad95cd486bcaa3be860045c29daa2f3c84f65a01e275c919da286d8f0d81cfa3aa512b8 SHA512 9e67fbfdd4fc65ad72a56bc841316e803eca031307a3ced4ba5773773a9920fd1d2e11cb7de6e6da4b2aae78611e198d999d85a5df65d3d7a43af195a47a84c7
-DIST stripe-7.5.0.tar.gz 735899 BLAKE2B e3b58f5e949cdea3f177cf87c82d15f1bd8a9fe3bbd8a07dd4f25d06e555d3e4f2cfd7f03d810ac80cefa70d5e4cbf77da6c3b77d091955530c9d18aedea7d34 SHA512 34d1a6e7cfc826c2f48321e07fed81fe8fdf19d4865f7bc657c81e170f55c8685331b550596b31fd20d69e130a9547539507fd22a772ac15a09d14492120e2f9
 DIST stripe-7.6.0.tar.gz 743504 BLAKE2B 32b82cd34241f00c259edc3e0d46d25337cd2490e6c3f4fb9d90d13e785f5e844fbaf66b224a7ae2ac7643d80b90eb36fde465ffdae058ded7741cb53dca5ec6 SHA512 5383ee5bc7e128840f9a1a738eca3bd6ce4a98df554243308d3b6fc667b519b996fc63d34c29abfc4f2f9082e8062aaf9aacdb3edb70e4ef2a6556228926daa2
-EBUILD stripe-6.7.0.ebuild 1911 BLAKE2B 0233bb23196ecd23022c85dbe304f83f84c9f992c558dca7c2fa3869acb82751644d1306dca3f2b27f6d4fe8cc625e22328e04bee232b21873c5ef4e963c9df6 SHA512 17b5ed9d8d5f8748165703cdcac110a40eb0505304d6649d56d57316148e0097983afc6d15170195b0c1e86348b6437696e1773a2132e9ca14dc6b3dcd04ee72
-EBUILD stripe-7.0.0.ebuild 1913 BLAKE2B 5a4402b2ab462b8e692b5a6f3857a19c465f5c34b95786c9279549f5d03ba054c70e33e986fbda77fb45a881a9dfa4076095ffb88cfe47dbfda802df7a2422e9 SHA512 d4c0e62f3a101c2fe2db9ddbdaab2f00f6052db2690e4d8c893b166296bfa1efc0e8afe5f125816d37eead4bbab183c602e48821710287b411c4d6df81d35eb2
-EBUILD stripe-7.1.0.ebuild 1913 BLAKE2B 464bdd3dd7c56b058f5fff69e34ccfeb556dfa6c23c1ada2cbd4324ddca2bda140430108f2aad5f422d08bad7ad64eb830ed2463fb8578646d77054e56b194bc SHA512 77266f6919d8c05d990c340399fcced2790cd7333ad7b3416b9865443ea01c21a27b0511178df663c407ba4cee9cbb90ffae280a8bcf5e10f6fd299495a7f3f0
-EBUILD stripe-7.2.0.ebuild 1971 BLAKE2B 7019276c3f64a5af2d989876c39a9ecc8f07ff1ca53779e1f50560d2b461ccfab26ddedea25cc9523ee2fe936f4407cdd70d57c0e4b184ce22409879fd4a10bd SHA512 c6e5a764c1ba1a5f1afa19c276b2373dac6e0e8a9997bd0fdad501ac7c3d8f84acec29449c7d2ba5d994c6b98d158c93c003df42cf5fc351c64fbb81256595bb
-EBUILD stripe-7.3.0.ebuild 1971 BLAKE2B 7019276c3f64a5af2d989876c39a9ecc8f07ff1ca53779e1f50560d2b461ccfab26ddedea25cc9523ee2fe936f4407cdd70d57c0e4b184ce22409879fd4a10bd SHA512 c6e5a764c1ba1a5f1afa19c276b2373dac6e0e8a9997bd0fdad501ac7c3d8f84acec29449c7d2ba5d994c6b98d158c93c003df42cf5fc351c64fbb81256595bb
-EBUILD stripe-7.4.0.ebuild 1971 BLAKE2B 7019276c3f64a5af2d989876c39a9ecc8f07ff1ca53779e1f50560d2b461ccfab26ddedea25cc9523ee2fe936f4407cdd70d57c0e4b184ce22409879fd4a10bd SHA512 c6e5a764c1ba1a5f1afa19c276b2373dac6e0e8a9997bd0fdad501ac7c3d8f84acec29449c7d2ba5d994c6b98d158c93c003df42cf5fc351c64fbb81256595bb
-EBUILD stripe-7.5.0.ebuild 1971 BLAKE2B 7019276c3f64a5af2d989876c39a9ecc8f07ff1ca53779e1f50560d2b461ccfab26ddedea25cc9523ee2fe936f4407cdd70d57c0e4b184ce22409879fd4a10bd SHA512 c6e5a764c1ba1a5f1afa19c276b2373dac6e0e8a9997bd0fdad501ac7c3d8f84acec29449c7d2ba5d994c6b98d158c93c003df42cf5fc351c64fbb81256595bb
+EBUILD stripe-7.4.0.ebuild 1969 BLAKE2B 2051889d37342fcde47305b9055be88780e30ca41e504d6c4e1c67302706f8663fbb448b442b0b6fff77a4aff8047a904860d2dd4d7689bf76ebe2071997e659 SHA512 3ba3363d9b44c66cf9ebec472b76885da3e4d7b55a6227e6d54e7dc564fe5b5702d3884fb860bbcdcdfee1f11f427c1ca21480b7ebcf7d79d09d0adb1f3d8e83
 EBUILD stripe-7.6.0.ebuild 1971 BLAKE2B 056b8b2d55e45eebeabf54dbea24628182827c3855c30978967d62a9bf01f8937817adce80832e0ce726272f5619fec820eabf05cd026b88cd2965e6235e5d7c SHA512 f81d9660867672877c150dafe4158293f1fd390fe6f8d1e57ff60293f20ec47cc3fc4911f7ea9ab73d126c3724ce2df1c9f9fee93479a5e71de55a50f37004a2
 MISC metadata.xml 372 BLAKE2B e6a38fdec6fc016068e7a0522ba15e83bf358ba1475e54a9630b1e86c75bc14b790c59716317bd81438a1c770e4d31afbe04400ddcd5dd272715c251fd6cb1a2 SHA512 2d9672b242f2d38654f7906097e597dfbdf75afa3583ea331f61772db95d19a802e83ed523c67a6cf3da18411036055c0996fd04d99199618d5205be8a61bd77
diff --git a/dev-python/stripe/stripe-6.7.0.ebuild b/dev-python/stripe/stripe-6.7.0.ebuild
deleted file mode 100644
index 2e5302990e91..000000000000
--- a/dev-python/stripe/stripe-6.7.0.ebuild
+++ /dev/null
@@ -1,72 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.175.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-7.0.0.ebuild b/dev-python/stripe/stripe-7.0.0.ebuild
deleted file mode 100644
index f91c6f71034b..000000000000
--- a/dev-python/stripe/stripe-7.0.0.ebuild
+++ /dev/null
@@ -1,72 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.177.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-7.1.0.ebuild b/dev-python/stripe/stripe-7.1.0.ebuild
deleted file mode 100644
index 110df1be151a..000000000000
--- a/dev-python/stripe/stripe-7.1.0.ebuild
+++ /dev/null
@@ -1,72 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.177.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-7.2.0.ebuild b/dev-python/stripe/stripe-7.2.0.ebuild
deleted file mode 100644
index 1b1e683365bd..000000000000
--- a/dev-python/stripe/stripe-7.2.0.ebuild
+++ /dev/null
@@ -1,73 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.177.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-7.3.0.ebuild b/dev-python/stripe/stripe-7.3.0.ebuild
deleted file mode 100644
index 1b1e683365bd..000000000000
--- a/dev-python/stripe/stripe-7.3.0.ebuild
+++ /dev/null
@@ -1,73 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.177.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-7.4.0.ebuild b/dev-python/stripe/stripe-7.4.0.ebuild
index 1b1e683365bd..c84c34600830 100644
--- a/dev-python/stripe/stripe-7.4.0.ebuild
+++ b/dev-python/stripe/stripe-7.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/stripe-7.5.0.ebuild b/dev-python/stripe/stripe-7.5.0.ebuild
deleted file mode 100644
index 1b1e683365bd..000000000000
--- a/dev-python/stripe/stripe-7.5.0.ebuild
+++ /dev/null
@@ -1,73 +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..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.177.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index bc3dec8e9c08..0f6273e567c2 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,8 +1,6 @@
 AUX tavern-2.6.0-py312.patch 1704 BLAKE2B 9973ce4194c392e705be5bab9aa4b4919a5ce36855b9a51d5988eaf78fdee3b27fbf891cfd01135ef7bdc50dee91b6e6cccb308ee5687db04548d7d7a0eca033 SHA512 a0efcb2187ad760d59c67b9af8c00f3a7d6b74bc94fc1eeae132345ef90c6ac1b6404b766e8d912ca2f0ffc395e0dfaf6f14f190f761149a221c51ae71b53bd4
-DIST tavern-2.3.0.gh.tar.gz 211676 BLAKE2B 80506d846036c7a68bf27c30e734a92983eadaff07e68a101e120a6284be750bc195817f1686cdaabe8dfe906720e5b41d22098db8f91e911438a60a2cbdd5db SHA512 2c1292cd047195b6e2059514f517b29caebeac3af370b298938cbbc8b5bc861dd818c3e45e25a65fa1acbbae96f36aa2d024edcee49b0086d459f3d41d4052ed
 DIST tavern-2.5.0.gh.tar.gz 217343 BLAKE2B bcb9d7f753b14351cd98e12e9d392f9effa716651f8686d053dc72080a2b738b02f78665f2bb07012b4c6ec7b39a661dfdc74a0272c036718cc13e2d731b4cee SHA512 9d957f815b57ba01d9707c1a3e8f715f062194efd0b24d82ebb99aec4bb83965e31a6538f3ff7748d3acd52b32cd38a097a4d36fe71faf1703dbf70ff0454111
 DIST tavern-2.6.0.gh.tar.gz 217509 BLAKE2B 99d9990757930a45a86a914fcf656b63266266869542cbd9b59850c7d648f54993ad5f409f12d09fbb12383c7586ecaeed323b04b478d62c7331cf514faa970a SHA512 1165dcc41244259d2ef7f69370dd35a40a9411b2a5c05e5dae45fc413d88478cd49aa540175a4a65dcf7dcd0eb2ee06b4f97059eb5d69ed5684893a8d5e8fcdc
-EBUILD tavern-2.3.0.ebuild 1239 BLAKE2B 942e4e8999d4bcb14ed13e64372bbc71421664b761ae75c5d6483fd7656ebb9b4bce7a5d1b99d899980c3d846cc9d7882fa0ccfa8e4c64662688c4e35b824995 SHA512 df36c2cadd47f54b615ee2fd68d9c0ab287915ffb77498c8250eabc511e5860248b1bbe49c94d525e8d885ccde7691eaead88584cffcea5042a89e647e8f9743
-EBUILD tavern-2.5.0.ebuild 1248 BLAKE2B bc8dc7bb5516fe88b6dcf98a9289fcb8850ae3c98f6ca4c3cbacc162048e576f81b6a1f81fcd5e93671aeead7314cedf374492a3d4ce722aeff790637504e9a8 SHA512 0d6fcfcb8bff0a0643486271beb8abdb6183f71b8fdfe0d675f5d6c5f3c76e2e8caf0e4b769c5c8e35f98d8c04d73aba3c1df5fa3ace62235a0a94c01edffa8f
+EBUILD tavern-2.5.0.ebuild 1247 BLAKE2B 4d9b544bbe330f6311d8e6595d1f364bca980f7c38ccc2f8ceebbed051f6f9627f9975a4fc5ce2714d58543b8cec6f81a9ce219e041447548c60b8ed21260de3 SHA512 e739bd4c2f3140659b6aac81b68d47147f4ee1d3a5d6cab6afc656780c09301b021cc1104202b94e9082d3cfaccf6cf1be1bbbcca7472b3f8706129db45d32d5
 EBUILD tavern-2.6.0.ebuild 1345 BLAKE2B 35f495f9d310019357080a49837d811746623d62f08f6b2b86f69bbd3635017a0ebbbc335d96c1f0c51bc9645afa71f76cdd6c3fc104014bd808c48ed5ddff18 SHA512 b52d5fc9c473e180412a8301626f3d2ba21010d8237b1ad35f5ca48d6578c46e40e54d7872344bdc99f709bc63a941f702640e9a26a3e167a571ec2080cd0311
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/tavern-2.3.0.ebuild b/dev-python/tavern/tavern-2.3.0.ebuild
deleted file mode 100644
index 2ac7d0f579a0..000000000000
--- a/dev-python/tavern/tavern-2.3.0.ebuild
+++ /dev/null
@@ -1,54 +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_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="
-	https://github.com/taverntesting/tavern/
-	https://pypi.org/project/tavern/
-"
-SRC_URI="
-	https://github.com/taverntesting/tavern/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# strip unnecessary pins, upstream doesn't update them a lot
-	sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p tavern
-}
diff --git a/dev-python/tavern/tavern-2.5.0.ebuild b/dev-python/tavern/tavern-2.5.0.ebuild
index d50400d0e77a..542043b22397 100644
--- a/dev-python/tavern/tavern-2.5.0.ebuild
+++ b/dev-python/tavern/tavern-2.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/jmespath[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 1de8e21aa60f..9eaa36f9f381 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,3 @@
-DIST testfixtures-7.2.0.tar.gz 133487 BLAKE2B f5c4ff354d1e2b06a28a947fffe8622e51ed680a29ed6fa3ff5e7e851c21e39ed432d6dc0f5f8c83c6541b0054ca3b2afce960f4a00e1e70619a29f29e03b5ae SHA512 b1b5fdd45509e60db8590ec454659efa42c87f75de9187286d820b5643388f83919ccf3763ec223018a5a5b48821041494982af2016c41e11fe30cabdb909223
 DIST testfixtures-7.2.2.tar.gz 133809 BLAKE2B 6a3701bb9c5ca476aadc144f1013268f87e10dd47a6f757e8a0aaa3feb33e1a06663a38f0789b7c54cf439b07562dfb638bd9b89efdc36831d04977f6035ecc8 SHA512 4f7a5ed659b650080deac0b1caff6d2dff0b71d23eaeb26b48b7daa4df85dc0a1f6cfef98275c9a90289eb893c0a06311c849b84f2cc35447fb766f4d0d41c89
-EBUILD testfixtures-7.2.0.ebuild 1556 BLAKE2B 024e2b3e202ada793fd4c74d6d061b3585f6d1ce0df6a9975b3700cb01d4e3779242f43408ee9e1fc0c878829c1edbc14a5b15cc5c2ca9b0e85ff1e64e41f3fb SHA512 92c1195c1d21431fb306073e28258fb164feef0d3387fbd407e3eba3b012d821ec1683e16ecadf5d632422289af76ebc6c904333fa697c8d65988e5805428432
-EBUILD testfixtures-7.2.2.ebuild 1559 BLAKE2B 14941bbd03340eb309b0fe7f1a0a55a7671eb393c79e5fee0959ba5d3bffa2cc4ccbd077943f454e65366e4594cb6753d086bb5b40d98cc4da2e4e40d23a8a7f SHA512 2b46a1d9c7c05a43cf19e9d19c539e20450a066c51397b2c2a1b28f876b129ac5909a729750b334377374b4f066c513307d70ade2bd4022614dd4ae3763df2a0
+EBUILD testfixtures-7.2.2.ebuild 1556 BLAKE2B 024e2b3e202ada793fd4c74d6d061b3585f6d1ce0df6a9975b3700cb01d4e3779242f43408ee9e1fc0c878829c1edbc14a5b15cc5c2ca9b0e85ff1e64e41f3fb SHA512 92c1195c1d21431fb306073e28258fb164feef0d3387fbd407e3eba3b012d821ec1683e16ecadf5d632422289af76ebc6c904333fa697c8d65988e5805428432
 MISC metadata.xml 416 BLAKE2B 19f5d275458874364d2719ecf363f7a5627f9e612b7d3a3f2c075e306063ed899dec0b2e59ea5e5d7ba65209c9a6d91045d80b2fe50e74278e61247d0426b940 SHA512 8a5776feee4d6758da67dc0b413e2d0ddc0c843075ca96c9b44adace1f7669a6abf820c5b73b86652b27e9feed19a4a30e1004a021b24bda0829b5690a1687ec
diff --git a/dev-python/testfixtures/testfixtures-7.2.0.ebuild b/dev-python/testfixtures/testfixtures-7.2.0.ebuild
deleted file mode 100644
index 30bd34356b19..000000000000
--- a/dev-python/testfixtures/testfixtures-7.2.0.ebuild
+++ /dev/null
@@ -1,59 +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..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="
-	https://pypi.org/project/testfixtures/
-	https://github.com/Simplistix/testfixtures/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# https://github.com/simplistix/testfixtures/issues/183
-				docs/comparing.txt::line:790,column:1
-				docs/comparing.txt::line:829,column:1
-				testfixtures/tests/test_tempdirectory.py::TempDirectoryTests::test_as_path_relative_sequence
-				testfixtures/tests/test_tempdirectory.py::TempDirectoryTests::test_as_path_relative_string
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-7.2.2.ebuild b/dev-python/testfixtures/testfixtures-7.2.2.ebuild
index b5276e04b446..30bd34356b19 100644
--- a/dev-python/testfixtures/testfixtures-7.2.2.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index c31424d7477a..90b81bfd793f 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,3 +1,3 @@
 DIST types-psutil-5.9.5.17.tar.gz 14260 BLAKE2B e9addb084e29e2944c07d2003a97ddc879a42ab3687d478a4b55893687360565904f803615de227f48579ad117d47c9f98abeeb6ed6da281b4619776fa40ed45 SHA512 c9a39da945262756c0c75168bc9b67b220096b88dabc13327801b5b572bb571c3c791ff2bd280243195acbc9818552ad3aafddad1813956a5ffef45084aebaaa
-EBUILD types-psutil-5.9.5.17.ebuild 437 BLAKE2B 81232252e35cbe3bdb10a01b7247be148a8ce356ea15c280cf3a5c8f62eaca7895b7c0d0e9fc94d76303c5cb9f967f58212570db105019d536d1195a8a49de5a SHA512 f97414b12c974c30669b8492a76bf4095569006cf817c527cdb548d072584ac9c28b73718cc41f2fd77764aafd49971ba850f3de3192475117710b90227ae5f8
+EBUILD types-psutil-5.9.5.17.ebuild 434 BLAKE2B d640d4782780239f2927d3b9673d0adc75dcbbd70ed3566344d30842c7ca07208afb80cc5b6358bfbe6667fea5bd51bc9a71852f648d9db5bd6cde89a87603bb SHA512 f8db3685e7f5ac8cb07a6d19792cdceb1fe194635b6b3982ad1b223e872d2886907e453e063eca3fb636d42248b5d7b48c85ce2cc254d5c42a51e559b4f9f12a
 MISC metadata.xml 395 BLAKE2B 58c240c13cad1e6840bfeab26f48efbe07b75fb432da70652802e95b7cace7013f72d6d8f4c17ea15620abde8cd9940a8f74842e72dd5a7831d552c614c37f18 SHA512 58f9782008175a716f07a26e3b24a10904d942cc8dad7bad13cba697da5c6701cc3a6b06823a303f73485d6abb78c245ed2599e8b015c146ba35fb2722191143
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.17.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.17.ebuild
index d66060a22afd..f2cecd1df420 100644
--- a/dev-python/types-psutil/types-psutil-5.9.5.17.ebuild
+++ b/dev-python/types-psutil/types-psutil-5.9.5.17.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index cf264268e8fd..17ed404a2d56 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,3 +1,3 @@
 DIST types-setuptools-68.2.0.1.tar.gz 33293 BLAKE2B f492a35c4282f95a1fe01854edfa10a8ceec1307d29042197ba079354488aa2cc8a8770f876b02ddcb6d568e9e94f9f995d4f1a444da313354d6c4ad2974f860 SHA512 1a1efa6bb5759c82bbcb514816ece34ec133c1b4540ddb80e2155b02dfa05175fb3aacc836e72d9f0416b9f523c3efa3e3282569b5dcfa597cfab75f1ff5a490
-EBUILD types-setuptools-68.2.0.1.ebuild 445 BLAKE2B f6816f9477614250e39cc88e9a041e52a6dde21cd358d82361511bbb483b2107182cf608bf043479f29a7446679729ed26b61c0ed803288ba5b20f215c7fff3a SHA512 ff60a237995755c1faa20957afdb6039d67294b3e15584a4e676476b6b603828cf9cf70422bc22cc54ae81f982fe2bc97d73100f11b561fb3b6b6b55efe65495
+EBUILD types-setuptools-68.2.0.1.ebuild 442 BLAKE2B 366ad6a663c31af2a9b5842eab4c77d8f5eed82117c3d541a5dd44533c179fc1dd70b4122d065d126b994ac6f0f68aa9f6fb081e2cd42b0d802882734d0b856c SHA512 deee5b9158767d3142dfb4c769bace7924837763b866ab6d50c7a6aeead550af061ba3c9101cf412fcac0359cffe84c039ec386c2a9c4f344f16c137988e1a5a
 MISC metadata.xml 399 BLAKE2B 6e130dc38e0e0e0e6e02567d750d37c6f28ea40c4742a9247f347f29e1700fc420015e7ff951f4a11c156c2df88d7e3b7f03be7759d05872a7783a2d25e35b1e SHA512 bbc9cb552e652e7644d4d635cfd74fdfffcf6426160025411843d53d37b02fdd65f7e1fb435fee7b628033cef517e3f5a902466b5786b842592ccfad068edc15
diff --git a/dev-python/types-setuptools/types-setuptools-68.2.0.1.ebuild b/dev-python/types-setuptools/types-setuptools-68.2.0.1.ebuild
index 53d800a10ce2..2479df0637c7 100644
--- a/dev-python/types-setuptools/types-setuptools-68.2.0.1.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-68.2.0.1.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index 1d2ca90e663c..340d97733a5f 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,5 +1,3 @@
-DIST tzlocal-5.1.gh.tar.gz 25413 BLAKE2B e4ed9c3161d049e9e00176d3ebf9a30db0f65b8c5141498d3a5d4df9e9bb299e6a307e462884640cbdaa781a3a5c07bc453e36d0eb772da0e22bbf6e474de187 SHA512 692d7ac8d04cdc3da43d75fbbd99b329b1436ef6b41540604bd65f667ac5f20219dc769d0379f41eb8723521e2ad4d2b9f399326f3d1a41b9f63c0db4341eb0d
 DIST tzlocal-5.2.gh.tar.gz 25734 BLAKE2B a2f1084e9128bc66ff861bd953a7c7a1c69e29d1e411f9489b9ff13cbadac75f42c126ddd3b66e8426e41d6376d3f9646192dc4bb5ed421b602b85bd8f109233 SHA512 21e25ef6756cb11277027dc388f779f68b1c5e03c1e7dced81fdebe0d3656c81c363a1c2f3a98344f34325bc9533d995c5a006ab7b34ff2907442a6994024d4e
-EBUILD tzlocal-5.1.ebuild 712 BLAKE2B 77f6d957dfac4627f56fe63b3d24e97781f0d28b214ca84b1e2f5c85a2bf126238f76b0353e3c060b652cc66b78df11d7aae9bfb4dcd8d2bbd32d8a5a1af071c SHA512 d3a2ac2e9c542551f27c2843d20425bc9517073bab423a1c41d3f7705c1b2e8fd052843146369927159e2a962b816207d2eb9b87b453c0b7bae9cf7b18b3c0ab
-EBUILD tzlocal-5.2.ebuild 715 BLAKE2B 76ff85c7c4f9242ba28e6fde6b27434fd21cc53dba240df8f4db5136a704e1e3b13d46e77264f8c84c6310d15d9e6330e4221c0ba8840ebc20238e653b302fac SHA512 a0bb35eab4dca7f7a1cda4a664204f5b1d8f001b1c022923cee836ceed6e5108277cf954a3c5cff33034fd43039919a49c87376e8501ed2b4046a2b7bb801e06
+EBUILD tzlocal-5.2.ebuild 712 BLAKE2B 77f6d957dfac4627f56fe63b3d24e97781f0d28b214ca84b1e2f5c85a2bf126238f76b0353e3c060b652cc66b78df11d7aae9bfb4dcd8d2bbd32d8a5a1af071c SHA512 d3a2ac2e9c542551f27c2843d20425bc9517073bab423a1c41d3f7705c1b2e8fd052843146369927159e2a962b816207d2eb9b87b453c0b7bae9cf7b18b3c0ab
 MISC metadata.xml 403 BLAKE2B c2fbd81151ee69075c53b7c7d353ac2eb207e92b5bee234591f839c751c54e20abfeb10a8ef1c7cf074d5b94c4745dd23ca1e935b41619dfdc551d2fbb955ac5 SHA512 73c29b14ace10a0b23ef59f9a10abf5f9367dfecc89743cd29a01ece71689c08f83a14612fd3a4779fcbe5382e4e33f6ffbae183c498cba8ba7776d2afbea8ab
diff --git a/dev-python/tzlocal/tzlocal-5.1.ebuild b/dev-python/tzlocal/tzlocal-5.1.ebuild
deleted file mode 100644
index abfb93d6d81f..000000000000
--- a/dev-python/tzlocal/tzlocal-5.1.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
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="tzinfo object for the local timezone"
-HOMEPAGE="
-	https://github.com/regebro/tzlocal/
-	https://pypi.org/project/tzlocal/
-"
-# symlinks aren't correctly preserved in sdist, as of 5.0.1
-SRC_URI="
-	https://github.com/regebro/tzlocal/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/tzlocal-5.2.ebuild b/dev-python/tzlocal/tzlocal-5.2.ebuild
index 19aa8b81c205..abfb93d6d81f 100644
--- a/dev-python/tzlocal/tzlocal-5.2.ebuild
+++ b/dev-python/tzlocal/tzlocal-5.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index cf5a05990d13..cdbdd093c103 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,11 +1,7 @@
-DIST urllib3-1.26.17.tar.gz 305031 BLAKE2B 616b183168a78737988428efa52516586b66cab067d6a257af544c67922156e1e769fbbdd65c8f1ba606f02faa5918e4bafe8c1b27105b8e3f5fe644260d093d SHA512 f26c54def8564981f241a94c915c660d26a52d5437a1e1f4b8ebb6d6cd9de834a31b5816306c2cf2cadc2af00a1633bee97c8bbefa5a45b8e732f7566b4c0327
 DIST urllib3-1.26.18.tar.gz 305687 BLAKE2B f2f673761a8d80eee715a8726ba36ab6b09800fd4a4f03f27438553c36072e2abb5ff26cff71dcf30fd114f4d28c4ad9907533965b83c8a0581d3d4661904b70 SHA512 c89e93a032bf6b11375c06ef7c5abc1868f93e7655cfdca09e9bd939ad415d206ea159fe151ecd2e5f725e0e18a831c7a5382ad01dbc32264154fc8af7aec156
-DIST urllib3-2.0.6.tar.gz 281846 BLAKE2B 3af632a77f07d5c686e6412b06d67df5c62517239431ead7d0c7e7bbb5efe06c298db0afda1a84fb314f3e3936edd16aef693ac316a923f67232abf8789b6201 SHA512 872a5899ad4486b45fe7a327f029beb5f7d3dd8447b58b861922b32bd15f1cff68d12136f262c2d2d3740047976bc6cff16a54590c1eab19949149e7dae2956a
 DIST urllib3-2.0.7.tar.gz 282546 BLAKE2B d4fbb9e1d0b6d1f3c3d71efc3fc479c7b1c49f87ca849c387701fb0c8b4124082de6d83d958c8b2afc225a84b80e7665df857e7b0918ba50e4ad1431f8facc4d SHA512 ca21dd330cfc7f53e6f00a92be1df1d24acbe61b6ca31c52a272dccd6f50d1bb797eece9132860adc84c21a9bebc3030a12816081451fcb8384c11a6cd2d1e8b
 DIST urllib3-2.1.0.tar.gz 263900 BLAKE2B 9e0438a11b7178c5004c1253179bb6bfcb1fa8711db47084377bb14c5834f7b88b04a5560b99bf6fff5f1f4622d4b1998d19dd517ab6b7453fd53c832ee7fefa SHA512 33d6eafd9b6ecd97ee2dca8a4f1612a6fcc584961bcfd3a0a188f557a73f4c1576f98dc525c3b2feecb2d676f4bf4364aafeef093d6686e4b3ef2043726561a8
-EBUILD urllib3-1.26.17.ebuild 2193 BLAKE2B 724c27ff2cd776ada5c8ddb43aab29e8a1a6c7b1a4b984a7b5c8050aa8036e908dc45c8a012fd83d3fe9a5a819578249b73b60d0cb573a47d133396813ecf96a SHA512 575c8e31fcacbe8542ac3067ae878ef0995cc4176d845e287edffc7223a8725af3940bba4b54f77d4f5a9125568076e45415176bdd4a2d470f8b7389129e68ec
-EBUILD urllib3-1.26.18.ebuild 2320 BLAKE2B 58fb1494ba7fd15909e3f863f3226acd37743e3581080e05ac76c56050787b883965f04a7ab7c4e5dd17146ae6c80cbed82ea7cb1048688b7c5b133609e62af4 SHA512 6b935d8813b3e29aab92fdb3ec3b76a54c980770030de937e5b78fbdc8002d578246e994f2f47b3b9929c27a373da836441faf65fa234d203d41acc1dd2ef69c
-EBUILD urllib3-2.0.6.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
-EBUILD urllib3-2.0.7.ebuild 3305 BLAKE2B 799af269c4b33717e99e465d947a256ae81160fb2a6c5dada46e0a450287a73474c9e682f1370454f17559af825c6e21244959530da70625035830e1404cf070 SHA512 1af95b47010b03acaa9343db5719ed97656a045955849702dd6442ba9a6792ac3ebfd7beb63563e50367ed6b5fd89b976efbaf56f779593a9beaacd82a74d696
-EBUILD urllib3-2.1.0.ebuild 3305 BLAKE2B 799af269c4b33717e99e465d947a256ae81160fb2a6c5dada46e0a450287a73474c9e682f1370454f17559af825c6e21244959530da70625035830e1404cf070 SHA512 1af95b47010b03acaa9343db5719ed97656a045955849702dd6442ba9a6792ac3ebfd7beb63563e50367ed6b5fd89b976efbaf56f779593a9beaacd82a74d696
+EBUILD urllib3-1.26.18.ebuild 2312 BLAKE2B 9c1155aa93102ea0b118b2980142c07b9bb98b08ebb779861ecf182ffcedd542bb816e1f9a1976cdd09760ad2d0c931bc1d4fe8050ab2a93d9ded82ba0b4966d SHA512 9c4d385c148f5ba5e1a2f0792e1059aece3aff14baf2236edeee36e31fc6f83ff7b6401b6100d3d3f35ad631eb2bbbe4eec95e31dfb0948e2a4833c38c234a73
+EBUILD urllib3-2.0.7.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
+EBUILD urllib3-2.1.0.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
 MISC metadata.xml 449 BLAKE2B 45df5a0e80d7b229058be52fd8feb3ba2efe8d981b5b34216e4b9cb35d332588c4b3efade8e8d06bdf1f13159dfcd937458e5cf4d0cea5e07b6c1011cc8592cb SHA512 312b41031a9cbf6341f537fef94137420ca49ab609e7d4c325a998e328be415b381aa50e7b5600483d1a7583b72675a044b5dd80cb84a52539ab23271f1b096c
diff --git a/dev-python/urllib3/urllib3-1.26.17.ebuild b/dev-python/urllib3/urllib3-1.26.17.ebuild
deleted file mode 100644
index 5f91d38b5e3c..000000000000
--- a/dev-python/urllib3/urllib3-1.26.17.ebuild
+++ /dev/null
@@ -1,76 +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_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# unbundle urllib3
-	rm src/urllib3/packages/six.py || die
-	find -name '*.py' -exec sed -i \
-		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
-		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
-		{} + || die
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# unstable (relies on warning count)
-		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
-	)
-	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
-		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
-	)
-
-	epytest
-}
diff --git a/dev-python/urllib3/urllib3-1.26.18.ebuild b/dev-python/urllib3/urllib3-1.26.18.ebuild
index 8d3723a28ac8..151ef0e7ae0c 100644
--- a/dev-python/urllib3/urllib3-1.26.18.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.18.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-2.0.6.ebuild b/dev-python/urllib3/urllib3-2.0.6.ebuild
deleted file mode 100644
index e5dc381b44ca..000000000000
--- a/dev-python/urllib3/urllib3-2.0.6.ebuild
+++ /dev/null
@@ -1,87 +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=hatchling
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="brotli test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# take forever
-		test/contrib/test_pyopenssl.py::TestSocketSSL::test_requesting_large_resources_via_ssl
-		test/with_dummyserver/test_socketlevel.py::TestSSL::test_requesting_large_resources_via_ssl
-		# stupid test, next bump please verify if they fixed it
-		test/test_poolmanager.py::TestPoolManager::test_deprecated_no_scheme
-		# fails with newer secure SSL configuration, which removes TLS 1.1
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/contrib/test_pyopenssl.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1::test_verify_none_and_good_fingerprint
-		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_1::test_verify_none_and_good_fingerprint
-		# TODO: timeouts
-		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-		# warnings, sigh
-		test/with_dummyserver/test_connectionpool.py::TestConnectionPool::test_request_chunked_is_deprecated
-	)
-
-	# plugins make tests slower, and more fragile
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# some tests are very fragile to timing
-	epytest -p rerunfailures --reruns=10 --reruns-delay=2 \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/urllib3/urllib3-2.0.7.ebuild b/dev-python/urllib3/urllib3-2.0.7.ebuild
index 32852e31e793..e5dc381b44ca 100644
--- a/dev-python/urllib3/urllib3-2.0.7.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-2.1.0.ebuild b/dev-python/urllib3/urllib3-2.1.0.ebuild
index 32852e31e793..e5dc381b44ca 100644
--- a/dev-python/urllib3/urllib3-2.1.0.ebuild
+++ b/dev-python/urllib3/urllib3-2.1.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="brotli test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index 4a1f647217da..9ad83949645b 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -2,5 +2,5 @@ AUX urwid-2.1.2-fix-py3.11.patch 924 BLAKE2B a0c8452f4a025a9ed4f94b746f4c487c7c9
 DIST urwid-2.1.2.tar.gz 634621 BLAKE2B ce274820c27708fd0b10f22359923316576b895f6888c9b174b42dedcd551353b6c3ba797c68d61a082ecf23b8f0108a58454bdb44806e33b74d9e6e5bd28537 SHA512 f102bdde5f5d39d4bce455020bbe4f18290589da0750a3b15b1e2bc8acf8a405f02295d7efa3009877801a36bfbfade92ec963086122e9b133db137d816a1ea5
 DIST urwid-2.2.3.tar.gz 677723 BLAKE2B 4aeae29e557e0ecbe902b56865feef3b2978263e657f2159194d8334852627ac6ccee82730d6a7e24b8914e5548ca88ac00eeddd7c2a34299d135843a99008fb SHA512 48588d0c819b229bdaaa70bec3a279c3bf232b8520d95e1f45a83bea927244634e91fd47cc161647c2d8155e523543549bc5ed2ccb5eac29843e12515e5dfd22
 EBUILD urwid-2.1.2-r1.ebuild 1272 BLAKE2B ff35eb7c30f726c298f3d0fd63a13246525609db18ea256ad6c8d394742d112cdd066b03387a2ac1177b903f04f8bbf93ab8328b028c1b7396946a55423fd5b9 SHA512 08d628d5ac1ca27da368c1ab883309daf07c36267ce06b57bb873cdf3be8aa0ff487de78ce2040d5860968a317b2e2e58ac101e87066174fd6791f24b68745c5
-EBUILD urwid-2.2.3.ebuild 822 BLAKE2B 8e3fd8ca2dae9ebac601cdef2713048ebb9fb8350d6e667afcdb812f767136d6a361760d0c4643e7a873feeae4114575d012d08f1ed1738411b1c80f1dd1bfb2 SHA512 8dbdbd3a07ccd7e1109979ee4cc17f0e833dddf62c41e9efa7e88dc7797345043765918f66761918d8e8c43a4e013367f72fd656297c389ec12aada78cb6df1d
+EBUILD urwid-2.2.3.ebuild 818 BLAKE2B 7ee52b3e3e0a4f1c92c833d44e9814101dbfcf2637d1936e41f9ac0d3503f0dc9acc51480fcc8049814e72e100b0a28c1696a5be5046fe2c89e30e72ff032994 SHA512 8c6522cd73ced0cf13f44704e5632f25116847c3b32c7e5942478928f9fd0b83e886cd42e5e16d9ad7653fb6d4b16cedbd3eba7f7652c297cf1884aaa1b3d0df
 MISC metadata.xml 1194 BLAKE2B 387c1e6ca71806f706b054e11755e885c7bbe11e6be1b639a6160e0b2c51df91feef025f6166a973a38e8ad16fe7627ba6f2b5e293c007da8a1e32e46db1541d SHA512 ee6bb39746fdfe3ebcc83304cb9d7c7cce16f4caca284bd82907fd13672bdcf982f1fbfba22b0877da8de9f6cdadc4045916eff678095320745eab954960ab6f
diff --git a/dev-python/urwid/urwid-2.2.3.ebuild b/dev-python/urwid/urwid-2.2.3.ebuild
index ddf92bfdf600..100133845ac0 100644
--- a/dev-python/urwid/urwid-2.2.3.ebuild
+++ b/dev-python/urwid/urwid-2.2.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests unittest
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index c567393d6093..a8d1c5b751c9 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -2,5 +2,5 @@ DIST websockets-11.0.3-python3.12.patch.xz 4328 BLAKE2B 6ef94255ef5d95de8015eca1
 DIST websockets-11.0.3.gh.tar.gz 347652 BLAKE2B b7d796744cb4c7b944e98644dfb9c0e44ba465a6dba71b9e891604f3012b025557dbcd5b7eeae02e71c84350e05b334f99404ddfda814a8984b7a893d3f092f7 SHA512 37a84d7c57da7a3e48870abf992ba96ee454b342610d51c06f7dfc7ee082b7fb51304518c208379c3dbd039eafb1a85444c257fed20b4605a52dc8fc938a4cca
 DIST websockets-12.0.gh.tar.gz 352120 BLAKE2B cab704e0ee44a7012ee58d515a5ea7380a97a3cbb8f55d105c00c8c2b9ed992b4c87435875474de32e5969fd92256bdec830db0571399a1d2e5fb719b23c2d83 SHA512 f17943d444ce275b709cf89453b2d2cce09f5af26f0460e226c2e24cfbb425c825963352e130dcd4201587606355375b525d8e5a02eccbffbb3985a108a3ed5e
 EBUILD websockets-11.0.3-r2.ebuild 1486 BLAKE2B ea9991ebd3c46ee6d057a44d8596c75a74879ce1f661cf9ce1d05e975be2ec451cd897d31da5266a518b9cf333013c3f61d2e23a20341812a4c1959217e9ccc3 SHA512 ae6aca3c8a3b1ca538250ea1257c7723eb9650bbf81de0cb9cbdcf3727fe9086130ea0c598d1826eb478d9c6dbf8c41d94069a3162e4a886477f9ce064d1fb0e
-EBUILD websockets-12.0.ebuild 1434 BLAKE2B 5c6cb842e6b333f31b4c65d661a38b69e08146cd843f51343ca4e590a487d962d577c8c2c50ce4cbd6dd99d9cbbdc759e29b3c0aa1a0a55b1c753287f1f71e13 SHA512 b8a6104ece0a37e865cdb6453c10421d3d5dc1dacb07bae1f11744e7766c395efb8c1ece330b734e6024a69d4e24dc500bf332316c3c3079dae7bc991d3260a1
+EBUILD websockets-12.0.ebuild 1430 BLAKE2B 40ed2f18f3f5ff889db6374eecce66c7efeb83bf53db7b393f958926cc7b9f9249ad5a73f1d85296af67a4f6cf49f99584c63c9982c75c115808b9a59f6a9b98 SHA512 f039fd52a87f5e46f7e38bc36c8025d59a1ebb0e7fdd6830dd76a13ec5854540eb5cef5ba70211c09f088c8cd10f41982babee15935cf3f4a7fdbdea5ea850db
 MISC metadata.xml 580 BLAKE2B 66a318a73b2a9e37f44a28dfc9ed5f1aa7193edb05fa295bde27fd7a1c429cae1d875289ac5bd8ff7b579be2cfc5671d27dfb46ba959c47b2c1074e8e549e9c3 SHA512 c4ba79e5ec539ffb6f0338e6e161132dc8dd0e6c7e7533df1c32731810126b728076703a542bb28abc159842ad71bd42e69e36f4fe17dc3377d054d21ec53dbf
diff --git a/dev-python/websockets/websockets-12.0.ebuild b/dev-python/websockets/websockets-12.0.ebuild
index d6c08f6e7319..9753a7d16bf3 100644
--- a/dev-python/websockets/websockets-12.0.ebuild
+++ b/dev-python/websockets/websockets-12.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/whatthepatch/Manifest b/dev-python/whatthepatch/Manifest
index d9bc32c240f8..018554d7a932 100644
--- a/dev-python/whatthepatch/Manifest
+++ b/dev-python/whatthepatch/Manifest
@@ -1,3 +1,3 @@
 DIST whatthepatch-1.0.5.tar.gz 31850 BLAKE2B dfded6069aa70051fb5f399c9f4707969be4dfc1dee853cd8eb7f36e074c2b595eddbae3efd534321dbbcce7a6658ef9e9bc7675ef466e0a486d930d62761e1e SHA512 d87a36a608a15bcf6d28d26afee40161e26f17fa3b011056388f9850896577f913a91066de8b6071ea15b28fa05f8d00acb997b18483ea56218df4efb40109ab
-EBUILD whatthepatch-1.0.5.ebuild 449 BLAKE2B d0c8050dde209156e51277b44aa9fa212b29125e6c50ba2fb2eb67bd6c07ce56e40b09ffb1f2773504d9eb7a88902d43369ffc09251f774f027117c3e5b62bce SHA512 3aac7a316b8a452f375cb1f195a6cdffefd4887276f2b29d1cc8d9737fe5cab81350ce4a6c2acca9ce74ba5c2e0be0cce2eff6904bf3e890b9ff5c1797c781d4
+EBUILD whatthepatch-1.0.5.ebuild 455 BLAKE2B 73e13ddfc9bc838dabcf3ad3b7f8de1266e346ee7583ac022fc8e22f665fb0799af08f6044943f966785111b20ab5cb65fbf47b1ecd6017c98ca48d78fe5c47b SHA512 c26003dbf1e62aae2a3a5a6faa8b9e69aa34c4eb86dc846952c461d71bab4670c9a79b975b6e56386e41c67b73c1791825cfafd1f9c6c8fb6f096d5cded72ea1
 MISC metadata.xml 401 BLAKE2B ee370b7f08a16ea4054d5192831a530a9bceac969b2832d6fe058e98dd7558498afbebf4c1f2102979b2f3c252de73c5b11aafcdfed7044a5218144def4f333a SHA512 2a5c7944923e59032c3e75a0a08339ab4b273a346ef855a8ff61c45cc52ecc847db314b0e733876e6d14c3ca42418d9573a26d7f47213958f44a47c6dcbb6c48
diff --git a/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild b/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild
index 35137b89d47c..73c6adc2344d 100644
--- a/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild
+++ b/dev-python/whatthepatch/whatthepatch-1.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 37a18ae4b8af..761857812c4e 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,7 +2,7 @@ DIST xarray-2023.10.1.tar.gz 3796343 BLAKE2B 8c4bcccf977bf22dcb7495a35b507b113cf
 DIST xarray-2023.11.0.tar.gz 3800529 BLAKE2B 45b54588e3178c5104f40741cf2a3cb6403a0ab199ad1b24a6b2da9cb19649184ba4ca516d54002753ba62c7df6e80dde3b25c68cd63d65dd076b412219de3bc SHA512 fe84884b9147683d61d68233c703d07617f61638d84e28f94c9b9f1fdddf942c563af20a15c6d765b0ff169fe0985d74d7cb4d35d42c3988f62263e55e3e9071
 DIST xarray-2023.9.0.tar.gz 3776743 BLAKE2B 38433f7898db2b53f31db134b110fea743ea5886c33f8f8390b85cda18c1a1d7d178681e4e442ecc39f2f19ae4b761f94b38ccab27e8e20c3463f4364f1222dd SHA512 d6c1e6ff438415766dedada5841413b9c7514dc2b1bf71a4adb17df4d78b68f5f22cded09c20511e4e2e85ac3284c447fc13191397b7ae77d1294d7867e3ac3f
 EBUILD xarray-2023.10.1-r1.ebuild 3396 BLAKE2B dde22ebb0e1d2b2ec9b0d4cc0423e36e201660d5d854f133df05feaa8842162e3373c4e5710719bef7b0ad1d3be55712504a41869665cf189f547505d57981e6 SHA512 6862761b7c01904fadba146c585059791809ea0951cf9d462a7d512c1670763b74c617486e2e14d713696909cfd41756c91574ab476fa6778b29d3735b4194ed
-EBUILD xarray-2023.10.1.ebuild 2161 BLAKE2B 678f1511363c270bac10f3205c5296417e348c856f2fe813be2b6f62475d804f0b10e32737075d8c5c791b7229907d7e84dbd23a2872a008fd293f4db2287917 SHA512 407a9740240bb506474405e3487cac8c78a70d159bf0ad89840e87ec3db66a886099b930c9cdabc343301b832e9e638f958bdff6c53c97b7d515ddb32be3227b
+EBUILD xarray-2023.10.1.ebuild 2158 BLAKE2B fbe78754f9016c368199d35904774440c1d2b4ab2acab503ce00714631353de0e4defcb2d083943ae2400f04f8e2cf62be5d7d822114eafa34a31d612e86b712 SHA512 9b743474f5bb9c828fc1b95b4556b19fce76e07abcb6f326b7f35a8e65c087f05e4bde047907646e32203c1a1ce5358b308d0bf76e7569fe624c59ec44946989
 EBUILD xarray-2023.11.0.ebuild 3304 BLAKE2B 414113f1d09862c428cd733322902c478d0629e61b9f2e1dc3cab4fb10b21fa9f95e17ad9312ed6c1128a01f66ae2ad45ddfe32d6b9dfa17214cd9088656db80 SHA512 d67daeb9720942b647f79bf131bc558f4764451c5a26ad78430c3c61c0d8a656a39f722fabb00adecbb0971dba16a994b0bc9abae4bf8b98e9d7531dc1a835ae
 EBUILD xarray-2023.9.0.ebuild 2156 BLAKE2B a383efc4e5cb2c95f9b29afd0da35c2542f60d0445b974a707215cecfdfa1032536cf62f5b52d40cfe6ed3cc35de2ccdce3357c2c86c682902eb56043f2009b5 SHA512 75bf7fde06b2ac525ddc5b4ac61a2a1314fb7ae4ea240632635d3d519a39695738df5bb3123dd3b8c06150bbfc9327191d6c9a02a215d15c244adce458c0a3a1
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2023.10.1.ebuild b/dev-python/xarray/xarray-2023.10.1.ebuild
index 927a172c75ba..80a90f9e3afa 100644
--- a/dev-python/xarray/xarray-2023.10.1.ebuild
+++ b/dev-python/xarray/xarray-2023.10.1.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/yarl/Manifest b/dev-python/yarl/Manifest
index fce0ede4053a..6b6845ef88ec 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,5 @@
 DIST yarl-1.9.2.tar.gz 184673 BLAKE2B bb94131059d0cfaf88f04d62a44181245ebcb660cb44904f0b7e8d497905a16d0026aeff454b8179fab5342c6bf9c8d6aadade0d9f7c70321c71bbcc3998e9a3 SHA512 ffbb6df94220bb1561333f1ad69a70334328e2273ec5e91c2741f6fd5ca2f6dd38d5b5f617728797fce490accc2394a406a5f9b5b665af4746746229af0d7c5f
 DIST yarl-1.9.3.tar.gz 135606 BLAKE2B f73b41227c08c791442c4c96ec961bcdbc8078f72082a842b6537a28b212c8612d700f2245e8c431008b652afd59a08be36137e92ebb15f1ea2c733bfc00dd4f SHA512 44dcc51c0b01eda024d9e6a236b95999a6be5989958362060b6b21c3d98fcb862824f7ec1897ac8c164ad2cb9362a2df4d40dcc980f57eaeefb0eddfc19b4741
 EBUILD yarl-1.9.2.ebuild 1341 BLAKE2B 92bab115f3719bcd29a8b21ccaec6fc24247d4bfd0189de7e8cb234ac23198012311d97290bd579b32515a258959ceffed71ba0b22182bca568fdbbeed4eb142 SHA512 0518ba27b67a1d72b0557c978017ff6a4db5e3506851a1b4fc6906cbba954804701ce6f26feaf69ac90fc45c3d928117ee84bba546047ea23908ce2cc5eaa1a2
-EBUILD yarl-1.9.3.ebuild 760 BLAKE2B 669f3ab20cfd23fd91da2e576861b0a8c15455f6c95899be0d7abeabf26f7b7a0cd2a38cd1b790093f2bd92b41320059f2f112ccb71944ffe72f26a0e7fab54b SHA512 7abcdf1720b0e57afb41e6ced2142f662c10d0204d0243b906e2f7a779158f040ae6b72fb1ef8af15871ee67a5d3ad60d0d49d6e35a5f794b516937912a1ad77
+EBUILD yarl-1.9.3.ebuild 765 BLAKE2B baedc22c3cc3b4d18eaefa8f4d0641703b2d6776bd2e462ce599e6dc4ef1382c333180de4dabaadb49ca7842c210711aba4654a5cac8b8ed7f6663ee2465c1c3 SHA512 07235f60045b75d343b53255b86fd29f8f0e33dd986b11819fa3da49cc8ae2c84e8678acd81cc772baf8197214642f0bfe82b4474bda1d14b34d2d5112c1e250
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.9.3.ebuild b/dev-python/yarl/yarl-1.9.3.ebuild
index 958ea8d2610f..4b01d7f0af67 100644
--- a/dev-python/yarl/yarl-1.9.3.ebuild
+++ b/dev-python/yarl/yarl-1.9.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@koprulu.sector>	2023-11-22 17:18:34 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-11-22 17:18:34 +0000
commit	fd87b7c771378b2116981e3924bee5805148e118 (patch)
tree	91ed28393c7b534787d3c073e269fe598d0fd535 /dev-python
parent	77b74be093bdf4a0ed4121acc3f8e229103cf004 (diff)