gentoo auto-resync : 07:03:2024 - 19:06:58

130 files changed, 485 insertions, 2427 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9ac54fc2784b..67a2bc113065 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/a2wsgi/Manifest b/dev-python/a2wsgi/Manifest
index b6a37407f029..3e5acd50d388 100644
--- a/dev-python/a2wsgi/Manifest
+++ b/dev-python/a2wsgi/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD a2wsgi-1.10.0.ebuild 716 BLAKE2B 89f1f6fb34e94c39f518812a53d9e64c07db417196b557ff4754ccaecc0167be4a17ef656535a9a94fed2ba0252b9098bc898608fe602dce945c2214137c7e54 SHA512 fc24584516577a848d79ed09c485ca7f40b8fe003903765a330c48418114195b5bffb1befbbbe07fa1ac3bc3c0ba4044e95b5516ee8eac0724130cab80d29b63
-EBUILD a2wsgi-1.10.1.ebuild 724 BLAKE2B 0e50baeefb442f014d0dc77bc734f6a3ddf47bf0b06e273f3ffe48ae2cc3c0c576fd7199f88e6b47079af87b6af6fd5185ecb464be671bbe70f702525cff7857 SHA512 afa1cc8956cd86e62cbcf9e3e5467bd140c58e98d6aec2f7f54afc3dccc592438383c6719dd4ed1750ba2df52dc27d20b3bf87b5fe5018db59a53b362a142303
-EBUILD a2wsgi-1.10.2.ebuild 724 BLAKE2B 0e50baeefb442f014d0dc77bc734f6a3ddf47bf0b06e273f3ffe48ae2cc3c0c576fd7199f88e6b47079af87b6af6fd5185ecb464be671bbe70f702525cff7857 SHA512 afa1cc8956cd86e62cbcf9e3e5467bd140c58e98d6aec2f7f54afc3dccc592438383c6719dd4ed1750ba2df52dc27d20b3bf87b5fe5018db59a53b362a142303
+EBUILD a2wsgi-1.10.2.ebuild 716 BLAKE2B 89f1f6fb34e94c39f518812a53d9e64c07db417196b557ff4754ccaecc0167be4a17ef656535a9a94fed2ba0252b9098bc898608fe602dce945c2214137c7e54 SHA512 fc24584516577a848d79ed09c485ca7f40b8fe003903765a330c48418114195b5bffb1befbbbe07fa1ac3bc3c0ba4044e95b5516ee8eac0724130cab80d29b63
 MISC metadata.xml 392 BLAKE2B 17f9cfa46eeac0752f6e27d004a04173528f5033dee30ba31bb9b0d86231b3311937e0765cba3cae0fcc8b9653654c9b53bbc009f15140db0b38496856b9c27e SHA512 828436206a1e9b01df9da1546ffc8e6bc614e71708ad8a806dda9ab2dad80c86e539c37496a0c2525f0370e9ead3131bbde69f235da83331cd5097985981006e
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 df53d55470fc..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=( pypy3 python3_{10..12} )
-
-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 4dab2405e9f9..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=( pypy3 python3_{10..12} )
-
-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 4dab2405e9f9..df53d55470fc 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 298499e6233f..640497cbb3e2 100644
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@@ -1,5 +1,3 @@
-DIST anyio-4.2.0.tar.gz 158770 BLAKE2B 10ae621872edb27727c8931904c84f41dc18ef0cc4cce1ea18c957d479be24b1a4ffb15d8a9e2b4338663fdbc2a989e5772ba1bd2076f9f0b22f6f5c4feef4bc SHA512 a6f3cbedbfa063a5cf031cd833e6da7a23ee37dbdae8d47ccdfb09c61a73c186267f1a33ba6b4936cac7fb4c970f5488ff1464295e5ffa452952732ac0468d65
 DIST anyio-4.3.0.tar.gz 159642 BLAKE2B 33b300d1da37137d45b311f8424c022d19518c207c39ec6f8bd3e42432cf1457f2d533eadeaa1e21853ed1b25a4f58818fc595e8588489722846f8a8d72262dc SHA512 26ff552a03b24b63c7c99cffcec61e97289eacba3ad2fc7a3c1dde8cfaffd9a8d621b867429901c12d7cef912d3807db134dbeb9c5ba619921160f6d5df4d02f
-EBUILD anyio-4.2.0.ebuild 1684 BLAKE2B 82452731d1288270c4d6229f5a8aedf5e930f292ad4df17e145fa4239390dc9172623fa33c464893bc371c74023c7ffe7fc1e6801a4cbd09872ab6c3def463c8 SHA512 478925f2d70e8c5130f75a2650da30b5c8e772a79d25d2dc73d5eafb4d9ad6e8afaa23d94074993d14b1928b0aefd53fc6fc8840363a2ec514142a83f5c9039d
-EBUILD anyio-4.3.0.ebuild 1692 BLAKE2B 4717758a6e86e9ae8ee11ec3d51de1af31e91bcc6a313160026924bbb9be22c973ee2d9084e38dc8a6ed2dd5a6cf6a000860df07d6b0dcdd0ef9dbbd402e46f4 SHA512 c6ef93b1e08b2d662935a6347e6bdba9b553fedf74869b12c278875bee44272b6ecbc168a016e88a3b851d6b0294f17e3ec311fc07a409ba09d00dcf70e7cd9d
+EBUILD anyio-4.3.0.ebuild 1684 BLAKE2B 82452731d1288270c4d6229f5a8aedf5e930f292ad4df17e145fa4239390dc9172623fa33c464893bc371c74023c7ffe7fc1e6801a4cbd09872ab6c3def463c8 SHA512 478925f2d70e8c5130f75a2650da30b5c8e772a79d25d2dc73d5eafb4d9ad6e8afaa23d94074993d14b1928b0aefd53fc6fc8840363a2ec514142a83f5c9039d
 MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
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 4768f8c60a52..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=( pypy3 python3_{10..12} )
-
-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 694cd3be7f30..4768f8c60a52 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 ca975c037533..db1204ab9493 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,8 +1,3 @@
-AUX dnspython-2.5.0-musl-test.patch 2797 BLAKE2B 0f2b3e9cce32de491ea9fc1c896a0acbf27972a75fc75fca9440faad1aa4f2e5adfaf44f2f94518fcc95793381d73c742d902fd94d44262be6892b97d7414011 SHA512 93ca5a2cce940c505a35846aa96cdae235f3871c4b2e871ed6b61860c4b22cf927b684ca9c651bcf1c1fd939990fe1145adb9217d42715c6dba10608a9a5e90d
-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
-EBUILD dnspython-2.5.0.ebuild 1210 BLAKE2B 95debb590399bf85840b458cd562dc378571150cb691f2ca3deee71afb74ac091681670a16af4d58dc6076f62768197d16b5ad72aa4118bc008b53d540d92c3a SHA512 b1b5f5d16de165ea0ed08d9fe9cee3e4756c661cf706e837368102396c71f6a765b3a2bd006da16018935bd77d067b765e3e6d1b2103859829407cf6373bbbc6
-EBUILD dnspython-2.6.0.ebuild 1027 BLAKE2B 0575a64e02ae1f60d17083e87b30b3a7a90735c2fcd0014c16a52662dd5dd5017ce683ba03c8d936bc9ea02c7529ca584612201fff2301a295c362c6d63a06e2 SHA512 3c8798e6fe0fa22fab1de512b4b2c5e4b46493598f0a0bc5bdd87a8a7a8ebd01bc8624728ed2a8b450aa844f626c439aaa85aff92e52ba2c41db2bafa5f5c13f
-EBUILD dnspython-2.6.1.ebuild 1027 BLAKE2B 0575a64e02ae1f60d17083e87b30b3a7a90735c2fcd0014c16a52662dd5dd5017ce683ba03c8d936bc9ea02c7529ca584612201fff2301a295c362c6d63a06e2 SHA512 3c8798e6fe0fa22fab1de512b4b2c5e4b46493598f0a0bc5bdd87a8a7a8ebd01bc8624728ed2a8b450aa844f626c439aaa85aff92e52ba2c41db2bafa5f5c13f
+EBUILD dnspython-2.6.1.ebuild 1019 BLAKE2B d1c3a237b907f156d0168360cd04bede130bf5bf57fbedaf35e08a98a573fa64df5027dc0597dc7f927cb508d0e900a6b1bfd8070ad9cc91647ba0215a0aa4be SHA512 c000f1f245f2223f704a2f52bc1f883c8ee43f008cdf41bb29b6a23b4f30b4cfeea6e0b9f024a7ae71ce1e501d98cdd9ff5b184fb529addd172c3ebb3779d413
 MISC metadata.xml 1709 BLAKE2B abd502753325fedca3f1ca94818258c9d1b82f88766f9e005b35b3e79aff71ca2efaf06188e73ea30830f80ec011cdf5c42df320130c9295e13d3c427a148f8c SHA512 8c25d579a4a2a7c5ff34c21643a1386a434545f6b9b465f4aa8e07f7da3aee203bbc0341e930ddb767af431f64e8024ddd6cc8513cfce862c5900da4637bb1c8
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 76ebb1afdd58..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_{10..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 fa76df91c401..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_{10..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 fa76df91c401..aefb1a3a556f 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/docstring-to-markdown/Manifest b/dev-python/docstring-to-markdown/Manifest
index 714be910de59..164c01a658b6 100644
--- a/dev-python/docstring-to-markdown/Manifest
+++ b/dev-python/docstring-to-markdown/Manifest
@@ -3,5 +3,5 @@ DIST docstring-to-markdown-0.14.gh.tar.gz 29619 BLAKE2B 5aa56a332408c7945cda3525
 DIST docstring-to-markdown-0.15.gh.tar.gz 29806 BLAKE2B 424cc74feb3e42bbd546495a998aba92b4df02b9d259c8b3e0fe704d860bb789825b5c1fde79211b675cee82e8c560359f54bf5311eb940a51c0b7c58dcbcf99 SHA512 100d84b6071609d774f2b3426804a32d88eb6e0a463d63003d8cee67f8e0ffb93dad54cfa2f18647dd5d1439459e4c217589c89737bc98e2ee2e11bb9f0871f6
 EBUILD docstring-to-markdown-0.13.ebuild 756 BLAKE2B 0c296572fc8be3ce675e04b556c9bb2145038b43ada097196e5defbd3afe91d93003872dc5956fccabeec2ebc2d0cf27c986e81236ac4545a1fd8556ed3e4778 SHA512 ecffe8f2b582eacaa7401c08d8fda752fe606bc57d0074e87797eb1e9a66877b90405f380601e07eb12c9ca1135f03c18762574ffb41eaaa5df69b20c42d808f
 EBUILD docstring-to-markdown-0.14.ebuild 759 BLAKE2B c2c3e4e03eecf64a67214c28b2dc4fb18b01cc9bb3d364176d72497ff774e792e5cbba87c3413fa29c90affbd0dcdb41f18e2c39944b665e38e0c0cb7bd791fd SHA512 a8478e6bef0a65b74185a7786fadf229b3c40404db8430e64eb538ef379bfd4ea59e60fcab5c1409dd98e97e8125f440c7733d20415195e0b7a555a72ed81579
-EBUILD docstring-to-markdown-0.15.ebuild 759 BLAKE2B c2c3e4e03eecf64a67214c28b2dc4fb18b01cc9bb3d364176d72497ff774e792e5cbba87c3413fa29c90affbd0dcdb41f18e2c39944b665e38e0c0cb7bd791fd SHA512 a8478e6bef0a65b74185a7786fadf229b3c40404db8430e64eb538ef379bfd4ea59e60fcab5c1409dd98e97e8125f440c7733d20415195e0b7a555a72ed81579
+EBUILD docstring-to-markdown-0.15.ebuild 756 BLAKE2B c4ebacd2d468b9b387ffd5020394a8465794ea13ba3dcd9297c7156894447197bbebc143ab30b8afaf423db15ad3aa71df7d32005d7ac71f0f8f43ecf86da9e9 SHA512 47eac28ad74ceb4c5f910c812ff5f0caa0d0258d80e97840d40dcb9323b7e9bdedc6134d95ef7396afec02ba783982fffc2e225f89012953d3186065a0de1674
 MISC metadata.xml 421 BLAKE2B a6bf8b83336e2e1b67af703c3ddc6d68a5ce94a3477902a9f6d7d35f8a5635cad265365820548959ccf861a14c1c24d5bb2fd934a6fc297ca20182b5686c3ec5 SHA512 952b36476833618a51a6c05181213fb8598237157e887fb81369084db327fc360e827ff2393e00f99141efa2256ea0701ca17005ddd337661a6d9e8f81fd3494
diff --git a/dev-python/docstring-to-markdown/docstring-to-markdown-0.15.ebuild b/dev-python/docstring-to-markdown/docstring-to-markdown-0.15.ebuild
index 4d111a767604..234446603167 100644
--- a/dev-python/docstring-to-markdown/docstring-to-markdown-0.15.ebuild
+++ b/dev-python/docstring-to-markdown/docstring-to-markdown-0.15.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index bd512ae94e96..e4d69f6bd1d6 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD dogpile-cache-1.3.0.ebuild 799 BLAKE2B d6f07538b6391a5e00ff308b8595420970050a20daa892aa44e58cbf90069abfd894cb0c474c512680ef65464960a253d59f8dceb60f06e16c629e375d717100 SHA512 2bb28b05f4430dd652753c3886778290675a33e3f85820a6b9caebae87d17a0376c1dc2815bef4461a34e1a010beaa5c96520d8ed11857c32ab63320f5b8150b
-EBUILD dogpile-cache-1.3.1.ebuild 802 BLAKE2B b13ace7a9adc5162ff68f40bc7f5794e4e053cd5a44693d28062fc5f47a70123ae2efb03e6bbb839e167cc9937e28c1d2b1ddcc6b3e93224146f6b5b2dfeaffb SHA512 351731bbfc8742bea9543cb3d4a5485af4596b3f9e6bb83dde2ab9cadffe893da950fa776403aadaf834d51500ded85df40ebc7d7e0fd38b8ed5bb6ad93611d5
-EBUILD dogpile-cache-1.3.2.ebuild 802 BLAKE2B b13ace7a9adc5162ff68f40bc7f5794e4e053cd5a44693d28062fc5f47a70123ae2efb03e6bbb839e167cc9937e28c1d2b1ddcc6b3e93224146f6b5b2dfeaffb SHA512 351731bbfc8742bea9543cb3d4a5485af4596b3f9e6bb83dde2ab9cadffe893da950fa776403aadaf834d51500ded85df40ebc7d7e0fd38b8ed5bb6ad93611d5
+EBUILD dogpile-cache-1.3.2.ebuild 799 BLAKE2B d6f07538b6391a5e00ff308b8595420970050a20daa892aa44e58cbf90069abfd894cb0c474c512680ef65464960a253d59f8dceb60f06e16c629e375d717100 SHA512 2bb28b05f4430dd652753c3886778290675a33e3f85820a6b9caebae87d17a0376c1dc2815bef4461a34e1a010beaa5c96520d8ed11857c32ab63320f5b8150b
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
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 d4868dc80a4e..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_{10..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 dcdf789c5f6f..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_{10..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 dcdf789c5f6f..d4868dc80a4e 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/Manifest b/dev-python/elementpath/Manifest
index 5f1f78e9e072..977cd6adea0d 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
 DIST elementpath-4.2.1.tar.gz 326745 BLAKE2B 63e5d92117a0ea25ad8aaeb14c99ce739b25ee4733366373098920c14e457fbee7b87398809913356a694812da5213936d783c60a1f7e2885d4dab49c2daf76f SHA512 bb996ea64051e73c05be05eeb3f373ed12759f07cc19b1e332715cf8876a6753dedcaba5b8c4e052e75b0f59f2f0344abcd106ae0d8dc79a36654b6c4135a20b
 DIST elementpath-4.3.0.tar.gz 327870 BLAKE2B 6292d9c296e0653dc1acb40fffc1166a9ffe9428c9679fb87fa80c5478e9260593da62933238dc67eb88c9f62d55169afb18fee6aed91ac9b5e66d7ef175d9a3 SHA512 cd7b5b3a4556c9b68c654903d0a68b21658d4c40be9aede31ea4dfcb825d5bed4b1f7694344f88e9251df995a40d1a9e3a64f0e43a340ffe1f8e9160fd05b5a9
 EBUILD elementpath-4.2.1.ebuild 785 BLAKE2B 8d17af2f109cd87f903a4df1865f30a0a318e604b877c7ff06090d9836a8be049d7ebf044cace7f36a17d17a613baa308d3e42ea7a2eb16e6f7e449a93540c80 SHA512 29c8b8ffaf0bc222d0bc233de07ec7e322573d1e925b09f657cbb0c696f8a20ebba979b79de57f15a94cb241d0211efd437f774d8c62b5d0a3086ded384a5b2b
-EBUILD elementpath-4.3.0.ebuild 793 BLAKE2B 8a25cfe35a23e91d3ee2bf6748f58fa42e72c2d1d61522152fe88b21962a3ade52d80ee3b65cdec4b65e1b3180e02670e96f3e72d1eb4acad3468c7a73ffd17a SHA512 b7a44e5ff115f6323ed0255c4a08ea0d7dd368700304ac9af54e899afb30696a62d3362894b6707bdb5fd5e66c9004f470f85a97fb8debbb495c10377eae6a71
+EBUILD elementpath-4.3.0.ebuild 785 BLAKE2B 8d17af2f109cd87f903a4df1865f30a0a318e604b877c7ff06090d9836a8be049d7ebf044cace7f36a17d17a613baa308d3e42ea7a2eb16e6f7e449a93540c80 SHA512 29c8b8ffaf0bc222d0bc233de07ec7e322573d1e925b09f657cbb0c696f8a20ebba979b79de57f15a94cb241d0211efd437f774d8c62b5d0a3086ded384a5b2b
 MISC metadata.xml 380 BLAKE2B 00a18a4c9373b73866c8f5159e6c11327baea8ea6ba8027c2477cefaf6bbd2d2838de3cf78b9bc3e8bdffd0444e6c44b45cf6e6aac0f7ac470c7e092ae4e43f9 SHA512 abdc862e0d684023fcd42843a9c558d71e923a09fb0592e5e3c3e7e949e311c36afc34ee3cea5873c1799b093924fe15c240da4a782fdbca11ace66ea0d2717c
diff --git a/dev-python/elementpath/elementpath-4.3.0.ebuild b/dev-python/elementpath/elementpath-4.3.0.ebuild
index fb96a128f43a..8eac7d175276 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/Manifest b/dev-python/evdev/Manifest
index 4a45020816f7..e8be47aae03b 100644
--- a/dev-python/evdev/Manifest
+++ b/dev-python/evdev/Manifest
@@ -1,5 +1,5 @@
 DIST python-evdev-1.6.0.gh.tar.gz 86212 BLAKE2B bbb9adc3caff31c817972e33cd02ff63ee4e037ebe346fc6b128d119c38b337681bc9ef9069cbe9b604b1ac926dd23a02add23da2f629b31b74b0de338f9f423 SHA512 d3dc27aad70897d46ae3cad71cafdf5ac49e8cb52b88566b004edaee3b192b68093e44b487f9ab27b503a18e8e62a08b17d7b782726658f4d8131aa4562cd17a
 DIST python-evdev-1.7.0.gh.tar.gz 87773 BLAKE2B 8ed41fa8b9a8583c863450d6952955477ca8fca649a1615fcce8741624561f5719d535700dc67c6757f193452d618e5850b6f9ab35c32ab49ed48025e4e5b94c SHA512 79cb8e92f5698b120ba0c4b2603a18907097d130e0128cbad68eb95b50935b6aeadd1e844d4c76909c965719cb5b067e37d0921748be3c7c2493acb58c153521
 EBUILD evdev-1.6.0.ebuild 896 BLAKE2B f560a3f38b26b9dcae4ade4ea177643c01584bfe8c7b64d4daf7c8c0b521c8472718834aca08b58fb780b20acdd7e2cb3e71a074ffaa82d0caa35d97b91cc7a4 SHA512 d04a880ed03d0c467a5e3fb9fec66f0fef5277bf2d9c45dfd7c116e1c66393130082b63c5883680b55d112d42a2621d372058fd4e47046f18f30aa718c01b580
-EBUILD evdev-1.7.0.ebuild 898 BLAKE2B 6ce67de3dcfbd5a234b554afc8a6a09aebd04b1c7cbb28574a2a0a76503cecd19aa0051727bd64c35a9be5ac4a3a4587d9b54b18c0dc3ace170c81e70f1d7524 SHA512 e1c853519996c5b70641f09eafb21031583117e9b2304b76a7a8dac2895cd32d210b3da0cf450d2ff60962f3921683f9a88e91ff6fe630ceb48061b60bc168f6
+EBUILD evdev-1.7.0.ebuild 897 BLAKE2B 29c373a734c41843df451683e34e90643b56c22faae84729c2105572c6b9d4868c11e0db66ae4140e5b7c0f7c87e8fc0657282e2b0f0020076350790e0f88d91 SHA512 f8e936650ac5e128b603a66b15e946ffac3cc916759f14c2f35cb7d0fca22b59ddf4a60a115699edebc2ea5eecb0368d5c341934414aa6c3490d87ac6ba35fa4
 MISC metadata.xml 369 BLAKE2B 3db50cf2308091023bd5dd7768e1ff0af97124c5009efb710defc139b2809a804472969055cd0d120399d14b78d7da9dd92ca44b7de35fbf0e4cda2838ceb911 SHA512 1ceaa34af50744cd1108c990891c7105fa5373242b02fdd9b25718a6275b90d787a948b78ab4a17f0cfc168ba0c9f98d4c5b1e33997a0d751f7ffaed0b7189da
diff --git a/dev-python/evdev/evdev-1.7.0.ebuild b/dev-python/evdev/evdev-1.7.0.ebuild
index 7325d4b2a71e..bd4056589cef 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 a3c05b041ddd..32d99f518a11 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD flatbuffers-23.1.21.ebuild 881 BLAKE2B b3b7f9015b0283b4cb0899d93c5297bec484961e70b5a0bc4fc86fcac13c8017eccbfd75e7b269ced4be61173b88601897b70030d8ac6d3e1f59ff05c28942d4 SHA512 b30f06debe333971e3439f006a83f23d4236adaa3a3f17e719d5566c9bd6fcc6c2b269e7cb23167307565872b2d9cd87bddde274bed0a3c1191403ee38399f80
 EBUILD flatbuffers-23.5.26.ebuild 826 BLAKE2B 2ff4c3119afc8ffed559972711d4f537f3c871c4e65724bfa1d2ac97bdd2a6ba7910dfba92c54372b3ead85ca502c46810289dab4b24cbf95f857cb7df21a1be SHA512 3863b448c1e5afeeece3d866c6f7eb8e83b63b0bf524b9d6f4f7da803a56b59076fa190997ad9f5d580f853048cadd651931b78219473ae41b7ead02312230a3
+EBUILD flatbuffers-24.3.6.ebuild 832 BLAKE2B 0be118b73e7a2bc1ac5e291d4907ef4b0e9946c40be6f7134873c398f3fc7dcae2fb62c988e4cd7f0b7b0d46cffd9cf16e426a53ca95888df8c8590a7cc45b1d SHA512 028560eb113db1a6e95450913f9540a45d3c7b8a254cc5585eef51a98a6e261cfe8d8edabe8a6b4aeca6dc437df49bb2aa415ab60fbfa81647b86daf249121a4
 MISC metadata.xml 397 BLAKE2B 2407f1c42b05c20ddeaf0ddce303c24604be89323c35c68a0770b221f44c4fe9e0c6580e7d5f9e50d3e263f81b26935c250e45634279285ebf2c5d327220122b SHA512 635f3e14f3aa038bf8b2b7bf321e48fe4496048a11b337bab0589bab924135f8b1d216329d9326ba214e1db202ed390722345c69e3260327c2e103f5feb7fa31
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..9f4884db1418
--- /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_{10..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 9e172b1ec0b1..c212fe15d65c 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD google-auth-2.27.0.ebuild 1439 BLAKE2B 7f1d474e335a4a6ec0a86d6f47d69accd6ae97bb5ff53f1d1c4e8d78c79ffcbaf3f1a633a279936276ecf707cc2455f494a68a599c3299f06e73090e08d3b4c3 SHA512 cedc905deb31d47c3581d26b8b7765145452a281c0ca0ba79966b47d1f20779ab41e6c321b3ced80b7d805bd3d9ab47cdf041e3d0c727b69c88059b584e6b54a
-EBUILD google-auth-2.28.0.ebuild 1442 BLAKE2B ecbc9be9f3ad790c4f3b52d359cd4e3727fb67c5b179a6a3da566077ad811ac6e7cf459af03fcfd088e8c61ba035780fb3f0f59f79be33f2699ad044a821af10 SHA512 dd25537915a25048d6baa439a9c983c432c334a7cc395eda312d2517c71f83750964cd4d1978886d270e3f6e38f020f75875ecfd86e9bd102a265e9c729bf812
-EBUILD google-auth-2.28.1.ebuild 1442 BLAKE2B ecbc9be9f3ad790c4f3b52d359cd4e3727fb67c5b179a6a3da566077ad811ac6e7cf459af03fcfd088e8c61ba035780fb3f0f59f79be33f2699ad044a821af10 SHA512 dd25537915a25048d6baa439a9c983c432c334a7cc395eda312d2517c71f83750964cd4d1978886d270e3f6e38f020f75875ecfd86e9bd102a265e9c729bf812
+EBUILD google-auth-2.28.1.ebuild 1439 BLAKE2B 7f1d474e335a4a6ec0a86d6f47d69accd6ae97bb5ff53f1d1c4e8d78c79ffcbaf3f1a633a279936276ecf707cc2455f494a68a599c3299f06e73090e08d3b4c3 SHA512 cedc905deb31d47c3581d26b8b7765145452a281c0ca0ba79966b47d1f20779ab41e6c321b3ced80b7d805bd3d9ab47cdf041e3d0c727b69c88059b584e6b54a
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
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 9cfd3b0ae33e..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_{10..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 e044a6c75ff3..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_{10..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 e044a6c75ff3..9cfd3b0ae33e 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 98184f6a78e3..40aad939eb05 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -1,7 +1,4 @@
 AUX httpbin-0.10.1-optional-flasgger.patch 2246 BLAKE2B f96db03047b779625f5107aff167eba52f6819b99c4fcded932e1c4337e02e00be15901a3a3dacaf708933c04cdf9b687a78eedd7b03fb13aac868163ee0f632 SHA512 1e161b7ead872cccda833fa7a21e82229563dd996f9d5511550becf5e5623a61a7c85034e8ccb125d39eeaf9cbefb67616d692d08554f93b1fb0295ce5530ccc
-AUX httpbin-0.10.1-werkzeug-3.patch 2753 BLAKE2B eb335f980867d0f55b4f790689b890c4c92246e870f3714fcda88ec302491ff76e6cc46929d227d0ef3b5b5682152d0ad83dd97e46a16729282de1497935c5e5 SHA512 b232558f609425f7cb674bf34fa0116c76e69d93ce52df656a4d76a7fec8e5a9d6f872abc681bbafede7aa5c7187439a695fbbf18ebc5c8271001bc7776a7fb7
-DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be
 DIST httpbin-0.10.2.tar.gz 107327 BLAKE2B 39ab1e518c9f7e1ede9cd0aa2e3155f7e36267c83d1d2537a5b6cb5aa1c9e70efe96c5bf98a5b22cd05e70368d1495f8e5364032fcf2f476d62512b7e7322652 SHA512 731b842090be516d9eccb1d2bb8303128d2b2e24b1ebf0b2018a2f0b8629b164c7de686e1775841cd57417ec89941d98fc81f878a284c7242bfef4db481a781b
-EBUILD httpbin-0.10.1-r5.ebuild 1273 BLAKE2B 8e9f8928bb6a813c87e7928b6f4364a1b5103efd9458196f02c323bdbbf83f1626d563d321494c12a2ca70aab06232ebd7f5c4fa4263ca804b15264dda04dddb SHA512 6e712edf26e963d4b43db50538b3d1868a0056141c4f95cde4850127421e042b2e2c2d271ea18e1698ffde93c4930fa1918eab165bf19f1a2da36a573c9f4c35
-EBUILD httpbin-0.10.2.ebuild 1257 BLAKE2B b81b45016e613376f41e96326efbf5879d9a5a25573cb4dad7d3514c54e1e66a69a4f0accd3e697a91a4ca736a99bf96da62d1cb677b48cbeab8c36526476f46 SHA512 2df24d0f07e2207b077bbb01e72130c58a80318f982f6f506b72df8cab1a4559f0eaead0c86ab3de586ad1acc125af32b57216e262413787a497a8f759ba1ed6
+EBUILD httpbin-0.10.2.ebuild 1249 BLAKE2B 22a9a804b3845ea19c0f6597c1907a230ca5e800fcdbe1fe4e2071ff87df3a8cf14378980a3d33d3660e85a905e34014de08123fcc686c942af027ed596d9b3f SHA512 c50d5cea1fe1aa05d57fbad22dd196df3dd81dc96d380dc7ab7dffb0042e80e49dc561813a4fd5129eb62c0513bce70e0fb9acbcde0a4d1feb02a42ecbf6b139
 MISC metadata.xml 445 BLAKE2B c577334830bc0d51f9df221e224c231c254b3db9129e4028d53cbd96a4481728e3b721b44f569c243deeecfb38e8dc81a7566a0b7ccd665d51b1a69a3687eb18 SHA512 fcdbd0c24e12d91df89af24befa6c9600f28083c3fe38e88ebec9856f4fb5c4c137c3b85f2271422c513bbd7c31a457f8290ebc2dd755d9117d57aa42883eec8
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 d34c543e7976..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_{10..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 a6c4050a2c16..6aecdd6bc65a 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 d5499264bacd..d39956e8a852 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -1,7 +1,3 @@
-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
-EBUILD httpcore-1.0.2.ebuild 1221 BLAKE2B e69fd8414b022c4054a1bd91311a0826970af271ce3e04380a7612122317ca28da22fd731126fbde55fa1931f67a8a378280169328dfc23e550aca044285e89a SHA512 c215c7d88dc54e7ac48e503358e33ffe0d5b83e7df4e3712e7debe1b895d3e17b1957e816b2f7f0f29190a408a4d70d9c6e61ae68aec864c5add4044e9aed157
-EBUILD httpcore-1.0.3.ebuild 1229 BLAKE2B bb9e98b602caa18bd7e3a22d1aabe802253132309e36c833dccb4b3d5085e22895d99a898928b738f3b7e72393b50484868a34bb68de4fb2371b7037445a8742 SHA512 6e714920745c9da8dd56532f94564879af7b9c5c7fdfc316ddcc486ecfec25454a87bdfba357828d43062cb8f7e0b71a921664647b510f5c1fa63dfca3d717a5
-EBUILD httpcore-1.0.4.ebuild 1229 BLAKE2B bb9e98b602caa18bd7e3a22d1aabe802253132309e36c833dccb4b3d5085e22895d99a898928b738f3b7e72393b50484868a34bb68de4fb2371b7037445a8742 SHA512 6e714920745c9da8dd56532f94564879af7b9c5c7fdfc316ddcc486ecfec25454a87bdfba357828d43062cb8f7e0b71a921664647b510f5c1fa63dfca3d717a5
+EBUILD httpcore-1.0.4.ebuild 1221 BLAKE2B 240f2f97f5fa46b78e78afee39e4d6b9f51b8b767614d330ddbfbe402cf5109a5b63da5414d3b59016359f763aee403da5bc857d6f734d4cef577da3aeb507e8 SHA512 f52d5767df19583e9af721f9563f1958c0f1cf52ec177d6c42672e32a62dcd16ce1ecb5fcf786dfbecd1991f2f627f3d2a6d617b7efc90092ee9054c33a42d0c
 MISC metadata.xml 454 BLAKE2B f8a48d9ab81e5f74623dd0c8490e5de5cc711fda7f4614932e7ac6caa80bd23436037ddf9327d6bddc3d39c8b601b4ee74a85c0a10bacb20514cbf8278e34d1f SHA512 af962141bd55f51b27e0d4b61bcf7d5426e816df4f8c65be257d8fddd597664afe04e78ebe7e11caaebf06ae4fe17b88f568dc440403865ba6b8e3b47d796aa6
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 08ec98a9ea8d..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=( pypy3 python3_{10..12} )
-
-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 24a34134c031..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=( pypy3 python3_{10..12} )
-
-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 24a34134c031..29e200461117 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 9d8fe13d53bd..3117db678f8c 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD httpx-0.26.0.ebuild 2019 BLAKE2B cd24389a6c4b118229cd52ed37e745f3be248f39be71a5b9618a2d643d68a84a0126541c01afab98b3185873ba3a631896d908a5295c3d5aac4bb08704cec5ac SHA512 27c86a50493b1ac70183f6943a33738b69d264aa03cb1e5d445ddf64505b89e3548fbfd62f69dba331ecaedf56f41f11f2989025fa18888665d4073a66aaf6c2
-EBUILD httpx-0.27.0.ebuild 2027 BLAKE2B 943f896844e046fdca52ca747b76066849bbf37e3a485ce0a139a35fff0d345c47a9b7abbb8db93cd340fd41c59a54dc6dd61a653dc6b3786175a4c8566b9a4f SHA512 1318d5a5f9606b1d70221be15b623d1a8e6d0c7c8150a72806bf64e24c60ee160a6c883636883d6a454e3b0e5a771809f93f1edbea61061ccbc40a282e71300e
+EBUILD httpx-0.27.0.ebuild 2019 BLAKE2B cd24389a6c4b118229cd52ed37e745f3be248f39be71a5b9618a2d643d68a84a0126541c01afab98b3185873ba3a631896d908a5295c3d5aac4bb08704cec5ac SHA512 27c86a50493b1ac70183f6943a33738b69d264aa03cb1e5d445ddf64505b89e3548fbfd62f69dba331ecaedf56f41f11f2989025fa18888665d4073a66aaf6c2
 MISC metadata.xml 518 BLAKE2B 063b5b95529cd5a31aac83998c0acbdfef208c34e931c96ae8ee767a326301a597a8297514b5c97bef2b3b706b8938d38c0e5f5d752307a9dd06984792c799a2 SHA512 3a29dffa0f951255a67468b28917590d4108ca12e14af03bfddef80f6d48e266fcccdd991e778ab9e267c0bc76ff0017e07905c1f2f45dc440a9af89f6cae6aa
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 108c55923dff..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=( pypy3 python3_{10..12} )
-
-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 a3784ba1c42c..108c55923dff 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 e9cfb5aaaa34..b2feb2e90810 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,17 +1,7 @@
-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
-EBUILD hypothesis-6.97.5.ebuild 2461 BLAKE2B 343d4374955bed436ecb2533684eac1d2013c8b6c691bf72477a24c52e5caf7e71e61b67de8475c38e940a13b046ed07e8f2b188ad39c3acff8de4df3f7f5a97 SHA512 3a72f5c9f5c1b3787c37cd8830321a47a5c54c655c8b75fdeaa4b09c6c4db310914ebfa5cf631c2576e92e4bd56e106f745e25777b5f86cd7b0cc58ec838fa7b
-EBUILD hypothesis-6.98.10.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
-EBUILD hypothesis-6.98.11.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
-EBUILD hypothesis-6.98.12.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
-EBUILD hypothesis-6.98.13.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
 EBUILD hypothesis-6.98.15.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
 EBUILD hypothesis-6.98.17.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
-EBUILD hypothesis-6.98.9.ebuild 2469 BLAKE2B c411ef0dbd4cb160b7695cd5e9428835163379752bab7b2f4668b7cadff8fb0773ff46540a66c521f15f65cdb4f1f51a832e06adce48491e492a0c4f0dd13499 SHA512 d7031fa1c8a7fe3914019a39976473dbe629b215b40647c262ba8c75a33b668176e5fb3262f01267f81b42b951b641ea561c4f1c2d21f61e4a0f05c5dbfd520c
+EBUILD hypothesis-6.98.9.ebuild 2461 BLAKE2B 343d4374955bed436ecb2533684eac1d2013c8b6c691bf72477a24c52e5caf7e71e61b67de8475c38e940a13b046ed07e8f2b188ad39c3acff8de4df3f7f5a97 SHA512 3a72f5c9f5c1b3787c37cd8830321a47a5c54c655c8b75fdeaa4b09c6c4db310914ebfa5cf631c2576e92e4bd56e106f745e25777b5f86cd7b0cc58ec838fa7b
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
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 d542c10c068e..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=( "${CLI_COMPAT[@]}" 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 f7f366381e4f..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=( "${CLI_COMPAT[@]}" 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 f7f366381e4f..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=( "${CLI_COMPAT[@]}" 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 f7f366381e4f..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=( "${CLI_COMPAT[@]}" 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 f7f366381e4f..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=( "${CLI_COMPAT[@]}" 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 f7f366381e4f..d542c10c068e 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/identify/Manifest b/dev-python/identify/Manifest
index 202f9c0866d7..e21df168d8b8 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD identify-2.5.34.ebuild 595 BLAKE2B 29c3f7a774a2dc6999c99f96790af9ae54659258f1e2d5ccd15a395d3e2028b53cbb29ca25683ecbc9ae49a6a09c9dfc695e28e72f133ee82b7ed895c9e65293 SHA512 90ca9fb774fc3f930e4db8f5bf3690ed29ac2dbbf15a71cecf8400269ee5af30be56d8c41e436624bf27f7a0417ab13633aca9a6b3acd98f447e0f0d302992a0
-EBUILD identify-2.5.35.ebuild 598 BLAKE2B b29030ac179d4b7a20d90b278ec871a8056eb84e7d4f87fdffb822fe19800383e8e6a39eea42c332e6e73890f4f0da83b6343a3a9102e11365cb74685b47ff17 SHA512 f6dc46c2b5380e4faddcc17861bedfed4a8552ac97268c17cd801d824a077b1447c2a01ca3a2535d63a1d48fee2d0baf2a82b386d6853fce2100e70fe915de63
+EBUILD identify-2.5.35.ebuild 595 BLAKE2B 29c3f7a774a2dc6999c99f96790af9ae54659258f1e2d5ccd15a395d3e2028b53cbb29ca25683ecbc9ae49a6a09c9dfc695e28e72f133ee82b7ed895c9e65293 SHA512 90ca9fb774fc3f930e4db8f5bf3690ed29ac2dbbf15a71cecf8400269ee5af30be56d8c41e436624bf27f7a0417ab13633aca9a6b3acd98f447e0f0d302992a0
 MISC metadata.xml 501 BLAKE2B da95534590927f7290f78f47e30484e3349c9058048c15522e7346a74d9a2c96141a18897b10b230adf966d3c237217ef1d2dcfe59814ccfffd58ab4c38c1ebf SHA512 8d78245bbd2e14016eb70f1d8f8d6129e6b265084f7da95bd915f01ce5af94f86bd69c33c1514195de70d0f834332d9ca968a18afb59a7016c8cb58681d04d24
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 6d0d4666c11a..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_{10..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 0aa9daac20bc..6d0d4666c11a 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/Manifest b/dev-python/imageio-ffmpeg/Manifest
index 274909d4c1cb..861411e972ca 100644
--- a/dev-python/imageio-ffmpeg/Manifest
+++ b/dev-python/imageio-ffmpeg/Manifest
@@ -1,3 +1,4 @@
+AUX imageio-ffmpeg-0.4.9-ffmpeg-6.patch 740 BLAKE2B 8846c0c7773f0c75904dac8140be38dfb6f2a73dfa4edcfa0e5fe92080e378fec9bcee542c978aafb0726f7c6c506e918e56b2773277d1f72298936b7af22597 SHA512 c2310b7cc091bdcc13d4348bf784a68b501ff1390583ee9907016705f9c9ed2b1d7006040ea0425772506086d0535d37cd4f329fee8ecf7ad82cef6193d73e0f
 DIST imageio-ffmpeg-0.4.9.gh.tar.gz 27344 BLAKE2B f9bf6421859f8b17aee5300613a14de9883436aaa724b61b8068498f533cc24ab4c8372a6de6ce4ab49218abb84af8a35e29e1ccbe9c913fcdcf2db159f13a92 SHA512 ebf63b9ac9c733d4c12d3aa4c6a9e81dd0128795a040e65df03bfae00e3562a3976eaa2f4058562bbddc3f8d63d6bf2a38133de4d2ddb0d2dc62ffab2449e143
-EBUILD imageio-ffmpeg-0.4.9.ebuild 652 BLAKE2B 35c71597cd2cff3052aa9a0354fa7a0cccc3883283b69acb77fd996db047b1c6425041b65d7fdc4f4cdb1af8c002981626ad92f2ddb359415d9495f6f66a865d SHA512 62255610c5047bcd84012025e635aa66fca9f4beccc0098a04475cb14bea6d91b9e445f283c694b11496a05f12fe4b060497e3428b8b6a1aaff5c2faa6d7b760
+EBUILD imageio-ffmpeg-0.4.9-r1.ebuild 754 BLAKE2B d951ac329f2382e9aaa2d4dcbdcb03fcc3655bc81df8ba0de2fa2302828218b919a1ccbb6fa55e3297709ce43a19208660bb4906a3423802d9cf97a3debcb78f SHA512 ee08984bd65b56d32bcb1aad1a9df3b8739d4ee9093d160309dc87864eba43e01d5f6d85ab4bb101d0953201cb9f46ae8e23a24cbf4da3f37edc2bf135a9aa31
 MISC metadata.xml 404 BLAKE2B 6edf3706d02cda22fe3f62df4c773035b0296721571683672ffe287059b3d5b12812538bd8deb4b26008bb28bef65de97feab3aad32b397f55a9d6c62fb95b52 SHA512 3b6ffbd42a85df5f03cb429aa8dd0b5dbe5585b4fd57af4739aa49a96408329bb77c8017eeca078ca2212bfc390099d06670bc70f968f8024a3d5621d1016ed3
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 caabdf39b65d..71869a870c23 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/Manifest b/dev-python/imageio/Manifest
index d991862a159a..451a474d89ef 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -2,5 +2,5 @@ AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a
 DIST imageio-2.34.0.gh.tar.gz 413125 BLAKE2B c6f9650265924f370634f5ab87bed94bdb501d078a154b93400d8c89847da3fef7196f18db0682bbfc99ac5c9f4156a113bb2d74f572c010842b9b9593d7c13e SHA512 d28b5b849a8d7fc90c4c4a82b2056431e5351ecce709cd48ccb9aaf58a50964a1b77faf4663d3fdeb4757951fb8a03b5bf632e57f78ddd59d5a9acdb62b78f48
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
-EBUILD imageio-2.34.0.ebuild 2549 BLAKE2B 016d94008cea58775ddf68092546da7cf5ee44b79da87aa37af0fb7ae242c4d87fd78ae516c566526537b3495cc141bf132a1374a889a094f5631879c3de96e4 SHA512 32b25745ae05e799dec9fe2d6307bf5a6edc09a99deb7b64102013edcd9708abd8c3c190c4ff645ce831aaa2a7885d747a6d623d161287ddea8e5c0e2ea24344
+EBUILD imageio-2.34.0.ebuild 2217 BLAKE2B 436df51686bad3ced9dbb75dacb05f2790997897184560a3f1d4435518df20389e501ec98a0da1aa2b66ee6add9294f8916cb401915448bb9f9cbf3e9b355ebf SHA512 ae034ff0a3ffba8d4b2f03bb5b329c152ae7f2b628a2e840f025013f796f1a6b31c9dc1f747646914108fc5c04727430f3561cd102fc8340c0749f090489a793
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.34.0.ebuild b/dev-python/imageio/imageio-2.34.0.ebuild
index 8a2d4f074917..9c415ea19f7b 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 2899d006ded5..b39da3e1d1af 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD importlib-metadata-7.0.1.ebuild 1360 BLAKE2B 06ec461d4811902a6e1aea8726749fdd3bf8feae4b9f36fa7ba717a607e816fa1ccea250a872c4ea97c79c4ee5c7cb625e9bc16e0fc36e35c9b64ad894700334 SHA512 757290d201fcc687317ce35a225081cee712a2a804cd2bdeaef0a8e28074ee238dabbb46dd19aae6e0ff1252ffce974ae2caf51200e182bf43564dd8ee03edaf
+EBUILD importlib-metadata-7.0.2.ebuild 1368 BLAKE2B 2ab76733796a9f829d328e60ab357ace9c3b79580127b7cb9412d83a705ee8745883361743d3e9b36063b34ebee36c2609c5798d75bf39b5db9cdfa3a523c41c SHA512 10839cbf98705fa45464101596ad2521249009acdefb3985bcb4f74bdd3813db0a409cc90bea76f12b495f6f63443462bfac4e0c3fe738005e0e70d72f032769
 MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
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..337c0169eb9a
--- /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=( pypy3 python3_{10..12} )
+
+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 63a81cfcb2ea..292068f96e1e 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,11 +1,5 @@
 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
-EBUILD json5-0.9.11.ebuild 611 BLAKE2B c8c98d4bfdde0495b92044845437ce7d7fbce86ec791149b9f77095212a48ba802a128665a9832a51a517b321b215025d3c587876de281b44fd214e871232fde SHA512 4f361f1f43b0bced61cf91296e8fe6e8e3aa2a0d20fada7922ec9bb23207bde290b167ef500ff94cd3366ccf6f932d73ebc4d53fb50abd288a8656d7aab15e4e
-EBUILD json5-0.9.17.ebuild 478 BLAKE2B 60606d434999e1a743ac86a0bc02f85983a6b989c14ec72382869a9512d6288568b15778b6e7dc594ffb0136c6a1aafd016c56f50b409fb90a8fa6459b7834ef SHA512 99750feb92a9c602dc7ffe2ff4e5231f6bc04496ca159f5b3c916e2c669a2179f18c00483acd9288ac33c26a2b735af52acdb0daca481da458d2e64b385ba35a
-EBUILD json5-0.9.18.ebuild 478 BLAKE2B 60606d434999e1a743ac86a0bc02f85983a6b989c14ec72382869a9512d6288568b15778b6e7dc594ffb0136c6a1aafd016c56f50b409fb90a8fa6459b7834ef SHA512 99750feb92a9c602dc7ffe2ff4e5231f6bc04496ca159f5b3c916e2c669a2179f18c00483acd9288ac33c26a2b735af52acdb0daca481da458d2e64b385ba35a
-EBUILD json5-0.9.20.ebuild 478 BLAKE2B 60606d434999e1a743ac86a0bc02f85983a6b989c14ec72382869a9512d6288568b15778b6e7dc594ffb0136c6a1aafd016c56f50b409fb90a8fa6459b7834ef SHA512 99750feb92a9c602dc7ffe2ff4e5231f6bc04496ca159f5b3c916e2c669a2179f18c00483acd9288ac33c26a2b735af52acdb0daca481da458d2e64b385ba35a
+EBUILD json5-0.9.17.ebuild 473 BLAKE2B 3892af1d1f83f3990e33eed84b71d4ca6c2f28726715e67d936f38a73e06460d99da56cafccb9280b3110ccec513b1fd1b8f535004d809c2b1a28a0169a50dbc SHA512 cf98aed488668ff968bc35fae371b1afcb2b3375ff56dcfb9edb225c6d04d383eb6bbe7be95288d821d108de0673d18187844a61b95a492f11e1073fad175f90
 EBUILD json5-0.9.22.ebuild 478 BLAKE2B 60606d434999e1a743ac86a0bc02f85983a6b989c14ec72382869a9512d6288568b15778b6e7dc594ffb0136c6a1aafd016c56f50b409fb90a8fa6459b7834ef SHA512 99750feb92a9c602dc7ffe2ff4e5231f6bc04496ca159f5b3c916e2c669a2179f18c00483acd9288ac33c26a2b735af52acdb0daca481da458d2e64b385ba35a
 MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
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 b87e3bc9caec..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=( pypy3 python3_{10..12} )
-
-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 ef679f5690a7..90c8fcac19c6 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 ef679f5690a7..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=( pypy3 python3_{10..12} )
-
-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 ef679f5690a7..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=( pypy3 python3_{10..12} )
-
-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/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 65e87e9d7396..40514315ff75 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpickle-3.0.2.gh.tar.gz 258895 BLAKE2B 51af5841fada084c4fdb27d2d9c95ba0a790027d6a67b37bee6cbf9f256ee2778cffa38fd994de728b58c03536a07492335fbe6d4e7eed875561a3264232f81e SHA512 ed2552a68ca05a6e7e01169697c1c46735f99df95d126007ac02c0315b32da45ddbb1265ab53e39e9f4f1b54029a764cb50a05f31d773bda46f349f53929f888
 DIST jsonpickle-3.0.3.gh.tar.gz 259093 BLAKE2B a281f2054a4b7d66c746abecebb06326682e365941cfb880426bafc3aa0156202463a222a5c24a8eed89eb16ed90d01f38fa9728385e301c62ce27ee6abac770 SHA512 c3576c80d727f7b4f43e993a1dc68b0194dc4308cab9c7a9e3bd7e220a51fe2c2524c02d6afb5c1ead3c37c02d10c1106e89650fe6e609b5052f2a367150e8d1
 EBUILD jsonpickle-3.0.2.ebuild 1917 BLAKE2B 7131ea55c4004f81233c3319b5dd5a39035da46af55d6ebfd9692b95b0a2b48bafe982aa1c49e295bf8e9698b87eae719e84119994a3d075bbc7a5415b46e6a6 SHA512 c470f6e28787b86d9d7168209275ce1840bd7fa4c552154fd4c67f38e16c6ce91435f693e216ae2988824cbb67cc09958e97e394a8b710bf5b93ba808b567ad5
-EBUILD jsonpickle-3.0.3.ebuild 1678 BLAKE2B 9f8d163b75414b48651e80cbdcb5aff6fe96211af7048c3981eb62957b86a38891f78d15f3a7cef0b0410bb97945760963dd913e910aff76dcbdcdd105a1b48e SHA512 329c91aad66e0f4c863e2d97c6ae9e962e8daef1b0ed947f9d398bb31cd8238738e001ff7011544cc66b1f127d16120efce929e97bf975ae9ca00881a443e1bf
+EBUILD jsonpickle-3.0.3.ebuild 1675 BLAKE2B ffc6653dda9fab522fed63646274f73bc673eda8f9c498dbd4f8669573b134af6a2ad2e8ccd8da0cefa855cd49cee2697a39946ae4831496092262f4ced2c9d6 SHA512 1fd2a1529cca789e09c689f04019133feb1d333cc2269ddb72fb1ebb40989b4b1a80b764f252cbf6c31a61f29b77c19ad9212a03bb6e810cb3e0084009572f0b
 MISC metadata.xml 412 BLAKE2B a7e746abd8b45415ecdbccbde1b65ba9f1fa9fe7ce353411681c2a3de046878e990aad20849ee561a56ad3208bd5071d7b5e5b3c767fd71b7c44d2e8412d349b SHA512 dc52df78fdfe9024e695aae3d2bf22bed7162e1f2a528a288056b68022ebbc400b0a3a2f3e9c2155ee57e66d77a4f7a3f6f67188fb13ee15f200212ac6809a31
diff --git a/dev-python/jsonpickle/jsonpickle-3.0.3.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.3.ebuild
index 75bdde528e32..870bdd4cb9fa 100644
--- a/dev-python/jsonpickle/jsonpickle-3.0.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-3.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 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"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index dd8f1a6de493..1ae3de925b25 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -3,9 +3,11 @@ 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
 EBUILD jupyterlab-4.0.12.ebuild 2610 BLAKE2B 43cf71f66c0706f0ff3e34465946de03118fc540a9b8c415a3cfcc9bfcafa786031600365354ad9c7cbf1c6d075ea0493409bb280ae9bfdf7e2e93c3d8d2c3d3 SHA512 6c0aac16395c80b7393d3101e3864249b4523a5db3a432ccd51f4a909fccff93db42959a27eb13025eaa08f1db58e1bfa3758ddba6d32b8ec5032662b18b81c8
-EBUILD jupyterlab-4.0.13.ebuild 2615 BLAKE2B c0643bbfbcd6c5ca30e090cf8e1cae2d400dd2c11e283d4737dfcc7b2e75fe58962cd4d5ab930403418a2f0e18fda792f2874c9b501f5bfb2fd9245d9f47a0a2 SHA512 5998157191632668110865248ac80843b2a274b3d2e2041841d566e0731156cc4146891816e057c0595ec45b2590fece3ee1d127b1ce8e698179c01ca56ebbb0
+EBUILD jupyterlab-4.0.13.ebuild 2610 BLAKE2B 43cf71f66c0706f0ff3e34465946de03118fc540a9b8c415a3cfcc9bfcafa786031600365354ad9c7cbf1c6d075ea0493409bb280ae9bfdf7e2e93c3d8d2c3d3 SHA512 6c0aac16395c80b7393d3101e3864249b4523a5db3a432ccd51f4a909fccff93db42959a27eb13025eaa08f1db58e1bfa3758ddba6d32b8ec5032662b18b81c8
 EBUILD jupyterlab-4.1.1.ebuild 2662 BLAKE2B 97f243099e85c1cff2475724d4b5e627ce3ff088256ff14ebed31bf12ce1843837a7eaccdfd13e710a2f698debfa6055b59172217c1d55d968902f728270b644 SHA512 871f2502659371217cde25e9d381705dbe080273e358a4e72fb9aab9b5ce3e9807bbdf2816de30624c08727e5ca7eb0fb662ad87318b9ad65b4c0e4dbeac5c7d
-EBUILD jupyterlab-4.1.2.ebuild 2662 BLAKE2B 97f243099e85c1cff2475724d4b5e627ce3ff088256ff14ebed31bf12ce1843837a7eaccdfd13e710a2f698debfa6055b59172217c1d55d968902f728270b644 SHA512 871f2502659371217cde25e9d381705dbe080273e358a4e72fb9aab9b5ce3e9807bbdf2816de30624c08727e5ca7eb0fb662ad87318b9ad65b4c0e4dbeac5c7d
+EBUILD jupyterlab-4.1.2.ebuild 2657 BLAKE2B a254a6243de8ca8dfa0716385f8b79adc979dc111788ed9a468015fba3b3ce2b642c62330a2993b63c4c257ffbac1016159aba4ccc462ac5834d516c76a40674 SHA512 a459f3fe02af80092137d4b889eadbb833c3fff5b669cd68395b2cfd7cc7991ab939da163110377546755355d843e4c56175873760440074f9a559b112f26d73
 EBUILD jupyterlab-4.1.3.ebuild 2662 BLAKE2B 97f243099e85c1cff2475724d4b5e627ce3ff088256ff14ebed31bf12ce1843837a7eaccdfd13e710a2f698debfa6055b59172217c1d55d968902f728270b644 SHA512 871f2502659371217cde25e9d381705dbe080273e358a4e72fb9aab9b5ce3e9807bbdf2816de30624c08727e5ca7eb0fb662ad87318b9ad65b4c0e4dbeac5c7d
+EBUILD jupyterlab-4.1.4.ebuild 2662 BLAKE2B 97f243099e85c1cff2475724d4b5e627ce3ff088256ff14ebed31bf12ce1843837a7eaccdfd13e710a2f698debfa6055b59172217c1d55d968902f728270b644 SHA512 871f2502659371217cde25e9d381705dbe080273e358a4e72fb9aab9b5ce3e9807bbdf2816de30624c08727e5ca7eb0fb662ad87318b9ad65b4c0e4dbeac5c7d
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild b/dev-python/jupyterlab/jupyterlab-4.0.13.ebuild
index 2eb5e053e66d..ad25dc63d9a7 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 9e3f5902f2f5..72f5ef9f095b 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..9e3f5902f2f5
--- /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=( pypy3 python3_{10..12} )
+
+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 b954f1a2405c..2459c26d8eba 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,14 +1,6 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
 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
-EBUILD mkdocs-material-9.5.10.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
-EBUILD mkdocs-material-9.5.11.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
-EBUILD mkdocs-material-9.5.12.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
+EBUILD mkdocs-material-9.5.10.ebuild 1794 BLAKE2B 57edfb330af7a05f23b7baa57c878462f123a83e5b647ecfab1b8e25e5aa44a59586878bab2e3b7744174bc818dd4ba6b4561d3bfb7df69de53db1112ece4545 SHA512 bdb3af90984d501faa16d0cd27bf72fc9e4965ecbf427b99fcb5e7d615f4edb8610bfeb86b958559a3640b05d4bef3e2d7fe35a3e136ef044886461deae6496a
 EBUILD mkdocs-material-9.5.13.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
-EBUILD mkdocs-material-9.5.7.ebuild 1794 BLAKE2B 57edfb330af7a05f23b7baa57c878462f123a83e5b647ecfab1b8e25e5aa44a59586878bab2e3b7744174bc818dd4ba6b4561d3bfb7df69de53db1112ece4545 SHA512 bdb3af90984d501faa16d0cd27bf72fc9e4965ecbf427b99fcb5e7d615f4edb8610bfeb86b958559a3640b05d4bef3e2d7fe35a3e136ef044886461deae6496a
-EBUILD mkdocs-material-9.5.9.ebuild 1797 BLAKE2B a39f2daf4cb4df3d7b94ba8d4cd5c7ba541e97afbe8747f21ce9f6e88e4455e2b40d13a37090ff0df1d5b98676c73e4c6d1db7a89f09c315034e00c823c39c5f SHA512 482cd4f0c8e3512b8f3270115b1a90f727ab29d9c7097deb9a5a0215516f2b9ac1825f00bf1ae50b91b8aaeb22b75f7b77f1e8e22c10efb4ea8424a2e7a5ce5a
 MISC metadata.xml 1146 BLAKE2B c9eb031eb40f303fdcc39f891cdd2d4317075deb030d0f8374f874ecd63bf73960427eb3ee485b5b28515f58689b1e1bf977ee7b565bf8f9275b115853044f2c SHA512 01db399842cb09af4823278f84fcf8c51ed42609a2e61d8e64964e1759e14d22ed2f32ec0565f19184575089a218dad4939337798cd3a5b39f5be55f5f7edb69
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 46c2a0851fa9..28c6850f9d71 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 46c2a0851fa9..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_{10..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 46c2a0851fa9..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_{10..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 28c6850f9d71..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_{10..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 46c2a0851fa9..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_{10..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/Manifest b/dev-python/moto/Manifest
index 53dc3fa9c818..5a9f13d9bd84 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,5 +1,5 @@
 DIST moto-4.2.14.tar.gz 4933741 BLAKE2B 4c50a808dc8f27cfbcd0ba234d268084ee9a32f36cb5d6af61aacc4ee79f7bf5cf1045147c4642472129eee37bef8bc2c1953d140260d39d7f333ae0f5e5cf95 SHA512 d4079118ed1d2eef9134575e33dc0ed749bff0293d753baa63a630dbb987914b9933445027abdc344bb93fa1d6e483baf8a337a444c9dd055dda50b095ff9937
 DIST moto-5.0.2.tar.gz 4948857 BLAKE2B 664da28791bbf65eae9f76f59fd62f9c53aeb615c714fb142684213fe90f6e1e071f30511dfa44e16b12abd6fcf97316d097f3b4b1008a0f1139e5a419f1bb87 SHA512 4fb03586171dfde6979022623047578634f9b8ec7ac34234bbfe3e60492c34a04b61547c4fb42f7734ad8284271cc238cc33692b746d52d004d33f0c6348852b
 EBUILD moto-4.2.14.ebuild 6511 BLAKE2B 7bd2d7dcdbf678785be8f87b079f1c7a6295ae10dd50a8460f5937f9cb962bac232de2aeca8c6bb029fb5446c3784c1a92df30453660ed50491bf49fb90e3b2e SHA512 498b5c82391981420595b5b25465e69fe9dee5afbfc4619b92b05f93f3585e2abaea8733f8a74cfbb3475b74e49c778383d2e78f22caae6d904603539e6a64e9
-EBUILD moto-5.0.2.ebuild 7242 BLAKE2B 07774b247c1f56e98d53069fe0f3ba4511ca830eeeda125ded409765b92e73d9fe9245d15093f85f5d3680b94b3d31e7c3e3e287a91dff28c9e70aa4e4dcfd91 SHA512 a6863ddd53d37e6c461e2de94bc9bf8b99dc79bcdc77ff8d699996a3f88e5c9f167f9b1a0b1bd4823514c878ec3f67f0444cc90564f7d956b97ebf892b7c6591
+EBUILD moto-5.0.2.ebuild 7240 BLAKE2B 86cd668a544d8ff9ead710a566bc2b8397c3b8fe8ae55ca5c9559802006b2a02d64d5944fc737453c8d06f05b72069461105a75e95330ea4fbe8af9ab9c3b48c SHA512 df682627c9b6ca6d1e176ffed169bdc39c2347f91cbd263358c381ae1ea50ab1de592b91187b9616c2f9a5c82112da4aeb9901668a6ccc14282834bf43f4bb6e
 MISC metadata.xml 553 BLAKE2B 1669d17d3e655aa3fb41a489229a5fbfa6a9cfb23c667e98fbbef931992c7e9645581b9ea12011601093586cba491a5557d68e5256edb9f387c4db362346edf9 SHA512 48ae3bd9be8c3bfb68f7022d0e7bb422c2a06157967809be302067facf91db825023859d18ccea89109931538b0e93181d54a31fcc967628df61a9a3112edd3d
diff --git a/dev-python/moto/moto-5.0.2.ebuild b/dev-python/moto/moto-5.0.2.ebuild
index ce6a7e91b01f..7dd96d007b49 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 43f307a6b331..fef8506feb0f 100644
--- a/dev-python/netaddr/Manifest
+++ b/dev-python/netaddr/Manifest
@@ -1,7 +1,5 @@
 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
 EBUILD netaddr-0.10.1.ebuild 652 BLAKE2B 4dc1debe113519a1a60ccc4e9054d06374395962f0d0566c0b68fe8284b4fab390b425edb16ed8c33ddfccd1264d8ce30118486a589b86701ef63a6d0597da1e SHA512 7dd192046c075ae9628e42582adf933a10ec8eb8ded10a57931bcb64adb4cb580b07d4334b2e9c333d11f545dae655d4970a2c70352229e31d4c77f1ac009978
-EBUILD netaddr-1.1.0.ebuild 797 BLAKE2B ca568eb3822bfb9c3edfe8eb69f9c8a57c1eb65db58483d85ece8863836a9ea705d6665a82f8fdb2d5ae1958097aecff9164a684d40ea06e2f3c378ac8db9d70 SHA512 27a3147494b02133478560e1071ef594d068d71abe0403655f8f11b547528eb8ea337a83d60a7f4e64dc261049d321105fb7574ce37dc3163fc5097e0e6be690
-EBUILD netaddr-1.2.1.ebuild 607 BLAKE2B 1a7fc789dbe7f3ff62edb6fa2d452f536196bc3a440d7c196c25675a1179d337efc83a5b63ea6e0e104b8155f9649fed110745bb10c21ce169b576ff5e973e06 SHA512 300acc17ad460bbd5012157ee0a0e7bcc88a0349f0197d6f290effe44c127a4a2d3bc5718d72f10aa58ef9d4b0c530a93bbcf34be8c3a8978579cb1f64a3ea2e
-MISC metadata.xml 572 BLAKE2B df2129e7ea8d550dd815178869ec0bef7f268f6db90a7d9297d8e87a4565e0636b29992c0d0b2598805d03daa6bce6784b3a922b20d6effd96cc628fd3e2e082 SHA512 524dd99a24f19d46cc4b35f281985ed412d8c690773c42d9eaa8d4610729fee628dc5cc4c29561b237fbb01b25a8db05c06216ed356f7c285e3c758e67156e44
+EBUILD netaddr-1.2.1.ebuild 604 BLAKE2B f2b4b83ecdd690941e588c1a5d68580f354155fb81fcdc7a30c7449ee185739d35be6875c515e2dc169f8798d059b1e531538389f755f214f5c3354f2eca5190 SHA512 e7105b34ec6687793bebd70d2ff4c36b4aa41433289e33867f0864bf997970d3ba53877550c49c596ef230772e1cb58f461f3fb8c6fadb2cb0ac72662f3f245c
+MISC metadata.xml 498 BLAKE2B 26cee7b92dbfd3c2508f8cfb72a5ba9d1c3bfc9792ae5f14b9fc31a19dca8d032b459b85a284e0f663d2bce6072acd756d3ada618edfa72690fe85d94a72c0a5 SHA512 9099de88db4bdcd5230a89f9fc15094216f8ede5493cf2b5e63d093f86fb8139a6c41397985a6bfc044cd4a6cb27a29ab63b86b0a88cfb8927ad4ee4ad59f6b0
diff --git a/dev-python/netaddr/metadata.xml b/dev-python/netaddr/metadata.xml
index 46f3f19c2a53..e84df37ac9a6 100644
--- a/dev-python/netaddr/metadata.xml
+++ b/dev-python/netaddr/metadata.xml
@@ -12,7 +12,4 @@
 		<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>
 </pkgmetadata>
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 719767e4cca7..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_{10..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 dfb255e0a2d2..ecfbaf1638cd 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/Manifest b/dev-python/pooch/Manifest
index cbb46bb6ad62..733debf2bf8b 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,5 +1,5 @@
 DIST pooch-1.8.0.tar.gz 59408 BLAKE2B 07ed7c17e98ef4627f347e9b71355e147f56970fe5f0d709269602796a5ba2d8ffd5ad0ad47a17114d32841b9a7fc3eeab978f8ca9f64d35c89ff35b0aa62279 SHA512 d97e3e1098d1eeee30108affc64ed5a12f679e9122d35494598a03f3a548bb83b57dc54ac5a2c85bc42e664cb90f713bdb55b47b430ff000a722ffad58010497
 DIST pooch-1.8.1.tar.gz 59614 BLAKE2B ff30e6f1a1cc71091d5e822eb0eeda59fb1ff8f53d2dd6dc67dccc955d28f3fa485d03615d544096fdae7786c181a3395b62e3c59212f80b977755e3df0addf0 SHA512 9e78da7839deb443340c925622d5e9b1d7a3f14fdac3eae2528fb91ebf86f88715e8737e869057fe7c703e8423303e15379c07e5d11a7bebd3da63b1ac06ae3f
 EBUILD pooch-1.8.0.ebuild 1777 BLAKE2B e9bb96b23480b4db627a516d1a10269510b49de48afeead135b13c13b667c9c4f85c660bf3de22f7dff762cc18e958f3f1f7912b2812a77c60d9db841f6e319b SHA512 70810a56585e2a4a7b3f46202cf46059f6be589a41b99b9d1194b9b6fe215af62f29a85befbf2cf727cdea86f5f3f2ccfcff947c7c17872ba4a70b18c8d40f4c
-EBUILD pooch-1.8.1.ebuild 1783 BLAKE2B b8e14847f6a518db2ee58d48420b293d55630d58df9e7c2f3277100cad07fee4aaad774703c2bc61b4c0221823f9a2120a837c0a82f0b829ef535a17db534317 SHA512 c18d5cc6e064cd330b1bb66db634b1541296154b10e06f2792003c965f31f81df33ced0296835570d15999d255da0d19ca4b51152da2a628fd5d86f3eaa212bc
+EBUILD pooch-1.8.1.ebuild 1778 BLAKE2B 1480a8d09f3f0e413cbdf3c321a619bf2fffb28f6033bda84472e9c74fff63ab61f8b17eef89bda586121b144a603978ea87a68ebaeccfdfb48322c77c4098b9 SHA512 f4265e432e265982623781f80ad592cbb2835c473be5f86c807b61a2b1e84d49673775ce931664347b49d835830dbb06e4b82c2fe27c87baf709da6ec2581050
 MISC metadata.xml 684 BLAKE2B b6cd1db5a31f316800c9c5e15e11c858bebc81b7c38ced227e7f54a5a0386462fa9a92bb8f177d9df0d3fea00775dced1e2eebbb1622fededdac87ce40db21e7 SHA512 a96adfa4b8996e2685f7d5ea8ab6936fcc795a3f517da8ec14e885c08b2ae1f6d950ea9314e8aa6a4b2a4b436a23d1e98a6d56b5ae0c633bffc4fbeaca4058a4
diff --git a/dev-python/pooch/pooch-1.8.1.ebuild b/dev-python/pooch/pooch-1.8.1.ebuild
index c6e63ad9b1a0..858b564d628a 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/pymongo/Manifest b/dev-python/pymongo/Manifest
index cc5613ecc4f1..7aea02a8889f 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,5 +1,5 @@
 DIST mongo-python-driver-4.6.1.gh.tar.gz 1493790 BLAKE2B dd59001536ed5d84553350fe8c93fa5082acd1af23ca2850cb2ba8d69e1e69e2ad250da9f62b4f86e6e9013434cd1d2ed38e44bda946ff5fe0ab74935668bbf1 SHA512 7a6fe18b409961b796dfd403dc100a898b282e0abfd9995f20541b7c5f0f2dbc047c25b45a2bb9ae229954d1cd804918dc4f7487f87e311863452bab41a19414
 DIST mongo-python-driver-4.6.2.gh.tar.gz 1494123 BLAKE2B 3bf24c26ad2e97e6d23b01b1074baa7420e2d8197d5bc618cd851c148b38b68afaa3943448030692f358b7500b65d0576aaf4fdc6a49cb41e9a8ecd9e58ea0a5 SHA512 931b0632bc5764c160d6da8645f2e2e851b0ddf409390264a69fae8a9309d03271f50e6c3e3e5aae78df9b6203ab2de0471b2c8e50e4883c05b473e6c90bf9c4
 EBUILD pymongo-4.6.1.ebuild 4322 BLAKE2B 2c0120c5d55963fce6b12d16d392e3422666aa272c149ef455df35303087f9c7d703e1c9a6c205b1978ff0680902456dbedeb5a55356b33cbded2895fee9d2ce SHA512 a7d47df05291900f59e328219bd7a97135215a30cfc086f6eb16154dadd31071eb0e1e01154d1341a3144239fd17bdcf6297df56f7307f40514831aaf71813fa
-EBUILD pymongo-4.6.2.ebuild 4327 BLAKE2B fb7b2d68a9266b0d81c38edc415e71203aa0aead31f5b76cb6f65dc9343a145cd8bbb889dd1ad15e3b2b4fb6e5bf3a0263fec6348029895548074ee07e7fa9fb SHA512 341926fae52239fa2c6177ba0a7edac8ae92a69bb6b99fe318f55516c5742886520f55e594770617bb92640450f51c4bd605e5d8171bb88c26dac7654a7791ee
+EBUILD pymongo-4.6.2.ebuild 4323 BLAKE2B 1311f33611a165b8ed3815f7c45c42e8443dfbd3a87e78d53dff3badc2da6666d7c71f22a473105dd32bdb375ad55b97a16f5b0c3407d5ad62e0d99f4b4f8ebd SHA512 03800e9894317bbc268468828f5dcc8be96091d7d69cb5fff5052d4337f63ad56dde71298b2985f26180d74eddd3f9af26f9302b6cea3538caf7ea09979dec04
 MISC metadata.xml 880 BLAKE2B 024d83cdf3d8cf94cdc98153a6b429550579d494b053becfe5cda0a7a7f3852632d7155e71116a9ab751e6542fe63985755f4eeb147914bc8dbb1e9fac560434 SHA512 c6110fd18fa7f7819299b5de919bfc0ce407d653115d34d297513ce3a4acd2e16399d6f327c61bc5d4ef8aa6776f84750cff37798415ca4bd59c6fd19961d891
diff --git a/dev-python/pymongo/pymongo-4.6.2.ebuild b/dev-python/pymongo/pymongo-4.6.2.ebuild
index a96fab7df0f5..623bf64f0148 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/Manifest b/dev-python/pypdf/Manifest
index 6f0195ecb321..37cde80a41fd 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -5,6 +5,6 @@ DIST pypdf-4.1.0.gh.tar.gz 8005929 BLAKE2B 3bec62a86dc8503a8738ea14941db6f661817
 DIST pypdf-sample-files-8c405ece5eff12396a34a1fae3276132002e1753.gh.tar.gz 11748093 BLAKE2B c5989200893b28a3c2062bb024a5cfc6f3389dc259ec129857979fa43469e1274559612b4d555499e2c7e16cf34be07825229932bf4d147fa6d7324d043e97d5 SHA512 c9771129b7668a2fd1fa79bb859ae9213f3d60341cf1b9937ff0eaab0de9bf4c35adcb7b896e93329038dc0f3809a0c697c523f8fe41b43030b0b029a88058e3
 DIST pypdf-sample-files-964fb47b0fbfa89864680582640ae4eedf143890.gh.tar.gz 11668924 BLAKE2B 0c7d8e7cfb2f9d06d7633d57b691ba473d33cfcb58d2f1f83661cef9d755340d05db8767771a385d0ba88aa904f84b8bc7eafdb5d4f614b7a21a2d138572316f SHA512 28070b575273b6fee3173e797ed5bac618f8e8aca16d0122dcf3b4b16cedbcad69b84a9bc4be65037695597bcc1fa7898cdf766c37915c49f880a0c6ca057e68
 EBUILD pypdf-4.0.1.ebuild 1496 BLAKE2B f4b4e9e7a34fab791f8fdff920a43f7b8b96a9a276aeaf0879bb009d7e5dffdf0750fc9d44d337ec0ed96a454bf7ebf477aed296d46522fb43b8dbc76f6abbe8 SHA512 1b0219c832b84b8d6f08b729a6b823038c54db14e0b1fdbfd692f0590350c5f196183e7836ffead0d78645cec4c9db79f18924ab85720b5bad8f37db7040667e
-EBUILD pypdf-4.0.2.ebuild 1406 BLAKE2B 2a65acc5e208087e453bc1a7c4ecc9dc3daf37ed9bc12f9cbe021846f5c8135f2ed26acb31a49cdbd4328d4f1441f12541112a409728966596690be2e5cdd403 SHA512 f371a293660fa36cc4f2e360877e10d7fdaf866419dd723c2abbec2cfd74e7bf13d1e4d8b07d4f7333807435ada6d5c8765cd59a00a4c8c3031d30fb1ef5794c
+EBUILD pypdf-4.0.2.ebuild 1404 BLAKE2B f1da1e4efcfc5702585c5895cd23cae36e19691ae7fddddff09774f3025f1057d904a657400a667a06b90875c50b70fe69a6e4ae073c5f88d40137f26f036bf2 SHA512 d878d0cccf247fda7b2d131d83a291eb30dfcd11e2cb3a9b4d895d5c20dd0d1e73d53fe61dc42963cae2173bde3a79102d93040ffe45daa381131484ead9ccac
 EBUILD pypdf-4.1.0.ebuild 1516 BLAKE2B 040b14eba3228ccfd2779859ff7fa697e1e48c62cabbd9497316a5307b6893bdc140e82806e19d7ccef4fa131cb79da2b84ee41c9f4aba42802bade02f7ebb8e SHA512 52b834b64891bddfc0b519b738d8b527581c9eb0f2a826972cedc7c5c25d8fa9afb67f1886669be2e00f8b87666d6ac55cf17d8f3ca61097bf5c5c0fe3f1d0a4
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-4.0.2.ebuild b/dev-python/pypdf/pypdf-4.0.2.ebuild
index f0cc9485cc72..719fb3c59a78 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 bc0ab6ccfdc8..8af08e55402a 100644
--- a/dev-python/pytest-httpx/Manifest
+++ b/dev-python/pytest-httpx/Manifest
@@ -1,5 +1,3 @@
 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
-EBUILD pytest-httpx-0.29.0.ebuild 643 BLAKE2B 77b87f46554bc527119ac01805339a4d39b8bf1298006e75334fe4bb387cd32b778bd16857414e39201af9a7ffba5d2cdf97b66771b1779636f1543a22aa4502 SHA512 638f197b9543758848c29a6949e21cdd8991b70e0f426b576e37aaf555ef4dee375a712929a3b5dfe7d8e29a1b28eea63187c9dfd6c09367741b80c9aa7e6f16
-EBUILD pytest-httpx-0.30.0.ebuild 711 BLAKE2B e04e40d290ef2decc31663d3134061e869334c0451c6e659d2ebcfdee06e9557edc6bec6cb954ddec99c6fc5d01ddbce7ec367e14bed4244e34be366392e83fe SHA512 58d58b1dc617c6c8082afed01f5c32f2c3bf845acaca0d4352b0b969a875e1fa064d2438ea2247a569380324d26db00910583a2a598cbd5d6023f5aea4a1570b
+EBUILD pytest-httpx-0.30.0.ebuild 708 BLAKE2B bbb11d3136bab7a83bc1b99f5d2118ce1f5e91c270bae7968941423e934ac5ce4e489d0bf6ab96fcaaacc2ac83a183b7a70817aa17eef44070e9c42be8ab57a6 SHA512 29c093dcae6490257f043e5ab7a806b5f25ad238191c6658cced80f2ce1e0defce2e467d51b563c21065bef87bde433864490cc01ec39a8bdb27e2f44c5de852
 MISC metadata.xml 468 BLAKE2B e0f824f05936a831a958b027366ba18cad85307ac6c81b74b299f58270bcff53e06f32b2471d6433bd7014ffde83ddb24f787c07632453d14f4ee6e4679ffd10 SHA512 16bf024801db3c0d7b789cd1f16520a1ff2520e8b3e2abbeeff5b1192c19b8ac64f55fa678c922f8a817debcfe05242ce11e0164a00422445d7301858718b359
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 835002398de5..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_{10..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 20f3b769ac44..44b20f584851 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 2704a12f5c78..4093fe96ab75 100644
--- a/dev-python/pytest-jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD pytest-jupyter-0.8.0.ebuild 816 BLAKE2B 2122fba1470338920058a41c6acf8b1d17625bdede941ad0bf7e7b8ef1f0a4446b538f2c379fb665246d52f458d00ffb59c35cbffc104a5170201b58ad2ce478 SHA512 d71aa42197513e6b945fa1ee972732a99a7fc15e0e9b667d317c61871c0269905935243d0e09f98766e133c563eb7a0d328efa6ac0c79a71396c17069bcdfb0d
-EBUILD pytest-jupyter-0.9.0.ebuild 872 BLAKE2B e032a3d164cb6fc6c196752b2bcac09104c80712301291ba7c4b049a8f4f7e7e79e81be5fc73ca292fbc0c283c42fc4dbb355186d62a90dd69dbd1a769ef5155 SHA512 f27f4fb75589916b0d7a83efc85a408b70540e076698ce96c475a502265554ce4fa6b4aeb6b72945f788529bbe504e0e5438853524d7e37b3745738c87486598
+EBUILD pytest-jupyter-0.9.0.ebuild 865 BLAKE2B 582d3fc4e0a9fc491efb16cd10466f64a7727b188dd66994fb98b49f9afe3dd3a952479abc695068ee003534756b6267f9bf963f74d6165a8712be0cbc3a996f SHA512 a5a6cadf03b683ad53dedd9d28def87dc96146b3bf9e17bc53d01da791639aa7fb6329e97e3cf2882603bfe7b2543baea5786cbbad48f6b2ead4b446b7423058
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
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 53737cb166f2..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=( pypy3 python3_{10..12} )
-
-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 ac7134dabd4e..a6c41633be19 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 3561b3a728cd..dc7d00fbf430 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD pytest-subtests-0.11.0.ebuild 951 BLAKE2B f73cb93c3534a9ff1f55a80c7959d0e14aa0a3df7be41c9d6f4594fcd168ae4a836c779b23c209d6c0c89036c02d78348516541b5de194b7a9665eccb2d90a3b SHA512 2db66c2ae6f9d6c4a350b6bbb03f268f40d05879483e2fa852004f898f3a60bf2937b60d056b9cb92570cbadae5be5cf35aab38209e814d6d91ee7c1acbb53f3
+EBUILD pytest-subtests-0.12.0.ebuild 991 BLAKE2B f2c5db20a6d76b7d96f10ee1f2297f0a86bbfe445a888a4fc91cbbdc7296fddbedb737472ed3aa7635a2b0245b24715137d2ea44dd1b37fd10597c8b1af5b048 SHA512 a8c259a611eda8cc8c93cb1fc52adc1be9ccb8325fa44a0f5542c6605da217b7c1306972c8fa88da7ebd7aadcbbd39053fa6fed43c08d52bf95ba1cc3c3d1f62
 MISC metadata.xml 409 BLAKE2B ca267dc80fa124c3c8ba82f5e46356492e8cadefcf8001469c3c076b079844ae72829b5b527658bea341c3fee3f173421c9f2e7ec7042a171e234070113f4734 SHA512 57c12735a910107b53dbe54969f15ce70eafda3df096c78082d91d5bedc53b015ecae3e3d901e0a2a90841370916f6e4e94041e0b5589ffdce323144375e6c20
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..d97c208fa7e5
--- /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_{10..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 2b4b2484d50f..6006f524a1cb 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD requests-cache-1.1.1.ebuild 2435 BLAKE2B 3ca3e0653a97af57e78b0cb7dc43ef7085dbd5287a35fb823da9f3cdbdadc4177c65897fa4b5527ce017bff99d402eda0f7946e2b0c61128189b20cabe64c0f4 SHA512 68b6e62d8ffcd37264130cc49bb8177fab342da8c380e75ecfb6426e5a92cc2e3fb3ec4fe3f5353e31cd06a5e9c624de9527a813eac006565205f470349077a4
-EBUILD requests-cache-1.2.0.ebuild 2440 BLAKE2B ad45739124ed79a2f299cb8f551d6f48215dc19f210c9bd4de73ef3bd3ab6427b75d2d000c56a94596acc11ccc3ddf985cee6116e3a1485a91220d8c03cd32c0 SHA512 e7acf6fc792264958ff9970a061023c0e7dce59b462ee03b03b8d3998f915f66079fb554b78d90484e89124fd1056be359cb2aac08a5505c8f67b60681181116
+EBUILD requests-cache-1.2.0.ebuild 2435 BLAKE2B 6239275238a62ca79d02b694f2929bce923f601fa4a1c704e697c8cce25d5dd6cc7dfa433204cf775bbbdacd364adb64df4d4b31c3364638da30b9212b8339f5 SHA512 f0bc5ca7b299ebe2abaa524e69d5a9c7af145d68da7ad4241caab3f0b63281f66518b0ce0c6674700cfaa13e58546ae796e2c075e7b7d6d313146920bdabe23e
 MISC metadata.xml 541 BLAKE2B a8fd81921a36e2fe5bdec38cc1039b9e91971c992a59cbe2dc4826977f753bd6cd2533f65b5f1a076308a898972fe70e85a2c8cf480259e9801f51b10c4de8a4 SHA512 64f29b67eaf3ce892a9f918abd7eaf8f020323e9e0d986b424cffc83e3ac1ba5cb14b534f0a0ec73a8e81694ca4e0e7f98ef02968ac5b43dab104b2b12e8e0f2
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 49a50a7aedeb..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=( pypy3 python3_{10..12} )
-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 e6f048116b96..cd7fa8425059 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/Manifest b/dev-python/selenium/Manifest
index 17b0f5f96a87..83f561829a9d 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -6,5 +6,5 @@ DIST selenium-selenium-4.18.0.gh.tar.gz 77571210 BLAKE2B 13d8454d1aaf31f58aa89f5
 DIST selenium-selenium-4.18.1.gh.tar.gz 77568094 BLAKE2B af8a9fb058e16bbf3d71e4487bcf80aca19920d8e03f5a218ba3acfdc931cc95b8c557e42f97619f08ae3f3f59f9761663a65096678c43b0b1b9fae8e2dbd356 SHA512 6bdfbb45cdf7e036cb5e27cf8c2b3952413cc0d02257e1333baaa774f1c6188ae16fe75aa1054ff2af31a8215c11835c9d64f39b0b0170a3f04760f192f42e94
 EBUILD selenium-4.16.0.ebuild 1649 BLAKE2B c125acb75d9d1a010d298151e11f82802e2ba32749cb1afd2babc4e9cbe985a2ee2032dd89578526baa681b0142d24d3a60d2f4e7aa229977aa170c1d7692136 SHA512 9c8ab48fbf347da1198486c48205371a751a62127f935ce3ae8aa8da115f443ef52cbef837e5627886c781aa140d7f6c3296fe4d1255be4dc95d1a7ebee972bb
 EBUILD selenium-4.18.0.ebuild 1761 BLAKE2B 7355cdbe8cbc655516b61e9fa05ce6f69cd486c97d60faabb28c8ca4fd511cce8636fad799cb913adc89c9f53b1b6f220c2de6f9c8f715a86af2609fa33928ed SHA512 a0447ac8813cdf208fff5d1de476e1db77ff942bafaf5c5f57659569b3dd82390cf67b574c3b1c399f67a0a072cb855bdbf4e65e83dbe0d8be5aa374351fb53e
-EBUILD selenium-4.18.1.ebuild 1761 BLAKE2B 7355cdbe8cbc655516b61e9fa05ce6f69cd486c97d60faabb28c8ca4fd511cce8636fad799cb913adc89c9f53b1b6f220c2de6f9c8f715a86af2609fa33928ed SHA512 a0447ac8813cdf208fff5d1de476e1db77ff942bafaf5c5f57659569b3dd82390cf67b574c3b1c399f67a0a072cb855bdbf4e65e83dbe0d8be5aa374351fb53e
+EBUILD selenium-4.18.1.ebuild 1755 BLAKE2B a807fb718520abd6fa9816a1e71db51050a5e2a4e7c32ed508ae19434492249f9f449d0fa9210528c8e36934be669d2f600defdbad8de953273076f0e1a04e02 SHA512 c7c9dc5834c2061258e3c1277ae2b0e343bb73a43fb607010265f3aba0d90e837a6a1296976e3d4cf85093386e42b9637b924981be822707da660c74e66e01e2
 MISC metadata.xml 383 BLAKE2B d437d1631cefdba12fe2c3ce38ddff34bf9dd2bbc777d5d3425556bda76865711c991c9e3a735130a1d55cb7c6578b083ecb473c28706a2d45563b31bdbe6d1b SHA512 c087323da996b9ad4d0bf8f00306cf044d5daab194b60af029cb1ce06bf60c660fd5959b7914e6f1103143c3e4533d293a6d3bd0ec1c95163eba09d8a19c13a1
diff --git a/dev-python/selenium/selenium-4.18.1.ebuild b/dev-python/selenium/selenium-4.18.1.ebuild
index cd1feb489ced..deca46814336 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 8cf37968beec..652f00c134b1 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,6 +1,8 @@
 AUX sentry-sdk-1.21.0-ignore-warnings.patch 329 BLAKE2B cdb4295e600d868feb11b4a0af534bca90a1fa777344d56c945ddcfe71b3db10848df4032df06b9acf84cf574bec04dce4dc8935dd7421a6d0a2a011db337d6f SHA512 d1b5c50c78d1bb299280c4937fc8a8fdfc7d174d41061a32b57178c4dee58ab4b4b7afe8566a6b79244e53be8714b3ee7fdc9bf3401835d6d743e9fdc5a0aa05
 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
 EBUILD sentry-sdk-1.40.4.ebuild 5616 BLAKE2B 9ef615f70bd665d74f4f169d7c7c9b33581a8b532b6da0caafec5d3867c1da019613ad4f245b72ccb2a73474b7e6234490de71f6377eebe6f01aec0d89f9262a SHA512 25cf39a51fa88c0db103db9aef7eafb73024286465dbf9183f11a843d39af6b7aa7bf46c20434e1c5434575eefeb66f880540b13dae2d8e2efd07755e33748fa
 EBUILD sentry-sdk-1.40.6.ebuild 5685 BLAKE2B ff541097703666b7a31b256c91ddecb802d5a133a3b01e692a5398af7f8bc2e4ed00ddfdc54b69b999a7629add25273a6a91c7086e71d2b0eb3e8e835158b68d SHA512 24e0bfe931e0a2790c6e5a7dd610608fcc2d1646b2a6826f54b4de2287576bb4b5f02208b44ff2b955f6f7f23898b9042d6d6ae0522d06d9c8f28ea45ba420e1
+EBUILD sentry-sdk-1.41.0.ebuild 5685 BLAKE2B ff541097703666b7a31b256c91ddecb802d5a133a3b01e692a5398af7f8bc2e4ed00ddfdc54b69b999a7629add25273a6a91c7086e71d2b0eb3e8e835158b68d SHA512 24e0bfe931e0a2790c6e5a7dd610608fcc2d1646b2a6826f54b4de2287576bb4b5f02208b44ff2b955f6f7f23898b9042d6d6ae0522d06d9c8f28ea45ba420e1
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
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..bd77eeba0b1a
--- /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_{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 acb3f7249a20..4452aa05d320 100644
--- a/dev-python/sphinxcontrib-plantuml/Manifest
+++ b/dev-python/sphinxcontrib-plantuml/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD sphinxcontrib-plantuml-0.27.ebuild 1018 BLAKE2B 49f51474dd5f052f3bda975fb75d1eab2b2202c6beb61e918f58272b3a034eda800231edef001fd51218f0f15ecae4116073836a7c3cd946218c0bc13bbf6476 SHA512 cd30d43b34af01da12e8fcfdb508bcbde4bbaba5332d678c7ffdf8c18a005503df779b18dc1f7402eb0f2ced595f498fd596fc87f83391915a692938aeff2222
-EBUILD sphinxcontrib-plantuml-0.28.ebuild 1020 BLAKE2B 36d475bb8f7b0b423706bb6e46673e826f180c46f6dd9481adc0940615d1745b134aaf12c5c2dc156e4f3f1af88c6d2eb1c2be6a008076ec357cc561d66e2bb0 SHA512 41875b792465be425b970fe2600a2ee95b3d7a1640d2a368b97ded342b0d824b44b7f69fa1aa0233b1a69820a01cc05bf69a51a0075602164608eadcb43a4977
+EBUILD sphinxcontrib-plantuml-0.28.ebuild 1017 BLAKE2B 5f9f62b2132e00d0a3f57cc2bcc3fddc81d806cf525ed5488334205f98f953778938c47f0c88205d8dcf02b43262c838f2cb14b9f28c2c8b41c85f7baa0d7a47 SHA512 47d30c5f614090e4e2569ae6cd1057160f8b7ecc2c14ce306809aea5bba15e4cf440c7cb54d994a324984237fe705d7d8903620ef0614a8a29a5e2aa29b5740e
 MISC metadata.xml 419 BLAKE2B 05ba888453b1a19e83a8d21a5b0cc2a5a24482434b44c0f3bd4c75c99004523f6397a7a32811a336c15449ea86f1736e5a940d240d19f3956a176fce3881378d SHA512 6d8c4c646e7d84771a7ac7889650c06a0efcaa708d5e009df323f4d8ee591c75d864811ba10dde72b84f40359092302225a93d8de374da8d52033163356d6f46
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 05d76c224ebf..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_{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 74c22f4418d0..368a7eb7e9dd 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 2de4078a9de6..06f00513d59c 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,5 +1,3 @@
-DIST tempest-36.0.0.tar.gz 1137446 BLAKE2B f645b35b42252dc2bb4b7e1a3f609ee31e76d60e952c2ebb2a404b5f2e40b449aed0815631e922dffc71bd1598a5554277b851f54b99a37a1af328de171ec3ac SHA512 1d931052aa3fd9c76dc6ea23f861d43842877158307877235f5fc64d8a2a0a65dedefebec7ef5a7153aad7ccc3fc9954a882696adbaa6800af9ea2eb652790dc
 DIST tempest-37.0.0.tar.gz 1146330 BLAKE2B 51acf1e0e8ce3a95d54e7b916100c32cee34f9546166fd43883f9bd5c4d4aad7d846b17c4c805392b64b9a0a02fea903c59b799f14d7e459d337eeb11c62cb6a SHA512 1de0e26c86a59c0e3f3dc494d4fdb4d3ca5ab215c1d52b34b4618e9c939ecd59b29c09bccb31bed7911517edce4cae4f9acbd2d1e28be75b0305850230528c67
-EBUILD tempest-36.0.0.ebuild 2197 BLAKE2B 94a1ab9e691b56b9cf8cf60c06c3ff571a4a47137ad66eaca3bdf2d5cbac6e44a04ba199c486dace8c26ba2cfa4eb8b634926763f5faa879f326feabf3a10d9a SHA512 f51431930c7a84aa390228f71e9c566d1b40f9f8d98073d376f06ad7b1b180f888f985b33d7d8f78ad6581b4a5e39e6cb4319a043d388282beba4f1ddc50b5f1
-EBUILD tempest-37.0.0.ebuild 2161 BLAKE2B 71369c13ecf600033f40a588afc14a0fd854b9be5b2647e9e54126756595a1cd4fdb596800193be5138fcb0f0673fd02232cd90a752debb4283d52bdb4c09177 SHA512 00d8febef75cbd09b421b2c3262897ce92ebcca58cd06f4b8422cef59fa3a257c0204779f73fac604804fe9cf2d4eec005e7dbc52e23e520d8a15f92c756d9d7
+EBUILD tempest-37.0.0.ebuild 2158 BLAKE2B b7c10b1cce5f0f665bf16bf338d6ff0e1c7fdddb13a477a23b76539903fb70cacd03233a38f9bf295fae473d1df91661aa1758f39d681e0ea139a93fdf0c71af SHA512 e1e9cea83bfcc02588119d25cda7995e65b9d4f5d3af37031b112da6f1d00b77e4441b9c820f35a1ef674c5bd5e719f038c46ef439dd2a8c05c0842c908357d0
 MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
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 995bd0fb9acb..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_{10..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 6821a436d77d..f022f1461ccb 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 b002cd71f2fb..53063ccc9edb 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,3 @@
-DIST tempora-5.5.0.tar.gz 20877 BLAKE2B 9978fbf5bea1ec9d948ba7440dcbe61e591f32cd6a9db7072beda0d2cec9fdcf1c8793117afdc445d8389446856b11c45b1b93cb27220454180a765008d2b1f5 SHA512 7cf1d7f826e71e03bb733f082f0ac1e8746f1db64776c436fe683369c70164902140df9547757d8ed489366a5f7b336415aec076ea3c4b0b7b633ed09527f01b
 DIST tempora-5.5.1.tar.gz 21145 BLAKE2B b034b85272faefc884e098c1ca58b3e4b1f6598487f4678ed3b0b9f353d70b9862d8eaed425fb812e23630f123a28a25fefc8916a1c9cc882e5ed8c3da98dfa6 SHA512 642c4176ea14504e2f831f738e1064c1fb888ad89a67c74d5bcf2a5389923af3933981393855c7eceaf6c7fc16bbbf4126015d2d1dfa0fdfd38d528d16854dce
-EBUILD tempora-5.5.0.ebuild 772 BLAKE2B 651270ec123c34560c1ec20ff2279967335ccec8a563203839f203a0cf2d883ce29e4d3eed4da1206cf45492abba7a235b9e53675783d7d5475248df3583cd99 SHA512 11f88f07c5925b84081d4de0dbe5941359280ad1e6c680d3328c0495539b1744a0fe504cb793b8c102fe2bc52dbd6f59873a3a4002c68269746cd7f1faff741d
-EBUILD tempora-5.5.1.ebuild 780 BLAKE2B 2c2cdec1cd7d5b8a8dd8122c02d4159542c4e774714907b706ac4e87f2ec673b26778e0a558aea269aa9c661ee8994417ee2c9639678da5f335b9618b975b9d7 SHA512 88a39adceef5fe830cab286a37dad0ce23c5aa5aeb552eccea9d764fd2a90c4b8be79f6ad567670b0dd4cf80ce1649ee6802e957f571065e415e7424984ca600
+EBUILD tempora-5.5.1.ebuild 772 BLAKE2B 9e1689ff8f2bd33027a62ccaf997b5b1cbf071cc8c5c772796c3ff8258e9a1130104310becde4843c55082e3d6a53c88cd75bbfdf2fd26b905091739b3fe9673 SHA512 77b1910120db8968d755fdf158a983c2f9e52e04fe079cfce23fc9408a3d83c4e298e369227380a931b6ccfc9a44d74430ada1a902c80dc0e2f798671c14c5e7
 MISC metadata.xml 557 BLAKE2B 496ca69906103b5203131d5bcfd1249e39947857c883519953fd3f9730f9dd518e9d84f31643e152e8fa72423924c8dff7ae64b37c0dd8ffdb987cf7c00b491b SHA512 941db1a4f23e97334811a95d009d13fd04daee291fee43436cf938740f70dad09cc8482262a1a9cf9f838cf0a062d9373bc8d0e582da5b677999273f6967ed09
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 299ca75169af..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=( pypy3 python3_{10..12} )
-
-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 beb42e1caf32..fa1fae253ae0 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/Manifest b/dev-python/twisted/Manifest
index 4e2f8953313e..2875fe757a26 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -6,5 +6,5 @@ DIST twisted-24.3.0.tar.gz 3500456 BLAKE2B b2cebb2f3482dbeba250786b1977ddbb09e1a
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
 EBUILD twisted-23.10.0.ebuild 4134 BLAKE2B 48ad17b240e917bf0302c7e70a72fec9225108f07065110951685331bb3464588a0503c387efad0a16e3a1391cb8af1fe0b7461247b4462391adad25bb4d2076 SHA512 5619ee1cfb20422b6c3e2df29eb20d2d2c01748c2ef1201c009cd856e3f07f4811c703eb570429ac4de4bc051c532d32a8ee51f3f2c336a11ebe34380ec256a5
 EBUILD twisted-24.2.0_rc1.ebuild 4218 BLAKE2B fd42d75236c53fc50baab6c6000940eda5545d184096764b01624059dc02f1a970a3a6c694880187aa9a51bf357c39b69b23dfe9c0c8c3009fafbc947a884029 SHA512 1f7c84f034600d48686a641c736c120b71aaaad92729cfcd90720329831bdeb7391047ef3922e303f8501fdc665d1f01b9a2ed855abc50f5ec4415dc09694ca4
-EBUILD twisted-24.3.0.ebuild 4218 BLAKE2B fd42d75236c53fc50baab6c6000940eda5545d184096764b01624059dc02f1a970a3a6c694880187aa9a51bf357c39b69b23dfe9c0c8c3009fafbc947a884029 SHA512 1f7c84f034600d48686a641c736c120b71aaaad92729cfcd90720329831bdeb7391047ef3922e303f8501fdc665d1f01b9a2ed855abc50f5ec4415dc09694ca4
+EBUILD twisted-24.3.0.ebuild 4215 BLAKE2B ac7d07449a72aecab5093e0e68d87868ef7305547b62fedc8c9aceab2ed78b2bc01a18317ba6d1f09e514d58b1109b08dc0ecf9fb97073f5cb3fddf0d4d6e515 SHA512 9ab980f7b8cac94a9001736dbae9ca66e6b2530211b4c737c4f3448a2a75418cb63ca8afcb383091ff0dfd9dedbc1135ca81db799241e0bc4a54b79cf0777f18
 MISC metadata.xml 1231 BLAKE2B 60cd09e34c32152e6f08727c1281c65e871a51e64310a62a3104342fcb0e87e96b10cd4c7601668f054f9a2cb01fdf8ebeca3ed86b61ae2496a4d941897aa296 SHA512 800d9cd783d95cecb268362619deb346783149fa9226df714f9ce990da2d45edd3c8e5669e24ad15dfdf986a5816a5361c00f13719bb0dee3e6ae1578a889339
diff --git a/dev-python/twisted/twisted-24.3.0.ebuild b/dev-python/twisted/twisted-24.3.0.ebuild
index 4869d844543e..5f5d132b7fcb 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/Manifest b/dev-python/urllib3/Manifest
index 7a82197e2192..b452ed1970f8 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -10,5 +10,5 @@ EBUILD urllib3-1.26.18.ebuild 2312 BLAKE2B 9c1155aa93102ea0b118b2980142c07b9bb98
 EBUILD urllib3-2.0.7.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
 EBUILD urllib3-2.1.0.ebuild 3297 BLAKE2B aa93e50875380bda0b91543451be2d3425d0ab8c77650a9c84fff90c889ddf812ae66b78fed95ef820a68a510eb952716fea459f7dcef8b41db8156e0b5d3cb0 SHA512 790d5c7d1fb6838be75ecb3802cda5975ffe5a45c57cd67d6fe264de4bf47b9511b897233f8057298721665366f1da5bb89fbb58bf255b4659b8afc4f95224d4
 EBUILD urllib3-2.2.0-r1.ebuild 3114 BLAKE2B 7c6f0f27381c8058dc4bf97b4fc60517fd612a6b6d54b76ee81c8d4f0b99cdaf8848ed84c097f4b77c9566ea68457ca8c003f3e6ac9b53cf75e770c16d38bacf SHA512 8491d260e6b7f32646e4beef876dd481ab5d6843b96ddd3221bc3d500d8aee9417e2ed82d0fdf1f0e31fe4ccb9d404ff2eead22651cc88102808de10ed3d04a6
-EBUILD urllib3-2.2.1.ebuild 2849 BLAKE2B 03b8677acd813b4be94e3ef766d19afb529ca38be7f8e09c61870851de46b66bd1b1ccd0ef89e392926d09f6bd819877e82d9917c503a2915f45250e24cf8be4 SHA512 8d3f7edb37096aadabbdf2cf94d6cec47e9a344bf1cc4ca500cdf04230995febcf857611ce91c145e88a0b52b9c9476c5fa8ee54464b7ef25d408db2ddb6c429
+EBUILD urllib3-2.2.1.ebuild 2945 BLAKE2B 5b2831aa9d10fcb4ce67f9685f77a556c18680ac1db4800ac2998e04363ab6998feaebf8135ec07e5fd5a95d16a467285c2ddabf0f68d007610970017cd861c5 SHA512 50ba8aafe4bdc860e3bc1cdb0183797de63677dc1c845bc9cc3459a1156b2df991b7bde3fb0e032e0abf00d4902448f3b97c56dab960dd0a6d44e60f5beb3d44
 MISC metadata.xml 449 BLAKE2B 45df5a0e80d7b229058be52fd8feb3ba2efe8d981b5b34216e4b9cb35d332588c4b3efade8e8d06bdf1f13159dfcd937458e5cf4d0cea5e07b6c1011cc8592cb SHA512 312b41031a9cbf6341f537fef94137420ca49ab609e7d4c325a998e328be415b381aa50e7b5600483d1a7583b72675a044b5dd80cb84a52539ab23271f1b096c
diff --git a/dev-python/urllib3/urllib3-2.2.1.ebuild b/dev-python/urllib3/urllib3-2.2.1.ebuild
index eb55415eb52a..57d945b008fe 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 65c81abcac45..32d09386b25f 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,3 @@
-DIST virtualenv-20.25.0.tar.gz 7150307 BLAKE2B ebe36d523d23aa6e29b53cf49e536aa0f2ab6bb2edcfaed3ba89456893a0cb9fb7bf8f97c61f12725a57023a6b565a0de797f988714469e2166da5d63652d54e SHA512 f4d8acff9d5837aa40eea18810517d4f1b9936b567395d6216bbda36e84b24f8efc584586cd2d168491139b346513d924e371b6b1396833fbbfedebef8620b94
 DIST virtualenv-20.25.1.tar.gz 7152341 BLAKE2B 7d3ecaca89cb4106f97fb5565331b257017d756742f9c90972a01a86296e81d509d2f4a7869d3bc7a299c1c2f01cc08999eddc258f1bd46acf88999d0732794e SHA512 c0791de2aed7893658316199696906b1aed650460f3b53e0dbd13e695d16bc14d8974cd72fc8dcc010ff7ba10036121929ce9a608f97d7d2cd9f972144a3a1f0
-EBUILD virtualenv-20.25.0.ebuild 5086 BLAKE2B e6accacdff191403d255cef345eb094d74c45dc5f291d762780ba74469d4560083a21d987d60f1ecc18ef8fc00c9596bed3f8381b9f8162b3ea5b786a4ae5835 SHA512 41c9e8a2a6998dfaa48ec4049a6164d6a3bffce8a73c3ec1c7e5c3ec3b2d5bb4c08da760d1631ab4d06ebe35236d64907f43c4b5257f547663c3abe04761e40e
-EBUILD virtualenv-20.25.1.ebuild 5094 BLAKE2B c16fea90bd4e93af303f442eb9b0c89b126364ce3f21e469ce80d284bb7a84e89f6846d308c24e60d5da0987c030bd23d11fc42615b2ed42fec438640c339b5f SHA512 2dcacdffbeb726bdc6f11811221ab1d4915c8e28097d4f39215ce860251f1d97fc19e8c48dd7d23feed347668beb658cbabfa652a7ed7a1fa595483773349704
+EBUILD virtualenv-20.25.1.ebuild 5086 BLAKE2B 110d3947c5d4dfac5c5832ef43bc7a7df88362608acc377413f2e2273e3a0bd131290e6e25d3ced856b2f1f2790a5d42051470f5b2d1fb77bf20973abdab3269 SHA512 75cd5a639ae4a73c61a4b0c26c571471f02efc2a0750f3b665ec1fc4b8b38c9006a29c1ca60d61f8c14c7a3601557cb6a0e32ac304139b74c9a5bea1ce95b0ff
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
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 f88ff8d25e6f..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_{10..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 0e5aa43d3f5f..fbc59a9f90fb 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 cfc082c40d88..3a5264b738d7 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,3 @@
 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
-EBUILD wcmatch-8.5.1.ebuild 1293 BLAKE2B 8042a7a4741af68146b22080fb0f4a6aa4b06705d64861163df918c304df63c49fd4be63f75d65d0dadd18c91d119664c59d25085ff383b6120e57cd798ce4a6 SHA512 9d5b286814409285e611b93aafe2f4e47527a9a882cde2cb9759b1b5ffc2b23950af436fb78d9bc08ed2a1fcf623ab746e5098a93e2f074147fc86c20e9d04a6
-EBUILD wcmatch-8.5.ebuild 1290 BLAKE2B f65259e229c54ed48aaee86e4807965e105fe50014bee71eac19c31c513118002aad2898f4c25da408712d85f671feb0da3676eedcfa7bf8e775899719189657 SHA512 cfb37a1b9e66e284d6ff7b3efba23af660eeb879abdc43d895f806f14aab2526c4097f9f8d068cb020ee50957fcd608926cd7d1c7b0199e18d7abf82ae8e8a85
+EBUILD wcmatch-8.5.1.ebuild 1290 BLAKE2B 156dc8260a8f5ae2b64d0bd46b42fbc02a3888d6274d18eeb76d3cbd1aa2e26f2e4833a123576076610b29c865f8e96b2de834adb9fd1448417af068c64508d0 SHA512 2fd3895e1de3b24132988663ea6a5f2051f741e2976fb2f123f81586cc6b696d78886fb4eba7bd47bf133d7673dc7e906d9a090aa94c29d55dd1d77121d528f2
 MISC metadata.xml 2968 BLAKE2B c3164dbe165e67cd2cbd891bb6d1468c1382ab1a72ea59ab1eacc6999c8f0fa2718c30eb83f755b3d520ab22a40bb6f2997704b4e2a1aa23717aa05a7eea4526 SHA512 49ccfdde6bf3137386e4053e8306d1792b173b8d71f05789e20e24d61ea1e6ddd0b3a1d0aedf54790bb43fe2d9de4844d79ab98424abe13dda466b9990a3a592
diff --git a/dev-python/wcmatch/wcmatch-8.5.1.ebuild b/dev-python/wcmatch/wcmatch-8.5.1.ebuild
index 67f86264c16d..a1e9df7b7e6a 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 b615f7f7e248..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_{10..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 86a6d648a178..6d51dba2bacb 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,9 +1,5 @@
-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
-EBUILD weasyprint-60.1.ebuild 979 BLAKE2B 11567941df8db10f5b1e81d60ba838cfccd589eece230abfc00bb9e87ee55662de25cd66e7279f81f09d264de8d4a185e9dcd4f37f62eb2ebd25faeca562318e SHA512 deedd5aba05d71cdd058fef72b4e70c02480853029e2a1db36fcbce4183e53b0e98aaa721395b878ab52f99059b48c28aa0676c9306c201d64071789448c7f73
 EBUILD weasyprint-60.2.ebuild 979 BLAKE2B 11567941df8db10f5b1e81d60ba838cfccd589eece230abfc00bb9e87ee55662de25cd66e7279f81f09d264de8d4a185e9dcd4f37f62eb2ebd25faeca562318e SHA512 deedd5aba05d71cdd058fef72b4e70c02480853029e2a1db36fcbce4183e53b0e98aaa721395b878ab52f99059b48c28aa0676c9306c201d64071789448c7f73
-EBUILD weasyprint-61.0.ebuild 980 BLAKE2B 278b4486be2a42b09c3d866b795bf2e46cbe00ee5517f7bf3e7aabd3512919f0d25beffeb7f8fb006f230fde364b2c729b498f4ac9982473f1194a4ce7d685c9 SHA512 ae6a51b67f326470d44412f6374bab973b892c8628be47db8e53fb8fa8a8edb653ca7bf47a3f8d8bc919854d9c53f7048c300c5148079d2a24f2d50d3157daca
 EBUILD weasyprint-61.1.ebuild 1051 BLAKE2B 644e8fc77a6420ee19ad23876e84ec4051ed6d286cb3a66a98ad6b90a5432369b538d902f183d5bdb31f05a8906cdf0d1f8e68e6805f0ca2cad4e9e819797b89 SHA512 c5e98f59fc0d06ece87b281c1e8fcd3ebb4d1b2ea3277e6637f3301fab3da68c7a5f7bb515f40b482a3a9f53ff4b6adda3d8d08fb8762b03b12790e4e7b93c17
 MISC metadata.xml 382 BLAKE2B 3e5d142b055354e1ea440d9efd4bf92458b1da3f777dd90929ce2041ca6e0969fa6e58aacfb4a5a93ff90805e0d8ec4c9c6253559ca54698f5029639ce35ac8a SHA512 43415064a6f56eaca974031e51d63118d1c65b33e4399302fc72cc2cd6f15e0a47cf411b18d3c5136e866115855deb19b6a9e058a18049151959ce5ee29ececf
diff --git a/dev-python/weasyprint/weasyprint-60.1.ebuild b/dev-python/weasyprint/weasyprint-60.1.ebuild
deleted file mode 100644
index 7c6925e35573..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_{10..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 244b989d7d3c..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_{10..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/Manifest b/dev-python/xarray/Manifest
index 494170d13cd1..ce0702901010 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -2,5 +2,5 @@ AUX xarray-2024.1.1-pytest-8.patch 3537 BLAKE2B fad48831eb697cf3d6f36eda1b96e160
 DIST xarray-2024.1.1.tar.gz 3614037 BLAKE2B cc50fbfa19a2c9229b85b8c7d5d0e7e7f6d3e5a484955fcc81aa0b37839a0b992d2c2f928e4097ca05c7b8294ed1061fbd0c1b7e7c65c9087a940dab97c520ce SHA512 b6447ca2c80b3a3091ac2baba648fef4faa79ffff272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487
 DIST xarray-2024.2.0.tar.gz 3634288 BLAKE2B 8d1165360300da5af6d670947e5280052a3d8915768e02448b86ab38283d6d45258a2c4eb91982ba732ccedb3a7afc5f274116c9ee0072d35cdc5631b8a2ca50 SHA512 dcfe6d1f0edab8659664c5399b96d622d2e3df2f85bb7672d9afab6f74294a6449772efde080aaa7323f733c09cbd0f6f037e547be0afa79f39450eead777828
 EBUILD xarray-2024.1.1.ebuild 3553 BLAKE2B 61f51072a37249717ac4241af427d14a8195e67ca5c79f0b69e938bba1a1a9c3e1cf9d59a1ed86be01030d74c9cf11efd19a2e62635bf4c991bf91ddac0b3464 SHA512 16c12ba8791b7acce26cdff045cf5187764822bf5ebc6820d999c47445ed3c222b206ee20cd822101ab889e1a2a91aaa4f298f7408051e415da52282fe7746fd
-EBUILD xarray-2024.2.0.ebuild 3629 BLAKE2B 3c2bc96f11d84192ce510b474d624d2697a393096fad623b4e8d0c62de05863386602c372797c0502ca8ef9ab1c0e926cddb658b7c5941408d4fc7e07c2cab72 SHA512 0b388e664a4694992f690ca9175c7c335cb99f5e50ebc1890149e30e2a996ea4364290d03fe74bcebff3b9d0e56c00bcb870e1447e3fe7b25f07f2ca20d767fa
+EBUILD xarray-2024.2.0.ebuild 3628 BLAKE2B ec5785f8b84d6684ba1c4184aa0553616a06b8cffcc623848630c576a4787c39009143fdcb9a8a3407069451694b466ab501cbc4ca081d7ef28ca7e41c63c4e7 SHA512 84e43c722f06b5a5d0bd02fec6d32783dbfe18969ba268e70b67e774fba9b042d1f80a166686456ccd7f1c14de1b2ccb2441b8794485ce78e4c03fcc2f562a0f
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-2024.2.0.ebuild b/dev-python/xarray/xarray-2024.2.0.ebuild
index 177406558283..e4eaff31c4a1 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 587a1f107a49..265b50c5ad0d 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,3 @@
-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
-EBUILD xlsxwriter-3.1.9.ebuild 757 BLAKE2B ac370cfdf4a4b0d6208d747c2514b119e807971c1d06a66c50afd9a8efbbd3ac4e30aa6d17d1a0f2005c7426af808f364eda5e72cbf0dfe3d5f3097e414b40af SHA512 0903a7e9d911fb36b51aaac5214ee14d4010519ac840e10f9eaccb777c1dfd54bc61174b902dbc1bd099b770fa3159205f7d74470db38d3afef56c95eadaf9ff
-EBUILD xlsxwriter-3.2.0.ebuild 763 BLAKE2B dd91afdeb004612cd1ad893f274a8d36543e1cd2c73e510d9f592db0a1aa706f3da64d606b751d4054f891ae1bdafb70c5af8f154308e2cea1c0ae838c1c3bee SHA512 204ccdadbfbc34917857127955ac2f698b7c44e2be6a6d4caea34bf9bdd4a9f21906ddf6af62c9bda3420e556c1d0474738345f0e5f706d76407cfd0bf0049f6
+EBUILD xlsxwriter-3.2.0.ebuild 757 BLAKE2B 44498d4f3e1faa37c294eb9fc0d0001cdac3559224896942f8720bfb3fdec145728e4816d49cce6e8b95924b3690ebcac3a653aff9f016263e3eed3f04f923e3 SHA512 e4a015cbe6c55eeaf7f665a6baa681959851ea776049bd366ffe782e268daae41cc696dbdb80be391efa510b8c19a340689ffbfd6d48004e1ae8430d6b84c619
 MISC metadata.xml 411 BLAKE2B e41e1e6dddecef73fff1c0bd74d51b023694ea6eb162022679a2939819f5c3339b1e76d00e25f761c46f66d323a5ad7085ed86fb13fbe3f53526c75004a68e93 SHA512 63242ff274e1dde596e50f9360e1247084b7bae05cd42d60605700c49e33b53849529578cf532415b899bd2ccd04066f99e97c6e80d53c13f71522a041579976
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 467b0e23b80b..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_{10..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 9f459d5466a3..23285dc29da9 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
 
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 1ce6e7e6344c..3430c504dfcb 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,5 @@
 DIST xmlschema-3.0.1.tar.gz 560537 BLAKE2B 236794db504d3ff6e9e98a03d6e0b25211c76779eac665b69ddd58e98bbbd02dcf1ab6b8aa0430989fedf2c67efcb6999e29fdb9fce09241a0955e32ae76890c SHA512 0266b75c371a3b77a86a7a5380d6bafb14bd8a8b5c58d891825cf708891293f9bf10b4bf1d1a9b71efc43a40115baa51d02e3adb8dbddfe79e4dd56ed07951b9
 DIST xmlschema-3.0.2.tar.gz 563203 BLAKE2B a8b31b435d159df65a620d26a7e964745b9a7e6050a32c52bfa039a013e9108b601cdd2a1188503f327900712b2b445dc4279cc50ee3c62022517afc5dfe6425 SHA512 93062230b13bdcc30eed0291c295bdd8eccb50d5d07c8747336c2917e5d949b30f46d1b90f501fb6da06ceda99d162da92b8db9e206fff09fc3c362b05499903
 EBUILD xmlschema-3.0.1.ebuild 830 BLAKE2B 5ff5f4f4e0fd02e625852cacd83992f058a783bb6e07a4960dced2260aeadbd52cf7ea333abf666c816ab3929db3d40a3b13294c9aae32ac4ff929a5cc02e440 SHA512 0db9d9fe710ffd5daecb16eda8393ba6f7eda19e6d5e015afe80edbd45a649db6d711e8985746d5a9c9785c552e224d3ea1e21f18e6a6b2227aeae378a5be05c
-EBUILD xmlschema-3.0.2.ebuild 838 BLAKE2B 3f3b42c1e1aea66155c71a1a0c4b0228ddb70e013299e817d66aa9b8b79fc721caa8dd7cdb21f69a2f9459d796f21d3ae7c0747e7595065368a254b207c1993d SHA512 9926d63a0320420a77ef091bf9d3a4fe66e97c64fe74ed4da4e0f1b2c751949646f1f0035215a9e3bb848eb63ac89b78fc3110d0d5e52075ae0e94aa7988e743
+EBUILD xmlschema-3.0.2.ebuild 830 BLAKE2B 6515fce2b1aacea763804dfdb40030e765fd07fbeea915ffee71c341f7e05ab5aa22909c20c86b18289a7d91535dc8bd9d0df602e79f31937ab8da5c4025d5da SHA512 026ba76a6267de655c1b36922139116ec8757278cc0ffec20efa8063ad6b71f7b3b3fcbb631f246e91887317546c5b7e65bdb51f7bccc2fc1ef9bf2dfb3738f3
 MISC metadata.xml 376 BLAKE2B 6aa6c0ef38b17f49452a3db71c7f449dfda8951e2196b904235592921620b6a2064021aae7a1a30639e637c3b9bdb46bcaebec1903a081a41832bd0c5199dde9 SHA512 b814209cd4b87ad5cb8bc447f1d485043d8386339607f39575faf2d26c19b69befa9fd7b7eb2d3fca4b5e60499091a59c1466cfc2f0d9651430949893e2edaeb
diff --git a/dev-python/xmlschema/xmlschema-3.0.2.ebuild b/dev-python/xmlschema/xmlschema-3.0.2.ebuild
index f8430a380efa..13ac6ab287c5 100644
--- a/dev-python/xmlschema/xmlschema-3.0.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-3.0.2.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"
 IUSE="test"
 RESTRICT="!test? ( test )"