Adding metadata

88 files changed, 610 insertions, 1785 deletions

diff --git a/dev-python/Faker/Faker-25.0.1.ebuild b/dev-python/Faker/Faker-25.0.1.ebuild
deleted file mode 100644
index c75e86175fe0..000000000000
--- a/dev-python/Faker/Faker-25.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	local EPYTEST_DESELECT=(
-		tests/providers/test_job.py::TestCsCZ::test_job
-	)
-	epytest
-}
diff --git a/dev-python/Faker/Faker-25.1.0.ebuild b/dev-python/Faker/Faker-25.1.0.ebuild
index b50c6e807fe1..c75e86175fe0 100644
--- a/dev-python/Faker/Faker-25.1.0.ebuild
+++ b/dev-python/Faker/Faker-25.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index f0a5e50bb7de..26f611ffa075 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,2 @@
-DIST Faker-25.0.1.tar.gz 1759603 BLAKE2B 710c362ec8a077880d9728c75d775b318d2c3d65f1bb5488474b2c26fa48094a64e57f667c6b43d841224ced8c08ff98c87677d678e5fb738a3e17c941fcacf7 SHA512 0f0cfc86f76584320fc6ab0afae40da8c022b65fca07eff639ba9a89744814afc7f9e37c987a73d0ec025fa971c0468f3b8b026b16dc4a5813bacb9562a33384
 DIST Faker-25.1.0.tar.gz 1760306 BLAKE2B eb8a35853f8e70902d8ff59532cc8c5766f6986314b88afb973adfd6c8a0184ebcd9d1eecee1e9dd48bc393ba1270be88a3c3f463df8e0679aff7f00544cfd4d SHA512 6d53c843685d735664d6d986e8af76a520372900ea06cb54f86656ebb322d34543aa7aee8417cabb8c81a0ccc3ee3b212114790ff46aeb60cf29071bbf5c0361
 DIST Faker-25.2.0.tar.gz 1760547 BLAKE2B cba47dd21caaabef23212d38b856c67d9d68c6478f44269ed0da7df4aa06cd313caef1d8072572c2b680172e6a6313548228cbd446e397b6e29fd3e5317bc707 SHA512 bec0a516944f36a4714bcb9b8d46dbd4ab3fb3feb6d4818fd28e9d22d0cfd1621845f669940d41365ec423398ef58714e18de5ae537ce7524cf27018ab088c8f
diff --git a/dev-python/accessible-pygments/Manifest b/dev-python/accessible-pygments/Manifest
index 783a4e37143d..daa218becded 100644
--- a/dev-python/accessible-pygments/Manifest
+++ b/dev-python/accessible-pygments/Manifest
@@ -1,2 +1 @@
-DIST accessible-pygments-0.0.4.gh.tar.gz 4540933 BLAKE2B 1fdd376b9f069590552632a806f161404aeb3ae0c9b522705ea64476bccc97e3f888af270fba5e05680bb87e2d3283f2c93259c687e137efc56a38ca4d71b507 SHA512 b45b3c17bcfb2d66d397ee7e535c35159ab79080163f8ace286d73ea65a08f7e39c757414755d7f59bdae22a52198e26546ae61893bd9cd5c901d2e2b1efb2b1
 DIST accessible-pygments-0.0.5.gh.tar.gz 2273172 BLAKE2B ed07ecb1ef0d6dcc2b02383d1620c373bb54c65522752404a0e2e2382e374d35c11d7ad6978889b4fd20d4536b38d5ea951a2e6366725279123f5357ecff8a0a SHA512 2f5984c4f95a13dc566a0f916168fb293332f175da61f88ef7dcbc9f2bfcd8781d891b7830ed401839eef09ad65f7cbf94bb5a153bc5b4454ddf4c28573948d2
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.4.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.4.ebuild
deleted file mode 100644
index b7bdbcf073be..000000000000
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of accessible pygments styles"
-HOMEPAGE="
-	https://pypi.org/project/accessible-pygments/
-	https://github.com/Quansight-Labs/accessible-pygments/
-"
-SRC_URI="
-	https://github.com/Quansight-Labs/accessible-pygments/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	# it's more like a demo but at least checks if all themes can
-	# be loaded and run; we can't reasonably compare the results
-	# because they differ by pygments version a lot
-	"${EPYTHON}" test/run_tests.py || die
-}
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
index 9b4705342051..51e703a2eb5a 100644
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
+++ b/dev-python/accessible-pygments/accessible-pygments-0.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/babelfish/Manifest b/dev-python/babelfish/Manifest
index cd4c5efb1ad0..8f2f2b8c3934 100644
--- a/dev-python/babelfish/Manifest
+++ b/dev-python/babelfish/Manifest
@@ -1,2 +1 @@
-DIST babelfish-0.6.0.gh.tar.gz 90886 BLAKE2B deee75aef23cbcb7c64f385c303310e5ce1ef0a3180729e47e59b8e85015ff36360a4be74ef32869421c6d90cf185ad427a7d55b9ef3cf20f551233dae3d425f SHA512 9d3309e67815c301578533fdaf8baae946ba87148b458f7b01315203d2d4356dd770c1a0b7a0ffbba14036b77f1463d67e3b5732efa6682cb6afdae1a8fd0a4b
 DIST babelfish-0.6.1.gh.tar.gz 93127 BLAKE2B 6c1f56432671c0ad7b18401e78637acf8488fa2aa924a4df961403e570f1adbff6d868d6e8e3797e4b26a790b65b2aad8600fc7feb665bb3a73a6a5d4664865f SHA512 e5936b08f7ecf38beea3a2da2ee32cfd93f312548459c18370326a72011aed5ed8a1908b13a091979c3fe83a984b99f299ed6c3d39a47784b4d5c48145796d04
diff --git a/dev-python/babelfish/babelfish-0.6.0-r2.ebuild b/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
deleted file mode 100644
index ca45c27a061d..000000000000
--- a/dev-python/babelfish/babelfish-0.6.0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to work with countries and languages"
-HOMEPAGE="
-	https://github.com/Diaoul/babelfish/
-	https://pypi.org/project/babelfish/
-"
-SRC_URI="
-	https://github.com/Diaoul/babelfish/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/babelfish/babelfish-0.6.1.ebuild b/dev-python/babelfish/babelfish-0.6.1.ebuild
index 5418dde56297..96a9d2aadcf1 100644
--- a/dev-python/babelfish/babelfish-0.6.1.ebuild
+++ b/dev-python/babelfish/babelfish-0.6.1.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index eb82eff77879..7df48138b477 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,3 @@
 DIST boto3-1.34.103.gh.tar.gz 807394 BLAKE2B da291c86a8b20bcaac5f93779899bfa5c6ce207499df393cd921f37021c1c38ed0587edd2261cee8de7ce17264670f9cda072d6748f274e6f3d9b40caa499803 SHA512 3b879f88a145ca7ea7533e4d8aa77cec351f272c59fa119622dab061fd6354f88d33709bd1621802f38f19e8378505caa94b8a6b561d16f4a2aa168828021206
-DIST boto3-1.34.107.gh.tar.gz 809164 BLAKE2B ab11e6bd87ee2fa473e95fc1a135b90769fbde948ca7c9b4c5f1679a10036778ff37b1473e57dc957b5bfaa3a36bd05cd968bbd585f0ab92772aaec0bc3ae868 SHA512 388e1748480a7176b74ffe0142e2a9cd5e95c9badf054053f076ef4c5bd77f40d7052c457a5a671607d551473c0d82f26ea3f88e505127d642429bd4651c69db
 DIST boto3-1.34.108.gh.tar.gz 809808 BLAKE2B 56d21fdc35917426ea94f27ee4c7a59bc9eb8b265bdd6366216df090e25e834a7045cc26559b4773a12771a825054462552a44a701acabf2ba662aae9aee1f90 SHA512 d286bb99b838469b8f467f54fcebba4f3712fd1247cda227ba42dab2690ddc937368edcf54452b1ea555d19c9e0f8852c7ac01f0a3612b0592b16e97abbb6697
-DIST boto3-1.34.109.gh.tar.gz 810229 BLAKE2B 7d0af8783283715d281df2e68284aa98ead02c764892ec53bdff5212b470c561da4a52b94c62936a20d36a1bd32dac560a38e59577b34d9f82bbee197491e94b SHA512 f35cfb8cbab03c0c6856c01f095cf593c188ab81c8f9bd9c7f9d4e3ca654204795d19810ed701d31ee48f0a34ae1d47437b64ea5f7090708976e7d883677440f
-DIST boto3-1.34.110.gh.tar.gz 811067 BLAKE2B 5c030d0a52081a2e931c85611b510558c79a3079d3aa445b82bf2421424c00076f6f0d415dbec838cd437e680470652245595ec8a83e835eba3480f147f12a45 SHA512 e0780b1cca01503d730f01423cbab369cc0c4de8fd2e59033e64779d41c3d648aa54a8b80b6997d1ad9f2bab2673e426a3c1b5bf6536fb0f4248b0c7eade8512
-DIST boto3-1.34.111.gh.tar.gz 811593 BLAKE2B 5b1ba72259c6cf995e4a3668e6b4e195e9bfcfa6b3b0fb992795f98da301c1982196e3af1adfda355a4b73fb418158bc737524e8d220303af3c3fd28c65e2ff0 SHA512 7d0735a6beb3ba7d3e2c4eba4023d5f291aa522c1ea3947c37f29ae235e69ac02847bda7c4e9cd694d6e89fe3bf0e56b1cd41a4fed40b8924670b240c8643f98
-DIST boto3-1.34.112.gh.tar.gz 811766 BLAKE2B 7772298d455654a6d4ae1c0ccb7819ad14232638d465c5b4b95db4a352f0bced80f3b85c85638de3a0a1b9068453f594ebc804b2ab0508027eb0e5bc2af5ac83 SHA512 b75aab26264f35ea6df41e4dcbb303750210f56b33dbb95049585bab8c0b84d78d2f1a6efac854c5da37ee2d5088594e8aad00944db8c79551ef864b93a855bd
-DIST boto3-1.34.98.gh.tar.gz 805719 BLAKE2B 5cf7f0cc415e25c8b41aa464b636b1683f4e71198569f5eac3e6e43cef7050e20e92c3fd988517fc1463601073b41b0b9c668a58bb866d03b83973c9b9cd976a SHA512 06cab81bbf73a9c37b68e0312a7c587bace700b8032e283b6782c1275804ea7c93065c4282837957b5cf3523d50fe57319a54af494262e2666f65440da9771fd
+DIST boto3-1.34.113.gh.tar.gz 812031 BLAKE2B ffb4cc54a83d9d783eb69694393a6cc8c4d07325496802de80e8ac1999a1b5f45166571ae52eb8b38cb7d3e58d0cc8114088f7cd698f090b6ab1244565c0af63 SHA512 eebde25a83b2a7169b6892fa61475f26f9bf6baf7eff242d8bde0a5cd1920a7a39107071b093e59aca2a742662e16825b7fcf2850f59840da63a9cf78a19615d
diff --git a/dev-python/boto3/boto3-1.34.103.ebuild b/dev-python/boto3/boto3-1.34.103.ebuild
index 509842b2699d..1ad6d3c11774 100644
--- a/dev-python/boto3/boto3-1.34.103.ebuild
+++ b/dev-python/boto3/boto3-1.34.103.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.34.109.ebuild b/dev-python/boto3/boto3-1.34.109.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.109.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_{8,9,10,11,12} )
-
-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.34.110.ebuild b/dev-python/boto3/boto3-1.34.110.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.110.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_{8,9,10,11,12} )
-
-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.34.111.ebuild b/dev-python/boto3/boto3-1.34.111.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.111.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_{8,9,10,11,12} )
-
-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.34.112.ebuild b/dev-python/boto3/boto3-1.34.112.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.112.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_{8,9,10,11,12} )
-
-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.34.107.ebuild b/dev-python/boto3/boto3-1.34.113.ebuild
index 509842b2699d..509842b2699d 100644
--- a/dev-python/boto3/boto3-1.34.107.ebuild
+++ b/dev-python/boto3/boto3-1.34.113.ebuild
diff --git a/dev-python/boto3/boto3-1.34.98.ebuild b/dev-python/boto3/boto3-1.34.98.ebuild
deleted file mode 100644
index 1ad6d3c11774..000000000000
--- a/dev-python/boto3/boto3-1.34.98.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_{8,9,10,11,12} )
-
-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/botocore/Manifest b/dev-python/botocore/Manifest
index 7fada2a9b4e7..7a3a4e146e1e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,3 @@
 DIST botocore-1.34.103.gh.tar.gz 13018336 BLAKE2B 84cef06d1eff09fc9e7d4480bc11be16c775e6aa21c300be21735d4bbf891618861a94e7fb52735c34f4f831220411d2b307546e930e77822d8c876dd05f7780 SHA512 f66c3959c5f323117127789d0a3492d5ecfcdfa371f2fdd3339bf1feb7cf1ba67ce7015014e49530f24a440d08a9b634d2ada85c1953ed438f70e5a6cca040f0
-DIST botocore-1.34.107.gh.tar.gz 13028692 BLAKE2B ab26f39a43d1dad6b2ee7a99878a584601d0368bff65ef1beb0869a1272ce528074633091fd52f34ca839865f83c73b7be238666ccfa8975cbe2e83203f426e6 SHA512 59dcd1a4fe32bd61da81b02a78925cc11e010ccd98445c1073665d3de57a532cbc283dace6cd0772be7c366d5e859b2ea904ee5b197c7e395b75b7b795e13236
 DIST botocore-1.34.108.gh.tar.gz 13029228 BLAKE2B 947c11bb991e9e7622412bb7e90579e56d688b43ed836fb95ac133520221f56c2e96dc3a6d8b939d334ee4b4ad6ce8b30259c671be1bf9b3fc3deae62391674c SHA512 af23c80879d12cbb279741c216b99bf643b09ef516837275d31f6fbce253863027741b0cd6c815ae32bb6f41ebf0d33c8f2120ec81d6a3803cd0ffeab7be91e1
-DIST botocore-1.34.109.gh.tar.gz 13036889 BLAKE2B aa755b6078a98214cf3a602283a121320317dbc26651047b5c5fa30974e77c082883c40641b77b8745cc7c7a8377ba316bd0e6f1a1e42f273266be8c4927d0fe SHA512 9b915c44e83f8e64120be0ac5a4529bf07cd1e99b575eee980078a364f1cc033e64dd6d69466b0eef4f2f7e7dfccb050ee42f672a7bf5486eec1461a0923d88c
-DIST botocore-1.34.110.gh.tar.gz 13056986 BLAKE2B 815a24b950228b3e8e85867a9ac391af8ededbff9684d09c37a9b799be051ab2fe09db925d975ac9a8c6ecfe079df3ea7be967d5d49f7913ee9f5b881658bbcd SHA512 59028c45ed775b1ca84714480b263dc1c607ef53eaf970538fcfbf091a62bc1b2495616cb619ff5d74ca8ec4ca6b6fa8d9f5f0b81313652b9ead3ec7ccdba778
-DIST botocore-1.34.111.gh.tar.gz 13059351 BLAKE2B 753b2639104035679c73f2723fbcaaea1c02a912be9492e7e2d9b208c1c04595efe43e1bd1d12d85c47d063ad8f196b0c271106636a62b788d1632be03fc176a SHA512 498676d52a250df742d538460489a1c06c422dcd7a20c3704ac44561fef02bf2efe1801751c379de30fba35a21f052092a86190585f655e45bc01db8d5d3534a
-DIST botocore-1.34.112.gh.tar.gz 13060339 BLAKE2B 33157d7d4fb5b7eb908dce2fa7ef0d61ad3b27952ccbb6677a18a957fdc3bcc56d73e9a48c7ddfa8d9aceff44167e881990c31b4ab1db7b00f3c1142b7b79cd3 SHA512 8790f16ec26ab0c67daf555d93e15768dde9a138e99a8a3c40e68d8f40a04b1ba2be97bce80b1ae94c0d168da0ba3779ff5c340d2f3d4962bab138ff5d80e84a
-DIST botocore-1.34.98.gh.tar.gz 13008491 BLAKE2B 0b5c368264cc43c162d158b383535183c0fd0065dc6c5edfd3eaaab842d0607b3cc3b99860fa8dc4ef207b5be1457fce9d143723da29e262f30ecc82c5f9ba66 SHA512 39ccb0082ecd6ed6cc7d3f7cea01d39e8d5e92224e3290a66f86ed00562a1d858f75d006af725d2b857ac891f1b366300b7e4c2d24277d942b5a9b9e2cdba431
+DIST botocore-1.34.113.gh.tar.gz 13060395 BLAKE2B 8f9329d613f489f2305d068566940a94199a16e9d538597a86cd916a331245a70c6ad771f0d7d71a05a77a49c86aa8ff6be2ac6cd97c04828cc9f54cb6c5e2ac SHA512 218656c921b7ae6a605d6cca4cb90b76aee2a18541e78189828f2adfbb821fbebac406ba19887c0a07aece72dd4936f41b057fb25611e1b03db4bd11fda66bd6
diff --git a/dev-python/botocore/botocore-1.34.103.ebuild b/dev-python/botocore/botocore-1.34.103.ebuild
index 857224b496b7..beb1bdc6a919 100644
--- a/dev-python/botocore/botocore-1.34.103.ebuild
+++ b/dev-python/botocore/botocore-1.34.103.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.34.109.ebuild b/dev-python/botocore/botocore-1.34.109.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.109.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_{8,9,10,11,12} )
-
-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.34.110.ebuild b/dev-python/botocore/botocore-1.34.110.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.110.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_{8,9,10,11,12} )
-
-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.34.111.ebuild b/dev-python/botocore/botocore-1.34.111.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.111.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_{8,9,10,11,12} )
-
-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.34.112.ebuild b/dev-python/botocore/botocore-1.34.112.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.112.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_{8,9,10,11,12} )
-
-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.34.107.ebuild b/dev-python/botocore/botocore-1.34.113.ebuild
index 857224b496b7..857224b496b7 100644
--- a/dev-python/botocore/botocore-1.34.107.ebuild
+++ b/dev-python/botocore/botocore-1.34.113.ebuild
diff --git a/dev-python/botocore/botocore-1.34.98.ebuild b/dev-python/botocore/botocore-1.34.98.ebuild
deleted file mode 100644
index beb1bdc6a919..000000000000
--- a/dev-python/botocore/botocore-1.34.98.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_{8,9,10,11,12} )
-
-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/coverage/coverage-7.5.1.ebuild b/dev-python/coverage/coverage-7.5.1.ebuild
index 8f7e197a5950..8fc98a99aac9 100644
--- a/dev-python/coverage/coverage-7.5.1.ebuild
+++ b/dev-python/coverage/coverage-7.5.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cryptography/cryptography-42.0.7-r1.ebuild b/dev-python/cryptography/cryptography-42.0.7-r1.ebuild
new file mode 100644
index 000000000000..5923eaa3a3ef
--- /dev/null
+++ b/dev-python/cryptography/cryptography-42.0.7-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2021-2024 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_REQ_USE="threads(+)"
+
+
+CRATES="
+asn1-0.15.5
+asn1_derive-0.15.5
+autocfg-1.1.0
+base64-0.21.7
+bitflags-1.3.2
+bitflags-2.4.2
+cc-1.0.83
+cfg-if-1.0.0
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+heck-0.4.1
+indoc-2.0.4
+libc-0.2.152
+lock_api-0.4.11
+memoffset-0.9.0
+once_cell-1.19.0
+openssl-0.10.64
+openssl-macros-0.1.1
+openssl-sys-0.9.102
+parking_lot-0.12.1
+parking_lot_core-0.9.9
+pem-3.0.3
+pkg-config-0.3.29
+portable-atomic-1.6.0
+proc-macro2-1.0.78
+pyo3-0.20.3
+pyo3-build-config-0.20.3
+pyo3-ffi-0.20.3
+pyo3-macros-0.20.3
+pyo3-macros-backend-0.20.3
+quote-1.0.35
+redox_syscall-0.4.1
+scopeguard-1.2.0
+self_cell-1.0.3
+smallvec-1.13.1
+syn-2.0.48
+target-lexicon-0.12.13
+unicode-ident-1.0.12
+unindent-0.2.3
+vcpkg-0.2.15
+windows-targets-0.48.5
+windows_aarch64_gnullvm-0.48.5
+windows_aarch64_msvc-0.48.5
+windows_i686_gnu-0.48.5
+windows_i686_msvc-0.48.5
+windows_x86_64_gnu-0.48.5
+windows_x86_64_gnullvm-0.48.5
+windows_x86_64_msvc-0.48.5
+"
+inherit cargo distutils-r1 multiprocessing
+
+VEC_P=cryptography_vectors-$(ver_cut 1-3)
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="
+	https://github.com/pyca/cryptography/
+	https://pypi.org/project/cryptography/
+"
+SRC_URI="
+	https://github.com/pyca/cryptography/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86"
+IUSE="libressl"
+
+#	libressl? ( <=dev-libs/libressl-3.8.1:= )
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-3.9.1:= )
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=dev-python/setuptools-rust-1.7.0[${PYTHON_USEDEP}]
+	>=virtual/rust-1.56.0
+	test? (
+		dev-python/certifi[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/cryptography/hazmat/bindings/_rust.*.so"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's:--benchmark-disable::' pyproject.toml || die
+
+	# work around availability macros not supported in GCC (yet)
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local darwinok=0
+		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
+			darwinok=1
+		fi
+		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
+			src/_cffi_src/openssl/src/osrandom_engine.c || die
+	fi
+}
+
+python_configure_all() {
+	filter-lto # bug #903908
+}
+
+python_test() {
+	local -x PYTHONPATH="${PYTHONPATH}:${WORKDIR}/cryptography_vectors-${PV}"
+	local EPYTEST_IGNORE=(
+		tests/bench
+	)
+	epytest -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 58d1c85d1f67..49eb194c3b61 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,2 +1 @@
-DIST filelock-3.13.4.tar.gz 15093 BLAKE2B 1ee07531e4743ad61e9fc2ef85d79e1402be75efb31a6661e1f912a3ae44d19e5578e6e78980228645157ab254f56070ee85b2cdcd2e9d507947c778284159d4 SHA512 072d78bfb3b3831847103b3e7d54e97e9486cbe1ba146d9632edb510abe2d56f3f06bce6b79a2e6cb830ba51e47bbfe32b8f18abb08bd33480ecf78ee0da161b
 DIST filelock-3.14.0.tar.gz 15401 BLAKE2B afa95a941189cd73767684016502fba6972541a8a0f16bed0a4acc6452700224d511a17e6882b1c680fa6b20621b617704a7e9d3aff8ae883ede56f40acb5de3 SHA512 51eda6394fcac86a12887fe1974022b9da921fb96a61887f7a91c5b15f083a4c9186600ec61b4e93b91b8c4799c50ca4b6c418416c6bf2b422ea3b41715258e4
diff --git a/dev-python/filelock/filelock-3.13.4.ebuild b/dev-python/filelock/filelock-3.13.4.ebuild
deleted file mode 100644
index f0daf06754a0..000000000000
--- a/dev-python/filelock/filelock-3.13.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.14.0.ebuild b/dev-python/filelock/filelock-3.14.0.ebuild
index 42a496178710..f0daf06754a0 100644
--- a/dev-python/filelock/filelock-3.14.0.ebuild
+++ b/dev-python/filelock/filelock-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index ed728b0229c5..5b69d7609ed9 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,3 @@
 DIST fonttools-4.50.0.gh.tar.gz 3823676 BLAKE2B ebcc19b3f2c8367147c7e05a514951d25497b1e6e224226e0831f566464b6d407e6a52a3b30620dbe87df1a0ce03d95cb5769cab15ee78822d218ccd81419263 SHA512 a169f18077f2c4f0ad8a46569a30b3e35ca2343e9f3d43cd362dafa26085f545dd9a42e7edb3054f9d37e1576117aa34a0c2b4adabc9fc29c076e69d3fdd66ee
 DIST fonttools-4.51.0.gh.tar.gz 3826324 BLAKE2B 84485874ce373ef759746104f8c0593d63e2955427a1606404e56ae006342fef39e3fe9468d85b974741ae26a8cceba23ea46e33fff0e2648c154074b01b5eac SHA512 3a9984b56a8ed1e918781c8503dd8901276ae7e20659777ff0a9bf799a42b4ec112a6cfd31deb81f73f7f19c03145a66962187fb243b2580db9d3ef7011d3d82
+DIST fonttools-4.52.1.gh.tar.gz 3845345 BLAKE2B c987e8214d4ca998b4f700d11d5c2e31efd8684f4dda6541735db9bd7547b738a1cb786b6c84aa30488a5a6fb2d71e4246dff7f873fdc1161745f74bcc29bd40 SHA512 4bb5fbcbb108723ffeb07baa87699e664775d52653aadae5ee15ed3a74d7f6349e1972e3873f3041fba6d68144f5a364b86373f158f6574a03e68e0eef4ffc7d
diff --git a/dev-python/fonttools/fonttools-4.52.1.ebuild b/dev-python/fonttools/fonttools-4.52.1.ebuild
new file mode 100644
index 000000000000..313804574550
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.52.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
+	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test
+		Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables
+	)
+
+	if [[ ${EPYTHON} == pypy3 ]] &&
+		has_version "dev-python/pyxattr[${PYTHON_USEDEP}]" &&
+		{
+			has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
+			has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
+		}
+	then
+		EPYTEST_DESELECT+=(
+			# affected by a bug in PyPy/pyxattr
+			# https://github.com/iustin/pyxattr/issues/41
+			Tests/t1Lib/t1Lib_test.py::ReadWriteTest::test_read_with_path
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest \
+		-p rerunfailures --reruns=5 \
+		Tests fontTools || die -n "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/genty/genty-1.3.2-r2.ebuild b/dev-python/genty/genty-1.3.2-r2.ebuild
deleted file mode 100644
index 1c054418c900..000000000000
--- a/dev-python/genty/genty-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Allows you to run a test with multiple data sets"
-HOMEPAGE="
-	https://pypi.org/project/genty/
-	https://github.com/box/genty/
-"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/genty/genty-1.3.2-r3.ebuild b/dev-python/genty/genty-1.3.2-r3.ebuild
index 2a06f2b7aba3..9c44ce1fd889 100644
--- a/dev-python/genty/genty-1.3.2-r3.ebuild
+++ b/dev-python/genty/genty-1.3.2-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/html5lib/html5lib-1.1-r1.ebuild b/dev-python/html5lib/html5lib-1.1-r1.ebuild
deleted file mode 100644
index 23514c946833..000000000000
--- a/dev-python/html5lib/html5lib-1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTML parser based on the HTML5 specification"
-HOMEPAGE="
-	https://github.com/html5lib/html5lib-python/
-	https://html5lib.readthedocs.io/
-	https://pypi.org/project/html5lib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest6.patch
-)
-
-RDEPEND="
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/webencodings[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-expect[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_expect
-}
diff --git a/dev-python/html5lib/html5lib-1.1-r2.ebuild b/dev-python/html5lib/html5lib-1.1-r2.ebuild
index b90964ee69fc..c38583ac6cf7 100644
--- a/dev-python/html5lib/html5lib-1.1-r2.ebuild
+++ b/dev-python/html5lib/html5lib-1.1-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-pytest6.patch
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+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
deleted file mode 100644
index 637368d2f237..000000000000
--- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 630fe63c6f53..c09b7356f549 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-2024 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,4 @@ 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 736a1167c898..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <origin>gentoo-guru-overlay</origin>
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
index d75829447acd..e34bd8151931 100644
--- a/dev-python/munkres/munkres-1.1.4-r1.ebuild
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index d8b008aff269..9551a6e40ee4 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1 @@
-DIST peewee-3.17.3.gh.tar.gz 926892 BLAKE2B e5d378da37f7fda74c75d3c3998e3fae79e9b8c7d66ca5a17e76a7b855c9d7ae159b4eedb97f68c9ec13cf00f2268f425b36273e7b09fbd001364e748d13bc95 SHA512 d7d0c716c1b6600275c151894ea8738c3393e554627ae4d8cf0d52548be99cfaf31e5553f51762cedc7f9e66a779ddef60d305a3797e3db71ac1a2178bb45468
 DIST peewee-3.17.5.gh.tar.gz 927674 BLAKE2B 45d23ebec38363a83441c916def460d76c7fe54175497df53de5a904d57b3d2cdbe077f757028b85f6a5eba0e65f1eab9ee99ceea11a00a9b111fce842ccd010 SHA512 b9878450a0759740f28cb6425ba0f14aa92e037bc4c888c13ae24bc38993787e64bff6342edcdf5364b5aac97c405e1c8e53e1140016e6bdbeba6d57d7f339ec
diff --git a/dev-python/peewee/peewee-3.17.3.ebuild b/dev-python/peewee/peewee-3.17.3.ebuild
deleted file mode 100644
index e7b92b71ec61..000000000000
--- a/dev-python/peewee/peewee-3.17.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples +native-extensions test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	native-extensions? ( dev-db/sqlite:3= )
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-db/postgresql
-		dev-python/psycopg:0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-src_compile() {
-	if ! use native-extensions; then
-		local -x NO_SQLITE=1
-	fi
-
-	distutils-r1_src_compile
-}
-
-src_test() {
-	initdb -D "${T}"/pgsql || die
-	pg_ctl -w -D "${T}"/pgsql start -o "-h '' -k '${T}'" || die
-	createdb -h "${T}" peewee_test || die
-
-	local -x PEEWEE_PSQL_HOST="${T}"
-	distutils-r1_src_test
-
-	pg_ctl -w -D "${T}"/pgsql stop || die
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.17.5.ebuild b/dev-python/peewee/peewee-3.17.5.ebuild
index e1bea70555cd..e7b92b71ec61 100644
--- a/dev-python/peewee/peewee-3.17.5.ebuild
+++ b/dev-python/peewee/peewee-3.17.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples +native-extensions test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/psycopg/psycopg-3.1.19.ebuild b/dev-python/psycopg/psycopg-3.1.19.ebuild
index 4a1ad4e4210d..3a300e0ff747 100644
--- a/dev-python/psycopg/psycopg-3.1.19.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.19.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DEPEND="
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index ecd5fc873fc8..ea30261224ea 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -1,2 +1 @@
-DIST pygraphviz-1.12.tar.gz 104941 BLAKE2B 5c2d119c66837d13511ef4756093b159f45ccb2888eb2b86c1d016837059ed34bdc5cb7e69eeff013642d92ec0c2b4a1149316b0baaa742c49a34945fd2563e0 SHA512 2407fdd7de3b2f7f1d9f9e3e3fe0f19c4faad4a72db33a0b4341a01f98eecd4d240079f2d0ea5cf68a5e10236f11fd84e55fd44518611efde2fab7590e3aae90
 DIST pygraphviz-1.13.tar.gz 104642 BLAKE2B 6111c1b811d5359da673f9c43719d21e86e93e7e82e5819872fed6f87ebb74efb87dba40b5dac737b93bffcd51683f143528a135a76e3d6f62615593fdc22b88 SHA512 3159fd9fb1226974c3a6289ebc437eed394021a7fc41669e29879fa6fd5e5cb809c808a4016cfb1afaf30dc10e467e8b0fe5c3b71fb9a1f889efcf5ae6ff3597
diff --git a/dev-python/pygraphviz/files/pygraphviz-1.12-swig-4.2.0.patch b/dev-python/pygraphviz/files/pygraphviz-1.12-swig-4.2.0.patch
deleted file mode 100644
index 3daa485044ce..000000000000
--- a/dev-python/pygraphviz/files/pygraphviz-1.12-swig-4.2.0.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-https://bugs.gentoo.org/921637
-https://github.com/swig/swig/issues/2778
-https://github.com/pygraphviz/pygraphviz/commit/6ecae22cc382407652f9d3b57e9da89a3a03043b
-
-From 6ecae22cc382407652f9d3b57e9da89a3a03043b Mon Sep 17 00:00:00 2001
-From: William S Fulton <wsf@fultondesigns.co.uk>
-Date: Fri, 26 Jan 2024 00:52:44 +0000
-Subject: [PATCH] Remove outdated pystrings.swg (#508)
-
-Remove pystring.swg - a very ancient copy from SWIG which does not
-compile when using swig-4.2.0. Instead SWIG's version of pystrings.swg
-that is kept up to date in SWIG is used. SWIG_PYTHON_STRICT_BYTE_CHAR
-needs to be defined in order to maintain the current behaviour of only
-allowing Python 3 byte type instead of Python 3 string type as input.
-
-As the output of swig is in graphviz_wrap.c and is committed to the
-repo, the updates committed in this file (keeping the current swig-4.1.1
-version). A later commit could update it to swig-4.2.0.
-
-Fixes build problems on Fedora where SWIG_Python_str_AsChar no longer exists,
-as reported at https://github.com/swig/swig/issues/2778.
----
- pygraphviz/graphviz.i      |   4 ++
- pygraphviz/graphviz_wrap.c | 106 ++++++++++++++++++++++++++++---------
- pystrings.swg              |  86 ------------------------------
- 3 files changed, 84 insertions(+), 112 deletions(-)
- delete mode 100644 pystrings.swg
-
-diff --git a/pygraphviz/graphviz.i b/pygraphviz/graphviz.i
-index c63eb2d3..d7c49330 100644
---- a/pygraphviz/graphviz.i
-+++ b/pygraphviz/graphviz.i
-@@ -1,5 +1,9 @@
- %module graphviz
- 
-+%begin %{
-+#define SWIG_PYTHON_STRICT_BYTE_CHAR
-+%}
-+
- %{
- #include "graphviz/cgraph.h"
- #include "graphviz/gvc.h"
-diff --git a/pygraphviz/graphviz_wrap.c b/pygraphviz/graphviz_wrap.c
-index 8f4d3a62..cb06da79 100644
---- a/pygraphviz/graphviz_wrap.c
-+++ b/pygraphviz/graphviz_wrap.c
-@@ -6,6 +6,9 @@
-  * the SWIG interface file instead.
-  * ----------------------------------------------------------------------------- */
- 
-+#define SWIG_PYTHON_STRICT_BYTE_CHAR
-+
-+
- 
- #define SWIG_VERSION 0x040101
- #define SWIGPYTHON
-@@ -3038,49 +3041,96 @@ SWIGINTERN int
- SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
- {
- #if PY_VERSION_HEX>=0x03000000
-+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-   if (PyBytes_Check(obj))
- #else
-+  if (PyUnicode_Check(obj))
-+#endif
-+#else  
-   if (PyString_Check(obj))
- #endif
-   {
-     char *cstr; Py_ssize_t len;
-+    int ret = SWIG_OK;
- #if PY_VERSION_HEX>=0x03000000
--    PyBytes_AsStringAndSize(obj, &cstr, &len);
--    if(alloc) *alloc = SWIG_NEWOBJ;
-+#if !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+    if (!alloc && cptr) {
-+        /* We can't allow converting without allocation, since the internal
-+           representation of string in Python 3 is UCS-2/UCS-4 but we require
-+           a UTF-8 representation.
-+           TODO(bhy) More detailed explanation */
-+        return SWIG_RuntimeError;
-+    }
-+    obj = PyUnicode_AsUTF8String(obj);
-+    if (!obj)
-+      return SWIG_TypeError;
-+    if (alloc)
-+      *alloc = SWIG_NEWOBJ;
-+#endif
-+    if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1)
-+      return SWIG_TypeError;
- #else
--    PyString_AsStringAndSize(obj, &cstr, &len);
-+    if (PyString_AsStringAndSize(obj, &cstr, &len) == -1)
-+      return SWIG_TypeError;
- #endif
-     if (cptr) {
-       if (alloc) {
--	/*
--	   In python the user should not be able to modify the inner
--	   string representation. To warranty that, if you define
--	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
--	   buffer is always returned.
--
--	   The default behavior is just to return the pointer value,
--	   so, be careful.
--	*/
--#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
--	if (*alloc != SWIG_OLDOBJ)
--#else
--	if (*alloc == SWIG_NEWOBJ)
--#endif
--	  {
--	    *cptr = (char *)memcpy(malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
--	    *alloc = SWIG_NEWOBJ;
--	  }
--	else {
-+	if (*alloc == SWIG_NEWOBJ) {
-+	  *cptr = (char *)memcpy(malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-+	  *alloc = SWIG_NEWOBJ;
-+	} else {
- 	  *cptr = cstr;
- 	  *alloc = SWIG_OLDOBJ;
- 	}
-       } else {
-+#if PY_VERSION_HEX>=0x03000000
-+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+	*cptr = PyBytes_AsString(obj);
-+#else
-+	assert(0); /* Should never reach here with Unicode strings in Python 3 */
-+#endif
-+#else
- 	*cptr = SWIG_Python_str_AsChar(obj);
-+        if (!*cptr)
-+          ret = SWIG_TypeError;
-+#endif
-       }
-     }
-     if (psize) *psize = len + 1;
--    return SWIG_OK;
-+#if PY_VERSION_HEX>=0x03000000 && !defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+    Py_XDECREF(obj);
-+#endif
-+    return ret;
-   } else {
-+#if defined(SWIG_PYTHON_2_UNICODE)
-+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
-+#endif
-+#if PY_VERSION_HEX<0x03000000
-+    if (PyUnicode_Check(obj)) {
-+      char *cstr; Py_ssize_t len;
-+      if (!alloc && cptr) {
-+        return SWIG_RuntimeError;
-+      }
-+      obj = PyUnicode_AsUTF8String(obj);
-+      if (!obj)
-+        return SWIG_TypeError;
-+      if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
-+        if (cptr) {
-+          if (alloc) *alloc = SWIG_NEWOBJ;
-+          *cptr = (char *)memcpy(malloc((len + 1)*sizeof(char)), cstr, sizeof(char)*(len + 1));
-+        }
-+        if (psize) *psize = len + 1;
-+
-+        Py_XDECREF(obj);
-+        return SWIG_OK;
-+      } else {
-+        Py_XDECREF(obj);
-+      }
-+    }
-+#endif
-+#endif
-+
-     swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
-     if (pchar_descriptor) {
-       void* vptr = 0;
-@@ -3311,13 +3361,17 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
-   if (carray) {
-     if (size > INT_MAX) {
-       swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--      return pchar_descriptor ?
-+      return pchar_descriptor ? 
- 	SWIG_InternalNewPointerObj((char *)(carray), pchar_descriptor, 0) : SWIG_Py_Void();
-     } else {
- #if PY_VERSION_HEX >= 0x03000000
--      return PyBytes_FromStringAndSize(carray, (int)(size));
-+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
-+      return PyBytes_FromStringAndSize(carray, (Py_ssize_t)(size));
-+#else
-+      return PyUnicode_DecodeUTF8(carray, (Py_ssize_t)(size), "surrogateescape");
-+#endif
- #else
--      return PyString_FromStringAndSize(carray, (int)(size));
-+      return PyString_FromStringAndSize(carray, (Py_ssize_t)(size));
- #endif
-     }
-   } else {
-diff --git a/pystrings.swg b/pystrings.swg
-deleted file mode 100644
-index 7988a353..00000000
---- a/pystrings.swg
-+++ /dev/null
-@@ -1,86 +0,0 @@
--/* Fixed fragments for work with bytes in Python 3. */
--
--%fragment("SWIG_AsCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
--SWIGINTERN int
--SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
--{
--%#if PY_VERSION_HEX>=0x03000000
--  if (PyBytes_Check(obj))
--%#else
--  if (PyString_Check(obj))
--%#endif
--  {
--    char *cstr; Py_ssize_t len;
--%#if PY_VERSION_HEX>=0x03000000
--    PyBytes_AsStringAndSize(obj, &cstr, &len);
--    if(alloc) *alloc = SWIG_NEWOBJ;
--%#else
--    PyString_AsStringAndSize(obj, &cstr, &len);
--%#endif
--    if (cptr) {
--      if (alloc) {
--	/*
--	   In python the user should not be able to modify the inner
--	   string representation. To warranty that, if you define
--	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
--	   buffer is always returned.
--
--	   The default behavior is just to return the pointer value,
--	   so, be careful.
--	*/
--%#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
--	if (*alloc != SWIG_OLDOBJ)
--%#else
--	if (*alloc == SWIG_NEWOBJ)
--%#endif
--	  {
--	    *cptr = %new_copy_array(cstr, len + 1, char);
--	    *alloc = SWIG_NEWOBJ;
--	  }
--	else {
--	  *cptr = cstr;
--	  *alloc = SWIG_OLDOBJ;
--	}
--      } else {
--	*cptr = SWIG_Python_str_AsChar(obj);
--      }
--    }
--    if (psize) *psize = len + 1;
--    return SWIG_OK;
--  } else {
--    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--    if (pchar_descriptor) {
--      void* vptr = 0;
--      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
--	if (cptr) *cptr = (char *) vptr;
--	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
--	if (alloc) *alloc = SWIG_OLDOBJ;
--	return SWIG_OK;
--      }
--    }
--  }
--  return SWIG_TypeError;
--}
--}
--
--%fragment("SWIG_FromCharPtrAndSize","header",fragment="SWIG_pchar_descriptor") {
--SWIGINTERNINLINE PyObject *
--SWIG_FromCharPtrAndSize(const char* carray, size_t size)
--{
--  if (carray) {
--    if (size > INT_MAX) {
--      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
--      return pchar_descriptor ?
--	SWIG_InternalNewPointerObj(%const_cast(carray,char *), pchar_descriptor, 0) : SWIG_Py_Void();
--    } else {
--%#if PY_VERSION_HEX >= 0x03000000
--      return PyBytes_FromStringAndSize(carray, %numeric_cast(size,int));
--%#else
--      return PyString_FromStringAndSize(carray, %numeric_cast(size,int));
--%#endif
--    }
--  } else {
--    return SWIG_Py_Void();
--  }
--}
--}
-
diff --git a/dev-python/pygraphviz/pygraphviz-1.12-r1.ebuild b/dev-python/pygraphviz/pygraphviz-1.12-r1.ebuild
deleted file mode 100644
index 1106d009d86c..000000000000
--- a/dev-python/pygraphviz/pygraphviz-1.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python wrapper for the Graphviz Agraph data structure"
-HOMEPAGE="
-	https://pygraphviz.github.io/
-	https://github.com/pygraphviz/pygraphviz/
-	https://pypi.org/project/pygraphviz/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
-
-# Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
-DEPEND="
-	media-gfx/graphviz
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-lang/swig:0
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-swig-4.2.0.patch
-)
-
-src_configure() {
-	swig -python pygraphviz/graphviz.i || die
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/install || die
-	epytest
-}
-
-python_install_all() {
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygraphviz/pygraphviz-1.13.ebuild b/dev-python/pygraphviz/pygraphviz-1.13.ebuild
index 73635b138dff..6e0e8d53a149 100644
--- a/dev-python/pygraphviz/pygraphviz-1.13.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.13.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 DEPEND="
diff --git a/dev-python/pyproject-hooks/Manifest b/dev-python/pyproject-hooks/Manifest
index 473fd942c57d..e83e095938e2 100644
--- a/dev-python/pyproject-hooks/Manifest
+++ b/dev-python/pyproject-hooks/Manifest
@@ -1,2 +1 @@
-DIST pyproject-hooks-1.0.0.gh.tar.gz 16001 BLAKE2B c90d2fb70ada9414cbbf201bfbb695b4e9055b61fdcdc8e0f8a2548e4f47e7512140fc71fee9f9306577d97b76ca64e77b7c58d526381c5481739e630e5250a1 SHA512 fca9b69859d7e3949b158c2879ba7ebc7305f1edaacdd84b71a92565010176d1194be03a21fd6b9aa65d175cfd8243ba3a50aab617fb56ceac6b263da6613e17
 DIST pyproject-hooks-1.1.0.gh.tar.gz 18774 BLAKE2B e6b376188655a5bc188567f412c22f8224209612c4fb0332f8c0c441180c18589139549139957834b3359bf3ced961e22f97e2449edc354047afaa6d2eff58d7 SHA512 256028d13adbe35126a63431a2a49e0c48adddce5ffc3ff2eebad368eee7ce52591ecfd8a8526876de20bc59dfc87156533d6a97b55538a739873e60f9509eff
diff --git a/dev-python/pyproject-hooks/pyproject-hooks-1.0.0.ebuild b/dev-python/pyproject-hooks/pyproject-hooks-1.0.0.ebuild
deleted file mode 100644
index ce7ea88a9a89..000000000000
--- a/dev-python/pyproject-hooks/pyproject-hooks-1.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Wrappers to build Python packages using PEP 517 hooks"
-HOMEPAGE="
-	https://pypi.org/project/pyproject_hooks/
-	https://github.com/pypa/pyproject-hooks/
-	https://pyproject-hooks.readthedocs.io/
-"
-SRC_URI="
-	https://github.com/pypa/pyproject-hooks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-hooks/pyproject-hooks-1.1.0.ebuild b/dev-python/pyproject-hooks/pyproject-hooks-1.1.0.ebuild
index 9cdd2206e03c..f5894e76d17b 100644
--- a/dev-python/pyproject-hooks/pyproject-hooks-1.1.0.ebuild
+++ b/dev-python/pyproject-hooks/pyproject-hooks-1.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 014754a9d137..12651f40e9a0 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,3 +1 @@
-DIST pytest-xdist-3.5.0.tar.gz 78977 BLAKE2B 94feaa236728688a993ed89825f4ccd67abd7a520d235790bbfc629173e5918695ac500d04de642f07d323325972512e3ad95f0ae18a9ea239da8c2f167ab1a5 SHA512 1b6a896c6c69c110d1f3aa634740ffced570bbb788b3474687fef20147a5480a8681886b04db0413f7db68db546236f9a7f37e1592a74d1145f6eb6d876216ca
-DIST pytest_xdist-3.6.0.tar.gz 83818 BLAKE2B e15935799675014a01524b850106c29b1e43efcdc965c5695ae727ba4c12af446dbaec662eb66022b3e553e311d456859e90c7cfb0f7b4d9d0f28c3184e2901a SHA512 d623d31fa3f441c7ac56b7740bdd205933b90c9784ae1bcbac185bdc2920f1a27fa51fa6e1b75392a3ae13a62c51e168925ce3040cc1f0d22e8d9906faebbc2e
 DIST pytest_xdist-3.6.1.tar.gz 84060 BLAKE2B 01392bc1f5a1587f609fc0246235457ab92ca40b3c34c660c117fae1c2b8b98dc0cde345f42951d69c3b58732e0094c7618ed570a6e3ca41165e93e2d8cf9e84 SHA512 583a78d0adc05d81458bbdd5832c239581c0fcd9cad9edfd16fa78009c005c15bffec7ed074d9e18f1542393f62d9ccb2c9e0a96d825e9cff1faec123545a2a3
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.5.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.5.0.ebuild
deleted file mode 100644
index cc774bf37859..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-3.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xdist/
-	https://github.com/pytest-dev/pytest-xdist/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail
-
-	epytest -o tmp_path_retention_count=1
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.6.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.6.0.ebuild
deleted file mode 100644
index a57260d72c26..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-3.6.0.ebuild
+++ /dev/null
@@ -1,43 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="
-	https://pypi.org/project/pytest-xdist/
-	https://github.com/pytest-dev/pytest-xdist/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/execnet-2.1[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail
-
-	epytest -o tmp_path_retention_count=1
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-3.6.1.ebuild b/dev-python/pytest-xdist/pytest-xdist-3.6.1.ebuild
index a57260d72c26..f593fc8de326 100644
--- a/dev-python/pytest-xdist/pytest-xdist-3.6.1.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-3.6.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/execnet-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.6.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.6.0.ebuild
index ad01fe490ab3..880b701c31eb 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.6.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/regress/regress-0.4.5.ebuild b/dev-python/regress/regress-0.4.5.ebuild
index 0d8f6d332965..215a67e90ed0 100644
--- a/dev-python/regress/regress-0.4.5.ebuild
+++ b/dev-python/regress/regress-0.4.5.ebuild
@@ -65,6 +65,6 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.25.0.ebuild b/dev-python/responses/responses-0.25.0.ebuild
index e56b46d8c783..066078f8f453 100644
--- a/dev-python/responses/responses-0.25.0.ebuild
+++ b/dev-python/responses/responses-0.25.0.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 
 BDEPEND="
 	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
 	)
 "
@@ -42,5 +43,5 @@ distutils_enable_tests pytest
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver
+	epytest -o asyncio_mode=auto -p asyncio -p pytest_httpserver
 }
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index e85df05734f7..308e1728a20c 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -2,6 +2,8 @@ DIST scipy-1.11.3.tar.gz 56335652 BLAKE2B 2b35c24522b2bd498b4ebe84a854c8ec1e6291
 DIST scipy-1.11.4.tar.gz 56336202 BLAKE2B a2091a1edb54eb73c2de6ed8c62a7e571f37b247c9af50947aa97b739342c96b87b20a82b1a238c859fa532c84249cbadde228366dcea3555e9a506c1ae55031 SHA512 2eb403f6de9723b411d948b8e1b5457078704c605b8e760d42362c82d802e167eaaf701ddb8b480af2bdf2efe4dbf66fcc4e97321519bb8dab19b0e2a8976beb
 DIST scipy-1.12.0.tar.gz 56811768 BLAKE2B 03c142274f1466747935fa54fab427f3a48c1642406211fa1a0f8ad5e0f194baecf76182e0448a0fb647063871483239cd876ce431cd9406e396e6170912ab64 SHA512 376ed94c4caaf782814bb07047fff0b363f7b608a0399697c6e862432333cbe6d3abb351730a574a3f077b3cdd9cb7474090a460baffcfbd5546bcfee309b6e7
 DIST scipy-1.13.0.tar.gz 57204550 BLAKE2B cfbb4e76efae952854e9ff4ed254e9819b58d224906e1ded3c6a914b1e28b5fad15f8bbbb4a9c413969d6e4b1faf4e0038a36729171ff06e640b241a9dd4af94 SHA512 9bd6fd3f76742a07e5bb003edf4c0e3a82edf749077502fbce3d16fe595d455846edcf57db12ec0a9d4792803e974355362d919047414badfcaededf1e4343f7
+DIST scipy-1.13.1.tar.gz 57210720 BLAKE2B d58d673de9b8d6239a3de285982d65ba1baf0ca8b623276c19b85b1f4bb83c56e66c32d7a22d1d602435cfa086b5d56167cac55bdda608590aaddf677844f060 SHA512 28aafdbcae7229a3d11f192683b703cb485d45e4d90413d6564df3d9005bc8fd4df8bd92caffe657666828cd7253e7e0363c0948c74a1b8f3f3b7d4f4cfd9b36
 DIST scipy-html-1.11.0.zip 50421508 BLAKE2B cb5e4a4f8817a80f54ae73b4a47ba22d2438df46ebfe27ef5fdc2695fdd983226f4ccae925bf82b15d01ced4f4b6807384ecadac5e1aa7700aa887ad06b7d065 SHA512 33718bbd5e828687d93fccc441a53b6a2e8f54ac4952d3b69d4c4668f55cb6ef5aba33df9acda20b2400effa5ae71767b2a5602a365ad2045a6edd24ff89c253
 DIST scipy-html-1.11.2.zip 50435722 BLAKE2B 460c67509a8bf50986f866ee2f90e634af21ddd71508efeef5681c2ee2130c3f79b4b428bc21277bfb310bb45ccad1fb38221ada43620055377cdc4839b9d1e5 SHA512 986a6e37f9e01dc4925ef22af6ff660bae1e4b66e57270262974c207dfb70285e3f8f548774d6e81d5f457b9198c0ba1c06e6d689fe5d54fdea878c1e5a7f797
 DIST scipy-html-1.13.0.zip 65327245 BLAKE2B 5e5ffbf4ff4a28c5a003da0e5170ef5eef1b430ecca0284a89aed5f96f7afc549db001beb2e56b3debbd3527c57b773b25c35579b32d8a6d8e5e97a75db4d38b SHA512 792c32f077d76d47e42d02c5047990a6afdcdc9c31dcc7e9987e7a5aa62c56aec44dcf7d14e3f94ae59f8fb718ce89a2835b87d2aef7a16ce9a534361b7329d7
+DIST scipy-html-1.13.1.zip 65288062 BLAKE2B 4eea1277870fcc0070d543139ef8b786d3c6841835601eb5447fed042d03035edfb556f824ccbf9946f1efa41da75372df1dd3789d045bdbaea7e156010bb8e6 SHA512 fc70eb7fa3763e40f2389ad31e1a78fcd2aa1b3db40927f57a583692143001c8b6a8f3f0ddea47eaf62adb30d1207765d8887a2a53baa1b8ed706b7fb348bbbf
diff --git a/dev-python/scipy/scipy-1.13.1.ebuild b/dev-python/scipy/scipy-1.13.1.ebuild
new file mode 100644
index 000000000000..2c9b7670b428
--- /dev/null
+++ b/dev-python/scipy/scipy-1.13.1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=${PV}
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.22.4:=[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-3.0.8[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.12.0[${PYTHON_USEDEP}]
+	>=dev-build/meson-1.1.0
+	!kernel_Darwin? ( dev-util/patchelf )
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? ( >=dev-python/pythran-0.14.0[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+
+	# hide real scipy, to prevent pythran crashing when scipy is being
+	# rebuilt for new numpy ABI
+	# https://github.com/serge-sans-paille/pythran/issues/2194
+	cat >> "${T}/scipy.py" <<-EOF || die
+		raise ImportError("hide real scipy")
+	EOF
+}
+
+python_compile() {
+	local -x PYTHONPATH="${T}${PYTHONPATH+:${PYTHONPATH}}"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Precision issue with diff. blas?
+		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
+
+		# Crashes with assertion, not a regression
+		# https://github.com/scipy/scipy/issues/19321
+		scipy/signal/tests/test_signaltools.py::test_lfilter_bad_object
+
+		# timeouts
+		scipy/sparse/linalg/tests/test_propack.py::test_examples
+		# hang or incredibly slow
+		scipy/optimize/tests/test_lsq_linear.py::TestBVLS::test_large_rank_deficient
+		scipy/optimize/tests/test_lsq_linear.py::TestTRF::test_large_rank_deficient
+
+		# TODO
+		scipy/optimize/tests/test_minimize_constrained.py::TestTrustRegionConstr::test_list_of_problems
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# fd leaks in tests
+				# https://github.com/scipy/scipy/issues/19553
+				scipy/fft/_pocketfft/tests/test_real_transforms.py
+				# TODO
+				'scipy/special/tests/test_data.py::test_boost[<Data for expi: expinti_data_long_ipp-expinti_data_long>]'
+				# missing dict.__ror__
+				# https://github.com/pypy/pypy/issues/4934
+				'scipy/sparse/tests/test_dok.py::test_dunder_ror[dok_matrix]'
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 44ae4774fa49..3a6dcf01f910 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,3 @@
-DIST stripe-9.5.0.tar.gz 1262346 BLAKE2B 45ba78fac985352f1857b7f6e5e4907afc9ff45815419671b9ee6476f04a7bf216fa49eb0008b8804d0a9763885ee5a8d09431ba6c26cca5e2091787353ae688 SHA512 2a530fe88d56a4753a5f497547aaf51ae770c1c616677eaad65d820eef638f5dd35d78486a3105caf97b2986f3940019a7cc0e7f89fe1c4ae83195bccd1ce000
 DIST stripe-9.6.0.tar.gz 1265189 BLAKE2B d5b37cc8c7ee8597b80f9920e782e6eda5ff6905f8b303c4344b345c73c80a37eb1cd8dc9cc30d7321c58070cc5b0180144964d5f285edcff031cb0655b41409 SHA512 d93349c85791abec7d691c2aa726996e3110117dfda5608aa63e39463399200a4f8427dc609fc2a32c7eea005e4a79fd93cffa76762e0914efcd89b83baa58c2
 DIST stripe-9.7.0.tar.gz 1268225 BLAKE2B 2ae512fa7f24966166e2d64a8e4e9f23077d0d0318c6f85e4b922b59fbf66e7bf884567d86270c96911a82b51ecfd72312dfd42d335801e9dd40a1912150e8f0 SHA512 5c36ca6447f5d4947b0e069fe5d4fa30ce2cf11768efa8abb70fcc9a69bd104fe085707a463d566abb5417f9dd4b6cb1d3bab132d20616267931fd895544236e
 DIST stripe-9.8.0.tar.gz 1268721 BLAKE2B 12eeb333a51e71f39c366dda1a4bf82c15f7c3673fc4d27c0e25b978a19902b722d44d5b0f17c017638740cb95f353a024f5012ad70b13c0ac7f7b420df4b082 SHA512 3b19ba9709818af12ba2110b32232c9a33f3a43ce33dfeb8a1e0a7c8a2d643f96795ef474ccdef9e780c1ab58bfa3e687105311cc1d5d24c2984d442d539706b
diff --git a/dev-python/stripe/stripe-9.5.0.ebuild b/dev-python/stripe/stripe-9.5.0.ebuild
deleted file mode 100644
index 7e27243e412c..000000000000
--- a/dev-python/stripe/stripe-9.5.0.ebuild
+++ /dev/null
@@ -1,88 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.185.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-9.6.0.ebuild b/dev-python/stripe/stripe-9.6.0.ebuild
index 9eb8142014cd..7e27243e412c 100644
--- a/dev-python/stripe/stripe-9.6.0.ebuild
+++ b/dev-python/stripe/stripe-9.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 9142a713ce46..f407fb342633 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,2 +1 @@
-DIST sybil-6.1.0.gh.tar.gz 70823 BLAKE2B dfdd931f1f2bb7944a97ceb92425e55accc8d7587c829b65be9b6b65007f8a32b076938e1114bbee76d0a9592ba29335cf88e982aa00d1a3ad17c8523f162548 SHA512 2048073c8ef8a9c0f71dabe39ada1404eef3d83509fe3f3e0a7e6b5d1f65a24242c8faf14aaac9ea12b21ab5908dee9bae9d03d9907f09a830d73a3b6e52f8d3
 DIST sybil-6.1.1.gh.tar.gz 71447 BLAKE2B 44ced68adfae094454c9dc4ae55b7327fc9d149728ec9f2faafc42057bc9e99572289100e310f16afdde7741841964a365c008fc9a16092d270ce88dfb0d89be SHA512 f14bb09b8886bd17ccd3a56d3dfc8e2ff510ad04f7b9c8deadff826571e36547934af6855e0a6cbed43e0c0767a0f0af8f80afcecf4a8db74b041fae9d84bd5a
diff --git a/dev-python/sybil/sybil-6.1.0.ebuild b/dev-python/sybil/sybil-6.1.0.ebuild
deleted file mode 100644
index c3cd3f084083..000000000000
--- a/dev-python/sybil/sybil-6.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-# tests are missing in sdist, as of 5.0.1
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sybil/sybil-6.1.1.ebuild b/dev-python/sybil/sybil-6.1.1.ebuild
index a3c67ebe6688..c3cd3f084083 100644
--- a/dev-python/sybil/sybil-6.1.1.ebuild
+++ b/dev-python/sybil/sybil-6.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
deleted file mode 100644
index 34f2117f12b7..000000000000
--- a/dev-python/tinycss/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
diff --git a/dev-python/tinycss/metadata.xml b/dev-python/tinycss/metadata.xml
deleted file mode 100644
index 853174b8f2ab..000000000000
--- a/dev-python/tinycss/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/tinycss/tinycss-0.4-r1.ebuild b/dev-python/tinycss/tinycss-0.4-r1.ebuild
deleted file mode 100644
index 3ef08828ab84..000000000000
--- a/dev-python/tinycss/tinycss-0.4-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="
-	https://github.com/Kozea/tinycss/
-	https://pypi.org/project/tinycss/
-	https://tinycss.readthedocs.io/en/latest/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-DOCS=( CHANGES README.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-python_prepare_all() {
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf tinycss || die
-	epytest --pyargs tinycss
-}
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index 05a5ba64102e..f75f14e93a27 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1,2 +1 @@
-DIST tomlkit-0.12.4.tar.gz 191162 BLAKE2B 3a5f8f01c7965a6d445fa96d0253d0dad55414bf9cae875fe9d9bc670d5b0a20a76fbf655695396ea188cddcea7ad034a38eed05d85f48c47301a3f23a9c7ded SHA512 b6b1cbb954202a256411388eea46852964bbdd02026086a42eab9107c55b961718398ec504f0289560894e9b46cf1c2f4b7e943267454509f6212e899e161d05
 DIST tomlkit-0.12.5.tar.gz 191420 BLAKE2B 3175f2932db1da3aca439581c7a11fd2dce01dff3c9d21b07577bdf38138515105939bc864510dce1f98e28caa222b6ba94a0d0906b515e7b677c405b90bf77c SHA512 85fba0018059c72f483251e53c039ede4ed630dd31afc58a1555705281a42c090aee2d8c25234b8700ff5f3a766313d7c9c716d7224f608f22f836c9e701c251
diff --git a/dev-python/tomlkit/tomlkit-0.12.4.ebuild b/dev-python/tomlkit/tomlkit-0.12.4.ebuild
deleted file mode 100644
index e919c55dee6b..000000000000
--- a/dev-python/tomlkit/tomlkit-0.12.4.ebuild
+++ /dev/null
@@ -1,43 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "poetry' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "tomlkit"
-		version = "${PV}"
-		description = "Style preserving TOML library"
-	EOF
-}
diff --git a/dev-python/tomlkit/tomlkit-0.12.5-r1.ebuild b/dev-python/tomlkit/tomlkit-0.12.5-r1.ebuild
index cb3e37ec1bd4..183926f26348 100644
--- a/dev-python/tomlkit/tomlkit-0.12.5-r1.ebuild
+++ b/dev-python/tomlkit/tomlkit-0.12.5-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tomlkit/tomlkit-0.12.5.ebuild b/dev-python/tomlkit/tomlkit-0.12.5.ebuild
deleted file mode 100644
index 8765f6d057c1..000000000000
--- a/dev-python/tomlkit/tomlkit-0.12.5.ebuild
+++ /dev/null
@@ -1,43 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Style preserving TOML library"
-HOMEPAGE="
-	https://github.com/sdispater/tomlkit/
-	https://pypi.org/project/tomlkit/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "poetry' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "tomlkit"
-		version = "${PV}"
-		description = "Style preserving TOML library"
-	EOF
-}
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 0c67c59bb229..a223bf46a5e4 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,3 +1 @@
-DIST types-psutil-5.9.5.20240423.tar.gz 14582 BLAKE2B 64922d5e12a0f2e9fb5de8dc519c234c4b60372f618393ffe8da21215cf9ce41d0dcd233a44d77c4b3ad852eb7dfb996e58784908a7e44e169bac5541413d038 SHA512 52e895fb82e3221d0dae945afed0091421df65131ed7d9705a58ed90246ed2c884737d2cfda17a70e2fc7bfab3f6d37bd1f0015c6b04218b41bf2a621585c144
-DIST types-psutil-5.9.5.20240511.tar.gz 14625 BLAKE2B bf790a7cb7c32221c5e4ac2efde92b24a32a5bedd5f913a725aeabae0d7feedc0e9a9a0e509e9e4b06d8833a6b397f4695d53f60e67d263e4522db695400a6a2 SHA512 05ff43d1c6b96dafa59cd5eab53f0386739c798d57321febf5253ab5e2a51d79dad41681b683a76ea0def4007f5cdaece8a67928c82fed8fbfbf764d334eb215
 DIST types-psutil-5.9.5.20240516.tar.gz 14771 BLAKE2B 9d163a5909b79a1d775f5edb557fa9e047b2874a3def37ca9277f446ee83b4ded8776c2d231142ee72cf80f7a48c7ebafbe03794d0d3192f762f14692559b16b SHA512 831ffcf2031f3d40d591c7660c38e469114867b53990739130098db571f6369877ee534388ad87f178f1b689c8a66bf020e5b5b2a141aa81485324b370b7473f
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240423.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240423.ebuild
deleted file mode 100644
index dd837c12832a..000000000000
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240423.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_{8,9,10,11,12} )
-
-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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240511.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240511.ebuild
deleted file mode 100644
index 13f69b1b406d..000000000000
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240511.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_{8,9,10,11,12} )
-
-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 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-psutil/types-psutil-5.9.5.20240516.ebuild b/dev-python/types-psutil/types-psutil-5.9.5.20240516.ebuild
index 13f69b1b406d..dd837c12832a 100644
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240516.ebuild
+++ b/dev-python/types-psutil/types-psutil-5.9.5.20240516.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/Manifest b/dev-python/types-setuptools/Manifest
index e3aa4945b6f4..346ad6765ca8 100644
--- a/dev-python/types-setuptools/Manifest
+++ b/dev-python/types-setuptools/Manifest
@@ -1,6 +1,2 @@
-DIST types-setuptools-69.5.0.20240423.tar.gz 37608 BLAKE2B 8a5b9ece3318ac9646c5a8e5961e6fbc05fddb4a5e96cc2d0d96f11b317b2ec1da1f4fb8624348e0cc307cc7781895f9d016eac3f07f37351a3211f77a2de1a0 SHA512 2134c4c31bddd6c8f5722f171054dda21abdb13d743fb94fc280fc185b521b24e889be9f61c21e83a5d881c9ca40ffb7b60d49a3abb63f30c51793ed2b32b56f
-DIST types-setuptools-69.5.0.20240513.tar.gz 37766 BLAKE2B 8c573de3c40af243061f04c21266815fc13f6f5244919b98ecd2345bc790a40471ea21939163a08727b505b5cf295e44889ace93faf51ac9baf9f51195fecb6b SHA512 fcd7262fc2f54f22480ddc09f9edfa1202dfc0e5f2d0dec3accc6bfb32666bd3f49a6e455e0e834e2166d38ea8782c172dd85c4adb30329b0d7c9bae66f74d7b
-DIST types-setuptools-69.5.0.20240518.tar.gz 37877 BLAKE2B 0dc0debe16a13d3b365284eeb73f15f2313de78d6bb68ea87ad7f55109980cc67704a9b83e5e25027110ced85249503578232c9b949ebdafd19fcbc5b16d9608 SHA512 08e4fb4db92ac81eccfdd9a458ec8313e26bf4ad2d4125797acd6c4e02c47c0a9715aaad0b270895e52947b0d0e428d32bcbae310a5b799a0ae1510afb8211e7
-DIST types-setuptools-69.5.0.20240519.tar.gz 37962 BLAKE2B 236cf4def03a6cb2fa42965e1fb1f06343bc0aa70499a232c0f831276cdbaf996469f1553d03e54f1d8e45967444860a86a224a094038aff058fcdc7e2645744 SHA512 ea7077a51c0ab14fd7c417b9512acaea76b38ee7342c42ba22e016ed52adf2b1c38998e9b060fe2d0224fdc7e5b39ee2d57decb65f0880bc34a47b544e7aab12
 DIST types-setuptools-69.5.0.20240522.tar.gz 38273 BLAKE2B c488e16638697c899ad6b01dfa3fac4dd9e9379680408cb44fc3624084cca2f87b5d510e44632e521b8f531a10f189608f002ce555355a308f5c879369d499e9 SHA512 3062676cf158c7505c4fb07faab41a75163b79cca06a3a558d62879efd0a05413fefb31eb291c35f7e0dee5c8a9ff95ef8738e9e7780714e58984f50e43e0449
 DIST types-setuptools-70.0.0.20240524.tar.gz 38370 BLAKE2B 7964344dfb8a9b3594bd3b6f46b1e41b439dff2c035c16c3bb93b0ed23f2e9380e4ba8af50f3ae44217fdab79fb15a5002f6792d1b9d9e1d5e5cd11057f55bfd SHA512 9edace3d84b9bbcb67fb4ff5f0c17ba7416901b1b12359e5394f0a5edb3250bbf81cd39946a4566217f0060fe50b15580df99b1f4e028774e4d36e0b5416a374
diff --git a/dev-python/types-setuptools/types-setuptools-69.5.0.20240423.ebuild b/dev-python/types-setuptools/types-setuptools-69.5.0.20240423.ebuild
deleted file mode 100644
index 83c285890380..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.5.0.20240423.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.5.0.20240513.ebuild b/dev-python/types-setuptools/types-setuptools-69.5.0.20240513.ebuild
deleted file mode 100644
index c755b6e96b17..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.5.0.20240513.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.5.0.20240518.ebuild b/dev-python/types-setuptools/types-setuptools-69.5.0.20240518.ebuild
deleted file mode 100644
index c755b6e96b17..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.5.0.20240518.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.5.0.20240519.ebuild b/dev-python/types-setuptools/types-setuptools-69.5.0.20240519.ebuild
deleted file mode 100644
index c755b6e96b17..000000000000
--- a/dev-python/types-setuptools/types-setuptools-69.5.0.20240519.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Typing stubs for setuptools"
-HOMEPAGE="https://pypi.org/project/types-setuptools/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/types-setuptools/types-setuptools-69.5.0.20240522.ebuild b/dev-python/types-setuptools/types-setuptools-69.5.0.20240522.ebuild
index c755b6e96b17..83c285890380 100644
--- a/dev-python/types-setuptools/types-setuptools-69.5.0.20240522.ebuild
+++ b/dev-python/types-setuptools/types-setuptools-69.5.0.20240522.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-setuptools/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 3577d2e46215..1ee73097780d 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -13,3 +13,5 @@ DIST uv-0.1.45-crates.tar.xz 58017580 BLAKE2B 557abd37f4b436077e59f506f62403b8dc
 DIST uv-0.1.45.gh.tar.gz 1105106 BLAKE2B 75b0ce6f21e6f0da8d95be8b035cc817019ad1d1a5227c422412bf8f8b70d3e60298a9355f73dcdc658f43ed5d927bc7e4ed49cc0aaa5ee906ed281d12eb4956 SHA512 b88d0b691d86fd12c830acd06bf7a5b6319b41435ab59a7c8bd975d6876402dba721ef8460fc79a2b515d8737e1848912848bc8751cd28cb4acd148c73e107ad
 DIST uv-0.2.2-crates.tar.xz 57993620 BLAKE2B 31a7b73c0954a057a8ddd04d328e1e2b2e00d74b9c5431bbdf0771780a964d49ec8e6dcec00dbf49606c80a01c53117cef76b94bb0a07f15b85056e27d5310e1 SHA512 cccdd9536bbc738c83074eb2e41f1ff329977fe12240c473d8ff4de226dedba97ce9e79998dda25b0f9014e2c8373d80ed87331c0d5314b866b264a011d7c555
 DIST uv-0.2.2.gh.tar.gz 1122110 BLAKE2B c65b3925d7798ba5cb43359ef073c673047fec8673f698f5cec3aed50661b08e13a3056345384cae654d2eeabced4c717bac228d77b01ba9522dcac1f18d899e SHA512 9520b8d8c4684b3eedcac686814b7b7d74190760b1d21dd7b3ad99b45954f61437b9ee9583b262ed05b53e9ab0e908e65a9d0e0fc7b3e4bf31c298784d185396
+DIST uv-0.2.3-crates.tar.xz 57931028 BLAKE2B fe6040bb495613a462ff1ae654717b7cf9f8155b7940c0de4e2429b2e764adc59079e8a0aa3f610d8e4e1b219e4693324f33175988328f288844eb39c7e9efd2 SHA512 5557318b621d8ff24af1729c41c07b25c7bc55f680683b5ef827f83c06370585852cf12ca557cc25d93a36e3b6e8fbb275bfe8491185fe8136b407850765cd76
+DIST uv-0.2.3.gh.tar.gz 1123964 BLAKE2B 86f74e01c28dbadfa9ad8b4c2dc109b51d3fb9ba35cf1d5d038856cce03ccbfc2d60f02332a60f74725fd7b39f12ad81cfaf8dac63766b56bc8d385295626530 SHA512 af075da0332ef912c589926e56175bd5c3664f52f4c6f5728624d413247891c919389bb316e237cef1d53aca0725a98609f5fccc5c847e0f96d6d31bd5ee1ab0
diff --git a/dev-python/uv/uv-0.2.3.ebuild b/dev-python/uv/uv-0.2.3.ebuild
new file mode 100644
index 000000000000..609994a07315
--- /dev/null
+++ b/dev-python/uv/uv-0.2.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;0e684a874c9fb8f74738cd8875524c80e3d4820b;pubgrub-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_P=${P}
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${CRATE_P}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+DEPEND="
+	dev-libs/libgit2:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.77
+	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
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 8d28e284716f..600d8bdbb2c6 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,4 +1,5 @@
 DIST zope.interface-6.2.tar.gz 247528 BLAKE2B 4112579da95e763bb5feca7fc8845896178afd5e3fb181a5945de80cf579d0c66373e9ee9cbff97964f79750908b5e4650316b3df1cef16a267c3625268cec46 SHA512 42c169ba88e0e4fe7895f0956250ddb5f3e9aef3e73a801ef71b0e94f906e9f597008de16955a7a8a5ca59551b800e6f000c70ffb3f486a7cbb7bf9caa00059d
 DIST zope.interface-6.3.tar.gz 294679 BLAKE2B e70c0581213776a685ff8e208a418f82adc5df2d53cc00316e38621dfa05559836416a897366cf7df76784405490c3cb137ff48d35287812f503a4685e2e75be SHA512 fcc318fd098ca91a4617f2a15123cb727c4ebcdeb56b4e0c59475a55d67afdfeb2f2e2d0fdef462e22236c8733ba2c5982ba72c8e75648be6bf55116f5d39139
 DIST zope.interface-6.4.post1.tar.gz 247305 BLAKE2B 3e61b90ceb22fcb7902b2fab5d07a3dea65555384221f4f87a3e73ed084194fc9d65d807a9b253be62ca9616918bca4b7b7e430884718f6b56360deb4f804d03 SHA512 4b0aaa71f2cbba461c18d2e3123f44eec95981bb3fc453280e226583b7ec184073a6028929b6509731153f9105615c283a46b083a7089eb1e6381019b3eec3f6
+DIST zope.interface-6.4.post2.tar.gz 294539 BLAKE2B c6d892357e2ead04841cc5dde924b560e0cd968d84c607e3d1d2ebd804c2d1fbc764a721e8182ffd373a6339967b5230153e3e4934359028e98a0ad4e26c92a9 SHA512 da53c2136a6057de49374a428e855ad731288e45f27787d255073adb188680cb46a7b493258da01d6bbce5d7c7181306b64eb90609520aab361ac07dfba00d4b
 DIST zope_interface-6.4.tar.gz 293987 BLAKE2B 40eb0fbd56c49c82773d4854f92ba691bf3b68850f443362249c22401b3c0f3859b3adc6768c9fc6c01d9f9435d1fde45bf5dce0a72b69981220424e8a49ef5d SHA512 a76d7235bac040fe0b663eabd7bd993ea9db31e39f3786343ee56aef13c36c036398cd17856f33413d4aa6f4d203c4997c178bea306a05eb9c5da8cb880e02c3
diff --git a/dev-python/zope-interface/zope-interface-6.4_p2.ebuild b/dev-python/zope-interface/zope-interface-6.4_p2.ebuild
new file mode 100644
index 000000000000..e7ac2640a571
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-6.4_p2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="
+	https://github.com/zopefoundation/zope.interface/
+	https://pypi.org/project/zope.interface/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!dev-python/namespace-zope
+"
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -e "/'setuptools'/d" -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}