gentoo auto-resync : 17:11:2024 - 03:03:09

181 files changed, 628 insertions, 3164 deletions

diff --git a/dev-python/Faker/Faker-30.6.0.ebuild b/dev-python/Faker/Faker-30.6.0.ebuild
deleted file mode 100644
index afe89145d589..000000000000
--- a/dev-python/Faker/Faker-30.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-# note: tests are flaky with xdist
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-30.8.2.ebuild b/dev-python/Faker/Faker-30.8.2.ebuild
index f552cda2d4a8..afe89145d589 100644
--- a/dev-python/Faker/Faker-30.8.2.ebuild
+++ b/dev-python/Faker/Faker-30.8.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 27fb99a831ad..b487458920f4 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,7 +1,5 @@
-DIST faker-30.6.0.tar.gz 1806340 BLAKE2B e39a41aa46a45d9431908c0c76371fd51d23bcbb110bba8a8d015e150b7a4c5b767c5eca59846de659637af4f182377152b4ed49c1f68c971aee884df819e011 SHA512 e313d128ee8ebc724d63e0f3f42d16b5b8875e499449b67c0ce8b7ffc1613397c675da9f2933833ef112c6ebb669a51140183714015e9fcc3e02dbc097bfd8f6
 DIST faker-30.8.2.tar.gz 1808329 BLAKE2B a9788fdf875bf57e76de33478cf6ebb81a6cc94b9261f5226ea9a797e2d8332a0c9035896b03e86f741b630312872c10678b34dee11d92eea00b9b37d719944f SHA512 4db0352155b724890986c5b1ae59783fed7cd6a0aca289f6df2065c028cd0b9e03560faee60f2b75455e51c212819bc85ddf10c13351e774424fce6f553636be
 DIST faker-33.0.0.tar.gz 1850076 BLAKE2B 3a1dc9fff3a45af023cc14c7cc89b8db93faba2de9e4f03a6d04b0bdc37d8271d1e0a7aa4347c5327c80ca95dc490f6fd86e1ab4c0ebee6644505e980d2c7f63 SHA512 8c74093f91121cf8beb63a6b59a99c783be21c58f2788fe83dfb670b16a334f358ca13e65aa734c0ea2c0e6fac863e37116c1ff456eb2b96fe079d4f53059150
-EBUILD Faker-30.6.0.ebuild 993 BLAKE2B 3bff54cc40b7ab7d4f7da0625ded6efe488d0f33d134ec255f438ae28b99923b2772eaa067fc6ede33a119ced01044455a8930ce5b7f4f03aa1edd893590723a SHA512 29630619e51608a6bc42bef10b69aced0611ee39722307649bbd99b8c87b7fbd7977d248f19d6fc735a879e4b893268fea943c47c4afc11383ebf1826f7d67e3
-EBUILD Faker-30.8.2.ebuild 1000 BLAKE2B 910b6c3d4b14ded04e82086e398bddff73202f984bb76ff01f8c99ab255840abc8ba94f0914fc0d7076c0d901ad63364afc03b438884a7b911c957ebf611774d SHA512 f4f4c7f35f518342a00afda816f30a81a9d9b9c1977f45bb2f2e32b698dbbbdb0eacdf5bfe846755d273299410f508e4bb7a898ececf4b2b16ecf2a53fb1c4dc
+EBUILD Faker-30.8.2.ebuild 993 BLAKE2B 3bff54cc40b7ab7d4f7da0625ded6efe488d0f33d134ec255f438ae28b99923b2772eaa067fc6ede33a119ced01044455a8930ce5b7f4f03aa1edd893590723a SHA512 29630619e51608a6bc42bef10b69aced0611ee39722307649bbd99b8c87b7fbd7977d248f19d6fc735a879e4b893268fea943c47c4afc11383ebf1826f7d67e3
 EBUILD Faker-33.0.0.ebuild 1000 BLAKE2B 910b6c3d4b14ded04e82086e398bddff73202f984bb76ff01f8c99ab255840abc8ba94f0914fc0d7076c0d901ad63364afc03b438884a7b911c957ebf611774d SHA512 f4f4c7f35f518342a00afda816f30a81a9d9b9c1977f45bb2f2e32b698dbbbdb0eacdf5bfe846755d273299410f508e4bb7a898ececf4b2b16ecf2a53fb1c4dc
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild b/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild
deleted file mode 100644
index e3e12fecabf3..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.26.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=scikit-build-core
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/rapidfuzz/Levenshtein/
-"
-SRC_URI="
-	https://github.com/rapidfuzz/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	<dev-cpp/rapidfuzz-cpp-4
-	>=dev-cpp/rapidfuzz-cpp-3.0.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/rapidfuzz-3.9.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/cython-3.0.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Levenshtein-0.26.1.ebuild b/dev-python/Levenshtein/Levenshtein-0.26.1.ebuild
index 20b556469ade..e3e12fecabf3 100644
--- a/dev-python/Levenshtein/Levenshtein-0.26.1.ebuild
+++ b/dev-python/Levenshtein/Levenshtein-0.26.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	<dev-cpp/rapidfuzz-cpp-4
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index 6dcfbc43e950..3b560ec5c9f0 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,5 +1,3 @@
-DIST Levenshtein-0.26.0.gh.tar.gz 38404 BLAKE2B c78a53ba9d5c10968f000264cd20e9d5bc155135765088d4cb7f3f937c6cb5c30f01c09c977e9c8a50d4d0bafab0ad89848102d6f28c57cd471b5901f652d175 SHA512 cf48aa9e81a90c6a9a4cc7033f5035dc89f45db9c7e35929c4b11e2b9af180a018d455a56b8c1f5c748db263401155950e1985a195613a5bb914050f5d68e998
 DIST Levenshtein-0.26.1.gh.tar.gz 38429 BLAKE2B d217bf620f5ebe68a50230f7ce91f292f0a9cd9781b29a9e328e1e788d2d2f2ee71362a1ab660794f6adfa7e7267d9bc3685e9460754354226a6b964affd0ade SHA512 589b1f404108f488caf880063f20ee9c6a2033b0a2cd819352bf15e285ea8537c1dc8117de70679f720fd3da47546f7e0e5c620e4da8cf09bf8df9b119e6abc9
-EBUILD Levenshtein-0.26.0.ebuild 1010 BLAKE2B 07f46a03d767277056a9bc6f8234788d9bad880fd928c30ee12dfa0d59cb046c1ae927ec3deeef50a5c06b585549da29f54ee8894857a55516efb1e1d3a8897e SHA512 df0b5d93d7e4ff16482f374e25e656ca0946533204125332ebf63a0719334c6e56790816a17494db2f91c186348f97040f84b33dcb49c06a65f40c5fdd2338cb
-EBUILD Levenshtein-0.26.1.ebuild 1017 BLAKE2B 223aeccfb9a9a3297a1fcffbf7e226678d16d0e2ed3547ad320be5f413fd9d1e5cf8445d63dea507591527dd5c53a05c50924c4a689dc71352371443edcea332 SHA512 b3da37caee02843fd47928fb066ced113a7dc291e368db5d4e80f7a7108d3dcfdc8a069001a3bfbb7b492fab7d2a0b5cb0f965877c9b7086ad4c840a353f2404
+EBUILD Levenshtein-0.26.1.ebuild 1010 BLAKE2B 07f46a03d767277056a9bc6f8234788d9bad880fd928c30ee12dfa0d59cb046c1ae927ec3deeef50a5c06b585549da29f54ee8894857a55516efb1e1d3a8897e SHA512 df0b5d93d7e4ff16482f374e25e656ca0946533204125332ebf63a0719334c6e56790816a17494db2f91c186348f97040f84b33dcb49c06a65f40c5fdd2338cb
 MISC metadata.xml 376 BLAKE2B def9cd056f31bd8ef5f0903f302a00ed361fef19a7df2494fc0ebb34f61c098e50288d98d30a292b0614ae2930082bf919fc37612cdc1bef9f5c5d07cdc080d3 SHA512 4b4766b2894b28a2d199a4d98d4accffe4a5197b41b08443d7d57d9363f96ae42400dd717e516aded73197233d779f5cbdf58670244ef162ebf4177f47cffa4c
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a36f25fe8aef..4e9f745c2ecb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aioresponses/Manifest b/dev-python/aioresponses/Manifest
index 86188087f50c..460901c33b3a 100644
--- a/dev-python/aioresponses/Manifest
+++ b/dev-python/aioresponses/Manifest
@@ -1,3 +1,5 @@
 DIST aioresponses-0.7.6.tar.gz 35846 BLAKE2B f5cb820ee410e1203526ac6731c73f02993684679d788c8e3db830189d9874991b6fabf2e0738d14d3e54e2fa2b44af788f054137590ffea78df49056389673b SHA512 d02fa848a5d6588e32c203591f842cb212aae60d5e060a3fa13993bbb575922e516f04d47f9428c5f4b8103bc9990aa45cdde3c17bd2c47d8eff714f93976450
+DIST aioresponses-0.7.7.tar.gz 39087 BLAKE2B 4692e088ec1c0a0f5e4f65a1269eb845ea6892ce41cc772cab9d0bb3795767b9ef776045d699e05f0816acdc795521318ce2ddd17ea8d436e89e9aae5e29436c SHA512 36fc45bc33d011d24fdbc437ea2adbba63eadec67d7198fe1e645d1dc0e7596104d5bf61ac1fe40b1d64f21cbe707e80775d26aa3762f87ad0a440ebabaa3a47
 EBUILD aioresponses-0.7.6.ebuild 915 BLAKE2B 4477156fb85e438338be23c2423474ad78fbac5d323d22fc4306ddec6b24445261f92e1d49248e6119688affcb365a02927c4e07dfd5bbc2d976eb903461dc05 SHA512 5f8fc2531b63612c2c607d8f701880f468dd1ae0532d1e7a59832a339ac8c9f27fabd1345c054c661b1bd70bb25d5fbb45e49cc07dd73e33a820382266bcf69a
+EBUILD aioresponses-0.7.7.ebuild 1009 BLAKE2B 715ac00a67b35f4731d82e1bf6cd10ebd17143b792fb2eacdc60daeeba6a957a4303cee201f0aafb550ff90bc98deea9abfca49de4a58849f279c7567697486e SHA512 82c4bbaa970dde3f54d80d60d7614eadbf6d7d833aaea8b6665b3e55896479f478218e363079bdcd36fffb02ed0c14719eb0c6644365870c0da52e8c270f9378
 MISC metadata.xml 474 BLAKE2B 1768a360fe74d971bd194fdccc0b562c416b70f9992b513167cc6a0944c0d9e7b806029ac55f70998f6bdeffbe0113d1901664c4ded69d23b8664da5b1deda8e SHA512 b133e74d89b308b68387e069544fb24ac2b2f0aa2287c38c48e05c07fa7ec04639b5339930562078b17febd9895b1af46df59c9be323a2de8d7597f35eb24d7d
diff --git a/dev-python/aioresponses/aioresponses-0.7.7.ebuild b/dev-python/aioresponses/aioresponses-0.7.7.ebuild
new file mode 100644
index 000000000000..ce93c1aa00f3
--- /dev/null
+++ b/dev-python/aioresponses/aioresponses-0.7.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Helper to mock/fake web requests in Python's aiohttp package"
+HOMEPAGE="
+	https://github.com/pnuckowski/aioresponses/
+	https://pypi.org/project/aioresponses/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aiohttp-3.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ddt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# These tests require Internet access
+	tests/test_aioresponses.py::AIOResponsesTestCase::test_address_as_instance_of_url_combined_with_pass_through
+	tests/test_aioresponses.py::AIOResponsesTestCase::test_pass_through_with_origin_params
+	tests/test_aioresponses.py::AIOResponseRedirectTest::test_pass_through_unmatched_requests
+)
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 782ebcc2d681..97fbca391961 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,6 +1,4 @@
 AUX bleach-6.0.0-py39.patch 1527 BLAKE2B 07bfabe99b5185398d85a5320f88286363562db4afd129186322efe66881f76f0517726a19d0df627064d9e011ee3e2e621c145e183eb179f148ec0c9b6b9309 SHA512 a6d0ccdda4425e1700d8113ee4d60bae48568b78279e303ecc051f803ac3aa693eb18ada5ce6dc224262f4a614972d793e400f4b1b585a18a29c11d4d402abd8
-DIST bleach-6.1.0.tar.gz 202119 BLAKE2B d2da448feabe61431b176092f713f6f85790c22d3869a8d94f5c9659e481fd4a0b8e230eb72687e4da8914956a8858a2a5f942169ae2324d7762c5e1f20cc0ef SHA512 d7c9e77decd5eb0aceb4b33ad7e213683354aa702508f332dd6be15a14010d3795c2115acbae964cbaeff3e74c15d35eb18268d8fd8286e2cd6ad1c0dc79a838
 DIST bleach-6.2.0.tar.gz 203083 BLAKE2B bd570cc330d02ce1340f326b480827d6a4f522975562b7e78edd1505ec78bdeba6e9233819fc1703a0ad009b23975032fabbaa8c4c5242fa91a94a4f2de93ff3 SHA512 2a5059076756bfe528221bd719a00b1221ae9e07644b53232b268e078ab0d37fb25f6fdd292d39bcc711dcbe771a21dad6549ec1b27dc7d7de6852f85228c48c
-EBUILD bleach-6.1.0.ebuild 1276 BLAKE2B 68e97da36937dfa267a97b960a9a4b46a83a554c2cd05c8712786047938aabf33b783196269895f3f0c8fc5057f678a79ed234d8eed6cfe4857a4b598561cddb SHA512 e706da4b70ef6ec733c0a2bf8ec0c392cdc87d48b970de02f6c6b1a82a5cba0ae12a7cfa503a4779e618f24dbf4ad61483e15800727c831092d46d278f5143c4
-EBUILD bleach-6.2.0.ebuild 1302 BLAKE2B 7f2382a628a5ed5a98a6c0026c9d58db9f7f2ac31b72deb2a82afc9aff7feb648f65d6af3fe35d86d3db8d70ce1ec03858fa18791a4457767e5e2eb84ac27214 SHA512 3ebd6f36e540c5aeba5d2c3c429fa5b5f7ce37a4d7b7b31d5a909b689b1376673382b324ed1670f6d8452b75687d34cfa497b4cb0cabe245ef7d42cbdc16669a
+EBUILD bleach-6.2.0.ebuild 1294 BLAKE2B 862b24b7ea29f5e47910d2ff1c73d427ce3dcb1de72260f5ddfb88ab51788103884d8838deb94b651f870926d87908b75e686064455f443c12e14eeeba906bf7 SHA512 e11fe0dcca5d63598b81de3cd6c251c9c896d6dcc2164002dc13f886ba749825704d6597521dc010d16a42b37d5c47dcd38bf86d79850189527c9007f081227b
 MISC metadata.xml 401 BLAKE2B 9250e95731d3269e92b401f17d066e70838fa4009e9b62e6ec88420ada2b4695179fad49a8b010eab162ed0af2e2398fa987e04cd8ad34813dfb1ed1ad1208e4 SHA512 e5ba74a86efa4450b9181fb5f32dfd63ac5d3e34b8e1c447b21acb4cb615d77711761352a8e1e4807bde17b1b2e688eded99d8a9785cd42a915d470084b98a04
diff --git a/dev-python/bleach/bleach-6.1.0.ebuild b/dev-python/bleach/bleach-6.1.0.ebuild
deleted file mode 100644
index 6e09fee2035c..000000000000
--- a/dev-python/bleach/bleach-6.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An easy whitelist-based HTML-sanitizing tool"
-HOMEPAGE="
-	https://github.com/mozilla/bleach/
-	https://pypi.org/project/bleach/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/bleach-6.0.0-py39.patch
-)
-
-EPYTEST_DESELECT=(
-	# this package is not really maintained anymore
-	'tests/test_parse_shim.py::test_urlparse[\t   :foo.com   \n-expected8]'
-	'tests/test_parse_shim.py::test_urlparse[ foo.com  -expected9]'
-)
-
-src_prepare() {
-	# unbundle unpatched broken html5lib
-	rm -r bleach/_vendor || die
-	sed -i -e 's:bleach\._vendor\.parse:urllib.parse:' \
-		bleach/parse_shim.py || die
-	sed -i -e 's:bleach\._vendor\.::' \
-		bleach/html5lib_shim.py \
-		bleach/sanitizer.py \
-		tests/test_clean.py || die
-	# indirect html5lib deps
-	sed -i -e '/six/d' -e '/webencodings/d' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/bleach/bleach-6.2.0.ebuild b/dev-python/bleach/bleach-6.2.0.ebuild
index 6b6f999af7e9..572a66ecc0e2 100644
--- a/dev-python/bleach/bleach-6.2.0.ebuild
+++ b/dev-python/bleach/bleach-6.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/boltons/Manifest b/dev-python/boltons/Manifest
index be4f4bdd6a6a..76f3c461d39e 100644
--- a/dev-python/boltons/Manifest
+++ b/dev-python/boltons/Manifest
@@ -1,5 +1,3 @@
-DIST boltons-24.0.0.tar.gz 239550 BLAKE2B e7001b3aa04834f1d234ff7ce996cebd32293189cdf000c8b36719d24b51ab24098c58ad3df58e938a58f319a575b8a0f2f09cec423d33b876103b89ad7d85bb SHA512 afc7f9d495d91e38219378f9f4f287918d6e5b19feb1299c5f504cab1d4a3e0a5fb9fa1c073d46f941c86a18086af5be3a44506d986b010b2595da0c2b908b48
 DIST boltons-24.1.0.tar.gz 240916 BLAKE2B 65f3b3e3c495bcd168badd776e0e04da2339c52fddbaa4ba4ccce6ddc1f6143ab224fa6d89cc4f9a5632fcf91b2e7beac31f92e9587004282b24e177670e9bef SHA512 9f61fb9c9e0a56abc75c61c56bc47ac8ab219d0abd14f700ca609b61f25df392c1b5be3a2bfecd1a2b2c73a50e407c6f90f0460341dfa23d8dfdf8ad530974af
-EBUILD boltons-24.0.0.ebuild 956 BLAKE2B 1e0b371ae2fe9ae553c921036a138b87ed17b9de2bce2730f2443776a60410715b273b12d012c3acd37f274c021f70458e84acbd18ca9cdd3c75067b08732c31 SHA512 9a9e748220b328e2eb7e27edc36746d58de95608eb30fcf15dfe3695b53b99d5c4e3342d3c944fb89271cc24fbdcd4b74628227b0aa8bc97e4c7866e2adb59f9
-EBUILD boltons-24.1.0.ebuild 963 BLAKE2B 9cce263501c31c28a4ed5789bcf12bd2fa15334855a8ceb53fa75b8f0170923da81fdf8554e1e55b132eb3ca9a5825e55176ca0d2c8e45f41a61d17d675814a9 SHA512 ee3e09166c33d42ae48a7c8aa14917432539cfc3c0a198addf96a7f12dbc53aa1b7a4f2071336359c894540ba78545a22870f7e44647dcd815c18af72a2d5a7f
+EBUILD boltons-24.1.0.ebuild 956 BLAKE2B 1e0b371ae2fe9ae553c921036a138b87ed17b9de2bce2730f2443776a60410715b273b12d012c3acd37f274c021f70458e84acbd18ca9cdd3c75067b08732c31 SHA512 9a9e748220b328e2eb7e27edc36746d58de95608eb30fcf15dfe3695b53b99d5c4e3342d3c944fb89271cc24fbdcd4b74628227b0aa8bc97e4c7866e2adb59f9
 MISC metadata.xml 395 BLAKE2B 6ed304f1dced75dfd795b9fe582ec669bf1c8ba5fefeb9e753b11aa20de8fc0966fc9a8a0ed40e460dd23a67ef0e5721a8dae27b3d799a4be629537bb18f54c9 SHA512 fb73041a95df230153dc686e21a88d91bb06367ae8c22a20777c4a0f13202cbaf59396f4ed2630265d331d6461a6da85f57ba62cc432c4d9105b8404753b383b
diff --git a/dev-python/boltons/boltons-24.0.0.ebuild b/dev-python/boltons/boltons-24.0.0.ebuild
deleted file mode 100644
index 461698c2a419..000000000000
--- a/dev-python/boltons/boltons-24.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pure-python utilities in the same spirit as the standard library"
-HOMEPAGE="https://boltons.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-DOCS=( CHANGELOG.md README.md TODO.rst )
-
-src_test() {
-	# tests break with pytest-qt, django, and likely more
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local EPYTEST_DESELECT=(
-		# fails with 3.13, but ignore for now given causes no
-		# issues for the only revdep (maturin's tests)
-		# https://github.com/mahmoud/boltons/issues/365
-		tests/test_funcutils_fb_py3.py::test_update_wrapper_partial\[boltons.funcutils\]
-		tests/test_tbutils.py::test_exception_info
-	)
-
-	distutils-r1_src_test
-}
diff --git a/dev-python/boltons/boltons-24.1.0.ebuild b/dev-python/boltons/boltons-24.1.0.ebuild
index 27be1e660905..461698c2a419 100644
--- a/dev-python/boltons/boltons-24.1.0.ebuild
+++ b/dev-python/boltons/boltons-24.1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://boltons.readthedocs.io/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 76d8843468e3..af955dad8d9b 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,15 +1,7 @@
-DIST boto3-1.35.49.gh.tar.gz 878577 BLAKE2B 8f9ddf29eaad2f91a9ba670b268ac987f7f813dea52427a559b245111042f84b8593158bf1f3dbec353b9fb92116be39e739326dbdd70366589ee507a994da4d SHA512 3a1aa9bb8c8aa384abdc2a139273364c49f608921ff9c4ce9e96b4b93d11bb145a45ac65df6245912ba3be6d4e8f0df86e407d74610837b149f81712529b3152
 DIST boto3-1.35.54.gh.tar.gz 882727 BLAKE2B 398e7743d30700856b15440c217d40e88aec4e58669009f68392e108373f2e57ff3c384be9bdc3873b102686df7f0e05f53d4518b149e982e0893473919db3cb SHA512 bfddb7c4b3816edc2b572bd6f412c0d085296df17b552930dfc9bb108c7100190da1f58f5f701d3ec3c36e6deb88c93e5af5bfc68963b76fc7c950d456815ec5
 DIST boto3-1.35.57.gh.tar.gz 885077 BLAKE2B 4f3a29db5e76c706fbfd0afb3ec05d5518e69f3fd26d15e79024fb898d874818fa21031187d66078a4ebd107cce9461000e37506886f337049bd821e20933563 SHA512 19f951c04452203c070243bd8c944183221b51d9853efc19d33002af57c7d59c1967e8a7b606e56f772f35576ec6e1b52e2037138ba01a28f13685a49458c7d4
-DIST boto3-1.35.58.gh.tar.gz 885941 BLAKE2B d561cf27dba3177789047cf8ac9cc3e5b7a669f26cae948c5d0c458464518eb16ea2525ef0b1c2118acaaeb348e7435947eca69f37d42affe3b3b8dfd199ddbc SHA512 9988693c33dab2294f302e9e9434fd9c681fc43042ba6772a36d36df9ba60f5884eeecaa60a17e6087a07d35c9691ecb16ee3920c3859335817e49b5f97247ee
-DIST boto3-1.35.59.gh.tar.gz 886122 BLAKE2B 2eb1378f810bada55c5c6c1a6c70c16c073ddc68d30850ff50b5f604dd15b386bcd0985b81b39fc79801f552eab7f289aaf4ca5377b958b2d28ad0b193e7886d SHA512 ab771736bd88419d50bb11db36f7c308da4816222379d45dfa97557a3c3c43ffb9a9521bc92cf0a4dd2631d01c94f6f9c728517c02a9787e49d98dd860f7e128
-DIST boto3-1.35.60.gh.tar.gz 888293 BLAKE2B a6fac2065a5dfa70f99112f1ff0c98fcc429800a0a88fa011a78f7f8fbb609d27d879ce1a374d977c1bf5407cf2f7052c7560ce6531b4bdbf691ffd18c06d897 SHA512 bdec30b276c001f59d73180b536848466f585bbece2938632ebdbc9087bed59e6cedf4936192fe7a0c97cdbe132072a20d7cc92fc6a538fa4a1fc12baae16403
-DIST boto3-1.35.62.gh.tar.gz 890328 BLAKE2B b0106a87e0cd1c25f9c5fccbc162343663f7251c3750c82207d78f4bf5ac597af0cd2b6636f638161a597f23e527c2f9c874398c1cecc9d0db8fed72bc03b72c SHA512 e7e261e194e911d5ff7ab6d1dc3e517d66ab83a8671e0fb462f1ec8c191e28fe685146374a4549c3d7fc9426018c3518e7fd8dfaf91631003d405e569813d714
-EBUILD boto3-1.35.49.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
-EBUILD boto3-1.35.54.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+DIST boto3-1.35.63.gh.tar.gz 891481 BLAKE2B 092f4380aa31e57b3c8f6ef41ea8f0a4272e55f7a71762a532f338482f08782a11d57bdbc9af3630348706c4009bd0d3cd56ef4b2f1394d2d003638717cef860 SHA512 4deab7682b0f4d80a4aa12a8660b7263908411bd8f38692f9fa8820c6a18a4ecc3443e7524794282a0c0f38a4b94a1d09b6737e84ff3e01b9c8ac93abca2a9ce
+EBUILD boto3-1.35.54.ebuild 1198 BLAKE2B 99a7fa08055cee13f14557124398df39119bae2e4b684265d4647ad0ec83a502bb422365e3797ff5c0440c4b1c9866ede4c62b1876510178dc2e6a0b05ed8781 SHA512 c020cc5535d63c948dd456d9f4af4e97339cb36dc0bb2b2c53d3da0c8c62737e0846ff71d9f85ca9b2936a8a7bfc43b67c3114f91440e75c9870beaa8997107a
 EBUILD boto3-1.35.57.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.58.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.59.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.60.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
-EBUILD boto3-1.35.62.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+EBUILD boto3-1.35.63.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.35.49.ebuild b/dev-python/boto3/boto3-1.35.49.ebuild
deleted file mode 100644
index 54e9299b7dca..000000000000
--- a/dev-python/boto3/boto3-1.35.49.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.54.ebuild b/dev-python/boto3/boto3-1.35.54.ebuild
index 8cba6d95740e..54e9299b7dca 100644
--- a/dev-python/boto3/boto3-1.35.54.ebuild
+++ b/dev-python/boto3/boto3-1.35.54.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.59.ebuild b/dev-python/boto3/boto3-1.35.59.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.59.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.60.ebuild b/dev-python/boto3/boto3-1.35.60.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.60.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.62.ebuild b/dev-python/boto3/boto3-1.35.62.ebuild
deleted file mode 100644
index 8cba6d95740e..000000000000
--- a/dev-python/boto3/boto3-1.35.62.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-SRC_URI="
-	https://github.com/boto/boto3/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.58.ebuild b/dev-python/boto3/boto3-1.35.63.ebuild
index 8cba6d95740e..8cba6d95740e 100644
--- a/dev-python/boto3/boto3-1.35.58.ebuild
+++ b/dev-python/boto3/boto3-1.35.63.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index ac595117ee14..f3a87e37647b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,15 +1,7 @@
-DIST botocore-1.35.49.gh.tar.gz 13473579 BLAKE2B 0b1a0e8ec76ad0d4ec677532626c4f34383828415ae6a6dc318a8e7864f2756c5618e0086a02f29726844e585895492b0e80d5e944e67fa5c233122a35a75eab SHA512 abcbcd3e8c5c4704755f83290aa8c65ee703c5f75cecab45d58451e2960f341e73042b61c28fd42a671562b25795255392d13db60c6c9d2f944f04ede6d3e78d
 DIST botocore-1.35.54.gh.tar.gz 13569174 BLAKE2B 1f4cb326d27ef028e16b20838fe1f7bc32cc5c782694d4d47dc2d0cd1384a7fdfe584f6225f41004c8e4c9028c1ac2b2b157daa073adab515d99a2cf1d42b19f SHA512 cab2956d9b7597295d761f232b9981085bb4daec182514fb514b6aed7bdb82ddca41b7b85900987f624828ae389f4ac282b0950692d965ccb9b67d6ce3d40362
 DIST botocore-1.35.57.gh.tar.gz 13603794 BLAKE2B 23a4dc82e1d9667e75494c2fb651b883c7fbaf689679a1b40c3f277c33760fbaacd6843e6630876fe75597c6e6dc892726c609a97efcff0d46533460c379c43f SHA512 f20eccdcd0c027e3c1d6c631988c8913f3150b1b6da679fc18ea75824d0ef61b999ee9cad4f0d74edbb639cf52daf188fd7e256664e57fc89be09f33ed78d65e
-DIST botocore-1.35.58.gh.tar.gz 13608279 BLAKE2B 6f67c155f7b87c827b07f3bceb29836f59cf38479911cff8c92970e25b82baf920d673c8766e61c5db05e5dcbf1f46acc3aff2ebe32498d4ec733ea0a02a1718 SHA512 5db5c1832936a95ee11b80e872ece61f034ad61eb5c0d307deea047bca8785e9ca211d2f38349b234d7c5aa13ba363f4908520fa211be16924d3552d1bed27a7
-DIST botocore-1.35.59.gh.tar.gz 13619172 BLAKE2B 593bae8b31935cabd5ca44e48bc85d1638d03a34d58ac209f9f0aa51ddc55c72f88b383fe422a10e0045a84e287da0c417ee388acdc72ebf982665532657aee0 SHA512 ced4d9c149924f09c6cb3fb62f348225f7df4a07be383b5f523d7284fefd2de0e60f4c302a71eaf81d56051a31e78d962e75eda28afb6624db0b0bac7fef9140
-DIST botocore-1.35.60.gh.tar.gz 13625896 BLAKE2B 3e1337713f2a96430eaac399db7d6ad468e991ac1c777fff6761dfc377104833ddbe711b8384e08086862a60e5e558c2aae48bb87bd399b2dbd00cb032b696fc SHA512 4e05899948f5ece08f51c4eda2e124f743ee5e5fa82e849585bb8065850e08e190d3b04b720af4ca651165e9b209d2dfab597ca7118cc2a18ce4badf72688dc9
-DIST botocore-1.35.62.gh.tar.gz 13676480 BLAKE2B 66cb770fc797c4bc7c10b03834ea0caf98eef4fd20ce4651a924747687afac174324f9dfc3a9dc41fbe9323ae19a909d8eeb7698a4561171e44063a65bc24f25 SHA512 c691d14280e05b8d6083e7c399925e882558ed3f65161ae9f60a556839c8a103352b497a983dc8af7a8088bcdd0269d500118129f75fdf0b55773c741cc298be
-EBUILD botocore-1.35.49.ebuild 1477 BLAKE2B 8ba848e2c436928ab5bab36e735b148504d8b82228fad1eebe027605a34abed713b9dd7a671541d3fd51699bdef252fe3aa414c809afc461601dd1e42b22296c SHA512 221d3251da242b9eb5c5138fde3e3e5972f2a44d53ea78665302679928a3ba4a21c304973724fcdf7fd0f373f2ec61fb4e1994a4927bbe8ee8ecdffdea32a209
-EBUILD botocore-1.35.54.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
+DIST botocore-1.35.63.gh.tar.gz 13692343 BLAKE2B 41ded808c412e9af8f938cf64db1632478f77d082417afac1f34905e946c0459545afa46854a41458090eab26a32b2733fb164f374455d8bdefea35718182632 SHA512 7185f5a288f848e1f3810ab9fa4eb46467321af6bdd345a8de623722ee513ab89f43303955487b014a3c349ed69a62c7bdf54e5095c3f4ebfd254fab51443ca8
+EBUILD botocore-1.35.54.ebuild 1477 BLAKE2B 8ba848e2c436928ab5bab36e735b148504d8b82228fad1eebe027605a34abed713b9dd7a671541d3fd51699bdef252fe3aa414c809afc461601dd1e42b22296c SHA512 221d3251da242b9eb5c5138fde3e3e5972f2a44d53ea78665302679928a3ba4a21c304973724fcdf7fd0f373f2ec61fb4e1994a4927bbe8ee8ecdffdea32a209
 EBUILD botocore-1.35.57.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.58.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.59.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.60.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
-EBUILD botocore-1.35.62.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
+EBUILD botocore-1.35.63.ebuild 1484 BLAKE2B c9537c34e5c2ccdfc4a43355acfffe603de4f12e19934355c62d7366e45fb4974d33a9b0ec7b4a5a6054b3627e6fd453c1d806797ca59a8cadc8230a5760541d SHA512 1897b078e3a849aba08170048369cbeef8b15729d4137446f8347b4249eca416df0e4d51e83a7c800eccbe15bf3362242e45e7c42082921e44fbfa37a9955ca8
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.35.49.ebuild b/dev-python/botocore/botocore-1.35.49.ebuild
deleted file mode 100644
index 2a4066b03f9d..000000000000
--- a/dev-python/botocore/botocore-1.35.49.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.54.ebuild b/dev-python/botocore/botocore-1.35.54.ebuild
index 0f88c5cbe9f3..2a4066b03f9d 100644
--- a/dev-python/botocore/botocore-1.35.54.ebuild
+++ b/dev-python/botocore/botocore-1.35.54.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.59.ebuild b/dev-python/botocore/botocore-1.35.59.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.59.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.60.ebuild b/dev-python/botocore/botocore-1.35.60.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.60.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.62.ebuild b/dev-python/botocore/botocore-1.35.62.ebuild
deleted file mode 100644
index 0f88c5cbe9f3..000000000000
--- a/dev-python/botocore/botocore-1.35.62.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-SRC_URI="
-	https://github.com/boto/botocore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.58.ebuild b/dev-python/botocore/botocore-1.35.63.ebuild
index 0f88c5cbe9f3..0f88c5cbe9f3 100644
--- a/dev-python/botocore/botocore-1.35.58.ebuild
+++ b/dev-python/botocore/botocore-1.35.63.ebuild
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index 2a3517aecda6..eb89f80733fb 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1,6 +1,3 @@
-AUX colorlog-6.8.2-py313.patch 1396 BLAKE2B b3f8311fe2d61f74fb118a5635d3f8fbd22ee6e4e8e6762f2d7044cd9aa12b46c451c1ddab349a6f3464591145bfcba4ba191833d38795281a0b8eb36d853e11 SHA512 40374c7a695598232e7f96cba765225e4a9d6b93d1a6d58dc60d418b0ef6477561fb120d323a2a05309c0e3ddbe8bc5c96639941695f0d294e930501411cac48
-DIST colorlog-6.8.2.tar.gz 16529 BLAKE2B c745e9deae4f0a96e5b3481268b7ae402f0c7f05a3997753cbc6e117c1f0630338748ca557f5f3ae261694f0ce6c65f486d06d35778b3ee331160d2c0596465f SHA512 cffd4541837e15ed7cfa0e48d8424d6bb10d0de6e227fe16145cfba51ebc2f90e2a4c750db57d37ee2708ec0272de97ad74e946283b7b3cd3628e1bd24a60b6f
 DIST colorlog-6.9.0.tar.gz 16624 BLAKE2B 6c4e6db3592bafa0c4ee799681076f9c775200d495e19532b63c11e3cd165eeb1c1dfd1b3b0763be6b033d098afec2a467103f2d73e73a6d0592a4d04e1cc2af SHA512 a1f0fa3858314a770050172c287fca3bbd060ea00ce8d042429edf38f363ac21b689204c2f97140bc58c27f708bb15836de699a4692873118471e4e966a8320f
-EBUILD colorlog-6.8.2.ebuild 590 BLAKE2B f67022ff641a240a2008d0697d78cc3b8f5de7686db1d8539fe70543a9b703fc964ffcfb46be9fee49c8635ce16f7e722651608c995f84aa8764410bd80a9d75 SHA512 4867dd15553aecf71f0cb68df5e469dbf3ab824cdeda82e0e8079eedecbb6d2ee80f8180bf92215df19911ac08fb0762c10af647ec6aa2774727571ed90cf272
-EBUILD colorlog-6.9.0.ebuild 451 BLAKE2B c8cdc372857007ab33a01f9b81375b5c74b26a1f3c596dc133c6efb668759c733970844979b443f39f3a40d57b12be6ecd76c2444d6dcf188cdd517c69c3d50e SHA512 b1326f999ec4abb50168f4a2f214fdb99910954b76361bdc85f7779829f27203c5a9b1f24c6a327cc140892f0c03d440fe229959681010383d7bb83f0ed2b9ee
+EBUILD colorlog-6.9.0.ebuild 448 BLAKE2B 4525555c6810ed8ec14a15784f34ff177ad267992351ee3d997f64db38026a81d50569d1fa1e049e1218daaa23959a6e9cbd3e2db373d6b836a1563596140322 SHA512 4aa0c788d5268658bbbef98838d90150eca4b02ad0a8304b7a986ad3c184e57ee0a54aa5beb564ffff568a1c07a83b7dfceae672aa0d03f38632fabb1d6968d2
 MISC metadata.xml 415 BLAKE2B 4b7aecb1bfde4142a6d3f090e5aa93245e98a5ad63238e141666d1b4ea621a8cde4a9b642b44ff8792fa3bea6d50107b084bf07f9eeb41074f34746be934c0f0 SHA512 66bb051d87b620dc5f04dfacb5abc9a67b87bc28f9cb60f99ace58731c8e23576d061bc16a84942d4c69eb04563a3effa7a21f10392e58256bc73e3414ae798d
diff --git a/dev-python/colorlog/colorlog-6.8.2.ebuild b/dev-python/colorlog/colorlog-6.8.2.ebuild
deleted file mode 100644
index d75db15a6ab3..000000000000
--- a/dev-python/colorlog/colorlog-6.8.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Log formatting with colors"
-HOMEPAGE="
-	https://pypi.org/project/colorlog/
-	https://github.com/borntyping/python-colorlog/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/borntyping/python-colorlog/commit/607485def2d60b60c40c0d682574324b47fc30ba
-	"${FILESDIR}/${P}-py313.patch"
-)
diff --git a/dev-python/colorlog/colorlog-6.9.0.ebuild b/dev-python/colorlog/colorlog-6.9.0.ebuild
index 5c49fe6e7977..3a964bf78152 100644
--- a/dev-python/colorlog/colorlog-6.9.0.ebuild
+++ b/dev-python/colorlog/colorlog-6.9.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/colorlog/files/colorlog-6.8.2-py313.patch b/dev-python/colorlog/files/colorlog-6.8.2-py313.patch
deleted file mode 100644
index dc47fe2ee534..000000000000
--- a/dev-python/colorlog/files/colorlog-6.8.2-py313.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 607485def2d60b60c40c0d682574324b47fc30ba Mon Sep 17 00:00:00 2001
-From: Sam Clements <sam@borntyping.co.uk>
-Date: Fri, 26 Jan 2024 14:06:47 +0000
-Subject: [PATCH] Support Python 3.13
-
----
- colorlog/wrappers.py     | 17 +++++++++++++----
- 4 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/colorlog/wrappers.py b/colorlog/wrappers.py
-index 20e3042..63b201a 100644
---- a/colorlog/wrappers.py
-+++ b/colorlog/wrappers.py
-@@ -2,6 +2,7 @@
- 
- import functools
- import logging
-+import sys
- import typing
- from logging import (
-     CRITICAL,
-@@ -53,8 +54,8 @@ def basicConfig(
- ) -> None:
-     """Call ``logging.basicConfig`` and override the formatter it creates."""
-     logging.basicConfig(**kwargs)
--    logging._acquireLock()  # type: ignore
--    try:
-+
-+    def _basicConfig():
-         handler = logging.root.handlers[0]
-         handler.setFormatter(
-             colorlog.formatter.ColoredFormatter(
-@@ -67,8 +68,16 @@ def basicConfig(
-                 stream=kwargs.get("stream", None),
-             )
-         )
--    finally:
--        logging._releaseLock()  # type: ignore
-+
-+    if sys.version_info >= (3, 13):
-+        with logging._lock:
-+            _basicConfig()
-+    else:
-+        logging._acquireLock()  # type: ignore
-+        try:
-+            _basicConfig()
-+        finally:
-+            logging._releaseLock()  # type: ignore
- 
- 
- def ensure_configured(func):
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 0bcb690e7b3f..568a29fa3378 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,8 +2,10 @@ DIST coverage-7.6.2.tar.gz 797872 BLAKE2B dee18c9199169b74693377d937e720f26ec5c0
 DIST coverage-7.6.3.tar.gz 798337 BLAKE2B 62190d9adff5bc752b16c799939dc6b710b5bed6e0ce3c2c14e6a074ab119482c23e33236bd1a758545eb1eccbb02b7eeb8072612ae52aaba8a7190f65b20e51 SHA512 e078989028ed8a6ec9e532314be63fb1cbe5589df56e737a96947fa09447da4adee502bb6aa26fb4455ade29ac722172b3314502709732b831484a7de6d1d489
 DIST coverage-7.6.4.tar.gz 798716 BLAKE2B 2b89e05fa71b18d94e19e9ee7acf3cea4125aa0baf32425e1bcdd695fbad4ac46f89d761cdd1593df1cc59d622dc6b63c010cb85d1b7c0d1396da4b0ac0c29c8 SHA512 ebd0f08584fbe6741f1b578bff22b3bc916b4ea352fd906a090c7a497ab7b885417e83344f108e95a22e93db306822e670578cc290af48e7a24f5a04956bceec
 DIST coverage-7.6.5.tar.gz 799549 BLAKE2B f571b32e3b7e6168e0e132bfec82a44e2897c6a7e381d3df77ad41bfb0afafea4ae32969841329b2b37a3db2bfdcd0ce9ba208fb350396db762168e1e968196b SHA512 8d7cb585d100080db239c05c2a1d09de9c9da0b2372616d9b6e7f52becc1273df347abd7568fce20dc18357badc6ba12e30255bc39876768b3bf32365f1900ad
+DIST coverage-7.6.7.tar.gz 799938 BLAKE2B f780fdefcb9a9610384646ede95acaff27d1a27a6fcefdcf092baac6134c0731914c10c195fce966282c33b06f45d4fd404b275cb797d6bbbae681ad6abbe916 SHA512 73b4cf99eb17b2615e5c70488ee219d25e18c0484dc5e53dbaba459486b6b2308c60adfc4acf9093c258e5914729dfbbf21401a871ce6ed3c01bf95912261fc0
 EBUILD coverage-7.6.2.ebuild 2670 BLAKE2B a4af413c7af27de2134da8f07ab089961e1f3926d1f99d1bfbf52f343dd089c782554e9499ede1bd00f9b34c718794a75f474bc76327c79827cd0b01cafd90ac SHA512 d3b3e9e02a29cada83553a9cbd269b786d6e7ff76481c704962d9c3129f7fad59720171492d1278431813d25cc837e3c06c62b82335f0c277d1abc688215cedf
 EBUILD coverage-7.6.3.ebuild 2671 BLAKE2B d2f45b0370a99652fbb7992544753233769578ca50b62e9c9f62f6f17953ed1d5b5b58a641e10ae5217b199b3ccd405f52cd9703e15d200bc7f0608efdf87875 SHA512 64dea655b87841015dac5ee3383c8ad30c5f3d3a5f723595802ee17912ce38c6cf14d24fb1de04a6abdd43574dcfd8157c2ebf1d0feef1d6be4f5c3d8e8e8070
 EBUILD coverage-7.6.4.ebuild 2671 BLAKE2B d2f45b0370a99652fbb7992544753233769578ca50b62e9c9f62f6f17953ed1d5b5b58a641e10ae5217b199b3ccd405f52cd9703e15d200bc7f0608efdf87875 SHA512 64dea655b87841015dac5ee3383c8ad30c5f3d3a5f723595802ee17912ce38c6cf14d24fb1de04a6abdd43574dcfd8157c2ebf1d0feef1d6be4f5c3d8e8e8070
 EBUILD coverage-7.6.5.ebuild 2678 BLAKE2B a192b24f1c622a54a8c659dfc4cfc12d3fb5bc92482b54cda090515778048b35b03f9b4ef4307dbc5543fa9d1b8b8259c409ea34a928d565eeda3139a74b6caf SHA512 d9276a455e1a1e4301d4a896f0a031d0c667a00006399d2bfb883dc79fb5a4cc20e45c27f2e93440d4d35da083ecb6b2a2f6954266d42d741ae45f51d0a3f83f
+EBUILD coverage-7.6.7.ebuild 2678 BLAKE2B a192b24f1c622a54a8c659dfc4cfc12d3fb5bc92482b54cda090515778048b35b03f9b4ef4307dbc5543fa9d1b8b8259c409ea34a928d565eeda3139a74b6caf SHA512 d9276a455e1a1e4301d4a896f0a031d0c667a00006399d2bfb883dc79fb5a4cc20e45c27f2e93440d4d35da083ecb6b2a2f6954266d42d741ae45f51d0a3f83f
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.6.7.ebuild b/dev-python/coverage/coverage-7.6.7.ebuild
new file mode 100644
index 000000000000..806fc7ea8616
--- /dev/null
+++ b/dev-python/coverage/coverage-7.6.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="
+	https://coverage.readthedocs.io/en/latest/
+	https://github.com/nedbat/coveragepy/
+	https://pypi.org/project/coverage/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+test_tracer() {
+	local -x COVERAGE_CORE=${1}
+	einfo "  Testing with the ${COVERAGE_CORE} core ..."
+	epytest -p flaky -p hypothesis -p xdist tests
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: fails because of additional "Terminated" print on SIGTERM
+		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
+		# broken because of pytest plugins explicity loaded
+		tests/test_debug.py::ShortStackTest::test_short_stack{,_skip}
+		# these expect specific availability of C extension matching
+		# COVERAGE_CORE (which breaks testing pytracer on CPython)
+		tests/test_cmdline.py::CmdLineStdoutTest::test_version
+		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
+		# mismatch of expected concurrency in error message
+		# TODO: report upstream?
+		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
+		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
+	)
+	local EPYTEST_IGNORE=(
+		# pip these days insists on fetching build deps from Internet
+		tests/test_venv.py
+	)
+
+	"${EPYTHON}" igor.py zip_mods || die
+
+	local -x COVERAGE_TESTING=True
+	# TODO: figure out why they can't be imported inside test env
+	local -x COVERAGE_NO_CONTRACTS=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local prev_opt=$(shopt -p nullglob)
+	shopt -s nullglob
+	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
+	${prev_opt}
+
+	if [[ -n ${c_ext} ]]; then
+		cp "${c_ext}" coverage/ || die
+		test_tracer ctrace
+	fi
+
+	test_tracer pytrace
+
+	case ${EPYTHON} in
+		python3.1[01]|pypy3)
+			;;
+		*)
+			# available since Python 3.12
+			test_tracer sysmon
+			;;
+	esac
+
+	if [[ -n ${c_ext} ]]; then
+		rm coverage/*.so || die
+	fi
+}
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 0d09856c9d0b..d39ac15470dc 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,7 +1,3 @@
-DIST croniter-3.0.4.tar.gz 54500 BLAKE2B caba8dd5efda4d56787130d43416ce79d2183e481ae5b4524542a353d40b765112c54961d1aeb0f9c99e0f3d319c31812a866dbaa5c2ee597fbc139eb079963a SHA512 e46e0ac27ed2dd30c5239565b7d9a926b2451febf047f96573699b50baf83157bf30e22f5f7f9be4fc66bb1a6b2eb0b5245a810542dbe808294eefba31af1d8a
-DIST croniter-4.0.0.tar.gz 55312 BLAKE2B 7733eb55b53e0921a37b4084bf815f3f2032041154083681a6d69a7be23ad48fc84e581af948acb8d7a1505f2a25240cd0cf09eaea14418da8f1a14466604575 SHA512 086cb137589514daf7e996c824c7e2d2e46615ae3150ea9060a21cb6577fa5c2a0132c7d169d38f500642325005be19ea2e9604a76906b0d7d62757e0f88ded9
 DIST croniter-5.0.1.tar.gz 57084 BLAKE2B 5417d548c103dca87e9dff2ad521e82d5cb468332f3dc11bdff74f331ea23f49753cc9135b22ab1c269e8aa96a05dc04e9b92269b5bbb7334688143daad4664b SHA512 410a3b0ada979259bcd9b82d1b83f3384714645bae642ffaf9e118d65417b716b0efaa3a8c592cc3cc8a9a2694d6f70aa8d36af83aab0c8461493ce96f457bbb
-EBUILD croniter-3.0.4.ebuild 609 BLAKE2B 833440e16f53902ca24c45ef08ffd526971821b2b31b55f3002ae0a92fd2a8c462e8e005dcc59e63cb259605adba402d61b4d62f9f1c832b80f6d4fa2a23aed1 SHA512 938e7a6592cd40378125405e0a1a7e4a369ab70270f8aa6e5df8309f3022c6924a6316613a113ab7344c59490b491ff586f244ea44ec354632dc4779984415e1
-EBUILD croniter-4.0.0.ebuild 612 BLAKE2B ecb9bbe9ef11e8fad55679ad9a0d68dfd0717b67a9e6eb847ebbfb30eb15ae01731faedc2d6d8eff73e3692cd00d87d0ff715caef2078d1819febefd2133d8a4 SHA512 9df989d449bca1a8362478fb1a03eec63717ecbb5c172fefc6352c2ad2dda30dbea72ecaed03c1cd449803b365c98a1ceb86def91ae530ea75ad1e5053615710
-EBUILD croniter-5.0.1.ebuild 612 BLAKE2B ecb9bbe9ef11e8fad55679ad9a0d68dfd0717b67a9e6eb847ebbfb30eb15ae01731faedc2d6d8eff73e3692cd00d87d0ff715caef2078d1819febefd2133d8a4 SHA512 9df989d449bca1a8362478fb1a03eec63717ecbb5c172fefc6352c2ad2dda30dbea72ecaed03c1cd449803b365c98a1ceb86def91ae530ea75ad1e5053615710
+EBUILD croniter-5.0.1.ebuild 609 BLAKE2B 833440e16f53902ca24c45ef08ffd526971821b2b31b55f3002ae0a92fd2a8c462e8e005dcc59e63cb259605adba402d61b4d62f9f1c832b80f6d4fa2a23aed1 SHA512 938e7a6592cd40378125405e0a1a7e4a369ab70270f8aa6e5df8309f3022c6924a6316613a113ab7344c59490b491ff586f244ea44ec354632dc4779984415e1
 MISC metadata.xml 470 BLAKE2B ee6bfe88287fe27cb8bb33258f6fbb3275daf8294a834e899975e27c34d9103e21dcdef3f43b5df3a9a9e5d741f971d0117ad6e4410c1117306d9b913c8f2bc6 SHA512 e2167dfde1b79b2ec613ad671868a7ad28e64705515534b7911d2bc1f2cfeb6e68e14b1d93e6e29ab2f60c2b49b60454d4b6d9bba2f7bcf9cc3f3a20424fe3a7
diff --git a/dev-python/croniter/croniter-3.0.4.ebuild b/dev-python/croniter/croniter-3.0.4.ebuild
deleted file mode 100644
index 6b9cd9264d4d..000000000000
--- a/dev-python/croniter/croniter-3.0.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-4.0.0.ebuild b/dev-python/croniter/croniter-4.0.0.ebuild
deleted file mode 100644
index 678616a1506d..000000000000
--- a/dev-python/croniter/croniter-4.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-5.0.1.ebuild b/dev-python/croniter/croniter-5.0.1.ebuild
index 678616a1506d..6b9cd9264d4d 100644
--- a/dev-python/croniter/croniter-5.0.1.ebuild
+++ b/dev-python/croniter/croniter-5.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/deprecated/Manifest b/dev-python/deprecated/Manifest
index 40ce8ea06bd6..587f26af4736 100644
--- a/dev-python/deprecated/Manifest
+++ b/dev-python/deprecated/Manifest
@@ -1,4 +1,6 @@
 AUX deprecated-1.2.14-py313.patch 1593 BLAKE2B fd4731430b9216dc4081430aae2c159f4bbfbaa2e52eddcab0b616cd16820b548d2b917a2e6435473bfb6c997f9e0e144a4f15875aa564cacad3ef2ceb95424b SHA512 532c970dafc98c5b003f869286a3a891a871d6d15ffaf563a1abb3a70b78bc59ead248953ad303c5e5d789a45c80a593500558f01f4763c42e1481cf7119c0f1
 DIST Deprecated-1.2.14.tar.gz 2974416 BLAKE2B d7994a435f7709a74fde71b1bfe20aaec44813893fd8d9fba70b55938ec2dcb01364a0084e5b161ad84819a6ce258ef28813f7272c9cc48cfc8a2159408b5f29 SHA512 5c2f71fc4c1abb6d4a6913bd9644d47d12f709a0830b2aa3513aa2aa92c13e916c49fcd45a5f38aa29279822a5bb8563c4062e5f3e21bb6c55ca97b7845ee736
+DIST deprecated-1.2.15.tar.gz 2977612 BLAKE2B b12747c874ac94825dd6c8e2004aa31d4b0b5a7b2f6057951963ba24a26d17fead67ce4283755b3740399e7bb7ed49a7b3ad7b081497e58af80c6454280eefd1 SHA512 03d5eaa2cb881b5b284f9112d15502522887c3beb91a0e8e2868bfd7b7d8ddf0c947937f3b19dd42c8b512ab1e37dc1012f5e0b5d3d374eb7a8718c4b5f214b8
 EBUILD deprecated-1.2.14.ebuild 632 BLAKE2B d5bb15a924bb10bc6d32567541ac0f43899794648e09140701227efdc5b30178ca13e0657eef4b0a1e946f6b2102e22cb10b9290f92b4226aa24cc44ecea64b4 SHA512 46e80e940a48d5586a06fdca56c4df3cfbd4d0313b2fb40f832a0fbe119fe1b99a6dab1d70bfddf8c28937fdea32dd1bdfca8887fe00422298587377b46699d1
-MISC metadata.xml 374 BLAKE2B be79deba7ab13c58cb57fc05937c949f2a7fefd60028d35b3c9a4f9a1acdff09535b9f21402f281e9299c9275a3fb8e26a860dfc4712e07422b7f03e8a5ddf48 SHA512 e302d1682a1c252b8d79f7d3126302c3378249aa328c9f1733936805ce423be4d9dca0216eb836fc30208ecb41ac3f077fcc40c0c0c2e195d314f7c840bce5ce
+EBUILD deprecated-1.2.15.ebuild 588 BLAKE2B bd4cea70789c954a08a1ae4adff57c5b382b200eaa80c2e6408af5a4fdb5d89fb9b7f37dbe993914d9780bf073aa28ef0bb3c030d128bcd123f84ae8f7b5e91d SHA512 39917cba6ad608f096628b1311a57f05691ff6491e0d304bdca7e5a2b3fa1ee1ee4397978fcbbc973c1fa0a1b22fea0230290eee3ebbb5d1ce26ef8d52f8ec75
+MISC metadata.xml 386 BLAKE2B ba26eb3f8ef78395582e9b093b0bfbe627d6e227da7d6b59b0adac44afc1c624fe45bc31a8ad78608002d181073a9253f0c64523a97ccdd1a825c2315464f237 SHA512 5540360e5aed3e273664506161e328eb8dabd22a1af46aba7b04dd7572d1043dd36a29035333ac2679ca484d01b952a97e94dbe01859e8873e818469455827ba
diff --git a/dev-python/deprecated/deprecated-1.2.15.ebuild b/dev-python/deprecated/deprecated-1.2.15.ebuild
new file mode 100644
index 000000000000..8e9942131315
--- /dev/null
+++ b/dev-python/deprecated/deprecated-1.2.15.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN^}
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python @deprecated decorator to deprecate old API"
+HOMEPAGE="
+	https://github.com/laurent-laporte-pro//deprecated/
+	https://pypi.org/project/Deprecated/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wrapt[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/deprecated/metadata.xml b/dev-python/deprecated/metadata.xml
index c45ae963f499..cb18defe1b5b 100644
--- a/dev-python/deprecated/metadata.xml
+++ b/dev-python/deprecated/metadata.xml
@@ -6,7 +6,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">tantale/deprecated</remote-id>
+		<remote-id type="github">laurent-laporte-pro/deprecated</remote-id>
 		<remote-id type="pypi">Deprecated</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 13ff13be0fe5..385bc22db553 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,3 @@
-DIST elementpath-4.5.0.tar.gz 338727 BLAKE2B d05f98c509fb7d6fc2db73880963e8f77fbc4643907b6de37771bd52faaf054dddd9bfc35e238e4f8f7b4e0d3c033f4be9297e93b91462cd21664e16661739c4 SHA512 dafd480778d9d4e9fec1dc11d298590d460ad6b26f3683dea301b650da1b1ddcf03a68af6f3fa947b78a528f458ecf655e6ec172fd6ff194890c3f8fa28f37ca
 DIST elementpath-4.6.0.tar.gz 355931 BLAKE2B 7617e778bb48b3d7aaf9ec4043af3827c2bd41eb3b0f7a2e4dae71d080cacd9d9a7932f8d358dc8d1fbd2e872fe9f390b90be4a55e04030eba806183e2d29fc1 SHA512 87e01f2aa2c98b626a1cfa38b4695c16b39c1425dbe686afef092cb265b82e6dc25997c989ffa2b198a6cb60e042d2361fabb0b53fb3efb853263a5651a59fd6
-EBUILD elementpath-4.5.0.ebuild 750 BLAKE2B a30acfaafc4d3213339b9da7b3f69142da3ccafad088c89575399ede11f94f761eb638c013b188d6b2ae1c13b0d1f029046e15e4997e3f7f67a46cf63f2291cd SHA512 f5bbdba82f46661ac858aee4896f6adba5c520cde4b0f8d3bb62d92f244ebb4ff2e8e6eedf4ad31583ec7c7536d96dd9e3a908fe127314ffc6eb93b7838fd1f2
-EBUILD elementpath-4.6.0.ebuild 766 BLAKE2B dc9b2ed18736343dcd818380e2ea0f271a8619898d180980c5922e0699bd82f4e26559ed14ba693acb268b0b7dd4657262dea4037007d6385d10a79c19d82045 SHA512 e74f1722b1e1b925877aeb3a16637d12a0c81b2ce6c0f362a22bcc8edae47ae6aafb402065ebcd3c69b85af4c7696c50e41c0c546baa584653f4230f4b2befd6
+EBUILD elementpath-4.6.0.ebuild 758 BLAKE2B dd119799c7fda21932a0bcdcf67727fd319f43e987058bfaec2f80ba8c5b26a44e57ee349ce53909d84ffdfe7d42487310228d06c81ae81f2c3c8cfd456feeca SHA512 92512ab6f01c8154b313c6dffc53482ab7b4a9cbfe96596064d24a09ecef6c1be4f1559e3e05a4d5f676a9b989358423cd573c44d9d3c2345388b77534fe0a2d
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-4.5.0.ebuild b/dev-python/elementpath/elementpath-4.5.0.ebuild
deleted file mode 100644
index bd4211c2c1cc..000000000000
--- a/dev-python/elementpath/elementpath-4.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="
-	https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# fails for some reason, more fit for upstream testing anyway
-	tests/test_typing.py
-)
diff --git a/dev-python/elementpath/elementpath-4.6.0.ebuild b/dev-python/elementpath/elementpath-4.6.0.ebuild
index a45ac427b816..80c31fa544cc 100644
--- a/dev-python/elementpath/elementpath-4.6.0.ebuild
+++ b/dev-python/elementpath/elementpath-4.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index f37da94fbd0f..3bbdfb32a656 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,7 +1,3 @@
-DIST fakeredis-2.25.1.tar.gz 149463 BLAKE2B a96c54cbbb221cfcf3d2a096fce90807a92f6cbc6ec474c3705058f47db8d37f7f957321c0ea631a116269068618fcbb1e9168fd17404a49611e37c423c2a08c SHA512 999113bb7c2a15ef16d51dc8c8eea906786eaaa102ed8d9d639423852a070c837504e8926bfa32fe7f4b2481d9e8fb0c588c3fe29347642e8984b46f0b2783ca
-DIST fakeredis-2.26.0.tar.gz 150240 BLAKE2B a0813dd0e4bf2bb788fdef3651f9419b5e0dcaecc2b8ebcd3f3774f59b498c90aedbd65aba7779d1eb16580c32e7625e481658f162cb01c3e0680562280b0675 SHA512 708256e08722ea61b8677d1d7299364582e279cd5d69b9551b037968652e361a93832696fd31c6255dae5d5ab2d6cda0b0f4c05c398bb4434b8d846f1feeab9b
 DIST fakeredis-2.26.1.tar.gz 150240 BLAKE2B 4a3416731ba1c4d96b0a7fe4d1a4382fa4de6eac1f029a00bd84e8fbbb2fa2142ad3efe6140c062f19ed9d806899fadfa584ddd453df63ef30400d93863ea19e SHA512 04ba6ec80cf2b9b2bb80b4da37286b5751b1565458727ea116625b4599e6343be11db472a793f859c29c22d09c03f9ec6adc40f2a3204cd9803bc08cfe01e63b
-EBUILD fakeredis-2.25.1.ebuild 2561 BLAKE2B 71728bc8f31e8f80621178cf4b62e1f3c8ef2b6485642577a4c7a1b62bcbfdc2df81de339c1ab12699abd26434b1ee907e40b8f78775d0b4bf9583650fa7f576 SHA512 dc1c71823d25fc00127c937a547ee47be7174afaac88f566fa91b394da848bcd9b75abffa54ba168805aa41809542a50723dfec06d40ea68fba460de3e59328c
-EBUILD fakeredis-2.26.0.ebuild 2564 BLAKE2B 5663a123c750978dedf54df20abd259808bb7edd5e5cda293e3d8c38b859b1fef03c5e910026777f6d1a781edca9db723a2863b615102bdcd861bd6a7e560736 SHA512 7e39e9dec131ce08c1e973b4b3feac06ce7766161708a0dd9777f74e70a3fde316d73d4631954a25b2358e48548211b348595e2923d498fe9924e866144047a6
-EBUILD fakeredis-2.26.1.ebuild 2564 BLAKE2B 5663a123c750978dedf54df20abd259808bb7edd5e5cda293e3d8c38b859b1fef03c5e910026777f6d1a781edca9db723a2863b615102bdcd861bd6a7e560736 SHA512 7e39e9dec131ce08c1e973b4b3feac06ce7766161708a0dd9777f74e70a3fde316d73d4631954a25b2358e48548211b348595e2923d498fe9924e866144047a6
+EBUILD fakeredis-2.26.1.ebuild 2561 BLAKE2B 71728bc8f31e8f80621178cf4b62e1f3c8ef2b6485642577a4c7a1b62bcbfdc2df81de339c1ab12699abd26434b1ee907e40b8f78775d0b4bf9583650fa7f576 SHA512 dc1c71823d25fc00127c937a547ee47be7174afaac88f566fa91b394da848bcd9b75abffa54ba168805aa41809542a50723dfec06d40ea68fba460de3e59328c
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.25.1.ebuild b/dev-python/fakeredis/fakeredis-2.25.1.ebuild
deleted file mode 100644
index e84169511210..000000000000
--- a/dev-python/fakeredis/fakeredis-2.25.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-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.3[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/cunla/fakeredis-py/issues/320
-	sed -i -e '/LICENSE/d' pyproject.toml || die
-}
-
-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
-		# tdigest ext?
-		'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]'
-	)
-	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'
-	)
-	# Note: this package is not xdist-friendly
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6390
-
-	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.26.0.ebuild b/dev-python/fakeredis/fakeredis-2.26.0.ebuild
deleted file mode 100644
index 7dfb54aa0658..000000000000
--- a/dev-python/fakeredis/fakeredis-2.26.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-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.3[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/cunla/fakeredis-py/issues/320
-	sed -i -e '/LICENSE/d' pyproject.toml || die
-}
-
-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
-		# tdigest ext?
-		'test/test_mixins/test_server_commands.py::test_command[FakeStrictRedis]'
-	)
-	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'
-	)
-	# Note: this package is not xdist-friendly
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6390
-
-	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.26.1.ebuild b/dev-python/fakeredis/fakeredis-2.26.1.ebuild
index 7dfb54aa0658..e84169511210 100644
--- a/dev-python/fakeredis/fakeredis-2.26.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.26.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 9566b05e53fd..b9f18e9529e5 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,7 @@
-DIST google_api_python_client-2.149.0.tar.gz 11791789 BLAKE2B b4397d1e0a6b064b9c7aa7b4ada816a76871de089776f6aab4cc1f962171a427ecd1e4c1ba9e43455becaddd31cfa50082aa498a1443d2116f0acb678d221549 SHA512 3602a9d5f9fd5e00605a2b12114a81770662ac1ad168c65160d6c64340d8ea3f3da2765a5cc5959ef09f5b72725baa493a0686d976e3d22add49bb86b21626e7
 DIST google_api_python_client-2.151.0.tar.gz 12030480 BLAKE2B afbe2cb25e789aaa1aa5cf94e0b2a8e910cb097a885d6dc479af27e7836ac96a2a3db7b54b3fe5e060bdd4c0bdfa86dab3f0cab2e0ea176a6802d455ec7eda77 SHA512 3a8f55f457106779798e0bdf544c9bb9482967dcf0329a9a85f390a4acf8b9946ee56e43af798966c0958ae934426081bbf29cbb344071f2589b84937e85ed37
 DIST google_api_python_client-2.152.0.tar.gz 12046554 BLAKE2B 019bf46e4c876cf77028e1c8d71983a1b37abe95001c713d3b9a5063781c4fb329ecd4137c1ce706a5266b8445f757261c31964b5a9defe0433e94573453091b SHA512 4dc7e551c4defa6a6607a5838e2f282a5a669f0bc6d8bfc676d90fb4394a898667e023c042ffab56c9ea9638256a6671d095d3a5b8c5af1e49f60d1b6d416790
 DIST google_api_python_client-2.153.0.tar.gz 12059322 BLAKE2B dec9affc093262984d9f050dbc55a746d9747c6069b54a85edf14ad037b732ba614e4f0c3dfd0ef678f79aec598625ccd5ce80e942870999f5f0c147337e261a SHA512 c4066807e2e6096b90f6cbe51c20919429abd7c9b25fcefbdd849e290335d926e2b190ad3e61531681589176bbbb72c77f53858687bfee040b1dda36f92ffef3
-EBUILD google-api-python-client-2.149.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
-EBUILD google-api-python-client-2.151.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
+EBUILD google-api-python-client-2.151.0.ebuild 1455 BLAKE2B 0c236e102819fa393880129e1ae048cce4a018e567de29e2d344a451a87dd0f261b05b5285ed660f8b36937cf0b2503eef3fee84ef7e64c3754269f5878a45bd SHA512 b2dc3d562f94b8ffc4c6b6fecbf7538fe676f1a8667e71886585231e0fa3ac2d1e0269d8afc3879f94e3c328faf99672bea5109275527236afc79e7b46fdbe1a
 EBUILD google-api-python-client-2.152.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 EBUILD google-api-python-client-2.153.0.ebuild 1458 BLAKE2B de0b7e7284c45a3a6eabbe54d470e5f216b867e16271dcc0535533bf53683c634faacb3ecf5a21589336e75ff85ab3dbcc9011085dea646df2008a72b162f009 SHA512 2c627f313081d9d186b7a75bcaa8fec68e75ed8ab4ff8f76ac3db2808b8e1ae20cace68afd4e02479c55016bf83aad38edbadea7e4cc78f61dc8f9c91813e114
 MISC metadata.xml 538 BLAKE2B bf0b8ab3a89ce9ab1d2159f4c0ebfe3f2646aced20bd2006485510c12d22e83cc130fac979f699ae6431a610c8d2acf86c04b39bc262abaf167c20571a860810 SHA512 30d004d944055660165954f8475e57ba45cef56423c80a324118836d78e5376261409955155a40c9bd988f230f3e2fc44c6aeb6fae3028c78c55a382ccd83bff
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.149.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.149.0.ebuild
deleted file mode 100644
index 56cf84636d29..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.149.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.151.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.151.0.ebuild
index 58a0eb467bad..56cf84636d29 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.151.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.151.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 08db9c884b6c..b6a315143657 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1,5 @@
 DIST httpcore-1.0.6.gh.tar.gz 99863 BLAKE2B 0da9b958674d92ed787c0310ad6819cd9359b6e608bfff1b366233ba10085905ec5aeb1b1f0b99ea3fef84aaed31f3aa832ced3fa22cb659e3016c0626dac997 SHA512 f83fb851267bb2007a1735d387acba4d99a957db7f85decd5dc6d7d7235a41fe50081b33267e61dc5c52627f07429ba99839868e95997cff1f6c8b2c046a0596
+DIST httpcore-1.0.7.gh.tar.gz 99854 BLAKE2B f9ade1e72edc8f4f3bba615111bb81a9d58f2eb94b489c05f4a41337e7754f1826879ca555085921dc91498c9c581b24c6470a63f9db20b54bcf242b54f8547e SHA512 d41625fc5f53596e6dabcd99f809ca8006b6fe3701f022ad10ddc0dd14f5c41873cd1a12fb444ef5e6d191114a55467ce4983c6a8fff18a7a403d7814eb5868d
 EBUILD httpcore-1.0.6.ebuild 1606 BLAKE2B 04040c4352bdea65e89e65ead8d5a29f29877034330148e8d7638045efa252493c03c1c431abb9fd9d533496aa9211df25445b7d992b412a273d07ba625ad805 SHA512 78a93a7213d359b77783b7c4ae5030ef2e3eb501810fc8ac5597684632ee23928730026ac8dd69804933db1447e80b1bebacbc73ae7749888dde0b77bfddbe6c
+EBUILD httpcore-1.0.7.ebuild 1614 BLAKE2B 7352f3cbd44640faa08e42be65501d68b2fc5104cdf49e3a3c9a98960c2994d535482338410bd6f110c0541f1bcc52c3ba61a95c19fb291d5fa457bcafc2d305 SHA512 2d441a80e160469e140522ef0a091af29fbdafd51265e729470e22e58af41e10d92a7444c79e4c8cf8ed85a58ad47397502b7ac53dd4467a0c05cf128573d933
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
diff --git a/dev-python/httpcore/httpcore-1.0.7.ebuild b/dev-python/httpcore/httpcore-1.0.7.ebuild
new file mode 100644
index 000000000000..f0e565de6747
--- /dev/null
+++ b/dev-python/httpcore/httpcore-1.0.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A minimal low-level HTTP client"
+HOMEPAGE="
+	https://www.encode.io/httpcore/
+	https://github.com/encode/httpcore/
+	https://pypi.org/project/httpcore/
+"
+SRC_URI="
+	https://github.com/encode/httpcore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	<dev-python/h11-0.15[${PYTHON_USEDEP}]
+	<dev-python/h2-5[${PYTHON_USEDEP}]
+	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/socksio[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/trio[${PYTHON_USEDEP}]
+		' 3.{10..13})
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local opts=()
+	local EPYTEST_IGNORE=()
+
+	if ! has_version "dev-python/trio[${PYTHON_USEDEP}]"; then
+		opts+=( -k "not trio" )
+		EPYTEST_IGNORE+=(
+			tests/_async/test_connection_pool.py
+		)
+	fi
+
+	if ! has_version "dev-python/pytest-trio[${PYTHON_USEDEP}]"; then
+		opts+=( -m "not trio" -o addopts= )
+	fi
+
+	epytest "${opts[@]}"
+}
+
+pkg_postinst() {
+	optfeature "SOCKS support" dev-python/socksio
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 1cfec43efc93..2d16cad41eea 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,13 +1,7 @@
-DIST hypothesis-6.114.1.gh.tar.gz 9477292 BLAKE2B 3dadb706f7d283febdc30c9e897fa5b648382edd9bba0ed0824abc2f2c1f6562f0ac77003df496d1def1e56092412c14674b5e768f9583607463f92b78770ad5 SHA512 14526a836c71cdec68a3fbd54391d4f6fe6911305fea9b349c77c59a3f352b7105531a44df05e26cd372d457ed07f7c8199967f444ede14b7d66151afe815727
-DIST hypothesis-6.115.5.gh.tar.gz 9479622 BLAKE2B 44e21c25fbfb0da48102010a23522a636dd7dba0cbae3e1589710e816cb1f83abd33611750a76fd68c965dff5e0d1c234a5fb87da7cbf6ae0ebb4d3a8152ae9f SHA512 e6528eb48710b61f6ef18cc1415f9977c0a4c10d86f4d92da51859f17dc1b24e16ea7cbce5be2438794edb1002b426fc9911e02bb1ce456d7f812262bcc3bd2f
-DIST hypothesis-6.115.6.gh.tar.gz 9479927 BLAKE2B ddfeaebaa4e3687be1cab03fa8517353fcfc392dfe7a38100087534c6e71339e381a425c0e2b0d277d3d6344b69b9498e0b722efb18bbcbb90c3401e997afa96 SHA512 fb5df7b7bb45958e492d69d9375b3847de1ed39467bc119be69a237456e1cb1a2633cafbcd58c90113f0aa35880d5d30395ac9d43ccbc6c7368af46065094eb9
 DIST hypothesis-6.116.0.gh.tar.gz 9480480 BLAKE2B 350abfd8bad65a33669345a71c3df9737e4defcfc12cd81a1d9ecb5603310372e039d1a148c2223a71f37f0ad485ca892ba322f9404e6d873016193b7f864f88 SHA512 5ae6848f16c21b9012d15eb71715df1fc9448b70264d18453d13e61fd71b84623150ce32c9b50ea4ce95494b0df21907368d0f6fabaa8cb8b26c71e474885703
-DIST hypothesis-6.118.8.gh.tar.gz 9486191 BLAKE2B daadb191cf8a0a4a972604c9320e7c10b4a342e7a6f240e6fff1a5a5d52fef5d004134381ef475f7e1b7143b38fac15c59538a6a8cac48433bd62c760db2cd67 SHA512 b5d240f81596d742002ebe073d086f149af17dafabbc9c070f6e109aca05f506c4291a10a36f6a799fd8fe20285bab8f6776685f29a6e505225ffcc581d44d64
 DIST hypothesis-6.118.9.gh.tar.gz 9487943 BLAKE2B 3c8d17d2763877107c7342d9a9825cb733de91ce6c99c88ed7536ac0e82d728f54d762c9b26cb02d742c470afc05c2798fb20e1f3c6f52d3b9d0e2c9cea9e99a SHA512 ba4f32892088a3a4d1a3d9ca2d28b9828cd7e2f4c4878733943f34f431014d4ba4dfe07729878b4c87cc295b6d6f219094c1f774ac115acd3b375ecc3c58d580
-EBUILD hypothesis-6.114.1.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
-EBUILD hypothesis-6.115.5.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
-EBUILD hypothesis-6.115.6.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
-EBUILD hypothesis-6.116.0.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
-EBUILD hypothesis-6.118.8.ebuild 2587 BLAKE2B 9e95a6c5f458945e0d98a7b0f1e35d3803a52d019e0407a159ee81dd1d8574ee907d50def5e01bc056ea28df67092a592d364a44cd420ec01f3f38c0bf323ca1 SHA512 c35c3064f41bc48c0993c8f3e8c5bdf38d92e768b60b6e44ccd733709daf115a98d645a608db10783a3a05a9599ca8bf062173e5907c322caf1411dce6d24812
+DIST hypothesis-6.119.1.gh.tar.gz 9491481 BLAKE2B e1485ac899f64fcc1a1d9d673e32b92e6311b90e9ed3d173b276b9fed0f34ee931d485f6b86250f426d947b511fc777304ae1d536cafb8524b609c3b4d1443e3 SHA512 479fb3b19278c94675dfb1a3e8962f1be8db1240350c59953fbaae67c382c58854a137b8df3e441c6e87f921b3ae781fe9d39c7eceb6d3087bc0bd8e34d797c4
+EBUILD hypothesis-6.116.0.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
 EBUILD hypothesis-6.118.9.ebuild 2546 BLAKE2B a0d28f72abedc005d8e8cd2ada7e933f24a804b2c6ed69447971a7dda156157e9f964735da5bf6fcf75c29212d533df69a467bb4f607a28dd060540164d9aecc SHA512 91b00667808773833c2ec4671f80f665fcaa08e37ca3cbb4b12f18dd216ffb5a456caa36b9014f28950e4aaefda1d4b288fd119d2e679f9d214b9b3a694fda2f
+EBUILD hypothesis-6.119.1.ebuild 2546 BLAKE2B a0d28f72abedc005d8e8cd2ada7e933f24a804b2c6ed69447971a7dda156157e9f964735da5bf6fcf75c29212d533df69a467bb4f607a28dd060540164d9aecc SHA512 91b00667808773833c2ec4671f80f665fcaa08e37ca3cbb4b12f18dd216ffb5a456caa36b9014f28950e4aaefda1d4b288fd119d2e679f9d214b9b3a694fda2f
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.114.1.ebuild b/dev-python/hypothesis/hypothesis-6.114.1.ebuild
deleted file mode 100644
index f41c1bd0c012..000000000000
--- a/dev-python/hypothesis/hypothesis-6.114.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.115.6.ebuild b/dev-python/hypothesis/hypothesis-6.115.6.ebuild
deleted file mode 100644
index f3d89f9d71ea..000000000000
--- a/dev-python/hypothesis/hypothesis-6.115.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.116.0.ebuild b/dev-python/hypothesis/hypothesis-6.116.0.ebuild
index f3d89f9d71ea..f41c1bd0c012 100644
--- a/dev-python/hypothesis/hypothesis-6.116.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.116.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.118.8.ebuild b/dev-python/hypothesis/hypothesis-6.118.8.ebuild
deleted file mode 100644
index f3d89f9d71ea..000000000000
--- a/dev-python/hypothesis/hypothesis-6.118.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= tests/cover tests/pytest tests/quality
-}
-
-src_install() {
-	local HAD_CLI=
-
-	distutils-r1_src_install
-
-	if [[ ! ${HAD_CLI} ]]; then
-		rm -r "${ED}/usr/bin" || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		HAD_CLI=1
-	else
-		rm -r "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.115.5.ebuild b/dev-python/hypothesis/hypothesis-6.119.1.ebuild
index f3d89f9d71ea..2f4ac73c1f89 100644
--- a/dev-python/hypothesis/hypothesis-6.115.5.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.119.1.ebuild
@@ -46,7 +46,6 @@ BDEPEND="
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		>=dev-python/pytest-8[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
 	)
 "
 
diff --git a/dev-python/inline-snapshot/Manifest b/dev-python/inline-snapshot/Manifest
index 8b8a60ff6d7a..65338fa78e22 100644
--- a/dev-python/inline-snapshot/Manifest
+++ b/dev-python/inline-snapshot/Manifest
@@ -1,5 +1,5 @@
 DIST inline_snapshot-0.13.4.tar.gz 215264 BLAKE2B 911bb7007fd35c68e0e42fb915e284394e45b7b510de875827282fc6dadf7f467a6da1efa626e9b2c348750709aea0399bcd7869dc181ab7a2121f76206404a8 SHA512 724d72984399712611c0eea5129b86b6650bdce1a4331255cf30b806ae6f03a33aa51de9f6353e84ae09ec8f6738372964f380a622481b5bf1db1e9baaa5bf00
 DIST inline_snapshot-0.14.0.tar.gz 209662 BLAKE2B 9bea11df88aab049af61146cb40c8afaa7607f8812c800ee7dffc7de94403029e4ae1d1ed49921f624e5327171650210744962559786e45586ae929830f81819 SHA512 32855dcd098c3e9b6a046752a3fc03c18b0df85e2cf338a928eadcd0e63bb784bdaca6855c954974ec7561e602ff3dd95ccdadb0c4f7dd1075d9d84245c171ef
 EBUILD inline-snapshot-0.13.4.ebuild 1490 BLAKE2B 0a4f2f867af7c141a8d974f00ae57b868d173754414036784ffcb6ac7f047ca2817bea0b089993915bec153f6f3bd351bc92127f1747bd9e58776c37884040fa SHA512 d26865210d55ff182da7810286620cc4162496d6b95863777d8fc846509479741b50a682bb72e46d9a5b861b046db4f6cc9947b8a5a02bf17760cd5f80c223e7
-EBUILD inline-snapshot-0.14.0.ebuild 1541 BLAKE2B 028f368918951464c40534e4b7a72f5f908b95e11e739cc6a39222428db268a07a8b9434fd719aeac98a55134d69b2c8951a003578cd0f2631719c7624aa71a2 SHA512 1092c7cc6f5eeaf62e8feffcc4473cb199e8b57a69f48da9b2ca47c17d081a434253d479279c5668dec1366e580900073f34617989b935cfd9e45951f9c39a26
+EBUILD inline-snapshot-0.14.0.ebuild 1590 BLAKE2B f046f63ad309d440f36cd62d3d2dc711e60581645f6c8f17d1d82f4b1fc9a90108f5f92b49c04a78fb0184adf81a12588d464a6b27790d2c340081210a91ec7c SHA512 5af2fcc227fa2ffd01fa9bd2c3c9350a63fc809a559369c151c87ba08d447d0fd3f725ddd09997c468f52afa7d1269d88c7d3892bd45f65c0d5b440624776b0d
 MISC metadata.xml 384 BLAKE2B 37af14f95875416431210b572e9c5e96437d773cf53174dec247a9006ad24940f17ae9803a750dd2e1e73f63675f594b326f880bf7d5cb29ff09a8aae4959e60 SHA512 173bd013e023443c9dac349fab3deea6b5e9c2f054052d3362757cc0c46dd89309c509eb6a0f5a5774a7d8acbc55578b629039615a0cb31d74001a8d0db8b680
diff --git a/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild b/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild
index 62d796d87b09..e5be52476c3a 100644
--- a/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild
+++ b/dev-python/inline-snapshot/inline-snapshot-0.14.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/asttokens-2.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index fb6534db9b14..9d9c0da72fd7 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,3 @@
-DIST keyring-25.4.1.tar.gz 62491 BLAKE2B 48a808185c336493d13c4839346984084881824fc94f6842f7eb4d4a1adddc9b38fe57449e77ddfbf9cb3637c15e31492e9283d2060e7a5960638c9569d83890 SHA512 19df186202220a234ab3d7b3bdb2b31ffc78ccc9c569841a96876048d65d1f7ac5573028f3e6cbf31b598001edf592fa02e19bd036af2f5af9baa7d746175ee7
 DIST keyring-25.5.0.tar.gz 62675 BLAKE2B 9499adbc756a94761acadf121ff22f55186481788477b17dcdb206200ab8041c9b68fba64139f823d1155e0c679f028281fc0093e1038b3cfd740c7c3e38fb7b SHA512 bd8b792781bde9bb5d609acd9516b66486bd785231b81239bf9add483aefaa864ebe541d30c9977216c7a635e3f9161a55da15ba1070d8aab06bb86769fca476
-EBUILD keyring-25.4.1.ebuild 1374 BLAKE2B 8b345a6c693c41ed6115c6351a026f0d276f06c307beda2393a4d5be7903284e2659294ae5fac9f5cc443b00a3c4dd8bbfa35b7015e6d6f06d1501db7212e6e5 SHA512 2ffd64123eaadda0ad6cc54c57ba2c0d8d3238df82fa800b189c85785856cc759c9c43ccf470fa001bab38f7d4cac773406c673b8d38db22c98b2439c81338c8
-EBUILD keyring-25.5.0.ebuild 1381 BLAKE2B c1eadcc27918aee3943e51ce3732e23857319828704094d4719b8f43984fc6acfc52f5210838f9cf30a6b04f8c34d7d49e1f21b661932cbdb91ecbfefa31db44 SHA512 7945695abb9dee95d4ade1433616ea3de3248a1c27dda02e9d6e8987744707577b66787693d74f9527c10fa398b4f75cb43eceb4f7705684fff5fae7997e73f8
+EBUILD keyring-25.5.0.ebuild 1374 BLAKE2B 8b345a6c693c41ed6115c6351a026f0d276f06c307beda2393a4d5be7903284e2659294ae5fac9f5cc443b00a3c4dd8bbfa35b7015e6d6f06d1501db7212e6e5 SHA512 2ffd64123eaadda0ad6cc54c57ba2c0d8d3238df82fa800b189c85785856cc759c9c43ccf470fa001bab38f7d4cac773406c673b8d38db22c98b2439c81338c8
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-25.4.1.ebuild b/dev-python/keyring/keyring-25.4.1.ebuild
deleted file mode 100644
index e6e8c540e9b9..000000000000
--- a/dev-python/keyring/keyring-25.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.5.0.ebuild b/dev-python/keyring/keyring-25.5.0.ebuild
index 6253b57dcaf9..e6e8c540e9b9 100644
--- a/dev-python/keyring/keyring-25.5.0.ebuild
+++ b/dev-python/keyring/keyring-25.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml-html-clean/Manifest b/dev-python/lxml-html-clean/Manifest
index a862b01231b5..d6300b63b6ff 100644
--- a/dev-python/lxml-html-clean/Manifest
+++ b/dev-python/lxml-html-clean/Manifest
@@ -1,5 +1,7 @@
 DIST lxml_html_clean-0.3.1.tar.gz 20851 BLAKE2B 476c73463341af064e7d32b4def1b3cbbc7287cb26308fed2362792ce9dfc3c20bdbb9dcc1174710bf694633789037ec4f1c2510c48fab98ba17fb506b091baa SHA512 cbbcbec337586024db9b622d5724adc1e645dfe7bb1958be8f8974c7858e9a6443b0e75f09cf0ca83d7331aae944648c6bd644aeedd56307a01269e82d866b36
 DIST lxml_html_clean-0.4.0.tar.gz 21374 BLAKE2B 0bb2964f33fa80e08e773f0f0705a554cd332fe956fe2ab219be767caa6f091454b1e3330a56247a77836fae558c54b325d5f5b7468525cae58e067f4c705ac0 SHA512 30427d0e700adc24df5730b56db38c7add36bdc89be598a856ad892fcda72951d19666d304b1a457d1d2400a454f07838e71a2e2859b94448a8b44622a9f62ef
+DIST lxml_html_clean-0.4.1.tar.gz 21378 BLAKE2B 607c2a5b3b35b0cc89729f4114af7a358fa03e386ea3099369d3b10b083ad092ee7b83ea44f6afc1b9be85457737f22df0db458065eb4910388c142c3c335772 SHA512 87e7835f77da6c20a3581edf86fa42df600e1012b2802686e341f525fd4b78211369282bfd873cb07626cb6f1cc0c898d36ab24ec44700f0b9947d1dbee9f6d6
 EBUILD lxml-html-clean-0.3.1.ebuild 651 BLAKE2B bca7d6c561e4f447ee124a3178e6e14d2b3df48f4a8bf103ba6ee652b5222c648e3fa23bdfb4811d3ef47c06741aa31d55e4a7974a778d99639adc7b91ffb40d SHA512 0b2f4634fa3e54d16df0ca698a31f89b4712a78a6495ddabc45f5d126fd1cdeb54db6f37f3bb601d3efa601c675bddf6b7399a11709a495fd757b1c277b578c2
 EBUILD lxml-html-clean-0.4.0.ebuild 652 BLAKE2B 0e93fef3a394ba9c0c5797027128f77461dfe86d9076cea68ab1fc3022ee0ff6365d968b5b1cb17b85415d59a1bbc68a2e13ae6335b533abd9b33bef45cfd103 SHA512 d25133555c7d5d2e7f24fc000c11e7a324e989e2c9e910de1dc6480b34e11246511cde1fa51c93e527b0d53adc30fd19bea7b5dea9155e4bfa466a2d2c1bdfd8
+EBUILD lxml-html-clean-0.4.1.ebuild 652 BLAKE2B 0e93fef3a394ba9c0c5797027128f77461dfe86d9076cea68ab1fc3022ee0ff6365d968b5b1cb17b85415d59a1bbc68a2e13ae6335b533abd9b33bef45cfd103 SHA512 d25133555c7d5d2e7f24fc000c11e7a324e989e2c9e910de1dc6480b34e11246511cde1fa51c93e527b0d53adc30fd19bea7b5dea9155e4bfa466a2d2c1bdfd8
 MISC metadata.xml 497 BLAKE2B 18a62ece379f7aebe63687b148c878a6d3990570c66e31102ecc727fed76ab92df6ae0bf5191a7d7621106ea2aeb0431f2c5c09f5cd70442c8e869a24c77b375 SHA512 95831be01d43c01060d05d6a3bd7c92dea28c2d1d78c7a4e98a8de50cebb0b0779afec4732e2a9c355c9cf4b693e29624c95996fce27a225b285c3b94e3350ec
diff --git a/dev-python/lxml-html-clean/lxml-html-clean-0.4.1.ebuild b/dev-python/lxml-html-clean/lxml-html-clean-0.4.1.ebuild
new file mode 100644
index 000000000000..8523f79facae
--- /dev/null
+++ b/dev-python/lxml-html-clean/lxml-html-clean-0.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Separate project for HTML cleaning functionalities copied from lxml.html.clean"
+HOMEPAGE="
+	https://github.com/fedora-python/lxml_html_clean/
+	https://pypi.org/project/lxml-html-clean/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/lxml-5.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest
+	"${EPYTHON}" -m doctest -v tests/*.txt ||
+		die "Doctests failed on ${EPYTHON}"
+}
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 03c76ba05cf6..d1660c6f025b 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,5 +1,3 @@
-DIST m2crypto-0.42.0.tar.gz 240072 BLAKE2B 86b9f340eb90a8fc94b09faa20a676a3a63c0c64a0902a6729face72b602a2f55941c156ecb3d522a823457d2514e96b147585264200674e11dfaba3d19790de SHA512 b36fb6d1ca401de9741118ab8d43113511bf27d32f45d2257ed70ea8d3b8a3beaf811731dbbece00a6b990366c43096c6b5f5b12d4649ae923bff98c5fc8e674
 DIST m2crypto-0.43.0.tar.gz 366785 BLAKE2B 611daee57c5605246c0a505604e54ec7e029301194ed75bcb7c02ec04f0246a3dc05e13c8c00f1cc15496495a81c098b203cf69a75ce5a65ea3c7a1c0445e5d3 SHA512 c5232956a88de51bd3a1e02859b7a308eabb4e055cc0c8aac2d8d34a60c60a4a4c7160db4060ec07f559134a04eb41c6ab116a194ec3f7441d342e6d38f9add9
-EBUILD m2crypto-0.42.0.ebuild 1508 BLAKE2B bf465681be554b9215d06b0ebe3a0c86e063473838d93f8ba7b2226c966f48580358872013911cb7e07ea5402971240187269a5b61a9b83dd09023863f120fdf SHA512 33ddfb3c37583a026761462b20d7794d1d90707b62f9517399eabb046441e9961e2cdf557fc57f124050432dfd89bfeb6078c5cfb3adb62454996e08fe5b5a13
-EBUILD m2crypto-0.43.0.ebuild 1515 BLAKE2B 0d8979ab7340259810e986c84b2052c4c3513d921ed1e2f2950eb8d595184b11326c256ad6ab7a078f7419a1a8eba65170fb8ed0230534e787054c211206d82e SHA512 a27d22584d6f85a678e840e183f3482a21fd61ab3ec509c0d5340abe13bc07be9f24c707cf0dca57d8312ffdbcaedb4c300b0604004af75538d9c56a15767abd
+EBUILD m2crypto-0.43.0.ebuild 1508 BLAKE2B 4e0e19d5b99df880570c8c5db1949b71e2757ab4cc91bcbbfcdb99df855b40474b7499e55d89d2d1438526044bbaeac6aae6617cd120befa7e854b642d67062d SHA512 47ece67337a050b0ed197b895e783dca50cace3aa6d08d7a8a0bc943a3068cb1cf67c3d07f8987623018b90598300eb7fe38a796bdb127c618a9a9bbbb9118b2
 MISC metadata.xml 381 BLAKE2B 9581f2ef53dd3b8bfff3724e91e36733892f9c4331376861ec25cee892d63f69f4f1846e46c40bc5a5045963d91aadcc2cdf70b574bf519557afe72cffab256b SHA512 95cfd7f65c912a520f371f236a49f41b711101f5997b14fa81f027cbcabe4bf6361d1a6f647d0de6e6b7756a2c662f2336c6dea5779d00372aa5b05f0566663d
diff --git a/dev-python/m2crypto/m2crypto-0.42.0.ebuild b/dev-python/m2crypto/m2crypto-0.42.0.ebuild
deleted file mode 100644
index 226a5ea1bcd4..000000000000
--- a/dev-python/m2crypto/m2crypto-0.42.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYPI_PN="M2Crypto"
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs pypi
-
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="
-	https://gitlab.com/m2crypto/m2crypto/
-	https://pypi.org/project/M2Crypto/
-"
-
-# openssl via src/SWIG/_lib11_compat.i
-LICENSE="MIT openssl"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
-
-DEPEND="
-	dev-libs/openssl:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-"
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# relies on very exact clock behavior which apparently fails
-	# with inconvenient CONFIG_HZ*
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest -b -v tests.alltests.suite ||
-		die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/m2crypto/m2crypto-0.43.0.ebuild b/dev-python/m2crypto/m2crypto-0.43.0.ebuild
index ef855199c635..89eae437c14f 100644
--- a/dev-python/m2crypto/m2crypto-0.43.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.43.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYPI_PN="M2Crypto"
 PYTHON_REQ_USE="threads(+)"
 
@@ -20,7 +20,7 @@ HOMEPAGE="
 # openssl via src/SWIG/_lib11_compat.i
 LICENSE="MIT openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="abi_mips_n32 abi_mips_n64 abi_mips_o32"
 
 DEPEND="
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 67457ef7de27..07526656f52c 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,7 +1,5 @@
-DIST mkdocs-git-authors-plugin-0.9.0.gh.tar.gz 30785 BLAKE2B babf9c6b200ee3ea6839e4b35c78e83c727477b9dbaee027fda49500d7b8bb57ffea2d960a2ca979ee8cb2e499a004dc49ca417c4a96054dad27408e4bbb0607 SHA512 66527124217eecef80025517b1fabe9b81c3b65808f0c32610a8333ace2bec1dbb316ad35aec819c03482e9a09961f8cf84f8b1c2f5bdfbd5e270c07019f06e6
 DIST mkdocs-git-authors-plugin-0.9.1.gh.tar.gz 32985 BLAKE2B 4b0ba5ed91b809aa3873953018c80fe86e7d1d7df04b73de170b9cf546848fccdbcf5282b608c1197af27783856259fbcde945a53426c3e46c0927bcda4e9f5a SHA512 d93cef7d86961aeb321d2eb74487f69c0d775bc9e90445444e8978f624d9b9ae4af5b183c72ec494ad8d3e89a8d67ae81ecd999218adced597fff6a374132477
 DIST mkdocs-git-authors-plugin-0.9.2.gh.tar.gz 32983 BLAKE2B 3f709a180ee80b4553038a459b46684a367ef6c2f62bde4cb551d23aadb7ca701402e4b645d9b75c4d735346d4cd6f825821c23a391dca5264b750f2c2c544c8 SHA512 8933bbf828c239427b40a1a99ea014c1947400b46bb9a88beed6074420fb3b85d60083476c5daf88fe9e10e1f6a6cb5899dfd768ff6f12ead8d70f4bd3951b51
-EBUILD mkdocs-git-authors-plugin-0.9.0.ebuild 1302 BLAKE2B 89fc36eb9b3090ccb26ad20ab8ef6393ecd3896c0217efa40589c15ea72cb57042d35ed0fb150bb4087221947b6f23e369514ddfd87cdd07ca76839b8b0dbca9 SHA512 4ed8f889541bb54621c6f8e726e30b57709d8d01982f65bafdb40cc238bb768dc377b0c1703eb34ada2acf244039b1dbbbe475b53983c37941c9c46970ad767c
-EBUILD mkdocs-git-authors-plugin-0.9.1.ebuild 1305 BLAKE2B 10ed284eccb78c142eb7541a335c42a99b07032a9656c96fee64b08004486ef5033c758c0e58128134a46bd4ffdb6f69e6d15628f262bcf43e1348cc4a5ce8d8 SHA512 66936abc73bb2fa0b10f1ec82881a21b81a49dce44fe67e01eb7eb33c959142c3acdf6d45ddaf918f6242005fded0f1e2eaaba567741825ce3731c69bb7440d1
+EBUILD mkdocs-git-authors-plugin-0.9.1.ebuild 1302 BLAKE2B 89fc36eb9b3090ccb26ad20ab8ef6393ecd3896c0217efa40589c15ea72cb57042d35ed0fb150bb4087221947b6f23e369514ddfd87cdd07ca76839b8b0dbca9 SHA512 4ed8f889541bb54621c6f8e726e30b57709d8d01982f65bafdb40cc238bb768dc377b0c1703eb34ada2acf244039b1dbbbe475b53983c37941c9c46970ad767c
 EBUILD mkdocs-git-authors-plugin-0.9.2.ebuild 1305 BLAKE2B 10ed284eccb78c142eb7541a335c42a99b07032a9656c96fee64b08004486ef5033c758c0e58128134a46bd4ffdb6f69e6d15628f262bcf43e1348cc4a5ce8d8 SHA512 66936abc73bb2fa0b10f1ec82881a21b81a49dce44fe67e01eb7eb33c959142c3acdf6d45ddaf918f6242005fded0f1e2eaaba567741825ce3731c69bb7440d1
 MISC metadata.xml 551 BLAKE2B d6b33c0cdc84cab078109ee4e6b896373309e41d348598487fb91562873f87d898bd7ad46d35615c35a56ddc0e6d4189da9b11f395cf7783ef72f4a30f0d9c6f SHA512 aa06a7c33d78f920cf9f0ddc213aedaef8f4fdde39c78cabdfdd6de273e5ffdcc99bbf3ef92d6dc9bf7a252c134f953dbe3c3eac2c599a904ab2bb193fe2a505
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.0.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.0.ebuild
deleted file mode 100644
index 092949b40893..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..13} )
-
-# Requires self to be installed to build docs
-# TODO: Do this a bit better
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/regex
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-# Tests are broken outside of upstream git repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	use test && initialize_git_repo
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild
index 363bb4f9f2ad..092949b40893 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 # Tests are broken outside of upstream git repo
 RESTRICT="test"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index babb5ba627bf..8a69e8e9ec45 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,8 +1,6 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-9.5.42.gh.tar.gz 14763147 BLAKE2B 3f45a3d40e77ef822c0a661ca3b8234d7098029f5a259cde631484aa92311c417b628a2b532e8df88d08d116dec7520b2c49219e5e6f6c0db7491bf260cc46c5 SHA512 96e5c8db3dcb047a9eb0df1c686f38238807f44c22554311eb86ac17dca5c6243996b2b8d5bc2745a611a6ca21da0657b5010889fbcc3a038311c816eaf846f5
 DIST mkdocs-material-9.5.43.gh.tar.gz 14762388 BLAKE2B 49e5591aa3669c7bc8a8cd1969d3a54c7575958303742d5169023dd0e8c42ea6beabaa730b388e144d06dd402be7edac92a51d26ee40c2e90c2d19b8779afb6a SHA512 f7930ebcecb2cb37ec9a462f7a1a68351e73f745db36a85bac4c07797582e0a64a28936ccb85f0125ff5d3940768627f5b51c425b2d3b886663e904c607ae629
 DIST mkdocs-material-9.5.44.gh.tar.gz 14764147 BLAKE2B e0aaed852abd060eee0b9049798a327a4ddc5969a84289b8aa983b0dfbe926b2e0dfd13525593c2783106bca882adfcfad7961c2eb0363a1f4a4131c364c42c8 SHA512 9a0c8d4a52c8b44b9c8e84b57839d5ddc3080eaa136cb6effc3da8eb9d08a2ef0c0898ff875afabc1783ea548653a9b00f00db67ceb48d52f323a93795529465
-EBUILD mkdocs-material-9.5.42.ebuild 1795 BLAKE2B d40d456ef9179a103d8cb796cff20423c5c8f17bd036e9d47fe8afbf54ae8b187c5da92b7d3cb58325bd713e0aa8588e815d34653d3fcd361f3b6bddd96c5a25 SHA512 33821bf437ceb16c01028223d98b111b02f1d128a52763b32f13c15cd5f2bdf2d976fa353b98233ef5bf40e2043e3b954be2f8eec46d98cfea39c550ab70b529
-EBUILD mkdocs-material-9.5.43.ebuild 1798 BLAKE2B 732691faf3be1adef90d241b9a1477e69a5b0331a53afa1b3b396ac93f573aa1d9f0790b1abeec3b4f8596ae1eebd07bef6590260823356f1150168fa7785394 SHA512 0648cd95360d3104f3211c358bc977446f25eeef327d104ecb40d2bbff3a35c1c718e65ed662a3933377b82eaea407d537f3ccab857d9d1cacc5911bedae915d
+EBUILD mkdocs-material-9.5.43.ebuild 1795 BLAKE2B d40d456ef9179a103d8cb796cff20423c5c8f17bd036e9d47fe8afbf54ae8b187c5da92b7d3cb58325bd713e0aa8588e815d34653d3fcd361f3b6bddd96c5a25 SHA512 33821bf437ceb16c01028223d98b111b02f1d128a52763b32f13c15cd5f2bdf2d976fa353b98233ef5bf40e2043e3b954be2f8eec46d98cfea39c550ab70b529
 EBUILD mkdocs-material-9.5.44.ebuild 1798 BLAKE2B 732691faf3be1adef90d241b9a1477e69a5b0331a53afa1b3b396ac93f573aa1d9f0790b1abeec3b4f8596ae1eebd07bef6590260823356f1150168fa7785394 SHA512 0648cd95360d3104f3211c358bc977446f25eeef327d104ecb40d2bbff3a35c1c718e65ed662a3933377b82eaea407d537f3ccab857d9d1cacc5911bedae915d
 MISC metadata.xml 1133 BLAKE2B 539649e3b6efda18535738e45078b7b35f8226034b18c40ff5feae249a4dc5aa6b4a1247a712564ab5b7cee1f62eda4e3bbb709ea7970d2fc279bc48ab1ee934 SHA512 72a58ba3f100cea6653406c3a314b1b67225d118fdb8323e54b6ae9bcd2224a00d01cee96b6564fbbf19de6e5fe5db54143aaa56ca2b7cf8c56fcd8c8c5cf6ef
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
deleted file mode 100644
index 654bfdf48051..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
index 8f658065d0a2..654bfdf48051 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.43.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 0c5319d63af5..c984f6a6ea80 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,3 +1,3 @@
 DIST mypy-1.13.0.gh.tar.gz 3165219 BLAKE2B 67e05628fb79666a84a7c284c8437222ce159260ef490c8c91a3f92fd21985032043821823dcbd0fb8775956ca4660b3468c6955fef5d13a104b3339b1e6a0b5 SHA512 a351a30bfc7ac687d4802c6459296a4a46356fc153258c686051fa3cb149ab3e8690357cad21cd6ab07b4fb6e91dd3610b57f7b38078da7e563c114cd3ed562a
-EBUILD mypy-1.13.0.ebuild 3650 BLAKE2B c4b8cc29a7fc8628461278bf4f34fd73bc933cb94ba4eea29b3e397e94711cfd02c85f096d7f4be923a50bb151dcd8e99a77265731779a7d60464b70ff4f9e48 SHA512 10b56bf092e610836d85d2fae5655f210febf5dd0a6f2f9a6d3e96cfd51517766fb5106211f64afe9b064f20882ddba1dfe41ae054b24af60df05881fc779a79
+EBUILD mypy-1.13.0.ebuild 3841 BLAKE2B a77f7fc1ccbb032eb3210efc5261af3bd923ce65033e1ccd43b7a41d8c2af3f819d88a932943c5db8700ace17c19e14ed8229354ae071fefddf162e598c82be7 SHA512 721c269a99a4c53ff817a389118dbb4d660243e6a3147f10cb72cd28cc8a889a12f014922b3a6adf6f337d2d80551975a7bcc17bbdeb8f99ff40f77120c7fcb4
 MISC metadata.xml 661 BLAKE2B df57cc2dfde5b112f8c26b51ca5cc9e7727d318ee274ea7e1abf448819daf0307f471aeb7c32b19f20e87ce1ccffd47a5529415003765c275523e1b5236f3bb1 SHA512 eddd19c4b0b5211f73f9619f388a799ced108b62bb43d852ed2d01d0b1717e7b9ef118d34b9d61db543c7b47080fb8058c3d35f7359cc456069636f357e080c9
diff --git a/dev-python/mypy/mypy-1.13.0.ebuild b/dev-python/mypy/mypy-1.13.0.ebuild
index 6b11df394b05..11cd237cb444 100644
--- a/dev-python/mypy/mypy-1.13.0.ebuild
+++ b/dev-python/mypy/mypy-1.13.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
@@ -56,6 +56,13 @@ distutils_enable_tests pytest
 # test files (https://github.com/mypyc/mypyc/issues/1014)
 export CCACHE_DISABLE=1
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# don't force pytest-xdist, in case user asked for EPYTEST_JOBS=1
+	sed -i -e '/addopts/s:-nauto::' pyproject.toml || die
+}
+
 python_compile() {
 	local -x MYPY_USE_MYPYC=$(usex native-extensions 1 0)
 	case ${EPYTHON} in
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index b79ea4c9eb43..abb653a64588 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,3 @@
-DIST prettytable-3.11.0.tar.gz 57527 BLAKE2B 494f3ff0802b29a419f58310a0ad50ccd1ae39845ad5167956f68ab674a2b357d098e28426c8df6a889026eaf397593018070d441cff20f0a01b76c51470a482 SHA512 3da3dcaeef1f8ce224381a6a12e56a7220e7bf7bc6a99402cd0ae68703d0630beb42f6575c86981f1ff5f592283a990398d6dd1bbdcc21074f77cab4739683b7
 DIST prettytable-3.12.0.tar.gz 59539 BLAKE2B f484f90515af5306ed56fda516ac5fa6ea2b6acf5fdde9b3e6f40bd147cc19b4934819d169b1de96d6feaf1170a57556f43308f4bb82af680a7acbd2b6913642 SHA512 ccbbf2467725d1ea75b1d90468da2369f41de7cc0c15c67e27efbfee8d35bfeeba4c959752980561978d37fb603e1b7b17400b9e983876daa19456c790b492ec
-EBUILD prettytable-3.11.0.ebuild 725 BLAKE2B 768d54e9173784cf034b5a97fb5666c92b4f87f38f411b0ef2e62c1c94caf0aacfb0713fb85f60e20c4c31fba4d8d86e14104bf45c916c4bf1d1b1c88fc3f493 SHA512 7e38a4e46c87fe13be330444a8f41fcf733916cccebd71295477bb83195b799b866494024775ea1bbc36fbea2ad8d414318752233981bdaa8c8cbe2b17c5d90b
-EBUILD prettytable-3.12.0.ebuild 865 BLAKE2B 4a1a157e47d8852eddda0317d6ecac729d2bf2f2b86fe38769d025403dd0fbfcc3903b63b7888f0d25d2e89775270f9f3d6033fe93364001558ccb93b895ccda SHA512 186a13ca94fe2eec0ec65977310058e1403a2ed5c7b152713ddfd46603b6fbe9e8d10f472eac03c64e6885bffc7c7702bbb42174ae8102e99bf00b38224b1919
+EBUILD prettytable-3.12.0.ebuild 860 BLAKE2B 3bdc6d40285f99b907cb6abba0f26cfbc52edf39ea3d189f7a42b5686e95e6abb70ddfe3753e90cfc930079d05c7a014b41119adf70b332a9493de326fe5cebf SHA512 872a14c117855ef93bb7c6cec00f271c78d865ecc0b31cb04415933781f634a21c6aaa0eb1495a0362ca31be3f4fc818c26b20546163bcbad6c861ad1264081e
 MISC metadata.xml 528 BLAKE2B 21627ff0b6f1e48b09a0a701047720a70eb58439eb1f58ebb079bc325bea9bf1ed458010d6a171bdb6775f71d3fa5330d59c747825fe51de91d4cb68ada616c0 SHA512 4685264c305ca320d841d230179f29225862d4912fa7cfbe7151eea2d3792009716276eff1836a574fd532cffb86aac51c82a55357c02d27a361a208de649d53
diff --git a/dev-python/prettytable/prettytable-3.11.0.ebuild b/dev-python/prettytable/prettytable-3.11.0.ebuild
deleted file mode 100644
index 047d13630a35..000000000000
--- a/dev-python/prettytable/prettytable-3.11.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
-HOMEPAGE="
-	https://github.com/jazzband/prettytable/
-	https://pypi.org/project/prettytable/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prettytable/prettytable-3.12.0.ebuild b/dev-python/prettytable/prettytable-3.12.0.ebuild
index 3d4cac4245d7..025c47785772 100644
--- a/dev-python/prettytable/prettytable-3.12.0.ebuild
+++ b/dev-python/prettytable/prettytable-3.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
index d5c817e004a2..d30e34e491d1 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,5 +1,3 @@
 DIST pulsectl-24.11.0.tar.gz 41166 BLAKE2B 1dc94c8191d7c47e8185c2a31de380a4b3d0b945201e9643e225eb383c1ed101d6119571b5bfba118b28f9215ff0b2a446156af1fc86226280dbb3cb951bbc96 SHA512 3fa4f913a0cf5dca4e5d24019cd69f3045c3116693ad503f7de04e013be5141a3bcaeda72b73258372d56fb2f35bf321e09ca4c1ed1f6d8880124b744195a124
-DIST pulsectl-24.8.0.tar.gz 41171 BLAKE2B 58a16b07fcec68f21fd573cf781f2ac09ccdf2faa3e7afa84a4f8cf9f28111e94bf41e0f8a8740434edeace78156f56ac428a87d669cbc947e331b8d555dd2e1 SHA512 4638bb41611e8d7a00f2daeec7e7783789d5d1d94841206b4052e53897e6547c21f8410c3400e1bd301e237b3a72143fb6ff3d67cbafd06bada0a1d0da007c96
-EBUILD pulsectl-24.11.0.ebuild 582 BLAKE2B cf21cc4a02e86d920853c2342bab24250fe58ff85d04d36ea2a62625937d642d0a2fe2d75ba6f515ee5d0ccf44ab2915777e2c80e12328b7680a22c23eb42f60 SHA512 82928301f96ea5491747ff46103bceb9153f8e3ae744564ad0515027d8dc49b014756f58bad2c6a933304518869b9b26dda6510fe760f5a0a6126bb7fd6e61b5
-EBUILD pulsectl-24.8.0.ebuild 581 BLAKE2B bc378c0e1bd52ebdedf5ddc03c39ba9633854762e9a0cf052290b36c39bde68b309795b484d67914daba443fe564b6ac2e5d1fe7476ed5d3af6d7c5d74b93821 SHA512 a35c5890c05541cb18b0d3e95c422843ad925729194627507f3923592025cbcd3cb04ec4d707b1611f2778d5b5269f303286bdf851fccb2931b0cbae279db798
+EBUILD pulsectl-24.11.0.ebuild 581 BLAKE2B bc378c0e1bd52ebdedf5ddc03c39ba9633854762e9a0cf052290b36c39bde68b309795b484d67914daba443fe564b6ac2e5d1fe7476ed5d3af6d7c5d74b93821 SHA512 a35c5890c05541cb18b0d3e95c422843ad925729194627507f3923592025cbcd3cb04ec4d707b1611f2778d5b5269f303286bdf851fccb2931b0cbae279db798
 MISC metadata.xml 558 BLAKE2B 6cdebbc1f507bbab92256bbac867a86468b733b40dacfdb71090738f5505ea6ac33b24cbeb06835e10d9845e3fd9189a6c34625176f12c9dc7f4a1511069e8fe SHA512 b15eaa0564bc6dadf8d46eab154d028b4cbde26fa099793aa23df8f82eba86a4125d173eca8a8d2d73359dc67171dca9d8716e1495168c7b6c8ff5c701a21577
diff --git a/dev-python/pulsectl/pulsectl-24.11.0.ebuild b/dev-python/pulsectl/pulsectl-24.11.0.ebuild
index 693b086854aa..a26679e2fc15 100644
--- a/dev-python/pulsectl/pulsectl-24.11.0.ebuild
+++ b/dev-python/pulsectl/pulsectl-24.11.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	media-libs/libpulse
diff --git a/dev-python/pulsectl/pulsectl-24.8.0.ebuild b/dev-python/pulsectl/pulsectl-24.8.0.ebuild
deleted file mode 100644
index a26679e2fc15..000000000000
--- a/dev-python/pulsectl/pulsectl-24.8.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
-HOMEPAGE="
-	https://github.com/mk-fg/python-pulse-control/
-	https://pypi.org/project/pulsectl/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RDEPEND="
-	media-libs/libpulse
-"
-BDEPEND="
-	test? (
-		media-sound/pulseaudio-daemon
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyarrow/Manifest b/dev-python/pyarrow/Manifest
index aaf198708b5a..48f6dbce0d14 100644
--- a/dev-python/pyarrow/Manifest
+++ b/dev-python/pyarrow/Manifest
@@ -7,5 +7,5 @@ DIST arrow-testing-4d209492d514c2d3cb2d392681b9aa00e6d8da1c.tar.gz 3572558 BLAKE
 DIST parquet-testing-cb7a9674142c137367bf75a01b79c6e214a73199.tar.gz 1068025 BLAKE2B 0fdd12d04108b27b17564c60ca36e751453f5d74cfbbe3a076e8befa1696aa0f093e2d1a5eacb99e69a98deda502930ba79b8329403af1e8b9d696e6617c6075 SHA512 dd221d9d59442cebb7158d7cf769d6e5323416bfcde2852eee37a26ff089bc04ea10b9ae7158a37d8694c10469d77c7d251d0dd2549596a7b3899d9c39b45997
 EBUILD pyarrow-16.1.0.ebuild 2629 BLAKE2B 7f6daf44bc3d5aa3257559ee56367a91d9437f78314febfc4bd5b00bd61f5d6255f1ff46efb15a56df4a945f6e56b79e512ed090afec5187a3d31db9faf55aed SHA512 14946af7cb7e1b39ac6be8dc4ea5fc70abe3f8e5f86a294567204928b0f81b0e352dcc288ca251ee70a79340370e2bb5bbc2f7dde41b041c4937885ddca04392
 EBUILD pyarrow-17.0.0.ebuild 2842 BLAKE2B 99c74928ef1544993a756771667099c2b4413d635101c3fada35553b0d7aa6728d72591301ba4af1f104d9cc262250c873cd4a19eea7685bffeb70c3b6803bd2 SHA512 671f2761535926a96cfec1c0d04a6a5d4dc6d8790761339b0100a65ff20b1e36baf309884f1bc2d1fcf968531a2478c6937ec4cfd1fa3c3c5057a6261e15664a
-EBUILD pyarrow-18.0.0.ebuild 3301 BLAKE2B f93ab98a92e1cdea2dc7ab65870ab850b900a03fc4f3252c5907fe2b5b5453de69ca8c60ca833b6d40e62fdbc93a46ad49f71abdd70766d22aac3d14e505ea65 SHA512 9496ab3430ddb9c4cc2acacc127efd34c8b775a9f5da0a9ce0c0aac8f4a603be510823328d0051448d983016d12af015705f9086584ab7f1af25f78d78190e9d
+EBUILD pyarrow-18.0.0.ebuild 3299 BLAKE2B 5142c08bfb6247887ad623af075f3d2243b959857a7561b9507c71db8c4a57dc0663350c14a9d52fba96ea650435cdecbb98c39b07fe9344cea3105ea55f30e1 SHA512 cb01fc93413530451e90a57794d4fe8cef798d66c4ba8328dfee0e9d0c259f4bf97f8eb44c46e5d8a44e7773358bd935b5d7fed67c8fb6cde581149586bd6dcb
 MISC metadata.xml 555 BLAKE2B 5683205ece2b0266e5792f42ebd515c1822563d2705f046ebcabd1de71efc67800616303b2fc83ea8cac3395303178f13e859b7390adfcef23da8d687fc8d6a3 SHA512 61d8f5bcbdbe92b858d0aab3040cd3e8dcb33ba0c45808649e032a165d6826c1a489ae2cfbf8dca52eda82d5b24b4c3f74a9abd6f87d5ff72f6578cf7535c797
diff --git a/dev-python/pyarrow/pyarrow-18.0.0.ebuild b/dev-python/pyarrow/pyarrow-18.0.0.ebuild
index 4883d3daef9c..96351dbc7b04 100644
--- a/dev-python/pyarrow/pyarrow-18.0.0.ebuild
+++ b/dev-python/pyarrow/pyarrow-18.0.0.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/apache-arrow-${PV}/python"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~riscv x86"
 IUSE="+parquet +snappy ssl"
 
 RDEPEND="
diff --git a/dev-python/pyasn1-modules/Manifest b/dev-python/pyasn1-modules/Manifest
index e8468530388c..155a8be4cb1e 100644
--- a/dev-python/pyasn1-modules/Manifest
+++ b/dev-python/pyasn1-modules/Manifest
@@ -1,6 +1,4 @@
 AUX pyasn1-modules-0.4.1-test.patch 6150 BLAKE2B f90e13fdaa1be173ba568024541c4074f023d0140e3945117abe117e8acdb9a6172107d79214757a4e18deb08d2ad47999a7107b77d1a2d7ccf1a1e0d44110dd SHA512 ef3d7e8ba85bfc896b2125946b40e81dc50a0ef9125eee213bc395422cc3bf99fae76bf40392efb7202eda0a86cb9238ccb879620483fb72415fc4b899338afb
-DIST pyasn1_modules-0.4.0.tar.gz 307859 BLAKE2B 7808c3ad72cda2292fa358a066cb401884a785281c5ba3c28ec5cbf1a7c7408031ff1018f4e0c4e53ac227a6b7082bb5572216ab12074c90f0a3159330ec3f35 SHA512 d28cbb44788b3a33b9da807d273a6afab38ff420e8ce1264a9ebc68beb003f9ac9673210a5eb829d17ed1ae01798f856a0409dcbcd1a17b489c767d4b11467d3
 DIST pyasn1_modules-0.4.1.tar.gz 310028 BLAKE2B dcffd13196982fb9f4808a789252b9c9910bff3c3eb3e852d13cf1e1285bac4f2900dc62698d9929da4ff882e5d823f2e5290fecd1488e5b61d04c62fe24e2ec SHA512 d3716cafbfe940c5415cb59073897cd15d69b9723064ba581b7d573fe9a0fad9872d88517fe03b0db5b4fa93f8cd3254372e71d60ff5975013c97409b6c22d1d
-EBUILD pyasn1-modules-0.4.0.ebuild 728 BLAKE2B 79aee628d2a7d1c5da5655b5bd9edb3336f7684c21a6454aec8df5c930475fd90a1f8fafd99074dfd77a725030ccf1be093ad66d3bd6b8fc9e69f4f9bceedc77 SHA512 201d5826cf5251d757a5acc9d6e3b0c8b00cb2232466abf3415c25f3984e0032c8b197918a6445ef8bc71da0f0a1070ee0c1211045115628d253f16a27ad1788
-EBUILD pyasn1-modules-0.4.1.ebuild 832 BLAKE2B 2204d3dc3c2436fcb887de6c52f8faa49ecbd6a3c039bd2281e1d687744f44f4c53964ccdd9f3c342d85b561f313ac1e53bf89f3ba07be3c4949db39958a6fb2 SHA512 ea50f30f6890639a9c38bf121793864aac7561135c84ec348c888c73f6e9a98710acc4680452188f00006a51193231281a190195c2750b6c5da867e6ac320229
+EBUILD pyasn1-modules-0.4.1.ebuild 824 BLAKE2B 3cec59a1f077a5eb02d27e7d76d90a8ac80556af8c57e1ca79fa2559965ab15074c69cb57b26126d42560be9441b281d226b5b84f9e0a887bd55b34839f93884 SHA512 b5ab1930c8c06a185eb663ce6eb4e7d4850f16bada42d6f03f41b3b41f9c43d387a6782559195d3d068f78e531975598eb7a447afde821cd666205563f61ba98
 MISC metadata.xml 403 BLAKE2B 2377224f9e8784560e1cb62b77e5bc22c225e815535d1e99aca5453d6155addcc4edeb6252131f7721d82ef6ac296cc82ba2cc58b824f3d71a6ff1c44e4fb7f9 SHA512 1978f00f1590cc46567ea1e565b5adf311b1d0384f253ff6422b76306f70f3def2eae00babe7b36e97c5bea2c81c8488c8c8df1d1f618fcc201a4a7c68c94d2e
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild
deleted file mode 100644
index 2d735d56a271..000000000000
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pyasn1 modules"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1-modules/
-	https://github.com/pyasn1/pyasn1-modules/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	<dev-python/pyasn1-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.4.6[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/${P}
-	doins -r tools
-}
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.4.1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.4.1.ebuild
index ebaaaebce833..ae71390dbf5d 100644
--- a/dev-python/pyasn1-modules/pyasn1-modules-0.4.1.ebuild
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	<dev-python/pyasn1-0.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyasn1/Manifest b/dev-python/pyasn1/Manifest
index dc0d13a8f803..f6d58b51c325 100644
--- a/dev-python/pyasn1/Manifest
+++ b/dev-python/pyasn1/Manifest
@@ -1,5 +1,3 @@
-DIST pyasn1-0.6.0.tar.gz 148088 BLAKE2B 42ad0d3478c6860b035e27627b019b94b1f39cee8ac62c289349c4fd24e129e1a20f13b57b69c0e5e1376f59524f715e3c42ad2b8e0ed4774000418b74ea8506 SHA512 577bbb750a00e82e7a00806da6c564ab863341e0aa57b74e3132e1be814e0349e33ff05d48c04e58cd514ce97a971a5eafbaae75c978a3eb9268008c2270d15e
 DIST pyasn1-0.6.1.tar.gz 145322 BLAKE2B e3f55b01e88aa14e47bcb2a2296ab48eb950b2a80184c525ddb7f7871ebaf2402c28e8e56f1d87b635eb59745f6b717324f1d19c0f0c8fee27474ea78ca1cd7b SHA512 a85036aeafc899b72a0dbd6adfe43d6b4d6ac8e79e2c8a043534ff9298c3a1942aeac42241fcc8a57bf89a9be845fecb01d3814bf812260ec7f370fa2f56e774
-EBUILD pyasn1-0.6.0.ebuild 558 BLAKE2B ee66955dd01692f0a0f04e7776de4ffea44d3a6684ddf5408606b6596cfa8e4c17192abc27f6ec806756691c8cf0b721ed07e7ba06a01c442660b2703ff71b56 SHA512 9c4676d714c441e3bd005db713827b74881fd6bee53bbc1849a1d29b765583abbec09d4bb63ed5205111cde3601afbed3a3d86ff5b4311e6f040b201eeee0f55
-EBUILD pyasn1-0.6.1.ebuild 566 BLAKE2B b4375e2b1419c5a227712985e42af3d635f67852f28599a25b834d36100fe36615456cc4465f3c5777d785ac575257f56759a2400300fe109169906b71bca248 SHA512 8dcb7ce0dee0d723cd8cf985a9b58a8d3849a9aa4554e7b2369ea0db3e36231d624de5ea76c7299c6ddf6003523dbdef2fa0439f85f4f5fb2b226eb14ecc9605
+EBUILD pyasn1-0.6.1.ebuild 558 BLAKE2B ee66955dd01692f0a0f04e7776de4ffea44d3a6684ddf5408606b6596cfa8e4c17192abc27f6ec806756691c8cf0b721ed07e7ba06a01c442660b2703ff71b56 SHA512 9c4676d714c441e3bd005db713827b74881fd6bee53bbc1849a1d29b765583abbec09d4bb63ed5205111cde3601afbed3a3d86ff5b4311e6f040b201eeee0f55
 MISC metadata.xml 400 BLAKE2B 7e261648a014ea61d284932a725094b1de4ca82395f37a365d0ab46a5a4e4a0bdcd94a95cf946fe6737e1de1e93984e91b574e98987d1870941dadbeb0411763 SHA512 24e677c462405c936bc7c926096ec269b8d935b7218bc1950a5c5063aa9b0fd3d176ca9bb3617d46be10a3791463e5aeeb58e4ed53b315193b91d0ff74b045d0
diff --git a/dev-python/pyasn1/pyasn1-0.6.0.ebuild b/dev-python/pyasn1/pyasn1-0.6.0.ebuild
deleted file mode 100644
index b867bc24b661..000000000000
--- a/dev-python/pyasn1/pyasn1-0.6.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ASN.1 library for Python"
-HOMEPAGE="
-	https://pypi.org/project/pyasn1/
-	https://github.com/pyasn1/pyasn1/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pyasn1/pyasn1-0.6.1.ebuild b/dev-python/pyasn1/pyasn1-0.6.1.ebuild
index c921ae6cd9a3..b867bc24b661 100644
--- a/dev-python/pyasn1/pyasn1-0.6.1.ebuild
+++ b/dev-python/pyasn1/pyasn1-0.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests unittest
 distutils_enable_sphinx "docs/source"
diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest
index 8c7e2f216b41..ff77c8bd4b1e 100644
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,8 +1,4 @@
-DIST pycpio-1.3.2.tar.gz 22449 BLAKE2B 9f183ccb44552295c1ddf83102865b59f00f387302cbfcdf4cf226bd72a7e6b49883db8c0fece50904c4dc4891f8ee2b513e3192d95f74dd673e3c71e13817dc SHA512 d5e7f4f59e91944bf3c49cb3da79e34b11167a39374036906a3c1fb2230992ec31c1c51880cf26ef3682a58a5082627635576bd697a4b972edd9d62ade7e9130
-DIST pycpio-1.4.0.gh.tar.gz 22518 BLAKE2B 192ce37d9ffa1e049ff7f11494a01295f28efbb4cca08b0a7316ea130a4c5d8edf51101a2e07276d4a24fdbca01644082489cb531ad049ad8ce4c801e90d6add SHA512 3fc30159ea14ec16ca30031df2e1624e92b3815829e00eedeccb41b3fb224c17d1af18d2d544ccf677094f6ab5c7d76407bc8d316c359fe8620ab350aed080e1
 DIST pycpio-1.4.1.gh.tar.gz 22532 BLAKE2B 590f2df7f2d8b93d7d16b8ff11ae6ecc947ab9032a6f0db2acdd8e72aeddc74aba93d511b14306df7eb6716861f64d0b4bce70dfc174658679cf9421ca3f6932 SHA512 a7ac927b555d8f9e8ed41f676aba802faa31780252a991eff21bc90d00daee510c335d9d65822333681cc505de5bdc4ff395cabb0b0b9748621ad000fa02cf61
-EBUILD pycpio-1.3.2.ebuild 547 BLAKE2B c70204298f9d62866e9a0aaec13666c26cad7be62f3b6016744be9f897dd01b4a683150dad101dda0f2aade26aae720878f9a488a44b9cefeee89c4b21c42852 SHA512 db4f9ce7209ecd3f922d56933ac39b24114aa2d557d55b73b701d2f766d66f16c593b29f2155f6bc2f0451685d2101dcf945de255fc491669733b2f33e66dca7
-EBUILD pycpio-1.4.0.ebuild 563 BLAKE2B 3099828d7185cab8cb03ea6a5291536e3285961919fab561abfc00ecbb44b93045d2cb798986bbaa16806c7c243d06524386fe916c02ae2a6cd0f20e8adfe498 SHA512 963545c5164db7ecb4ba7b28829b4e63632f06264f7968cd3aac0378c00d4a4415b52fdd92b9afc5a6f12fedcd4eccbc750cafd26c1e87909f2d6359291bae64
-EBUILD pycpio-1.4.1.ebuild 563 BLAKE2B 1b6c1c1d6bb61b3fccd1fa5be23a4fa00d0ce22ddb16d977a9ed25a00a79ffc93bb0cf78869bbaf9e738e53494cf16beaf64c93b81a7293b6943eff2af4dfd16 SHA512 c3ca8bc580a56557b139fc966e703d1958f11c168eb7ae8cd35327a99fd344eec1d7580f3148d88b7ad6ba1bed425368774dfeec85901a144c8848bf081180c2
+EBUILD pycpio-1.4.1.ebuild 561 BLAKE2B c70e1c3776d70242d309592884b14a90ad8e8e5c348b2bf7e93871edd166df47486b4f7eb79e1eaae78afa5ff56d35e237d1d4160f20b6c723514c1a377fdcc0 SHA512 498eb6de59537b5d7161486f641677d78aaf299234e8e9b796c99e588c667cbb43f839971aa26822729cbc4aa58b878d09088f1e1cf43c0686f0191012b18d78
 EBUILD pycpio-9999.ebuild 495 BLAKE2B 078968c053cdfc5c1495097dd0aa6ce9544956a55198059b12f4cabcc1c76ffc591cc60db1f25411d9e1f27d15d4458d575a6732f3e1a40be6cdbde49a3b8d59 SHA512 e7233323ef2f643e1441ad8bb31b9322060078a0529a3f2a4745617b7641d120abb4539a05640e7265c373ab80f05baa4d65d95e3dde8e9e1b5c89ed990fc53a
 MISC metadata.xml 448 BLAKE2B 4324185ef695587de96b7df3e5edfbb8046c8d40902181fa581d3f1f02fa0085d6fdbc15d59032a28f0145a5bb6aa939b38b353168d5a69b6032950876b97f5f SHA512 a80d14c870ead81264b4e8295825955fbecc7f2296fe2fbd880dd5fb2e4c41e84378690737db7b13cd4736c15cac510ff56c5fd87fba75c5c38d7b7be84da6bb
diff --git a/dev-python/pycpio/pycpio-1.3.2.ebuild b/dev-python/pycpio/pycpio-1.3.2.ebuild
deleted file mode 100644
index 11f44cbfb0c5..000000000000
--- a/dev-python/pycpio/pycpio-1.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio"
-SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-RDEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/pycpio/pycpio-1.4.0.ebuild b/dev-python/pycpio/pycpio-1.4.0.ebuild
deleted file mode 100644
index 72159d6fc2a2..000000000000
--- a/dev-python/pycpio/pycpio-1.4.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio/"
-SRC_URI="
-	https://github.com/desultory/pycpio/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	>=dev-python/zenlib-2.3.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest tests
-}
diff --git a/dev-python/pycpio/pycpio-1.4.1.ebuild b/dev-python/pycpio/pycpio-1.4.1.ebuild
index 856b38d89238..256e6bca82f6 100644
--- a/dev-python/pycpio/pycpio-1.4.1.ebuild
+++ b/dev-python/pycpio/pycpio-1.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 RDEPEND="
 	>=dev-python/zenlib-2.3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index f966a3fb980f..83da1ee53444 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,7 +1,4 @@
-DIST pydata-sphinx-theme-0.15.4.gh.tar.gz 2396654 BLAKE2B 34293e53fe17568e65118702f1c55eb6cc0bca0d17fbc168fac0b495de581f094046bf775480ae608b711f2136c131e02163b2eed84dafa080e6ebc1b4eb96a5 SHA512 5cdedfa182a75c0735773627bbe738f31b36bc812051d4848676b33acf3b2a55d2bd59b1171c4deb4e7c29e8968bcade1f1abfa901c3c4dc8caeaf9e47cbba28
 DIST pydata-sphinx-theme-0.16.0.gh.tar.gz 2402696 BLAKE2B a56fe7accb28a82973076d19380600f188dc1e682158b2b77e7b1b0a0e6d6c2bfbed7ea4ac9bf2591ae8e4cccf529f7cf8c187afc044f152e22edd4515938ddd SHA512 4f5c48708d5aae21ed8f1827a4d805c893652b02612699468875d283180087c2193b4dd12b8cbe24a1cee1a748d5de9ebbe378d1ff0b07b2a57c0b349ea3c173
-DIST pydata_sphinx_theme-0.15.4-py3-none-any.whl 4640157 BLAKE2B cb4e067e1acdb8364e498c00f3f8d549a16fc90675511dca65968828002422a8048818fdf3881f9ca33e7368758501b096dd9c968498a273cf2f353ea9868d3c SHA512 0d5e22952e11f683be4e14e597f488a2716877d1d064fa9c52985fcfd6dabcd5ae7c48143a3ebfd26f6a1f933b18e69f5d938afc99a9bfb475a80f94b34c82e7
 DIST pydata_sphinx_theme-0.16.0-py3-none-any.whl 6739948 BLAKE2B 070ede0cd030b6c1919f5f7b54bb1738c5e6af8f74bda49d2d4be4ea99b79b0adf9283b6f837a785203e5c442f845f8f8fd0139c189b927b5d5642aff17894e3 SHA512 947f0a0c910f9ced070e3128822292d1a4a1bfe99f46802abe9589d7d5216aa5294d81adae3d47db5e88942184d7455a624a9061030ea9e6648b031cd37b2fef
-EBUILD pydata-sphinx-theme-0.15.4.ebuild 1370 BLAKE2B 7794a67891d6cbaf101c807d58f5e75dafeb45318d1698224513790a7862563731df69a2cac158081e11f34b0622947c4f86dcf47766208fc0f59bcd976bd073 SHA512 8078f93fa4559e51ce6580ba1332c7ccb5f3cfb2f199754d38102f89327a5781ac69638a14270ab2fd2527693ff48c606834af46c33a01f9931a16baca11616a
-EBUILD pydata-sphinx-theme-0.16.0.ebuild 1412 BLAKE2B 96ea0b550f1ce2aa18e6286294db6f94d237c4d535d2c548cc7a888d11476a92d704763df3775f6743203232ce58e360a372a8fcbc93f7eb3b7a1a6f7991d28f SHA512 997a4dd11e94116bd7e06809e749d64e2744115b5365d20d8a24b0f9c7837fa7b423705598c58d7d2caaa17a2f5706dcdeee821498016e2298e0456a64ef512b
+EBUILD pydata-sphinx-theme-0.16.0.ebuild 1404 BLAKE2B 099622df71e5ba874fb11919a90a572ee0db0b452d0f211ce8bc50770f2d196ecee9531f0b43c424b6ef8f39069d8f0163b46fc8b5272fd594d7eb9ca0608304 SHA512 c5d8f6edcf845719460aa4a1c605089118ba0addd61ef168f47145cccb523cb5968290c5f21e095c7ebc8fae97ca3064cb08f3f530aca6389efdc03a40803a1e
 MISC metadata.xml 519 BLAKE2B 51698f70d5fbecabfa5a93e6616e6554c75c51c0c97e5d01ed9883e51099dd5808e015f7731c1b26d1f31a6b1349739fefb64ae67c0e2ceb6d018b8d60c931f5 SHA512 36eb7fa0c5c04f501bea0fd85f7a14bf362a01bd5a0ba4d36c42188b92cdae2e66ea6992c2f8ebce75ed85a1483c7cccc763540cabb50ffa9493dace67d829fd
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
deleted file mode 100644
index 9d370e5c908c..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-MY_P=${P/_/}
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV/_/}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# pygments version mismatch?
-	'tests/test_build.py::test_pygments_fallbacks[real]'
-)
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.16.0.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.16.0.ebuild
index 1b5c8a0129f0..1ee8bac20ae2 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.16.0.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.16.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 8f28a8c9657d..d3932f941ee6 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,3 @@
-DIST pyicu-v2.13.1.tar.bz2 196960 BLAKE2B 8faf5faf1fb8246c07dfb5ace5c2ad7cf8c86a183e0fa48288c81f7de47422152af2a44392972d818542370ea6f91c592d8d520b49848389109e6b2c1aa3ee17 SHA512 f85dd31b6a505efd32c3d0ea1c996b51b9da8cdc7ce3b88c997573a4ef1506a6af7b76f48f86d64e8993878ae25abcd95b04f40ba7a4f38fbf3b4cefd79b8066
 DIST pyicu-v2.14.tar.bz2 198031 BLAKE2B f0b4e4162df9854c68dd61aae9b57f97793283e57658327cc41d8f71661dbe45e1b2af1fceb214187d031906a769f70e16085764af30b28ec190097f0f5663d7 SHA512 671a02c69c2ad5b0d6dec5eceeda87500d6c362cd8066147b5027d0b37211025deb7e231a29f977c98f9ed22201b554988418627aeb7a10164ebcdeaacab2cef
-EBUILD pyicu-2.13.1.ebuild 768 BLAKE2B b9ac766c78a136d5c43c3afae9b2c908e805bbdbe8db84a85a9b99192df009b3410350dcdb9521d97511ecc9198fc5900803a02c06fa51d0095adf3ecf244c67 SHA512 f8371ca1c56798389eb41daf1302938cd7803be3d946f34b496353fee398c464f7d1fd37d33c0a9c9dc429c89f3a09f3bac6fd2542e05d149e4e48af340a9e61
-EBUILD pyicu-2.14.ebuild 770 BLAKE2B df1f963324030ff82ebe42c5e7f145f8905482a5613701c4b5b8e7db903f4fe52e4ca7cd6feca9c0d9128014e04e7ef401453ffc14fa954ed788355eb9b0f89d SHA512 5947827574728399a2cc0817b1a04b0cc95a6870d1dc895bc18583007c99bce313aead7ceef44a2d8e9c36e2d2b3a92e5e04358febdbe42ffa914a38ef4c01ca
+EBUILD pyicu-2.14.ebuild 768 BLAKE2B b9ac766c78a136d5c43c3afae9b2c908e805bbdbe8db84a85a9b99192df009b3410350dcdb9521d97511ecc9198fc5900803a02c06fa51d0095adf3ecf244c67 SHA512 f8371ca1c56798389eb41daf1302938cd7803be3d946f34b496353fee398c464f7d1fd37d33c0a9c9dc429c89f3a09f3bac6fd2542e05d149e4e48af340a9e61
 MISC metadata.xml 309 BLAKE2B 342314bed928ae7326e7b3826923f904840cb83c54e39b0b8c1870db23ddff3f5c7d4c35604e44699af83df1f65a6889760c012662b352f91daccea26067c7af SHA512 06241f5ca1f3c022997e1c7b0cf8f778715c4169a8f0c33c1900ec7c6679e0404fee3c2f7bdc757d0ecbb58a3b1ccfb96d85dd4597a6bef60c058a658ce38b1a
diff --git a/dev-python/pyicu/pyicu-2.13.1.ebuild b/dev-python/pyicu/pyicu-2.13.1.ebuild
deleted file mode 100644
index 5a29047db1f0..000000000000
--- a/dev-python/pyicu/pyicu-2.13.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/
-"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
-
-DEPEND="
-	dev-libs/icu:=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest test
-}
diff --git a/dev-python/pyicu/pyicu-2.14.ebuild b/dev-python/pyicu/pyicu-2.14.ebuild
index 81bb2bcd0dc6..5a29047db1f0 100644
--- a/dev-python/pyicu/pyicu-2.14.ebuild
+++ b/dev-python/pyicu/pyicu-2.14.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 DEPEND="
 	dev-libs/icu:=
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 0590c87db289..b1e42601b243 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST pymdown_extensions-10.11.2.tar.gz 830241 BLAKE2B c4048ae6931e7c540b8fd97080daa2290df74be76933874c91db09edac49a272c079d8767b15f28ecee0bf2efa3569179f236d6c4e703dd0d324feabab8da3db SHA512 9636552de1a9ae4519e1c6d7ca7b9c6cd0eb8b4be27a844ea926937cfa00add0b9ca8894f3b8f95e7c95ef0b6012e9a5d0c5b8d0f9aa20d7300fb4878c6f91da
 DIST pymdown_extensions-10.12.tar.gz 840790 BLAKE2B cb0567072847b37a1717259dac2db06ca780d35cb6cde7b0b969f6b3cedf62c03db0f229f7d45feb69062bf5d62e149cb8ced7330a380e3e2ba30a5696138ce8 SHA512 4bf1decf0b44ea05b0df4a147f0aabdc9182e14f4dc5f731c74f851764f9a9bd38a3bd2a1a0e619ca6aa3c0898989f4cc97df500e9cd7a6067e2d75722b113dd
-EBUILD pymdown-extensions-10.11.2.ebuild 716 BLAKE2B 27275e4a6432d8f8c4d682c5ce0bec5ffec05f9768b39d3e74652aa092056fc1e39100799150e4346f5a23a14e8dedd5690041098123dca668987c637764f262 SHA512 3d170cc203987a3d7f2513a96323769f5eca4991706555d8a93cf22d087d6854e357eb885a1e5089c1853a32eb936607e442f2d27a6e83024a682748c477fd0f
-EBUILD pymdown-extensions-10.12.ebuild 719 BLAKE2B ae1ad392f5db068b381c94da4d2f347d5f5e42530e27c7417ac6443a8961c890a5fba8f32fae1ea314d5e036523813791b051721106bc4e76d3abeb770451286 SHA512 0aa712ee104fe3f72d072bdfe49f4544f0549c0f978bfa0cec5388cbb4b05d4fe7dce19f5fa7e6c015ed3795b90f2977c66f03332350b1dd7f3dd8b10b1cf68e
+EBUILD pymdown-extensions-10.12.ebuild 716 BLAKE2B 27275e4a6432d8f8c4d682c5ce0bec5ffec05f9768b39d3e74652aa092056fc1e39100799150e4346f5a23a14e8dedd5690041098123dca668987c637764f262 SHA512 3d170cc203987a3d7f2513a96323769f5eca4991706555d8a93cf22d087d6854e357eb885a1e5089c1853a32eb936607e442f2d27a6e83024a682748c477fd0f
 MISC metadata.xml 523 BLAKE2B d637dfe0f1c80870592bdeff2af5e9f7d176297ede17f9e9fdf6b8847b120cd6aa76eb44cadd1248eeff1b4a6a4800781aa0b6dd43a56072d516a7df2ad50616 SHA512 c996a2ea6886e9cff9bea1b938167860b021f99b37f7a850fb993c722976a0e636f28daf6b536c612e6f7b46fa523c8895d248bab42f0f3d65ecd41d467563df
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.11.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.11.2.ebuild
deleted file mode 100644
index acf98580e863..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.11.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-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.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild
index 8447dcb9ba40..acf98580e863 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.12.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.12.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.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index d9798cc147c6..228b48fd9e96 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,6 +1,4 @@
-DIST pypdf-5.0.1.gh.tar.gz 8014103 BLAKE2B 27b7533e56e87b0945058a05aaf6079d7259705c01d4d8601e46b1c5947918d155664250cc5339afe3a3a4cc926abfb34502a7048aba91d67b2bf3661169df72 SHA512 3109164a5fbcb03c397e371802dd8502f78ed31acf38fdf7cf25be959427614ba0cb05662bc7791d8017fa4adb9438e7bba6190266759286f7a82e5618718023
 DIST pypdf-5.1.0.gh.tar.gz 8026822 BLAKE2B 068490ced3dd97d7c08fe87620b68a7363900ea4b9875b52ea525263ba9240b9ce07f1e98c2fe13167c8f9aa58f9a4280b4eb2ef899ef54efa58a8c1ce02f38c SHA512 2c13b0622fcad1faaee41e82489d12f9f2006822487412eda6108bbec68b37bfc2e94510f29eb0f3a9af788c5d99142fd64f28ed3e464ff17dbecad0442dfd2e
 DIST pypdf-sample-files-8c405ece5eff12396a34a1fae3276132002e1753.gh.tar.gz 11748093 BLAKE2B c5989200893b28a3c2062bb024a5cfc6f3389dc259ec129857979fa43469e1274559612b4d555499e2c7e16cf34be07825229932bf4d147fa6d7324d043e97d5 SHA512 c9771129b7668a2fd1fa79bb859ae9213f3d60341cf1b9937ff0eaab0de9bf4c35adcb7b896e93329038dc0f3809a0c697c523f8fe41b43030b0b029a88058e3
-EBUILD pypdf-5.0.1.ebuild 1660 BLAKE2B 3f48ae6da3e588de31a32bac9b5a49d3ce935b76422faecd90a859096511a76725f8569fdbd72e4b91f466387f1814e63e3638f6275ce7b4dc13f58a17a03992 SHA512 2e735e20eb7b4491d47998b1724b4ca8abe00de2096d50646f9b900c7b30fa154bbdc8e1bf16d02ed2618da32bd46a9e01c97294bd5c4c0103ee00e4fd2a2161
-EBUILD pypdf-5.1.0.ebuild 1663 BLAKE2B c7d25ba9e7ef1578cf759f515c8ca6f03fc346126dc5e517845877e31a8b60d61e19c4997c88809b9854928c330940910ece7f4170e2dfa60a6cc1e593fe66b8 SHA512 a555afa14553ac27444b904c4f6842c02f70de6b5321ad198ae75d5ee00d83d30768eaaffa8c1c96dfe26d8784adc6133e9dfc6f7f0d8c42338295745e8d8c74
+EBUILD pypdf-5.1.0.ebuild 1660 BLAKE2B 3f48ae6da3e588de31a32bac9b5a49d3ce935b76422faecd90a859096511a76725f8569fdbd72e4b91f466387f1814e63e3638f6275ce7b4dc13f58a17a03992 SHA512 2e735e20eb7b4491d47998b1724b4ca8abe00de2096d50646f9b900c7b30fa154bbdc8e1bf16d02ed2618da32bd46a9e01c97294bd5c4c0103ee00e4fd2a2161
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-5.0.1.ebuild b/dev-python/pypdf/pypdf-5.0.1.ebuild
deleted file mode 100644
index bb6cf2106aca..000000000000
--- a/dev-python/pypdf/pypdf-5.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=8c405ece5eff12396a34a1fae3276132002e1753
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/pillow-8.0.0[jpeg,jpeg2k,tiff,zlib,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/test_reader.py::test_decode_permissions
-		tests/test_workflows.py::test_text_extraction_layout_mode
-		# rely on -Werror
-		tests/test_utils.py::test_deprecate_no_replacement
-		tests/test_workflows.py::test_orientations
-		tests/test_writer.py::test_remove_image_per_type
-		tests/test_generic.py::test_name_object
-		# Internet
-		tests/test_generic.py::test_calling_indirect_objects
-		tests/test_writer.py::test_increment_writer
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-5.1.0.ebuild b/dev-python/pypdf/pypdf-5.1.0.ebuild
index 86a783051785..bb6cf2106aca 100644
--- a/dev-python/pypdf/pypdf-5.1.0.ebuild
+++ b/dev-python/pypdf/pypdf-5.1.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index 8177fecf3e5a..a019b99ae778 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,3 +1,6 @@
+AUX pyperclip-1.9.0-fix-test.patch 1349 BLAKE2B e36a77bc94a90c6a0c5c2c982ca4ed610c6b474fa133640cd5b6c513dcffa618a696fe917ee56b9661e26465824a48687020c32d5221ea3546c44f7739237c0b SHA512 26e6956237b91fdfc9c9a152fe91e641bc9540b824c8a99aa930ec1da916646665a726386bacc2fc37d5b81bf8bfffbd5291527b39b9bcbf25504f4047657ef4
 DIST pyperclip-1.8.2.tar.gz 20920 BLAKE2B d14a7d977b434db5ae3218792ccd73428bab244a6f6a92d3fd7f059ee99f841853b69a8e039a8192a6cca693adc943a93f24835d25471888975b306b7be4a36a SHA512 ade0cdf2bfdbe3ce807a02b64bb1e839afc9955254ddeb3e0fe7c1dd9fd9fddc11f8386a02590690b039045b46e9103e4d094f1bad3e272f532fda4db5ed1c1a
+DIST pyperclip-1.9.0.tar.gz 20961 BLAKE2B a489268724b7beb82ec6b28c11cbb5fe04393a800297e4f71aace7232c13b68ce05092ca949f5cdc8257343b8e8f8b3cbd5227aa03a53e32eaeba8f3146108e2 SHA512 19865ebdcce99817f92994d14e26e1cd321d85da89f3177794a93981321ac3e39c937cccbcd00c866ccb30591d4720cd97a39fd266ef8378e3a21471ee69606f
 EBUILD pyperclip-1.8.2-r1.ebuild 1186 BLAKE2B 73ca9949761ac3021cd9d823f07ee3623a04c54f21ace033ed74f411e2103505f035c0caabd520b4602f2955b686d6a26f29985377b2853a1829c29d7e00426d SHA512 b300ef33ce98a0a6246309898895aaf99efb7d8aa6d4961a86a77a0fc04f72ba86aa99d7b30c0b442a8d8eb942592d18f0e7bc24eadfba4d62f025993d965728
+EBUILD pyperclip-1.9.0.ebuild 1250 BLAKE2B dae7dd6c7b1f238b16e606eff3e3065a07b1bc7184ec0aae2ccf8e8147fa416ee11fbd6cae6cc07fdf49a789142d7d09bdc1de3c550e1277370232dcc2adf195 SHA512 1297f1ecff1ec674b16bbf410df7257b5230ccfc20f23afad36ad5d930c972a1b1ee150489997bb9e732f727a10d527f5ce31f6fefcc561b28ae8175468ab6d6
 MISC metadata.xml 489 BLAKE2B 98c6a524e23e041886c911bd90ed9f336b1c32c8bcaf1894c42eb321a0d55db72d3ec2446bcda292408c2f935839fe87724038d733bc79a74fec0fb05574b2f9 SHA512 9bf5bec29926e45ed484747365ac847b119a0809342202746d290bb03a333f53a725f5538684e19c5140d320fd3420e197065f7145268255c67250a8c80aa4e9
diff --git a/dev-python/pyperclip/files/pyperclip-1.9.0-fix-test.patch b/dev-python/pyperclip/files/pyperclip-1.9.0-fix-test.patch
new file mode 100644
index 000000000000..a7b2b653485b
--- /dev/null
+++ b/dev-python/pyperclip/files/pyperclip-1.9.0-fix-test.patch
@@ -0,0 +1,41 @@
+Fix the tests for the 1.9.0 release.
+See https://github.com/asweigart/pyperclip/issues/263
+From: kulikjak <kulikjak@gmail.com>
+
+--- a/tests/test_pyperclip.py
++++ b/tests/test_pyperclip.py
+@@ -8,7 +8,7 @@
+ #import sys
+ #sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+ 
+-from pyperclip import _executable_exists, HAS_DISPLAY
++from pyperclip import _executable_exists
+ from pyperclip import (init_osx_pbcopy_clipboard, init_osx_pyobjc_clipboard,
+                                   init_dev_clipboard_clipboard,
+                                   init_qt_clipboard,
+@@ -99,12 +99,11 @@ def test_non_str(self):
+         self.copy(False)
+         self.assertEqual(self.paste(), 'False')
+ 
+-        # All other non-str values raise an exception.
+-        with self.assertRaises(PyperclipException):
+-            self.copy(None)
++        self.copy(None)
++        self.assertEqual(self.paste(), 'None')
+ 
+-        with self.assertRaises(PyperclipException):
+-            self.copy([2, 4, 6, 8])
++        self.copy([2, 4, 6, 8])
++        self.assertEqual(self.paste(), '[2, 4, 6, 8]')
+ 
+ 
+ class TestCygwin(_TestClipboard):
+@@ -135,7 +134,7 @@ class TestOSX(_TestClipboard):
+ 
+ 
+ class TestQt(_TestClipboard):
+-    if HAS_DISPLAY:
++    if os.getenv("DISPLAY"):
+         try:
+             import PyQt5.QtWidgets
+         except ImportError:
diff --git a/dev-python/pyperclip/pyperclip-1.9.0.ebuild b/dev-python/pyperclip/pyperclip-1.9.0.ebuild
new file mode 100644
index 000000000000..6436be82187a
--- /dev/null
+++ b/dev-python/pyperclip/pyperclip-1.9.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 virtualx pypi
+
+DESCRIPTION="A cross-platform clipboard module for Python"
+HOMEPAGE="
+	https://github.com/asweigart/pyperclip/
+	https://pypi.org/project/pyperclip/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	|| (
+		x11-misc/xsel
+		x11-misc/xclip
+		kde-plasma/plasma-workspace
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP}]
+	)
+"
+# test at least one backend
+BDEPEND="
+	test? (
+		${RDEPEND}
+	)
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-fix-test.patch"
+	)
+
+	# stupid windows
+	find -type f -exec sed -i -e 's:\r$::' {} + || die
+
+	distutils-r1_src_prepare
+
+	# klipper is hard to get working, and once we make it work,
+	# it breaks most of the other backends
+	# wl-copy requires wayland, not Xvfb
+	sed -e 's:_executable_exists("\(klipper\|wl-copy\)"):False:' \
+		-i tests/test_pyperclip.py || die
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_pyperclip.py -vv ||
+		die "Tests fail on ${EPYTHON}"
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index ac7ac2e046d9..330b909426d9 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,3 @@
-DIST pyphen-0.16.0.tar.gz 2072790 BLAKE2B c3c5b248a9532abecca09fec66594aa77313cd84f66a3fe569b39306ba937fd1f8459e5140aa2154599d805197e68806e16b51958e52f0c21792c442b7c1e62a SHA512 0469dd043578bd2f4bd12f22c10879c009be1907e34b41f5c6b4ff3d4e824a5320292308d5fd40c645a14589547b3432c7331400b2c4e64723a1e79a1ab66242
 DIST pyphen-0.17.0.tar.gz 2072773 BLAKE2B 14c7700854dfe952ff24f7d8fcd80b2287fda4e53dfd57c8cfc506162641a5f13031a0f49b3e0868e1adf050a6fb736b87b95cb5136b90e545b1328d61774a2a SHA512 2f856e9d7f404c515bc7c4c26f4a60664d1f22e08d078818d008d87809e76e4a56976169a131bb368785bd4b01b4c08b2699702afa721d498eb715eb797dc3e2
-EBUILD pyphen-0.16.0.ebuild 503 BLAKE2B 1be9437972af7971e617fef460a15bd7377d053b8f7c5944822589e0e4ebb3e9f0184ab482fdaff0199f0565ac5a30cde7680ebdb10745f98a748a954f2cc672 SHA512 c88b9ba7f1858af9923699b4b3835442cb178b04fcd00eac79b179ccc06f38f899a40daac85f025c07046d0dada8963811c3e50a87e2669ec2ae8835d475b6fa
-EBUILD pyphen-0.17.0.ebuild 506 BLAKE2B 260b39cec5669f95307811db5da1e93f98dd2b74e0deadee31caa8eab5ad40bad778d78e3000958b6dfa7bac2a19a2549f3b8d19dce2dce3f7ca49fec4d33c64 SHA512 21b492c64e0e88f977b26870dcd56d9b2aba1e8dbebe35d4d451ffdf144dd34ce86367bebb44543d0c67d4cca59efdeb2cdd1288e765a3ebabfd6ffd4544fb83
+EBUILD pyphen-0.17.0.ebuild 503 BLAKE2B 1be9437972af7971e617fef460a15bd7377d053b8f7c5944822589e0e4ebb3e9f0184ab482fdaff0199f0565ac5a30cde7680ebdb10745f98a748a954f2cc672 SHA512 c88b9ba7f1858af9923699b4b3835442cb178b04fcd00eac79b179ccc06f38f899a40daac85f025c07046d0dada8963811c3e50a87e2669ec2ae8835d475b6fa
 MISC metadata.xml 386 BLAKE2B 884bd76d980e70fcec706674b5363dfebc74931eac7a2e06cd77e5ca2cd7a72ec0673e44dd05a17dd16f91b7d43b7f97c996bb3994045adb008d97b64ef40c0f SHA512 20752bbbc3c47d4a6f1330a552a5c02bb5fc036f3656c067cb6ebcb4ac2fe2e766c343ec90542aa3ff7465d0726fcf705118ac03d743508ab135261fb115f8f8
diff --git a/dev-python/pyphen/pyphen-0.16.0.ebuild b/dev-python/pyphen/pyphen-0.16.0.ebuild
deleted file mode 100644
index 2fef544a8c28..000000000000
--- a/dev-python/pyphen/pyphen-0.16.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-HOMEPAGE="
-	https://github.com/Kozea/Pyphen/
-	https://pypi.org/project/pyphen/
-"
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-python/pyphen/pyphen-0.17.0.ebuild b/dev-python/pyphen/pyphen-0.17.0.ebuild
index 03102339b98f..2fef544a8c28 100644
--- a/dev-python/pyphen/pyphen-0.17.0.ebuild
+++ b/dev-python/pyphen/pyphen-0.17.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 1253195734de..89bb6e53b366 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,5 +1,3 @@
-DIST pytest_httpx-0.32.0.tar.gz 43824 BLAKE2B d373703f5614e7d3d75631bef7c316ae0e5e1963eb1ffdff3fd6a10c65e095e44d1bf09eb81dd9b90492a8e44f19d650875f7302d4843854622df620eb146bde SHA512 fed3b83e4b3162f1500f3a591650aca5a0c09a1a640c5718ae00d4a3e3e9df8b6a90ec4cc1a1e77b6d2be7de80dec8fe69d8fb601de164c7ad84322acc1eb7d0
 DIST pytest_httpx-0.33.0.tar.gz 51708 BLAKE2B c4b4a5bc41c44b982dcfe81f09ec4b3ee1eeed9cdc52cea6889988692bfb312eb7c4105cdcd60fadbbf0602236e2e5baf3c1a448248189214c0ec77cde8a3ea4 SHA512 96e3b5e0264f61644ed22fc809f35d0b2b255aa2ba75a5bf33d165c35276f2b731689b70cfbab5b5c901b1be4ff59c4b21704f8b15453582a6095611380830c8
-EBUILD pytest-httpx-0.32.0.ebuild 732 BLAKE2B a3ad5fc22688cb84f7baa7bb374b2554232cd8cbd0bf771470d668b0eea9e7adfeb23842dfb33d97d92521ee747d43b03e859c88d63f9c83cddb942dd737e31f SHA512 0e5131898dc35a0beb5a146b34cdd0aca86731f720a73a0d913e529cdee635f924d0ba5c0ab27a6f3003ba142b1adc1f115ee0e1cb5f66196fa0a921019e6454
-EBUILD pytest-httpx-0.33.0.ebuild 735 BLAKE2B 4c9a72d110909e5659e45ec2d33019285936cfa8b2323a862af757e9eb9c50b0e6a170deb10a7a7187ea73b4fdfc48e87c522f7ecb136db09a0602a383d1c7ca SHA512 2138642a7f7a9e6888973790d07307a008f3985c108a0bf292b6c37b216a4d51dfd50a23d5ddeecd82bcf99bdf34130032299855bdc5d38b52e41d0dc24b5ef9
+EBUILD pytest-httpx-0.33.0.ebuild 732 BLAKE2B a3ad5fc22688cb84f7baa7bb374b2554232cd8cbd0bf771470d668b0eea9e7adfeb23842dfb33d97d92521ee747d43b03e859c88d63f9c83cddb942dd737e31f SHA512 0e5131898dc35a0beb5a146b34cdd0aca86731f720a73a0d913e529cdee635f924d0ba5c0ab27a6f3003ba142b1adc1f115ee0e1cb5f66196fa0a921019e6454
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.32.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.32.0.ebuild
deleted file mode 100644
index ef89e388d43d..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.32.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
-	=dev-python/pytest-8*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild
index 609a6666899b..ef89e388d43d 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.33.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 0b5b5b34ce17..1b994a5e51da 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-openstackclient-7.1.3.tar.gz 946836 BLAKE2B e9e5a4a43619d1681080f3d980017098e615eb624c465bb6d69303b49e69307e336d1a6076eb0bb2198fac7992bf3eeb77a4945197152e270b996222cde0dee4 SHA512 fc97809ffecd051d61f300e82d71a0fe8e4fd4b4e3ae22ce99f3ae2363cfb82c70c8f42dd61ca105f46c691a0fed4e6225dcd7af644e48f2c56b33197ead169e
 DIST python-openstackclient-7.2.1.tar.gz 947778 BLAKE2B 44274861d6f14852184f89520e08ddc5a0b88a97473708eac092fa8d4992b1174efa698530c917c15e212a28aff4487ffcd3c58bb530dc3450cfe2f7fa1dc09d SHA512 12009df28accc4c6076bc6d4c0a418ee0600bbca73f126ba58caff2c211839b38d8812fded09d93154781586aa6ee7b92a7c1ea6cb07f01a6e31a2a0655d3786
-EBUILD python-openstackclient-7.1.3.ebuild 1743 BLAKE2B bc35d342fc1c6745b5223a2fb93714e96885bb098d40045b956ace6e1090411509b1158f30d4a88ae0c1447d7f9273cb87c8795dfd4f906949b57e616c210b26 SHA512 208454ef5c3b17e15f1cf140151c3a9f1a1e3c32368db039115f747a4ebdd01dfadb251df20155deb8082021585baf7f12b8b6c0e4b6e3295fa31ba086c0b022
-EBUILD python-openstackclient-7.2.1.ebuild 1746 BLAKE2B 89131e3c0833c851e415d8cbe8207b72d46df6fe3e56c1c138ebc9ac38dec01a9839c7e57e429e91a00be30d66a1cd9fdbbdc00a96fdb33522e7d0816d155cba SHA512 12f26418718b56035666824eb1e70f819bc3adacc2cfd93044a98de2cfd29af3699f123e56eb74be0dd3343da9e0d9c5c63a0eb94fcd13ffe4573b2ad70e45e0
+EBUILD python-openstackclient-7.2.1.ebuild 1743 BLAKE2B bc35d342fc1c6745b5223a2fb93714e96885bb098d40045b956ace6e1090411509b1158f30d4a88ae0c1447d7f9273cb87c8795dfd4f906949b57e616c210b26 SHA512 208454ef5c3b17e15f1cf140151c3a9f1a1e3c32368db039115f747a4ebdd01dfadb251df20155deb8082021585baf7f12b8b6c0e4b6e3295fa31ba086c0b022
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-7.1.3.ebuild b/dev-python/python-openstackclient/python-openstackclient-7.1.3.ebuild
deleted file mode 100644
index e99eb43cf12a..000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-7.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 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 client for the OpenStack APIs"
-HOMEPAGE="
-	https://opendev.org/openstack/python-openstackclient/
-	https://github.com/openstack/python-openstackclient/
-	https://pypi.org/project/python-openstackclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.27.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Depends on a specific runner
-	sed -e 's/test_command_has_logger/_&/' \
-		-i openstackclient/tests/unit/common/test_command.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstackclient/tests/unit
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-7.2.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-7.2.1.ebuild
index 4e64496aa63f..e99eb43cf12a 100644
--- a/dev-python/python-openstackclient/python-openstackclient-7.2.1.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-7.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-tests/Manifest b/dev-python/python-tests/Manifest
index 75dc212d2a2e..4503dd50ae75 100644
--- a/dev-python/python-tests/Manifest
+++ b/dev-python/python-tests/Manifest
@@ -9,12 +9,14 @@ DIST Python-3.12.7.tar.xz.asc 963 BLAKE2B 8c7db3d1971d93a10c611a2e6dd3679d0b331b
 DIST Python-3.13.0.tar.xz 22532980 BLAKE2B 4a4e397199402de8c9fe8e4d63443ed972cbe8a4f541743908d699c7987127d159d600fd14145b6a946e8671426279d230c9155fdc5863c1e49a945eedcbf21b SHA512 44a143c9b96b55b01885ec020c3364265bda55289615cd7d5071915b0d0178a6f35e7551a89090001fcb7f3172d38177a56bf8b8532b15c9dbc50295c9210152
 DIST Python-3.13.0.tar.xz.asc 963 BLAKE2B d05f02692a9fea42b73dbfe5dc42bd6533555e5ecb848510d2b94bb7f0e55d4a0f89bcd20b073ed2c7f7a68be35b12cb6dbff6bc16fc9a4592ded2c339ada7fd SHA512 1b8bb0fe4eb93e31ec1770e90b94d44b5864c0391aad5dcba3a30d8e505d9b17107385414353c0060007f8a536254f49b8e919f36ddf6421a6e4330f817f1a3e
 DIST python-gentoo-patches-3.10.15_p1.tar.xz 24048 BLAKE2B 191c28ad9bc781d6f3077870e8d40ff98a47a64009ecfbbd10fe2b3c5330692181837fd3e9b336fd01f936a39160fc12761b2ef9bc00843248ab978cda2e2767 SHA512 4461e351c991694415e2812e558d6c3d3f79295358623dc955bc0839691a170d95a3efd31c0bf9f0d6191e4184d7b55fdb485b948d591782fef5b060d7660cce
+DIST python-gentoo-patches-3.10.15_p2.tar.xz 25284 BLAKE2B 24ecd523dba88915db130b174a5d692b9218decf81db7617ba016d4e21555cefa807e344a490110bcd3992637a95d0ce3179b219911417d29d008b4e2b5d7b33 SHA512 e1017b80272c57c18dbf7e1515d50fe13ead8de028d1ccaf1339a93ad4b0286f758979ee6f27011fa12350855cefdbdf049927bf2dd185905d4f3fe146c5bd68
 DIST python-gentoo-patches-3.11.10_p1.tar.xz 10592 BLAKE2B 1cc02d22b55cb76beba133c37e6db3b9ba12b11cd8776acb064f14431842405cbc9efb5a06319cff1c73d9178ddbbe2e340829d4628c88a9589aa2fc1d308f80 SHA512 7ddb08e4d8a9173a26fa18de687a4c85c3d460e2bc595da6f4b15cfe3be264ccdc7d61d5fed1e7a82f256d21caf3ea7de87f774fde61a9d37bed15f86f546adb
 DIST python-gentoo-patches-3.12.6_p2.tar.xz 8144 BLAKE2B 2f36ce972e0b3e2884c9df629e3aeb1af05e4c77dffb866ff28e08a0a7df3c7cf36a9de250d148d909c07fd5bad483c95b3267818657c04e7d0d6fe512e21f9a SHA512 caa86c6cf693f9293b3aa8944452d117b78c1c3f8d6a6aa658cb5c2d2ffb0cecc6cf14b293872bd2101766ee7167ba88183904b2814090f8cbc64c1fa3b771be
 DIST python-gentoo-patches-3.12.6_p4.tar.xz 8764 BLAKE2B a75b9bc3768f1e07272f43d1a8f0fb6858eee7c786bc3141cd152382c287ee984b92ff1301e5894db7c24af994ee52ac7374a3edf692aa4255c1413b73209020 SHA512 237c9e8b50173a757204621d7019f68f230ea3e520ea1f078528acfb509fe7f44c0919a8ac0245e79b1a51c3e3545dd9ded51047451048ca782e35b1c4365363
 DIST python-gentoo-patches-3.12.7_p1.tar.xz 10228 BLAKE2B 71cc6034201198d9483414fa362d68b550bfcbf75ca6f44dd8ab9d90b201098a05cbf4799b1db9359f4dc464acfcee9b0ce59045db27e8e9ce916b5aab010448 SHA512 22f9256c28b96723ad86878cbe44da155e280a8df08c6bcc568dc5296aca1a6fcc41ab823ee9e6d34ce5954bbedb76aea7dba2d9189e0558c536e8b2b9a3c8ce
 DIST python-gentoo-patches-3.13.0.tar.xz 8316 BLAKE2B 8fb8ba8f41f310140ad7066b614952023112d5043e5d82058364125611785144c1843e87eecb7669bcbab51c40d0694069526219f7419a7009517ce0821b74ba SHA512 0eb31ebfa3411020aa70b3b66fd7eec98b4b7a686b0e8f1f7ed76a8186a7c1ee85ccd9565a86a1d7ec13b975855eeb7303036af05e2dfdce3d64e4ad99299df4
 EBUILD python-tests-3.10.15_p1.ebuild 1605 BLAKE2B db4c562031e602638107c76bfafcc97771ffa56b54a3d65028d06562e73fe8c1b037bdf0697da465cf07417fcecd179501121d95dce054e1fd75442273014f53 SHA512 e00999be4c1fe1dcf54868a60f9143766809738be5171ef82a525be7f41214cfcf8a1906df347975fdb05b49c7023bac5075b8eed838b110b69b29ef7c56b956
+EBUILD python-tests-3.10.15_p2.ebuild 1611 BLAKE2B 5696c0584ea27bcf47505f54c4f67d5b2454953fd98ddbe6facbb7b9e9d4a15d8cd78d1070ff9698dc9a71aa500428612f11b8f82536a338cca7f6276e963180 SHA512 26d5e6dac6ef8091ededee92e43d04268a467518b5ce970111461e9ed5770f58218c1d55ec775639a623826c9a8211fade7f0dc5dba51cbf454bfa805e7d3dc4
 EBUILD python-tests-3.11.10_p1.ebuild 1591 BLAKE2B 41988aa6074078cd26dc08004cd74c78becc96894847b2e873529bcf1f1742bbf2547aad0da1ebc53f79fe422d60c46fb075da9824413c0f38353f0c5cb4f0dd SHA512 41580e92e1d167eeb0896bf271ddfc3b06d5979cc620e66f7f36a5102481a94a92efab6b40ea1dafdb29a35c031a3a2f3680f52a699484815962f0e7b364f964
 EBUILD python-tests-3.12.6_p2.ebuild 1502 BLAKE2B bce969e4a5147fdfe4cfd0f8c5f6bebc9ed452bb53e658dd6c71c2bd75d01ad1962bf4365e9e36b44726a17d08b767f24e240048be4234f5a8c5d2ea66cdcec4 SHA512 882090e5cdf1cd7eb43a363b000b11a45e4f3ca4f5c94130c238ec7961037b29d30477b267ec5230be60cd1dceb240247b24fe43f789cde326829ff25c06db7c
 EBUILD python-tests-3.12.6_p4.ebuild 1504 BLAKE2B 711a2ab62015c8113dfca9a02a57301add78b0fabefc09b629096f2fc0e1bd68157e517ceeb807fc04cabb81910eed3e5546e5f3adcd9a12b59c49718fafd6bc SHA512 69677a1276b7b746b10e268cc573a8ac62aa108288d810a18ceae4aa0f797ffe228903cd2d1e53aab4e45b42872fd15432f93226b19f2d9bf726cbec5d480ee4
diff --git a/dev-python/python-tests/python-tests-3.10.15_p2.ebuild b/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
new file mode 100644
index 000000000000..87ae43f28123
--- /dev/null
+++ b/dev-python/python-tests/python-tests-3.10.15_p2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit python-r1 verify-sig
+
+MY_PV=${PV}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="Test modules from dev-lang/python"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}/Lib"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~dev-lang/python-${PV}:${PYVER}
+	!<dev-lang/python-3.10.14_p3-r1:${PYVER}
+"
+BDEPEND="
+	${RDEPEND}
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	cd .. || die
+	default
+}
+
+src_install() {
+	python_setup
+	# keep in sync with TESTSUBDIRS in Makefile.pre.in
+	local dirs=(
+		ctypes/test distutils/tests idlelib/idle_test lib2to3/tests
+		sqlite3/test ./test tkinter/test unittest/test
+	)
+	local dir
+	for dir in "${dirs[@]}"; do
+		python_moduleinto "/usr/lib/python${PYVER}/${dir%/*}"
+		python_domodule "${dir}"
+	done
+}
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index ee7bf3d98308..a4b3a157c46f 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,5 +1,5 @@
 DIST pythran-0.16.1.gh.tar.gz 3680817 BLAKE2B 2a4b928e9d0ce68248eb543c97da5afca900d81bc660377313617149c5aae7529a371bfd3604dd9feb6e38f834360fef881c8324ae72b585d8ab86e867c2f6b3 SHA512 7a89546b52bdae9bdaeba42768ac822c584a3714b8f4e32417d793454dc0b5492342dfd393d92f8ecee12c854bc39e418f5860aadd00d328afef7b17ebddec99
 DIST pythran-0.17.0.gh.tar.gz 3697173 BLAKE2B 90f765283e4346392eb69d8e6fadf4b00469779bd7fb8dc99084ed0d2d940a1ca949c9dd0eb0fc484c2938de79b1e3650c417dc1cd30786b25b6781c519a629d SHA512 af14cd497bcbef7ac97b42b80e297e641bd520f51938b04a68ebf01de86d6900926653c01ff99b1af7f699674094241099101f1501acfae2be5dc9d1724af777
 EBUILD pythran-0.16.1-r2.ebuild 3030 BLAKE2B c4d5497948b0d70f465678a147ae4846b0d45dbd181ff44ea1bf356065bd3ac2f4e6986478e5e622baf16ed9d0edf50d9024b3747238d97da36c170ca1b725e6 SHA512 8a2e5c89fb8af631a3cd2a51c5fc595c97f7635575dbe10ee43b365a4e8a416436393ef3598b8f5b233651a7b2c97271df1344409078a7fa9aad60d7ef4945ad
-EBUILD pythran-0.17.0.ebuild 2988 BLAKE2B 16972b461955f9c8257d53e110e8d369f49b51da7622d36c4ed33061052c392626619c62b16ec53941a5993f14169e6846929cc776271887a3bee91314736410 SHA512 03c72b52f2abf8e81bb333665bd59ca9f8250d704c942354150508495722687a4bdd0777854895f6183212173ffe917c096458f2f1037118e7d25325b5aec469
+EBUILD pythran-0.17.0.ebuild 2987 BLAKE2B 01494b60be3f9bb50f3abed6c100060728942f8075a6e22b242518552978294b0c76971a494ded5f4d32a43c24c0f09cd2fc97480b5f89f1b4fa5dabe0dadc2b SHA512 66bd2adbb5264507347751b7471963c63240a98616570eca914a2d6d97b85de08f1669697e046ae438699f70ab5fce4277715119c7ffb2f489b0aae34f65618f
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.17.0.ebuild b/dev-python/pythran/pythran-0.17.0.ebuild
index 03a72413f83d..4b14e228d55b 100644
--- a/dev-python/pythran/pythran-0.17.0.ebuild
+++ b/dev-python/pythran/pythran-0.17.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 5af98bfa145d..85307e028cdc 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,5 @@
 DIST qtconsole-5.5.2.tar.gz 439219 BLAKE2B f354d3e6132142a3da52a1cb6b290d0a07b13920bc9f33f7fb29eb307cc5b653beccc5d28e53f7cbe7483147adb6e34ffc584718a79b814c9ce2c37b57a768fc SHA512 f79e51903fe5a1164a90c0905c308d2bce066bef2c61fed2b5bb7e757a9cf56875cdd14665df9284317497cd73bb544ae09e0b23c63b527bbd4bc90b874009f6
-DIST qtconsole-5.6.0.tar.gz 440531 BLAKE2B f8d9e1ec45f310152b2c779df71c048ce6f704f8a9f366b6ed415a3dc8988553f45c4ac63fa08425e22124048e7946a4b40aedbbb15e90306bca5138426d91fe SHA512 ccd8f7b87d218237827bd52afc160cc8c00e9feecf90cde39aff55509831bdc9c4799499c91ed13538ce52a4011ed289f194662eef55b98efe09a2b9a5bd5427
 DIST qtconsole-5.6.1.tar.gz 435808 BLAKE2B 74476bfa85e08dfdd3bb0595531253638957024a2a5c9ec16e5eefa3677cf57756ddacdbf21405e93da1b5101bb4a354970ef86c786db02c52ca92e40877bbc0 SHA512 1bc2cf75019186ad439033ca7e262fb0e3172336b15573fec1da4925830c26f33117229f7552cdd26a3691b0c9facaf0073c640aea8098c3599aed38e7621392
 EBUILD qtconsole-5.5.2.ebuild 1684 BLAKE2B 9d2984a34b05203ddf430006d94e800474aeb880c2a0e16eadde409dbdc8b5c74da812abedac79e934239b5a68a527b34e6be3ffd658ea5ec37632447d792c72 SHA512 84b1a81bde38bc3f40249abc73f61ec9a8dfe7256e491b1e7265ed72c3918291a78a72935c3b902d22908192988b594c0511b5ece35635bfaf18fd77364f7358
-EBUILD qtconsole-5.6.0.ebuild 1641 BLAKE2B b9d7f9e104ff8728c95905bf035076d7e800a6caf056bebc0e435347359de442f9263a2a7c44d6e7618adee0b4eb4f9a1b5695970f1c15e2338850801b80db55 SHA512 c731c921901bcd2b891956654ff01312e3d66475bf516ee61000e40f7f5ba4202f1533862fcef8abdd73c2b3c9bec7d08ad88727529c7305a56b06bb797da54e
-EBUILD qtconsole-5.6.1.ebuild 1644 BLAKE2B 475e93a4e76e18aa6aa1be266a354669391ae01a5372ae89433cc06c8ca73cf2986925e61bcea572d544b3b0d4c88d7cd2fd9d09181e4ece32cc3999ea18f021 SHA512 1b018e998311e362712126c98003fac7676a19d6d442a69600b972697a6104ddda31109b50ebe2710a46d637365222c7caa6f7bd5b96628c3b9b5523b23277fe
+EBUILD qtconsole-5.6.1.ebuild 1641 BLAKE2B b9d7f9e104ff8728c95905bf035076d7e800a6caf056bebc0e435347359de442f9263a2a7c44d6e7618adee0b4eb4f9a1b5695970f1c15e2338850801b80db55 SHA512 c731c921901bcd2b891956654ff01312e3d66475bf516ee61000e40f7f5ba4202f1533862fcef8abdd73c2b3c9bec7d08ad88727529c7305a56b06bb797da54e
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.6.0.ebuild b/dev-python/qtconsole/qtconsole-5.6.0.ebuild
deleted file mode 100644
index bb20cd7c90f4..000000000000
--- a/dev-python/qtconsole/qtconsole-5.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/qtconsole/
-	https://pypi.org/project/qtconsole/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
-	dev-python/jupyter-core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-2.4.0[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-
-PDEPEND="
-	dev-python/ipython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO; expects exact HTML, so perhaps fragile
-		qtconsole/tests/test_jupyter_widget.py::TestJupyterWidget::test_other_output
-	)
-	local -x QT_API
-	for QT_API in pyqt5 pyqt6 pyside2 pyside6; do
-		if has_version "dev-python/QtPy[${QT_API}]"; then
-			local -x PYTEST_QT_API=${QT_API}
-			einfo "Testing with ${QT_API}"
-			nonfatal epytest ||
-				die "Tests failed with ${EPYTHON} / ${QT_API}"
-		fi
-	done
-}
diff --git a/dev-python/qtconsole/qtconsole-5.6.1.ebuild b/dev-python/qtconsole/qtconsole-5.6.1.ebuild
index c9b6137a741c..bb20cd7c90f4 100644
--- a/dev-python/qtconsole/qtconsole-5.6.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.6.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 0ab96a2bbfba..e958dd532c30 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,9 +1,4 @@
-AUX rdflib-7.0.0-py3_13-fix-pickler.diff 1986 BLAKE2B 6ba02b7b5efa73e09ea3535d834162000f7a28f8d0d1a29db41c58594fea4d777ad9631d45aecfae9559fbfdf1e6edd81eedf9d4344661bc0af1246d2c2c91d0 SHA512 b87c5e938c33afd57a561c6d27eb31121f57c64425178e31b64f33e737ce877ede748d485f8f6dfafc1dd96e296d86ca6218176921a258c1fbe810a81e5685da
 AUX rdflib-7.1.0-py3_13-fix-pickler.diff 1975 BLAKE2B 11ec2c11f6662f6a52660b83c8785816e28e4b06c091749dc6fa725b6d4c69221ac56c45d3a520d0d27b151db3893453ba1afd407713926390b49d718de7ce4a SHA512 5fed78c535c1e3d66a9be61c3179fda1bc03554d40b81d7169b19fc6e6bf116b37163df6b0aa856ba95b40598c82f0d54fddbf029bd3866cfe976cede1ea35e2
-DIST rdflib-7.0.0.tar.gz 4765796 BLAKE2B 60ca36160f4f6588892853adde9dd4b795e549cc7fd52127cf1e50de3853b25b3a333cabd584ccf22827cb6f89d215d225c4ba767d0775feeefb481e4b1ed93b SHA512 56d110ab24c74c6ddb2e75320f60a82b4945e6ea1ce9d10ad4ae53d44c679b35826e3d7406e7d0e321ef9b042d32d2ba327a6dbd5c2c1780f552131d80c09445
-DIST rdflib-7.1.0.tar.gz 4863439 BLAKE2B 0f06d272a6b8b0d9356fe8fd67e9df5c1ceb0d9e102a9e954edc17ee3633f45e61520a9db3598777420f501dbb9e63085249211466fc8412d23986ee2b585c7e SHA512 40a3afba52161c2e642a0770d88b08d5bfd6d84325757cef13ad5dc620bcc7f13395c4a51e32b44db56b54568893af44f51b723ceebae1cc089e99b7e0e93c25
 DIST rdflib-7.1.1.tar.gz 4864216 BLAKE2B b583e6f9afab95fc0818c4f11740ab8cab540b774a3db15fc8be7b836149f40af6eb445a61b61e020c55f9b561c17f5019275070272449bd4ea25827e4925e39 SHA512 6eafaebfb604446399b214496aabc91fe0c689e9b35d5637de35a5d9784a1acb9d727c7ad5eebe8700d0be2b1e54b3d51cd3fe723a2a6cbd38f0e259d42bc2c5
-EBUILD rdflib-7.0.0-r2.ebuild 1540 BLAKE2B 7d928901067a0abb854902fa0fd28de8967a57a5d078c9780b73a25e02ce4f4be7f789ab2a433bc44e6a4c393dfc583a6d61acaeca4769f7b2048179be975c97 SHA512 a78e39417b4098b00894dfefa59dcc6d528489abe3a20404b48a62f4b2eb00327c5b4cd3198b9e07e0dfe145fd09792d79bc61a18b1cc745f0292d0931391083
-EBUILD rdflib-7.1.0.ebuild 1707 BLAKE2B b233c753b94ea52466fd79b2012d7171d0a8ce2749b2a317dc1db288632d76d98b25ee4226d5fa3ef3f709812128ba18000f3495fbd40a2b48a6dc0569dc4bfd SHA512 c04bdabb18512bd7ac96810605b06db362fb62633edd5cf6d19d38c25bdaab0215f1074d0b4858c0d5d5084fca1fe35cf5a9ec1eb9f02fa7c390df4bba1adb7e
-EBUILD rdflib-7.1.1.ebuild 1776 BLAKE2B ed3ae57b0e4a6129c13468aeec42434b61f8db4b4b4d38fb9a05ce774baf0a0cfadea8021bbb267a64610aaf12a8e4fb6f4bb851a8f42edd3f7b2b67750db68f SHA512 e3a65a8259747c7abbdb3b41f446343c64cc5f9b07e0aae3de3c1ca42cd3945589b19cf4c2eaa78b459876ad9530dd9d730ad7ee52a94344d1354afb29ae5cf9
+EBUILD rdflib-7.1.1.ebuild 1769 BLAKE2B 8a5d445d36b09aae76d3ea2f5d918c576eff3f2db3d2545231b6e6abbb5e8e078a49cd03f4f83b2bc5f85b4c64a0721eff1731a24d676d0f4921a1a5271ba5a0 SHA512 8b691fe582ccf27b55931e9241f27eeaa0bad21676ce8df5f5838ec022172e3a4b79bdf6179e7e344a986db9463f3301cc3f7eb083138c1fb8a690e1b2ae5ce1
 MISC metadata.xml 400 BLAKE2B eea3d3a69375a70a1c4a93cebf48169032f9d7cc6ba5df0422bad8c0f4e1caa10721a42b66cfb0dad2ab85aff38f826a0790b4d2dbac90be16e88ecf507d9025 SHA512 d8b94c9c8c037f40db80a44d235ada552851c3b979f496462e19a909eb2b46f606c23458b20869060b596969015616d065b2df0f5b24d2b3d7224afa6089e8e7
diff --git a/dev-python/rdflib/files/rdflib-7.0.0-py3_13-fix-pickler.diff b/dev-python/rdflib/files/rdflib-7.0.0-py3_13-fix-pickler.diff
deleted file mode 100644
index d2fbf4928972..000000000000
--- a/dev-python/rdflib/files/rdflib-7.0.0-py3_13-fix-pickler.diff
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/rdflib/store.py
-+++ b/rdflib/store.py
-@@ -113,27 +113,39 @@ class TripleRemovedEvent(Event):
-     """
- 
- 
-+class _Pickler(Pickler):
-+    def __init__(self, file, node):
-+        super(_Pickler, self).__init__(file)
-+        self._node = node
-+
-+    def persistent_id(self, key: Any) -> Optional[str]:
-+        try:
-+            return self._node._ids.get(key)
-+        except TypeError:
-+            return None
-+
-+
-+class _Unpickler(Unpickler):
-+    def __init__(self, file, node):
-+        super(_Unpickler, self).__init__(file)
-+        self._node = node
-+
-+    def persistent_load(self, pid):
-+        return self._node._get_object(pid)
-+
-+
- class NodePickler:
-     def __init__(self) -> None:
-         self._objects: Dict[str, Any] = {}
-         self._ids: Dict[Any, str] = {}
-         self._get_object = self._objects.__getitem__
- 
--    def _get_ids(self, key: Any) -> Optional[str]:
--        try:
--            return self._ids.get(key)
--        except TypeError:
--            return None
--
-     def register(self, object: Any, id: str) -> None:
-         self._objects[id] = object
-         self._ids[object] = id
- 
-     def loads(self, s: bytes) -> "Node":
--        up = Unpickler(BytesIO(s))
--        # NOTE on type error: https://github.com/python/mypy/issues/2427
--        # type error: Cannot assign to a method
--        up.persistent_load = self._get_object  # type: ignore[assignment]
-+        up = _Unpickler(BytesIO(s), self)
-         try:
-             return up.load()
-         except KeyError as e:
-@@ -143,10 +155,7 @@ class NodePickler:
-         self, obj: "Node", protocol: Optional[Any] = None, bin: Optional[Any] = None
-     ):
-         src = BytesIO()
--        p = Pickler(src)
--        # NOTE on type error: https://github.com/python/mypy/issues/2427
--        # type error: Cannot assign to a method
--        p.persistent_id = self._get_ids  # type: ignore[assignment]
-+        p = _Pickler(src, self)
-         p.dump(obj)
-         return src.getvalue()
- 
diff --git a/dev-python/rdflib/rdflib-7.0.0-r2.ebuild b/dev-python/rdflib/rdflib-7.0.0-r2.ebuild
deleted file mode 100644
index ec8faa1ba61d..000000000000
--- a/dev-python/rdflib/rdflib-7.0.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="
-	https://github.com/RDFLib/rdflib/
-	https://pypi.org/project/rdflib/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="examples sqlite"
-
-RDEPEND="
-	<dev-python/isodate-0.7[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.6.0[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://src.fedoraproject.org/fork/salimma/rpms/python-rdflib/blob/d2fbf492897262350bd569f1566b97a54e092cd9/f/rdflib-py3_13-fix-pickler.diff
-	"${FILESDIR}/${PN}-7.0.0-py3_13-fix-pickler.diff"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# doctests require internet
-	sed -i -e '/doctest-modules/d' pyproject.toml || die
-
-	# we disable pytest-cov
-	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not webtest"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/rdflib/rdflib-7.1.0.ebuild b/dev-python/rdflib/rdflib-7.1.0.ebuild
deleted file mode 100644
index 045fd23592a0..000000000000
--- a/dev-python/rdflib/rdflib-7.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="
-	https://github.com/RDFLib/rdflib/
-	https://pypi.org/project/rdflib/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples sqlite"
-
-RDEPEND="
-	<dev-python/isodate-1[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.7.2[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	<dev-python/pyparsing-4[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# https://src.fedoraproject.org/fork/salimma/rpms/python-rdflib/blob/d2fbf492897262350bd569f1566b97a54e092cd9/f/rdflib-py3_13-fix-pickler.diff
-	"${FILESDIR}/${PN}-7.1.0-py3_13-fix-pickler.diff"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# doctests require internet
-	sed -i -e '/doctest-modules/d' pyproject.toml || die
-
-	# we disable pytest-cov
-	sed -i -e 's@, no_cover: None@@' test/test_misc/test_plugins.py || die
-
-	# allow regular html5lib, html5lib-modern has no real changes
-	sed -e 's:html5lib-modern:html5lib:' \
-		-e '/html5lib/s:1\.2:1.1:' \
-		-i pyproject.toml || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m "not webtest"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/rdflib/rdflib-7.1.1.ebuild b/dev-python/rdflib/rdflib-7.1.1.ebuild
index 5f275b02f557..67a4358641e5 100644
--- a/dev-python/rdflib/rdflib-7.1.1.ebuild
+++ b/dev-python/rdflib/rdflib-7.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="examples sqlite"
 
 RDEPEND="
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index ef6f47bf5a0f..43d858df2244 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,5 @@
 DIST requests-futures-1.0.1.tar.gz 9921 BLAKE2B f4b1ec5c473ebe5e2cd4ca7bf8da3c60b4a0304c6ee5940900fcbad1f8e3400facfc886e3ba318d30c597d2e212b29d6eed4dfe7e985c526309e0abb15ded6b4 SHA512 e95c2ae8a97f314a6f2ec02ab1d4b456cd673599dea9cf4abd9f2c601ea7ea4b48a6595d4b52bd5c717cfcbbb378be8789d6f63dfb58fb2aa4778db408521730
+DIST requests_futures-1.0.2.tar.gz 10356 BLAKE2B 4aa9b549981c13681ada1335bbf00a1b2b23c10376941062f92275a9f772a2aae57332b10dabb730bd5aa7157e19f61b82b41e03a9978b41a55cab2a57dba101 SHA512 1d163ffe45a09e0160710cf8bd060f741a524e60d69318af7c03a3b5dc41f27f4f7d115faed227bb710b29ffdb230a7ef5991e33ab2ad4e25b3c52727ef76fc7
 EBUILD requests-futures-1.0.1.ebuild 699 BLAKE2B de84abb2aab0bcb3843e7f1a3c8ccbfbf3490b59f686773779b74939fa947336c21486d8f2471188f3b78f57f6231c7a4fa3581cf029fff539c6e4bd73f15912 SHA512 38448e5f25da9a224fb08f8c4c486d923d76c69073a91efa12f9a633afa483741d25bd8b2bf4c106ef0fef4fe595782de387f044af488d85bb028527e5a34d3a
+EBUILD requests-futures-1.0.2.ebuild 720 BLAKE2B c5e33788cb1f109cef48a7ed9f766c6451c18cf60f7f79a0d93b165403089b7795734f2c2970390476e362bf216f95e5a27da241a96d79b13c25fdcc5af2cde6 SHA512 c686e3a672cec34dfe2dddc748ce1b1c2166fc1b586ba8b2481987fa891ee345472b067543119e49116992990232e85c37f4807386f70085a5217cd613516d1e
 MISC metadata.xml 625 BLAKE2B 906c5f1ce8e7f360c8d30226b97aeb71b6ec2b5d0f808c0584805d373ba777d53235d39099aaa86c7a46724e43355888313ef17ade64206aa287ea59bd4a5cfb SHA512 578acdb71cbb67921163c6a41b0057ba09d7a6933f9b3f55906e1e28719f5ffb5ca5468f1904fc1155c7876e300b05e161be00b15d4bc1fe1e49fd683c17dfba
diff --git a/dev-python/requests-futures/requests-futures-1.0.2.ebuild b/dev-python/requests-futures/requests-futures-1.0.2.ebuild
new file mode 100644
index 000000000000..747e231ada94
--- /dev/null
+++ b/dev-python/requests-futures/requests-futures-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="
+	https://github.com/ross/requests-futures/
+	https://pypi.org/project/requests-futures/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/requests-1.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-httpbin-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index c7db6d16cd61..c09b224eed62 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,5 +1,5 @@
 DIST resolvelib-1.0.1.gh.tar.gz 769608 BLAKE2B 7715f61d262cb79ce08f0431650e6213def4582a0774cf36dab722d88013f7bc9c72a31a957d3782e35b315158982c3311fe3e06e26bbf9040fa96b239934661 SHA512 a35f7fdbc3aba5b44fdf6b9c55b082156ca641dfe5825611be6364622bcaaf45faafa2c45bdd13d1b5723a55732759a806905ab4b6f366fba0474d1f808d91bc
 DIST resolvelib-1.1.0.gh.tar.gz 772503 BLAKE2B 6dfda2dc8bc8fc6c5bd53de6f4cd0a44fc39cd53a3a8b01c8a9f135f64ef2ec022248a87d8c8302af4a3c1ea171751de4cba26139a7231bdf143b115f048bfe9 SHA512 d3b2a49c4cd6e6a27bb1eb5a8672a2b4f6daa315b82f0f008a915094a59bd2f38ad64fd83fba4387a50686a3ededb13c24839afd4d45d9766467d7e70f7b863a
 EBUILD resolvelib-1.0.1.ebuild 702 BLAKE2B 6dc2923dbfcb0d82390db5884f39e4572d0a79c224cf161098156e591789dcfe3c95c649b589c1838e36f7384b56e3af7e12ac2102546cca2a080b6fcbd75bdd SHA512 bcb44d75ad977b8de4c2bc273f931745f6b176ceac6803abd324ee5eb906d395a0ddb41ce9bb2604f543d1c972b86c96cf7f6df4090e6d332575e1dad7e4c182
-EBUILD resolvelib-1.1.0.ebuild 665 BLAKE2B 7801b2763ec70ecc56ebd4213bca6798be2ee31182834a6e39c6a1f71aed538abbf8728de8d6a7d92520f877d3ce80cf5bbcdd49b8e9c8b3d611f0b32e330593 SHA512 3a0d361830537dfd146e94c059a25c14f364893b666b65f0138a62cefeaaad8c6348bffec157b60db9bc2a4093ff67b38723bc8b6acf3450c02c3f69997ea888
+EBUILD resolvelib-1.1.0.ebuild 659 BLAKE2B a6e1fa9cfc6a545054342d27e4a16d6549018b149e2572b1a1fd386fe27496f544ebdf952dd42a288d2d4d6ec21df5176e3335f2a62a724983d7e307786ef021 SHA512 3b58639e03bd2199d10de9b75f8abb11c1745e5b7419a01f9350abb2ab1c5a4b21f1386271cde4b2aefe39c1ee3309ffb3af9f10869050e247e0fd0956883cd4
 MISC metadata.xml 864 BLAKE2B e62049b9f1eca68e3148fb112e0b1b51713ec88deea5ddc7eac28b84003e427f6e17d018ebb27f68b59a5007e7ace47cb89e25af12df432a1ebf13feaba9dff1 SHA512 7af7a80800ba0c3da0789f545a6b3e51c35cdba8785e2aa8761c1689d5ec7a3b9f428f28b182d86ed6625042d2d85d52ebb1095134bd2c7013302abd4ecd19b9
diff --git a/dev-python/resolvelib/resolvelib-1.1.0.ebuild b/dev-python/resolvelib/resolvelib-1.1.0.ebuild
index 1e80fb87bcfc..1470b41f7286 100644
--- a/dev-python/resolvelib/resolvelib-1.1.0.ebuild
+++ b/dev-python/resolvelib/resolvelib-1.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 399f0146d604..d1edc27a753c 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.16.2.tar.gz 629881 BLAKE2B 69ac4ba43ea79ddf998bc9f7cf0fc5fa42acb0315dff663b1c924498ccfabdd37ac6d9613e128b838b9e1f45988632a337fb2fa50f5adcd1b69aa520b5ad33e2 SHA512 1c3162b1acffc9d11292fcbff7177267272a02e752b5839a4004b875bb5bb25af7e61f31041df438ef4e0e47152296c3a2711856c6a36d787848dcb766387d1a
 DIST rq-2.0.0.tar.gz 639193 BLAKE2B ec44a45618f4ba0cafd30d13d15db8efc26c35f41100019e94d28ac21ca0c6157df34c55fd9bc2c2afdd4752e815a45150c95840339744c005c297153795e598 SHA512 46878626ad939fdc3f31bfd04fab9d11f266a390fe75ea22fde62e1622607e715673a8f3d2e3aba78e489b861d16068836aea4eca5a88cd295d6b6ca61707a41
-EBUILD rq-1.16.2.ebuild 1472 BLAKE2B 5069ef150732873a25c3d4f73e8c699e267dc28d2cc304afcb6f9aeda696fb08503fa3b3e1a12ef6cbe3da0d0fda9b597f15487c3b0b7f7eb6cc51bff0953fc4 SHA512 33dc640b0aced4501582d728d3ad977bf7f406c6f09b06d22e3ef00b121a6ea84f2b5e678c72c561fa67737fa12579725bda49c4b6144c391d0c02ff723ae4d2
-EBUILD rq-2.0.0.ebuild 1599 BLAKE2B 0a5a9bebfeec8cc8e73312881b9e43ce9ae7a97bdccbaa4075934d8758829f73676755ac33a47b1b0f14f9d8c4e1d8ccbcf1952272f595731a3f2aa16725b0f4 SHA512 1d31e528652b8ae8d657e89e2edaaf08c78473b4152569c244e1691d9acbdaf7ea806fc2c7f3e94baa9f258610ff4740b1ee819b1b5d76632a41cba383d6f926
+EBUILD rq-2.0.0.ebuild 1596 BLAKE2B 7c5a67580c26e09084f444ef8907c29a927d3d17a3842ab0c1d8f945e0695f6495a4af4ba483647c54379b6a547278cc78c9ce61122f755408b8935b1725cdb0 SHA512 acfc1b98fe4719522d7dcb4562ddb942270d151c026cc5e11fc4a291ebe132df5043f45fc9b49c0e0824ee4e6c63bb9417160e5dbc3e03545f729063a326e29a
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.16.2.ebuild b/dev-python/rq/rq-1.16.2.ebuild
deleted file mode 100644
index b4c12356976c..000000000000
--- a/dev-python/rq/rq-1.16.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="
-	https://python-rq.org/
-	https://github.com/rq/rq/
-	https://pypi.org/project/rq/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires <sentry-sdk-2
-		tests/test_sentry.py::TestSentry::test_failure_capture
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/rq/rq-2.0.0.ebuild b/dev-python/rq/rq-2.0.0.ebuild
index 5cde9ca9c756..1bb4b1c0f6a0 100644
--- a/dev-python/rq/rq-2.0.0.ebuild
+++ b/dev-python/rq/rq-2.0.0.ebuild
@@ -17,7 +17,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/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 66a7c7574c1b..c44db44d3fc8 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -6,5 +6,5 @@ DIST selenium-selenium-4.26.0.gh.tar.gz 77107740 BLAKE2B d4e466dbdb9a12126ae8ee9
 DIST selenium-selenium-4.26.1-python.gh.tar.gz 77109265 BLAKE2B c0c5693c64fa65a627e5edf0cbbc051410fcddf59e4fd80c362b9a382c586fc3ad3d574674e5523ab284b40b6639e95e85fd1c8195f2f1a6f35ad6532ed667ce SHA512 7ace69332f17c6f7e28b81223f4c8c62cde1832b5acaf2fd1c777a08a5a9cfebb5d9c83daa10462eeb3acb9c7cb5038711f5acee51f5dad3910d7e29e4387d3f
 EBUILD selenium-4.25.0.ebuild 4194 BLAKE2B b6877b705f144862ae7a23e26e86339225422cbf4fb3b5af44dc9860158dda116968349ce3cff3f9b3cfa4e71a182f00a48b055a2cd9605c0b038021cabf5961 SHA512 ea12c310a886e39854b476fc04452c4c79cc2bd4e38d01f396bd4ab0eb36f0373719831830e762b2822e4672513343997bbb5854a0ffda60038abc35af37efbe
 EBUILD selenium-4.26.0.ebuild 4201 BLAKE2B b0ed725b0b4b250aa95d2decb5035cee2a35e7f10579b8524f1b7a05b1791b865a6d23891247ee05aac3088794b01b1c6937c6f57f0569317d751aa2d6d8ee87 SHA512 35d3ccd18f33d22336bceb9af0fe90e6011db93e17b8f40f043ab827a6cc34a150ed30d7bbb02e0ccf3f3ed1167af521cca1ef09fbec1feb6414e6f155fa0482
-EBUILD selenium-4.26.1.ebuild 4208 BLAKE2B af68de0036ab7c2e1dda0a1d0c311d3555c78fcb424ddec6e8fc03ee67fbf9366e8d695806e0758f7d658ad27dc3b6488b40700e11f0a37457351455f73aba5c SHA512 37f8073311350a6212f3d9ab3e5feb756845cc69ee73e9f28c9f9b14fc63f0cf2780bd1bd51e8786fa5d02517dc7b26da37277618d9b0f644e1cfcbad493efa7
+EBUILD selenium-4.26.1.ebuild 4203 BLAKE2B 2f93db67eb6f8d292dc3f337bbb9b9365f48a6bc4b99626da0923f8ea4b472711d839f8c2c6e3d2b46c82a1646db44068a17c61e1826a781608241040e09cdda SHA512 5670ab20415688051d6e214cd411b96921134d17beebc00d3337b05a920252ecf90b1a15f8258f0f236fca70ab86cc5850ae70215912b11d06dc5e70d8d90c95
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.26.1.ebuild b/dev-python/selenium/selenium-4.26.1.ebuild
index 2a930ffc5491..3199598130f7 100644
--- a/dev-python/selenium/selenium-4.26.1.ebuild
+++ b/dev-python/selenium/selenium-4.26.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/service-identity/Manifest b/dev-python/service-identity/Manifest
index f5308c97c70c..67a7743d563e 100644
--- a/dev-python/service-identity/Manifest
+++ b/dev-python/service-identity/Manifest
@@ -1,5 +1,3 @@
-DIST service_identity-24.1.0.tar.gz 40183 BLAKE2B d597f4bfced6e766e1b256f43d134537a44e048bf4c704dbec1c16e6a29a42d60c2392c679e810b2ecc2f8ea3f681ddbe59bc0bfbd2d2c145bcc648f803b0964 SHA512 86cf2754bf8564d828d8cae4dec25dae04537ae59f5e2ee8450594f473cbd27f4c96313f743bad6842f9344a53a76a9d22064d8143e9d2d41a83376627d309fd
 DIST service_identity-24.2.0.tar.gz 39245 BLAKE2B c23e323e5b6782cf814c85d63ce89f41c0d6cf120cb266714944548b18c4cd50b23f59bd62cdcc88a7c3bd874713de3aab78340f219547f84852f895867b0f22 SHA512 8dc475b965e5e33f2c9b5587b7b91351c8b424e2ebb89ab8cf7fe159798d26912b16bcff9bc6151606e319c32a7e53a3852fafd7c7bccdbf1d6ac93c2f9dda03
-EBUILD service-identity-24.1.0.ebuild 876 BLAKE2B 2b7031a009d5602fd16c53cf48935f3d8e8cc121ce6ead43e1e9fa48ccd76e6da28379de479049eab69e505a521a3fcb2eb07e07f84bcff251e36dd97675ad89 SHA512 b277761c193707ec554dcf68e7891998ec8408a5ed804bdf673b1762f114363a6f91033d56f5a9c1e9b3fbfa32a9befd70c4077548f9b5aae78eb90b1f80ab70
-EBUILD service-identity-24.2.0.ebuild 892 BLAKE2B 754a523165651c45857b076bee66e539201f6c5d3afb5a848529000b4e3878648e2ffd48ecd326cdafdb953d0b2d14dd510da80d42f09edcfb65d74f76ae6f4b SHA512 ffda3f72d9d2546f7858a0fb071dbea1daa5fa0689fefcda153a2df4782074d1f443a169ae69e2f34613fd58f864a9cac3a8017242a1ed42fc33ca881dd97286
+EBUILD service-identity-24.2.0.ebuild 885 BLAKE2B 7c0e94b3b27da9fdc49fdef11e7b8fdee57584ec0992c9b64d51b12c1b6a20d67e8916075c433daea683684fd0ea316be4f577a0564a777574e3eb09ad938362 SHA512 685468769ad66844e9d83812392ac32e933de96b21d9d51c238f245b5460a6795d5d5bae73d44e5fe02b9c4f825e9724a82adf0a63dc1e5fbe5ca4b367b9ed7a
 MISC metadata.xml 405 BLAKE2B 6cbc25ff47728a28c25dc7c28670486dc3eeb488931fcf3883bd278f72d7f7fcd5834087c811cbeab32fd85f4dc04afd7b6fd50571283b2e88df3cc5b36dbc3e SHA512 db97cac52d30f9e01f40b4e1629b7602f643bbc0947db6ad8d4112a158a2e1caa2200438354e903d6986219a782de131b1a0ad7ad05203242b31faef9fb242f3
diff --git a/dev-python/service-identity/service-identity-24.1.0.ebuild b/dev-python/service-identity/service-identity-24.1.0.ebuild
deleted file mode 100644
index 0d33a16718f3..000000000000
--- a/dev-python/service-identity/service-identity-24.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Service identity verification for pyOpenSSL"
-HOMEPAGE="
-	https://github.com/pyca/service-identity/
-	https://pypi.org/project/service-identity/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/service-identity/service-identity-24.2.0.ebuild b/dev-python/service-identity/service-identity-24.2.0.ebuild
index cfc7d1dbebdc..164b1724e65d 100644
--- a/dev-python/service-identity/service-identity-24.2.0.ebuild
+++ b/dev-python/service-identity/service-identity-24.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 6bac33218869..cdd4f020748d 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,9 +1,5 @@
-DIST simpleeval-1.0.0.tar.gz 25714 BLAKE2B 3527c3109fd77226c1103ebaac6fb5d03b9439b7e79b2b8386bd9ac9631bc0c1843d06e7a12843801294b84517bd2fc32ce607cc6f99dacf6c827e57d1717e6e SHA512 b5310dfac1ba231e47e86ff6dc8b3c814210f3f14724a0da12f429133354a46f60f980fd29ef66c675c52cd668f2f18c74a6b805192972e821d8331817f44c83
-DIST simpleeval-1.0.1.tar.gz 24395 BLAKE2B f5ac188a6797135e79ce6d1cdc5a57987666c6670ce335d7dec68df05c6793f857fb100c087d0f228103ac74f38e41054ad8dbcf4bfc895e47c11faaf965990d SHA512 ba5202f505da411378f97b516070c6f4c456d58467ecbdfd98e611a63c77fe4382a456a9551dee00d8b22cc9dd9d8cddf57e379fac968c27db075cbfc84d8dd2
 DIST simpleeval-1.0.2.tar.gz 24378 BLAKE2B 1e4e6224c249fb13d3d39dd29d3d82356aecdcdab64336656650606b53c0d24d4bf66bf7a09b763cb647068594453d19243abfeb241928db6e0c3998803fc287 SHA512 480ba3f4ab50c10c0dceb9a552603ba90791fd34f3ecbd737fe10eafb5c60d0f5cec9ef44b8bd8ba62bbebad9bcf89117078800716ed2e26d7e0455fe681a0e4
 DIST simpleeval-1.0.3.tar.gz 24358 BLAKE2B aa073d0e6776b3943240c7054736097f2695933f9590d085dadc442e7541f47386f5894aef9709bdacbe857cae850aa8faa421b75539b8c48054c2e57696be1d SHA512 e5dbfe40c48afcc75c0d2bae00f8fd5e33f56052a0f4671ae89cb1d072e218190af3115acf6bfbecbeae8c9a4b39cb75adac9071d44e3c851a9ad31c89c26139
-EBUILD simpleeval-1.0.0.ebuild 453 BLAKE2B 0ed1de83e25544787ad5ded3a121bf185ba7c62608bcedb2ec82bcfdd153749f14c78b8395362085204430ade182ecdf4eb0f751b215718eb48001cde63b0f88 SHA512 598141e67dd024b292d95493538eccf27189c900e7071500895e12ec2adc022f36cf63387d9177a9e7958426de7a22b61e7a3dd22744415e12dc9306da6817fd
-EBUILD simpleeval-1.0.1.ebuild 600 BLAKE2B 4c6cb7fed7a4aeab100a5c169ee5396dfad08bbc822715949439f147f67f707980fe8a59ace4a233c68f0a63e41cc07f79020103f3ac87559432eb9b875f615b SHA512 0fba1fa1b0f5147be3e546c2fd5664b1d313cb67cbb469876d2d7df2d167e9f2e9d5e797fbed0a3fa732ef511435f2f2acb00f770ae0f9084ba3126f5a57c967
-EBUILD simpleeval-1.0.2.ebuild 455 BLAKE2B 518fe8530fb97fb6a15176d6064460d05c941572145ce15e11376829741f5947252a4073803fed2d1d9c68b56e9d869fff54129db59fa5b44beb6d7f4de2f97a SHA512 c2d13efed552bbe7b3fdb47ca6dcd06951cfaa46b9989f2c7d6c923c0c31cf0329f33e991f122283b2d24483680fc17856e9caf534f6cc146ea4b3bfc0861642
+EBUILD simpleeval-1.0.2.ebuild 452 BLAKE2B 31b1b5cf909c5318f64e5c7ef5675eac4c0f009affcfe4b397097ae1b24e5ef94730cb868cc48a2a5a805c8253caa8ee12b3feaa060776fc1cc3f1577531a91a SHA512 e6a7a33838378e8378446d548683926e7f1e764a2fcc15ad6885e825d7dfa692c886ad6fbfb340b2eeaba6b2bd1b449336b29b74f4440c97c89712bcd6b2cf51
 EBUILD simpleeval-1.0.3.ebuild 455 BLAKE2B 518fe8530fb97fb6a15176d6064460d05c941572145ce15e11376829741f5947252a4073803fed2d1d9c68b56e9d869fff54129db59fa5b44beb6d7f4de2f97a SHA512 c2d13efed552bbe7b3fdb47ca6dcd06951cfaa46b9989f2c7d6c923c0c31cf0329f33e991f122283b2d24483680fc17856e9caf534f6cc146ea4b3bfc0861642
 MISC metadata.xml 506 BLAKE2B 697e9acab14f80458e539abe119b70a47f4b97ff3e8e88cfc5b071a4403d80ed637976a2428512bcd6570ee37aad12cbf853b87988262548c09670c31dd7c970 SHA512 be74df1cba2c5c7684d767a229eed2f641747abee58f421ad437c33d40ebd55b360e7bee162a9464ea4443afc4de03c7dbc9c7db35c832f6cd531dcd151aa796
diff --git a/dev-python/simpleeval/simpleeval-1.0.0.ebuild b/dev-python/simpleeval/simpleeval-1.0.0.ebuild
deleted file mode 100644
index 9c96538a7655..000000000000
--- a/dev-python/simpleeval/simpleeval-1.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2024 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 simple, safe single expression evaluator library"
-HOMEPAGE="
-	https://github.com/danthedeckie/simpleeval/
-	https://pypi.org/project/simpleeval/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/simpleeval/simpleeval-1.0.1.ebuild b/dev-python/simpleeval/simpleeval-1.0.1.ebuild
deleted file mode 100644
index bc45d62a0add..000000000000
--- a/dev-python/simpleeval/simpleeval-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="
-	https://github.com/danthedeckie/simpleeval/
-	https://pypi.org/project/simpleeval/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/danthedeckie/simpleeval/issues/155
-	sed -i -e '/pip/d' pyproject.toml || die
-}
diff --git a/dev-python/simpleeval/simpleeval-1.0.2.ebuild b/dev-python/simpleeval/simpleeval-1.0.2.ebuild
index c2691f0c9b1f..c3f285110b5f 100644
--- a/dev-python/simpleeval/simpleeval-1.0.2.ebuild
+++ b/dev-python/simpleeval/simpleeval-1.0.2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 9452ab0b8517..52058a81994d 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,5 +1,3 @@
-DIST stripe-11.1.1.tar.gz 1340542 BLAKE2B 49e3884de5db95628efe1dd57685e9cced09d47015e1a7b8f9fa74ec0dd75f16d122bf1f7a579f6786b5886337d77cbf3f68770582431f4eb7dab3c09d2855e1 SHA512 13dd219559abfd38996eef7cf77c0278f58cccf744e34f139bf50068ec4ab18c896b444313103e8eab8eab05653ac6d3ba07a6d5734bde4cdd8cba10c4916be5
 DIST stripe-11.2.0.tar.gz 1362386 BLAKE2B 56e22671886efe3e2b8d3c7f41402f5dcf4320e3ceea8d0ed9cf2813ba682ead62e9af796ef94d05f5eb18f678c55c36a1005902fdceca5ce9a9b5b4ac204193 SHA512 9344845d6b9b89886ea6ec2918b4ce53545141232aadaadfbf3f7bdd6522b1ee1bfe57f0145e69c0edeb66fb01dedb3a9fd7263410f7d2fbae7240c68ac87936
-EBUILD stripe-11.1.1.ebuild 2575 BLAKE2B 62eb57a013e436e4fdc3c4547563cba2fc3c77f48f5afe86f8a84c25fa5f6bc691b8f28aed3b2ee8e3d87b4820eda165b3865c552ede91f8d58038cd0b7c566d SHA512 037e48922a2a38fb5c125495b54a8876ca56db806f6b3b3c33c955ddea66122af8b79d4dee7999817f8b305d766c3deaf573f9392ed4a5c353f90a7aad5902f2
-EBUILD stripe-11.2.0.ebuild 2578 BLAKE2B 6b91847bdbd364b73ae3fb73f6690066e2f82a28cb01abc615760b3f60d85e4f05eb6d096719ab54213847ee1080c56b9e861def728ad3df819559d8561e458a SHA512 bc05fb9da657eb4f937ddb3696414fae5640ee204b60a2b936fbbaa9d6af75352be1eadb4389ded869294955badeebf3108a420776f1e6196c2cac15301b0830
+EBUILD stripe-11.2.0.ebuild 2575 BLAKE2B 62eb57a013e436e4fdc3c4547563cba2fc3c77f48f5afe86f8a84c25fa5f6bc691b8f28aed3b2ee8e3d87b4820eda165b3865c552ede91f8d58038cd0b7c566d SHA512 037e48922a2a38fb5c125495b54a8876ca56db806f6b3b3c33c955ddea66122af8b79d4dee7999817f8b305d766c3deaf573f9392ed4a5c353f90a7aad5902f2
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-11.1.1.ebuild b/dev-python/stripe/stripe-11.1.1.ebuild
deleted file mode 100644
index 433af0cecd1e..000000000000
--- a/dev-python/stripe/stripe-11.1.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} 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 arm64 x86"
-IUSE="telemetry"
-
-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.190.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-		"tests/test_integration.py::TestIntegration::test_async_raw_request_timeout[asyncio-aiohttp]"
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -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-11.2.0.ebuild b/dev-python/stripe/stripe-11.2.0.ebuild
index 6d45d0feff2c..433af0cecd1e 100644
--- a/dev-python/stripe/stripe-11.2.0.ebuild
+++ b/dev-python/stripe/stripe-11.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index ab6569d4d699..396f919cdc7b 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,7 +1,5 @@
-DIST sybil-8.0.0.gh.tar.gz 75118 BLAKE2B f62f15dab48af23423d8ce9e8a49f3b772fad7d029360d0a98f36a8d2386fc2fc76a2510550ada6b2256848364fa0c998ba939f625c00f1628b8d1a07ad298b5 SHA512 00a02c786e29596fadc3f016c97bc492723fdd956b430ddca2a5e66d38cab424410cf3c74b46f5fff84d3bf3d39ba397068562c5bdca3cff142ce42ad0048487
 DIST sybil-8.0.1.gh.tar.gz 75321 BLAKE2B dc3b4dcafd7d10549d75767a86a32d6509c1fc6683617d533b64bedb9499dfa1405656eed049622d32d9aef13f74e20ba2a46bf5eb57bd8306e086a31353b2cb SHA512 06f0012198e575c0a90274c970880c5fbbcf0738ea57a4cc9692999ea3ad9e40be217e741b3b6ddcfd947f1787c3d60e68ee4d52d547f9929cf3fd2c89880bcc
 DIST sybil-9.0.0.gh.tar.gz 75154 BLAKE2B adc04da47539cb17001538776f1b73c2a27eae07fcc63ace38925fb46e2679f21133354b78da02299d9f87d047d68ee4ba623fc555c9efd17e965a067e8c8646 SHA512 098efe001c17606cbf3ab4095ca9b85e784a13af67d48d898a2622c18c6a506507ba7dddd43a232bb8c270734b9fadb24aeff356833a854a45285521a06c3ed8
-EBUILD sybil-8.0.0.ebuild 887 BLAKE2B de491417aa76861629588c32945868ee348ec5997b4a4b49b1fcd4ec4ed87cb9bd61aba1c34d49ea5ea6cb7247e1235ecab6b655a62610797ff8985df4f66e8b SHA512 0a336e73e870b11cc14aaf55cd1db2106feb3a669912d80dc4b20c233fcf5f43b1b67c67885bd52975079c53244238612ca91891df4a92ab6eeeacf261553a3b
-EBUILD sybil-8.0.1.ebuild 894 BLAKE2B a8335b14901435f21363f6d6a60723708620fc70d50572b4844f78eff04a4ed1c9e027dac01158f3b1e8a4b2e5982e5dae4469d7c2e624ffe976daaf82ace9ab SHA512 3e4142c50eddf9e0f133b99503238bb4989f6e61b28b3dae6e1bc376fa23f17b694af26e7d84733ae4009e0810b72d74fcc7e20e05a18cb45932712c5065bb16
+EBUILD sybil-8.0.1.ebuild 887 BLAKE2B de491417aa76861629588c32945868ee348ec5997b4a4b49b1fcd4ec4ed87cb9bd61aba1c34d49ea5ea6cb7247e1235ecab6b655a62610797ff8985df4f66e8b SHA512 0a336e73e870b11cc14aaf55cd1db2106feb3a669912d80dc4b20c233fcf5f43b1b67c67885bd52975079c53244238612ca91891df4a92ab6eeeacf261553a3b
 EBUILD sybil-9.0.0.ebuild 894 BLAKE2B a8335b14901435f21363f6d6a60723708620fc70d50572b4844f78eff04a4ed1c9e027dac01158f3b1e8a4b2e5982e5dae4469d7c2e624ffe976daaf82ace9ab SHA512 3e4142c50eddf9e0f133b99503238bb4989f6e61b28b3dae6e1bc376fa23f17b694af26e7d84733ae4009e0810b72d74fcc7e20e05a18cb45932712c5065bb16
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-8.0.0.ebuild b/dev-python/sybil/sybil-8.0.0.ebuild
deleted file mode 100644
index 571bf958f1f3..000000000000
--- a/dev-python/sybil/sybil-8.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-# tests are missing in sdist, as of 5.0.1
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sybil/sybil-8.0.1.ebuild b/dev-python/sybil/sybil-8.0.1.ebuild
index 6244e3506d0c..571bf958f1f3 100644
--- a/dev-python/sybil/sybil-8.0.1.ebuild
+++ b/dev-python/sybil/sybil-8.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/tinyhtml5/Manifest b/dev-python/tinyhtml5/Manifest
index bab262874902..4d722b91b672 100644
--- a/dev-python/tinyhtml5/Manifest
+++ b/dev-python/tinyhtml5/Manifest
@@ -1,3 +1,3 @@
 DIST tinyhtml5-2.0.0.tar.gz 179507 BLAKE2B 600e4852c49649c77d060114bb412b0cd0cf85c64d627ec4796bbce167605ff5fa15fc11504f8bf170bbce4ab7adbdc76b2f4291971b28b6a30054dab5e4efe5 SHA512 79b78171d021a0cd7f6f56b2e5bd0d9bab422cbec4c601e19cb9c248eac0df74339290f0aaacc12eae4f733e92743a0a24e8caddf709f3bc86f3c022c4df3ded
-EBUILD tinyhtml5-2.0.0.ebuild 559 BLAKE2B 80e679f2377f0c7e97e817a8626ca7f7d083a4cfa599dd7fede577ca9355f4084e7417041f893cfc0c59ce662c3b635481e3cdd04b4345646b9f71bac95ec849 SHA512 d35d397fb1fbda6994f0b81878649f4eff6e23cc5695a01e5752f6867d92eae30e4e790241e8125414c1afdb12d751e39afccce0d2b6dc64aed4a026d572c5dc
+EBUILD tinyhtml5-2.0.0.ebuild 558 BLAKE2B 5434d88946f17a4739d94f9d554ea988e759aa568041a9a198f6455ad9cb9653c53dc258a066724bd954c3cf2c39830fe07d8175000ba1b3a359129176019ccf SHA512 98b4cea21ebe192bae9e4248ca016e72fd283a142c8866a357165742cb18c7e1798ad2ac61c244ac57698d0521c6c1cc6fa480a1f1b5dce29c69485e2a618dc4
 MISC metadata.xml 378 BLAKE2B 122fdb35720ec666b0e02f21f7e19bc07330946b82429ea56947d40c7912e251479e7a5c5b4857835566f8ac4ef897640dfbc79ae48a10f08c8253dcfd807df9 SHA512 3783aa245ad8dfe297396f4d79238f63c005f7a8d89bba30f14d3908bd65766b7f3322e7f072533c9b3743bab6eb5b5deeca94c2b3fd24ba04026af1cc0031e1
diff --git a/dev-python/tinyhtml5/tinyhtml5-2.0.0.ebuild b/dev-python/tinyhtml5/tinyhtml5-2.0.0.ebuild
index ac75ab70e6f9..53ec07e70b70 100644
--- a/dev-python/tinyhtml5/tinyhtml5-2.0.0.ebuild
+++ b/dev-python/tinyhtml5/tinyhtml5-2.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index e7a6b6f91a4d..21adf6e7c257 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,7 +1,5 @@
-DIST tqdm-4.66.5.tar.gz 169504 BLAKE2B 9868bcfb4f3fc22aedfbb848d383055ef6ef9795982cd7877e620dba5391ffee369c375b27555c302d1fc6fb27ddacf8d3874daeffa62e5e8699e1124fbf96af SHA512 8e2c35f02fe365063a325d8a1d3e525870d522fab465e1a86764b8716ff32c039db463fe5e74a5f080ced40851d49b1e4273126074d62f14ed1935a96e0afb8a
 DIST tqdm-4.66.6.tar.gz 169533 BLAKE2B 98f5e357cdd99b45e30345f4a8a7b935de987b301686c2efcbf88813967258ca09ce26d9b3df31a3606db87cb7fdc6a525e8ea44d05d2730709dfeea55c32ad7 SHA512 4813fc6896bde582cb14dac2fd741772c181fe0647197d84d65561e9c9e6bf02b5370658e4839fb8f50c8ad0b8bf0ca5b5ad62b5ea29d912f288d86699b2ff5c
 DIST tqdm-4.67.0.tar.gz 169739 BLAKE2B e596b4a8e1c9af1b21f55dbf8f96ae716d4a28700fdeeddd7073f0ee73429e745d3e69824f9d53d258e646fdc84228c7407a432fbf00a6fd5651eb3fe62136fb SHA512 87c9f233eb28ff1570fc8b9a5a55c19b116b8dd451d82f1bfb14ca8bf8a2c3135fe9b788476c301ca169ef2c32099945178907feebdb4129eac2558d205e5715
-EBUILD tqdm-4.66.5.ebuild 995 BLAKE2B b7b08fdd2fb188d978b0747646a2f3928f9afb85c2e2c53a790fa7c59fd5328c42ae5ce886a06af7375f80bfa2f19d634861c3fd4376c77976cff74ee242b307 SHA512 c836918a9fe4b59426e8285a61d6f231b9987cedcb0f37e1c05a3440003961480e004da970f902635e328aca87bdc7674a0407e644fc58521e1a540a00f0e84d
-EBUILD tqdm-4.66.6.ebuild 1003 BLAKE2B 5bdf4e0623e59a51754727fd8fd45e79b9a1beaafa700d0f07f94487df6ad76f3f9e10434f2ec555a529abf950348fe08cff3a7dd9fa096024a1349403bc3ea8 SHA512 41b2435706dd7227fd99b3e8d8a26e02f851d10288885a55a905a8248bf110f5ecba0763320d995da8da4f7eca358722aa6802a0dd5d434814aa028ca7789886
+EBUILD tqdm-4.66.6.ebuild 995 BLAKE2B b7b08fdd2fb188d978b0747646a2f3928f9afb85c2e2c53a790fa7c59fd5328c42ae5ce886a06af7375f80bfa2f19d634861c3fd4376c77976cff74ee242b307 SHA512 c836918a9fe4b59426e8285a61d6f231b9987cedcb0f37e1c05a3440003961480e004da970f902635e328aca87bdc7674a0407e644fc58521e1a540a00f0e84d
 EBUILD tqdm-4.67.0.ebuild 1003 BLAKE2B 5bdf4e0623e59a51754727fd8fd45e79b9a1beaafa700d0f07f94487df6ad76f3f9e10434f2ec555a529abf950348fe08cff3a7dd9fa096024a1349403bc3ea8 SHA512 41b2435706dd7227fd99b3e8d8a26e02f851d10288885a55a905a8248bf110f5ecba0763320d995da8da4f7eca358722aa6802a0dd5d434814aa028ca7789886
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.66.5.ebuild b/dev-python/tqdm/tqdm-4.66.5.ebuild
deleted file mode 100644
index 1a026863699d..000000000000
--- a/dev-python/tqdm/tqdm-4.66.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1 pypi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="
-	https://github.com/tqdm/tqdm/
-	https://pypi.org/project/tqdm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Skip unpredictable performance tests
-	tests/tests_perf.py
-)
-
-python_install_all() {
-	doman tqdm/tqdm.1
-	newbashcomp tqdm/completion.sh tqdm
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tqdm/tqdm-4.66.6.ebuild b/dev-python/tqdm/tqdm-4.66.6.ebuild
index 134307285bc4..1a026863699d 100644
--- a/dev-python/tqdm/tqdm-4.66.6.ebuild
+++ b/dev-python/tqdm/tqdm-4.66.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index a1496d6011b5..aabe4781967c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -6,6 +6,6 @@ AUX twisted-24.7.0_rc1-skip-py313-tests.patch 1927 BLAKE2B f2647c913cf594eaed6bc
 DIST twisted-24.10.0.tar.gz 3525999 BLAKE2B 4d274a4b5989597c2789e05774bad3595ac5284f5da25fb488d46b87a4bb0e0ab311fcab228eaf070530451a28098bbefc326f6d4806378b2fe076adf5b07199 SHA512 dad7c1301c3b31f096db8c4796e064e864c2c28107c46c202b4f4b123c99a0e69f9b43afbf582997dd2c15a08e95b41213e4bc67ea1fe9fd8137c76656a20162
 DIST twisted-24.7.0.tar.gz 3516844 BLAKE2B 169347260b473ea1c50806ce50324ebd51388186098886ccaad1f94e55f6b14eb7a7fc42728dbeaf4b5649d0e6dc1e4624cd5ab6d79feeaa733e18d09cfd689f SHA512 cd5a993c8f1dfdc82597bdc095e07c1016a2a86d1ce5b011b27f9f760db428fcba4579dda5733244979827f9c772c2480d1d419d2d24ae7af8697e2b8e852f62
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-24.10.0.ebuild 4571 BLAKE2B c3509b6045e6afeee08544c51d4a02e73f1228ed9783a5b6ebf7f627a296abc38d7cecf0f880dd7c961b536bcda1cbb01115191dcbd9c4143445eaaf11aff3b6 SHA512 fa71a84b1df31afdb515548f16cc52b6dfd616cc41ccc84c6444c3bbf68439651408d97d7238bdb1f305cdf29a197c32ec93f7341ee8c8ddde15928af3fca944
+EBUILD twisted-24.10.0.ebuild 4565 BLAKE2B 5c119572ef64b80aead8e11179656eb2dec4f7ca8c99d2ae9a7b01cc4cea782d5edb629cf368c04e9ad8f07471f94ff9cd0135e9d5db1cb043d3824aa3abd328 SHA512 f2119332ee5960f02de7ee546fba72e422fef4c736f0e57b01de010cfe6d490c47409f9bf39f469c257bb9fff0ae042a3bf2e71db7ddb39c7f77f218f64bdd22
 EBUILD twisted-24.7.0.ebuild 4696 BLAKE2B fe26fc5f87dad924facc5d82a683f6f5024cac281ba21869821f3c997b349a90810c6fc63b53ed53481b2f07ac9781d2dcf3a54bca66d2118d68c33d43e473f4 SHA512 23fa5836bc07794767ccaf3c369902dad56d4abf8039e7a5c058799d7c276dec183b53d69b173a76f7e8b05c77bcce3c0f5be5f80414624e167258738f9c48a2
 MISC metadata.xml 1231 BLAKE2B 60cd09e34c32152e6f08727c1281c65e871a51e64310a62a3104342fcb0e87e96b10cd4c7601668f054f9a2cb01fdf8ebeca3ed86b61ae2496a4d941897aa296 SHA512 800d9cd783d95cecb268362619deb346783149fa9226df714f9ce990da2d45edd3c8e5669e24ad15dfdf986a5816a5361c00f13719bb0dee3e6ae1578a889339
diff --git a/dev-python/twisted/twisted-24.10.0.ebuild b/dev-python/twisted/twisted-24.10.0.ebuild
index ca55e6158b82..db7fa420f946 100644
--- a/dev-python/twisted/twisted-24.10.0.ebuild
+++ b/dev-python/twisted/twisted-24.10.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index 06f763ef3c23..8401b44cd840 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -3,9 +3,11 @@ DIST types-setuptools-75.3.0.20241105.tar.gz 43569 BLAKE2B 415bbe2320f20af8ebeb3
 DIST types-setuptools-75.3.0.20241107.tar.gz 43666 BLAKE2B c076284dd0868618a4c2c198af5c7172a10c9a093591f73817fd3e52c8ac885eb5613f88d539621f669ab2f3748fcc28e829c12d3a19f3a3a99bd92ec3ff5430 SHA512 d9eecad639fac5dc6bfde98d0274d0d02a26cc767803643d7a01756be0f93348a293bed3dfae921265be2157bd1254ac3eb1b6a3dbc35b86caff957a5c4a40a4
 DIST types-setuptools-75.3.0.20241112.tar.gz 43723 BLAKE2B 0315211e7bc53988c39a599df3e0b8e1026bb4446239ae93096cc1b7c0d2d8df7527c22f525a8b24d148129c2b7cc9a1aa385fa0d6d8f1b65d0d4a33690fba41 SHA512 71a1e6e265bf9ef254543d34b28c6e55d1cc1332166942ea4839f1ab2bc64f72ab81cf4e08b66f2a7e4965f7ea9196518b761bdf79a795d5e2d16113c7a6db73
 DIST types-setuptools-75.4.0.20241115.tar.gz 43599 BLAKE2B aa19e16d875780fa8e153d2399a6e1b8ccddb185fb2db4007beaab931471d789f45d9795fb046cd17c8a4d3fa15729f3c0fa95d96c8564a1c8aa1e9648c4b798 SHA512 21edf684c0f5aaa95b289c5bff813bfc5a800b598ccd30e9dfee6735bb055d93acb65916e27cf7a09a13065ca02f57ce494b736ada17871a635ac1b4921c0080
+DIST types-setuptools-75.5.0.20241116.tar.gz 43675 BLAKE2B d416084f82e968ffe1d45e436dc9e346dc8b13f61a34dcb35a9cb5d54a8bd2f3546c14247bac483a72555496366eb324254a74f7dc6c10498da8d2f06e822626 SHA512 57c1bac20ae6b47dda99d99ab360864bc9595ccdc0e0b89cd82f5786b36125193a39968a115b04b867e57642a3381d5dbb473f01304c323bb32b6518207b12c1
 EBUILD types-setuptools-75.2.0.20241025.ebuild 440 BLAKE2B c734df29e57433a7e8e2325687fb52987edd825cc42e801f8fb8fd77f870f1de03e3d776df8ca52530423e298af5bf4fd1b3b5edec322c5e8556c4ef7fa9c90d SHA512 292081f2e1d3e3c8fa152a361d7c1ecfac6222dafced339663b7a5a40a5bb40e4fca30a18a3028cd9189c2c63797e2c6cafc3110d06478cb33382ae853d7f72a
 EBUILD types-setuptools-75.3.0.20241105.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
 EBUILD types-setuptools-75.3.0.20241107.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
 EBUILD types-setuptools-75.3.0.20241112.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
 EBUILD types-setuptools-75.4.0.20241115.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
+EBUILD types-setuptools-75.5.0.20241116.ebuild 448 BLAKE2B 7520d7034175ed93bdf4f9b7e6e7921857b5e1f11ee63b9dfdd2673e9935d0c6272577eca5c60b05f809ceab29b8ae2bbc693e0a1191a777a6d6f2bbf0349023 SHA512 3379dde51da588db88b633950b0020a3df35ffbc3dfe5b795cca89c6cdbc63c41d651fde917b38dcb5dc338d6a7831438d65ef0cc1c4133814faa271e9bb72f0
 MISC metadata.xml 399 BLAKE2B 6e130dc38e0e0e0e6e02567d750d37c6f28ea40c4742a9247f347f29e1700fc420015e7ff951f4a11c156c2df88d7e3b7f03be7759d05872a7783a2d25e35b1e SHA512 bbc9cb552e652e7644d4d635cfd74fdfffcf6426160025411843d53d37b02fdd65f7e1fb435fee7b628033cef517e3f5a902466b5786b842592ccfad068edc15
diff --git a/dev-python/types-setuptools/types-setuptools-75.5.0.20241116.ebuild b/dev-python/types-setuptools/types-setuptools-75.5.0.20241116.ebuild
new file mode 100644
index 000000000000..50edc0c91a3c
--- /dev/null
+++ b/dev-python/types-setuptools/types-setuptools-75.5.0.20241116.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-2024 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Typing stubs for setuptools"
+HOMEPAGE="https://pypi.org/project/types-setuptools/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index eb720195d9a1..e80f35a317bd 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,6 +1,4 @@
 AUX virtualenv-20.26.3-ensurepip.patch 1231 BLAKE2B e70cb1a5f8dc8ccf6e08fce67aa3485c0f584937d8e7b693f0d0859d6ec9d9b16bf1492b9abe96d4c8c8eb12814eaa54f76ed8e318f3871ee956189ce08b3dff SHA512 86c98d7ce4a9ea073c72cd103cbce66ed720794fa4fa2b68ac19382e3c4f53303613aed80a6984a68cab513cb198d648c5c6f103308eacb3c7306b72e4321129
-DIST virtualenv-20.26.6.tar.gz 9372482 BLAKE2B 7e91c8beb59c3c3f4d538af425916abe94151efedae3f643c573f6c0dd05a37cfc42b5e61cbdb73e02fcc5adbfd34a0ffa5096790975890fe9d17f626ea5687c SHA512 9d403a835c66f9b7f733d3720f459b9450dddd5cd9a76358332da20dddd309918177d3d7782304e11f56f48755d901feb4eb9b708c3719241bf389f29bf0ba04
 DIST virtualenv-20.27.1.tar.gz 6491145 BLAKE2B 807f4b2f699098ef3ddff3fad6af9244f1a33468522395a1cfb4e937cdb44b83c54224c4abafb65ba00b266b68b0e91eeadef5b1c4a175dd0c3288f5ddbce073 SHA512 36a84a3ada9ac79fbd6c23f77b45742421af0fdbb6ff4a83660ca3fe0d2a9b2e34e0bb5df633362bb98fcba042fd6d7e5f82587efa124cc1d7cf076df260fea5
-EBUILD virtualenv-20.26.6.ebuild 3420 BLAKE2B f14f7f0d059ee5d5c4b1a18b4068d41ad6bbce2ee2bcd49b1cac89d896398f1a72a4a41caf041b1539a5b7c85fee4ec6fb5e92882ea52d184e70dc11e3e351c6 SHA512 5daf437d02672dfd5381844336edb86e3c83a07ca521d72a9f16fe467620a1abd454e4f85f0ca9c6a9db910d30b343dc52bd2737d5cb872e580947d71e63e670
-EBUILD virtualenv-20.27.1.ebuild 3428 BLAKE2B 357c6a685e462336f5aa62e316143111454b7c32d75d56f080074099d81aa86705a58638b35db827d2c69642618959ee80a138700948695a051ae4f7f9513be4 SHA512 43f379b79040c4acb4e2e26a868b7ad8ce35b39dd11cfa7082728231e90cc14eb94b33427050c375418eac9aae24f05d3e6f4cf7440c71eae01bcd2dd3a3be94
+EBUILD virtualenv-20.27.1.ebuild 3420 BLAKE2B f14f7f0d059ee5d5c4b1a18b4068d41ad6bbce2ee2bcd49b1cac89d896398f1a72a4a41caf041b1539a5b7c85fee4ec6fb5e92882ea52d184e70dc11e3e351c6 SHA512 5daf437d02672dfd5381844336edb86e3c83a07ca521d72a9f16fe467620a1abd454e4f85f0ca9c6a9db910d30b343dc52bd2737d5cb872e580947d71e63e670
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.26.6.ebuild b/dev-python/virtualenv/virtualenv-20.26.6.ebuild
deleted file mode 100644
index 9523d6898950..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.6.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-
-	dev-python/ensurepip-pip
-	dev-python/ensurepip-setuptools
-	dev-python/ensurepip-wheel
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# use wheels from ensurepip bundle
-		"${FILESDIR}/${PN}-20.26.3-ensurepip.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	# remove bundled wheels
-	rm src/virtualenv/seed/wheels/embed/*.whl || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		# tests for old wheels with py3.7 support
-		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
-		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
-		# broken by different wheel versions in ensurepip
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_string
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_exact
-		tests/unit/seed/wheels/test_acquire_find_wheel.py::test_find_latest_none
-		tests/unit/seed/wheels/test_acquire.py::test_download_wheel_bad_output
-		# hangs on a busy system, sigh
-		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
-	)
-	case ${EPYTHON} in
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# remove bundled wheels, we're using ensurepip bundle instead
-	find "${ED}" -name '*.whl' -delete || die
-}
diff --git a/dev-python/virtualenv/virtualenv-20.27.1.ebuild b/dev-python/virtualenv/virtualenv-20.27.1.ebuild
index acc7255ef749..9523d6898950 100644
--- a/dev-python/virtualenv/virtualenv-20.27.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.27.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 9451c2a0ea2b..8f457871106e 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,3 @@
-DIST waitress-3.0.0.tar.gz 179393 BLAKE2B 266130e3f0610098c29fe11076f58c8f938439c9b80e9630b917e829b64c88d06803c9208137b220827ed1deb8e9ba2c396dfcaf8d92435ee738d580dbda6f26 SHA512 8b391eb194fce32fd78c1a20cd1afe8caf20e7e0c622e4be2b1ec7d3831cb5a607cda0637d08dcd3a55f2e8c84817abdad4636bf2ca260b12a774dcfa68b9176
 DIST waitress-3.0.1.tar.gz 180560 BLAKE2B 20f7372ab2df88a9d67a7d7553f88d8024702e7003f5482aaa125ec89d00db1c5f1e1ec4f924a83b87613b871b440d4e56c72dafb450a9e107f756069afe811a SHA512 131492515d1c7c82e9dff0688c2f36f79594a2b1c6cd767ee29bfba53764aa514c8e2eeaef4319142df01001c850337954474745880541b6c9f8c39cd2ea5113
-EBUILD waitress-3.0.0.ebuild 783 BLAKE2B dac24fff4ed3712da0ae956fbac25974342d4f7081451a604b1e91f9bef29047936d40916477cfeef1b9a8746d68eee4c2459da12a7985c9b0c4918581df6f17 SHA512 8b224afce8c42b8358fe02e2a1634ff801986414d11fdcd10cba38be21c0a42de37a0b3457199af55aa582ab305add8c8163ba8e28cf4226c82e1c6d720ed494
-EBUILD waitress-3.0.1.ebuild 791 BLAKE2B 4389da7e151f95167cf8ef85e1fc5071b47840dba961ff43fc6d338aef81151705245e7598450d6d455a4a0dec89f69f4e81b9037d9f16321e9bdeacc92e186b SHA512 bd0c15a99c6122205069366bd8feffad5f4a36a9a3b25ae57533f9c0081540bc4715bb03da4f506137f971530639bd7ae5690cb944ab784c7336b2e3bce40750
+EBUILD waitress-3.0.1.ebuild 783 BLAKE2B dac24fff4ed3712da0ae956fbac25974342d4f7081451a604b1e91f9bef29047936d40916477cfeef1b9a8746d68eee4c2459da12a7985c9b0c4918581df6f17 SHA512 8b224afce8c42b8358fe02e2a1634ff801986414d11fdcd10cba38be21c0a42de37a0b3457199af55aa582ab305add8c8163ba8e28cf4226c82e1c6d720ed494
 MISC metadata.xml 404 BLAKE2B 384598e80742dbc76ff25fab9b93b3e5ad1f730c9c55782257a6e7ce2724f631213301d4a213bd1a20ffc0bc97bfbb2ae4759cf9ac6e31d9728f645fbb69cb9d SHA512 5315d60706055e2def0e41f4d8ed99bcb54f99524fc6d23ffbe36a28faa315801dbbfba02042ae217e3a9db2dbac430085500603d88cfb0fab25d0a587ccee0e
diff --git a/dev-python/waitress/waitress-3.0.0.ebuild b/dev-python/waitress/waitress-3.0.0.ebuild
deleted file mode 100644
index 345a0d4b94bb..000000000000
--- a/dev-python/waitress/waitress-3.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pure-Python WSGI server"
-HOMEPAGE="
-	https://docs.pylonsproject.org/projects/waitress/en/latest/
-	https://pypi.org/project/waitress/
-	https://github.com/Pylons/waitress/
-"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fails on some systems, https://bugs.gentoo.org/782031
-	tests/test_wasyncore.py::DispatcherWithSendTests::test_send
-)
-
-src_prepare() {
-	sed -i -e 's:--cov::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/waitress/waitress-3.0.1.ebuild b/dev-python/waitress/waitress-3.0.1.ebuild
index 5721ef370703..345a0d4b94bb 100644
--- a/dev-python/waitress/waitress-3.0.1.ebuild
+++ b/dev-python/waitress/waitress-3.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index a912d3bc7266..4b949f63231e 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -3,5 +3,5 @@ DIST watchdog-5.0.3.tar.gz 129556 BLAKE2B 93eb0ade613974b7882d8744dd2430983a5bdc
 DIST watchdog-6.0.0.tar.gz 131220 BLAKE2B 739568453f437d70ec401437b1fdfe76f4ef9155a98f5d1e885f9371999b1d5b5a31f1d0e8a5f3bfd0558009e655da1055cbc203e4bbeff4b5af9ed56c4d8302 SHA512 a248e05b538a894a00e38dabbc0cc7490bb1a87689aa14aac5835f611136fcf6f1e3bd45a6ca4f10991ffabd9264c72f981f4619bd77eb8baf297d015975d57f
 EBUILD watchdog-5.0.2.ebuild 1007 BLAKE2B 4304a29ecb5f60facf001dbc4e6b5ccb4e6cd24b9046766199c1f62198fa5e9ab14e33f30f573217b75a9a61ffc9e3cdd0202afa220ce085a13b1dce4e3f0d34 SHA512 c1ecbdf0a7e529a8c20cb698c26093a45b6793cc4e22cb5bb883b4c57f9f8b58799fafd4fb04076a3ef7b7b309ad43026939ca1b655c4ae34684612fa9dfc19c
 EBUILD watchdog-5.0.3.ebuild 1005 BLAKE2B 629d28a553e4dc2ba4c28f92b76b715da2674adbe97842e73205d9948c724c0e545405851e4c5af17a03a81c3cbbc45e324d6c44df1c6c13cbb538b3c576543d SHA512 830736fb1e08e53f7b97d87df28acd01ddf81dd66876feaded8b2e1bff20c19435d512438fade19936fdf16a671d9c11008dbac878f6596c1019d14f54027ef2
-EBUILD watchdog-6.0.0.ebuild 1102 BLAKE2B 8a8820443e19315fba9b5e991040a59d7c2be04a614f7abfda84d7f9563e44a413523212633284855e9fdb61e00fb36e907271dd4c8cdb2ab952635cb785e5a9 SHA512 2d837008af48c29fd7005d4f8fb1b10a89126aeca3475f4ba402092ae9adac75ef8c91c93cbe3390357f6faf976025cc8e9b98327e0defc6ceeaa9ac48c7f70f
+EBUILD watchdog-6.0.0.ebuild 1095 BLAKE2B 7f4591a7eef6c906a3b4ab94ff5aa07342e3f8f60c86efa857f2ca72626beb1e636bb4a242e12ce5fbf5f60e08c856f96e78ed7fb4f6f3855d5f9f9dae9316d3 SHA512 da9232ae4861ee1f1d5e78eac09efc83f329651b437ba584e89ded70ed91f69a1adb2a30799c99094eddb2b3df0b048034adada792b5a4dd7562f919db2c1453
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-6.0.0.ebuild b/dev-python/watchdog/watchdog-6.0.0.ebuild
index 1816fd4bc48b..c80c6630b39c 100644
--- a/dev-python/watchdog/watchdog-6.0.0.ebuild
+++ b/dev-python/watchdog/watchdog-6.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index ead270a4dfad..c766ec74dfbc 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,5 +1,3 @@
-DIST weasyprint-62.3.tar.gz 477181 BLAKE2B 144b531e36c0e66fb715d2b1db20affb489e90dc7545435e2d2d5e5e89a0b77e03b5f08166a5ac6f488ed5e2ff5d268408d94edaf66a3327895f719e9329ff60 SHA512 c563019aac075d0f55a153483719a5ea1dd4dced8bf281aeb1c5ccb65b8591e883ea09ca86757073b10a4dd9dc2d718df83ff5913cd5b9ed703fb5cf71bf7fbf
 DIST weasyprint-63.0.tar.gz 491295 BLAKE2B f25a777a5057502f5a056417037411325c7600db2f1609c854c43ade98a1d7bda6a5c4663e7221e3b8002dfa763aff1b104541ee4cb55b0079cf973f256efe6d SHA512 79384ead532dbcfc561d2c490fbc04d7d0d11ed3c589fe375e9b2bb43e57a28c5bcfeaa7a6fb8daa1b031ce56720775e7b558c0a6ac5d195dee4310a3a3cab8d
-EBUILD weasyprint-62.3.ebuild 1051 BLAKE2B 07524c7ea251d1227f8b96637b4827c927a14c1cc0429f9bd9aa3f77a61afe2d17a4d5276b3e569670553d5d6882e3bc5e959e077d037a18951e514253b9d5c0 SHA512 e7890bea3ca800608d3747fd8a65b864d6c8b65e7496dad50ba46d7d76776082d973076f181249911faa26d012c19d6615545230a3528e615d6f1ea80e41403d
-EBUILD weasyprint-63.0.ebuild 1164 BLAKE2B 59c78b875917fc73360eee9cc8539e20308680c2f2a4801c4687302a839d82df6f65078a4d2d198bd095161d73bc866977f92ee3f5e11f128b2c5e7884628803 SHA512 bff915b32873d8a3576286d621a784254b0e209d6a4d85da171bdba6c74614aeef5fe9032297d39ff540ebf2faecf494ec90f4d3a1bc92633c6b2e8307a36a39
+EBUILD weasyprint-63.0.ebuild 1163 BLAKE2B a3e8d718f22e780454df049193b33a38878ff731ee37492d8d0b7d926098771c2d3abe50ab7685bc156bbb0014fc681e41654cfcc39f9d8aa5fcf878a8079cee SHA512 4a891481afcf883ea6415960533a519139b813541c15cb0e65a4a21d0cfe7a10f826003f2ed7ac169860fdc4719206b10ed42fbac34ea4379a652fdf6021ea90
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-62.3.ebuild b/dev-python/weasyprint/weasyprint-62.3.ebuild
deleted file mode 100644
index be4627019a26..000000000000
--- a/dev-python/weasyprint/weasyprint-62.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.3.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/weasyprint/weasyprint-63.0.ebuild b/dev-python/weasyprint/weasyprint-63.0.ebuild
index f8de6dffa726..48133fe5a259 100644
--- a/dev-python/weasyprint/weasyprint-63.0.ebuild
+++ b/dev-python/weasyprint/weasyprint-63.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index f006d33d6a67..567306a2c899 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -5,5 +5,5 @@ DIST yarl-1.17.1.tar.gz 178163 BLAKE2B 88d864944829e4b69ae346b0c6eb205969e9f9d23
 EBUILD yarl-1.14.0.ebuild 1364 BLAKE2B 01e769e473b04efb8ad17a0432a5cf870baf227c8d9224bb9e85de84858c7b5deb744dac46045b099f881080380240337f8cd7c25e65d9fd0ed95152dc6fced3 SHA512 52ee02f464cf5a317ffdbaf53c59627cd4012c4a26d26bfc4decc97ada5809b50fe0bceea7ec067f13a6c109e48deb1ed5ee51738b04f30f63f8e427e73ad472
 EBUILD yarl-1.15.5.ebuild 1474 BLAKE2B 67510cf06d3ffda1ebe9b3be765210b4c4d1b451371ce3045ff328a5cf328a69b0cb604075934bc9481f3fbcc4f3a51ff1e1d5cd57109fcaf1f90dc21b089721 SHA512 c4840898eedb58a78fd98edc5d28fdcda3c3b43d6ca6613c89107b321598cf6fa83bbf65bc05ebd99bfcde149b1a7cdf2dc86e4ab3388dff6a958097b2fc8df4
 EBUILD yarl-1.16.0.ebuild 1474 BLAKE2B 67510cf06d3ffda1ebe9b3be765210b4c4d1b451371ce3045ff328a5cf328a69b0cb604075934bc9481f3fbcc4f3a51ff1e1d5cd57109fcaf1f90dc21b089721 SHA512 c4840898eedb58a78fd98edc5d28fdcda3c3b43d6ca6613c89107b321598cf6fa83bbf65bc05ebd99bfcde149b1a7cdf2dc86e4ab3388dff6a958097b2fc8df4
-EBUILD yarl-1.17.1.ebuild 1481 BLAKE2B 88327ded19ba58b8f9b8eebb3211f16d03a110d7ff55edd667263256c420d5e12f5fef0ee46047914b5b8f68f3f9042dd7f36b38fdc41214426e3b6309447826 SHA512 33889a7a3b0203656a1de970120b8490a4d306e7151f48a5d3affed423305ed78ea8944ceac13541d8b259ddc9b65a91df53b4fdb85b2840bb2f605400181065
+EBUILD yarl-1.17.1.ebuild 1474 BLAKE2B 67510cf06d3ffda1ebe9b3be765210b4c4d1b451371ce3045ff328a5cf328a69b0cb604075934bc9481f3fbcc4f3a51ff1e1d5cd57109fcaf1f90dc21b089721 SHA512 c4840898eedb58a78fd98edc5d28fdcda3c3b43d6ca6613c89107b321598cf6fa83bbf65bc05ebd99bfcde149b1a7cdf2dc86e4ab3388dff6a958097b2fc8df4
 MISC metadata.xml 440 BLAKE2B 10fd0e37c9be76c5d1dd90b9fd1cb1e5161fc5a7d2b51bcb5658a8c187a67d5f9573241733c3f9570e9fb7767bf84b38a6f8b2c212596627bea4e1686b7eb41e SHA512 c9e340124ed93cb0d52a0ae5abd43c10528197893c3d5ab57a0eb7046ebae5b80119f7b033d6697110c4bc064c0a8581d904788f6969cb52a433064067898cbe
diff --git a/dev-python/yarl/yarl-1.17.1.ebuild b/dev-python/yarl/yarl-1.17.1.ebuild
index 2f428eea3047..0ac6ae66078b 100644
--- a/dev-python/yarl/yarl-1.17.1.ebuild
+++ b/dev-python/yarl/yarl-1.17.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zenlib/Manifest b/dev-python/zenlib/Manifest
index 5735557e8f76..3bbe342b48d9 100644
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -1,8 +1,4 @@
-DIST zenlib-2.2.0.tar.gz 17727 BLAKE2B 073bbaa252ab000a30602e0a603a8293b8c3a322374ad4172758a6c95d52483b03cc84d4b72aa868168bde03796defb3efca85682ca8f7b7fce6243d8112198f SHA512 4b324e1b56d757536a80d4d5fe31d4087ee8e1a0aa1ff8a19a43252033ea6e5115c55c5c6d69bcae8594bc36c84625b75df2ce93a2f49f7b885179aa05b45d80
-DIST zenlib-2.2.4.tar.gz 17734 BLAKE2B 9c054eafaa8a70231f9ffca241aad0fdd49257f77de02d47ca0fed7636c06a95923b1398ce8b11de7e690aa7be6762e4e0576b82edae15977f6f0b20a7c31c10 SHA512 ad1be96b6cd4f46e342e012cbd93b76fd051b7cd2d03d23b0065978b1d0a15a751ad5866322fd69b70890ed18f154355556b9b8402e6f19d17175340c1b5a0d3
 DIST zenlib-2.3.2.gh.tar.gz 20508 BLAKE2B 78ab80cbd1c4c71045900f6ddf3896a743fec2780a1645a7f10fd5678574cc68972321c28ae69b2fa60bcc6292691421c24e0b5c1c8326577d0a6e19a9a098b6 SHA512 08fec47999cf56d8db2bd585f9246708a0c566b529d9ddb49daca8c97a3b2e188217513087ede0c36d8182ff088d37483bc14539a35f51d2aca5d897c7479a99
-EBUILD zenlib-2.2.0.ebuild 434 BLAKE2B 84d59799d48ad6ae0a4392276a5ce80b14fcd4325fdba73e7b3fdca283b6a4a135cd81153fce5a930be70526d7ea39c1b7a981f72b5cb16cd0335353936f40a0 SHA512 aae490f53e25f8a0b45cdcad4991ae33c01827cedb25f7a44a187be300e4c6f29adad498acf8229f281c2fc5bc5092166d6faca3c4f7636c25e5f3526568c2c3
-EBUILD zenlib-2.2.4.ebuild 432 BLAKE2B 11ffcf0654bbaf6cb2e9fcda10bbba616b5323b320fa0d29c5e12cf83ea0756e8c7f9b57a8bd571614d5163bb79978b6616041c960a9b89391e5f74225acd722 SHA512 d3dbd2d2c33f0b60fc526620703917bb74e11978ce8818974c78ddd80aa6c826c3da920d1d8b82c3370ceead167f7bc096814ef1bf6f94b944f961a67dfc72a6
-EBUILD zenlib-2.3.2.ebuild 514 BLAKE2B 189a1cb2aa09285e839015e805428e90c4e7a6760c91b63da3d5c624f1ee25f08fd61b269c22499ea9d4f17378f537b94a7fc1b3b4f3b30beb936aeed5bab08f SHA512 325cf7b7ff7a1616c441d0f9ca1dceffbe28776262885f9c076246f1bed02c8ec10f2a90b209d61b48839db430ca92a272790b81a9fb73e1e970fd8d17f52bb3
+EBUILD zenlib-2.3.2.ebuild 512 BLAKE2B c75b40f64204cf962fa5b87d9963bf082fa9073e7f01f3fcc81740f463e1878d8a59057b61c210ae45ed991443379b294e68ca63b068aa7ce7817acedb860d28 SHA512 1ce07aec15b742f2fc7e9e8cd6ed87b9189dfdbffced9e4325742843fabcc366216d208165ccb1ec737081bf76a5e519cdc117fb5e9609e0f876c7acfa1af44d
 EBUILD zenlib-9999.ebuild 462 BLAKE2B 1dfc0a6ab795730ab017df1031643b4e50f73b180e2f50dcd2bca49ed9750fcbbe90d5c5ea207c987d36ff7fb1d5891eaad35936278cea5a96d13de89bd43176 SHA512 6c0952430cfa5a02b7bd0c4de824145866b4abc5b6c707452ef205c2b132796c6e9fde846a922f81cd6c9606c91c7faa351cb22fcab69878b558fb45b267f8df
-MISC metadata.xml 448 BLAKE2B f789e39fd21021b8af60099a33b46f07bb4fe0990fa7f1985aad2dfa951b14c6708fcf3c5ebafe188e1af94b162fdb273a0e90ecf803103d5816bc2ef372044f SHA512 593daf3aa77a54b4a52826e343b5db8319f2431b5ba93c505291b670956f3eb038f9e1b4249e268297090775056473567bc8407e2ac02c48b4fb516f3b7f8147
+MISC metadata.xml 472 BLAKE2B 032f0c3e944db5091f98e10eb5c5d5d1385291951d6ebd1d6a8c9a59e42bb59e2c566297fff3dadce420fb23f697ed8ee462378b7def0f862f82b04df7d67f48 SHA512 8c456bc68afee6391230defabf7928b8715a642f0cee3830c25b53326a7b90bd4ebbcdfbb05c0d0afd7f09406c94a339b3568fae822e2770e64d0e45b132d730
diff --git a/dev-python/zenlib/metadata.xml b/dev-python/zenlib/metadata.xml
index 70ae9d36b263..6b4addafb5fd 100644
--- a/dev-python/zenlib/metadata.xml
+++ b/dev-python/zenlib/metadata.xml
@@ -9,6 +9,7 @@
 		<email>nowa@gentoo.org</email>
 		<name>Nowa Ammerlaan</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">desultory/zenlib</remote-id>
 	</upstream>
diff --git a/dev-python/zenlib/zenlib-2.2.0.ebuild b/dev-python/zenlib/zenlib-2.2.0.ebuild
deleted file mode 100644
index 901021ca3bc9..000000000000
--- a/dev-python/zenlib/zenlib-2.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
diff --git a/dev-python/zenlib/zenlib-2.2.4.ebuild b/dev-python/zenlib/zenlib-2.2.4.ebuild
deleted file mode 100644
index 5f3cf97f05e2..000000000000
--- a/dev-python/zenlib/zenlib-2.2.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
-inherit distutils-r1
-
-DESCRIPTION="Useful python decorators and utilities"
-HOMEPAGE="https://github.com/desultory/zenlib"
-SRC_URI="https://github.com/desultory/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
diff --git a/dev-python/zenlib/zenlib-2.3.2.ebuild b/dev-python/zenlib/zenlib-2.3.2.ebuild
index cd63c6cb8120..6210ef57bbb3 100644
--- a/dev-python/zenlib/zenlib-2.3.2.ebuild
+++ b/dev-python/zenlib/zenlib-2.3.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 
 distutils_enable_tests unittest