Adding metadata

128 files changed, 550 insertions, 2867 deletions

diff --git a/dev-python/Faker/Faker-28.1.0.ebuild b/dev-python/Faker/Faker-28.1.0.ebuild
deleted file mode 100644
index 7c917a89cadb..000000000000
--- a/dev-python/Faker/Faker-28.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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}]
-	)
-"
-
-# note: tests are flaky with xdist
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-28.4.1.ebuild b/dev-python/Faker/Faker-28.4.1.ebuild
index ea68314c824b..d0f2153a1974 100644
--- a/dev-python/Faker/Faker-28.4.1.ebuild
+++ b/dev-python/Faker/Faker-28.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 98350730f8d2..7f7d478746f5 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,3 +1,2 @@
-DIST faker-28.1.0.tar.gz 1781898 BLAKE2B 4c18e70992e89b4638815afcd2be4a409e9caeb7e32f8903964491e4f687f25b0184dd3e4e9cd605e3fd0cdc33bd3b9be6573e60f98efaf18b0ddecdbf9355b1 SHA512 a312ccce960ee01452329bdf47289f8b4fc9362b1a10a445d93583eefae7c8aa94af363733babe56dd3c7df4a1e585c8a4f84e86d811fa2e1a6d050924c9ae95
 DIST faker-28.4.1.tar.gz 1794640 BLAKE2B 96a2f16b1d1906c1ae5263f8a2e782417fa6fb8062881d3700bf31b25892f27c612ebb64be925548c848e75e2e90d5761cc20a7b7bdb74119c95dfe3e5b871e5 SHA512 376b8e97ef654477ba549f0de50ef02979bf2595051f1a41b353a44bb734aa75171afa633ea76d3f02cf72f84dd12d268e28a4baba55fcb728fb4cd988b57e6a
 DIST faker-29.0.0.tar.gz 1795098 BLAKE2B 96f6ee6166cc4dde4c6c8e1be2ac9cc1f529c5afe371cbb75c264777fdb390aa6dfaf199e6671b9f3e4658937c7fc0953aa31e548d3ea2e7ae948d8e2ced8e7c SHA512 09f46d2693b611277312cd39a5a6b7a40271c7136fd42c8a02c6d55ab10caeddb8d614db81ea76bc37879b21c6bb53297b04b7169410da7d6d183cb1406f60d9
diff --git a/dev-python/aioitertools/Manifest b/dev-python/aioitertools/Manifest
index d2328ef1a247..476b3ea613a4 100644
--- a/dev-python/aioitertools/Manifest
+++ b/dev-python/aioitertools/Manifest
@@ -1,2 +1 @@
-DIST aioitertools-0.11.0.tar.gz 32053 BLAKE2B 1dea436f26f738b72aa2a2085d102b7228250f463cbc0cc45d8875a3a78e5468b3d3e7149f2df8754dbc6611f4f62e79ad263669a1f228e576fc2807d2f2f135 SHA512 ed2ca827ad72eadb541eab6621bb3d4a654f5f35a8ec185906aac558e2f7b7d6956e24b57b8540d48fdf48e6f630547ec0cc83627307c227bfc33bf1bf44c451
 DIST aioitertools-0.12.0.tar.gz 19369 BLAKE2B c19cc1590ecef5889bf48045a2ad342bab2c5e57615dc3bbdc6f786db240eade5adb6bc4187084c1b88ac66f30c51e9bc46c17672a953e2c4e4926762fa53c8a SHA512 759db7a6f1158f829ed1c8d80fe9c7951b15cb6eaa4560b2c7d6df52fc4bc4d3c8ef4dd2468fef2a61292176b229076f4a57ed025b815ce9720f286dbd10e131
diff --git a/dev-python/aioitertools/aioitertools-0.11.0.ebuild b/dev-python/aioitertools/aioitertools-0.11.0.ebuild
deleted file mode 100644
index 7c7ac999c60c..000000000000
--- a/dev-python/aioitertools/aioitertools-0.11.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 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="itertools and builtins for AsyncIO and mixed iterables"
-HOMEPAGE="
-	https://aioitertools.omnilib.dev/
-	https://github.com/omnilib/aioitertools/
-	https://pypi.org/project/aioitertools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-python_test() {
-	"${EPYTHON}" -m aioitertools.tests || die
-}
diff --git a/dev-python/aioitertools/aioitertools-0.12.0.ebuild b/dev-python/aioitertools/aioitertools-0.12.0.ebuild
index 31b978f65ef4..7c7ac999c60c 100644
--- a/dev-python/aioitertools/aioitertools-0.12.0.ebuild
+++ b/dev-python/aioitertools/aioitertools-0.12.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 python_test() {
 	"${EPYTHON}" -m aioitertools.tests || die
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 8a4bb9cdd6f8..97c31427ed0e 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1,3 @@
 DIST anyio-4.4.0.tar.gz 163930 BLAKE2B a37b8bc05e43cf1a4bc3f15ab399c78c7a76235942d776848307b189898973e46ddfb553bd20da154dc740d8b8bb93050ac460e56607b686bc2936c5a1e09332 SHA512 db8ad7a4faf257269de9975c3a6325023a95255a8bfe1a9642221080f44a2487160f3c0e8b220d637816e9eb3641550393a3c80b23bddafc33fd9ebe9a23b33d
 DIST anyio-4.5.0.tar.gz 169376 BLAKE2B be8b68729b9ad3c6ff39844617ebabf2b36facee5b1e4cbc9933fb6315a70daec785d2aebab9dc29d387987bee20bc6bf56f3befa9a997a4caa2ef9d7dffcc23 SHA512 12dbcc59888c555381589a820713c636f0f1a09d7999746ce5fbbdaa9a4cad5644510d036287d202db617ee16d59231a8edc824b003056bad22a189b5863c6f5
+DIST anyio-4.6.0.tar.gz 170983 BLAKE2B 686cb9b622cba29d02fe6e440502de80c159dc40547124aed79eb7558fe147fa62f378745c2aa5487ca1ea7c24e1f3c6167f8343236dbb7e0876d95f741c46ec SHA512 4828198d3e2b2924b3490c305dcaddc14b5746b29a0cb36f75913f897254fed0ac46e075a3c04bf164a7d4d597b0dcdd991fe5cb26ffce477d029db7ff924f38
diff --git a/dev-python/anyio/anyio-4.6.0.ebuild b/dev-python/anyio/anyio-4.6.0.ebuild
new file mode 100644
index 000000000000..86c5a804cb7e
--- /dev/null
+++ b/dev-python/anyio/anyio-4.6.0.ebuild
@@ -0,0 +1,74 @@
+# 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="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio/
+	https://pypi.org/project/anyio/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# On amd64, let's get more test coverage by dragging in uvloop, but let's
+# not bother on other arches where uvloop may not be supported.
+BDEPEND="
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/trio-0.26.1[${PYTHON_USEDEP}]
+		' 3.{10..13})
+		amd64? (
+			$(python_gen_cond_dep '
+				>=dev-python/uvloop-0.21.0_beta1[${PYTHON_USEDEP}]
+			' python3_{10..13})
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinx-rtd-theme-1.2.2' \
+	dev-python/sphinxcontrib-jquery \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires link-local IPv6 interface
+		tests/test_sockets.py::TestTCPListener::test_bind_link_local
+	)
+
+	local filter=()
+	if ! has_version ">=dev-python/trio-0.26.1[${PYTHON_USEDEP}]"; then
+		filter+=( -k "not trio" )
+		EPYTEST_DESELECT+=(
+			tests/test_pytest_plugin.py::test_plugin
+			tests/test_pytest_plugin.py::test_autouse_async_fixture
+			tests/test_pytest_plugin.py::test_cancel_scope_in_asyncgen_fixture
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network' "${filter[@]}"
+}
diff --git a/dev-python/apprise/Manifest b/dev-python/apprise/Manifest
index c5ccd1905d8b..8f66d188b53e 100644
--- a/dev-python/apprise/Manifest
+++ b/dev-python/apprise/Manifest
@@ -1,2 +1 @@
-DIST apprise-1.8.1.tar.gz 1696426 BLAKE2B ddc8966716e89a3e18995370e90f20c080a1249faccdbcf5f28fb22a89dc3f415c33208a5c98352307a28a65b45e305d1b9c3e2df52f6f6f017197a6f893a101 SHA512 b0e5d760ad8fcbecaa51de8e398abbb8766ef8a52bbd9cbd7f77156e4e00194adc1e18e0b6a95c611863ae72162041971408744348a7ea9e6579f4f4aae15f04
 DIST apprise-1.9.0.tar.gz 1753505 BLAKE2B 83dda79cb585387ba3fa0405126274c35bee20e40a91e699441f56341f411e16dd62ff73115e6cde42e0184afffcaa4cb0783e082d0b2c1ed59a58839cfe9c73 SHA512 9b1ebc18f1662cea35186ddf28182e5507d7faf6e13770a4d6448f129c9d4659665ddf502e0cc7e6bd2e67cda41ee94cd0898f53b986af0daae5f905ccdab2eb
diff --git a/dev-python/apprise/apprise-1.8.1.ebuild b/dev-python/apprise/apprise-1.8.1.ebuild
deleted file mode 100644
index c01a1ad9cbea..000000000000
--- a/dev-python/apprise/apprise-1.8.1.ebuild
+++ /dev/null
@@ -1,38 +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 pypi
-
-DESCRIPTION="Push Notifications that work with just about every platform"
-HOMEPAGE="
-	https://pypi.org/project/apprise/
-	https://github.com/caronc/apprise/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv"
-IUSE="+dbus mqtt"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	mqtt? ( dev-python/paho-mqtt[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/apprise/apprise-1.9.0.ebuild b/dev-python/apprise/apprise-1.9.0.ebuild
index 1fb4c1bf85d5..c01a1ad9cbea 100644
--- a/dev-python/apprise/apprise-1.9.0.ebuild
+++ b/dev-python/apprise/apprise-1.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv"
 IUSE="+dbus mqtt"
 
 RDEPEND="
diff --git a/dev-python/apsw/apsw-3.46.1.0.ebuild b/dev-python/apsw/apsw-3.46.1.0.ebuild
index cd1426156f2e..35a6a1676a64 100644
--- a/dev-python/apsw/apsw-3.46.1.0.ebuild
+++ b/dev-python/apsw/apsw-3.46.1.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index bdac57e6d1a8..fb8ca07280f0 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,3 @@
-DIST boto3-1.35.10.gh.tar.gz 856679 BLAKE2B 03e7be74455b487a79188405796fc08bd940962ca4ef8c36398ee8f955c2677e57a528626ef31e5e54ce2c1b96c82cef857b54dcc16248178c60c14fd14de3f9 SHA512 99c0e0b67a590a06713eeb98eb485b055ee6fa1bd181f996d24bdf88698d7885efe0a5f1e9883083655b12a474112a03f8561c66c4c5b5a0e6db56d5733db77b
 DIST boto3-1.35.14.gh.tar.gz 859166 BLAKE2B eb201a319453097068b4711356ea930de739ff8874da7441fa3b931434c8a82a1692a5f67b10f06eaf7644335033e302f733fcc2267b782398e9edd28c32a613 SHA512 ade4b6bc0c816244d5335b1669090d8a5e3c8dcc8802b0aa10498ce8c5fe8e456958ff3bfd73a5c9376ce1658f9c2a90d5470c86c2b3399d7198bacd09764619
 DIST boto3-1.35.19.gh.tar.gz 861578 BLAKE2B 5011df66763e646768232a65022080ffbe3db08253f1bf3e192cf57be010ccdd08f8add78ec365e1c04d78ba1722cf6ef54fbc170f7f2419fcd370c08d48e3ce SHA512 faabd3ef8eb35a323ed64a711e0a026f8f77974516b05a93d389fb82b84932f69a2c784a1065811699dac4db016549f3756f24b879485b2dfb6ca380e6873670
-DIST boto3-1.35.20.gh.tar.gz 862207 BLAKE2B 06a45feaba2a8afdd213a6c059e3a3dce2608ab5f55bdccd17478be8b865ad3dddef2459481f4565bbb44736bf6ae2a68bbd26dcd1e3f0e12afc03290dc8433f SHA512 59854e97f957b58c391111aae2538771003414c04d46d50006306b84b3566dd7b1d369e68ecc658e66c04fdf89541184063aebec7859387503fbea2cfd40ea08
-DIST boto3-1.35.21.gh.tar.gz 862801 BLAKE2B 44f322177603bad3de23dc47d95dc8b80b442762986a4402ec441c96cbbaa4708a3a9532c477983c0e0d857975f42ee980e61328ac72dc8bd68151980014dba1 SHA512 67bf2a8051bb08c1b761f1a13df41806356c67826e7cc6bd3c38f82ff709e6baac43430ed720f8d1f31a7e6c1fb7e4bf14bf67e8fd66db3f133ba8b8c93384c3
-DIST boto3-1.35.22.gh.tar.gz 863521 BLAKE2B 758d3b7ad49d147278e5a3cbe222fdc1b21f925343c491b4f1708762e70e7b5cc89eb3003e3b8fd1430b8b04f8d9a59c7002c404597a03321a4a57c8827a5a5d SHA512 ad7524fd5850fd77d4f3f5ca5a94c3674639c3b4e7b6d65881cf2e546f8c5f9217d2513b43435b1a9ab97a63c9d94c20f00a3791a5fba52590b2eb4c5453bf22
-DIST boto3-1.35.23.gh.tar.gz 864231 BLAKE2B 53c7a4aa10e0676983e1909fee7264106ad10526848ff122c74125fc26ff49eda0571aeecf7d914050c0d55a47b63de85f493333d0774daa2006ea57f899e95d SHA512 ccd5c2654f5f355a77fa0b562e5e1603948ae2146b2600a01e17fac2540deb86adcc82d3d5c493385361f0473820c7b7eaf7057566cd33ca50e7f18b8f8e6579
 DIST boto3-1.35.24.gh.tar.gz 864653 BLAKE2B e2327ae352d17f0cfabdcca6d7db07e0212ea740c66d8f36baf44d0617cdbfdcb018388fed1deeea37bef5e44edb360f2cb77b41085e7a3308f7d4045b0a4aa3 SHA512 e34b02cf141bd77d92a34dbef266e07f6d45d46aa924e3941dbe09a9562253f375b79a6a4f1e3df248d711341e00367a8519f816b2200353a6262de72a40fba0
diff --git a/dev-python/boto3/boto3-1.35.10.ebuild b/dev-python/boto3/boto3-1.35.10.ebuild
deleted file mode 100644
index 1ad6d3c11774..000000000000
--- a/dev-python/boto3/boto3-1.35.10.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.35.14.ebuild b/dev-python/boto3/boto3-1.35.14.ebuild
index 509842b2699d..1ad6d3c11774 100644
--- a/dev-python/boto3/boto3-1.35.14.ebuild
+++ b/dev-python/boto3/boto3-1.35.14.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/boto3-1.35.20.ebuild b/dev-python/boto3/boto3-1.35.20.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.35.20.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.35.21.ebuild b/dev-python/boto3/boto3-1.35.21.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.35.21.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.35.22.ebuild b/dev-python/boto3/boto3-1.35.22.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.35.22.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.35.23.ebuild b/dev-python/boto3/boto3-1.35.23.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.35.23.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 667ffe693677..1f7d89e9e4a7 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,8 +1,3 @@
-DIST botocore-1.35.10.gh.tar.gz 13328544 BLAKE2B cecad54696210597a09f4316a88b8335bc441a6429ddbc7f3c6e539a1aaee4312b855ec93b99971c8241b2431a920085f4f3b38545d607609a8d6a94d36676d8 SHA512 cf6bb103aea0af9ed2e43762848438eef89ab5bf8eec856cb8cd70204dd36f143ab9b8defd6ecd849a542332351feb499d8c34e7382bde558eac3ad19b1c5757
 DIST botocore-1.35.14.gh.tar.gz 13340768 BLAKE2B 4ba023dbfc9e632d86028100910544e192a5b2d70ec76a21dfc5003c767a6043a144385561c35f4d7b4bfefbf4a1f3a38ef2845e323f93868e1f5ad86ae1f12b SHA512 c0dfdec80a45cf11796496bc2bef575a567368be3f29267b4d411d0615e6c8536036e47a5de11fb8f4626590dca051e891bb9430ed1ea80dfab2f43f070209d2
 DIST botocore-1.35.19.gh.tar.gz 13376459 BLAKE2B ba64ff0dc221782ce23592a6d6a146a680e2b86aa734673d4b16d6fd83355958b32af0e86a6769d2237e6234d80fb7fb23d52e3bcd2187cfe7d3646307fdea38 SHA512 6988f442b573e951766f1978325937a29141436d976baedb9c29959d5ff64014520c1bee4a8ce9b0d4226f62a6efb081a0532b2a825811e8cb2de3217ed311ae
-DIST botocore-1.35.20.gh.tar.gz 13379086 BLAKE2B ea90039d3dd8848052e45e967d5a4598ca7eee3cfdad492660861b63eebba2fb1b012ac146a457d5ac4f299b5c3cbf81b5c002b6f9c88d8aa37eb32a4decfb8b SHA512 35e532c49a20a098d0694be93243eca285e311899d52eae9bbc99823d65464709ae7ad03f5a82e9dacba392b83be74fc84ede549d5dd33a875888346fff6d26f
-DIST botocore-1.35.21.gh.tar.gz 13382479 BLAKE2B 6f63f736fd4bba93829dd4243bbc2ee46ee9e75f86c294cf8c2f0cb89f981f4b38146532fcb7a77184fb795d1d53d40791c6e7595b9db9ac340180cb18664dbd SHA512 c2341709b2b52fe9ee2512edab44721b00612b4f489f8dd67361c69ddc702a094aeb7dfd6fb6c15598a43c6ee4e6c530ead9525e4f5e4b59829b5ecfc18945cc
-DIST botocore-1.35.22.gh.tar.gz 13397669 BLAKE2B 644cdd48d54a92fc8c2a1f024ee0e20662431f90f45340cf4ca50f2378c4cb8c0f322c2c86a1546ce0bac5b837295643a622816a2498fb643494a94b16f034c2 SHA512 5035a36bb8af933b871bb16ea617368058b3f4c6517f9bcc95291dcfe3cc479934aa70e5d746fc5fb7936d917f9e286cd5aefac271b27bbe25c49f267e87c9e6
-DIST botocore-1.35.23.gh.tar.gz 13404025 BLAKE2B d31ff73b019ba2c02a4a8d9014550b39470a821b18aa4219dea4124dd75017030c0ce54a7c8c35419c7bdc743a6c7fced5d3678eca6a0c8434098af1beea51f2 SHA512 9d45182a6dfffd9d99cf2bee4640680ef969084f86179d34b570028322b9e02d1f671285e84e3ed954df89f0467becf8ead7b37249d7365e0ffeb7e39358107e
 DIST botocore-1.35.24.gh.tar.gz 13406391 BLAKE2B ddc1c456e4358b3e28ca8f6a92230fb843309fd6059eaf909a9fb3de0bd580fb52389173187e0794054b9f1bc21a829f457b80067868c13fd7987fc682acd024 SHA512 7a1e8c1a85e8699a811a41b59cdefcee2457c5dfdf01d54f3048f894869c5c4033287909095bf15304e408c268cf772194655afffff280dbb6fd6c6daac1d8cb
diff --git a/dev-python/botocore/botocore-1.35.10.ebuild b/dev-python/botocore/botocore-1.35.10.ebuild
deleted file mode 100644
index 3f7c926a5b9d..000000000000
--- a/dev-python/botocore/botocore-1.35.10.ebuild
+++ /dev/null
@@ -1,76 +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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.14.ebuild b/dev-python/botocore/botocore-1.35.14.ebuild
index 64a61a30c80b..3f7c926a5b9d 100644
--- a/dev-python/botocore/botocore-1.35.14.ebuild
+++ b/dev-python/botocore/botocore-1.35.14.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<dev-python/jmespath-2[${PYTHON_USEDEP}]
diff --git a/dev-python/botocore/botocore-1.35.20.ebuild b/dev-python/botocore/botocore-1.35.20.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.35.20.ebuild
+++ /dev/null
@@ -1,76 +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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.21.ebuild b/dev-python/botocore/botocore-1.35.21.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.35.21.ebuild
+++ /dev/null
@@ -1,76 +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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.22.ebuild b/dev-python/botocore/botocore-1.35.22.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.35.22.ebuild
+++ /dev/null
@@ -1,76 +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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.35.23.ebuild b/dev-python/botocore/botocore-1.35.23.ebuild
deleted file mode 100644
index 64a61a30c80b..000000000000
--- a/dev-python/botocore/botocore-1.35.23.ebuild
+++ /dev/null
@@ -1,76 +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
-	)
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# memory use tests, probably fragile
-				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/cffi/cffi-1.17.1.ebuild b/dev-python/cffi/cffi-1.17.1.ebuild
index b9c93034096b..f8789aa2747c 100644
--- a/dev-python/cffi/cffi-1.17.1.ebuild
+++ b/dev-python/cffi/cffi-1.17.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Needs recent libffi for HPPA fixes
 DEPEND="
diff --git a/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild b/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild
index ff0861230c7a..f579cb9f00c6 100644
--- a/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.12.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.91.0[${PYTHON_USEDEP}]
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 737c0496a495..0c32f6bdd3f4 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1 +1,2 @@
 DIST configobj-5.0.8.gh.tar.gz 99071 BLAKE2B 61fb8622f3771f56f3a67511ce0eee11b9022a47a6a48858fafad966dd7fb18387d18dc0c32984bec064c2b03a7c72570248a967bf428f871c5b8ba4353a71e7 SHA512 26cdfec9f4d7adbab579191b29e6642f4f2a6fc73353f877565b76682d6087748f466f9cbb82fccfb2d409bace29c377c2276848179f5cb396e6ff1375c8edf2
+DIST configobj-5.0.9.gh.tar.gz 98246 BLAKE2B a91e2fd8aa19bae699e8edd5e5f60f0cfdebd28026a4582ac5a0afc11db9456e498ea1f2251e6d8223984f5a679a581cdf16fc9ba5e25ba490b4786d5cc092c2 SHA512 95ca81f785aacdd6c17b36b937e3338a8a72491ea153fc10db3eb038332d389c6cea0dca4cc8df803495e3d326e25e2e56a1741b84ea57c0159d38d3ded52fc0
diff --git a/dev-python/configobj/configobj-5.0.9.ebuild b/dev-python/configobj/configobj-5.0.9.ebuild
new file mode 100644
index 000000000000..ccd6c6eee379
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.9.ebuild
@@ -0,0 +1,29 @@
+# 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="Simple config file reader and writer"
+HOMEPAGE="
+	https://github.com/DiffSK/configobj/
+	https://pypi.org/project/configobj/
+"
+SRC_URI="
+	https://github.com/DiffSK/configobj/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index bd4cfddbd0f3..6b97b3d1efce 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,2 +1 @@
-DIST doc8-1.1.1.tar.gz 26514 BLAKE2B 847e34081f4e00698cbe3ca9b7325de2995c45bd02b2f443459050a2801a5b476222c345c4ba06463fc6ff489c3c59e5b6e7abbd7b98af740f09d5b04771a4b2 SHA512 7ec21c2483f7ebf2a7e1fef6677c6051ac253da6014354a968b8a107d8097f986b6b162850561fd6a103e93d157b2c849554aabe2484a49c4a3726c8e2083a89
 DIST doc8-1.1.2.tar.gz 27030 BLAKE2B 76c02acb4165bc70a5f84a68c44a1560ca2fe7eae97efe12e93f48922439ca5141028be4be78f3edaff5e25757bf668e567b77ca2f46c0844a54b085da9e3e1e SHA512 77e6dd1abe99ae993138653093458672e8af281e9c195696b67e2ba1a2d0ef4f1b77dd9f24077f159d0b6d9dbb2c78b5b24fc1a6121e2a199fe72528e3926072
diff --git a/dev-python/doc8/doc8-1.1.1-r1.ebuild b/dev-python/doc8/doc8-1.1.1-r1.ebuild
deleted file mode 100644
index 15e540a0d6be..000000000000
--- a/dev-python/doc8/doc8-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
-HOMEPAGE="
-	https://pypi.org/project/doc8/
-	https://github.com/PyCQA/doc8/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/docutils-0.21[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# setuptools_scm_git_archive is not actually needed here
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/doc8/doc8-1.1.2.ebuild b/dev-python/doc8/doc8-1.1.2.ebuild
index f31eedcbf860..a0325b7689b4 100644
--- a/dev-python/doc8/doc8-1.1.2.ebuild
+++ b/dev-python/doc8/doc8-1.1.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.19[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index a16c6961d2fa..ce077201f752 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,3 @@
-DIST google_api_python_client-2.143.0.tar.gz 11695158 BLAKE2B bff768420c0303403268aff68059e81852da89e1a353bae23c86f17314842e17986b39d5c2410adc8991d3966b1c718e88a49a22ed0e222758928928c519077b SHA512 c977599521402fa3b63c432d8e058a4c5a2ac5cf15eadcba7d43200a2c5eb246bdd25a7fecb98ba3c2791d0d566a518d8274f9f77561d0fc7c78c7378a0b05c5
 DIST google_api_python_client-2.144.0.tar.gz 11688778 BLAKE2B 98ca8b9d389876abf16c809f72a6ed907676ae6607acc82aa4656f8c05757459a478f820db6dc364eb7484a839f402c43c50136e254e5d0501eeeba1a1274a67 SHA512 3e6a9a59408f994dd8b5fa6ef5e49b069d907006a29c6631fdc25d6f2cc885cb919387b1cc385d6ecfccab450b4a4787787e401be9b2d7d97ba455595d72d297
 DIST google_api_python_client-2.145.0.tar.gz 11714260 BLAKE2B eb672bdf74519f7dfd984412348ee0c62aa6a942acbb3182648bce2018af72ba6737924cb82c754a94c02f5b749c1bfdd07edb66bb2294b98e2b636cac7c2107 SHA512 33452e866798cd82f79e4d9a8708b4ca32a1e3118e37fbfe5b6e8b8b431167560c4175a5155499bca864fbdb59623368663e0025f71e8bd64b44e365ac889ad8
 DIST google_api_python_client-2.146.0.tar.gz 11690645 BLAKE2B 850f8b5b383ab8485b4b8aef77e94a18971498b51e1689aa707997931ba908e97e590681900beec42fc0f50adcbe8488657fbf0be0d8d5c6a55dc424a49ed86c SHA512 5789e69f1d279f8e53d40348af770aa03738853ebf19cfd4e50f23dca3412ca7d360993e4e00c4f0e654c65b3dbddfc2ffca069ebb26cc13b674bd622e90ae2a
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
deleted file mode 100644
index ac128eeaffaf..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.143.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild
index 10fa88d021bb..ac128eeaffaf 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.144.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-i18n-address/Manifest b/dev-python/google-i18n-address/Manifest
index 32a0f7b9bda3..bdb058706821 100644
--- a/dev-python/google-i18n-address/Manifest
+++ b/dev-python/google-i18n-address/Manifest
@@ -1,2 +1 @@
-DIST google-i18n-address-3.1.0.gh.tar.gz 726728 BLAKE2B ef41b285aecea0b3e11b08c0815d57a2c3816c59fe01fab64fd75913b0f870e42fbcd0ed76b201c6cd47e4b249c03689b54c648468c3a2cf3d3cb67e2be7ab03 SHA512 b47b5eeaf214a04614ed0976055d25fbce2d298c45db4bfe31b369cd27dc1e097b14d4fae62b5f8dd95be5693d2fda12d0b618029dc1f3ed2784e28b60c43ef9
 DIST google-i18n-address-3.1.1.gh.tar.gz 726391 BLAKE2B 5c77c059a61cd4f8d56bf25d95f9672c3c8185348239a5aafe54b955cc13b84f56d2143db3bb201024d459cd932bc8efe9828c1e77fa1fb2c9b4293efd2d9225 SHA512 7df537ec2f2f06246e1f77dc2eccb87aca30fb9251a3f32acb154b6ab5754f0525d8a06f1adee210f98bd49ace25b1e78075f5ef378ea0c410fcf08c3addd0b1
diff --git a/dev-python/google-i18n-address/google-i18n-address-3.1.0-r1.ebuild b/dev-python/google-i18n-address/google-i18n-address-3.1.0-r1.ebuild
deleted file mode 100644
index 47ccdaa7d6af..000000000000
--- a/dev-python/google-i18n-address/google-i18n-address-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google's i18n address metadata repository"
-HOMEPAGE="
-	https://github.com/mirumee/google-i18n-address/
-	https://pypi.org/project/google-i18n-address/
-"
-# Using the github release, as it contains the tests (unlike the pypi artifact).
-SRC_URI="
-	https://github.com/mirumee/google-i18n-address/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild b/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild
index 1c68530b730d..3c06122938ed 100644
--- a/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild
+++ b/dev-python/google-i18n-address/google-i18n-address-3.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index f43e0e28f98d..f1614acffd76 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,2 +1 @@
-DIST jsonpickle-3.2.2.gh.tar.gz 321994 BLAKE2B 1e126e0f1f336e5b64631a874c379b39665b324ccbc4c87d7becba302568f61df2d576732ea9165514791e6b2dd122e7008d43090d634d4d30fdde5c7d0600f9 SHA512 20e28885e637f8dba5965e22dc9960acb7c10fb25d78f2ba9bf6fb94d55a968e2245d577dbe19a32153e12af2ffa7dad6ae3e1897c426c25fa544796606736a6
 DIST jsonpickle-3.3.0.gh.tar.gz 324099 BLAKE2B e2c922df65f497b80ae78258024342de763d7585ce391f076e9e8a2f1da73e5c755b977be069a9778c85721b2fdcfcde70034374c7f38f001486a41742e9a488 SHA512 b796c2263ccb38e9e9191d9519ac044defa5df8a2b34bc8002f4de59397056048e037ae12f3e5ca46061febb81a7b35cfec11335926c893357f0c22e9b1b6d85
diff --git a/dev-python/jsonpickle/jsonpickle-3.2.2.ebuild b/dev-python/jsonpickle/jsonpickle-3.2.2.ebuild
deleted file mode 100644
index 5e128e1433d2..000000000000
--- a/dev-python/jsonpickle/jsonpickle-3.2.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/pandas[${PYTHON_USEDEP}]
-		' 3.{10..12})
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i -e 's:--cov::' pytest.ini || die
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
index 2af0f6da552e..ee7ac3cd9d2c 100644
--- a/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..37a64204a00a 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 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
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 c0f74ac187e2..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>pastalian46@gmail.com</email>
-  <name>Takuya Wakazono</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <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/llfuse/Manifest b/dev-python/llfuse/Manifest
index 3a04228425db..6ac5d4508cd4 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,2 +1 @@
-DIST llfuse-1.5.0.tar.gz 869259 BLAKE2B 2a3eee64718f4a73b8dd51ccaeedd7b1b700f734b10daa864d2ca04da5f38ed6a514c4ae8b541000c4d4a3042dcd95533ff7c1df655d7b57ec89120a97d8a9b6 SHA512 bb84c697658e7cd39eb6af3a4a6085c3bc3295e5f0b4f35adf6565ecff5077acb27ecd92f7c6420aa06dab36d9b54915bce65e4ec3d011047a0a15cdccbbb284
 DIST llfuse-1.5.1.tar.gz 959557 BLAKE2B 0484c1b71b1293f4577039ff150bbf870350e25c091363affa99ca4c33dc4db72d7ff48747076707ca2de605c0ae15adaa49cfbcef3a52630e92b9f5bc717743 SHA512 c4dc25bb3cfe9abd0d7f6885a73f1b3e21a834554206cc6fdf6ba3f7e03f5f4f6c1117161528f4ea2bb93013abbcba0c87ce7fef3368ac147e4d15fe1c5dd113
diff --git a/dev-python/llfuse/llfuse-1.5.0.ebuild b/dev-python/llfuse/llfuse-1.5.0.ebuild
deleted file mode 100644
index 3d6fd953cb69..000000000000
--- a/dev-python/llfuse/llfuse-1.5.0.ebuild
+++ /dev/null
@@ -1,58 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="
-	https://github.com/python-llfuse/python-llfuse/
-	https://pypi.org/project/llfuse/
-"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=sys-fs/fuse-2.8.0:0
-"
-DEPEND="
-	${RDEPEND}
-	sys-apps/attr
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
-)
-
-distutils_enable_sphinx rst
-distutils_enable_tests pytest
-
-src_prepare() {
-	# force regen
-	rm src/llfuse.c || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ! -f src/llfuse.c ]]; then
-		esetup.py build_cython
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.5.1.ebuild b/dev-python/llfuse/llfuse-1.5.1.ebuild
index 27f65e5d8bac..3d6fd953cb69 100644
--- a/dev-python/llfuse/llfuse-1.5.1.ebuild
+++ b/dev-python/llfuse/llfuse-1.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5b14688789ee..6917f3a1bf55 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,3 @@
-DIST mkdocs-material-9.5.33.gh.tar.gz 14905512 BLAKE2B 474852be4b975a72a2429ab1b072eadea9b3e6549f0132e307da03aed657924d928391205b6953e445590bf53a79b8c405116b93eed099a9a9a174f9b66f5d3a SHA512 2a414c0e5c3160224ec445d7ed6b366ea18667a31110be1b310b5487abdf1b3d3a4b6f44b3d2ccae401f9d850a847a85ae3e3ef2a41ebe5f62f5c5a955a9713a
 DIST mkdocs-material-9.5.34.gh.tar.gz 14766308 BLAKE2B 62371c082fe6d1d42d01cc315f2e0e5a0de24ee3faff173d940b797ca7f43f20985e4025e90ba385dbf38ef7ff2b76bbae0831558d07dcafd5a5493597e223ed SHA512 ac6e2fcf96a0591513222a81046d66547cdf3a9b64acf29e7482aa93be3d7a2ceeb8ad779e9bcbd12ae9fc527414ae11cd70f07ae85b4c2b0104cade29ebe646
 DIST mkdocs-material-9.5.35.gh.tar.gz 14791440 BLAKE2B d6cd4826e4a9f57e7c1790063e1b6aaff3524b07f532bb6ca705186e633b345d3526a4ea8423c7456a342536f7a6253e5add0b9491fdfaa61a932039905d28c9 SHA512 d35ad9ee7140de4d22eee4a6cf75d2cd522dc13394ef8be4cc2360291ea4a78f7489f014917beae7d9484103f6c6642e9e71d556839c5f523921588a7b001d8a
+DIST mkdocs-material-9.5.36.gh.tar.gz 14794813 BLAKE2B 607df2d24803cf8ff41243e9583128f9b9e49c077f6242b3949618cc6e8da9dc8b0e6db8caa0e5bad7f7f2607f4f313e954304091bf80a454ad3d913625947e7 SHA512 d5d86feeb35ca85d47d98ad09285a30075c0e6b925240d2e31d1050f8d55468f33b5f80216eb0fd1fc7833074b97f02abf3b9c277b9d64eec002d487bae8a11c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
index eec1908ef846..5c080c205d27 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.34.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.33.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
index 5c080c205d27..eec1908ef846 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.33.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index a24ed7b85a9a..3cf0697476bc 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,2 +1 @@
-DIST mss-9.0.1.tar.gz 87504 BLAKE2B 445392b65b62e67802397e708781cbf1b3409303c68d863c4f44b0f32026b196faba1a6bb960110917ea6cf2b34b43d61d4e069fac6f6926af3e6a0b5fbab800 SHA512 22c4aa56eaf5d3c6ca752a8c966908b35256056a23f5f707d2ccd5acfbefecec6b6b8bff5d8c18024ef94f365a6ce1433aafddfdf9f7f30180af5dbd8a1f8eb7
 DIST mss-9.0.2.tar.gz 82514 BLAKE2B 9f5bec89fbe2405265070f5be03fe55ed496dddb6f28493ae2b88f131c6a6b2ed8c65969cf4b7b4256b492c8bc321e1548e5f355d802084880ff32e1eb9fcd28 SHA512 b4a9a6dd97810eb56d91c9ba65ac5e628c554e2cd038e830d87e583aa35cecf19cce337e61da814f10f8278017dca758c92c18220167f3660e322a7fba05488c
diff --git a/dev-python/mss/mss-9.0.1.ebuild b/dev-python/mss/mss-9.0.1.ebuild
deleted file mode 100644
index 3b85419a88e1..000000000000
--- a/dev-python/mss/mss-9.0.1.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
-HOMEPAGE="
-	https://github.com/BoboTiG/python-mss/
-	https://pypi.org/project/mss/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# upstream tests for self-build, apparently broken by setuptools
-		# issuing deprecation warnings
-		src/tests/test_setup.py
-	)
-
-	local EPYTEST_DESELECT=(
-		# unreliable `lsof -U | grep ...` tests
-		src/tests/test_leaks.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p rerunfailures
-}
diff --git a/dev-python/mss/mss-9.0.2.ebuild b/dev-python/mss/mss-9.0.2.ebuild
index f670502ec08d..2a4460c655f6 100644
--- a/dev-python/mss/mss-9.0.2.ebuild
+++ b/dev-python/mss/mss-9.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index d4135e471c52..96a1d40b1247 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,2 +1 @@
-DIST nbdime-4.0.1.tar.gz 9414125 BLAKE2B bf2581cec0f71ef8949c9cf19e21aa47302b6c71bbb9861e8c6f3a4b1921e9f73460ee5059e5bc92c7789d8f0695329125725c10e10763dd6e4d388bfaee53d1 SHA512 df14dfe9df296d71eb4a98140fe15703ca277063a153c3159cc883c99ce98b76f5f4dae24d32b048a18d2530e52535e3d89523d7a1c54a8654d2d54c8812ded3
 DIST nbdime-4.0.2.tar.gz 9452967 BLAKE2B c9c390f9165d0b8b3277c7bd93e5a90f4ac23cf0d084ed8ba166254bfbfe9cc0e9f0bc35c2a86b39d84167e78639cb2ed69f6cda5da02bb113f7323a86d745a6 SHA512 1e923b7f719d6a33f1dc06e06511a6d48bb8bfef7d8f7676da2520edd2914014eb88f70eaaeec27af6b03f1cefbd9a3e6854a7c0dec7f76f211d750b3fd90894
diff --git a/dev-python/nbdime/nbdime-4.0.1.ebuild b/dev-python/nbdime/nbdime-4.0.1.ebuild
deleted file mode 100644
index 4b5f0b3764c6..000000000000
--- a/dev-python/nbdime/nbdime-4.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbdime/
-	https://pypi.org/project/nbdime/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/recommonmark \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-
-	distutils-r1_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}"{/usr,}/etc || die
-}
diff --git a/dev-python/nbdime/nbdime-4.0.2.ebuild b/dev-python/nbdime/nbdime-4.0.2.ebuild
index cdb82d6dee8a..1e16dc1bd503 100644
--- a/dev-python/nbdime/nbdime-4.0.2.ebuild
+++ b/dev-python/nbdime/nbdime-4.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 2b249b6a1e44..8ac6b9e372a1 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1 @@
-DIST openapi_core-0.19.3.tar.gz 109026 BLAKE2B e7725fd14069599a3f4f0d976452fca9b12acd39c2a0fb7b448ee862d9fa973c520b1e428e017a7f246c7110b56d58c299aa35c8f387cf43af6e9a53da2f1418 SHA512 87db8e0a1c5998fb4dbe3bfaf5c33b526e291ad96bb4a679fcb68ce21b003a66b40db14c4784f80104d4462c1e958a1b7776fb3d952e68eb4a7308999896c08b
 DIST openapi_core-0.19.4.tar.gz 109095 BLAKE2B 85cb1733beeb5d18251a071c6123e5f395242a5d124a0fc40caec9090f98485ed1dfca4ccc76c2457b9a9d39bb07920770d7d0bc978f815af95f235d7a17de7d SHA512 b21223e6fcea7deb95863335abc7b5079dace585d6418514df9d9e947ac7e7e9d88fc618aeeca3008551838c6fc018f03469722a3b325ad8b0766c422954b4a5
diff --git a/dev-python/openapi-core/openapi-core-0.19.3.ebuild b/dev-python/openapi-core/openapi-core-0.19.3.ebuild
deleted file mode 100644
index 689b6ee8a188..000000000000
--- a/dev-python/openapi-core/openapi-core-0.19.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2024 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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-path-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-path-0.3.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.8[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.7.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		>=dev-python/aioitertools-0.11.0[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# missing dependendencies
-	tests/integration/contrib/falcon
-	tests/integration/contrib/fastapi
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-core/openapi-core-0.19.4.ebuild b/dev-python/openapi-core/openapi-core-0.19.4.ebuild
index 59c15dd0f57e..689b6ee8a188 100644
--- a/dev-python/openapi-core/openapi-core-0.19.4.ebuild
+++ b/dev-python/openapi-core/openapi-core-0.19.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/asgiref-4[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 2a252d8d6cf0..b4677520ddec 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,2 +1 @@
-DIST openstacksdk-3.3.0.tar.gz 1229640 BLAKE2B f807493c8db39121599124389f330316edb0d183a7bbf9219b6e75eb6c871d3bf55207a7de7270635e4a154b9e30e2365122eab2ea28634c8f003371dccaed03 SHA512 cccfd6f28de9c617ccf9e8d0476a884a63ac0e15707ac446f0aa56f22eaefabcff07ab7aa3d46484fe0c7c5a565d000f72407250e1365202af4bbc8787fbad18
 DIST openstacksdk-4.0.0.tar.gz 1228578 BLAKE2B 84b4b82a7b6d35b377d6c05d9d2e33069f76f848f79876c4d8ee940e9b6b8849acd60a1b7bea7d0fea1e9483c64ecdf6d48d5e4b68062f48d7f106c9cf250091 SHA512 bb0ebd32c442b84c8cbcfbcc7d271739814811ee5b0f61459b515bb22b00f7bb600399a7f055209bbb5001053d05133b82de2cb2a7dcc2a081cd3ce2a7c1b64a
diff --git a/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild b/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild
deleted file mode 100644
index 899f8fe1bd86..000000000000
--- a/dev-python/openstacksdk/openstacksdk-3.3.0.ebuild
+++ /dev/null
@@ -1,91 +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 pypi
-
-DESCRIPTION="A collection of libraries for building applications to work with OpenStack"
-HOMEPAGE="
-	https://opendev.org/openstack/openstacksdk/
-	https://github.com/openstack/openstacksdk/
-	https://pypi.org/project/openstacksdk/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonpatch-1.21[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	>=dev-python/requestsexceptions-1.2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/prometheus-client-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/statsd-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Internet?
-	sed -e 's:test_create_dynamic_large_object:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-
-	# TODO
-	sed -e 's:test_generate_form:_&:' \
-		-e 's:test_create_static_large_object:_&:' \
-		-e 's:test_object_segment_retries:_&:' \
-		-e 's:test_object_segment_retry_failure:_&:' \
-		-e 's:test_slo_manifest_retry:_&:' \
-		-i openstack/tests/unit/cloud/test_object.py || die
-	sed -e 's:test_servers:_&:' \
-		-i openstack/tests/unit/test_stats.py || die
-
-	# unhappy about paths due to test runner
-	sed -e 's:test_method_not_supported:_&:' \
-		-i openstack/tests/unit/test_exceptions.py || die
-	sed -e 's:test_repr:_&:' \
-		-i openstack/tests/unit/test_resource.py || die
-
-	# requires hacking
-	rm openstack/tests/unit/test_hacking.py || die
-
-	# fragile warning-based tests
-	sed -e 's:test_unsupported_version_override:_&:' \
-		-i openstack/tests/unit/test_missing_version.py || die
-	sed -e 's:test_create_unknown_proxy:_&:' \
-		-i openstack/tests/unit/test_connection.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b openstack/tests/unit
-}
diff --git a/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild b/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild
index 7b29b390d71d..899f8fe1bd86 100644
--- a/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-4.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 1d54ae5e948f..2f4a892f2940 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,2 +1,3 @@
 DIST pdm-backend-2.3.3.gh.tar.gz 136942 BLAKE2B 14f2584f22f1c4e08f687c77621269ae1e5acfe4babb1ab427c10d65ff07841b8175479f867870b9a5745db76444ca140a7da497a94c831ca6d0ea1e67b4e88f SHA512 382ad95e2811f1142fee66065f96ede1a646c3e2b9fbfafc6afb17442d3aeccfbf1ff6260952986a025791d3d56a2c4b730decb3cb65e893c25a710e16cbcfc8
 DIST pdm-backend-2.4.0.gh.tar.gz 138766 BLAKE2B 75295c6c72e34dd70d60a05949f4c0646cb5db45c2e9d952cd498395956dd3171bd293b0d5246dc782f5bb90ddfa7326fec75d4d4d8767de79e7c284cc1a9f08 SHA512 cd78cc2c9c8bd4964504aa495c9cd2ffa0d14da9e8e3aac6a3cc15045b0385e474214ae15c4ace57fd2ef87e0067a521355fd513610ef9aeadf276b2fe41d28d
+DIST pdm-backend-2.4.1.gh.tar.gz 140137 BLAKE2B fba054e7d94544ed6864b28d13bcc57e585d74b37e775ac0ae2d2e7041d6f8e34bdb5fbaff1b3d918ca75a2c4d7165d97024c63b48d2a2e0a0f3444ffef72669 SHA512 50e28e301c38e47c6c6d2e1a3c01a27da06517e40bd04b2809a130f14ec4de6811b28d8480093efa2e8209be2769b886f65106bf9a94297274b6a5853f901964
diff --git a/dev-python/pdm-backend/pdm-backend-2.4.1.ebuild b/dev-python/pdm-backend/pdm-backend-2.4.1.ebuild
new file mode 100644
index 000000000000..d6f0b8eac4cb
--- /dev/null
+++ b/dev-python/pdm-backend/pdm-backend-2.4.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-backend/
+	https://github.com/pdm-project/pdm-backend/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# see src/pdm/backend/_vendor/vendor.txt
+RDEPEND="
+	>=dev-python/editables-0.5[${PYTHON_USEDEP}]
+	>=dev-python/packaging-24.0[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r src/pdm/backend/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.backend\._vendor\.:from :' \
+		-e 's:from pdm\.backend\._vendor ::' \
+		-e 's:import pdm\.backend\._vendor\.:import :' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# this must not be set during src_test()
+	local -x PDM_BUILD_SCM_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -k "not [hg"
+}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index be60a73813ea..4477127f72d0 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,2 +1 @@
-DIST python-phonenumbers-8.13.44.gh.tar.gz 4912993 BLAKE2B d579e9c17e8c78390ce93832d53a50e9aaed0c186a1430119c54a22ef6af65ad2bac42cd082278bdca0f0e32762c7d0b7e90d28f1998fdf8b5cc2544b241e7f0 SHA512 64eec22c997d1f0d775445a829d63c7568e943411522f4d55fdf4fd18b1c680c48396b056492f27f6275e83c7bcd53ecc5c6258beeb24d5a7e218011c50b5a35
 DIST python-phonenumbers-8.13.45.gh.tar.gz 4913395 BLAKE2B 78cf1a38dba34f4c989b39b676fcb0e78369a41cb7882fe59e48b9c36af9471082153a194ba75b72e7b25515eb0bcb7749eb0af78175f49c2933e17efc13c263 SHA512 28abdd0ae5f28b38c5279a850ee36812ddcd8eed6f57c9f1e816406c25896e6fdc547d7802ddd4b97a9253c3962946a8c17aa4c96e6a62823a9ae80c74a16024
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
deleted file mode 100644
index 778607a083c5..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.44.ebuild
+++ /dev/null
@@ -1,39 +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
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
index 062c56c77784..778607a083c5 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pulsectl-asyncio/Manifest b/dev-python/pulsectl-asyncio/Manifest
index bd9d822b3bb4..fc382ce246b7 100644
--- a/dev-python/pulsectl-asyncio/Manifest
+++ b/dev-python/pulsectl-asyncio/Manifest
@@ -1,2 +1 @@
-DIST pulsectl-asyncio-1.2.0.gh.tar.gz 19517 BLAKE2B 919909acfabfefa1dbea99cef6285483652649c111df6f3f6719d92e35ea548b54e6c0a60e4277b69610ee9a58c2c29c3355b7f2fe2780d773aa2c89513ce9a1 SHA512 b560c38b6d18a4c73551ae4ba34243f0043dc18426141c128c6ca3e8bd30f4d94d8718c3003ae506be038bc645ee569b77e6289b97ac913daa1e42e6b9aef03b
 DIST pulsectl-asyncio-1.2.1.gh.tar.gz 19531 BLAKE2B 4a3275d75602907f91b3a0979ff8908f4fa23bcf5d1d04068f878fc477011258180cec8ef16b6e6ebe6cc1713ff493841686cc67c4990222c061aa1b722199ff SHA512 b22d0a634433d558860ff1590020ba7272412be97da478a8b00ec457506cb58353b645537ae26591f1aed300cacc14fd0f50c8a3a0c7d650d610b24cc52248ee
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.0.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.0.ebuild
deleted file mode 100644
index a5e5b2108cb5..000000000000
--- a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Asyncio frontend for pulsectl, Python bindings of libpulse"
-HOMEPAGE="
-	https://github.com/mhthies/pulsectl-asyncio/
-	https://pypi.org/project/pulsectl-asyncio/
-"
-# sdist is missing examples that are used in tests
-SRC_URI="
-	https://github.com/mhthies/pulsectl-asyncio/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		media-sound/pulseaudio-daemon
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:,<=[0-9.]*::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
index 32ad8b4aacb5..a5e5b2108cb5 100644
--- a/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
+++ b/dev-python/pulsectl-asyncio/pulsectl-asyncio-1.2.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pulsectl-23.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index c95b04ce7722..2e260fbdef52 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,2 @@
-DIST pycairo-1.26.0.tar.gz 346850 BLAKE2B da6c35c929d372764280e8963a8b66ba533ccb99be9ee2bfa10859c635dd16cc087d542607be9ec6a9ffb942feb892100d4b9017d832d478b35c434aa05b9bb9 SHA512 5313f0d408a6e6ce6e70ac92291be5dd8651e01fbf9411d0467061afa21849cde27db273f2a13b4c3c931183f63f75f31fc0f0d3283b8f339ba88e71eab432f1
 DIST pycairo-1.26.1.tar.gz 346882 BLAKE2B 52e92b3b7e6ffda89a01b293f0bc6c5da5018ba77dce92d30b221fbf1f8c1b253f5ae279d64a517810b6efe4d7d282c21dbc15e5ef8e372204095c773b12de52 SHA512 4f63fc4fb2b6bf65d8a1cbbeaf4d982c5eb2271309763522ee6f763f691428b3e420434382e8a3e1d6b841821940f44f4bc6f51724eb4474494d60b7ff1c9031
 DIST pycairo-1.27.0.tar.gz 661450 BLAKE2B cc1ef54057d02f3e25fed010c995e4fe400ccdf3a5d2f241c029ded167c5db2560a4d9c8cb09b2f0519e674b5962f2244f0570401f45743fe1ec61d5a8982227 SHA512 1b077917b1d99262da1c1d2ff85ae841dd0ff715925a5a20032162aa876576d966fc6b30c154343cc45f104cce243887de9b5f14af1e15775cb71b6c11e553a6
diff --git a/dev-python/pycairo/files/pycairo-1.26.0-py313.patch b/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
deleted file mode 100644
index c3c0d74cb415..000000000000
--- a/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/pygobject/pycairo/pull/366
-
-From 387e27fa36d29bc8f656656ca8b47e7b4996f4f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 29 May 2024 21:25:41 +0200
-Subject: [PATCH] Avoid invalid PyBUF_READ flag in PyObject_GetBuffer()
-
-Since Python 3.13, the flag is no longer allowed.
-
-See https://github.com/python/cpython/pull/114707
-
-Fixes https://github.com/pygobject/pycairo/issues/365
----
- cairo/surface.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cairo/surface.c b/cairo/surface.c
-index 048522c6..f00db8b5 100644
---- a/cairo/surface.c
-+++ b/cairo/surface.c
-@@ -484,7 +484,7 @@ surface_set_mime_data (PycairoSurface *o, PyObject *args) {
-     return NULL;
-   }
- 
--  res = PyObject_GetBuffer (obj, view, PyBUF_READ);
-+  res = PyObject_GetBuffer (obj, view, PyBUF_SIMPLE);
-   if (res == -1) {
-       PyMem_Free (view);
-       return NULL;
-
diff --git a/dev-python/pycairo/pycairo-1.26.0-r1.ebuild b/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
deleted file mode 100644
index a2e2160d50d1..000000000000
--- a/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,77 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/pycairo-1.26.0-py313.patch
-)
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# we need to pass --root via install command, sigh
-	cat > "${T}/distutils-extra.cfg" <<-EOF || die
-		[install]
-		root = ${D}
-	EOF
-	local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
-	esetup.py \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/include/pycairo
-	doins cairo/py3cairo.h
-}
diff --git a/dev-python/pycairo/pycairo-1.26.0.ebuild b/dev-python/pycairo/pycairo-1.26.0.ebuild
deleted file mode 100644
index 227f28252dfa..000000000000
--- a/dev-python/pycairo/pycairo-1.26.0.ebuild
+++ /dev/null
@@ -1,73 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# we need to pass --root via install command, sigh
-	cat > "${T}/distutils-extra.cfg" <<-EOF || die
-		[install]
-		root = ${D}
-	EOF
-	local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
-	esetup.py \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/include/pycairo
-	doins cairo/py3cairo.h
-}
diff --git a/dev-python/pycairo/pycairo-1.26.1.ebuild b/dev-python/pycairo/pycairo-1.26.1.ebuild
index 3c8b3ed30a50..227f28252dfa 100644
--- a/dev-python/pycairo/pycairo-1.26.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.26.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 9f93d8a3a528..3990bc8b621c 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1,2 @@
-DIST pylint-3.2.6.gh.tar.gz 1447684 BLAKE2B 22ec600b327b405dfdd7a9ffe94b20faeed6cca92dbfff8e96baa6bebe5c049b90da55f16e84e53d4a22fdbcb5a8caf7719038935522235ccf3364fe2492c16c SHA512 ba7e87f3eaca088b88cec35ae8d1dbd15ec2167a615638b1fe7c1abb711d54742e5fb2d2c9c2836294c464b98ec32d53efaf5afb170d4cb73dacf966dddca62c
 DIST pylint-3.2.7.gh.tar.gz 1448329 BLAKE2B 4ec4a0e2a886e7acc4694582e7f7902b6806750a12286986533a4e57c68eeac96bec43bb4cef2de6ec0a7811cde5ec2cc03226b2213d1b2107aafe73db03c32d SHA512 66dbf0f05aa7aac59f43cab6a1f23c29a3a37d9a19f2c54af0e0aa6f2630fc74d7602a6b6a250e1e02a24723d0513c54a7ee704026af16c8acc50b843708fd98
+DIST pylint-3.3.0.gh.tar.gz 1453518 BLAKE2B 407ab1a3db4ae832c8ab7f26c3d3cd02c686305050f0dbd1168fe00e2e267aa169a99eb7e9a3a858a5ad58752a1e8a193692224c39971da93374da72a3d66ea7 SHA512 52bfc54691e5ea323032909c6e2bd8f265c70cc4941cb51ce4eb25e86ebfb22c54fdd9c92a8b5c518cbbcbb48894a9ae7bf2dcd6c2993533acb21ff3f9786f02
diff --git a/dev-python/pylint/pylint-3.2.7.ebuild b/dev-python/pylint/pylint-3.2.7.ebuild
index eb940fd9cb45..be63cbe57670 100644
--- a/dev-python/pylint/pylint-3.2.7.ebuild
+++ b/dev-python/pylint/pylint-3.2.7.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-3.2.6.ebuild b/dev-python/pylint/pylint-3.3.0.ebuild
index be63cbe57670..a6e6abde5f05 100644
--- a/dev-python/pylint/pylint-3.2.6.ebuild
+++ b/dev-python/pylint/pylint-3.3.0.ebuild
@@ -23,12 +23,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 RDEPEND="
-	<dev-python/astroid-3.3[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.2.4[${PYTHON_USEDEP}]
+	<dev-python/astroid-3.4[${PYTHON_USEDEP}]
+	>=dev-python/astroid-3.3.3[${PYTHON_USEDEP}]
 	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
 	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
 	<dev-python/isort-6[${PYTHON_USEDEP}]
@@ -45,9 +45,9 @@ BDEPEND="
 		$(python_gen_cond_dep '
 			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
 		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8.3[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.12[${PYTHON_USEDEP}]
 	)
 "
 
@@ -58,7 +58,6 @@ python_test() {
 		# TODO
 		'tests/test_functional.py::test_functional[dataclass_with_field]'
 		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[recursion_error_3159]'
 		'tests/test_functional.py::test_functional[shadowed_import]'
 		'tests/test_functional.py::test_functional[use_yield_from]'
 		'tests/test_functional.py::test_functional[wrong_import_order]'
diff --git a/dev-python/pysmi/Manifest b/dev-python/pysmi/Manifest
index c84f0f8e69b3..bb52a8a9333d 100644
--- a/dev-python/pysmi/Manifest
+++ b/dev-python/pysmi/Manifest
@@ -1,2 +1 @@
-DIST pysmi-1.4.4.tar.gz 117164 BLAKE2B 2ef1c2fc58ee90ad052fec5f0aa08fc128cc041e24dc74d8942ff81912e7e45b480e5a125e412e0c52818670dafbd9bee310a863f9a5b898c8a67a18492897ae SHA512 9ce5665d1db147cb80fe7ef17981a4231a25a8b25cfafb14784acc0355fbd0296070a7da67a7f6b1e738e0f5f1249f871ee29a72da546e639ad4d2f2e8b00c43
 DIST pysmi-1.5.0.tar.gz 124064 BLAKE2B 763501b0fd575e356944372f0f173857d8a982a1cc7342636807d7147f7b6615d9c9518f099fb3071356957f0775e7bbd6b5f37d2110947ad22585cc44dff461 SHA512 f99fbc186b2fd481b16269e5b3622821b932459ec97023968ce8e0ae5c2d863702122a44fafb26d901b8a0b03c02f97e60c6999bdde0f19d551a61daf4e926b5
diff --git a/dev-python/pysmi/pysmi-1.4.4.ebuild b/dev-python/pysmi/pysmi-1.4.4.ebuild
deleted file mode 100644
index 78c12ed943a6..000000000000
--- a/dev-python/pysmi/pysmi-1.4.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017-2024 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 pypi
-
-DESCRIPTION="Pure-Python implementation of SNMP/SMI MIB parsing and conversion library"
-HOMEPAGE="
-	https://github.com/lextudio/pysmi/
-	https://pypi.org/project/pysmi/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
-
-RDEPEND="
-	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ply-3.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pysnmp-5.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-# TODO: doc
-# distutils_enable_sphinx docs/source dev-python/sphinx-copybutton dev-python/sphinx-sitemap
diff --git a/dev-python/pysmi/pysmi-1.5.0.ebuild b/dev-python/pysmi/pysmi-1.5.0.ebuild
index 444ea38866b1..f8ff62acaf3e 100644
--- a/dev-python/pysmi/pysmi-1.5.0.ebuild
+++ b/dev-python/pysmi/pysmi-1.5.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~sparc x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 25f636991b6d..985889f6bdf2 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1 +1,2 @@
 DIST pytest-bdd-7.2.0.gh.tar.gz 81301 BLAKE2B e47ec5873546596e913453f86d7c0654b8212de74b0bfa46022da093fa87191c9303559ec670bd37f94e282973192596c77a1f7293a608ae8dedbd863fc245c2 SHA512 d0991feb446f264f0f114693dccb67682a10a427cb5fda28dccafd67cc37810e00c34e3235bb38d02b7fa1edabf1359c6c119be9cfdce0ccf00235ca3dde337b
+DIST pytest-bdd-7.3.0.gh.tar.gz 81595 BLAKE2B 80c5323ba3c50fae17bb57ec26b968ca7d7b673d2aeb2716dee02e3543916ca8b5752d9af56d3d250f3a4b0a857a3dc760de615f0650eaf379380fb24a5b7c2a SHA512 e7c309552714a77d47e437a825e661dbf201a6945e84f4b611b5c3da3d0b4ceb535bde4809fc9633b82a74e2b52cc69c7e14b27a27032c7e4400727498442e29
diff --git a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
new file mode 100644
index 000000000000..f9cc1f976b7d
--- /dev/null
+++ b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: may be able to switch to pypi tarball next bump, also wouldn't hurt
+# to build the formerly forgotten docs if the tarball includes them
+# https://github.com/pytest-dev/pytest-bdd/issues/703
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+inherit distutils-r1
+
+DESCRIPTION="BDD library for the pytest runner"
+HOMEPAGE="https://pytest-bdd.readthedocs.io/"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-bdd/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/mako[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	dev-python/parse-type[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst )
+
+src_test() {
+	# terminal_reporter test needs exact wrapping
+	local -x COLUMNS=80
+
+	# hooks output parsing may be affected by other pytest-*, e.g. tornasync
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_bdd.plugin
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 7a3c405f645a..99afb67d665f 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,2 +1 @@
-DIST pytest-django-4.8.0.gh.tar.gz 77646 BLAKE2B 206357110066d233c103755cfd6324e8042d9c93442c25db17a13f02132eab60a315856441e26d43a3c493cf72ce39ef51163ccc5368941875e63656bf9122a7 SHA512 8f7ba6b28cc4c0347876beb85247ccd021767811b9122c8cd0fb5d051df4ae76267b27a3fee5c36882a40716bdcbaab43abf71ef8dd61757087b12fd141632aa
 DIST pytest-django-4.9.0.gh.tar.gz 78407 BLAKE2B 0ab7dd12494fdb5c66ceabc67c793f7d970258a1a1b7cd3f7b31b6ee5087436396936a0a1672d77ab3c7e391f00bc63060e137ee9399a52940ebbc2ba25e253e SHA512 ec4cb8e9220cd21d96b72c1f09cfdd023700831ed583fe79d84a85f8d24eeaf3f111580d672950feecad69455078f0c73879f0d73364e74a4577352a4d8a1d4d
diff --git a/dev-python/pytest-django/pytest-django-4.8.0.ebuild b/dev-python/pytest-django/pytest-django-4.8.0.ebuild
deleted file mode 100644
index 2832b30169bc..000000000000
--- a/dev-python/pytest-django/pytest-django-4.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for pytest"
-HOMEPAGE="
-	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.io/
-	https://github.com/pytest-dev/pytest-django/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-1.11.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/django[${PYTHON_USEDEP}]
-		>=dev-python/django-configurations-2.0[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x DJANGO_SETTINGS_MODULE
-	local -x PYTHONPATH=${PWD}
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_django.plugin,xdist.plugin
-	for DJANGO_SETTINGS_MODULE in pytest_django_test.settings_sqlite{,_file}; do
-		einfo "Testing ${DJANGO_SETTINGS_MODULE}"
-		epytest tests
-	done
-}
diff --git a/dev-python/pytest-django/pytest-django-4.9.0.ebuild b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
index dec928c5fa67..2832b30169bc 100644
--- a/dev-python/pytest-django/pytest-django-4.9.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.9.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-7.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index 6c3ba688e6d9..146821591883 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1 +1,2 @@
+DIST python-multipart-0.0.10.gh.tar.gz 88275 BLAKE2B 56c1e1e5e59861068f29b66a5bea28234a70c273c1c5f0625f497eda19cc19389ecf6c602cc6fffca6d0681e4ab19b6b536196654f1b7ef9c40b192b475281af SHA512 eb35194b23772f448ff9b9a79bf69425891e39a54c56be92a25cf0c356bfa6ae016ec97c31bcc20535065f2eecdbc14444dfaedb3008c85f26e1a704b6b4b214
 DIST python-multipart-0.0.9.gh.tar.gz 49448 BLAKE2B 9ab4026dd4f45e60fd3bd781b178258edc9841e2a999ba6d0e918e37da106d7e9fb5816fa3e2fccb9eb3139c06c83dc892fe3e38b98bc6289dccaee4cdc64260 SHA512 6e41be080e079b1e9730e61d72b5b339fbb447bfb2b171a617c17025c5ad69924ca3c24f39e160f7b1cc495cea0999e72e6674e5631ce88a48240ecc229d0343
diff --git a/dev-python/python-multipart/python-multipart-0.0.10.ebuild b/dev-python/python-multipart/python-multipart-0.0.10.ebuild
new file mode 100644
index 000000000000..324b1aa4529b
--- /dev/null
+++ b/dev-python/python-multipart/python-multipart-0.0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A streaming multipart parser for Python"
+HOMEPAGE="
+	https://github.com/Kludex/python-multipart/
+	https://pypi.org/project/python-multipart/
+"
+SRC_URI="
+	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild b/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
index 3b46a71a5346..006ca797efba 100644
--- a/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
+++ b/dev-python/python-tests/python-tests-3.11.10_p1.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.6.ebuild b/dev-python/python-tests/python-tests-3.12.6.ebuild
index 9bd3e65b88f7..39974e2a1b13 100644
--- a/dev-python/python-tests/python-tests-3.12.6.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.6.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/python-tests/python-tests-3.12.6_p2.ebuild b/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
index dc298b45db23..0655b22642c9 100644
--- a/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
+++ b/dev-python/python-tests/python-tests-3.12.6_p2.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}/Lib"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-python/pytools/pytools-2024.1.14.ebuild b/dev-python/pytools/pytools-2024.1.14.ebuild
index fcd4323118fd..9a39dd5de917 100644
--- a/dev-python/pytools/pytools-2024.1.14.ebuild
+++ b/dev-python/pytools/pytools-2024.1.14.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 # NB: numpy & siphash24 are an "extra" (optional) deps
 RDEPEND="
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild
index f9eeaecf70b8..c9eadc4ed829 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.9.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # all these are header-only libraries
 DEPEND="
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 6416455905f3..282cd531d647 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -1,3 +1,2 @@
-DIST scipy-1.14.0.tar.gz 58618870 BLAKE2B bf9ed05628b02dc058555402995caae722cf6802bde80387d4e4477ec533589a66ca70b5dd44a32ddac652c7c69300406434b80e7cbc9aee2a78ae6b26ee4c2b SHA512 6579d988a2093602f5fc82203bbb5dc5690a95032484b5d5bd843d1e7995b3b89d802c7b38ec0345c1f3d8e22c98fb92b3982a1eadfcdf63607f929a52b56abf
 DIST scipy-1.14.1.tar.gz 58620554 BLAKE2B 5cb383648a5f3b8d0d321efcd66992212c59ce3fc3dbf812a2fa97c09cb18831b280af6c7689553644f83c531a266e9152e2a139a12aed08307e1ed64deea78e SHA512 20e3cf13590f76dfdc40ca8f90e6d5a68502e74415f37fa24fdb8169098e1d7f0aa631ae742c8c3e9573fa7d63da61986d51f35f090a3785873ae0761f7fcfa6
 DIST scipy-html-1.14.0.zip 65723829 BLAKE2B ba47dbf00a5d2a53a9addc5ea68ab18b42f211a018b89aa4b0b57ff0dee02e410a3effc59ddf8fbbc5aa33075d45d86880aed3a14068da5bd7b62ee526199967 SHA512 93be0bafcc64cea1ba130bbcc77c0741acc4f819c84a5030391a22657a1bc63abe8434a2723f66b7ad04c0809dc6d02e3a97ffb8d94bd3d4a4bb759ee796b475
diff --git a/dev-python/scipy/files/scipy-1.14.0-np2.patch b/dev-python/scipy/files/scipy-1.14.0-np2.patch
deleted file mode 100644
index fdb81baa68a6..000000000000
--- a/dev-python/scipy/files/scipy-1.14.0-np2.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 87c4932ca0e4dbe10f918bc5e8096e30fc6557e7 Mon Sep 17 00:00:00 2001
-From: Lucas Colley <lucas.colley8@gmail.com>
-Date: Mon, 29 Jul 2024 17:57:11 +0100
-Subject: [PATCH 1/2] BUG: stats: adapt to `np.floor` type promotion removal
-
-`rv_discrete._cdf` relied on `np.floor` promoting its integer input to `np.float64`. This is no longer the case since numpy/numpy#26766.
-
-[skip cirrus] [skip circle]
----
- scipy/stats/_distn_infrastructure.py     |  2 +-
- scipy/stats/tests/test_discrete_basic.py | 12 ++++++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/scipy/stats/_distn_infrastructure.py b/scipy/stats/_distn_infrastructure.py
-index a7a0bb66b396..83954af2c11f 100644
---- a/scipy/stats/_distn_infrastructure.py
-+++ b/scipy/stats/_distn_infrastructure.py
-@@ -3392,7 +3392,7 @@ def _cdf_single(self, k, *args):
-         return np.sum(self._pmf(m, *args), axis=0)
- 
-     def _cdf(self, x, *args):
--        k = floor(x)
-+        k = floor(x).astype(np.float64)
-         return self._cdfvec(k, *args)
- 
-     # generic _logcdf, _sf, _logsf, _ppf, _isf, _rvs defined in rv_generic
-diff --git a/scipy/stats/tests/test_discrete_basic.py b/scipy/stats/tests/test_discrete_basic.py
-index 1ebc9371c075..3db2f0666dbd 100644
---- a/scipy/stats/tests/test_discrete_basic.py
-+++ b/scipy/stats/tests/test_discrete_basic.py
-@@ -549,3 +549,15 @@ def test_rv_sample():
-     rng = np.random.default_rng(98430143469)
-     rvs0 = dist.ppf(rng.random(size=100))
-     assert_allclose(rvs, rvs0)
-+
-+def test__pmf_float_input():
-+    # gh-21272
-+    # test that `rvs()` can be computed when `_pmf` requires float input
-+    
-+    class rv_exponential(stats.rv_discrete):
-+        def _pmf(self, i):
-+            return (2/3)*3**(1 - i)
-+    
-+    rv = rv_exponential(a=0.0, b=float('inf'))
-+    rvs = rv.rvs() # should not crash due to integer input to `_pmf`
-+    assert_allclose(rvs, 0)
-
-From fe924edb6564358df24de8b915861d6754c6e94d Mon Sep 17 00:00:00 2001
-From: Matt Haberland <mhaberla@calpoly.edu>
-Date: Sat, 10 Aug 2024 12:15:56 -0700
-Subject: [PATCH 2/2] Update scipy/stats/tests/test_discrete_basic.py
-
-[skip ci]
----
- scipy/stats/tests/test_discrete_basic.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scipy/stats/tests/test_discrete_basic.py b/scipy/stats/tests/test_discrete_basic.py
-index 3db2f0666dbd..2bc53d95228a 100644
---- a/scipy/stats/tests/test_discrete_basic.py
-+++ b/scipy/stats/tests/test_discrete_basic.py
-@@ -559,5 +559,5 @@ def _pmf(self, i):
-             return (2/3)*3**(1 - i)
-     
-     rv = rv_exponential(a=0.0, b=float('inf'))
--    rvs = rv.rvs() # should not crash due to integer input to `_pmf`
-+    rvs = rv.rvs(random_state=42)  # should not crash due to integer input to `_pmf`
-     assert_allclose(rvs, 0)
diff --git a/dev-python/scipy/scipy-1.14.0-r1.ebuild b/dev-python/scipy/scipy-1.14.0-r1.ebuild
deleted file mode 100644
index 26a4498b4b43..000000000000
--- a/dev-python/scipy/scipy-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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 flag-o-matic fortran-2 distutils-r1
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	# Need submodules, so git for now.
-	EGIT_REPO_URI="https://github.com/scipy/scipy"
-	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
-	EGIT_SUBMODULES=( '*' )
-else
-	inherit pypi
-
-	# Upstream is often behind with doc updates
-	DOC_PV=${PV}
-
-	SRC_URI+="
-		doc? (
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		)"
-
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	fi
-fi
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc +fortran test-rust"
-
-# umfpack is technically optional but it's preferred to have it available.
-DEPEND="
-	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:=
-	sci-libs/umfpack
-	virtual/cblas
-	>=virtual/lapack-3.8
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-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.16.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
-	)
-	test-rust? (
-		dev-python/pooch[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/scipy/scipy/pull/21283
-	# (breaks test_sample_scipy in dev-python/sympy)
-	"${FILESDIR}/${P}-np2.patch"
-)
-
-src_unpack() {
-	default
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=blas
-		-Dlapack=lapack
-		-Duse-pythran=$(usex fortran true false)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-
-	local EPYTEST_DESELECT=(
-		# Network
-		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
-		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
-		scipy/datasets/tests/test_data.py::TestDatasets::test_face
-		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
-
-		# 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]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring formatting
-				scipy/misc/tests/test_doccer.py::test_decorator
-			)
-			;;
-	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/scipy/scipy-1.14.0.ebuild b/dev-python/scipy/scipy-1.14.0.ebuild
deleted file mode 100644
index 56ca38ebaf7f..000000000000
--- a/dev-python/scipy/scipy-1.14.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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 flag-o-matic fortran-2 distutils-r1
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="
-	https://scipy.org/
-	https://github.com/scipy/scipy/
-	https://pypi.org/project/scipy/
-"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	# Need submodules, so git for now.
-	EGIT_REPO_URI="https://github.com/scipy/scipy"
-	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
-	EGIT_SUBMODULES=( '*' )
-else
-	inherit pypi
-
-	# Upstream is often behind with doc updates
-	DOC_PV=${PV}
-
-	SRC_URI+="
-		doc? (
-			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
-		)"
-
-	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
-	fi
-fi
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc +fortran test-rust"
-
-# umfpack is technically optional but it's preferred to have it available.
-DEPEND="
-	>=dev-python/numpy-1.23.5:=[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:=
-	sci-libs/umfpack
-	virtual/cblas
-	>=virtual/lapack-3.8
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-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.16.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/hypothesis-6.30[${PYTHON_USEDEP}]
-	)
-	test-rust? (
-		dev-python/pooch[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=(
-		-Dblas=blas
-		-Dlapack=lapack
-		-Duse-pythran=$(usex fortran true false)
-	)
-
-	# https://bugs.gentoo.org/932721
-	has_version '>=dev-python/numpy-2.0.0' && filter-lto
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-
-	local EPYTEST_DESELECT=(
-		# Network
-		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
-		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
-		scipy/datasets/tests/test_data.py::TestDatasets::test_face
-		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
-
-		# 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]'
-				# mismatched exception message
-				scipy/optimize/tests/test_hessian_update_strategy.py::TestHessianUpdateStrategy::test_initialize_catch_illegal
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# docstring formatting
-				scipy/misc/tests/test_doccer.py::test_decorator
-			)
-			;;
-	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/scipy/scipy-1.14.1.ebuild b/dev-python/scipy/scipy-1.14.1.ebuild
index 6335ae9bd0ce..19e52ce693b7 100644
--- a/dev-python/scipy/scipy-1.14.1.ebuild
+++ b/dev-python/scipy/scipy-1.14.1.ebuild
@@ -37,7 +37,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+		KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
index 0405fcac85d4..7e9a3be7b273 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
index 812744967794..38f1e97a2e50 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.54.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild
index 8ce80ee9417c..5ccd9dff335f 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.34.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 8d649226b2e9..501e13fe1c74 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1,3 @@
 DIST stripe-10.10.0.tar.gz 1313050 BLAKE2B 6a37c70d8faab0a23a52505edf722cbdb8b40f89fc2bfd9d73ce94c3c40877ca6080ac4f8973d9ac01fd7a1d67f8e62366b3dd498673fadbd29e8dbd3a0c1d8d SHA512 1049a27f07c0fb870735786cf8e971cf91095f3799e094cf81e3529839f1710f10133ccd20d2cfe249c460ee7753cb255e876e864e56ac1bea7f280771df197c
 DIST stripe-10.11.0.tar.gz 1317883 BLAKE2B fa533f6a3ab66a844ff16513ad8cb8b6a8d87677fa01ea93c406cb229577456ccc567b63196c3616878a1cb78c5b91e56ac9fff8d53e0b961702cbd65ab9024f SHA512 64b6adaf3eabe77ab863fe3ef2e0d20d6cfa0e266bb58cde0b0d2edd87dd240a0a8fedf11c35252f3cc6cd517cc767b2c4714facc29475597270e7a143e091dc
 DIST stripe-10.12.0.tar.gz 1318680 BLAKE2B 0de2d108c6813d4ed0493b0e2b906a5d41f6b39b0f60fb2730fc3737b9f641d732e22c5ddf5e4e856b6bc5a1b312c10c9304467f29b5474bf8d6a9ca219f876d SHA512 0843cae0e1dd9a54604938a3ae5a28bb681e5166c2e800478c543b22b103626ac138ee999e468e909e3b5865754ed131af5a01287044603082f1f05329da45d3
-DIST stripe-10.9.0.tar.gz 1312738 BLAKE2B 6be3b40695842c164620a8abab4a8753c44cb68dcd39b7e8f62e5a359ae5ffa0faa6a8890a1b0965dd1b1f32c95fa857abe44003c94043d2e76c59a9d52fc152 SHA512 39946c7efcf7597347835495f80810987f6812be337b2f9d84bebe029b2f6d326c9a73ef0c06f3c86786f59a1fb7d227e6a0cb800b8101216df6d0fb05709ea8
diff --git a/dev-python/stripe/stripe-10.10.0.ebuild b/dev-python/stripe/stripe-10.10.0.ebuild
index b04a73ec0849..2aae85ab8216 100644
--- a/dev-python/stripe/stripe-10.10.0.ebuild
+++ b/dev-python/stripe/stripe-10.10.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/stripe/stripe-10.9.0.ebuild b/dev-python/stripe/stripe-10.9.0.ebuild
deleted file mode 100644
index 2aae85ab8216..000000000000
--- a/dev-python/stripe/stripe-10.9.0.ebuild
+++ /dev/null
@@ -1,92 +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.188.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# exception message mismatch with aiohttp-3.10.0
-		"tests/test_integration.py::TestIntegration::test_async_timeout[asyncio-aiohttp]"
-	)
-
-	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/tables/Manifest b/dev-python/tables/Manifest
index 3d017adf6b35..914db9a3d26e 100644
--- a/dev-python/tables/Manifest
+++ b/dev-python/tables/Manifest
@@ -1,3 +1 @@
-DIST tables-3.10.0.tar.gz 4762618 BLAKE2B 351ec7e1bb9f0e4a43686b51911793aac32260d88418e1dac0b4fb815fd0f48543e139d1b7ea5607c1368578db4c6513a36d6379f4038cc53fbead4a436ce50d SHA512 10b4d2d1df5c692b72ad599cebc81fc2ef56f432a8d8059c2cede25a201076d12aff3e8874dafb8ef1d41dcc6c9151523f7e4fae3971443f79d051c6f8fcbc88
 DIST tables-3.10.1.tar.gz 4762413 BLAKE2B b185e839767cb339bf5e3760d6d37593eb57551776c563bd99eaaeabc5ee3c041f3b86a03995294dbfaa1a27b0581b0c4544fac0dbdfacd507fe487c1256a2cc SHA512 7590dccefdd718d170ac288d391173ed540760a911f53fd39e37dd74237dc554f9363c8d9d4d518f067da299d71a1d8cb4a40134b1afaf79daa0a17de248caf5
-DIST tables-3.9.2.tar.gz 4683437 BLAKE2B 7044aede85d9eca67260a309d19b5c80944b80b2107f665296ad7ae6a3c3f9a8717a41ae7298a5ae45e5b9de7ae0a6678a83d4bd914bd8709512333e783367bc SHA512 9b416222304b7798585a20d4d7d61934023f151d4262a58a4f0ee969aa365264270c12a734461a194d2c857a13a8e09fb7a1386042267113f601560c041cecd9
diff --git a/dev-python/tables/files/tables-3.10.0-pypy.patch b/dev-python/tables/files/tables-3.10.0-pypy.patch
deleted file mode 100644
index f27c99eadfb8..000000000000
--- a/dev-python/tables/files/tables-3.10.0-pypy.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c04a456a3e3f7c55722b8c77144991c657fc3af6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 14 Aug 2024 13:34:22 +0200
-Subject: [PATCH] FIX: Pass `refcheck=False` to `np.ndarray.resize()` for PyPy
- compat
-
-Pass `refcheck=False` when resizing an `np.ndarray` in place, in order
-to fix a test failure on PyPy3:
-
-```
-Traceback (most recent call last):
-  File "/tmp/PyTables/tables/tests/test_direct_chunk.py", line 266, in test_write_chunk_missing1
-    return self._test_write_chunk_missing(shrink_after=False)
-  File "/tmp/PyTables/tables/tests/test_direct_chunk.py", line 255, in _test_write_chunk_missing
-    new_obj.resize(self.array.shape)
-ValueError: cannot resize an array with refcheck=True on PyPy.
-Use the np.resize function or refcheck=False
-```
-
-Since the object is created immediately above the `.resize()` call,
-adding `refcheck=False` should be entirely safe.  Furthermore,
-unlike `np.resize()` this preserves the current behavior when new shape
-is larger than the original.
-
-Fixes #1202
----
- tables/tests/test_direct_chunk.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tables/tests/test_direct_chunk.py b/tables/tests/test_direct_chunk.py
-index ccc82516d..ed290d7e6 100644
---- a/tables/tests/test_direct_chunk.py
-+++ b/tables/tests/test_direct_chunk.py
-@@ -252,7 +252,7 @@ def _test_write_chunk_missing(self, shrink_after):
-             self.array.truncate(self.shape[0] - 1)
- 
-         new_obj = self.obj.copy()
--        new_obj.resize(self.array.shape)
-+        new_obj.resize(self.array.shape, refcheck=False)
-         obj_slice = tuple(slice(s, s + cs) for (s, cs)
-                           in zip(chunk_start, self.chunkshape))
-         if not shrink_after:
diff --git a/dev-python/tables/files/tables-3.9.2-numpy-2.patch b/dev-python/tables/files/tables-3.9.2-numpy-2.patch
deleted file mode 100644
index a3d56d13f1a8..000000000000
--- a/dev-python/tables/files/tables-3.9.2-numpy-2.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 48dc6ca5..e8957c1f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -736,7 +736,10 @@ if __name__ == "__main__":
- 
-     # -----------------------------------------------------------------
- 
--    def_macros = [("NDEBUG", 1)]
-+    def_macros = [
-+        ("NDEBUG", 1),
-+        ("NPY_TARGET_VERSION", "NPY_1_20_API_VERSION"),
-+    ]
- 
-     # Define macros for Windows platform
-     if os.name == "nt":
-diff --git a/src/utils.c b/src/utils.c
-index 15fce02d..b28dbc90 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -765,8 +765,8 @@ hid_t create_ieee_complex64(const char *byteorder) {
-     return float_id;
-   }
- 
--  H5Tinsert(complex_id, "r", HOFFSET(npy_complex64, real), float_id);
--  H5Tinsert(complex_id, "i", HOFFSET(npy_complex64, imag), float_id);
-+  H5Tinsert(complex_id, "r", 0, float_id);
-+  H5Tinsert(complex_id, "i", 4, float_id);
-   H5Tclose(float_id);
-   return complex_id;
- }
-@@ -790,8 +790,8 @@ hid_t create_ieee_complex128(const char *byteorder) {
-     return float_id;
-   }
- 
--  H5Tinsert(complex_id, "r", HOFFSET(npy_complex128, real), float_id);
--  H5Tinsert(complex_id, "i", HOFFSET(npy_complex128, imag), float_id);
-+  H5Tinsert(complex_id, "r", 0, float_id);
-+  H5Tinsert(complex_id, "i", 8, float_id);
-   H5Tclose(float_id);
-   return complex_id;
- }
-@@ -822,8 +822,8 @@ hid_t create_ieee_complex192(const char *byteorder) {
-     return err;
-   }
- 
--  H5Tinsert(complex_id, "r", HOFFSET(npy_complex192, real), float_id);
--  H5Tinsert(complex_id, "i", HOFFSET(npy_complex192, imag), float_id);
-+  H5Tinsert(complex_id, "r", 0, float_id);
-+  H5Tinsert(complex_id, "i", 12, float_id);
-   H5Tclose(float_id);
-   return complex_id;
- }
-@@ -854,8 +854,8 @@ hid_t create_ieee_complex256(const char *byteorder) {
-     return err;
-   }
- 
--  H5Tinsert(complex_id, "r", HOFFSET(npy_complex256, real), float_id);
--  H5Tinsert(complex_id, "i", HOFFSET(npy_complex256, imag), float_id);
-+  H5Tinsert(complex_id, "r", 0, float_id);
-+  H5Tinsert(complex_id, "i", 16, float_id);
-   H5Tclose(float_id);
-   return complex_id;
- }
-diff --git a/tables/atom.py b/tables/atom.py
-index 56ab6423..5d4fba2b 100644
---- a/tables/atom.py
-+++ b/tables/atom.py
-@@ -276,15 +276,15 @@ class Atom(metaclass=MetaAtom):
-             >>> atom1 = StringAtom(itemsize=10)  # same as ``atom2``
-             >>> atom2 = Atom.from_kind('string', 10)  # same as ``atom1``
-             >>> atom3 = IntAtom()
--            >>> atom1 == 'foo'
-+            >>> bool(atom1 == 'foo')
-             False
--            >>> atom1 == atom2
-+            >>> bool(atom1 == atom2)
-             True
--            >>> atom2 != atom1
-+            >>> bool(atom2 != atom1)
-             False
--            >>> atom1 == atom3
-+            >>> bool(atom1 == atom3)
-             False
--            >>> atom3 != atom2
-+            >>> bool(atom3 != atom2)
-             True
- 
-     """
-diff --git a/tables/index.py b/tables/index.py
-index e8c8caf7..28ff37e2 100644
---- a/tables/index.py
-+++ b/tables/index.py
-@@ -581,7 +581,8 @@ class Index(NotLoggedMixin, Group, indexesextension.Index):
-                 # Add a second offset in this case
-                 # First normalize the number of rows
-                 offset2 = (nrow % self.nslicesblock) * slicesize // lbucket
--                idx += offset2
-+                assert offset2 < 2**(indsize*8)
-+                idx += np.asarray(offset2).astype(idx.dtype)
-         # Add the last row at the beginning of arr & idx (if needed)
-         if (indsize == 8 and nelementsILR > 0):
-             # It is possible that the values in LR are already sorted.
-@@ -622,11 +623,11 @@ class Index(NotLoggedMixin, Group, indexesextension.Index):
-             show_stats("Entering final_idx32", tref)
-         # Do an upcast first in order to add the offset.
-         idx = idx.astype('uint64')
--        idx += offset
-+        idx += np.asarray(offset).astype(idx.dtype)
-         # The next partition is valid up to table sizes of
-         # 2**30 * 2**18 = 2**48 bytes, that is, 256 Tera-elements,
-         # which should be a safe figure, at least for a while.
--        idx //= self.lbucket
-+        idx //= np.asarray(self.lbucket).astype(idx.dtype)
-         # After the division, we can downsize the indexes to 'uint32'
-         idx = idx.astype('uint32')
-         if profile:
-@@ -2002,7 +2003,7 @@ class Index(NotLoggedMixin, Group, indexesextension.Index):
-                 else:
-                     self.indicesLR._read_index_slice(start, stop, idx)
-                 if indsize == 8:
--                    idx //= lbucket
-+                    idx //= np.asarray(lbucket).astype(idx.dtype)
-                 elif indsize == 2:
-                     # The chunkmap size cannot be never larger than 'int_'
-                     idx = idx.astype("int_")
-diff --git a/tables/tests/common.py b/tables/tests/common.py
-index 31378a88..1992f39a 100644
---- a/tables/tests/common.py
-+++ b/tables/tests/common.py
-@@ -205,7 +205,7 @@ def allequal(a, b, flavor="numpy"):
-     return result
- 
- 
--def areArraysEqual(arr1, arr2):
-+def areArraysEqual(arr1, arr2, *, check_type=True):
-     """Are both `arr1` and `arr2` equal arrays?
- 
-     Arguments can be regular NumPy arrays, chararray arrays or
-@@ -217,8 +217,8 @@ def areArraysEqual(arr1, arr2):
-     t1 = type(arr1)
-     t2 = type(arr2)
- 
--    if not ((hasattr(arr1, 'dtype') and arr1.dtype == arr2.dtype) or
--            issubclass(t1, t2) or issubclass(t2, t1)):
-+    if check_type and not ((hasattr(arr1, 'dtype') and arr1.dtype == arr2.dtype) or
-+                           issubclass(t1, t2) or issubclass(t2, t1)):
-         return False
- 
-     return np.all(arr1 == arr2)
-diff --git a/tables/tests/test_expression.py b/tables/tests/test_expression.py
-index 018d4208..d9c0e990 100644
---- a/tables/tests/test_expression.py
-+++ b/tables/tests/test_expression.py
-@@ -265,9 +265,12 @@ class MixedContainersTestCase(common.TempFileMixin, common.PyTablesTestCase):
-         if common.verbose:
-             print("Computed expression:", repr(r1), r1.dtype)
-             print("Should look like:", repr(r2), r2.dtype)
--        self.assertTrue(
--            r1.shape == r2.shape and r1.dtype == r2.dtype and r1 == r2,
--            "Evaluate is returning a wrong value.")
-+        msg = f"Evaluate is returning a wrong value: {expr_str}\n{r1=}\n{r2=}"
-+        self.assertEqual(r1.shape, r2.shape, msg=msg)
-+        # In something like 2 * np.in16(3) + np.int16(2) the result is still a
-+        # np.int16 in NumPy 2.0, so we shouldn't actually check this:
-+        # self.assertEqual(r1.dtype, r2.dtype, msg=msg)
-+        self.assertEqual(r1, r2, msg=msg)
- 
-     def test01a_out(self):
-         """Checking expressions with mixed objects (`out` param)"""
-@@ -305,8 +308,9 @@ class MixedContainersTestCase(common.TempFileMixin, common.PyTablesTestCase):
-             if common.verbose:
-                 print("Computed expression:", repr(r1), r1.dtype)
-                 print("Should look like:", repr(r2), r2.dtype)
--            self.assertTrue(common.areArraysEqual(r1, r2),
--                            "Evaluate is returning a wrong value.")
-+            msg = f"Evaluate is returning a wrong value: {expr_str}\n{r1=}\n{r2=}"
-+            # On NumPy 2 type promotion is different so don't check type here
-+            self.assertTrue(common.areArraysEqual(r1, r2, check_type=False), msg=msg)
- 
-     def test02a_sss(self):
-         """Checking mixed objects and start, stop, step (I)"""
-diff --git a/tables/tests/test_indexvalues.py b/tables/tests/test_indexvalues.py
-index fac33af8..85ca38c3 100644
---- a/tables/tests/test_indexvalues.py
-+++ b/tables/tests/test_indexvalues.py
-@@ -2296,6 +2296,11 @@ class SelectValuesTestCase(common.TempFileMixin, common.PyTablesTestCase):
-         self.assertFalse(t1var3.index.dirty)
-         self.assertFalse(t1var4.index.dirty)
- 
-+        # TODO: IT IS DIRTY BECAUSE THIS FIXES THINGS FOR FINSV2aTestCase,
-+        # which otherwise fails a test a few lines below!
-+        for col in table1.colinstances.values():
-+            col.reindex()
-+
-         # Do some selections and check the results
-         # First selection: string
-         # Convert the limits to the appropriate type
-@@ -2318,11 +2323,15 @@ class SelectValuesTestCase(common.TempFileMixin, common.PyTablesTestCase):
-         # Second selection: bool
-         results1 = [p["var2"] for p in table1.where('t1var2 == True')]
-         results2 = [p["var2"] for p in table2 if p["var2"] is True]
--        if common.verbose:
--            print("Length results:", len(results1))
--            print("Should be:", len(results2))
--        self.assertEqual(len(results1), len(results2))
--        self.assertEqual(results1, results2)
-+        t2var1_vals = [p["var1"] for p in table2]
-+        t2var2_vals = [p["var2"] for p in table2]
-+        msg = (
-+            f"Incorrect results for t1var2[n] == True where\n"
-+            f"t2var1_vals={repr(t2var1_vals)}\nt2var2_vals={repr(t2var2_vals)}\n"
-+            f"\n{results1=}\n{results2=}"
-+        )
-+        self.assertEqual(len(results1), len(results2), msg=msg)
-+        self.assertEqual(results1, results2, msg=msg)
- 
-         # Third selection: int
-         # Convert the limits to the appropriate type
-@@ -3228,7 +3237,9 @@ class LastRowReuseBuffers(common.PyTablesTestCase):
- 
- 
- normal_tests = (
--    "SV1aTestCase", "SV2aTestCase", "SV3aTestCase",
-+    "SV1aTestCase",
-+    "SV2aTestCase",
-+    "SV3aTestCase",
- )
- 
- heavy_tests = (
-diff --git a/tables/utils.py b/tables/utils.py
-index e11e5ba7..7d786e32 100644
---- a/tables/utils.py
-+++ b/tables/utils.py
-@@ -25,6 +25,11 @@ byteorders = {
- SizeType = np.int64
- 
- 
-+copy_if_needed = (
-+    None if np.lib.NumpyVersion(np.__version__) >= "2.0.0" else False
-+)
-+
-+
- def correct_byteorder(ptype, byteorder):
-     """Fix the byteorder depending on the PyTables types."""
- 
-@@ -78,7 +83,7 @@ def idx2long(index):
- # with atom from a generic python type.  If copy is stated as True, it
- # is assured that it will return a copy of the object and never the same
- # object or a new one sharing the same memory.
--def convert_to_np_atom(arr, atom, copy=False):
-+def convert_to_np_atom(arr, atom, copy=copy_if_needed):
-     """Convert a generic object into a NumPy object compliant with atom."""
- 
-     # First, convert the object into a NumPy array
-@@ -112,7 +117,7 @@ def convert_to_np_atom2(object, atom):
- 
-     # Check whether the object needs to be copied to make the operation
-     # safe to in-place conversion.
--    copy = atom.type in ['time64']
-+    copy = True if atom.type in ['time64'] else copy_if_needed
-     nparr = convert_to_np_atom(object, atom, copy)
-     # Finally, check the byteorder and change it if needed
-     byteorder = byteorders[nparr.dtype.byteorder]
diff --git a/dev-python/tables/files/tables-3.9.2-py313.patch b/dev-python/tables/files/tables-3.9.2-py313.patch
deleted file mode 100644
index 660c5615765f..000000000000
--- a/dev-python/tables/files/tables-3.9.2-py313.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 4a1b480e7e3758cf2cf06354ec5720020db16ce7 Mon Sep 17 00:00:00 2001
-From: Antonio Valentino <antonio.valentino@tiscali.it>
-Date: Sun, 19 May 2024 17:39:47 +0200
-Subject: [PATCH] Fix compatibility with Python v3.13 (Closes: #1166)
-
-The unittest.makeSuite function is not available in Python 3.13.
----
-diff --git a/tables/tests/test_aux.py b/tables/tests/test_aux.py
-index 95f34ee16..cf4f022de 100644
---- a/tables/tests/test_aux.py
-+++ b/tables/tests/test_aux.py
-@@ -2,6 +2,7 @@
- import numpy as np
- 
- import tables as tb
-+from tables.tests.common import make_suite
- 
- 
- class TestAuxiliaryFunctions(unittest.TestCase):
-diff --git a/tables/nodes/tests/test_filenode.py b/tables/nodes/tests/test_filenode.py
-index c2754218a..3572cc38f 100644
---- a/tables/nodes/tests/test_filenode.py
-+++ b/tables/nodes/tests/test_filenode.py
-@@ -9,7 +9,7 @@
- from ... import open_file, file, NoSuchNodeError
- from ...nodes import filenode
- from ...tests.common import (
--    unittest, TempFileMixin, parse_argv, print_versions,
-+    unittest, TempFileMixin, parse_argv, print_versions, make_suite,
-     PyTablesTestCase as TestCase)
- 
- 
-diff --git a/tables/tests/common.py b/tables/tests/common.py
-index 31378a880..918b17247 100644
---- a/tables/tests/common.py
-+++ b/tables/tests/common.py
-@@ -366,3 +366,10 @@ def test00(self):
-         print(f"VmSize: {vmsize:>7} kB\tVmRSS: {vmrss:>7} kB")
-         print(f"VmData: {vmdata:>7} kB\tVmStk: {vmstk:>7} kB")
-         print(f"VmExe:  {vmexe:>7} kB\tVmLib: {vmlib:>7} kB")
-+
-+
-+try:
-+    from unittest import makeSuite as make_suite
-+except ImportError:
-+    def make_suite(test_case_class):
-+        return unittest.TestLoader().loadTestsFromTestCase(test_case_class)
-From 424784895b0fb15ad06707ce60f9829cef4f11e2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Mon, 3 Jun 2024 17:21:38 +0200
-Subject: [PATCH] Make tables.tests.common.make_suite() accept the prefix
- argument
-
-...as test_queries.py uses it.
----
- tables/tests/common.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/tables/tests/common.py b/tables/tests/common.py
-index 918b17247..1d2e5feab 100644
---- a/tables/tests/common.py
-+++ b/tables/tests/common.py
-@@ -371,5 +371,8 @@ def test00(self):
- try:
-     from unittest import makeSuite as make_suite
- except ImportError:
--    def make_suite(test_case_class):
--        return unittest.TestLoader().loadTestsFromTestCase(test_case_class)
-+    def make_suite(test_case_class, *, prefix=None):
-+        loader = unittest.TestLoader()
-+        if prefix:
-+            loader.testMethodPrefix = prefix
-+        return loader.loadTestsFromTestCase(test_case_class)
diff --git a/dev-python/tables/tables-3.10.0.ebuild b/dev-python/tables/tables-3.10.0.ebuild
deleted file mode 100644
index 320e56f7a971..000000000000
--- a/dev-python/tables/tables-3.10.0.ebuild
+++ /dev/null
@@ -1,80 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix pypi
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="
-	https://www.pytables.org/
-	https://github.com/PyTables/PyTables/
-	https://pypi.org/project/tables/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cpudetection examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0:=
-	>=dev-libs/c-blosc-1.11.1:0=
-	>=dev-libs/c-blosc2-2.11.0:=
-	dev-libs/lzo:2=
-	>=dev-python/numpy-1.19.0:=[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.4:=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/PyTables/PyTables/pull/1205
-		"${FILESDIR}/${P}-pypy.patch"
-	)
-
-	rm -r c-blosc/{blosc,internal-complibs} || die
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e '/blosc2/d' -e '/numpy/s:, <2::' pyproject.toml || die
-	hprefixify -w '/prefixes =/' setup.py
-
-	export PYTABLES_NO_EMBEDDED_LIBS=1
-	export USE_PKGCONFIG=TRUE
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" tables/tests/test_all.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r contrib examples
-		docompress -x /usr/share/doc/${PF}/{contrib,examples}
-	fi
-}
diff --git a/dev-python/tables/tables-3.10.1.ebuild b/dev-python/tables/tables-3.10.1.ebuild
index 131e2cca0a0f..966126f67b32 100644
--- a/dev-python/tables/tables-3.10.1.ebuild
+++ b/dev-python/tables/tables-3.10.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+cpudetection examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tables/tables-3.9.2-r1.ebuild b/dev-python/tables/tables-3.9.2-r1.ebuild
deleted file mode 100644
index f85b93f39445..000000000000
--- a/dev-python/tables/tables-3.9.2-r1.ebuild
+++ /dev/null
@@ -1,89 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 prefix pypi
-
-DESCRIPTION="Hierarchical datasets for Python"
-HOMEPAGE="
-	https://www.pytables.org/
-	https://github.com/PyTables/PyTables/
-	https://pypi.org/project/tables/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+cpudetection examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	app-arch/bzip2:0=
-	app-arch/lz4:0=
-	>=app-arch/zstd-1.0.0:=
-	>=dev-libs/c-blosc-1.11.1:0=
-	>=dev-libs/c-blosc2-2.11.0:=
-	dev-libs/lzo:2=
-	>=dev-python/numpy-1.19.0:=[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.8.4:=
-"
-RDEPEND="
-	${DEPEND}
-	>=dev-python/numexpr-2.6.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	cpudetection? ( dev-python/py-cpuinfo[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/PyTables/PyTables/pull/1176
-		"${FILESDIR}/${P}-numpy-2.patch"
-		# https://github.com/PyTables/PyTables/commit/4a1b480e7e3758cf2cf06354ec5720020db16ce7
-		# https://github.com/PyTables/PyTables/commit/424784895b0fb15ad06707ce60f9829cef4f11e2
-		"${FILESDIR}/${P}-py313.patch"
-	)
-
-	rm -r c-blosc/{blosc,internal-complibs} || die
-
-	# part of https://github.com/PyTables/PyTables/commit/4a1b480e7e3758cf2cf06354ec5720020db16ce7
-	# (warning: do it *before* patching, so it doesn't modify
-	# the added function)
-	find -name '*.py' -exec \
-		sed -i -e 's:unittest[.]makeSuite:make_suite:' {} + || die
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e '/blosc2/d' pyproject.toml || die
-	hprefixify -w '/prefixes =/' setup.py
-
-	export PYTABLES_NO_EMBEDDED_LIBS=1
-	export USE_PKGCONFIG=TRUE
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	"${EPYTHON}" tables/tests/test_all.py -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r contrib examples
-		docompress -x /usr/share/doc/${PF}/{contrib,examples}
-	fi
-}
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 836f16932889..bd08566f86cc 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1 +1,2 @@
 DIST thrift-0.20.0.tar.gz 4397667 BLAKE2B 23422fdcdf7e0dbce8bc0f8017f54b5848594e2da21de56834152c17c74da7d1c4df23c5b57cf3ba811bb03f1a8588ddf1c2a05222bb726aceda4292a15af21e SHA512 8dc77f666e60141a6b3cf7ee1407b08a0e80d176f8ccfee69317d7df89ab87aea2c7b3ba3e59d4561835edf1ce23762443ad5aeed0099bf075b010853d5eb1cd
+DIST thrift-0.21.0.tar.gz 4398072 BLAKE2B 1cbbecd0a4ecfe1a14b657d2a87286ad821e821894efde226aa96b23c62250c6bb032e703e0031990328b263593d92024f28b907e8dc27c217d475f6f3b90932 SHA512 0ffca1232305c07f803adb7239b5d22ee5c766a2809703c127b45a80b820c677e05a2d5b82852af5e1e923abe07ff1d9eb2f3fa4f2aa8732c9a81d8b0daa1f35
diff --git a/dev-python/thrift/thrift-0.21.0.ebuild b/dev-python/thrift/thrift-0.21.0.ebuild
new file mode 100644
index 000000000000..c8aadd9428b4
--- /dev/null
+++ b/dev-python/thrift/thrift-0.21.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of Thrift"
+HOMEPAGE="
+	https://pypi.org/project/thrift/
+	https://thrift.apache.org/
+	https://github.com/apache/thrift
+"
+SRC_URI="https://downloads.apache.org/${PN}/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/lib/py"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest test
+}
+
+src_install() {
+	distutils-r1_src_install
+	# avoid file collision with dev-libs/thrift (bug #933272)
+	mv "${D}"/usr/share/doc/${P}/README.md \
+		"${D}"/usr/share/doc/${P}/ReadMe.md || die
+}
diff --git a/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild b/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
index 9197c0ce0b42..94f0c0857602 100644
--- a/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.22.3-r2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/py-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # setuptools is needed for distutils import
 DEPEND=">=dev-libs/tree-sitter-0.22.1:="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 27d08356f23b..c1cd5af1529f 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,2 +1 @@
-DIST trimesh-4.4.7.gh.tar.gz 13606593 BLAKE2B 1847d601711df60257a8f1248cdea66fcc6489b570606c9ab1d360db2742a9e7c1f0d6093924afa7105a5a272e80c291b1c3568b041db2ee4d144e72ab44fbd8 SHA512 b3e1a670b8dec26df3357cad4205431e94fc2b59b87af976b0754ac8e46f4f930f768322f0aa236a6205c289b9037f2343ec6aaeb0e281f021a03d3147be3d20
 DIST trimesh-4.4.9.gh.tar.gz 13612220 BLAKE2B 9ee21f8a3f0db041133b2843948a00e8ee6bf52e3de1d2ca9ac88391ef1c07a4b540c75b439da3e137923f0822399cdf759072729363253ad8137a06cb208791 SHA512 3b58a0378231dd1111ac4ffe030b1dd18d24647e22fe815bc411a7854f83e12a9482cb0b48d5333be9f6f6ebf622c15e29c446531ce27ff12c1835a6f25cc51a
diff --git a/dev-python/trimesh/trimesh-4.4.7.ebuild b/dev-python/trimesh/trimesh-4.4.7.ebuild
deleted file mode 100644
index b36f2a112dac..000000000000
--- a/dev-python/trimesh/trimesh-4.4.7.ebuild
+++ /dev/null
@@ -1,74 +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 optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimesh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	dev-python/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mapbox-earcut[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=1800
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# require pyinstrument
-		tests/test_sweep.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox-earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-4.4.9.ebuild b/dev-python/trimesh/trimesh-4.4.9.ebuild
index 3a9c1843a308..b36f2a112dac 100644
--- a/dev-python/trimesh/trimesh-4.4.9.ebuild
+++ b/dev-python/trimesh/trimesh-4.4.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 5cfcbe7e27c3..45c06a576f70 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1,3 +1 @@
-DIST types-psutil-5.9.5.20240516.tar.gz 14771 BLAKE2B 9d163a5909b79a1d775f5edb557fa9e047b2874a3def37ca9277f446ee83b4ded8776c2d231142ee72cf80f7a48c7ebafbe03794d0d3192f762f14692559b16b SHA512 831ffcf2031f3d40d591c7660c38e469114867b53990739130098db571f6369877ee534388ad87f178f1b689c8a66bf020e5b5b2a141aa81485324b370b7473f
-DIST types-psutil-6.0.0.20240621.tar.gz 14857 BLAKE2B 1529a89f836d4ec9fb3707143caecd770a6820f9cd3af02ddf6dd8583eadbbe9c7c10d21fc97eb77f07990f80e43cf6da6bb00e9ca3c881a92dad097e7748eaa SHA512 4799a22db15052e32ab3016829514c425615deaa587ce7436f6978a1bd58ae812608bc4865d57910303bda907322348a6e2cd3ae4d45999f473440d2cff813fb
 DIST types-psutil-6.0.0.20240901.tar.gz 15117 BLAKE2B 1cdcdcb2fe5b67c482b479ab470d2b6fceac324bd059fbe856c228b55040a1b3beabc0dfc7c11febecf19f58fb2ea486b11f442ab87529f8475fb8649dd0d3de SHA512 05a686d3c16b356da056be565f7a77bd6c2c5161e75229bcda80b0b22c6c51407ce5b7c39c8d7c2a6684a98decb92cde3d6dee53265778613b46da499524ac03
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
deleted file mode 100644
index f56f0a117f69..000000000000
--- a/dev-python/types-psutil/types-psutil-5.9.5.20240516.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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20240621.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20240621.ebuild
deleted file mode 100644
index b0890efef987..000000000000
--- a/dev-python/types-psutil/types-psutil-6.0.0.20240621.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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild
index 158eeda82860..f56f0a117f69 100644
--- a/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild
+++ b/dev-python/types-psutil/types-psutil-6.0.0.20240901.ebuild
@@ -14,4 +14,4 @@ HOMEPAGE="https://pypi.org/project/types-psutil/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index b641bf9fd632..fb4906f26e3b 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -7,4 +7,5 @@ DIST uv-0.4.11-crates.tar.xz 46271540 BLAKE2B e0add4875653581f022ba72ee9c8167368
 DIST uv-0.4.11.gh.tar.gz 2598363 BLAKE2B 44b04001ca796e59aec6b17984d89324de6cbf72c3e32c20e16c65b8dd1eee930f2a6358de6bbcc4b6bf01720786cc032c76ca6cdee64a21f91ee656aedd3f41 SHA512 23d79e4c485dde92958ef4a93cab184eda9aabe12441f0c88f752e98b8f24c177d6d08c6ae520490b841c1f3d9571a2c75ee324557b390ce8e716191abaf2b2f
 DIST uv-0.4.14-crates.tar.xz 46101112 BLAKE2B 08db62cb25a53b604f717b971063b1c01b6772442316777d82ca331ae19c685ad2b7b4f2d69a6f5112783f89108cc78a66e116a106e3d4c17dbee7508d3bf27e SHA512 8b8bd02c2e7b8b9bc38161aad144a1a2581491448e9e6b68f99fdaee737c52f80bac70e80cbd57094de621cc08d39c63d5d791635a9b327d260afd61d9de8b6b
 DIST uv-0.4.14.gh.tar.gz 2650440 BLAKE2B bf9329999e2f88932f3d7072ce941fcaed0ccd172737820f9e980de71a6636e4b445387857de5b6649d0d2b512901e0482b37f3634d0e0a30ee4268debc8ff8a SHA512 6f5a92f3900f131917120e0ad0b05ef56f8d9a227275d25d8fc132a1a62a0351c96c332b7f75709b6542600f51fdf0c4f702f90151b62c1f265e159d7e7af648
+DIST uv-0.4.15.gh.tar.gz 2650314 BLAKE2B bc492fab2af297c68666fda239da204ecce9b9169767c2a0a4feb85d0078f57df25c61c4068783042e9977c7698fc2fd6776e106443672beacab932fce3db5f0 SHA512 7b2293e8be56a61fd4288256b462f01a522da5cdcbab8c4ad140f7c0fe9b196f4ce2ecfb23984c0a1d0f7205e85e49dc9eae0b4fbce4778f8f5eb21d4eb77ee3
 DIST uv-0.4.9-crates.tar.xz 46250584 BLAKE2B 6beb0a00885b674f3d8e35c67372d4ba04c6512306f78522fac2ff170d7cc6cb6c0702546da1d1de3dc84397f04258c56558c666b8f935130a0fea1debce01d0 SHA512 676f6a197af92bc9f6716c0e1df1f87d81b1b07dc81c591b94b34b985bbe4a49fb0b319fe8fba7f83d158124af84f64ebefe1ce0119e6238f9ae837e4652c5c0
diff --git a/dev-python/uv/uv-0.4.15.ebuild b/dev-python/uv/uv-0.4.15.ebuild
new file mode 100644
index 000000000000..e681d242ef6a
--- /dev/null
+++ b/dev-python/uv/uv-0.4.15.ebuild
@@ -0,0 +1,135 @@
+# 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;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
+	[reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
+	[reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+	[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+)
+
+inherit cargo check-reqs
+
+CRATE_PV=0.4.14
+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/uv-${CRATE_PV}-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="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=virtual/rust-1.80
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+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
+
+	# remove patch.* that breaks GIT_CRATES
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
+
+	# enable system libraries where supported
+	export ZSTD_SYS_USE_PKG_CONFIG=1
+	sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
+	# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
+
+	# remove unbundled sources, just in case
+	find "${ECARGO_VENDOR}"/{bzip2,lzma,zstd}-sys-*/ -name '*.c' -delete || die
+
+	# bzip2-sys requires a pkg-config file
+	# https://github.com/alexcrichton/bzip2-rs/issues/104
+	mkdir "${T}/pkg-config" || die
+	export PKG_CONFIG_PATH=${T}/pkg-config${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}
+	cat >> "${T}/pkg-config/bzip2.pc" <<-EOF || die
+		Name: bzip2
+		Version: 9999
+		Description:
+		Libs: -lbz2
+	EOF
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	# work around https://github.com/astral-sh/uv/issues/4376
+	local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
+	local -x COLUMNS=100
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/watchdog/watchdog-5.0.2.ebuild b/dev-python/watchdog/watchdog-5.0.2.ebuild
index 43f866b6f28b..bfa5d318de9b 100644
--- a/dev-python/watchdog/watchdog-5.0.2.ebuild
+++ b/dev-python/watchdog/watchdog-5.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 8ab7d72100ec..ef3e78c9c975 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,4 @@
 DIST websockets-11.0.3-python3.12.patch.xz 4328 BLAKE2B 6ef94255ef5d95de8015eca14a5110373ab9ffadf4d1c86a892da1aac46caa2755cafeb643a222000a03262c1b1b1aea58132daff36981c00dbb68ce05484058 SHA512 421a6fb5a2a801850ea1fbaf890c11eac0f55ad288185f16f4244f316132591bc5a814636141ba3ada67aeff340f41de61d06c8db87010c858c1b0b02fd9b5ab
 DIST websockets-12.0.gh.tar.gz 352120 BLAKE2B cab704e0ee44a7012ee58d515a5ea7380a97a3cbb8f55d105c00c8c2b9ed992b4c87435875474de32e5969fd92256bdec830db0571399a1d2e5fb719b23c2d83 SHA512 f17943d444ce275b709cf89453b2d2cce09f5af26f0460e226c2e24cfbb425c825963352e130dcd4201587606355375b525d8e5a02eccbffbb3985a108a3ed5e
 DIST websockets-13.0.1.gh.tar.gz 400436 BLAKE2B 3387cdc72117d2b1b0d1a5d3bc2444a243de2536b3937459221095b539172fab60972f4b1d0371c9c88222f8dcdf604a0371de1519728b40889a51ad6dd32029 SHA512 b187e7c443b9c6abbc7993f9c45dbd4fe83784d3ceb339b6e7d104cfa4da03450c25a8bf9dfa9c8626c3c91f2fe44c0dec6579ba830e0e20116a3e1e01be3bf1
+DIST websockets-13.1.gh.tar.gz 414934 BLAKE2B ac6ec67c360e88a7091c28e582b8a0e58fffb37b91f6cfe2b62fa91e1de10f94ba66b644e22f3ce34db698ec25c1685f682e3557058e30f162e1a6a39c19451e SHA512 f66c25c8c2a327840e424e1db3742f1e303df562fe59e91d44c15731d9e43d3d9b126253f2ffb2efeada63d3fd8b404480506554f263846d8d0d86da02f4d8aa
diff --git a/dev-python/websockets/websockets-13.1.ebuild b/dev-python/websockets/websockets-13.1.ebuild
new file mode 100644
index 000000000000..3efa31e00c67
--- /dev/null
+++ b/dev-python/websockets/websockets-13.1.ebuild
@@ -0,0 +1,60 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="
+	https://websockets.readthedocs.io/
+	https://github.com/python-websockets/websockets/
+	https://pypi.org/project/websockets/
+"
+# tests are missing pypi sdist, as of 11.0
+SRC_URI="
+	https://github.com/python-websockets/websockets/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-11.0.3-python3.12.patch.xz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	if use native-extensions && [[ ${EPYTHON} != pypy3 ]] ; then
+		local -x BUILD_EXTENSION=yes
+	else
+		local -x BUILD_EXTENSION=no
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires DNS access
+		# https://bugs.gentoo.org/909567
+		tests/legacy/test_client_server.py::ClientServerTests::test_explicit_host_port
+		tests/legacy/test_client_server.py::SecureClientServerTests::test_explicit_host_port
+		# TODO
+		tests/asyncio/test_server.py::ServerTests::test_close_server_keeps_handlers_running
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests -p rerunfailures --reruns=10 --reruns-delay=2
+}