Adding metadata

144 files changed, 1174 insertions, 1776 deletions

diff --git a/dev-python/aiohttp/aiohttp-3.11.18.ebuild b/dev-python/aiohttp/aiohttp-3.11.18.ebuild
index 06772b8404ff..b0fa55b11278 100644
--- a/dev-python/aiohttp/aiohttp-3.11.18.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.11.18.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+native-extensions test-rust"
 
 DEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 6cf6138c849c..f9ca9fdb803f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,6 +2,7 @@ DIST boto3-1.37.37.gh.tar.gz 930327 BLAKE2B 93ed4e903189a9620f13e71fe64557ebcfa5
 DIST boto3-1.38.10.gh.tar.gz 937983 BLAKE2B 3e82c1f7e1de9ff61a0db1124d265a03d48abe8ed251a7981e378a3108e500593fbc31ee18e5533f94254e386558ce93b0ddc706d74ce457cfa22c34e496d4cf SHA512 635fb20ecead040d9a81e4738a9464210c9c31018c6bebc66f6f5893b68e924c12eb48cdcce55ce49faaf1d3a3ac9f7c07cfc56aee9b26713893d1dc5e43dc06
 DIST boto3-1.38.11.gh.tar.gz 938736 BLAKE2B b1a27cb729b67047d9df35e4c9892560eeed5aec16e197e57493680423817692bc8ca02ff08afd4b2e678fa82b11226d22c27798270c1e3cc334578dd8a6a041 SHA512 cf70dd6710fb19fbcd604c14b0a98a51dc8efc49e2d4afdb02bcc75654e5c07ceac2695635b1e0a579f5db48b885ad1dcf1efc277bf5695a93da0b097a861ecc
 DIST boto3-1.38.12.gh.tar.gz 939412 BLAKE2B 096514640df4a98b76c30cd21816260fcb7a23c2a9cda9410094f35bf1c153995046a68497d1af8af7fdce47ece9efdede595a3d9a35ce9605058e5172bc8c60 SHA512 e430a248bf26fcf54fd3737502f0fb335275353381c23d7bfba793f0d092e0e37a1fe0bac550d1ad6386f92c1d62f868a939d9addfc48afc9331a082b9bae07e
+DIST boto3-1.38.13.gh.tar.gz 939786 BLAKE2B 5c65c92b79ce28f398170950ed0fbce84a0079335a391a7ba4243a103634ba9e863fff8305dd799c47b896871ce16c5393fc2a4974026e34b8e35ca396002092 SHA512 e06f144b4cc6784d2563de2bfba2e0868c7877a2232c390bfee9db70518880b2d3c1506d3849b5f7cf46515ee2d1932a1ca09ca8847da2824f97fa5d828bc313
 DIST boto3-1.38.3.gh.tar.gz 934010 BLAKE2B f5008a63aec620385e06c15e97ea37335bba190e5a29920c14389ae0dfc0e09a70ce70f8b50c0d25feda3defd9e855739305d19df7759688c156f53fc698b533 SHA512 8f300e38c7912f5df00431c1b70494521ac49500512b4aba7dc18f6bf0e570508d6a00fe8a98eb3c8607af39744a67e3b47d69507dbaf25d44dd02085f24bf95
 DIST boto3-1.38.8.gh.tar.gz 937130 BLAKE2B 4158573a032957c33f62c6406937a45956f4ccf972be4a223e16a327b0b476402a1e7bf7d9b6a5b83005fc324f6c0062ed73008972cabed9247790225c4d4e5a SHA512 3c3854ed132ad4c81cd868848a370cdc73101ac3c578f8ae70bc53c9a98b1d85dcd364258027adef976b3c6d220aa45f865928c055c9320d3a268e0e29d5af63
 DIST boto3-1.38.9.gh.tar.gz 937730 BLAKE2B 6b1a68095601d9b32be0679171a73b204897a7f632c1825ee203d27b46c625b196739b9c6ed8f19e84e0f0d2ba3a777539d9474cbaaa526fd499655e62ce9def SHA512 37960c90bb8de6328dc08cabb98a71e0dbb9303137410a1e44efdd650d6d0009398a4c4fb75ab53f8c8dfa7f566925c03de10012092967e661157f6bdc12e583
diff --git a/dev-python/boto3/boto3-1.38.13.ebuild b/dev-python/boto3/boto3-1.38.13.ebuild
new file mode 100644
index 000000000000..b862f479d876
--- /dev/null
+++ b/dev-python/boto3/boto3-1.38.13.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,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 ~loong ~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.12.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/botocore/Manifest b/dev-python/botocore/Manifest
index 1469b199676a..ca0edffd0900 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,6 +2,7 @@ DIST botocore-1.37.37.gh.tar.gz 14563135 BLAKE2B 290689f13333ab7ebdbac0bccf65680
 DIST botocore-1.38.10.gh.tar.gz 14616622 BLAKE2B adf54a0e015d3a8b17ac986f8f05b49552ab3966694bf2fe90fbf9a0e4da134f4028469133d5c9b9717c2bd9bb874e0212373482341c1fee7a837d15614cd3ca SHA512 bc3ff2e73cd123017bf3be6793cbb902fafce244cd2469c33f093120317acff75f19c37c5f11427882bfc1be228f2f1a1334024e6c6683e46a57793f77a3bf0b
 DIST botocore-1.38.11.gh.tar.gz 14617163 BLAKE2B e521777baa74342bff16a59a0a1281e8c44abfa4e83c49aba3cf7ec21ef0fb9e4940a7aa82cd1e51ed628ce64260fbd953db8c0867139c2ed37d2a002e01ad9d SHA512 6b9cd410aa2cf4169450aa6607ae68408a179258d1de8f0c465bc8010cad0ad05946822924780c68259bcce95c1b99e61459c850f9a31a7df5ac8638ba1186cf
 DIST botocore-1.38.12.gh.tar.gz 14619336 BLAKE2B 65e66c6ef2daccef4e21a8256e4633140c2cfd424b76bee71c76fb1f9609c27623fbf34fa5a73606a9b9e1877e5eae70453b6106f0f02a1148f0baef6b5cda2e SHA512 471918f08af44395297f25b663d972155dddd23d6e1904afb3c002d38e919b52785dbc7da84f8a5b56921198304a7a28320328fc00da2b786ecc8b726bd1f08f
+DIST botocore-1.38.13.gh.tar.gz 14619576 BLAKE2B 088dfd540934b2c1f20e5a63ffd3aa2351021f3f61207d30d3352e3d92c5df6138e87fe74fc9e48b2bf221dda2ede7e632f50f4378448a6dc6cdc2f87aaa0b02 SHA512 b1c7b585289859b94325bb1f3934bcb3a0d7596cb22e20ee79125aff96af2aa9337ec97a197426200b4ac606370eecf395a0ba7e26c79946c9390fbb02acc578
 DIST botocore-1.38.3.gh.tar.gz 14578552 BLAKE2B 4766db1ba2651ebe65c79f8a37c91cf95875a20c0cc51c1886cd394b90d50109738daa79b398e0c4b80031cfab69e1338dfaafbc0ae796fffa3348f6b13fc1ce SHA512 ad69e119d5bbc98a0c14c1c927badeecc1f57d31305e6a07af41d4d4bf6755f5abc150e36321f71b9495221ad93052d84a1dc964fb9ef6fdd791d4c37e75a01a
 DIST botocore-1.38.8.gh.tar.gz 14606167 BLAKE2B cb92f6014349f5188d62ddeb043e7532c50c7edc984cabae918825cdace981694c37ba656afcbbb64e65e275da4980d5f256a945bbcc63f9609272b08690c3d5 SHA512 bc9096051fde740a908ef0912a0c205595e7df653a349c167f616a788423578ba6b3aed6fe6213f528faa32b1c946abf0ac66dd81afdc05d41d12a4af4f7e818
 DIST botocore-1.38.9.gh.tar.gz 14612563 BLAKE2B 10a0e43846393c06c808e306cde1398ea9374712d07b71d16270cd3238d3063f66ff532fab465acb5a87065002b7ca7394d0c77a25c83b9f8b8ecad7823042a2 SHA512 748c373a1be84a123968444316de7ab6f34b548d7619183d23ae07d0b0aeeeebc8ba1d25bb5517f0491144f7578fa9a7e9fbca066f6aa0da7b2d7439138bb8fd
diff --git a/dev-python/botocore/botocore-1.38.13.ebuild b/dev-python/botocore/botocore-1.38.13.ebuild
new file mode 100644
index 000000000000..df85ee0d220c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.38.13.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,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 ~loong ~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/bottle/Manifest b/dev-python/bottle/Manifest
index 761bfcb39c86..cf75ae2730e9 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,3 +1,2 @@
 DIST bottle-0.12.25.tar.gz 74231 BLAKE2B 2856d94e1525f21e272d70ca3101188ea65417179342d7b3e971c5d1a3be77265e4197e5d29764a5739adbd984883ed121524f29e6a5933b8681e2c34b511a57 SHA512 14b8ed1ffd58f9667d451872ccf73a6f4bf8f7ffb9329f55314f90c770630cfe3f9956f786bcc7fd5f67fde22d14961952969af405912ebe71f019ca6599c975
-DIST bottle-0.13.2.tar.gz 98472 BLAKE2B 44c47d052e1daa99bea23fa0be9bb9977c4747bbee496e6815e7267b473cfa659026b8abed248d89235915c5018c29b455c379fa9ed22df8ba861b909b27cbce SHA512 3923070d3723fa975aaed79a6edc7ec47ce2d3cbc4b3fbddff340e19e3e13215034208c2bd198726b0461008313c4600021bd2766b7f0a0dfae2b12ff988f52d
 DIST bottle-0.13.3.tar.gz 98555 BLAKE2B c076de717641022441b6fd2a225c7dd9f68baf68cd19f0fb64639e38e14bcd187f6bb4a04bbade95252715bca5cccaed94de0809f6ab9c8c431f0c2db0e9abb9 SHA512 a84ec4851eaff4238b31fe9eeac02d694a94678e4f4cae9513599fb9062df4e8593bcd15fbdf8a6b020f9f67e75345de964da06a66a28708c066d1c8e94f5564
diff --git a/dev-python/bottle/bottle-0.13.2.ebuild b/dev-python/bottle/bottle-0.13.2.ebuild
deleted file mode 100644
index 603af5eedf50..000000000000
--- a/dev-python/bottle/bottle-0.13.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="
-	https://bottlepy.org/
-	https://github.com/bottlepy/bottle/
-	https://pypi.org/project/bottle/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "Templating support" dev-python/mako
-}
diff --git a/dev-python/bottle/bottle-0.13.3.ebuild b/dev-python/bottle/bottle-0.13.3.ebuild
index 6bc64a88ede6..603af5eedf50 100644
--- a/dev-python/bottle/bottle-0.13.3.ebuild
+++ b/dev-python/bottle/bottle-0.13.3.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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 7def1ab51e43..7522a24e023a 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,3 +1,2 @@
 DIST cachetools-5.5.2.tar.gz 28380 BLAKE2B ff0f838bdcf3ff29a466829a34e80c83a0d15763039bc9d81e254daf150bbd39a42a04b4541be06d7beaa938561a1d35646a83eb22474baccd33479d5a56b53e SHA512 9969eb5ca092174975a79e664594842b4ae4f671bc17ae3e3d2d286b164eb408af254d6b40358dcbe5e4341fc6a0ef928e192eb1432696ed7654729062555a29
-DIST cachetools-6.0.0b3.tar.gz 29181 BLAKE2B 8dee80202f141b534372d3abe3a44f3e26d8e9b65433006bc61057d4d2f603bb0acb9bc1e9c66e732235f878a8cbc7c10c6d732f654ad076e02e5a430ef0191e SHA512 8dc36cb6f804a600fc59f900e40c13dc907e58f87fdf7b336d5060a3c7424c8769742f39a1cef7fed6f8af3e88c8f9b4a29fd13d9caea00ab97b4abb8197cc22
 DIST cachetools-6.0.0b4.tar.gz 30050 BLAKE2B a495ba3244f18a9b8fc7c9b1226c34ca4019660d41afee07963f114e5915faec36b31dc0ab74e2be9a87462641252a85f8629072c24f3df908bff805b1ef5e57 SHA512 89861cb48c922d7e61cd03fec3b0836029814bc4e90ae0047deaf8e8d878069a74e6f4cb69b0fb490564623cda0ce3fe8bf4c4f65939e1612e2ac9130ad46b8f
diff --git a/dev-python/cachetools/cachetools-6.0.0_beta3.ebuild b/dev-python/cachetools/cachetools-6.0.0_beta3.ebuild
deleted file mode 100644
index 6227509adae7..000000000000
--- a/dev-python/cachetools/cachetools-6.0.0_beta3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 134133d0064b..38c18761186b 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,4 +1,2 @@
-DIST cfn_lint-1.33.2.tar.gz 3163304 BLAKE2B f61d6a55e1fe2edd3229d6e9281b6267b3231afea43376d0ef2046ed941ef1c910c56e1af05b9eec08c8f0bec87fcddc95757a2433e1c46b2c8863280bebae2a SHA512 d935009da692e5003461d9c9f806733d17de426e0598a33a53470d3ee6c8a194c735b542bd346e9b33d462a71a6043f6ae1f8e9ff55cff3b6b942d2f1f49913c
 DIST cfn_lint-1.34.2.tar.gz 3180262 BLAKE2B 0e92964da1d661e5a37f9f4c65c46b7eabdf9a23df1cbeeba96e072347b9be32b8067e72179e51ff83fbf8fa5cf810a409fe1819f3c124189a83e0bd9d147e0a SHA512 46d738319c3e0227fa0996e102e753929bf2bd6916136fe1879d757e64cc83554eca9fd1934dba89602301e42854af9f229bf4d41a118e2dea895553cf556b6e
-DIST cfn_lint-1.35.0.tar.gz 3070040 BLAKE2B f0f868188e8b9088ce3e15d6b83dfc75ff4fd69b6095e8f1d3f27eec0da6518df5231336416bfc14e50b290def2ed10c9d6e4b022686686f580fec1e4a88db6d SHA512 8f44c6f1639ddeed41f4b978b1b5f8503de6a3e2d96b85a82f86f23ea2a258dfa7cfb37019a5bc9ed0620ccba6d8993f12e33c06d81eb32f1201309dd2a23580
 DIST cfn_lint-1.35.1.tar.gz 3077415 BLAKE2B 8ef32c6a1b7e6d4db976e8b59b1933814647207a0d690ecadb82ac1dd660bc5ed55e66de2ef21e9936d0c97abcdaa1bdaf8e65a996622e949ddf07afa8588240 SHA512 90c6acec47e9d4fb7344dab7c3ce8170a0ee09875806fe1ea71da91a9ef9e852044a351227b279e9ae0ba42d8f2f1104c6f1460b0aba00aac63ce41d4e147b36
diff --git a/dev-python/cfn-lint/cfn-lint-1.33.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.33.2.ebuild
deleted file mode 100644
index 4e5fd788dab8..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.33.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.96.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-77.0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# different line wrapping somehow
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.34.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.34.2.ebuild
index 669286dc533a..9921dc42a902 100644
--- a/dev-python/cfn-lint/cfn-lint-1.34.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.34.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.97.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.35.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.35.0.ebuild
deleted file mode 100644
index 669286dc533a..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.35.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.97.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-77.0.3[${PYTHON_USEDEP}]
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# different line wrapping somehow
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/clang/Manifest b/dev-python/clang/Manifest
index 392493c200e0..d173631df2d3 100644
--- a/dev-python/clang/Manifest
+++ b/dev-python/clang/Manifest
@@ -15,3 +15,4 @@ DIST llvm-project-20.1.4.src.tar.xz.sig 566 BLAKE2B 1f0f057dedf938190554ca1a51d9
 DIST llvm-project-ac8fc09688e10e983b99224b5dc5cbbeeedb1879.tar.gz 231567089 BLAKE2B f7878f114c908b21d179854bc693716b34b963612c6b5172789a37cd21fa316720d4e9498bc7679058db3e822ed240bfdafd85bfd00154914d747d0c0ed1cb48 SHA512 4c39db8b22fa087ca96c3b4541ec77ba8a826a126b4e93b0650e59b3622b22b329f60fa3780dd4572fdece409fd5833eda473046d7547f6ee3ac8aadb8f2fc34
 DIST llvm-project-b9e32749d273a957e60170d6e7ef205fd1fb1834.tar.gz 232146799 BLAKE2B f7c02bf1e6b9958114f07827ff00264774a7ad54b51c6867d7e66d7c9a94a36fb84f371d7d30c2f094a0d539b565fb651786ed9e0641f2bea8d982073f1a8ac0 SHA512 2d81ead79c606e00549d5205584f1bd272e4d7adf4b376fdba19e7fb719710e80b00b22ee3500ab2b990178fa044ca9fcf45bd2063e62e6a217b11775bb3b163
 DIST llvm-project-d1e38eab95b07b422194427474521623916bbf29.tar.gz 232705423 BLAKE2B bf5200c2223d8cdf7c34c84876d8cfeb9429cb6535ced226b1bf9ab468b6401fe3da8759f0fc1ab3112927304c5f74db29b18be60fa961ce99471caa2c6a1f33 SHA512 8fae137725ad4eb0f5bab73895c65b34d1e36ea039c9fb3978c908ecc6023094d84919b97dc405b86e2dd32f585d87b29cee02293c8156d10a8371b516ca5e7a
+DIST llvm-project-fcb4bda9dcfcdb64d8b069e8416c75d7a1a62e52.tar.gz 233149231 BLAKE2B 95a7a012a1e747afcf83ace3785c8ef6a3e10f6075e59eb1c5b077cc9edae244b648f341bc0ac6a45b2afc8f7ffe130a90a741a04465523f30f8322566386703 SHA512 b46f0c90a1c56750cada24183ca382b267a2d2faa0db7d77a8bdd4e94e6303e57d565cf85447b3c0e0efdd3750efef1e10e8ce6f1fe8f1ae10ee31d25ddf3fb7
diff --git a/dev-python/clang/clang-21.0.0_pre20250510.ebuild b/dev-python/clang/clang-21.0.0_pre20250510.ebuild
new file mode 100644
index 000000000000..a99c5601e047
--- /dev/null
+++ b/dev-python/clang/clang-21.0.0_pre20250510.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for llvm-core/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=llvm-core/clang-${PV}:*
+	!llvm-core/llvm:0[clang(-),python(-)]
+	!llvm-core/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		llvm-core/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/concurrent-log-handler/Manifest b/dev-python/concurrent-log-handler/Manifest
index f8448277a646..80143625fc66 100644
--- a/dev-python/concurrent-log-handler/Manifest
+++ b/dev-python/concurrent-log-handler/Manifest
@@ -1,3 +1,3 @@
-DIST concurrent-log-handler-0.9.25.gh.tar.gz 41565 BLAKE2B c9a9641f31baade25a6f7fca24f213a0b41b31d7b6c9ea4ee4778b5b1662428ce22bc5e532bc877354d218db459441c37f4918a6119e469a3495aba3e0a7f564 SHA512 682f33a9a81c78e7c07bcf7c30f5955100a2846d08d3da4331ec8d155e5a35c92e224bafbb848b121b41ab2e84b60b35a31034185b57b7c02ea4bdaaccf8c4ac
-EBUILD concurrent-log-handler-0.9.25.ebuild 678 BLAKE2B 0eed4893824b30256a5e19bdf049a62e0fd7ed951a508aac810d79aa47ef5334162a6f6bca6de27196193bfe8e96b7f85e1585b0e4f731dc2b8cadb45bed85de SHA512 7e26a618bd8e67cde38af4b09d14caa8f270e20ae2f9a13374ce8b29c97cc8f76a99d42c123e3bc0631b5c4d62520dc63f123ab8de5984528db17d7da3be0e9a
+DIST concurrent-log-handler-0.9.26.gh.tar.gz 55150 BLAKE2B 785df170666e8c9538109808109116a57e30677b64f967097890d053ad232943976917925364f0cbf0fb828ff83f384ef847da857ba3621c65d27269af772be6 SHA512 59dd009712445115634e854c9f3738dc0f3893d8bb150b5edfcc0705e00e84fd2515720ad33f82687f60d9855709f69ba838af3729bed2bd0d5759fb604e216e
+EBUILD concurrent-log-handler-0.9.26.ebuild 678 BLAKE2B 0eed4893824b30256a5e19bdf049a62e0fd7ed951a508aac810d79aa47ef5334162a6f6bca6de27196193bfe8e96b7f85e1585b0e4f731dc2b8cadb45bed85de SHA512 7e26a618bd8e67cde38af4b09d14caa8f270e20ae2f9a13374ce8b29c97cc8f76a99d42c123e3bc0631b5c4d62520dc63f123ab8de5984528db17d7da3be0e9a
 MISC metadata.xml 505 BLAKE2B dad218de3b8ccad3a14150386a121035cfcd6860ef5870e826aa4b94265c89ec5938c3805df79d39c9908e6d48b8e667e28b355a17f77e70dfc25a1f6c25f00b SHA512 662034c51f1da4c2e13698592dadf1f6575f0ffc4f3d111af8d0d08a58fc05d4316b62ea140503d42fd9c1833da9f1b7aacf2d611d4befab0d266c705e192bf9
diff --git a/dev-python/concurrent-log-handler/concurrent-log-handler-0.9.25.ebuild b/dev-python/concurrent-log-handler/concurrent-log-handler-0.9.26.ebuild
index c45e2b69063b..c45e2b69063b 100644
--- a/dev-python/concurrent-log-handler/concurrent-log-handler-0.9.25.ebuild
+++ b/dev-python/concurrent-log-handler/concurrent-log-handler-0.9.26.ebuild
diff --git a/dev-python/cython/cython-3.0.12-r1.ebuild b/dev-python/cython/cython-3.0.12-r1.ebuild
index 69ae49a7a981..c503866ca262 100644
--- a/dev-python/cython/cython-3.0.12-r1.ebuild
+++ b/dev-python/cython/cython-3.0.12-r1.ebuild
@@ -68,8 +68,6 @@ python_test() {
 	unset CYTHON_FORCE_REGEN
 
 	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
 	"${PYTHON}" runtests.py \
 		-vv \
 		-j "$(makeopts_jobs)" \
diff --git a/dev-python/cython/cython-3.1.0.ebuild b/dev-python/cython/cython-3.1.0.ebuild
index 2f47286fe83a..73a80a26855e 100644
--- a/dev-python/cython/cython-3.1.0.ebuild
+++ b/dev-python/cython/cython-3.1.0.ebuild
@@ -67,8 +67,6 @@ python_test() {
 	unset CYTHON_FORCE_REGEN
 
 	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
 	"${PYTHON}" runtests.py \
 		-vv \
 		-j "$(makeopts_jobs)" \
diff --git a/dev-python/cython/cython-3.1.0_rc1-r1.ebuild b/dev-python/cython/cython-3.1.0_rc1-r1.ebuild
index d3ff18f81dd5..83e6bb31b417 100644
--- a/dev-python/cython/cython-3.1.0_rc1-r1.ebuild
+++ b/dev-python/cython/cython-3.1.0_rc1-r1.ebuild
@@ -69,8 +69,6 @@ python_test() {
 	unset CYTHON_FORCE_REGEN
 
 	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
 	"${PYTHON}" runtests.py \
 		-vv \
 		-j "$(makeopts_jobs)" \
diff --git a/dev-python/cython/cython-3.1.0_rc1.ebuild b/dev-python/cython/cython-3.1.0_rc1.ebuild
index 2f47286fe83a..73a80a26855e 100644
--- a/dev-python/cython/cython-3.1.0_rc1.ebuild
+++ b/dev-python/cython/cython-3.1.0_rc1.ebuild
@@ -67,8 +67,6 @@ python_test() {
 	unset CYTHON_FORCE_REGEN
 
 	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
 	"${PYTHON}" runtests.py \
 		-vv \
 		-j "$(makeopts_jobs)" \
diff --git a/dev-python/cython/cython-3.1.0_rc2.ebuild b/dev-python/cython/cython-3.1.0_rc2.ebuild
index 2f47286fe83a..73a80a26855e 100644
--- a/dev-python/cython/cython-3.1.0_rc2.ebuild
+++ b/dev-python/cython/cython-3.1.0_rc2.ebuild
@@ -67,8 +67,6 @@ python_test() {
 	unset CYTHON_FORCE_REGEN
 
 	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
 	"${PYTHON}" runtests.py \
 		-vv \
 		-j "$(makeopts_jobs)" \
diff --git a/dev-python/deepdiff/Manifest b/dev-python/deepdiff/Manifest
index d76b2dd0f9b5..03ca63b5761f 100644
--- a/dev-python/deepdiff/Manifest
+++ b/dev-python/deepdiff/Manifest
@@ -1 +1,2 @@
 DIST deepdiff-8.4.2.tar.gz 515380 BLAKE2B e044d45c4a2ba68e399d506a801912ef0169be3b6a41df9a9f47a5ffb2dfc588d0eed35e984f8e36616709235f26537290bc7e5953d61823291eebfc52951574 SHA512 ec0b495afb57bbaf7b4785dda5367a1f87e5940afb801e2e71aa478562cda597005780bf2733b2e913dce5932996fdb548203922b4b6613e3daed751aa89d885
+DIST deepdiff-8.5.0.tar.gz 538517 BLAKE2B 27bcac8a511961540c6d285c03a8011c6075776cf795971d9fa03be4a9029909750da327c72505ba736703d95d790bae76b27f9a662d551108e12ec8227bbebf SHA512 7898b9eee9e7d7ec441adaa4f306f304df3e922e85cb58601daec530e61da1f7dd79fb34395620df1015aedd646eed1fd203d14a65397b0cc7b708722e68582b
diff --git a/dev-python/deepdiff/deepdiff-8.5.0.ebuild b/dev-python/deepdiff/deepdiff-8.5.0.ebuild
new file mode 100644
index 000000000000..b45d907165f0
--- /dev/null
+++ b/dev-python/deepdiff/deepdiff-8.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A library for comparing dictionaries, iterables, strings and other objects"
+HOMEPAGE="
+	https://github.com/seperman/deepdiff/
+	https://pypi.org/project/deepdiff/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/click-8.1.3[${PYTHON_USEDEP}]
+	<dev-python/orderly-set-6[${PYTHON_USEDEP}]
+	>=dev-python/orderly-set-5.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		>=dev-python/jsonpickle-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/numpy-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/tomli-w[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# benchmarks
+		tests/test_lfucache.py::TestLFUcache::test_lfu
+		# requires polars
+		tests/test_hash.py::TestDeepHashPrep::test_polars
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.21.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.21.0.ebuild
index 213e73d9af8d..a9ee42cd79b3 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.21.0.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.21.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/beautifulsoup4-4[${PYTHON_USEDEP}]
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index ff4ed01cf984..3a7693be76db 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,6 +1,4 @@
-DIST setuptools-75.8.2-py3-none-any.whl 1229385 BLAKE2B e2890604e9acbf23aefc94ee99927bafdc189e45c84b0e4e0b48737d120ba60590438603195e180988b26e3e8fb378812507e2a0b513bf886c3b1eb673853da5 SHA512 083447a6bd375ca99e017ec4c5e3083ee4eee32b65d911b4d5ccadfa587ec213d43562d21d0f238753cc5c54354027b8425880d7248fbbd170b0c006613f4327
-DIST setuptools-78.1.0-py3-none-any.whl 1256108 BLAKE2B 3bc6328e3ca2f98df327054c308560c48849ea3374017e72111471f4d7394bb6200d181e9ce7bc5cc2732ca365ade8e7ac79a8b1bfae1a18d0364c5dea4aa151 SHA512 89b1ba752d6b1cf7820ad0ef37ad42a6614e9b88438c63264eee09f94439608e53a51bf5ff8ce9f898300d6d628a7ed582004e6a483d774f4ec285f95e23752e
 DIST setuptools-79.0.1-py3-none-any.whl 1256281 BLAKE2B 8ae51bdd1c0ccada116757c2bd765225fcf4bedc7ada18567ae12f09b6978cdbcddd4f635a39a5568b6d3ed4388e4f73af5c33a7060f2ac0d0907fc82d8fd74f SHA512 fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
 DIST setuptools-80.2.0-py3-none-any.whl 1240763 BLAKE2B afb1a983aa8534ab20de1889fd8460bcddad7ffb956b95a830879f03982d38da5f76f71d8c45d8134d9c0223dd3771c639f95ad9e4447e4c201dfbabaca16a3d SHA512 d3b4f97ea45a7f98b9dd711ed3bef6e5faf562a2bd114aec458b196170f8ccf53e2ae12642aeed17af65a2647c258679148c1dfe136cb2b59fa7f4fdd3768ad1
-DIST setuptools-80.3.0-py3-none-any.whl 1200273 BLAKE2B 6f17d3e7ef602d31698f450714af9ee86dd3234450dfcca23d0d27d2e58c3242e77bc156d377192660cab0a3986e85615a74f611bd3b8f6951dd0cb5a3b074f4 SHA512 c6ab8430aae000d986d4edb5027f3a6f5062ff869a8ed85768ce488cb494289ab8ec85a0377928a080111b70a7959e05f9e17487eded93c84637db8a9dda6153
 DIST setuptools-80.3.1-py3-none-any.whl 1201172 BLAKE2B 4daf6a4a65a4e7c0547750addbf30f92e3a386fd7fcc2a98761ec1bee5caf6ccf506f1e201a9518c34bc278ae504f8b277d6199e23df0457a603b1c05a7bb50d SHA512 85b62d19a3762c9cb5d5b79a2f5319d4d387e334711963730e4b6a72dc73be3291bf5fb6eb40a6284a8486cbe615e8af44bc299210642f70f52d3fbfd41be26c
+DIST setuptools-80.4.0-py3-none-any.whl 1200812 BLAKE2B a3487a12084fa8582f1201b6df8cdd23de5b5fc763c5df607a4ae9a688fbd8defe064865e7f03a860819cdff1bf8c8fb98e3f94408e6511709f52eb9538feaef SHA512 2348c2e181394016f23d8ab55d9bf1104f16154729dfa891c3f57cd76d4f2fa0b96cc09b61d2a2ba73ac862c79ae03a6c57850c02c0a46ec279a78dddb06c39d
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild
deleted file mode 100644
index 473fddfd3ccc..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-75.8.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-78.1.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-78.1.0.ebuild
deleted file mode 100644
index 473fddfd3ccc..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-78.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
index b76c3f6972d8..473fddfd3ccc 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-79.0.1.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 src_install() {
 	insinto /usr/lib/python/ensurepip
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.3.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.4.0.ebuild
index b76c3f6972d8..b76c3f6972d8 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.3.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-80.4.0.ebuild
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 1e8c38a13ce3..07bcba15624c 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,2 @@
-DIST google_api_python_client-2.167.0.tar.gz 12725129 BLAKE2B d1d94b92f161f68ccad986eb17043a9f1855357cc8914b9a58755f6eb9451c3768012a68d45709f0a79e70936734ff8f1464dcbc19b7ba1bdff88eca54a881fa SHA512 ae51ef8985d87f0663ce34d5bc28c29693268fdf362b95ad1d8c6c5aa847c6880082d0b25281d6c7dda91b7a17eb62057deeccd31e9416309a50f04c6ff33e09
 DIST google_api_python_client-2.168.0.tar.gz 12774671 BLAKE2B 71ac1e3f6688c2c3545cf86a5cbbfec3551721a27e5b415fcf14e6ad8ca8070650c6dd645f5da67f625e0ee62f8f658883860b6aeeb7489400d04322b220bf8d SHA512 410b8ea2b960621b7971621b6aa106b8f7dd1ff45435a94358b41553df7a6514aab22bfa53511e4466741d31c5e66d755be0870981c380567e8cc90fb49838bc
 DIST google_api_python_client-2.169.0.tar.gz 12811341 BLAKE2B 31bf7b5aa53a05a7d196ea59f6a03b835628e4bcab312f4799386f1fc344c1774f06882fa502bd06a7d6feb244725a9c3f2396c1ef8ce999480ef9d211e10b44 SHA512 506bf5fc576a0db4d9db1e4abffdc5fa78009a070a7254821393599e3f56c55b6219b16200ea7f776a0ceca8673aa58cd379f952078deaafdc3f72e0591d726f
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.167.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.167.0.ebuild
deleted file mode 100644
index 75fc31e16901..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.167.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,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.168.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.168.0.ebuild
index b2220fafe3ef..75fc31e16901 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.168.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.168.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/greenlet/Manifest b/dev-python/greenlet/Manifest
index 6c97f56dbc5c..a8d10b7bc031 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,4 @@
 DIST greenlet-3.1.1.tar.gz 186022 BLAKE2B 1d73f63d3bf881534bd64eca6510f32d1596261bd42176d396c7a0442494c73f8b03e57621bd11fc1bc67db550514c26a94926eaba8c53e08eecb3f999c9ba16 SHA512 915a6e22c20b235de472c61c7bc4cb60a08b79e29127c4fb817c362cee37f589bc362f12ed31bdc7dda91f49976d4e2784c8d13202bf598156a0aacacdb7f6fb
 DIST greenlet-3.2.0.tar.gz 183685 BLAKE2B d750f9f0639003448b95cc0db5046617da0d9c40976c851d4f23f5e26f54fba29da6867304d7569ea171d497047442e85c35aeedd479cdcc8d57af51fd5a76ed SHA512 0a13142bbb9b043a8b6047fdb182b1091dfc8c6da517092ab382b6ae42fbc8d5e4b9d8593d353d1c95dbf7337aa1e4cc946c2638e50e49af4813aee94b07d214
 DIST greenlet-3.2.1.tar.gz 184475 BLAKE2B ff36fafef74ff1c0d9a9c2f5929017afe7f083d31830aebf4f068c84df7312352cd43f9ba1d42b4562921b869df3afd8210d71f318bf2f8f6f7ea441d934ae04 SHA512 75fd697d0bde99c60d4c741c61c1010e2bae659e93661e8ea37f6683c1223422a7f862aa770b80bc3299593a9791ec515fd31797fd36216ed784f4e2f4103420
+DIST greenlet-3.2.2.tar.gz 185797 BLAKE2B 8df91b479ea530bb8f5d3069fd4be507583e6ec5268e840c09620577fb8cf4ee3fd9266b0906d35679be61814b193eac1be78f1ccee447a15b99973ee3ce6493 SHA512 ed7b5adec413debc89d01a03768d14f2e29a4fe6ad72ac79d47baa09a556138e27c8f80771d567bf727c19ea67cc1e012fc8f031a910e5551969eb98c9dbbaa6
diff --git a/dev-python/greenlet/greenlet-3.2.1.ebuild b/dev-python/greenlet/greenlet-3.2.1.ebuild
index ac6de7027873..e07437446149 100644
--- a/dev-python/greenlet/greenlet-3.2.1.ebuild
+++ b/dev-python/greenlet/greenlet-3.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/greenlet/greenlet-3.2.2.ebuild b/dev-python/greenlet/greenlet-3.2.2.ebuild
new file mode 100644
index 000000000000..ac6de7027873
--- /dev/null
+++ b/dev-python/greenlet/greenlet-3.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="
+	https://greenlet.readthedocs.io/en/latest/
+	https://github.com/python-greenlet/greenlet/
+	https://pypi.org/project/greenlet/
+"
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/objgraph[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/furo
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# patch cflag manipulations out
+	sed -i -e 's:global_compile_args[.]append.*:pass:' setup.py || die
+	# broken assertions on py3.12+
+	# https://github.com/python-greenlet/greenlet/issues/368
+	sed -e 's:test_trace_events_multiple_greenlets_switching:_&: ' \
+		-i src/greenlet/tests/test_tracing.py || die
+}
+
+python_test() {
+	eunittest greenlet.tests
+}
diff --git a/dev-python/grpcio-status/Manifest b/dev-python/grpcio-status/Manifest
index bc4be3820878..0634b5b9fcd7 100644
--- a/dev-python/grpcio-status/Manifest
+++ b/dev-python/grpcio-status/Manifest
@@ -1,3 +1,2 @@
 DIST grpc-1.68.1.gh.tar.gz 17320674 BLAKE2B 46f4ae35c6a3a6ddfd47918a68a42d10e115ef81052715e8d8a73abf973063c730ddda06373278f3a4a6280dd4938e530a5e7377ab76aa653bb208583deab7f3 SHA512 cfb88a1290e2ee46fbd5f2b50b9c066ac174b1077170088c3b1a30bd37e66c6ca5254d2b951329a3991ac2b4320d12a50b1464babffbfc3bcf4eab670a449fd1
-DIST grpc-1.71.0.gh.tar.gz 14659092 BLAKE2B 8c08020eca27c97d5a47e61a758e482662425c8afe6feef8f3ba9cd0fe2d2c100c9087b16fbf3f2ba3d447aee5d7da3267db7c6e642e2a94f554640364135990 SHA512 25783f75295919d0a077e3d0ff70ea2e651eaf107da2ebe8af40a584540f2f56aae0e04c7b809f3b1eb7d5adc3892f84464662d80b1234a111836f454ba84a18
 DIST grpc-1.72.0.gh.tar.gz 14730317 BLAKE2B f4b16fcef3efa086cce043197e0d7bb6dc858074c329c3c993f33a5a65db72d8cf8106bc3d96cf72a12cf3040405e91f1d2fda2ac64b558ed00b18d6aef5821a SHA512 e56c37f6b2370426df63e700d9cf227864812911ae071f1c34626d0c336d6b6b42ca5d7cdc6d5d04744009aca6be8769fe9b0f15992f3aa2112e6166ed326f6a
diff --git a/dev-python/grpcio-status/grpcio-status-1.71.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.71.0.ebuild
deleted file mode 100644
index 5ddcca511486..000000000000
--- a/dev-python/grpcio-status/grpcio-status-1.71.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P=grpc-${PV}
-DESCRIPTION="Reference package for GRPC Python status proto mapping"
-HOMEPAGE="
-	https://grpc.io/
-	https://github.com/grpc/grpc/
-	https://pypi.org/project/grpcio-status/
-"
-SRC_URI="
-	https://github.com/grpc/grpc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/src/python/grpcio_status
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/googleapis-common-protos-1.5.5[${PYTHON_USEDEP}]
-	<dev-python/protobuf-6[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-5.29.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	cd "${WORKDIR}/${MY_P}/src/python/grpcio_tests" || die
-	epytest tests{,_aio}/status
-}
diff --git a/dev-python/h11/h11-0.16.0.ebuild b/dev-python/h11/h11-0.16.0.ebuild
index 1ccba014df2a..51116c48b0e1 100644
--- a/dev-python/h11/h11-0.16.0.ebuild
+++ b/dev-python/h11/h11-0.16.0.ebuild
@@ -17,6 +17,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index aea77b6731f9..b74de5aa7818 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1 +1,2 @@
 DIST hiredis-py-3.1.0.gh.tar.gz 19066 BLAKE2B 06b4c3e47a27d16b28a96f0769399d8b3bcc361ac14d755134cb88faed4e403e89892276a3ce5e7c2920b45c5575caba8777cef8d64bc61fcf9d47f1b94b19f2 SHA512 8c47179bc55b89d64aa02a18c81d0e77669882afe126ca7ca468df8c9417023c36c6e3bdfcc28e092feba7a766655005e839a3aaf766d2fc4424176808c978d8
+DIST hiredis-py-3.1.1.gh.tar.gz 19545 BLAKE2B 02762179999f226ac87c059299116c5880ab07efd9a61d0b1fa9af8225f1f2f303756411cea8605055cbe1918c8948418e6beed28f6325d5af0a95723a5a6c6e SHA512 10eb7a7b69d26c8f977ac6790d2ae110b04bf071d547dff1cd0234f0bb227735b6c7784573921125c54ba936334077c55b7a981348af06f58ffca020ed64ef60
diff --git a/dev-python/hiredis/hiredis-3.1.1.ebuild b/dev-python/hiredis/hiredis-3.1.1.ebuild
new file mode 100644
index 000000000000..368d4625dfa0
--- /dev/null
+++ b/dev-python/hiredis/hiredis-3.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 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_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+MY_P=hiredis-py-${PV}
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="
+	https://github.com/redis/hiredis-py/
+	https://pypi.org/project/hiredis/
+"
+SRC_URI="
+	https://github.com/redis/hiredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/hiredis-1.0.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/hiredis-2.4.0-system-libs.patch
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf hiredis || die
+	epytest
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 1edd75cf2635..99b1a55e1abf 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1 @@
 DIST identify-2.6.10.gh.tar.gz 101914 BLAKE2B a4b4db9ea573cfd11762714ed4fe40d64be6ce812d2eabe227ef60a0583176b0efd52261c6d60b02fa9d7f7288be35366fd887f7f41e225c64b77b68580fd7f2 SHA512 97620cf3ffbf96ee167adf0ffe30c91fff902c64898ad5c733b441e96575172cfeae29e37602db9f7de80ad8a3dd08e8d4389a6b1ec5a9c14873a13e9f9b4a72
-DIST identify-2.6.8.gh.tar.gz 101927 BLAKE2B 27ca9c41dade2bfb0710fa92936ec1a478bdad4e2a94af1b5df98234aeb4666758cc47820e199dfefe9274c8439240a1722880dce44a7d78c79bf010daf5fee3 SHA512 3d30615719b7770fc9eebf790ffb01cefbe71832bbc48be7052ce1f2c636bca5808e9b257e16145669dadb06e21a517802ee3bd99bb646a2f2f2ad3da00682af
diff --git a/dev-python/identify/identify-2.6.10.ebuild b/dev-python/identify/identify-2.6.10.ebuild
index 0507ba92554f..ef19a9ea1cc4 100644
--- a/dev-python/identify/identify-2.6.10.ebuild
+++ b/dev-python/identify/identify-2.6.10.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/identify/identify-2.6.8.ebuild b/dev-python/identify/identify-2.6.8.ebuild
deleted file mode 100644
index ef19a9ea1cc4..000000000000
--- a/dev-python/identify/identify-2.6.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jsonschema-specifications/Manifest b/dev-python/jsonschema-specifications/Manifest
index 100353ffc43e..393980c20113 100644
--- a/dev-python/jsonschema-specifications/Manifest
+++ b/dev-python/jsonschema-specifications/Manifest
@@ -1,2 +1 @@
-DIST jsonschema_specifications-2024.10.1.tar.gz 15561 BLAKE2B 3587ca9c5525f3a8bf91c7e0619fda6d052ec89e11acce0a1aa5c7962fb1b89d54c952d81a5116f596aabfe769c8e9ae687821929d5bf1ad76346b480b2cd2fb SHA512 333efbd81ad787da841fe8526257b4213bff508c91a6a655f2dbe62b22a0347ac8f97230b52e00aabcf626e91026a6c2f5760d54c2078eccd2f033a8599e7484
 DIST jsonschema_specifications-2025.4.1.tar.gz 15513 BLAKE2B 90b17b36818895b7cb54615bc9df9f4b068bb14b47b930c91db1c250572cff3f9388b4369c7a776bcf5db8b2cf6a4c213e03f9a4b31c471fd370977352d541af SHA512 e7dbe1e801de993f4863477832dffe0475976fa4ed9a5f2938470da8871f2599f7e99951a6ca2b4315136a13dd184fd0860afebd7163d1924ce27f699319f484
diff --git a/dev-python/jsonschema-specifications/jsonschema-specifications-2024.10.1.ebuild b/dev-python/jsonschema-specifications/jsonschema-specifications-2024.10.1.ebuild
deleted file mode 100644
index dc5d549ed27c..000000000000
--- a/dev-python/jsonschema-specifications/jsonschema-specifications-2024.10.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
-HOMEPAGE="
-	https://github.com/python-jsonschema/jsonschema-specifications/
-	https://pypi.org/project/jsonschema-specifications/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/referencing-0.31.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jsonschema-specifications/jsonschema-specifications-2025.4.1.ebuild b/dev-python/jsonschema-specifications/jsonschema-specifications-2025.4.1.ebuild
index 8f87b6edcef2..dc5d549ed27c 100644
--- a/dev-python/jsonschema-specifications/jsonschema-specifications-2025.4.1.ebuild
+++ b/dev-python/jsonschema-specifications/jsonschema-specifications-2025.4.1.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/referencing-0.31.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 392493c200e0..d173631df2d3 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -15,3 +15,4 @@ DIST llvm-project-20.1.4.src.tar.xz.sig 566 BLAKE2B 1f0f057dedf938190554ca1a51d9
 DIST llvm-project-ac8fc09688e10e983b99224b5dc5cbbeeedb1879.tar.gz 231567089 BLAKE2B f7878f114c908b21d179854bc693716b34b963612c6b5172789a37cd21fa316720d4e9498bc7679058db3e822ed240bfdafd85bfd00154914d747d0c0ed1cb48 SHA512 4c39db8b22fa087ca96c3b4541ec77ba8a826a126b4e93b0650e59b3622b22b329f60fa3780dd4572fdece409fd5833eda473046d7547f6ee3ac8aadb8f2fc34
 DIST llvm-project-b9e32749d273a957e60170d6e7ef205fd1fb1834.tar.gz 232146799 BLAKE2B f7c02bf1e6b9958114f07827ff00264774a7ad54b51c6867d7e66d7c9a94a36fb84f371d7d30c2f094a0d539b565fb651786ed9e0641f2bea8d982073f1a8ac0 SHA512 2d81ead79c606e00549d5205584f1bd272e4d7adf4b376fdba19e7fb719710e80b00b22ee3500ab2b990178fa044ca9fcf45bd2063e62e6a217b11775bb3b163
 DIST llvm-project-d1e38eab95b07b422194427474521623916bbf29.tar.gz 232705423 BLAKE2B bf5200c2223d8cdf7c34c84876d8cfeb9429cb6535ced226b1bf9ab468b6401fe3da8759f0fc1ab3112927304c5f74db29b18be60fa961ce99471caa2c6a1f33 SHA512 8fae137725ad4eb0f5bab73895c65b34d1e36ea039c9fb3978c908ecc6023094d84919b97dc405b86e2dd32f585d87b29cee02293c8156d10a8371b516ca5e7a
+DIST llvm-project-fcb4bda9dcfcdb64d8b069e8416c75d7a1a62e52.tar.gz 233149231 BLAKE2B 95a7a012a1e747afcf83ace3785c8ef6a3e10f6075e59eb1c5b077cc9edae244b648f341bc0ac6a45b2afc8f7ffe130a90a741a04465523f30f8322566386703 SHA512 b46f0c90a1c56750cada24183ca382b267a2d2faa0db7d77a8bdd4e94e6303e57d565cf85447b3c0e0efdd3750efef1e10e8ce6f1fe8f1ae10ee31d25ddf3fb7
diff --git a/dev-python/lit/lit-21.0.0_pre20250510.ebuild b/dev-python/lit/lit-21.0.0_pre20250510.ebuild
new file mode 100644
index 000000000000..4230fa63b2a4
--- /dev/null
+++ b/dev-python/lit/lit-21.0.0_pre20250510.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		llvm-core/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from llvm-core/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index 68b61617a7b2..e2fe54de5320 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,2 @@
-DIST loky-3.5.1.gh.tar.gz 145759 BLAKE2B 3fd1a254051a25e0556c29c50d9153e6894150d0eb39094fa3b7128439889777026aea6e001b73d825b6c18c8d7e6e49e0feb6e7fb508696c0694cf5321fa6fd SHA512 9c90fda5af45a89142866a3ec4a2e77425b20f248d55a56f5e78acf09dbf3b61ba04cf4b72c416e1eb343e23ab0d73a0139804a9fd92e27044debf97b8920635
 DIST loky-3.5.2.gh.tar.gz 145219 BLAKE2B 6de1d77d64db2cda1e45ec3f34aec1cc367a6bd83675b0f7172b4640d866bb1d03ebda963d5b7ee4d680ec5bc40a02ea13b760f1cb6cef2f3fe28509d4b0ffae SHA512 1cc67fcb3450afff67e3e5d598ae93624fd792335a222fd7e4723bb6e04231a68094ab1a78ec505a13c69384868fb05c1fa3a016b2d215d233f8fd9945586e69
 DIST loky-3.5.3.gh.tar.gz 145725 BLAKE2B 7971485a0895bad4b86312ec58e63141077d9e0708313a25ef3016eb34b05ac5509c754f49379503d244bda10ba8f28c142b3d91de0a58efc2b1d758725781cf SHA512 72924a95cd781cd338f3d9c7fa89bc2e3c1441e64eb4f0199ef8663aa23916920bec5504c9724bec7d128804209cd9c5de58beb756056fbf756d3e5477ef790c
diff --git a/dev-python/loky/loky-3.5.1.ebuild b/dev-python/loky/loky-3.5.1.ebuild
deleted file mode 100644
index 83fa026d1855..000000000000
--- a/dev-python/loky/loky-3.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2020-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Robust and reusable Executor for joblib"
-HOMEPAGE="
-	https://github.com/joblib/loky/
-	https://pypi.org/project/loky/
-"
-SRC_URI="
-	https://github.com/joblib/loky/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	EPYTEST_DESELECT=(
-		# docker, seriously?
-		tests/test_loky_module.py::test_cpu_count_cfs_limit
-		tests/test_loky_module.py::test_cpu_count_cgroup_limit
-		# hangs, and even pytest-timeout does not help
-		tests/test_reusable_executor.py::TestExecutorDeadLock::test_deadlock_kill
-		tests/test_reusable_executor.py::TestResizeExecutor::test_reusable_executor_resize
-		# Python 3.12 raises an additional warning due to the use of fork()
-		# in a multithreaded process, the additional warning breaks this test
-		# since the expected warning is no longer the first.
-		# This is harmless, skip test for now
-		tests/test_worker_timeout.py::TestTimeoutExecutor::test_worker_timeout_shutdown_no_deadlock
-		tests/test_reusable_executor.py::TestResizeExecutor::test_resize_after_timeout
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# high memory test needs a lot of memory + is broken on 32-bit platforms
-	epytest --skip-high-memory \
-		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/loky/loky-3.5.2.ebuild b/dev-python/loky/loky-3.5.2.ebuild
index d47214d70848..5deeaedab5b5 100644
--- a/dev-python/loky/loky-3.5.2.ebuild
+++ b/dev-python/loky/loky-3.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index 17d61c05e65d..d9f6492c4ccf 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1 +1,2 @@
 DIST makefun-1.15.6.tar.gz 72583 BLAKE2B 00cee1083a5c36d70e9e480af526ab2ee4f62ddc34a2320f6adb8be96a87ea13a8eac261b715c02311fc877d8a25f0779b891c41f1eb9cd4766eb25dc37a8393 SHA512 b495d28d838989cd67a219be1d4b8f3a1b5a03aeceb76c6445074d154b1b7c65a9bbc9ae8a3ee0aa6e991a9572f43ba93ed949bfccb97dc557250e4b735f0c2a
+DIST makefun-1.16.0.tar.gz 73565 BLAKE2B 283f51291dfad55d9ff3a311f5af5af376e9614f089fa5825a404b984cba9e1d14c543d649518d3b24cec4174dddd76efa9d4f8fd2f125318b6a3539bbaabbdd SHA512 42edad79771331e2fc664affd975f681787124da9cdd1ea25adcad51a7d20e8b5499c8043899ca6f30c9fbf23888c16e2f7476e0f5d136d8ca43a8d8c93d5eb9
diff --git a/dev-python/makefun/makefun-1.16.0.ebuild b/dev-python/makefun/makefun-1.16.0.ebuild
new file mode 100644
index 000000000000..7d8509948658
--- /dev/null
+++ b/dev-python/makefun/makefun-1.16.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Small library to dynamically create Python functions"
+HOMEPAGE="
+	https://pypi.org/project/makefun/
+	https://github.com/smarie/python-makefun/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio --asyncio-mode=auto
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index fc4688516b14..7f67a52843cf 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,3 +1,3 @@
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.10.1.tar.gz 36743335 BLAKE2B e689dcaa314a6af8ce2934aac95208adf0f87822e4f84d6fb15ac1a17d162deea106636abf52b5332636ad8bb944301f16100b15d409b04ef2a8ecd287ea827c SHA512 1b52a421e61ca0a295d7b1d2bbe9bdcb1dd58f6c750b21d95e263547b20a17d58aadcc86f97ae0fdff9151d3c2f75a6c5419a35b258b698d777f42de7b598c4e
-DIST matplotlib-3.9.0.tar.gz 36069890 BLAKE2B 02ddb25901b5a93a8daf6f26c98b92d5e35abe2e98783b039928338abb1d628adbf3fd4786c08cb1610bf405cb558ca31fc12dbde77ec5f2a633143c7ea659a1 SHA512 135ee2f97c26cb60479cc10bf8a833384c393993d8a905ab869f4c73b91a50ffa596f84ce349af7f1a0b08a21e1906394cf6a702bb567a9c3999d40f54974326
+DIST matplotlib-3.10.3.tar.gz 34799811 BLAKE2B f855a65ebf6d33373b8ed62fca0824291aa10319cfa652e0ed07db4fe2511d6bc0232e0ef44858717142ce6f13ef604131c312d3ffa00b414321d34dc45d2727 SHA512 c3027fa116f45a4a7d7ac8e7ce87f509a6604b283c39b74379e8d84a05df61283ddf4e79036c9b83b2dff13291b59945d26aeb7420873d3b275097817a12be72
diff --git a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch
index db8ab5e2a0fb..b58b0c5bca41 100644
--- a/dev-python/matplotlib/files/matplotlib-3.9.0-test.patch
+++ b/dev-python/matplotlib/files/matplotlib-3.10.3-test.patch
@@ -1,5 +1,23 @@
+From 54ef285784b7519dfbe4170662d09518b237c7d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 28 Feb 2025 04:30:34 +0100
+Subject: [PATCH] adjust tests
+
+---
+ lib/matplotlib/tests/test_arrow_patches.py     | 6 +++---
+ lib/matplotlib/tests/test_axes.py              | 8 ++++----
+ lib/matplotlib/tests/test_colorbar.py          | 2 +-
+ lib/matplotlib/tests/test_constrainedlayout.py | 2 +-
+ lib/matplotlib/tests/test_contour.py           | 2 +-
+ lib/matplotlib/tests/test_figure.py            | 4 ++--
+ lib/matplotlib/tests/test_legend.py            | 6 +++---
+ lib/matplotlib/tests/test_lines.py             | 2 +-
+ lib/matplotlib/tests/test_units.py             | 4 ++--
+ lib/matplotlib/tests/test_usetex.py            | 5 +++--
+ 10 files changed, 21 insertions(+), 20 deletions(-)
+
 diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
-index 254b86cb54..1f93b1a476 100644
+index c2b6d4fa80..3527022043 100644
 --- a/lib/matplotlib/tests/test_arrow_patches.py
 +++ b/lib/matplotlib/tests/test_arrow_patches.py
 @@ -68,7 +68,7 @@ def __prepare_fancyarrow_dpi_cor_test():
@@ -30,47 +48,47 @@ index 254b86cb54..1f93b1a476 100644
      styles = mpatches.ArrowStyle.get_styles()
  
 diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
-index 0ed5a11c13..c57ed9934e 100644
+index e3fc1ada99..1c387ef2df 100644
 --- a/lib/matplotlib/tests/test_axes.py
 +++ b/lib/matplotlib/tests/test_axes.py
-@@ -1157,7 +1157,7 @@ def test_imshow():
+@@ -1214,7 +1214,7 @@ def test_imshow():
  
- @image_comparison(
-     ['imshow_clip'], style='mpl20',
--    tol=1.24 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
-+    tol=1.24)
+ 
+ @image_comparison(['imshow_clip'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 1.24)
++                  tol=1.24)
  def test_imshow_clip():
      # As originally reported by Gellule Xg <gellule.xg@free.fr>
      # use former defaults to match existing baseline image
-@@ -2541,7 +2541,7 @@ def test_contour_hatching():
+@@ -2648,7 +2648,7 @@ def test_contour_hatching():
  
- @image_comparison(
-     ['contour_colorbar'], style='mpl20',
--    tol=0.54 if platform.machine() in ('aarch64', 'ppc64le', 's390x') else 0)
-+    tol=0.54)
+ 
+ @image_comparison(['contour_colorbar'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.54)
++                  tol=0.54)
  def test_contour_colorbar():
      x, y, z = contour_dat()
  
-@@ -4902,7 +4902,7 @@ def test_vertex_markers():
+@@ -5176,7 +5176,7 @@ def test_vertex_markers():
  
  
- @image_comparison(['vline_hline_zorder', 'errorbar_zorder'],
+ @image_comparison(['vline_hline_zorder.png', 'errorbar_zorder.png'],
 -                  tol=0 if platform.machine() == 'x86_64' else 0.026)
 +                  tol=0.015 if platform.machine() == 'x86_64' else 0.026)
  def test_eb_line_zorder():
      x = list(range(10))
  
-@@ -8810,7 +8810,7 @@ def test_zorder_and_explicit_rasterization():
+@@ -9161,7 +9161,7 @@ def test_zorder_and_explicit_rasterization():
  
  
  @image_comparison(["preset_clip_paths.png"], remove_text=True, style="mpl20",
--                  tol=0.027 if platform.machine() == "arm64" else 0)
-+                  tol=0.027 if platform.machine() == "arm64" else 0.02)
+-                  tol=0 if platform.machine() == 'x86_64' else 0.027)
++                  tol=0.027)
  def test_preset_clip_paths():
      fig, ax = plt.subplots()
  
 diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
-index 35911afc79..852075c78d 100644
+index 24eeab6894..f140e031fe 100644
 --- a/lib/matplotlib/tests/test_colorbar.py
 +++ b/lib/matplotlib/tests/test_colorbar.py
 @@ -235,7 +235,7 @@ def test_colorbar_single_ax_panchor_east(constrained):
@@ -83,41 +101,33 @@ index 35911afc79..852075c78d 100644
      fig, ax = plt.subplots(figsize=(4, 2))
      data = np.arange(1200).reshape(30, 40) - 500
 diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
-index 4dc4d9501e..015e46cbe4 100644
+index 7c7dd43a31..fd64eced4b 100644
 --- a/lib/matplotlib/tests/test_constrainedlayout.py
 +++ b/lib/matplotlib/tests/test_constrainedlayout.py
-@@ -655,11 +655,11 @@ def test_compressed1():
-     fig.draw_without_rendering()
- 
-     pos = axs[0, 0].get_position()
--    np.testing.assert_allclose(pos.x0, 0.06195, atol=1e-3)
--    np.testing.assert_allclose(pos.y1, 0.8537, atol=1e-3)
-+    np.testing.assert_allclose(pos.x0, 0.06195, atol=2e-3)
-+    np.testing.assert_allclose(pos.y1, 0.8537, atol=2e-3)
-     pos = axs[1, 2].get_position()
--    np.testing.assert_allclose(pos.x1, 0.8618, atol=1e-3)
--    np.testing.assert_allclose(pos.y0, 0.1934, atol=1e-3)
-+    np.testing.assert_allclose(pos.x1, 0.8618, atol=2e-3)
-+    np.testing.assert_allclose(pos.y0, 0.1934, atol=2e-3)
+@@ -200,7 +200,7 @@ def test_constrained_layout9():
  
  
- @pytest.mark.parametrize('arg, state', [
+ @image_comparison(['constrained_layout10.png'], style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.032)
++                  tol=0.02 if platform.machine() == 'x86_64' else 0.032)
+ def test_constrained_layout10():
+     """Test for handling legend outside axis"""
+     fig, axs = plt.subplots(2, 2, layout="constrained")
 diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
-index d4600a14fe..d2deff9362 100644
+index 543cff18c6..6e113bc897 100644
 --- a/lib/matplotlib/tests/test_contour.py
 +++ b/lib/matplotlib/tests/test_contour.py
-@@ -442,8 +442,7 @@ def test_contourf_log_extension(split_collections):
- @pytest.mark.parametrize("split_collections", [False, True])
- @image_comparison(
-     ['contour_addlines.png'], remove_text=True, style='mpl20',
--    tol=0.15 if platform.machine() in ('aarch64', 'ppc64le', 's390x')
--        else 0.03)
-+    tol=0.15)
+@@ -417,7 +417,7 @@ def test_contourf_log_extension():
+ 
+ 
+ @image_comparison(['contour_addlines.png'], remove_text=True, style='mpl20',
+-                  tol=0.03 if platform.machine() == 'x86_64' else 0.15)
++                  tol=0.15)
  # tolerance is because image changed minutely when tick finding on
  # colorbars was cleaned up...
- def test_contour_addlines(split_collections):
+ def test_contour_addlines():
 diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
-index 58aecd3dea..53f3145cbd 100644
+index 3a4ced2540..62ce098d50 100644
 --- a/lib/matplotlib/tests/test_figure.py
 +++ b/lib/matplotlib/tests/test_figure.py
 @@ -26,7 +26,7 @@ import matplotlib.dates as mdates
@@ -138,24 +148,11 @@ index 58aecd3dea..53f3145cbd 100644
                    style='mpl20')
  def test_align_titles():
      for layout in ['tight', 'constrained']:
-diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
-index 1602f86716..c2bc71e22f 100644
---- a/lib/matplotlib/tests/test_image.py
-+++ b/lib/matplotlib/tests/test_image.py
-@@ -1416,7 +1416,7 @@ def test_nonuniform_and_pcolor():
- 
- @image_comparison(
-     ['rgba_antialias.png'], style='mpl20', remove_text=True,
--    tol=0 if platform.machine() == 'x86_64' else 0.007)
-+    tol=0.007)
- def test_rgba_antialias():
-     fig, axs = plt.subplots(2, 2, figsize=(3.5, 3.5), sharex=False,
-                             sharey=False, constrained_layout=True)
 diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
-index 0353f1408b..4c15058e7a 100644
+index 5e69044866..1480f7c663 100644
 --- a/lib/matplotlib/tests/test_legend.py
 +++ b/lib/matplotlib/tests/test_legend.py
-@@ -177,7 +177,7 @@ def test_multiple_keys():
+@@ -165,7 +165,7 @@ def test_multiple_keys():
  
  
  @image_comparison(['rgba_alpha.png'], remove_text=True,
@@ -164,7 +161,7 @@ index 0353f1408b..4c15058e7a 100644
  def test_alpha_rgba():
      fig, ax = plt.subplots()
      ax.plot(range(10), lw=5)
-@@ -186,7 +186,7 @@ def test_alpha_rgba():
+@@ -174,7 +174,7 @@ def test_alpha_rgba():
  
  
  @image_comparison(['rcparam_alpha.png'], remove_text=True,
@@ -173,7 +170,7 @@ index 0353f1408b..4c15058e7a 100644
  def test_alpha_rcparam():
      fig, ax = plt.subplots()
      ax.plot(range(10), lw=5)
-@@ -214,7 +214,7 @@ def test_fancy():
+@@ -202,7 +202,7 @@ def test_fancy():
  
  
  @image_comparison(['framealpha'], remove_text=True,
@@ -183,23 +180,23 @@ index 0353f1408b..4c15058e7a 100644
      x = np.linspace(1, 100, 100)
      y = x
 diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py
-index 531237b2ba..0e37450e1a 100644
+index 81252198cd..dd62412b44 100644
 --- a/lib/matplotlib/tests/test_lines.py
 +++ b/lib/matplotlib/tests/test_lines.py
-@@ -185,7 +185,7 @@ def test_set_drawstyle():
+@@ -184,7 +184,7 @@ def test_set_drawstyle():
  
- @image_comparison(
-     ['line_collection_dashes'], remove_text=True, style='mpl20',
--    tol=0 if platform.machine() == 'x86_64' else 0.65)
-+    tol=0.65)
+ 
+ @image_comparison(['line_collection_dashes'], remove_text=True, style='mpl20',
+-                  tol=0 if platform.machine() == 'x86_64' else 0.65)
++                  tol=0.65)
  def test_set_line_coll_dash_image():
      fig, ax = plt.subplots()
      np.random.seed(0)
 diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py
-index ae6372fea1..4f0dc25732 100644
+index cc71f68585..1fd3b50fea 100644
 --- a/lib/matplotlib/tests/test_units.py
 +++ b/lib/matplotlib/tests/test_units.py
-@@ -79,7 +79,7 @@ def quantity_converter():
+@@ -81,7 +81,7 @@ def quantity_converter():
  # Tests that the conversion machinery works properly for classes that
  # work as a facade over numpy arrays (like pint)
  @image_comparison(['plot_pint.png'], style='mpl20',
@@ -208,7 +205,7 @@ index ae6372fea1..4f0dc25732 100644
  def test_numpy_facade(quantity_converter):
      # use former defaults to match existing baseline image
      plt.rcParams['axes.formatter.limits'] = -7, 7
-@@ -106,7 +106,7 @@ def test_numpy_facade(quantity_converter):
+@@ -108,7 +108,7 @@ def test_numpy_facade(quantity_converter):
  
  # Tests gh-8908
  @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20',
diff --git a/dev-python/matplotlib/matplotlib-3.10.1.ebuild b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
index 66acfc29071f..5a2c854a4f25 100644
--- a/dev-python/matplotlib/matplotlib-3.10.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 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="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
 DEPEND="
@@ -293,6 +293,7 @@ python_test() {
 	)
 	distutils_pep517_install "${BUILD_DIR}"/test
 	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
+	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/pyvenv.cfg" || die
 	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
 
 	pushd lib >/dev/null || die
diff --git a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.10.3.ebuild
index 58fda33e62df..bd64961d0c1c 100644
--- a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,8 +29,8 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="cairo excel gtk3 latex qt6 tk webagg wxwidgets"
 
 DEPEND="
 	media-libs/freetype:2
@@ -74,9 +74,12 @@ RDEPEND="
 		dev-texlive/texlive-luatex
 		dev-texlive/texlive-xetex
 	)
-	qt5? (
+	qt6? (
 		$(python_gen_cond_dep '
-			dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
+			|| (
+				dev-python/pyqt6[gui,widgets,${PYTHON_USEDEP}]
+				dev-python/pyside:6[gui,widgets,${PYTHON_USEDEP}]
+			)
 		' 'python3*')
 	)
 	webagg? (
@@ -95,6 +98,7 @@ BDEPEND="
 	>=dev-python/setuptools-scm-7[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	test? (
+		$(python_gen_impl_dep 'tk')
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 		>=dev-python/tornado-6.0.4[${PYTHON_USEDEP}]
@@ -116,7 +120,7 @@ distutils_enable_tests pytest
 
 src_unpack() {
 	# do not unpack freetype
-	unpack "${P}.tar.gz"
+	unpack "${P//_/}.tar.gz"
 }
 
 python_prepare_all() {
@@ -124,7 +128,7 @@ python_prepare_all() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
 	local PATCHES=(
-		"${FILESDIR}"/matplotlib-3.9.0-test.patch
+		"${FILESDIR}"/matplotlib-3.10.3-test.patch
 	)
 
 	# increase lock timeout to 30 s
@@ -170,38 +174,43 @@ python_test() {
 		# "no warnings"
 		tests/test_backend_pdf.py::test_invalid_metadata
 		tests/test_figure.py::test_too_many_figures
+		# Requires qt5
+		tests/test_backends_interactive.py::test_qt5backends_uses_qt5
+		'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
+		'tests/test_backends_interactive.py::test_interactive_backend[toolbar2-MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
+		'tests/test_backends_interactive.py::test_interactive_backend[toolmanager-MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
+		'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
+		'tests/test_backends_interactive.py::test_blitting_events[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
+		'tests/test_backends_interactive.py::test_interactive_thread_safety[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
+		'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtagg-QT_API=PyQt5-BACKEND_DEPS=PyQt5]'
+		'tests/test_backends_interactive.py::test_interactive_timers[MPLBACKEND=qtcairo-QT_API=PyQt5-BACKEND_DEPS=PyQt5,cairocffi]'
+		# Tests mixing qt5 and qt6, requires installing all Qt4Py impl.
+		tests/test_backends_interactive.py::test_cross_Qt_imports
 	)
 
 	case ${EPYTHON} in
 		pypy3)
 			EPYTEST_DESELECT+=(
+				# TODO
+				tests/test_widgets.py::test_check_buttons
+				tests/test_widgets.py::test_check_buttons_lines
+				tests/test_widgets.py::test_check_radio_buttons_image
+				tests/test_widgets.py::test_radio_buttons
+			)
+			;&
+		pypy3.11)
+			EPYTEST_DESELECT+=(
 				# TODO: warning isn't passed through
 				tests/test_image.py::test_large_image
+				# TODO: regression in 7.3.18+
+				tests/test_axes.py::test_axes_clear_reference_cycle
 				# TODO
 				tests/test_pickle.py::test_complete
 				tests/test_pickle.py::test_no_pyplot
 				tests/test_pickle.py::test_pickle_load_from_subprocess
 				tests/test_pickle.py::test_simple
 				tests/test_texmanager.py::test_openin_any_paranoid
-				tests/test_widgets.py::test_check_buttons
-				tests/test_widgets.py::test_check_buttons_lines
-				tests/test_widgets.py::test_check_radio_buttons_image
-				tests/test_widgets.py::test_radio_buttons
 			)
-			if has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
-				has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
-			then
-				EPYTEST_DESELECT+=(
-					# TypeError is raised when exception is raised in a starred
-					# expression referencing a generator that uses "yield from"
-					# and raises -- non-critical, since some exception is raised
-					# after all
-					# https://foss.heptapod.net/pypy/pypy/-/issues/4032
-					tests/test_axes.py::test_bad_plot_args
-					tests/test_axes.py::test_plot_errors
-					tests/test_axes.py::test_plot_format_errors
-				)
-			fi
 			;;
 		python3.11)
 			EPYTEST_DESELECT+=(
@@ -252,7 +261,20 @@ python_test() {
 				'tests/test_text.py::test_parse_math'
 				'tests/test_text.py::test_parse_math_rcparams'
 			)
-			;&
+			;;
+		arm)
+			EPYTEST_DESELECT+=(
+				tests/test_backend_ps.py::test_savefig_to_stringio
+				# too large for 32-bit platforms
+				'tests/test_axes.py::test_psd_csd[png]'
+			)
+			;;
+		sparc64)
+			EPYTEST_DESELECT+=(
+				tests/test_backend_pgf.py::test_pdf_pages_metadata_check
+				tests/test_backend_pgf.py::test_minus_signs_with_tex
+			)
+			;;
 		alpha|arm|m68k|o32|ppc|s390|sh|sparc|x86)
 			EPYTEST_DESELECT+=(
 				# too large for 32-bit platforms
@@ -263,19 +285,25 @@ python_test() {
 			;;
 	esac
 
+	# override BUILD_DIR used by meson, so that mpl is actually rebuilt
+	# against bundled freetype
+	local orig_build_dir=${BUILD_DIR}
+	local BUILD_DIR=${BUILD_DIR}-test
+
 	# we need to rebuild mpl against bundled freetype, otherwise
 	# over 1000 tests will fail because of mismatched font rendering
 	local DISTUTILS_ARGS=(
 		"${DISTUTILS_ARGS[@]}"
 		-Dsystem-freetype=false
 	)
-	distutils_pep517_install "${BUILD_DIR}"/test
-	cp -r "${BUILD_DIR}"/{install,test}"${EPREFIX}/usr/bin" || die
-	local -x PATH=${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}
+	distutils_pep517_install "${BUILD_DIR}"/install
+	cp -r {"${orig_build_dir}","${BUILD_DIR}"}/install"${EPREFIX}/usr/bin" || die
+	cp -r {"${orig_build_dir}","${BUILD_DIR}"}/install"${EPREFIX}/usr/pyvenv.cfg" || die
+	local -x PATH=${BUILD_DIR}/install${EPREFIX}/usr/bin:${PATH}
 
 	pushd lib >/dev/null || die
 	local path
-	local sitedir=${BUILD_DIR}/test$(python_get_sitedir)
+	local sitedir=${BUILD_DIR}/install$(python_get_sitedir)
 	# sigh, upstream doesn't install these
 	while IFS= read -d '' path; do
 		cp -r "${path}" "${sitedir}/${path}" || die
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 63885c3021ec..fdc3e939a2a1 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-git-authors-plugin-0.9.4.gh.tar.gz 92571 BLAKE2B c9b0cab92b179157bf5af93c1c1df714df17b959bb3a18ea3bc0fa0d113323b37fad1b5406ce2bbb1b3eb1ed0ac213525e1129e0b96b7abcca57fc48397dd283 SHA512 8036752ae314a9eb87567a6b8a55d5fd1fc7d6beca9e8a2f6d6d3c51f77bc11c880cb747a28b6dacfc78959a56944ab7c86b523b3909fcf33ddd1611da594c2b
 DIST mkdocs-git-authors-plugin-0.9.5.gh.tar.gz 93152 BLAKE2B 746fb1010b6631e2387a0207159aa88a11aa92d3866e8f2487b5dacddb1df0813b16e93287c3c42339e0f38c7d01986157e9e268450af325f2de2243de615db3 SHA512 f1e147dd15515f92641ab1e2eb858edb93c720af21a340eed6414ea3014ea1bac264478f0985fa6cc1014cadc3ac1e9c41f6744b2a4fac1fb83ceb47f7eacadf
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild
deleted file mode 100644
index f2c2ed1d124c..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{9,10,11,12,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.5.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.5.ebuild
index 16a593b2d0d5..f2c2ed1d124c 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.5.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.9.5.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/moto/moto-5.1.4.ebuild b/dev-python/moto/moto-5.1.4.ebuild
index fa22c67103ee..6264ee2ccbca 100644
--- a/dev-python/moto/moto-5.1.4.ebuild
+++ b/dev-python/moto/moto-5.1.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy-extensions/Manifest b/dev-python/mypy-extensions/Manifest
index eb02687d626c..41bba785f3b5 100644
--- a/dev-python/mypy-extensions/Manifest
+++ b/dev-python/mypy-extensions/Manifest
@@ -1,2 +1 @@
-DIST mypy_extensions-1.0.0.gh.tar.gz 6097 BLAKE2B 099616ee0bacad62d9ce642c3adb1eebe27546f7c567d1e0fa6ec04d9e6cbcda2966fff9769940cfda8b7d6cc9f33100af9d6f416ab2def26079668a16c354b3 SHA512 ac89a9f60a2c3df3457d5a6ab7ed47b72dd173646ef57f1450556051617e62046405a69fadeb40d2c24e68ce6ffed56d9182365e3203477facdc935e1a807847
 DIST mypy_extensions-1.1.0.gh.tar.gz 6853 BLAKE2B 05c7b9b6ccc873d11642057e8c5c16cc4f7a5ad597a2e90f8d540e4875f01bd4e665929cb0f3294aaac3b0720b4ca3c9697e5676ad42e8e59f1111dfe304d9e1 SHA512 f31428ae3315675c7789eba1a92081a2155babc6d2b229482c2d2f2891e9bb50a182a589adaa5b2afee8c2d08c170946ba3eb3b4f76d219be92ba1876eff4b36
diff --git a/dev-python/mypy-extensions/mypy-extensions-1.0.0.ebuild b/dev-python/mypy-extensions/mypy-extensions-1.0.0.ebuild
deleted file mode 100644
index be0138d7cba8..000000000000
--- a/dev-python/mypy-extensions/mypy-extensions-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-MY_P=mypy_extensions-${PV}
-DESCRIPTION="Type system extensions for programs checked with mypy"
-HOMEPAGE="
-	https://www.mypy-lang.org/
-	https://github.com/python/mypy_extensions/
-"
-SRC_URI="
-	https://github.com/python/mypy_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests/*.py
-}
diff --git a/dev-python/mypy-extensions/mypy-extensions-1.1.0.ebuild b/dev-python/mypy-extensions/mypy-extensions-1.1.0.ebuild
index afbcc8ebb4ee..ff13934f9a39 100644
--- a/dev-python/mypy-extensions/mypy-extensions-1.1.0.ebuild
+++ b/dev-python/mypy-extensions/mypy-extensions-1.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nanobind/nanobind-2.7.0.ebuild b/dev-python/nanobind/nanobind-2.7.0.ebuild
index b193cf5b4420..b155ccddcaaf 100644
--- a/dev-python/nanobind/nanobind-2.7.0.ebuild
+++ b/dev-python/nanobind/nanobind-2.7.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-cpp/robin-map-1.3.0
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 9c60dff11ac4..b2750cc39701 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1 +1,2 @@
 DIST networkx-3.4.2.tar.gz 2151368 BLAKE2B 10b18d7d5b80dd60342f65729688dd2a175c925c72f6e3d0aa4555f008acd347940d6f118a870ba02543d2dc451c4b91986fa834431cc8752b467c5b8622aa82 SHA512 910e1400ad18711761c715896c3238b9c7d8914c571ab4db3aaf18a772b5fef90e5378ca435fbfce55b5821f1ddd3863a3cd65030086e80a971df91d9203c637
+DIST networkx-3.5rc0.tar.gz 2463934 BLAKE2B 8d54ce43ed0222f6bccfd078c64cb58db0705072d0c98267e9ac0e9603a70621a4da91c1720f964d804fe2116ef952e1954a861273d8b54864ed893a50b8307d SHA512 f002db82259ddaa5a6ef06397cb53bfde6c971c8fb20cbb520a868a352045984ec52179f99ab19dbfdb7c77a06fcad4f3b7a50ec241ac1f312707f72240f42d0
diff --git a/dev-python/networkx/networkx-3.5_rc0.ebuild b/dev-python/networkx/networkx-3.5_rc0.ebuild
new file mode 100644
index 000000000000..5a70b4a9c56a
--- /dev/null
+++ b/dev-python/networkx/networkx-3.5_rc0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{11..13} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
+
+inherit distutils-r1 optfeature pypi virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+
+LICENSE="BSD"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/matplotlib-3.8[${PYTHON_USEDEP}]
+			>=dev-python/numpy-1.25[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.11.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/networkx/networkx/issues/5913 (bug #921958)
+			networkx/algorithms/approximation/tests/test_traveling_salesman.py::test_asadpour_tsp
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# virtx implies nonfatal
+	nonfatal epytest || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "sci-libs/gdal[python]"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/numpy/numpy-2.2.5.ebuild b/dev-python/numpy/numpy-2.2.5.ebuild
index c8cdcd529222..001e74421abd 100644
--- a/dev-python/numpy/numpy-2.2.5.ebuild
+++ b/dev-python/numpy/numpy-2.2.5.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0/2"
-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"
 # +lapack because the internal fallbacks are pretty slow. Building without blas
 # is barely supported anyway, see bug #914358.
 IUSE="big-endian +lapack"
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 53902b5ac62f..14fdffcd9970 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-3.4.1.tar.gz 1256381 BLAKE2B df100b6092c8c3635b80f01cb31de4cc3ded146289c40c77049c6f2f993bd779147d295b7867b23f930d44590e89d5d26af7b03e935077ca74702122f3699113 SHA512 93473465e6ce5199b20f738232f71d837d537052fa273efa3dc11448ec4d86a7f6a0253baac4fbcec7f3378d1e6683982c14d91dd1f9f2fd7638d1fe96791a33
 DIST openstackdocstheme-3.5.0.tar.gz 1616880 BLAKE2B 401adebe986e8e755a81ab140aa09d85bd4c6c4d3b86bb134962462be47e94a6d4cf9a55d644359bd042b9f7582a3493d2e0eaef5c990f6bc9f9cf1bc229e406 SHA512 5a427e60b55aa8a6e8523d91f4665bdff64ef1163334b70d5b658d80f3b51450984ef9f2a7503136308a87e446b9ee70f76d2def502e7ba24bb8091a047a1da2
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
deleted file mode 100644
index 8cf44db93c7b..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.5.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.5.0.ebuild
index 528f5d259e8a..8cf44db93c7b 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.5.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.5.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/opentelemetry-api/Manifest b/dev-python/opentelemetry-api/Manifest
index dd8f9419bfb4..e2fe7619ec42 100644
--- a/dev-python/opentelemetry-api/Manifest
+++ b/dev-python/opentelemetry-api/Manifest
@@ -1 +1,2 @@
 DIST opentelemetry-python-1.32.1.gh.tar.gz 1227397 BLAKE2B 3ae557c528be81fe68bf34349224abb8f30b7ffaacedec9730a54b14ee73fd07fef28112f59274bbcac7c491e6415214e94d91f99c5145f5d56aca220774f333 SHA512 f2d785824b2eba9ec309f26083292a5ed8efa63851a9cd7d5067c9a5633cf4ba4f8d1c38fb67a925e6a5f8741c4f8ba786d0e7e404527e850bb879912620ad7a
+DIST opentelemetry-python-1.33.0.gh.tar.gz 1235139 BLAKE2B dcab10ef9dc996954e6d89641c486881c4465d7d02a42da3bc8aa988bc69a7a9c7724fb605808ed5cb3cb76d677944d8c06a4c0bda34ca3170365dcd842c0dfb SHA512 9ca537ea25c3a6a04cf5a30621afc548f9b0c41c7d5d70417699191d9e112c9f54f6a07fb2ae6d75f9e58beda95e52fe8b4d45e3f58abeefef842b357ff43f28
diff --git a/dev-python/opentelemetry-api/opentelemetry-api-1.33.0.ebuild b/dev-python/opentelemetry-api/opentelemetry-api-1.33.0.ebuild
new file mode 100644
index 000000000000..1155cafc062e
--- /dev/null
+++ b/dev-python/opentelemetry-api/opentelemetry-api-1.33.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+MY_P="opentelemetry-python-${PV}"
+DESCRIPTION="OpenTelemetry Python API"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-api/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
+	dev-python/importlib-metadata[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+
+	# Unnecessary restriction
+	sed -i -e '/importlib-metadata/s:, < [0-9.]*::' pyproject.toml || die
+}
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in opentelemetry-semantic-conventions opentelemetry-sdk \
+		tests/opentelemetry-test-utils
+	do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/opentelemetry-sdk/Manifest b/dev-python/opentelemetry-sdk/Manifest
index dd8f9419bfb4..e2fe7619ec42 100644
--- a/dev-python/opentelemetry-sdk/Manifest
+++ b/dev-python/opentelemetry-sdk/Manifest
@@ -1 +1,2 @@
 DIST opentelemetry-python-1.32.1.gh.tar.gz 1227397 BLAKE2B 3ae557c528be81fe68bf34349224abb8f30b7ffaacedec9730a54b14ee73fd07fef28112f59274bbcac7c491e6415214e94d91f99c5145f5d56aca220774f333 SHA512 f2d785824b2eba9ec309f26083292a5ed8efa63851a9cd7d5067c9a5633cf4ba4f8d1c38fb67a925e6a5f8741c4f8ba786d0e7e404527e850bb879912620ad7a
+DIST opentelemetry-python-1.33.0.gh.tar.gz 1235139 BLAKE2B dcab10ef9dc996954e6d89641c486881c4465d7d02a42da3bc8aa988bc69a7a9c7724fb605808ed5cb3cb76d677944d8c06a4c0bda34ca3170365dcd842c0dfb SHA512 9ca537ea25c3a6a04cf5a30621afc548f9b0c41c7d5d70417699191d9e112c9f54f6a07fb2ae6d75f9e58beda95e52fe8b4d45e3f58abeefef842b357ff43f28
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.33.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.33.0.ebuild
new file mode 100644
index 000000000000..0a63f8565793
--- /dev/null
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.33.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+MY_P="opentelemetry-python-${PV}"
+DESCRIPTION="OpenTelemetry Python SDK"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-sdk/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
+	~dev-python/opentelemetry-semantic-conventions-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+	)
+"
+
+# Tests cannot handle xdist with high makeopts
+# https://bugs.gentoo.org/928132
+distutils_enable_tests pytest
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in tests/opentelemetry-test-utils; do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		"${PN}"/tests/resources/test_resources.py::TestOTELResourceDetector::test_process_detector
+		"${PN}"/tests/metrics/integration_test/test_console_exporter.py::TestConsoleExporter::test_console_exporter_with_exemplars
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests
+}
diff --git a/dev-python/opentelemetry-semantic-conventions/Manifest b/dev-python/opentelemetry-semantic-conventions/Manifest
index dd8f9419bfb4..e2fe7619ec42 100644
--- a/dev-python/opentelemetry-semantic-conventions/Manifest
+++ b/dev-python/opentelemetry-semantic-conventions/Manifest
@@ -1 +1,2 @@
 DIST opentelemetry-python-1.32.1.gh.tar.gz 1227397 BLAKE2B 3ae557c528be81fe68bf34349224abb8f30b7ffaacedec9730a54b14ee73fd07fef28112f59274bbcac7c491e6415214e94d91f99c5145f5d56aca220774f333 SHA512 f2d785824b2eba9ec309f26083292a5ed8efa63851a9cd7d5067c9a5633cf4ba4f8d1c38fb67a925e6a5f8741c4f8ba786d0e7e404527e850bb879912620ad7a
+DIST opentelemetry-python-1.33.0.gh.tar.gz 1235139 BLAKE2B dcab10ef9dc996954e6d89641c486881c4465d7d02a42da3bc8aa988bc69a7a9c7724fb605808ed5cb3cb76d677944d8c06a4c0bda34ca3170365dcd842c0dfb SHA512 9ca537ea25c3a6a04cf5a30621afc548f9b0c41c7d5d70417699191d9e112c9f54f6a07fb2ae6d75f9e58beda95e52fe8b4d45e3f58abeefef842b357ff43f28
diff --git a/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.33.0.ebuild b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.33.0.ebuild
new file mode 100644
index 000000000000..4fcd38d97ec6
--- /dev/null
+++ b/dev-python/opentelemetry-semantic-conventions/opentelemetry-semantic-conventions-1.33.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+MY_P="opentelemetry-python-${PV}"
+DESCRIPTION="OpenTelemetry Semantic Conventions"
+HOMEPAGE="
+	https://opentelemetry.io/
+	https://pypi.org/project/opentelemetry-sdk/
+	https://github.com/open-telemetry/opentelemetry-python/
+"
+SRC_URI="
+	https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/${PN}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/deprecated-1.2.6[${PYTHON_USEDEP}]
+	~dev-python/opentelemetry-api-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cp -a "${BUILD_DIR}"/{install,test} || die
+	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
+
+	for dep in opentelemetry-sdk tests/opentelemetry-test-utils; do
+		pushd "${WORKDIR}/${MY_P}/${dep}" >/dev/null || die
+		distutils_pep517_install "${BUILD_DIR}"/test
+		popd >/dev/null || die
+	done
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/pivy/pivy-0.6.10.ebuild b/dev-python/pivy/pivy-0.6.10.ebuild
index 09e370b410d8..4bcbd293f0bd 100644
--- a/dev-python/pivy/pivy-0.6.10.ebuild
+++ b/dev-python/pivy/pivy-0.6.10.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="
 		https://github.com/coin3d/pivy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/dev-python/pycares/pycares-4.6.1.ebuild b/dev-python/pycares/pycares-4.6.1.ebuild
index 1e29425e9d10..c524c3ae2ec0 100644
--- a/dev-python/pycares/pycares-4.6.1.ebuild
+++ b/dev-python/pycares/pycares-4.6.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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="test"
 # Tests fail with network-sandbox, since they try to resolve google.com
 PROPERTIES="test_network"
diff --git a/dev-python/pygit2/pygit2-1.18.0.ebuild b/dev-python/pygit2/pygit2-1.18.0.ebuild
index b458fd3b943d..e4a1b35ef3aa 100644
--- a/dev-python/pygit2/pygit2-1.18.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.18.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~loong ~riscv ~x86"
+KEYWORDS="~amd64 ~loong ~riscv x86"
 
 DEPEND="
 	<dev-libs/libgit2-1.10:=
diff --git a/dev-python/pyglet/pyglet-2.1.5.ebuild b/dev-python/pyglet/pyglet-2.1.5.ebuild
index 6a4098f915db..fad828fb72c5 100644
--- a/dev-python/pyglet/pyglet-2.1.5.ebuild
+++ b/dev-python/pyglet/pyglet-2.1.5.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 RDEPEND="
diff --git a/dev-python/pyicu/pyicu-2.15.2.ebuild b/dev-python/pyicu/pyicu-2.15.2.ebuild
index 98c637b35e2d..7024933ecf36 100644
--- a/dev-python/pyicu/pyicu-2.15.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.15.2.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/pyotp/pyotp-2.9.0.ebuild b/dev-python/pyotp/pyotp-2.9.0.ebuild
index 81830d1ccb40..e1fbc3df90f7 100644
--- a/dev-python/pyotp/pyotp-2.9.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.9.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index a5bf40676ab5..5c6026389cfa 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1 +1,2 @@
 DIST pytest_asyncio-0.26.0.tar.gz 54156 BLAKE2B 763053772ff148a80773bb22457bd1a14e23f8b8c10279731ad356b168618a675f5e5ac20eff11bc5db0989a53ca079fbe3fd00d2afdbee41f61848b375b018e SHA512 60cb6e9bf7554b5d94d8e9c3bb8e60fba92ecb2fd4258ea8967eebf5af2b2050913e08917dafeddf4e27ad09bc52c800f38739eed9705330ce70f653bcd765a0
+DIST pytest_asyncio-1.0.0a1.tar.gz 46979 BLAKE2B b474a9f448e41551a3823cb391fcf3becdb9650836811bd16e5f76fad8ad6ede81210727d6b8ff0dc91f2ecfc962fc57935006380733d6e5f61363e8e3a34555 SHA512 2f27d02bd44816592e954c3d0c5aa579f77347dfff535436ede04c250794e7d3acb16370526ddf8c8d18a0b2a509aa1dae1cd88d84e463d2289eabf33cb4f737
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-1.0.0_alpha1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-1.0.0_alpha1.ebuild
new file mode 100644
index 000000000000..7e75b45aa5c8
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-1.0.0_alpha1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-asyncio/
+	https://pypi.org/project/pytest-asyncio/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-5.7.1[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on precise warning counts
+		tests/hypothesis/test_base.py::test_can_use_explicit_event_loop_fixture
+		tests/modes/test_strict_mode.py::test_strict_mode_ignores_unmarked_fixture
+		tests/test_event_loop_fixture.py::test_event_loop_already_closed
+		tests/test_event_loop_fixture.py::test_event_loop_fixture_asyncgen_error
+		tests/test_event_loop_fixture.py::test_event_loop_fixture_handles_unclosed_async_gen
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_fixture_leaves_loop_unclosed
+		tests/test_event_loop_fixture_finalizer.py::test_event_loop_fixture_finalizer_raises_warning_when_test_leaves_loop_unclosed
+		# flaky
+		# https://github.com/pytest-dev/pytest-asyncio/issues/1114
+		tests/async_fixtures/test_async_gen_fixtures.py::test_async_gen_fixture_finalized
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_asyncio.plugin,_hypothesis_pytestplugin
+	epytest
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 1aa7b0fb2fa4..f7c465766317 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1 @@
-DIST pytest-cov-6.0.0.tar.gz 66945 BLAKE2B 8746915eb23b7d524e15ece1a05d5a1c8de6e8e08b807142e9a03f48605d54f715396d73cdb4ee5004dc5703ac0f68309e700d783ebb2037fc861e00033c35f3 SHA512 2947a032417d60867595bb65630942ff5d8a61523af5298e3f169420b28882f9b4256d89980a9cbe88c34f9b7fa759f44fd64d391ad86c1491a55f9a70282bf0
-DIST pytest_cov-6.1.0.tar.gz 66651 BLAKE2B b71fc2da69cdc2c3370cbefb8921b861888ee4e0a93871ad5c7b94ae9f0b9ee6e48bf622e33f28980a2cd26efdfad60c4098dbde703706e49aec88acd09349d6 SHA512 0d1aa8f1ba1aa06a16f86f80d73b96143b845734a84205f35201a6b0d24913c61f1459ac0ff2a149c36eb273873a24cce94ea92e6aa2c876689fb77f52575eb5
 DIST pytest_cov-6.1.1.tar.gz 66857 BLAKE2B 078102351afd498c50f4ea2bc5fc0ee438b5025e6dbf2174aaadb2fc85b4c25c695774b92f805e86a25249c207a1a566e86b64c372349e9142649f600b5a0011 SHA512 4716f00895916f989fb339a814173175f78af7aff20ef253708f9b7715535895ae06c9a130cfa13733a0bc7699baa4ac65df71f7f68866e34a34f1888f3e8859
diff --git a/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild b/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild
deleted file mode 100644
index 146e64d8a342..000000000000
--- a/dev-python/pytest-cov/pytest-cov-6.0.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin for coverage reporting"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-cov
-	https://pypi.org/project/pytest-cov/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-6.4.4-r1[${PYTHON_USEDEP}]
-"
-# NB: xdist is also used directly in the test suite
-BDEPEND="
-	test? (
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# NB: disabling all plugins speeds tests up a lot
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
-
-	# https://github.com/pytest-dev/pytest-cov/issues/517
-	local -x PYTHONPATH=$(python_get_sitedir):${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# this one's broken by the PYTHONPATH hack
-		# the alternative is to symlink coverage and pytest into venv,
-		# but that's ugly and likely to break again in the future
-		tests/test_pytest_cov.py::test_central_subprocess_change_cwd_with_pythonpath
-	)
-
-	epytest
-}
diff --git a/dev-python/pytest-cov/pytest-cov-6.1.0.ebuild b/dev-python/pytest-cov/pytest-cov-6.1.0.ebuild
deleted file mode 100644
index 483c0e8bb1af..000000000000
--- a/dev-python/pytest-cov/pytest-cov-6.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin for coverage reporting"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-cov
-	https://pypi.org/project/pytest-cov/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-	>=dev-python/coverage-6.4.4-r1[${PYTHON_USEDEP}]
-"
-# NB: xdist is also used directly in the test suite
-BDEPEND="
-	test? (
-		dev-python/fields[${PYTHON_USEDEP}]
-		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	# NB: disabling all plugins speeds tests up a lot
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_cov.plugin,xdist.plugin,xdist.looponfail
-
-	# https://github.com/pytest-dev/pytest-cov/issues/517
-	local -x PYTHONPATH=$(python_get_sitedir):${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# this one's broken by the PYTHONPATH hack
-		# the alternative is to symlink coverage and pytest into venv,
-		# but that's ugly and likely to break again in the future
-		tests/test_pytest_cov.py::test_central_subprocess_change_cwd_with_pythonpath
-	)
-
-	epytest
-}
diff --git a/dev-python/pytest-cov/pytest-cov-6.1.1.ebuild b/dev-python/pytest-cov/pytest-cov-6.1.1.ebuild
index 15011e9e98dd..57429d4b5ea8 100644
--- a/dev-python/pytest-cov/pytest-cov-6.1.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-6.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 7661ea520385..e525f24a0210 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,2 +1,3 @@
 DIST pytools-2025.1.2.tar.gz 80400 BLAKE2B e07379f1c954ece6d9b2e5c7db5a84758d5d85a5955990cf730a135bc961321132c36c7e1402c4684d50957069f839bb732bda849f3d46513ddb5533b9a88b88 SHA512 74fc858aed5043cab9aa2210f071aa3aaf60008ec60b63133dac870ff257981284f66b40ccbedfdcf68969b1e1476cb012dbf83fa9397bb1b857ae5db09f99f6
 DIST pytools-2025.1.3.tar.gz 80509 BLAKE2B 448de6bb5ddedd905ee002ee4f6c0a49c657fce546e99c8ccdc5ddc119db9b8e0d40a138be9b3f25a63c5beab1602ff862805b175f927bea2ca306d6155d2499 SHA512 cdf9562f9dbc916fc0c21f363e7f34c1bdee3fd5adc5b499461ce40e887100d39ab0f8dddc50ade6c85120c74da3330d487eda112b7bf6d7e567fcdcabbe6e9b
+DIST pytools-2025.1.4.tar.gz 95738 BLAKE2B c2e722dd22b64fedd09b384d14e3201bcaf7f5fa18a546bc22ca7d21b168e96d862076178e14cc9c3cdd66e297f1b085ab33dd61fb7f565aa42cc797d474efbc SHA512 1018a6291dcde017993bb64dfeed0396d8f2373681731546474a99dd2086878684de39faf3e8c8eadc056e4375830cfda937c34f1ffb3c68eec8a39a51ad0764
diff --git a/dev-python/pytools/pytools-2025.1.4.ebuild b/dev-python/pytools/pytools-2025.1.4.ebuild
new file mode 100644
index 000000000000..d879e4989751
--- /dev/null
+++ b/dev-python/pytools/pytools-2025.1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Collection of tools missing from the Python standard library"
+HOMEPAGE="
+	https://mathema.tician.de/software/pytools/
+	https://github.com/inducer/pytools/
+	https://pypi.org/project/pytools/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+
+# NB: numpy are an "extra" (optional) deps
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
+	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyyaml-env-tag/Manifest b/dev-python/pyyaml-env-tag/Manifest
index f164431c4296..f04fc9841cbf 100644
--- a/dev-python/pyyaml-env-tag/Manifest
+++ b/dev-python/pyyaml-env-tag/Manifest
@@ -1 +1,2 @@
+DIST pyyaml-env-tag-1.0.gh.tar.gz 11727 BLAKE2B d0c3955df53e08d657b258691c4ed9fc4812aab5b2844914df09887aeb0660deb68ecb5c523ec9e7d692090f40627bf0072cd208d8a39c14634ec7f6ae21a55f SHA512 60a4a818d9b547a83e1d4f6b249d52eb7b1650dce12e6f7229f4999604d082ab2369d348cefe8423c2ae4ef36e50a5501a0327c6dbae0d82805af0dd192619bc
 DIST pyyaml_env_tag-0.1.tar.gz 5631 BLAKE2B 2302f3fd7c33347b1e451f466b13fbad53f2b77ee305ce844cd5b5bf40e633de95f4604eb27660c5f61aca21845e6f70e40a0ab52386a44d9b4e9be3ec7a7f29 SHA512 7d3dbc08fb338b3de5bbe657fa8a98a330d7ac7962ac2ea6513ade362b36deaaad8d9e82eb018454d73fd26d90003861a3ffee9abc2e9ac51dea4ba315b5c1f9
diff --git a/dev-python/pyyaml-env-tag/pyyaml-env-tag-1.0.ebuild b/dev-python/pyyaml-env-tag/pyyaml-env-tag-1.0.ebuild
new file mode 100644
index 000000000000..146fc4364f8c
--- /dev/null
+++ b/dev-python/pyyaml-env-tag/pyyaml-env-tag-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A custom YAML tag for referencing environment variables in YAML files"
+HOMEPAGE="
+	https://github.com/waylan/pyyaml-env-tag/
+	https://pypi.org/project/pyyaml_env_tag/
+"
+# https://github.com/waylan/pyyaml-env-tag/issues/9
+SRC_URI="
+	https://github.com/waylan/pyyaml-env-tag/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index dcff5bb1da8f..2b96dc936323 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,2 +1 @@
-DIST s3transfer-0.11.5.tar.gz 149107 BLAKE2B a5eed06767663a87b63649e62f3d98301551defda08e64b623a5beb38e4573ccdbbd68f426b580f93e17f8d09e679766b28cc248658c8ed515ada7064d7f53a6 SHA512 b8c0aa483429d4beabf58127678ebbfb28b407a95f1dde8bbcbb9d0adcf2143d3e1449cd71fa5c6eb3cf0ba25f08aa4f22f1671a34da26f67f36aab38837796b
 DIST s3transfer-0.12.0.tar.gz 149178 BLAKE2B ab9f293e04864190b7128bf1cb46f1fd13b240c5b4f419fbd937529e36c954c5595d2575b039e041a0555e6b0d609d7d4922a638b25f7487fdb4bf62b610c134 SHA512 06bd5bcab95c8b0f06e69e5cc78fc5f9e1dd1dba30a88b4fb2206e4e64ba4addd0679cf5e2384cd7ba674577c6a075dc0cc6dc5880e584a7fe5e4dc6df758ea0
diff --git a/dev-python/s3transfer/s3transfer-0.11.5.ebuild b/dev-python/s3transfer/s3transfer-0.11.5.ebuild
deleted file mode 100644
index 2712c3fe9d0c..000000000000
--- a/dev-python/s3transfer/s3transfer-0.11.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="
-	https://github.com/boto/s3transfer/
-	https://pypi.org/project/s3transfer/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/botocore-2[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.37.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.12.0.ebuild b/dev-python/s3transfer/s3transfer-0.12.0.ebuild
index b961e21eb65c..2712c3fe9d0c 100644
--- a/dev-python/s3transfer/s3transfer-0.12.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/botocore-2[${PYTHON_USEDEP}]
diff --git a/dev-python/scikit-learn/Manifest b/dev-python/scikit-learn/Manifest
index ed7addffbda4..195645bbba36 100644
--- a/dev-python/scikit-learn/Manifest
+++ b/dev-python/scikit-learn/Manifest
@@ -1 +1,2 @@
 DIST scikit-learn-1.6.1.gh.tar.gz 7046495 BLAKE2B 83292549cc12e44033451345fe6deac17fa4f3d013f9755839d4d7f1c7de9690c089a754493d0d3879ef44ed8523400d617fa4d135ce8500dab608552777cdf6 SHA512 ad91d7bd67884851334fed9b0f3b6f3bfacb6b1521b89acbe22e9428a88009579373118bbd3a55358ea60c997e98609062fc4eac8b1def1d0ad18026c0491074
+DIST scikit-learn-1.7.0rc1.gh.tar.gz 7160017 BLAKE2B 15534eeef26f8f7ee335f14cb193be3742c1fe215093f2852e7ad6a00e23237fae2b6af820632bc07630c51a54f6cc5bdd8e4a7b40834c2b1ddf6b385c55eb06 SHA512 103dda41a312dad7a9586ffcc3d2e95594de566dfa33cce5e06b34b30bd62eceae762af4ecfc5094313a28502db2c22aafd1bd69bffe5347ccb651fa589ebe9d
diff --git a/dev-python/scikit-learn/scikit-learn-1.7.0_rc1.ebuild b/dev-python/scikit-learn/scikit-learn-1.7.0_rc1.ebuild
new file mode 100644
index 000000000000..971476d364fa
--- /dev/null
+++ b/dev-python/scikit-learn/scikit-learn-1.7.0_rc1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Machine learning library for Python"
+HOMEPAGE="
+	https://scikit-learn.org/stable/
+	https://github.com/scikit-learn/scikit-learn/
+	https://pypi.org/project/scikit-learn/
+"
+SRC_URI="
+	https://github.com/scikit-learn/scikit-learn/archive/${PV/_}.tar.gz
+		-> ${P/_}.gh.tar.gz
+"
+S=${WORKDIR}/${P/_}
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="
+	virtual/blas:=
+	virtual/cblas:=
+	>=dev-python/numpy-1.22.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	>=dev-python/joblib-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/threadpoolctl-3.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pythran-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/cython-3.0.10[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+# For some reason this wants to use urllib to fetch things from the internet
+# distutils_enable_sphinx doc \
+# 	dev-python/matplotlib \
+# 	dev-python/memory-profiler \
+# 	dev-python/numpydoc \
+# 	dev-python/pandas \
+# 	dev-python/pillow \
+# 	dev-python/seaborn \
+# 	dev-python/sphinx-gallery \
+# 	dev-python/sphinx-prompt \
+# 	dev-python/scikit-image
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO: floating-point problems
+		gaussian_process/kernels.py::sklearn.gaussian_process.kernels.ExpSineSquared
+	)
+
+	case ${ARCH} in
+		ppc64)
+			EPYTEST_DESELECT+=(
+				# TODO
+				ensemble/_weight_boosting.py::sklearn.ensemble._weight_boosting.AdaBoostRegressor
+			)
+	esac
+
+	rm -rf sklearn || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest --pyargs sklearn
+}
+
+python_install_all() {
+	find "${S}" -name \*LICENSE.txt -delete || die
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index bf0cf960fc25..7b4dc5823d6d 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,2 +1,4 @@
 DIST scipy-1.15.2.tar.gz 59417316 BLAKE2B 7ae748a58b6a7fb2674dc6627c3d6f4f28694283bf19ca9973fcf5796ccb0e2e35bb7cd8fbfbefa21cb832b771e563f478bc09ded61d989ea47625e7ac35e1bd SHA512 e772aa040622ef457478e08eb41471af33784cafc2022f091a30563f6abed067cdbae424a5ae86f9dab8c1adc67276794b67cb7cb7c7963ca55a38529df63834
+DIST scipy-1.15.3.tar.gz 59419214 BLAKE2B 526e6182e4991e52fea69452b7894b203d31089ee1f8640ef1bff8f1fa57c31a7179a1ab82325689f3b0a7b907c34adb64b80e640780c99e166f6999adbb1524 SHA512 009de94a64c9361b261788ef3577d636a20ca23ff5c8f12f5e19a4ba4d6177ef7ade0cf1a5ee740bd1c6d740193d70b314d1abd83ab65fcb5d5cf2d2ba06bfb1
 DIST scipy-html-1.15.2.zip 68568078 BLAKE2B 270f1d89bbcb707616f7af0e1bd90909c1f33d647cf55e42dbf27128ecd90f619f0d579d8897eb04851b6327df1682236c5fd9c4c948b1fd99b083145681a202 SHA512 48e09d3678547775c6c86b82cdb4ef5e7eed7722c6ba8d53170384c3a9380b2bb29fc467b5ee66ae2ec1a621930c8bf20adfc8db3a75546a6ba8e9906df03426
+DIST scipy-html-1.15.3.zip 68590525 BLAKE2B f6473e273843e3eb2aa791be1b885a11ac2b77accdf00ea2d7bc78dc59228dede66259ff4d2ac616ceeb3152a80a8036226622240d963a8bce51dc0143b6aea4 SHA512 df59c2a53dc9c8a64631a2c9906762de046b9beefd759e0810afdcbb00e4da8800e83902d49fa81d791bccb0ed190e00f0ea4948b855e97ad9b5d7a0984d4eec
diff --git a/dev-python/scipy/scipy-1.15.3.ebuild b/dev-python/scipy/scipy-1.15.3.ebuild
new file mode 100644
index 000000000000..77dc1672f43e
--- /dev/null
+++ b/dev-python/scipy/scipy-1.15.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic fortran-2 distutils-r1
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=${PV}
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# pythran is needed in both BDEPEND (for /usr/bin/pythran) and in DEPEND
+# to actually compile code generated by pythran (headers and such needed).
+#
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+DEPEND+="
+	fortran? (
+		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.13.2[${PYTHON_USEDEP}]
+	>=dev-build/meson-1.1.0
+	!kernel_Darwin? ( dev-util/patchelf )
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? (
+		>=dev-python/pythran-0.16.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+
+	# https://bugs.gentoo.org/932721
+	has_version '>=dev-python/numpy-2.0.0' && filter-lto
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Crashes with assertion, not a regression
+		# https://github.com/scipy/scipy/issues/19321
+		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3*)
+			EPYTEST_DESELECT+=(
+				# TODO
+				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
+				'scipy/_lib/tests/test_ccallback.py::test_callbacks'
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# avoid other stuff being multithreaded when using xdist
+	local -x PYTHON_CPU_COUNT=1
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 8544804e3a33..36dbef5ff3e2 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,6 +1,4 @@
-DIST setuptools-75.8.2.tar.gz 1344083 BLAKE2B 7d4dff2c0948bb411ef5f70e5f5f91bc0e230b155a97419d263f88e54a94390fd7dcadad14105f4d886a25024bf4c95e776ae7b25e4b1d6f17e45e6060b99da2 SHA512 adf7f5d2eab7621b03c86e3f96857b176631108dc8a0eba2b16b87e394bff0b607998bc24cc074cd3f7b0ed6dbe0bd753cce5af2f108fce2473fb50b22f32913
-DIST setuptools-78.1.0.tar.gz 1367827 BLAKE2B d82320d11829e43e6841cd6b5a9bd4e16cfc9e7e2f97f64ac2ab1956ed68587ca6c74a07781f6afeefd3a949c23dee374460bdd327b7a5d908f33b2882f3d87d SHA512 e0b9562a8b3bb7a6b664da84ef37e4f4f71df5dd3129b636ece798878e62bf4be60ff6b6643a98b7047e540e14c931eeb54b4e08c583ac1a86ffb5dc5e921c68
 DIST setuptools-79.0.1.tar.gz 1367909 BLAKE2B d495a22753400b3b0ef71423e2c9b5adaad1a065d1f9638b5da8161b29c453495701c3efaa3abd2482777e186ba992bd7b57090dfc711d9cdfdaa8254616a8ff SHA512 5b68d7cc775f4318e178f7d7f69c60a01b1abc607411e88c88e3507a08bd85eed241b915d4be5f3ada90df4b68718056c2ba032943c1f53fe68d171c7d728179
 DIST setuptools-80.2.0.tar.gz 1354232 BLAKE2B 2eb5f9b51632c865533bb018e268da7e9b52f1cecdb9da0eb0da713ee4e44d0827c6340b5c1f663d3b8b4df08849c32972498980de287fab6101593d5aeb47ca SHA512 a684eb3ef4049c6d05aca9cd77a015e63047cdc84460af798ac1dc1d87a970370176ac7fd87e250be155e61dddd77e89ad84adb5557f04d1a1059cd449c08c53
-DIST setuptools-80.3.0.tar.gz 1314475 BLAKE2B 26fb2b0408221a51f4664a983927be79936b89e3daffb71f1d6ad76a2b752ee10f3958ac9be9fb7d8c78906b6cff33b19c16d248649600d6921083bdfc841d04 SHA512 f492360d8eec2a33a70328cf6e7e017290dea510ffa14fe12ef0161bd72a46d6078ff099a885f256ced0862c3551b6ef3af449a4638b309f6b55070dcd482c51
 DIST setuptools-80.3.1.tar.gz 1315082 BLAKE2B 65207edf080d80599b2fe82caed638221bbe1155f745fd8cd02bd9da5934b1880782eb285f5be44088e189684385e7fbbd2bd0750fcd27aaf556f0a44214573d SHA512 be5157aa1f1a7f1e3e11b971ffedac509303d4919d590c1f741dd1c4966c5dc83168b458d3aad66dd9874c7f8f4c8c5bbded6b4dbf6ed91f0d05b1c65229a789
+DIST setuptools-80.4.0.tar.gz 1315008 BLAKE2B e41541fdd6e6adad6ed2f39f2c344c944336e89c24b6d9de9984c8a0234c61dba05b15df805639d380e840b0a15b98a3998c251b764340b5251624827be0934a SHA512 d4d55d9f7bdecbf26e3de6e5a99245db4b69a203a37475539ce4a3b8c6e6b9f1c47f5dc29b4d6a4dc971cabc6714ae7bc0a55f99e214d9402b47bb3dd89b58a4
diff --git a/dev-python/setuptools/setuptools-75.8.2.ebuild b/dev-python/setuptools/setuptools-75.8.2.ebuild
deleted file mode 100644
index 81b89f7e0331..000000000000
--- a/dev-python/setuptools/setuptools-75.8.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-78.1.0.ebuild b/dev-python/setuptools/setuptools-78.1.0.ebuild
deleted file mode 100644
index 25c858a78c11..000000000000
--- a/dev-python/setuptools/setuptools-78.1.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
-	dev-python/jaraco-collections[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
-	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.14[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-test-5.5[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pyproject-hooks[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			>=dev-python/pytest-home-0.5[${PYTHON_USEDEP}]
-			dev-python/pytest-subprocess[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-# setuptools-scm is here because installing plugins apparently breaks stuff at
-# runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
-PDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	# breaks tests
-	sed -i -e '/--import-mode/d' pytest.ini || die
-
-	# remove bundled dependencies
-	rm -r */_vendor || die
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# TODO, probably some random package
-		setuptools/tests/config/test_setupcfg.py::TestOptions::test_cmdclass
-		# broken by unbundling
-		setuptools/tests/test_setuptools.py::test_wheel_includes_vendored_metadata
-		# fails on normalized metadata, perhaps different dep version?
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_with_pyproject_config
-		# TODO
-		setuptools/tests/test_sdist.py::test_sanity_check_setuptools_own_sdist
-		# relies on -Werror
-		setuptools/_static.py::setuptools._static.Dict
-		setuptools/_static.py::setuptools._static.List
-		# TODO
-		setuptools/dist.py::setuptools.dist.Distribution._find_pattern
-	)
-
-	local EPYTEST_XDIST=1
-	local -x PRE_BUILT_SETUPTOOLS_WHEEL=${DISTUTILS_WHEEL_PATH}
-	epytest -o tmp_path_retention_policy=all \
-		-m "not uses_network" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-79.0.1.ebuild b/dev-python/setuptools/setuptools-79.0.1.ebuild
index 75df7b4b3e85..25c858a78c11 100644
--- a/dev-python/setuptools/setuptools-79.0.1.ebuild
+++ b/dev-python/setuptools/setuptools-79.0.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools/setuptools-80.3.0.ebuild b/dev-python/setuptools/setuptools-80.4.0.ebuild
index 9282ff6be41a..8b8c38e414b5 100644
--- a/dev-python/setuptools/setuptools-80.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-80.4.0.ebuild
@@ -26,7 +26,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	!<dev-python/setuptools-rust-1.8.0
 	dev-python/jaraco-collections[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-functools-4[${PYTHON_USEDEP}]
 	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
@@ -34,9 +33,6 @@ RDEPEND="
 	>=dev-python/packaging-24.2[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-4.2.2[${PYTHON_USEDEP}]
 	>=dev-python/wheel-0.44.0[${PYTHON_USEDEP}]
-	!<=dev-libs/gobject-introspection-1.76.1-r0
-	!=dev-libs/gobject-introspection-1.78.1-r0
-	!=dev-libs/gobject-introspection-1.80.1-r1
 "
 BDEPEND="
 	${RDEPEND}
@@ -96,6 +92,7 @@ python_test() {
 
 	local EPYTEST_DESELECT=(
 		# network
+		setuptools/tests/integration/test_pbr.py::test_pbr_integration
 		setuptools/tests/test_build_meta.py::test_legacy_editable_install
 		setuptools/tests/test_develop.py::TestNamespaces::test_namespace_package_importable
 		setuptools/tests/test_distutils_adoption.py
@@ -121,6 +118,7 @@ python_test() {
 		# relies on -Werror
 		setuptools/_static.py::setuptools._static.Dict
 		setuptools/_static.py::setuptools._static.List
+		setuptools/tests/test_bdist_egg.py::Test::test_bdist_egg
 		# TODO
 		setuptools/dist.py::setuptools.dist.Distribution._find_pattern
 	)
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 46a7095e42e8..b0080b048251 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,2 +1,2 @@
 DIST snowballstemmer-2.2.0.tar.gz 86699 BLAKE2B b106fac1587143c9e88f54cc982c573b227f9e2d0125d36391a95050b41e9c97e47c7c8dff890ebfcf4bdf7c97559908d3bd380c6659b0d1fef4bed111fbae4b SHA512 f1dee83e06fc79ffb250892fe62c75e3393b9af07fbf7cde413e6391870aa74934302771239dea5c9bc89806684f95059b00c9ffbcf7340375c9dd8f1216cd37
-DIST snowballstemmer-3.0.0.1.tar.gz 105321 BLAKE2B 3f6c71cce25c1a2afbec0f52008f8e44d9898af62ee75f75b4dca7d27736f360a37539ea1d65d42471bc0dcad33698defc47bb12c8b64a421385de6d47fc5b8c SHA512 6970ecc4188f714df19c6eb6415368774726e54c3c574ac34a866532385bb3e89eaff28bbac2c3820f8d393c7d4e852ada8689986f0aad7c18aa8cf9d5879772
+DIST snowballstemmer-3.0.1.tar.gz 105575 BLAKE2B 68515d35b8aa8ad9f80e2fb37c483f6fe15951796413553e543b7cd4dfc2da37107766e8c96662498b63f019b5dfc62288f026d5465613d740421e41d00f2b99 SHA512 a9590da2b0be4b93a7500b337a63cf2039ff01a6da309ddb9462961c309b4763d4dfc925965a62376a9f3b41a05bb634d6472f1e2ee07e53b38f8542e7eada82
diff --git a/dev-python/snowballstemmer/snowballstemmer-3.0.0.1.ebuild b/dev-python/snowballstemmer/snowballstemmer-3.0.1.ebuild
index fe382b3fb048..fe382b3fb048 100644
--- a/dev-python/snowballstemmer/snowballstemmer-3.0.0.1.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-3.0.1.ebuild
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 741041070e46..9c7da4f2a070 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,2 +1 @@
-DIST soupsieve-2.6.gh.tar.gz 105495 BLAKE2B 0d84abf1bdb5dde8884b1594cc588d4ccfa9df486149cf2f44784bfd86a6dd3a645e1ad319283837cc11d9c9bcdc8fa190b9315d0d2565c7ea0ebb5a887562fa SHA512 ee30c999721b93b3812270ed713d3450f460deac285472f939669bfa607dd195a1325e2e8cb86e233b693f7ff01a77eaf81035a1d4e7cd06a2ceb7db4ae88ea5
 DIST soupsieve-2.7.gh.tar.gz 107367 BLAKE2B 4ea891e30bdbc104d985821d3ae778f434dcac2c204e34b077d775bf4b51a9d264c607349a2fa0acca58a1ddaf7f919ffdbbeba1451d61559fe4ecbc15b194dc SHA512 8bac55ea5f6ad34aab9ecc6f78247a74285d7913c514410eb6d8a321703b22aa43f5c3fc888237b6258e0afde7796876ec4fa4f80e23cbf471f957279f35c5e8
diff --git a/dev-python/soupsieve/soupsieve-2.6.ebuild b/dev-python/soupsieve/soupsieve-2.6.ebuild
deleted file mode 100644
index 9131964c3713..000000000000
--- a/dev-python/soupsieve/soupsieve-2.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="
-	https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/
-"
-SRC_URI="
-	https://github.com/facelessuser/soupsieve/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.7.ebuild b/dev-python/soupsieve/soupsieve-2.7.ebuild
index 0892efaaa09c..9131964c3713 100644
--- a/dev-python/soupsieve/soupsieve-2.7.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 392356421283..744686fefda6 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,2 +1 @@
-DIST stestr-4.1.0.tar.gz 113187 BLAKE2B 6bd423aaad6189c90fe9b43db9390e85a5f458cfa899c33bd34b1340ca7f111d2edd2981d9c664d63ec6b880a904b08a26c09c332548ac5f2ebdabd2bad6a00a SHA512 77287ffdfe59042c4d189aa6c662df4357633d3a134ea60a4533b5b8b1b433ffd6f265a430977da175f242cc1c8e8514f876a486cc900a436cf93ab629fe7b7d
 DIST stestr-4.2.0.tar.gz 79824 BLAKE2B 85ec7ad7a029ba4ebe75c71863ea0962d5d8d3add6fe8f4903013d4c72620b98fd4baf6a1690ccc2084b299930fb8c7f00f9108211742cf850040f4ed2219c86 SHA512 2d870604f671b720bfa7ac21d58b5beb56aab2fe4e70e99c8f332ed0081c0c86e791eeb92d4477b6dafaed50ffa17a0ac8e776bd35713fa5a1b0785803a27ba8
diff --git a/dev-python/stestr/stestr-4.1.0.ebuild b/dev-python/stestr/stestr-4.1.0.ebuild
deleted file mode 100644
index e6b029985052..000000000000
--- a/dev-python/stestr/stestr-4.1.0.ebuild
+++ /dev/null
@@ -1,46 +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_{9,10,11,12,13} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="A parallel Python test runner built around subunit"
-HOMEPAGE="
-	https://github.com/mtreinish/stestr/
-	https://pypi.org/project/stestr/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-subunit-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install$(python_get_sitedir)"
-	stestr init || die
-	stestr run --concurrency "${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
-		die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/stestr/stestr-4.2.0.ebuild b/dev-python/stestr/stestr-4.2.0.ebuild
index 34a72418eabd..00b1cb5a484f 100644
--- a/dev-python/stestr/stestr-4.2.0.ebuild
+++ b/dev-python/stestr/stestr-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 80b6f7a4c7d3..8e63b2a92c59 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,2 @@
-DIST stripe-12.0.0.tar.gz 1369861 BLAKE2B abd767466760e8e43d313e7072dcab5d74b09cd395eafb894ef0ee7d21db5503e3f36493e194ab02100f3b9d648342a91efd5c46574af290481c2a260680a974 SHA512 ab9cac4712989227562ade7a7058c2c3342c04f98f02496597047755d9f790f720c29b5f8c26da1a2f4d795793931a8a073789708f395cdfa0057a8e71724a49
 DIST stripe-12.0.1.tar.gz 1370176 BLAKE2B 72298f444c491b1166cb2b6e7e16e25737531b65c6320404be5b1d5ece5b6a62dd36f66e8e95ff7aa6972c7046f04b0ccc0b5b2ccfb7cea7da7d8ca8cdd9b18e SHA512 aa5a02f6a1e2f7e6be649399ffe8af93e3a637128a4e8db3dd12abe3faa4c876b33a93128ecefb3e9119931b690ca7a14fcbf83cf77fd2b8d9ac1068d5b8a426
 DIST stripe-12.1.0.tar.gz 1379855 BLAKE2B 9d1fcfbceccb48def5724b12ef4d801b23a3fb08883ad59435a7babe6d0533af69be4d6706a6d2493362347fa65ec99183b8a2749a9c460a6b976491f55eec51 SHA512 31ba62055e0e3b4e66313ebd8505833a1d69b7d133047a76492ea98f496b329a16d5f1d763f7b9ef5239d578d1b0dde293f2be4fa2e8ef33f481033ac213cce3
diff --git a/dev-python/stripe/stripe-12.0.0.ebuild b/dev-python/stripe/stripe-12.0.0.ebuild
deleted file mode 100644
index b652190db5b5..000000000000
--- a/dev-python/stripe/stripe-12.0.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,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.192.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=(
-		# Internet
-		tests/test_http_client.py::TestLiveHTTPClients::test_httpx_request_async_https
-		'tests/test_integration.py::TestIntegration::test_async_raw_request_timeout[asyncio-aiohttp]'
-		# timing
-		tests/test_integration.py::TestIntegration::test_passes_client_telemetry_when_enabled
-	)
-
-	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-12.0.1.ebuild b/dev-python/stripe/stripe-12.0.1.ebuild
index 865cef97ef18..b652190db5b5 100644
--- a/dev-python/stripe/stripe-12.0.1.ebuild
+++ b/dev-python/stripe/stripe-12.0.1.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/symengine/symengine-0.14.1.ebuild b/dev-python/symengine/symengine-0.14.1.ebuild
index 9f227be7d57d..697ed229aab8 100644
--- a/dev-python/symengine/symengine-0.14.1.ebuild
+++ b/dev-python/symengine/symengine-0.14.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	dev-build/cmake
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 182563a5699c..d558616fdeb1 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,2 +1 @@
-DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
 DIST testresources-2.0.2.tar.gz 45057 BLAKE2B bb4c0cc12eae792eae3546cb7d0a71aaef0e50e7e26bffe3c8e80230e1e7686b91e93dd8fb31ec45a8c7c4e7f5c201193356653fcf1e199406d18d4673e8babc SHA512 3e7970830833f0a057488638e77af017ca337a736c27e1bd86c896e02174d8f52ad154a649ba3f5a32aac36e1e17b4cb63a6539fcdb19eedba2dba42a76adaf1
diff --git a/dev-python/testresources/files/testresources-2.0.1-py312-tests.patch b/dev-python/testresources/files/testresources-2.0.1-py312-tests.patch
deleted file mode 100644
index 7d4451ca43b9..000000000000
--- a/dev-python/testresources/files/testresources-2.0.1-py312-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Subject: [PATCH] Refactor failIf to assertFalse for Python 3.12 Compatibility
-
-This commit replaces deprecated failIf calls with assertFalse in the
-test_resourced_test_case.py file. The failIf method was removed in
-Python 3.12 [1-3].
-
-[1] https://docs.python.org/3.12/whatsnew/3.12.html#removed
-[2] https://github.com/python/cpython/issues/89325
-[3] https://github.com/python/cpython/pull/28268
-
-Upstream-PR: https://github.com/testing-cabal/testresources/pull/15
-
-diff --git a/testresources/tests/test_resourced_test_case.py b/testresources/tests/test_resourced_test_case.py
-index 7d2cfba..3c8a1b3 100644
---- a/testresources/tests/test_resourced_test_case.py
-+++ b/testresources/tests/test_resourced_test_case.py
-@@ -129,7 +129,7 @@ class TestResourcedTestCase(testtools.TestCase):
-         self.resourced_case.resources = [("foo", self.resource_manager)]
-         self.resourced_case.setUpResources()
-         self.resourced_case.tearDownResources()
--        self.failIf(hasattr(self.resourced_case, "foo"))
-+        self.assertFalse(hasattr(self.resourced_case, "foo"))
- 
-     def testTearDownResourcesStopsUsingResource(self):
-         # tearDownResources records that there is one less use of each
-@@ -158,5 +158,5 @@ class TestResourcedTestCase(testtools.TestCase):
-         self.assertEqual(self.resourced_case.foo, self.resource)
-         self.assertEqual(self.resource_manager._uses, 1)
-         self.resourced_case.tearDown()
--        self.failIf(hasattr(self.resourced_case, "foo"))
-+        self.assertFalse(hasattr(self.resourced_case, "foo"))
-         self.assertEqual(self.resource_manager._uses, 0)
--- 
-2.39.2
-
diff --git a/dev-python/testresources/testresources-2.0.1-r3.ebuild b/dev-python/testresources/testresources-2.0.1-r3.ebuild
deleted file mode 100644
index 6e9e173057a2..000000000000
--- a/dev-python/testresources/testresources-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="
-	https://launchpad.net/testresources/
-	https://github.com/testing-cabal/testresources/
-	https://pypi.org/project/testresources/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-py312-tests.patch"
-)
-
-distutils_enable_tests unittest
diff --git a/dev-python/testresources/testresources-2.0.2.ebuild b/dev-python/testresources/testresources-2.0.2.ebuild
index 1e77de19676e..cbd793a9235f 100644
--- a/dev-python/testresources/testresources-2.0.2.ebuild
+++ b/dev-python/testresources/testresources-2.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index fba1c8d0f0ee..6475d348b58a 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,2 +1 @@
-DIST tldextract-5.2.0.tar.gz 126839 BLAKE2B a8560b381e2969ad7161949a1820b3b55ebe5fc74c9cf15ea1ff5ecd9f4245c2a33e7cdeb0b4033e5b6474eed961d3737b5271e45e974a9285aeb31652b4962d SHA512 574146034076280dd524ef33530471d14485e3602fe3b1ce06c72ecea4f99918efee25cc8f26e6809244e053c084d0f37ca4477348400be67f13da68448aebbe
 DIST tldextract-5.3.0.tar.gz 128502 BLAKE2B 36579f832c508283fc78c514d9274659d5f55b2d60f3af93a686d9470fc8e8473f30e3404dda15f6e0dd4a0020b841e98eaf3506feeeb591ed1c27d7b2b45185 SHA512 8745464464355be830f30ee4a694ede58f3e6ee3339c38d32e2cdca4c5cffb5178b64f8c463d0c824034ea1c0b3eefd42e5b1dd694fa8971771444c34f4c01f5
diff --git a/dev-python/tldextract/tldextract-5.2.0.ebuild b/dev-python/tldextract/tldextract-5.2.0.ebuild
deleted file mode 100644
index 6067a95b76d5..000000000000
--- a/dev-python/tldextract/tldextract-5.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL"
-HOMEPAGE="
-	https://github.com/john-kurkowski/tldextract/
-	https://pypi.org/project/tldextract/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/filelock-3.0.8[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-file-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# we don't need release tests, also deps
-		tests/test_release.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/tldextract/tldextract-5.3.0.ebuild b/dev-python/tldextract/tldextract-5.3.0.ebuild
index 989df19a3072..6067a95b76d5 100644
--- a/dev-python/tldextract/tldextract-5.3.0.ebuild
+++ b/dev-python/tldextract/tldextract-5.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/filelock-3.0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 757e93701a30..0808d7839f26 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,5 +1 @@
-DIST trove_classifiers-2025.4.11.15.tar.gz 16321 BLAKE2B b011b524d267506aef4d91ac6d365e08e419fb57b424259b080de8cb7205cd8c4c6df52e29532b9dc19ca36f41b0793ac25a8824e9d2328735357efa369b2157 SHA512 5eb5d892a751105319c003e4a370d2f69b614a1f2bea8904865b7da9f4d2648ffe57fba1cebc1ec21dab74d02b3223eb72af478ddd69635e45b0424621cefa9a
-DIST trove_classifiers-2025.4.28.22.tar.gz 16883 BLAKE2B 9598b19874f7deaeb15333a7f97cb91a7d82fe34d26d6d4e526bf857ed777539cad89949628196f2bbff187511fc5bca2327aeaacec4052611c5f2d82c4bb8a8 SHA512 4863ff031d9c83177099b5c1e04e2a22396055209b88e60dd44e22a8357889f27572444e0a1fbef65b7b37919cb9d7f8cb548b7007fd878d8fe92c9cd39b864e
-DIST trove_classifiers-2025.5.1.12.tar.gz 16876 BLAKE2B 27ae91479d2a811978b3f1447568f5849341a7fda5c825ebf0dd0502d85f206d63f4687463708031637da4313d0182abc05b6b710a6f32fd714167ac766a587d SHA512 af3c0ee51e7ce3e7ec0eb1fd901ac3d0c02f6c0ba1c77d3ba66e0770bf5300144f636dcbf608f046a21789cfc780f651be222b7d23f359a672fde0210af966b5
-DIST trove_classifiers-2025.5.7.19.tar.gz 16891 BLAKE2B 42c1d72cb1f70137e4d2af4b2a4f85811b0aab0a325793865afb51511bf00d7d5f7f5cfeeb1c887a630fdbe8e437987396cb9a9eeefc4d2cd56e5ecbfab0aab3 SHA512 ab35ab9f627244ce68d9db45684018392bd91d9b3f001be7e41ec8bf061fb86aee904347813db90afd2b94325d74665fea85994f29b144753c409642e8d9fdda
-DIST trove_classifiers-2025.5.8.15.tar.gz 16870 BLAKE2B d52e632a6a9e563c2ab7d9d5bf46baa8168d86677c98b3447e1b7c8c9f92c8a33707b4c2603dcbf546ffd87819a1362f23a60b2e299c5356480ce0f5660a3157 SHA512 81e96cd33997cb2574d05a553a0402f02d320d5fe2234a7c92d23d5bf460a5603bbdaa19ea37ecbbe81d6e2c8ef86bb936d74817514482ef551d85d103761858
+DIST trove_classifiers-2025.5.9.12.tar.gz 16940 BLAKE2B f6143f341d280eca611269c1a04b7f795d8f8733e97518d81d5872b8e1e13f745f7428737993a5c50285de24f56f899737d05fe073c683ddd69765b6081a6ebe SHA512 ee858f52c08b867fe4845ebb19f9b431308d216b5313e2bc030d63340860205d40125ef6cee218f734ccd49e5ae36011c8e3415f03d0ace182cb518ed5f2318d
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.4.28.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.4.28.22.ebuild
deleted file mode 100644
index 0b6867aee421..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2025.4.28.22.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-
-		[project.scripts]
-		trove-classifiers = "trove_classifiers.__main__:cli"
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.5.1.12.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.5.1.12.ebuild
deleted file mode 100644
index 0b6867aee421..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2025.5.1.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-
-		[project.scripts]
-		trove-classifiers = "trove_classifiers.__main__:cli"
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.5.7.19.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.5.7.19.ebuild
deleted file mode 100644
index 0b6867aee421..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2025.5.7.19.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-
-		[project.scripts]
-		trove-classifiers = "trove_classifiers.__main__:cli"
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.5.8.15.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.5.8.15.ebuild
deleted file mode 100644
index 0b6867aee421..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2025.5.8.15.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-
-		[project.scripts]
-		trove-classifiers = "trove_classifiers.__main__:cli"
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2025.4.11.15.ebuild b/dev-python/trove-classifiers/trove-classifiers-2025.5.9.12.ebuild
index 423fa8fb572d..85ec99e9e268 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2025.4.11.15.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2025.5.9.12.ebuild
@@ -33,6 +33,9 @@ src_configure() {
 		name = "trove-classifiers"
 		version = "${PV}"
 		description = "Canonical source for classifiers on PyPI (pypi.org)."
+
+		[project.scripts]
+		trove-classifiers = "trove_classifiers.__main__:cli"
 	EOF
 }
 
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index daf12851fb90..d5a4bcfbc201 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,5 +1,2 @@
-DIST types_setuptools-78.1.0.20250329.tar.gz 43942 BLAKE2B 1d471cda411f650fa42fc04d4cf44e8a0deb078c9601922fb70bb3bc44701753071ff8b5a220e1e788e33a51f71e492a6edba6b5695151fd9e7da1f8e0ef84fa SHA512 9de9e79ddc6bc6b0a02ecdb40702c8e041fe2197f4e1773cca70632510982c5e1549f38f6e3f36eb80e160c246a8db805b0ec375ac26262113f5c85624bf4699
 DIST types_setuptools-79.0.0.20250422.tar.gz 43865 BLAKE2B 3ef152fbaa27057b0279bfd5ef6e6104a04eaa55d9594e1cd5867bbaea4cd105ab7da94aad0f5e84382c566deec572d203b68feab06ece61982823eeb55d0806 SHA512 841a4d5332f0c8ed27333330cf5e78f21b1d033e3202d733f44234d234fca7db0bd0205520287d5cc0e69bb9befe79bff72e80fde593e70821692c3a8be29352
-DIST types_setuptools-80.0.0.20250429.tar.gz 43353 BLAKE2B 55e5611945fc34222779878bc2eff4daef86d51d331bcf4ce51ca3b6cae970e8437c4102b4355f3b7362a93e280d13ac04de4b9a9708920b7988e5567f719d80 SHA512 481ec0f25ea00550faba0a1271891153a070dbea9aab2cc2c1f14ea9b7e5b14c4caa18b9e72072c2d0cdf035a1e8aad03a58fe4058734ba95355996ce536194d
-DIST types_setuptools-80.1.0.20250503.tar.gz 43334 BLAKE2B a52772cd6ec23069db47fc63e735821ead982b146b2d581ab4554e04e0289fab19c3f5a8721c78ba3c6fe09c3136e8ca743892e0ab5a4e64a3e3ea1b32822725 SHA512 8c7b89fc7ff596d705b4d4face65a899cd49e5f18b5fbde27d09f9d8c3bfbd1b5e9d769d7a2bdf9043a9d51d9c55a4801870d947f1549eb87a8f4db7fe511897
 DIST types_setuptools-80.3.0.20250505.tar.gz 41205 BLAKE2B 9678f681ea420290c55d7e1a20e8cea7f90d9c4c9a8dcb327056c6044f1a84a57e6e03d0cf20afe456f1f1f209f2e66461574dd27c5f63fa5d208b528d98bdfd SHA512 a5c186d246eb42764d90db0409c8fcdc8bb41aa6116c1705b0c32561db3d0bd28cdd6c14e4d0c2d9c4a29ba802231f809f46fd12d753f2d0719e6f0ddb6a1421
diff --git a/dev-python/types-setuptools/types-setuptools-78.1.0.20250329.ebuild b/dev-python/types-setuptools/types-setuptools-78.1.0.20250329.ebuild
deleted file mode 100644
index aa7e65d38ab7..000000000000
--- a/dev-python/types-setuptools/types-setuptools-78.1.0.20250329.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,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/types-setuptools/types-setuptools-79.0.0.20250422.ebuild b/dev-python/types-setuptools/types-setuptools-79.0.0.20250422.ebuild
index 4d6bfa0439df..aa7e65d38ab7 100644
--- a/dev-python/types-setuptools/types-setuptools-79.0.0.20250422.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-79.0.0.20250422.ebuild
@@ -13,4 +13,4 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-80.0.0.20250429.ebuild b/dev-python/types-setuptools/types-setuptools-80.0.0.20250429.ebuild
deleted file mode 100644
index 4d6bfa0439df..000000000000
--- a/dev-python/types-setuptools/types-setuptools-80.0.0.20250429.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,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/types-setuptools/types-setuptools-80.1.0.20250503.ebuild b/dev-python/types-setuptools/types-setuptools-80.1.0.20250503.ebuild
deleted file mode 100644
index 4d6bfa0439df..000000000000
--- a/dev-python/types-setuptools/types-setuptools-80.1.0.20250503.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,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/unidecode/Manifest b/dev-python/unidecode/Manifest
index 12e0542326e8..aed2606a110d 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,2 +1 @@
-DIST Unidecode-1.3.8.tar.gz 192701 BLAKE2B 622b61b89d83070101626775187a666b830399bc86c67367b0793b6626667dc8f4655372c7bc8b61f2433ac927ec7572e5beb104407784dd2f8e20ced9ecf981 SHA512 0c93647b05b3ce041ba0091705630a4d75dfc249b3aa57b1d8bd26d26f1a067af1d0103a0f57ee2ea07224797ce204562e08df92d0fe60e250a16614bf146ece
 DIST Unidecode-1.4.0.tar.gz 200149 BLAKE2B 34456bd340aebc40ccd92170dcbcc15b02231ed84fe1d9c7095e2be6e695207be262724f6178b37c6ad0a729715f1dd2a56214aa4233136179bb07fe5f7a99f3 SHA512 c2030855bf650a648d1707b629f29ad7b911b1143f603176b2236695fc884f1d25b7d635a92cd206e71b9b56bc9ab965952a187749b6dbf664b41a33b592db82
diff --git a/dev-python/unidecode/unidecode-1.3.8.ebuild b/dev-python/unidecode/unidecode-1.3.8.ebuild
deleted file mode 100644
index 1baa1751c5c9..000000000000
--- a/dev-python/unidecode/unidecode-1.3.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Module providing ASCII transliterations of Unicode text"
-HOMEPAGE="https://pypi.org/project/Unidecode/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/unidecode/unidecode-1.4.0.ebuild b/dev-python/unidecode/unidecode-1.4.0.ebuild
index 61a9ea0bcdba..1baa1751c5c9 100644
--- a/dev-python/unidecode/unidecode-1.4.0.ebuild
+++ b/dev-python/unidecode/unidecode-1.4.0.ebuild
@@ -15,6 +15,6 @@ HOMEPAGE="https://pypi.org/project/Unidecode/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 01eae2ec4c38..2562aa0b3856 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,2 @@
 DIST uvicorn-0.31.1.gh.tar.gz 728604 BLAKE2B 4f8f4e34bc6b13f6f0866a6890855a5b3bf9aad179de2fdeab40fdb017f76acfaa1cb7c9bd97d55d2ea5cd513afc3b6857ae0613912f6be55dc1d17cf810b213 SHA512 2ceab852cd7819fee592cf2507fa9ce8cc80f19dec0492fec621e6eded4a47edecbe4fe559a8474dacff260546ba146e33af9cab964e121356797fdc9a2dae28
-DIST uvicorn-0.34.1.gh.tar.gz 709794 BLAKE2B 9ea07bc6046601c5d9b8bdd263821f4a39de0c8facb41ee83f89ab4686c4d68a861445d1e1e98dc7679c30285fd0efe008dd9a9caf6f3920cd22c97ae72d28a8 SHA512 8a4020eabf644ad03c9cb4ecd69bdaa163c9ad5aaca226a38baf679c02864c8e6c5ad525d4c7b2197ad32553c9e1412376c1d17d51ab936878ab2eb251f23f51
 DIST uvicorn-0.34.2.gh.tar.gz 709898 BLAKE2B 8316b0f51f0a833ae42eaf235839761019e20e80e1bf9a81d79f90c814fc214b0a346b81d98b6734f2b132c8641e96b1ef43c137906b55fcd8d4c825d607626e SHA512 e8d4dbf182a47431ab9485a8f1072b327c2adb97e4489dcad08835d2759241539971192781cffe4cbb12ff68e70b040e07ad60fe274aa1d62320ad0d63278e64
diff --git a/dev-python/uvicorn/uvicorn-0.34.1.ebuild b/dev-python/uvicorn/uvicorn-0.34.1.ebuild
deleted file mode 100644
index 7de68801dc68..000000000000
--- a/dev-python/uvicorn/uvicorn-0.34.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2021-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
-	https://www.uvicorn.org/
-	https://github.com/encode/uvicorn/
-	https://pypi.org/project/uvicorn/
-"
-# as of 0.28.0, no tests in sdist
-SRC_URI="
-	https://github.com/encode/uvicorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.8[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/a2wsgi[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		>=dev-python/httptools-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.28[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		>=dev-python/websockets-10.4[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-			dev-python/watchfiles[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# too long path for unix socket
-		tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
-		# TODO
-		'tests/protocols/test_http.py::test_close_connection_with_multiple_requests[httptools]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[httptools-max=defaults sent=defaults+1]'
-		'tests/protocols/test_websocket.py::test_send_binary_data_to_server_bigger_than_default_on_websockets[h11-max=defaults sent=defaults+1]'
-	)
-	case ${EPYTHON} in
-		pypy3*)
-			# TODO
-			EPYTEST_DESELECT+=(
-				tests/middleware/test_logging.py::test_running_log_using_fd
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio -p pytest_mock -p rerunfailures --reruns=5
-}
-
-pkg_postinst() {
-	optfeature "auto reload on file changes" dev-python/watchfiles
-}
diff --git a/dev-python/uvicorn/uvicorn-0.34.2.ebuild b/dev-python/uvicorn/uvicorn-0.34.2.ebuild
index 186c7dbe4fef..7de68801dc68 100644
--- a/dev-python/uvicorn/uvicorn-0.34.2.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.34.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/xcffib/xcffib-1.8.0.ebuild b/dev-python/xcffib/xcffib-1.8.0.ebuild
index fecaa3c64bd5..055ccdc41e03 100644
--- a/dev-python/xcffib/xcffib-1.8.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.8.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 DEPEND="
 	x11-libs/libxcb