Adding metadata

123 files changed, 1322 insertions, 1405 deletions

diff --git a/dev-python/Faker/Faker-25.2.0.ebuild b/dev-python/Faker/Faker-25.2.0.ebuild
deleted file mode 100644
index 7654943106a7..000000000000
--- a/dev-python/Faker/Faker-25.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Faker-25.3.0.ebuild b/dev-python/Faker/Faker-25.3.0.ebuild
index b726995539a4..7654943106a7 100644
--- a/dev-python/Faker/Faker-25.3.0.ebuild
+++ b/dev-python/Faker/Faker-25.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Faker-25.4.0.ebuild b/dev-python/Faker/Faker-25.4.0.ebuild
deleted file mode 100644
index 3bca49bf0d63..000000000000
--- a/dev-python/Faker/Faker-25.4.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Faker-25.6.0.ebuild b/dev-python/Faker/Faker-25.6.0.ebuild
deleted file mode 100644
index 3bca49bf0d63..000000000000
--- a/dev-python/Faker/Faker-25.6.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-}
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index a34f19952f7a..09bcc22984be 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,5 +1,2 @@
-DIST Faker-25.2.0.tar.gz 1760547 BLAKE2B cba47dd21caaabef23212d38b856c67d9d68c6478f44269ed0da7df4aa06cd313caef1d8072572c2b680172e6a6313548228cbd446e397b6e29fd3e5317bc707 SHA512 bec0a516944f36a4714bcb9b8d46dbd4ab3fb3feb6d4818fd28e9d22d0cfd1621845f669940d41365ec423398ef58714e18de5ae537ce7524cf27018ab088c8f
 DIST Faker-25.3.0.tar.gz 1760396 BLAKE2B 46e12f80a84385b4bb50e19a26fe436be1ee846f87309869bc624ec45c15550f33e733d70d9e87c493521020c4e16cddb6f17f2bbc36b6d8072829f582f0beed SHA512 d4b3a762d22b9947ebae254d07abc7e0c3511d9277439075fe876371f1c25dbcbe5a08729e33925c98ec86ef3b5f3321b5a3ac3802784bb42f8296fe9a09eb30
-DIST Faker-25.4.0.tar.gz 1760724 BLAKE2B c081bac6264721bafb80c8c64d85050dddfcc89a47f84c1e31ddc8980919c9f46cce0eec00c63f5af906ae09f4e55782610e6a216e481b784a733d9d15385815 SHA512 90398d9ba91d54eb5f81794a7df3b2131206eeff37105653e8175226ad82ef63ac365a9e5fa32f1fb0f30cdf398811e72ac22c2eefc6f2e8ff0821180a362186
-DIST Faker-25.6.0.tar.gz 1761114 BLAKE2B ed88ab6f3bd86ae29bce97318a693b5045a0a688e09b3266b32d217d04c66805bae30f809fc3e384cefc8e7d44e172908cb156c7ce3c43fe68505f47a89c5ffd SHA512 6048a7d225b6cbf4c5e2b11c4d33eeef2eb22414345310907180723e93688d11c885c168bf6d67dd253bd992856e5b41d2921d5673c9ce674cd6d5dd3f81e299
 DIST Faker-25.8.0.tar.gz 1760950 BLAKE2B 89b18875ae2c3934423d4e7ce9d0da048830f73384db73589372791c6a1798254e3cab54b566ecfbe3263c44edbe12f2c3e7e0d6cbb004e6fc09e9b2e12f7e89 SHA512 88d0c073b48e0df050d3601d97223d64ccf04ad57d59cb37e26a40211633b04301000e7ce12a124e97b32b63225b440f5b44e1d6197f9c8999f7dd0b579a075e
diff --git a/dev-python/Nuitka/Manifest b/dev-python/Nuitka/Manifest
index 7daf20ed2c2e..73a1abc4e6c5 100644
--- a/dev-python/Nuitka/Manifest
+++ b/dev-python/Nuitka/Manifest
@@ -2,4 +2,5 @@ DIST Nuitka-2.2.2.tar.gz 3999091 BLAKE2B 1512b0112dfa36c704900b787ac43a24377ab29
 DIST Nuitka-2.2.3.tar.gz 3657438 BLAKE2B f01a213f7dff39b6bba50ba21fbd120927caa60c88156aa0e9094339f260008fe18aaec4aabe5f878224516bddde697020ac16795e528b0e0141937565255b0a SHA512 36147901a75fcefad10ec75b66a3c988be9c8d6f54aca0f2f9ab3a8c4b06efc7c1b4eb5af5686675ce7040948f7032c27a93f7ea2429e02b99c2d817c37c72fe
 DIST Nuitka-2.3.1.tar.gz 3668744 BLAKE2B fa2951f4e4f903007b8747748233b5a506d650bd4647f49f3a98e8a352da0ff10b9c2e462062cafe666e91003a47dcd61e4c55b9100fc73d15a5c23ac282a90d SHA512 77caa68117e1bb22b5be1dbe411e1fcd2dfa2fd2dd2e066ea6373c57894df559519dac4c35b4ccddc3c34cb5e061ee6ee5b3feba61e15ebd21975a5b42448599
 DIST Nuitka-2.3.2.tar.gz 3668619 BLAKE2B c48bedbb1aa73ace4c44b4d00748f3bc1d739a710cbf1fa1014520cf8d7e6e747833eaf5608f13e7909414c7feaa6a6d599fb533ba2f5622788241873ea62335 SHA512 2bcdffe24602848850bf3c3c0aa0fda0ecf8d6710e40c2dc00ff8600e0ab97df4aac0f0ef59a14904ec918f525a5a2c5835d34cb2d98e14bf9a6800c37508c3b
+DIST Nuitka-2.3.3.tar.gz 3668441 BLAKE2B 0e661948185490a4e47e71eca8c2cecb116bdea1f3ef2d0a477bae33bcfe5612d262e5fb8c3c9b0e192c8c41c3eee019dbb96a429eb072f05b0b5aeaae46a0f7 SHA512 1ea8f644f84d28bf4720f0fdc49204e93607a233c7e921eb006d1c09d6893d299d67d623ced0cd0b57bbe5056d108155f43e1de3d481c5c18f392dca321e9c4b
 DIST Nuitka-2.3.tar.gz 3663624 BLAKE2B 14d11b529322710e1c733661447dda38b5c2140fa924f3a510b710fd9191c194f36a8340c7a6908bfcba62844b3e76604725b5e41e239a1097b9e6b91664b943 SHA512 2bdfd4970f024e1f035f231d3f11f417228d12c33929c2625f05ff410500f1f7903b4c7dca4493374b13acb615b00fd555239d59eda661b1e27b0a3facc7bd5e
diff --git a/dev-python/Nuitka/Nuitka-2.3.3.ebuild b/dev-python/Nuitka/Nuitka-2.3.3.ebuild
new file mode 100644
index 000000000000..35ccf652e8e3
--- /dev/null
+++ b/dev-python/Nuitka/Nuitka-2.3.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 flag-o-matic optfeature pypi
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="
+	https://nuitka.net/
+	https://github.com/Nuitka/Nuitka/
+	https://pypi.org/project/Nuitka/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-build/scons[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "nuitka/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" dev-util/patchelf
+}
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index b219359209e6..44e1047aafea 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1 @@
-DIST anyio-4.3.0.tar.gz 159642 BLAKE2B 33b300d1da37137d45b311f8424c022d19518c207c39ec6f8bd3e42432cf1457f2d533eadeaa1e21853ed1b25a4f58818fc595e8588489722846f8a8d72262dc SHA512 26ff552a03b24b63c7c99cffcec61e97289eacba3ad2fc7a3c1dde8cfaffd9a8d621b867429901c12d7cef912d3807db134dbeb9c5ba619921160f6d5df4d02f
 DIST anyio-4.4.0.tar.gz 163930 BLAKE2B a37b8bc05e43cf1a4bc3f15ab399c78c7a76235942d776848307b189898973e46ddfb553bd20da154dc740d8b8bb93050ac460e56607b686bc2936c5a1e09332 SHA512 db8ad7a4faf257269de9975c3a6325023a95255a8bfe1a9642221080f44a2487160f3c0e8b220d637816e9eb3641550393a3c80b23bddafc33fd9ebe9a23b33d
diff --git a/dev-python/anyio/anyio-4.3.0-r1.ebuild b/dev-python/anyio/anyio-4.3.0-r1.ebuild
deleted file mode 100644
index b213e6b30b2a..000000000000
--- a/dev-python/anyio/anyio-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="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 ~ia64 ~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..12})
-		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
-
-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.4.0.ebuild b/dev-python/anyio/anyio-4.4.0.ebuild
index 969486bec1b1..b213e6b30b2a 100644
--- a/dev-python/anyio/anyio-4.4.0.ebuild
+++ b/dev-python/anyio/anyio-4.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index efa2b05aa64a..51b1ddbe819c 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,2 @@
-DIST autopep8-2.1.0.tar.gz 88891 BLAKE2B 60bd5e9a177d8bdb741b37884bb3ef170fb59664b740beb1b1f38df021dfb7916f2cecdb2e20b6363c2abcc110f9f36902dbccd7f06ddf56f090ccb36149fb19 SHA512 f694a506646b4bc4932fb07cf1c989897e7db3fc9b65dc90886fa657b163dfcbad4c16bb911a2e399a4623b167b313d32213762d3e21e20bff27b6fe2a5abc59
-DIST autopep8-2.1.1.tar.gz 91009 BLAKE2B fa324c2c2e827a4bd5c3f60e0fbb83419055a5b0ced7c737b590cdfba9c43f6517ac659bc77212d9694530d42d6ea4c9af642acf5074d514b32a11c62dcc3688 SHA512 cfa9927e44d40d778405fa1a49385c40b79dd425d945ec5053510c594e783f98aaaf083ad53a07b04cf929eac9b274c5a37c8a1256ebb83d897364d40fc9eba0
 DIST autopep8-2.1.2.tar.gz 91299 BLAKE2B a38ed72306d77a517b2f510e46941aa2fe572b4d51e9c8ee9c817798d5e1db964c0f2f436de9be22553557335a9291074870694ca4ac1e054b4cfd9de9db71a5 SHA512 296f3463f5a7088029e4a6cfefcf9b93a8be1798e6c81818d362d801b97d76bb107619c7724d9f1557006223e9514bc5044f2cec24d8c896c7e420431eb2252d
 DIST autopep8-2.2.0.tar.gz 91723 BLAKE2B 6d00f689752cb134e11e46bbb617d274afbacb30f4f337270cfd00aa9a4dc1cd6f3754a1b0c53986d0350821475b91126ae14bb2464f25fa5f24afb9f9c13c73 SHA512 2a2441e742b3172c011dc142d8d24c439c17fc9b3733c0fc161d30914e1cea50b45c85a66e20c435a828629f1cd1e3f699c1b1a102db0bf721efe8b1e7c91c43
diff --git a/dev-python/autopep8/autopep8-2.1.0.ebuild b/dev-python/autopep8/autopep8-2.1.0.ebuild
deleted file mode 100644
index c79a762452c7..000000000000
--- a/dev-python/autopep8/autopep8-2.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="
-	https://github.com/hhatto/autopep8/
-	https://pypi.org/project/autopep8/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autopep8/autopep8-2.1.1.ebuild b/dev-python/autopep8/autopep8-2.1.1.ebuild
deleted file mode 100644
index af2966e33e91..000000000000
--- a/dev-python/autopep8/autopep8-2.1.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_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="
-	https://github.com/hhatto/autopep8/
-	https://pypi.org/project/autopep8/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/autopep8/autopep8-2.1.2.ebuild b/dev-python/autopep8/autopep8-2.1.2.ebuild
index af2966e33e91..c79a762452c7 100644
--- a/dev-python/autopep8/autopep8-2.1.2.ebuild
+++ b/dev-python/autopep8/autopep8-2.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pycodestyle-2.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-tarfile/Manifest b/dev-python/backports-tarfile/Manifest
index be902a026e69..11d1ddacd218 100644
--- a/dev-python/backports-tarfile/Manifest
+++ b/dev-python/backports-tarfile/Manifest
@@ -1,2 +1 @@
-DIST backports_tarfile-1.1.1.tar.gz 84734 BLAKE2B 7691aaf4bd66e6fd6ad32dc9f4c4c51887ab502d302dae4931c72076b97d55b7646a716fd0dcd04dfc955a8dbf195d3804800b79375ecac1631fd633aefe2d12 SHA512 59ff0f6d78a0b4b2d868026a2f82375a7bfa3b1a09a96c0d6eaf0620c99ec379c22e12e6222677ca9c430349d40714f265ad879390789d63b8d322a31a7c1923
 DIST backports_tarfile-1.2.0.tar.gz 86406 BLAKE2B 20ba5dd91c609b6d7a32b8d489bae5f0d29af83d86c187a8b73e95e3fee034a07469fdfd90fc6c6e96b532b2acbf37ba9e01bdae019ca148d3a668762599fa6d SHA512 8f57526e9aabf7f778e876dab06dd7a476316bb02e9eadd703da3ba74f3b8b0c12338a32fbcb033d477a1a1ff115653a2292b730bfded208c9efb21506bc23d4
diff --git a/dev-python/backports-tarfile/backports-tarfile-1.1.1.ebuild b/dev-python/backports-tarfile/backports-tarfile-1.1.1.ebuild
deleted file mode 100644
index 145b017fd60c..000000000000
--- a/dev-python/backports-tarfile/backports-tarfile-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 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
-PYPI_PN=${PN/-/.}
-# This is a backport from Python 3.12.
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of CPython tarfile module (from Python 3.12)"
-HOMEPAGE="
-	https://github.com/jaraco/backports.tarfile/
-	https://pypi.org/project/backports.tarfile/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-test[${PYTHON_USEDEP}]
-		=dev-python/pytest-8.0*[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "backports.tarfile"
-		version = "${PV}"
-		description = "Backport of CPython tarfile module"
-	EOF
-}
diff --git a/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild b/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
index 5cdced53eb62..193da6e6b8d8 100644
--- a/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
+++ b/dev-python/backports-tarfile/backports-tarfile-1.2.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/bitstring/bitstring-4.2.3.ebuild b/dev-python/bitstring/bitstring-4.2.3.ebuild
index 9413555f7396..4fc720ce0e4c 100644
--- a/dev-python/bitstring/bitstring-4.2.3.ebuild
+++ b/dev-python/bitstring/bitstring-4.2.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	<dev-python/bitarray-3[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8b86979ba0f5..b1af8ed49927 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.34.113.gh.tar.gz 812031 BLAKE2B ffb4cc54a83d9d783eb69694393a6cc8c4d
 DIST boto3-1.34.117.gh.tar.gz 813596 BLAKE2B 1b68c6410a9e4859c05ec6e8baa7b4d0a8eda39ac9cfe7173d581e5712409bb5df83d35f30deb4f5e4e1dd70c0dc411cd8a1725b00f1e8a3026dbaef9862cde0 SHA512 40c6c1d62d94e0ac8d0237abbbacb9b7473dbce0ee7be5f2e8106f0c0be99b6bf048f3068e2978c578a8df5948f854bd4f3b9d99d935094a646a33f3bada7136
 DIST boto3-1.34.122.gh.tar.gz 817093 BLAKE2B ecc91833d5d8b7ae33c2fe435e33bc8fa236388dcd36bbbfad138e72dcada1018d9fe032a04565bc6ba04f252c5b1e066f650620aab2b6682705d164660eaa9b SHA512 26ece26e24a09ce12f57fd7cbede798446ddb60c28dd7d090c2604b71cc92fca9cfdc268e6d65fad1bcecf161976186b21acefdb70a2de8acaccd85567a388d0
 DIST boto3-1.34.123.gh.tar.gz 817520 BLAKE2B 264464edc80ec43c6759b542629bfbaa1a7212a67d6738b920191f52be9a51bf6c16170de161f2299273cb5ac3e15dc8c74e60aff8212e51408343362f275f8f SHA512 4b90e3534e0319932bd038a23e68a2dd913fe99f0d07df23f2a1dd4ac8fca7c6f614e7cbc3359851e575599c386c89f382c439f712956e9190872d610b8f6c04
+DIST boto3-1.34.124.gh.tar.gz 818934 BLAKE2B ab1ae5af51340c1782af93c7bbcd88960331449e1372cd614b8905fd8e04d3d2f10a3b92c49938dc101e543525fc85a95dba8ec774d0eb91fbb832ac54288979 SHA512 c49aaf78e1f539e5af32252d645de28f1126e35f4d3603107a3b1329c1cb1d5578c005d678d05e3d0c907c3ef098485113982292bce5168cd4679727797f210d
diff --git a/dev-python/boto3/boto3-1.34.124.ebuild b/dev-python/boto3/boto3-1.34.124.ebuild
new file mode 100644
index 000000000000..509842b2699d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.124.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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7259774e09d9..a922f25ad7ee 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.34.113.gh.tar.gz 13060395 BLAKE2B 8f9329d613f489f2305d068566940a
 DIST botocore-1.34.117.gh.tar.gz 13076178 BLAKE2B defbd66d6409004fe49df44aec0a00b4bbe1a459d3e4b067c5c8609b998c63e7d62c8d3c48805416d44c08aeb3ab261f4449cc7e6a7c66dd3ca5f97bdcce291f SHA512 d9736ddb868e602afbaad95989d284b2835636f273e8a4263caa7eec619fe7cc45515fbbe98d4fd33121fe0d97d34353f7cd811bc878a81d1f5f7437798b24d6
 DIST botocore-1.34.122.gh.tar.gz 13066937 BLAKE2B f22af79873b5574ae4b2b9041568cfc1d727625c3fa45c9b8d1bef71ffcce893aa8a3591c83160437c7e617be72814a2209569db633d857f869a2152af7c8e05 SHA512 f08dcb2920d4bd26a47478edb871f75b240275a7b96acf58be838080dddca3d4f64b9fda8683e5a3db97defe367298b2ba634fc4d605523805b23c83c3a5ae0d
 DIST botocore-1.34.123.gh.tar.gz 13080868 BLAKE2B a15ecc1151803d26181c72117df62a6777c2d209cc1a49eb106d7a779fab23300762d8e034e9dc79c8eb747d6e31b5ea75739698809797bea9fe3c930b72b40a SHA512 20f77200edd899b957c7544ba7faed4fb7fd6a0fb6c0fe95cd729c67b3f47bb2414ed413c145fcc9e0f1e55f2cee86398580b9b71d38b70043d01efbe48e9510
+DIST botocore-1.34.124.gh.tar.gz 13097299 BLAKE2B 1dd7353ca2ae93199995530057cdd90dbaf1a4e493ca7be1e7b4cc445dfa0d352f02b903a6264dd67105f2826df05ed01aa1a861545ab28369519183b731365a SHA512 5e53a80571811faa306926aa7f72d802f720040c6a613aacadcb00e331259185ccfed91bd1fdffefddc069ae58cd80454b182d4965273bc10921cb2625ebf793
diff --git a/dev-python/botocore/botocore-1.34.124.ebuild b/dev-python/botocore/botocore-1.34.124.ebuild
new file mode 100644
index 000000000000..857224b496b7
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.124.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_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index dd7ccf5a077b..6c6eee35db3f 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,2 +1,3 @@
 DIST cfn_lint-0.87.3.tar.gz 3963065 BLAKE2B 400532698248204fe2bbf9f29fb374d178cd4a8b168dcb681b284da0d5d7be17cd28292b8f37a7c600936b96a56e90d925e5e0d88f062f5c8a7821f0ffe43528 SHA512 b23ed7259907da993469b4b2a6cfb6a5b8f1bc9186d65e8392ccf628b8b37fe7a0bde6d5d57ca6924d738770367e67245f13abce4777fa88945316569eb59b4b
 DIST cfn_lint-0.87.5.tar.gz 4059125 BLAKE2B 93d1b6ad445628360f62d1d4ceab75af85c1ed8ae9b5ac667f70346e5ddb6e75cac57544f5fb4f1f44d30503041c2259a4cedcd4be343eb7408b6d82a9e2fe9a SHA512 3a1fc8514a9490544190e6f8b9d1333676683ebdafbe040660558f9c2cd3675494ac44979019f1fc57857cb692ee32000e60218a9abb959e686949ff032e6eb9
+DIST cfn_lint-0.87.6.tar.gz 4076995 BLAKE2B 57a5d598d2725851d1a59094bda249b32f7426381224cb8c2e6701e5eea92d0aea2984a5dcc6eb1640194e2535c9fd570712d80620c86fb20fcf42938942fd7a SHA512 06f3a51487ec19a4288ebfa87d6c00bd4fc2b3bfc81299c23e3afa7991ac1234e772dd989cf94af21ee3fa7d236fd9d36119e34d6d57f8da0ad304cb754a3326
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.6.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.6.ebuild
new file mode 100644
index 000000000000..c538c0ae4a62
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.87.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="
+	https://github.com/aws-cloudformation/cfn-lint/
+	https://pypi.org/project/cfn-lint/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	<dev-python/networkx-4[${PYTHON_USEDEP}]
+	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
+	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/unit/module/test_template.py::TestTemplate::test_build_graph
+		# requires git repo
+		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+		# Internet
+		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
+		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
+		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
+		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
+	)
+
+	# from tox.ini
+	local -x AWS_DEFAULT_REGION=us-east-1
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/coverage/coverage-7.5.3.ebuild b/dev-python/coverage/coverage-7.5.3.ebuild
index 8f7e197a5950..7577803bd732 100644
--- a/dev-python/coverage/coverage-7.5.3.ebuild
+++ b/dev-python/coverage/coverage-7.5.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 5d7976cfeb9b..e7ecb5f66314 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,2 +1 @@
-DIST dj-database-url-2.1.0.tar.gz 10502 BLAKE2B cc8a9bc396c3df363c7c8c2d0da603493e65fb927d9aecfe9670ccc687b55320ac5c0827e728049ef9030f3b1e20c53b4aaeb7173ae822ded2347c446518e5d5 SHA512 17e35b6abba45d31d58bd2f5def59f45395f0fa489f93c9c71b8405b1fcd6b7da2192649d091a6a63506e755a683b2786af377a135f675cf1145fcd8508356ff
 DIST dj_database_url-2.2.0.tar.gz 10874 BLAKE2B 71bf484ba339edf9dc304085d433ae29b1efae6fe856152173989411cfffdb52297f7613b6f9337972cc8563494be4a94919055a0b7a84a0b066d64d5fe60d59 SHA512 17c26dc07e309ba448976fafdbd3bdc74cc2f5f7022fb1f041494f2555b8a77b9fc602c1f11602da5b8574487ca997e7b71d7859dd08875b2295ae08262c39bc
diff --git a/dev-python/dj-database-url/dj-database-url-2.1.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.1.0.ebuild
deleted file mode 100644
index 18b02677fdd0..000000000000
--- a/dev-python/dj-database-url/dj-database-url-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Use Database URLs in your Django Application"
-HOMEPAGE="
-	https://github.com/jazzband/dj-database-url/
-	https://pypi.org/project/dj-database-url/
-"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
-
-python_test() {
-	eunittest -s tests
-}
diff --git a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
index 3f974df3eb89..f18cfa5667a8 100644
--- a/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-2.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/django[${PYTHON_USEDEP}]
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index 53daf4230113..778fa5921c37 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,2 +1 @@
-DIST elastic-transport-python-8.13.0.gh.tar.gz 75950 BLAKE2B 5a62d28ece9570d8fc4fff30cf04f88e7e138276054bb191c883c156995effcb750aef874836e5fb32cecedf79641f8faa08ab2e3c74bf5d0c2ba950f490ffb8 SHA512 65239951d56efa4273b8023cf4caa04f44196d0f9bcad91fe5376139adbd669d76a9c0e673f8eec23aadf107fea315216ecf95064acfa5eeb769ca3b92885fb6
 DIST elastic-transport-python-8.13.1.gh.tar.gz 76370 BLAKE2B 7f4584953c243547a73ee48c9033dc212a837bf0977f1a2329365805705ce1317bc9fa6e35f22affe9cc8f9b3fd6725b44c8a45dde02ac835195d4a6d33964b1 SHA512 a025b80e86163ee25798aba7ebf75f4c481c4f6cbcda0542ab80c0c9899988fc608ad41a2593a2f0371eb6cde2ca8da8c72dd843a03f9b2312d65bddc903dec4
diff --git a/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild
deleted file mode 100644
index ace01a552ded..000000000000
--- a/dev-python/elastic-transport/elastic-transport-8.13.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=elastic-transport-python-${PV}
-DESCRIPTION="Transport classes and utilities shared among Python Elastic client libraries"
-HOMEPAGE="
-	https://github.com/elastic/elastic-transport-python/
-	https://pypi.org/project/elastic-transport/
-"
-SRC_URI="
-	https://github.com/elastic/elastic-transport-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/orjson[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/respx[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/furo \
-	dev-python/sphinx-autodoc-typehints
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e 's:, *<[0-9.]*::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fragile to random warnings
-		tests/node/test_http_aiohttp.py::TestAiohttpHttpNode::test_uses_https_if_verify_certs_is_off
-		tests/node/test_urllib3_chain_certs.py::test_assert_fingerprint_in_cert_chain
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -o addopts=
-}
diff --git a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
index 42e334206251..5c2d01b519f6 100644
--- a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
+++ b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 PROPERTIES="test_network"
 RESTRICT="test"
 
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index f0bfe58562c8..2bd765fdf223 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,2 +1 @@
-DIST elasticsearch-py-8.13.1.gh.tar.gz 1074911 BLAKE2B 4ba5f728690274ab074fa17993c59fb41d4493bc05b69d4281db56c274ddd522124c96046248bdecf7fc362e624853d7a31fac0a12d952faf0e38296d62c89c9 SHA512 ab5b3b67e70588c31a2b62fe03dd5aa0320da36b4a669986207db5982fabfb8fa800d181be958505bb264a9fb72ab33a9d5167779300e93d0874e9105e990891
 DIST elasticsearch-py-8.13.2.gh.tar.gz 1075234 BLAKE2B a13126b41f297db196b0ad22ff1da419e3472d42314984133380f0826d25a2e5ba5e0dcd0a9d571e8e27382eb53ceeadd32a4b6de312e63a3b192fd27829495d SHA512 c5f59eee672da292ca7f40e894a88c62bee3aabf35eb241c48f8f9a52c81e2348747e7d09d3b3323575407c8a072f510dffca2dce2caf9e420a9b40d5e4582fc
diff --git a/dev-python/elasticsearch/elasticsearch-8.13.1.ebuild b/dev-python/elasticsearch/elasticsearch-8.13.1.ebuild
deleted file mode 100644
index 5285efa00601..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.13.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	# https://github.com/elastic/elasticsearch-py/pull/2552/
-	sed -i -e '/float_/d' elasticsearch/serializer.py \
-		test_elasticsearch/test_serializer.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild b/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild
index c9d02dccad40..5285efa00601 100644
--- a/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild
+++ b/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 
 RDEPEND="
 	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
diff --git a/dev-python/gfloat/Manifest b/dev-python/gfloat/Manifest
index dd6bf5fd40f5..d4627844d126 100644
--- a/dev-python/gfloat/Manifest
+++ b/dev-python/gfloat/Manifest
@@ -1,2 +1 @@
-DIST gfloat-0.2.1.tar.gz 40460 BLAKE2B 9103140b2523c1e0f430bdf066c1625c71783d30d3d6754cd44c626ce6ca4204742188d967489ff2dba65df6ac51989551c14ee6ae66302c452c765d5a0eca20 SHA512 50bb770795b8284c9071f345667772ecd334a7c44368acf173dd65094f9fe9ac473ae0cc250f35dfafdb19d5fe039ad3258c4256fbc281feac41f192ed139cc5
 DIST gfloat-0.3.tar.gz 43790 BLAKE2B 3b6628dd6410090a684bc253965e167297f4105e3690b9ac38c0192c202fbc7e02026103723721494d4826d835b70a217114335201ab1c329d6bac02412f9e7f SHA512 2df65a3a188e99d1aa3da1b067aa3eaa9aabc22f42414b773c312d9c8dae9baf34d797f947a1646ea89e1db8f2bdb5f97a9672c292e2e0a2a8312e0e6f2fc496
diff --git a/dev-python/gfloat/gfloat-0.2.1.ebuild b/dev-python/gfloat/gfloat-0.2.1.ebuild
deleted file mode 100644
index c8db796da57b..000000000000
--- a/dev-python/gfloat/gfloat-0.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Generic floating-point types in Python"
-HOMEPAGE="
-	https://github.com/graphcore-research/gfloat/
-	https://pypi.org/project/gfloat/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ml-dtypes[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires mx (possibly git version), torch
-	test/test_microxcaling.py
-)
diff --git a/dev-python/gfloat/gfloat-0.3.ebuild b/dev-python/gfloat/gfloat-0.3.ebuild
index c8db796da57b..5bfb29134a03 100644
--- a/dev-python/gfloat/gfloat-0.3.ebuild
+++ b/dev-python/gfloat/gfloat-0.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 7994a55842a6..deb7e995e8a1 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,2 +1,3 @@
 DIST google-api-python-client-2.130.0.tar.gz 11178249 BLAKE2B 8f89f85124f72fa1c23ef6ab2d8e0eba2935ae14bf3528102de977aeec6b6b525f51f6d6d574e582b010ad49f6d8ac450cdf6edae7653a6b47b15868754e6ea4 SHA512 3553a140a86974cbf05cf21b4792f59adb3dee23e50772c8b6d285868ef08566bda8a64895b7054fa3f340dac0c9f52b4a712eba3fabea8feebca7390149e0ed
 DIST google-api-python-client-2.132.0.tar.gz 11256536 BLAKE2B 4a046c03a50b3922b94e6a07bfce974851752542a69300d544b7c8439c4ad54fc9fd2d5fdf84656801ebe9bf5ad35588d39dc3603537d67db93ea995b50651ff SHA512 ecd6be9009f979447ee7d29dc05af2b25c500ca17a8d88ae6660ac0a72f6bb8237f3224dda63b22378a38c6cf7fab914bc6372351d95e691c3b16f248be04a64
+DIST google-api-python-client-2.133.0.tar.gz 11299741 BLAKE2B d964eebe1ce76448d716865f200b07f06eeffac866aa40f602a8bae09cdfd0f66ec6eec8d96f71a63d8cbad68c4677c7398f0b7157507b8f56b04210debe937a SHA512 a22871af52b0a40b328328438c248b324d5f695f507df2df470ef6735b7d3b7261915d087d8260dc315a57c7a12825412cc1a468170c8b77a74fbc0523858952
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild
new file mode 100644
index 000000000000..2b0d333aae0a
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.133.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+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/gssapi/gssapi-1.8.3-r1.ebuild b/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
index 7875bcf89f2a..0b9f41bb4c37 100644
--- a/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
+++ b/dev-python/gssapi/gssapi-1.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,10 +30,7 @@ RDEPEND="
 "
 
 BDEPEND="
-	|| (
-		>=dev-python/cython-3.0.2-r1[${PYTHON_USEDEP}]
-		<dev-python/cython-3[${PYTHON_USEDEP}]
-	)
+	>=dev-python/cython-3.0.2-r1[${PYTHON_USEDEP}]
 	virtual/krb5
 	test? (
 		dev-python/k5test[${PYTHON_USEDEP}]
diff --git a/dev-python/guidata/Manifest b/dev-python/guidata/Manifest
index 72e768fc9643..a99953e84059 100644
--- a/dev-python/guidata/Manifest
+++ b/dev-python/guidata/Manifest
@@ -1,2 +1 @@
-DIST guidata-3.3.0.tar.gz 690865 BLAKE2B 1b52295094844f839665e9dadbfff8d407b48d1746d72154d1181812a8b205660feac6ec86002cab31eef2c8fc5e72a35034145e51388e16e9bae89b2e801bd1 SHA512 7c962b8205cdcb13a628b6bfa256e7b62e1478933933d5ac9b8a1f7fbf6e4e17dbbbfe73bd520585b148ea858816e78f7dd3377ba70acc1be3a071981e5179ca
 DIST guidata-3.5.0.tar.gz 715835 BLAKE2B 11668c0ab1e5c7ec1a58b1cd705420c79b5e2c05174318556aabd48895421a2e77cadd8932e8affe4e52214881b3feb5d99a5f75ccc8adec31d44137ff70df24 SHA512 281460040396d1de07bad44a27c69b1fb69d41406d3b4029651332bf8d39d610e1d89f541062b8cd3b5d11afa9f39c5de83ae0e9729594a22c23abd73a79d83d
diff --git a/dev-python/guidata/guidata-3.3.0.ebuild b/dev-python/guidata/guidata-3.5.0-r1.ebuild
index 2e3f2e22332e..f666bd9296cd 100644
--- a/dev-python/guidata/guidata-3.3.0.ebuild
+++ b/dev-python/guidata/guidata-3.5.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 
 RDEPEND="
 	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-2.0.0[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/QtPy[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/guidata/guidata-3.5.0.ebuild b/dev-python/guidata/guidata-3.5.0.ebuild
deleted file mode 100644
index 2e3f2e22332e..000000000000
--- a/dev-python/guidata/guidata-3.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Library for user interfaces for easy dataset editing and display"
-HOMEPAGE="https://pypi.python.org/pypi/guidata"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/h5py[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-qt[${PYTHON_USEDEP}]
-		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p xvfb
-}
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index 79bf6c04689f..3b4d3e8aec3c 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1,3 +1 @@
-DIST hypercorn-0.16.0.gh.tar.gz 159038 BLAKE2B d17fde74af7f3a0157af22465f52a46967b8c4297eb5f602614d5337ca511d365e391630495535b56650fc4bfac864d30c5b281c04beddb0fec9bfcecd0f0c00 SHA512 75d75f0a0c1726b83d8ee38d5a15f4241130369904c9925cc3b87d1bf92f0d6a59ae7e7c83434c60ceae4bb628f6a51a42eda00c68a226c0bea6ef1c6fb8cb2c
-DIST hypercorn-0.17.2.gh.tar.gz 162107 BLAKE2B f5db0c323c6bbf4dbb7d28617adf1a55fa810e165129d945b410e6810c8f0cc41c6dd8043f846f00405d56760ad94b807b53b104a97396277d98c33d6598b7d6 SHA512 c840eb34fb6e12c236c1d279ba94752a3a1d9ba3f73e519ff71628a648580e7ef6196f5f806053c601531b12af11aa455801a6c2c13cabf3729e55581ffbb881
 DIST hypercorn-0.17.3.gh.tar.gz 162354 BLAKE2B 60e5e0edbf60330e1a172d8b86ed1e0b2bfbb047dca22bf9eecfd672d8bdcf7a224658d0b5b123fb5f63fcff74ad2928760df58c1be065e4849c5bd36cc5f90f SHA512 d1dd42445af580d4083cfae906cbed7d74b9378be93b476ef2188744f9f17a041b496b270847a8a47ffd99198513f6133942367fc7a11d4d502353c1204a1abb
diff --git a/dev-python/hypercorn/hypercorn-0.16.0.ebuild b/dev-python/hypercorn/hypercorn-0.16.0.ebuild
deleted file mode 100644
index 8f8c5fe3f4a5..000000000000
--- a/dev-python/hypercorn/hypercorn-0.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A ASGI Server based on Hyper libraries and inspired by Gunicorn"
-HOMEPAGE="
-	https://github.com/pgjones/hypercorn/
-	https://pypi.org/project/Hypercorn/
-"
-SRC_URI="
-	https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/exceptiongroup-1.1.0[${PYTHON_USEDEP}]
-	dev-python/h11[${PYTHON_USEDEP}]
-	>=dev-python/h2-3.1.0[${PYTHON_USEDEP}]
-	dev-python/priority[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/taskgroup[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--no-cov-on-fail::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/hypercorn/hypercorn-0.17.2.ebuild b/dev-python/hypercorn/hypercorn-0.17.2.ebuild
deleted file mode 100644
index a0e62d644b6f..000000000000
--- a/dev-python/hypercorn/hypercorn-0.17.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A ASGI Server based on Hyper libraries and inspired by Gunicorn"
-HOMEPAGE="
-	https://github.com/pgjones/hypercorn/
-	https://pypi.org/project/Hypercorn/
-"
-SRC_URI="
-	https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/h11[${PYTHON_USEDEP}]
-	>=dev-python/h2-3.1.0[${PYTHON_USEDEP}]
-	dev-python/priority[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.1.0[${PYTHON_USEDEP}]
-		dev-python/taskgroup[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.10)
-	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--no-cov-on-fail::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/hypercorn/hypercorn-0.17.3.ebuild b/dev-python/hypercorn/hypercorn-0.17.3.ebuild
index a0e62d644b6f..974085b54b5c 100644
--- a/dev-python/hypercorn/hypercorn-0.17.3.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.17.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/ipython-8.24.0-r1.ebuild b/dev-python/ipython/ipython-8.24.0-r1.ebuild
index 132aaa77767f..609477833afa 100644
--- a/dev-python/ipython/ipython-8.24.0-r1.ebuild
+++ b/dev-python/ipython/ipython-8.24.0-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="doc examples notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-vcs/jaraco-vcs-2.2.0.ebuild b/dev-python/jaraco-vcs/jaraco-vcs-2.2.0.ebuild
index f6ad78b90bc2..37524a64c71e 100644
--- a/dev-python/jaraco-vcs/jaraco-vcs-2.2.0.ebuild
+++ b/dev-python/jaraco-vcs/jaraco-vcs-2.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-classes[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild b/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
index 6a7db7ae999e..e7f7fdd8cdc9 100644
--- a/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
+++ b/dev-python/jaraco-versioning/jaraco-versioning-1.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index fa9c103716ac..12bf1d5842a4 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,93 +1,53 @@
 DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d
-DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e3619ebd437c34a018920b679d5a11f9e96be48fbdabd2e98a379c0395d118616f21eb9004724d8fcb04b2b2b SHA512 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73
-DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST autocfg-1.3.0.crate 16524 BLAKE2B 7d5a03853d6b4f0da08d8e139fb200da21e47fa7e50d1956270d0ff0cc496f660f8f800122c95eee9ba98d9210ab200c3010b782097483d12d6be4ac0df0e7c9 SHA512 a5570b955d57a7183ba148b335837dc5af24b202e80681027536d33fe2822509ba644fc70c29f018c893285ced2bf6774f44ca6c59f7c7e2226d5349cf7c3635
-DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed
 DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee
-DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345
 DIST getrandom-0.2.15.crate 37163 BLAKE2B 7d534e799a4711d01c6553b8c9422dbf01e384a850fb0f7cd76e444628f2b96d28d0f5e8dae042f8081a2bf9340f57c558be50a6f22ed5fa6b0301a15898fb35 SHA512 04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb
 DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
-DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a
 DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
 DIST itoa-1.0.11.crate 10563 BLAKE2B 94da07e0f7f2535d0b1491b3a3c64905274b315ffd35ec8e9a3e36e26cd7211733b462eefb5208963e388345f65be9694804c344a6132b2b595b0bc716c0b328 SHA512 7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311
-DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
-DIST jellyfish-1.0.3.tar.gz 363670 BLAKE2B eea18515960933fe98ecea1928b2d5e31ca6daacac9f8c4b52004cce8f37c5288e4358e04d662d119b96060cf5d1b15d4aa09ffa51c4829eb004dd2e7eb5494d SHA512 dc977cff57c3aaad3564dabcae1155e05389bd16c37f0b836f81fea26df42dc0b4397ed17ee3f130d53c967007c3c7a322a917dfdc7a87cf2c340ce33552b09a
 DIST jellyfish-1.0.4.tar.gz 363993 BLAKE2B 55f24ffe9345c5b38018de1fd887c8ac4ab9d71cd9b34771d9125a1f7dab92e15464f9fa7ceaab4ebf56c8bdadfa546ec2e944388fb1fb418e76b6c3c2045a21 SHA512 2120d09681eabf9571f87eb7518d941193c3ac46895f605b78994117cd65f7cd804f76edd4f42ba789f93e0b7afdd9ace1cc0ceac927e9d43a5a108604af6ebc
-DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385
 DIST libc-0.2.155.crate 743539 BLAKE2B 42cdcf8d4a187383548b1f09d404474f168916d626d614463fe10a1fd886e972e1caf6297e75445214af3f31fe631d0927e54ec1cdc63e20082b3587e38dce16 SHA512 05354bba532b8338bda1f88f12c7f3893429734a06e33925fca2b99d49548ae5216e2cd84e782d2368a2dfef20b0e035e2dcad8dd13ede7119462a8c639b2807
-DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
 DIST lock_api-0.4.12.crate 27591 BLAKE2B 4504d146a114d8f8e1fe9ae70b993c713cbfe884dd69c61c54dec978733b95a853c3e5af26f237e48ebb4ee9dbebfce0f6c06067f74a3d122e92f5ace40e22d7 SHA512 525d971f495449bbd02eb70fcd84d4aab05ca582142144a5f314f9aa67ad4c5b4c98dc919a416d0ed2e555063eab037a441d671d56b633f2cb75dfab5d99bcf7
-DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
 DIST memchr-2.7.2.crate 96220 BLAKE2B 2399064b6db21838d4aa0b25ed0bf04940ee3820741658cc6bf62e5ade08f41320df743ff13f99b2781da7b844e18deb1cfe25fe570f0e93f98ff03ca5d442e3 SHA512 cadcb4239c7f3aaab042592c5186770a225621e32f8583052fd3dbebb4a6d9b99be28f589b39b5ca36cb2d56fb3709e7d4ba91838ebb882e28e51280c02bbc40
-DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST memoffset-0.9.1.crate 9032 BLAKE2B 0aab55fe084134bb599c52d77c96400db40949b1013e7037747ada4fcec8dc4a124b6f3755f04b36e057eb2fb4a6bd6f07d6eebcf166f8a71405ef434d802fbf SHA512 3a236c0f481e36973b9f805e454c2efe4dd375e6b4ee406b57145136c70d5fbf4e1183d563ebf3b5fbde7363bbf5f08f0d88e507aae5bda4cc75664ecd0e33aa
-DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
-DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot-0.12.3.crate 41860 BLAKE2B d1899a1132035aaea3a784290cf4951ea3b36b2018d407e27d333b2a2ce3820e040d635009c44cb6e58ad07cec6565c0347af6f6fb02954eac2d4c348bb036f0 SHA512 368c17203fb5b9e4ecfd4857e3b1ab96b86da3770b8f21be392818c845952f72dde1072a10265760a62aa8a1dd65332bfd585667444e5fbb9dbe3280b5862703
 DIST parking_lot_core-0.9.10.crate 32406 BLAKE2B 25339d028579eb45a957ae5fdbac00288b1472d784c0aa7fa2953fcf9279c750d243ce69744993ee8cbe6899633e71e0a54ffc11e39247755685107f2f8dea54 SHA512 4f30fb60ded274d3154ffb00f6f50ac284b6fb97daebc1a2ac897ce97fa8e2ec6ff30cbdadf3b7419617a410fa7525f30ef5e580334e07d4420f4c0200a57389
-DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
 DIST portable-atomic-1.6.0.crate 140689 BLAKE2B c91d06e04a87c9a207233d8a850859aa1f5cc43dda8aed34511c3fe9641c27412796539ed045a58e649d2a0c7d71100b6b2d78a0c662fc061fd961a652ae8722 SHA512 b27cf57655a2f1e2d6ea7b45d80b4f9920a836e462f132c50dc1e4d314e162444309de1baecf45dad2defc7a5b99759165e54da9fe759b24092f8cb8755c515c
-DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1
 DIST proc-macro2-1.0.84.crate 48922 BLAKE2B 51f73a6bbc3cc42aa5bb5c3f4bf404a0c7803f7219673771d375ab288c638113f496e932b98981ef56dac755d9387f888a4147864d8f9364cef47644ea179161 SHA512 0d0bd0cc1f457b6d5feb9fd6da670f2a0662d15d88e5d20d4d308103c689a103861b3838eb25e5144cf24fb87abffdebb3175989285a03f08730ce3daa55e35e
-DIST pyo3-0.20.0.crate 431766 BLAKE2B 104bc21ce2c6931753ca0c7b2d91693f454c964260ca3c4628a899fc8e7edbe4238db913ed7356f3beff154d88a60a17c0e252b655768e75483e1d9d9b86f40b SHA512 85d9533c75f905752c62f6a4898582ae48daf085e287b44949c47260301205a5f00477927877ce46300d2801d22fbc04a958c058a37eb28374c834fff27feca1
 DIST pyo3-0.20.3.crate 434673 BLAKE2B 1dcb881fd1fe5c76e9b4951f4d95fcd1daa1845c226a4ab1db4283cabe67bda822ff03e3cc85d797fe4665a1614229e7406dea65ec5e99ce4aac96b973a7f55d SHA512 77cce558fa60bbd8d9981ff5e62fdfa9bac94bd650b287fbf14ac93ef1c326c8ae7fda82d744e3582df03cab8adf490e0f2752fabd9ae3de044e7d80984e0350
-DIST pyo3-build-config-0.20.0.crate 29534 BLAKE2B eb1d5f75276533483c52c6fcae49b294d6d8edf504859dae18811c1ef695dc6d0a055f2a34bea305975e4c1492c312433d2dcb7753484f793376c62cd59c8e40 SHA512 a01d06ebeb4b9cfe6ff6731046101e9437498453ca5aa68ec53df3bfb2f34665a489f8072636c2da16c1e867f536032fd293f05a43561117fd131bde5fe5aac7
 DIST pyo3-build-config-0.20.3.crate 30060 BLAKE2B ef122b0b7d840d5362928bac76e1299b333775ec5c49a3bf23a19eccec074917931356bbf719c6d700999941bb6a396948ee7f8761e685c8e9251af07ba0cadc SHA512 70685415bba443787dabb9c61ca3702aefbcacb0705471b496b4f01efe34291735321d91243355b4be9aed8b243e393c09fb65556f1b926ac7f22f64560bd927
-DIST pyo3-ffi-0.20.0.crate 64220 BLAKE2B dfe75b9459b4a564d1dd9f907166b76d00c5b50ba027db65d11540a7b993f3ef4e19e574135b538635ebb9c9eba66115c09198c7b6071b0b82fd94faccb1bb63 SHA512 a68f0b1380f2ac3d3034ac8b3788cd6573850137c6678694cbcc3e814b619510b9b21b11704c2e702d4eb7433d8b1d3a6dac663501b6db5197a409407802b714
 DIST pyo3-ffi-0.20.3.crate 65024 BLAKE2B 33e79a02c7ab85f4767e02a39d8553ddc015c80d13bea674885ad8a18d89bd90f866cc39d81ecbf56270ebe87d29bca48f635c4e73ec99df02ce425f1427cb31 SHA512 3d1ced58e243be7cee4a3ca831dc08a1631fcd511c707dd3bada87d7662807dea2d88393d76e56ff19a6d1c2804d93b5b6b7b5efd36b9c275d66fa1bb1bfc384
-DIST pyo3-macros-0.20.0.crate 7678 BLAKE2B 03fdc0cc9c735086ca2d27e0bcd197e69538c3640ba7f87bc3d65907db374ac7283f61bdb67a1d45b66ce972072ddcb3b1daed4aeb9a66100d11bba6515cdc86 SHA512 79b61f55010dad60dda2c5061c9736bef3f6805f28db230726937340a5c40a3fcfb727a0db7779c3eb094ebd45492f7af4f40a3fcaef42f160989a8ef6174e7e
 DIST pyo3-macros-0.20.3.crate 7920 BLAKE2B 0510accf51cd83390cbb7b6ba4ec9f4610e3dbb7448d1213994013487ae81bb087df1ba0076a3862e5ecfd172b7846f9439a2d86950a93b016aae565ced4f03b SHA512 454f3c0c054aa131ffe955e4be1af061005b9c81b4d80702827e19b983224c118dfea474da515d5fc2c79cfd3fa21204ed4af2d9e81427123e0a78bd246a23f8
-DIST pyo3-macros-backend-0.20.0.crate 49383 BLAKE2B a239042abdfcf5ad38505b57bc6b858ba346bf8681e24acf2e433f53e4a40bf0b28928b434b96f596d12acbb602b14b7e1bbf4be1e5789e6d9c754368db00a1e SHA512 c823caba48b4a30aaf84c23f80934f0172f2c76a41b538b69ebc25afcb61611b54b8fbb4ab6cac1c7a78b4e6f9f909f22748a2cd279b508d3897b74b17021d56
 DIST pyo3-macros-backend-0.20.3.crate 49797 BLAKE2B 59c55d482577ce105db3e19a1db794eaab8221d7de01197716b75d5d2602e0f27c86aaae527eae7098eafad311144550bd597efe8cd6560c82dc435021f3428f SHA512 e177ee0d6a538a555fbe9108e3e2c20102622b2c9b9696ae309189e5c4d068efad2132afd4a97d734ebabb4d7146980a26cb68dc05d5eb88f338be2ad0cd651f
-DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
 DIST quote-1.0.36.crate 28507 BLAKE2B b93495163ed205e33543ed45f084870240d479071d643704b6e348fb9ada6e1d8401893c13348b9964f4b6b17ddb96cb5458eec540f0d761655fcb96a4cd9129 SHA512 f1f002a912692f7ffd4912ca980ec57ff4aca3a7d9e2e42e9e3409e2105c9f59d86c05719f6af309bccaef2f8843b0848a6e3afda3356e045d8e7cc5956ae685
-DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
 DIST redox_syscall-0.5.1.crate 22536 BLAKE2B b7766fcf35dd865fc98495f60da54ca9a6b4cff007f4323d1c63de5d1152766aa5517139b5ec50afca39d934360c701a180c4516feccbc2600085d5d72dabd2a SHA512 0952b5f4f79f2cff04b4c21d964df7b56bc0cbff8d8a2a9a7d38ba66fd69cbd0fb004cd3d8ac6feadde8d9590858cd7e1763da7e4a5de840cdef42b1b6f1e460
-DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
 DIST ryu-1.0.18.crate 47713 BLAKE2B 409cdf4b4e77685394018371e91ad6fdb175ac57e1df9f902871f13208515e5a2ab1daa226fc1e7291278e64448332845be4cc9409bce3b2f3daed409259e104 SHA512 a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84
 DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
-DIST serde-1.0.192.crate 76866 BLAKE2B 4920089921e23bbc9180d413cff34277683db1881d7e65c5fd9dc8bad2beae954d2429c9c2049b3e98bc04314ef059e59562c936d6c767681e75b84aa0a2a468 SHA512 b34cea6034a14a6785b3023d0a1c2cb5b1c2756c28f02ea20ba62a657ba54e9d04096a54c4fdde3ff4094913dba46c99713828de4287186bf9dd3f7d89dda0c3
 DIST serde-1.0.203.crate 77935 BLAKE2B 3d3dd4f81f7d74b60483d6759879a9f87c0c7d615aec308bad1bc575fac4e2071dc86551c2789e87331dbf8089e923ae56fff82e6f5a9992cf850121b052ce1d SHA512 a8d302589244e41f6f675e8d199b2532b29f62b63e45aee141a93dad96033e4bbb27ed01c11e329ec2266cdcc6f2a40f41dfc7d1b9bada69aea81d35d2d82cec
-DIST serde_derive-1.0.192.crate 55690 BLAKE2B 1e9706fdf38880989cf907c36d1f72b5b211fc6f263a4ee35d5f7106aea0a792fd79a3361d09f831e06ce0a43680647952a8478bd1001f617d2571be428b5516 SHA512 67ad208291c8d7063adce4bface5d963488c43a326e77a89970f86f65e8f77856e173d134718f64eb80dce67283df1951022c12300dea0b4d9570fb7f637643a
 DIST serde_derive-1.0.203.crate 55867 BLAKE2B 1bc8aa96328bb83e4e4ff527b1df855bbcefd333f0c43c96d1e0b93f98a46273dd88a21653bccc8f517c4fc06d17b9b44332a963d024796e0a2c18a5bfecc824 SHA512 b2aeeab33395ac11ebdbd922fcdbda29f2592e7a20e78aef250713baf269cacf497271be7aa407f657aba33da132df0e035be046fef070f915f234097d1dd392
-DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
 DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
-DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3
 DIST syn-2.0.66.crate 264855 BLAKE2B 5029091b2cfa88e5c739be913a647dc9492696398c09b891f84089350e6f09baafd9935b81e0f3519d5465eff2e1822ef6cdc96c15d6a40d1b6b8dd2f9e7d073 SHA512 60a617bfd37d74c52e4d4d63ef0a27a2f9b982469a6926922f2f6e96754a0c66affb0847b9a44d505c053cbd788b97e998efb8d1e558ea00ae4a0b7f15bed9b0
-DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
 DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
-DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
 DIST unicode-normalization-0.1.23.crate 122649 BLAKE2B 22ea5ce3f5a2b371c3c8782321b1bbbee724db1e4d8c1d43af4e6bd8044b99307c227d93631d178d10fda445a941a485882ae0015a6e3d3c347e4bd465bbe1d9 SHA512 539f04010810d73fde7b0ab314faf813f3e7ecd2e51d7975281554b7cba4a8706e2b5523c4b7840568593652360ca59e9db0e1ce342e71c28db635ff55ffb0f5
-DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
 DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef
 DIST unindent-0.2.3.crate 7306 BLAKE2B a57407b117e99c230750c7d4a2a0899586c8271e4ba88ecb409c976905c014f42885372c234a75fbfbedf71dbed779f95f735975d150adacdcb61152a49db4c2 SHA512 2f1eb420ea3653b00d3e5fa0c2c105da8fd8a37cb3e699373c168604b799fccd5f0faf0cddce4212d119c2afb0c86b41efc3a50752b83ff7beda2bd84d360505
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
-DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
 DIST windows-targets-0.52.5.crate 6376 BLAKE2B 1d39fd86380ab086c536d88e67b60956410b345790ccea62a25e6a700757b2a9cfa6dfeb7b86934cf47b981ea2e5f42dddf49780ad9829a551dc507fcf108641 SHA512 d00d7bc7eec3c10272e803ee5c9ea0d9b07c43311124dae975b4f5aae7408c5f2ccb2fe6e68228ea3d4e70b6b658382cac6992ea177f43a9cba2ef95c4fda0ee
-DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
 DIST windows_aarch64_gnullvm-0.52.5.crate 433266 BLAKE2B dee1b69cdf1fbd4143136909e4df3adaa7b80d7630a01ca9a42fc5ad0d5a4d9a9e2873b43c6d8e55de59f237d9199fad0768c4e1cda3b1e5354847bd70d4c79e SHA512 b4cf511025458fe30d5b11368af285610e1654a8986ea9f78fa81b8bb87d38a00c4869441c62692534df66d06baf14c8a4d17f8eb06468eb260b99e2fda6439d
-DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
 DIST windows_aarch64_msvc-0.52.5.crate 827944 BLAKE2B 3bcb16d527be1dfdf18a9105ab259a064f00e949937ca423c8dcd1d2b90090d85aa7e42ca6ccc50c9baeee1aa144123d0a04643f9ff1147e62b2fce28b8a697b SHA512 c8974f81e37a43d92c4a8b142705e36b7acc58d9150d80ffa3997433da878044c467a2d9167ba792d37a183a0082d912500fea8c8fed743f395b63ca62a5758d
-DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
 DIST windows_i686_gnu-0.52.5.crate 875699 BLAKE2B 528ea431d080c5326e4c6ed316d9ea3e38b40c2e1322a12a432506a2c11555a94537661a0941e90c20eff4a9ce42c12539876dae6e77a1df18b522529928b309 SHA512 cc3e0362fb62dd5e8a855bda3be0177708ec8629ee9685f1f9aaac3f71a8cb082387388bdf49b09d3f5ee24a636b0b4f933d2c8bb75db434ee0192c8ce0547d2
 DIST windows_i686_gnullvm-0.52.5.crate 473064 BLAKE2B abe41ee330c05ee1366b3a835d15c6db3964ffd7b340ee69d215056b0d4b65c67f2782b0c04a55db64001098de87c93e2d447e25ef2a27f2cfa6685b8cf20c88 SHA512 da45c882248070911bf55698f62c245cb081a23254cdcf578df053905adb9117454235e52dcf1dd97c0d2248f92ff1d2fd3e18844a7be8d93ba08590c1eca22b
-DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
 DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693fc871ea0d7d33f52f60e164bacb35cec13d463af07c57fec4667948047cc222d8bda7f6a0be01a07e7184b69e4adc2b4577 SHA512 08c96f8e9385ac121549bae8ed228741b32004be20b2955d163a98d4b62af464f1682cb813681fa22823d20646f19335cf0a66203a876b105e119e05a4db0634
-DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
 DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
-DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
-DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
-DIST zerocopy-0.7.26.crate 128648 BLAKE2B cd26ca75197d2f74e091359f72743b8b0c92774ce4466ee47bd23854dd7c5fdf09be89ee2412bdb0e52b3c73a169b8d5c172c13285a8931c74f106970deafa60 SHA512 3789e845ec87beaf84ff9cf8d72e9968a2c7ed2350cca24836b24c16b791867db0d9a580fdb7aa2187b35ac88723932498c44d10eccc756ae92f31a97ac6771b
 DIST zerocopy-0.7.34.crate 151177 BLAKE2B 30b65131370dfa4f41d3c2705d3b75da9b76f2a4ed723dec66345939de8bafe2c181ab6c98036c25a30739cae1720d927e27e5fa5587442d5cfb7f39a7018c8f SHA512 4d27b1230ebcea4e9d4c15f38a979aa3fe8b23833e95df781a0a67054e920637642b89345596fe331907edc27abab83c766967f2a04399a6fe0a4e89fa0dd148
-DIST zerocopy-derive-0.7.26.crate 528381 BLAKE2B 4be2168e3af5a5c541be49159f7d37405eceaa9e914d670899c814076e7240781d580007d906f8433e469ffad8e7abed3e18dc8b5e80ec09837f13a28976af57 SHA512 1e28e957d1a9cb5164bc839750ecad26ccd280dc9f5ee58a02a09d2135dc097991be2755d7b87f360863f1ab030f772963677d61861f7d33699a631eb9026829
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
diff --git a/dev-python/jellyfish/jellyfish-1.0.3.ebuild b/dev-python/jellyfish/jellyfish-1.0.3.ebuild
deleted file mode 100644
index c11684b979d0..000000000000
--- a/dev-python/jellyfish/jellyfish-1.0.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_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-CRATES="
-	ahash@0.8.6
-	autocfg@1.1.0
-	bitflags@1.3.2
-	cfg-if@1.0.0
-	csv-core@0.1.11
-	csv@1.3.0
-	getrandom@0.2.11
-	heck@0.4.1
-	indoc@2.0.4
-	itoa@1.0.9
-	libc@0.2.150
-	lock_api@0.4.11
-	memchr@2.6.4
-	memoffset@0.9.0
-	once_cell@1.18.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.9
-	proc-macro2@1.0.69
-	pyo3-build-config@0.20.0
-	pyo3-ffi@0.20.0
-	pyo3-macros-backend@0.20.0
-	pyo3-macros@0.20.0
-	pyo3@0.20.0
-	quote@1.0.33
-	redox_syscall@0.4.1
-	ryu@1.0.15
-	scopeguard@1.2.0
-	serde@1.0.192
-	serde_derive@1.0.192
-	smallvec@1.11.2
-	syn@2.0.39
-	target-lexicon@0.12.12
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-ident@1.0.12
-	unicode-normalization@0.1.22
-	unicode-segmentation@1.10.1
-	unindent@0.2.3
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-targets@0.48.5
-	windows_aarch64_gnullvm@0.48.5
-	windows_aarch64_msvc@0.48.5
-	windows_i686_gnu@0.48.5
-	windows_i686_msvc@0.48.5
-	windows_x86_64_gnu@0.48.5
-	windows_x86_64_gnullvm@0.48.5
-	windows_x86_64_msvc@0.48.5
-	zerocopy-derive@0.7.26
-	zerocopy@0.7.26
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
-HOMEPAGE="
-	https://github.com/jamesturk/jellyfish/
-	https://pypi.org/project/jellyfish/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-	|| ( Apache-2.0 Boost-1.0 )
-"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
-
-distutils_enable_tests pytest
-
-python_test_all() {
-	cargo_src_test
-}
diff --git a/dev-python/jellyfish/jellyfish-1.0.4.ebuild b/dev-python/jellyfish/jellyfish-1.0.4.ebuild
index 3a91193217e3..a6ed84cb1388 100644
--- a/dev-python/jellyfish/jellyfish-1.0.4.ebuild
+++ b/dev-python/jellyfish/jellyfish-1.0.4.ebuild
@@ -80,7 +80,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.0 )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/jellyfish/_rustyfish.*.so"
 
diff --git a/dev-python/jupyter-server-proxy/Manifest b/dev-python/jupyter-server-proxy/Manifest
index eb0fe21f9ae2..d2a7888ba7e2 100644
--- a/dev-python/jupyter-server-proxy/Manifest
+++ b/dev-python/jupyter-server-proxy/Manifest
@@ -1,2 +1 @@
-DIST jupyter-server-proxy-3.2.2.tar.gz 121353 BLAKE2B 4f7c8af14a149f13272ea2802e830b38a5167f1de80dab21e1d175cb96ba3b908bd268f6dbb02cfd4fb8991ffb3315c044405925358904f82b26d55f74f97dbe SHA512 320765a8a8b1c6f213bd9c8cf514aac44f40ce93fb27fa890d8c6a9ae158f92f1b3a7119b47067db1c4f38925815f647559b3c618a9a85553cdbf7d2dc0a3872
 DIST jupyter_server_proxy-4.1.2.tar.gz 133085 BLAKE2B a859938f7ab5570e978b3afa71a924b882bcc1e788181bbdee1b2dd22d9b2e7bf706d130b04dc9a0871c3a3046041b939d8da82af5abe093ba2a2d0f9451cb20 SHA512 9dc8c84b28f79dd2f89ceb6012f0bf69d43c8c59ffe73d1559aee9d7f6d90cce93fc8b277fe3ad83197fd3d5f7aaad60c3353b0618967e51ed3749e12db4bd3c
diff --git a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild b/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
deleted file mode 100644
index 3581be4494c5..000000000000
--- a/dev-python/jupyter-server-proxy/jupyter-server-proxy-3.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter notebook server extension to proxy web services"
-HOMEPAGE="https://github.com/jupyterhub/jupyter-server-proxy"
-# The GitHub tarball includes the tests, but does not have the js stuff we need
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/aiohttp[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.0[${PYTHON_USEDEP}]
-	>=dev-python/simpervisor-0.4[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/jupyter-packaging[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
diff --git a/dev-python/krb5/krb5-0.5.1.ebuild b/dev-python/krb5/krb5-0.5.1.ebuild
index dee25e5ac55a..d99b212a5c22 100644
--- a/dev-python/krb5/krb5-0.5.1.ebuild
+++ b/dev-python/krb5/krb5-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild
index f52986f9551e..ff569c85bc7c 100644
--- a/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.9.0-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
 IUSE="cairo excel gtk3 latex qt5 tk webagg wxwidgets"
 
 DEPEND="
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 353c9a666065..95b718f4764d 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,3 +1,2 @@
-DIST mkdocs-material-9.5.23.gh.tar.gz 14870657 BLAKE2B f9736348b70c6b50b284c82bc886fa1de953557ae99221aab2567b0fee3620ff313d6c5d31bd42bbc231574a6df3b9bad58de7b210ad0b304a77d7144e3d737e SHA512 f560a3ed268abb40760a0d4263bbacc079ed407018c7618f012d29c6815dff5a02d69dac63fce75fc928ee2f2a904229b17d1a803ede83432f4f4ad403800441
 DIST mkdocs-material-9.5.25.gh.tar.gz 14879571 BLAKE2B 4a3b36d73d583fad189b0a19b4e66506318ab7ae0ef86ef1b3fec8c9e36c758c7aa941b0faa02e080c96ab018cad3f2874d676033dea8c83512b8d1561e9e79a SHA512 1c3a1466100feeb0e4150025668bd2de0d4d0552de4a156d336a5cda6bf6e94583513b1449ca0b7da4aa911e51201c105c4c95b87972b691eff280fdf32acdf2
 DIST mkdocs-material-9.5.26.gh.tar.gz 14915417 BLAKE2B d026405c89d41c8190ba1694bbea5ed3bad9ccfebda3af590d78192c7ad1ee5514740fa42c7f0f7cea59d5b8fb8a9685fa87cba0a67175e9cde53da514442241 SHA512 b2a02fcfae3ea8c0a8777726589288ab4a703175216f3ec4a96b621ff8eec8e210953fbe4ce112db151671821266f319b01bbac4d732157d2aec059120ab41a6
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.23.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.23.ebuild
deleted file mode 100644
index 5c080c205d27..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.23.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_{8,9,10,11,12} )
-
-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.25.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.25.ebuild
index eec1908ef846..5c080c205d27 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.25.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.25.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/ml-dtypes/ml-dtypes-0.4.0.ebuild b/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
index 5557415d0421..c0c2570bc024 100644
--- a/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
+++ b/dev-python/ml-dtypes/ml-dtypes-0.4.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	dev-python/numpy:=[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.8.ebuild b/dev-python/moto/moto-5.0.8.ebuild
index 20ce1f880740..86da351c6d3c 100644
--- a/dev-python/moto/moto-5.0.8.ebuild
+++ b/dev-python/moto/moto-5.0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
-inherit distutils-r1 pypi
+inherit distutils-r1 pypi toolchain-funcs
 
 DESCRIPTION="Mock library for boto"
 HOMEPAGE="
@@ -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}]
@@ -56,7 +56,7 @@ BDEPEND="
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
-python_test() {
+src_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
 		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
@@ -119,6 +119,26 @@ python_test() {
 		tests/test_stepfunctions/parser
 	)
 
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
+			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
+		)
+		EPYTEST_IGNORE+=(
+			tests/test_route53domains/test_route53domains_domain.py
+		)
+	fi
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x TZ=UTC
 
@@ -150,6 +170,10 @@ python_test() {
 		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
 	)
 
+	distutils-r1_src_test
+}
+
+python_test() {
 	EPYTEST_XDIST= epytest "${serial_tests[@]}"
 
 	EPYTEST_DESELECT+=( "${serial_tests[@]}" )
diff --git a/dev-python/moto/moto-5.0.9.ebuild b/dev-python/moto/moto-5.0.9.ebuild
index 20ce1f880740..b9af051b25a5 100644
--- a/dev-python/moto/moto-5.0.9.ebuild
+++ b/dev-python/moto/moto-5.0.9.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
-inherit distutils-r1 pypi
+inherit distutils-r1 pypi toolchain-funcs
 
 DESCRIPTION="Mock library for boto"
 HOMEPAGE="
@@ -56,7 +56,7 @@ BDEPEND="
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
-python_test() {
+src_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
 		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
@@ -119,6 +119,26 @@ python_test() {
 		tests/test_stepfunctions/parser
 	)
 
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_acm/test_acm.py::test_request_certificate_with_optional_arguments
+			tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header
+			tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins
+		)
+		EPYTEST_IGNORE+=(
+			tests/test_route53domains/test_route53domains_domain.py
+		)
+	fi
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	local -x TZ=UTC
 
@@ -150,6 +170,10 @@ python_test() {
 		tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable
 	)
 
+	distutils-r1_src_test
+}
+
+python_test() {
 	EPYTEST_XDIST= epytest "${serial_tests[@]}"
 
 	EPYTEST_DESELECT+=( "${serial_tests[@]}" )
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 20723c10c80e..28bb2b41c7da 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,2 @@
 DIST netaddr-0.10.1.tar.gz 2225283 BLAKE2B 1e350909779af0bf48d74834194358386cf4f8e11fa7b03c971b3011bcec437cc39feb72e7e79d55eb330e6ee138d15bb6dba9293667e1adb4ed1c6d42a35d78 SHA512 ca04171d5cbfd569d4f262f4870610edfd98be35899cb70983dbff5f37add963e05987ddbe1ab22d9b615580ac1abe96a8c2903681b18af8c9f2f96899b618ff
-DIST netaddr-1.2.1.tar.gz 2278809 BLAKE2B 86ab4308961e31277846555295321f392cd9d31bb53abe6a975cafba675dca0da20980a730ed90f545b03b9041269ef93b1ba4bd1a9e523ac3193059e227f63a SHA512 73e9dc76bb1b6affe56be47a409c470c95bb2d50255211b1cd0d130c3d31c16cb608897cd0785fbe155de82c43d526252b6132e8ae757b7e6a28a95889b0e0f7
 DIST netaddr-1.3.0.tar.gz 2260504 BLAKE2B e597d1603f3b55bc8ccdb404d056d94ee13b3776db603b98b91f643eb01f21bdd1094b6d3d7dbf14dc7d5642231b047a532889e98ea3909c6e2b6508ebc20ed0 SHA512 07dc08b5b24265c48fc303dc20b62a37b28c752a8ce44cb560ac7cd6fb8db874f05a5dfb18c26c0137c440e39a5e40e55a6b660f7298bfabead837dd075ba3a7
diff --git a/dev-python/netaddr/netaddr-1.2.1.ebuild b/dev-python/netaddr/netaddr-1.2.1.ebuild
deleted file mode 100644
index fba4454f8af5..000000000000
--- a/dev-python/netaddr/netaddr-1.2.1.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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="
-	https://github.com/netaddr/netaddr/
-	https://pypi.org/project/netaddr/
-	https://netaddr.readthedocs.io/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_sphinx docs/source \
-	dev-python/furo \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
diff --git a/dev-python/netaddr/netaddr-1.3.0.ebuild b/dev-python/netaddr/netaddr-1.3.0.ebuild
index b300c66f6cea..94e30b187813 100644
--- a/dev-python/netaddr/netaddr-1.3.0.ebuild
+++ b/dev-python/netaddr/netaddr-1.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs/source \
 	dev-python/furo \
diff --git a/dev-python/noseofyeti/noseofyeti-2.4.9.ebuild b/dev-python/noseofyeti/noseofyeti-2.4.9-r1.ebuild
index 00d99b61a127..9a470bd87c52 100644
--- a/dev-python/noseofyeti/noseofyeti-2.4.9.ebuild
+++ b/dev-python/noseofyeti/noseofyeti-2.4.9-r1.ebuild
@@ -31,3 +31,9 @@ EPYTEST_DESELECT=(
 	# requires alt-pytest-asyncio
 	tests/test_using_pytest.py::TestPyTest::test_it_collects_tests_correctly
 )
+
+src_install() {
+	distutils-r1_src_install
+	# delete the black .pth thingy, it breaks building CPython (sigh!)
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
index 402570e3167d..5144cde48fe2 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
index 55ebfc8b7dcb..9e188daf0cbd 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,11 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="A library to handle official service types for OpenStack and it's aliases"
-HOMEPAGE="https://github.com/openstack/os-service-types"
+HOMEPAGE="
+	https://opendev.org/openstack/os-service-types/
+	https://github.com/openstack/os-service-types/
+	https://pypi.org/project/os-service-types/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
new file mode 100644
index 000000000000..b3e6979f9e4f
--- /dev/null
+++ b/dev-python/oslo-config/files/oslo-config-9.4.0-py313.patch
@@ -0,0 +1,42 @@
+From 4f916edb457eb02bede0a7c4a64741ef13709af7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 12 Jun 2024 07:47:18 +0200
+Subject: [PATCH] Fix tests for Python 3.13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix expected argparse --help output to account for changes in Python
+3.13.
+
+Closes-Bug: 2069108
+Change-Id: Ie221e5f5b369930f015a74998f50ddb473b53b94
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ oslo_config/tests/test_cfg.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py
+index 926eb8c..f69f7a0 100644
+--- a/oslo_config/tests/test_cfg.py
++++ b/oslo_config/tests/test_cfg.py
+@@ -264,8 +264,14 @@ class HelpTestCase(BaseTestCase):
+         self.conf.register_cli_opt(uvw)
+         self.conf([])
+         self.conf.print_help(file=f)
+-        self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC', f.getvalue())
+-        self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW', f.getvalue())
++        if sys.version_info >= (3, 13):
++            self.assertIn('--a-bc, --d-ef, --d_ef A_BC', f.getvalue())
++            self.assertIn('--u-vw, --x-yz, --x_yz U_VW', f.getvalue())
++        else:
++            self.assertIn('--a-bc A_BC, --d-ef A_BC, --d_ef A_BC',
++                          f.getvalue())
++            self.assertIn('--u-vw U_VW, --x-yz U_VW, --x_yz U_VW',
++                          f.getvalue())
+ 
+ 
+ class FindConfigFilesTestCase(BaseTestCase):
+-- 
+2.45.2
+
diff --git a/dev-python/oslo-config/oslo-config-9.4.0.ebuild b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
index 87e61f7ccba4..8ee5812db580 100644
--- a/dev-python/oslo-config/oslo-config-9.4.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.4.0.ebuild
@@ -46,6 +46,11 @@ BDEPEND="
 distutils_enable_tests unittest
 
 src_prepare() {
+	local PATCHES=(
+		# https://review.opendev.org/c/openstack/oslo.log/+/921797
+		"${FILESDIR}/${P}-py313.patch"
+	)
+
 	# broken by some dep upgrade
 	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
 		oslo_config/tests/test_cfg.py || die
diff --git a/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch b/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch
new file mode 100644
index 000000000000..b80e29550854
--- /dev/null
+++ b/dev-python/oslo-log/files/oslo-log-6.0.0-py313.patch
@@ -0,0 +1,80 @@
+From 60c39a3b874f027f690b49c987daa31c37bfb0e6 Mon Sep 17 00:00:00 2001
+From: Michał Górny <mgorny@gentoo.org>
+Date: Tue, 11 Jun 2024 21:35:58 +0200
+Subject: [PATCH] Replace deprecated logging.warn() calls with logging.warning()
+
+Replace the deprecated logging.warn() calls with logging.warning().
+The former were undocumented, deprecated since Python 3.3 and eventually
+removed in Python 3.13.
+
+See: https://docs.python.org/3.13/whatsnew/3.13.html#logging
+Partial-Bug: 2069084
+Change-Id: I6d1ee13409fe84cd54b7a3aa3ed862bc6e33f1c3
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+
+diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
+index d17d20a..7c066ae 100644
+--- a/oslo_log/tests/unit/test_log.py
++++ b/oslo_log/tests/unit/test_log.py
+@@ -1115,7 +1115,7 @@
+         self.assertIn(infoexpected, self.stream.getvalue())
+         self.assertEqual('\033[00;36m', infocolor)
+ 
+-        self.colorlog.warn(warn_msg, context=ctxt)
++        self.colorlog.warning(warn_msg, context=ctxt)
+         self.assertIn(infoexpected, self.stream.getvalue())
+         self.assertIn(warnexpected, self.stream.getvalue())
+         self.assertEqual('\033[01;33m', warncolor)
+@@ -1266,7 +1266,7 @@
+         self.mylog.info(info_message, context=ctxt)
+         self.assertEqual(infoexpected, self.stream.getvalue())
+ 
+-        self.mylog.warn(warn_message, context=ctxt)
++        self.mylog.warning(warn_message, context=ctxt)
+         self.assertEqual(infoexpected + warnexpected, self.stream.getvalue())
+ 
+     def test_domain_in_log_msg(self):
+@@ -1590,11 +1590,11 @@
+             stream = self.set_root_stream()
+             log = logging.getLogger("a.a")
+             log.info("info")
+-            log.warn("warn")
++            log.warning("warn")
+             self.assertEqual("warn\n", stream.getvalue())
+         stream = self.set_root_stream()
+         log.info("info")
+-        log.warn("warn")
++        log.warning("warn")
+         self.assertEqual("info\nwarn\n", stream.getvalue())
+ 
+ 
+From cd5eb0fdf4d74150d8e3b014ef43ad0d0cbb9a5d Mon Sep 17 00:00:00 2001
+From: Michał Górny <mgorny@gentoo.org>
+Date: Tue, 11 Jun 2024 21:45:05 +0200
+Subject: [PATCH] Update test_rfc5424_isotime_format_no_microseconds output for py3.13
+
+In Python 3.13, the isotime format does not include microseconds anymore
+if they are zero.  Update the test to account for both possibilities.
+
+Closes-Bug: 2069084
+Change-Id: I8fc022e5ad0df8ec4bd413de12106390d9dbc0f1
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+
+diff --git a/oslo_log/tests/unit/test_log.py b/oslo_log/tests/unit/test_log.py
+index 7c066ae..3176c1c 100644
+--- a/oslo_log/tests/unit/test_log.py
++++ b/oslo_log/tests/unit/test_log.py
+@@ -996,7 +996,10 @@
+         self.config(logging_default_format_string="%(isotime)s %(message)s")
+ 
+         message = "test"
+-        expected = "2015-12-16T13:54:26.000000+00:00 %s\n" % message
++        if sys.version_info >= (3, 13):
++            expected = "2015-12-16T13:54:26+00:00 %s\n" % message
++        else:
++            expected = "2015-12-16T13:54:26.000000+00:00 %s\n" % message
+ 
+         self.log.info(message)
+ 
diff --git a/dev-python/oslo-log/oslo-log-6.0.0.ebuild b/dev-python/oslo-log/oslo-log-6.0.0.ebuild
index 6d45eb634bc3..892683ff64f7 100644
--- a/dev-python/oslo-log/oslo-log-6.0.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-6.0.0.ebuild
@@ -44,6 +44,12 @@ distutils_enable_sphinx doc/source \
 	dev-python/openstackdocstheme \
 	dev-python/oslo-config
 
+PATCHES=(
+	# https://review.opendev.org/c/openstack/oslo.log/+/921797
+	# https://review.opendev.org/c/openstack/oslo.log/+/921798
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 src_test() {
 	# requires eventlet
 	rm oslo_log/tests/unit/test_pipe_mutex.py || die
diff --git a/dev-python/parameterized/files/parameterized-0.9.0-py313-test.patch b/dev-python/parameterized/files/parameterized-0.9.0-py313-test.patch
new file mode 100644
index 000000000000..cad68e9b7921
--- /dev/null
+++ b/dev-python/parameterized/files/parameterized-0.9.0-py313-test.patch
@@ -0,0 +1,26 @@
+From 85cd1c5e0b95a75385e68972ceef3329edb7b7f0 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Mon, 30 Oct 2023 10:38:27 -0400
+Subject: [PATCH 1/2] Fix tests to handle Python 3.13 stripping indents from
+ docstrings
+
+https://docs.python.org/3.13/whatsnew/3.13.html#other-language-changes
+
+https://github.com/python/cpython/issues/81283
+---
+ parameterized/test.py | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/parameterized/test.py b/parameterized/test.py
+index 6419171..6d11e32 100644
+--- a/parameterized/test.py
++++ b/parameterized/test.py
+@@ -385,6 +385,8 @@ def _assert_docstring(self, expected_docstring, rstrip=False):
+         actual_docstring = test_method.__doc__
+         if rstrip:
+             actual_docstring = actual_docstring.rstrip()
++        if sys.version_info[:2] >= (3, 13):
++            expected_docstring = inspect.cleandoc(expected_docstring)
+         assert_equal(actual_docstring, expected_docstring)
+ 
+     @parameterized.expand([param("foo")],
diff --git a/dev-python/parameterized/parameterized-0.9.0.ebuild b/dev-python/parameterized/parameterized-0.9.0.ebuild
index 255ebe8cc78e..1433be996854 100644
--- a/dev-python/parameterized/parameterized-0.9.0.ebuild
+++ b/dev-python/parameterized/parameterized-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,6 +26,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-py312-test.patch"
+	# https://github.com/wolever/parameterized/pull/176
+	"${FILESDIR}/${P}-py313-test.patch"
 )
 
 distutils_enable_tests unittest
diff --git a/dev-python/pdm-backend/pdm-backend-2.3.0.ebuild b/dev-python/pdm-backend/pdm-backend-2.3.0.ebuild
index b56d8c11f94e..186ba3712e9d 100644
--- a/dev-python/pdm-backend/pdm-backend-2.3.0.ebuild
+++ b/dev-python/pdm-backend/pdm-backend-2.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # see src/pdm/backend/_vendor/vendor.txt
 RDEPEND="
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index ee8fd871c93f..fd373865e37b 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1,5 +1,2 @@
-DIST prompt_toolkit-3.0.43.tar.gz 425733 BLAKE2B 663b3f675e004de9f2d6dce09320bc0bbd6a47f5a581d5b49bb5fe36f0d3eee2022522eac09dccc5bceaf6227e17abe475f133c53b912b3b84f940877aaa6b9a SHA512 833666da9bc7259eec2ee357cb936001880ac1f88c33a1e346ef5e4b8c3fcd37ff7d7102e590d509b0b0ac1e046fcd9d2a7046857c9e95dc3890f1b70c62544c
-DIST prompt_toolkit-3.0.44.tar.gz 425654 BLAKE2B 48d080ad6cab2ed192284ae376c65b43a500b7c642b9298af6afc109a16ddf53d8242748af772dd556a568356ab4af95bb71dfb36ec345ee9d4904f0de15fa20 SHA512 09202d023e52eae2200e23be1ed9bfa91ce072c1c6970d00d92fe9f0fabfaa4117b9e174b43b9ae041f4e0605c77a990625e51e51925d1ff63a65a10e09734a8
 DIST prompt_toolkit-3.0.45.tar.gz 425324 BLAKE2B 771b1c4b80475f52547d725bbcc5e12223ab15cce9ca5a63c4364615c3f1c6ab23c9e14023178bf2e30467138f1b8407132eb22208fdc29c3c34992c6899c016 SHA512 6e8758e06fac7462821bd803a99f961017cd4e889eb39744fc1a3665983c12fced7bdf0538d83d709040cfb182e3694c1dc31e0c9e62aa08c4b1a7336955d35e
-DIST prompt_toolkit-3.0.46.tar.gz 425591 BLAKE2B 74d10e5bb93cbdf9625f621ca80f15bb012c2839956fa0edaecab7f7af4ce1209eea4eb8fcd403563be5da514f3d08f550d605d44ec2e3b7af136950a9f9428c SHA512 c75dc84a45c24ddbf6074c65aa5e5e0e4ba6d2f1c1a9211e771a534118571b1ad31db57457304365d08091fdf5ad0f8827893269d3963fc1f29b0dd56a12ca64
 DIST prompt_toolkit-3.0.47.tar.gz 425859 BLAKE2B fa12151c48126c971b2dc468a6e1de4ede49ade08f637e9c02d2284f74f07cbcf4d3167447e616af3385eef0355f8928bfc50632f0cf61138320d7e75777c07e SHA512 c27dc03929f0bd373e41bf70e19f82f97c8f0a6308e51e079e89d6233f1e638c34703cc056fe8c86cc9b63f91b5d345c28ce0e418f79f6e450ca06bcda5820fd
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.43.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.43.ebuild
deleted file mode 100644
index 411e14a3c2c8..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.43.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_{8,9,10,11,12} 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.ebuild
deleted file mode 100644
index 3a9463cfb5dd..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.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_{8,9,10,11,12} 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 ~ia64 ~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.45.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.45.ebuild
index 3a9463cfb5dd..20d3ec2b6540 100644
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.45.ebuild
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.45.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.ebuild
deleted file mode 100644
index 3a9463cfb5dd..000000000000
--- a/dev-python/prompt-toolkit/prompt-toolkit-3.0.46.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_{8,9,10,11,12} 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 ~ia64 ~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/pyalsa/Manifest b/dev-python/pyalsa/Manifest
index 132834427a65..604a0c75bfa4 100644
--- a/dev-python/pyalsa/Manifest
+++ b/dev-python/pyalsa/Manifest
@@ -1 +1,2 @@
+DIST pyalsa-1.2.12.tar.bz2 40133 BLAKE2B 50e4cff2d4fccdf8fd62cb379c08f55f8229b20cb51ac8c89c6ba84214663992748fc9c3555b4242457348dfc877280754f1574eaffb8c9cbc4e82d376d6660c SHA512 9073cb9a1fc6ad04bafa368435e45dd6c8506e14f0e594f02f7d2b7e06c72b8af9babf08cfead57a940a9ebde4548edf608196fea56089fe8d1300a04f573151
 DIST pyalsa-1.2.7.tar.bz2 40132 BLAKE2B c100d16bd8c0d9fc6eddcda360f3582c55ed1b143a58a49caf76a62494882952d311271941ce0ecdf57ac934f3564dc922c80e8a5f5742b593341ff4215b700c SHA512 126501fe7b9c006f28e9290bdd3ad907ea9e053b71e21e2c6f0b0beeecdba07b4b557014041b03452f96be690f59f2e647e075487ee87054f21f66df7f39b34b
diff --git a/dev-python/pyalsa/pyalsa-1.2.12.ebuild b/dev-python/pyalsa/pyalsa-1.2.12.ebuild
new file mode 100644
index 000000000000..6fcf27efc79a
--- /dev/null
+++ b/dev-python/pyalsa/pyalsa-1.2.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for ALSA library"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+SRC_URI="https://www.alsa-project.org/files/pub/pyalsa/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# Needs access to system's alsa configuration/devices
+RESTRICT="test"
+
+DEPEND="
+	media-libs/alsa-lib
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	cd "${T}" || die
+
+	shopt -s nullglob
+	local test
+	local failed
+	for test in "${S}"/test/*.py ; do
+		${EPYTHON} "${test}" || {
+			eerror "${test} failed with ${EPYTHON}"
+			failed=1
+			break
+		}
+	done
+	shopt -u nullglob
+
+	if [[ ${failed} -eq 1 ]] ; then
+		die "${test} failed with ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/pycairo/files/pycairo-1.26.0-py313.patch b/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
new file mode 100644
index 000000000000..c3c0d74cb415
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
@@ -0,0 +1,30 @@
+https://github.com/pygobject/pycairo/pull/366
+
+From 387e27fa36d29bc8f656656ca8b47e7b4996f4f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 29 May 2024 21:25:41 +0200
+Subject: [PATCH] Avoid invalid PyBUF_READ flag in PyObject_GetBuffer()
+
+Since Python 3.13, the flag is no longer allowed.
+
+See https://github.com/python/cpython/pull/114707
+
+Fixes https://github.com/pygobject/pycairo/issues/365
+---
+ cairo/surface.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cairo/surface.c b/cairo/surface.c
+index 048522c6..f00db8b5 100644
+--- a/cairo/surface.c
++++ b/cairo/surface.c
+@@ -484,7 +484,7 @@ surface_set_mime_data (PycairoSurface *o, PyObject *args) {
+     return NULL;
+   }
+ 
+-  res = PyObject_GetBuffer (obj, view, PyBUF_READ);
++  res = PyObject_GetBuffer (obj, view, PyBUF_SIMPLE);
+   if (res == -1) {
+       PyMem_Free (view);
+       return NULL;
+
diff --git a/dev-python/pycairo/pycairo-1.26.0-r1.ebuild b/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..307987fe81c7
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="
+	https://www.cairographics.org/pycairo/
+	https://github.com/pygobject/pycairo/
+	https://pypi.org/project/pycairo/
+"
+SRC_URI="
+	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="examples"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=x11-libs/cairo-1.15.10[svg(+)]
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	"${FILESDIR}"/pycairo-1.26.0-py313.patch
+)
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+	esetup.py build_tests
+	epytest
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# we need to pass --root via install command, sigh
+	cat > "${T}/distutils-extra.cfg" <<-EOF || die
+		[install]
+		root = ${D}
+	EOF
+	local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
+	esetup.py \
+		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/include/pycairo
+	doins cairo/py3cairo.h
+}
diff --git a/dev-python/pydantic-core/pydantic-core-2.18.3.ebuild b/dev-python/pydantic-core/pydantic-core-2.18.3.ebuild
index b162b0f30d15..645b8446b808 100644
--- a/dev-python/pydantic-core/pydantic-core-2.18.3.ebuild
+++ b/dev-python/pydantic-core/pydantic-core-2.18.3.ebuild
@@ -107,7 +107,7 @@ LICENSE+="
 	|| ( Apache-2.0 Boost-1.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"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.7.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pydantic/pydantic-2.7.2.ebuild b/dev-python/pydantic/pydantic-2.7.2.ebuild
index 2a33e3c6e8a6..3deaa57a589a 100644
--- a/dev-python/pydantic/pydantic-2.7.2.ebuild
+++ b/dev-python/pydantic/pydantic-2.7.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index c69b047a794d..ef172309b485 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,6 +1,2 @@
-DIST pydata-sphinx-theme-0.15.2.gh.tar.gz 2409617 BLAKE2B ee9405e36241bfac93927e4de2d12f65b95717e459b1f584179f0d7ad2c5161b85b39ef60527de8b2e0eac8a38621452e3a5dcf15733980359b4f03526a906bb SHA512 11653f36def68ddc63994d00e1de63575ce6a24f7b2887c53ea8c3063bdc30fe57baf25e239a70f63a1598625a3707ac405171230c977d7e0ed3f88404c8cd21
 DIST pydata-sphinx-theme-0.15.3.gh.tar.gz 2393144 BLAKE2B 69755220c6099921d57eefc926106c0fe8127fd9c9a47f74050113abb78b997fe60fe50cc01e8a6f926eb7261c34628fae4b6f624ca713031feb4dbb3ca5aa29 SHA512 bba767a92855aefb81139887a515de7917704a447ea223a43067e8e301e0f0ade008dfcf2751c0e9e147af9768bf4e25af7f767c325f07b057f7f4b353e56d1a
-DIST pydata-sphinx-theme-0.15.3_rc1.gh.tar.gz 2386216 BLAKE2B bfd3c12753598a29d8fe1e631993e318c4c83340f8680ad6f810d3b1b7c4daa72bd71d7bdd86381ddfac71e915d548bb6b3175d18d99354a0d61d546c1de930e SHA512 81923fb35ec9c03161a81fe8cdaa9fc36d2be3f80af628adc31c97eaa2daadf5c3652c817b847c11be1ca2694c5fc1359056a23d7c73e0e097c99986cbe11853
-DIST pydata_sphinx_theme-0.15.2-py3-none-any.whl 4523706 BLAKE2B fdb3ca53d26b7da882b9530929bb41729d77af6aef8c5748c41ab9ea4b43cdc858dd3f270432c18accc59e5408a267125f840b4ed2815d0cda7e748afffa90d0 SHA512 60c00161768cb0259462e7af16b8d2324ddc367391d83efcb34dd7999364b2745795cb6807a903f80cfaf21bd8b2b466cbee3fa9cb800be4221955ab888481d0
 DIST pydata_sphinx_theme-0.15.3-py3-none-any.whl 4631638 BLAKE2B 261b08b159cf073e896f27fbedc3375cdd7181b2dd6f85264530d34b9cdccdaaaf175f6f7c349768014bfb373ffbaaaf1071b85de6e3805cf992e656cb04ddb5 SHA512 6bed169c5ae65027f7e5d8903062e0be910bb69409aa061cf8c17be3632d90d189a8dde49a8d760f747308a5e1891237bb36a70430cfd6f3d9207274aa8d8bf2
-DIST pydata_sphinx_theme-0.15.3rc1-py3-none-any.whl 4612708 BLAKE2B eb22dd58325749b162515f11a79c57ddd0511305af1ae0616691b9a488e85b34e67bebd39e60a8c1b3c6fc603ac25c8f213358e38f446a68ba31a5889432c9f1 SHA512 e1871caa26eb0a5c62b30cfeb655150450acaa55cc17b958fb0c16a1fcfe470810bb2fa7e4b7d3d656fb8a7f51d459b0d2b68a38ee339fa801385441ea2f5e22
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2-r1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2-r1.ebuild
deleted file mode 100644
index 13b395e17c06..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.2-r1.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=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	<dev-python/sphinx-7.3[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)/pydata_sphinx_theme" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild
index 81bfdc03f942..95d5e0f361d7 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3_rc1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3_rc1.ebuild
deleted file mode 100644
index 81bfdc03f942..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3_rc1.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=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-MY_P=${P/_/}
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV/_/}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# pygments version mismatch?
-	'tests/test_build.py::test_pygments_fallbacks[real]'
-)
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pygobject/pygobject-3.46.0-r1.ebuild b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
new file mode 100644
index 000000000000..192933475eb2
--- /dev/null
+++ b/dev-python/pygobject/pygobject-3.46.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit gnome.org meson virtualx xdg distutils-r1
+
+DESCRIPTION="Python bindings for GObject Introspection"
+HOMEPAGE="
+	https://pygobject.readthedocs.io/
+	https://gitlab.gnome.org/GNOME/pygobject/
+"
+
+LICENSE="LGPL-2.1+"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+cairo examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.64:2
+	>=dev-libs/gobject-introspection-1.64:=
+	dev-libs/libffi:=
+	cairo? (
+		>=dev-python/pycairo-1.16.0[${PYTHON_USEDEP}]
+		x11-libs/cairo[glib]
+	)
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		>=app-accessibility/at-spi2-core-2.46.0[introspection]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection,jpeg]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+python_configure() {
+	local emesonargs=(
+		$(meson_feature cairo pycairo)
+		$(meson_use test tests)
+		-Dpython="${EPYTHON}"
+	)
+	meson_src_configure
+}
+
+python_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
+	local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
+	meson_src_test --timeout-multiplier 3 || die "test failed for ${EPYTHON}"
+}
+
+python_install() {
+	meson_src_install
+	python_optimize
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pyspnego/pyspnego-0.10.2.ebuild b/dev-python/pyspnego/pyspnego-0.10.2.ebuild
index 0d260a37e2f5..e7d572cf4979 100644
--- a/dev-python/pyspnego/pyspnego-0.10.2.ebuild
+++ b/dev-python/pyspnego/pyspnego-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index 400eb874ad04..a2a24c393c48 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,2 +1 @@
-DIST pytest-testinfra-10.1.0.tar.gz 85117 BLAKE2B 3db43661def60ef9627bd888b92f409886f2d6f1ae1306a8d46bbcbe3363cf5ae9e79f9fab49f0d0f8d6529d677a40db04fc68597d0d11e0285a7e27a01283fb SHA512 98003ab250c06fc69ff015fc53af87aa642109866a86bdd679cc8876db614660f11f79c3146aef10c7b8f47723a13777cbad07276af661986129a5d0bfc11e1b
 DIST pytest-testinfra-10.1.1.tar.gz 86567 BLAKE2B b9dd9ea4023b1b7d9399615fbf6493efb094ec7f2478f65b46118173f6b20f545b645d06f20b42544325d68a917812a55f902ca28774b8ffb8743ac8182c3970 SHA512 6173937b03eaefb84a95b6fca616092ea0649f880fd1bccef6364f338b859bda8d09d706b517625b81cff4f663ababa766dac82d4d094c38683d9b170909f6c9
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-10.1.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-10.1.0.ebuild
deleted file mode 100644
index d799892f9a00..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-10.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-testinfra/
-	https://pypi.org/project/pytest-testinfra/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-# Ansible is called via its CLI
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x EPYTEST_DESELECT=()
-
-	# This is the only test which actually fails if salt cannot be imported
-	if ! has_version "dev-python/salt[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			test/test_backends.py::test_backend_importables
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-10.1.1.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-10.1.1.ebuild
index d53ca217b239..d799892f9a00 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-10.1.1.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-10.1.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pythran/pythran-0.16.1.ebuild b/dev-python/pythran/pythran-0.16.1.ebuild
index 77b815405381..33e14010656c 100644
--- a/dev-python/pythran/pythran-0.16.1.ebuild
+++ b/dev-python/pythran/pythran-0.16.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-libs/boost
diff --git a/dev-python/rst-linker/rst-linker-2.6.0.ebuild b/dev-python/rst-linker/rst-linker-2.6.0.ebuild
index 81ec66556df2..c47cb864d8e3 100644
--- a/dev-python/rst-linker/rst-linker-2.6.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.6.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/jaraco-context[${PYTHON_USEDEP}]
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 828d9f122e02..a96daa3e81c8 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,2 +1,3 @@
 DIST spyder-kernels-2.5.1.tar.gz 99906 BLAKE2B 50cae2744ea2bb2d59046423f084d8e29385a82fe05c5d18fa15a64261c4ae0bef6e6f0427c8053ea6cc622d87660f98dc55613d954818a72babc92a119e3dc2 SHA512 bd855e95fb84014cf86dd062aeffc580ce23db7f1c5c1b4ba6d5386d0be4a4bcde625a6bc3a6d126b07a66ef720860019bab5f245a383fd0b2c7975f6d331598
+DIST spyder_kernels-2.5.2.tar.gz 99972 BLAKE2B 178f175fe03fd2b7871681ae30d10b62a4daf9ee606477eab4f88a4d81d2692b80cdcf4f9b6d46c4cfc0394b98d798e93dda870a3f1cbe6f77e243fd2b06d97c SHA512 4cf5462d6a6e72bf13f9890fbc5a4008788e132ee3315b0ad01a00beff6b78c63f47b7b5d19be601b64984196cc1a5c4706a4c5bbe878d938e487ae9ddd9f1fc
 DIST spyder_kernels-3.0.0b6.tar.gz 238208 BLAKE2B 2d1e227e876eec6ea6435d581892a3f76845164b4c4c2835ace859394f95813ea2630fc5c03bdec827e025680478184831328530d6b56373e220fe52d219d386 SHA512 f3a18731850d5a7f2ad9c45a706c4526b9d22f357a0175b4f67954c3d1912640a5871157373575ed8b0f044bdb618548c8d0a3f8fff44492d06dceab43efc6ad
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild
new file mode 100644
index 000000000000..34982404a5d5
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-2.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+	https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	<dev-python/ipykernel-7[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-6.29.3[${PYTHON_USEDEP}]
+	<dev-python/ipython-9[${PYTHON_USEDEP}]
+	>=dev-python/ipython-8.13.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-client-9[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.9[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/h5py[${PYTHON_USEDEP}]
+			dev-python/pandas[${PYTHON_USEDEP}]
+			dev-python/xarray[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# we no longer package distributed, and also removed dependency on dask
+	spyder_kernels/console/tests/test_console_kernel.py::test_dask_multiprocessing
+)
+
+python_test() {
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_IGNORE=(
+			# requires pandas
+			spyder_kernels/utils/tests/test_nsview.py
+		)
+		EPYTEST_DESELECT+=(
+			# requires hdf5
+			spyder_kernels/utils/tests/test_iofuncs.py::test_save_load_hdf5_files
+			spyder_kernels/utils/tests/test_dochelpers.py
+		)
+	fi
+	distutils-r1_python_test
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 77c849078fd8..0263bbaf420b 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,3 +1,4 @@
 DIST spyder-5.5.4.gh.tar.gz 16258160 BLAKE2B 4f29db0805e1d7eed33497df0b28754cd873cfa5c6bd6c7955efc881000498a7527e413de5107ca4414f2dcbf0aa55903b1bf496626e7b470942cc5142abc152 SHA512 4f68d1edc2901b4cffb67943c782ccd89e923722579ec4144064de2ec1b6bbf89f831feb3eb58a7adf7c403efc7d2529c38017b423bb32709170915792f4deb2
+DIST spyder-5.5.5.gh.tar.gz 16258487 BLAKE2B 3fa3ea611fc3267918e4314027c0825905f256a7fe070534c7608a4a42938c3934f34f4dc06fe0cfc0ac32e03fbdc294974672b010aaf9bc32512b817af62e6b SHA512 5f5d25822f20f8ae8767402b037cca78b760768b9bc53ef74ed95839aa59e1c24206457fd4c71003bb9ebffe8daf8ad3bda8dd40e71cc15d3d3ee2030b284b42
 DIST spyder-6.0.0_beta1.gh.tar.gz 15555385 BLAKE2B 5ae3a174929c2044f8e351d4edcb018f16133d63de1cb1aae0749509da1c350fa4fff54fd5067e8af58377e111ec7434f5aaa56728565826f31fe3c791800349 SHA512 d89385525054740b8c6aaf1e7d769cac6c6c102aad7cc32199b5667b06ad96e22838f5416ca2a77af68529032519fdf383c41f964b66a8a7db9252c2835bfdaf
 DIST spyder-docs-32efdaebc11dab0b8e0767717342b7d306dc06ea.gh.tar.gz 94897009 BLAKE2B 30e0b42e34bddb60d8fc986183a363b71455067bc7f4411cb75a00c5758e87501ee07ad0b484caed2aa3cf91153be814c7faf935be8665b6984bce38ebcd0be2 SHA512 9f9aa56ab27aed8d27c3d653119d5c5454b4317a78a7ff27715d91cac9dec79143db85d4f1c87b10fa821eb33abc043912df308fa6c84ade59539bd633eefbd2
diff --git a/dev-python/spyder/spyder-5.5.5.ebuild b/dev-python/spyder/spyder-5.5.5.ebuild
new file mode 100644
index 000000000000..15cdad6b93bc
--- /dev/null
+++ b/dev-python/spyder/spyder-5.5.5.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 optfeature virtualx xdg
+
+# Commit of documentation to fetch
+DOCS_PV="32efdaebc11dab0b8e0767717342b7d306dc06ea"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/
+"
+SRC_URI="
+	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-util/cookiecutter-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jellyfish-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-venv-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-black-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/python-lsp-black-3[${PYTHON_USEDEP}]
+	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-3.2[${PYTHON_USEDEP}]
+	<dev-python/qdarkstyle-3.3[${PYTHON_USEDEP}]
+	>=dev-python/qstylizer-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-1.3.1[${PYTHON_USEDEP}]
+	<dev-python/qtawesome-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.5.1[${PYTHON_USEDEP}]
+	<dev-python/qtconsole-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-2.1.0[${PYTHON_USEDEP},pyqt5,svg,webengine]
+	>=sci-libs/rtree-0.9.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.5.2[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-order[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/QtPy[${PYTHON_USEDEP},pyside2,pyqt5]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-build.patch"
+	"${FILESDIR}/${PN}-5.2.0-doc-theme-renamed.patch"
+)
+
+DOCS=(
+	"AUTHORS.txt"
+	"Announcements.md"
+	"CHANGELOG.md"
+	"CODE_OF_CONDUCT.md"
+	"CONTRIBUTING.md"
+	"NOTICE.txt"
+	"README.md"
+	"RELEASE.md"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc \
+	dev-python/sphinx-panels \
+	dev-python/pydata-sphinx-theme \
+	dev-python/sphinx-multiversion
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these dependencies are packaged separately:
+	#    dev-python/spyder-kernels,
+	#    dev-python/python-lsp-server,
+	#    dev-python/qdarkstyle
+	rm -r external-deps/* || die
+	# runs against things packaged in external-deps dir
+	rm conftest.py || die
+
+	# Do not depend on pyqt5<5.16, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.16, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# Do not depend on ipython, this dependency is carried in spyder-kernels
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e "/'pyqt5[ 0-9<=>.,]*',/d" \
+		-e "/'pyqtwebengine[ 0-9<=>.,]*',/d" \
+		-e "/'python-lsp-server\[all\][ 0-9<=>.,]*',/d" \
+		-e "/'parso[ 0-9<=>.,]*',/d" \
+		-e "/'jedi[ 0-9<=>.,]*',/d" \
+		-e "/'pylint[ 0-9<=>.,]*',/d" \
+			setup.py || die
+		# -e "/'ipython[ 0-9<=>.,]*',/d" \
+
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+		-e "/^PYLINT_REQVER/c\PYLINT_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
+		# -e "/^IPYTHON_REQVER/c\IPYTHON_REQVER = '>=0.0.1'" \
+
+	# do not check deps, fails because we removed dependencies above
+	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# can't check for update, need network
+	rm spyder/workers/tests/test_update.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+# Calling pytest directly somehow passes the pytest arguments to spyder
+# causing an invalid argument error
+python_test() {
+	virtx "${EPYTHON}" runtests.py
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
+	optfeature "Run Cython files in the IPython console" dev-python/cython
+	optfeature "The hdf5/h5py plugin" dev-python/h5py
+	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+	optfeature "Vim key bindings" dev-python/spyder-vim
+	optfeature "Unittest support" dev-python/spyder-unittest
+	optfeature "System terminal inside spyder" dev-python/spyder-terminal
+	optfeature "Jupyter notebook support" dev-python/spyder-notebook
+	# spyder-memory-profiler is not compatible with spyder-5.2+ yet
+	# optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+	# spyder-reports not yet updated to >=spyder-4.0.0
+	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+	# Plugins with no release yet:
+	# optfeature "Manage virtual environments and packages" dev-python/spyder-env-manager
+	# optfeature "VCS (e.g. git) integration" dev-python/spyder-vcs
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
index e40d1978f2ce..c4b66a639dc3 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.30-r1.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/structlog/structlog-24.2.0.ebuild b/dev-python/structlog/structlog-24.2.0.ebuild
index d87a9110280f..055557106e87 100644
--- a/dev-python/structlog/structlog-24.2.0.ebuild
+++ b/dev-python/structlog/structlog-24.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index b063fec8c605..6fd58940634d 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -1,2 +1 @@
-DIST typeguard-4.2.1.tar.gz 71292 BLAKE2B ad529ce88c7d38d4491734c5ac8e465bbde66ccd76a18f83c0f61837fa10c50450bc8535bbab48e913cea9593795a6b16d82650eed38c277f65cd5d5556d71a1 SHA512 2bfe2836cbcca0f223d16e5772c9c53169b75391f062eb6fc5f1abc22297b7482f3482812f15b3ed92dd31b86f803072245370dce5ba19fc4d31723b1d2f38b3
 DIST typeguard-4.3.0.tar.gz 73374 BLAKE2B 0a7cd0dfa2c3caa19160cd66fffeeafe21cb1d195271b82e67d26fa471615768c48f8dd7d92a004db187b9b231f1bce12f1054d98f4157b784854dbb32b18320 SHA512 ce085f0655beede2d3e1178c64cea0a6fbebe9e7eeece3f9ff656233d74d3d9be5c4119aaecdc0541e9adf9c6f1458b06e6c2056b8e5394ded3f7ae4101e9e11
diff --git a/dev-python/typeguard/typeguard-4.2.1.ebuild b/dev-python/typeguard/typeguard-4.2.1.ebuild
deleted file mode 100644
index fb164ad442a7..000000000000
--- a/dev-python/typeguard/typeguard-4.2.1.ebuild
+++ /dev/null
@@ -1,42 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Run-time type checker for Python"
-HOMEPAGE="
-	https://pypi.org/project/typeguard/
-	https://github.com/agronholm/typeguard/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.10.0[${PYTHON_USEDEP}]
-	' 3.{10..12})
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
-
-	local -x PYTHONDONTWRITEBYTECODE=
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# the XFAIL test pass due to some package being installed
-	epytest -o xfail_strict=False -p typeguard
-}
diff --git a/dev-python/typeguard/typeguard-4.3.0.ebuild b/dev-python/typeguard/typeguard-4.3.0.ebuild
index d96df4310cf7..8e4c9d9286f8 100644
--- a/dev-python/typeguard/typeguard-4.3.0.ebuild
+++ b/dev-python/typeguard/typeguard-4.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/typing-extensions-4.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/uritools/Manifest b/dev-python/uritools/Manifest
index 616e406b8389..d8b91505c2e3 100644
--- a/dev-python/uritools/Manifest
+++ b/dev-python/uritools/Manifest
@@ -1,2 +1 @@
-DIST uritools-4.0.2.tar.gz 23673 BLAKE2B 3535a149e934c031548e4aeeb9be3e9e17492360dd8f77add5565677cdfc7657c9e27806729b18c52cdb477345fe4b9ecd54e2a3aaba6f692cd9e45c487bf75d SHA512 71879ee6c346bf0c7b0d12fc42c91ecc8af553b3bf038edddd504e374933911e92c8adc26b2ff07243380229261e0b3eb6a6c6e189904aa4b467348098d73fff
 DIST uritools-4.0.3.tar.gz 24184 BLAKE2B 4d7cb21a0bd50c80cf34401646cd2049f16c2673cc9d057878881d940af089f72871df65acbaa67489114ee3094d94f9ac68c67ed75c995177679102851c58fb SHA512 91dbe20a166fc142def443564ba5a630be85e329181041c8ba8a421f01fb8c4c043a2335dd4a773a672d24933509af4b9c7e635119e4e87ea5504eb6afa978f3
diff --git a/dev-python/uritools/uritools-4.0.2.ebuild b/dev-python/uritools/uritools-4.0.2.ebuild
deleted file mode 100644
index 7b124c821376..000000000000
--- a/dev-python/uritools/uritools-4.0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DOCS_BUILDER="sphinx"
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_DIR="docs"
-
-inherit distutils-r1 docs pypi
-
-DESCRIPTION="RFC 3986-compliant URI parsing, classification and composition"
-HOMEPAGE="
-	https://github.com/tkem/uritools/
-	https://pypi.org/project/uritools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-
-distutils_enable_tests pytest
diff --git a/dev-python/uritools/uritools-4.0.3.ebuild b/dev-python/uritools/uritools-4.0.3.ebuild
index c76a7b519b75..efdaffb3b129 100644
--- a/dev-python/uritools/uritools-4.0.3.ebuild
+++ b/dev-python/uritools/uritools-4.0.3.ebuild
@@ -19,6 +19,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 69c834681d58..652bc35bab9b 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -6,6 +6,7 @@ DIST uv-0.1.24-crates.tar.xz 64420840 BLAKE2B 7324461092a07c86aadaddf051aaa7454e
 DIST uv-0.1.24.gh.tar.gz 899637 BLAKE2B fab26ba9934fc5f586505b5ac1fa386c11f07e51ca2bb2a79f46d5dec9475ba8d75ad8587223d5149df5f2a225146d020a49b7ff81ed26b949cff55892738c2d SHA512 520b47a096b50fce9e7b7af5bca203df9bf4c2d0aafbe28a3dcfe0592d8ddcaa7b58d52300c67454f6aeecfd196f1592be18e45c95b7c67257361917cdb0154d
 DIST uv-0.2.10-crates.tar.xz 49410344 BLAKE2B d1e921cac3e9ef07fc9055fa6ff463776e1f0fcf0c7e655d7774e5a422c8aaab4f892e3962d38e8500545f831f25d106628d11bddc98095b722156a913d824b4 SHA512 71ba87d1d7c9668086d62420318c6d9489446259d55ae17ee9bb63530e63c140533dfb575d838ff75f8fb053dc316924c7e699386a78ca043428b87a3e68d70f
 DIST uv-0.2.10.gh.tar.gz 1178721 BLAKE2B ae7d527016c5f10b700db89167acef1a9bc62779e1486e908659a8f73ed22957eea39654c97d94fd7976ba19a907b9abd92cd93f620ca3d8f0bee8b2289f1436 SHA512 f8afe27ec75e89e00343e59123e4e785dae77c49f63a3bcb88ec6e194bc761f27447c92c9ec2d7e6d885ea90b8df1747fafd9800e6f0066af61d3ed590e7f3c9
+DIST uv-0.2.11.gh.tar.gz 1188556 BLAKE2B 9d22cf0bc202635c0631eb15dc955d19c4c65f1baff31391e62962837ff91611479bb9190cbcd15655dd92366ce58c8b13bfea369812c68fb6a56cb11883d745 SHA512 124f4d866307ff0ac522c5780995d6f4be3ae95a35ff4615937511b2d658eb4444005fa49905f1886fc22fe35e7882efbe5fbd87752d457e441c462639d8506a
 DIST uv-0.2.8-crates.tar.xz 49233792 BLAKE2B 9ba3816b627b02079ca64c29764c4484a2ca617f8ea5426f0cbae367c5e2647f5b0a3927408e3352645358a1de5513e66e3cec38955920435d1165178e348196 SHA512 b2474f3445745f4351774c597100bafc471db30d9078c4891b426ef299b0b5b30185fb5a2398cc4cf3851e2bdab1fc2c361a990d80eddbd9100314102583cc2a
 DIST uv-0.2.8.gh.tar.gz 1139645 BLAKE2B 6a3ce5cf2b9978e0b292c543e81b17df476f410a832524b9d036981a4fcb8ab67f1769e9f975599c7df950b9de802a8147ce209fb5f7c7ea66b4d0197843e6e0 SHA512 e0c6e9e5274095b2315604fd9ae4742c931cd64a893a832142c2ee54be2b8b32fa28a72eb16ef7ef26c7ad3d37ba8428dca62ad653977e98a5c1f029b9260201
 DIST uv-0.2.9-crates.tar.xz 49233792 BLAKE2B 9ba3816b627b02079ca64c29764c4484a2ca617f8ea5426f0cbae367c5e2647f5b0a3927408e3352645358a1de5513e66e3cec38955920435d1165178e348196 SHA512 b2474f3445745f4351774c597100bafc471db30d9078c4891b426ef299b0b5b30185fb5a2398cc4cf3851e2bdab1fc2c361a990d80eddbd9100314102583cc2a
diff --git a/dev-python/uv/uv-0.2.11.ebuild b/dev-python/uv/uv-0.2.11.ebuild
new file mode 100644
index 000000000000..b9b79626e6fc
--- /dev/null
+++ b/dev-python/uv/uv-0.2.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+"
+
+declare -A GIT_CRATES=(
+	[async_zip]='https://github.com/charliermarsh/rs-async-zip;1dcb40cfe1bf5325a6fd4bfcf9894db40241f585;rs-async-zip-%commit%'
+	[pubgrub]='https://github.com/astral-sh/pubgrub;a68cbd1a26e43986a31563e1d127e83bafca3a0c;pubgrub-%commit%'
+)
+
+# workaround faulty assumptions that 3.12 is the newest Python installed
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit cargo check-reqs python-any-r1
+
+CRATE_PV=0.2.10
+DESCRIPTION="A Python package installer and resolver, written in Rust"
+HOMEPAGE="
+	https://github.com/astral-sh/uv/
+	https://pypi.org/project/uv/
+"
+# pypi sdist misses scripts/, needed for tests
+SRC_URI="
+	https://github.com/astral-sh/uv/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/uv-${CRATE_PV}-crates.tar.xz
+	"
+fi
+
+# most of the code
+LICENSE="|| ( Apache-2.0 MIT )"
+# crates/pep508-rs is || ( Apache-2.0 BSD-2 ) which is covered below
+# Dependent crate licenses
+LICENSE+="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD ISC MIT
+	MPL-2.0 Unicode-DFS-2016
+"
+# ring crate
+LICENSE+=" openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+BDEPEND="
+	>=virtual/rust-1.77
+	test? (
+		dev-lang/python:3.8
+		dev-lang/python:3.9
+		dev-lang/python:3.10
+		dev-lang/python:3.11
+		dev-lang/python:3.12
+	)
+"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+check_space() {
+	local CHECKREQS_DISK_BUILD=3G
+	use debug && CHECKREQS_DISK_BUILD=9G
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/vorot93/tokio-tar/pull/23
+	# (fortunately uv already depends on portable-atomic, so we don't
+	# have to fight Cargo.lock)
+	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
+}
+
+src_compile() {
+	cd crates/uv || die
+	cargo_src_compile
+}
+
+src_test() {
+	cd crates/uv || die
+	cargo_src_test --no-fail-fast
+}
+
+src_install() {
+	cd crates/uv || die
+	cargo_src_install
+}
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 3d20e9570ed3..f6c34e51a827 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,2 +1 @@
-DIST validators-0.28.1.tar.gz 66294 BLAKE2B c52bb565243b74b7be5442c7d20140fafd47d6240b735b1d0ebb3ed53ad7827d853a1e3cdcba3d09ecd0343c38e62c0549e87b648abd8f596141cffae6e67233 SHA512 69f6dacda7aa326bad42296a7deba3e95545e657f40a687e3995a61b3f75e2597232467267325c638c05df88518b02021a20262a1e223f600268112facd30fac
 DIST validators-0.28.3.tar.gz 65129 BLAKE2B 00ff76346e46f14bc0eb986eb6fc791e43b773bbad2b1cfe9d0b6f24d0f141ff258d5bea97d5330b98307a79c0a75dba69ffe3d85c28fa2ebe509ca0e305d2aa SHA512 d5d1fe6cf250698161efaa6c4d23225f2aab250a7bbf1a1d1de2ee171fd35731905a1c8596dfbc15840a97ac684d8497cb338047db8fc8520ce2056198ccae8d
diff --git a/dev-python/validators/validators-0.28.1.ebuild b/dev-python/validators/validators-0.28.1.ebuild
deleted file mode 100644
index 0ec92fe50cfd..000000000000
--- a/dev-python/validators/validators-0.28.1.ebuild
+++ /dev/null
@@ -1,21 +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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Data Validation for Humans"
-HOMEPAGE="
-	https://github.com/python-validators/validators/
-	https://pypi.org/project/validators/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/validators/validators-0.28.3.ebuild b/dev-python/validators/validators-0.28.3.ebuild
index c129e9d75200..0ec92fe50cfd 100644
--- a/dev-python/validators/validators-0.28.3.ebuild
+++ b/dev-python/validators/validators-0.28.3.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/watchfiles/watchfiles-0.22.0.ebuild b/dev-python/watchfiles/watchfiles-0.22.0.ebuild
index aa827c55f102..8d00348e54dc 100644
--- a/dev-python/watchfiles/watchfiles-0.22.0.ebuild
+++ b/dev-python/watchfiles/watchfiles-0.22.0.ebuild
@@ -93,7 +93,7 @@ LICENSE+="
 	Apache-2.0-with-LLVM-exceptions CC0-1.0 ISC MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch b/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch
new file mode 100644
index 000000000000..b98624d7df8f
--- /dev/null
+++ b/dev-python/wxpython/files/wxpython-4.2.1-integer-division-for-randint.patch
@@ -0,0 +1,26 @@
+From https://github.com/wxWidgets/Phoenix/pull/2508
+From 3b042c863f4092f802a877a972fd6eb284451a78 Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code@bnavigator.de>
+Date: Sat, 6 Jan 2024 21:58:29 +0100
+Subject: [PATCH] integer division for randint
+
+Python 3.12 does not accept floats for random.randint() anymore
+---
+ unittests/test_dcDrawLists.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unittests/test_dcDrawLists.py b/unittests/test_dcDrawLists.py
+index 9e35e5eaf..6696a79a0 100644
+--- a/unittests/test_dcDrawLists.py
++++ b/unittests/test_dcDrawLists.py
+@@ -63,8 +63,8 @@ def makeRandomRectangles():
+     rects = []
+ 
+     for i in range(num):
+-        W = random.randint(10, w/2)
+-        H = random.randint(10, h/2)
++        W = random.randint(10, w//2)
++        H = random.randint(10, h//2)
+         x = random.randint(0, w - W)
+         y = random.randint(0, h - H)
+         rects.append( (x, y, W, H) )
diff --git a/dev-python/wxpython/wxpython-4.2.1-r1.ebuild b/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..5364e1b56160
--- /dev/null
+++ b/dev-python/wxpython/wxpython-4.2.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_IN_SOURCE_BUILD="1"
+PYTHON_COMPAT=( python3_{10..12} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="wxPython"
+WX_GTK_VER="3.2-gtk3"
+
+inherit distutils-r1 multiprocessing virtualx wxwidgets pypi
+
+DESCRIPTION="A blending of the wxWindows C++ class library with Python"
+HOMEPAGE="
+	https://www.wxpython.org/
+	https://github.com/wxWidgets/Phoenix/
+	https://pypi.org/project/wxPython/
+"
+
+LICENSE="wxWinLL-3"
+SLOT="4.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test webkit"
+RESTRICT="!test? ( test )"
+
+# wxPython doesn't seem to be able to optionally disable features. webkit is
+# optionally patched out because it's so huge, but other elements are not,
+# which makes us have to require all features from wxGTK
+DEPEND="
+	>=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X]
+	media-libs/libpng:=
+	media-libs/tiff:=
+	media-libs/libjpeg-turbo:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-text/doxygen
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.6.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		${VIRTUALX_DEPEND}
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-flags.patch"
+	"${FILESDIR}/${PN}-4.2.0-cython-3.patch"
+	"${FILESDIR}/${PN}-4.2.1-integer-division-for-randint.patch"
+)
+
+python_prepare_all() {
+	if ! use webkit; then
+		eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch"
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	setup-wxwidgets
+}
+
+python_compile() {
+	DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die
+
+	# Refresh the bundled/pregenerated sip files
+	"${EPYTHON}" build.py sip || die
+
+	# Build the bindings
+	"${EPYTHON}" build.py build_py \
+		--use_syswx \
+		--no_magic \
+		--jobs="$(makeopts_jobs)" \
+		--verbose \
+		--release || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# virtx probably
+		unittests/test_display.py::display_Tests::test_display
+		unittests/test_frame.py::frame_Tests::test_frameRestore
+		unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar
+		unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp
+		unittests/test_uiaction.py::uiaction_MouseTests
+
+		# assertion (TODO)
+		unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric
+		unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor
+
+		# seems to rely on state from a previous test (sigh)
+		unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore
+
+		# requires Spanish localization
+		unittests/test_intl.py::intl_Tests::test_intlGetString
+
+		# TODO
+		unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor
+		unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1
+		unittests/test_windowid.py::IdManagerTest::test_newIdRef03
+	)
+	local EPYTEST_IGNORE=()
+	if ! use webkit; then
+		EPYTEST_IGNORE+=( unittests/test_webview.py )
+	fi
+
+	# We use pytest-forked as opensuse does to avoid tests corrupting each
+	# other.
+	virtx epytest --forked -n "$(makeopts_jobs)" unittests
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 76d698e18559..e677780578e6 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,4 +1 @@
-DIST ytmusicapi-1.7.0.tar.gz 276068 BLAKE2B 39b33782fde91ada32269e6ec8630164796caff2e17743a852f1eca72debaf23b01fd9e8f4d486e1a67bf790221a233339b0074034d993053388cf31cadb32a0 SHA512 4e5f021e7dc9879e6cf881595afc8c17637e0d722a019b855563358f38bb74fe5ff154ea639c6d56836967c520bfece504733bf960b77cfe79b0586390339551
-DIST ytmusicapi-1.7.1.tar.gz 276874 BLAKE2B 0fee5ad7219b675cbd1cf91e7722dc0addfc7f91be7ad8d74e0df99cc770726df68a1e37d47531161323a42115283b8072f87df2e0261c3b14176a005dd4e52b SHA512 1285ca07cfe18e3965cb769c34a507266188e4d5fa3e34f8e29bb69e0a31aab605f25dbdf24c790621cbcbd7552c0b44a0ae8a0be0237971a02f19d58a05b79f
-DIST ytmusicapi-1.7.2.tar.gz 277033 BLAKE2B f81ecedc00a48e2daa777388d8d362aa5bb6cb5c984277e96a0a4fe62aef55b5926f7eac26ec7a6e526db6ee7abbad570a4e71d7544349b51f33bcaa7f5daac4 SHA512 012b904accdb2fd84871909a139b1b665d0266ed2c157d4988ec0a02eb22ca47803ab980af2828442ca83a08c76c4fb88bec4dedcaf3a15b58e9ff1d2b9ee44c
 DIST ytmusicapi-1.7.3.tar.gz 277265 BLAKE2B 1461450fb2c1ceff63703f26c89aa6947cfca7ecae13232dadc207a20361e36ec43a03718dd5b0d63a84e69a5e77eae722fa06b3f1036183f65bbf5ee0fc1ebe SHA512 fa305e8a07c668270db27ea537101862ad78f8c1d353f4f5d98cefdfbcdf1388195e250f65076b1fc0aba5f95951d6b9ff76ca71201e9b35cd1af3fa6fd4476b
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.0.ebuild
deleted file mode 100644
index 42c5d110c627..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.1.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.1.ebuild
deleted file mode 100644
index 006c7e44cb09..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.2.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.2.ebuild
deleted file mode 100644
index 006c7e44cb09..000000000000
--- a/dev-python/ytmusicapi/ytmusicapi-1.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Unofficial API for YouTube Music"
-HOMEPAGE="https://ytmusicapi.readthedocs.io/
-	https://github.com/sigma67/ytmusicapi/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild
index 006c7e44cb09..42c5d110c627 100644
--- a/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild
+++ b/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://ytmusicapi.readthedocs.io/
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"