Adding metadata

193 files changed, 612 insertions, 2347 deletions

diff --git a/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
index 876b70365a8b..71d93799ad21 100644
--- a/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.10.7-r1.ebuild
@@ -16,7 +16,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"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/adblock/adblock-0.6.0.ebuild b/dev-python/adblock/adblock-0.6.0-r1.ebuild
index e14bf9f83ead..e14bf9f83ead 100644
--- a/dev-python/adblock/adblock-0.6.0.ebuild
+++ b/dev-python/adblock/adblock-0.6.0-r1.ebuild
diff --git a/dev-python/anyio/anyio-4.6.2_p1.ebuild b/dev-python/anyio/anyio-4.6.2_p1.ebuild
index 03237917ba8b..4bd00ffd2975 100644
--- a/dev-python/anyio/anyio-4.6.2_p1.ebuild
+++ b/dev-python/anyio/anyio-4.6.2_p1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f9877e17e0bd..f52d10ce2f1b 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST serverless-application-model-1.91.0.gh.tar.gz 5710886 BLAKE2B 29d5825610e8e3253cd9d5659a65659f39c3a423061eb0e6ac754fcf3a943aa87799653e26dd901ae94b71c7290f791f6a8b16d089fa43c9f0cd3f3bbf973a34 SHA512 04cb4f61673005928b2361a8c9d304c5d29719a32dd962da0c34d3685d8bc4c8282d7fb61f6d228e3de6a5a037405a8ecacdc020bc9ace229fcbdb22ad99902e
+DIST serverless-application-model-1.92.0.gh.tar.gz 5761362 BLAKE2B 57546b2996795a8a53ef678b790bdd7fe313c5d012ba40be22529e133d15687b095d95ad905db66ca663d885a0d28b9be4d660f6227fc2fede13baf3a5951035 SHA512 a5ac0e4489f75ca0554d9a0d0a7a4f2439fd14224a2bcd1bb6e21717684a4c5e5e204c7b3eb67f9264aceaa30d47474affba7357e4006a2250a870392e67411c
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.92.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.92.0.ebuild
new file mode 100644
index 000000000000..4419fad76380
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.92.0.ebuild
@@ -0,0 +1,62 @@
+# 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
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-3[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts= -o filterwarnings= \
+		-p xdist -n "$(makeopts_jobs)" --dist=worksteal
+}
diff --git a/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild b/dev-python/bcrypt/bcrypt-4.2.0-r3.ebuild
index a34864692558..a34864692558 100644
--- a/dev-python/bcrypt/bcrypt-4.2.0-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.2.0-r3.ebuild
diff --git a/dev-python/blake3/blake3-0.4.1.ebuild b/dev-python/blake3/blake3-0.4.1-r1.ebuild
index 9d6b34fcd0c6..71c77e0b4d8a 100644
--- a/dev-python/blake3/blake3-0.4.1.ebuild
+++ b/dev-python/blake3/blake3-0.4.1-r1.ebuild
@@ -108,8 +108,13 @@ QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/blake3/blake3.*.so"
 
 distutils_enable_tests pytest
 
+pkg_setup() {
+	distutils-r1_pkg_setup
+	use rust && cargo_pkg_setup
+}
+
 src_unpack() {
-	cargo_src_unpack
+	use rust && cargo_src_unpack
 }
 
 src_prepare() {
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 9fbe0b27f9db..80d51826f084 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,5 +1,3 @@
-DIST boto3-1.35.44.gh.tar.gz 875230 BLAKE2B 68c4fa6739a5d9cb720670a1bc14079ffac4b23101bd27367ec81675a34d717341c87257864a658c60d8a0c5fdea298f73db979b6aa64f65e9ea54479005d33b SHA512 6ff24f42088ae9f77b5e1ff033fab34c6a0c0f7fc46cf9cbe172b3151cf259e48c3804981afbc8de893dc2541105a04bc00d6becd3220c18243bda7ed206740b
 DIST boto3-1.35.49.gh.tar.gz 878577 BLAKE2B 8f9ddf29eaad2f91a9ba670b268ac987f7f813dea52427a559b245111042f84b8593158bf1f3dbec353b9fb92116be39e739326dbdd70366589ee507a994da4d SHA512 3a1aa9bb8c8aa384abdc2a139273364c49f608921ff9c4ce9e96b4b93d11bb145a45ac65df6245912ba3be6d4e8f0df86e407d74610837b149f81712529b3152
 DIST boto3-1.35.54.gh.tar.gz 882727 BLAKE2B 398e7743d30700856b15440c217d40e88aec4e58669009f68392e108373f2e57ff3c384be9bdc3873b102686df7f0e05f53d4518b149e982e0893473919db3cb SHA512 bfddb7c4b3816edc2b572bd6f412c0d085296df17b552930dfc9bb108c7100190da1f58f5f701d3ec3c36e6deb88c93e5af5bfc68963b76fc7c950d456815ec5
-DIST boto3-1.35.55.gh.tar.gz 883345 BLAKE2B 149ad97b6ac52dcc291aeb3300152c247bbbcaa2abb7f73819b11e93f8f55c6866bbd1212fdfd636e862ec48efc27a38787d705820e2dede70ed46568b73fe99 SHA512 3eaff2982947f5b946faf2dfd1d02eba66cf1e93b447baf0d82d72159578efa4c141a841c2eff33cfb6766917cac2c399ba9485c7988f108ab93087459764492
-DIST boto3-1.35.56.gh.tar.gz 884221 BLAKE2B 14b6cd1c01cf8ff87691668e7af2d49a7e956c980dd34212a0ba46daf564aae1497f99483da5dcd4d634e0da51d16f0c9f9491b8259ce6720051d2a3d8033e5c SHA512 852722ab8370e8a750fe43c3161b39ebbf399dcaad5967d8bd74f3d452f2be29808d79ef273332bc7288cb647c5559b3bc317e8ff78a2826496c704cdf52012d
+DIST boto3-1.35.57.gh.tar.gz 885077 BLAKE2B 4f3a29db5e76c706fbfd0afb3ec05d5518e69f3fd26d15e79024fb898d874818fa21031187d66078a4ebd107cce9461000e37506886f337049bd821e20933563 SHA512 19f951c04452203c070243bd8c944183221b51d9853efc19d33002af57c7d59c1967e8a7b606e56f772f35576ec6e1b52e2037138ba01a28f13685a49458c7d4
diff --git a/dev-python/boto3/boto3-1.35.44.ebuild b/dev-python/boto3/boto3-1.35.44.ebuild
deleted file mode 100644
index 3a10a36056b1..000000000000
--- a/dev-python/boto3/boto3-1.35.44.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.49.ebuild b/dev-python/boto3/boto3-1.35.49.ebuild
index d91ce27598cf..3a10a36056b1 100644
--- a/dev-python/boto3/boto3-1.35.49.ebuild
+++ b/dev-python/boto3/boto3-1.35.49.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.56.ebuild b/dev-python/boto3/boto3-1.35.56.ebuild
deleted file mode 100644
index d91ce27598cf..000000000000
--- a/dev-python/boto3/boto3-1.35.56.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/boto3/boto3-1.35.55.ebuild b/dev-python/boto3/boto3-1.35.57.ebuild
index d91ce27598cf..d91ce27598cf 100644
--- a/dev-python/boto3/boto3-1.35.55.ebuild
+++ b/dev-python/boto3/boto3-1.35.57.ebuild
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2d9419559fab..126f6edb234a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,5 +1,3 @@
-DIST botocore-1.35.44.gh.tar.gz 13472693 BLAKE2B a38fd45888ee1e77d7dec3fbd5aeb9f94cd825d1d54bd11a467ef9938753724958fc28eae4316d1802c729f02874113b028a929afb3de64400723c144d5d0eef SHA512 52f6c507efe175deef4e824c038f2db620f35f53f62a1372815b9c75a3638e371d89a8aa19f481f4ee29e58e5c30e5f9083fe14eb08048f80cd0f9aa1730841c
 DIST botocore-1.35.49.gh.tar.gz 13473579 BLAKE2B 0b1a0e8ec76ad0d4ec677532626c4f34383828415ae6a6dc318a8e7864f2756c5618e0086a02f29726844e585895492b0e80d5e944e67fa5c233122a35a75eab SHA512 abcbcd3e8c5c4704755f83290aa8c65ee703c5f75cecab45d58451e2960f341e73042b61c28fd42a671562b25795255392d13db60c6c9d2f944f04ede6d3e78d
 DIST botocore-1.35.54.gh.tar.gz 13569174 BLAKE2B 1f4cb326d27ef028e16b20838fe1f7bc32cc5c782694d4d47dc2d0cd1384a7fdfe584f6225f41004c8e4c9028c1ac2b2b157daa073adab515d99a2cf1d42b19f SHA512 cab2956d9b7597295d761f232b9981085bb4daec182514fb514b6aed7bdb82ddca41b7b85900987f624828ae389f4ac282b0950692d965ccb9b67d6ce3d40362
-DIST botocore-1.35.55.gh.tar.gz 13573450 BLAKE2B e1066fd6739932086d39ab889f020f50b32d06dd634fce7f3d357a5cbfdbba441f7a2a6863239a73fbd5a9e2e376b6a96af82ac9cbbf9ebfb8b894c85288ad8a SHA512 5744bc972ce3d6be738d2e5dff524607606759803124f335fc3b55c20158c2a34c3fbfc39fe47b8b539ace2c0e352bc8f1abc121c6d9c1ac7977f9a5de5a4b6b
-DIST botocore-1.35.56.gh.tar.gz 13597124 BLAKE2B d459df3e5b35cf58dc8d975483b6ff7b1000e33fe89af255055b5f28a8b09daa5f73019acf154f19d272a6a1cce7b8815d51cb1c118da14c78afd888cd930aec SHA512 a8125ae8bc5d5846063496b3472e22ac831117c909128bfe4a3a48f509b62266f63db2a435e322193d2036edc84d7bdcbfd7ae56709ed0455b913c012d4a4dfd
+DIST botocore-1.35.57.gh.tar.gz 13603794 BLAKE2B 23a4dc82e1d9667e75494c2fb651b883c7fbaf689679a1b40c3f277c33760fbaacd6843e6630876fe75597c6e6dc892726c609a97efcff0d46533460c379c43f SHA512 f20eccdcd0c027e3c1d6c631988c8913f3150b1b6da679fc18ea75824d0ef61b999ee9cad4f0d74edbb639cf52daf188fd7e256664e57fc89be09f33ed78d65e
diff --git a/dev-python/botocore/botocore-1.35.44.ebuild b/dev-python/botocore/botocore-1.35.44.ebuild
deleted file mode 100644
index c81d932a2d78..000000000000
--- a/dev-python/botocore/botocore-1.35.44.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.49.ebuild b/dev-python/botocore/botocore-1.35.49.ebuild
index 7816e9efeb52..c81d932a2d78 100644
--- a/dev-python/botocore/botocore-1.35.49.ebuild
+++ b/dev-python/botocore/botocore-1.35.49.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.56.ebuild b/dev-python/botocore/botocore-1.35.56.ebuild
deleted file mode 100644
index 7816e9efeb52..000000000000
--- a/dev-python/botocore/botocore-1.35.56.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-# unbundled packages
-RDEPEND+="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.55.ebuild b/dev-python/botocore/botocore-1.35.57.ebuild
index 7816e9efeb52..7816e9efeb52 100644
--- a/dev-python/botocore/botocore-1.35.55.ebuild
+++ b/dev-python/botocore/botocore-1.35.57.ebuild
diff --git a/dev-python/cftime/cftime-1.6.4_p1.ebuild b/dev-python/cftime/cftime-1.6.4_p1.ebuild
index 6dc00bf10e42..fd8738a521f9 100644
--- a/dev-python/cftime/cftime-1.6.4_p1.ebuild
+++ b/dev-python/cftime/cftime-1.6.4_p1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~s390 ~x86"
+KEYWORDS="~amd64 arm64 ~loong ~riscv ~s390 ~x86"
 
 DEPEND="
 	>=dev-python/numpy-1.26.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/coverage-7.6.4.ebuild b/dev-python/coverage/coverage-7.6.4.ebuild
index 5f3cb4e3c7fe..3d315c77e270 100644
--- a/dev-python/coverage/coverage-7.6.4.ebuild
+++ b/dev-python/coverage/coverage-7.6.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cramjam/cramjam-2.8.3.ebuild b/dev-python/cramjam/cramjam-2.8.3-r1.ebuild
index ce0bf20aef18..ce0bf20aef18 100644
--- a/dev-python/cramjam/cramjam-2.8.3.ebuild
+++ b/dev-python/cramjam/cramjam-2.8.3-r1.ebuild
diff --git a/dev-python/cramjam/cramjam-2.8.4.ebuild b/dev-python/cramjam/cramjam-2.8.4-r1.ebuild
index 5b86ec922c46..5b86ec922c46 100644
--- a/dev-python/cramjam/cramjam-2.8.4.ebuild
+++ b/dev-python/cramjam/cramjam-2.8.4-r1.ebuild
diff --git a/dev-python/cramjam/cramjam-2.9.0.ebuild b/dev-python/cramjam/cramjam-2.9.0-r1.ebuild
index cd3d9eb7cb86..cd3d9eb7cb86 100644
--- a/dev-python/cramjam/cramjam-2.9.0.ebuild
+++ b/dev-python/cramjam/cramjam-2.9.0-r1.ebuild
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 03e837689e73..e6abc2397347 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,4 +1,3 @@
-DIST croniter-3.0.3.tar.gz 53088 BLAKE2B 258eff623e0017dcc1fd1d1b3a0ac8e1e67c387afba15fbb04a077dad9e5c72d4d2d68541e06ac85897857ce2bdb36fe0ddb59812368b9e89e58f6322fe61034 SHA512 4fe703544fd899c80766e6a867d96e655b5269b8798562ad4396b9819072acfd22c69fe72d52e911807acfbabe65b131ca4b6f1311b62e5b99f7d1cd1de39068
 DIST croniter-3.0.4.tar.gz 54500 BLAKE2B caba8dd5efda4d56787130d43416ce79d2183e481ae5b4524542a353d40b765112c54961d1aeb0f9c99e0f3d319c31812a866dbaa5c2ee597fbc139eb079963a SHA512 e46e0ac27ed2dd30c5239565b7d9a926b2451febf047f96573699b50baf83157bf30e22f5f7f9be4fc66bb1a6b2eb0b5245a810542dbe808294eefba31af1d8a
 DIST croniter-4.0.0.tar.gz 55312 BLAKE2B 7733eb55b53e0921a37b4084bf815f3f2032041154083681a6d69a7be23ad48fc84e581af948acb8d7a1505f2a25240cd0cf09eaea14418da8f1a14466604575 SHA512 086cb137589514daf7e996c824c7e2d2e46615ae3150ea9060a21cb6577fa5c2a0132c7d169d38f500642325005be19ea2e9604a76906b0d7d62757e0f88ded9
 DIST croniter-5.0.1.tar.gz 57084 BLAKE2B 5417d548c103dca87e9dff2ad521e82d5cb468332f3dc11bdff74f331ea23f49753cc9135b22ab1c269e8aa96a05dc04e9b92269b5bbb7334688143daad4664b SHA512 410a3b0ada979259bcd9b82d1b83f3384714645bae642ffaf9e118d65417b716b0efaa3a8c592cc3cc8a9a2694d6f70aa8d36af83aab0c8461493ce96f457bbb
diff --git a/dev-python/croniter/croniter-3.0.3.ebuild b/dev-python/croniter/croniter-3.0.3.ebuild
deleted file mode 100644
index a41378f7360e..000000000000
--- a/dev-python/croniter/croniter-3.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-3.0.4.ebuild b/dev-python/croniter/croniter-3.0.4.ebuild
index f8bda937f684..a41378f7360e 100644
--- a/dev-python/croniter/croniter-3.0.4.ebuild
+++ b/dev-python/croniter/croniter-3.0.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index 5dc24c788c2e..dd9eee540fd2 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1,2 +1 @@
-DIST diff-match-patch-20230430.tar.gz 43324 BLAKE2B c13beb380d68cf96af41c124eb23f890c71664624de20780ea586f71b4c52a55ee06ac3427c61c233ebead309fcca02cb75f3447f17b7306c2728ebc5b06f6f8 SHA512 a62d15327de659999e3381215249fb088a9e40368008b91201de3db3d02f22892bbf6d2ac40dc4ea4986d24470dd396eaf69583fabbe9078a5cb1f97bae94000
 DIST diff_match_patch-20241021.tar.gz 39962 BLAKE2B 798eb10166ec05226a017ca3718cf721dc48ee6bf16915779245bc7b29a000c6605f332834a7da45ffd6de9344853e1e5d3a95054c3aa73c7c995a9ea7ffa9be SHA512 23bdf81a159358f668e4adb1771780bef6cf14fc1bc90c76700d3339e35a2c00b61a72ef7cdabd0abc079c3aa8606ea91cef4d936c47b95b4fd94483c927daf5
diff --git a/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild b/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
deleted file mode 100644
index 48467d192f41..000000000000
--- a/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Diff, match and patch algorithms for plain text"
-HOMEPAGE="
-	https://github.com/diff-match-patch-python/diff-match-patch/
-	https://pypi.org/project/diff-match-patch/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/diff-match-patch/diff-match-patch-20241021.ebuild b/dev-python/diff-match-patch/diff-match-patch-20241021.ebuild
index 94d02d3fe117..7f5866d6e186 100644
--- a/dev-python/diff-match-patch/diff-match-patch-20241021.ebuild
+++ b/dev-python/diff-match-patch/diff-match-patch-20241021.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 1e6f4d862740..e6301d1ea547 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,2 +1 @@
-DIST dj_database_url-2.2.0.tar.gz 10874 BLAKE2B 71bf484ba339edf9dc304085d433ae29b1efae6fe856152173989411cfffdb52297f7613b6f9337972cc8563494be4a94919055a0b7a84a0b066d64d5fe60d59 SHA512 17c26dc07e309ba448976fafdbd3bdc74cc2f5f7022fb1f041494f2555b8a77b9fc602c1f11602da5b8574487ca997e7b71d7859dd08875b2295ae08262c39bc
 DIST dj_database_url-2.3.0.tar.gz 10980 BLAKE2B fba212a3795fa735646d35b4d228d5581ef2310b9bb496cbc0305774e96074d5e7734f9970f1808ce7a7d39836937b4b33a509190c4194c2fbb494b598b9b57a SHA512 ad1c05fe7ec1340044c8f47702b5d6962127621f33dfffd9236799bdf6119c6fbe34ec0521777704e3f465a3587b04aaebc9f68170a583007ac21d6dfba06a12
diff --git a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
deleted file mode 100644
index fdd5d1657edb..000000000000
--- a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://github.com/jazzband/dj-database-url/
-	https://pypi.org/project/dj-database-url/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s tests
-}
diff --git a/dev-python/dj-database-url/dj-database-url-2.3.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.3.0.ebuild
index 19e0570dd503..e1cdae73c173 100644
--- a/dev-python/dj-database-url/dj-database-url-2.3.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-2.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/django-4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 70898df5d6cb..2910d7f1f7b8 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -4,5 +4,7 @@ DIST Django-5.0.9.checksum.txt 2574 BLAKE2B e3bef5a7fdfa8a383cc1d185dff3e8818dee
 DIST Django-5.0.9.tar.gz 10646283 BLAKE2B 898e7af1cde9c48589019c095a554f07ee3b92b2d26ff9d960a5cec05347664de608d8c12831f187fc8172e7f5dce947164419e937b26754691da4fec602ee2e SHA512 7d27bfdc07a79abe2a82a5579f27241384e507649006951a8e7d59d8ea627f6b240a13671ed4e61be58402a07d7b3359ca6df1ad69cc00876135810a543b249a
 DIST Django-5.1.2.checksum.txt 2572 BLAKE2B 7c74394e81e443b97ce3029b11f5a84d9b4b555e05d71046e7760650c62aa40eb72fd779b11be05d8683e07925aff6aec736bcd38c5e5380b4dd05edd220ebbd SHA512 2f5d7e5e35f964cf78f70dbaee42a24511f04848f082406f9404b75bbaaf6e460c3c1de44da3a6e48c602d3273a898361639b26c7f10328eade491cf2060d4a4
 DIST Django-5.1.2.tar.gz 10711674 BLAKE2B f2020899c59a65aac74800db0f96bf93a10d01a404880857ee9bae95c35e9b0828c65ed888662503e2f9d85c1a54e3f1d5cb4827e8c2ce238845f70fb6571204 SHA512 7c7199fe5884f184ce6460df2186c6638110d77b06a37a5fc5cdfe359561b67d3ee8bb80d405c67fbbe16f10c50bfd0270a8e382d18c4366cb0da46d3ef7b4d2
+DIST Django-5.1.3.checksum.txt 2553 BLAKE2B dd8f2e988f51210594b0d16d55c9ec7dbe9db7327a56894d6f8f0c0ac7ead103ba78e34d9279af7a2bd1f662e5441aad9b74c35726b05211516798eda658ed94 SHA512 6f30aa4646455c3b1da4f8536b7b0e906f0ca3dd6cc0403f3f5d47268df0c3b4a922be12ebbe8b0025e46aa9e5d598d261582a7e6fedf4b7f2990a02a4895fb2
+DIST Django-5.1.3.tar.gz 10698518 BLAKE2B 409702f8e80d3a60dafce5c92c24a723c7ca3b0121d32f8a4a1e2a22fed7fe8e66aeef5c5c5eab9773020c98f601723f940bbd782245de4d1489f2421dc203e3 SHA512 43c7c196c8d34c2354d2c0c3a1e1d4a816841dcdf60ec6277567acce23aae125c502f1afa354838fc4722fd3e665587878e2c57caa056ad5a6130bb5643991be
 DIST django-4.2.8-pypy3.patch.xz 5900 BLAKE2B b7dc5c5fc162817a218ee6d025ed8a65559b80e4506e49ac393428c26e2621f9e7c5010b36f2412dea8194a9f1086ab21f97286eabd696c6a786285eb07393cf SHA512 f953b5adbd1364f1d84dde55087ccb493256b1327701275fd2fe99f3cd41751d18e002b6e21afc96892e1671428a6b8f3c2e4b88252c3c278f1a79e286bb73e3
 DIST django-5.0-pypy3.patch.xz 6124 BLAKE2B 7eba7cc70b30743cf4e186a2c5b0f27c13f49114a7a80bcaa2b25fdd7a959583c115a302c9bc6da97c32f6401cf8f3616818ba759190d317c5b033a0f0088766 SHA512 c550e2b2c1243d13cd1f4908f4b6df606355d1491e3bf72042e4b4777a4474306ff0f67b1c2eb4ab4d137cc85bde52dcdbd54bec245d2ba2e092545be8a2993b
diff --git a/dev-python/django/django-5.1.3.ebuild b/dev-python/django/django-5.1.3.ebuild
new file mode 100644
index 000000000000..60766d7371f6
--- /dev/null
+++ b/dev-python/django/django-5.1.3.ebuild
@@ -0,0 +1,99 @@
+# 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} pypy3 )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 multiprocessing optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${PYTHON_USEDEP}]
+	sys-libs/timezone-data
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2.11.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/selenium-4.8.0[${PYTHON_USEDEP}]
+		>=dev-python/tblib-1.5.0[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20240807 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite \
+		-v2 --parallel="${EPYTEST_JOBS:-$(makeopts_jobs)}" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:0
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+}
diff --git a/dev-python/dulwich/dulwich-0.22.4.ebuild b/dev-python/dulwich/dulwich-0.22.4-r1.ebuild
index be352a0472dc..be352a0472dc 100644
--- a/dev-python/dulwich/dulwich-0.22.4.ebuild
+++ b/dev-python/dulwich/dulwich-0.22.4-r1.ebuild
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 7fe03ded49b4..79bab95ea4fd 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -3,3 +3,4 @@ DIST pip-24.1-py3-none-any.whl 1823006 BLAKE2B ca5282b1100243cc4e391ce30d5ae7d49
 DIST pip-24.1.1-py3-none-any.whl 1824282 BLAKE2B dc8b4938002bc8ededf5f3fb5f47492b529cb846f145308d5392c04778417f7e85527064e791c4dec4bfe6fc407bcc4d7ad26ff84e0f4c436dce5db8d9ec1f25 SHA512 591c0862ca7469a00a4a0220ca9acbd4834394abb0abcd44bd071a1b392b46029d618c2219e327cd43bacdd5d62f0f47d88454d60d4028f0ba7cd02ce3e648bf
 DIST pip-24.1.2-py3-none-any.whl 1824406 BLAKE2B b3e951f444bc93cf64a35acbef5363f7e44607f567f73eff886f5a14bd97fe5b18aa5a8de01b899601847bccee24318843b41c35cd484e758ffb4c11460b458f SHA512 bc8ed36bc9e618b7e299d412d07472b46968ba6485dd1d7eee4e8583996aa29cb268ff5d3114a6e5efeae9f6407c9f9066a0e4f5c2a0be76e6cd234b85cc2bec
 DIST pip-24.2-py3-none-any.whl 1815170 BLAKE2B 8d93bdfb2f3ae4fafd5433df1f9871ca549029457dd4395cf7c53fff93d235768f042cb2f7b6d5b5af068df1867add1a0aca83d329a6d66ecd64fa51e01f0939 SHA512 5c8c6531a477aa4deb9e880f079c6971318b3b0eae007a45c7d73aff1da050824bb6c44e8b71487c9b937732bca93c29b07ed2272fff118cc11fd27bad3022f5
+DIST pip-24.3.1-py3-none-any.whl 1822182 BLAKE2B 8ec4f45dcc84094426db053dea43d86d14d24f6f23ca8b1b094a989f08b5653a2290df24e907c3ed283a668fa6da305620b4f74a3054d67f6e048327c5f06c66 SHA512 21cb4a844b7c9216a4878639a876acdce17ffda9e7228e85e344169d548a3f4316e5ec5183a950848c7391e2a650152e4a1e1f0f020de57f895c458de5ee7b82
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild
new file mode 100644
index 000000000000..917cc77faea1
--- /dev/null
+++ b/dev-python/ensurepip-pip/ensurepip-pip-24.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared pip wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/pip/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+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"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/ensurepip-wheel/Manifest b/dev-python/ensurepip-wheel/Manifest
index dedd653079c4..fffb345feafe 100644
--- a/dev-python/ensurepip-wheel/Manifest
+++ b/dev-python/ensurepip-wheel/Manifest
@@ -1 +1,2 @@
 DIST wheel-0.44.0-py3-none-any.whl 67059 BLAKE2B e02afce5ad38a1cccc19b67acca74d3c43e0b45f52f334d28102d71ed8ffff5f0749f0ffa49c26d8eb89ce63f0a240c33117593b7807c6797fffd1e6daf6fc87 SHA512 98209d3ff1a04fd50ae256b94a648deb9ff29114e90a632c0fc34304c9f8a904b000f66019c684e228f56900e51105fe8678dc9c1bbcdd9ec69dd28d8e98058a
+DIST wheel-0.45.0-py3-none-any.whl 72497 BLAKE2B ab83fa3a1dd36fb44791dd2277252c9ad71d69c3bb0913e29c9f92f3b3335074ab517c307d6f5030c5873f241f076f66035c1330d655ceb677847ccbe55991f4 SHA512 c24d09819cf081025f1abd896bf53efa86f459e37668ce2537f22d27b071b4bca931c532ef3c0526bf5e2804b403b7475c50c05b50cdb829ea579847f8dd9a38
diff --git a/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild b/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild
new file mode 100644
index 000000000000..03e848400d01
--- /dev/null
+++ b/dev-python/ensurepip-wheel/ensurepip-wheel-0.45.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared wheel wheel for use in pip tests"
+HOMEPAGE="https://pypi.org/project/wheel/"
+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"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/et-xmlfile/Manifest b/dev-python/et-xmlfile/Manifest
index 88519bafd39b..34855bd4dbe2 100644
--- a/dev-python/et-xmlfile/Manifest
+++ b/dev-python/et-xmlfile/Manifest
@@ -1,2 +1 @@
-DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
 DIST et_xmlfile-2.0.0.git.tar.gz 99140 BLAKE2B 810cb9119558bd139e19e5ad9df90db0b1445f47dc410040d319d5a761a357eb07776e9a4d2515d7ddd10c2b845ea834769d7bddc7cebff54e1085261203a936 SHA512 b23c0d110b85aba2881e4bb2702efc7a7d411aa1528e1096fd11c09b54e1afed01bf8ae5231874eeb64011ae0ebd6342dd89add45237bfc98ff19f2a895eb013
diff --git a/dev-python/et-xmlfile/et-xmlfile-1.1.0-r1.ebuild b/dev-python/et-xmlfile/et-xmlfile-1.1.0-r1.ebuild
deleted file mode 100644
index 433c0c9ab52b..000000000000
--- a/dev-python/et-xmlfile/et-xmlfile-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_PV=${PV%.0}
-MY_P=et_xmlfile-${MY_PV}
-
-DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
-HOMEPAGE="
-	https://pypi.org/project/et-xmlfile/
-	https://foss.heptapod.net/openpyxl/et_xmlfile/
-"
-SRC_URI="
-	https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/${MY_PV}/${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
diff --git a/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild b/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
index 368650485fe9..f4ce4a590005 100644
--- a/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
+++ b/dev-python/et-xmlfile/et-xmlfile-2.0.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/frozenlist/frozenlist-1.5.0.ebuild b/dev-python/frozenlist/frozenlist-1.5.0.ebuild
index 3908f0d381f0..df398e344650 100644
--- a/dev-python/frozenlist/frozenlist-1.5.0.ebuild
+++ b/dev-python/frozenlist/frozenlist-1.5.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="+native-extensions"
 
 BDEPEND="
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index f3d2d3cef2d7..b37e547688d6 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,2 +1 @@
 DIST filesystem_spec-2024.10.0.gh.tar.gz 415286 BLAKE2B 59e8a1457c528c350ef49da546ee8e15dc27031dde3c5b2ae4c97a7ec0a392010c8d1558c4a6569be07aebc272add9629c6e8e7fc7e392259bb5f72b47b65a3c SHA512 46542e494044e40110c3da879ec620daca15e3a18e3e0a318f0c98f18a08aa7c319fffdf396527e920f6bc5f17fbec5e4c2030ed6a9b8853720e513165dbc56d
-DIST filesystem_spec-2024.9.0.gh.tar.gz 413991 BLAKE2B b4dbb17e39481d3d5ee900618b3bea036faec0ce84d95cf2e581feb59d0eb5cb1ecc73730b87bbeb175110db34d52db062bf8d94e82f27a28a6f1693e10c49e7 SHA512 2600f7b020019634ec3f4ffd2a66f458c04423f10c00afbfd99dabad7fca809af28792a5b8a6625c57548f8dc172ab0d9498cbfcd570cd1d04a905c079fe4fb9
diff --git a/dev-python/fsspec/files/fsspec-2024.9.0-backports.patch b/dev-python/fsspec/files/fsspec-2024.9.0-backports.patch
deleted file mode 100644
index a8f9f965c083..000000000000
--- a/dev-python/fsspec/files/fsspec-2024.9.0-backports.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From edf495736a39c0031d5514e8350363dfa229f3d4 Mon Sep 17 00:00:00 2001
-From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
-Date: Sun, 22 Sep 2024 23:48:36 -0400
-Subject: [PATCH] Fix handling of Paths in zip implementation
-
-Fixes #1688
----
- fsspec/implementations/zip.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fsspec/implementations/zip.py b/fsspec/implementations/zip.py
-index aa6a57842..6db3ae278 100644
---- a/fsspec/implementations/zip.py
-+++ b/fsspec/implementations/zip.py
-@@ -1,3 +1,4 @@
-+import os
- import zipfile
- 
- import fsspec
-@@ -48,7 +49,7 @@ def __init__(
-         if mode not in set("rwa"):
-             raise ValueError(f"mode '{mode}' no understood")
-         self.mode = mode
--        if isinstance(fo, str):
-+        if isinstance(fo, (str, os.PathLike)):
-             if mode == "a":
-                 m = "r+b"
-             else:
-From dc4f5a97d90238b862fa7974a9b8e93602f44540 Mon Sep 17 00:00:00 2001
-From: Martin Durant <martindurant@users.noreply.github.com>
-Date: Mon, 23 Sep 2024 09:42:21 -0400
-Subject: [PATCH] Don't require absolute offsets in zip tests (#1691)
-
----
- fsspec/implementations/tests/test_zip.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/fsspec/implementations/tests/test_zip.py b/fsspec/implementations/tests/test_zip.py
-index ecd082f3f..8bf8155d9 100644
---- a/fsspec/implementations/tests/test_zip.py
-+++ b/fsspec/implementations/tests/test_zip.py
-@@ -169,12 +169,16 @@ def _assert_all_except_context_dependent_variables(result, expected_result):
-         result_without_date_time.pop("_raw_time")
-         result_without_date_time.pop("external_attr")
-         result_without_date_time.pop("create_system")
-+        result_without_date_time.pop("_end_offset", None)
-+        result_without_date_time.pop("header_offset", None)
- 
-         expected_result_without_date_time = expected_result[path].copy()
-         expected_result_without_date_time.pop("date_time")
-         expected_result_without_date_time.pop("_raw_time")
-         expected_result_without_date_time.pop("external_attr")
-         expected_result_without_date_time.pop("create_system")
-+        expected_result_without_date_time.pop("_end_offset", None)
-+        expected_result_without_date_time.pop("header_offset", None)
-         assert result_without_date_time == expected_result_without_date_time
- 
- 
-From 0021859ff78bbf62e86c330e2dad00c5dd205108 Mon Sep 17 00:00:00 2001
-From: Martin Durant <martin.durant@alumni.utoronto.ca>
-Date: Wed, 2 Oct 2024 11:37:14 -0400
-Subject: [PATCH] Limit fields checked in ZIP tests
-
----
- fsspec/asyn.py                           |  4 +++
- fsspec/implementations/tests/test_zip.py | 34 +++++++++++++-----------
- 2 files changed, 23 insertions(+), 15 deletions(-)
-
-diff --git a/fsspec/asyn.py b/fsspec/asyn.py
-index f203fa0a4..de41839ea 100644
---- a/fsspec/asyn.py
-+++ b/fsspec/asyn.py
-@@ -344,6 +344,10 @@ async def _rm(self, path, recursive=False, batch_size=None, **kwargs):
-     async def _cp_file(self, path1, path2, **kwargs):
-         raise NotImplementedError
- 
-+    async def _mv_file(self, path1, path2):
-+        await self._cp_file(path1, path2)
-+        await self._rm_file(path1)
-+
-     async def _copy(
-         self,
-         path1,
-diff --git a/fsspec/implementations/tests/test_zip.py b/fsspec/implementations/tests/test_zip.py
-index 8bf8155d9..14d00086e 100644
---- a/fsspec/implementations/tests/test_zip.py
-+++ b/fsspec/implementations/tests/test_zip.py
-@@ -164,21 +164,25 @@ def zip_file_fixture(tmp_path):
- def _assert_all_except_context_dependent_variables(result, expected_result):
-     for path in expected_result.keys():
-         assert result[path]
--        result_without_date_time = result[path].copy()
--        result_without_date_time.pop("date_time")
--        result_without_date_time.pop("_raw_time")
--        result_without_date_time.pop("external_attr")
--        result_without_date_time.pop("create_system")
--        result_without_date_time.pop("_end_offset", None)
--        result_without_date_time.pop("header_offset", None)
--
--        expected_result_without_date_time = expected_result[path].copy()
--        expected_result_without_date_time.pop("date_time")
--        expected_result_without_date_time.pop("_raw_time")
--        expected_result_without_date_time.pop("external_attr")
--        expected_result_without_date_time.pop("create_system")
--        expected_result_without_date_time.pop("_end_offset", None)
--        expected_result_without_date_time.pop("header_offset", None)
-+        fields = [
-+            "orig_filename",
-+            "filename",
-+            "compress_type",
-+            "comment",
-+            "extra",
-+            "CRC",
-+            "compress_size",
-+            "file_size",
-+            "name",
-+            "size",
-+            "type",
-+        ]
-+
-+        result_without_date_time = {k: result[path][k] for k in fields}
-+
-+        expected_result_without_date_time = {
-+            k: expected_result[path][k] for k in fields
-+        }
-         assert result_without_date_time == expected_result_without_date_time
- 
- 
diff --git a/dev-python/fsspec/fsspec-2024.10.0.ebuild b/dev-python/fsspec/fsspec-2024.10.0.ebuild
index abf68b2617bf..39df854949c1 100644
--- a/dev-python/fsspec/fsspec-2024.10.0.ebuild
+++ b/dev-python/fsspec/fsspec-2024.10.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/fsspec/fsspec-2024.9.0.ebuild b/dev-python/fsspec/fsspec-2024.9.0.ebuild
deleted file mode 100644
index 396d185111cc..000000000000
--- a/dev-python/fsspec/fsspec-2024.9.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2020-2024 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=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-# upstream removed tests in 2024.6.0
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-# Note: this package is not xdist-friendly
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
-	# https://github.com/fsspec/filesystem_spec/pull/1689
-	# https://github.com/fsspec/filesystem_spec/pull/1691
-	# https://github.com/fsspec/filesystem_spec/pull/1700
-	"${FILESDIR}/${P}-backports.patch"
-)
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_mock -o tmp_path_retention_policy=all
-}
diff --git a/dev-python/google-api-core/google-api-core-2.22.0.ebuild b/dev-python/google-api-core/google-api-core-2.22.0.ebuild
index b50f69f9e652..5989aa80ded7 100644
--- a/dev-python/google-api-core/google-api-core-2.22.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-2.22.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 IUSE="grpc"
 
 RDEPEND="
diff --git a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
index b955cbe08e19..a2c909140715 100644
--- a/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
+++ b/dev-python/grpcio-status/grpcio-status-1.67.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/src/python/grpcio_status
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 1905e0d774f9..5349cc452829 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-8.28.0.tar.gz 5495762 BLAKE2B cd80970486b5c8128fc5f20382cd087ecbe6a1f4566db52030e9825fbd24acbef8b1857dc74592f5fe1f278aabf0b34913e7be53d8851bf6f9cefccc9360662e SHA512 5634b9faf55eec9cf2775587e994b4298ae9ddd6420fbdcc6a9c32c0f9bbe39f5137e6b39a2f5a5c40efa1deba668d81fe39867151480eb4b88f3850d8670719
 DIST ipython-8.29.0.tar.gz 5497513 BLAKE2B 49e68bfae3a1f29e9def5f1140fa0abcad163e75ebb597dd2aff4fb97bcc1c692a82b194378e071fa4f8d31d5960bc6a68cdc973ab8974752f5820c997b9fd12 SHA512 684c6f541c407ace48f6f889ad2fe776e3e32092c2af1d5863a07708c84469695165ae2765c98341d5098a362d47ee7f62e9ebd014494321b1928e44e64064f3
diff --git a/dev-python/ipython/ipython-8.28.0.ebuild b/dev-python/ipython/ipython-8.28.0.ebuild
deleted file mode 100644
index 265742e39f2a..000000000000
--- a/dev-python/ipython/ipython-8.28.0.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE='readline(+),sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-IUSE="examples notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.41[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/stack-data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-	' 3.10)
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-3.9[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pickleshare[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	$(python_gen_cond_dep '
-		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	' 'python*')
-	$(python_gen_cond_dep '
-		notebook? (
-			dev-python/notebook[${PYTHON_USEDEP}]
-			dev-python/ipywidgets[${PYTHON_USEDEP}]
-			dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-		)
-	' 3.{10..12})
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/ipython/ipython/issues/14244
-				IPython/lib/tests/test_display.py::TestAudioDataWithoutNumpy
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring mismatch?
-				IPython/core/tests/test_debugger.py::IPython.core.tests.test_debugger.test_ipdb_magics
-			)
-			;;
-	esac
-
-	# nonfatal implied by virtx
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest -p asyncio --asyncio-mode=auto ||
-		die "Tests failed on ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line-profiler
-	optfeature "%matplotlib magic command" dev-python/matplotlib-inline
-
-	if use nbconvert; then
-		if ! has_version virtual/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.29.0.ebuild b/dev-python/ipython/ipython-8.29.0.ebuild
index 3141060317f2..265742e39f2a 100644
--- a/dev-python/ipython/ipython-8.29.0.ebuild
+++ b/dev-python/ipython/ipython-8.29.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="examples notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jellyfish/jellyfish-1.1.0.ebuild b/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild
index 9caf2a22007c..f40f9af5ea86 100644
--- a/dev-python/jellyfish/jellyfish-1.1.0.ebuild
+++ b/dev-python/jellyfish/jellyfish-1.1.0-r1.ebuild
@@ -74,6 +74,11 @@ distutils_enable_tests pytest
 
 export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
 
+pkg_setup() {
+	distutils-r1_pkg_setup
+	cargo_src_prepare
+}
+
 python_test_all() {
 	cargo_src_test
 }
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index 37a64204a00a..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
+
+--- a/setup.py
++++ b/setup.py
+@@ -18,7 +18,7 @@ setup(
+     author_email='michal.danilak@gmail.com',
+     url='https://github.com/Mimino666/langdetect',
+     keywords='language detection library',
+-    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
++    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
+     include_package_data=True,
+     install_requires=['six'],
+     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 56733bbffc48..eb2586280d80 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,4 +19,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
+
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..c0f74ac187e2 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/libcst/libcst-1.5.0.ebuild b/dev-python/libcst/libcst-1.5.0-r1.ebuild
index 650dd6cef899..c70cba373eaa 100644
--- a/dev-python/libcst/libcst-1.5.0.ebuild
+++ b/dev-python/libcst/libcst-1.5.0-r1.ebuild
@@ -160,6 +160,11 @@ distutils_enable_tests pytest
 
 QA_FLAGS_IGNORED="usr/lib/py.*/site-packages/libcst/native.*"
 
+pkg_setup() {
+	distutils_r1_pkg_setup
+	rust_pkg_setup
+}
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 7fd08fe65690..56bd4072ea62 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,2 +1 @@
-DIST license-expression-30.3.1.gh.tar.gz 170363 BLAKE2B a40882d006c92f6327b710529bfa8225d8565d17aeb977ba7b05970f620dd7f801c855c4198928be92109ef7727d92578b18add0afc44a08625f9a989693be5e SHA512 c5093cfd5dac3ba202610d9794368c5c93380927d7bc8bf57c93bd14bb91b62d1dcff56157a8994a94ca2d66e7a2cf3956cb931a7fa86cb46a04844db3ed7c65
 DIST license-expression-30.4.0.gh.tar.gz 172061 BLAKE2B aaa96d1d39feb34bbce92945a61369717d31652794f667406010397f9194f48075406c7bcea1681771ab25c6fb2bd01da9228480a40092925d748f662101538f SHA512 8ea6d9c3be9237a405fef010512ca5bbf7cab4088ae6ac9bc3d4152e92dbfe4fdc5c8c82f9df994524d4622f6be7d58cfeeddfb4ca4c63c527fa94bb5a0a8074
diff --git a/dev-python/license-expression/license-expression-30.3.1.ebuild b/dev-python/license-expression/license-expression-30.3.1.ebuild
deleted file mode 100644
index f56c99a984c5..000000000000
--- a/dev-python/license-expression/license-expression-30.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse, compare, simplify and normalize license expressions"
-HOMEPAGE="
-	https://pypi.org/project/license-expression/
-	https://github.com/aboutcode-org/license-expression/
-"
-SRC_URI="
-	https://github.com/aboutcode-org/license-expression/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/license-expression/license-expression-30.4.0.ebuild b/dev-python/license-expression/license-expression-30.4.0.ebuild
index 69d83439155d..f56c99a984c5 100644
--- a/dev-python/license-expression/license-expression-30.4.0.ebuild
+++ b/dev-python/license-expression/license-expression-30.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index f79525896049..c0388276e6ba 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1 @@
-DIST Mako-1.3.5.tar.gz 392738 BLAKE2B 566d4126a1c2ece5b2b3f2bec8470d97cc44e512987103f7027d6433418e50bff1cfad7ba510b88f38537c92d3a69d9a85e5b28cd759dbaa29ec19702461e359 SHA512 9a2f96bcb650f40cc2a9daa05904e54efca1fa30022ab641c850f6e32b84a38368d4c5d328f94ac4495ed97778d6ab0b661bc93a14740ed7e5d518f03bc9a59f
 DIST mako-1.3.6.tar.gz 390206 BLAKE2B 9ead8381e738033d06950a537ecd04b8f83909027430f5d246a0dac13f3e7ad874353d3945d2d1f5ff188d5379db051a1092c68b84e0f6f4d93a7fc8ed715b4d SHA512 ad7a05b7cb4a330495ba5842d578565356d19912fee20e2d894a6e5a7812197944943d947eb15a539ef4a11d2bafde29fc7b007767228bd8e40f154d53631073
diff --git a/dev-python/mako/mako-1.3.5.ebuild b/dev-python/mako/mako-1.3.5.ebuild
deleted file mode 100644
index a326ab2a40b6..000000000000
--- a/dev-python/mako/mako-1.3.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python templating language"
-HOMEPAGE="
-	https://www.makotemplates.org/
-	https://github.com/sqlalchemy/mako/
-	https://pypi.org/project/Mako/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/Babel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-		EPYTEST_DESELECT+=(
-			test/test_exceptions.py::ExceptionsTest::test_alternating_file_names
-		)
-		;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.3.6.ebuild b/dev-python/mako/mako-1.3.6.ebuild
index 960fe3c49387..236114304b43 100644
--- a/dev-python/mako/mako-1.3.6.ebuild
+++ b/dev-python/mako/mako-1.3.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/mando/mando-0.8.2.ebuild b/dev-python/mando/mando-0.8.2.ebuild
index 81469ed80d18..fd1f7910487c 100644
--- a/dev-python/mando/mando-0.8.2.ebuild
+++ b/dev-python/mando/mando-0.8.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/meson-python/meson-python-0.17.1.ebuild b/dev-python/meson-python/meson-python-0.17.1.ebuild
index 491d1f1ba944..d6d41ad5bcbe 100644
--- a/dev-python/meson-python/meson-python-0.17.1.ebuild
+++ b/dev-python/meson-python/meson-python-0.17.1.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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild b/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20-r1.ebuild
index ce3524b2bf30..ce3524b2bf30 100644
--- a/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20.ebuild
+++ b/dev-python/mitmproxy_wireguard/mitmproxy_wireguard-0.1.20-r1.ebuild
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 9e6029e82c4b..715f0932dd4b 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,2 +1 @@
-DIST mkdocs-git-revision-date-localized-plugin-1.2.9.gh.tar.gz 378207 BLAKE2B a6f57eceeb2ff2c0e489848bb5c85717472dc39a5b49c464c497ae8ff78b1f0e1830b3a1fa5043aa0f2653460d6f783e9c92cf063552bc184c6c38fb47aa1fe4 SHA512 b3a88accd335ba7b4f8e85c59d5e51ad26e895ecbd8f52948da8d54bfc972e6383457c10dfbda8ef4c3adca323dd6a85d6eec483b2d2ef8e612bebf5bb77f36f
 DIST mkdocs-git-revision-date-localized-plugin-1.3.0.gh.tar.gz 378511 BLAKE2B e922d0ce5dd37f92c11a37d7c02a59fc776a1a4245823a2275c600c6348cc7f97a2a8b43919a5cdbe03e8b23623f0c7d22cf92eb728d6f11d7472db5b78e98a1 SHA512 6e6c085ae861382a932817264c00de55f94b8b09349c18206c1644487a7476d4494f0b451b31510de4ba3a5d4934514923521c8c4c5aca84a8183f5cd574177d
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.9.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.9.ebuild
deleted file mode 100644
index 6cacb1ef2b76..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.9.ebuild
+++ /dev/null
@@ -1,64 +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} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/regex
-	dev-python/mkdocs-static-i18n
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-	dev-python/mkdocs-git-revision-date-localized-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="
-	https://github.com/timvink/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-static-i18n[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.3.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.3.0.ebuild
index 27111ebf4201..6cacb1ef2b76 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.3.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.3.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 6a749f0cfa03..62f86ce5f633 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,4 +1,3 @@
-DIST mkdocs-material-9.5.41.gh.tar.gz 14762837 BLAKE2B 6519d6f426ad4f53e83255c5a41cd06d4c4892c40457a1bda878f25134bc2942baaa38c90dbbde26a301b4958b149bc0050c3a0a434811f9b7462a6e315555c0 SHA512 4588b4b9ff0debbbb0ed3bc27504c43f7a60a7a0e0690766285dddf50714de2ae048cbdaf44f1bae3607e4ba4aff00f779926cd48e0de59b02a08f3b13291e4f
 DIST mkdocs-material-9.5.42.gh.tar.gz 14763147 BLAKE2B 3f45a3d40e77ef822c0a661ca3b8234d7098029f5a259cde631484aa92311c417b628a2b532e8df88d08d116dec7520b2c49219e5e6f6c0db7491bf260cc46c5 SHA512 96e5c8db3dcb047a9eb0df1c686f38238807f44c22554311eb86ac17dca5c6243996b2b8d5bc2745a611a6ca21da0657b5010889fbcc3a038311c816eaf846f5
 DIST mkdocs-material-9.5.43.gh.tar.gz 14762388 BLAKE2B 49e5591aa3669c7bc8a8cd1969d3a54c7575958303742d5169023dd0e8c42ea6beabaa730b388e144d06dd402be7edac92a51d26ee40c2e90c2d19b8779afb6a SHA512 f7930ebcecb2cb37ec9a462f7a1a68351e73f745db36a85bac4c07797582e0a64a28936ccb85f0125ff5d3940768627f5b51c425b2d3b886663e904c607ae629
 DIST mkdocs-material-9.5.44.gh.tar.gz 14764147 BLAKE2B e0aaed852abd060eee0b9049798a327a4ddc5969a84289b8aa983b0dfbe926b2e0dfd13525593c2783106bca882adfcfad7961c2eb0363a1f4a4131c364c42c8 SHA512 9a0c8d4a52c8b44b9c8e84b57839d5ddc3080eaa136cb6effc3da8eb9d08a2ef0c0898ff875afabc1783ea548653a9b00f00db67ceb48d52f323a93795529465
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.41.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.41.ebuild
deleted file mode 100644
index b29d9c6ec471..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.41.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
index 30ab9a0405c7..b29d9c6ec471 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.42.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/moto/moto-5.0.18.ebuild b/dev-python/moto/moto-5.0.18.ebuild
index 0d43814f23b8..eaaa025bdf0e 100644
--- a/dev-python/moto/moto-5.0.18.ebuild
+++ b/dev-python/moto/moto-5.0.18.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/mypy-1.13.0.ebuild b/dev-python/mypy/mypy-1.13.0.ebuild
index bf7e0820660d..37a938336b25 100644
--- a/dev-python/mypy/mypy-1.13.0.ebuild
+++ b/dev-python/mypy/mypy-1.13.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~loong ppc64 ~riscv ~x86"
 IUSE="+native-extensions"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
diff --git a/dev-python/netcdf4/netcdf4-1.7.2.ebuild b/dev-python/netcdf4/netcdf4-1.7.2.ebuild
index 9d95dbccd063..f1637bf7aaa3 100644
--- a/dev-python/netcdf4/netcdf4-1.7.2.ebuild
+++ b/dev-python/netcdf4/netcdf4-1.7.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="blosc bzip2 mpi test szip zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 137e4784a392..9c60dff11ac4 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,2 +1 @@
-DIST networkx-3.3.tar.gz 2126579 BLAKE2B 37d5d536e2564f9a219df70bb7f1b7c0717b99e9cdb7a4050aa321609a0ef34caecfda5a6ed8cb17f4d3b305b667adf8e40b58568dde8eb942d4a00b1ebdb255 SHA512 86306cabd7e15aa79cae4d84a42e8804b1e904fc2127725067a80e3ddf31f0fa72ebb9d21284018e72bdfc662c766a5be55564572aadaf7392dada7ea93d1ea4
 DIST networkx-3.4.2.tar.gz 2151368 BLAKE2B 10b18d7d5b80dd60342f65729688dd2a175c925c72f6e3d0aa4555f008acd347940d6f118a870ba02543d2dc451c4b91986fa834431cc8752b467c5b8622aa82 SHA512 910e1400ad18711761c715896c3238b9c7d8914c571ab4db3aaf18a772b5fef90e5378ca435fbfce55b5821f1ddd3863a3cd65030086e80a971df91d9203c637
diff --git a/dev-python/networkx/networkx-3.3.ebuild b/dev-python/networkx/networkx-3.3.ebuild
deleted file mode 100644
index e02eb4555bec..000000000000
--- a/dev-python/networkx/networkx-3.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_FULLY_TESTED=( python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
-
-inherit distutils-r1 multiprocessing 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"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/matplotlib-3.6[${PYTHON_USEDEP}]
-			>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-			>=dev-python/scipy-1.11.2[${PYTHON_USEDEP}]
-		' "${PYTHON_FULLY_TESTED[@]}")
-	)
-"
-
-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 -p xdist -n "$(makeopts_jobs)" --dist=worksteal || 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/networkx/networkx-3.4.2.ebuild b/dev-python/networkx/networkx-3.4.2.ebuild
index b386d30100dd..8eceda68d0d0 100644
--- a/dev-python/networkx/networkx-3.4.2.ebuild
+++ b/dev-python/networkx/networkx-3.4.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nh3/nh3-0.2.18.ebuild b/dev-python/nh3/nh3-0.2.18-r1.ebuild
index 801947753e1c..801947753e1c 100644
--- a/dev-python/nh3/nh3-0.2.18.ebuild
+++ b/dev-python/nh3/nh3-0.2.18-r1.ebuild
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 5ba3efb3401d..826f6c5c2428 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,2 +1 @@
-DIST openstackdocstheme-3.3.0.tar.gz 1256566 BLAKE2B d69f9edae656de888cb06b9a4c42ece7c615976d8e454b5b391772a19958366ed14c57b55a3e8514052a845eaf5f9774e5415e71c0d16e44dab1c7285c66be45 SHA512 b49be9d4b7deccbdf6f9c398ddd1e763572dadfecdc228fe6956aab5fdb5588a4d20aaa1e445b2de66e99fe0953f753c2734bb6bc2211836f5bf4b0567ba7deb
 DIST openstackdocstheme-3.4.0.tar.gz 1256314 BLAKE2B 595f1a8b1729cd79e998d4de9817daf23365b4e1b9d8361afbddbd20ecd8ead3c07662a5ff0de70986547ed3cad32785c5182cdf1fadfea455d6824036b5f59b SHA512 34cc9a2f4d1f6cda86e4f4b411edaf3d3fc229c2384ce160cb9b65068054793867b14c40beaf9f4b46948da8f22f70a68d5a3868c4b8605ade0aa2b0d8750828
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild
deleted file mode 100644
index 942fedbd55d6..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.3.0.ebuild
+++ /dev/null
@@ -1,29 +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 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.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
index fd220e699932..942fedbd55d6 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.4.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.4.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/orjson/orjson-3.10.10.ebuild b/dev-python/orjson/orjson-3.10.10-r1.ebuild
index c3fd36eef73e..3536288b2be7 100644
--- a/dev-python/orjson/orjson-3.10.10.ebuild
+++ b/dev-python/orjson/orjson-3.10.10-r1.ebuild
@@ -45,6 +45,8 @@ CRATES="
 	xxhash-rust@0.8.12
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
@@ -65,7 +67,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
-	>=virtual/rust-1.72
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.10.11.ebuild b/dev-python/orjson/orjson-3.10.11-r1.ebuild
index fc6e8e4712f2..56f7a83096a2 100644
--- a/dev-python/orjson/orjson-3.10.11.ebuild
+++ b/dev-python/orjson/orjson-3.10.11-r1.ebuild
@@ -45,6 +45,8 @@ CRATES="
 	xxhash-rust@0.8.12
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
@@ -65,7 +67,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
-	>=virtual/rust-1.72
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.10.7.ebuild b/dev-python/orjson/orjson-3.10.7-r1.ebuild
index 950f7a83a680..0aff70ceba24 100644
--- a/dev-python/orjson/orjson-3.10.7.ebuild
+++ b/dev-python/orjson/orjson-3.10.7-r1.ebuild
@@ -49,6 +49,8 @@ CRATES="
 	xxhash-rust@0.8.12
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
@@ -69,7 +71,6 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
-	>=virtual/rust-1.72
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/orjson/orjson-3.10.9.ebuild b/dev-python/orjson/orjson-3.10.9-r1.ebuild
index 62cd44eb652d..8b1bbb6d005e 100644
--- a/dev-python/orjson/orjson-3.10.9.ebuild
+++ b/dev-python/orjson/orjson-3.10.9-r1.ebuild
@@ -45,6 +45,8 @@ CRATES="
 	xxhash-rust@0.8.12
 "
 
+RUST_MIN_VER="1.74.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
@@ -65,7 +67,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
-	>=virtual/rust-1.72
 	test? (
 		dev-python/arrow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index e81830b99727..80b537a6134e 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,2 @@
 DIST pallets_sphinx_themes-2.1.3.tar.gz 20124 BLAKE2B c66fac3aa625812c48aceee75a8296d272a1c5819463b41c2892aeefef4633da1d74c781b1669dbe87aa7af302169469fb04b7cc0492970156efcc53271e8c0f SHA512 2b11d05af4023b54b6bb3f1edda509648458542b9ff255b709cc01797551755d80851612259f460e3d17e4a3b5da0833e12c15bf5df11b38641c4d34007dc12e
-DIST pallets_sphinx_themes-2.2.0.tar.gz 20659 BLAKE2B 4aecdfa83241371a8e6082663462f3b7bd0357ab452e478629728978ae8809e54d81480bf9b177104e3facd77a0deb4d228dcecd5c283e914c0af0165145302e SHA512 c7daea2e79f0a2c6b2bd1959cd36de65a8b094bf637703b51a7e6f9d0b7da5827c45b7d4504f3e8cc895046e3ca7e66e1411e0cecc51c0f6424dc0a9e7a95988
 DIST pallets_sphinx_themes-2.3.0.tar.gz 21029 BLAKE2B 0f0abb334beb70ddb6f6d85164914e6eac3b4e938d085c81a62c8f33a7e6eb8b599dc0b2ff7d164124797cd781e2eb23b0a9ae502a28bf8720c2d5464213cf78 SHA512 9c76ab7e8e2cecaaecab7ccc621bac685b28394d16e4d35d79b8dc7745ceff88cba23b04efeb1faf0b6a987cf173c9fc77364a7306bfe5029e5129fed791b5a8
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.2.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.2.0.ebuild
deleted file mode 100644
index c20e51f9bf09..000000000000
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYPI_PN=Pallets-Sphinx-Themes
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx themes for Pallets and related projects"
-HOMEPAGE="
-	https://github.com/pallets/pallets-sphinx-themes/
-	https://pypi.org/project/Pallets-Sphinx-Themes/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
-	dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
index c20e51f9bf09..0e96c83ec2ce 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/patch-ng/Manifest b/dev-python/patch-ng/Manifest
index a4d8af96fdea..30da748109d7 100644
--- a/dev-python/patch-ng/Manifest
+++ b/dev-python/patch-ng/Manifest
@@ -1,2 +1 @@
-DIST patch-ng-1.18.0.gh.tar.gz 166380 BLAKE2B b3a53f2586763000c9a38d2acf25b4b1d236f34da8f0d0105a78d07bee46f30b5fb27ad0223cf274e83def6e66a1ec752f672d0a7e7df2f08280116ed26add30 SHA512 e4c271d5b8bfdcc756a8bb4f678de29f573190a4c1b3e9eb4b6c2564b008c38eb022c644c1bbee2412e7ee2e0ba08c161408303a3fbd223decd85bb6e63f24a9
 DIST python-patch-ng-1.18.1.gh.tar.gz 166492 BLAKE2B c9285805cc0efe8ce033df5a2eedc01fe9fdf8986cc614f5b2b656d94462b538062f033930a4810eba95de9880a6536a9dfa901b62faf3aef5e272b1fa43f712 SHA512 e744711d652447bbf0881fd097ed35bddeccec8dd3b45a898e27f8846b664d23cd5313f09a7d92e431cce5c069acb7fa50dd8875fe2324146b2bd0ea6fd44cf5
diff --git a/dev-python/patch-ng/patch-ng-1.18.0.ebuild b/dev-python/patch-ng/patch-ng-1.18.0.ebuild
deleted file mode 100644
index bfbefbf1b522..000000000000
--- a/dev-python/patch-ng/patch-ng-1.18.0.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="Library to parse and apply unified diffs, fork of dev-python/patch"
-HOMEPAGE="https://github.com/conan-io/python-patch-ng https://pypi.org/project/patch-ng/"
-SRC_URI="https://github.com/conan-io/python-patch-ng/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/python-${P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests unittest
-
-python_test() {
-	"${EPYTHON}" -m unittest -v tests/run_tests.py || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/patch-ng/patch-ng-1.18.1.ebuild b/dev-python/patch-ng/patch-ng-1.18.1.ebuild
index 7b3f0cc15b94..cec58da9191d 100644
--- a/dev-python/patch-ng/patch-ng-1.18.1.ebuild
+++ b/dev-python/patch-ng/patch-ng-1.18.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 5e04d0009739..a4bdb8da6c95 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,2 +1 @@
-DIST pdm-backend-2.3.3.gh.tar.gz 136942 BLAKE2B 14f2584f22f1c4e08f687c77621269ae1e5acfe4babb1ab427c10d65ff07841b8175479f867870b9a5745db76444ca140a7da497a94c831ca6d0ea1e67b4e88f SHA512 382ad95e2811f1142fee66065f96ede1a646c3e2b9fbfafc6afb17442d3aeccfbf1ff6260952986a025791d3d56a2c4b730decb3cb65e893c25a710e16cbcfc8
 DIST pdm-backend-2.4.3.gh.tar.gz 146089 BLAKE2B 36f65db90de5b507348a2a8407ae0eec8e1939c6b0fea1181548de910fad2497594e17aee7d478572a32e28260ef15660bddfaec4d921b2975b5a51da031dc1e SHA512 378bc4360140f18dd7f66701da77f4b98ef4bad39c86055f11f4e508b16ebbbbce2188f47dedc05cd43525baf7873fc4565ee98d00d9e65efd9d8fc1820ddc15
diff --git a/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild b/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild
deleted file mode 100644
index 72c8db4f86b2..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.3.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# see src/pdm/backend/_vendor/vendor.txt
-RDEPEND="
-	>=dev-python/editables-0.5[${PYTHON_USEDEP}]
-	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -k "not [hg"
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.4.3.ebuild b/dev-python/pdm-backend/pdm-backend-2.4.3.ebuild
index 5927754aaf13..06c7d3d6fc07 100644
--- a/dev-python/pdm-backend/pdm-backend-2.4.3.ebuild
+++ b/dev-python/pdm-backend/pdm-backend-2.4.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 # see src/pdm/backend/_vendor/vendor.txt
 RDEPEND="
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 610338e1e90d..a29e6221bd42 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,3 +3,4 @@ DIST pip-24.1.1.gh.tar.gz 9190972 BLAKE2B 1ce876d2767c1c36bac3237c17a3aced9dd5a3
 DIST pip-24.1.2.gh.tar.gz 9192691 BLAKE2B 9b5a07e9f10b5787d668766423d8b3a9dfcc62564673155b80c7bc95ffe79daafa8788d8141f67c76d4098c21922e62fcb2164f72bf580bbeec136786c48d512 SHA512 222a957030e9c51defa6f741f8e176f2a19bd54f0ef664d2e218d3d2c2b5a335c9b7ce4bd1c804133d6116b3fbf37648453cd85f7a2bcf86a5aeb43e22db4b0f
 DIST pip-24.1.gh.tar.gz 9188658 BLAKE2B 4a43ff0199d811dd30461e376f655a447f3f706a48dd97fe1d0ccf630f558e72209ccd06d98949a1541cd6b2942a816db23ce8aaa7fbbf9aef429502fb91ab92 SHA512 c60ab329fe91202ff64b5f0f90209085fbf8db0f0a05f0703f952ad69e39e2e3edb5dadc006a3f317cdd4ba4fb5abe56dfbd22792249a2d139702eec272186d1
 DIST pip-24.2.gh.tar.gz 9189637 BLAKE2B 6bc7bf69cd3e1edc1898a4476d36b749c037ac10a1614ef3a6bacc0c7debd38de94e0cf6d8a2931b1a7afb2f6f853922fcd62b65d17ac805f22741b7ff6423c6 SHA512 2c44881f62f7b89cedeb0b739409ad67c6144bfdffc347efeb7bcf85aed77bcd7ddd10868d24577fbba0ef84dd752473d6b6dff329b42841939fae2ff2f63d28
+DIST pip-24.3.1.gh.tar.gz 9198711 BLAKE2B c70524bfedf46776d5ab8da24754e8177caac6d87cc90aa86b144c0fe9718860fe3d08823f655495c059dbece6e0ecbb2ac8e655cff3124693f64a35deac512e SHA512 9cf5f18eefd559cf27bc026e5206b0028ea77fd904a61fea9a6682b519305c962dd19170b841581bd05ff72192a9c458ec0eba173fa66db0438b046111ff5856
diff --git a/dev-python/pip/files/pip-23.1-no-coverage.patch b/dev-python/pip/files/pip-23.1-no-coverage.patch
index 943cc281cdfb..963bd4e7d43b 100644
--- a/dev-python/pip/files/pip-23.1-no-coverage.patch
+++ b/dev-python/pip/files/pip-23.1-no-coverage.patch
@@ -25,14 +25,10 @@ index 57dd7e68a..af2af9ffa 100644
  def install_pth_link(
      venv: VirtualEnvironment, project_name: str, lib_dir: Path
  ) -> None:
-@@ -430,7 +423,6 @@ def virtualenv_template(
-     pip_src: Path,
+@@ -431,3 +424,2 @@ def virtualenv_template(
      setuptools_install: Path,
      wheel_install: Path,
 -    coverage_install: Path,
- ) -> Iterator[VirtualEnvironment]:
-     venv_type: VirtualEnvironmentType
-     if request.config.getoption("--use-venv"):
 @@ -457,13 +449,6 @@ def virtualenv_template(
          [os.fspath(venv.bin / "python"), "setup.py", "-q", "develop"], cwd=pip_editable
      )
diff --git a/dev-python/pip/files/pip-24.3.1-rich-13.8.patch b/dev-python/pip/files/pip-24.3.1-rich-13.8.patch
new file mode 100644
index 000000000000..d17ccf5b2fe3
--- /dev/null
+++ b/dev-python/pip/files/pip-24.3.1-rich-13.8.patch
@@ -0,0 +1,47 @@
+From 8cfd050f615a4bad699ec55d4cb19b1f1dc4137e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 9 Nov 2024 16:41:40 +0100
+Subject: [PATCH] Override rich.console pipe handler for rich 13.8.0+
+
+Explicitly override `rich.console.Console.on_broken_pipe()` to reraise
+the original exception, to bring the behavior of rich 13.8.0+ in line
+with older versions.  The new versions instead close output fds and exit
+with error instead, which prevents pip's pipe handler from firing.
+This is the minimal change needed to make pip's test suite pass after
+upgrading vendored rich.
+
+Bug #13006
+Bug #13072
+---
+ src/pip/_internal/utils/logging.py | 9 ++++++++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+ create mode 100644 news/13072.trivial.rst
+
+diff --git a/src/pip/_internal/utils/logging.py b/src/pip/_internal/utils/logging.py
+index 41f6eb51a..be17add5d 100644
+--- a/src/pip/_internal/utils/logging.py
++++ b/src/pip/_internal/utils/logging.py
+@@ -137,12 +137,19 @@ class IndentedRenderable:
+             yield Segment("\n")
+ 
+ 
++class PipConsole(Console):
++    def on_broken_pipe(self) -> None:
++        # Reraise the original exception, rich 13.8.0+ exits by default
++        # instead, preventing our handler from firing.
++        raise BrokenPipeError() from None
++
++
+ class RichPipStreamHandler(RichHandler):
+     KEYWORDS: ClassVar[Optional[List[str]]] = []
+ 
+     def __init__(self, stream: Optional[TextIO], no_color: bool) -> None:
+         super().__init__(
+-            console=Console(file=stream, no_color=no_color, soft_wrap=True),
++            console=PipConsole(file=stream, no_color=no_color, soft_wrap=True),
+             show_time=False,
+             show_level=False,
+             show_path=False,
+-- 
+2.47.0
+
diff --git a/dev-python/pip/pip-24.2-r1.ebuild b/dev-python/pip/pip-24.2-r1.ebuild
index c6ea27d41143..50adf823c02e 100644
--- a/dev-python/pip/pip-24.2-r1.ebuild
+++ b/dev-python/pip/pip-24.2-r1.ebuild
@@ -58,6 +58,7 @@ BDEPEND="
 			dev-python/pretend[${PYTHON_USEDEP}]
 			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			<dev-python/rich-13.8[${PYTHON_USEDEP}]
 			dev-python/scripttest[${PYTHON_USEDEP}]
 			dev-python/tomli-w[${PYTHON_USEDEP}]
 			dev-python/virtualenv[${PYTHON_USEDEP}]
diff --git a/dev-python/pip/pip-24.3.1-r1.ebuild b/dev-python/pip/pip-24.3.1-r1.ebuild
new file mode 100644
index 000000000000..dac10b623b15
--- /dev/null
+++ b/dev-python/pip/pip-24.3.1-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-pip along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{9,10,11,12,13} )
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+# see src/pip/_vendor/vendor.txt
+RDEPEND="
+	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.9[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.8[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.1[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-hooks-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.32.0[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-69.5.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/truststore-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.12.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ensurepip-setuptools
+			dev-python/ensurepip-wheel
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			test-rust? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			)
+			dev-vcs/git
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-23.1-no-coverage.patch"
+		# prepare to unbundle dependencies
+		"${FILESDIR}/pip-24.1-unbundle.patch"
+		# https://github.com/pypa/pip/pull/13073
+		"${FILESDIR}/pip-24.3.1-rich-13.8.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	# unbundle dependencies
+	rm -r src/pip/_vendor || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from pip\._vendor import:import:g' \
+		-e 's:from pip\._vendor\.:from :g' \
+		{} + || die
+
+	if use test; then
+		local wheels=(
+			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
+		)
+		mkdir tests/data/common_wheels/ || die
+		cp "${wheels[@]}" tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		# Internet
+		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_install.py::test_install_sdist_links
+		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		# broken by system site-packages use
+		tests/functional/test_check.py::test_basic_check_clean
+		tests/functional/test_check.py::test_check_skip_work_dir_pkg
+		tests/functional/test_check.py::test_check_complicated_name_clean
+		tests/functional/test_check.py::test_check_development_versions_are_also_considered
+		tests/functional/test_freeze.py::test_freeze_with_setuptools
+		tests/functional/test_pip_runner_script.py::test_runner_work_in_environments_with_no_pip
+		tests/functional/test_uninstall.py::test_basic_uninstall_distutils
+		tests/unit/test_base_command.py::test_base_command_global_tempdir_cleanup
+		tests/unit/test_base_command.py::test_base_command_local_tempdir_cleanup
+		tests/unit/test_base_command.py::test_base_command_provides_tempdir_helpers
+		# broken by unbundling
+		"tests/functional/test_debug.py::test_debug[vendored library versions:]"
+		tests/functional/test_debug.py::test_debug__library_versions
+		tests/functional/test_python_option.py::test_python_interpreter
+		tests/functional/test_uninstall.py::test_uninstall_non_local_distutils
+	)
+	local EPYTEST_IGNORE=(
+		# requires proxy.py
+		tests/functional/test_proxy.py
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_XDIST=1
+	# rerunfailures because test suite breaks if packages are installed
+	# in parallel
+	epytest -m "not network" -o tmp_path_retention_policy=all \
+		-p rerunfailures --reruns=5
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/proto-plus/proto-plus-1.25.0.ebuild b/dev-python/proto-plus/proto-plus-1.25.0.ebuild
index 8060e8a390e7..2297c2467c1e 100644
--- a/dev-python/proto-plus/proto-plus-1.25.0.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.25.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-6[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild b/dev-python/pydantic-core/pydantic-core-2.23.4-r1.ebuild
index 944ab8c5fc84..8c408708ca1d 100644
--- a/dev-python/pydantic-core/pydantic-core-2.23.4.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.23.4-r1.ebuild
@@ -130,7 +130,6 @@ RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? (
 		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic-core/pydantic-core-2.25.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.25.0-r1.ebuild
index 3083ddb7f40b..17af2c2e3698 100644
--- a/dev-python/pydantic-core/pydantic-core-2.25.0.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.25.0-r1.ebuild
@@ -130,7 +130,6 @@ RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? (
 		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic-core/pydantic-core-2.25.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.25.1-r1.ebuild
index 4b6d0cdc9757..3333fb7ffd51 100644
--- a/dev-python/pydantic-core/pydantic-core-2.25.1.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.25.1-r1.ebuild
@@ -130,7 +130,6 @@ RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? (
 		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic-core/pydantic-core-2.26.0.ebuild b/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
index b1dc9bc3e1d3..6ea31fb15bc8 100644
--- a/dev-python/pydantic-core/pydantic-core-2.26.0.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.26.0-r1.ebuild
@@ -130,7 +130,6 @@ RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=virtual/rust-1.70.0
 	test? (
 		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index c34a3d64f77a..4bb9cf80350e 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,2 +1 @@
-DIST pyftpdlib-2.0.0.tar.gz 196108 BLAKE2B bec261eac70a93092055413fca67dd4a480e492481f027b32508dcee8b479dbc0ec84c56d972dca63f2fbf4e3240e02b1c2877105cf77130bf75b64c9785993e SHA512 c154127771b949854c05f87a7b77f1cf144e2756cb0709c44cd0921c2ac415e7c6336c6dca1982b762087a42fc1408e26fbb2ebecbf9255d6f2d6019af14ccfe
 DIST pyftpdlib-2.0.1.tar.gz 202285 BLAKE2B 16e25d45a7d832e0a35e810d3017091e4a00b25b85cefac16182ce36e213ee09119d0705f84e3b6c92b7c7becd80c8e91245f5591dd7e88daa4944fdcc472940 SHA512 b913d2deaa9d16239eca1e00fe9b01c33222173242b1b6d5513de563cdd4a5c3bf346cbd1d6044c74b16a7691a4b619a01aff373e2f94e08f232f13e3383d99b
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
deleted file mode 100644
index 44fa27067ed4..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-2.0.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="
-	https://github.com/giampaolo/pyftpdlib/
-	https://pypi.org/project/pyftpdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pyasynchat[${PYTHON_USEDEP}]
-		dev-python/pyasyncore[${PYTHON_USEDEP}]
-	' 3.12 3.13)
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs pyftpdlib
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild b/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
index 862740c41031..44fa27067ed4 100644
--- a/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-2.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3-r1.ebuild
index 0334b553865d..0334b553865d 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.3-r1.ebuild
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6-r1.ebuild
index 212589c16d3a..212589c16d3a 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.1.6-r1.ebuild
diff --git a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.2.1.ebuild b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.2.1-r1.ebuild
index 16127f6cf44c..16127f6cf44c 100644
--- a/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.2.1.ebuild
+++ b/dev-python/pyproject-fmt-rust/pyproject-fmt-rust-1.2.1-r1.ebuild
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.4.2.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.4.2-r1.ebuild
index a6dd1b1766a1..a6dd1b1766a1 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.4.2.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.4.2-r1.ebuild
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.4.3-r1.ebuild
index 6289aab91ee0..6289aab91ee0 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.4.3.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.4.3-r1.ebuild
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
index 762ccf491756..762ccf491756 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-2.5.0.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-2.5.0-r1.ebuild
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0.ebuild
index cef3e7ff2c2f..7b2ddaeb2e70 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/packaging-19[${PYTHON_USEDEP}]
diff --git a/dev-python/pyscard/pyscard-2.2.0.ebuild b/dev-python/pyscard/pyscard-2.2.0.ebuild
index 8300107a83f7..d59690237a19 100644
--- a/dev-python/pyscard/pyscard-2.2.0.ebuild
+++ b/dev-python/pyscard/pyscard-2.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	sys-apps/pcsc-lite
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 8b2f56afba2d..5a1608f085c4 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -1,2 +1 @@
-DIST pytest-shell-utilities-1.9.6.gh.tar.gz 79736 BLAKE2B 95c701ffd7b43356f3369d2bab3a8a6aee116b51dd2b78a9fe0e2defe6d86910c69222074ffbd23f6f6aa21f04613f168b9635b481f6b1646f8d8eaf707c9e5e SHA512 829b3c98ac5d9ef2995eb492286eacf84d186bdd75a78ba28e0c5500a0350773fa0d9776043b25eb1951896ec2ca448b43ca340e59bbd5cf27cd392d94408178
 DIST pytest-shell-utilities-1.9.7.gh.tar.gz 79847 BLAKE2B f74fdfc24acd521313b2cc98bfcaaf916ff649a88b10c642edb8af785f7c473fbc97d80badec5e7da5b27a6394c6c16e6c354e8261cdfa94cb48ef3eb7174940 SHA512 6e072bbf429abde82504c8c7c03e360d07c88a0239fec10e5d20f424a776fa170a90b0a8a7d809813413326c0915e06164eeeb619c7385a68992fd2bd662bcea
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.6.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.6.ebuild
deleted file mode 100644
index d89769d428a9..000000000000
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin: fixtures and code to help with running shell commands on tests"
-HOMEPAGE="
-	https://pypi.org/project/pytest-shell-utilities/
-	https://github.com/saltstack/pytest-shell-utilities/
-"
-SRC_URI="
-	https://github.com/saltstack/pytest-shell-utilities/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.4.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-6.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.7.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.7.ebuild
index e809278546d3..063560cc9b7e 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.7.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.9.7.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 3fdf73ffc291..11e3571dbca4 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,2 +1 @@
-DIST python-daemon-2.3.2.tar.gz 83127 BLAKE2B bce00867850e8451bcaf5a51864bdd751fa3b5e7be8ae1d36d724a915680713fc66c0fc6c8499bce03e0eb86465f5806fb8645376e600b8eac579fee3c24a087 SHA512 d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd
 DIST python_daemon-3.1.0.tar.gz 61947 BLAKE2B d6f24cb72a033401a2eb1149c359ec49e044b0d549ae8ccb337dc60525f3ad80efd8646a50a51e6ba0768a5e8e77a3a5bd5b1a5aea3b54c5546769a5599d49ad SHA512 d7641baba841af8724dd37b66db605d07a62c947f01ff6328c44aca56deaa5a0891b8fe3bbbf5840e16c7080402776676892f105aac900944a8d2921a12edba4
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
deleted file mode 100644
index 701f4ea022a2..000000000000
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library to implement a well-behaved Unix daemon process"
-HOMEPAGE="
-	https://pagure.io/python-daemon/
-	https://pypi.org/project/python-daemon/
-"
-
-# build system and tests use GPL-3.0+ but none of these files are installed
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ppc64 ~sparc x86"
-
-RDEPEND="
-	dev-python/lockfile[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	test? (
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-daemon/python-daemon-3.1.0.ebuild b/dev-python/python-daemon/python-daemon-3.1.0.ebuild
index 62dc8f4ba2f4..53fb4636e304 100644
--- a/dev-python/python-daemon/python-daemon-3.1.0.ebuild
+++ b/dev-python/python-daemon/python-daemon-3.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/lockfile-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index b5c31e25c351..2bac2af8b622 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1,4 +1,2 @@
 DIST python-multipart-0.0.12.gh.tar.gz 92904 BLAKE2B 25076627fdcb3a4bfc9eda74218f9d6d30ea18517da00c312f50c9d3ae156894b29e83bd38d4e11d7d06732999ae9640243e660d2a037253b9f511772a6c737b SHA512 271ed29f3025be5c058a56ec56ce373348dc27b4c8130c17609bd48d73fc975b2ac8387d4989be578e1be01a618aad87c1d3ec3a37dbe73dc45813ec961842d0
-DIST python-multipart-0.0.14.gh.tar.gz 94136 BLAKE2B 7e6c99fb6c3a61d655447fdda8df4aeaad7157ba42959627d69cf079c5146a6a4c35bf972ee728343816fa2ceef3da81cb4140dda42b86b19c0cac7affcea7e0 SHA512 c53d3e8faec421dd05cd9c3695e80555ee9fdd65cf616fb65b4a948fa2ca86119e076d7b6b7aa1add386306774a5de1a03811b36eaf1cc36d6ab5310573ed0f3
-DIST python-multipart-0.0.16.gh.tar.gz 94363 BLAKE2B c1f6494cbce56d7c0d6b9992e19b9661c65a89433d30b1bfa66b6a3af0a61175a3b109166ae08867a7321be7f12c351f7b61ddee374c31c36085ba19411e2fe1 SHA512 c2a58f96425217d08e71307e9d1a7649df70ee8a1d8587d1fc2d01e39863837cd56fe6acdcdac3c04e6790a744ac2074b82278073652a47b9178e584a040cb97
 DIST python-multipart-0.0.17.gh.tar.gz 94416 BLAKE2B daf9f5e2a94d804216fbf18778295cec3270139d5912ace80ab84d57d32115d7a53563d429f81fd2f0f55b9fe30b58f62ef1d095414f7bfe6bd3951dbb9d9e89 SHA512 52b5d5b154a18a2ae34ce7931076278b5a5edb2cbca5350c6898fd675fb57755cefc97642b2edae7e7d9903d877430da85f73347b9fcaaf1c20fa09dc12799fd
diff --git a/dev-python/python-multipart/files/python-multipart-0.0.12-rename.patch b/dev-python/python-multipart/files/python-multipart-0.0.12-rename.patch
deleted file mode 100644
index cee51b2df1c8..000000000000
--- a/dev-python/python-multipart/files/python-multipart-0.0.12-rename.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d6e30eb0269fa04d4a16133bd94405f10240aeb0 Mon Sep 17 00:00:00 2001
-From: Henry Schreiner <henryschreineriii@gmail.com>
-Date: Fri, 11 Oct 2024 17:11:21 -0400
-Subject: [PATCH 1/2] refactor: rename to python_multipart
-
-Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
-
-diff --git a/pyproject.toml b/pyproject.toml
-index fb03f83..1a81077 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -62,13 +65,10 @@ Changelog = "https://github.com/Kludex/python-multipart/blob/master/CHANGELOG.md
- Source = "https://github.com/Kludex/python-multipart"
- 
- [tool.hatch.version]
--path = "multipart/__init__.py"
--
--[tool.hatch.build.targets.wheel]
--packages = ["multipart"]
-+path = "python_multipart/__init__.py"
- 
- [tool.hatch.build.targets.sdist]
--include = ["/multipart", "/tests", "CHANGELOG.md", "LICENSE.txt"]
-+include = ["/python_multipart", "/tests", "CHANGELOG.md", "LICENSE.txt", "_python_multipart.pth", "_python_multipart_loader.py"]
- 
- [tool.mypy]
- strict = true
-diff --git a/tests/test_multipart.py b/tests/test_multipart.py
-index b824f19..f5f8e7e 100644
---- a/tests/test_multipart.py
-+++ b/tests/test_multipart.py
-@@ -11,9 +11,9 @@
- 
- import yaml
- 
--from multipart.decoders import Base64Decoder, QuotedPrintableDecoder
--from multipart.exceptions import DecodeError, FileError, FormParserError, MultipartParseError, QuerystringParseError
--from multipart.multipart import (
-+from python_multipart.decoders import Base64Decoder, QuotedPrintableDecoder
-+from python_multipart.exceptions import DecodeError, FileError, FormParserError, MultipartParseError, QuerystringParseError
-+from python_multipart.multipart import (
-     BaseParser,
-     Field,
-     File,
-@@ -31,7 +31,7 @@
- if TYPE_CHECKING:
-     from typing import Any, Iterator, TypedDict
- 
--    from multipart.multipart import FieldProtocol, FileConfig, FileProtocol
-+    from python_multipart.multipart import FieldProtocol, FileConfig, FileProtocol
- 
-     class TestParams(TypedDict):
-         name: str
-
diff --git a/dev-python/python-multipart/python-multipart-0.0.12-r100.ebuild b/dev-python/python-multipart/python-multipart-0.0.12-r100.ebuild
deleted file mode 100644
index 30bea6b7bb5b..000000000000
--- a/dev-python/python-multipart/python-multipart-0.0.12-r100.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2022-2024 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 streaming multipart parser for Python"
-HOMEPAGE="
-	https://github.com/Kludex/python-multipart/
-	https://pypi.org/project/python-multipart/
-"
-SRC_URI="
-	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/Kludex/python-multipart/pull/166
-		"${FILESDIR}/${P}-rename.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	mv multipart python_multipart || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-multipart/python-multipart-0.0.14.ebuild b/dev-python/python-multipart/python-multipart-0.0.14.ebuild
deleted file mode 100644
index e30a8926b657..000000000000
--- a/dev-python/python-multipart/python-multipart-0.0.14.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022-2024 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 streaming multipart parser for Python"
-HOMEPAGE="
-	https://github.com/Kludex/python-multipart/
-	https://pypi.org/project/python-multipart/
-"
-SRC_URI="
-	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not install the backwards compatibility package
-	# we're patching revdeps instead
-	rm -r multipart || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/python-multipart/python-multipart-0.0.16.ebuild b/dev-python/python-multipart/python-multipart-0.0.16.ebuild
deleted file mode 100644
index e30a8926b657..000000000000
--- a/dev-python/python-multipart/python-multipart-0.0.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022-2024 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 streaming multipart parser for Python"
-HOMEPAGE="
-	https://github.com/Kludex/python-multipart/
-	https://pypi.org/project/python-multipart/
-"
-SRC_URI="
-	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# do not install the backwards compatibility package
-	# we're patching revdeps instead
-	rm -r multipart || die
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/qiskit/qiskit-1.2.4.ebuild b/dev-python/qiskit/qiskit-1.2.4-r1.ebuild
index 377e96825a7f..377e96825a7f 100644
--- a/dev-python/qiskit/qiskit-1.2.4.ebuild
+++ b/dev-python/qiskit/qiskit-1.2.4-r1.ebuild
diff --git a/dev-python/qiskit/qiskit-1.3.0_rc1.ebuild b/dev-python/qiskit/qiskit-1.3.0_rc1-r1.ebuild
index 93cd3f5b8a6f..93cd3f5b8a6f 100644
--- a/dev-python/qiskit/qiskit-1.3.0_rc1.ebuild
+++ b/dev-python/qiskit/qiskit-1.3.0_rc1-r1.ebuild
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild
index a5696ed6c011..4e4ce737f206 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.10.1.ebuild
@@ -18,7 +18,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"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 72d6cfa8d3e2..67d095436d69 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,2 +1 @@
-DIST redis-py-5.1.1.gh.tar.gz 4829819 BLAKE2B 2cf104142c70cb7b082178d26dfd84c9970488613551c2f87052e2f56f2bd1e816f4760dc2070dc8520098768263f810a524278ca6d24e0a97340d94434f97bb SHA512 2dbc5ba3138ca6b00c89185fa7b0280958eb66e3640c30ffe88bb77ef0cc88ae82f11e1d3d2cf94a2e8ef35ce30df3e5dd46ccb02d663a6acdb45085f3f1bc95
 DIST redis-py-5.2.0.gh.tar.gz 4832021 BLAKE2B 0b35e2fa0aa2a0d0d03f0bd7bd225ab959e39d7cd37b91411bfcae77ba0571aa81d072a9deffce26dec818e6e298ea9027738ef00b6819405b92b6d2c05245e4 SHA512 7e8661f1bf9ab66d58527124fa08419a962b2a6d45026029487ea8ec8fdf41565ccfa6610311508201ac2ef9ec57f16a0e51793a8c6447de57e0f0c0a829468a
diff --git a/dev-python/redis/redis-5.1.1.ebuild b/dev-python/redis/redis-5.1.1.ebuild
deleted file mode 100644
index a61d1a428330..000000000000
--- a/dev-python/redis/redis-5.1.1.ebuild
+++ /dev/null
@@ -1,107 +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} pypy3 )
-
-inherit distutils-r1
-
-MY_P=redis-py-${PV}
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# https://github.com/redis/redis-py/issues/3339
-	sed -i 's:(forbid_global_loop=True)::' tests/test_asyncio/*.py || die
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-		# require extra redis modules that apparently aren't packaged
-		# on Gentoo
-		tests/{,test_asyncio/}test_bloom.py
-		tests/{,test_asyncio/}test_graph.py
-		tests/{,test_asyncio/}test_json.py
-		tests/{,test_asyncio/}test_timeseries.py
-		# apparently available only in "Redis Stack 7.2 RC3 or later"
-		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
-		tests/test_commands.py::TestRedisCommands::test_tfunction_list
-		tests/test_commands.py::TestRedisCommands::test_tfcall
-		# TODO
-		tests/test_commands.py::TestRedisCommands::test_module
-		tests/test_commands.py::TestRedisCommands::test_module_loadex
-		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	if has_version ">=dev-db/redis-7"; then
-		local extra_conf="
-			enable-debug-command yes
-			enable-module-command yes
-		"
-	fi
-
-	# Spawn Redis itself for testing purposes
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1 ::1
-		${extra_conf}
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis/redis-5.2.0.ebuild b/dev-python/redis/redis-5.2.0.ebuild
index 666599dc2f14..a61d1a428330 100644
--- a/dev-python/redis/redis-5.2.0.ebuild
+++ b/dev-python/redis/redis-5.2.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/regress/regress-2024.11.1.ebuild b/dev-python/regress/regress-2024.11.1-r1.ebuild
index 88183a291842..88183a291842 100644
--- a/dev-python/regress/regress-2024.11.1.ebuild
+++ b/dev-python/regress/regress-2024.11.1-r1.ebuild
diff --git a/dev-python/regress/regress-2024.8.1.ebuild b/dev-python/regress/regress-2024.8.1-r1.ebuild
index 889b069c3c3b..889b069c3c3b 100644
--- a/dev-python/regress/regress-2024.8.1.ebuild
+++ b/dev-python/regress/regress-2024.8.1-r1.ebuild
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 4009b1862fa2..9871c75a901f 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,2 +1,2 @@
-DIST rich-13.9.2.gh.tar.gz 15063908 BLAKE2B c83f736630a7bfbccda7d790476e7a9f518f2fa4e6bb3d4f5190bdeae784571875066c94bd8f4e01117b45a7eee83e9072bb7bb64ab5d5d8675aac5a63d5b0b5 SHA512 468e8f758c374264a77be154dde8908e04502cf8dfdc442dacfaebaaf9f1fbf634ae8dcbcefe42f7562183532a372aebebcdcb03c90031f619a8c5f2cd78f653
+DIST rich-13.7.1.gh.tar.gz 15058064 BLAKE2B 6fad18bf0a4e4f72e530c78db7a498f27dd8c9a7b9b17ca5ef12a94bbe513857f3c42d4903f8ebbfe8907727cddaf290f08862c27efb29db8aaf70c7bcb13ace SHA512 0c69101bc6c2a238a4c516812cda08299115b903b8282ee348b45b212a88fcbfbf69d11a3705a97bdb6192988ee3047804bb5b52b7950d860542cde8ce2d4bd2
 DIST rich-13.9.3.gh.tar.gz 15064090 BLAKE2B 4ef76583ed13692b9f4a9714a68186fd06262e76d691f79cd256b4ab153052efd5fdf2320df797683ea1765cf063215a6b2d2614cd8040ebed0b89178cdcf2e0 SHA512 ca74d59e5df0476b482f60fac8d1f2e0810ffa61a10d410ff188c82548df3307405119f3b18992d96b01458b921ebcd61c99bf68dd808358395e9b04cf78579b
diff --git a/dev-python/rich/rich-13.9.2.ebuild b/dev-python/rich/rich-13.7.1.ebuild
index 1331940a83d8..a786c0768469 100644
--- a/dev-python/rich/rich-13.9.2.ebuild
+++ b/dev-python/rich/rich-13.7.1.ebuild
@@ -26,9 +26,6 @@ RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
 	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/rich/rich-13.9.3.ebuild b/dev-python/rich/rich-13.9.3.ebuild
index 394f7a04fbcf..1331940a83d8 100644
--- a/dev-python/rich/rich-13.9.3.ebuild
+++ b/dev-python/rich/rich-13.9.3.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"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/rpds-py/rpds-py-0.19.1.ebuild b/dev-python/rpds-py/rpds-py-0.19.1-r1.ebuild
index 3b3b881dcbb8..c22dd8993a8d 100644
--- a/dev-python/rpds-py/rpds-py-0.19.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.19.1-r1.ebuild
@@ -35,6 +35,8 @@ CRATES="
 	unindent@0.2.3
 "
 
+RUST_MIN_VER="1.77.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
@@ -52,10 +54,6 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-BDEPEND="
-	>=virtual/rust-1.76.0
-"
-
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
 distutils_enable_tests pytest
diff --git a/dev-python/rpds-py/rpds-py-0.20.1.ebuild b/dev-python/rpds-py/rpds-py-0.20.1-r1.ebuild
index 70a6e5bcdf63..ad6865495f97 100644
--- a/dev-python/rpds-py/rpds-py-0.20.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.20.1-r1.ebuild
@@ -34,6 +34,8 @@ CRATES="
 	unindent@0.2.3
 "
 
+RUST_MIN_VER="1.77.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
@@ -51,10 +53,6 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-BDEPEND="
-	>=virtual/rust-1.76.0
-"
-
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
 distutils_enable_tests pytest
diff --git a/dev-python/rpds-py/rpds-py-0.21.0.ebuild b/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild
index 7e7395d68943..8eae4938a60c 100644
--- a/dev-python/rpds-py/rpds-py-0.21.0.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.21.0-r1.ebuild
@@ -34,6 +34,8 @@ CRATES="
 	unindent@0.2.3
 "
 
+RUST_MIN_VER="1.77.1"
+
 inherit cargo distutils-r1 pypi
 
 DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
@@ -51,10 +53,6 @@ LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
-BDEPEND="
-	>=virtual/rust-1.76.0
-"
-
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.12.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.12.ebuild
index 2602f1b1a5b4..405ff4175de4 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.12.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.12.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/ruamel_yaml_clib
 
 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="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/rustworkx/rustworkx-0.14.2-r1.ebuild b/dev-python/rustworkx/rustworkx-0.14.2-r2.ebuild
index a1afe69431be..a1afe69431be 100644
--- a/dev-python/rustworkx/rustworkx-0.14.2-r1.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.14.2-r2.ebuild
diff --git a/dev-python/rustworkx/rustworkx-0.15.0.ebuild b/dev-python/rustworkx/rustworkx-0.15.0-r1.ebuild
index 2a8f193d4649..2a8f193d4649 100644
--- a/dev-python/rustworkx/rustworkx-0.15.0.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.15.0-r1.ebuild
diff --git a/dev-python/rustworkx/rustworkx-0.15.1.ebuild b/dev-python/rustworkx/rustworkx-0.15.1-r1.ebuild
index 16398a7888c3..16398a7888c3 100644
--- a/dev-python/rustworkx/rustworkx-0.15.1.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.15.1-r1.ebuild
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
index 6d06dd44ad18..7db4273e686c 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.10.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.10.2-r1.ebuild
index 99ad079e813d..00da2a81ad25 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.10.2.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.10.2-r1.ebuild
@@ -121,7 +121,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	virtual/rust
+	${RUST_DEPEND}
 	<dev-python/semantic-version-3[${PYTHON_USEDEP}]
 	>=dev-python/semantic-version-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 16d60f311986..a289bd55b4db 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,2 +1 @@
-DIST sphinx-autoapi-3.3.2.gh.tar.gz 71874 BLAKE2B ec92e3a4d3a7b2597a7224201e7ea443dbc6408e43933a54a24fdcb4968fe4e5d295374ea310c600ecf0893a3692a5d4645eafec8bf2a12566de057193eef073 SHA512 6532655408bde105377de1d87cb2f392524935499f45b77afefcfe0fb1b04e8251dce71d338e030537469520774fb8155f91fbe747181ea721a4477fcdebfa3a
 DIST sphinx-autoapi-3.3.3.gh.tar.gz 72123 BLAKE2B 85b7c8f1eae4d9366f8e8afd526bdb5e6c0e3f14de44c9e94f4922e021bd15f31117942dc1c542a903c1fa4b3f138e0eacbfaccc744bf28c211283acbfc4268c SHA512 c6de80ceb7b394627ca19dbd59e8f7361ff1d14b5ab401134d149131b69f6be05348189ae97dcc6daa6e99276a99072d62990a8594be653d449659b556d86655
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
deleted file mode 100644
index 3fabccbf5a96..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-# sdist is missing docs, as of 2.1.0
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/python/test_pyintegration.py::TestPEP695::test_integration
-		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
-		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
-	)
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
index d9fdd1ae5dba..888a73ecfd0f 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.3.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlglot/sqlglot-25.29.0.ebuild b/dev-python/sqlglot/sqlglot-25.28.0-r1.ebuild
index 3bab78f5b721..53563e0e4141 100644
--- a/dev-python/sqlglot/sqlglot-25.29.0.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.28.0-r1.ebuild
@@ -81,6 +81,10 @@ distutils_enable_tests pytest
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
 
+pkg_setup() {
+	use native-extensions && rust_pkg_setup
+}
+
 src_unpack() {
 	cargo_src_unpack
 }
diff --git a/dev-python/sqlglot/sqlglot-25.28.0.ebuild b/dev-python/sqlglot/sqlglot-25.29.0-r1.ebuild
index 3bab78f5b721..53563e0e4141 100644
--- a/dev-python/sqlglot/sqlglot-25.28.0.ebuild
+++ b/dev-python/sqlglot/sqlglot-25.29.0-r1.ebuild
@@ -81,6 +81,10 @@ distutils_enable_tests pytest
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/sqlglotrs/sqlglotrs.*.so"
 
+pkg_setup() {
+	use native-extensions && rust_pkg_setup
+}
+
 src_unpack() {
 	cargo_src_unpack
 }
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index e810092d14f1..3370b65308d0 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,4 +1,2 @@
 DIST starlette-0.39.2.gh.tar.gz 2573134 BLAKE2B e6cd3bd3e2c2fac96d8b145ffae3a680d775a7668d9baf4db09ab81036985c8c0f5cdc6505f6db56f51126013118568c75d6f0dd6c28ea330baf575a5ff7c004 SHA512 2e81e61451136802449baafd152bf6db9cdad9a111713efb16ccef419aeb9a99b004167cd890509bad613df12d300cb5531197867c594c2b755220a1dae7bf14
-DIST starlette-0.41.0.gh.tar.gz 2573744 BLAKE2B 34e96fdb97eaf9fd2de66587c5fdd877d572269ada720f7d0e9f7d3befb4e500210236d84bb2d5eb4de49e7bc005485085671d47f3885c55eed6032ef98ebda7 SHA512 9640a6117c252bdad7f065c374e09eda56f1c2c2bd2d38748000651aeb4ce92f519c9598b8dec8579810adfcd7a58173ccfdf4e2c1953f2609aca520c5b45551
-DIST starlette-0.41.1.gh.tar.gz 2573805 BLAKE2B dd883e9247cf60ca98250c59640215e065513684321a8e7dceabc2681ad092939c50462ada8c5e50a6c6f7a46cc75439e164daaab045e0e218b9185ec885b21c SHA512 1b02527826534404c4f9a7a6f26d16a618d72e11f1a1bd5e7188928a76e5070c7f6ede488226247782c948948002e4d1556cabb41ff208a8d229f2eea2d61342
 DIST starlette-0.41.2.gh.tar.gz 2573909 BLAKE2B 387665e21586ec43a3683f30c111fe77ad71a7f1c8dfea13f50fae9a9315e6a00ede22f5a1c55cd05210e4996a834b2d3d60c001899905a002e11cb09b5e60c8 SHA512 7ef590fdd7bebcae54f203acf57cf086a85653b0286aa7dc5eac92c67f846e04961680234234cfd2a6d57c12678b2ce76763c39e96caed984a1220558090303c
diff --git a/dev-python/starlette/starlette-0.41.0-r1.ebuild b/dev-python/starlette/starlette-0.41.0-r1.ebuild
deleted file mode 100644
index 822ca94c0a0f..000000000000
--- a/dev-python/starlette/starlette-0.41.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	<dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.41.0-r2.ebuild b/dev-python/starlette/starlette-0.41.0-r2.ebuild
deleted file mode 100644
index fe95d166535b..000000000000
--- a/dev-python/starlette/starlette-0.41.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# python-multipart package renamed in Gentoo to python_multipart
-	sed -e "s:from multipart:from python_multipart:" \
-		-e "s:import multipart:import python_multipart as multipart:" \
-		-i starlette/*.py || die
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.41.1.ebuild b/dev-python/starlette/starlette-0.41.1.ebuild
deleted file mode 100644
index d6971f531a67..000000000000
--- a/dev-python/starlette/starlette-0.41.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.13[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index d4df55323d89..285edb98d09a 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,3 +1,2 @@
 DIST css-parsing-tests-43e65b244133f17eb8a4d4404d5774672b94824f.gh.tar.gz 35943 BLAKE2B 69a3dd9e638d04b498c28bf8367e1d0bfe1876e8bcdfc6796f5b5715425f943e6308afa7774a5af5e6d3b3d5cd4f8424fa2809bdf0ecdadddfcfd36354986d82 SHA512 ed83bf447a595d754bbae9fcf25c3d2b4812f99b65c5e46b39d5f7ade57d49b4ffded9bc9d1cfef0a50b078f8ceb9bedb1d4f2f9ebf6db875eaad6c956b4f1d5
-DIST tinycss2-1.3.0.tar.gz 67360 BLAKE2B f39eaaaafe2be20d2d420977e8d2d80c0e1817c277e14c57b155f1dafa54191ac2aed6908b038da5c03b4cbed66b626af432160699152800ebe2d7823e1685ed SHA512 d215ba2d8c580ca785bc2c3e33c8ae220c085e3ec1b932c01f81e176987c48559867af186056e2c501541d1d337b4fc33eea7ff2feba490e81076608b7c3aaee
 DIST tinycss2-1.4.0.tar.gz 87085 BLAKE2B c1aa1edb8ea5ae2fc3d68d4e9efd6aa057513064c9da6c2e528c4e1b3efc5f13837cf161a793d656c13451601b9cc7825af315b74616b26b42f4d3c2e9098f5a SHA512 be0faac6fc55113c4a110d6cd23714867f3f4c33829cadcc8619b1c7b801bc009501cd0f0f7b3d21040129526633ef1f956ef6cb2ca8955d32f2b0b11f875d92
diff --git a/dev-python/tinycss2/tinycss2-1.3.0.ebuild b/dev-python/tinycss2/tinycss2-1.3.0.ebuild
deleted file mode 100644
index ab09d53538df..000000000000
--- a/dev-python/tinycss2/tinycss2-1.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-CSS_TEST_COMMIT_ID=43e65b244133f17eb8a4d4404d5774672b94824f
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="
-	https://www.courtbouillon.org/tinycss2/
-	https://github.com/Kozea/tinycss2/
-	https://pypi.org/project/tinycss2/
-"
-SRC_URI+="
-	test? (
-		https://github.com/CourtBouillon/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
-			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/webencodings-0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if use test; then
-		mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
-			tests/css-parsing-tests/ || die
-	fi
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tinycss2/tinycss2-1.4.0.ebuild b/dev-python/tinycss2/tinycss2-1.4.0.ebuild
index ec671a575183..ab09d53538df 100644
--- a/dev-python/tinycss2/tinycss2-1.4.0.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.4.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/webencodings-0.4[${PYTHON_USEDEP}]
diff --git a/dev-python/tokenize-rt/Manifest b/dev-python/tokenize-rt/Manifest
index ea05fb1ff384..d9eb2e0e9c69 100644
--- a/dev-python/tokenize-rt/Manifest
+++ b/dev-python/tokenize-rt/Manifest
@@ -1,2 +1 @@
-DIST tokenize-rt-6.0.0.gh.tar.gz 7509 BLAKE2B e652a394062fa9965e525430e021a36c9411848dcc1e7283d64692cb349eb5714fd8bce6db0098cd01461a75e638141a18a918befee80a01764ba9d152d1d1da SHA512 40a98a2a6090afa095b4933c63e4ac9dd5b4643a1e804f9ec31956cfc1cff0100a884d62c52c4c769a5810e72ab83b62f5c76cb030e48eced67670b408429cd0
 DIST tokenize-rt-6.1.0.gh.tar.gz 7780 BLAKE2B c83a669abf7291981f3f240483ecad50852c375bb232bb530d58a527af92f7f984b5f0860068a2852b3fdd8c748c43531d450cd2f9da9345548bf76c351f31e6 SHA512 7cc6b4e37598269c265bcff6cc182f022369cbf0d9f7cb9606dbd251dd6557912d0427a7feb1c98f021dea4c528e1df8cc5459149a0d152fc7150e174636dad4
diff --git a/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild b/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild
deleted file mode 100644
index 0ac19b750b9d..000000000000
--- a/dev-python/tokenize-rt/tokenize-rt-6.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around the stdlib 'tokenize' which roundtrips"
-HOMEPAGE="
-	https://github.com/asottile/tokenize-rt/
-	https://pypi.org/project/tokenize-rt/
-"
-SRC_URI="
-	https://github.com/asottile/tokenize-rt/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tokenize-rt/tokenize-rt-6.1.0.ebuild b/dev-python/tokenize-rt/tokenize-rt-6.1.0.ebuild
index 07266d5899bf..0ac19b750b9d 100644
--- a/dev-python/tokenize-rt/tokenize-rt-6.1.0.ebuild
+++ b/dev-python/tokenize-rt/tokenize-rt-6.1.0.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 68639aa78049..f264b340aa0e 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-4.22.0.tar.gz 189907 BLAKE2B 8a3ff89838a532b4cb42b4624d56d9d008319198b61edcf6ebcc609296b9d358b91ba17c262b17893321d5737c5ed51c23b495348d084e8712142e77b9c4af1a SHA512 5bce8cbc826f2cfc54b2824e023fdef21120183a65688113a956691759b885c22135fcce551e3cf0430412d6f85ccd7ec568495e47e7645766049ed0a55fae97
 DIST tox-4.23.2.tar.gz 189998 BLAKE2B 776b653388a4b0578b5e5fd7957e97e1b3591d6239a23fe232238a7ce64a9adc641bbd5d3d4585ebb094da7c487da2b0875a466d62e27a9686317cc38a9b2491 SHA512 5008964ebed3c94a6ad5f0985150c7bf73fd3996b91171b16323d195bf0288102aac0dc38848bd4c63e5c5678ab1a82c170579139eda97132a4555eb11d381a0
diff --git a/dev-python/tox/tox-4.22.0.ebuild b/dev-python/tox/tox-4.22.0.ebuild
deleted file mode 100644
index 9d1ec5259468..000000000000
--- a/dev-python/tox/tox-4.22.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/pyproject-api[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/virtualenv[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/distlib[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/re-assert[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream lower bounds are meaningless
-	sed -i -e 's:>=[0-9.]*::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_run_installpkg_targz
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[constraints-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[explicit+requirements-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_indirect-True-True]'
-				'tests/tox_env/python/pip/test_pip_install.py::test_constrain_package_deps[requirements_constraints_indirect-True-True]'
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/tox-dev/tox/issues/3290
-				'tests/config/loader/test_str_convert.py::test_str_convert_ok_py39[1,2-value1-Optional]'
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.23.2.ebuild b/dev-python/tox/tox-4.23.2.ebuild
index 199330ea36bf..9d1ec5259468 100644
--- a/dev-python/tox/tox-4.23.2.ebuild
+++ b/dev-python/tox/tox-4.23.2.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"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 6ae5603707dd..0a5af0537dad 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,2 +1 @@
-DIST trove_classifiers-2024.10.16.tar.gz 16113 BLAKE2B 7ab9b0d16d93abeb4cf272bacdbf946cb85f3544c028860bfa2163f883e62868fb5a8356186dd59d2fec98b8dd06578aea0a60f02304f2ce555d7fa6fd5bc283 SHA512 7d67947c12e2fbe8a3d380e50e22671cc538593e0bf752955b84f74018c364dcc56553727dc53a540da713df5db73601acdc1e1cd608f55a968b9ec48a04d9ee
 DIST trove_classifiers-2024.10.21.16.tar.gz 16153 BLAKE2B 9170a2f78b41d2d6793a5bbf7df7ce2ae4c1d70a193a92874bf74cad5a083d8153a9cd8ae42c85da3cdedc690c485aff8d864626efdb52965301f2a377ebb048 SHA512 4fca7cc5d172ddcb210bfbd6e993fc3d7243887762ba37c05aca3d6c5fcece8f573372704160c8048eb39c68d284fe808ca289c8c07564b06334bed6bafdc61e
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.10.16.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.10.16.ebuild
deleted file mode 100644
index 210ea9d4e7d5..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2024.10.16.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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)."
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.10.21.16.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.10.21.16.ebuild
index d3efb3b1e483..210ea9d4e7d5 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2024.10.21.16.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2024.10.21.16.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/truststore/Manifest b/dev-python/truststore/Manifest
index 787939f6b3c7..850407ee7ada 100644
--- a/dev-python/truststore/Manifest
+++ b/dev-python/truststore/Manifest
@@ -1,2 +1 @@
 DIST truststore-0.10.0.gh.tar.gz 28644 BLAKE2B cf83a6936e361bb08f399ea5f6739acbe254dab380b06cf4befab8e1084e01d0757afd02eb0b9718963b4249280e2fa629b079eea143a7d3c5bda3767d4e0611 SHA512 eb1b16f093f32ff8be29bb696e92843823a8ffe2e7428ea989ee987d94d7328b5c40d6d8e5aa25eb223ca348ca30b29018decaec11d6106221753fd4525aa5b0
-DIST truststore-0.9.2.gh.tar.gz 27256 BLAKE2B 0f03da308697a6bcf8def97b875a962f484418dc6b54d6795a9de5dc68b949f145e6611aa6b4bebcde3f03693bbdfaaa238a9d32b5f9b2d635b4e3075420f239 SHA512 e2d9da3d22a2f06d83dd9c7c9014dd689d8e915c7c8b8b33a3526859d15e9a5d4e86162f51f22b566e844a0c6a5b16fa3ab6907a56ce11c4fcc27444493a5970
diff --git a/dev-python/truststore/truststore-0.10.0.ebuild b/dev-python/truststore/truststore-0.10.0.ebuild
index c87af7680172..25d831b5421b 100644
--- a/dev-python/truststore/truststore-0.10.0.ebuild
+++ b/dev-python/truststore/truststore-0.10.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 # The vast majority of tests require Internet access.
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-python/truststore/truststore-0.9.2.ebuild b/dev-python/truststore/truststore-0.9.2.ebuild
deleted file mode 100644
index efe76cac1590..000000000000
--- a/dev-python/truststore/truststore-0.9.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2023-2024 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
-
-DESCRIPTION="Verify certificates using native system trust stores"
-HOMEPAGE="
-	https://github.com/sethmlarson/truststore/
-	https://pypi.org/project/truststore/
-"
-SRC_URI="
-	https://github.com/sethmlarson/truststore/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~sparc x86"
-# The vast majority of tests require Internet access.
-PROPERTIES="test_network"
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p pytest_httpserver
-}
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 80255a51d423..b713b4b07db1 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,3 +1 @@
-DIST types-psutil-6.0.0.20241011.tar.gz 15222 BLAKE2B 1bbe0dc93b61aa67d5730467396dab3eea57007d7a01a38fd339ed7ca0438239865936ad62fcf070e34a45c728382cb1dd840cb61a52cc2cb589d8da1412634c SHA512 b6688918ae07c8cce2a59cbb616f5187dd14d263f57fb9371732bb509c3ec2514b254a1f92a6320a3056477de4d3c8d6de871dceb6f018603316a3325022902f
-DIST types-psutil-6.1.0.20241022.tar.gz 15360 BLAKE2B afda82e6112e3095dd5af78c9b97da9f2d89333d7ef257b8d95bdac78c264abfda4ef190c91d025ec159298c33ab4fdb9bf1f52cfe9c40d62c6385b2f35b7c14 SHA512 1da1faa70c4bc8ea0b488326f8e2810eaf712a7b50192c7f0df78aff36b17e2d93bfc42e3c964e972be82249865d973cff1f0da0b39039747b303bd0a9d83d23
 DIST types-psutil-6.1.0.20241102.tar.gz 15447 BLAKE2B d4e97ecfd3c1b812b1eb6f193dba37cfc58d5d12f732e3269287f1df62a307e717d2772fb3e5af4bbd6b25a44b5898aa8c90826aa0a2f21b1d8d193f876a442a SHA512 e772f8063d71871ce18b96347eca8af7c7c2e53fd2eda154690b6d36d7c0f40379dda889b2fc04735ccf4ffcc9afea8bd3ca453c7fd92e664b4f901b0f0a995d
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
deleted file mode 100644
index 089bf01897f0..000000000000
--- a/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for psutil"
-HOMEPAGE="https://pypi.org/project/types-psutil/"
-
-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-psutil/types-psutil-6.1.0.20241022.ebuild b/dev-python/types-psutil/types-psutil-6.1.0.20241022.ebuild
deleted file mode 100644
index 5607455cf106..000000000000
--- a/dev-python/types-psutil/types-psutil-6.1.0.20241022.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for psutil"
-HOMEPAGE="https://pypi.org/project/types-psutil/"
-
-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-psutil/types-psutil-6.1.0.20241102.ebuild b/dev-python/types-psutil/types-psutil-6.1.0.20241102.ebuild
index 5607455cf106..089bf01897f0 100644
--- a/dev-python/types-psutil/types-psutil-6.1.0.20241102.ebuild
+++ b/dev-python/types-psutil/types-psutil-6.1.0.20241102.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 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/uv/Manifest b/dev-python/uv/Manifest
index 5d15e91d0bd0..7f3cc1637cf8 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -5,4 +5,4 @@ DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c3
 DIST uv-0.4.30-crates.tar.xz 45786704 BLAKE2B 72a5828c5c504859248312e0d796a6505e4d0546218c8f7f99e37843afdf9496ea1ba4b1f094979299de417accca7f021e4f8971e467429e7d986ed9a3fb2008 SHA512 49abd05fa9e14b1bdb1b4d26f1e68a2038d57bd25c756440bca209b513de42fd8d33ce6e1333392dce65ab427285651809b44e024758359688af5fb87efc19ed
 DIST uv-0.4.30.gh.tar.gz 2832043 BLAKE2B 11c0d090161b9aa6d6e84d0edb15701c8eaba8281579653d6b0ba84003933f82ec5b71c3c33689e5324e51de70b7af41e4799f35fb45f57ce6d58fafa371a615 SHA512 4930c863aae71ae6e6f5b7ba20ff30ffe4c044f6980f973110d0c8c3079cb4aacbe774fe4577eb8d9c16f5d41d2cd0974c0fe63cf0d10e065c6b8d4cf553b80b
 DIST uv-0.5.0-crates.tar.xz 45831504 BLAKE2B 0a95463b47729d40cdaf852ba556626ed3a1d2122f5d5a8bc6c401b95c836fa0ac0726f2aeaceb10346d65c0aa3c5250598c3219244fc3b957d26ee16968d443 SHA512 b991d9aeeec6b4e5d3f3f11a51c66f929560cc75bfc9379f090ba75b243056d4cf174326f8cb31b7aefd7e60e445e05b6799d9d7a8021b0893de436dafb384ab
-DIST uv-0.5.0.gh.tar.gz 2836911 BLAKE2B 326279605229675237d239fe5395436cfaa90026011e8195feeedb84333dd96f9fe5a860073776b3c3b2e0c2604d134572322e8ab12f5b72561213b6a2705a65 SHA512 6b9527d650492ccb465167e9e3087482a083997bef5b3dd494b7122a0b176762c2526819278867f42e205a93f283a955879f2431005265db7e808018ac8e3f51
+DIST uv-0.5.1.gh.tar.gz 2839701 BLAKE2B 5b4ec310a9979583b1f75355ed7a69f9b40ee397464c031b2ec36a1852e9d60b66223719cda6d6f3edff1901e60426bd0e662da7c346082a9d8889ef8b411bec SHA512 eb60061df14a6fee3295097af92bb63b71bc61f56d422db2fe6d61b7d65eba002aed57115e1ffa9e6382fc4b29a38c2e4821e9a75e1114594751dea6e8a02d0e
diff --git a/dev-python/uv/uv-0.4.30.ebuild b/dev-python/uv/uv-0.4.30-r1.ebuild
index 8ce7f04ec3be..4d826c5cfb40 100644
--- a/dev-python/uv/uv-0.4.30.ebuild
+++ b/dev-python/uv/uv-0.4.30-r1.ebuild
@@ -15,6 +15,8 @@ declare -A GIT_CRATES=(
 	[version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges'
 )
 
+RUST_MIN_VER="1.80.1"
+
 inherit cargo check-reqs
 
 CRATE_PV=${PV}
@@ -60,7 +62,6 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	>=virtual/rust-1.80
 	test? (
 		dev-lang/python:3.8
 		dev-lang/python:3.9
@@ -84,6 +85,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	check_space
+	rust_pkg_setup
 }
 
 src_prepare() {
diff --git a/dev-python/uv/uv-0.5.0.ebuild b/dev-python/uv/uv-0.5.1.ebuild
index e67a3e7e521e..cf59953b7c5b 100644
--- a/dev-python/uv/uv-0.5.0.ebuild
+++ b/dev-python/uv/uv-0.5.1.ebuild
@@ -15,9 +15,11 @@ declare -A GIT_CRATES=(
 	[version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges'
 )
 
+RUST_MIN_VER="1.80.1"
+
 inherit cargo check-reqs
 
-CRATE_PV=${PV}
+CRATE_PV=0.5.0
 DESCRIPTION="A Python package installer and resolver, written in Rust"
 HOMEPAGE="
 	https://github.com/astral-sh/uv/
@@ -60,13 +62,13 @@ RDEPEND="
 	${DEPEND}
 "
 BDEPEND="
-	>=virtual/rust-1.80
 	test? (
 		dev-lang/python:3.8
 		dev-lang/python:3.9
 		dev-lang/python:3.10
 		dev-lang/python:3.11
 		dev-lang/python:3.12
+		!!~dev-python/uv-0.5.0
 	)
 "
 
@@ -84,6 +86,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	check_space
+	rust_pkg_setup
 }
 
 src_prepare() {
@@ -134,6 +137,8 @@ src_test() {
 	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
 	local -x COLUMNS=100
 	local -x PYTHONDONTWRITEBYTECODE=
+	# fix tests failing because of our config
+	local -x XDG_CONFIG_DIRS=${T}
 
 	cd crates/uv || die
 	cargo_src_test --no-fail-fast
@@ -143,7 +148,7 @@ src_install() {
 	cd crates/uv || die
 	cargo_src_install
 
-	insinto /etc/uv
+	insinto /etc/xdg/uv
 	newins - uv.toml <<-EOF || die
 		# By default ("automatic"), uv downloads missing Python versions
 		# automatically and keeps them in the user's home directory.
diff --git a/dev-python/watchfiles/watchfiles-0.23.0.ebuild b/dev-python/watchfiles/watchfiles-0.23.0-r1.ebuild
index 33e74b5a2dd0..33e74b5a2dd0 100644
--- a/dev-python/watchfiles/watchfiles-0.23.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.23.0-r1.ebuild
diff --git a/dev-python/watchfiles/watchfiles-0.24.0.ebuild b/dev-python/watchfiles/watchfiles-0.24.0-r1.ebuild
index 0e75853ec48b..0e75853ec48b 100644
--- a/dev-python/watchfiles/watchfiles-0.24.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.24.0-r1.ebuild
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index dc0921f21455..3f01fe45d047 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,2 +1 @@
-DIST webob-1.8.8.tar.gz 279035 BLAKE2B 61bbcc71763feccbd7a39b2649024c8d7a49ab5602fd638b4a895900395cd54bb6b0885e0bdeccd6504f5cc3162f7e198e94016b98836dbed4ed608605251052 SHA512 13093e77591a3bdb36e8f30a5d40922120d949faf24e3322b0116f1a14483180772b22c82237b0db4a17a914c2c99509847a9f2a717de09b4bffa55fa5269838
 DIST webob-1.8.9.tar.gz 279775 BLAKE2B 1442fb0cac7a5a55582956a89b998beb8b7e0cc75a7b09e8767ca2064c60a51102a5f8d08cd3d854c560f38448bea439acffa096b392811ba8941b9fa543e539 SHA512 ed5d91f864572b4bbeaa2aa6ada98285d597f83bc14613e62defb6fd6617986aa63534f0962d8045866471f8dfa09c803a5f2105efb84e5f618db6eeb804b9a1
diff --git a/dev-python/webob/webob-1.8.8.ebuild b/dev-python/webob/webob-1.8.8.ebuild
deleted file mode 100644
index f65a5d526aed..000000000000
--- a/dev-python/webob/webob-1.8.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN="WebOb"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="WSGI request and response object"
-HOMEPAGE="
-	https://webob.org/
-	https://github.com/Pylons/webob/
-	https://pypi.org/project/WebOb/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/legacy-cgi[${PYTHON_USEDEP}]
-	' 3.13)
-"
-
-distutils_enable_sphinx docs 'dev-python/alabaster'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# py3.9
-	sed -i -e 's:isAlive:is_alive:' tests/conftest.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/webob/webob-1.8.9.ebuild b/dev-python/webob/webob-1.8.9.ebuild
index d36db8c7c39b..01fe61abcef3 100644
--- a/dev-python/webob/webob-1.8.9.ebuild
+++ b/dev-python/webob/webob-1.8.9.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/wheel/Manifest b/dev-python/wheel/Manifest
index a6de1d3543f7..54658571ff05 100644
--- a/dev-python/wheel/Manifest
+++ b/dev-python/wheel/Manifest
@@ -1 +1,2 @@
 DIST wheel-0.44.0.tar.gz 100733 BLAKE2B 6beefa0875be52fb2dff2921cb87063bcafdf2e31c43963676fbae8aef4e68ea21675aa715f94052edc9f5e8dbbd5e2afe3abc17f521eb36b24fa628b0522bbe SHA512 f0a1efbf70e8a2eebdf7564932bdfa3892940a3fbfc00f256f61be03a51ff9cc5a55570d1d3f5878670be84ab233483453ce754ea46c508574fcf4ec61d480c8
+DIST wheel-0.45.0.tar.gz 107426 BLAKE2B 57cfbe247bbc2f0598a3ee18a1ab4b309e6ec6eb89486391bc7b5baa148736829b2620d05f1c6f75b0743ee1065ccbdc66ce690ee7efcf5f2b58519eb4cc8b25 SHA512 dca95cadde7c551baebde50f66ca79d4205d0a896da34b7f4f103c62fb72f78c0b9e71933564b951ab3878e6bc47d1961a73545bc0ead45e618de33b6b7cb16a
diff --git a/dev-python/wheel/wheel-0.45.0.ebuild b/dev-python/wheel/wheel-0.45.0.ebuild
new file mode 100644
index 000000000000..816d213fe7b4
--- /dev/null
+++ b/dev-python/wheel/wheel-0.45.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A built-package format for Python"
+HOMEPAGE="
+	https://github.com/pypa/wheel/
+	https://pypi.org/project/wheel/
+"
+
+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"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# fails if any setuptools plugin imported the module first
+	tests/test_bdist_wheel.py::test_deprecated_import
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle packaging
+	rm -r src/wheel/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:wheel\.vendored\.::' \
+		-e 's:\.\+vendored\.::' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index 66cf238ba8cc..db0ad199df00 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,3 +1 @@
-DIST wtforms-3.1.2.tar.gz 134705 BLAKE2B 748ea71ced149220947d0f54d69cc94b3cd8a2e648551556621082418a7555519b275788b961abca1331e6c6d52c1999451cc26b3bc9ab27261ef25de7ffd9fa SHA512 4c4203c735f755cedf9c20ddf9805d1e80096fe2fb499dc91a9608df0ac5eb0ddf6c67eea782f9507d14b14e362454f50b567dc5518ca95ce090305a44436873
-DIST wtforms-3.2.0.tar.gz 137750 BLAKE2B cab28b7016fc73958d56f5580aae80ab72acfecf3f4f7d17021d760db396644d6581f3ff6b0ff07193359d0ffa22523b22cc70c28843f9add8cd5d6cc601b04f SHA512 afa684eefb08f437624b3a1e04327f3497d1067033ef6782fd9470bfe3ff10f84b99294a2fb48800fa3de6e188a6285ca63ba696e74a222c55c1d9e030babe2a
 DIST wtforms-3.2.1.tar.gz 137801 BLAKE2B 91deeb5a2b3ef07bec48c55a4aaef92969d6c731d91874ecf5260f2228be8ef0fdee32c61e4f5233a953f4c0be4359f1e98a87c4bf87975780b6be00b8717283 SHA512 96aa2934e39f95f2a2d0db4cd8026215cb0adea2df9bd235305b2857f2e5eecc3ea4e959ff1c1d46090213d348bccf70df19efaf73059074d1f02c577cbb1fdf
diff --git a/dev-python/wtforms/wtforms-3.1.2.ebuild b/dev-python/wtforms/wtforms-3.1.2.ebuild
deleted file mode 100644
index b66e0df0a596..000000000000
--- a/dev-python/wtforms/wtforms-3.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYPI_PN="WTForms"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="
-	https://wtforms.readthedocs.io/
-	https://github.com/wtforms/wtforms/
-	https://pypi.org/project/WTForms/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/email-validator[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wtforms/wtforms-3.2.0.ebuild b/dev-python/wtforms/wtforms-3.2.0.ebuild
deleted file mode 100644
index 84276d074916..000000000000
--- a/dev-python/wtforms/wtforms-3.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYPI_PN="WTForms"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Flexible forms validation and rendering library for python web development"
-HOMEPAGE="
-	https://wtforms.readthedocs.io/
-	https://github.com/pallets-eco/wtforms/
-	https://pypi.org/project/WTForms/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/email-validator[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/wtforms/wtforms-3.2.1.ebuild b/dev-python/wtforms/wtforms-3.2.1.ebuild
index 84276d074916..0f468aa5585e 100644
--- a/dev-python/wtforms/wtforms-3.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-3.2.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/xarray-2024.10.0.ebuild b/dev-python/xarray/xarray-2024.10.0.ebuild
index 28cf501f49d9..1af35b73cc23 100644
--- a/dev-python/xarray/xarray-2024.10.0.ebuild
+++ b/dev-python/xarray/xarray-2024.10.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv ~x86"
 IUSE="big-endian"
 
 RDEPEND="
diff --git a/dev-python/yarl/yarl-1.16.0.ebuild b/dev-python/yarl/yarl-1.16.0.ebuild
index 638ce0f69079..59c822cae8d2 100644
--- a/dev-python/yarl/yarl-1.16.0.ebuild
+++ b/dev-python/yarl/yarl-1.16.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/zeroconf/zeroconf-0.136.0.ebuild b/dev-python/zeroconf/zeroconf-0.136.0.ebuild
index 0c00ccff1261..75671f09613e 100644
--- a/dev-python/zeroconf/zeroconf-0.136.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.136.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/zope-interface-7.1.1.ebuild b/dev-python/zope-interface/zope-interface-7.1.1.ebuild
index c40b2aeb3b46..973d5e89521a 100644
--- a/dev-python/zope-interface/zope-interface-7.1.1.ebuild
+++ b/dev-python/zope-interface/zope-interface-7.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+native-extensions"
 
 BDEPEND="