Adding metadata

116 files changed, 460 insertions, 2350 deletions

diff --git a/dev-python/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index f0f65d5e9124..c5238c68ff47 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1,3 +1 @@
-DIST a2wsgi-1.10.0.tar.gz 17811 BLAKE2B f88c243b2141c1ec04eb1447714f66384cd9dd630a081233f801779cc2abbebc1bcf479f3f5311e2f4b7a33ab549cce7197f78a8cf79221f6fe38131d2bd41e5 SHA512 fa92e7cdbcfe1a4ece72ce39c4d718b50f3e6b78daf0c85cbe7b933bca5dcc6d5e27d4004f58d8ce83fdaf7fcb43f25fbd481a0f5f4141f42d72ec5757dc1ab9
-DIST a2wsgi-1.10.1.tar.gz 18121 BLAKE2B e5d17100d8ccf4f8d6fabc3156d66dbbf0cedaf52cd6714385ade7760792db476a197c9955aa99b906a2e3e08d0458f646781f04d0905671ab0a38e9908ac07b SHA512 b0347462c3557444c4fd33f922ea0baf3ef92d390820ce4d5bf723ae6af708c3b5fdd05c2be7d92fc31f4b76a157b37fbe784c30c3b6588d13e6a23028ddf059
 DIST a2wsgi-1.10.2.tar.gz 18126 BLAKE2B 8f0163a9acd3548d5627b026cba7f573cb10d3d346b4304a2152d92f0c9c9a7c0a622ec2761c473a23ef3724d706da1c832f28f7040f7b44303a74794aff6702 SHA512 c084cdeba47c848635cd1ae8ab05d46b6d83acbad48a923f4c21141564d755ac73e52acb097251a6fb3feba9009aca03db40d9a44aa94ea89caad5218cb5e456
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.0.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.0.ebuild
deleted file mode 100644
index 53ca169b7068..000000000000
--- a/dev-python/a2wsgi/a2wsgi-1.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert WSGI app to ASGI app or ASGI app to WSGI app"
-HOMEPAGE="
-	https://github.com/abersheeran/a2wsgi/
-	https://pypi.org/project/a2wsgi/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		<dev-python/asgiref-4[${PYTHON_USEDEP}]
-		>=dev-python/asgiref-3.2.7[${PYTHON_USEDEP}]
-		<dev-python/httpx-1[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.1.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.1.ebuild
deleted file mode 100644
index d01e0e31d956..000000000000
--- a/dev-python/a2wsgi/a2wsgi-1.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert WSGI app to ASGI app or ASGI app to WSGI app"
-HOMEPAGE="
-	https://github.com/abersheeran/a2wsgi/
-	https://pypi.org/project/a2wsgi/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		<dev-python/asgiref-4[${PYTHON_USEDEP}]
-		>=dev-python/asgiref-3.2.7[${PYTHON_USEDEP}]
-		<dev-python/httpx-1[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/a2wsgi/a2wsgi-1.10.2.ebuild b/dev-python/a2wsgi/a2wsgi-1.10.2.ebuild
index d01e0e31d956..53ca169b7068 100644
--- a/dev-python/a2wsgi/a2wsgi-1.10.2.ebuild
+++ b/dev-python/a2wsgi/a2wsgi-1.10.2.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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/anyio/Manifest b/dev-python/anyio/Manifest
index 966345215b8c..c0102b74ff06 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,2 +1 @@
-DIST anyio-4.2.0.tar.gz 158770 BLAKE2B 10ae621872edb27727c8931904c84f41dc18ef0cc4cce1ea18c957d479be24b1a4ffb15d8a9e2b4338663fdbc2a989e5772ba1bd2076f9f0b22f6f5c4feef4bc SHA512 a6f3cbedbfa063a5cf031cd833e6da7a23ee37dbdae8d47ccdfb09c61a73c186267f1a33ba6b4936cac7fb4c970f5488ff1464295e5ffa452952732ac0468d65
 DIST anyio-4.3.0.tar.gz 159642 BLAKE2B 33b300d1da37137d45b311f8424c022d19518c207c39ec6f8bd3e42432cf1457f2d533eadeaa1e21853ed1b25a4f58818fc595e8588489722846f8a8d72262dc SHA512 26ff552a03b24b63c7c99cffcec61e97289eacba3ad2fc7a3c1dde8cfaffd9a8d621b867429901c12d7cef912d3807db134dbeb9c5ba619921160f6d5df4d02f
diff --git a/dev-python/anyio/anyio-4.2.0.ebuild b/dev-python/anyio/anyio-4.2.0.ebuild
deleted file mode 100644
index a9dec2838305..000000000000
--- a/dev-python/anyio/anyio-4.2.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
-HOMEPAGE="
-	https://github.com/agronholm/anyio/
-	https://pypi.org/project/anyio/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# On amd64, let's get more test coverage by dragging in uvloop, but let's
-# not bother on other arches where uvloop may not be supported.
-BDEPEND="
-	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.23[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		amd64? (
-			$(python_gen_cond_dep '
-				>=dev-python/uvloop-0.17[${PYTHON_USEDEP}]
-			' python3_{10..12})
-		)
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinx-rtd-theme-1.2.2' \
-	dev-python/sphinxcontrib-jquery \
-	dev-python/sphinx-autodoc-typehints
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires link-local IPv6 interface
-		tests/test_sockets.py::TestTCPListener::test_bind_link_local
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -m 'not network'
-}
diff --git a/dev-python/anyio/anyio-4.3.0.ebuild b/dev-python/anyio/anyio-4.3.0.ebuild
index d620cf7e2cb4..a9dec2838305 100644
--- a/dev-python/anyio/anyio-4.3.0.ebuild
+++ b/dev-python/anyio/anyio-4.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/exceptiongroup-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 55bfab4265de..69ffca18b716 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,3 +1 @@
-DIST dnspython-2.5.0.gh.tar.gz 366093 BLAKE2B f8e3d8632a74b0421f7c77316dc80e01936277d701c282239ed60e79952755d34c673f15e19d4da812883e33d5f2cb54a8faa419185d8d198de923a2f3861095 SHA512 8ed207f9cee88dc1deb626d727c510dabace327586911e340df435c8cce5936efee51937b52881b4b4452d9c8c5bd903044bfef5a4effa95aaf05f24c0213b07
-DIST dnspython-2.6.0.gh.tar.gz 372953 BLAKE2B c35a994ff0573a175a8011ef84291ea9de3450e4e57ae059c756cdb5e3163a736057b994e0d370b3c237eff7cf2650b7faae1f11071c53e9c953e655f539f8f3 SHA512 68361d624af6b308669a20316c9046e23135fdaec69f0dd0580f865b363565b813d836aaf9ddd1db5c51a831bd34ddbf6136b6bf72d2e91833d4c7c209528c2b
 DIST dnspython-2.6.1.gh.tar.gz 373684 BLAKE2B 63ac506d528a9e3684daf4888b51d732d9a12c3439ff1c353250a7bad78781f9f12bb13509e69093d5585a4a04bf2fbb1b8eb690a39f27e5d58e8f0f3b3b36a8 SHA512 77e9c69ac70e9e31a11188b968d28b8f2890b053b2cce0e608eefad7fd2c2b0f30c074222b2e5e85c0b4b8705f2e45acfa8b016a7808cc421df1d77f2561d978
diff --git a/dev-python/dnspython/dnspython-2.5.0.ebuild b/dev-python/dnspython/dnspython-2.5.0.ebuild
deleted file mode 100644
index ba193a4364ae..000000000000
--- a/dev-python/dnspython/dnspython-2.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-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"
-IUSE="dnssec examples"
-
-RDEPEND="
-	dnssec? (
-		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
-	)
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/rthalley/dnspython/issues/1035
-	# https://github.com/rthalley/dnspython/commit/1b22985f2d67b6dd43259e3c6b853498f1cff712
-	"${FILESDIR}/${P}-musl-test.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.6.0.ebuild b/dev-python/dnspython/dnspython-2.6.0.ebuild
deleted file mode 100644
index 05191e93a134..000000000000
--- a/dev-python/dnspython/dnspython-2.6.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=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="DNS toolkit for Python"
-HOMEPAGE="
-	https://www.dnspython.org/
-	https://github.com/rthalley/dnspython/
-	https://pypi.org/project/dnspython/
-"
-SRC_URI="
-	https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ISC"
-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"
-IUSE="dnssec examples"
-
-RDEPEND="
-	dnssec? (
-		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
-	)
-	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/cryptography-41[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/dnspython/dnspython-2.6.1.ebuild b/dev-python/dnspython/dnspython-2.6.1.ebuild
index 05191e93a134..2a5ee1b3ae06 100644
--- a/dev-python/dnspython/dnspython-2.6.1.ebuild
+++ b/dev-python/dnspython/dnspython-2.6.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="ISC"
 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"
 IUSE="dnssec examples"
 
 RDEPEND="
diff --git a/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch b/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch
deleted file mode 100644
index a5aec3378fdd..000000000000
--- a/dev-python/dnspython/files/dnspython-2.5.0-musl-test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1b22985f2d67b6dd43259e3c6b853498f1cff712 Mon Sep 17 00:00:00 2001
-From: Bob Halley <halley@dnspython.org>
-Date: Sat, 27 Jan 2024 12:38:03 -0800
-Subject: [PATCH] In tests, work around musl libc and docker issues.
-
-Specifically: musl libc's getaddrinfo behavior always returns
-a canonical name.
-
-Docker's resolver proxy doesn't do dangling CNAMEs correctly
-and also answers NXDOMAIN in some cases where it should say
-no error, no data.
----
- tests/test_async.py             | 14 +++++++++++---
- tests/test_resolver.py          | 21 +++++++++++++++------
- tests/test_resolver_override.py | 19 ++++++++++++-------
- tests/util.py                   | 10 +++++++++-
- 4 files changed, 47 insertions(+), 17 deletions(-)
-
-diff --git a/tests/test_resolver_override.py b/tests/test_resolver_override.py
-index aed7a53d..be9e53f2 100644
---- a/tests/test_resolver_override.py
-+++ b/tests/test_resolver_override.py
-@@ -69,7 +69,7 @@ def test_override(self):
-         dns.resolver.restore_system_resolver()
-         self.assertTrue(socket.getaddrinfo is dns.resolver._original_getaddrinfo)
- 
--    def equivalent_info(self, a, b):
-+    def equivalent_info(self, a, b, q):
-         if len(a) != len(b):
-             return False
-         for x in a:
-@@ -78,16 +78,21 @@ def equivalent_info(self, a, b):
-                 # looking for a zero protocol.
-                 y = (x[0], x[1], 0, x[3], x[4])
-                 if y not in b:
--                    print("NOT EQUIVALENT")
--                    print(a)
--                    print(b)
--                    return False
-+                    # musl libc insists on always providing a canonical name, so
-+                    # accept that too.
-+                    y = (x[0], x[1], x[2], q, x[4])
-+                    if y not in b:
-+                        print("NOT EQUIVALENT")
-+                        print(a)
-+                        print(b)
-+                        return False
-         return True
- 
-     def equivalent(self, *args, **kwargs):
-+        q = args[0]
-         a = socket.getaddrinfo(*args, **kwargs)
-         b = dns.resolver._original_getaddrinfo(*args, **kwargs)
--        return self.equivalent_info(a, b)
-+        return self.equivalent_info(a, b, q)
- 
-     @unittest.skipIf(
-         sys.platform == "win32", "avoid windows original getaddrinfo issues"
-@@ -139,7 +144,7 @@ def test_getaddrinfo_nxdomain(self):
-     def test_getaddrinfo_service(self):
-         a = socket.getaddrinfo("dns.google", "domain")
-         b = socket.getaddrinfo("dns.google", 53)
--        self.assertTrue(self.equivalent_info(a, b))
-+        self.assertTrue(self.equivalent_info(a, b, "dns.google"))
-         try:
-             socket.getaddrinfo("dns.google", "domain", flags=socket.AI_NUMERICSERV)
-             self.assertTrue(False)  # should not happen!
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 5cef4a743e20..a7069916476f 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1 @@
-DIST dogpile.cache-1.3.0.tar.gz 265984 BLAKE2B 80aba607dad31b1ddb4e8b706f40c2ed47c7c2a4f074b7d115737ed934ed2b97c900e8ff5f01fa52c3177ebd364d4bac585cca4dd1d6aa5830cf42cdade52070 SHA512 fb00e114b2107d4ee27d699c62581554758f9ff2121ccade8f5c5aee5240adc0c6a1ae734f5d64b06f25493bfe19c40cffe1393d361be484433baaec74791b5a
-DIST dogpile.cache-1.3.1.tar.gz 266542 BLAKE2B ba639266dceed9fa55fa2e0045c8a73181da7620a4f06a032d41409933d7ed68c8b88a55bbf2711722507eb19a894cb6147bdc98ab714c0fb7b00e6d6ad6f149 SHA512 de7ab320e0173c302befd13751d89d1f1bcc024c210b3167b79b232306a835f2a51b6f09c449a7a401f4aa2b5e95d26039afbb57bbd17f0f0c4b962f8109d499
 DIST dogpile.cache-1.3.2.tar.gz 269742 BLAKE2B 9656ec20cecccc03c101fe23fd2fa9879bf34cbf52f5232677c357690e55185b6fdeeefc8f820e48a1e39f4d3f2ab106705c717edc3fb0245b8d66f2845bc0cb SHA512 4cdc77f5c58ac26dbedd32580ac03a3b1c9ebc7e0526dbc980307704b2a41be604682a24084149e0d09caf535eed3a555a97e47142676b42fdb68276aa04d1a3
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild
deleted file mode 100644
index 8f22f6ec8aac..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="
-	https://github.com/sqlalchemy/dogpile.cache/
-	https://pypi.org/project/dogpile.cache/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.3.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.3.1.ebuild
deleted file mode 100644
index 7d4db6d29616..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.3.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="
-	https://github.com/sqlalchemy/dogpile.cache/
-	https://pypi.org/project/dogpile.cache/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.3.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.3.2.ebuild
index 7d4db6d29616..8f22f6ec8aac 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.3.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.3.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/elementpath/elementpath-4.3.0.ebuild b/dev-python/elementpath/elementpath-4.3.0.ebuild
index 10951637b60d..ca46ba640677 100644
--- a/dev-python/elementpath/elementpath-4.3.0.ebuild
+++ b/dev-python/elementpath/elementpath-4.3.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/evdev/evdev-1.7.0.ebuild b/dev-python/evdev/evdev-1.7.0.ebuild
index ada2fa34bf03..dfc63502d672 100644
--- a/dev-python/evdev/evdev-1.7.0.ebuild
+++ b/dev-python/evdev/evdev-1.7.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 16918eaf4e7a..df7a4cf841f8 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,2 +1,3 @@
 DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
 DIST flatbuffers-23.5.26.gh.tar.gz 2257271 BLAKE2B 147425e7c018072f4ae4cdb3e034a4f434362d88d5e27b09375965993c279acfbed36064014c8f4fbe3fb81175ac0aa9b07629675e2c7ad33d59a9c85f2c3bb8 SHA512 cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31
+DIST flatbuffers-24.3.6.gh.tar.gz 2296876 BLAKE2B 2a9233c5256c16a494a850999565ee7b7fe6a032794770f7a9cb47e43d1abf8335f08f1ec2e94cb3fdb06d452bcb46c4b7f98519a7d52d2479891d50beeaf3c3 SHA512 2b0a97ee3ff0236b38dac9edbe4d984ae32c0a89436fd043b831e27c947782c704937afd44216ac1f7bdb7ad003f09bc381b1567e4866462fd3c9d6c7ab272e1
diff --git a/dev-python/flatbuffers/flatbuffers-24.3.6.ebuild b/dev-python/flatbuffers/flatbuffers-24.3.6.ebuild
new file mode 100644
index 000000000000..bd6699343be2
--- /dev/null
+++ b/dev-python/flatbuffers/flatbuffers-24.3.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/google/flatbuffers/
+	https://pypi.org/project/flatbuffers/
+"
+SRC_URI="
+	https://github.com/google/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	cd "${WORKDIR}/${P}/tests" || die
+	# zeroes means without benchmarks
+	"${EPYTHON}" py_test.py 0 0 0 0 false || die
+	"${EPYTHON}" py_flexbuffers_test.py -v || die
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 83e3f372c5e6..cde0358cd02d 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1 @@
-DIST google-auth-2.27.0.tar.gz 239688 BLAKE2B 3fa3c3c3da41b6337140e0ae474ab5b3a2da5aad3d18be64959c90339e03279594af97033faf406c0e76a923686b89a8f55ce5f7dff3bf3ad4510aca85189240 SHA512 a352cfced15d3e312410d382170909024d00cc27c34c3ec166af36aacf37ea9ac76b5c8bafc6e1379e2ddf3e422c27ce996474338d4efd17c21c9e79f3756994
-DIST google-auth-2.28.0.tar.gz 240460 BLAKE2B f7275d8ff1eb80871914a27a4cdcb7143d3d5de9d6217b74b2acfb64a95e7953dc076cd0d3796f81be62b174ea574a0ff7f557cc2372e475c08f095c8f299833 SHA512 b9c31ab425dc2e934443123cc5666e69ca7736e029f68b12b1a297c8818e28806671dd4ea01344213565718474182e4f2e1639f49ac408fb7913e8af4399daae
 DIST google-auth-2.28.1.tar.gz 240469 BLAKE2B 5bb74863eceddb7e0a1cdd6adb52a7467fcbd23a913177d20910194458721c3abcaa5d2f1f93324fae08aff91c8dc9fb65ba786ea8ed698daebb440505f17b2e SHA512 013c90dbeb6868406f56de87b72277a7932795ae3b806442bf07e90d34143e9a8035d2481f8c46a707a2bb0ed4285a1cb249613eff0da0b28b1aced783ce6a08
diff --git a/dev-python/google-auth/google-auth-2.27.0.ebuild b/dev-python/google-auth/google-auth-2.27.0.ebuild
deleted file mode 100644
index e34d831db5b5..000000000000
--- a/dev-python/google-auth/google-auth-2.27.0.ebuild
+++ /dev/null
@@ -1,59 +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="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.28.0.ebuild b/dev-python/google-auth/google-auth-2.28.0.ebuild
deleted file mode 100644
index 0dd347cc1e65..000000000000
--- a/dev-python/google-auth/google-auth-2.28.0.ebuild
+++ /dev/null
@@ -1,59 +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="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# these are compatibility tests with oauth2client
-		# disable them to unblock removal of that package
-		tests/test__oauth2client.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-2.28.1.ebuild b/dev-python/google-auth/google-auth-2.28.1.ebuild
index 0dd347cc1e65..e34d831db5b5 100644
--- a/dev-python/google-auth/google-auth-2.28.1.ebuild
+++ b/dev-python/google-auth/google-auth-2.28.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index c095ce2f4c3f..f21fd6043cd9 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,2 +1 @@
-DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be
 DIST httpbin-0.10.2.tar.gz 107327 BLAKE2B 39ab1e518c9f7e1ede9cd0aa2e3155f7e36267c83d1d2537a5b6cb5aa1c9e70efe96c5bf98a5b22cd05e70368d1495f8e5364032fcf2f476d62512b7e7322652 SHA512 731b842090be516d9eccb1d2bb8303128d2b2e24b1ebf0b2018a2f0b8629b164c7de686e1775841cd57417ec89941d98fc81f878a284c7242bfef4db481a781b
diff --git a/dev-python/httpbin/files/httpbin-0.10.1-werkzeug-3.patch b/dev-python/httpbin/files/httpbin-0.10.1-werkzeug-3.patch
deleted file mode 100644
index 5ad6f2743400..000000000000
--- a/dev-python/httpbin/files/httpbin-0.10.1-werkzeug-3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/httpbin/core.py b/httpbin/core.py
-index 5c1783a1..a82c1b88 100644
---- a/httpbin/core.py
-+++ b/httpbin/core.py
-@@ -32,7 +32,7 @@
-     from werkzeug.wrappers import Response
- except ImportError:  # werkzeug < 2.1
-     from werkzeug.wrappers import BaseResponse as Response
--from werkzeug.http import parse_authorization_header
-+
- from flasgger import Swagger, NO_SANITIZER
- 
- from . import filters
-@@ -47,6 +47,7 @@
-     H,
-     ROBOT_TXT,
-     ANGRY_ASCII,
-+    parse_authorization_header,
-     parse_multi_value_header,
-     next_stale_after_value,
-     digest_challenge_response,
-@@ -636,16 +637,13 @@ def redirect_to():
-     args_dict = request.args.items()
-     args = CaseInsensitiveDict(args_dict)
- 
--    # We need to build the response manually and convert to UTF-8 to prevent
--    # werkzeug from "fixing" the URL. This endpoint should set the Location
--    # header to the exact string supplied.
-     response = app.make_response("")
-     response.status_code = 302
-     if "status_code" in args:
-         status_code = int(args["status_code"])
-         if status_code >= 300 and status_code < 400:
-             response.status_code = status_code
--    response.headers["Location"] = args["url"].encode("utf-8")
-+    response.headers["Location"] = args["url"]
- 
-     return response
- 
-diff --git a/httpbin/helpers.py b/httpbin/helpers.py
-index b29e1835..836c8026 100644
---- a/httpbin/helpers.py
-+++ b/httpbin/helpers.py
-@@ -13,8 +13,14 @@
- import time
- import os
- from hashlib import md5, sha256, sha512
--from werkzeug.http import parse_authorization_header
- from werkzeug.datastructures import WWWAuthenticate
-+from werkzeug.http import dump_header
-+
-+try:
-+    from werkzeug.http import parse_authorization_header
-+except ImportError: # werkzeug < 2.3
-+    from werkzeug.datastructures import Authorization
-+    parse_authorization_header = Authorization.from_header
- 
- from flask import request, make_response
- from six.moves.urllib.parse import urlparse, urlunparse
-@@ -466,9 +472,14 @@ def digest_challenge_response(app, qop, algorithm, stale = False):
-     ]), algorithm)
-     opaque = H(os.urandom(10), algorithm)
- 
--    auth = WWWAuthenticate("digest")
--    auth.set_digest('me@kennethreitz.com', nonce, opaque=opaque,
--                    qop=('auth', 'auth-int') if qop is None else (qop,), algorithm=algorithm)
--    auth.stale = stale
-+    values = {
-+        'realm': 'me@kennethreitz.com',
-+        'nonce': nonce,
-+        'opaque': opaque,
-+        'qop': dump_header(('auth', 'auth-int') if qop is None else (qop,)),
-+        'algorithm': algorithm,
-+        'stale': stale,
-+    }
-+    auth = WWWAuthenticate("digest", values=values)
-     response.headers['WWW-Authenticate'] = auth.to_header()
-     return response
diff --git a/dev-python/httpbin/httpbin-0.10.1-r5.ebuild b/dev-python/httpbin/httpbin-0.10.1-r5.ebuild
deleted file mode 100644
index 553fb9ed723e..000000000000
--- a/dev-python/httpbin/httpbin-0.10.1-r5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="
-	https://github.com/psf/httpbin/
-	https://pypi.org/project/httpbin/
-"
-
-LICENSE="|| ( MIT ISC )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/flask-2.2.4[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		test-rust? (
-			dev-python/flasgger[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		# https://github.com/psf/httpbin/pull/29
-		"${FILESDIR}/${P}-werkzeug-3.patch"
-		# https://github.com/psf/httpbin/pull/44 (simplified)
-		"${FILESDIR}/${P}-optional-flasgger.patch"
-	)
-
-	# remove unnecessary deps
-	sed -i -e '/greenlet/d' -e '/flasgger/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	optfeature "Fancy index" dev-python/flasgger
-}
diff --git a/dev-python/httpbin/httpbin-0.10.2.ebuild b/dev-python/httpbin/httpbin-0.10.2.ebuild
index 44e7664e7639..50393d363207 100644
--- a/dev-python/httpbin/httpbin-0.10.2.ebuild
+++ b/dev-python/httpbin/httpbin-0.10.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT ISC )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index becded666577..5ae5178ec6ff 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,3 +1 @@
-DIST httpcore-1.0.2.gh.tar.gz 95549 BLAKE2B 92aa9a936d8c6933e1840ae50e6dfb70e61c756027a0448c2f0a5d270937342bd99cdb110aae152103c0d6c966e9288a22f7166a04dbb06dfb2a6f1bf1454d87 SHA512 6fc0c686b0b02b1e822550c18a7a90d2501f9d530598511877ee8cb09a0bdc4d56afe48cbb5fab5f8c1a12ea443055fe2a081b990fa4270f84db8197646b4979
-DIST httpcore-1.0.3.gh.tar.gz 96028 BLAKE2B de71f44e21a7aedeb61bd598ea5451efdace9582b15dbbe22f2bd91e1892f21ef3ee49408cdb08ec4142eeef688c1eed003eadf43bd2a8d16a38e6fc2fdf7409 SHA512 1f17e6232a7fe5e2500d7adc67915143eff0fd4b197e5cea0ee11ad7c6b88488ac2181571b5a2f67d4bebe933886b1f273c91c565e3b739df8aaf2d6aa219cb0
 DIST httpcore-1.0.4.gh.tar.gz 97682 BLAKE2B 2a500e63360095680b5b679856b8b2b9bdefc5f0a2d268ded83da52f0ef9cee5d09a99fa15565590d6c7ef4637146beeee3c950dd37a8a40f2af5189eb25cc4c SHA512 e618a562dbeb2229e9fdc8e63769415c7308614e120f24d0319e8fe9c96ed6de014fcc03ac376737c5791875bb82b2cc486247bfbf235afe11d48f09a2d2a701
diff --git a/dev-python/httpcore/httpcore-1.0.2.ebuild b/dev-python/httpcore/httpcore-1.0.2.ebuild
deleted file mode 100644
index 2993e623cf9b..000000000000
--- a/dev-python/httpcore/httpcore-1.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-1.0.3.ebuild b/dev-python/httpcore/httpcore-1.0.3.ebuild
deleted file mode 100644
index bb1f4a2df607..000000000000
--- a/dev-python/httpcore/httpcore-1.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A minimal low-level HTTP client"
-HOMEPAGE="
-	https://www.encode.io/httpcore/
-	https://github.com/encode/httpcore/
-	https://pypi.org/project/httpcore/
-"
-SRC_URI="
-	https://github.com/encode/httpcore/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	<dev-python/h11-0.15[${PYTHON_USEDEP}]
-	<dev-python/h2-5[${PYTHON_USEDEP}]
-	=dev-python/sniffio-1*[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "SOCKS support" dev-python/socksio
-}
diff --git a/dev-python/httpcore/httpcore-1.0.4.ebuild b/dev-python/httpcore/httpcore-1.0.4.ebuild
index bb1f4a2df607..1ef1a9b8d7ac 100644
--- a/dev-python/httpcore/httpcore-1.0.4.ebuild
+++ b/dev-python/httpcore/httpcore-1.0.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 6f5e65aebcad..6dfbfb2e792e 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,2 +1 @@
-DIST httpx-0.26.0.gh.tar.gz 2164373 BLAKE2B 1de507dd1a0a4f5c87187645f7928f37f29e9a6cdcaacfbefe0e324cda5ad7f86a29efe99b496629a2e2f14851b8a6312d8be4595cfc61a97ce302b284dd1939 SHA512 76838d5c191700f5fd4c6afcc9d129f3809811f6ce40d45edf89518457a9497cdd94c11a68a9c42494780c579eaa43760a8bd85313d7864a8f5ae1c1b9912d61
 DIST httpx-0.27.0.gh.tar.gz 2168004 BLAKE2B 2bfe58ffa9bd75b602acf844967d399c2173499981e73296bfc0726ee738219031ac3ac04517dd027f769966b77bf225287490c55435a53aec44b9784a0c4b2e SHA512 9db19cced6554effdb5fb0b442cbe05dc66cbfbdb23e8fbc19f43e1acc81028bca9e0fba5d2dae617b19be9f64baa0f02e727e92fef3f3f1288aa19ae07f35c6
diff --git a/dev-python/httpx/httpx-0.26.0.ebuild b/dev-python/httpx/httpx-0.26.0.ebuild
deleted file mode 100644
index c67b14c43ee3..000000000000
--- a/dev-python/httpx/httpx-0.26.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 optfeature
-
-DESCRIPTION="Fully-featured HTTP client which provides sync and async APIs"
-HOMEPAGE="
-	https://www.python-httpx.org/
-	https://github.com/encode/httpx/
-	https://pypi.org/project/httpx/
-"
-SRC_URI="
-	https://github.com/encode/httpx/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	dev-python/anyio[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-	=dev-python/httpcore-1*[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/sniffio[${PYTHON_USEDEP}]
-	cli? (
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		=dev-python/pygments-2*[${PYTHON_USEDEP}]
-		dev-python/rich[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-python/brotlicffi[${PYTHON_USEDEP}]
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/h2[${PYTHON_USEDEP}]
-		dev-python/socksio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-		dev-python/uvicorn[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/^httpx =/d' pyproject.toml || die
-	fi
-	sed -i -e '/rich/s:,<14::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/client/test_proxies.py::test_async_proxy_close
-		tests/client/test_proxies.py::test_sync_proxy_close
-	)
-
-	use cli || EPYTEST_IGNORE+=(
-		tests/test_main.py
-	)
-
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "HTTP/2 support" dev-python/h2
-	optfeature "SOCKS proxy support" dev-python/socksio
-	optfeature "Decoding for brotli compressed responses" dev-python/brotlicffi
-}
diff --git a/dev-python/httpx/httpx-0.27.0.ebuild b/dev-python/httpx/httpx-0.27.0.ebuild
index d61986b2328c..c67b14c43ee3 100644
--- a/dev-python/httpx/httpx-0.27.0.ebuild
+++ b/dev-python/httpx/httpx-0.27.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 97f01b9259d0..d9d38a77d742 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,8 +1,3 @@
-DIST hypothesis-6.97.5.gh.tar.gz 9426065 BLAKE2B 2aec769268af7392f71c0ec7d12defad4962bd56597cb68ca0edfa81dbf28ef7d865b26086b75ee03287c82a0b2c0273a55bd6872b188728595fe74198130dd6 SHA512 d9f2adc51ef3b7fc331d3dca1b69a9464a2bc73298747f3732b8b4621237284ac60a50b927b57a047a155e0d94a3ee2974bbef2c9cf9112080e9098fba3cfc7f
-DIST hypothesis-6.98.10.gh.tar.gz 9428083 BLAKE2B 7b1f49fb296097d00396bdcb699203a92ac210d4c05927e5f44cf4d3ab1aadb75a1a13a66bdcd63a582b19b99980e3075b3d481b9d4d8b737e53f410e3821718 SHA512 5cff0fb16e64b9190da4055487945060b0a85c3dbde949bcd9e1931e3825d8316bd3780a432503fce33cab48f078f83d418e4e1760a084a933f591183b22f0c3
-DIST hypothesis-6.98.11.gh.tar.gz 9428472 BLAKE2B 79c4561ac1ac3ad309bccd215bb0b4f1a010b50058e70770ca51cb5e35e5c99e95aaa1d0a757a84fc1c34c117c6d400d40d41ea0dcfc236db2b2bc78812a9671 SHA512 3abe0801e33836727a48bdf7888bfaf0fbe2eca36aa511cdeaed29d45351c250c8f5aed6f47396f1e97fbccbecb45bd0b55b86a2956fa0bd735b99edc6bbe53f
-DIST hypothesis-6.98.12.gh.tar.gz 9429362 BLAKE2B cb8ac92b93057c1e311caddcdba99ef56cc5fdcedbf4a5fc0cc9342a4bdc2565cb5154f963e202b0d6fc6254a123277db0ff825493ed0d240f01b14f33131745 SHA512 0dfb07a69810685fc8042e93ce3fa9738d593835008bae31afd9cee621b8975f455c545768096990c3000e08d230cb116c465509e95c5139db0c7609a576ab3e
-DIST hypothesis-6.98.13.gh.tar.gz 9430826 BLAKE2B 93de2e3548c10167e3f1d66dafe8a1f4bb221b79da6de71055753413778657260aac88ac6321d78a06934d2e5c649478b8f7704a79d7d93bcb655d866b3c89d5 SHA512 4a512e2feea13968327913df601be284bf42f94f7cfc574db6e2107b991d83f5c81734a43df31a19f30e1ea57f610916d611270fb9c9f5df353db7c2645b6428
 DIST hypothesis-6.98.15.gh.tar.gz 9431325 BLAKE2B 350791d64db933b4b64df5430d79ec1d67b6fac9f2a3cef0997965e29c2c1acc1f83e59f11591d29734abc5704a2d25f4497d30c6fce8190bd245365d8ee5dbd SHA512 97794968d2028fd1fbb90c1fcb415f3d3cc894e160f0af0a867798ffb6b678c7f5c213ef24d05def81be0fda3de4264371e211e7c514b64d5e21d312ca381ef1
 DIST hypothesis-6.98.17.gh.tar.gz 9434016 BLAKE2B 3c26f8c696bc4a62b9ada8e45dd3053879e15c3dfde25caf8239be5e89f6267df342d9c3039b6c2cbb8125ade365b89c5f4d1de5f79e65ddc0808227fe37ec40 SHA512 749fb572b7239dafab5af649ec0eb8fa0071f35dd394c1b356ff2042abbe6e469ca8d7c32619d44cefbc3d7aa8fd31a81d95f772e826578261fdf97c792bdb57
 DIST hypothesis-6.98.9.gh.tar.gz 9427046 BLAKE2B c3705e4c780b6e7f427943231ac056f343e70569e88391f118383e6d6197f72e744306476f2e1994e8a6d95dce73b93dcd49e8fa197149e532b84c91bce79594 SHA512 1e8a0dcefb8def8376a0ad6549a58dac66470941e4a3584ba82867f8779fd941c141039f631f15f134f7cdb3beb2ad1a19312d8e56c47db9ace0569f203afaf3
diff --git a/dev-python/hypothesis/hypothesis-6.97.5.ebuild b/dev-python/hypothesis/hypothesis-6.97.5.ebuild
deleted file mode 100644
index def1ceae16af..000000000000
--- a/dev-python/hypothesis/hypothesis-6.97.5.ebuild
+++ /dev/null
@@ -1,90 +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-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.98.10.ebuild b/dev-python/hypothesis/hypothesis-6.98.10.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.98.10.ebuild
+++ /dev/null
@@ -1,90 +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-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.98.11.ebuild b/dev-python/hypothesis/hypothesis-6.98.11.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.98.11.ebuild
+++ /dev/null
@@ -1,90 +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-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.98.12.ebuild b/dev-python/hypothesis/hypothesis-6.98.12.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.98.12.ebuild
+++ /dev/null
@@ -1,90 +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-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.98.13.ebuild b/dev-python/hypothesis/hypothesis-6.98.13.ebuild
deleted file mode 100644
index 1f7054962839..000000000000
--- a/dev-python/hypothesis/hypothesis-6.98.13.ebuild
+++ /dev/null
@@ -1,90 +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-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.98.9.ebuild b/dev-python/hypothesis/hypothesis-6.98.9.ebuild
index 1f7054962839..def1ceae16af 100644
--- a/dev-python/hypothesis/hypothesis-6.98.9.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.98.9.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/i3ipc/i3ipc-2.2.1.ebuild b/dev-python/i3ipc/i3ipc-2.2.1.ebuild
index 2a630229b9de..e29742882687 100644
--- a/dev-python/i3ipc/i3ipc-2.2.1.ebuild
+++ b/dev-python/i3ipc/i3ipc-2.2.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1 pypi
@@ -15,6 +16,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/python-xlib"
-DEPEND="${DEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 5e857a81d578..7e529f529c50 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1 @@
-DIST identify-2.5.34.gh.tar.gz 101695 BLAKE2B 94522c083ce2584831bd61b6d7e34533f08ad3814ccde93b7340139bcc4dc05fa6384024e6f15cc33e480de06117d17a88d148044758658e7cb302bfab7d7366 SHA512 bf9fe2bdca46b1e9a7f1e4559178061bb5293d43b42962d17a08b6f9230c3d2d004b74ac3b1c825905fa77631533565b26c95a0fa99f2bb9a3320d2d4a5f67aa
 DIST identify-2.5.35.gh.tar.gz 101691 BLAKE2B 931169744a9126d82b32bd4dea1731f1f4ad209b78d3df9ce490891994194797a7adcaff19400e9856716528f5b3490e05c8e06614c788b089251ef92cd1dd03 SHA512 1d01535f95818533220c06988eb2d9f495c004b41fd197482ab0e3520f81ab2aebce0344dffeb0449423abd6574c21043fa0ad20472b3aaff6cb97986f31fd88
diff --git a/dev-python/identify/identify-2.5.34.ebuild b/dev-python/identify/identify-2.5.34.ebuild
deleted file mode 100644
index 1429dd3b7f42..000000000000
--- a/dev-python/identify/identify-2.5.34.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="File identification library for Python"
-HOMEPAGE="
-	https://github.com/pre-commit/identify/
-	https://pypi.org/project/identify/
-"
-SRC_URI="
-	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/ukkonen[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.5.35.ebuild b/dev-python/identify/identify-2.5.35.ebuild
index 043fcd3b8487..1429dd3b7f42 100644
--- a/dev-python/identify/identify-2.5.35.ebuild
+++ b/dev-python/identify/identify-2.5.35.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/ukkonen[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch b/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch
new file mode 100644
index 000000000000..196c21523426
--- /dev/null
+++ b/dev-python/imageio-ffmpeg/files/imageio-ffmpeg-0.4.9-ffmpeg-6.patch
@@ -0,0 +1,25 @@
+From e2ec5ea3b7d9e5fd3225a05891f3611e29adbd1d Mon Sep 17 00:00:00 2001
+From: Tom Vercauteren <tom.vercauteren@kcl.ac.uk>
+Date: Thu, 7 Mar 2024 14:28:21 +0000
+Subject: [PATCH] Add a null filter to re-enable frame count
+
+This aims at addressing https://github.com/imageio/imageio-ffmpeg/issues/99
+---
+ imageio_ffmpeg/_io.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/imageio_ffmpeg/_io.py b/imageio_ffmpeg/_io.py
+index b85c453..faf1ee8 100644
+--- a/imageio_ffmpeg/_io.py
++++ b/imageio_ffmpeg/_io.py
+@@ -153,8 +153,8 @@ def count_frames_and_secs(path):
+         path,
+         "-map",
+         "0:v:0",
+-        "-c",
+-        "copy",
++        "-vf",
++        "null",
+         "-f",
+         "null",
+         "-",
diff --git a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9.ebuild b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9-r1.ebuild
index c8787bcebd17..33fc9ba2681e 100644
--- a/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9.ebuild
+++ b/dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.9-r1.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
@@ -30,3 +30,8 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/imageio/imageio-ffmpeg/pull/107
+	"${FILESDIR}/${P}-ffmpeg-6.patch"
+)
diff --git a/dev-python/imageio/imageio-2.34.0.ebuild b/dev-python/imageio/imageio-2.34.0.ebuild
index 35d0682ac4e9..e8fb59b99527 100644
--- a/dev-python/imageio/imageio-2.34.0.ebuild
+++ b/dev-python/imageio/imageio-2.34.0.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/fsspec[${PYTHON_USEDEP}]
-		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		>=dev-python/imageio-ffmpeg-0.4.9-r1[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/tifffile[${PYTHON_USEDEP}]
@@ -82,11 +82,4 @@ EPYTEST_DESELECT=(
 	# requires pillow-heif, also possibly Internet
 	tests/test_pillow.py::test_avif_remote
 	tests/test_pillow.py::test_heif_remote
-	# TODO: imageio-ffmpeg seems broken with current ffmpeg?
-	tests/test_ffmpeg.py::test_reader_more
-	tests/test_ffmpeg.py::test_reverse_read
-	tests/test_ffmpeg.py::test_write_audio_ac3
-	tests/test_ffmpeg.py::test_write_audio_default_codec
-	tests/test_ffmpeg.py::test_writer_pixelformat_size_verbose
-	tests/test_ffmpeg_info.py::test_overload_fps
 )
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index e1bf1eb39590..1431a64c3482 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1 +1,2 @@
 DIST importlib_metadata-7.0.1.tar.gz 50537 BLAKE2B 791a5d11e7b52f1563f69e4c6014ca8d29995a673d9f55b5ab809215f8e1f3410ed52e80443d28fa944f460a2d55c6e857bf34533376a05ae677186cfd3916dd SHA512 73cdd72e0e39c34beb357bafd0ece2ebdf7def4c9c34f434f4be6da53c70206e5bc9ec3e6ddf0282e1511ddf14a9a562b09cab822483733802bed19e23716023
+DIST importlib_metadata-7.0.2.tar.gz 51206 BLAKE2B 74202e7e4097f16c2de0453d7a47ee6f7b1658d07979fd13e34b749d7bf13c668ee5a8e9fd48bbf4220c87216c702ddc17483ecc30a41409d1e7757ecd4c0300 SHA512 a672e5b887107f4dac02283bedfe8e545c2eadc92a51df75e5db671707f497c4d441b9c60841e2651d9dc4779b34167b49ad20f4b49e642d848419e303d73aef
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.0.2.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.0.2.ebuild
new file mode 100644
index 000000000000..0d30da070710
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-7.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index 150f14ff8839..d7739e46b6ba 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,5 +1,2 @@
 DIST json5-0.9.17.tar.gz 35980 BLAKE2B 5edfdbd48dbc287d3b0575ef0f6b8dfd567cecfb0fabe31c2254ba56b82d9c54e133bca86dd71315537d15f7068fb957c9d86b869804de2d51bcc12c07a0961d SHA512 eeff6db19e9a38d61c0ef6a1259e69616b524ede372fade1973be341a7c8730812049212a0f75023026ece3e598f579900d9cac73f231dfa711939c71b8c1e17
-DIST json5-0.9.18.tar.gz 36395 BLAKE2B 577b4ce726ea408547e387d9489a65b57db7c2bc8a1fcdbdde48261a6b74646c4adba99ba7a5252305b5bff005de2355c5312e428c6bb1bf48a56124e7493062 SHA512 c4244aee83365f51011609686e214fc5d3a9154346286304b1b4ca3385619ec1735eba998e10cfaadb34a6ba9f6203c5c8306b66662c739ac7e98e9298c58c34
-DIST json5-0.9.20.tar.gz 36990 BLAKE2B 3de1d852ca6ccc379c20dee1866ae4d05e4c276c4d4b37dd2531c0773d1f8d38f1e80ee682732a2c20c03cd2fe666f77476075bb31d038b17ebd6fe8fa3181bf SHA512 60ba90e13c70965eb1561684c7b0a816d0002629a76789a1d649a7b41708c14a860ccc942ecc94a246dbcbb8d866065d0c5f62a5d9f9ccefcc01f3c9d29d81ca
 DIST json5-0.9.22.tar.gz 38875 BLAKE2B 42a88acba034874ef1084a2d1205833b1ed8311308a67628098e7cfee4ef84f8dea8096b28b0a456119eedc9ce02dcca321831843fba3814aa1014649d9ac708 SHA512 a9d02cb980ebb62c931cd4747519ea268b285440f1ad5e9175f3fe92da573a91d9cbae1f770915ddcbbbc083c6b616039357b6956e294bb4582db2b2f0f00dbc
-DIST pyjson5-0.9.11.gh.tar.gz 111445 BLAKE2B 038ac1fab6e56e6dc45dc9bff1fc5e0da21c594cb0ac1f6d888f0207fddace9663b0dbd6abbfabce857cb9fcb40348002b10a6b4133e2f2ebb2081c543e1ad9c SHA512 aca3f38cd79d4bf52ceaf1b3dd27e30bf7598fa0b369216ac820f0c913797ebf542c9eaac17e562ee07006bf83c09210c799bc1b715c7b6e7689d2dcd702d414
diff --git a/dev-python/json5/json5-0.9.11.ebuild b/dev-python/json5/json5-0.9.11.ebuild
deleted file mode 100644
index 6ca5a6b4fcec..000000000000
--- a/dev-python/json5/json5-0.9.11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-MY_P=pyjson5-${PV}
-DESCRIPTION="A Python implementation of the JSON5 data format"
-HOMEPAGE="
-	https://github.com/dpranke/pyjson5/
-	https://pypi.org/project/json5/
-"
-SRC_URI="
-	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.17.ebuild b/dev-python/json5/json5-0.9.17.ebuild
index b753b823a262..391914d8ded0 100644
--- a/dev-python/json5/json5-0.9.17.ebuild
+++ b/dev-python/json5/json5-0.9.17.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.18.ebuild b/dev-python/json5/json5-0.9.18.ebuild
deleted file mode 100644
index b753b823a262..000000000000
--- a/dev-python/json5/json5-0.9.18.ebuild
+++ /dev/null
@@ -1,21 +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="A Python implementation of the JSON5 data format"
-HOMEPAGE="
-	https://github.com/dpranke/pyjson5/
-	https://pypi.org/project/json5/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/json5/json5-0.9.20.ebuild b/dev-python/json5/json5-0.9.20.ebuild
deleted file mode 100644
index b753b823a262..000000000000
--- a/dev-python/json5/json5-0.9.20.ebuild
+++ /dev/null
@@ -1,21 +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="A Python implementation of the JSON5 data format"
-HOMEPAGE="
-	https://github.com/dpranke/pyjson5/
-	https://pypi.org/project/json5/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 74d24754d059..e83886620667 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -3,3 +3,4 @@ DIST jupyterlab-4.0.13.tar.gz 18354664 BLAKE2B 6c4df40c8ab5a97cf85025c752f48dc97
 DIST jupyterlab-4.1.1.tar.gz 21807943 BLAKE2B 9bd6d9fc25c68743f01c2193e09d996e4350a8a00b1b8a0c83c001d4452a16b7ba69362fea36955cbb93f8f408a6e3a5dd45f2a17cde8899d5a192f7395875a5 SHA512 9441dc0faec7e65c7a228b2876d5a6d962e892209414e38c336436af218789d6f735c6c7eb089a0c1525c04ef6824abfb5da82b14292dc402b6a0f7f97d06e0a
 DIST jupyterlab-4.1.2.tar.gz 21810592 BLAKE2B 5c5c828c0144260e1fbead1f2ea23cd6b458c2c86dc2202ed4e56fd566d85e14544fa7443d0676926e0619721bad5b8e85431bf02f7a61a3f0fceeafb0eafa66 SHA512 17ab1132421e494a3ce48edec3823576f0202b90e238a01f8500b86bbd7753a8b3e6376a9f2bdd5cf7b1f50708853d92886b486a4a0c620df179693f1566e3e2
 DIST jupyterlab-4.1.3.tar.gz 21796851 BLAKE2B afe0b939a24bd977d2667d4b769a2742ca34e52ffe9264bd940d740e6189a5285f7e2f3c261f8af0a63097f1afa70802939e635bd316bcdc592ca72d670c0ef9 SHA512 ea463c86b06632a007e4fe1d7fd724b1b2377af13620313bc70620d7fbf05ccc5b6a5565b27469ea281a95424c446f62db904f1d40dfab321c6821a998813513
+DIST jupyterlab-4.1.4.tar.gz 21797461 BLAKE2B 1a2926f153e2c7343ec83d79bd6dbc666f9955cb4df93e8aa6f93c9af625dbad0e1b50c96181257df2969b4cd2e8abe979d6a1662c20b7c08d7730767f54d8f1 SHA512 14613f0a008ed37f79d52c149734171d1aa93b0eeedbe62c05dbb3d9d796c27cc754225ebae0ca0615d6bed527b8f641d30333cb092ed7134434124446f3512a
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild
index 86c870676a9c..e1ad42ed7c20 100644
--- a/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-4.1.2.ebuild b/dev-python/jupyterlab/jupyterlab-4.1.2.ebuild
index bf6f338b6cac..34de2dc495e0 100644
--- a/dev-python/jupyterlab/jupyterlab-4.1.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.1.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD MIT GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/async-lru[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-4.1.4.ebuild b/dev-python/jupyterlab/jupyterlab-4.1.4.ebuild
new file mode 100644
index 000000000000..bf6f338b6cac
--- /dev/null
+++ b/dev-python/jupyterlab/jupyterlab-4.1.4.ebuild
@@ -0,0 +1,78 @@
+# 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 xdg
+
+DESCRIPTION="JupyterLab computational environment"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyterlab/jupyterlab/
+	https://pypi.org/project/jupyterlab/
+"
+
+LICENSE="BSD MIT GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/async-lru[${PYTHON_USEDEP}]
+	>=dev-python/httpx-0.25.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-lsp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
+	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
+	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
+	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2.0[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	net-libs/nodejs
+"
+
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.5.3[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-cache[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_DESELECT=(
+	# These tests call npm and want internet
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_uninstall_core_extension
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned_folder
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_install_and_uninstall_pinned
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom_minimal_core_config
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_custom
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build_check
+	jupyterlab/tests/test_jupyterlab.py::TestExtension::test_build
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_clear
+	jupyterlab/tests/test_build_api.py::TestBuildAPI::test_build
+)
+
+EPYTEST_IGNORE=(
+	jupyterlab/tests/test_announcements.py
+)
+
+distutils_enable_tests pytest
+# TODO: package sphinx_copybutton
+#distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme dev-python/myst-parser
+
+python_install_all() {
+	distutils-r1_python_install_all
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 3f11093edf78..393a8643c6f4 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,6 +1,2 @@
 DIST mkdocs-material-9.5.10.gh.tar.gz 14770017 BLAKE2B 90f436c205d226332b1b3acee73649a77bf01ced13e403230396f0fcf5aa7a30721d1eacb6b788324f12b08c190c7387677f4588d00d6ccab59b6ed46d2fbc1f SHA512 4ab89fdf3f31355520d49e290db613e8585a92a349bc5bb064363d8dc6c65c2998cceb2e455324880166300b05593e2195c6dcf916dbe5ac286f3112ff4f82a2
-DIST mkdocs-material-9.5.11.gh.tar.gz 14776542 BLAKE2B c15e89522b1720aba4fbd00d9039238be43a96765010ab8a3197e6e964036db5b959595facc6debd2d582740bfcd2134abc8773f767188b45af6e26ce5234400 SHA512 b0c532dd96abc656fb3b3fe45b2c6b90ac29edae35492423f7a62851dbd4c07c6cf32249f09d67e1266293f5afbc6675505260770f3cbfed08d50f07342c17de
-DIST mkdocs-material-9.5.12.gh.tar.gz 14786551 BLAKE2B 149be39600d4d59553b0281df8ea606ab9ac39a98ca7ac75a945dec16147a43e0d706c9c71478123eda6ab1d3e57227f9d367da00acefd57607cd2d967674787 SHA512 669a55d79d7ae2aba3666c9e72f0374788d97eb266854795ac8b7cd10b462a3b609e0308a9581889764a001086bb9348242dcff735379f10c2f8ad003f257621
 DIST mkdocs-material-9.5.13.gh.tar.gz 14797946 BLAKE2B fa525ff6577eb9409f08a3dd3b609f85d5bd0eabf3922d2f32751ee3d2fd52a09bdcbf4aa73f8a5c5185ced8eed542a33f414980a1632cc995d572b50fdb277d SHA512 57cb9a8d18bbb1d4ce43976b59737fc9619d8755f1736687b8399df7edbe0f44e91a97256ede886f45583a32d3cfdd049361c817310bbaca045b96e1a0d3e5e6
-DIST mkdocs-material-9.5.7.gh.tar.gz 14715071 BLAKE2B 4eb978e28150b00b925fa151445b459cb048b8a48526aadc1f82b12fab65e8635d1417546b280cfd7af3dc6a9cf4d2ed7984958896bfa910d3d14fa27059c907 SHA512 4a5163bb5e5705a1d9bf35ed88746cff1e8bb74e7dfa92b73304a9261702449e6c63fbbcaf7680ff28ba8a344376adf777d74f145f3668076036518c143064e5
-DIST mkdocs-material-9.5.9.gh.tar.gz 14726800 BLAKE2B dad4da1b661b0e1c67884248cf526bc19b3c2e33d5d2da7bfcc5589f6dde953147672ac657e84e7825ef8dcc061f6bc8aaabd6b24a3caa962dbdfa5ab8f2d49e SHA512 74031f4e9bb3ffd5cd02ee4301b5d61861e36a5cbdbc385c7db253e18c4d935ef959bf6c58033887f1edd6e3011d38b45c6bdca0ae838f76536df439447d79fc
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.10.ebuild
index eec1908ef846..5c080c205d27 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.10.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.5.10.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="social"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.11.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.11.ebuild
deleted file mode 100644
index eec1908ef846..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.11.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.12.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.12.ebuild
deleted file mode 100644
index eec1908ef846..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.7.ebuild
deleted file mode 100644
index 5c080c205d27..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.7.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.5.9.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.5.9.ebuild
deleted file mode 100644
index eec1908ef846..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.5.9.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="social"
-
-RDEPEND="
-	>=dev-python/Babel-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.6[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.5.3[${PYTHON_USEDEP}]
-	>=dev-python/paginate-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-10.2[${PYTHON_USEDEP}]
-	>=dev-python/readtime-2.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2022.4.24[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	social? (
-		>=dev-python/pillow-10.2[${PYTHON_USEDEP}]
-		>=media-gfx/cairosvg-2.5[${PYTHON_USEDEP}]
-	)
-"
-BDEPEND="
-	>=dev-python/trove-classifiers-2023.10.18[${PYTHON_USEDEP}]
-"
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.2[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/moto/moto-5.0.2.ebuild b/dev-python/moto/moto-5.0.2.ebuild
index bdcab4c42c04..78410afd3664 100644
--- a/dev-python/moto/moto-5.0.2.ebuild
+++ b/dev-python/moto/moto-5.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/aws-xray-sdk-0.93[${PYTHON_USEDEP}]
diff --git a/dev-python/netaddr/Manifest b/dev-python/netaddr/Manifest
index 991e32afb007..37b10114182d 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,3 +1,2 @@
 DIST netaddr-0.10.1.tar.gz 2225283 BLAKE2B 1e350909779af0bf48d74834194358386cf4f8e11fa7b03c971b3011bcec437cc39feb72e7e79d55eb330e6ee138d15bb6dba9293667e1adb4ed1c6d42a35d78 SHA512 ca04171d5cbfd569d4f262f4870610edfd98be35899cb70983dbff5f37add963e05987ddbe1ab22d9b615580ac1abe96a8c2903681b18af8c9f2f96899b618ff
-DIST netaddr-1.1.0.tar.gz 2277798 BLAKE2B 8924bca9287b85db171e3d6df4b2fa1a8b00686d606920b92907ef03da284230849625e31cbd7c0606a94d7b5b002b90bf2209b1df39905d4d90c95bbb1a0b32 SHA512 a3b64627a4f9355457f02b5ace5d2b6c29874dcfc6341ef6001807074cddef205844328123357170c8474ef3b5035f61a6015985172d9377dc5bb14b741caa4c
 DIST netaddr-1.2.1.tar.gz 2278809 BLAKE2B 86ab4308961e31277846555295321f392cd9d31bb53abe6a975cafba675dca0da20980a730ed90f545b03b9041269ef93b1ba4bd1a9e523ac3193059e227f63a SHA512 73e9dc76bb1b6affe56be47a409c470c95bb2d50255211b1cd0d130c3d31c16cb608897cd0785fbe155de82c43d526252b6132e8ae757b7e6a28a95889b0e0f7
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index dee90aa52b49..483c720b8f34 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -9,9 +9,6 @@
   <bugs-to>https://github.com/netaddr/netaddr/issues</bugs-to>
   <doc>https://netaddr.readthedocs.io/</doc>
  </upstream>
- <use>
-  <flag name="cli">Provide a command-line interface</flag>
- </use>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/netaddr/netaddr-1.1.0.ebuild b/dev-python/netaddr/netaddr-1.1.0.ebuild
deleted file mode 100644
index e8b4456a64b9..000000000000
--- a/dev-python/netaddr/netaddr-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Network address representation and manipulation library"
-HOMEPAGE="
-	https://github.com/netaddr/netaddr/
-	https://pypi.org/project/netaddr/
-	https://netaddr.readthedocs.io/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="cli"
-
-RDEPEND="
-	cli? ( dev-python/ipython[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/furo \
-	dev-python/sphinx-issues
-distutils_enable_tests pytest
-
-src_prepare() {
-	if ! use cli; then
-		sed -i -e '/netaddr\.cli/d' pyproject.toml || die
-	fi
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/netaddr/netaddr-1.2.1.ebuild b/dev-python/netaddr/netaddr-1.2.1.ebuild
index e855a06e65d6..fba4454f8af5 100644
--- a/dev-python/netaddr/netaddr-1.2.1.ebuild
+++ b/dev-python/netaddr/netaddr-1.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_sphinx docs/source \
 	dev-python/furo \
diff --git a/dev-python/pooch/pooch-1.8.1.ebuild b/dev-python/pooch/pooch-1.8.1.ebuild
index 1b2cce0461f0..0823bef1ae7c 100644
--- a/dev-python/pooch/pooch-1.8.1.ebuild
+++ b/dev-python/pooch/pooch-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pure-protobuf/Manifest b/dev-python/pure-protobuf/Manifest
index 0dff75892522..e61777204016 100644
--- a/dev-python/pure-protobuf/Manifest
+++ b/dev-python/pure-protobuf/Manifest
@@ -1 +1 @@
-DIST pure_protobuf-2.3.0.tar.gz 16481 BLAKE2B b56d024b13ef4711c9b53ffc47029fb4e49e025d8c096b547926d44a89769a26d180420698dbf51c2db4b58f8b8df6825d368c921babdd9774e4c3a4f0d72e7e SHA512 2b2eb372cde5b7c765fa878b06fe1a82f57061d0887f560aa84799db09d506a4947b54feffff51391ebf2c87923845f93badbab19e1cf45f998c79f6df75fb05
+DIST pure_protobuf-3.0.1.tar.gz 18228 BLAKE2B c714bcd78763e854e9e690b98d4166cf8395511ad8fa8a37692daeec86463e99a884069b3da927a594b6204a5c8b3810b2fac5d7d1075794891d1843a232a2ba SHA512 f08005d2fbeda2d5cfc0f066cb88da350ba3ff7d8ee8922c58b77936360782c5e5ac40f8a5a98377c65c7a0d0df5e10d16fafa082f0a6caddbf6450782551ab0
diff --git a/dev-python/pure-protobuf/files/pure-protobuf-3.0.1-static-version.patch b/dev-python/pure-protobuf/files/pure-protobuf-3.0.1-static-version.patch
new file mode 100644
index 000000000000..39e1d7f6cb40
--- /dev/null
+++ b/dev-python/pure-protobuf/files/pure-protobuf-3.0.1-static-version.patch
@@ -0,0 +1,12 @@
+We don't need dynamic versioning, replace with default backend.
+--- a/pyproject.toml	2024-03-06 20:59:32.071133500 +0900
++++ b/pyproject.toml	2024-03-06 21:00:01.002037882 +0900
+@@ -31,7 +31,7 @@
+ 
+ [build-system]
+ requires = ["poetry-core", "poetry-dynamic-versioning"]
+-build-backend = "poetry_dynamic_versioning.backend"
++build-backend = "poetry.core.masonry.api"
+ 
+ [tool.poetry.dependencies]
+ get-annotations = { version = "^0.1.2", python = "<3.10" }
diff --git a/dev-python/pure-protobuf/metadata.xml b/dev-python/pure-protobuf/metadata.xml
index d5e0dd79a716..c77a8442b312 100644
--- a/dev-python/pure-protobuf/metadata.xml
+++ b/dev-python/pure-protobuf/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>pastalian46@gmail.com</email>
+  <name>Takuya Wakazono</name>
+ </maintainer>
  <upstream>
   <maintainer>
    <email>eigenein@gmail.com</email>
diff --git a/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild b/dev-python/pure-protobuf/pure-protobuf-3.0.1.ebuild
index b3cf425f718a..77a44a54c986 100644
--- a/dev-python/pure-protobuf/pure-protobuf-2.3.0.ebuild
+++ b/dev-python/pure-protobuf/pure-protobuf-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=hatchling
+DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python implementation of Protocol Buffers data types with dataclasses support"
@@ -17,4 +17,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/typing-extensions[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-static-version.patch" )
diff --git a/dev-python/pymongo/pymongo-4.6.2.ebuild b/dev-python/pymongo/pymongo-4.6.2.ebuild
index faa001a3e66b..418cdbdc62cf 100644
--- a/dev-python/pymongo/pymongo-4.6.2.ebuild
+++ b/dev-python/pymongo/pymongo-4.6.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 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"
 IUSE="doc kerberos +native-extensions +test-full"
 
 RDEPEND="
diff --git a/dev-python/pypdf/pypdf-4.0.2.ebuild b/dev-python/pypdf/pypdf-4.0.2.ebuild
index af248b81d46b..8d1e1fa6e8a7 100644
--- a/dev-python/pypdf/pypdf-4.0.2.ebuild
+++ b/dev-python/pypdf/pypdf-4.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pytest-httpx/Manifest b/dev-python/pytest-httpx/Manifest
index 1e87ce872f33..2e4787fb9cd0 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,2 +1 @@
 DIST pytest-httpx-0.30.0.tar.gz 36959 BLAKE2B b56f0e51558ffa6eb0c0af61aa3633a8e358f8c78916d101f1de853f683136a68e195bf0af099bbc6766198b4136a560ffd2676d9a49f0b350882896a61d935a SHA512 6aadb544bda5003156bf9c0fa309a166636dc87aea033d9a48ee10e1e8b77e6cb52350930e97cab89cff7c10111d5e26d1d74cd33f0a6c54e34c3fb7ef72ea05
-DIST pytest_httpx-0.29.0.tar.gz 34103 BLAKE2B b8ee299ce17861732050f0059905193ee964ca375734584356b26a179979f2f967b69d134b8fc9c0fd4ae75172c404dc8e9ec27bb50e6bed58f8e7e76a4aa9e6 SHA512 ada6f5f419de3fbe835a5ce9fba9e5d368cbb01d1826d61cd4bb5a7f2941030d40afa17e582eca20743a546bf98699ecc2d8a0c640efa69b390dc32f2349bb13
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.29.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.29.0.ebuild
deleted file mode 100644
index abbb6a2967e2..000000000000
--- a/dev-python/pytest-httpx/pytest-httpx-0.29.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Send responses to HTTPX using pytest"
-HOMEPAGE="
-	https://colin-b.github.io/pytest_httpx/
-	https://github.com/Colin-b/pytest_httpx/
-	https://pypi.org/project/pytest-httpx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	=dev-python/httpx-0.26*[${PYTHON_USEDEP}]
-	<dev-python/pytest-9[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild b/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
index fe7b5477cb9f..8e6a03fb8475 100644
--- a/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
+++ b/dev-python/pytest-httpx/pytest-httpx-0.30.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	=dev-python/httpx-0.27*[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index 136f4b06cd30..c0de1df2742c 100644
--- a/dev-python/pytest-jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,2 +1 @@
-DIST pytest_jupyter-0.8.0.tar.gz 15716 BLAKE2B 9000be141466553346737596e80c5208aa9c1bdd9a72c8b1ae9fa1b8d994dc33f6e237a2eb16e60fa9c1a9040e6711ac45b0420aa865b6c27c48455cc1a11c34 SHA512 7789d4e92a1da254c8ef161a58b63fc494e4b59ce7721d5c501fdce0975452ed53700292e1554c247f5fa58cbe1f87489403f0f5ae97c5260cc3d7c9fc1c3418
 DIST pytest_jupyter-0.9.0.tar.gz 15520 BLAKE2B 59c80b3fc3a6a48c071a3fbf4068b5a3bbef888677f89db5f9e9a573a7de2ad34658a4543978bc747488fdc5f3720104af00fb2878b360bd503d01e851a5b65e SHA512 46e223754f5c36df7783207e8d9589d6c5525adf22b2c476fb7017d5cfac50d9ecdeadf4a7fcfb58e418ba84ee1f966d2655100e5b1c65ed780d34a02580fb7e
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild
deleted file mode 100644
index e4c9dc550efb..000000000000
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for testing Jupyter libraries and extensions"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter-server/pytest-jupyter/
-	https://pypi.org/project/pytest-jupyter/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter-client-7.4.0[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-server-1.21[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.9.0.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.9.0.ebuild
index 31b0ede81f83..ff2d42f8ea86 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.9.0.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.9.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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/ipykernel-6.14[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 33abed93f3b6..307cb06f77de 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1 +1,2 @@
 DIST pytest-subtests-0.11.0.tar.gz 12763 BLAKE2B b1e1373d197798a9c27ed65569a681e9ea8dd36014cf6ea57a1d44ed888dca21bd8c5afffeb7f590a501d83d1bc0a8e1fe06b13832173e6937b722163614f21e SHA512 cab486252148e457e234e0dadacefa5ff38cf67df48d9c8bd61aa546a4a1e712b70dca0a270dffceede6be0f8a6324e8c21beaa4d1528b39f12bba72e077ef1d
+DIST pytest-subtests-0.12.0.tar.gz 15251 BLAKE2B d7a526a4af21828d4ad8364b0cf50dc5ae071806b49dfd13068f679b43dfef6367f32e61bad0547100408d0d6fd58d6a33ee96220d234116535b840da1b659c4 SHA512 4ff64e29b5c7f76a239ac3f365450a60d3ebe3ee9d01781c4f79f100b1590d24a867c503567d0bbf60e397bc1cc3dff091afbee823aa9399b7cc14a6e60bc0b8
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild
new file mode 100644
index 000000000000..b32eb5d6e060
--- /dev/null
+++ b/dev-python/pytest-subtests/pytest-subtests-0.12.0.ebuild
@@ -0,0 +1,41 @@
+# 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="Unittest subTest() support and subtests fixture"
+HOMEPAGE="
+	https://github.com/pytest-dev/pytest-subtests/
+	https://pypi.org/project/pytest-subtests/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	<dev-python/pytest-8.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-7[${PYTHON_USEDEP}]
+"
+# pytest-xdist is used to test compatibility
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_subtests.plugin
+	epytest
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 75355cf16a77..0a170bdc4a9b 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,2 +1 @@
-DIST requests-cache-1.1.1.gh.tar.gz 2927360 BLAKE2B 2db8b71d4f219f2b61e4477a57af9dee09783ea47e86dfcc7b7726acb2507043186433ee6a9f67162c0a01c5f1439fd52ea9b74b89daa94cbe351341ef6b1f53 SHA512 99782fe635daa0834709b254b0d51c5d2b2ad37d26201acdc143f963b613bb6b4e5863e2246a2bf9d099c773e229157a983b04a40740e6207e2c356dc48bdba6
 DIST requests-cache-1.2.0.gh.tar.gz 3057187 BLAKE2B 135d39d8fac1e123c71b07b30002b980b5fdcdb586cafb310f8f72e865cdc97f62b699cd981068207c6f020deef595469801d440cf5034566e9618385d569437 SHA512 b198d282cfd656c432d3a63f4d615191ac1ff97c9563e9bd6945e7a78444601108beb47a0f4a79740c7bd6942c3753f025cd52457e87ece7964229799bbb8fa1
diff --git a/dev-python/requests-cache/requests-cache-1.1.1.ebuild b/dev-python/requests-cache/requests-cache-1.1.1.ebuild
deleted file mode 100644
index 6dc606ade2b3..000000000000
--- a/dev-python/requests-cache/requests-cache-1.1.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/requests-cache/requests-cache/
-"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/cattrs-22.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/rich-10.0[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		>=dev-python/ujson-5.4[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_upgrade.py::test_version_upgrade
-	)
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# "database is locked", upstream probably relies on GC
-				# too much
-				tests/integration/test_sqlite.py
-			)
-			;;
-		python3.12)
-			# https://github.com/requests-cache/requests-cache/issues/845
-			EPYTEST_DESELECT+=(
-				tests/integration/test_memory.py::TestMemoryCache::test_response_no_duplicate_read
-				tests/integration/test_sqlite.py::TestSQLiteCache::test_concurrency
-			)
-			;;
-	esac
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-1.2.0.ebuild b/dev-python/requests-cache/requests-cache-1.2.0.ebuild
index ce12bfae6910..95a48485f2e5 100644
--- a/dev-python/requests-cache/requests-cache-1.2.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.2.0.ebuild
@@ -9,11 +9,11 @@ PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 optfeature
 
+DESCRIPTION="Persistent cache for requests library"
 HOMEPAGE="
 	https://pypi.org/project/requests-cache/
 	https://github.com/requests-cache/requests-cache/
 "
-DESCRIPTION="Persistent cache for requests library"
 SRC_URI="
 	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/selenium-4.18.1.ebuild b/dev-python/selenium/selenium-4.18.1.ebuild
index 995d6a723fdb..8c2de17c2608 100644
--- a/dev-python/selenium/selenium-4.18.1.ebuild
+++ b/dev-python/selenium/selenium-4.18.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	)
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 535c0c567f06..8cf71a0beb5c 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST sentry-python-1.40.4.gh.tar.gz 458601 BLAKE2B d2d7ab718b461418bb5a54afe5998dcc0e95d76d5975673c7470fa0f2bbb79e5f8999b254ff406b026d86422fbbe4d3395f07be1224afd00d02ce6d5f170a8f6 SHA512 2c62618e102f754ca838c54aa90bc4d00d8a98903ee2ac3118741bb38f0dd808c8deb8254581c820b086a06415c8adf62862e4c4b2dad393faf7d977a1015cfb
 DIST sentry-python-1.40.6.gh.tar.gz 460979 BLAKE2B c1df8479e8464480985a722cbbb078af071087e2f8f8c99cdd2675c732ae88c721bc99c5f16aa409552620fe1c89d0668b52b4d2662a6e53bec8eebbb56960c1 SHA512 6eb8237a5cdcd0e10f52cfb660b45f4873da9c10dd0f249d5c4d3a714def4256433a16835a17562dbd2f77b39dc7d50fd7d1b9807bdcac634763879c0a0c9aa3
+DIST sentry-python-1.41.0.gh.tar.gz 462664 BLAKE2B 6c0b8256d639682124db51e27f81458930a53885682c3441edcfe12bdff4e63aec5fed78a88f9c13002efb9ea1ed064d8694c4e80bbcdf14c3fa4f394a884273 SHA512 5e58d5a7f06e3afb35645186373a9e6ef87ced3c11ddafcaa45e6a6760d08a812ef1c839d28e91ffd9844c64255e48001bd503536c15ba43366518685b764936
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.41.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.41.0.ebuild
new file mode 100644
index 000000000000..3833dccf2fec
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.41.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/python-socks[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
+)
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		tests/integrations/flask/test_flask.py
+		tests/integrations/django/test_basic.py
+		tests/integrations/socket/test_socket.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# broken by rq-1.10.1 (optional dep)
+		tests/integrations/rq/test_rq.py
+		# fastapi is not packaged
+		tests/integrations/asgi/test_fastapi.py
+		# TODO
+		tests/integrations/bottle
+		# TODO: causes breakage in other tests
+		tests/integrations/starlette
+		# TODO
+		tests/integrations/tornado
+		# requires mockupdb
+		tests/integrations/pymongo
+		# requires AWS access
+		tests/integrations/aws_lambda
+		# requires quart_auth
+		tests/integrations/quart
+	)
+
+	local EPYTEST_DESELECT=(
+		# hangs
+		'tests/test_transport.py::test_transport_works'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+		tests/integrations/asgi/test_asgi.py::test_websocket
+		tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+		tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
+		tests/integrations/django/test_data_scrubbing.py::test_scrub_django_session_cookies_{filtered,removed}
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+		# TODO
+		tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+		tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+		tests/test_profiler.py::test_sample_buffer
+		tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+		tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+		tests/test_profiler.py::test_thread_scheduler_single_background_thread
+		# broken with py3.11, *shrug*
+		tests/test_profiler.py::test_extract_stack_with_max_depth
+		# TODO
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
+		tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
+		tests/test_scrubber.py::test_span_data_scrubbing
+		# this is not even funny
+		tests/test_utils.py::test_installed_modules
+		# flaky hypothesis stuff
+		tests/test_serializer.py::test_bytes_serialization_repr_many
+		# TODO
+		tests/integrations/aiohttp/test_aiohttp.py::test_basic
+		tests/tracing/test_decorator_py3.py::test_trace_decorator_{,a}sync_py3
+		# crashes Python
+		tests/integrations/grpc/test_grpc_aio.py
+		# hangs
+		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
+		# TODO
+		tests/test_utils.py::test_default_release
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
+		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
+		tests/integrations/threading/test_threading.py
+		tests/integrations/wsgi/test_wsgi.py
+		'tests/utils/test_contextvars.py::test_leaks[threads]'
+		# skipped without gevent but breaks stuff via broken teardown?
+		tests/test_metrics.py::test_no_metrics_with_gevent
+		# TODO
+		tests/utils/test_contextvars.py::test_leaks
+		# broken teardown?
+		tests/test_client.py::test_uwsgi_warnings
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p asyncio -p aiohttp -p pytest_forked
+}
diff --git a/dev-python/sphinxcontrib-plantuml/Manifest b/dev-python/sphinxcontrib-plantuml/Manifest
index cf7222dee0fe..cd0a3bae0dfd 100644
--- a/dev-python/sphinxcontrib-plantuml/Manifest
+++ b/dev-python/sphinxcontrib-plantuml/Manifest
@@ -1,2 +1 @@
-DIST sphinxcontrib-plantuml-0.27.gh.tar.gz 19268 BLAKE2B d74d85da40a9c17eb6d73bfd2890af4f4260b11001bba4f3001d84f2f9b53597c2148c14af5a853ab3c0d3a760435a3475c6bc69748c9522f66b5f1c5e01d7b2 SHA512 acf648bc83647317d717c7f69026f20cc87066e26c409daaf14ec35e874f53ba324d1b2325b82987bc54f8224293113997bbfeca78b9f14c1704ff108e083faf
 DIST sphinxcontrib-plantuml-0.28.gh.tar.gz 19322 BLAKE2B b76166130ddcebc9312ea40d20dd0710403566a989dfdc40b906a724b32d8e3b53d50a4db1871e771eafb46f9cfea463f58348910c4bdeed0f25996269be8dea SHA512 52553e8ee5a9dbb3644f28a26f6be48a910e2013673169a8a9f0776406f6453b2443967af1837056010b0621d681e7fd00ab590858b07665bb74699c81aa81e2
diff --git a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.27.ebuild b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.27.ebuild
deleted file mode 100644
index fdc4d2bd4b46..000000000000
--- a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.27.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extensions for PlantUML"
-HOMEPAGE="
-	https://github.com/sphinx-contrib/plantuml/
-	https://pypi.org/project/sphinxcontrib-plantuml/
-"
-SRC_URI="
-	https://github.com/sphinx-contrib/plantuml/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-S="${WORKDIR}/${P#sphinxcontrib-}"
-
-BDEPEND="
-	test? (
-		app-text/texlive
-		dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-		dev-tex/latexmk
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latexextra
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Fix for sphinx.errors.ExtensionError: Could not import extension sphinxcontrib.applehelp
-	# See https://projects.gentoo.org/python/guide/test.html#importerrors-for-c-extensions, thanks to mgorny.
-	rm -rf sphinxcontrib || die
-
-	epytest
-}
diff --git a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.28.ebuild b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.28.ebuild
index 487424a88800..68d086cc223f 100644
--- a/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.28.ebuild
+++ b/dev-python/sphinxcontrib-plantuml/sphinxcontrib-plantuml-0.28.ebuild
@@ -17,12 +17,11 @@ SRC_URI="
 	https://github.com/sphinx-contrib/plantuml/archive/refs/tags/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
+S="${WORKDIR}/${P#sphinxcontrib-}"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-S="${WORKDIR}/${P#sphinxcontrib-}"
+KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index d1082e08ad28..ce5ad50a5bd9 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,2 +1 @@
-DIST tempest-36.0.0.tar.gz 1137446 BLAKE2B f645b35b42252dc2bb4b7e1a3f609ee31e76d60e952c2ebb2a404b5f2e40b449aed0815631e922dffc71bd1598a5554277b851f54b99a37a1af328de171ec3ac SHA512 1d931052aa3fd9c76dc6ea23f861d43842877158307877235f5fc64d8a2a0a65dedefebec7ef5a7153aad7ccc3fc9954a882696adbaa6800af9ea2eb652790dc
 DIST tempest-37.0.0.tar.gz 1146330 BLAKE2B 51acf1e0e8ce3a95d54e7b916100c32cee34f9546166fd43883f9bd5c4d4aad7d846b17c4c805392b64b9a0a02fea903c59b799f14d7e459d337eeb11c62cb6a SHA512 1de0e26c86a59c0e3f3dc494d4fdb4d3ca5ab215c1d52b34b4618e9c939ecd59b29c09bccb31bed7911517edce4cae4f9acbd2d1e28be75b0305850230528c67
diff --git a/dev-python/tempest/tempest-36.0.0.ebuild b/dev-python/tempest/tempest-36.0.0.ebuild
deleted file mode 100644
index d337106da7aa..000000000000
--- a/dev-python/tempest/tempest-36.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	eunittest -b -s tempest/tests -t .
-}
diff --git a/dev-python/tempest/tempest-37.0.0.ebuild b/dev-python/tempest/tempest-37.0.0.ebuild
index ee7a3645bd36..e2ae19efdb30 100644
--- a/dev-python/tempest/tempest-37.0.0.ebuild
+++ b/dev-python/tempest/tempest-37.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 4fcabcf6afa7..46d3a53be930 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,2 +1 @@
-DIST tempora-5.5.0.tar.gz 20877 BLAKE2B 9978fbf5bea1ec9d948ba7440dcbe61e591f32cd6a9db7072beda0d2cec9fdcf1c8793117afdc445d8389446856b11c45b1b93cb27220454180a765008d2b1f5 SHA512 7cf1d7f826e71e03bb733f082f0ac1e8746f1db64776c436fe683369c70164902140df9547757d8ed489366a5f7b336415aec076ea3c4b0b7b633ed09527f01b
 DIST tempora-5.5.1.tar.gz 21145 BLAKE2B b034b85272faefc884e098c1ca58b3e4b1f6598487f4678ed3b0b9f353d70b9862d8eaed425fb812e23630f123a28a25fefc8916a1c9cc882e5ed8c3da98dfa6 SHA512 642c4176ea14504e2f831f738e1064c1fb888ad89a67c74d5bcf2a5389923af3933981393855c7eceaf6c7fc16bbbf4126015d2d1dfa0fdfd38d528d16854dce
diff --git a/dev-python/tempora/tempora-5.5.0.ebuild b/dev-python/tempora/tempora-5.5.0.ebuild
deleted file mode 100644
index eb48205f997e..000000000000
--- a/dev-python/tempora/tempora-5.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="
-	https://github.com/jaraco/tempora/
-	https://pypi.org/project/tempora/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tempora/tempora-5.5.1.ebuild b/dev-python/tempora/tempora-5.5.1.ebuild
index ac4ef20dd46b..fa97deb54d9a 100644
--- a/dev-python/tempora/tempora-5.5.1.ebuild
+++ b/dev-python/tempora/tempora-5.5.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 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"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/twisted-24.3.0.ebuild b/dev-python/twisted/twisted-24.3.0.ebuild
index bb8156f8cacc..9bb3ca3bcd67 100644
--- a/dev-python/twisted/twisted-24.3.0.ebuild
+++ b/dev-python/twisted/twisted-24.3.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 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"
 IUSE="conch http2 serial ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-2.2.1.ebuild b/dev-python/urllib3/urllib3-2.2.1.ebuild
index fb2fc467f430..e5943ce75b2f 100644
--- a/dev-python/urllib3/urllib3-2.2.1.ebuild
+++ b/dev-python/urllib3/urllib3-2.2.1.ebuild
@@ -84,6 +84,8 @@ python_test() {
 		# TODO: timeouts
 		test/contrib/test_pyopenssl.py::TestSocketClosing::test_timeout_errors_cause_retries
 		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
+		# TODO: random regression?
+		test/contrib/test_socks.py::TestSocks5Proxy::test_socket_timeout
 	)
 
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8ad169eb3f00..161a4dc436c0 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,2 +1 @@
-DIST virtualenv-20.25.0.tar.gz 7150307 BLAKE2B ebe36d523d23aa6e29b53cf49e536aa0f2ab6bb2edcfaed3ba89456893a0cb9fb7bf8f97c61f12725a57023a6b565a0de797f988714469e2166da5d63652d54e SHA512 f4d8acff9d5837aa40eea18810517d4f1b9936b567395d6216bbda36e84b24f8efc584586cd2d168491139b346513d924e371b6b1396833fbbfedebef8620b94
 DIST virtualenv-20.25.1.tar.gz 7152341 BLAKE2B 7d3ecaca89cb4106f97fb5565331b257017d756742f9c90972a01a86296e81d509d2f4a7869d3bc7a299c1c2f01cc08999eddc258f1bd46acf88999d0732794e SHA512 c0791de2aed7893658316199696906b1aed650460f3b53e0dbd13e695d16bc14d8974cd72fc8dcc010ff7ba10036121929ce9a608f97d7d2cd9f972144a3a1f0
diff --git a/dev-python/virtualenv/virtualenv-20.25.0.ebuild b/dev-python/virtualenv/virtualenv-20.25.0.ebuild
deleted file mode 100644
index 8ec614d727ed..000000000000
--- a/dev-python/virtualenv/virtualenv-20.25.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} 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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-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}]
-	)
-"
-
-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.25.1.ebuild b/dev-python/virtualenv/virtualenv-20.25.1.ebuild
index ea928722eb7c..e8c195428206 100644
--- a/dev-python/virtualenv/virtualenv-20.25.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.25.1.ebuild
@@ -16,8 +16,8 @@ HOMEPAGE="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 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}]
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index e56e0d2e7a89..9e1a9ccab3ab 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,2 +1 @@
 DIST wcmatch-8.5.1.gh.tar.gz 117483 BLAKE2B db4d77651ab4fc6692c746d94dda68dc0fcdfe72a6e3b512b4f60a1bd5bf7015e21349d022c6ec17ea2bbc55ae87cf6c9a3690d9b6774f02a167b4b0ad65b691 SHA512 10ab7d76ad7c71efb2639e2d439593a45339f485f1f628770ae845c291c34d0e3fc8a9b75b6ce6d3c131c1f0a521f3aafcadc7d24ffad5284e9db06dc5838974
-DIST wcmatch-8.5.gh.tar.gz 117301 BLAKE2B db62057e9fe148d64a7b326ba15029a20781008288a60171793db3e4e3aab75ca4eeb1be63b7c2af5951225d512d4a5886982cb278c703980b755e6b816e51bf SHA512 a4de7714945e36e0ac68c5ce99cc06887fdceb3a461464ceb05e66f5a84965cafa9cdac337e3332f5fe42aaef90d53978185e451b28d56730418ca830f98c290
diff --git a/dev-python/wcmatch/wcmatch-8.5.1.ebuild b/dev-python/wcmatch/wcmatch-8.5.1.ebuild
index 30399ededa9a..3236a6f4add5 100644
--- a/dev-python/wcmatch/wcmatch-8.5.1.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.5.1.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/wcmatch/wcmatch-8.5.ebuild b/dev-python/wcmatch/wcmatch-8.5.ebuild
deleted file mode 100644
index 7d97a3c260e9..000000000000
--- a/dev-python/wcmatch/wcmatch-8.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs-pymdownx-material-extras-2.0
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/
-"
-SRC_URI="
-	https://github.com/facelessuser/wcmatch/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "larry@gentoo.org" || die
-		git config --global user.name "Larry the Cow" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 83d42ef66c7c..af68541c2571 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,4 +1,2 @@
-DIST weasyprint-60.1.tar.gz 441148 BLAKE2B 3d5eb6d9dd80a222649a03e09a096786bc4add67c7df3965325217a4c03aa4a545d442b6327b83bea082fa50f5d1ba32587749449824267acc849a0374a58cea SHA512 7fc05c6c80fc6eb251637b529720794df4b7d5c066ecfb4086cb49b7e1c42a51fcb7b2502a79f9f01f6cc5b83d92d5a48c7386b2db555e7dba6eb64e3151d6ae
 DIST weasyprint-60.2.tar.gz 442554 BLAKE2B 492f0cd3f155aa20e440e384930cff38e8674cc2430f134fdcce80e627997b0d752d6b585aaece6ff23505fed3ff45430c06c82763ca96ce30da38411e21721f SHA512 1da30b2626911c22a996cf7888edc86a7e3534d552325790c3bb06b29a7bedda8021680f5cac1acd6f0aba0658c64cda02cafa1fcba5f3a76bce6bb5fb229b71
-DIST weasyprint-61.0.tar.gz 447890 BLAKE2B 2e282f6a9e5979b44c52fba50c80041a75d7019bc7d24776f4ffd277b2cdb8f5a117e625a19a60ad013e487ced687aff13dc61e742e766c0d7b374a30f54cb58 SHA512 8f8d0dd9b49c7617a710e49f32c2b2f99750c5385b8e6fa78c3a646a01c961ebb5ebdeb4b3fb93dba898de61b687218063884e198d8fb98dd119973192440279
 DIST weasyprint-61.1.tar.gz 446987 BLAKE2B f32e0ec4014d6bd023e5320de9c2878b529fe1725691bb8c73fe295784507a5e785938d043a3731f659fd2c49fe2413008264b8ca8748c451bd99ce07209c9ff SHA512 f7f0c84acc9a9eba61fc59c7f16eb9260ca93ba901905c3cdc1fb871f3646687eb9881dd486eeec5d98cebb5d1893f2fcdff585cdb356bdfb0e38fdd0167b316
diff --git a/dev-python/weasyprint/weasyprint-60.1.ebuild b/dev-python/weasyprint/weasyprint-60.1.ebuild
deleted file mode 100644
index 8aad5f7bcdff..000000000000
--- a/dev-python/weasyprint/weasyprint-60.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/weasyprint/weasyprint-61.0.ebuild b/dev-python/weasyprint/weasyprint-61.0.ebuild
deleted file mode 100644
index d776538285b9..000000000000
--- a/dev-python/weasyprint/weasyprint-61.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xarray/xarray-2024.2.0.ebuild b/dev-python/xarray/xarray-2024.2.0.ebuild
index d188cd48f1da..a171750f2e49 100644
--- a/dev-python/xarray/xarray-2024.2.0.ebuild
+++ b/dev-python/xarray/xarray-2024.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="big-endian"
 
 RDEPEND="
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 94bd2dc9963c..6be404ad2535 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1 @@
-DIST XlsxWriter-RELEASE_3.1.9.gh.tar.gz 37377544 BLAKE2B f04e06ef75e80f9bb33ebf14f71aa42c30b9152295367877d83c20e62897985691e35288c6b7d4ff218cbf799fc5ddeda1d2b08bb91fbdeb3d48c5c27be95bec SHA512 1c7ea489182f1abe50fae5f1f387274f67e6043ef3fa909b015a340e38d8449f18ef1f40a64719982680371430a98bd0ac0d441b88daad655599f6eccae04a85
 DIST XlsxWriter-RELEASE_3.2.0.gh.tar.gz 24079667 BLAKE2B ee6f35d2df8edef3a1282bd821b1eaa3d3a79bb9d962df9d50394519905a0344e0b747a58d3bf5fc1323baefde3b9e11a2c5e7e77be2cc02bab716b0a3cf3226 SHA512 b36ee896d01e5a6369f4f42e69338b69b9ea5ee4919eea9361c0f5f6ff012ca153c708ff1c719b82ce067c5d57392e3b72c47e828a7e832953d0c06de9f65962
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild
deleted file mode 100644
index 3bd42a29ca51..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
index 4069572c13b5..dde984c061a4 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.2.0.ebuild
@@ -21,9 +21,9 @@ SRC_URI="
 "
 S=${WORKDIR}/${MY_P}
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest