Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-10-12 08:46:40 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-10-12 08:46:40 +0000
commit: 7108873385a38c38d76962848792b339c4de2fed (patch)
tree: 01c34715ac190693e111b206aee43d23d03486fc /dev-python
parent: c2273b4df43751f22098f6029944aaf35c254b4f (diff)
download: baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.tar.gz
baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.tar.xz
baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.zip
181 files changed, 869 insertions, 3359 deletions
diff --git a/dev-python/Faker/Faker-29.0.0.ebuild b/dev-python/Faker/Faker-29.0.0.ebuild
deleted file mode 100644
index d3e5bb59f241..000000000000
--- a/dev-python/Faker/Faker-29.0.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_{9,10,11,12,13} 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 ~mips 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-30.0.0.ebuild b/dev-python/Faker/Faker-30.0.0.ebuild
index 73a972075555..d3e5bb59f241 100644
--- a/dev-python/Faker/Faker-30.0.0.ebuild
+++ b/dev-python/Faker/Faker-30.0.0.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 6af70180697f..f75dfbd863c0 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,4 +1,3 @@
-DIST faker-29.0.0.tar.gz 1795098 BLAKE2B 96f6ee6166cc4dde4c6c8e1be2ac9cc1f529c5afe371cbb75c264777fdb390aa6dfaf199e6671b9f3e4658937c7fc0953aa31e548d3ea2e7ae948d8e2ced8e7c SHA512 09f46d2693b611277312cd39a5a6b7a40271c7136fd42c8a02c6d55ab10caeddb8d614db81ea76bc37879b21c6bb53297b04b7169410da7d6d183cb1406f60d9
 DIST faker-30.0.0.tar.gz 1795010 BLAKE2B 01e93e39bb22db8220400d28f92ad08f4f1f971b7023cd76c6ae5b965800c6f44a0d67d22b48c4ced732b89efa8b7290e94b1a163f164c3f67d1e830174cba4e SHA512 21bd8d4d2ada7c579cad16ed019bce1187427dd1c5806bc97d055ca9e6a2477bbd2fd5861dc60bb1961ff6613fedabdff9cb59b453434fc80bbb52b336b78f89
 DIST faker-30.1.0.tar.gz 1796615 BLAKE2B 448e1361fc397d13898778f32148a0ff6b13dd8ad232a29931ce08a5575986f832adb1167cff5de3a866bfdf5e8b06645bc46643f2b690e82c7d18c721fa84e4 SHA512 53828e30eeff7ffd5ce3b34dbdbe8d0b38b119f58e44dc3f0a5af47df48d8226101fa00dbb08594d03dd0369f7c6067f5f573eaf329133b3a7fdc3846f0e3780
 DIST faker-30.3.0.tar.gz 1797350 BLAKE2B 3c8da599ea115637687d168acc299803844ec42d645ea6485f80911becdde4c0e93a1a065f831048651f1c749c74d05f57eb978ddb95f229f58d194710b3fbf8 SHA512 843d7b46ad5585b715a73a831f8f5fb912f545dcec1d12fbf2296278feb8b0838aad613df8f39b1c515657e617737795ce5775eba89d0d4e645325dc2f50b0ad
diff --git a/dev-python/aiohttp-theme/Manifest b/dev-python/aiohttp-theme/Manifest
index cb113facf281..3a156d888296 100644
--- a/dev-python/aiohttp-theme/Manifest
+++ b/dev-python/aiohttp-theme/Manifest
@@ -1,2 +1 @@
-DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
 DIST aiohttp_theme-0.1.7.tar.gz 11509 BLAKE2B ddb92ac862f5e93f33eec508c706d88112f043928ec48b4e7ec7000819f12b8a06ed7c3aa3c1590d5678e45573b295882158394904328edfd623068d89b8bf8a SHA512 2c840fdfb8cbdd58c8b133cb44345cbb55629591ea066b86b09df5ce7d092ef96291fce7cd4e1814b46805e41b20aa8ecfbc41f820242ed46496b14c5966e58c
diff --git a/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild b/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild
deleted file mode 100644
index 3969811f017d..000000000000
--- a/dev-python/aiohttp-theme/aiohttp-theme-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN="aiohttp-theme"
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Sphinx theme for aiohttp"
-HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild b/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
index c70a0b76613f..a1d02da0c518 100644
--- a/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
+++ b/dev-python/aiohttp-theme/aiohttp-theme-0.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 2a8bcfbba4d8..5b8a6848f064 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.13.2.tar.gz 1206463 BLAKE2B edff3a244fa37556cd656e60940d94e7df75b6c67aa4199b673851b5b06e84dbf51e53f2ac9781465aa923c0019fcd33a9c3b4da90d64f583956e390ca1f5fa7 SHA512 c4952123ba00403bb030606c736dab8d5494b01662d02914fb0d10d0c1d99b27a97cc4a800cdfa32d53870031c46e351f97815e337c71f3a0a824b6403bd75cf
 DIST alembic-1.13.3.tar.gz 1921223 BLAKE2B 25f0dcc806e5988e54f2557bce31bdb50ff94ea6a312fa71a82f61114b4b34a5a2b8003c8174d77a4e202c60d84f8cad4b61c048b093e2159a6dd85ca8f38ce1 SHA512 5661098833a4314484a6e7ea4cdea9755ed84982eaa914972265943c8b62e17d5a2831d323d238c4a37d71de61251388d43f5b419e2c592753f6bdc5fc463563
diff --git a/dev-python/alembic/alembic-1.13.2.ebuild b/dev-python/alembic/alembic-1.13.2.ebuild
deleted file mode 100644
index 0bbcebbd02bd..000000000000
--- a/dev-python/alembic/alembic-1.13.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-libs/timezone-data
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# setup.cfg contains -p no:warnings in addopts which triggers
-	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
-	epytest -o addopts=
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.13.3.ebuild b/dev-python/alembic/alembic-1.13.3.ebuild
index bc0d60309286..0bbcebbd02bd 100644
--- a/dev-python/alembic/alembic-1.13.3.ebuild
+++ b/dev-python/alembic/alembic-1.13.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
index 46a69b8e5eab..38c3c2599c50 100644
--- a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.13.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}/runtime/Python3"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 src_prepare() {
 	# https://github.com/antlr/antlr4/pull/4593
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 97c31427ed0e..7d2d94833006 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,3 +1 @@
-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.4.0-r1.ebuild b/dev-python/anyio/anyio-4.4.0-r1.ebuild
deleted file mode 100644
index 5018a4e92e31..000000000000
--- a/dev-python/anyio/anyio-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="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.23[${PYTHON_USEDEP}]
-		' 3.{10..13})
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.17[${PYTHON_USEDEP}]
-			' python3_{10..12})
-		)
-	)
-"
-
-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
-
-PATCHES=(
-	# https://github.com/agronholm/anyio/pull/740
-	"${FILESDIR}/${P}-py313.patch"
-)
-
-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.23[${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
-
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				'tests/test_fileio.py::TestPath::test_properties[asyncio]'
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network' "${filter[@]}"
-}
diff --git a/dev-python/anyio/anyio-4.5.0.ebuild b/dev-python/anyio/anyio-4.5.0.ebuild
deleted file mode 100644
index 06e61da2a72a..000000000000
--- a/dev-python/anyio/anyio-4.5.0.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_{9,10,11,12,13} 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/anyio/anyio-4.6.0.ebuild b/dev-python/anyio/anyio-4.6.0.ebuild
index d3f3d47c50fe..3692028a8017 100644
--- a/dev-python/anyio/anyio-4.6.0.ebuild
+++ b/dev-python/anyio/anyio-4.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/anyio/files/anyio-4.4.0-py313.patch b/dev-python/anyio/files/anyio-4.4.0-py313.patch
deleted file mode 100644
index ebd3763f7544..000000000000
--- a/dev-python/anyio/files/anyio-4.4.0-py313.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 8a4d651610abb71da66cef58f350788eab6b0bd1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
-Date: Tue, 28 May 2024 01:00:49 +0300
-Subject: [PATCH 1/3] Added missing Path properties from Python 3.13
-
-Fixes #737.
----
- src/anyio/_core/_fileio.py | 24 ++++++++++++++++++++++--
- tests/test_fileio.py       | 18 ++++++++++++++++++
- 4 files changed, 47 insertions(+), 4 deletions(-)
-
-diff --git a/src/anyio/_core/_fileio.py b/src/anyio/_core/_fileio.py
-index df2057fe..8053dce5 100644
---- a/src/anyio/_core/_fileio.py
-+++ b/src/anyio/_core/_fileio.py
-@@ -358,8 +358,28 @@ def as_posix(self) -> str:
-     def as_uri(self) -> str:
-         return self._path.as_uri()
- 
--    def match(self, path_pattern: str) -> bool:
--        return self._path.match(path_pattern)
-+    if sys.version_info >= (3, 13):
-+        parser = pathlib.Path.parser  # type: ignore[attr-defined]
-+
-+        @classmethod
-+        def from_uri(cls, uri: str) -> Path:
-+            return Path(pathlib.Path.from_uri(uri))  # type: ignore[attr-defined]
-+
-+        def full_match(
-+            self, path_pattern: str, *, case_sensitive: bool | None = None
-+        ) -> bool:
-+            return self._path.full_match(  # type: ignore[attr-defined]
-+                path_pattern, case_sensitive=case_sensitive
-+            )
-+
-+        def match(
-+            self, path_pattern: str, *, case_sensitive: bool | None = None
-+        ) -> bool:
-+            return self._path.match(path_pattern, case_sensitive=case_sensitive)
-+    else:
-+
-+        def match(self, path_pattern: str) -> bool:
-+            return self._path.match(path_pattern)
- 
-     def is_relative_to(self, other: str | PathLike[str]) -> bool:
-         try:
-diff --git a/tests/test_fileio.py b/tests/test_fileio.py
-index bcd7fe1d..ff9178e0 100644
---- a/tests/test_fileio.py
-+++ b/tests/test_fileio.py
-@@ -186,6 +186,15 @@ def test_as_uri(self) -> None:
-         else:
-             assert Path("/foo/bar").as_uri() == "file:///foo/bar"
- 
-+    @pytest.mark.skipif(
-+        sys.version_info < (3, 13),
-+        reason="Path.from_uri() is only available on Python 3.13+",
-+    )
-+    def test_from_uri(self) -> None:
-+        path = Path.from_uri("file:///foo/bar")
-+        assert isinstance(path, Path)
-+        assert path.as_uri() == "file:///foo/bar"
-+
-     async def test_cwd(self) -> None:
-         result = await Path.cwd()
-         assert isinstance(result, Path)
-@@ -269,6 +278,7 @@ async def test_is_mount(self) -> None:
-         assert not await Path("/gfobj4ewiotj").is_mount()
-         assert await Path("/").is_mount()
- 
-+    @pytest.mark.filterwarnings("ignore::DeprecationWarning")
-     def test_is_reserved(self) -> None:
-         expected_result = platform.system() == "Windows"
-         assert Path("nul").is_reserved() == expected_result
-@@ -339,6 +349,14 @@ def test_joinpath(self) -> None:
-         path = Path("/foo").joinpath("bar")
-         assert path == Path("/foo/bar")
- 
-+    @pytest.mark.skipif(
-+        sys.version_info < (3, 13),
-+        reason="Path.full_match() is only available on Python 3.13+",
-+    )
-+    def test_fullmatch(self) -> None:
-+        assert Path("/foo/bar").full_match("/foo/*")
-+        assert not Path("/foo/bar").full_match("/baz/*")
-+
-     def test_match(self) -> None:
-         assert Path("/foo/bar").match("/foo/*")
-         assert not Path("/foo/bar").match("/baz/*")
-
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 180c4cb266c4..0a201894dcb9 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,2 @@
-DIST astroid-3.2.4.gh.tar.gz 465788 BLAKE2B 745a860b7bacb45cb86e9b232fe3a37cdac40cb471b00832a7dd7da4c3374760749cebe8c8688748e750cc3639554515a7a9e24f5f4d2ebac10af2c906fa04a9 SHA512 e48289794f67cf53bb8a2dcf357c1e892140a0a625c2e19601cf5ad579aaa33a94f0e052915fa6e854bc0a2e626f41b2d13773aa2b2af2412efeb33d030ed2b6
-DIST astroid-3.3.2.gh.tar.gz 464183 BLAKE2B a891a57ce697e539b865ead8f1a1a42aa57962d1ac3cb39624f3c8cac1a233ce5ed207a87f6b8ef0b2fcacc296610819d5612262a6fbfe08eed20a2955b168c4 SHA512 dc9777e701f0bf3dc5367da8e7c79eeba18f485ad1425f8e3e50814efef9f8fd0e11f30363d1c602cfd05c51b2b2e9749989da1413db59c9f648fbc47cfbc8ae
-DIST astroid-3.3.3.gh.tar.gz 464883 BLAKE2B 0a0324619c15c0b5341f6b7d271b45a3d716814c5af35966cbc17dbd499196dc282b44e7a6e2904fac34d416343c79d2194f98f4811e16a2f7ee3365d759aa77 SHA512 a8f130bbf26d8cd3dd696bd6198e34f4e1585f11360acb068f95f26c4b72ec2187ce48533e3b00b4c1e3e33cbdc0a684999cc044f23de39f61111dc46781a1e6
 DIST astroid-3.3.4.gh.tar.gz 465703 BLAKE2B a6ee3a02196e1fe67177339c235aa43419459f9b82d98e0cdf681e24321bf77517074ed756693b6f8d66e167f6d567e01694cb9678b4f60857fc6cd80365104f SHA512 fd826d8d08f3031670959eb0ef27108c6df632d951d47e75ee870d866b80da37e3880bfc51843ec7cf0a6441d6f9a85a16757a6b0c777844dd7ee0445fb8ef76
 DIST astroid-3.3.5.gh.tar.gz 465885 BLAKE2B 64453a7b17aa1584083ca3c1fea4fdf8a236a1e0b80a66d8fe83a7201f2ef7c1cb362370648d61f766e8dc101c7797fbb7c5a2ab6f21e23da3830072e6a66c23 SHA512 323774d0853e8bebf5074eab3da3c29dfd2c04c96f222eb9a7fbe8da37544f7e6dceed8d0fd163591a2cd56a3d06ebf8ec33d23baeb921aa49cccb0f29cae426
diff --git a/dev-python/astroid/astroid-3.2.4.ebuild b/dev-python/astroid/astroid-3.2.4.ebuild
deleted file mode 100644
index 71595e1a3690..000000000000
--- a/dev-python/astroid/astroid-3.2.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
-	# https://github.com/pylint-dev/astroid/pull/2424 (rebased)
-	"${FILESDIR}/${PN}-3.2.2-py313.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.2.ebuild b/dev-python/astroid/astroid-3.3.2.ebuild
deleted file mode 100644
index c54d226aaea8..000000000000
--- a/dev-python/astroid/astroid-3.3.2.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.3.ebuild b/dev-python/astroid/astroid-3.3.3.ebuild
deleted file mode 100644
index f342635e39aa..000000000000
--- a/dev-python/astroid/astroid-3.3.3.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# dev-python/regex isn't available for pypy
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/regex[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# pydantic-2?
-		tests/brain/test_dataclasses.py::test_pydantic_field
-		# requires urllib3 with bundled six (skipped with urllib3>=2)
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-		# hangs
-		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
-		# TODO
-		tests/test_builder.py::BuilderTest::test_data_build_error_filename
-		# numpy-2 (https://github.com/pylint-dev/astroid/issues/2442)
-		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
-		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
-		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_transforms.py::TestTransforms::test_transform_aborted_if_recursion_limited
-			)
-			;;
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# changes in py3.13.0b4
-				# https://github.com/pylint-dev/astroid/issues/2478
-				tests/test_nodes.py::AsStringTest::test_f_strings
-				tests/test_nodes_lineno.py::TestLinenoColOffset::test_end_lineno_string
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/astroid/astroid-3.3.4.ebuild b/dev-python/astroid/astroid-3.3.4.ebuild
index f342635e39aa..c54d226aaea8 100644
--- a/dev-python/astroid/astroid-3.3.4.ebuild
+++ b/dev-python/astroid/astroid-3.3.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 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"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/astroid/files/astroid-3.2.2-py313.patch b/dev-python/astroid/files/astroid-3.2.2-py313.patch
deleted file mode 100644
index f8addfe9ef7c..000000000000
--- a/dev-python/astroid/files/astroid-3.2.2-py313.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/astroid/brain/brain_dataclasses.py b/astroid/brain/brain_dataclasses.py
-index 88a4385f..743dfe96 100644
---- a/astroid/brain/brain_dataclasses.py
-+++ b/astroid/brain/brain_dataclasses.py
-@@ -19,7 +19,7 @@ from typing import Literal, Tuple, Union
- 
- from astroid import bases, context, nodes
- from astroid.builder import parse
--from astroid.const import PY39_PLUS, PY310_PLUS
-+from astroid.const import PY39_PLUS, PY310_PLUS, PY313_PLUS
- from astroid.exceptions import AstroidSyntaxError, InferenceError, UseInferenceDefault
- from astroid.inference_tip import inference_tip
- from astroid.manager import AstroidManager
-@@ -503,6 +503,15 @@ def _looks_like_dataclass_field_call(
-     return inferred.name == FIELD_NAME and inferred.root().name in DATACLASS_MODULES
- 
- 
-+def _looks_like_dataclasses(node: nodes.Module) -> bool:
-+    return node.qname() == "dataclasses"
-+
-+
-+def _resolve_private_replace_to_public(node: nodes.Module) -> None:
-+    if "_replace" in node.locals:
-+        node.locals["replace"] = node.locals["_replace"]
-+
-+
- def _get_field_default(field_call: nodes.Call) -> _FieldDefaultReturn:
-     """Return a the default value of a field call, and the corresponding keyword
-     argument name.
-@@ -618,6 +627,13 @@ def _infer_instance_from_annotation(
- 
- 
- def register(manager: AstroidManager) -> None:
-+    if PY313_PLUS:
-+        manager.register_transform(
-+            nodes.Module,
-+            _resolve_private_replace_to_public,
-+            _looks_like_dataclasses,
-+        )
-+
-     manager.register_transform(
-         nodes.ClassDef, dataclass_transform, is_decorated_with_dataclass
-     )
-diff --git a/astroid/brain/brain_pathlib.py b/astroid/brain/brain_pathlib.py
-index 116cd2ee..d0f53132 100644
---- a/astroid/brain/brain_pathlib.py
-+++ b/astroid/brain/brain_pathlib.py
-@@ -8,6 +8,7 @@ from collections.abc import Iterator
- 
- from astroid import bases, context, inference_tip, nodes
- from astroid.builder import _extract_single_node
-+from astroid.const import PY313_PLUS
- from astroid.exceptions import InferenceError, UseInferenceDefault
- from astroid.manager import AstroidManager
- 
-@@ -27,10 +28,11 @@ def _looks_like_parents_subscript(node: nodes.Subscript) -> bool:
-         value = next(node.value.infer())
-     except (InferenceError, StopIteration):
-         return False
-+    parents = "builtins.tuple" if PY313_PLUS else "pathlib._PathParents"
-     return (
-         isinstance(value, bases.Instance)
-         and isinstance(value._proxied, nodes.ClassDef)
--        and value.qname() == "pathlib._PathParents"
-+        and value.qname() == parents
-     )
- 
- 
-diff --git a/astroid/brain/brain_typing.py b/astroid/brain/brain_typing.py
-index 9965abc2..7a7c7183 100644
---- a/astroid/brain/brain_typing.py
-+++ b/astroid/brain/brain_typing.py
-@@ -15,7 +15,7 @@ from typing import Final
- from astroid import context, extract_node, inference_tip
- from astroid.brain.helpers import register_module_extender
- from astroid.builder import AstroidBuilder, _extract_single_node
--from astroid.const import PY39_PLUS, PY312_PLUS
-+from astroid.const import PY39_PLUS, PY312_PLUS, PY313_PLUS
- from astroid.exceptions import (
-     AstroidSyntaxError,
-     AttributeInferenceError,
-@@ -168,6 +168,15 @@ def infer_typing_attr(
-         # If typing subscript belongs to an alias handle it separately.
-         raise UseInferenceDefault
- 
-+    if (
-+        PY313_PLUS
-+        and isinstance(value, FunctionDef)
-+        and value.qname() == "typing.Annotated"
-+    ):
-+        # typing.Annotated is a FunctionDef on 3.13+
-+        node._explicit_inference = lambda node, context: iter([value])
-+        return iter([value])
-+
-     if isinstance(value, ClassDef) and value.qname() in {
-         "typing.Generic",
-         "typing.Annotated",
-diff --git a/tests/brain/test_brain.py b/tests/brain/test_brain.py
-index b8bc84e3..78b6f8b3 100644
---- a/tests/brain/test_brain.py
-+++ b/tests/brain/test_brain.py
-@@ -647,7 +647,7 @@ class TypingBrain(unittest.TestCase):
- 
-     @test_utils.require_version(minver="3.9")
-     def test_typing_annotated_subscriptable(self):
--        """Test typing.Annotated is subscriptable with __class_getitem__"""
-+        """typing.Annotated is subscriptable with __class_getitem__ below 3.13."""
-         node = builder.extract_node(
-             """
-         import typing
-@@ -655,8 +655,13 @@ class TypingBrain(unittest.TestCase):
-         """
-         )
-         inferred = next(node.infer())
--        assert isinstance(inferred, nodes.ClassDef)
--        assert isinstance(inferred.getattr("__class_getitem__")[0], nodes.FunctionDef)
-+        if PY313_PLUS:
-+            assert isinstance(inferred, nodes.FunctionDef)
-+        else:
-+            assert isinstance(inferred, nodes.ClassDef)
-+            assert isinstance(
-+                inferred.getattr("__class_getitem__")[0], nodes.FunctionDef
-+            )
- 
-     def test_typing_generic_slots(self):
-         """Test slots for Generic subclass."""
-diff --git a/tests/brain/test_pathlib.py b/tests/brain/test_pathlib.py
-index d935d964..5aea8d37 100644
---- a/tests/brain/test_pathlib.py
-+++ b/tests/brain/test_pathlib.py
-@@ -5,7 +5,7 @@
- 
- import astroid
- from astroid import bases
--from astroid.const import PY310_PLUS
-+from astroid.const import PY310_PLUS, PY313_PLUS
- from astroid.util import Uninferable
- 
- 
-@@ -23,7 +23,10 @@ def test_inference_parents() -> None:
-     inferred = name_node.inferred()
-     assert len(inferred) == 1
-     assert isinstance(inferred[0], bases.Instance)
--    assert inferred[0].qname() == "pathlib._PathParents"
-+    if PY313_PLUS:
-+        assert inferred[0].qname() == "builtins.tuple"
-+    else:
-+        assert inferred[0].qname() == "pathlib._PathParents"
- 
- 
- def test_inference_parents_subscript_index() -> None:
-@@ -40,7 +43,10 @@ def test_inference_parents_subscript_index() -> None:
-     inferred = path.inferred()
-     assert len(inferred) == 1
-     assert isinstance(inferred[0], bases.Instance)
--    assert inferred[0].qname() == "pathlib.Path"
-+    if PY313_PLUS:
-+        assert inferred[0].qname() == "pathlib._local.Path"
-+    else:
-+        assert inferred[0].qname() == "pathlib.Path"
- 
- 
- def test_inference_parents_subscript_slice() -> None:
-diff --git a/tests/test_inference.py b/tests/test_inference.py
-index ec8fc71b..95f00821 100644
---- a/tests/test_inference.py
-+++ b/tests/test_inference.py
-@@ -4458,8 +4458,7 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
-         # and reraise it as a TypeError in Class.getitem
-         node = extract_node(
-             """
--        def test():
--            yield
-+        def test(): ...
-         test()
-         """
-         )
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index ebbc7a5d2c01..fe91158dc8fe 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,2 +1 @@
 DIST bandit-1.7.10.tar.gz 4228540 BLAKE2B ca1fdbd5061a635520500cb583b739d19335920eeb89661c7ddf2a2c3a97d3c55c2ce7797be984dd1dba2613a38d6b2e0bbcfde655f9d4ed76582ce831e4b42e SHA512 c9c5d098186a23f856f4bdecdebfe863f7ddce8627608b80c62a537416d2aa91666a95c304f5cdde43ff1a41e1f6a58b30dce1042159a1ea74b8b5c9a8ee381a
-DIST bandit-1.7.9.tar.gz 4225771 BLAKE2B e5d20fbf4c3a33b092c23ad356dad39543ccea4d552687b97350cb6fe960dfa004cbef627ee0e0911da147ed53c6eb57046ec57c76858c58e772bf81e2c2b82e SHA512 a71e3eb359fad952afc9e210795fb8cc6fe178305bb837e002af83eccc4a958664b69422ba93d7d72b24089ba3142667ca17909d712db1b447e78d6f7f4c9634
diff --git a/dev-python/bandit/bandit-1.7.10.ebuild b/dev-python/bandit/bandit-1.7.10.ebuild
index a7aca56d07fc..c96a49cf3c3e 100644
--- a/dev-python/bandit/bandit-1.7.10.ebuild
+++ b/dev-python/bandit/bandit-1.7.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/bandit/bandit-1.7.9.ebuild b/dev-python/bandit/bandit-1.7.9.ebuild
deleted file mode 100644
index c96a49cf3c3e..000000000000
--- a/dev-python/bandit/bandit-1.7.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A security linter from OpenStack Security"
-HOMEPAGE="
-	https://github.com/PyCQA/bandit/
-	https://pypi.org/project/bandit/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/GitPython-3.1.30[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	dev-python/rich[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/beautifulsoup4-4.8.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.9.4[${PYTHON_USEDEP}]
-		>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.3.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/beartype/beartype-0.19.0.ebuild b/dev-python/beartype/beartype-0.19.0.ebuild
index dbfd42ec8b38..af38db12056e 100644
--- a/dev-python/beartype/beartype-0.19.0.ebuild
+++ b/dev-python/beartype/beartype-0.19.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 90f5fe0c871d..6b8a2341e5c6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,3 +9,4 @@ DIST boto3-1.35.35.gh.tar.gz 870230 BLAKE2B 00f8272dc5f184ace7fd38921a1b131d2154
 DIST boto3-1.35.36.gh.tar.gz 870548 BLAKE2B b61e5f2ebbce178584d1b7d8e185c13f4536ad4615fdc242fc8ec1faeeeff4b95594c14f89c1b1cb2047fcc25f8b31c84a70b2fe056d10968ceeaaca08109a41 SHA512 a7ed7f87a5963cc6c6a52329765925afc9a7270b7cabf6f5f5aacc7ee42e031dba835f5d4f4aad1a5c06055b714b5ec1965986715ddf0b75994941962e25d460
 DIST boto3-1.35.37.gh.tar.gz 870622 BLAKE2B 488022f367677230defe90cdef0716fc1a2dfd97f5a60a24dd86e6c02bd487f9bb4b6aa14f12add60393598e5804a2ad72a774e4b6460c28eee54cf227c235f6 SHA512 77919ac52f928473a64ad71c6467a2d976a4c276535e6ada9ce2cab0c1f2a87baec5516cb4a5777bb4b5a10b1cf4102a417ebbf32170127a5def638e2dc163ac
 DIST boto3-1.35.38.gh.tar.gz 871729 BLAKE2B 6d0d8294abd2e4fad3698ef066356d77d4b177b0248a71617677e89ccc9c64ab83bf7752421a66713d639276d136029fc044bbfc2daf7c778c3dc5642c827085 SHA512 ade967cd3ead490a9168fa10d17cbf3916170a36cbae04e5dd82c380cccc02ec2cd7ef29be1603efe686c0d457e6f87c2f82bbe505eb6b26251c76693a069b19
+DIST boto3-1.35.39.gh.tar.gz 872172 BLAKE2B 1baad362b9bfcf68ea89c9ba9ea473fcf2451a71be8121a443830622114b3577ae83500aaa0cbef86115e24d276ffa5660fa6e9c08d2358fa493367405fc8dd4 SHA512 4244e71a3773d9abfa419c34220fa2c44c90a93b11b8338535582aee8fe9cd788672d6833ae97f1b32fb6479b9be97f1b2db953f24b403b07f2ee3153bc833aa
diff --git a/dev-python/boto3/boto3-1.35.24.ebuild b/dev-python/boto3/boto3-1.35.24.ebuild
index d91ce27598cf..3a10a36056b1 100644
--- a/dev-python/boto3/boto3-1.35.24.ebuild
+++ b/dev-python/boto3/boto3-1.35.24.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.39.ebuild b/dev-python/boto3/boto3-1.35.39.ebuild
new file mode 100644
index 000000000000..d91ce27598cf
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.39.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7ba66a074cbc..8ab2076e2a2e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,3 +9,4 @@ DIST botocore-1.35.35.gh.tar.gz 13440561 BLAKE2B 7dedca0fa7e492279f1bc138c7cd4d7
 DIST botocore-1.35.36.gh.tar.gz 13442036 BLAKE2B 44f999e07f8296295e0c9d90a268ef59ac2c3d5a0cf3049bc978a0000418908f876ece8f3ccc52c4b3826a305b76f932df227bbdee8cf144da5990f31afb8e16 SHA512 8c9894f32d26dbd38ddeee8b02ef5948404fcbf41601dd8c426940dade3a3ed6674778b1299a32e2a3c699676016de1d8df5aaa186452438d256256d38ae7286
 DIST botocore-1.35.37.gh.tar.gz 13441841 BLAKE2B 69b7f4981080b48632e44037988c90683e11d559ee9496a7f4930d7cb632ac6aedfdbcdca8ac56462ec19c65937c187ac6fa9a647d26c84ac09b3d79237cb294 SHA512 84a2240ca369060fa7837c95117bd91ce6c4914f8fd153da46a8c4f42bd7b5b837277624e22d350bc2bb476b57e355afb4545a46568ce3c6ad947592bcc55620
 DIST botocore-1.35.38.gh.tar.gz 13457067 BLAKE2B 15128282a46507fe3e57dd0949e4361875a5aad4af4cce4db457f7eb8683ba8c9e3f3c2422f535ad55cc17d9a7d9a5bd3a46d1c85b7866cf136eb4de46631799 SHA512 4374d7e8c67735a7bc5458a0b7d26b46e5271e3b25fed1de4846b3e201d223869b92558af479dae191b1a37580b7dc33a093990afc09f8920a605d178bff8a37
+DIST botocore-1.35.39.gh.tar.gz 13458607 BLAKE2B 631b16d9a4acf1a2c594318f20fb9755aebb5f4b390388e1c4348874948b08a8ae3b571378383fee55d9228983f89f334d208fedd2fbe3e233d9b546490ac204 SHA512 642e5c82c22c0186addcd527985132790a046f7388ab2d0fb5219476d610a65bec2d7a6e3b0123328601f91f570ae4050449b58d0ec61f5e4291abbd7407d12e
diff --git a/dev-python/botocore/botocore-1.35.24.ebuild b/dev-python/botocore/botocore-1.35.24.ebuild
index 2fce84c7e05c..57b33ea7cd1b 100644
--- a/dev-python/botocore/botocore-1.35.24.ebuild
+++ b/dev-python/botocore/botocore-1.35.24.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.39.ebuild b/dev-python/botocore/botocore-1.35.39.ebuild
new file mode 100644
index 000000000000..7816e9efeb52
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.39.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cattrs/cattrs-24.1.2.ebuild b/dev-python/cattrs/cattrs-24.1.2.ebuild
index c899d30a2744..fc9b819c53ca 100644
--- a/dev-python/cattrs/cattrs-24.1.2.ebuild
+++ b/dev-python/cattrs/cattrs-24.1.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 77f4b21b8440..9b75a99249dc 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1 +1,2 @@
 DIST cloudpickle-3.0.0.gh.tar.gz 59519 BLAKE2B 6d5c7b98990bb4d59ffc4e75efe109814430c8b73753d630b169ce0c455e5d5105782a314d4921b5051d458758980c954b8a84cf79a9534c9a382a8066d03c27 SHA512 e091cc0de2489c06e020fac2852d25f7fd832036a2b2c4c34f0cda0c642a1c65413fc0f21dc51fec75803e7c7da37f26f613620150acd9ab4aa2bb7b1eaabb79
+DIST cloudpickle-3.1.0.gh.tar.gz 62638 BLAKE2B f99e2c96aa60a98ed401c59d8bfb6fc18735cda685ce669747e50a28d19cf27bea6e863af42b8e93c28ee7ddd0a075359864b683fca356c74c425a13f9573833 SHA512 1ab356d394af43496ab426c58a33e087dc2c71da77a7e744f860115a40217bac9f16d10b9510543415f8b8c1799729c6a6bf0f4c6b4b5eb82fce7a25fabbfa1d
diff --git a/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild b/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild
new file mode 100644
index 000000000000..77e3e29dfe21
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-3.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://github.com/cloudpipe/cloudpickle/
+	https://pypi.org/project/cloudpickle/
+"
+SRC_URI="
+	https://github.com/cloudpipe/cloudpickle/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	epytest -s
+}
diff --git a/dev-python/cramjam/cramjam-2.8.4.ebuild b/dev-python/cramjam/cramjam-2.8.4.ebuild
index 72129575fa62..5b86ec922c46 100644
--- a/dev-python/cramjam/cramjam-2.8.4.ebuild
+++ b/dev-python/cramjam/cramjam-2.8.4.ebuild
@@ -131,7 +131,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~sparc ~x86"
 
 DEPEND="
 	app-arch/bzip2:=
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 714dca1dad1c..af69dd2ab5ae 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,3 +1,2 @@
-DIST emoji-2.12.1.gh.tar.gz 503707 BLAKE2B 75d81d99cbb5c89b3f63ccee57f20e13cae4b3d1bda5257c2f5382a6595d62c1159ecd51862b96ff6a5d9c920dfece6346d1ed36c2a6567d7c50eed69c5ac373 SHA512 98c1ecf986c7623122c9d101c82f7667d30b58b6e45c834f2644bae1659c67755dd9a4f025111b74508267861ad155131d4aefb8f951566f6950e64e7d3a3d24
 DIST emoji-2.13.2.gh.tar.gz 631138 BLAKE2B 8a4c1c98b2053623a10b71bd0a5a41e10687917e2120107c5e01ec75125a11b4f07dd0457186cb20b53c841e2bb04168f5ccef7577afcae474349072dec9ed48 SHA512 2d2962de896986f1f3ecab9d9e56e2aa5b47062214699285ca5e83ecd10b0c1ce3158ed4e1a6e3976c4f905ae207d351f67b4ff59bde279b5c85895610116bf6
 DIST emoji-2.14.0.gh.tar.gz 664189 BLAKE2B 1bde169cfb1d82d86cc2a5720036fdc44e2009880c21756bc48588f0e6b8e34a512309b0b01899717c49fc9dd6800344e182386e72d0824f120012a29941d8c2 SHA512 6e91a67702b42e246003feca13b24794faf55cbcbcc06c66ed7671f0407cf68ac66f8b076655b550c5b5ed7835d1c13ba680128fea8a656721780eac2fd9ea46
diff --git a/dev-python/emoji/emoji-2.12.1.ebuild b/dev-python/emoji/emoji-2.12.1.ebuild
deleted file mode 100644
index c2e4dc3a6087..000000000000
--- a/dev-python/emoji/emoji-2.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Emoji for Python"
-HOMEPAGE="
-	https://github.com/carpedm20/emoji/
-	https://pypi.org/project/emoji/
-"
-SRC_URI="
-	https://github.com/carpedm20/emoji/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/emoji/emoji-2.13.2.ebuild b/dev-python/emoji/emoji-2.13.2.ebuild
index 1119018dca4b..9ed71e72b74a 100644
--- a/dev-python/emoji/emoji-2.13.2.ebuild
+++ b/dev-python/emoji/emoji-2.13.2.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
index c48c6a133f1f..894ea82f77e4 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-74.1.3.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fonttools/fonttools-4.54.1.ebuild b/dev-python/fonttools/fonttools-4.54.1.ebuild
index 2b9bd3ce3dd4..23e75164fdaf 100644
--- a/dev-python/fonttools/fonttools-4.54.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.54.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD"
 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="+native-extensions"
 
 RDEPEND="
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 6bd992a2debd..6707d02eafe7 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.146.0.tar.gz 11690645 BLAKE2B 850f8b5b383ab8485b4b8aef77e94a18971498b51e1689aa707997931ba908e97e590681900beec42fc0f50adcbe8488657fbf0be0d8d5c6a55dc424a49ed86c SHA512 5789e69f1d279f8e53d40348af770aa03738853ebf19cfd4e50f23dca3412ca7d360993e4e00c4f0e654c65b3dbddfc2ffca069ebb26cc13b674bd622e90ae2a
 DIST google_api_python_client-2.147.0.tar.gz 11729279 BLAKE2B 319442376870b780cf9c42e6e9c7d25f5f2b4b1ecda33f3179773cb18c9c447748528e575dfd122cb5153870c7fc26900e092d24a9362deacb905fc6fa740205 SHA512 5a4abdfbaebfeee4c2ded84f19e1f5b4f888179964e76b7cc88c75b7dbe75c735d0a024f068a5fa8f0994b56671c94c60d9bd81648c123309e1c1087329b1a2f
 DIST google_api_python_client-2.148.0.tar.gz 11762466 BLAKE2B b075c0379896460e0550dfee3fdc015f1a31dc3e30387a5c5e231c6f4b7ec3b922e0e4f6ad56da4c37773a03e791725679f8e29e200c4c9b08321d8dd39186e6 SHA512 3dcad3530a46095979fcdbbffa97a74e48d2fc4cff35863c65f6d0994a7e92ad884f533f41ce3744fdcb4a5fe5fd61ba04eabeeb40e9dd7a826ac9c4ccdb8a60
 DIST google_api_python_client-2.149.0.tar.gz 11791789 BLAKE2B b4397d1e0a6b064b9c7aa7b4ada816a76871de089776f6aab4cc1f962171a427ecd1e4c1ba9e43455becaddd31cfa50082aa498a1443d2116f0acb678d221549 SHA512 3602a9d5f9fd5e00605a2b12114a81770662ac1ad168c65160d6c64340d8ea3f3da2765a5cc5959ef09f5b72725baa493a0686d976e3d22add49bb86b21626e7
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.146.0.ebuild
deleted file mode 100644
index 2727f2d53b96..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.146.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_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
-		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
index 595a1e3cbd88..2727f2d53b96 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.147.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/greenlet-3.1.1.ebuild b/dev-python/greenlet/greenlet-3.1.1.ebuild
index 3549748a736a..5d7df3a441c2 100644
--- a/dev-python/greenlet/greenlet-3.1.1.ebuild
+++ b/dev-python/greenlet/greenlet-3.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~m68k ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 -hppa ~m68k ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 01ab11e14c0b..a8826ae4243b 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,3 +1,2 @@
-DIST griffe-1.3.0.gh.tar.gz 383337 BLAKE2B e1908e68f812b9227f4ba7249a8f20ae1d75cac3237ca90c5f47adb51a8d0efcd31b016f30f9f9e0af2a2292b86cf5fb08d9314e72ca4282bd36cafce19030ac SHA512 839d0bb8fc36f5552d50721f72905d533849d9b7258ba1ed1eabc783dddc4aee87ea612605bd23268f4282c06e71e010e76dfebce0951ef92917abc80211e7d1
-DIST griffe-1.3.1.gh.tar.gz 383076 BLAKE2B e7bc85daa49531c17215ce64209db89c3e4c12fe7b20a7ba004ee696c1fa0307a1753c7663d455ac6562b226c6526725750c0b25c2e148af468431d1a38d8aad SHA512 45d44cc81ca3e108127470271f058dcfaa80702ed4e5d2610a9b4f6bb5e1e16052c9ae5c6a5b396b1cc8d6002b9cf3531cae611b15e7d54b1096d74b4bf04976
 DIST griffe-1.3.2.gh.tar.gz 383330 BLAKE2B ce96d0ce14dec7a48172758cb08331e07b36c436f953061aee375fbb7c4ad7fa01050b6a15335dae44d292c90ea5724c85abda9b4f8dd231e979ca1b8d2faa38 SHA512 098f78f95e89d22738ef5b8b6e91fffd7f0c48705492081aee0c072d2ac409f88bb7698ffbcbbfa9cd7627d081c441a8eafba3d261a81dba02a92e04ac80d7c0
+DIST griffe-1.4.1.gh.tar.gz 383674 BLAKE2B d85a7c7dcc1406d361bd13b7a356b79d02d00d3bf24bb21a4f279b537d1001263b61af959ad27be50422d4cf56d5b75db79150b6d9bebfc4191217b2b9e4b09b SHA512 cb6c498daa6bce724c1cfd008e3b6c5c17ada8027a9cee58705a64739b7d049773d13fe08c7519777cb0c4870619d2b51426c2cad1d87404c6487ac10a60d703
diff --git a/dev-python/griffe/griffe-1.3.1.ebuild b/dev-python/griffe/griffe-1.3.1.ebuild
deleted file mode 100644
index 06ef983f39dd..000000000000
--- a/dev-python/griffe/griffe-1.3.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Signature generator for Python programs"
-HOMEPAGE="
-	https://mkdocstrings.github.io/griffe/
-	https://github.com/mkdocstrings/griffe/
-	https://pypi.org/project/griffe/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-1.3.0.ebuild b/dev-python/griffe/griffe-1.4.1.ebuild
index 06ef983f39dd..06ef983f39dd 100644
--- a/dev-python/griffe/griffe-1.3.0.ebuild
+++ b/dev-python/griffe/griffe-1.4.1.ebuild
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index 753cf8843a03..8e3e2b3fd531 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,3 +1 @@
-DIST h5py-3.10.0-cython3.patch.xz 3868 BLAKE2B 3c0d952bdca5307ebf0bf878c26b94d0593bb89ac538a51017fb94e1e488bffc1583dcf4e713005b87d1b5e20d7b73043b24d65404faf60fb69515e598ca2133 SHA512 a0a0e3d1a9bccad1c89aa7efe3ba1e080eb70cae1f42f8de1021c212817970eaaa7070131e8e39859eea3c18d6c1243a17e7f53f2179f34ff6c406b315bab8fa
-DIST h5py-3.11.0.tar.gz 406519 BLAKE2B a5568c96290eee1f6da965174b6fa398f94e2e1825ec4ec50efd856b37ccf2bf634cfeb32101c7c53712fe9c68b0617774e9339a3f0d9373d3df24e6763a20cf SHA512 05d99093d5e7c280779b4167bd3594488dfc348b800da95c2275ddc8d77b4208fd1353942bf8863c4859d0208e8aa8bf84e628b3c5942eb947ecdcf0a7d19e88
 DIST h5py-3.12.1.tar.gz 411457 BLAKE2B c8e2bb453b9f7f1a79b9061ec3564bd8f1175c286a163b43f340cb9fc93f0e279131e4ed658066b870237046766aaff1289f22d84ee318108c96840d257baafa SHA512 a96dc5b7a14408c73db3ef758e0d3cff5d4469d6efe19a71af69e049f434aa62f01fbf44464cc5a3d15b89f00b9864cbb42b1b1e59bf3f520b458007f8819cd3
diff --git a/dev-python/h5py/h5py-3.11.0-r1.ebuild b/dev-python/h5py/h5py-3.11.0-r1.ebuild
deleted file mode 100644
index 8bf6f741039d..000000000000
--- a/dev-python/h5py/h5py-3.11.0-r1.ebuild
+++ /dev/null
@@ -1,62 +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_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="
-	https://www.h5py.org/
-	https://github.com/h5py/h5py/
-	https://pypi.org/project/h5py/
-"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.10.0-cython3.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-IUSE="examples"
-
-DEPEND="
-	>=dev-python/numpy-1.17.3:=[${PYTHON_USEDEP}]
-	>=sci-libs/hdf5-1.10.4:=[hl(+)]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-BDEPEND="
-	>=dev-python/cython-0.29.31[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.14.5[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	epytest -m "not mpi"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.12.1.ebuild b/dev-python/h5py/h5py-3.12.1.ebuild
index fe6a4e449e31..ba724a461237 100644
--- a/dev-python/h5py/h5py-3.12.1.ebuild
+++ b/dev-python/h5py/h5py-3.12.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 16872b0761f3..41bced058cfd 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,3 +1,2 @@
-DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
 DIST importlib_metadata-8.4.0.tar.gz 54320 BLAKE2B fc8912dd432e05c5ad82428f47b6265588d6b20c364321bea5ffb1653f2f9d6b2aff3d35b399d1d8237d328414bc77697bd4dcbd56611f39fd002779328c78b6 SHA512 97d904225f478bf9877a62e2d1a43dc88e2d9d74ac4488ddbdd2371066b08429d11e10a5a9bb484a93e86a01f13404b57e0350726c1c13c6cb1b2424970da2be
 DIST importlib_metadata-8.5.0.tar.gz 55304 BLAKE2B 801d7edaed5a42ef5c871830286e698620cd06cde43178c1ab65a5d35f6055fdd2a02b0f14bada94704a13a6708ea3091e634548e534df2df92d942c83192c3b SHA512 86ceb3ff408705565628b71a740a9e9123eee4b49e2ad029b9ee204548a78257dfefe9756194ce660939806f75983dd4b858dacd642b40fddc4188e699ef4e19
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild
deleted file mode 100644
index cba3aec75f8c..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-7.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="
-	https://github.com/python/importlib_metadata/
-	https://pypi.org/project/importlib-metadata/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/jsonpath-ng/Manifest b/dev-python/jsonpath-ng/Manifest
index 7d340c03496d..afef41f0bb4e 100644
--- a/dev-python/jsonpath-ng/Manifest
+++ b/dev-python/jsonpath-ng/Manifest
@@ -1 +1,2 @@
 DIST jsonpath-ng-1.6.1.tar.gz 36024 BLAKE2B ed6b47974e55c8bb5e086249c24d847dc0e1719d6912c0097bf6bcc06ad096f54b99f9c7053c088bb2efae4c612a49364cae3b061593890508e408b6776e73fb SHA512 84f4ceb3b2e76665b56df6c6cd9bf8c155d3677cc6b4798531bb35e95a591e98186c7fa756d400cbbde4c62acc7da077d0fdf989f5101846fb74bba83dd4be58
+DIST jsonpath-ng-1.7.0.tar.gz 37838 BLAKE2B fbd9a77e332eb691444f29f27de1f00f6bd68d2ba729e94940a55f13fe948d73d46f3b54dc3e1097165164aa011ee7f669ad01324031d869ca33f2da5dba5991 SHA512 91dfedeee3ff3eab7df318ca02572caeb03a70a02146e281d849c7263147269610a65d81738972c436b717cef18c3a10efe106cf013e651f7acaa5ef81d71705
diff --git a/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild b/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild
new file mode 100644
index 000000000000..f2f6c0f41003
--- /dev/null
+++ b/dev-python/jsonpath-ng/jsonpath-ng-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python JSONPath Next-Generation"
+HOMEPAGE="
+	https://github.com/h2non/jsonpath-ng/
+	https://pypi.org/project/jsonpath-ng/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ply[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/oslotest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 9b7bf0833ff9..4bed2cf09beb 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1 @@
-DIST keyring-24.3.1.tar.gz 60454 BLAKE2B cb0a9b82163febbbd737f2f25353bf96cbb7b8a87c7db00523960b3fce5595c6af65bc02b7d070b0fa5a466fc53530975de8f7a44ab9a9f783d2db34b1a67901 SHA512 53f26763175c7f1de041d8805062696ef3ef6c79792cdc75ae72621da8e729ac4cbb6e76937db2a0a5ce4bc41ab92c164d62e4627f92edab8c0d0fc02ca4980e
-DIST keyring-25.3.0.tar.gz 61495 BLAKE2B 3286c2de8a2113ccdace88c44f40adfebcd42d08cdcc314a2067ea9911e63a193b68947ccce106a521cf4e54b96887db4ba06a76dece536f72af608473ec5f1a SHA512 80f3be5990f18aced25d6f75a8ca2b2033930a6bc622d44ab8732dfdf17343bfc9a19e5818dd170ce5c8a528b87f911522ed94c0237ce8fb2f39f97b6ad2ceda
-DIST keyring-25.4.0.tar.gz 62307 BLAKE2B 0f1f6f72f7d844c5a45389b3c6d78459d8c308982c4e86bb7af8e524f758a1c26ad94886eb214f6318485022ee1c46df7060a2ba9d0d0163d68077efd0e2faba SHA512 ac971ab9317866cab85b9507f2b1016c6de6f8523a4c25e866ef2b06b31bd34cffd9f8dfe51c911a0ea791c80f3f40cb3493ae3d35f1ea46f74f1763ddf2f101
 DIST keyring-25.4.1.tar.gz 62491 BLAKE2B 48a808185c336493d13c4839346984084881824fc94f6842f7eb4d4a1adddc9b38fe57449e77ddfbf9cb3637c15e31492e9283d2060e7a5960638c9569d83890 SHA512 19df186202220a234ab3d7b3bdb2b31ffc78ccc9c569841a96876048d65d1f7ac5573028f3e6cbf31b598001edf592fa02e19bd036af2f5af9baa7d746175ee7
diff --git a/dev-python/keyring/keyring-24.3.1.ebuild b/dev-python/keyring/keyring-24.3.1.ebuild
deleted file mode 100644
index 0e14154b4de9..000000000000
--- a/dev-python/keyring/keyring-24.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# this test fails if importlib-metadata returns more than one
-	# entry, i.e. when keyring is installed already
-	tests/test_packaging.py::test_entry_point
-)
-
-EPYTEST_IGNORE=(
-	# apparently does not unlock the keyring properly
-	tests/backends/test_libsecret.py
-	# hangs
-	tests/backends/test_kwallet.py
-)
diff --git a/dev-python/keyring/keyring-25.3.0.ebuild b/dev-python/keyring/keyring-25.3.0.ebuild
deleted file mode 100644
index 1cf7dc849aa5..000000000000
--- a/dev-python/keyring/keyring-25.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.4.0.ebuild b/dev-python/keyring/keyring-25.4.0.ebuild
deleted file mode 100644
index d7a24b4590f7..000000000000
--- a/dev-python/keyring/keyring-25.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.4.1.ebuild b/dev-python/keyring/keyring-25.4.1.ebuild
index d7a24b4590f7..1cf7dc849aa5 100644
--- a/dev-python/keyring/keyring-25.4.1.ebuild
+++ b/dev-python/keyring/keyring-25.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/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 eb2586280d80..56733bbffc48 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/makefun/Manifest b/dev-python/makefun/Manifest
index a071e60a6dfc..17d61c05e65d 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,2 +1 @@
-DIST makefun-1.15.4.tar.gz 72160 BLAKE2B 361e598bf17c3e235934d65de48e638897dae9f93285269c39d97d1202506dd7e0c688b628d1811571fc259c39dbe345e8b269809c5079bf651a9ef09b681331 SHA512 eb6ed268137726ed306c7b118307ada365832d6f17a50da2804cc55708d114ad7e630ed4fdbd15a411d92ce601c4cc10d671d1ade7e270349009c10fd82618d7
 DIST makefun-1.15.6.tar.gz 72583 BLAKE2B 00cee1083a5c36d70e9e480af526ab2ee4f62ddc34a2320f6adb8be96a87ea13a8eac261b715c02311fc877d8a25f0779b891c41f1eb9cd4766eb25dc37a8393 SHA512 b495d28d838989cd67a219be1d4b8f3a1b5a03aeceb76c6445074d154b1b7c65a9bbc9ae8a3ee0aa6e991a9572f43ba93ed949bfccb97dc557250e4b735f0c2a
diff --git a/dev-python/makefun/makefun-1.15.4.ebuild b/dev-python/makefun/makefun-1.15.4.ebuild
deleted file mode 100644
index 939981e5655b..000000000000
--- a/dev-python/makefun/makefun-1.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Small library to dynamically create Python functions"
-HOMEPAGE="
-	https://pypi.org/project/makefun/
-	https://github.com/smarie/python-makefun/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/makefun/makefun-1.15.6.ebuild b/dev-python/makefun/makefun-1.15.6.ebuild
index 2b9ff2d7ac3d..939981e5655b 100644
--- a/dev-python/makefun/makefun-1.15.6.ebuild
+++ b/dev-python/makefun/makefun-1.15.6.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2168f0dd1a5e..004524011028 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,6 +1,3 @@
-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
-DIST mkdocs-material-9.5.37.gh.tar.gz 14792573 BLAKE2B c232f9212ed47da3524497705a5ad106aa486a0c79ef739bf586d561507f54a0487a609ea4662a7c83aeedc7264ac44f2571d88ac20baac622bab0f696b3a3e6 SHA512 6fb62d4d6e67c1219deebd6313f1c0f3abbadc7f3bc8d0d187ac5a52faf1535a3b0544da0617aa180cf454a6bec16b8ba04067364dba802fc0850ad2aedb3f13
 DIST mkdocs-material-9.5.38.gh.tar.gz 14793685 BLAKE2B 6dcfafc67fec3a257a5609bbfe1bf1e0ad246c48d063d94adc221b0cb9caaa3a83647637ecf70143ace738fb600d652315ac9f652bf3f57c0f2a3e01f95be5b4 SHA512 735de92d151df519f4950e0bb9e77e9055472bcb177ddab73ebc8339f4a8f8c8b6bc80a3c9402c3e95fad469f79d253883e538a6d7ec57cacb562150e0a50dea
 DIST mkdocs-material-9.5.39.gh.tar.gz 14799240 BLAKE2B 7dcc1ae2cc17c631e76810cb255b894b10c984b083d462b804f3054c3beefcc04b9780a0fa252961ebb5ee2bdb9753cb137e4e2e643edeb4aadcacb1c17bdb9b SHA512 ba698cf60db9f5b991a6193cdab42b6c13c5269fc2ff6bc985f90577e088f7182117b356d5c20a584b5ad56be4667c59f9098f7daddecf39dfd73008b88c2493
 DIST mkdocs-material-9.5.40.gh.tar.gz 14758053 BLAKE2B 26097bff4d0ab90548c0e7ddf2e6b06fdc6601b100a30074cb6702df763dbcc4585ca8dac6089e4682ed1cf8be76b01e9096a9bf880354297139eaece00d6568 SHA512 e43519a9a719311146470b9fe10be7227cae77c5ce8625aa04751ebca16ba0645bb93d367046816746bd7ddd11e42fe44d522a616d773d610089c415ff8d9f31
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
deleted file mode 100644
index b29d9c6ec471..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.35.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
deleted file mode 100644
index 30ab9a0405c7..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.36.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild
deleted file mode 100644
index 30ab9a0405c7..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.37.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
index 30ab9a0405c7..b29d9c6ec471 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.38.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/moto/moto-5.0.15.ebuild b/dev-python/moto/moto-5.0.15.ebuild
index 951f6d49b9c0..027b37149bd2 100644
--- a/dev-python/moto/moto-5.0.15.ebuild
+++ b/dev-python/moto/moto-5.0.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 7428d6361caa..c03edfc30b75 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,3 +1,4 @@
 DIST networkx-3.3.tar.gz 2126579 BLAKE2B 37d5d536e2564f9a219df70bb7f1b7c0717b99e9cdb7a4050aa321609a0ef34caecfda5a6ed8cb17f4d3b305b667adf8e40b58568dde8eb942d4a00b1ebdb255 SHA512 86306cabd7e15aa79cae4d84a42e8804b1e904fc2127725067a80e3ddf31f0fa72ebb9d21284018e72bdfc662c766a5be55564572aadaf7392dada7ea93d1ea4
+DIST networkx-3.4.1.tar.gz 2151310 BLAKE2B e61270372fc1a334a8d9484275a3da72e6f45c405b9e867efb67dc32b4a0fa8973b5ecaebf3eb7d978314252c5bd4096844bf1648337a53d051d99628c93ed08 SHA512 44ea25509398c837d9c90ee2a47c980eac3bf3efe2dbf83c8cad0952a9c4b7b08e9c5c7e41ac96f704ac6d38533efa7af449d39804c1eb3b78781bd3eaad47be
 DIST networkx-3.4.tar.gz 2151262 BLAKE2B 77bdc5262b173b7ce566c2d55e9180eb796f9f57eba0725e122d3dd51c62ad1bf6eb02e6f9daea592c3fe59ca17a7589b53089fdd069729bfff56aebfe536ca1 SHA512 f86957669256313af31d6743b29ad80b918a64084bb39fde077c151b886cbe1cf9b93c801e6d72f78ec9a15e790af462f463cdc56e785385dfde22f11bdf0bf7
 DIST networkx-3.4rc0.tar.gz 2146054 BLAKE2B 9a183740a97136c85c75c1f34c11a6a753c0b1fc418074bcb02388822ddd2b7f5a53fc8f3866736dfb9833a300cf2e5d0776cbdceefcabdf0470cc89e790948e SHA512 14f19e1e524b8e9dfa55ecab34fcbb426460e29633284ec62957abd143f54685ceae3993306f3beff3a33d3cb7f3e408be417971fde11c75827ef05d999dc5f0
diff --git a/dev-python/networkx/networkx-3.4.1.ebuild b/dev-python/networkx/networkx-3.4.1.ebuild
new file mode 100644
index 000000000000..b386d30100dd
--- /dev/null
+++ b/dev-python/networkx/networkx-3.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{10..13} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
+
+inherit distutils-r1 multiprocessing optfeature pypi virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/matplotlib-3.7[${PYTHON_USEDEP}]
+			>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.11.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/networkx/networkx/issues/5913 (bug #921958)
+			networkx/algorithms/approximation/tests/test_traveling_salesman.py::test_asadpour_tsp
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# virtx implies nonfatal
+	nonfatal epytest -p xdist -n "$(makeopts_jobs)" --dist=worksteal || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "sci-libs/gdal[python]"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index fd554af00240..4afd4e53fe5b 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,2 +1 @@
-DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
 DIST opt_einsum-3.4.0.tar.gz 63004 BLAKE2B ef9174bdcdacc5bdc2a132ee45cac4ebfb57eaf00bf23638254434fdfd9648244fea27e91fc984112b43088876b99119b174c1cc6d7dfacfa46febff1ad072c9 SHA512 1f1dda6a6994394db9ad8d48a1cd7a6200ce0c5f8aae06748a199b4e1aa70b60ad69448d3d332d97d41bd3c94420bb00a033d67b4a6b3c2373d6678fec5834a4
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild
deleted file mode 100644
index d581d281254e..000000000000
--- a/dev-python/opt-einsum/opt-einsum-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
-HOMEPAGE="
-	https://github.com/dgasmith/opt_einsum/
-	https://pypi.org/project/opt-einsum/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# ancient, broken version
-	rm versioneer.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
index 60d86d030a15..5f41ab253694 100644
--- a/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 6b3b7abe6995..f7dfb03ef739 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,3 +1 @@
-DIST python-phonenumbers-8.13.45.gh.tar.gz 4913395 BLAKE2B 78cf1a38dba34f4c989b39b676fcb0e78369a41cb7882fe59e48b9c36af9471082153a194ba75b72e7b25515eb0bcb7749eb0af78175f49c2933e17efc13c263 SHA512 28abdd0ae5f28b38c5279a850ee36812ddcd8eed6f57c9f1e816406c25896e6fdc547d7802ddd4b97a9253c3962946a8c17aa4c96e6a62823a9ae80c74a16024
-DIST python-phonenumbers-8.13.46.gh.tar.gz 4913455 BLAKE2B 1310c5e2c58d1f16c7df4d2e4beb4b9754f00b7adb630691ebe1600a9b4b4ccf4ddbf86c0660daef53bae03f98a79a6856f9e10976c7c69de616f1fdd5dd5241 SHA512 36d6611196e78b02d7c77d8fe1f99f4a02b5a13d1bf5f6d1eac751988ddbd239b28081fbd2b1c582e8ff2d58e792f765070d3cbb5392a9c095faf102ce8c51fb
 DIST python-phonenumbers-8.13.47.gh.tar.gz 4913983 BLAKE2B adf167f95ec4817c3adf92ffe4e0e2eab3ff99ce572023d47adc88b03e29414721ed6ed22f4029fb9e56d4f8cf8c5d9cf65e59209c6a4e5ae41e89d24df509e5 SHA512 a25ce93f79f7ec17b4dd3334b3912c8311c8ad0196e91f554c59b2f12b85f2c5936ec280bb2a5048c9ea8e274cdc632e42566153d87992db3601ddb8f93a0eaf
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.45.ebuild
deleted file mode 100644
index 38c93191bc76..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.45.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_{9,10,11,12,13} )
-
-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.46.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.46.ebuild
deleted file mode 100644
index 587f52b791b0..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.46.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_{9,10,11,12,13} )
-
-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.47.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
index 587f52b791b0..38c93191bc76 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.47.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.47.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/pipenv/Manifest b/dev-python/pipenv/Manifest
index 3a4818d0c72a..838f3c0022ce 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,2 +1 @@
-DIST pipenv-2024.0.1.gh.tar.gz 10805446 BLAKE2B d9fc964cc3a204bb45c299595c238e3d37368e53b39d8be0cdbcadcec3ca395adbb03bf7abaa7d5d729ed47443c40b908f74abbff475e4a99c7e6d4436f04ee8 SHA512 67acff8e4c40e18a60e824420752cd2e5633e50c138b64131ca19cce15e97a1e36b9e685b92fed7378eeccce8154d3d36701134854d60b0fbc47e341b18f945e
 DIST pipenv-2024.0.2.gh.tar.gz 10812462 BLAKE2B 450c8027b2720188edf284a2644a705a3004ee481553871781d8906f415af56ef87d6cdb5ebb00df96bd36fd4dce8dad29cfc2480d9afe3be6ed6891458c188d SHA512 a414727d6ce5a1af565870cb75dfd57731a0513b97c818f304654867b87cf3d89e857fed45a898d19acc37d272d32897f838328fcd7b780fb4ba3e235c77bbb5
diff --git a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild b/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
deleted file mode 100644
index 856b93730e8e..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-8.4.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.1.ebuild b/dev-python/pipenv/pipenv-2024.0.1.ebuild
deleted file mode 100644
index 110f296905dc..000000000000
--- a/dev-python/pipenv/pipenv-2024.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 multiprocessing
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="Python Development Workflow for Humans"
-HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
-SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-
-PATCHES=(
-	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
-	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
-)
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/click-didyoumean[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	dev-python/dparse[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
-	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
-	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
-	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-7.1.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/shellingham[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-# IMPORTANT: The following sed command patches the vendor direcotry
-# in the pipenv source. Attempts to simply bump the version of the
-# package without checking that it works is likely to fail
-# The vendored packages should eventually all be removed
-# see: https://bugs.gentoo.org/717666
-src_prepare() {
-	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
-
-	local pkgName
-	local jobs=$(makeopts_jobs)
-	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
-					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
-					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
-	for pkgName in ${packages[@]}; do
-		find ./ -type f -print0 | \
-			xargs --max-procs="${jobs}" --null \
-			sed --in-place \
-				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
-				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
-				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
-				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
-		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
-	done
-
-	distutils-r1_src_prepare
-
-	# remove vendored versions
-	for pkgName in ${packages[@]}; do
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
-		# package names can be foo-bar, their module will be however foo_bar
-		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
-	done
-
-	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
-
-	find ./ -type f -print0 | \
-		xargs --max-procs="${jobs}" --null \
-		sed --in-place \
-			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
-
-	# remove python ruaml yaml
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
-	sed --in-place -e \
-		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
-		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
-
-	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
-
-	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
-		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
-	done
-
-	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
-
-	rm -Rfv pipenv/vendor || die "Could not vendor"
-	rm -Rfv examples || die "Could not remove examples"
-	rm -Rfv docs || die "Could not remove docs"
-}
-
-python_test() {
-	epytest -m "not cli and not needs_internet" tests/unit/
-}
diff --git a/dev-python/pipenv/pipenv-2024.0.2.ebuild b/dev-python/pipenv/pipenv-2024.0.2.ebuild
index 856b93730e8e..069b56c276b4 100644
--- a/dev-python/pipenv/pipenv-2024.0.2.ebuild
+++ b/dev-python/pipenv/pipenv-2024.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 
 PATCHES=(
 	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
diff --git a/dev-python/plette/Manifest b/dev-python/plette/Manifest
index e759edbe3b56..28cf99af8c97 100644
--- a/dev-python/plette/Manifest
+++ b/dev-python/plette/Manifest
@@ -1,4 +1,2 @@
 DIST plette-0.4.4.gh.tar.gz 36359 BLAKE2B dc630b9e98db9a8f6047fe0bb31c2ab29d695745b59d457c9cac218922c0d578a474f80ddc419364fb8ef92c5952c5cea33ee571cce2d698015466edb738885a SHA512 c4342ce040966730d2eba638c718c1db9340051baa89238b99e64cf8ef734fe448f0aaeae224e9f6b51c9e38458e9caeb2c8d6abbd5db76249529aaee90ed5c0
-DIST plette-1.0.0.gh.tar.gz 54297 BLAKE2B 7ade29df8bfc20d5c98f5f3290acea2f5e884f71b13c0950373f41240de54f3ea672d16c0557fef2e1be25aef0da68d4a7449ebea2f206d92901d7f11f6cc2bb SHA512 72a3f270f76dbf32cb418628f1b24046111a46633603b07fd44fd4ed50d946653afaec070bce8e67a1ecff3ec8607f2476d3b25760c76726218873898bef97ed
-DIST plette-2.0.2.tar.gz 12905 BLAKE2B 48d8e50b24a2b61a12f798467ed443a7a043bd6efca7cb99ce35e5e05edb44af327e3a2e5bdfde0e6db4a4be527ab668edd6433c195fe4f72975170bcb6acbed SHA512 9f273af721b29b81ef8921fa9bf42856711242cef04372c5e1c632e907d889554beeb4d85c47cc9f2003984004dfa97a239643d9307389be9a6710dec26b5b28
 DIST plette-2.1.0.tar.gz 12908 BLAKE2B 7e710826374f12317d93cd7410006059ecffe82095ecb05f5e30d3b1db56802ce44fb31ac5ef9fd6c6a1a83578cd69ae87c324a470a532557eed69f8c73923ba SHA512 ce75385d958be6c0adc0e11a8431484a91eb7b7e237218b37e073411551813bfbad4872fe6f1b3d5980f9da5f0465c66de4e19646d11716079a6be67b2c138a5
diff --git a/dev-python/plette/plette-1.0.0.ebuild b/dev-python/plette/plette-1.0.0.ebuild
deleted file mode 100644
index 0e90820324e2..000000000000
--- a/dev-python/plette/plette-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Structured Pipfile and Pipfile.lock models"
-HOMEPAGE="
-	https://github.com/sarugaku/plette/
-	https://pypi.org/project/plette/
-"
-# pypi tarballs are missing test data
-SRC_URI="
-	https://github.com/sarugaku/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	dev-python/cerberus[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/plette/plette-2.0.2.ebuild b/dev-python/plette/plette-2.0.2.ebuild
deleted file mode 100644
index 773cd878e2a7..000000000000
--- a/dev-python/plette/plette-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Structured Pipfile and Pipfile.lock models"
-HOMEPAGE="
-	https://github.com/sarugaku/plette/
-	https://pypi.org/project/plette/
-"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	dev-python/cerberus[${PYTHON_USEDEP}]
-	dev-python/tomlkit[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
index cbbecc195bf1..cfe71f9123a2 100644
--- a/dev-python/prometheus-client/Manifest
+++ b/dev-python/prometheus-client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.20.0.tar.gz 78278 BLAKE2B ae7dea79a2c4f7b6870da9f749e9be09c353e062e744beb98538eba45d0394ef2ce5b99a696e40620b38ea228711dff30a2a571d09d7e1b4a3d75ca713938f92 SHA512 9e5aed628b052790af8954eee7914b6480226368229bb0dade2f8c3f88ab04971d2a8a55558fd7dbb125894f30cea56363cc670deb0aa6822f31562437031fb2
 DIST prometheus_client-0.21.0.tar.gz 78634 BLAKE2B 878c6b3948ebb45fced9ceb24ef5ebb07b2538117712dc2b0a6365282fa1bd0e732f5c79bf496aa54386cc42ced458202b1537c6706e3906a6c48d71a3709437 SHA512 ad86e7d7eb1919bda77c5fe80e800721c6d93f8b849955903ec346c2c6d35130f7e179b470c261aba3d8aa2f2cb10c43dcc5e8c06024dcd79fac5818b87f76c5
diff --git a/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild
deleted file mode 100644
index 977cea0c5359..000000000000
--- a/dev-python/prometheus-client/prometheus-client-0.20.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="
-	https://github.com/prometheus/client_python/
-	https://pypi.org/project/prometheus-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# optional tests, broken with >=dev-python/asgiref-3.8
-		tests/test_asgi.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
index 17cec18787e0..977cea0c5359 100644
--- a/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
+++ b/dev-python/prometheus-client/prometheus-client-0.21.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index 263ca65043eb..e18c78a9a8ed 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,2 +1 @@
-DIST prompt_toolkit-3.0.47.tar.gz 425859 BLAKE2B fa12151c48126c971b2dc468a6e1de4ede49ade08f637e9c02d2284f74f07cbcf4d3167447e616af3385eef0355f8928bfc50632f0cf61138320d7e75777c07e SHA512 c27dc03929f0bd373e41bf70e19f82f97c8f0a6308e51e079e89d6233f1e638c34703cc056fe8c86cc9b63f91b5d345c28ce0e418f79f6e450ca06bcda5820fd
 DIST prompt_toolkit-3.0.48.tar.gz 424684 BLAKE2B 2b22cebfaf66c07bf9e2ba2677be4c36436c0b5679e01cf39b7335f1898e33f7bb5b4f3a147a39feca37bd3921b8cbe8db98c948d2819c0e7269cca5e2b71d26 SHA512 f999c0d6df94a1a640d735e4b6f4bebd496693b8ae7267c4a8561c726a8148f937781b07f8e76a045ac0b90fa1d98fb767c153c3a96e25bc5e610c873f8e76c3
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild
deleted file mode 100644
index a36bd416e9ca..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.47.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
-	https://pypi.org/project/prompt-toolkit/
-	https://github.com/prompt-toolkit/python-prompt-toolkit/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires tree-sitter-languages
-	src/prompt_toolkit/lexers/tree_sitter_test.py
-)
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
index 36122f11a7f7..a36bd416e9ca 100644
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.48.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index 7b20de33cf1a..ad56c73bcedd 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,2 +1 @@
-DIST puremagic-1.27.gh.tar.gz 311630 BLAKE2B f2856a138600ae8d9592870080c04ca15b2eefbb774f1156f52327d6a0fe26f419ade498a8ee08c02b0f09f4ea6427ce595de8b478d2e17fd00f5f7263364051 SHA512 56365dc122160d306704290a054afa7be5007ca3634275fab168e1ea8bc29356477c5455abba3d84c9e229dc9ce3a21df58ed7e6ff216fe0c60d7257e4b02584
 DIST puremagic-1.28.gh.tar.gz 315168 BLAKE2B 8102fc7a2fb2ecffc3b38d90ca4ca848c78f8989eb43bb74c5ecab3388238c9ee6285b8423ca0b999ea22462a150d5ecd5e59450edc136d666e8f68bf272d0eb SHA512 8a9d04b34d32a552fa51de1c720556d46c2aef99913d9c339838a682e8758ba16c66bcd4d205fe59dd6ae7cd27c311b24638a4084baf7a27869e5304e4994d27
diff --git a/dev-python/puremagic/puremagic-1.27.ebuild b/dev-python/puremagic/puremagic-1.27.ebuild
deleted file mode 100644
index 6c16c0c8bc8f..000000000000
--- a/dev-python/puremagic/puremagic-1.27.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/puremagic/puremagic-1.28.ebuild b/dev-python/puremagic/puremagic-1.28.ebuild
index d8bf38091db5..6c16c0c8bc8f 100644
--- a/dev-python/puremagic/puremagic-1.28.ebuild
+++ b/dev-python/puremagic/puremagic-1.28.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DOCS=( CHANGELOG.md README.rst )
 
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index 4178c970452f..2c5c82004b8f 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -72,21 +72,27 @@ DIST pydantic_core-2.18.4.tar.gz 385098 BLAKE2B 6bea502397c327f38a000e9ea3b59b7d
 DIST pydantic_core-2.20.1.tar.gz 388371 BLAKE2B d8c66cddd93fe4a56a901e5f06fe86c0c87b11397567e5400bf89e5884e13c98d37bbdc42ccd0bdd67c552370c17ed26d9a7897303544a816022d8a47ee8bc18 SHA512 fb5362a07282a54be9cbcf0773b5492dc1773c71d96979586885d920d794b13860a32a8165e7b5e023f9f0f7a3c85aa5098dc66d6626d5d290d3ab63fa70453f
 DIST pydantic_core-2.23.4.tar.gz 402156 BLAKE2B af899e149693907542296b5b4fa5f982d2dca5c090331703212aabbbce0a8e0badca3947affa9e42998949ebd18b1ffc2ad9904b47e130bbe7e90150c32bc527 SHA512 c7c9a303ff3c751108622f804f812f3793ad93a95e560b0d6b0a866c3bd41ed7bfdbcd87483f37ad3849969c72adde24083d1a9015ebd610847a7fa6d4068e24
 DIST pydantic_core-2.24.0.tar.gz 405714 BLAKE2B 4ce0a27cd35d6fa41adfe34734b73851733ca5f02971efdcc3b22f97736422dcb4c71dd743a79a61cd2b0545aaf23e2868629534728e8019ab4fc5b3033e2a05 SHA512 fef249007a61fc585f6ebeb9cab7922b33770969c1afba70cae4deb406009125664a0b3347b14198f7d0c3611287e68ee4ad41ed70a065ca66c93c90ff5f4787
+DIST pydantic_core-2.24.1.tar.gz 406309 BLAKE2B d87fb47c5e90709cc37dff510ba9f57aa2a6ffd23eb82c9c033cd5fd44304cc93fc0c4059038296b9de342943e7d1ebe002f9760b0c226c4ad2d71feb04e89cd SHA512 e893138e658f8b3363027b34e9089da46747c382dcc5b814a89cd48e1e2fe7a4c68ee0931b51f2d4dc907a4dd6be1cd8da84881db715646a76f3cf20ab49b490
 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-0.22.0.crate 535742 BLAKE2B 772a4f8b718bbec32faa3dac4cad07a5b452fb366280753c3316d932663bf367192483fb5cd0bd405321128e67157b982eaa89264685739a141e021f0f7e2b72 SHA512 44e0237fd3a8d4c7b082c48a5c8a52d8f4cc4673d134f680e29504bb46d870015fa210da34de4c1998defbcd4afdf2aaea4e148fbe093e4b2c8b0d064cd48da4
 DIST pyo3-0.22.2.crate 538342 BLAKE2B faf347695117f9fe0ebe5cd7f6aa1b0dcfe718343875d6c06438046deccc1075f104d2a2413dcda41ae9827bc363aa147057b45968f6634f577a6a4510a4bb8e SHA512 e8bae09059f50ffe477dad44499cedeaf3a734665f0fd8e8bd4b44f48578d21e4bdb8d55ceea00c5a27da750761842ddf89cfcecdecb2e7a4a17ab192259be9c
+DIST pyo3-0.22.3.crate 542516 BLAKE2B 26607f4455a58ea704cc2d01dfe3857147e03ff891ab0aadab73c7eef2ecb4445097b369d8986c18bdd5efa3ba767b9f41411d5a8f10d6d06851634d07d42642 SHA512 17940627701b0d3c401ccb4221241e7bc727d2b89cc26bbb231aec597cda1c04f07d4315b617d4e9f85623a6fff0031f83c6b7afcaf442c50e694785b07022ad
 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-build-config-0.22.0.crate 31205 BLAKE2B 6b9a0de5f431bfc123628c67da040e146e39353d7b42d8d083e1911929dc420622f8a1276229d89b7780bccd02a8e653bcb85bfa51281e72ddfacebadef5277a SHA512 50341f4e5134a275610a5b86e833d1963a0726c2ddc14f4742053c60ad336ee209e73441aca46c8670920ee47a81c76bbd3f9e6412d253a5b389692ff8f3c1f3
 DIST pyo3-build-config-0.22.2.crate 31225 BLAKE2B c2e6a3d3d23b7f2f51bcbf1214ab20a298a1e62f85c9af3dab1e77b09f20b657b576feefffb18eb49d438f0ffab525b6bcd1086d500601c327ffd4fd24a719ee SHA512 644c82d30bb27051557efcc9789a81380a64e29bc62abf97de88f42c3791dac74228c7a7d09e0d46d14f07c0475f0bc03fac6ed1367b9a616153e8820b94cbc8
+DIST pyo3-build-config-0.22.3.crate 31297 BLAKE2B dbac8f03e96ba1bfef9b31b3e28e7f81a79f24a9596ae786f602633dc18dbccb583380d324e3e2ccdc2909c57a23d1e488f300ac123c7f8309e052fc97c9fe28 SHA512 42265d570b07b23603783903181c49c4a8bfef1a67055510d9c8c9a504c8e0435b8bae9a352740be791c5562e0abdc48f97ea1d7c03cfc270e821e643dbadea2
 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
 DIST pyo3-ffi-0.22.0.crate 67420 BLAKE2B 65e4ed1a1ce854f37380aa23637a494226b98941b9e3f13eae8f627db0fea248c3cc93c7e594090407ab169cfdb27ab20c47f7004f2b4646103ee34da9a55f31 SHA512 cede32dc8025badcdd6d00b4a1204c6ceb5ad30fa0b637deecca669f2ee2b8961f88d9d867caa8cae59f498dc4e1c15f3b4049c5f47615e215b0f289fc560bce
 DIST pyo3-ffi-0.22.2.crate 67749 BLAKE2B 0a4357d5f4fbcab9717d58b7a80b63a63bc329267d4725136c4eac7c0101095a50e5f840638dde79034e5df99c4f46664cfdc2ad437837643db5d475c5705cb3 SHA512 bf8b83b4790832d99de8c6a61a15a43fc189505dd843011933305f7f93c4f5f4849fb00cc2a6fa410b788645f8ed8c0df61799cf801966a925abb9756b1ab579
+DIST pyo3-ffi-0.22.3.crate 69099 BLAKE2B c085c9485f585ab8c2a636385dcf90dc70fe854285b223a298283803c98ff21d3c3623a2cc8a00b61950ac07c123efa7c244d4c924eb0945b4a6c6023cd7e4d5 SHA512 f964b6b0ed17f968a06106f5396a23c5162f66bcf36e897ecf7b37cbd059f28093400c602b51d9a28dfdcfc8af6ff21c4fd68c6627b049a319c85096bf6024cd
 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-0.22.0.crate 7889 BLAKE2B 0b61caaed415023341dfd675c578e39cc3e5b2a08eb8c439857c81cf6cb895837f5df28decd7c08a3aa365411ff33a97eb5fe2f20e18427bda133f7df53349ba SHA512 ed9e9d6322fb8d3fd11114899c3ad84ebbc5b5eba58e5aabfc7f9691f02ec053f1c2804cea93d21f2ac9332f5b719b7fee9878faa95f21eb2a2d86f9050c7339
 DIST pyo3-macros-0.22.2.crate 8136 BLAKE2B 9dc97d2f60581db1b8ddb562dac917069525f297fe2cbb9aff3ed34d5a08ea43c112c9c7a450539da3536d753778b5ca506dd1b18e1d6b8a3649fc098e7af439 SHA512 f4f4f6af8dc3aa4bcc1698661990ab2112391ef9502e9f71d86e35bd10dc4e1be309102ebb1b7b32751817a6033168dc0486fdb16b35c626101e69f0de807a4a
+DIST pyo3-macros-0.22.3.crate 8183 BLAKE2B 5ef8297c67f2910580caa349951580b4d962329f1324eb3a53ef946cc5f41ffe10f4af1d7184904621cd0f318a94618af43cf785f3a3ef57fc4747c47db02820 SHA512 c0ad8480ef7f7ac5287a3bbd363136c63668b2cb77f475d5a6cd5921aa9dcf0336baf6a464b4d2a0068fb21724184785faa79d75b588f90359e8aa250a17e85f
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST pyo3-macros-backend-0.22.0.crate 64837 BLAKE2B 4961b8c8720bfc2bbd11089a658d64cb2b1e43e150e622d53490faec3b905344d256b2092238ebb1dd92290583ee7d04a12eb5759bd55276e7042e1c948c71bd SHA512 09496c7285b9faaad820cfea237ef602569de3adeaa3362727182b0cd1c8377ef55c0c28f14eb703ea73a86c94acbdfb1384b44ef32b318a76c730a0430ca233
 DIST pyo3-macros-backend-0.22.2.crate 65620 BLAKE2B 37fba9ff384373418d3a7341acafb8e33308a64e30026f828693a37c32ab4a74d058f2db84d00467a20f9f267c96fe54c0f154d1ebbae92490e8dfc0d29c042f SHA512 0517080c0d5d4ed8136521fd37aa3a192c2eb8cab58545d8543ee4df9cd0dcea19fe0678d5ab90f05fe3eb0f4a86fc2f07b76f2e12ac1fcf7e7c195c2ffa4fd8
+DIST pyo3-macros-backend-0.22.3.crate 66032 BLAKE2B 33c2e8cae9b44e4a4806833f780e03f553ef0e6dbac733e9232e406fb64757691fbdfb65fd864280e14e8af8a4bb9c485a3c02227e8d1286ce11f1d4dbd61c28 SHA512 7b52977e02aca9bf4754d60957e69d47f9f447fe8bda40f146bbbd31eb7ebf2fc01c600c9b279f97cdf203e2cc66d96c1617c08041bc1215a02a80a90244417c
 DIST python3-dll-a-0.2.10.crate 74573 BLAKE2B 770c5b070f4dd1b9639b8aff59bb733575eb1117ae8e510818b6e13bdc69b22bcad395bb5cf0d1931de3562775a56e1404bb7fca7384b62e5e782e6284fa1494 SHA512 c1171c29f6914ff809950a9f6c330638e72c58c7c691bf4d9e765dee47166915cc91131b494b65aeb3a812543690c5072f2f5ff32cdebb76ba588330f9c74cdb
 DIST python3-dll-a-0.2.9.crate 66092 BLAKE2B 2c4baa31df7f55da8f1c6073525b4498bae7207ee38ef0eba4dbe58088609937a7d7b851c603ae62e5eb5361881e67a05d8c112d0a76aba5d99b13cdccd59d59 SHA512 1914d3ce67284f13551a4efefaeb9c11138fcca3d5082746282f64b7a36f732c6834766d981f27d862a61410eed09b3d281e0cab8cc1a46d424d04823ffaee35
 DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2
@@ -96,10 +102,13 @@ DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87
 DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b
 DIST regex-1.10.5.crate 253805 BLAKE2B 9f5418b577209051640c3614a98b15604a1e71144763a6f00caa7757f0ff67fd833a7d14fe9d6acef96386a2a4eb60cf5d490472e73fd62ca8bb0e78d4f9f125 SHA512 177fddb001e14281510e34070f88f8e5167278a46f1d93d9286d9606b7673346f504e4064d7ad53558e6988a400c728e33b663ab398fee12ae23fba7158da5fb
 DIST regex-1.10.6.crate 253894 BLAKE2B 176cf6a1e86aa8a5004af5ab0d6cd4178135bdae3caeb6a8276b8739858c65e9ebcf23749398a5a91adcfee9cca3667b306c4adb6307acfe61dadba8c6f3eee4 SHA512 ec28961d226c944321d9953c42e43cf2d23b8ca0d72d6412e7b0f572c407aceb079bb82502d124af94d71d67c9e5e0c9f66ab9f31edf6023ff045ec37b770964
+DIST regex-1.11.0.crate 254059 BLAKE2B 9450e54b522c3f12e4f1d814025c3037f8373b9e1feaf2028756b573335cb7f22400b0925e3ceb0716d72aeb19b02b4bcf70b0b435a0252d0d52a7028d95308c SHA512 16c066664ae87497f9880a52222301fb0d44053ae2d6861ea21dc59cab82bd1ab8ac407f9e77228a21a586ee745b02f9eb10e7b9b30df2f3aad73633270bf73d
 DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611
 DIST regex-automata-0.4.7.crate 617582 BLAKE2B 6295d866706b623b2025fdc0c407086fec15053229d708713d0ec165bd526ba25e7468d0009625cbbbc21d20345f0af2eea10addf6de633e8e6a02dddced67b8 SHA512 b19d00d64bb8cd833cfb35fabb162b9481716f4b7f6035c1c8f1de4e0f90e00823d006e057aa3505aeda48c9e1802e61173c4a2878891129a3a918727e43b0d3
+DIST regex-automata-0.4.8.crate 617784 BLAKE2B 7535c79f6ddf1b1225e21171921594dcf32fc3afd47519d2067b2047b19070cb7e6fdfd1563b884fec6f91dd568522fc95d85bf095c11f8c02daeac128c45020 SHA512 278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f
 DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
 DIST regex-syntax-0.8.4.crate 347577 BLAKE2B 400323cdad2a7daa8d4006e4dd7a7b1234704df0f80ca0f4bb19447f8f1d270053bc8aa613e48291ab3a78c7eb02d7afec57bfc8d966a48b372a4c80de9b120c SHA512 10719c138d9aa304106fcbf77da0b01645d1b6fbc621abb639dbd43ed5fc3dbd22aaad8b86df55a60e7b2b4fc347b6f41419131d7b047273e146073250d892ed
+DIST regex-syntax-0.8.5.crate 357541 BLAKE2B fc6d125f7a8574c37d81c75cbfd447cbcff736f2d9991b19814ffc1a414ebc5b76e84fb8fd36c983b38e8e391d165cdd9047832b0d9100f0e1ba7085484b7db5 SHA512 549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8
 DIST rustversion-1.0.13.crate 17267 BLAKE2B f2cc10a9d998b95bedaecb60298b11637724058634b00844d7e3e77dc321d8c7578bab9a9362b94c6b4b30558df538578fe7a4a05a130fb16795e913b3fda8bf SHA512 4705face9c4e2570c6a7c8bd61ccfe1ce68bcc7bd11dcbb9e7321744de38277d1f66429b59498adad3cbfc25de68dbf194c2d244ab74003830ba5fcda47e621a
 DIST rustversion-1.0.17.crate 17621 BLAKE2B 1f077ca6fd90333724d1ea9df7f5b178f37f895b71a7b2814e9ba8618bffcd2307f9cb4ac2eea25d461a6686a4b5b51eebb80f1b1ccc773d4da1948c47fe8abe SHA512 0565cddecaedae17e7cd99bc34f54cda242d4c29cd4269f8e3b178ff91d49f3682e7ffe66e436bbb138299736c8e55cc143fefb74c076911fefcc41ba98064f3
 DIST ryu-1.0.14.crate 46861 BLAKE2B 208fa87e54e3c6831193ddefcdfa7e9731a3b72de6ea23a4af708a15487cf4d6cbc49fd3681da078390741595ff5d44b02e607cab6ea9e37e7f5f05c7275b4a9 SHA512 9832c760d1ac674ba362639968962928971231d696e450738045ca36ae2780116ad865b2bdd96e36f14d8f92e12107dc8b75be90c74d76e3bb834a94bd6e5599
@@ -107,8 +116,10 @@ DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
 DIST serde-1.0.209.crate 78364 BLAKE2B f6b4c2bd931a8067482ca033211c4e85c0dfd6084cb599c38a9ba666cce30489685a3a6a8a539eb6e41141a52328943dccbfe25dbd857af16665094fdf7c3f45 SHA512 25d2236eedc08fa3b9d078a1971df705c4f428b7a4e6a2d28d9f0f9893c19de745bffffe3fa9f3c08074bf4359aaf09cc28770e4b14c21c66d6a0b9411738f7b
+DIST serde-1.0.210.crate 78338 BLAKE2B b3621d1313312177a346313e6e384fe9660f74eefb18e6cffa39fc2aadc0ab73be84b9037c59b716e5feafcd73f4f054f83e6d17d82746984b3064bf8d3ed338 SHA512 0d853ca51543ae8b4a0c70204ff4e559a4eec77af3d3bdcfc75c5905c80d4ffd1bd9eb8258ea4f6ecfbdd26477ecac7dd698d84d86759fa32e03a9cce02fa4ae
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
 DIST serde_derive-1.0.209.crate 56023 BLAKE2B 752bc9f46b880d0ed8a4f7e29ffde1343c63c4be1e9740afb1a28dcbff5bedfe077eb51c7052adecfbdbd9942c30b63a27914deb6401a2ecaf70fef0f64cd80a SHA512 22c4eb76412bd73814d0b86209b110b9e59626f64b41cbc250755144e545ff30fa69972ac93d74f988a3a6a239d9138f4e8a23b283c746a0aa5fcddfbe077cd6
+DIST serde_derive-1.0.210.crate 56020 BLAKE2B b346e574c99b6a8b12dfc29b20a4fd2daf8abfabd3714ccfde059a3a1f14a5628d4acf6a03f8076174fd28adfdb7cb9bbdb8ac0d4403aa2f43e917eed4b08028 SHA512 1c54d70a55007c00d3ff3d8c2096f4f9966431ba7bfd9195bcf41932de71b71c4ab934f9a8c5067cb56a042742cf0efab07377dbabf12feb1af6d20399de00b5
 DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
 DIST serde_json-1.0.118.crate 146962 BLAKE2B b85f17cbef0cb9fcc8af5d8d18a74850804de631f8ac94193bdb0ff8c95d4c8507876e4802005e0bc8fc4745d52c79be153d825e106090b680b620acc5b1add4 SHA512 1fa7e01d849684e3ed6f9bd67ba9862f822dcecdcb9110a43182367225f559416f855d59f2b8bd943756957932710b930244963a1f47a3d7d530be19dd412f20
 DIST serde_json-1.0.128.crate 149520 BLAKE2B 246eb865f64a0f161b79f3d4f783dbadbc930c4a19edb6c0fe8f0c6145c7c47be4b692d3e084b1b500820ece8e94214820978cf898926dd805bd431fb411bbc9 SHA512 9e6290d3a6a971b3c37bbc97097b8179e64c655779b43c7b75303a35ef7030f5401b3a5f62cbc95a7bd5f42ecbefb0b469234d78a76c8c1597726d8e08908a7d
diff --git a/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild b/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild
new file mode 100644
index 000000000000..147abc429b09
--- /dev/null
+++ b/dev-python/pydantic-core/pydantic-core-2.24.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+CRATES="
+	ahash@0.8.11
+	aho-corasick@1.1.3
+	autocfg@1.3.0
+	base64@0.22.1
+	bitvec@1.0.1
+	cc@1.0.101
+	cfg-if@1.0.0
+	displaydoc@0.2.5
+	enum_dispatch@0.3.13
+	equivalent@1.0.1
+	form_urlencoded@1.2.1
+	funty@2.0.0
+	getrandom@0.2.15
+	hashbrown@0.14.5
+	heck@0.5.0
+	hex@0.4.3
+	icu_collections@1.5.0
+	icu_locid@1.5.0
+	icu_locid_transform@1.5.0
+	icu_locid_transform_data@1.5.0
+	icu_normalizer@1.5.0
+	icu_normalizer_data@1.5.0
+	icu_properties@1.5.1
+	icu_properties_data@1.5.0
+	icu_provider@1.5.0
+	icu_provider_macros@1.5.0
+	idna@0.5.0
+	idna@1.0.2
+	indexmap@2.2.6
+	indoc@2.0.5
+	itoa@1.0.11
+	jiter@0.5.0
+	lexical-parse-float@0.8.5
+	lexical-parse-integer@0.8.6
+	lexical-util@0.8.5
+	libc@0.2.155
+	litemap@0.7.3
+	memchr@2.7.4
+	memoffset@0.9.1
+	num-bigint@0.4.6
+	num-integer@0.1.46
+	num-traits@0.2.19
+	once_cell@1.19.0
+	percent-encoding@2.3.1
+	portable-atomic@1.6.0
+	proc-macro2@1.0.86
+	pyo3-build-config@0.22.3
+	pyo3-ffi@0.22.3
+	pyo3-macros-backend@0.22.3
+	pyo3-macros@0.22.3
+	pyo3@0.22.3
+	python3-dll-a@0.2.10
+	quote@1.0.36
+	radium@0.7.0
+	regex-automata@0.4.8
+	regex-syntax@0.8.5
+	regex@1.11.0
+	rustversion@1.0.17
+	ryu@1.0.18
+	serde@1.0.210
+	serde_derive@1.0.210
+	serde_json@1.0.128
+	smallvec@1.13.2
+	speedate@0.14.4
+	stable_deref_trait@1.2.0
+	static_assertions@1.1.0
+	strum@0.26.3
+	strum_macros@0.26.4
+	syn@2.0.68
+	synstructure@0.13.1
+	tap@1.0.1
+	target-lexicon@0.12.14
+	tinystr@0.7.6
+	tinyvec@1.6.1
+	tinyvec_macros@0.1.1
+	unicode-bidi@0.3.15
+	unicode-ident@1.0.12
+	unicode-normalization@0.1.23
+	unindent@0.2.3
+	url@2.5.2
+	utf16_iter@1.0.5
+	utf8_iter@1.0.4
+	uuid@1.10.0
+	version_check@0.9.5
+	wasi@0.11.0+wasi-snapshot-preview1
+	write16@1.0.0
+	writeable@0.5.5
+	wyz@0.5.1
+	yoke-derive@0.7.4
+	yoke@0.7.4
+	zerocopy-derive@0.7.34
+	zerocopy@0.7.34
+	zerofrom-derive@0.1.4
+	zerofrom@0.1.4
+	zerovec-derive@0.10.3
+	zerovec@0.10.4
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Core validation logic for pydantic written in Rust"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic-core/
+	https://pypi.org/project/pydantic-core/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0 Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=virtual/rust-1.70.0
+	test? (
+		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
+
+src_prepare() {
+	sed -i -e '/--benchmark/d' pyproject.toml || die
+	sed -i -e '/^strip/d' Cargo.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		tests/benchmarks
+	)
+	local EPYTEST_DESELECT=(
+		# TODO: recursion till segfault
+		tests/serializers/test_functions.py::test_recursive_call
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	rm -rf pydantic_core || die
+	# tests link to libpython, so they fail to link on pypy3
+	[[ ${EPYTHON} != pypy3 ]] && cargo_src_test
+	epytest -p pytest_mock -p timeout -o xfail_strict=False
+}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 95626301adb9..452259045799 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1 +1,2 @@
 DIST pygit2-1.15.1.tar.gz 768818 BLAKE2B ca418afc24a680cbfddee00ec9b6c8f4987ad65abd3d61b56cfc1682ce97a3685654f7663857a2a996c2c4f393ef2addfd336c5f5f548f3a1860056ba998bb40 SHA512 4795dbc7b05000955fea86e1b51209a77dfaf99ea806aa8a2be538aed8094638def3e15b0507c61ab57cad2b8e5faee7f1c90ce5c2b20094f972638e7c9bd20f
+DIST pygit2-1.16.0.tar.gz 768597 BLAKE2B 30e8df4c3f992e075117bdcda3d84e2ed0618dd8556ae8574f6238992cacff69ec3c7c22a6ab85f7857156fbb4b3e6e75bc899e71ea59efcb1f8dee61687355f SHA512 297fc46f2e48e77937718e54b3ef2bb41a252348173fc5858ab4225fc3403a4d29efd2d6377508220d8bdf901f6cd9595c31601d8c0f77e9dc9a44f159a1d278
diff --git a/dev-python/pygit2/pygit2-1.16.0.ebuild b/dev-python/pygit2/pygit2-1.16.0.ebuild
new file mode 100644
index 000000000000..05fe422fe93f
--- /dev/null
+++ b/dev-python/pygit2/pygit2-1.16.0.ebuild
@@ -0,0 +1,46 @@
+# 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_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python bindings for libgit2"
+HOMEPAGE="
+	https://github.com/libgit2/pygit2/
+	https://pypi.org/project/pygit2/
+"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+DEPEND="
+	<dev-libs/libgit2-1.9:=
+	>=dev-libs/libgit2-1.8.1:=
+"
+BDEPEND="
+	>=dev-python/cffi-1.17.0:=[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unconditionally prevent it from using network
+	sed -i -e '/has_network/s:True:False:' test/utils.py || die
+}
+
+src_test() {
+	rm -r pygit2 || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index ffc7321f2911..142e04e25a69 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1 +1,2 @@
 DIST pykka-4.0.2.gh.tar.gz 48536 BLAKE2B 57825e0cbcad0afc33870de000820cfcd400d195715d8c48f133470ab8c9c26d9f8ab1a9cb54e847fe163b240258c789ec70bcf3627dcfbad1d469eee7c2d9c0 SHA512 43d31258f73a6d43c467d108066dd3e852db9e21a04fda030137dbd65052a874e346ed78b79a4929b25d2744a286c95d5d425ae150428ea1594a24f2a6c6a164
+DIST pykka-4.1.0.gh.tar.gz 48569 BLAKE2B 7b97988d543cb6205c698cb91d292aae8312b5e0ccffc8113af0201a97abf01d67e15b2440c2d2473f7005a3e5cb475fa55d333f332f44e0995a4a0e07c9cf95 SHA512 ffb83329f3fc7dc9caa0d63e17138186286975259573540842eb8840e383cabc1959827659de22360fd6542332865f38fb23f75c89a16e224360ef4dbc33ecc4
diff --git a/dev-python/pykka/pykka-4.1.0.ebuild b/dev-python/pykka/pykka-4.1.0.ebuild
new file mode 100644
index 000000000000..f6644769948d
--- /dev/null
+++ b/dev-python/pykka/pykka-4.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python implementation of the actor model"
+HOMEPAGE="
+	https://pykka.org/en/latest/
+	https://github.com/jodal/pykka/
+	https://pypi.org/project/pykka/
+"
+SRC_URI="
+	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 6fcbb425fcfc..21d66eae30ac 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,3 +1 @@
-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
 DIST pylint-3.3.1.gh.tar.gz 1453572 BLAKE2B e756d72c0757a8d90491fddaa5a60cccedde043b4dbaf9162ccabd920bbb864bf109f619483474748a606dedb4bf889a57edb447ef77a40c7ee35e2019caf277 SHA512 86cb0019f53477346de44a7cf22b6ee6ec791d2cfc23ec0c1ffcc749752d52f255aa5dcfaaf7b124706ce8a87013d5e592c0896c527e10b8df06c974f440d3c6
diff --git a/dev-python/pylint/pylint-3.2.7.ebuild b/dev-python/pylint/pylint-3.2.7.ebuild
deleted file mode 100644
index cc40cbfa3bee..000000000000
--- a/dev-python/pylint/pylint-3.2.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-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/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# 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]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.3.0.ebuild b/dev-python/pylint/pylint-3.3.0.ebuild
deleted file mode 100644
index 2355d967c93f..000000000000
--- a/dev-python/pylint/pylint-3.3.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_{9,10,11,12,13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<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}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		>=dev-python/pytest-8.3[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/typing-extensions-4.12[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# 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[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.3.1.ebuild b/dev-python/pylint/pylint-3.3.1.ebuild
index 48de8603e310..6a227e1e13e5 100644
--- a/dev-python/pylint/pylint-3.3.1.ebuild
+++ b/dev-python/pylint/pylint-3.3.1.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/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index 7e413f993f58..95ed6ec23e6a 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -1,5 +1,2 @@
 DIST pymdown_extensions-10.10.2.tar.gz 829801 BLAKE2B 8da4c0afba79a4736621ce8b644a42b4918c04685c1c0312f6a184007c456f92e106fdfd9ae9be64a32bba1d907b6a528fdc49267d1153c0393a8c20c4ded527 SHA512 5885a8f9ea774a5718647a9d546dc5285186d19761441cd1ef39d5f8be40ee13f8fb6cf8791f890001affa6fe051962a45f8cfe8c1d0c549eb4bfeab956494f9
-DIST pymdown_extensions-10.11.1.tar.gz 830215 BLAKE2B b32f11d7c3ee3c680b6a225ec44e7eaab4bd23cc95dd96fff29a037938384ac348ef0405a3fabf9dfb2bccc705e2cc2293d04dec7e323a47612c9a1d2ca7188c SHA512 cb04fef9cf6e2c2371287f0cc914b892a519392bb573b04eb547f96c7167cbd93da5848324c5693fc3e9cbec61c9a6d45b22d12d5164db4a09621d8de1d44999
 DIST pymdown_extensions-10.11.2.tar.gz 830241 BLAKE2B c4048ae6931e7c540b8fd97080daa2290df74be76933874c91db09edac49a272c079d8767b15f28ecee0bf2efa3569179f236d6c4e703dd0d324feabab8da3db SHA512 9636552de1a9ae4519e1c6d7ca7b9c6cd0eb8b4be27a844ea926937cfa00add0b9ca8894f3b8f95e7c95ef0b6012e9a5d0c5b8d0f9aa20d7300fb4878c6f91da
-DIST pymdown_extensions-10.11.tar.gz 829898 BLAKE2B ed0acbfa6ec4b8a61e1a05817aff8abc94545fe9c6da9c43000a696a25c7f3ec7a27b9398079c2cdecad397fff6ddd8716ea07d36c00272ae7ae144a513e39f3 SHA512 a06c00e64635fa6223a7e764e3f5f4604cc7d8ae4c2a8f6e47f6f799e877a213eab5398e67d7bb6586142ad03b2c155897b559bbb66d50e343405d15c53fe7c0
-DIST pymdown_extensions-10.9.tar.gz 812128 BLAKE2B 2427c41b8587e8b0c4d9bedc4e7c413959545f6c1a12b2c9453861bdb349cbd5bb70327384821f6423718296f56efa17aae21db79bdd038f330246555bcd538b SHA512 3642ccf18a85ffe6ac03dcb132f4b64009490e2a6d0cc70c322ef7640de2a5895a321f755f2d6e16f9c9e84b112c12ded2db18ff73d3201f7b9e0a10c8cd78b5
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
index 23a947575357..03be1b9dae89 100644
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
+++ b/dev-python/pymdown-extensions/pymdown-extensions-10.10.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild
deleted file mode 100644
index 23a947575357..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.11.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild
deleted file mode 100644
index 23a947575357..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild
deleted file mode 100644
index 03be1b9dae89..000000000000
--- a/dev-python/pymdown-extensions/pymdown-extensions-10.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Extensions for Python Markdown"
-HOMEPAGE="
-	https://github.com/facelessuser/pymdown-extensions/
-	https://pypi.org/project/pymdown-extensions/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/pygments-2.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index e51400abbd10..758dc2dec059 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1,6 +1,2 @@
-DIST pyproject_metadata-0.8.0.tar.gz 14862 BLAKE2B 03c9a7fc9c53c56b27ea5c72789db10aa045d239c81bf30e926c0ed44d6b61028a27c4dbe02a40eb4ae7ce4a93efb24c63dd4b66f2e98f185fc68d96e96c350a SHA512 e3ec79bcb066fd952a7e88b62534775746b20a52b9952a303e80466c465e394264b8984ca30a1461cd8437334ae7b1a299be7d8036e99e3dcf59828d70650442
 DIST pyproject_metadata-0.8.1.tar.gz 15404 BLAKE2B 1f2ab911043b0511b2e13e78d1e208643a3d29d4b7152d305d432827d32402f0ae944e74eadc41faff7d641c642dfbc4482ce3c8aad6dfae385ff6c7df465465 SHA512 a9677d7d8d6004a86c92d3eb44c37494e2a4709c1ffcaad444d0f0e573ae56c753e6ec27efab6def03f89c357db7966f7dc9a819bf2cab02af2ee8718e7b5a39
-DIST pyproject_metadata-0.9.0b4.tar.gz 21975 BLAKE2B c80494dcb30bc40c5b64522a79343151750324907382448fedc449830ef14ea9cd74a2fb4a8ce663a95052b91b04354b736274d7149eb116862bd4757b6b9a09 SHA512 f8e023a88fe60278924fd839c69b3c9def8707c5a619aa24898677b9d1aec79c8b4513dbcbbb80a610dc033621ead8bc23840c921836d1e35d3d0605874be757
-DIST pyproject_metadata-0.9.0b5.tar.gz 26016 BLAKE2B 63586f314884f7b088abe9602582131aa45808a624006d508c234c801ada9eb117d42e29f4e3db4e73cc6fcc69e3f3b9f6469749e4614568e6bc25cbe7b36acb SHA512 5e9603d6b826ad52c2490afa107fd22ab8b78fc5e7f3dc220822df69a34f6845ee35c7cf167029250fedf62dea8162203579bcb879e182183485bfaacdc3bb50
-DIST pyproject_metadata-0.9.0b6.tar.gz 28932 BLAKE2B f82d1df56056f340a46a11a3a7a293a30b78d5067f52c4308f1e011b281e76fa2c8a191009687961acb808ead1248a90bcdee178ddd23c0571342782734d30ae SHA512 a2aa62e01022b018dc94deb72df6636c036f1484d608455a4751c80543ed91bb62c8f49e1121c0da2e11f85d71ffab3f098afb1e7fdf69b5d6fb834cd7a98d15
 DIST pyproject_metadata-0.9.0b7.tar.gz 31008 BLAKE2B 4935b537503b548d17934d2b9addec271e03766401860713382e2acced74a3bf30539bce506ade44e3a622c05104c7efa43058163748fd81e22852c6e47a1f3b SHA512 ef16c5662d8bb927760ea0a33b52fa2ea2fb60cb35a5a45854fa1f2596c4cdd4dec458dc2aa90b0edbf5f745989774528ad57b41fef0e271a097ddc21622405c
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
deleted file mode 100644
index 7b2ddaeb2e70..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
index cef3e7ff2c2f..7b2ddaeb2e70 100644
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	>=dev-python/packaging-19[${PYTHON_USEDEP}]
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild
deleted file mode 100644
index cef3e7ff2c2f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild
deleted file mode 100644
index cef3e7ff2c2f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild
deleted file mode 100644
index cef3e7ff2c2f..000000000000
--- a/dev-python/pyproject-metadata/pyproject-metadata-0.9.0_beta6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PEP 621 metadata parsing"
-HOMEPAGE="
-	https://github.com/pypa/pyproject-metadata/
-	https://pypi.org/project/pyproject-metadata/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/packaging-19[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
-		' 3.10)
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-bdd/Manifest b/dev-python/pytest-bdd/Manifest
index 985889f6bdf2..95ffdaf0b8c9 100644
--- a/dev-python/pytest-bdd/Manifest
+++ b/dev-python/pytest-bdd/Manifest
@@ -1,2 +1 @@
-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.2.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
deleted file mode 100644
index 7bf6bd13017e..000000000000
--- a/dev-python/pytest-bdd/pytest-bdd-7.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-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-bdd/pytest-bdd-7.3.0.ebuild b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
index 0673ad2b174f..7bf6bd13017e 100644
--- a/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
+++ b/dev-python/pytest-bdd/pytest-bdd-7.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/mako[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index f737577ef362..4ee704d3bd87 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,3 +1,2 @@
-DIST pytest-httpx-0.30.0.tar.gz 36959 BLAKE2B b56f0e51558ffa6eb0c0af61aa3633a8e358f8c78916d101f1de853f683136a68e195bf0af099bbc6766198b4136a560ffd2676d9a49f0b350882896a61d935a SHA512 6aadb544bda5003156bf9c0fa309a166636dc87aea033d9a48ee10e1e8b77e6cb52350930e97cab89cff7c10111d5e26d1d74cd33f0a6c54e34c3fb7ef72ea05
 DIST pytest_httpx-0.31.2.tar.gz 40320 BLAKE2B 3043f407c66fa72f38c39c86a7e85cf4a177b21bbaaeee2002291111ac4345bf6a9095d2c96e15b5966c0d94f5a29fe376d72ae2876ec5a174701d8c81aadb9a SHA512 22612da764f20f6ca2d3883d687b41e36fc7336048c1106a0839c2e2fa408d1ff3b57c9776010c6ee06b05dc470a34f6c9d1fc3fd97fd4b71c810f513bddf6d7
 DIST pytest_httpx-0.32.0.tar.gz 43824 BLAKE2B d373703f5614e7d3d75631bef7c316ae0e5e1963eb1ffdff3fd6a10c65e095e44d1bf09eb81dd9b90492a8e44f19d650875f7302d4843854622df620eb146bde SHA512 fed3b83e4b3162f1500f3a591650aca5a0c09a1a640c5718ae00d4a3e3e9df8b6a90ec4cc1a1e77b6d2be7de80dec8fe69d8fb601de164c7ad84322acc1eb7d0
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
deleted file mode 100644
index cb9aeac21883..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
-	<dev-python/pytest-9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
index 338bc57377ee..29f507ac8d05 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.31.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index fedd7bff4170..fc26d490c620 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,2 +1 @@
-DIST python-bugzilla-3.2.0.tar.gz 114279 BLAKE2B 4d2d7bfaab08dfeb4334462334f23f952b43255e656b0e39eff29bfc206529062c86c79b8c83110fbc5c3970bba40663318b65e208c1b10fb04ab6fb474eeb95 SHA512 215945a0ffd637be5567839303a738a0eef74427838bf0074a5f0ab6022306f47fc0dd5c43a3513b627fb458711f38046321ee9c2c3d43b61ffc577d6dd12375
 DIST python_bugzilla-3.3.0.tar.gz 120711 BLAKE2B 29b6b52c3907606ea474b2f21276fcc6ee307aec315787fe7910e2df16b8e571cff78e133326520f28574bce8d99fc2331e6341fd8fe09edbc9d61d4dcc72856 SHA512 e8e015575a4d2540e351628099642d586bfeefdc8fca0b1e2de802db4ef91b26952d84b5073ef39a6e3a54b181b1937f169c4477267f777f5a9551a5757cacbf
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
deleted file mode 100644
index 0d164fdc713b..000000000000
--- a/dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
-HOMEPAGE="
-	https://github.com/python-bugzilla/python-bugzilla/
-	https://pypi.org/project/python-bugzilla/
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	|| (
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		sys-apps/file[python,${PYTHON_USEDEP}]
-	)
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
index 3a9f06eee03d..9db7390b5b58 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 2da89a1b85e1..52a10328c96f 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -1,4 +1,2 @@
-DIST python-gnupg-0.5.2.tar.gz 64531 BLAKE2B c753004e60c16d9c098074b44f1d0b71e35544b478fbd90bfce0e50ab72b8581229d540ea612327b1fde0bcb247782daf4c39c51efe4de3360faeadc13a22f80 SHA512 9ccfb1dad7895cd08b86f9d220a58d67d83a8acead830364d51d49733d442e7d36e8b68541f3f867a4f11c964293b084a316c1caeb45165af2882b8603742846
-DIST python-gnupg-0.5.2.tar.gz.asc 801 BLAKE2B e778867bf354f6b488a2876bd70928642062200388227cae497cd09c934803a57801a2a306b669aa13aeaeb741f69b15c9597df2d19c04fb9137a1e6f20d36e8 SHA512 ea1d017331dcc88bda9bfa5332894a55e9597aabcecf9abdfd1ae8fa9e23478346d3c82d809fc1e34f112ace091c1d4cfb2bc67f33d30bd34dc0127055bb2065
 DIST python-gnupg-0.5.3.tar.gz 65457 BLAKE2B d5b646b2aadfef922d1b3116259b0f02668df373375676e679fd900bf001c91b58dd6fb06c8e3470d4135f4ef6b45fd1c5f63a78d3425e82931f2c190a28b129 SHA512 88a2d754df7265aefac6b9a0651c7e933125ba7f8170bda7e867f5dd8bb54272609c26d0ce17a15afa7710baebe06fa3ab211e2af1d1d84eb1f1c65ba7a1dd6a
 DIST python-gnupg-0.5.3.tar.gz.asc 833 BLAKE2B bbb455c138df56dec489334f1d9c9a13603e60bc88f156977ad09c0a0e8eefa89ceb5fe4dd4d01c4e2d92d193257024decee879457633bcba9ebc3a83fe8f20c SHA512 052022dd90821e3aac3b77e92921dcdcaa0e5d6914d04a533bf3e9af1cd74fbae59a756c37a9ed0a1b6e945a316e5414c4174c51d03bb70a5fc4d6d8e3c5400e
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild
deleted file mode 100644
index aad7eba762ec..000000000000
--- a/dev-python/python-gnupg/python-gnupg-0.5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 verify-sig
-
-DESCRIPTION="A Python wrapper for GnuPG"
-HOMEPAGE="
-	https://docs.red-dove.com/python-gnupg/
-	https://github.com/vsajip/python-gnupg/
-	https://pypi.org/project/python-gnupg/
-"
-SRC_URI="
-	https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz
-	verify-sig? (
-		https://github.com/vsajip/python-gnupg/releases/download/${PV}/${P}.tar.gz.asc
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-
-# Need gnupg[nls] for avoiding decode errors and possible hangs
-# w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
-DEPEND="
-	app-crypt/gnupg[nls]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-vinaysajip )
-"
-
-distutils_enable_tests unittest
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/vinaysajip.asc
-
-python_test() {
-	# NO_EXTERNAL_TESTS must be enabled,
-	# to disable all tests, which need internet access.
-	NO_EXTERNAL_TESTS=1 eunittest
-}
diff --git a/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild b/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
index 48a931e0f13b..aad7eba762ec 100644
--- a/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.5.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 
 # Need gnupg[nls] for avoiding decode errors and possible hangs
 # w/ e.g. sec-keys/openpgp-keys-gentoo-developers but other pkgs too.
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 66977f8648e1..bfaa0ab598fa 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,2 @@
-DIST python-socks-2.5.1.gh.tar.gz 32387 BLAKE2B a0f488a146b09433bee39382ace3143a31a55d3fccd2db5e5ca6c2a08f3e17abee5839a266f8dc1b1b3ac6add7584cfba988aacba575ed5d21a464f8a2f1464f SHA512 6f2491272d201abc06a0d0a4fae242899ed28f9caeb7bea42c33946daec3280b48a956319b82a89ebeb8ea61ab9c290f9360d6ea85eb4d654525b95faa3ffce0
 DIST python-socks-2.5.2.gh.tar.gz 32411 BLAKE2B 4070f7e0ff85881cec6252320a250404b1279b707719f41aa1b8bf8e8cd52c653a4a778baa4408977013e0c659f667152b902449bc32e84c4502067e240a901b SHA512 ec342b81d88192817eded048a8d6ed556ddfbb108bb945681cb33c05c4c53e39f01bac7cacb2bd1cecf907c53e49cce18d8bc237b625efa1067dd765bf648933
 DIST python-socks-2.5.3.gh.tar.gz 32399 BLAKE2B 39360537311683cb4ec6d1d9850e51877ab9d5f2319d83eefbee7362af1d0061bf7fba0fea9ebc74d24b9fab3a46ba78722ca4629c783406e935758f393d8183 SHA512 fd6351adf611e019298d2885d97d4ecdf1b9c9160297621d61bc770568eb5e20652507c7590b72de11e1e7505a60326139329d979ae325cba4abc81947ad6189
diff --git a/dev-python/python-socks/python-socks-2.5.1.ebuild b/dev-python/python-socks/python-socks-2.5.1.ebuild
deleted file mode 100644
index 21732565173c..000000000000
--- a/dev-python/python-socks/python-socks-2.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${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"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	dev-python/async-timeout[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.5.2.ebuild b/dev-python/python-socks/python-socks-2.5.2.ebuild
index d8b2886b362a..4635630e75d2 100644
--- a/dev-python/python-socks/python-socks-2.5.2.ebuild
+++ b/dev-python/python-socks/python-socks-2.5.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index bc6f6e8ea8b3..9785aa7d699e 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,2 +1 @@
-DIST python-utils-3.8.2.tar.gz 30431 BLAKE2B 3c53c02729f601b30e68a26cd4b61e49c29f036a1327c43124e326dae173d1b528035bb0952c349ec43f3cd6e159c2e0d5e82c8c46efd12c95f445dbb20751c0 SHA512 e0de794abe95f3e205fcbde0fd52615f44128ffb702a406ff0d3f7ce2640ff60ac3cc508829245bce750ed191c9d3ae563b8f0619af4c2c43cacde6a1aa0fde4
 DIST python_utils-3.9.0.tar.gz 35352 BLAKE2B 8d247d28a1ed797d1058f6bf45469230f5fcf3f8d305e195a49229deef5d41552e07b5c2e7543223f2df608feffa6df2f57828863acc437ff9c3c2a11e797703 SHA512 fe6313b18f53a56d71a9ca9b40f7bfe61629f7c5cf0b9088adf81ed8aa78b1c5a593c59ec178ec6c87424ae0730c9cb15d6eaa1a129d871f75b67d1d4f6938bf
diff --git a/dev-python/python-utils/python-utils-3.8.2.ebuild b/dev-python/python-utils/python-utils-3.8.2.ebuild
deleted file mode 100644
index 138403cb6799..000000000000
--- a/dev-python/python-utils/python-utils-3.8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of small Python functions & classes"
-HOMEPAGE="
-	https://github.com/WoLpH/python-utils/
-	https://pypi.org/project/python-utils/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	docs
-	_python_utils_tests/test_logger.py
-	python_utils/loguru.py
-)
-
-EPYTEST_DESELECT=(
-	# fragile
-	_python_utils_tests/test_time.py::test_timeout_generator
-)
-
-python_prepare_all() {
-	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-utils/python-utils-3.9.0.ebuild b/dev-python/python-utils/python-utils-3.9.0.ebuild
index 64cb749f2696..d5520320b84b 100644
--- a/dev-python/python-utils/python-utils-3.9.0.ebuild
+++ b/dev-python/python-utils/python-utils-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 68fe35db7192..5e74c4e852f2 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,2 +1,3 @@
 DIST pyupgrade-3.16.0.gh.tar.gz 65582 BLAKE2B 99c04e528d6bc8d802595ee320843561b317cdf57c87fe2f095b29dfa99b23d00c87951b48f437a72a2602a5bc7bd237abc98cdf9b802ca8c5faff83fe666396 SHA512 a348fd925418e5ec57777360f77aa814eb1b95e45842b8310ed4edb357e5a3648dfbecf09ab7c5d70a8ba98728f2355ef5e5f51908a8c53faf5762869b74e1da
 DIST pyupgrade-3.17.0.gh.tar.gz 66098 BLAKE2B e55b823e6e393ec7d1268661e527bdad6f17b330edc086387d8234a6da3a4a7da79a5d862c594827643853328a807e7ce39450f0685f3d31fd2e81c9407505ca SHA512 28dc66179edd44ec498ada856b6522b73296783d9ce6519676bc658c0c8038c7916f5f330240571458728d344a5a26de7c7a63d61b0a6496fc658dd57ccd7992
+DIST pyupgrade-3.18.0.gh.tar.gz 66227 BLAKE2B e788e3ce2b7f67fb8af62e430c6702b60729e6d7310085f785db8262e54429b11f25c95f922a3e51b2bcbc5120221ba00ef27a96f03ec4bd76d98c876a45fa43 SHA512 16a13f38ab422cb36eb3ac7546064b7c524bb746a7828c871ed67548dab57f97f22c80e9f89b520a763ae6b87dec78c7b7454dff74db7425157bf30d8e950ba4
diff --git a/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild b/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild
new file mode 100644
index 000000000000..9bc48cf64ca0
--- /dev/null
+++ b/dev-python/pyupgrade/pyupgrade-3.18.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
+HOMEPAGE="
+	https://github.com/asottile/pyupgrade/
+	https://pypi.org/project/pyupgrade/
+"
+# no tests in sdist, as of 3.3.2
+SRC_URI="
+	https://github.com/asottile/pyupgrade/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	>=dev-python/tokenize-rt-5.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
index cdbabc8c4642..f902c518eecb 100644
--- a/dev-python/rapidfuzz/rapidfuzz-3.10.0.ebuild
+++ b/dev-python/rapidfuzz/rapidfuzz-3.10.0.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/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index af0b6ed02e44..82f88c64c33e 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,2 +1 @@
-DIST scikit_build_core-0.10.6.tar.gz 254624 BLAKE2B da23ecf36e16f2d8f1b4daeb41c3cd7ca5af1cd0a4eff324765920a53410b9a6d5c7456247dd310b67ac0fc9a96547f1aa6f019e7d7527b603184a9199c863d2 SHA512 e3ee9aff752d2531c3bc44f8288a4619637e89d4a0edea3aef012153ba31af9a86929437e9d11b1d1a6d85a60a9a4da34cc347c203b80cca3caee05fb3e832da
 DIST scikit_build_core-0.10.7.tar.gz 255019 BLAKE2B 8cacc08d0ef5e23fb72e93215cbfb68d72cd93c88b2b63149f44dbe307c6fd4ea623955decd67fef5925b135dab2e5d0c66ab683037d98ec8cea926e3655f090 SHA512 dcd9e3170f7fb0251ce2353ecd5080b64c16b914f2afe8380d318388f1d2fdbe9ca989ed2bffa44963b1ce629e7fa1545132d003f60d76b35e8c680418d883da
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
deleted file mode 100644
index 2e105c618f27..000000000000
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Build backend for CMake based projects"
-HOMEPAGE="
-	https://github.com/scikit-build/scikit-build-core/
-	https://pypi.org/project/scikit-build-core/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
-
-# we always want [pyproject] extra
-RDEPEND="
-	app-alternatives/ninja
-	dev-build/cmake
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.5[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/exceptiongroup[${PYTHON_USEDEP}]
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/cattrs-22.2.0[${PYTHON_USEDEP}]
-		dev-python/fastjsonschema[${PYTHON_USEDEP}]
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		>=dev-python/pytest-subprocess-1.5[${PYTHON_USEDEP}]
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local _EPYTEST_DESELECT=(
-		# TODO / we don't package validate_pyproject anyway
-		tests/test_schema.py::test_compare_schemas
-		# setuptools now respects PEP 625
-		tests/test_setuptools_pep517.py::test_pep517_sdist
-	)
-	local EPYTEST_IGNORE=(
-		# needs unpackaged validate_pyproject
-		tests/test_schema.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest-subprocess -m "not isolated and not network"
-}
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
index f348c362ebf8..6f162b6dfc5c 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.10.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index a429692644a2..eb0c62ca99b7 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,2 +1,2 @@
-DIST scrypt-0.8.21.tar.gz 67220 BLAKE2B dcc3613c63a3e5fea3b2cece03490ac8858333f983df74e077d7d957988165371a05623ac10e1bb4e5ed18d320c1dd215b3685d09e97faf6fa243eda48710770 SHA512 f5f45fe8d8232fe47acebf14f2762bae4e5e709469cadf79a977409d14f14603499be11fc39e917dcfa5056bd2877087450b4411954bbcd51438c04da0dc3c87
 DIST scrypt-0.8.24.tar.gz 60845 BLAKE2B 3290c361750fb12409f6d507cd1cc00549cb77edfe2eacc273881642aea9a9f7a42727e138654a2a968d9e8c7819351fb61b7a63266ef36695153670f4e2ac82 SHA512 55a3f5e30992e89f68f35269bcffe977d799e353eff4d5e7a72159850fc838c28c68e6d008cf2470cc7c554755fd81c022543ab2860e9a93504c99d95409c2a3
+DIST scrypt-0.8.27.tar.gz 55650 BLAKE2B 112afaf3a5a9cc08be10f7a220fc4c12a5cf26cc82be4d10669650c6b4dc79ebf4b4117b7ecc5e24c1773f5b64a75571f683765c6f5709895028bb7f4a4c2b6f SHA512 e20bde0e00d9f82872fa957814765f2733feade8cada6a8c02543362bc9abbb2bc2bb203e14cec8793cc0cc374f233bc0aa59c8d5ec672aea13b9e3f0226de71
diff --git a/dev-python/scrypt/scrypt-0.8.21.ebuild b/dev-python/scrypt/scrypt-0.8.27.ebuild
index 85147959a4cd..8e06acbeabe0 100644
--- a/dev-python/scrypt/scrypt-0.8.21.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.27.ebuild
@@ -20,6 +20,5 @@ RDEPEND="
 	libressl? ( dev-libs/libressl:0= )
 "
 DEPEND="${RDEPEND}"
-S=${WORKDIR}/py-${P}
 
 distutils_enable_tests unittest
diff --git a/dev-python/selenium/selenium-4.25.0.ebuild b/dev-python/selenium/selenium-4.25.0.ebuild
index ecb996dc322d..fa5f14b1eb0d 100644
--- a/dev-python/selenium/selenium-4.25.0.ebuild
+++ b/dev-python/selenium/selenium-4.25.0.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/setuptools/setuptools-74.1.3.ebuild b/dev-python/setuptools/setuptools-74.1.3.ebuild
index eeab13587af2..a7b28d32b5cb 100644
--- a/dev-python/setuptools/setuptools-74.1.3.ebuild
+++ b/dev-python/setuptools/setuptools-74.1.3.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index b2b3d66d80c0..d811fc8b129b 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,2 +1 @@
-DIST sphinx-autoapi-3.3.1.gh.tar.gz 71304 BLAKE2B 0570a26bb22d8a2a37484e28e8d0ff6be9673a49cf8a569ea1808a0a04c6b061c740e0562de8ad351d56966c1e942624486e126f9a1adca0b6790eee2363e79e SHA512 322cba62d37d74ee5ed22787fad2959fbac0885b3066f5213fa57985ba062dfb0be7248356aef695beea371d4090bb591bf604fc0df2e3c56e835fcb6937e3dc
 DIST sphinx-autoapi-3.3.2.gh.tar.gz 71874 BLAKE2B ec92e3a4d3a7b2597a7224201e7ea443dbc6408e43933a54a24fdcb4968fe4e5d295374ea310c600ecf0893a3692a5d4645eafec8bf2a12566de057193eef073 SHA512 6532655408bde105377de1d87cb2f392524935499f45b77afefcfe0fb1b04e8251dce71d338e030537469520774fb8155f91fbe747181ea721a4477fcdebfa3a
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
deleted file mode 100644
index 3fabccbf5a96..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-# sdist is missing docs, as of 2.1.0
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/astroid-3.0.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-6.1.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND+="
-	test? ( dev-python/beautifulsoup4[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/python/test_pyintegration.py::TestPEP695::test_integration
-		tests/python/test_pyintegration.py::TestPipeUnionModule::test_integration
-		"tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample"
-	)
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
index 117bb5655add..3fabccbf5a96 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-3.3.2.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/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 582e55558da8..7a81f5b7e3fd 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1 +1,2 @@
 DIST sphinx_issues-4.1.0.tar.gz 14148 BLAKE2B 7d28cd650abe8248ed7edafcc64fc71bdaf97499597d034e9d9bf875224735b8445ee8b95fd465d8524345e3c8137570bda3ef1b9e25ffb97aa3a438ecac1b0f SHA512 ef7da6d4b1a46adde216d548d1be48773d653f383981d5ddde56260793d05c5e10a99d9196c4ed04ba1722b6d646eaa0c12a2650206f5582cf85ced448c3a361
+DIST sphinx_issues-5.0.0.tar.gz 14021 BLAKE2B 65d588f43d3aa0c50884bb11862deeac2b381122b4de4714f0bdfbe751749b11042cfbda7aae37412d4033acc8e1c111de7b516c8e59d62d62ea2d48961e23e6 SHA512 359080293f08e7a66f2534459cd27ba3f51de30da411bcdf0cfa744cdc7ce7c114d14333c21619ffa16e9258ddb8523187e3635e30c3ecbb07b276c890263dd7
diff --git a/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild
new file mode 100644
index 000000000000..0d214ed1e224
--- /dev/null
+++ b/dev-python/sphinx-issues/sphinx-issues-5.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension for linking to your project's issue tracker"
+HOMEPAGE="
+	https://github.com/sloria/sphinx-issues/
+	https://pypi.org/project/sphinx-issues/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# doesn't work in our pep517 install
+	tests/test_sphinx_issues.py::test_sphinx_build_integration
+)
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index e6267fdf3661..751127cf152b 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx-7.4.7.gh.tar.gz 8135111 BLAKE2B b5a511355b16edfbcf32f9a20855466251c592a7fbffa33a84d84369f2a9de7767cd9529cce3f350cdf25bfbb53534ddea70d9482c1d6d78e9ab160d2c9821e8 SHA512 bfb48d4dc09f108986c5b7737710c7495fbdd83eb18f2a1c77bc9d324c499bffb5103f65ebf7396260f10c0f89eddb1ae5eb8d037bd33fffd748483f4391a7e1
 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d
 DIST sphinx-8.1.0.gh.tar.gz 8245765 BLAKE2B a1caee3905b233f5401a7660d876befcfe85d5d630d1ce67c7386eb56aebe855684e88ed95899a9c0ad359c6ae02024784dd0388cf46ae6e41e927608514f6b8 SHA512 265d69167c8c8e3eb9ef174a22641b15eff7585026f1cfcaf00ba9966ad8a60ec0bc6128158fcb2b098f63c6444b1392de6413ac5884e7eafe6544c3a9c99443
+DIST sphinx-8.1.1.gh.tar.gz 8246435 BLAKE2B bc1e45b2528ae5e8376965cc923a4103c2ac410022d2991c162f75ab922c361ae696f1317728e4b4e23e7a121c486cf59b44c394211c9cfb249ffed3a4824ba5 SHA512 74cb44d3714a4000f92fe302cdd820be49580554fa3585de85d5d636b413e0eacbbc81cb26286304564bab0fe3eccfb16ab1d37bbe0251c5eab902179e8130d2
diff --git a/dev-python/sphinx/sphinx-8.1.1.ebuild b/dev-python/sphinx/sphinx-8.1.1.ebuild
new file mode 100644
index 000000000000..868bc4119e9f
--- /dev/null
+++ b/dev-python/sphinx/sphinx-8.1.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+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"
+IUSE="doc latex"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.13[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-applehelp-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-devhelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-jsmath-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-qthelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2[${PYTHON_USEDEP}]
+	' 3.10)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		app-text/dvipng
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# we can't use distutils_enable_sphinx because it would
+	# introduce a dep on itself
+	use doc && build_sphinx doc
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# less interesting failures
+		tests/test_builders/test_build_latex.py::test_build_latex_doc
+		tests/test_extensions/test_ext_math.py::test_imgmath_png
+		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
+	)
+	case ${EPYTHON} in
+		python3.13x)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
+				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+			)
+			;;
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
+				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
+				tests/test_extensions/test_ext_autodoc.py::test_cython
+				tests/test_extensions/test_ext_autodoc.py::test_format_signature
+				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
+				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+				tests/test_util/test_util_inspect.py::test_isattributedescriptor
+				tests/test_util/test_util_inspect.py::test_signature
+				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
+			)
+			;;
+	esac
+
+	# note: pytest-xdist causes random test failures
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p rerunfailures --reruns=5
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 1c2c43a2b417..ad22dd7a885b 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,4 +1,2 @@
-DIST starlette-0.38.5.gh.tar.gz 2569392 BLAKE2B 9ad32478b22cc743652eda43ad71e6b43af9a1c9b42614a16b5fbae282cfdf5e1c092717bb35711d256e75249cf8705d3545289236c78382673f87a9706b7599 SHA512 1ad5ddb497eb35c8b0b2569218b7e98cb4bee0fc2497912aa86bc75fd894264f8d30c886313cc4aa6dd02a24197d71dbd0640b7e2f0a472ce1002ee5cba5ae59
 DIST starlette-0.38.6.gh.tar.gz 2569402 BLAKE2B 1d580aa6d5f9782a0f3688f3ebde59ca0a8ec8756b3c05c9d9465af0ead346a566b28e14d068392d6d16a55a22a0c77adc3c99f781003df0b5963cfbb0e01514 SHA512 eeaf3c573e587ce4eec8c10f879b20059e0ca4f14c04865a744a8aefe1b3f51327a291e36db312d119b9df51475584b20d8407332a8817eee5b387255d4826d6
-DIST starlette-0.39.1.gh.tar.gz 2572649 BLAKE2B f8b1fb9c64ae73d6018e9ec2f069b413c14060a076d9b3cdcaa6a56219733b65e73a7b8ed8abc6caf4bb896e88a34e326fd98a6f2859e5c05a200bac94aa16bb SHA512 b019d368b5610d8b865a17ff98bec40dacaf1dc830150da907a01a900b058519a9170c80ed92a5a78c835c833e089234e38f939523923e3e566fb2d59de28bfe
 DIST starlette-0.39.2.gh.tar.gz 2573134 BLAKE2B e6cd3bd3e2c2fac96d8b145ffae3a680d775a7668d9baf4db09ab81036985c8c0f5cdc6505f6db56f51126013118568c75d6f0dd6c28ea330baf575a5ff7c004 SHA512 2e81e61451136802449baafd152bf6db9cdad9a111713efb16ccef419aeb9a99b004167cd890509bad613df12d300cb5531197867c594c2b755220a1dae7bf14
diff --git a/dev-python/starlette/starlette-0.38.5.ebuild b/dev-python/starlette/starlette-0.38.5.ebuild
deleted file mode 100644
index e04e0beaee56..000000000000
--- a/dev-python/starlette/starlette-0.38.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.7[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/starlette/starlette-0.38.6.ebuild b/dev-python/starlette/starlette-0.38.6.ebuild
index f84693875c8d..e04e0beaee56 100644
--- a/dev-python/starlette/starlette-0.38.6.ebuild
+++ b/dev-python/starlette/starlette-0.38.6.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/starlette/starlette-0.39.1.ebuild b/dev-python/starlette/starlette-0.39.1.ebuild
deleted file mode 100644
index f84693875c8d..000000000000
--- a/dev-python/starlette/starlette-0.39.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-# no docs or tests in sdist, as of 0.27.0
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/python-multipart-0.0.7[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-: ${EPYTEST_TIMEOUT:-180}
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Unpackaged 'databases' dependency
-		tests/test_database.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p anyio
-}
diff --git a/dev-python/stripe/stripe-11.0.0.ebuild b/dev-python/stripe/stripe-11.0.0.ebuild
index 9faa5fe8dfa2..d1292b4bb5a0 100644
--- a/dev-python/stripe/stripe-11.0.0.ebuild
+++ b/dev-python/stripe/stripe-11.0.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 # please bump dev-util/stripe-mock dep to the latest version on every bump
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.188.0
+		>=dev-util/stripe-mock-0.190.0
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/stripe-11.1.0.ebuild b/dev-python/stripe/stripe-11.1.0.ebuild
index 9faa5fe8dfa2..d1292b4bb5a0 100644
--- a/dev-python/stripe/stripe-11.1.0.ebuild
+++ b/dev-python/stripe/stripe-11.1.0.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 # please bump dev-util/stripe-mock dep to the latest version on every bump
 BDEPEND="
 	test? (
-		>=dev-util/stripe-mock-0.188.0
+		>=dev-util/stripe-mock-0.190.0
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/anyio[${PYTHON_USEDEP}]
 		dev-python/httpx[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 64ce6d5fd09f..db9e5d2f18c0 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,2 +1 @@
-DIST sybil-7.1.1.gh.tar.gz 75224 BLAKE2B df6946089aacdcd65ba76466e8bdc22481df9b9a3c2653d61ea5d29d1c323d33eecaf38dc718613d3503b38b2953b0deac7c8408b6e9b3fb37d519468361e7f1 SHA512 9c4ee6a166562a63281e151e6fcff4a274ac77d94180f35492f806d05da72daed4b9ae48b4095a90f6679bac226469e5d2ef5f48767a40f513efd295c9597b2c
 DIST sybil-8.0.0.gh.tar.gz 75118 BLAKE2B f62f15dab48af23423d8ce9e8a49f3b772fad7d029360d0a98f36a8d2386fc2fc76a2510550ada6b2256848364fa0c998ba939f625c00f1628b8d1a07ad298b5 SHA512 00a02c786e29596fadc3f016c97bc492723fdd956b430ddca2a5e66d38cab424410cf3c74b46f5fff84d3bf3d39ba397068562c5bdca3cff142ce42ad0048487
diff --git a/dev-python/sybil/sybil-7.1.1.ebuild b/dev-python/sybil/sybil-7.1.1.ebuild
deleted file mode 100644
index 0deda2c9b211..000000000000
--- a/dev-python/sybil/sybil-7.1.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-# tests are missing in sdist, as of 5.0.1
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/sybil/sybil-8.0.0.ebuild b/dev-python/sybil/sybil-8.0.0.ebuild
index 37eecb4c858b..0deda2c9b211 100644
--- a/dev-python/sybil/sybil-8.0.0.ebuild
+++ b/dev-python/sybil/sybil-8.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-8[${PYTHON_USEDEP}]
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 8ab9de4cbcd6..1b0240d3e626 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,2 +1 @@
-DIST tempest-40.0.0.tar.gz 1149624 BLAKE2B e75db763090738032699c35477a5bc5d877c44aed1ed4e9fe7b878af116dc6d53dd7b64cf58be55cd3448f5ebdf8e9a44e3f4deb215f535784a33abfc79fde9d SHA512 12227d4f20045f60e56db7bc1de3e117ddbc3d4b3e30aa26239795675023b23facf15646f1c048b75f43dd9c0ba5e7d475e8ad1c483b2d0e32ef9d8d50e62dfc
 DIST tempest-41.0.0.tar.gz 1151830 BLAKE2B 6c732647f49a07d1ae747a4f286779b21c1c64f046a8542cf3f067f79cc839d99fcc6eced01162f5e0415e803c8a2ee0a0e5e5ec92f1088736cff3b341874b9f SHA512 aa5065dbb7431b5cf5d93075083e74eb6c811c759f109ac9ceee7cc45240b84c091f84542a3455cf686f84e359a17f99154ec417ee7003bb01c7ef191f6dcc27
diff --git a/dev-python/tempest/tempest-40.0.0.ebuild b/dev-python/tempest/tempest-40.0.0.ebuild
deleted file mode 100644
index 80c9a74787dc..000000000000
--- a/dev-python/tempest/tempest-40.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	stestr --test-path ./tempest/tests run --concurrency="$(makeopts_jobs)" ||
-		die "Tests failed for ${EPYTHON}"
-}
diff --git a/dev-python/tempest/tempest-41.0.0.ebuild b/dev-python/tempest/tempest-41.0.0.ebuild
index 8aa4208b2540..80c9a74787dc 100644
--- a/dev-python/tempest/tempest-41.0.0.ebuild
+++ b/dev-python/tempest/tempest-41.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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/textile/Manifest b/dev-python/textile/Manifest
index 223b434bb7eb..dc830c17bce3 100644
--- a/dev-python/textile/Manifest
+++ b/dev-python/textile/Manifest
@@ -1,2 +1 @@
-DIST python-textile-4.0.2.gh.tar.gz 49296 BLAKE2B e9ac36b0ecf401a07aea1037c1f4390e440123d7e16f8fef64c257d27f6ef9c6918018ff34e9f8ad367767f3ebc5ce7957be424b2e6dac62fe8a1f7736b8eff7 SHA512 eb59e44b9a8521bcfa98f476e23efd727ffd867277d24f102bbb9511a99a0d636c324e22f8562382074007f304490c4ec6a5fde529f41b15f055a9cf16d49b8e
 DIST python-textile-4.0.3.gh.tar.gz 53228 BLAKE2B f72e3aa58afc3509c4e430a54e6099758655d62dd3274af457c45cd752281e1836aded117496ba6b8d154867f4bf30770156110eabd607d6edcec978ded5e0e4 SHA512 796e8bffe0e5d1d477bb7ea9ef48b5ac19f870d63ea8f895973b2d895475317fec8d888557f586807541601bd97550e5bc2297f5cfefa3031a53ffd3e0bade00
diff --git a/dev-python/textile/textile-4.0.2-r1.ebuild b/dev-python/textile/textile-4.0.2-r1.ebuild
deleted file mode 100644
index 4c0bc1fca974..000000000000
--- a/dev-python/textile/textile-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1
-
-MY_P="python-textile-${PV}"
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="
-	https://github.com/textile/python-textile/
-	https://pypi.org/project/textile/
-"
-SRC_URI="
-	https://github.com/textile/python-textile/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# tests that need network access
-		tests/test_getimagesize.py
-		tests/test_imagesize.py
-		tests/test_textile.py
-	)
-	epytest -o addopts=
-}
diff --git a/dev-python/textile/textile-4.0.3-r1.ebuild b/dev-python/textile/textile-4.0.3-r1.ebuild
index aa7986a5aec7..0660f85f9217 100644
--- a/dev-python/textile/textile-4.0.3-r1.ebuild
+++ b/dev-python/textile/textile-4.0.3-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/nh3[${PYTHON_USEDEP}]
diff --git a/dev-python/thrift/thrift-0.21.0.ebuild b/dev-python/thrift/thrift-0.21.0.ebuild
index dadacbe4eb3b..52609530b493 100644
--- a/dev-python/thrift/thrift-0.21.0.ebuild
+++ b/dev-python/thrift/thrift-0.21.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${P}/lib/py"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index e9b80b99cfe4..d88627b68f76 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1,2 @@
-DIST translate-3.13.3.gh.tar.gz 1172858 BLAKE2B e7b2f711faec3876fdc082aae02716beaa45934f2ad308433c20020e69b72850e0a9d32c7cb57e32b4fdc8b39334a358b8f289c83744882728616122f07cf8f7 SHA512 f435306b34a2a200df5b648a1354444ac5fd76872f36062704b2c8abf52b8b1e1d570afbcf4b50cb1d815abfcf85b05630e8bc02f908a83f3fea90188c76c6f7
 DIST translate-3.13.4.gh.tar.gz 1173494 BLAKE2B 878da77378e4ca1a27c3053812b4f70c1decc55523421daa1716f10c4af9cc1d3d1a601bf076f343eaf34c661355af84dc2d173411779942e83eb4d7e64280f9 SHA512 44d0ee7d5e8b177034385bbc323539b8d53ef7a01d2431ea9c58a8df24ccc5f55af15f245b584db225e194b796d0281dec73ed66f50f8749cf949cb0a4c95277
 DIST translate-3.13.5.gh.tar.gz 1173710 BLAKE2B 1b6431cb0ce2643477c352f54dff0b7cbac8a79d3bf1e2a5976cdea649f8bbf3ee23f96ee97db1c5a7e57789ca5b434cddac959aeda92acaa75a0714b04bc507 SHA512 5ae243584f2bc4e3b304c6e0ccba2f4fcd3728964ed8361017241a787124dc24580ec842b3116036cd99f911f066e29559291b56893410f170d59f1e722e81a2
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
deleted file mode 100644
index 9f851d3c4f9a..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mistletoe-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	>=dev-python/wcwidth-0.2.10[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-# Technically, the test suite also has undeclared dependency
-# on dev-python/snapshottest but all the tests using it are broken
-# anyway, so we skip them.
-BDEPEND="
-	test? (
-		dev-python/phply[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# unfortunately, this bad quality package doesn't support XDG_DATA_DIRS
-	# correctly, so we need to reassemble all data files in a single directory
-	local -x XDG_DATA_HOME=${T}/share
-	cp -r translate/share "${T}/" || die
-	cp -r "${ESYSROOT}/usr/share"/gaupol "${XDG_DATA_HOME}"/ || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# all tests based on snapshottest are broken and I'm too tired
-		# to figure this out
-		tests/translate/tools/test_pocount.py::test_{cases,output}
-		tests/translate/tools/test_junitmsgfmt.py::test_output
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		tests/translate/storage/test_fluent.py
-		# changes directory and does not change it back, sigh
-		tests/odf_xliff/test_odf_xliff.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr
-	doins -r translate/share
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
index e66184b00715..9f851d3c4f9a 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.13.4.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/types-psutil/Manifest b/dev-python/types-psutil/Manifest
index 45c06a576f70..2cb1b965485b 100644
--- a/dev-python/types-psutil/Manifest
+++ b/dev-python/types-psutil/Manifest
@@ -1 +1,2 @@
 DIST types-psutil-6.0.0.20240901.tar.gz 15117 BLAKE2B 1cdcdcb2fe5b67c482b479ab470d2b6fceac324bd059fbe856c228b55040a1b3beabc0dfc7c11febecf19f58fb2ea486b11f442ab87529f8475fb8649dd0d3de SHA512 05a686d3c16b356da056be565f7a77bd6c2c5161e75229bcda80b0b22c6c51407ce5b7c39c8d7c2a6684a98decb92cde3d6dee53265778613b46da499524ac03
+DIST types-psutil-6.0.0.20241011.tar.gz 15222 BLAKE2B 1bbe0dc93b61aa67d5730467396dab3eea57007d7a01a38fd339ed7ca0438239865936ad62fcf070e34a45c728382cb1dd840cb61a52cc2cb589d8da1412634c SHA512 b6688918ae07c8cce2a59cbb616f5187dd14d263f57fb9371732bb509c3ec2514b254a1f92a6320a3056477de4d3c8d6de871dceb6f018603316a3325022902f
diff --git a/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild b/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
new file mode 100644
index 000000000000..5607455cf106
--- /dev/null
+++ b/dev-python/types-psutil/types-psutil-6.0.0.20241011.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9,10,11,12,13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Typing stubs for psutil"
+HOMEPAGE="https://pypi.org/project/types-psutil/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 12007fb52d2f..7b0b4f4d2ca8 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,2 +1 @@
 DIST wcmatch-10.0.gh.tar.gz 118184 BLAKE2B ffc98749b111f472244a35654c8d57144e0f242f33b04e672a3b7d810c5c6c1b2c36172c09437e159c30812916fe15c7690fc3c2a1de14035f04ed801e898dc2 SHA512 db8fcfc7b0bef0256530a86f25491309b0d67f51ec9f60d9e6d2e3f49ae5e94ce432981aa2fb6b1f2086758a4eaa4a53daf9b2f765bd75480230f6064f181e75
-DIST wcmatch-9.0.gh.tar.gz 116090 BLAKE2B 6d33886a9f1f0f53c95dcd8adcebffcd50075c54f8a6398d22e372b811dab33a09152c98d982ed817c9230ae0f200e74dac209da785979365aa38a511b790965 SHA512 638a59b70729eeb39a9bc059d08271b8cfe924a9fce4317718b3cc38e057f1176ec87b033f9f30494fce5c1d24560ef22cd0d9e2a4df12c2b765c3e1358756d6
diff --git a/dev-python/wcmatch/wcmatch-10.0.ebuild b/dev-python/wcmatch/wcmatch-10.0.ebuild
index 9b6c94c0c0a6..8e62352eb4c9 100644
--- a/dev-python/wcmatch/wcmatch-10.0.ebuild
+++ b/dev-python/wcmatch/wcmatch-10.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wcmatch/wcmatch-9.0.ebuild b/dev-python/wcmatch/wcmatch-9.0.ebuild
deleted file mode 100644
index 8e62352eb4c9..000000000000
--- a/dev-python/wcmatch/wcmatch-9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs-pymdownx-material-extras-2.0
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/
-"
-SRC_URI="
-	https://github.com/facelessuser/wcmatch/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index b88c694963e6..8abe715a7ba3 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,4 +2,5 @@ DIST yarl-1.11.1.tar.gz 162095 BLAKE2B 2fc83033411ec3c1d2a8c4f6b2cbd1fab977a7dd5
 DIST yarl-1.12.1.tar.gz 163223 BLAKE2B 9d295c9e018ef15f3b089327006ea7dda7689b6ad7730caa716265cb5fd433fbc2bfd61f30be3f53a28a77102c4e04d87b2f4684aaaa3979f2e9f5e4dba8da6b SHA512 3e27c9ee9c416b4c8eb68ec425cba5d913cc7193670a0abb454551170c711b50b96bd6e10cee9fa34456e57d6a9d18852082a3789243b123ed22c9838b8e9eac
 DIST yarl-1.13.1.tar.gz 165912 BLAKE2B dfe4f9ac09c66d05b6d072cd6676d1753f97224d556dbd22601e544569d5e852b073c1a89e4ba471177c530ec580fb74700b9e6e21730c548e434ef75933b6bf SHA512 8fccb36dbb019d02fc50f006a3a59decd413abfc6387fd7c1220444f4f79412be1d5119c32fd668b3d553fbaf4de64b9135345e8300c7fa025d892c847955f88
 DIST yarl-1.14.0.tar.gz 166127 BLAKE2B 7974896144ef23309aead8935f18fe717e39b982bc75eb3c828eaf9a1d01b413c2bbb270344160a396927fc32571928c67eae46146920cc6908e2e3f74e90cd8 SHA512 8cc9d1aaa6fcccdfce5ea0a0ac3f89b81c5719568b76e66637e9a7baa0637770523f86495f70e28f94f166579e77d72afd708cef1306dafcd8093c7fb2a1d3f0
+DIST yarl-1.15.0.tar.gz 167065 BLAKE2B 2daae4ee528501cc00e4e967bce32b15585a827463b76ef8c27db3808dc3bfeac93de8eec0e2a9af28d3622d70a40ce66845c69744ad49dda7205e93d047f614 SHA512 25a2b2434204e29f4fc4ef438efda0747aedc3e703a8164f9aa5fee809d8d01895f3b0a9aa4de1d3deaa719d940b2b5e681360e47d8e3704200bffdf5e7151a8
 DIST yarl-1.9.4.tar.gz 141869 BLAKE2B 367eac4674bf1190122f10bb1dc1c4f3d5e4263e1d95ff2b871067d55a894dc19a6bb5a6c673d1bed28b3c5f77c704799568edfe639d50f0ae10313eb847352d SHA512 e4f7917f1625b40125abae9a13d61795f97e8cf489735e15cf58476e97c3bcf840b1452482f1f7a737fbb2bdd1dc7bbcfa882d0a7f76a27dfb3aea72b7a66c82
diff --git a/dev-python/yarl/yarl-1.12.1.ebuild b/dev-python/yarl/yarl-1.12.1.ebuild
index 6a35d99e532e..b0a9f6be48e0 100644
--- a/dev-python/yarl/yarl-1.12.1.ebuild
+++ b/dev-python/yarl/yarl-1.12.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/yarl-1.15.0.ebuild b/dev-python/yarl/yarl-1.15.0.ebuild
new file mode 100644
index 000000000000..84e2d46f0ed5
--- /dev/null
+++ b/dev-python/yarl/yarl-1.15.0.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=standalone
+PYTHON_COMPAT=( python3_{9,10,11,12,13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Yet another URL library"
+HOMEPAGE="
+	https://github.com/aio-libs/yarl/
+	https://pypi.org/project/yarl/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
+	>=dev-python/propcache-0.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		dev-python/cython[${PYTHON_USEDEP}]
+	)
+	dev-python/expandvars[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local -x YARL_NO_EXTENSIONS=0
+	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
+		YARL_NO_EXTENSIONS=1
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local opts=()
+	# note different boolean logic than for backend (sigh)
+	local -x YARL_NO_EXTENSIONS=
+	if ! use native-extensions || [[ ${EPYTHON} != python* ]]; then
+		YARL_NO_EXTENSIONS=1
+	fi
+
+	rm -rf yarl || die
+	epytest -o addopts= "${opts[@]}"
+}
diff --git a/dev-python/zeroconf/zeroconf-0.135.0.ebuild b/dev-python/zeroconf/zeroconf-0.135.0.ebuild
index 50e2fedfa3d0..2dd8bed62e1f 100644
--- a/dev-python/zeroconf/zeroconf-0.135.0.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.135.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-10-12 08:46:40 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-10-12 08:46:40 +0000
commit	7108873385a38c38d76962848792b339c4de2fed (patch)
tree	01c34715ac190693e111b206aee43d23d03486fc /dev-python
parent	c2273b4df43751f22098f6029944aaf35c254b4f (diff)
download	baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.tar.gz baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.tar.xz baldeagleos-repo-7108873385a38c38d76962848792b339c4de2fed.zip