Adding metadata

132 files changed, 1069 insertions, 2055 deletions

diff --git a/dev-python/Babel/Babel-2.14.0.ebuild b/dev-python/Babel/Babel-2.14.0.ebuild
deleted file mode 100644
index 920f75ce3d17..000000000000
--- a/dev-python/Babel/Babel-2.14.0.ebuild
+++ /dev/null
@@ -1,56 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-# see scripts/download_import_cldr.py
-CLDR_PV=43.0
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="
-	https://babel.pocoo.org/
-	https://pypi.org/project/Babel/
-	https://github.com/python-babel/babel/
-"
-SRC_URI+="
-	https://unicode.org/Public/cldr/${CLDR_PV%.*}/cldr-common-${CLDR_PV}.zip
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# RDEPEND in BDEPEND for import_cldr.py usage, bug #852158
-BDEPEND="
-	app-arch/unzip
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm babel/locale-data/*.dat || die
-	rm babel/global.dat || die
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	if [[ ! -f babel/global.dat ]]; then
-		"${EPYTHON}" scripts/import_cldr.py "${WORKDIR}"/common || die
-	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	epytest
-}
diff --git a/dev-python/Babel/Babel-2.15.0.ebuild b/dev-python/Babel/Babel-2.15.0.ebuild
index bb95b05a02bc..92cb363e5f28 100644
--- a/dev-python/Babel/Babel-2.15.0.ebuild
+++ b/dev-python/Babel/Babel-2.15.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 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 in BDEPEND for import_cldr.py usage, bug #852158
 BDEPEND="
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index c5f61bf09a2e..2116b05e9557 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,4 +1,2 @@
-DIST Babel-2.14.0.tar.gz 10795622 BLAKE2B 7beb79d34e5fc44a7520b7ca8541dbe41676b466c418a4fcf994fc556ca86d9cbc9ddeecad886b49a61ea4f62502413472a96df0fd65606f447e423c7ece4723 SHA512 cfcd93bc5e57e3d23b8fb67f77fdeeb08183cc5ef9a6e044085a090cec3d722cf658e740c639f5a834df11a4cff0dacafdbba435184d77a78d56fc0bb6b62fd2
 DIST babel-2.15.0.tar.gz 9390000 BLAKE2B 9cd99524dbb191b5b8835452118b57b23abc89123e358a29de2375263a0264a1ea4c71324632eff8711cab7dbb40a20e97acd8e0faa448872353852b064ca524 SHA512 8cff4dbbe84047f7e8b625772036d2a23b6f7dfc36aa15332e581d4331fdac1d0308341294741afc43f3180368a7cc7675f68f28bbf94a621c693a822d4a2028
-DIST cldr-common-43.0.zip 31934452 BLAKE2B 8390db2fb58ede0f55ebe369e5598c6a47b6ed01c95162d85365a699ceeb15d4d912a1ea26062c8f37a467c58fdaca27e99a9a133fec4afe15bf6ac6ba29b4f6 SHA512 930c64208d6f680d115bfa74a69445fb614910bb54233227b0b9ae85ddbce4db19e4ec863bf04ae9d4a11b2306aa7394e553384d7537487de8011f0e34877cef
 DIST cldr-common-44.0.zip 31750682 BLAKE2B a6f708d6c5bd02efc1e0672250b181542fb0f91d48bbaabddfc3b6b9e21201e3c9e6d09222cbc929b4ae654d2a0804a90f77f384df93577af188a907ce20bd61 SHA512 f2cd8733948caf308d6e39eae21724da7f29f528f8969d456514e1e84ecd5f1e6936d0460414a968888bb1b597bc1ee723950ea47df5cba21a02bb14f96d18b6
diff --git a/dev-python/Faker/Faker-25.1.0.ebuild b/dev-python/Faker/Faker-25.1.0.ebuild
deleted file mode 100644
index c75e86175fe0..000000000000
--- a/dev-python/Faker/Faker-25.1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	local EPYTEST_DESELECT=(
-		tests/providers/test_job.py::TestCsCZ::test_job
-	)
-	epytest
-}
diff --git a/dev-python/Faker/Faker-25.2.0.ebuild b/dev-python/Faker/Faker-25.2.0.ebuild
index b726995539a4..7654943106a7 100644
--- a/dev-python/Faker/Faker-25.2.0.ebuild
+++ b/dev-python/Faker/Faker-25.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 26f611ffa075..7eeab17fcf7f 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,2 +1 @@
-DIST Faker-25.1.0.tar.gz 1760306 BLAKE2B eb8a35853f8e70902d8ff59532cc8c5766f6986314b88afb973adfd6c8a0184ebcd9d1eecee1e9dd48bc393ba1270be88a3c3f463df8e0679aff7f00544cfd4d SHA512 6d53c843685d735664d6d986e8af76a520372900ea06cb54f86656ebb322d34543aa7aee8417cabb8c81a0ccc3ee3b212114790ff46aeb60cf29071bbf5c0361
 DIST Faker-25.2.0.tar.gz 1760547 BLAKE2B cba47dd21caaabef23212d38b856c67d9d68c6478f44269ed0da7df4aa06cd313caef1d8072572c2b680172e6a6313548228cbd446e397b6e29fd3e5317bc707 SHA512 bec0a516944f36a4714bcb9b8d46dbd4ab3fb3feb6d4818fd28e9d22d0cfd1621845f669940d41365ec423398ef58714e18de5ae537ce7524cf27018ab088c8f
diff --git a/dev-python/agate-excel/agate-excel-0.4.1.ebuild b/dev-python/agate-excel/agate-excel-0.4.1.ebuild
index 221f829e1a75..7ee61ab6b394 100644
--- a/dev-python/agate-excel/agate-excel-0.4.1.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.4.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/agate/Manifest b/dev-python/agate/Manifest
index 444e93cf4111..db409d09cba3 100644
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@@ -1,2 +1,3 @@
 DIST agate-1.10.1.tar.gz 203139 BLAKE2B 656cc5f9abcc38848560bb81a9e7b1a8cf498897ea49a98bd3b44f3d625c69047ef3fa32b4a7191d8807c1bee29bd0c5a8d0ed99e1b91e30ea294b8fb436fb3d SHA512 b039fa587d1fc49277860f9876ad1f885f2530e82888ad8a32066f35e3086b5da0cb7aa9a2ed09ea7992efe649d32df27a372f85e4a06e8aca0d6ec8651567b5
 DIST agate-1.10.2.tar.gz 203542 BLAKE2B 697aa898756ab256ed8e9bb92a29b3ad1f8edeb7a8b9636d753a74373714d84a6d0a5d4abb8600b52eb510e478f16ca707839a01ab3a05fec72d88e443322dae SHA512 87385515e3ffe88afdeaa1202368d69824501dc5816b40e1f475afd027bbd5229c70e7449485e0845f50203e6749f3a736d16f17752d1bdd040dc92cbcc2461a
+DIST agate-1.11.0.tar.gz 203764 BLAKE2B c652f4f28840b036361fd05d5f1ca612fdb251a055f2e42d3859050907f0c0f0c17cb2a3351d5eb9d96759f18fc6851a501d1d3aabcb2ad257093ee97a96693d SHA512 9134987ed32838565e6d599568d5346e90d4623dca0868d13d134d6333d55f64ee4fc67469c691e1e964c735e14482e18615ca79f25108ffaf24c4da50a28ae6
diff --git a/dev-python/agate/agate-1.11.0.ebuild b/dev-python/agate/agate-1.11.0.ebuild
new file mode 100644
index 000000000000..2d595fd7df94
--- /dev/null
+++ b/dev-python/agate/agate-1.11.0.ebuild
@@ -0,0 +1,45 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="
+	https://github.com/wireservice/agate/
+	https://pypi.org/project/agate/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/leather-0.3.3-r2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/cssselect-0.9.1[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/furo
+
+EPYTEST_DESELECT=(
+	# require specific locales
+	tests/test_data_types.py::TestDate::test_cast_format_locale
+	tests/test_data_types.py::TestDateTime::test_cast_format_locale
+)
diff --git a/dev-python/bcrypt/bcrypt-4.1.3.ebuild b/dev-python/bcrypt/bcrypt-4.1.3.ebuild
index 51b25d41c61f..5b490ecec1b8 100644
--- a/dev-python/bcrypt/bcrypt-4.1.3.ebuild
+++ b/dev-python/bcrypt/bcrypt-4.1.3.ebuild
@@ -80,7 +80,7 @@ LICENSE="Apache-2.0"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 3911c03aef36..269e9f20b920 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,3 +1,2 @@
-DIST cssutils-2.10.2.tar.gz 723055 BLAKE2B 7064f1928bf8496bef8eccf4663f944ed79e5e8065808254d12b68f32e9c8f308724e652b24fa584af54a0976ff3ab2f2751a9102e0f31a5f4a8fabf8f417b23 SHA512 c678b6953b13e8a7ac7b2abbe0b8be26283973537089071828e618b359bcce27df636f382d8b0dc50b13962e0d2dffcce991a47f678954ec018849e57026446d
 DIST cssutils-2.10.3.tar.gz 723334 BLAKE2B 3ee122fb843aeb8db79d5288d465fda4f632e63a51e09a9de7d1429b1e7a81de93518eb1c4766b7a18c7db3fb64480815fd3a8c22b9b4a4186890402328f1b42 SHA512 44570c048d64d9d2825f64c551470d86fd5a166c35fef7915e9187ba26807300c342360aa881fc4f7ed86ef7aba63969d5055811f5ecae4b3998bf4b28ffd5ea
 DIST cssutils-2.11.0.tar.gz 723164 BLAKE2B 433358b1bd167d72ceda9c60f4460a95804c492a92854747dfc49ef4e2efe69388781c515adbb3c5d9010895e13a039ea33c46d4b2c71cb8bb15eead3e998b60 SHA512 42ce87502757d213ab5b2812c8a76724955f565826c69ffe4db53d49020ce960c8544423428f2b8c24d9b1b215c22f18de9dff66ef249c8060d17aad990d9a6f
diff --git a/dev-python/cssutils/cssutils-2.10.2.ebuild b/dev-python/cssutils/cssutils-2.10.2.ebuild
deleted file mode 100644
index 3182e7923bef..000000000000
--- a/dev-python/cssutils/cssutils-2.10.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A CSS Cascading Style Sheets library"
-HOMEPAGE="
-	https://pypi.org/project/cssutils/
-	https://github.com/jaraco/cssutils/
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.1[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# network
-		encutils/__init__.py::encutils
-		cssutils/tests/test_parse.py::TestCSSParser::test_parseUrl
-		examples/website.py::examples.website.logging
-	)
-	local EPYTEST_IGNORE=(
-		# path mismatch with "parse" package
-		examples/parse.py
-	)
-
-	epytest
-}
diff --git a/dev-python/cssutils/cssutils-2.10.3.ebuild b/dev-python/cssutils/cssutils-2.10.3.ebuild
index 7334b1981df5..7a546c5fdcb0 100644
--- a/dev-python/cssutils/cssutils-2.10.3.ebuild
+++ b/dev-python/cssutils/cssutils-2.10.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index fce740dea5e2..f79d57079ce9 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,2 +1 @@
-DIST csvkit-1.5.0.tar.gz 3811034 BLAKE2B 4fd22d532803a520f9276e7f6be9068db4dba288582d85848143a6a5c70357a05450f7dcdc7a086949cd6568c62fa79546026a2a2aaa3e7f10985d0177c0a676 SHA512 e8e776419405a0e278f12440ba43e9f9c801673b54a6d2c0d3b543929f7a00fa30e9fc35697398127bdf73984453300ef5cde44355396b549d1a039e4e7c068e
 DIST csvkit-2.0.0.tar.gz 3818527 BLAKE2B 87976e5ea703fe16daac48b65f1f4132821e212c90c6f25fecc17f7e8e1c3859d3224e9b1ee77f6f5a39263391535e83a388ccbe4a610a96cec6256b64056b77 SHA512 70b1d8977bbeefd3ae4cfc26149d17527f6ad56b16b5a932d930505ac7b272fcb0ed9080eba33c9c60daa347c1e79c95c6b05c8dded2e0ea5a301335d21f8a88
diff --git a/dev-python/csvkit/csvkit-1.5.0.ebuild b/dev-python/csvkit/csvkit-1.5.0.ebuild
deleted file mode 100644
index 8e86894f195a..000000000000
--- a/dev-python/csvkit/csvkit-1.5.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A suite of utilities for converting to and working with CSV"
-HOMEPAGE="
-	https://github.com/wireservice/csvkit/
-	https://pypi.org/project/csvkit/
-"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	>=dev-python/agate-1.6.3[${PYTHON_USEDEP}]
-	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
-	dev-python/openpyxl[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	dev-python/xlrd[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/zstandard[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# fails depending on locale, let's not force en_US
-		tests/test_utilities/test_csvstat.py::TestCSVStat::test_decimal_format
-	)
-	local -x LC_ALL=C.UTF-8
-	epytest
-}
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index e9eef42d5dd6..53daf4230113 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1 +1,2 @@
 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.1.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
new file mode 100644
index 000000000000..42e334206251
--- /dev/null
+++ b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
@@ -0,0 +1,67 @@
+# 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
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Fails in upstream CI as well as of 8.13.1
+		# https://github.com/elastic/elastic-transport-python/commit/39488817cd5da824101322e40652d17938f0acac
+		tests/node/test_tls_versions.py::test_unsupported_tls_versions[https://tls-v1-2.badssl.com:1012-772-RequestsHttpNode]
+		# 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/et_xmlfile/Manifest b/dev-python/et-xmlfile/Manifest
index f57537cad621..f57537cad621 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et-xmlfile/Manifest
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild b/dev-python/et-xmlfile/et-xmlfile-1.1.0-r1.ebuild
index 4324e993b5d1..55524982e5da 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild
+++ b/dev-python/et-xmlfile/et-xmlfile-1.1.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 inherit distutils-r1
 
 MY_PV=${PV%.0}
-MY_P=${PN}-${MY_PV}
+MY_P=et_xmlfile-${MY_PV}
 
 DESCRIPTION="An implementation of lxml.xmlfile for the standard library"
 HOMEPAGE="
@@ -21,8 +21,8 @@ SRC_URI="
 "
 S=${WORKDIR}/${MY_P}
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 RDEPEND="
diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et-xmlfile/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et-xmlfile/metadata.xml
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 5b69d7609ed9..b8a0d706ba34 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,3 +1,4 @@
 DIST fonttools-4.50.0.gh.tar.gz 3823676 BLAKE2B ebcc19b3f2c8367147c7e05a514951d25497b1e6e224226e0831f566464b6d407e6a52a3b30620dbe87df1a0ce03d95cb5769cab15ee78822d218ccd81419263 SHA512 a169f18077f2c4f0ad8a46569a30b3e35ca2343e9f3d43cd362dafa26085f545dd9a42e7edb3054f9d37e1576117aa34a0c2b4adabc9fc29c076e69d3fdd66ee
 DIST fonttools-4.51.0.gh.tar.gz 3826324 BLAKE2B 84485874ce373ef759746104f8c0593d63e2955427a1606404e56ae006342fef39e3fe9468d85b974741ae26a8cceba23ea46e33fff0e2648c154074b01b5eac SHA512 3a9984b56a8ed1e918781c8503dd8901276ae7e20659777ff0a9bf799a42b4ec112a6cfd31deb81f73f7f19c03145a66962187fb243b2580db9d3ef7011d3d82
 DIST fonttools-4.52.1.gh.tar.gz 3845345 BLAKE2B c987e8214d4ca998b4f700d11d5c2e31efd8684f4dda6541735db9bd7547b738a1cb786b6c84aa30488a5a6fb2d71e4246dff7f873fdc1161745f74bcc29bd40 SHA512 4bb5fbcbb108723ffeb07baa87699e664775d52653aadae5ee15ed3a74d7f6349e1972e3873f3041fba6d68144f5a364b86373f158f6574a03e68e0eef4ffc7d
+DIST fonttools-4.52.3.gh.tar.gz 3848091 BLAKE2B 5f748ff511b35f72f914bed03ea4a0eb3032dcfabc49e95abcbfbfd7c05bb0ed886422b07ff87058304c9c5cfcf4d20202ea61cc2e32fe7bbfae18d3b1c88c8c SHA512 00ad7975d0fc1d6d7cf13221e81526242ebd30c7ca511bc937d96400f186ee9b7505fcbaf8f6f2996a354a8e52b6ed7a5dda2cfdd271403e97e173b771648719
diff --git a/dev-python/fonttools/fonttools-4.52.3.ebuild b/dev-python/fonttools/fonttools-4.52.3.ebuild
new file mode 100644
index 000000000000..22bc101caf93
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.52.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="
+	https://github.com/fonttools/fonttools/
+	https://pypi.org/project/fonttools/
+"
+SRC_URI="
+	https://github.com/fonttools/fonttools/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~x86"
+IUSE="+native-extensions"
+
+RDEPEND="
+	>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	native-extensions? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+	test? (
+		dev-python/brotlicffi[${PYTHON_USEDEP}]
+		dev-python/munkres[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x FONTTOOLS_WITH_CYTHON=$(usex native-extensions)
+	[[ ${EPYTHON} == pypy3 ]] && FONTTOOLS_WITH_CYTHON=0
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# flaky test
+		Tests/ttLib/woff2_test.py::WOFF2ReaderTest::test_get_normal_tables
+	)
+
+	if [[ ${EPYTHON} == pypy3 ]] &&
+		has_version "dev-python/pyxattr[${PYTHON_USEDEP}]" &&
+		{
+			has_version "<dev-python/pypy3_10-exe-7.3.13_p2" ||
+			has_version "<dev-python/pypy3_10-exe-bin-7.3.13_p2"
+		}
+	then
+		EPYTEST_DESELECT+=(
+			# affected by a bug in PyPy/pyxattr
+			# https://github.com/iustin/pyxattr/issues/41
+			Tests/t1Lib/t1Lib_test.py::ReadWriteTest::test_read_with_path
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest \
+		-p rerunfailures --reruns=5 \
+		Tests fontTools || die -n "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index c3803c16290a..b570fcc760c3 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -1,2 +1 @@
-DIST freezegun-1.5.0.tar.gz 33167 BLAKE2B 3cf05a41c4d66ded61a67385faa07ad80348ad7620db6076f1371d1707b9f6229d85bf2f87ff3533a9529f9d6c30e5f5bcdaf0a499b1e73760070ee5706936b9 SHA512 65d3c95e4992d80c104d52e1164662308aea0884e4a0bb1343f028e514519548dd295dca7dd97d06aaa57a61c0c71fae0bd040f944936858e0f72b2a08860694
 DIST freezegun-1.5.1.tar.gz 33697 BLAKE2B bb08703a7e6f6f4a2145c4dc7b10245af3ced5d1a0a9355df74acd03bfe1687ee22e54ffbbd791204a497b50d4a2c578eb531379dd9e55d274ede72785bb39fa SHA512 384122e31c1db90d4c30cc60ad6d693209c933538e4d507a45c6ff116dcfe2f5f2602116c31aae4576da876ea327d502b01f651414d41b6cb11cc6e98d2aacbc
diff --git a/dev-python/freezegun/freezegun-1.5.0.ebuild b/dev-python/freezegun/freezegun-1.5.0.ebuild
deleted file mode 100644
index 1ae5999e5cb2..000000000000
--- a/dev-python/freezegun/freezegun-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Let your Python tests travel through time"
-HOMEPAGE="
-	https://github.com/spulec/freezegun/
-	https://pypi.org/project/freezegun/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="
-	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		python3.13)
-			EPYTEST_DESELECT+=(
-				# https://github.com/spulec/freezegun/issues/547
-				tests/test_datetimes.py::TestUnitTestMethodDecorator::test_method_decorator_works_on_unittest_kwarg_frozen_time
-				tests/test_datetimes.py::TestUnitTestMethodDecorator::test_method_decorator_works_on_unittest_kwarg_frozen_time_with_func
-				tests/test_datetimes.py::TestUnitTestMethodDecorator::test_method_decorator_works_on_unittest_kwarg_hello
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/freezegun/freezegun-1.5.1.ebuild b/dev-python/freezegun/freezegun-1.5.1.ebuild
index e42b6b8d1566..1ae5999e5cb2 100644
--- a/dev-python/freezegun/freezegun-1.5.1.ebuild
+++ b/dev-python/freezegun/freezegun-1.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	>dev-python/python-dateutil-2.7[${PYTHON_USEDEP}]
diff --git a/dev-python/httpauth/Manifest b/dev-python/httpauth/Manifest
index 8dff66939152..1840fe76521a 100644
--- a/dev-python/httpauth/Manifest
+++ b/dev-python/httpauth/Manifest
@@ -1 +1,2 @@
 DIST httpauth-0.3.tar.gz 4440 BLAKE2B 41c9ba9ee50b7fcc4ed409f4b34897b5243df4065fd081cd5c0951ebe2719a34a424e59c21adbcd9be133c8fe4fa4ad9dc7bec561285b873987f982f684b3682 SHA512 aa35148322a1c5ffc22a132d3062d300118aa23181a0008018d0aacfd473758d86d50ff1236d88126858a53e2f45aeea938988b2d1a8f62f80a97d8c2cc69822
+DIST httpauth-0.4.gh.tar.gz 5437 BLAKE2B 9db9085afab06a8189e6ecad38a7da8a5599a39f6ca257f3a29818eeea100ca8301c704873977177ca6f40f46953365d5af14a713f87ea85747d84d006787850 SHA512 3e42bd400447f0179ae70662d79c61378a20dd1fcec2684d6b374de3114e362d1ad177ac7dcd9624a167de213df67438933161c083515a1ec6d20aadc6003dc4
diff --git a/dev-python/httpauth/httpauth-0.4.ebuild b/dev-python/httpauth/httpauth-0.4.ebuild
new file mode 100644
index 000000000000..c623a46bb8bb
--- /dev/null
+++ b/dev-python/httpauth/httpauth-0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A WSGI middleware that secures routes using HTTP Digest Authentication"
+HOMEPAGE="
+	https://github.com/jonashaag/httpauth/
+	https://pypi.org/project/httpauth/
+"
+# 0.4 has broken sdist
+# https://github.com/jonashaag/httpauth/issues/6
+SRC_URI="
+	https://github.com/jonashaag/httpauth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index 3f70248adae6..344c972003c9 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-python/hypercorn/hypercorn-0.17.2.ebuild b/dev-python/hypercorn/hypercorn-0.17.2.ebuild
new file mode 100644
index 000000000000..a0e62d644b6f
--- /dev/null
+++ b/dev-python/hypercorn/hypercorn-0.17.2.ebuild
@@ -0,0 +1,51 @@
+# 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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 65c92c4efa54..cc371f507703 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,2 @@
-DIST hypothesis-6.100.1.gh.tar.gz 9450717 BLAKE2B b27e3be6b43ee7d140ee00064748cd651683414b1b9f8d697c166ddec7596c11e2c47a814de91b567b4d08568e7bcaab42a88665f8b6882d2807afcfdb967257 SHA512 4b46c5dfb330c65c8fc4afce90ed28309fc377e39d65b1ba0bf086efb5fe53b2be021bcb5e6a90fa6bdad463de6254761faab14fe2ad7814e84dfff08ff1a9d9
-DIST hypothesis-6.100.8.gh.tar.gz 9458567 BLAKE2B 3deb2c90cbc283451633272954e5ca317d6615d80e37545a583fb2cbdd9e7761ecb158c13cde99daddaf4a0310ed9c616d85be488942a227c505aa2de796c2b0 SHA512 449d1f319405c2e9d65d34926c5d26c1ceebfb8ae61474ed487d459efc7c2640a6f119f1f3c367ef3098629d787a82e3d8ec50970b603358ded34e8dfb73474f
-DIST hypothesis-6.101.0.gh.tar.gz 9458712 BLAKE2B b5a920e835fdf3bec6a1c8d21cc35833ec15192a512352a8630b5d7a7428d345b78061f5ee1571aff543ddc65586825de35933b3dc6de479880ddbd8509e352d SHA512 7e73074af127de0987d7b09fa71e0cfae47bbf195e621be3fd811474893bfba04d5b885e3bd7a46f707faeb2420abf93921c2c36c15c25672e400320974c7f7c
 DIST hypothesis-6.102.1.gh.tar.gz 9459939 BLAKE2B 36edbaf4ad89af3c4554e05ed395b29681b39708cd85a35cd5662766ce08ac95564a2b7ff7892e98df3fad1e729b779d00fcce86c2d17b879a21f3c877156875 SHA512 acb2b5f62e9f23eb379d61705f22330d9e81f7a23164bbdd196124fc3a67ba1265125597f840fa135f35af6f626229b3340b9557b2d69fc81f0b08c99d948e18
-DIST hypothesis-6.102.4.gh.tar.gz 9461315 BLAKE2B d59f89fc2581cf770ca5118a3956c7ebaf975f21f8d32384137a19630f1c9e92502157fc3ad0c32f73127faba1d37e08d2813db3387620b0d040decc500e32ea SHA512 5e758ec308ae8bbd11a0c715a537541de63ef74bba664f666031d4948cc186a7a450aea77eacbc970c97215f79eda89a85bb77b5cb878b27a5ac99fd053be1b6
-DIST hypothesis-6.102.5.gh.tar.gz 9461717 BLAKE2B ea1ac0495c23636cde3399a96cb8a5194cb951be38bdfd43efaf4479f305b12d77ed41a6358412f8150e06605bd977eb54e03011236f5a284f2a0abe793ef36c SHA512 456b5091dfe8d2c024e89da1dcc5a37dee52c8bcaafa7a335f2eb93b621d85a33bcbb01cf7bab5201089f600a55ade9787f41d183f139edfa09b9da05c1bad8b
 DIST hypothesis-6.102.6.gh.tar.gz 9462342 BLAKE2B 7daf1cfedd3e8aec72ca2a16a320ccac8c03d62dd02c7b6e20a8c0e8e9510996fc36b5f1050c111ef2eb389b77a9f468b23ef7627867b8d50559c59df003f635 SHA512 aa458c9db8ca0f5661ffc64ae61b08ffe2e93cd1fe5431752aa92339af22cf90b79763d08c6e381dd0875b26b2cfbdad92e95cc581ba325072ec5330223d3b7e
diff --git a/dev-python/hypothesis/hypothesis-6.100.1.ebuild b/dev-python/hypothesis/hypothesis-6.100.1.ebuild
deleted file mode 100644
index ce3fd2a4dd30..000000000000
--- a/dev-python/hypothesis/hypothesis-6.100.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.100.8.ebuild b/dev-python/hypothesis/hypothesis-6.100.8.ebuild
deleted file mode 100644
index 29919aa8ec05..000000000000
--- a/dev-python/hypothesis/hypothesis-6.100.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.101.0.ebuild b/dev-python/hypothesis/hypothesis-6.101.0.ebuild
deleted file mode 100644
index 29919aa8ec05..000000000000
--- a/dev-python/hypothesis/hypothesis-6.101.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.102.1.ebuild b/dev-python/hypothesis/hypothesis-6.102.1.ebuild
index 29919aa8ec05..ce3fd2a4dd30 100644
--- a/dev-python/hypothesis/hypothesis-6.102.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.102.1.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 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"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.102.4.ebuild b/dev-python/hypothesis/hypothesis-6.102.4.ebuild
deleted file mode 100644
index 29919aa8ec05..000000000000
--- a/dev-python/hypothesis/hypothesis-6.102.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.102.5.ebuild b/dev-python/hypothesis/hypothesis-6.102.5.ebuild
deleted file mode 100644
index 29919aa8ec05..000000000000
--- a/dev-python/hypothesis/hypothesis-6.102.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 865139b10a3a..a9ac7a8a4912 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,2 +1 @@
-DIST ini2toml-0.14.tar.gz 108296 BLAKE2B f09ac924eea976b82d68b12132cc671cb5b0f57734fc2a4f4b0dc68e0a9e20d4f906ab757e662c152a5d7db9f0bad17bd28644524bd18a16895ad489eac1d29d SHA512 d29155ae1069084381aef852145a6c734ea4e1e8c6847174fff98bca497cbb4289ee791b26541c6027b716845dd23fc251dde531c6cb9c62d490e4bfed5f862e
 DIST ini2toml-0.15.tar.gz 109236 BLAKE2B d844f45e14379af974c86283daa1aa6fa5d9934b219fdf02be9abbeb873487b36eecede39dafc261f5ab2a6bfadceaea3b16611f5d6c1f3bc88a28574a11dc14 SHA512 5726c745972fbdf6a254ccd44133c5c65368f531c17efda3b83323c2c9e450d508fe57f1aa0919c0de6cc6e18d6a974b75dc50ecf29c852d367bc03891f0486c
diff --git a/dev-python/ini2toml/ini2toml-0.14.ebuild b/dev-python/ini2toml/ini2toml-0.14.ebuild
deleted file mode 100644
index d8b22dbba344..000000000000
--- a/dev-python/ini2toml/ini2toml-0.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
-HOMEPAGE="
-	https://pypi.org/project/ini2toml/
-	https://github.com/abravalheri/ini2toml/
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-59.6[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/configupdater[${PYTHON_USEDEP}]
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# validate_pyproject is not packaged
-		tests/test_examples.py
-	)
-	local EPYTEST_DESELECT=()
-
-	# Incompatible with pyproject-fmt-2 API:
-	# https://github.com/abravalheri/ini2toml/issues/103
-	if ! has_version "<dev-python/pyproject-fmt-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_cli.py::test_auto_formatting
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/ini2toml/ini2toml-0.15.ebuild b/dev-python/ini2toml/ini2toml-0.15.ebuild
index ece44c97cff2..d8b22dbba344 100644
--- a/dev-python/ini2toml/ini2toml-0.15.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MPL-2.0"
 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"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index f439c644e693..be3aeb25184f 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,2 +1 @@
-DIST jsonschema-4.21.1.tar.gz 321491 BLAKE2B 5c8fad04bf62af3f9204818cc5cff88dcc492b7957439be2a2fd8c0731a986c223d1612ab79d47696fa5695224fceacea35b5e699466f14393adc2cf9d89c83f SHA512 b0744a80d64572307860c9238ff5048e062b7665d9ed97dd390bae0b168ab96497f359ddc4e95f052d8b177161e5b808ee432bd9fe182c1ea39cbad417db9278
 DIST jsonschema-4.22.0.tar.gz 325490 BLAKE2B aa0fcd9cb35ffe93d9e7ae940f9fbfc6e20656b09bdec91163ee7120b3495210522c2354dd3e74b33274f61bd9364b6b33f9e6482bac58b2ee0c6dd4bba3658e SHA512 72c9ffd1edf8820696d831062cfae2d38729935b32d12b7fa5171fefa3d38d495b588152c07224a5c9d1f4b9f97bd9b2aa7919d3d4ecdae0ba396e60e954b1c5
diff --git a/dev-python/jsonschema/jsonschema-4.21.1.ebuild b/dev-python/jsonschema/jsonschema-4.21.1.ebuild
deleted file mode 100644
index c13d00865fff..000000000000
--- a/dev-python/jsonschema/jsonschema-4.21.1.ebuild
+++ /dev/null
@@ -1,57 +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} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An implementation of JSON-Schema validation for Python"
-HOMEPAGE="
-	https://pypi.org/project/jsonschema/
-	https://github.com/python-jsonschema/jsonschema/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-specifications-2023.03.6[${PYTHON_USEDEP}]
-	>=dev-python/referencing-0.28.4[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		!!dev-python/shiboken6
-	)
-"
-
-# formatter deps
-RDEPEND+="
-	dev-python/fqdn[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/isoduration[${PYTHON_USEDEP}]
-	>=dev-python/jsonpointer-1.13[${PYTHON_USEDEP}]
-	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
-	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri-template[${PYTHON_USEDEP}]
-	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# requires pip, does not make much sense for the users
-	jsonschema/tests/test_cli.py::TestCLIIntegration::test_license
-	# fragile warning tests
-	jsonschema/tests/test_deprecations.py
-	# wtf?
-	jsonschema/tests/test_jsonschema_test_suite.py::test_suite_bug
-)
diff --git a/dev-python/jsonschema/jsonschema-4.22.0.ebuild b/dev-python/jsonschema/jsonschema-4.22.0.ebuild
index 7f0e7a523ecb..c13d00865fff 100644
--- a/dev-python/jsonschema/jsonschema-4.22.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.22.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index 75cc87fb8a53..e89f1ce3c0b2 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,2 @@
 DIST keyring-24.3.1.tar.gz 60454 BLAKE2B cb0a9b82163febbbd737f2f25353bf96cbb7b8a87c7db00523960b3fce5595c6af65bc02b7d070b0fa5a466fc53530975de8f7a44ab9a9f783d2db34b1a67901 SHA512 53f26763175c7f1de041d8805062696ef3ef6c79792cdc75ae72621da8e729ac4cbb6e76937db2a0a5ce4bc41ab92c164d62e4627f92edab8c0d0fc02ca4980e
-DIST keyring-25.2.0.tar.gz 60808 BLAKE2B a9f97b80593cc1fc4716b0c97579408d4485dbd9dab415fa98e1827130cea425a03ff6188282ffb0125327feb6ed282260c15d21ce603f4d2561a94f83e6cbd0 SHA512 36ef4a78d5b9081f13ea7aabbfbe508e0ee275cbdf458fbcb36da5a360f91df79ce4c54bf0ce4000d91961d06f019d75a9ffc46328ef7d9e14e9a883508a1950
 DIST keyring-25.2.1.tar.gz 60797 BLAKE2B 706eb0cb1cb5e7f22e603df3b2ab9c95421a389d5bec8034ac452d37e754564379d6133a195e7c7fcbb1f96a8f964e5de505a39dce1da72090daad01d144c213 SHA512 4512c79a1f0c05cd5d28919f55f19c142488d69d9bf7a27e9d7b3aace36535cf43a4522a4ea4b4738f21c82a6980932bd9d1c7ae62592242c333161e791cdb2e
diff --git a/dev-python/keyring/keyring-25.2.0.ebuild b/dev-python/keyring/keyring-25.2.0.ebuild
deleted file mode 100644
index 2aa45ee32471..000000000000
--- a/dev-python/keyring/keyring-25.2.0.ebuild
+++ /dev/null
@@ -1,52 +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="Provides access to the system keyring service"
-HOMEPAGE="
-	https://github.com/jaraco/keyring/
-	https://pypi.org/project/keyring/
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
-	dev-python/jaraco-classes[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.4[${PYTHON_USEDEP}]
-	' 3.10 3.11)
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# this test fails if importlib-metadata returns more than one
-		# entry, i.e. when keyring is installed already
-		tests/test_packaging.py::test_entry_point
-	)
-	local EPYTEST_IGNORE=(
-		# apparently does not unlock the keyring properly
-		tests/backends/test_libsecret.py
-		# hangs
-		tests/backends/test_kwallet.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/keyring/keyring-25.2.1.ebuild b/dev-python/keyring/keyring-25.2.1.ebuild
index 9198c50f5be3..2aa45ee32471 100644
--- a/dev-python/keyring/keyring-25.2.1.ebuild
+++ b/dev-python/keyring/keyring-25.2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
diff --git a/dev-python/libtmux/libtmux-0.36.0.ebuild b/dev-python/libtmux/libtmux-0.36.0.ebuild
index 4d09659b6750..8eb79fac7f5a 100644
--- a/dev-python/libtmux/libtmux-0.36.0.ebuild
+++ b/dev-python/libtmux/libtmux-0.36.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/dev-python/libtmux/libtmux-0.37.0.ebuild b/dev-python/libtmux/libtmux-0.37.0.ebuild
index 4d09659b6750..8eb79fac7f5a 100644
--- a/dev-python/libtmux/libtmux-0.37.0.ebuild
+++ b/dev-python/libtmux/libtmux-0.37.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=app-misc/tmux-3.0a
diff --git a/dev-python/lxml/lxml-5.2.2.ebuild b/dev-python/lxml/lxml-5.2.2.ebuild
index 6074654a9f10..7ea8d9a1f39c 100644
--- a/dev-python/lxml/lxml-5.2.2.ebuild
+++ b/dev-python/lxml/lxml-5.2.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/mcbootflash/Manifest b/dev-python/mcbootflash/Manifest
index ac5f53e1e9a2..71e7a6930c42 100644
--- a/dev-python/mcbootflash/Manifest
+++ b/dev-python/mcbootflash/Manifest
@@ -1,4 +1,2 @@
-DIST mcbootflash-8.0.1.tar.gz 24906 BLAKE2B 2af5c73de29aa089d33047179ce196507ab1ed1ae224b6f680341a818d8056915271b121cf1ac32f31dd5e33e095f2b82fcddf5907bdb5513a17e009ac242f7f SHA512 fc4093873bbfc0a29d2c09b2f62247dd659b4c9d531613a2a18d6b452f7a0e573b5fa087d82686045af1ba6f7811ca3ccba0f109ada71c42925e8c01faa0fe1d
 DIST mcbootflash-8.0.2.tar.gz 27121 BLAKE2B caded3a13266db46ac1b9f35c0a027e9dbfa2c430da96992bf689d4b32574406a7d0c736da82dbe7c473189a8941db8548f59828010e755f33c0342c8c593be2 SHA512 542dcf9af6c22f2deae786fa547e99e4df07b8e3eda7b007a9ead96386c2bf880d8485985b3de399ecd496bf982b6a0308c3f82b49c5914bca09c961822566c6
-DIST mcbootflash-9.0.0.tar.gz 26736 BLAKE2B d813e06f88192d44139fe1dc127df6cb26d21f5716288e3bb59989ac362664b1c3a66e857fe702e8691d945ecaf5dace56b43ab967f029bc51583b0a1603fcbd SHA512 92854a1f7c4ecebff5bce12e10131154fa23ae078618fb7a7757f325b49cae7c1a0d3505e25a2c2faa5101adfb2786be90f703a074304a61c55590267d2cdf38
 DIST mcbootflash-9.0.1.tar.gz 26858 BLAKE2B d8d8486a8713d46f7b93443dcfd9cbd9a93452fa7c8e76aeba1f4bfbf52765fbe3807fe8206b994015c094f9fba1626d5a3bb2fa93bd6b6400a9cbaaee7c19a9 SHA512 0c001a0a2c10e9d4bf111136d08ec89c4bc62568934ef9d8b75d7c58d59f451f5459ccc387c72424e8d16c5e49e7bba903efce403f41923ca33d87c2290a84e9
diff --git a/dev-python/mcbootflash/mcbootflash-8.0.1.ebuild b/dev-python/mcbootflash/mcbootflash-8.0.1.ebuild
deleted file mode 100644
index 376639b33cb0..000000000000
--- a/dev-python/mcbootflash/mcbootflash-8.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Flash firmware to devices running Microchip's 16-bit bootloader"
-HOMEPAGE="
-	https://pypi.org/project/mcbootflash/
-	https://github.com/bessman/mcbootflash/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="
-	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-reserial[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --replay
-}
diff --git a/dev-python/mcbootflash/mcbootflash-8.0.2.ebuild b/dev-python/mcbootflash/mcbootflash-8.0.2.ebuild
index 7653ff5ad9db..376639b33cb0 100644
--- a/dev-python/mcbootflash/mcbootflash-8.0.2.ebuild
+++ b/dev-python/mcbootflash/mcbootflash-8.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/mcbootflash/mcbootflash-9.0.0.ebuild b/dev-python/mcbootflash/mcbootflash-9.0.0.ebuild
deleted file mode 100644
index 7653ff5ad9db..000000000000
--- a/dev-python/mcbootflash/mcbootflash-9.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Flash firmware to devices running Microchip's 16-bit bootloader"
-HOMEPAGE="
-	https://pypi.org/project/mcbootflash/
-	https://github.com/bessman/mcbootflash/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/bincopy-20.0.0[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-reserial[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest --replay
-}
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index eda364a33386..b52e68f41f37 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,2 +1 @@
-DIST mdit-py-plugins-0.4.0.gh.tar.gz 62199 BLAKE2B d8e69022ecceed436cd28202406bd46e786d40d3527f1c2c9311c4c32c59a4806cde9dc386309976c185522dd6286aec2542dabd31e08b8d7322fd02ae07186d SHA512 cdcce7a3819120923b7725daae0bf7a833c4da4487c49ff1a067fecf7d5e8f7a7be2fae03f3b821c766d7d6ebed4a298755ad5edb00adf73300a76a5663d67d6
 DIST mdit-py-plugins-0.4.1.gh.tar.gz 63342 BLAKE2B 3db6312e4d36cd7e870a707cbd2b99a4c954e40da2c34711a4b1f1fbd4086231f8e6013c99abdf3dc294acdfdc2706f2353151d2766223e141a0c6aa90e27996 SHA512 d2f5c59bf2a17ce441de18f815624cb6f61202f111176c5f1c7745e430d59e8690ce8a5f9da2402bd34dcc5cf4dc38377990df649fbf3256216bc82cdfc6333a
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild
deleted file mode 100644
index ec631e30ceef..000000000000
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="
-	https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins/
-"
-SRC_URI="
-	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/markdown-it-py-4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.1.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.1.ebuild
index 101fb3981635..32e6d06d0744 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.1.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.4.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/markdown-it-py-4[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-5.0.7.ebuild b/dev-python/moto/moto-5.0.7.ebuild
index 67905e5159f1..90646df3fa12 100644
--- a/dev-python/moto/moto-5.0.7.ebuild
+++ b/dev-python/moto/moto-5.0.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/mrcfile/mrcfile-1.5.0.ebuild b/dev-python/mrcfile/mrcfile-1.5.0-r1.ebuild
index f476d539ed73..dfc482df8c3d 100644
--- a/dev-python/mrcfile/mrcfile-1.5.0.ebuild
+++ b/dev-python/mrcfile/mrcfile-1.5.0-r1.ebuild
@@ -23,6 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
+	<dev-python/numpy-2[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.16.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
index 51353ee71be5..4292cc22925a 100644
--- a/dev-python/munkres/munkres-1.1.4-r1.ebuild
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -22,6 +22,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index 3012650e398e..293fdc9514a0 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1 +1 @@
-DIST nbclassic-1.0.0.tar.gz 20201455 BLAKE2B 8d87668cdf2347c6d9dcc7f335d9bf346c1622217b71c18a91f7703f90ab5d2c71830f9743d6b408033ab153fe7180a9f07edc016704b9d0469bbf15c1641ef8 SHA512 fc80cd6311ab9cac9e0fdcf4d37cffc383c90327da8c27901239b84486e4afe23372665b0e1464ec78845816e829c4f3cf8672b4a0ad7e396fdb962b2f4f5a1b
+DIST nbclassic-1.1.0.tar.gz 20194834 BLAKE2B 7fe5e3d405964faf09a6f58b54d03dae7ec661e276d5e26e71e054b277f99db61dd7ef0c3ec2417230ea7d724814a4919514b4274772b5a73a89d0c59db09468 SHA512 a5348ff7bff944c12745111fcf64ca92d75bf7bc063d51baf04bc8894473ba0689ec4420ff1ce2d2a40601b55d14a1cd257215cd4f11839fa47e8ea93933268d
diff --git a/dev-python/nbclassic/nbclassic-1.0.0-r1.ebuild b/dev-python/nbclassic/nbclassic-1.1.0-r1.ebuild
index c3d5aa1cb1a3..ce2d1655c770 100644
--- a/dev-python/nbclassic/nbclassic-1.0.0-r1.ebuild
+++ b/dev-python/nbclassic/nbclassic-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 DISTUTILS_USE_PEP517=jupyter
 
 inherit distutils-r1 pypi xdg-utils
@@ -20,27 +20,15 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest-asyncio-1.5[${PYTHON_USEDEP}]
 	>=dev-python/notebook-shim-0.2.3[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
 "
 
-# dev-python/nbval is missing impls
 BDEPEND="
 	test? (
-		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
+		dev-python/nbval[${PYTHON_USEDEP}]
 		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
 		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
@@ -54,7 +42,7 @@ BDEPEND="
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
+	dev-python/pydata-sphinx-theme \
 	dev-python/nbsphinx \
 	dev-python/sphinxcontrib-github-alt \
 	dev-python/myst-parser \
@@ -62,6 +50,10 @@ distutils_enable_sphinx docs/source \
 
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	# Notebook interferes with our tests, pretend it does not exist
+	echo "raise ImportError" > notebook.py || die
+
 	epytest -p pytest_tornasync.plugin
 }
 
diff --git a/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch b/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
new file mode 100644
index 000000000000..72ed1fab7638
--- /dev/null
+++ b/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
@@ -0,0 +1,118 @@
+From 517ce7d21194da275f8083fa2fd7de6977dc7e95 Mon Sep 17 00:00:00 2001
+From: Charlie Clark <charlie.clark@clark-consulting.eu>
+Date: Mon, 11 Mar 2024 13:38:08 +0100
+Subject: [PATCH] Looks like pytest has dropped support for unittest setup
+ methods so switched to fixture.
+
+--HG--
+branch : 3.1
+---
+ openpyxl/drawing/tests/test_drawing.py | 46 ++++++++++++++------------
+ 1 file changed, 24 insertions(+), 22 deletions(-)
+
+diff --git a/openpyxl/drawing/tests/test_drawing.py b/openpyxl/drawing/tests/test_drawing.py
+index c4c0712dd..befd2267c 100644
+--- a/openpyxl/drawing/tests/test_drawing.py
++++ b/openpyxl/drawing/tests/test_drawing.py
+@@ -1,20 +1,20 @@
+ # Copyright (c) 2010-2024 openpyxl
+ 
+ import pytest
+-
+ from openpyxl.xml.functions import tostring
+-
+ from openpyxl.tests.helper import compare_xml
+ 
++@pytest.fixture
++def Drawing():
++    from ..drawing import Drawing
++    return Drawing
++
+ 
+ class TestDrawing(object):
+ 
+-    def setup(self):
+-        from ..drawing import Drawing
+-        self.drawing = Drawing()
+ 
+-    def test_ctor(self):
+-        d = self.drawing
++    def test_ctor(self, Drawing):
++        d = Drawing()
+         assert d.coordinates == ((1, 2), (16, 8))
+         assert d.width == 21
+         assert d.height == 192
+@@ -26,34 +26,34 @@ class TestDrawing(object):
+         assert d.description == ""
+         assert d.name == ""
+ 
+-    def test_width(self):
+-        d = self.drawing
++    def test_width(self, Drawing):
++        d = Drawing()
+         d.width = 100
+         d.height = 50
+         assert d.width == 100
+ 
+-    def test_proportional_width(self):
+-        d = self.drawing
++    def test_proportional_width(self, Drawing):
++        d = Drawing()
+         d.resize_proportional = True
+         d.width = 100
+         d.height = 50
+         assert (d.width, d.height) == (5, 50)
+ 
+-    def test_height(self):
+-        d = self.drawing
++    def test_height(self, Drawing):
++        d = Drawing()
+         d.height = 50
+         d.width = 100
+         assert d.height == 50
+ 
+-    def test_proportional_height(self):
+-        d = self.drawing
++    def test_proportional_height(self, Drawing):
++        d = Drawing()
+         d.resize_proportional = True
+         d.height = 50
+         d.width = 100
+         assert (d.width, d.height) == (100, 1000)
+ 
+-    def test_set_dimension(self):
+-        d = self.drawing
++    def test_set_dimension(self, Drawing):
++        d = Drawing()
+         d.resize_proportional = True
+         d.set_dimension(100, 50)
+         assert d.width == 6
+@@ -65,8 +65,9 @@ class TestDrawing(object):
+ 
+ 
+     @pytest.mark.pil_required
+-    def test_absolute_anchor(self):
+-        node = self.drawing.anchor
++    def test_absolute_anchor(self, Drawing):
++        drawing = Drawing()
++        node = drawing.anchor
+         xml = tostring(node.to_tree())
+         expected = """
+         <absoluteAnchor>
+@@ -80,9 +81,10 @@ class TestDrawing(object):
+ 
+ 
+     @pytest.mark.pil_required
+-    def test_onecell_anchor(self):
+-        self.drawing.anchortype =  "oneCell"
+-        node = self.drawing.anchor
++    def test_onecell_anchor(self, Drawing):
++        drawing = Drawing()
++        drawing.anchortype =  "oneCell"
++        node = drawing.anchor
+         xml = tostring(node.to_tree())
+         expected = """
+         <oneCellAnchor>
+-- 
+GitLab
+
diff --git a/dev-python/openpyxl/openpyxl-3.1.2.ebuild b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
index 9b4b64a2cdbe..cbd7ca5a7270 100644
--- a/dev-python/openpyxl/openpyxl-3.1.2.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
-	dev-python/et_xmlfile[${PYTHON_USEDEP}]
+	dev-python/et-xmlfile[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
@@ -35,9 +35,21 @@ distutils_enable_sphinx doc \
 	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://foss.heptapod.net/openpyxl/openpyxl/-/commit/517ce7d21194da275f8083fa2fd7de6977dc7e95
+	"${FILESDIR}/${P}-pytest-8.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=()
 
+	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			# https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2187
+			openpyxl/compat/tests/test_compat.py::test_numpy_tostring
+		)
+	fi
+
 	case ${EPYTHON} in
 		python3.12)
 			EPYTEST_DESELECT+=(
diff --git a/dev-python/owslib/owslib-0.31.0.ebuild b/dev-python/owslib/owslib-0.31.0.ebuild
index 2dadaebaf19e..82c64e97a452 100644
--- a/dev-python/owslib/owslib-0.31.0.ebuild
+++ b/dev-python/owslib/owslib-0.31.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index 88b46781bb9a..b6d8e483130c 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -1,2 +1,3 @@
 DIST pipdeptree-2.16.2.tar.gz 32151 BLAKE2B 18715b0c7835e19bd5b6846922990e321a7e06315642204e7d79375a50b692f87e2ba1ec5884c4f69ff6e8d75e863c8cf372152aca7561ab94ef265d3c1df9fb SHA512 06d72f94a9165fe52cc15b9f539e3adb6da99e4a63cae78928bf68be3499b2828a5d471f270455b94a960ba2fe2f6319f5319c20ed270029a38a81173a7cd403
 DIST pipdeptree-2.17.0.tar.gz 34677 BLAKE2B 3f92c4361978d2a6b1ae46d3a7e21aca231d504abf3a3cc8388d64a70fc3853a33edeac091a0b60cd3043d86162f6816292f973e9c8691420f906e946a5c9dac SHA512 1e7a4bc7f2f872e9d3115b413acc791eeb912a6f428fca772e30a3c8164ecfa44bba7e5246f9b65cbc4d34ffcd8050ff795ced3e3f9ad918f134ce052a8e8992
+DIST pipdeptree-2.21.0.tar.gz 39119 BLAKE2B 15f37f997b89477a9e1815a2bf120ce5251e9cf2e4df9195dc76bd7414c0cf7f58c4b8e787649492c9826bda5d3f8df60577b5242af7354ad0e1583eabbf0589 SHA512 3d416683c70861de7b768a69fe59a31173e712ecb752c7948329f787c8e13bc54be544fa4a7d3bfdbf6b164202fa8b07898c6e993a53fe244a5f3d9fa9a00573
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch b/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch
new file mode 100644
index 000000000000..bbc8ea9d0b9c
--- /dev/null
+++ b/dev-python/pipdeptree/files/pipdeptree-2.21.0-pypy.patch
@@ -0,0 +1,134 @@
+diff --git a/tests/test_non_host.py b/tests/test_non_host.py
+index 7049b0c..54ba7fb 100644
+--- a/tests/test_non_host.py
++++ b/tests/test_non_host.py
+@@ -16,6 +16,21 @@
+     from pytest_mock import MockerFixture
+ 
+ 
++@pytest.fixture(scope="session")
++def expected_venv_pkgs() -> frozenset[str]:
++    implementation = python_implementation()
++    if implementation == "CPython":  # pragma: cpython cover
++        expected = {"pip", "setuptools", "wheel"}
++    elif implementation == "PyPy":  # pragma: pypy cover
++        expected = {"cffi", "greenlet", "pip", "readline", "hpy", "setuptools", "wheel"}
++    else:  # pragma: no cover
++        raise ValueError(implementation)
++    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
++        expected -= {"setuptools", "wheel"}
++
++    return frozenset(expected)
++
++
+ @pytest.mark.parametrize("args_joined", [True, False])
+ def test_custom_interpreter(
+     tmp_path: Path,
+@@ -23,6 +38,7 @@ def test_custom_interpreter(
+     monkeypatch: pytest.MonkeyPatch,
+     capfd: pytest.CaptureFixture[str],
+     args_joined: bool,
++    expected_venv_pkgs: frozenset[str],
+ ) -> None:
+     # Delete $PYTHONPATH so that it cannot be passed to the custom interpreter process (since we don't know what
+     # distribution metadata to expect when it's used).
+@@ -32,20 +48,13 @@ def test_custom_interpreter(
+     result = virtualenv.cli_run([str(tmp_path / "venv"), "--activators", ""])
+     py = str(result.creator.exe.relative_to(tmp_path))
+     cmd = ["", f"--python={result.creator.exe}"] if args_joined else ["", "--python", py]
++    cmd += ["--all", "--depth", "0"]
+     mocker.patch("pipdeptree._discovery.sys.argv", cmd)
+     main()
+     out, _ = capfd.readouterr()
+     found = {i.split("==")[0] for i in out.splitlines()}
+-    implementation = python_implementation()
+-    if implementation == "CPython":
+-        expected = {"pip", "setuptools", "wheel"}
+-    elif implementation == "PyPy":
+-        expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}  # pragma: no cover
+-    else:
+-        raise ValueError(implementation)
+-    if sys.version_info >= (3, 12):
+-        expected -= {"setuptools", "wheel"}
+-    assert found == expected, out
++
++    assert expected_venv_pkgs == found, out
+ 
+ 
+ def test_custom_interpreter_with_local_only(
+@@ -54,7 +63,6 @@ def test_custom_interpreter_with_local_only(
+     capfd: pytest.CaptureFixture[str],
+ ) -> None:
+     venv_path = str(tmp_path / "venv")
+-
+     result = virtualenv.cli_run([venv_path, "--system-site-packages", "--activators", ""])
+ 
+     cmd = ["", f"--python={result.creator.exe}", "--local-only"]
+@@ -63,16 +71,10 @@ def test_custom_interpreter_with_local_only(
+     main()
+     out, _ = capfd.readouterr()
+     found = {i.split("==")[0] for i in out.splitlines()}
+-    implementation = python_implementation()
+-    if implementation == "CPython":
+-        expected = {"pip", "setuptools", "wheel"}
+-    elif implementation == "PyPy":  # pragma: no cover
+-        expected = {"cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}  # pragma: no cover
+-    else:
+-        raise ValueError(implementation)  # pragma: no cover
+-    if sys.version_info >= (3, 12):
+-        expected -= {"setuptools", "wheel"}  # pragma: no cover
+-    assert found == expected, out
++    expected = {"pip", "setuptools", "wheel"}
++    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
++        expected -= {"setuptools", "wheel"}
++    assert expected == found, out
+ 
+ 
+ def test_custom_interpreter_with_user_only(
+@@ -81,7 +83,6 @@ def test_custom_interpreter_with_user_only(
+     # ensures there is no output when --user-only and --python are passed
+ 
+     venv_path = str(tmp_path / "venv")
+-
+     result = virtualenv.cli_run([venv_path, "--activators", ""])
+ 
+     cmd = ["", f"--python={result.creator.exe}", "--user-only"]
+@@ -127,7 +128,7 @@ def test_custom_interpreter_with_user_only_and_system_site_pkgs_enabled(
+     found = {i.split("==")[0] for i in out.splitlines()}
+     expected = {"bar"}
+ 
+-    assert found == expected
++    assert expected == found
+ 
+ 
+ def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
+@@ -135,6 +136,7 @@ def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
+     mocker: MockerFixture,
+     monkeypatch: pytest.MonkeyPatch,
+     capfd: pytest.CaptureFixture[str],
++    expected_venv_pkgs: frozenset[str],
+ ) -> None:
+     # ensures that we honor $PYTHONPATH when passing it to the custom interpreter process
+     venv_path = str(tmp_path / "venv")
+@@ -146,19 +148,10 @@ def test_custom_interpreter_ensure_pythonpath_envar_is_honored(
+     fake_metadata = fake_dist / "METADATA"
+     with fake_metadata.open("w") as f:
+         f.write("Metadata-Version: 2.3\n" "Name: foo\n" "Version: 1.2.3\n")
+-    cmd = ["", f"--python={result.creator.exe}"]
++    cmd = ["", f"--python={result.creator.exe}", "--all", "--depth", "0"]
+     mocker.patch("pipdeptree._discovery.sys.argv", cmd)
+     monkeypatch.setenv("PYTHONPATH", str(another_path))
+     main()
+     out, _ = capfd.readouterr()
+     found = {i.split("==")[0] for i in out.splitlines()}
+-    implementation = python_implementation()
+-    if implementation == "CPython":
+-        expected = {"foo", "pip", "setuptools", "wheel"}
+-    elif implementation == "PyPy":  # pragma: cpython no cover
+-        expected = {"foo", "cffi", "greenlet", "pip", "readline", "setuptools", "wheel"}
+-    else:  # pragma: no cover
+-        raise ValueError(implementation)
+-    if sys.version_info >= (3, 12):  # pragma: >=3.12 cover
+-        expected -= {"setuptools", "wheel"}
+-    assert found == expected, out
++    assert {*expected_venv_pkgs, "foo"} == found, out
diff --git a/dev-python/pipdeptree/pipdeptree-2.21.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.21.0.ebuild
new file mode 100644
index 000000000000..da3e1747a6b9
--- /dev/null
+++ b/dev-python/pipdeptree/pipdeptree-2.21.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi optfeature
+
+DESCRIPTION="Utility for displaying installed packages in a dependency tree"
+HOMEPAGE="
+	https://github.com/tox-dev/pipdeptree/
+	https://pypi.org/project/pipdeptree/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# https://github.com/tox-dev/pipdeptree/pull/369
+	"${FILESDIR}/${P}-pypy.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock -p console-scripts
+}
+
+pkg_postinst() {
+	optfeature \
+		"visualising the dependency graph with --graph-output" \
+		dev-python/graphviz
+}
diff --git a/dev-python/prompt-toolkit/Manifest b/dev-python/prompt-toolkit/Manifest
index b61f48ebe4b3..8c778bfa0dbb 100644
--- a/dev-python/prompt-toolkit/Manifest
+++ b/dev-python/prompt-toolkit/Manifest
@@ -1 +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
diff --git a/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.ebuild b/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.ebuild
new file mode 100644
index 000000000000..3a9463cfb5dd
--- /dev/null
+++ b/dev-python/prompt-toolkit/prompt-toolkit-3.0.44.ebuild
@@ -0,0 +1,30 @@
+# 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/pybind11/pybind11-2.12.0.ebuild b/dev-python/pybind11/pybind11-2.12.0.ebuild
index cfa0ba309bc4..860d576f7b82 100644
--- a/dev-python/pybind11/pybind11-2.12.0.ebuild
+++ b/dev-python/pybind11/pybind11-2.12.0.ebuild
@@ -28,8 +28,8 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		<dev-cpp/catch-3
-		>=dev-cpp/catch-2.13.9
+		<dev-cpp/catch-3:0
+		>=dev-cpp/catch-2.13.9:0
 		dev-libs/boost
 	)
 "
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 2c5bd04bcd17..0fa692b607bd 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,2 +1,4 @@
 DIST pydata-sphinx-theme-0.15.2.gh.tar.gz 2409617 BLAKE2B ee9405e36241bfac93927e4de2d12f65b95717e459b1f584179f0d7ad2c5161b85b39ef60527de8b2e0eac8a38621452e3a5dcf15733980359b4f03526a906bb SHA512 11653f36def68ddc63994d00e1de63575ce6a24f7b2887c53ea8c3063bdc30fe57baf25e239a70f63a1598625a3707ac405171230c977d7e0ed3f88404c8cd21
+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.3rc1-py3-none-any.whl 4612708 BLAKE2B eb22dd58325749b162515f11a79c57ddd0511305af1ae0616691b9a488e85b34e67bebd39e60a8c1b3c6fc603ac25c8f213358e38f446a68ba31a5889432c9f1 SHA512 e1871caa26eb0a5c62b30cfeb655150450acaa55cc17b958fb0c16a1fcfe470810bb2fa7e4b7d3d656fb8a7f51d459b0d2b68a38ee339fa801385441ea2f5e22
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
new file mode 100644
index 000000000000..81bfdc03f942
--- /dev/null
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3_rc1.ebuild
@@ -0,0 +1,56 @@
+# 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/pydevd/Manifest b/dev-python/pydevd/Manifest
index aac1fef617ef..caf3253d0935 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,3 +1,4 @@
 DIST PyDev.Debugger-pydev_debugger_2_10_0.gh.tar.gz 4019265 BLAKE2B e72c96576588ac3cbfcdd71a1a8e96d41b9d6757b3468c372b45a9c91a887c693f7309467fe8ea27d29c4775cc8df9ebd610b015cecabaaea43c8aa75229bc25 SHA512 a475e4f4cd9f883307d30b0bb2ebd5095de426b52f0f70b1a557095c06241149ad105ca4cbb31d311fa54e4387bbed27e5cf2712ba7447b19720d46dac21a101
 DIST PyDev.Debugger-pydev_debugger_3_0_3.gh.tar.gz 4287855 BLAKE2B 2f9f9cc892a19e42a37190966f2d2897f3e5da477c88d76d4b61b3062b6482db4c4cf5672efe75a1c139aa42a6b017cb5b276cede1167d0e91ca50009706e7e7 SHA512 4a5d03ea69e9eb40ee09c8d9a2258655f1645076757fa02bf92c8ad1b4fbb0570c1ac55464d8dd44cea6187ad2fa858851e02a86dc18b2343411cd8c56dc0c6a
+DIST PyDev.Debugger-pydev_debugger_3_1_0.gh.tar.gz 4293466 BLAKE2B 2b820b44a37362dfe554f60f418ce6c94cfd9fb9b14b6d6f521e7bd2023f044129b440878a136d67249096ba8a4aa61bb465551c1d9930989ffe9fe40c68f464 SHA512 8afaab2a69cb6785c5453ce1034a70fa28ab33c3122c1e21c485d9023317785524144c76e87864a695fa1fd26b05bc6d828db22a7cbcf025bd8aafe0b9ed4d3b
 DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
diff --git a/dev-python/pydevd/pydevd-3.1.0.ebuild b/dev-python/pydevd/pydevd-3.1.0.ebuild
new file mode 100644
index 000000000000..8ccab0a61d8d
--- /dev/null
+++ b/dev-python/pydevd/pydevd-3.1.0.ebuild
@@ -0,0 +1,137 @@
+# 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 toolchain-funcs
+
+TAG="pydev_debugger_${PV//./_}"
+MY_P="PyDev.Debugger-${TAG}"
+DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
+HOMEPAGE="
+	https://github.com/fabioz/PyDev.Debugger/
+	https://pypi.org/project/pydevd/
+"
+SRC_URI="
+	https://github.com/fabioz/PyDev.Debugger/archive/${TAG}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-debug/gdb
+"
+BDEPEND="
+	test? (
+		dev-python/untangle[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# Drop -O3 and -flto compiler args
+	sed -i \
+		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
+		-e '/extra_compile_args/d' \
+		setup.py || die
+
+	# Disable tests incompatible with new package versions
+	sed -e '/TEST_\(DJANGO\|FLASK\)/s:True:False:' \
+		-i tests_python/debug_constants.py || die
+
+	# Clean up some prebuilt files
+	rm -r third_party || die
+	cd pydevd_attach_to_process || die
+
+	# Remove these Windows files
+	rm attach_{amd64,x86}.dll || die
+	rm inject_dll_{amd64,x86}.exe || die
+	rm run_code_on_dllmain_{amd64,x86}.dll || die
+	rm -r windows winappdbg || die
+
+	# Remove these MacOS files
+	rm attach_x86_64.dylib || die
+
+	# Remove these prebuilt linux files
+	rm attach_linux_{amd64,x86}.so || die
+
+	cd linux_and_mac || die
+	rm compile_mac.sh || die
+}
+
+src_compile() {
+	pushd pydevd_attach_to_process/linux_and_mac || die
+	# recompile removed file (extracted from compile_linux.sh)
+	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} \
+		-o "../attach_linux_${ARCH}.so" \
+		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
+	popd || die
+
+	distutils-r1_src_compile
+
+	# C extensions
+	rm -r _pydevd* || die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		# NB: upstream seems to run tests via runfiles.py but that script
+		# is a horror and it seems broken for us anyway
+		tests_python/test_debugger.py::test_attach_to_pid_halted
+		tests_python/test_debugger.py::test_attach_to_pid_no_threads
+		'tests_python/test_debugger.py::test_path_translation[False]'
+		tests_python/test_debugger_json.py::test_attach_to_pid
+		tests_python/test_debugger_json.py::test_evaluate_exception_trace
+		tests_python/test_debugger_json.py::test_gui_event_loop_custom
+		tests_python/test_debugger_json.py::test_path_translation_and_source_reference
+		tests_python/test_utilities.py::test_tracing_basic
+		tests_python/test_utilities.py::test_tracing_other_threads
+		# incompatible with xdist
+		tests_python/test_utilities.py::test_find_main_thread_id
+		tests_python/test_utilities.py::test_is_main_thread
+		# numpy-2?
+		tests_python/test_debugger_json.py::test_evaluate_numpy
+	)
+
+	case ${EPYTHON} in
+		python3.10)
+			EPYTEST_DESELECT+=(
+				tests_python/test_debugger.py::test_frame_eval_limitations
+			)
+			;&
+		python3.11)
+			EPYTEST_DESELECT+=(
+				tests_python/test_debugger.py::test_remote_debugger_threads
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# this is only used to compare against getpid() to detect that xdist
+	# is being used
+	local -x PYDEV_MAIN_PID=1
+	epytest -p rerunfailures --reruns=5
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Remove this duplicate that is installed directly to /usr/
+	# These files are also correctly installed to the python site-packages dir
+	rm -r "${ED}/usr/pydevd_attach_to_process" || die
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 073b231c1255..0a3970bfc438 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,3 +1,2 @@
 DIST pyfakefs-5.3.5.gh.tar.gz 227359 BLAKE2B 635e41cb9892e1707555559769c01d5b575e44c5f1dd412acc05c3bed3b2dad2724ba32341b59cdecdfb658c94008e09396970349d8c1ffdcb90bf89ea82aca0 SHA512 342dc9cc0378af8cd8a9b0783fb6a1415207505ec8d4992f8fdd7e8d2bc4aada26d0803ed3b74d30b42a50dffb793c70acdeb3f28f199c0918783e1ea0a5e0d8
-DIST pyfakefs-5.4.1.gh.tar.gz 237928 BLAKE2B 8abea2d884d69717ab754c38666633f86230e981ddb099f8f9493d4d82ff0ff73e644ec793ea5e68edc662fee72dfd833fcab068b73fd5285555d2e5d8445823 SHA512 f27ce662a443623717a91e3fe1895cbbf7a64d009b7846b61c890ebabb0c3bb978b12bb83b68460fc026f4a0cfe846afb6057b72306e822dc8ba75d6e2f1b555
 DIST pyfakefs-5.5.0.gh.tar.gz 239883 BLAKE2B cf9b91fbfbb77b012ec768ac2188ea5c611a271f50ded69cc92607d955b4dda8cacf7b0560da5a2b57f7a4aa6879fafb328357e5996d8c7c025f531530a04f4d SHA512 d9f05318f26ca9c26e0cca3c4fdf19dc3cf33bd21a6a87e1e4d8871b06eba9d8ba875301b001221ec9e0bd17c14f8aba3e61d3ec5b3c72587d28b7b5263e2a2c
diff --git a/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild b/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild
deleted file mode 100644
index 3d631cf38242..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.4.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	local EPYTEST_IGNORE=(
-		# test for regression with opentimelineio package
-		pyfakefs/pytest_tests/segfault_test.py
-		# test for regression with undefined package
-		pyfakefs/pytest_tests/pytest_fixture_test.py
-	)
-
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.5.0.ebuild b/dev-python/pyfakefs/pyfakefs-5.5.0.ebuild
index cd6013b53c09..3d631cf38242 100644
--- a/dev-python/pyfakefs/pyfakefs-5.5.0.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 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"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index eafc2775a54c..29dfcc2dc3c0 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1 @@
-DIST pygments-2.17.2.tar.gz 4827772 BLAKE2B 7e6db51ff35ec35981fcdd6f4a1f0a242c29e8b0947a5a3febdee35a0e4047414d49d6883b8fbf9de78b149323f0b3c86b315b03eaada557b4cd70e67917aab8 SHA512 a3408a21f4c0a9f1a81d4fae5c2924f66f1f17daf98a52c4379d6953625354f47bb8db3005e6ab09407627f592843efde12afb14e1271c1e685973eb4c238d89
 DIST pygments-2.18.0.tar.gz 4891905 BLAKE2B 4ff1cc75ca348eecb96ecefe549a1e1c9a9cc81e1829a2354c70ce6f6e538bddbb9b7f90e781bbdd6433cee36e4a99fef9adaef95ca275d1be57a33ed8a77351 SHA512 2f696fed7f2120f9e3bd5f3d2837a5d6b883434b8d0f68d039c2620213508638cedf1517375019809720d56fc52f07e3bddd0defc4707703ace5d707908c00fb
diff --git a/dev-python/pygments/pygments-2.17.2.ebuild b/dev-python/pygments/pygments-2.17.2.ebuild
deleted file mode 100644
index eab8c1b8006f..000000000000
--- a/dev-python/pygments/pygments-2.17.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 bash-completion-r1 pypi
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
-	https://pygments.org/
-	https://github.com/pygments/pygments/
-	https://pypi.org/project/Pygments/
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)
-"
-
-EPYTEST_DESELECT=(
-	# fuzzing tests, very slow
-	tests/test_basic_api.py::test_random_input
-	# incompatibility with python-ctags3, apparently
-	# https://github.com/pygments/pygments/issues/2486
-	tests/test_html_formatter.py::test_ctags
-)
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.18.0.ebuild b/dev-python/pygments/pygments-2.18.0.ebuild
index 17d056cdb051..3951ebb99a74 100644
--- a/dev-python/pygments/pygments-2.18.0.ebuild
+++ b/dev-python/pygments/pygments-2.18.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2"
 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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index cc47b2181713..7760911256d0 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,2 @@
-DIST pylint-3.1.0.gh.tar.gz 1433040 BLAKE2B a224af608fa5ccb256c18073a70f82c399ad23ff6df65f7ae3504c67060f5ba1cd36022c7d53a42f0f93bd4648340433601d2f479bef41a4281e8041a9d15715 SHA512 bb7f09fa8b2c6f218c0e4d74ec2d7bbcb5e9d9fa8c2aeae5a1bf899f25080251609f284959fab14dd93cc5dd911688e25d3d4e1e030a1790578bc78ef1ce2bf7
 DIST pylint-3.1.1.gh.tar.gz 1433456 BLAKE2B f51e253228b9bb2bddd2edac76c11ae1e5c712e755665bf3f808da832af313626037aded39eeb75941b7462a87668ea2de307740bd6a736d3130aa10850b5c9f SHA512 66a30a45a1ac816a1e2ff16ea774fb5b5d646f89645c8f551ab4a65feea3076e6bc1b54ff1b71e5d8586f344c02b0e85c9b34d2c5b0afba115fd92cb7cb0a3f1
-DIST pylint-3.2.0.gh.tar.gz 1440470 BLAKE2B 428222378bdcf48ab05792144548a8d050115ecac84be72922839702a11247198a959098f3aa94b5c688671ce846386de35c4d870598912be26900d98c188f7d SHA512 14368efe598d074394effc5d90764d49b8680dfafea0837568e22ab9783de664e0d7c02491bf8c94c1b2bbe8d48018063f45a25ebd04c7813ac8e6bba7786109
-DIST pylint-3.2.1.gh.tar.gz 1443199 BLAKE2B 0b6a066971f963ebf69665c5e343456c482bdcfa788d08c267d225d1a6aa54f58bc9731cc686a38f85b6a4f9b030c9b39103e9929e8265cdfa434a38d7e3a07a SHA512 a7b22cab97e50f358d4aa3d2d1da50608e50cb13b6db433eb877007c32803b7151ef141a9741d7849e4ef7707ff5d4e5501174a5376418489bc0565148303f61
 DIST pylint-3.2.2.gh.tar.gz 1443983 BLAKE2B aeff52756e03278da1db7478d0c95ca0d5fa0c8a15203ada4b30fe5fb2fa56bfc2fc60e020bee9b2e242339214cf383838c93cbf1369a82655bedd62e3b2634f SHA512 84d625b0cd1ea0c308ff4381a9f553663af52fec534856a258ee50f00ec7238cf9af98d1e2c851522a8bd440c55e318d5c89035652d872cbd812d19ff14a0698
diff --git a/dev-python/pylint/pylint-3.1.0.ebuild b/dev-python/pylint/pylint-3.1.0.ebuild
deleted file mode 100644
index 7d879ae03836..000000000000
--- a/dev-python/pylint/pylint-3.1.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.2[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.1.1.ebuild b/dev-python/pylint/pylint-3.1.1.ebuild
index ef99e82a754f..6221be88f2d8 100644
--- a/dev-python/pylint/pylint-3.1.1.ebuild
+++ b/dev-python/pylint/pylint-3.1.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 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"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-3.2.0.ebuild b/dev-python/pylint/pylint-3.2.0.ebuild
deleted file mode 100644
index ab6346709dc8..000000000000
--- a/dev-python/pylint/pylint-3.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	=dev-python/astroid-3.2*[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[recursion_error_3159]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-3.2.1.ebuild b/dev-python/pylint/pylint-3.2.1.ebuild
deleted file mode 100644
index 3e61fa1c75de..000000000000
--- a/dev-python/pylint/pylint-3.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Python code static checker"
-HOMEPAGE="
-	https://pypi.org/project/pylint/
-	https://github.com/pylint-dev/pylint/
-"
-SRC_URI="
-	https://github.com/pylint-dev/pylint/archive/v${PV/_beta/b}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-3.3[${PYTHON_USEDEP}]
-	>=dev-python/astroid-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/dill-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.8[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.10.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/GitPython-3[${PYTHON_USEDEP}]
-		' 'python*' )
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'tests/test_functional.py::test_functional[dataclass_with_field]'
-		'tests/test_functional.py::test_functional[no_name_in_module]'
-		'tests/test_functional.py::test_functional[recursion_error_3159]'
-		'tests/test_functional.py::test_functional[shadowed_import]'
-		'tests/test_functional.py::test_functional[use_yield_from]'
-		'tests/test_functional.py::test_functional[wrong_import_order]'
-	)
-	local EPYTEST_IGNORE=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-
-	if ! has_version "dev-python/GitPython[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/profile/test_profile_against_externals.py
-			tests/testutils/_primer/test_package_to_lint.py
-			tests/testutils/_primer/test_primer.py
-		)
-	fi
-
-	rm -rf pylint || die
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p timeout
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.8.1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.8.1.ebuild
index b59f15ba2f17..f52627887718 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.8.1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.8.1.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/pytest-ordering/pytest-ordering-0.6-r1.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6-r1.ebuild
index 059b2ff4d7ba..a1fad34312c1 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6-r1.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6-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
diff --git a/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild b/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild
index 3de096a09143..02064760ee47 100644
--- a/dev-python/pytest-subprocess/pytest-subprocess-1.5.0.ebuild
+++ b/dev-python/pytest-subprocess/pytest-subprocess-1.5.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"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index d31b892eb803..a8af850e35c9 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,2 +1 @@
-DIST python-swiftclient-4.5.0.tar.gz 207642 BLAKE2B 0b15e5f110143ae7306a0c89a6d1e61907fc00a8dbb5aaaa9dddb5237f756727f114ee7036cf294126b331fd738b67119ea3c4cd68ec8bef8cf19e77a5ba0461 SHA512 95305f09cf4a00c4c0239719b2e6a54ec408bc4b12af9e6e13fb352e313aff65bd865927d4e525fe899ca730a2baf5b4c7827f6f2713d34dc135bf10eaebb6c6
 DIST python-swiftclient-4.6.0.tar.gz 209473 BLAKE2B e35516c4e05c889af5e9e794179b2c5a5fe364bcc85492639dd58c45ffc756d86942038d683e685c9f33d876043c0953c6b0cf69db16abdf57c057cf24ab97ed SHA512 19883c2640cf6071752e09261c7d8499e01b749100e6d79cc3a83e08bffc7392ee852351b11d549001d23898d4c34e8309fdadb8e0241e301bf03300db80eef7
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.5.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.5.0.ebuild
deleted file mode 100644
index 7af18e729f60..000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-4.5.0.ebuild
+++ /dev/null
@@ -1,40 +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="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-swiftclient/
-	https://github.com/openstack/python-swiftclient/
-	https://pypi.org/project/python-swiftclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/keystoneauth1-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/openstacksdk-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	sed -e 's/test_password_prompt/_&/' -i test/unit/test_shell.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild
index 4e48e22c1473..7af18e729f60 100644
--- a/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-4.6.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 0014bf5c985b..d33967f99cd5 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,2 +1,3 @@
 DIST pythran-0.15.0.gh.tar.gz 3676474 BLAKE2B 2b9c08d773f7848cf43c804ffa9a84eb19d20dbc40668657daea9698fb468e62ec86226f39aa3b8ff07b48a3120604b44a9d6a6c9e7f2b5f0f41ba2e9a201231 SHA512 2abba0ab5328e60d622512aa6c5442fcc28edb4da4209db50ede64961b58c91c2109b7bb90e5872c5c0d487542f669dc2ca3e721c28229e283f6e0130f95aee0
 DIST pythran-0.16.0.gh.tar.gz 3680823 BLAKE2B b0bd65b79831b2a64503d25a71b41ba493281e36d2a147f301ba81ffb9f2f40de07b89d300df2768ffc3eeb49ff3ad6698f6a12d92c68150c1e51655a8e983aa SHA512 8d65f10df6f73518f3a2606a796ee91480d654a17269651e05ee79c0d0c68b9d583c211caa8ef348c8d11cef49da36b560da6e8889accfad8c9b3a8b51eeff57
+DIST pythran-0.16.1.gh.tar.gz 3680817 BLAKE2B 2a4b928e9d0ce68248eb543c97da5afca900d81bc660377313617149c5aae7529a371bfd3604dd9feb6e38f834360fef881c8324ae72b585d8ab86e867c2f6b3 SHA512 7a89546b52bdae9bdaeba42768ac822c584a3714b8f4e32417d793454dc0b5492342dfd393d92f8ecee12c854bc39e418f5860aadd00d328afef7b17ebddec99
diff --git a/dev-python/pythran/pythran-0.16.1.ebuild b/dev-python/pythran/pythran-0.16.1.ebuild
new file mode 100644
index 000000000000..77b815405381
--- /dev/null
+++ b/dev-python/pythran/pythran-0.16.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/
+"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/boost
+	dev-cpp/xsimd
+	=dev-python/beniget-0.4*[${PYTHON_USEDEP}]
+	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-libs/boost
+		dev-cpp/xsimd
+	)
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ipython[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/scipy[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/cblas
+		!!dev-python/setuptools-declarative-requirements
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_configure() {
+	# vendored C++ headers -- use system copies
+	rm -r pythran/{boost,xsimd} || die
+
+	if use test ; then
+		# https://bugs.gentoo.org/916461
+		sed -i \
+			-e 's|blas=blas|blas=cblas|' \
+			-e 's|libs=|libs=cblas|' \
+			pythran/pythran-*.cfg || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		pythran/tests/test_numpy_ufunc_unary.py::TestNumpyUFuncUnary::test_signbit0
+	)
+
+	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
+		case ${EPYTHON} in
+			pypy3)
+				EPYTEST_DESELECT+=(
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_bdist_install3
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_build3
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install2
+					pythran/tests/test_distutils.py::TestDistutils::test_setup_sdist_install3
+					pythran/tests/test_exception.py::TestException::test_multiple_tuple_exception_register
+					pythran/tests/test_ndarray.py::TestNdarray::test_ndarray_fancy_indexing1
+					pythran/tests/test_numpy_fft.py::TestNumpyFFTN::test_fftn_1
+					pythran/tests/test_numpy_func0.py::TestNumpyFunc0::test_ravel0
+					pythran/tests/test_numpy_func3.py::TestNumpyFunc3::test_list_imag0
+					pythran/tests/test_numpy_random.py::TestNumpyRandom::test_numpy_uniform_size_int
+					pythran/tests/test_set.py::TestSet::test_fct_symmetric_difference_update
+				)
+				;;
+		esac
+	fi
+
+	epytest
+}
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
index 8d1de2fac65a..e1a3b770a002 100644
--- a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/pywlroots/pywlroots-0.17.0.ebuild b/dev-python/pywlroots/pywlroots-0.17.0.ebuild
index 54220afaeb6c..af18f8704c0f 100644
--- a/dev-python/pywlroots/pywlroots-0.17.0.ebuild
+++ b/dev-python/pywlroots/pywlroots-0.17.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="X"
 
 # See README for wlroots dep
diff --git a/dev-python/pyzmq/pyzmq-26.0.3.ebuild b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
index ca0a0260c8df..307e90183b83 100644
--- a/dev-python/pyzmq/pyzmq-26.0.3.ebuild
+++ b/dev-python/pyzmq/pyzmq-26.0.3.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
index ddd4a4ccb03b..f2c580a68143 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.12.2.ebuild
@@ -31,6 +31,7 @@ KEYWORDS="~amd64"
 #
 # <nlohmann_json-3.10.3 for https://github.com/Qiskit/qiskit-aer/issues/1742
 DEPEND="
+	<dev-python/numpy-2[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
 	<dev-cpp/nlohmann_json-3.10.3
 	>=dev-cpp/nlohmann_json-3.1.1
@@ -51,6 +52,7 @@ BDEPEND="
 	test? (
 		dev-python/ddt[${PYTHON_USEDEP}]
 		dev-python/fixtures[${PYTHON_USEDEP}]
+		<dev-python/pytest-8.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.13.3.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.13.3.ebuild
index ca580e0a5414..13fe2323c3d3 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.13.3.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.13.3.ebuild
@@ -31,6 +31,7 @@ KEYWORDS="~amd64"
 #
 # <nlohmann_json-3.10.3 for https://github.com/Qiskit/qiskit-aer/issues/1742
 DEPEND="
+	<dev-python/numpy-2[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.16.3[${PYTHON_USEDEP}]
 	<dev-cpp/nlohmann_json-3.10.3
 	>=dev-cpp/nlohmann_json-3.1.1
diff --git a/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild b/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild
index 388c4070c29a..5f7ad5c162d6 100644
--- a/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild
+++ b/dev-python/qiskit-terra/qiskit-terra-0.46.1.ebuild
@@ -138,6 +138,7 @@ BDEPEND="
 		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
 		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		<dev-python/pytest-8.2[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		<dev-python/qiskit-aer-0.13[${PYTHON_USEDEP}]
 		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
diff --git a/dev-python/referencing/Manifest b/dev-python/referencing/Manifest
index 83f10e56be7d..0552de56138a 100644
--- a/dev-python/referencing/Manifest
+++ b/dev-python/referencing/Manifest
@@ -1,3 +1 @@
-DIST referencing-0.34.0.tar.gz 62624 BLAKE2B c5e8a5d19121f2d09ea443248690e2fa9069140b027b6fa2f741d5133c931da12ae87d8ac7923bfc52ca3d93c966399cf48c1f31d6f4066b6a44488ec50b5d24 SHA512 97e4cfe0fb306068abfd6c0348d12483cbd3705c0b4c8852c0f0209c4d05be08bf77fa3ec56af77a2815a4ff3294ff06d3f09f213a165ae17bdcab246e47c178
-DIST referencing-0.35.0.tar.gz 62860 BLAKE2B 314f98e3c15d384a704def8c1cd62aea9ccfbfb0abce09d27b44062e68e284774314b79c3e9f6b3691f8e8e75e231f9bb0a7bb3c140c05d41f809515f8b4edd0 SHA512 c637a3767a7d03445adb14bcb4c1e9c9a069779d31c5043f300e34398c9c728dfe09cdf9601516a96280d6c095740114e3bd4a6b5103f8a1938b1be6b9cb9cb3
 DIST referencing-0.35.1.tar.gz 62991 BLAKE2B b434d3b24bb01c7ea2b97300408571483ecfaa49b52867374a8734b4dafd06404c8b993757620329668fa01eb791c2a6f938aa4be20ff841fe691a4b47dcf6b3 SHA512 b737afb45bfb1adb91f457b78ab4a31a6f33839ef61095663fd66d91c09fc379d900f778bacaa36722770ce80eccd6a227a074cb44836e69205bed06165d033d
diff --git a/dev-python/referencing/referencing-0.34.0.ebuild b/dev-python/referencing/referencing-0.34.0.ebuild
deleted file mode 100644
index 228b4a86002a..000000000000
--- a/dev-python/referencing/referencing-0.34.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Cross-specification JSON referencing (JSON Schema, OpenAPI...)"
-HOMEPAGE="
-	https://github.com/python-jsonschema/referencing/
-	https://pypi.org/project/referencing/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/referencing/referencing-0.35.0.ebuild b/dev-python/referencing/referencing-0.35.0.ebuild
deleted file mode 100644
index 83f1fb7d7b51..000000000000
--- a/dev-python/referencing/referencing-0.35.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Cross-specification JSON referencing (JSON Schema, OpenAPI...)"
-HOMEPAGE="
-	https://github.com/python-jsonschema/referencing/
-	https://pypi.org/project/referencing/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rpds-py-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/referencing/referencing-0.35.1.ebuild b/dev-python/referencing/referencing-0.35.1.ebuild
index 83f1fb7d7b51..228b4a86002a 100644
--- a/dev-python/referencing/referencing-0.35.1.ebuild
+++ b/dev-python/referencing/referencing-0.35.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rpds-py/rpds-py-0.18.1.ebuild b/dev-python/rpds-py/rpds-py-0.18.1.ebuild
index 1c07346a7e4f..2714afaae51a 100644
--- a/dev-python/rpds-py/rpds-py-0.18.1.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.18.1.ebuild
@@ -63,7 +63,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
 
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
index 3e25e66eb59e..99444a18de5d 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.9.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 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"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/setuptools-scm/Manifest b/dev-python/setuptools-scm/Manifest
index 0e76efb97976..15ec0ef24855 100644
--- a/dev-python/setuptools-scm/Manifest
+++ b/dev-python/setuptools-scm/Manifest
@@ -1,3 +1 @@
-DIST setuptools-scm-8.0.4.tar.gz 74280 BLAKE2B 317f4955365b6b7d21ddecc846b0158a72537692b70b5f2092183bd93af119875054d775628659b113dec3bdb94575485b6f1e58760f1580b143dc3b0882cb57 SHA512 1b584f20dfad115f379a97de9e96bb3b36ab00986381748c2f395facd26ce01a6556ccfbabeb8f0cf9ce8720b26ce3a00040dba02cc689701ccf1d31f13277da
-DIST setuptools_scm-7.1.0.tar.gz 71904 BLAKE2B be5ae215dadcc290290762b732434258409ecc2d71cdf1332ffe73431effae7cbc33e052a718efd952be79350171ed3e468492fc719bc08750dc23364fb0ee9d SHA512 bd7260672c213db6b8c5842dbb6ac69e69ce040777865c935033971f65d905bd8e6b54e174190a924e452c302e69d4c1de231cbc8f603176ba013a739840dad3
 DIST setuptools_scm-8.1.0.tar.gz 76465 BLAKE2B f50a1c25c93179809cb448dbaeab9d71596c729e374c88c2f8d9f5f7a1d746a001f9aa9fb93478679f1c1af96f35313e1250f96375f56310a4b814ee0542ed52 SHA512 205f1c122539d107a61a7ef01ff9ec225f7b2e6d92fc33a9f2a0c616051cbf32163ac4e6878d898e51cc1ff81fce6c6521a18fc5e09bdbc9d7d2467ba013c57f
diff --git a/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
deleted file mode 100644
index 5b9761d43d9b..000000000000
--- a/dev-python/setuptools-scm/setuptools-scm-7.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the usual nondescript gpg-agent failure
-		testing/test_git.py::test_git_getdate_signed_commit
-
-		# fetching from the Internet
-		testing/test_regressions.py::test_pip_download
-	)
-
-	if has_version dev-python/nose; then
-		EPYTEST_DESELECT+=(
-			# https://bugs.gentoo.org/892639
-			testing/test_integration.py::test_pyproject_support
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.0.4.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.0.4.ebuild
deleted file mode 100644
index 55945f3ac2f4..000000000000
--- a/dev-python/setuptools-scm/setuptools-scm-8.0.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 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=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# there's an optional dep on rich for cute logs
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-vcs/git
-		!sparc? (
-			dev-vcs/mercurial
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# the usual nondescript gpg-agent failure
-		testing/test_git.py::test_git_getdate_signed_commit
-
-		# fetching from the Internet
-		testing/test_regressions.py::test_pip_download
-
-		# calls flake8, unpredictable
-		testing/test_functions.py::test_dump_version_flake8
-	)
-
-	if has_version dev-python/nose; then
-		EPYTEST_DESELECT+=(
-			# https://bugs.gentoo.org/892639
-			testing/test_integration.py::test_pyproject_support
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild b/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
index 8dbc9f0a44a1..144ef00b834e 100644
--- a/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
+++ b/dev-python/setuptools-scm/setuptools-scm-8.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # there's an optional dep on rich for cute logs
 RDEPEND="
diff --git a/dev-python/sounddevice/Manifest b/dev-python/sounddevice/Manifest
index 9856d585cd17..2826cf5c7e78 100644
--- a/dev-python/sounddevice/Manifest
+++ b/dev-python/sounddevice/Manifest
@@ -1,2 +1,2 @@
-DIST sounddevice-0.4.5.tar.gz 51796 BLAKE2B 4be76ab22551e542965c15ac054c07c62efada19d0831e03ff3185e89941a44cbf06c783cb4a6d480297370338f85c8988ae1ff9c25a49a0c03b2526fadbd825 SHA512 6a6e17db31ba6088cda86721636b55222f4d6bcbc4ca23db85d092c79ad7e47624f6bd375b28a2daf905f500c79e1202c1f038c6a12c6a32c130c0332e2c0e29
 DIST sounddevice-0.4.6.tar.gz 51677 BLAKE2B 04edba9eb2cb582c04b94276463bc7ca715f922533ddb3e35d269b70a58116aaa9c7e0c87d24c0ac068b486b1ce27a842ebe64a6e4b373a7291cc828eaf96d3d SHA512 2454e028a6f143869267cdff7578c09b02b1e98c7dfd31617d503772c83bd15670fe21d35ab3e01f06192a2b1649287164028bff712818ab52f30ea150ca59bb
+DIST sounddevice-0.4.7.tar.gz 53389 BLAKE2B 37b1bf020645d1f55f0ee0757be3f48bd02ea59154d7f25e84d3f357ba2eedd76d1744637ee9d366e850615a71532ad27d68c643ab922e9e947d5bac6cedf94a SHA512 5d04af8d337c81bbe8dbc52c94478976e52949a3d6c0954e62007b2b2781cd475463ea41bb7bfde63417b8c460452ea7d5ebe64d3aec9faad641d1d3a14e297d
diff --git a/dev-python/sounddevice/sounddevice-0.4.5-r2.ebuild b/dev-python/sounddevice/sounddevice-0.4.7.ebuild
index ca8e05777e3e..4e23964bbddc 100644
--- a/dev-python/sounddevice/sounddevice-0.4.5-r2.ebuild
+++ b/dev-python/sounddevice/sounddevice-0.4.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2021-2023 Liguros Authors
+# Copyright 2021-2024 Liguros 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
 
 DESCRIPTION="Python bindings for PortAudio"
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
index 5c7c4047f360..b834d89812b5 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/structlog/Manifest b/dev-python/structlog/Manifest
index 7b8a184f39dd..adae347c2fd9 100644
--- a/dev-python/structlog/Manifest
+++ b/dev-python/structlog/Manifest
@@ -1 +1,2 @@
 DIST structlog-24.1.0.tar.gz 1340948 BLAKE2B ad92e145a8a45f7aaf08f26e637b4de42e56d3c5931f022b4524126a5650f30a8e7185ce87bd7e2c91fd48853dfc94585c13184bded1792d2c50153625379c3b SHA512 bb64d8d4ab9afe7482bdaafc3efae833426a256575ff99d013ae1438f3d5d0261842e598028ea644824577f579c5c4704108ce597de0a2eab5ffc1615a609ea6
+DIST structlog-24.2.0.tar.gz 1346958 BLAKE2B d47e78ec3c55048460a32a860ac2e5ebed9e49f546277e562104fec66e73e25702b61c2b8a250a9729c0c774e7c0c1492733957a9a551328267533187e63972e SHA512 df470f292bbf1de6a4a509f034c3bccb87e21afc31cf31a0ef998485a4b69e5bf6ec46d90236d556c876aa96e5a3dcb323d0bfe9bd8ac63a47b527a747af73c8
diff --git a/dev-python/structlog/structlog-24.2.0.ebuild b/dev-python/structlog/structlog-24.2.0.ebuild
new file mode 100644
index 000000000000..d87a9110280f
--- /dev/null
+++ b/dev-python/structlog/structlog-24.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Structured Logging for Python"
+HOMEPAGE="
+	https://github.com/hynek/structlog/
+	https://pypi.org/project/structlog/
+"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/transitions/transitions-0.9.1.ebuild b/dev-python/transitions/transitions-0.9.1.ebuild
index 8c448f7ef8ea..0c983ffad798 100644
--- a/dev-python/transitions/transitions-0.9.1.ebuild
+++ b/dev-python/transitions/transitions-0.9.1.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 	distutils-r1_src_prepare
 
 	# magic to ignore async tests sometimes, breaks EPYTEST_IGNORE
+	[[ ${PV} != 0.9.1 ]] && die "Remove this hack"
 	rm conftest.py || die
 }
 
diff --git a/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild b/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild
index eb162729f2ab..2daac7884d29 100644
--- a/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.21.3.ebuild
@@ -40,7 +40,7 @@ S=${WORKDIR}/py-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # setuptools is needed for distutils import
 DEPEND=">=dev-libs/tree-sitter-0.22.1:="
diff --git a/dev-python/trustme/trustme-1.1.0-r1.ebuild b/dev-python/trustme/trustme-1.1.0-r1.ebuild
index 37410f97c140..dfc61faa2714 100644
--- a/dev-python/trustme/trustme-1.1.0-r1.ebuild
+++ b/dev-python/trustme/trustme-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/trustme-1.1.0.ebuild b/dev-python/trustme/trustme-1.1.0.ebuild
deleted file mode 100644
index 86858b3f6344..000000000000
--- a/dev-python/trustme/trustme-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="
-	https://github.com/python-trio/trustme/
-	https://pypi.org/project/trustme/
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/typeguard/typeguard-4.3.0.ebuild b/dev-python/typeguard/typeguard-4.3.0.ebuild
index cb562ff655bb..d96df4310cf7 100644
--- a/dev-python/typeguard/typeguard-4.3.0.ebuild
+++ b/dev-python/typeguard/typeguard-4.3.0.ebuild
@@ -28,10 +28,9 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	local EPYTEST_IGNORE=(
-		# mypy changes results from version to version
-		tests/mypy
-	)
+	# mypy changes results from version to version
+	# (we can't use EPYTEST_IGNORE because pytest_ignore_collect breaks it)
+	rm -rf tests/mypy || die
 
 	local -x PYTHONDONTWRITEBYTECODE=
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/ujson/ujson-5.10.0.ebuild b/dev-python/ujson/ujson-5.10.0.ebuild
index 411197248496..47e8d98bcede 100644
--- a/dev-python/ujson/ujson-5.10.0.ebuild
+++ b/dev-python/ujson/ujson-5.10.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	dev-libs/double-conversion:=
diff --git a/dev-python/untangle/untangle-1.2.1-r1.ebuild b/dev-python/untangle/untangle-1.2.1-r2.ebuild
index 6cac77e1d77d..c3d99fa4d243 100644
--- a/dev-python/untangle/untangle-1.2.1-r1.ebuild
+++ b/dev-python/untangle/untangle-1.2.1-r2.ebuild
@@ -27,3 +27,9 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# poetry, sigh
+	sed -i -e 's:\^:>=:' pyproject.toml || die
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index da24ff77c4ef..52f6f17fb1fc 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1 @@
-DIST virtualenv-20.25.3.tar.gz 7289627 BLAKE2B 9edd92a238af78d4178f7c7b553f4b86206815fad3cd5f257b9fe35552835ab916849a07e06248f880335dc9a356364154ea689c08d64274eab4df36a81c05db SHA512 3933ed6dfa393a2f6cb6f996d8830f60204d5bf8953d61726afc5cc9b079bd1723c3e9044e33d3a584725ba80b93d9ac5a5d11c7304d0234303ce49c33ca1a9e
-DIST virtualenv-20.26.1.tar.gz 7290258 BLAKE2B acad9457ad56c7565091cc5a540e41039d87aa8d0b61687d8504b9452a560a32915585be39e5d17cf6d96644206ebd650f620f0a8e51a70cbd214c50bdb36575 SHA512 062621a7d6ec42db8b93d3cefef1f13e49bc46bec2528d02190c3a47944cd89e088bd3fa44f5d926959c5574559c0900afe54495cfbc8f3e4c19e8997a69285e
 DIST virtualenv-20.26.2.tar.gz 7290363 BLAKE2B 7b9ee7bd49d8fbb90de2716ea928b228b71ce3e344e9eeb2666974db41c389c9c0e14db66a77bf31cd7fe68c6f24a09686f2c0d40b9d1a0ef6974f50c8cd3d37 SHA512 49b78bb2b339a41637faa887728f195b042133506092e0793adf049b5b1523fab89222809449323a1eb771fa40d2f55df6dd97c16d765d7a78dc9299185fb864
diff --git a/dev-python/virtualenv/virtualenv-20.25.3.ebuild b/dev-python/virtualenv/virtualenv-20.25.3.ebuild
deleted file mode 100644
index 5ae7ab44ada8..000000000000
--- a/dev-python/virtualenv/virtualenv-20.25.3.ebuild
+++ /dev/null
@@ -1,123 +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} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.26.1.ebuild b/dev-python/virtualenv/virtualenv-20.26.1.ebuild
deleted file mode 100644
index 823ffe8caf17..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.1.ebuild
+++ /dev/null
@@ -1,123 +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} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-			)
-			;;
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.26.2.ebuild b/dev-python/virtualenv/virtualenv-20.26.2.ebuild
index 823ffe8caf17..8426da262101 100644
--- a/dev-python/virtualenv/virtualenv-20.26.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.26.2.ebuild
@@ -17,7 +17,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"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 8923d4d563d0..4f56da93bbe8 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,2 +1 @@
-DIST werkzeug-3.0.2.gh.tar.gz 817516 BLAKE2B 0c3324b6793f2fad77f62fbd0e3b847a73d6348d4a069dd83c852475d9cfa88feb3ab3ff1c4d547622b732de5fc3ba781d776d30f11ec1fae93cafdcfd9077eb SHA512 fdf44d2af517af69632909ae6fd5af327f34778c8f2dc7e606380123941102cc09d593a2036e843036e5abe998d2b2722f97b959eaeffc8de2b71a5b372a1e3e
 DIST werkzeug-3.0.3.tar.gz 803342 BLAKE2B 8c47d3131abeb8ce2d92291e08b603152210c44c40156b5399d24b167d0a02daf6adbeafec43e8b33dff940271feec95e9333e637e825f511cd5d03686c1e02e SHA512 fc771c161b37a376a86930c29c8b8052f81fb869cedea8c3c83af1e8b1aba271358c918e3067f3b0ac6d4a1689c8c355bff410d521c73a1909fd0ffc90fee6c6
diff --git a/dev-python/werkzeug/werkzeug-3.0.2-r1.ebuild b/dev-python/werkzeug/werkzeug-3.0.2-r1.ebuild
deleted file mode 100644
index c5b49f402d6f..000000000000
--- a/dev-python/werkzeug/werkzeug-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xprocess-1[${PYTHON_USEDEP}]
-		>=dev-python/watchdog-2.3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{10..11})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pallets/werkzeug/issues/2875
-	"${FILESDIR}/${PN}-3.0.2-pytest-xprocess-1.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# RequestRedirect class started incidentally being tested
-		# with pytest-8, though the test isn't prepared for that
-		# https://github.com/pallets/werkzeug/issues/2845
-		'tests/test_exceptions.py::test_response_body[RequestRedirect]'
-	)
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-3.0.3.ebuild b/dev-python/werkzeug/werkzeug-3.0.3.ebuild
index aeb0df53dc03..bd2f47d1ceff 100644
--- a/dev-python/werkzeug/werkzeug-3.0.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-3.0.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/xarray/xarray-2024.3.0.ebuild b/dev-python/xarray/xarray-2024.3.0.ebuild
index a412a6e0d730..45174dca99b9 100644
--- a/dev-python/xarray/xarray-2024.3.0.ebuild
+++ b/dev-python/xarray/xarray-2024.3.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~hppa ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~loong ~riscv ~x86"
 IUSE="big-endian"
 
 RDEPEND="
diff --git a/dev-python/yara-python/Manifest b/dev-python/yara-python/Manifest
index d5e047024713..88f7cd99469d 100644
--- a/dev-python/yara-python/Manifest
+++ b/dev-python/yara-python/Manifest
@@ -1,2 +1 @@
-DIST yara-python-4.4.0.gh.tar.gz 39295 BLAKE2B 27aa6b9fdf07cf30ec30a69c523e8a4eede52389a5565b4b083ac5d7206deaf3bcc0e2cf2fbda2fd01fce53b7ebc65e7c357705bc3244bfcc004bce2acd44e9e SHA512 8c6e30929172942e6e367c889f2d141f81264d9cfc4b5f5f4d35207d4ae25393050c976db823ef74f341ac18b7ee9eef8007d88348bc79848311d4b95fb1fdbd
 DIST yara-python-4.5.0.gh.tar.gz 39301 BLAKE2B 9bee247ef21b6e2e576acbac7cfcf140fd3b1ab992affc019f9ce290e00809e397d5057b9033f53fcd94885e855e783e4c43835850c9e6dcd57d74661ba8380b SHA512 b4f091bff7fd3bcd63e7f9f0a765aac7bdb3f17a1bc4b163687ae9ca21048194d90cf2bf1165998edb9953b83e022939179c51de59862a456676f099de69778d
diff --git a/dev-python/yara-python/yara-python-4.4.0.ebuild b/dev-python/yara-python/yara-python-4.4.0.ebuild
deleted file mode 100644
index 5b5a8906ef8d..000000000000
--- a/dev-python/yara-python/yara-python-4.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface for a malware identification and classification tool"
-HOMEPAGE="https://github.com/VirusTotal/yara-python"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/VirusTotal/yara-python.git"
-else
-	SRC_URI="https://github.com/virustotal/yara-python/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	=app-forensics/yara-$(ver_cut 1-2)*
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF
-	[build_ext]
-	dynamic_linking = True
-	EOF
-}
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 26d693baded0..2e4a8c6afed1 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -2,3 +2,4 @@ DIST ytmusicapi-1.6.0.tar.gz 106624 BLAKE2B b7900f4fb9e863f694a06a9d85d479e13514
 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.3.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild
new file mode 100644
index 000000000000..006c7e44cb09
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.7.3.ebuild
@@ -0,0 +1,23 @@
+# 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