gentoo auto-resync : 13:07:2024 - 12:26:41

author: V3n3RiX <venerix@koprulu.sector> 2024-07-13 12:26:41 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-07-13 12:26:41 +0100
commit: 482a48c0e1675b1e92663b8b5222bb7261aa7956 (patch)
tree: b81e02db1810214fc690a762e3a9c687d0f0c5ab /dev-python
parent: 37bccfe5e76c5740c4ef5ba1179e9488d8404075 (diff)
221 files changed, 1725 insertions, 3117 deletions
diff --git a/dev-python/Faker/Faker-25.8.0.ebuild b/dev-python/Faker/Faker-25.8.0.ebuild
deleted file mode 100644
index 83ecd6349279..000000000000
--- a/dev-python/Faker/Faker-25.8.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	EPYTEST_XDIST= epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-25.9.1.ebuild b/dev-python/Faker/Faker-25.9.1.ebuild
deleted file mode 100644
index bef66c8c66a9..000000000000
--- a/dev-python/Faker/Faker-25.9.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	EPYTEST_XDIST= epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-25.9.2.ebuild b/dev-python/Faker/Faker-25.9.2.ebuild
deleted file mode 100644
index bef66c8c66a9..000000000000
--- a/dev-python/Faker/Faker-25.9.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A Python package that generates fake data for you"
-HOMEPAGE="
-	https://github.com/joke2k/faker/
-	https://pypi.org/project/Faker/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
-	!dev-ruby/faker
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff]
-		dev-python/validators[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin
-	epytest
-	EPYTEST_XDIST= epytest --exclusive-faker-session tests/pytest/session_overrides
-}
diff --git a/dev-python/Faker/Faker-26.0.0.ebuild b/dev-python/Faker/Faker-26.0.0.ebuild
index d05cd1263fd7..630ce3773f17 100644
--- a/dev-python/Faker/Faker-26.0.0.ebuild
+++ b/dev-python/Faker/Faker-26.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 0abd20e62ccf..d4004a3197c1 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,9 +1,3 @@
-DIST Faker-25.8.0.tar.gz 1760950 BLAKE2B 89b18875ae2c3934423d4e7ce9d0da048830f73384db73589372791c6a1798254e3cab54b566ecfbe3263c44edbe12f2c3e7e0d6cbb004e6fc09e9b2e12f7e89 SHA512 88d0c073b48e0df050d3601d97223d64ccf04ad57d59cb37e26a40211633b04301000e7ce12a124e97b32b63225b440f5b44e1d6197f9c8999f7dd0b579a075e
-DIST Faker-25.9.1.tar.gz 1762549 BLAKE2B f331ba11899f0711a74aa4c6a3f883113c00ef16960816b26163be2355bfd1aeda1e01fb5ff430d5f34f99a21e74195d8cdd1fb44fb23e3870a6592242564ab9 SHA512 191ccf0cccdf125cabf2af20cf74681d3aa28038eb2551f7e1cd3a285b17e2fc1d8b245888c44d9a1f66b1f9a5ddc1847ff2e421ef9fb8732efeb56e0957a898
-DIST Faker-25.9.2.tar.gz 1762726 BLAKE2B 75e11d91eae914a8093e448802924e2bc63815317a36870909709648389dc4d55fa1951b588a7fa6ed1cf1468724158abc16342465156d00e66f1febb545d47c SHA512 6f1272b64bc973f3e9f32bff589aedf8db35ae3c90ea9d459babaf47e327cf26199f05a5cbc888c13aced41722e91335b8c34685b9bebda4a939aad89098bbd1
 DIST Faker-26.0.0.tar.gz 1763318 BLAKE2B 63cf76993c3e4fc229d5d80f3cd03d964f5f7f6fc7f9cb1aa272c075360ebec57289139d09d11d181436b30cdb5abc7fe7d7e5cc11d63e12b0e8746605f85d6a SHA512 ea09d4222b258f52e9d9b2c315ee46f42beb624c038f63d4a82baadafbf4a9cc382b92076bb7c421026c1761cadb246364bfc71a05177458a8e23d2eca2fd6e6
-EBUILD Faker-25.8.0.ebuild 955 BLAKE2B 7826768e6ace4bbc12c8f92803fc43b1880fef99e94709a153c773c94776ce3b38667567d1b4d656093590fa41017d6613539a990ed212fdeb92651412cff418 SHA512 f7ea917259bfeaee02fc3783da2c66272dcc4b0ffc36c8ddf50d118847ababb3b7cfcc9d0dc73392e4a0d48b2d8876bcb4edb064639b19e6597528b0d808d75a
-EBUILD Faker-25.9.1.ebuild 962 BLAKE2B 227cfcc4d918f9864be11062ec03c15f6f5f3c472de2ec4ec498993d719ba4766f2e23bc53a026e9619d72e42e694740a5452e484a7d7d1cb28c54941fac8150 SHA512 60962511b62659de7c15483d8b06dffac32c7c248c1b425192f8dbecfa9b811a76576798c230af8f3b7cea828936613a42f13ff1b83677b678af503f47a2623d
-EBUILD Faker-25.9.2.ebuild 962 BLAKE2B 227cfcc4d918f9864be11062ec03c15f6f5f3c472de2ec4ec498993d719ba4766f2e23bc53a026e9619d72e42e694740a5452e484a7d7d1cb28c54941fac8150 SHA512 60962511b62659de7c15483d8b06dffac32c7c248c1b425192f8dbecfa9b811a76576798c230af8f3b7cea828936613a42f13ff1b83677b678af503f47a2623d
-EBUILD Faker-26.0.0.ebuild 966 BLAKE2B 60b44c455575f8703ee56ae217bc9d30d23d0d8602d2c44b5cfd76efff741574e03af4996d7bcba588a70d0ad3c8372c940e8725eff535eaf9e54855225883ff SHA512 f8a3cd27fa78c96e083ed5ae375570132bba7db27e4d28f5a2e802dd916235128c53570522c29ea0bca42691e853a149f2a96603772142d80c379a92bfff2222
+EBUILD Faker-26.0.0.ebuild 959 BLAKE2B 0ef92e35b9271e30140fb465f43dc7c5c0a998f7f66c6fec5878bab9e5ce1d4bd88c4528aaef6eed9cf52c674a08dbf43c9e4ffc2f860942619319b4bf6e5896 SHA512 68bb6ecc5ec4bc9b4e1d3081afa16e8448bf0b240dd423ef927f09eafacc6755004a67d5d4239ebca9cd31c4e5749587570a53cd492fda2c7b0c8b8e81009e69
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e008bd7157e8..36ea6b820055 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt-builder/Manifest b/dev-python/PyQt-builder/Manifest
index d7765165cd2b..d43480486435 100644
--- a/dev-python/PyQt-builder/Manifest
+++ b/dev-python/PyQt-builder/Manifest
@@ -1,3 +1,5 @@
 DIST pyqt_builder-1.16.3.tar.gz 3671995 BLAKE2B ba3fb0ee1988106d1f4d4e822030b3848a5c3d42f79ac06d1dd4a4084c1e526d0c54c1720614f9005dec120b5395e9358ad75c52c74199d7413100bff82e8414 SHA512 f3820fd5714c88da69bc696abcfde74f0cebaff543de5cf93bd37f4aad22a6bc91627ff22a0f665850ca9c968b4350383784f65cf1b6bf76f3ebfe71a4a5f3b4
+DIST pyqt_builder-1.16.4.tar.gz 3672095 BLAKE2B ba81086b5c7d35a8e899c65e58b9aab12772f2845af099590e48dfaf597f3ab16a26985416f65711d60519878f148d4469a1c8cb1ca5e7b9d2f359ad571b0164 SHA512 8f92feeed1112e47845dd716de68dab2d0620e53bccdb7eb35d57e737110ef9f5e0fe338f064db21e052870b5c0a0c459ebe7d2933cd4854eebf63a1bc517652
 EBUILD PyQt-builder-1.16.3.ebuild 655 BLAKE2B e9b6894bc33950ff3f852536bcf03d8939b29c8eb4f85438c6f2e4077f65c5016584ce5ed37d515c14acfb497d6a8869bd68e9cee422042c095a265c8a8e36d4 SHA512 914a5a2890047630c4df11fec4cfbfcadd040e0a39998f599bcf37d9ca9e8aca792f11e7b0bb14eb629913c8c10f4d1684fb40873cdfe39735df38d96b48a001
+EBUILD PyQt-builder-1.16.4.ebuild 660 BLAKE2B 95e466adfb11d3ab899ce665d745cc5441d247a6975d03a3fee357ea3fd7ad2f5a8e1c44f0b853203b6dcaccf2319a493dc38fe2937b1b155a91f8aa00b9e43b SHA512 619722b3333a6f70da8f6300f1bc5e329759dae93d3ab017e415826cd2271b63864c31b64d6cc81b4d7b6b8e4bee792a3db11d3286e1ba11e4c0ac80922738f6
 MISC metadata.xml 581 BLAKE2B 52b5d19b8febf7a2c0c0fb4d72e66b537f5824c1fc1a9d065b79ebe9e3c7fe5188fa0acd13bb446a9ad9f8c4481222027885a2ff6217cdf2c8caddf9c5d60b1f SHA512 b58cebc65e92de2af613423c8767dc75063e0c4dd2f1c3b308eb5b371ca499e43024e502839ffdf32b034a59294c24bca6a4703822e8365ad9c339747c17c238
diff --git a/dev-python/PyQt-builder/PyQt-builder-1.16.4.ebuild b/dev-python/PyQt-builder/PyQt-builder-1.16.4.ebuild
new file mode 100644
index 000000000000..d60c304af339
--- /dev/null
+++ b/dev-python/PyQt-builder/PyQt-builder-1.16.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://github.com/Python-PyQt/PyQt-builder/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-6.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# skip installing DLLs
+	rm -r pyqtbuild/bundle/dlls || die
+}
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 578181f599d3..dbc488e76b83 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,4 +1,6 @@
 AUX PyQt5-sip-12.13.0-c99.patch 522 BLAKE2B 72f6d0a501fcc7f43cb11291833b7714ba2acc35813c4762a95ec2ce5b95ba955cfa7f5501e38e24f348b73e835487e151082c205c4d434044362b80d2a0f44a SHA512 768c88fab736a57f55e4adb4843b918f84ecf0e976246abbf83a9b45d69a1e6729e738eb4cbac3553ae76a36ace64abf798e073f8ec88fdb3065583a38801773
 DIST PyQt5_sip-12.13.0.tar.gz 123225 BLAKE2B e3b7233e5405f7b24de157e1f0ed0f2ff47a9c331a76672892d8a7adc8aba8c7b738354d9f1c2fe9c29501b5bfe8c6302307c6731273b980a04dd327048a3a94 SHA512 ef363b21899f6d089fbc6d5adf700dc6c8838501343070ed1cf0826e05dd860343eba608d5aee5d8bece39b8ddca1f37866bb56aa07db18384ac0a372ca3532f
+DIST PyQt5_sip-12.15.0.tar.gz 104024 BLAKE2B 40fdf25bfb8ca321f50926d7041e33edee9fbebafaded50d283ea95b04ea050e368d2b8470110d758f68f3ac08ada68b65b2f6ebcb9d7dd43707636e26701854 SHA512 1a009b53e80fc8231478f741839d8a88ab26f531c4ab0d41ccc00c8b0650c13c95c3c89cc949858a99bd1d817d736507df519384dff029530edc554f4b35b4cc
 EBUILD PyQt5-sip-12.13.0-r1.ebuild 600 BLAKE2B 65a3f0410c9b3ad2618dfe040f7e8fad0186e07851ddc07c93d1c9f2a6b75529ff21928d081989d17c9e0f638513bec412f6fe599b1f242526f59a69ce18559e SHA512 3522c3d06753a9ef521fd531363f8cfcc13ca74ea549e535cf00dbf10757b0554d3bc74f2d2241260a33c3a652f6e99dde39e7aa8b096113d2f528257cc68e14
-MISC metadata.xml 649 BLAKE2B 0a6faee65b39f122f65965490284b17856ba6d86537f3f3780f8604366739c346b01e29e933a91c7edb5ff898e5d51a10e4bf288228d1943a1c9e9970eac4c86 SHA512 3af9be87db6da5cb071f4025cd6fc1964a4b0629ebe93239f6c5a3734d4ef8ef06e652abbac5c9bd86f882a6235bf3b1f0fec6f0035c77ea42571e47c6045e29
+EBUILD PyQt5-sip-12.15.0.ebuild 637 BLAKE2B fe20f2690cfdd8096008641cf8376815238f7e936991c1f47bb0dd486ace13162f3d017910632b059a6647b91c549ea10c9cf010b3244a10ad0786332a536465 SHA512 ae92d71520ad53db6497e83e63d4b73545d83071faeab78c5d8c4151a4e01b117661634f8d1255b895d3a216f04092e25ca44dca6870983f33bb0ea907d93b29
+MISC metadata.xml 382 BLAKE2B 1924bdd8d05a7a04546d994004f1902edf06ca681fc557a47841e41e529cad483f2d6729b1be2b48d906dc94162eeed19f7749a4e431a3d95050d5ac08246fe7 SHA512 2296c770ba9ba38cebbd37474a6ed8bbd6221c6848555242529ee5cee1b3fff928bf9a6fc8e5ed4859af72f030588f1ef493a0edb54955968ac3f514b3cd9ec5
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.15.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.15.0.ebuild
new file mode 100644
index 000000000000..a85f804144fa
--- /dev/null
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/_}
+# keep compat in sync with PyQt5 or else it confuses some revdeps
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="sip extension module for PyQt5"
+# note that PyQt5-sip is currently not on github, but this is the
+# homepage listed upstream as of the writing of this
+HOMEPAGE="https://github.com/Python-SIP/sip/"
+
+LICENSE="BSD-2"
+SLOT="0/$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
diff --git a/dev-python/PyQt5-sip/metadata.xml b/dev-python/PyQt5-sip/metadata.xml
index 249066785741..37c680d9291a 100644
--- a/dev-python/PyQt5-sip/metadata.xml
+++ b/dev-python/PyQt5-sip/metadata.xml
@@ -6,13 +6,7 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<upstream>
-		<maintainer status="active">
-			<email>phil@riverbankcomputing.com</email>
-			<name>Phil Thompson</name>
-		</maintainer>
-		<changelog>https://www.riverbankcomputing.com/hg/sip/raw-file/tip/NEWS</changelog>
-		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
-		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<bugs-to>https://github.com/Python-SIP/sip/issues</bugs-to>
 		<remote-id type="pypi">PyQt5-sip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/PyQt6-sip/Manifest b/dev-python/PyQt6-sip/Manifest
index 0724eb4ca8c8..8678b85742cb 100644
--- a/dev-python/PyQt6-sip/Manifest
+++ b/dev-python/PyQt6-sip/Manifest
@@ -1,3 +1,5 @@
 DIST PyQt6_sip-13.6.0.tar.gz 111576 BLAKE2B 1a5a35bb060654d347940af90fb5605b1b2f699da4fd4bbcdbb7d9497f91d7dd1a76c3267b5c4e1e68360c66130d4a9983d2da21da745e70adfc627df85cd8c0 SHA512 bd2fa70d64544d8104d3477cb650a0e6bcefa0008680afcf7d187ba3fb1117871c0237d3a7f047144c8a8a8eeb8da941a3b206f8ee0601cb2cc734243cdb9d46
+DIST PyQt6_sip-13.8.0.tar.gz 92264 BLAKE2B b44ba35c3209b3a49fccf0e4634af8a410b1531d0dd74fc665d7da9780f4e32baf18fbba80eb9635a96442c1c91295dc10e0388194d1e169d300e0e1b37d18cd SHA512 6947690e61fe65a21f61d034ae9de7b7adb001c59a4a362933c5441648fe27140b43666efa73f981b138cfc73fac72777bb7318b98accc3c7f808687e3fc5d81
 EBUILD PyQt6-sip-13.6.0.ebuild 516 BLAKE2B e6a656205ddab4799dff88e945e7a62fb1995515dfc7fff4ea5734c42589411ca9257d20693da2629a051f17f1c1527667423e3f6d9f3a0213809eaaa7392927 SHA512 f49c127df434e3ef5d7b42e1152c7f25ab8853468e795b094527b9e9a1da6a2adecd2addb56941b3aa000fc47b96fee7b957120bffd03674195744f07b4fe82e
-MISC metadata.xml 399 BLAKE2B d762950e9c399c7cd0db4c7e521745824cea16fa2575878b8d20a932914037eabce35cc988532b3711d4447a132fdb4a61383017e3b3f7e89f09db74efb05244 SHA512 7c8fa564a8b30bb8207dd4eb70caaa1da4db60a1bc24dced4df22b371f441daabc484c57dcda87fb89bacbeb706414938750553c59b11da8d392d61531d92a41
+EBUILD PyQt6-sip-13.8.0.ebuild 605 BLAKE2B 92afc981d05839aa2f4098913075188d8847c75a8278d730a9e27adf3dbdef2d0ef5dcced5830cef637e76ea8f5e5435711c8a83315c60b428f94e3ab3b242ba SHA512 89d9c496df1452a473d04af170808d464f912a63438bf19ab97fbab5dc82137a3b3ba43aa41282a716f86dbc93aa84559ce951b7508f7cf9ebd8bde6b359e8fc
+MISC metadata.xml 382 BLAKE2B df3e932890695657b0e29bb309514558938bb77489f1f95f275250f9fe960910c7c5e3a827a290e9ff9c557ced98904fb1ff92f580f3a99c6ca6b6b3932814fe SHA512 1cd634b2a0c34682fb6468301a3d7cd28e3988651b62cfa200783e6f75fde29e29ee06c494a8fc272261642e3d7c22d2d3f35c143f5c31f936af74c6aa748554
diff --git a/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild b/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild
new file mode 100644
index 000000000000..16fcbd62d71a
--- /dev/null
+++ b/dev-python/PyQt6-sip/PyQt6-sip-13.8.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYPI_PN=${PN/-/_}
+# keep compat in sync with PyQt6 or else it confuses some revdeps
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
+
+DESCRIPTION="sip module support for PyQt6"
+# note that PyQt6-sip is currently not on github, but this is the
+# homepage listed upstream as of the writing of this
+HOMEPAGE="https://github.com/Python-SIP/sip/"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
diff --git a/dev-python/PyQt6-sip/metadata.xml b/dev-python/PyQt6-sip/metadata.xml
index 4db1b0254ea4..c37952e6b29f 100644
--- a/dev-python/PyQt6-sip/metadata.xml
+++ b/dev-python/PyQt6-sip/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://www.riverbankcomputing.com/mailman/listinfo/pyqt/</bugs-to>
+		<bugs-to>https://github.com/Python-SIP/sip/issues</bugs-to>
 		<remote-id type="pypi">PyQt6-sip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 640f8f57ea5e..f8bf074b0c73 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,6 +1,3 @@
-AUX alembic-1.13.1-pytest-8.patch 2119 BLAKE2B e03335427447649b710f5fc9daf1c62ecd0fb7452e301d49e74a0f8c2ce4d4a2eb7800e1e020b67c813fafe4ada27c28ae66c1f9b40f4db37dbeb9ae4ab2be33 SHA512 77146e56c15bcd04130bb68cb8a96cc25c221db9bb884215ea5f5b45e93708ee6cad639fc1db686c960cd265f3bee274784362be9409a50ffc0fc889162d5c24
-DIST alembic-1.13.1.tar.gz 1213288 BLAKE2B 12c01f60a564c3021b3d2ae61f220822a0ca644af5097b72a826f48d04225c441f580204680674410e6e2570b5c7ee24053024863162d7d43bc423a86cddcea6 SHA512 2a5826461bec22c2efc244dd8394d34d39ed6e3511a32e8e460057ab34f9e559d28dda4ea7e34ccd30628e889a3cb37cb156596e37dba748c12a0195d78aa678
 DIST alembic-1.13.2.tar.gz 1206463 BLAKE2B edff3a244fa37556cd656e60940d94e7df75b6c67aa4199b673851b5b06e84dbf51e53f2ac9781465aa923c0019fcd33a9c3b4da90d64f583956e390ca1f5fa7 SHA512 c4952123ba00403bb030606c736dab8d5494b01662d02914fb0d10d0c1d99b27a97cc4a800cdfa32d53870031c46e351f97815e337c71f3a0a824b6403bd75cf
-EBUILD alembic-1.13.1.ebuild 1196 BLAKE2B 4857f35f823a1741b0334e7f46a20476322e5cdd91fdb108ec8ee084e6954a4fb377c770b9d9de59379f912968841384021e40a5fa2cfc5c9c33f8a13d7db581 SHA512 d89304e4b9a6381c8ccd1c6e088df7aae03505d9d3794868bc05aeec3e920627483fd32c2296555ede93f310a619053f04d339f9be5a2eb565ff8d35cae269a6
-EBUILD alembic-1.13.2.ebuild 1062 BLAKE2B 53255b066cdc9a0f0f6f656f1255f9db9911c5167d23de18f762cba6f203523f3a87a2375d33752285e9ec10efedf9f4343cb9a7b12805a55aac37cb6b098709 SHA512 326ebc9001902109b3a7bc4cef661b5ac6c0fa8031422b5270ac53c16ed6a32af14b0e1520337ed49f90d474ec22d16328f7779aaa29d8c243c951fdfa5e263c
+EBUILD alembic-1.13.2.ebuild 1059 BLAKE2B bbcc91dd352f0a453892f7f19160469701918718113912522eb99781d2cb31001c896afd8c32665c0042dda7cfcecfca1832cf25f8deac2269c3e440369bc7d7 SHA512 3016dbf33d7b6b8dbedc780627e24b46385e1b6b428924375359a27912849d4834f916464c8e7ed795b65bdbc941e2cbf0f1e46f13a9316dc9d66f8949018a69
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.13.1.ebuild b/dev-python/alembic/alembic-1.13.1.ebuild
deleted file mode 100644
index 07917423bb4c..000000000000
--- a/dev-python/alembic/alembic-1.13.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
-HOMEPAGE="
-	https://github.com/sqlalchemy/alembic/
-	https://pypi.org/project/alembic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		sys-libs/timezone-data
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/sqlalchemy/alembic/commit/6bdb9043868d4bd04ebe3fe8a4991735d5f87ed3
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# setup.cfg contains -p no:warnings in addopts which triggers
-	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
-	epytest -o addopts=
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/alembic/alembic-1.13.2.ebuild b/dev-python/alembic/alembic-1.13.2.ebuild
index cf8af9852135..954c93539342 100644
--- a/dev-python/alembic/alembic-1.13.2.ebuild
+++ b/dev-python/alembic/alembic-1.13.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch b/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
deleted file mode 100644
index a681645e02ec..000000000000
--- a/dev-python/alembic/files/alembic-1.13.1-pytest-8.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 6bdb9043868d4bd04ebe3fe8a4991735d5f87ed3 Mon Sep 17 00:00:00 2001
-From: Mike Bayer <mike_mp@zzzcomputing.com>
-Date: Sun, 3 Mar 2024 23:11:50 -0500
-Subject: [PATCH] use SQLAlchemy's xdist methods
-
-Fixes to support pytest 8.1 for the test suite.
-
-the use of teardown() was based on pytest's nose
-compat, which is removed.  their xdist style tests use the name
-"setup_method()" and "teardown_method()" now.
-
-We have SQLAlchemy's pytestplugin in use which uses pytest fixtures
-to invoke our own xdist style setUp and tearDown methods, which we
-are already using here, so use those for this one test.
-
-Fixes: #1435
-Change-Id: I4c49e81fca6bfa957594714009531fe12691ace5
----
- docs/build/unreleased/1435.rst |  5 +++++
- tests/test_command.py          | 15 +++++++--------
- tox.ini                        |  2 +-
- 3 files changed, 13 insertions(+), 9 deletions(-)
- create mode 100644 docs/build/unreleased/1435.rst
-
-diff --git a/tests/test_command.py b/tests/test_command.py
-index c665f95..04a624a 100644
---- a/tests/test_command.py
-+++ b/tests/test_command.py
-@@ -64,7 +64,7 @@ class HistoryTest(_BufMixin, TestBase):
-     def teardown_class(cls):
-         clear_staging_env()
- 
--    def teardown(self):
-+    def tearDown(self):
-         self.cfg.set_main_option("revision_environment", "false")
- 
-     @classmethod
-@@ -206,13 +206,12 @@ finally:
- 
- 
- class RevisionEnvironmentTest(_BufMixin, TestBase):
--    @classmethod
--    def setup(cls):
--        cls.env = staging_env()
--        cls.cfg = _sqlite_testing_config()
--        cls._setup_env_file()
-+    def setUp(self):
-+        self.env = staging_env()
-+        self.cfg = _sqlite_testing_config()
-+        self._setup_env_file()
- 
--    def teardown(self):
-+    def tearDown(self):
-         self.cfg.set_main_option("revision_environment", "false")
-         clear_staging_env()
- 
-@@ -1144,7 +1143,7 @@ class CommandLineTest(TestBase):
-         cls.cfg = _sqlite_testing_config()
-         cls.a, cls.b, cls.c = three_rev_fixture(cls.cfg)
- 
--    def teardown(self):
-+    def tearDown(self):
-         os.environ.pop("ALEMBIC_CONFIG", None)
- 
-     @classmethod
--- 
-2.44.0
-
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index db638f3e0613..2552ea7f54e8 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,3 @@
-DIST ansi2html-1.9.1.tar.gz 44288 BLAKE2B ff83d2a9fe74766324515e7ccde5c6d157f836d655c6c55a07f0b9c4ab5df9c8a840f0c35e752a3e24f3e12fbd73565c2906382d77c2daf5951e861e18bdcb46 SHA512 1ffeffdd4f861b809c424b5b9e7d07212aaf1b5ef483a2820f128f815002628c823b5701652b0770ed182f0585052f040b55fca5db31e4690be86c49553105b3
 DIST ansi2html-1.9.2.tar.gz 44300 BLAKE2B 6c39a9525a5fe0c7f02b45f56ea515e6b07280cb74a88d54db5e33c77fb679f6ebb446edf50add3d68832ea877ed8861bc1a9f2116ab1214d2a6b3acfbfae19a SHA512 c465259d4c9ea82725bcd8cd286246b806b1bfde06f89b52b1cc3cd5c514be92a19ffcfd147417d64ce6da6627678baabc7ff05226ed392343cdb0496bd375eb
-EBUILD ansi2html-1.9.1.ebuild 520 BLAKE2B 4732eed5871d4141ee97eec2df21a997d7fa07e68941e582cd352b101d3aeab2174df36b5e986030ac09c88507bc57f356d3e1fcc21d76a0afe70dfad7672caa SHA512 d7edcd260f7fdb9181e33fd15649b97180a16d3b272b8e056e1d6dfc17de8973a7217fc92cd06d2d230570135f112650d2bda9fd7fc4014aaf229463d64e8efb
-EBUILD ansi2html-1.9.2.ebuild 524 BLAKE2B cbbca7b702da1228ad6deb2c980729442b30134b7c63630e8e12d1546d6eb860832a57c7080523ecf359f3c2ad19a52f5b738f907238df1b0c0ee087e0fd969d SHA512 42c437e643e1c51366a3303b5d32a64970819761be948296a60689d833bfc40fec72ced3687f85aeaab95f69ea9f63e890a3db0f0e79cba97e89f06298f7beab
+EBUILD ansi2html-1.9.2.ebuild 520 BLAKE2B 4732eed5871d4141ee97eec2df21a997d7fa07e68941e582cd352b101d3aeab2174df36b5e986030ac09c88507bc57f356d3e1fcc21d76a0afe70dfad7672caa SHA512 d7edcd260f7fdb9181e33fd15649b97180a16d3b272b8e056e1d6dfc17de8973a7217fc92cd06d2d230570135f112650d2bda9fd7fc4014aaf229463d64e8efb
 MISC metadata.xml 406 BLAKE2B af6335def83547635dc916a45f1d9296faa0e1806237eeb76deac4ea28e701549bdc7fc9cab7e35b84e8f5c32e31ac7bb22c924865872326b70485acef36d517 SHA512 ebbf8d50e3c798cd2889bec1f5bd3f827bbedb9bafe4610b88fa18b1805514f156351786461ae558769f1ce299174d50ee06c864e008d013b26a6c1afb10792e
diff --git a/dev-python/ansi2html/ansi2html-1.9.2.ebuild b/dev-python/ansi2html/ansi2html-1.9.2.ebuild
index 87b3e5333dd5..858bc3ae90bf 100644
--- a/dev-python/ansi2html/ansi2html-1.9.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.9.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 
 BDEPEND="
 	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index f64587b3ba90..ac35c5c3e22d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,10 +4,12 @@ DIST boto3-1.34.140.gh.tar.gz 828290 BLAKE2B 129c0f791ddc07f90d2b9ae2972839a0bca
 DIST boto3-1.34.141.gh.tar.gz 838371 BLAKE2B cf89956f3441e5936ff389fcb81527dc025d064d098ebc035474a7d079daba61972d9cf2a6bcdcbe163187f4f39313fc791dbc2ed3482091d7c27e1d7908cf1b SHA512 fc8d484d8cb7528b7f821f1cf8b22bf6df9be546fd2ac02a3ed697c75c9cc8c31c03c930e4f3a5edc4023b47121ded85df46510ec1f6a7b5e6076dd57641626a
 DIST boto3-1.34.142.gh.tar.gz 838808 BLAKE2B 653a47ff247ab5160f185e1020a4b66a210b54ac101aff07c731802767a0364804c066cbb6ea80b8b77044d7ae6794e71195885293a8c33cc20da32a9f589dd8 SHA512 ce32fea16c17bc75ecf288bd0c5bf079ed461e5e08e80ed4e18afe4ecbb6b4780d2a3eb5b7b53b1d3dd3d4687f65036dc86afc49ee160d4b0e9df4e41653441a
 DIST boto3-1.34.143.gh.tar.gz 840227 BLAKE2B a7bcc061596634d7b2599213172116a27ffd883944c916dbf5d69b97acf246a6669d04beebcc21eebd9cb954456daaf238aa97344f458077af5f97b547e4fa8f SHA512 5ef40b848dc7bb443e680bd3c5614c04e858e32f2fd43f1e98dc6038196d9e2ce6cb172e83b3dd4e97cac5188d667ccd06aa05082af44dfed9ba18e9fb0ba945
+DIST boto3-1.34.144.gh.tar.gz 840506 BLAKE2B 7fccc6ae45dec6411995795dc7dd180cec51b79f93362a221d7709f35ece2652390219d51507130fcfcedf82f0d2fa89461c112027b7d8040f84f2f907518b30 SHA512 4da24e40cb8beafd975cf21de0e548b167de59e1b47b4b005f4320d2c4cd60e0c5b72378ecdb1b21ec789b4b943df4856128890d865e0fb974a34563871a2078
 EBUILD boto3-1.34.131.ebuild 1198 BLAKE2B c863be0c9348383129a919e79acbc6962b7c3973f77f68c85df6944a7658a2b39a44a91d904b7fee34ffb849e904e7bf6a503ca35a56085f2b04f40cbb70d4d4 SHA512 10a7f8345e1dc13766f1a15a127a885a42f7750f15c53b25fcba2ef033083192b7381cb53cd7be6c8c876bc1422f615578f730efca83c71ece042593282043a6
 EBUILD boto3-1.34.136.ebuild 1205 BLAKE2B 27d096dc4f88c8351e0857e9f8b4195060f3f1218e1734c699a832246cc59e081cda9ee7369e3b44706e7ce8ef390e8792e273aff7f6e92a75c69461fc1136d6 SHA512 cca4aef410e4fb2ef71181a15233da830df39d8b7f1e779b5d6a8df74eb602afee11b8965e0ca9254cb87155a8514b43fcc0de09f681ecec9a384a904f3fe0b2
 EBUILD boto3-1.34.140.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 EBUILD boto3-1.34.141.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 EBUILD boto3-1.34.142.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 EBUILD boto3-1.34.143.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
+EBUILD boto3-1.34.144.ebuild 1205 BLAKE2B f1dce08bbfa9b103deaf3f8fcc34e0ff6e7aaa8a7be0ea69727c268ff7da0a1ddfcddc24bde5c654fc3f0f09d3c5a801a23e19c37ae05c3ebcf3bf26ec909b73 SHA512 94863e2208e36b66149792688378242b66b5546735fde1c3ccea6ad4883ab08046a9fd566d9016d5fd9612c035a7af4d5af599b0c18bad7137bdd1db5e6848af
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.34.144.ebuild b/dev-python/boto3/boto3-1.34.144.ebuild
new file mode 100644
index 000000000000..8cba6d95740e
--- /dev/null
+++ b/dev-python/boto3/boto3-1.34.144.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a9742a01647f..36600684dfe4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,10 +4,12 @@ DIST botocore-1.34.140.gh.tar.gz 13156596 BLAKE2B 4a264fe767c35dcc65ddbe1eb29529
 DIST botocore-1.34.141.gh.tar.gz 13177346 BLAKE2B f62ffb736687cb016d0aa3c00b74c8ffbddadc0f7e47bfed9087872f930fcb85a03da9c3f9c494f21a405afc7c0d5f8e9d50d7c3cefa9c1ea17a97d5f184feff SHA512 91b0f6007e7f030f9ab0c83276884ea993cdaa1f395c51ff4ff3a43e4a8b6f80eed4a93f4f5248984f00b51a44cfe37d51cce70147ed5a578cc0e006c2d0b4dd
 DIST botocore-1.34.142.gh.tar.gz 13181218 BLAKE2B a8bb49e11e0b6a308462501fa578939089792ba1a838e601ff76b6271eec16f32bbb6d489dee474008108198e0ac48fb25438f79428fc4cba9d575f56bee8d52 SHA512 66ebf68e478a4c2b5be44f5784ef5b117d729ca53eb5754eb0eb2540555aad6f3e95e4007bdbe76173d43c35cb79f30c800fa152ce69977399d5821761fcca28
 DIST botocore-1.34.143.gh.tar.gz 13217274 BLAKE2B 1dcc463aaff1733f7ba4fa3af27a91258da9862fec8ba8da00442ddc92003b27d0f4e655d04645dd778d62f1bffe1da8ad0e5da7ca6791d4109695bf52e51e11 SHA512 a63cdef39f7c91f0dc1bae19b6c063aa64e817e13c7c73fa95dcbbc0c5a3094974fec334d886a9ebb040128cab0f428b381e7e90f034f1321765818bf6329b17
+DIST botocore-1.34.144.gh.tar.gz 13221134 BLAKE2B 9b688a781ad80f294c147ce4aacc31b59ad90369722a256b934610790682fbe54fcc18bded66d3151c24335dafdcc2eecaa293a30f6715aa69ded57efacd6540 SHA512 92d96253eb62b0425d3763cd9df7f5e944e780c5694b6bad03aa1671b65a5a786b54cad037479f2e227b86b2dd33da1a10db1da1ede857378a9f9783405bb288
 EBUILD botocore-1.34.131.ebuild 1477 BLAKE2B 784b43f060f0702808a3894fdab7a15dd4b4feeffc3c1ab2fe24cca762b2dc1310f40ae5b2941db5c4aa9c4ff8b69d858520826027a50ce975d25150132b4d56 SHA512 e86970ec900929641794d61e02f26bc7e7c8af803095dcc5c8fbedac9d79275c596176f2b492061289056c7d29ebbaa6e64344148f22b6349ac4420ab5038dca
 EBUILD botocore-1.34.136.ebuild 1484 BLAKE2B 30f7e11da3d7c36574e721023e7a0dba6ffe87172afec095dec711b929274a58d6a1352d131df44cd36598f11dda34df8d2e51e723b62e8ac096437360526aa6 SHA512 699735f1b1feb67c3b03d3e3787b45bfa3bc2ac6f639881b9414cdfc4aea5bb022d2e701d09061de5a237dcf3f32be4668b7ebc3f12cd950765b439d1ea4d88c
 EBUILD botocore-1.34.140.ebuild 1833 BLAKE2B 5609eba12164e385a3a24c3dc8b4d723a2785c3580605580091de3b6e59005dea40fcb341cfe05ff4ba5b82f01428eeb687443cbdf59f13409938e71b6c31a4f SHA512 2ebd7e0d81ade32081d6ea0360434eadf6234ef16956de82659401bbdbab6977b5a082bac7cb6be8fb867527f1ae5c94049f011117a6881c7b57c2a7045622fb
 EBUILD botocore-1.34.141.ebuild 1833 BLAKE2B 5609eba12164e385a3a24c3dc8b4d723a2785c3580605580091de3b6e59005dea40fcb341cfe05ff4ba5b82f01428eeb687443cbdf59f13409938e71b6c31a4f SHA512 2ebd7e0d81ade32081d6ea0360434eadf6234ef16956de82659401bbdbab6977b5a082bac7cb6be8fb867527f1ae5c94049f011117a6881c7b57c2a7045622fb
 EBUILD botocore-1.34.142.ebuild 1833 BLAKE2B 5609eba12164e385a3a24c3dc8b4d723a2785c3580605580091de3b6e59005dea40fcb341cfe05ff4ba5b82f01428eeb687443cbdf59f13409938e71b6c31a4f SHA512 2ebd7e0d81ade32081d6ea0360434eadf6234ef16956de82659401bbdbab6977b5a082bac7cb6be8fb867527f1ae5c94049f011117a6881c7b57c2a7045622fb
 EBUILD botocore-1.34.143.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
+EBUILD botocore-1.34.144.ebuild 1672 BLAKE2B 8e30dae387821aea270f5db3ece49d58df6706d6e4ced17b2a595e1bc3f40dc49f79811cc9a82ad935b34ab5a053d802ac6afce166fb4cca168affe6b47a6c23 SHA512 23b6b04cba2a0afccc82805c78853bec7ea4568c0c01122edc83e3fea544ce14841a41fb469acb6f5a7b8fc462060bda2e4cba19cd82a799b7261f61df880a5d
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.34.144.ebuild b/dev-python/botocore/botocore-1.34.144.ebuild
new file mode 100644
index 000000000000..4f1ad852bdc1
--- /dev/null
+++ b/dev-python/botocore/botocore-1.34.144.ebuild
@@ -0,0 +1,76 @@
+# 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..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# memory use tests, probably fragile
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index f1ee21d0b4db..a45de67ef362 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,15 +1,7 @@
-DIST cfn_lint-0.87.8.tar.gz 4136317 BLAKE2B eb0c30ff83ea9eca80b0a5e2a364e9d013bae2edc245fff61e1a77ff969a23314b2f918a061f03dff6aded543563f1c318ffb389eb4a8cf1da4a142892b0f31b SHA512 044e9f5e88b4264c5782d25f4216e328cb4cc6b09441790fc150c0162393505f2f874cf8992b870772091970557aa6fa5d1991e35c61253c33f75d7f17070ad3
-DIST cfn_lint-0.87.9.tar.gz 4099520 BLAKE2B cdcb2a4b569f96eb4779e12a848078659dfb103c4f61f583127152db1b80ae951e46e3850a02a520ed242605e91328817fd7568779304cc08746994332934309 SHA512 6868723a9a7adb709fe5c6e80760d4276e781d25812f6a77b2c73ad290be67d43bfdbabbe100ae39a7c573da8c718660134ed9940351e4c42ba119f6c6153ca2
-DIST cfn_lint-1.3.7.tar.gz 2469769 BLAKE2B aa059688cee5dfc35ea76a0d771e3c3d370780d6bacef2f524f60a408b572eb92a23367141cbe195afff0e0599102b4fc05354e2bd9d712f936db32f47a4bf91 SHA512 77dbc087c91d75946838567dd95d4fbd32131e07020d8076748154ae1b2cbeea1f348e650534279fa573732dc22691e65e0e542f539156b0af59ff5422396ffc
 DIST cfn_lint-1.4.2.tar.gz 2485843 BLAKE2B c2e64721b537ab38cad3c3f6d40c509741fb03f61202d7dace4023f4b5b3a7840b7deb88892d9d282d223756a1e3908680ed166cdf216b0c76abdc29d0749967 SHA512 c9761e253ba77198264eabdd9c4e6a290bb9010533628958853c8d5a0f5f7317338f271588b5cef2ac1667f6ed5e1a6e43a3192aa9ff7202b0ca6db061284818
-DIST cfn_lint-1.5.2.tar.gz 2353616 BLAKE2B 2f7231c1c0b51668c1994558a6bfac24c250087736d1edab8dc3d266a5503c6298336749fb9e49f8b4953df6dcbe53a028cefde7c122fe942d0974c1f193413c SHA512 36fee3f67566c831224ce00efe2851df6df8f159ad6d843636948de9babfb56bbaa2789cfd6d8373493b482471d9caa046925f4a4d6bc61c5cae62ec8820a9b3
 DIST cfn_lint-1.5.3.tar.gz 2354279 BLAKE2B b8c836db35453efbb27fd050a4cb3090ca99fb050256c4e0b8cd5b634320d677f2ed325894a700127891b614ab70cd436e7af06759f9dbcf58ad45f4b50ee779 SHA512 38ce749f21e6118f129d98d21ecc01bc4f828efce8af9f597f624eff9a062dbceb8c670cfbaa0cf581c14d187094ffe90ada4293679c1e0f77cb3baff3308b26
-DIST cfn_lint-1.6.0.tar.gz 2365490 BLAKE2B 642ef47068f6684c721c65a2a71701ece4a16534494493730b7e8e898f54df471250402103480adcf0d6db0cf4cbeeb2c2120fd13e4d27ad9c4033defeba221b SHA512 d563e86745a7f3926011765c08c2b64fa5cae2c9772ecb81cb3807e6ba328f9ae868dc13fe66297e49eb3b71323a76b6f7537929a731e44a79afacfa7fb9c127
-EBUILD cfn-lint-0.87.8.ebuild 2040 BLAKE2B 3433bdc70808b67fabab42d70ead74e6e024f9dbf09e2a8aaf6814789edada5ff4508b580a0284facc6e4fdf8a7b3e3700a17edec42dfe72fb38fa955c67ff47 SHA512 eea1fd48f1012633408f84512a87d856461ffd1fa7710687a2db2e5fb715fbfd36c53e73dd92c3c8cff37d322c8367554e65c802342d18a7b241a1d4b073397e
-EBUILD cfn-lint-0.87.9.ebuild 2043 BLAKE2B 02f4a43649563ef965302d40bff0f6b8bed6acffdd2f3aa54670816062f1b5dc3cf26112d8ca31d002acc00f850cf3d19c8b75f948b4bfdeb46bd1d8f45ea568 SHA512 f24a5e9e4fbb1bf94117513d19ff04f2e26cf4da1cc57aebc6ae3da509ec5e4bc3c01ecfc254a1f1b7b1cad6a2aa16ca6c8e0fcb3d33af8fa6e359c1eda60932
-EBUILD cfn-lint-1.3.7.ebuild 2110 BLAKE2B ac9b693bc6097b01441e4b90e8112b26b5773a6ffd11c97177b5672250bb3f0755eca45b2943f119e565bcaaf1b64ab179d59157470538b0d350dd96799e978b SHA512 1cb9bb4e70ffbcbac8de8e0a0af9d265553f179e38b303eb3ed848c679e3a47fb6015458dd9746f5328876a715b1bc7f32a38697d9e6433a6909a38c97dbdec4
-EBUILD cfn-lint-1.4.2.ebuild 2176 BLAKE2B ca7307bebcdfb8816a3fd6b24f034b1f3a392260aa88686dff25265e47308c31ecbf065f2a092367414b9f5ca6338239e1ab5629d07014b561c50f8be9ccbdb8 SHA512 08c06da07cc919f2694222f5c11844375301fe4cf5b1d5e148bd6a308140f4043c48a412bfb2fc3798b6d3c6ecaf7b2c247059f85e06aa943ffe0d523e9493c6
-EBUILD cfn-lint-1.5.2.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
+DIST cfn_lint-1.6.1.tar.gz 2366313 BLAKE2B af7b3e8d5145f3368d4c7b2e86b0ffe441c1f6633de34024e8c10d8cd04625673a25e847c15f30a6778bee8196096ffca58241e3a6f21a750094a3b2845f5493 SHA512 f354fa40677f8b601dabfb12b8715f4eb49f8e8aec72d3b9eeb4a63fabe278c36629f404b193f557b193280d6ecd224f0f0a494f9dfc61a04ebb24d0fe953d67
+EBUILD cfn-lint-1.4.2.ebuild 2173 BLAKE2B ba593561e9e98b1bcb348db13747619379e3d79d80231c43d62b71216b6a5ada6cae1f83a080f2bd503c845bd8b3d04f2398dcdf6a34f3fe798187939929a8e1 SHA512 53e045faf285b309669a61c5d5654ae7a7e229588f5ef9ed2bb1d0afccfbb4005ab0464e8950b55009108fb7a56c5e1dfc5dfd74b7072f223221769bd913b60c
 EBUILD cfn-lint-1.5.3.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
-EBUILD cfn-lint-1.6.0.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
+EBUILD cfn-lint-1.6.1.ebuild 2176 BLAKE2B 07cacdbe24678c647596829bbfba09e70569c2b1f575c318581364c7e6cfe505cc12c0e4fe4174073e51aa123d2d5066189ff5058a008591b68b707cf36ca841 SHA512 97011ea77add065c2ff78d5cc6ced93c9e1251ee5da063afb7c957e2dde3639421e331ab31ef20571409f7f167bb4102bdbda8a4d463363c7ea34b1130ebfca6
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.8.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.8.ebuild
deleted file mode 100644
index e29d79c3ed42..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.87.8.ebuild
+++ /dev/null
@@ -1,64 +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="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.87.9.ebuild b/dev-python/cfn-lint/cfn-lint-0.87.9.ebuild
deleted file mode 100644
index 1965af60837c..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.87.9.ebuild
+++ /dev/null
@@ -1,64 +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="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild b/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild
deleted file mode 100644
index fef826927bf5..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.3.7.ebuild
+++ /dev/null
@@ -1,65 +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="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.4.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.4.2.ebuild
index 4cecffeffedd..09dde444afac 100644
--- a/dev-python/cfn-lint/cfn-lint-1.4.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.4.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-lint/cfn-lint-1.6.0.ebuild b/dev-python/cfn-lint/cfn-lint-1.6.0.ebuild
deleted file mode 100644
index 4ec420c8b216..000000000000
--- a/dev-python/cfn-lint/cfn-lint-1.6.0.ebuild
+++ /dev/null
@@ -1,70 +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..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.89.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema-to-python-1.2.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	<dev-python/networkx-4[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/regex-2021.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sarif-om-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/sympy-1.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		test/unit/module/test_template.py::TestTemplate::test_build_graph
-		# requires git repo
-		test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-		# Internet
-		test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-		test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-		# TODO: it looks as if AWS_DEFAULT_REGION didn't work
-		test/unit/module/core/test_run_cli.py::TestCli::test_bad_config
-		test/unit/module/core/test_run_cli.py::TestCli::test_override_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_positional_template_parameters
-		test/unit/module/core/test_run_cli.py::TestCli::test_template_config
-		# different graphviz version?
-		test/unit/module/template/test_template.py::TestTemplate::test_build_graph
-	)
-
-	# from tox.ini
-	local -x AWS_DEFAULT_REGION=us-east-1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/cfn-lint/cfn-lint-1.5.2.ebuild b/dev-python/cfn-lint/cfn-lint-1.6.1.ebuild
index 4ec420c8b216..4ec420c8b216 100644
--- a/dev-python/cfn-lint/cfn-lint-1.5.2.ebuild
+++ b/dev-python/cfn-lint/cfn-lint-1.6.1.ebuild
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index cb60cfc225e1..6b0e79ade9da 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,3 @@
-DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
 DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
@@ -8,13 +7,10 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
 EBUILD clang-python-16.0.6.ebuild 1203 BLAKE2B 7baa638bb302b5b97aea34e62d28035f6e2e7aab0bd626bae94d9b3ba9e776316a81003b55ae8a71008b13a664569c8587df927c5f925591addc99a2b4381832 SHA512 a2b00fe7edaf1cb1bb48c0e93555fbea3ef929f16d168b27e1ec1e3f38989e3220e6df1ab847ac2020faa7d44d957c6af7ec0723418e248677a40e29c071ddb2
 EBUILD clang-python-17.0.6.ebuild 1203 BLAKE2B 13f87c2782967c4fded88a60220b87e9f9f50d9c37543f30ab2b9ae94cdc5f53d2b1fb422e13450df50ecbb0e36f2a531705fd75f021f265e67f67dd08c85eed SHA512 8abd5bdb175a8c24c542dbcbc73617f075e50a555d9da698ae3139414c2fc11b9ee96d42af0829432c0d2f9d3c820683a2ef5946fdc4332f3d06e40466bbb38f
 EBUILD clang-python-18.1.8.ebuild 1205 BLAKE2B 609f06035ee58685b352f56b62925947fc3cb15f4ca04749256d4d49735443ddc6338c7121157bb722c9a45a60311c262a90a4bbe0ec280c8c6833df210c3b27 SHA512 4b07e79adeafb345896316114ec20ad2443e9b63d28181fe36d44285ed067e2ee73e04425aee255032699bef5e65cced1356967b7dd6f7fd221cbbf03d922057
 EBUILD clang-python-19.0.0.9999.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
-EBUILD clang-python-19.0.0_pre20240623.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
-EBUILD clang-python-19.0.0_pre20240630.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
 EBUILD clang-python-19.0.0_pre20240706.ebuild 1170 BLAKE2B c6bb0527431ced05965e35f2f3d0d0c05db4f27c4286d28cc36c0bc0e2e1c704018650840ab6cb7fbb62cb0acc22bc0472f5dd61a4c4c49a8dabdcb14dc35043 SHA512 bda343468b925bea4580582a163413f6ab45354698c2d3ed818d638989f3cd11248fedef0b7da469d1bfe5fa388304718cd091ca0120ee56da0173e582bc58be
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240623.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240623.ebuild
deleted file mode 100644
index 7f3de6814bbb..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240623.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240630.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240630.ebuild
deleted file mode 100644
index 7f3de6814bbb..000000000000
--- a/dev-python/clang-python/clang-python-19.0.0_pre20240630.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
-
-PYTHON_COMPAT=( python3_{10..13} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 8e42c7c61c97..a389b5af934e 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,6 +2,6 @@ DIST coverage-7.5.3.tar.gz 786184 BLAKE2B 014a21273bf302a7e10d3239edda1a95b99674
 DIST coverage-7.5.4.tar.gz 793238 BLAKE2B a53967307ce9cbb72d89810575574a7a1358c988e5e02cfa2a982ba8e68e7efd477c2d902c2037c67f18309c54777f3422db845b7753da49ccb69855289c13de SHA512 363658864f9a5116e49bd10a45a8ceeb0bb62c70458e0c0ce7ae90f3ddea0659d67af1a35a44a47e673b256cdad8ea0963339110dabfd7031d6b98ba483f3606
 DIST coverage-7.6.0.tar.gz 797590 BLAKE2B c63f022de8ace0e0ee420ecd12431104cafb9471272afd9ecb5ac0a356f065372955097c30c1128547da828ae7e20c8ea615db0fcc31c2ddb61d5377d7c284f7 SHA512 ed27f19a17d4f231a7d28af23045fb0144a8c192cc9b31f90353f558a99a9c4159d7fab6bb5c1231aa8229b8fd56e1163cc0880c4edb3d802e6d48af062468e9
 EBUILD coverage-7.5.3.ebuild 2468 BLAKE2B 34d2f181dea82475cdccd4655b0fe041d6664531d212a81e4b7e4d067fea96a9d34f5341c0e320c5a348a13fa97afd806abb637da390023a0300d795e0a7b5fd SHA512 510903008d7831a27af0c2d3eab72157bf5292fa26c1fbbb8c47181e73e74f041934702f22ebcba1e5d59c141fdf6904e63930b9fe48dd5aa9c24b18f7f42d5c
-EBUILD coverage-7.5.4.ebuild 2476 BLAKE2B 4a9a08dc69d73d9ffaa0a58ec9027fe4c84e9c82e0710d494e72bceb02f0634dd73a490e4b29c97d17ea81493a59fbb2212ab891575332e00dd3f307093c0736 SHA512 c5ab737e5496b70e7bea34bb3f2244da6b49883c561926ca0b79f948c567e2d8a126fd7e6d00fd4a33312bd0f418278077a1335313854b310147800cf10c1630
+EBUILD coverage-7.5.4.ebuild 2475 BLAKE2B 13ab914590e77ba48fa75c150031f4ec90bebe0b84b9ad535dcd4325b8379176dadf40cfd07dd272a56a9d95084adf01fa7fc4f69b5c8235609624a9c53cc798 SHA512 111520a3012f8a3b8c6546a99eb1d2964fd79de307672103510e574d4768189cad204b797efea3e4eba0517e65bb67561ddeecb304dc24241095d8d91cdbd7ed
 EBUILD coverage-7.6.0.ebuild 2471 BLAKE2B c807d6760b7dd07f786a9cbef0385d440362831f459cd6bd7741ee30f70b8c1b8b1282d846086e2452e892e34e8cc3fe5b4d54af80ba1227afb42d902f08c218 SHA512 74205ecce7291de809047ce0d7cecec22798cde2d48b1bd5e8778f484c72d705e19888570923abcdde3dbf5b25b38a44885393a16e11728ce1345ec46a3827ae
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.5.4.ebuild b/dev-python/coverage/coverage-7.5.4.ebuild
index 4903c1472391..74c12210b3c9 100644
--- a/dev-python/coverage/coverage-7.5.4.ebuild
+++ b/dev-python/coverage/coverage-7.5.4.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/csvkit/Manifest b/dev-python/csvkit/Manifest
index 2db6e0112c60..d1c3e8839925 100644
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@@ -1,3 +1,5 @@
 DIST csvkit-2.0.0.tar.gz 3818527 BLAKE2B 87976e5ea703fe16daac48b65f1f4132821e212c90c6f25fecc17f7e8e1c3859d3224e9b1ee77f6f5a39263391535e83a388ccbe4a610a96cec6256b64056b77 SHA512 70b1d8977bbeefd3ae4cfc26149d17527f6ad56b16b5a932d930505ac7b272fcb0ed9080eba33c9c60daa347c1e79c95c6b05c8dded2e0ea5a301335d21f8a88
+DIST csvkit-2.0.1.tar.gz 3819039 BLAKE2B c67b20f77cd3cada4b940facf5ee246d37cf07499278293bb97cc62f2950677daf236394118ae8a69bdd8686e309ba178bdc3799fbae5b77ff3df7a9d32d70f8 SHA512 2a7b6887c3042becdacb58db7604518c65f07fac51faae268c769ea233961c3754bbed3581a6756d337e40b62b264f8da518f8dc81cd5d61babbec0c2c9eaf31
 EBUILD csvkit-2.0.0.ebuild 1092 BLAKE2B e5f6771bb3dd082c9863c6b0c05253685ac37b93feab3562cb3a0e6af92fd2d29482807f699b96e01734b7c30672a77003d5418a89046ee7405a191adce46a8c SHA512 542e82b47fa2111fdbf45171ab2268b03a7d1ec24cbbd1482d09b63366885af0005023cc1b5cc6f928d0c30b44a93c8b29ff2b0b05517436b078dc37b5336a35
+EBUILD csvkit-2.0.1.ebuild 1092 BLAKE2B e5f6771bb3dd082c9863c6b0c05253685ac37b93feab3562cb3a0e6af92fd2d29482807f699b96e01734b7c30672a77003d5418a89046ee7405a191adce46a8c SHA512 542e82b47fa2111fdbf45171ab2268b03a7d1ec24cbbd1482d09b63366885af0005023cc1b5cc6f928d0c30b44a93c8b29ff2b0b05517436b078dc37b5336a35
 MISC metadata.xml 626 BLAKE2B 181917319a1f5bfd6356b2fb06f91892d2432f9ae29a5586c9a6d9579747a676a42d3ee94c1601b53f8ba5c3fc9bbf162b6b3b419ccbc047ead3f1120c2bd056 SHA512 23194fc2a805904809e1df179572fe8e52344b58bda98f064a5221b3637f21f9f8f974e466e65353915b7eb9c66ae23464d1c79e92829147a7c64c6999963f56
diff --git a/dev-python/csvkit/csvkit-2.0.1.ebuild b/dev-python/csvkit/csvkit-2.0.1.ebuild
new file mode 100644
index 000000000000..6dec2fc35ed9
--- /dev/null
+++ b/dev-python/csvkit/csvkit-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV"
+HOMEPAGE="
+	https://github.com/wireservice/csvkit/
+	https://pypi.org/project/csvkit/
+"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	>=dev-python/agate-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	dev-python/openpyxl[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	dev-python/xlrd[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# fails depending on locale, let's not force en_US
+		tests/test_utilities/test_csvstat.py::TestCSVStat::test_decimal_format
+	)
+	local -x LC_ALL=C.UTF-8
+	epytest
+}
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 8ff27d8c4c5f..b42638a1486c 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,7 +1,5 @@
-DIST dkimpy-1.1.6.tar.gz 66557 BLAKE2B 89e6752b97611eba5ecf0f487d10b3210f7b898131e465639aa0a8f2120c3a2901ad844db275748148574cbfcd1a5eeaf3319c09172b51d7a79342a0ee16f285 SHA512 d61331cc7baa3bd5156d919a4a88ad792ac3c3077381585f8b5aa1a35dc50761b86286312e13f3514496ab50bdc6f2dac469f4b5419b49053c1c9204d569d317
 DIST dkimpy-1.1.7.tar.gz 66735 BLAKE2B 2cca9b23761a6b87cc94d441eb65788971338a53301d00b077e767b0f0591c1db88e64fb57a16e8d78cbdaa0fd8218cb32eb4f1fae2b6760bbbf80ae42e067cf SHA512 79f25bb9f83b3d75aa21aa5521b17679228cd196d26ca35afb8aaf44dd0454bc7dfa50802d33800b410ee680305f2b60da052a9fd9ed6d0aa5838e8093b9236e
 DIST dkimpy-1.1.8.tar.gz 66979 BLAKE2B 4b118c02dc9039a21fcd4309c6d4f44f8d3d44eacb45f523b5527f217bbb27a58d77d2771fb23447c36bb6f07f9100a075e34a342da8d95bb8ac2cd60b944a7d SHA512 c8a53c01ab329e40ac66c1c77e40f104871fb9f52058a530d08b26599c20cd960f0f4b6a1e4be8e173332634ed0b10e0bf0711285a8eefa40ec5cfdbed74e12e
-EBUILD dkimpy-1.1.6.ebuild 773 BLAKE2B 79f29d088db6f33e7fbbf8e18e1c2c92ae7571f8e3b15ff547864b75fc42cd388315f2303f6f88632dd2a3a4f9da83ff9cdcf9413b67d662620f25c75a21b474 SHA512 d47db1c7e98e5fcbc5ed2ba0ff96628a0ddb8bbbcf94bed499e9689eaf7ab4e502b2741e99404a35b5c0df5fa19e722d5c7ccb84342504b58eefacb9027154dc
-EBUILD dkimpy-1.1.7.ebuild 776 BLAKE2B e56cf394e5472a6af05e1e6bf497ba40032a49e33c62461878c362851ce5e3bbe402e2eb6b724415cc34061d32cd73c3f0cd9902f911cd9b837a6056594d04e9 SHA512 d6145d53ad237a80580609e651be2a236f73426650815c95855ba01a89699ffc468eabaa63e0b20bc5376e27cbf98df1ded039463811a375cd0b323035017840
+EBUILD dkimpy-1.1.7.ebuild 773 BLAKE2B 79f29d088db6f33e7fbbf8e18e1c2c92ae7571f8e3b15ff547864b75fc42cd388315f2303f6f88632dd2a3a4f9da83ff9cdcf9413b67d662620f25c75a21b474 SHA512 d47db1c7e98e5fcbc5ed2ba0ff96628a0ddb8bbbcf94bed499e9689eaf7ab4e502b2741e99404a35b5c0df5fa19e722d5c7ccb84342504b58eefacb9027154dc
 EBUILD dkimpy-1.1.8.ebuild 776 BLAKE2B dfefaa0a2b214c5d14478597a061b864ce33ca451a78cea362eb51edc632e5e88141774bf45b30a243920b458b0cfc88fc1b851e862f805a4898cc90605280f9 SHA512 b6e2fa08dfc87157da36c3884b8d43935ecf5e410c286ebf2ef7f047a17a4bc2e2f92fcc9de3a4b358fabf9c36b54c51af5b5c842df2c6b55b14edaf3c95d142
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.1.6.ebuild b/dev-python/dkimpy/dkimpy-1.1.6.ebuild
deleted file mode 100644
index 6b4ecb70c5d8..000000000000
--- a/dev-python/dkimpy/dkimpy-1.1.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="DKIM and ARC email signing and verification library"
-HOMEPAGE="
-	https://launchpad.net/dkimpy/
-	https://pypi.org/project/dkimpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	>=dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/authres[${PYTHON_USEDEP}]
-		dev-python/pynacl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "ARC support" dev-python/authres
-	optfeature "ed25519 capability" dev-python/pynacl
-	optfeature "asyncio support" dev-python/aiodns
-}
diff --git a/dev-python/dkimpy/dkimpy-1.1.7.ebuild b/dev-python/dkimpy/dkimpy-1.1.7.ebuild
index 58eb09537432..6b4ecb70c5d8 100644
--- a/dev-python/dkimpy/dkimpy-1.1.7.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.1.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	>=dev-python/dnspython-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/elastic-transport/Manifest b/dev-python/elastic-transport/Manifest
index a37b7d81e05d..ee163ff7dd20 100644
--- a/dev-python/elastic-transport/Manifest
+++ b/dev-python/elastic-transport/Manifest
@@ -1,3 +1,3 @@
 DIST elastic-transport-python-8.13.1.gh.tar.gz 76370 BLAKE2B 7f4584953c243547a73ee48c9033dc212a837bf0977f1a2329365805705ce1317bc9fa6e35f22affe9cc8f9b3fd6725b44c8a45dde02ac835195d4a6d33964b1 SHA512 a025b80e86163ee25798aba7ebf75f4c481c4f6cbcda0542ab80c0c9899988fc608ad41a2593a2f0371eb6cde2ca8da8c72dd843a03f9b2312d65bddc903dec4
-EBUILD elastic-transport-8.13.1.ebuild 1995 BLAKE2B c480c14012fdd15bf165aaaecd05f58759a5983fe1dac0e072ffc63a302defbb94c8aa200386f92f032c79fc606fc761fb38dea842faf0c40d7d6aca09de6818 SHA512 f66a5c056360dda59238d90244a0bfc3b48a9b7da52d866e2f187c59157352e3e5c5d48f073d6c6a62decec948c04bc966e50de75d4b451b5587b03e0100f4ee
+EBUILD elastic-transport-8.13.1.ebuild 1995 BLAKE2B 400280365e22703f698f9bb3c5455742c6a37ebb5dad04a3268de3f1563431108f6dbdd6c5fc65bbf2172ae2c1a09f4b8925a50c09c09cf8eaadbba83d43fdbb SHA512 88cfad1ea1ae5325c82dfd50932b48d46f21076b303c32fe9964da4b11497a6a4e6df97bcc65e00749ed66dbe6009a9b01ff219966e5f569eb679c5a2b8bd3e1
 MISC metadata.xml 658 BLAKE2B 7ba1da27d590421cdd7a24d01d38771b27ae65f09521e39bc84e691f3e587a3bccabcdd297350166e00324ca482dd0459e8213ed578d81f9e93469fd3efec48d SHA512 c39cf837ff098fb09c25d1933f43c0f20e1b2b5ae4e1bb5aa172aac43f8f36ea80437e3e59909b0c51d0f8301853bdb6b5dbd7f3498502baa8936939bc0210d8
diff --git a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
index ff8e1b59e381..8ae43202d660 100644
--- a/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
+++ b/dev-python/elastic-transport/elastic-transport-8.13.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/exceptiongroup/Manifest b/dev-python/exceptiongroup/Manifest
index f2951207e2f5..453ee6bbb2f8 100644
--- a/dev-python/exceptiongroup/Manifest
+++ b/dev-python/exceptiongroup/Manifest
@@ -1,3 +1,5 @@
 DIST exceptiongroup-1.2.1.tar.gz 28717 BLAKE2B 70e8093ad6af81343bf90e349671265e612f12fe25e5caeaef5917353159415215e4bb1921d9a0fcde6c3bd1a31a84f032827a2d5d8884daea777d7b110d8995 SHA512 7e0216ac2d76f0b3d29a0690790aa98d8e0f019eaee74e37e4ddcb97553a6a4d5037982478e663e8dfba49731444decda06122a3cb68f1c538589f5b43bdebfc
+DIST exceptiongroup-1.2.2.tar.gz 28883 BLAKE2B 713a1dcce6575eb8513fc5016b5ef5c11cafeb910f96ab556916da4c109be228cabc078551244d04acb9521ae7af65e1d93a02d7f40fa985760421138f7ccb73 SHA512 dedee1401577d1047a99078552cf24346c55f1e9a281845f327d8ace30b22659877743ce1c8b60fa605988abcac14432138020e9d1c109df911f86993cbe2082
 EBUILD exceptiongroup-1.2.1.ebuild 789 BLAKE2B 82351661933a4cdc062d7995d52e0ffedbaf88f53a98739290bad516742a81e01c820a6232320ec3aa00c031be6943b651084fc469714ed8066b6de90f8e9c43 SHA512 4ba2b394bb3ab3c0cc1549ca3cbe96d419354acf5a090546b249090bb73a8aa2c0d9bafed84d23eeca5426752f19fa8415c9ac1f14e66dbb4513a7f9346c320e
+EBUILD exceptiongroup-1.2.2.ebuild 605 BLAKE2B fe5627d26f0877b715a3b150f7caf722f14dcada2e7103a395ba33da1d98ca152a03f689fc99a5aad04feeb64c3de1a7dbe3795ce4c7b8dd7a578c4011afa253 SHA512 f16928e56621d752718335c2c3c230ed248c3d8f98ed5fe9c92e7f9a95052d0673d4febe683978433abe272117282a22be1683b21714a9a615acf06f810c0274
 MISC metadata.xml 384 BLAKE2B 248abcb5fc08c91396cdbff52e5c3e4f6cce2aa273cfd52b48ee13de9ccdaecd09e9a436ed79f258d15d8d4583fe5995e054010c909a522f47e6866e55b3458f SHA512 c631c69438059cb2a6c80e595e45fac904d32dfb53f8be183142f1195d3a3b9bc14bc240f0808e14f47d31beb1887ad82ee79c5f1847c8e6b59dbfeea7913c8b
diff --git a/dev-python/exceptiongroup/exceptiongroup-1.2.2.ebuild b/dev-python/exceptiongroup/exceptiongroup-1.2.2.ebuild
new file mode 100644
index 000000000000..90abf7cf4769
--- /dev/null
+++ b/dev-python/exceptiongroup/exceptiongroup-1.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit_scm
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of PEP 654 (exception groups)"
+HOMEPAGE="
+	https://github.com/agronholm/exceptiongroup/
+	https://pypi.org/project/exceptiongroup/
+"
+
+LICENSE="MIT PSF-2.4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/filelock/Manifest b/dev-python/filelock/Manifest
index 1aedcdb6da03..a7d1cdac817f 100644
--- a/dev-python/filelock/Manifest
+++ b/dev-python/filelock/Manifest
@@ -1,9 +1,3 @@
-DIST filelock-3.14.0.tar.gz 15401 BLAKE2B afa95a941189cd73767684016502fba6972541a8a0f16bed0a4acc6452700224d511a17e6882b1c680fa6b20621b617704a7e9d3aff8ae883ede56f40acb5de3 SHA512 51eda6394fcac86a12887fe1974022b9da921fb96a61887f7a91c5b15f083a4c9186600ec61b4e93b91b8c4799c50ca4b6c418416c6bf2b422ea3b41715258e4
-DIST filelock-3.15.1.tar.gz 17564 BLAKE2B 5a4b7a02697318023bb555900c4ee8d486c62a7177fd35c374c13d03a1f03cd3bd36c40b2511112b098f0185e20c936251a9bc16373b2f3c3c61b8f154436f08 SHA512 cf8ef1cc68697ab04725057c186f6df8100ac480b727932be80b2ca655230861f5ae65f6957b992dcd4350433f90d958c9513f684685efb9080d0c506d730cbe
-DIST filelock-3.15.3.tar.gz 17982 BLAKE2B 802601805a247cfa5ef90e6fc6c919adbf04a77f4bbe571a09e1656101e340981ab3fe8716071b52476bea0e690d84541f5443af64609cabb042af9b8e9705c5 SHA512 b4519a911ac90ba3e1b8b6cdfcd3d31eb6024f94cc6794c5ce1beeaeac10692a6bdef16f09aaf4c579d383b89862fd94b1bc6ccbec079232e4f9553f65bd7b1f
 DIST filelock-3.15.4.tar.gz 18007 BLAKE2B bf64d43b189453c8c1fcf258edefb2df340d20578d942d147197423c433cd6629d5e73615201d7ef84857450d7a4cf1375d0dfc69a422c4319a76f2dc157442f SHA512 d809df84f321ab9d99f46609cc664af2d9b73161906308e1a9f949c745694577901def228c40a860c606d652f9ecefe9014159eeea92266f94e981eecc4fe103
-EBUILD filelock-3.14.0.ebuild 681 BLAKE2B 859c6ef75c1cf5057efed6761d068b841f1e82e7b87c94a7e111bcfb52a583dafa13a86afb1bcf80c93cefb733fc3677de447058b6d30e29a8c491a44437e144 SHA512 3d9216bd6f058b42cae6741401f2aa2ab774ab988cf4f7bbfd35f7ea9b52cf20c44a082b5c53de7aa7d58183178fdf83876c01053e31b569681ab7a9f0fafebe
-EBUILD filelock-3.15.1.ebuild 735 BLAKE2B e41d4d3e1d0a43c2621730395a65165c9cea3925572288b1fa4d8ed71f9b7b9182b1c0c9e544d111d491f81a6a77400a4f23e6e332ef184cc831b28b3d6fc3eb SHA512 181425c93fb881aa220ee181441a436433f6804919eed10fffb17411e82b513c215164179a130ca22f29c4f3b69261ebdc5a634609e26f0fafdd3bfe47465c75
-EBUILD filelock-3.15.3.ebuild 777 BLAKE2B 358da1aa2d24dcb2a395328b4e6e402c0bf43649306c9c7c8c868ce471555fde5925237dd9417ec7bcc70fcaa6239bc79754a584e50e2c80e3c719d6ab051991 SHA512 7aa5802bb97d99e1e04638b2b5e4fcffbe57259dcf08e990f70feb768fe0223b408623b30e39b97a5755c507d35227b9ae345828e43b0ba96e3d8133f51b06ef
-EBUILD filelock-3.15.4.ebuild 777 BLAKE2B 358da1aa2d24dcb2a395328b4e6e402c0bf43649306c9c7c8c868ce471555fde5925237dd9417ec7bcc70fcaa6239bc79754a584e50e2c80e3c719d6ab051991 SHA512 7aa5802bb97d99e1e04638b2b5e4fcffbe57259dcf08e990f70feb768fe0223b408623b30e39b97a5755c507d35227b9ae345828e43b0ba96e3d8133f51b06ef
+EBUILD filelock-3.15.4.ebuild 769 BLAKE2B 8249bdb713d99a0f08529999a0531c01dea380d6f9bc8d05d71efe3cd8781fb811639d19327ec69dba2a4e388001da6e0d42ae08d122df68aa3900e44233c546 SHA512 a6254e0be7e11df54bec47f20239649bf2391bf01c50715324895d7d882614e81bafb9f6e8df6a97cc1590609a4295cbc56cc5439f29847253571c37dd6ba263
 MISC metadata.xml 370 BLAKE2B 91fee1713e0ae7d6ad39c05769e769b05d0ddbdc514b9ea19ec9144e0452ce411ed08f45d4b3123dd8accb67077fe1113809512c8a3ec460fd70a2126b841899 SHA512 62afbe350d894dc05533ff9e532f24f351315a9fba3f2cb8a580fc056cc868592140ffa04ea08fde3ca594e6d398962343e18a0c4614d9e6d2211e07a1152117
diff --git a/dev-python/filelock/filelock-3.14.0.ebuild b/dev-python/filelock/filelock-3.14.0.ebuild
deleted file mode 100644
index 81cf9f0ae471..000000000000
--- a/dev-python/filelock/filelock-3.14.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.15.1.ebuild b/dev-python/filelock/filelock-3.15.1.ebuild
deleted file mode 100644
index 32dd96a12d65..000000000000
--- a/dev-python/filelock/filelock-3.15.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.15.3.ebuild b/dev-python/filelock/filelock-3.15.3.ebuild
deleted file mode 100644
index 6e7072b2fa9c..000000000000
--- a/dev-python/filelock/filelock-3.15.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A platform independent file lock for Python"
-HOMEPAGE="
-	https://github.com/tox-dev/filelock/
-	https://pypi.org/project/filelock/
-"
-
-LICENSE="Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/filelock/filelock-3.15.4.ebuild b/dev-python/filelock/filelock-3.15.4.ebuild
index 6e7072b2fa9c..75d8883842dc 100644
--- a/dev-python/filelock/filelock-3.15.4.ebuild
+++ b/dev-python/filelock/filelock-3.15.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index bb6dfd714be2..629ab56e5992 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -3,5 +3,5 @@ DIST gast-0.5.5.tar.gz 26733 BLAKE2B bc309969ace97920b7278fb329ecaa050090df3b962
 DIST gast-0.6.0.tar.gz 27708 BLAKE2B d3084eee3d3b2665d8435450f0b7fad7979656c1d5e2fc474ea25918005ebd70dddc0e6b955c6bd7ab4cdedd3aa2547bbf8daacc47846313196508150e18c896 SHA512 a482d0ca489781b57c119169a9bc502a84ead352ed5c4edc078907e8baa4f9abd379ee01df9cad9565a33fa1d0f363bea7b5c17b7d3cf6d600ef96018b97191b
 EBUILD gast-0.5.4.ebuild 507 BLAKE2B 4137fc77c6b9ab0637d300f635ac5617361150b36493c133c4664abf4d8e6218d61b7aadf027d95663aa21e83352e263e4e73e8bc421a973e1635ff2d0323bd3 SHA512 ed267bcec64c63d117461af01a7b63f7658b5e6459588b623c8caaf394d22176085e3b6873b14ba7468e1ec743919e2ab57e54772ffe08a0f6bdb537cb78fe84
 EBUILD gast-0.5.5.ebuild 560 BLAKE2B 4eb4e8f641093570d17a630a0edb5e1ffb5b4e2a72bf17eb3dc488718dc632954e7589729e9cf813e40e90a00e38e5f3c5be412c79508a2575bfa18e1acb3d51 SHA512 5c1f3e068063666a8717b79983e440e8a2e2def7ac26951e640c2967c455841940edd9c3d971cefaf7f8e3b122e11554706b37f71d16184c39ddd0a5a0bf9f1e
-EBUILD gast-0.6.0.ebuild 560 BLAKE2B 4eb4e8f641093570d17a630a0edb5e1ffb5b4e2a72bf17eb3dc488718dc632954e7589729e9cf813e40e90a00e38e5f3c5be412c79508a2575bfa18e1acb3d51 SHA512 5c1f3e068063666a8717b79983e440e8a2e2def7ac26951e640c2967c455841940edd9c3d971cefaf7f8e3b122e11554706b37f71d16184c39ddd0a5a0bf9f1e
+EBUILD gast-0.6.0.ebuild 554 BLAKE2B 7ca46af1d8b7aaae164997a514b68bb5f7b9e5dd06ddbd02d063e4da1d1d5416d9640875f6733323c2cfc9c2e5a5f32e9b80a2b5cc8ff425e83b96e9a9742ef9 SHA512 52511ca26ed494c3b1bacd1080d825a7b965cd86cdfec43ededf17fe938320b17ecf55f2448a5c93e7c66e2c251e3b9bdd3b49372b4e6c26ad4910666ccaac62
 MISC metadata.xml 739 BLAKE2B 6a226f9d712552a98ff4e7562da4097bb307fc7641085f45aed3f8610fefcb01e8458e96a5e46af30e3e01574415149269dcf5222229290225dd5f02543959b0 SHA512 02f9b1a30219372f6b769158ff9fb096a74f7d8ee6b67f5f9ad23ff382ce450767867a4074e04b1d5ac77e1987c3e9b661630e7626b68f8b5270032d7684161d
diff --git a/dev-python/gast/gast-0.6.0.ebuild b/dev-python/gast/gast-0.6.0.ebuild
index 4747a4e751f1..cff358b1264a 100644
--- a/dev-python/gast/gast-0.6.0.ebuild
+++ b/dev-python/gast/gast-0.6.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests unittest
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index 6246558de123..9c566236a601 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -1,5 +1,3 @@
-DIST hatch-hatchling-v1.24.2.gh.tar.gz 1054297 BLAKE2B b2da7dc3f3d58998b57d6ee625a2b7e890afc078c0d8f6cb9c332480df561090bb8bc255e3e60d5d25fa55001869429f822014891fe1cec0098b61fbe02efe52 SHA512 e83f57089707a267685c9cac7f29cd5862adec62f6346097aa62bd5b3b9f7222621b2ea71004dd52f62798dab71bcf05c33a2c43dbe39d1bbc5f4a4f99f28c40
 DIST hatch-hatchling-v1.25.0.gh.tar.gz 5276942 BLAKE2B 76de1a824086889370a996945ad031179132dc74f4ef8a79da29913fc587c85210db49e89f400f4db2533d6706452cd4c67b87ff4ca97be0c3dc1879cf2bd77e SHA512 54f4e5f9383e846a9192e47b61f5147d4c48f20c41df752898dc5e22dd0bf196ea60fe4866dd04dc09c763aac67f7c047c40d978398e910878eb772af887d607
-EBUILD hatchling-1.24.2.ebuild 2922 BLAKE2B 506fb6f862d54fc35adbe88fd542fba3ae6c5b023af893d5906b3db27dfe9369d529e0244dad394752acec23c166cb1c8c6a9e1bf0920aa31d263098f466bc81 SHA512 c0b7079e303e44c2865c599dab0157019c03f840649fa21db4b62f515140f0794e3ad8cd60529a151fe0401bc03d70b8869e42bda0542765d9c0120b39cf17b3
-EBUILD hatchling-1.25.0.ebuild 2930 BLAKE2B ee877ddafd84651691a8794c62c2d818d8c910d79cdaa605d4fb96796ddb6ee32aba82cfae0ca9e0b9cad02662ecd72a99d4936db265cd78f9550baf8e6d1594 SHA512 3553f1eb5ef859b270c6de76a55c79e26da10603e976e0c2d1b4bf3706994fea3a3de865260b376c5dcf387b9de0c623d21e1b3f77564e2e8a7f21408c48efa5
+EBUILD hatchling-1.25.0.ebuild 2922 BLAKE2B 506fb6f862d54fc35adbe88fd542fba3ae6c5b023af893d5906b3db27dfe9369d529e0244dad394752acec23c166cb1c8c6a9e1bf0920aa31d263098f466bc81 SHA512 c0b7079e303e44c2865c599dab0157019c03f840649fa21db4b62f515140f0794e3ad8cd60529a151fe0401bc03d70b8869e42bda0542765d9c0120b39cf17b3
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.24.2.ebuild b/dev-python/hatchling/hatchling-1.24.2.ebuild
deleted file mode 100644
index 4d265ef65886..000000000000
--- a/dev-python/hatchling/hatchling-1.24.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{10..13} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-TAG=${P/-/-v}
-MY_P=hatch-${TAG}
-DESCRIPTION="Modern, extensible Python build backend"
-HOMEPAGE="
-	https://pypi.org/project/hatchling/
-	https://github.com/pypa/hatch/
-"
-SRC_URI="
-	https://github.com/pypa/hatch/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/backend
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-# deps are listed in backend/src/hatchling/ouroboros.py
-# editables are optional but required for editable installs
-RDEPEND="
-	>=dev-python/editables-0.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
-	>=dev-python/pathspec-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-# always depend on the newest version available, at least until upstream
-# stops treating unknown classifiers as a fatal error
-# https://github.com/pypa/hatch/issues/1368
-RDEPEND+="
-	>=dev-python/trove-classifiers-2024.3.25[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/atomicwrites[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-			dev-python/httpx[${PYTHON_USEDEP}]
-			dev-python/platformdirs[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/rich[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# top-level "tests" directory contains tests both for hatch
-	# and hatchling
-	cd "${WORKDIR}/${MY_P}" || die
-
-	# sigh; standalone test suites are overrated, right?
-	echo "__version__ = '${PV}'" > src/hatch/_version.py || die
-	local -x PYTHONPATH="src:${PYTHONPATH}"
-
-	# do not require uv for portability, sigh
-	mkdir "${T}/bin" || die
-	cat > "${T}/bin/uv" <<-EOF || die
-		#!/bin/sh
-		exit 127
-	EOF
-	chmod +x "${T}/bin/uv" || die
-	local -x PATH=${T}/bin:${PATH}
-
-	# tests mock cargo subprocess call but the backend raises if CARGO
-	# is not set and shutil.which() can't find it
-	local -x CARGO=cargo
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local -x EPYTEST_DESELECT=(
-		# most of these run uv to install stuff
-		# the few remaining tests aren't worth running
-		tests/backend/dep/test_core.py
-		# broken if CARGO is set
-		tests/backend/builders/test_binary.py::TestBuildBootstrap::test_no_cargo
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock tests/backend
-}
diff --git a/dev-python/hatchling/hatchling-1.25.0.ebuild b/dev-python/hatchling/hatchling-1.25.0.ebuild
index 33191ee7e57c..4d265ef65886 100644
--- a/dev-python/hatchling/hatchling-1.25.0.ebuild
+++ b/dev-python/hatchling/hatchling-1.25.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}/backend
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 # deps are listed in backend/src/hatchling/ouroboros.py
 # editables are optional but required for editable installs
diff --git a/dev-python/hishel/Manifest b/dev-python/hishel/Manifest
index 52cf90c77595..929cb3124114 100644
--- a/dev-python/hishel/Manifest
+++ b/dev-python/hishel/Manifest
@@ -1,3 +1,5 @@
 DIST hishel-0.0.29.gh.tar.gz 828680 BLAKE2B 2869f53e04e92d5c6ccaeb3234a299a075db8429b3b8f77ac9671764b65a4a7d360451e934651789caf2e654b3e5b18819b741b52abe89867157599b921d5a40 SHA512 a16b2c198ea93c2445e0f572e5432c1f44b12ed0e301e52ed46c2c849a5a324457f88ca50c5e98283ceb9aaddf1e1ea4a11644cf61dd0ca4a25f956950c6da23
+DIST hishel-0.0.30.gh.tar.gz 832978 BLAKE2B 932150b3464dcbc4fc2ff1361bafa6b2ea3fef496b0c89117c18b62122d07b0d71db66762e3eb87edb03f84eb4af0273f1792131e110291924bb29299051741a SHA512 f55f04badfe9ea161e20d8eca631cc02f9b1195ddaf3ba75b5e1a0ef143337a13438181ede9c853f30f7a24d3b6e59cffdc044860fc564d18392a59bd603c5c9
 EBUILD hishel-0.0.29.ebuild 1673 BLAKE2B 2a77c164dc91b43c6c91fcbd3a28e5ee2c5631cab2e87c4f7686410cd8a057bdb109b6cbc6de9092e377e1febe574429ec400cbf03c3ee8a69f05bd14b022209 SHA512 bccffd94791ab6a99a9e79af2cf67ca556ee2ad4f133f417192c57cdafd1ed4f918bcabb98d82c6c90386670f9f6f1c96bfb4120f7f85fdc8fe9a78395c19fd6
+EBUILD hishel-0.0.30.ebuild 1673 BLAKE2B 2a77c164dc91b43c6c91fcbd3a28e5ee2c5631cab2e87c4f7686410cd8a057bdb109b6cbc6de9092e377e1febe574429ec400cbf03c3ee8a69f05bd14b022209 SHA512 bccffd94791ab6a99a9e79af2cf67ca556ee2ad4f133f417192c57cdafd1ed4f918bcabb98d82c6c90386670f9f6f1c96bfb4120f7f85fdc8fe9a78395c19fd6
 MISC metadata.xml 378 BLAKE2B 24bb3b6d47931488021a625ac5f4eca9575efaebabc4af29fcd42ea8468a0a8da077d88b98c6f348c7528d7b338fbf553475894fe0726f11ca48c6c5d4720f61 SHA512 ae67451815773cffe43a0e16ae42020f1c29fb83ad711633666b065be586a08e4da5ebcee8e35d7f0c0084c018713760a1f20b4b9a7f2a5d43691589be357b42
diff --git a/dev-python/hishel/hishel-0.0.30.ebuild b/dev-python/hishel/hishel-0.0.30.ebuild
new file mode 100644
index 000000000000..046e93ae7033
--- /dev/null
+++ b/dev-python/hishel/hishel-0.0.30.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1
+
+DESCRIPTION="An elegant HTTP Cache implementation for HTTPX and HTTP Core"
+HOMEPAGE="
+	https://github.com/karpetrosyan/hishel
+	https://pypi.org/project/hishel/
+"
+SRC_URI="https://github.com/karpetrosyan/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	test? (
+		dev-db/redis
+		dev-python/anyio[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/redis[${PYTHON_USEDEP}]
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's:mock_s3:mock_aws:g' \
+		-e '/import anysqlite/ d' \
+		-i tests/_async/test_storages.py \
+		tests/_sync/test_storages.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	local EPYTEST_DESELECT=(
+		# tests that need anysqlite
+		tests/_async/test_storages.py::test_sqlitestorage
+		tests/_async/test_storages.py::test_sqlite_expired
+		tests/_async/test_storages.py::test_sqlite_ttl_after_hits
+	)
+
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Starting Redis"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1 ::1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 2601408f6d16..7a148fccc0b1 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -8,6 +8,7 @@ DIST hypothesis-6.104.2.gh.tar.gz 9467131 BLAKE2B 22be74426808bef091351cfb688bdb
 DIST hypothesis-6.105.0.gh.tar.gz 9467572 BLAKE2B be878220e5908ca8b20c6b6ed8ab61638e2a5605118b61ecb715b94353751d014644995e8ab6056e2e5b4cab94e533117de199997bd3492b78465694321e4afa SHA512 dd6284ed12b68b9ff7fcb3026f08de240959f116b7444384c1737ef632483796ef3f1687796fa744d8cd7855811916a070ff48d66dc8ace869ee24d9ee9d8ca3
 DIST hypothesis-6.105.1.gh.tar.gz 9468095 BLAKE2B 285a6291ad1386384afa08634a2d7b4802060514e22a7f78d42a1cf97e548a4da6abffd24c98a931a07db9779ed5c54514e5460393ab12a904c5054db2bbb038 SHA512 f3a900d566a00ec178de3550108b752c70819b1081c0b3dcbe05aaee43cafb62f11d90efb6718d19039c2cb87ac55255dff09a71dafb7d6203f76408788e5cdf
 DIST hypothesis-6.106.0.gh.tar.gz 9469265 BLAKE2B ece6e47c8b8927bc9d4a470b14a8546abc506d6f50ecf33a83429aafcc31115dbad71d9f7ff07f60cc100a9ca26aabf111c86e1afd6882be2ccc00dcbfe3648f SHA512 3ae6e874a032ddc53fb6d609c49e3942ae121c0ef3e4dee5303fd52002379b86a5a5471fae229e646fccb44d71cc5f98159843d411deef702237bcfb6343b676
+DIST hypothesis-6.107.0.gh.tar.gz 9470192 BLAKE2B 721d9ee1281600bca8387e396c1d79316db3130061ac40635f8cb8ba3cf91ad0417debe1276efb21cadf5e5f8ae856d13b82fc674313a21549adff645ce07b1f SHA512 13403073167d24e80fec4ed256a60e696b79b900a45dbd9f349b123fbefe3c7fa5daac6f35200d5198d4565033b65792cd1fd8a7816955aeddbbc0c7bb93d578
 EBUILD hypothesis-6.102.6.ebuild 2514 BLAKE2B 1ad3d2518c490ef10d8e2fba0719e5ae4d11c1f44a82e1ebb6fc679aec161ed981b386225070090ea825fa154ee1896062db01e9d8d8c0daab1128cbdec7aa03 SHA512 b6116a2392ca288b55936a9e1d57231f64d08eada7a18d65d8f764b01a71afad967ff35102aaf528ac96cebebf344442d0334c4a499c02b43a5d82942b97e9fa
 EBUILD hypothesis-6.103.1.ebuild 2522 BLAKE2B e17cd7e595def59d5b8c35d6cd2c1af05e8febc9e0484db1030a9d86cc99e41757e51b9a6789c27d080bb5d59ea74c701a88bd8f423e6bbc63ea24b2a6de636d SHA512 05df0864941735b7d4d342ddaad53bf27689063a90a3f3bf7b2e8d4521243a6c3964bfc1935d466b99c505c122c2dd342c8532f048ab8fead90d185e3f7f1c87
 EBUILD hypothesis-6.103.2.ebuild 2522 BLAKE2B e17cd7e595def59d5b8c35d6cd2c1af05e8febc9e0484db1030a9d86cc99e41757e51b9a6789c27d080bb5d59ea74c701a88bd8f423e6bbc63ea24b2a6de636d SHA512 05df0864941735b7d4d342ddaad53bf27689063a90a3f3bf7b2e8d4521243a6c3964bfc1935d466b99c505c122c2dd342c8532f048ab8fead90d185e3f7f1c87
@@ -18,4 +19,5 @@ EBUILD hypothesis-6.104.2.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7
 EBUILD hypothesis-6.105.0.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
 EBUILD hypothesis-6.105.1.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
 EBUILD hypothesis-6.106.0.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
+EBUILD hypothesis-6.107.0.ebuild 2593 BLAKE2B 434f71f7fad97f9e06d3e0a459d8d724c7000ea5ee8712f382c9c8f3746550159b272d208d926d389d87c8198452c410197e55a5e8cb5fec33c8a38719d6bf6f SHA512 5447fcdfaaaa7f15efa13eabee95232a4ac40c248ad5a3c9c7c26846e1868ac1ddd62bd3c6cd8375f7a5cb3ad322ee9dbd737699069ee7f1df2bcfcfcde84aa1
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.107.0.ebuild b/dev-python/hypothesis/hypothesis-6.107.0.ebuild
new file mode 100644
index 000000000000..d401f55b2788
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.107.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+EPYTEST_XDIST=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= tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${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/iminuit/Manifest b/dev-python/iminuit/Manifest
index ad44ff970a9a..5008317d23f6 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -1,3 +1,3 @@
 DIST iminuit-2.26.0.tar.gz 2945757 BLAKE2B 361c84731ab3ddb01d940d5082b7170cde73ee1f1015724ea78e8dc9d910dcf4614c2ac7eb508a7efaed2abc259b5ffe09103ba921cd3f29c56daf227226e54f SHA512 6caa59c1dd3446f650bae490ef2c24b3f512284745d75e1acf714a3c440964017a68455fcc008b4176c5cbb9a4fadfc699bc01c7734a5b94ff521fe24a1b579a
-EBUILD iminuit-2.26.0.ebuild 1217 BLAKE2B eb82bf817bd10efff10e02426655c7779242f2f060747d945c8fd80ca6d8bc471fa87be71b49b389d1d710c36a66d19768cbd3078b12aca7bb9336dc2122a5ce SHA512 bd7a8c453a5f4f7154e74d792d31f4cc94097a8613de9e295556beff07c571febd8ce19294c0b5fe3353427e2ac1e1df6f9039818175a3422733b8ab3b18a247
+EBUILD iminuit-2.26.0.ebuild 1217 BLAKE2B 1924eda8e39a5aad4bf1cc8a5e662806c94284551e49c0c2fd4eea297236aa91304c0b4610c3339622b8ebd37f945cd258af9617d04b739adc6c632a9a6b0e65 SHA512 6ff0767fc5776d48336de49ddc82e272c33c31beedf680780be5a36496ea993685c15bf77650f288a7aa5f3e50040fab894eba47a539aa994e8bc98460707dac
 MISC metadata.xml 494 BLAKE2B c97d7fad530773c29b5e723843f13c8305aa1f011e678ad4e9625181ca633c1dfaa3847cb7b3aa09433b6ce665cbf4eb39fde7f80ead402292bc75bb8442beba SHA512 04413a2cbdc7f6843f89560a519ccdb00bcfcf0c9254e9fff7a8901ed992cd7121ba052191399fd60f76f35e495f84c2297acd0a9a1898d4fbcadb7a60841d99
diff --git a/dev-python/iminuit/iminuit-2.26.0.ebuild b/dev-python/iminuit/iminuit-2.26.0.ebuild
index 2de31718495a..c9795273e9af 100644
--- a/dev-python/iminuit/iminuit-2.26.0.ebuild
+++ b/dev-python/iminuit/iminuit-2.26.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=scikit-build-core
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake distutils-r1 virtualx pypi
 
diff --git a/dev-python/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index 4fa1464054cb..adb305d7abfb 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,9 +1,7 @@
 DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
-DIST importlib_metadata-7.2.0.tar.gz 52330 BLAKE2B ae781c9f161ebb52c862352aa460d071cce7c410747bb3ed0a3e7a1166aeb2a071ea0d17171b52e11ab6b60e6580f81b82a6c49a028e5bffece9720e628198e1 SHA512 0e39394b6e91970bf6777a5242ffa1d91524798eb2c8c365fa66099d52e5071f0daae39aebe03e2f5d2533e671792ddd1a342a2f10690df565ef39e251b3d0d7
 DIST importlib_metadata-7.2.1.tar.gz 52834 BLAKE2B e0225aab9ce4dc1049628bdc36dc62db975759f5e963842005ff11dde775a58aa9ce4e479073e8f427da6c00f2836d017ea2f7e37953c090fe36a8e49da5425c SHA512 553cf9e490f2a0f5587ebe8c10ae28f1d692c15b60537f73d07e4e2ee78d6e6de72275ab4f9f1fbe8994dabb525f0004afbd5d232b00f1cb9e2b01f2c8c14e8a
 DIST importlib_metadata-8.0.0.tar.gz 52667 BLAKE2B 5ca77157938dcced0c32a526e760a2d29bae5c34fa5a8f5711f3746278a9843ca85d82405eafe18821b5f7956bf75cdb2b619db903be8de96d60462b4af7fb62 SHA512 07245e6ba3f47ecc7ff4201b2dd24e6970317fe7ef0a39d74a66de180269f480c09e12601738c7c11e720a2e7c78347871ff83700c7f796a01fb1a12c8e46ff6
 EBUILD importlib-metadata-7.1.0.ebuild 1409 BLAKE2B 40fa82029d088d926cf55627552ec35c87c3f55d1d484f621a963e2eac254af36da29f12426272eb1a75f928094bf346aca202c6facb24d3812b115679d6989a SHA512 13007ef3e4e4d1caac3dffb2f80bab464edaf2baf85f8eef785ffe84a0f7e0cbe862067994c8f9639e60028e2e96a2553fda7a20e4454831f977ab0fe16a25cd
-EBUILD importlib-metadata-7.2.0.ebuild 1417 BLAKE2B ea90c07b3046918980c8a47f301adef126fdc93f0d009a7d5ca6acdce537e41821be09b8a85037544f9ad91d1c09f41cc2fd6c39cbaa1cdcddcb0bddc464d96b SHA512 ac7bec60ab437fd253e6936c03a1328aaf81fba59472335e2d41765bd2be25c0e86db5493289a4f03fe31b1f23db1c7e85c766f3e80dccff97ecca54f72ee513
-EBUILD importlib-metadata-7.2.1.ebuild 1417 BLAKE2B ea90c07b3046918980c8a47f301adef126fdc93f0d009a7d5ca6acdce537e41821be09b8a85037544f9ad91d1c09f41cc2fd6c39cbaa1cdcddcb0bddc464d96b SHA512 ac7bec60ab437fd253e6936c03a1328aaf81fba59472335e2d41765bd2be25c0e86db5493289a4f03fe31b1f23db1c7e85c766f3e80dccff97ecca54f72ee513
+EBUILD importlib-metadata-7.2.1.ebuild 1409 BLAKE2B 40fa82029d088d926cf55627552ec35c87c3f55d1d484f621a963e2eac254af36da29f12426272eb1a75f928094bf346aca202c6facb24d3812b115679d6989a SHA512 13007ef3e4e4d1caac3dffb2f80bab464edaf2baf85f8eef785ffe84a0f7e0cbe862067994c8f9639e60028e2e96a2553fda7a20e4454831f977ab0fe16a25cd
 EBUILD importlib-metadata-8.0.0.ebuild 1417 BLAKE2B 263e04db39e728aeb09cf18e31f5b0cdf59196915c87d53b4757e1c62cc79ce698b7bf6b31c8be4580d921042db153a95d5ab8c2941b3f1d374bbcc62a2b6814 SHA512 b4dd19290acbf164d024e073f27ff75020d67105514251086d7b23f77184f607180c4832fd0a54b637b49a28e603c9d703a6c8e2dd36d27fb7d25449d5735105
 MISC metadata.xml 540 BLAKE2B aa3ac97002fae5cb12dd2a8bab724322fa7a2ccea0b8b8b7e46a9e27e9566493b12a795e47724b703a74387b3805e925cc0b042a020e2a2e7862f74455b87809 SHA512 bc20e7317e1ea93d3d06666830bf32e00be6d50b1b8fb47d8092b3a80078a575e04c2cdbf9b78a17dbd1af23ae1d75766e62005ebf2942359ddd71867e8d9a12
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.2.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.2.0.ebuild
deleted file mode 100644
index b6c5249283cd..000000000000
--- a/dev-python/importlib-metadata/importlib-metadata-7.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-# NB: this package extends beyond built-in importlib stuff in py3.8+
-# new entry_point API not yet included in cpython release
-PYTHON_COMPAT=( 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/jaraco-test-5.4[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "importlib_metadata"
-		version = "${PV}"
-		description = "Read metadata from Python packages"
-	EOF
-}
diff --git a/dev-python/importlib-metadata/importlib-metadata-7.2.1.ebuild b/dev-python/importlib-metadata/importlib-metadata-7.2.1.ebuild
index b6c5249283cd..ef0dcef3964a 100644
--- a/dev-python/importlib-metadata/importlib-metadata-7.2.1.ebuild
+++ b/dev-python/importlib-metadata/importlib-metadata-7.2.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index cd5360bfb54e..ea28e8796044 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,5 @@
 DIST ipykernel-6.29.4.tar.gz 162958 BLAKE2B 887d33b433f5fba70273e4020a79bb511bd076fe536c04ebc5f7e838637ff120889789783f9a3a41b4669b0b51d44401215ed3feac413382b953edf9d1b6cb48 SHA512 488d43c1c9f416281b23ba0f31311c7327ef97034d6cf1776392c0f7b193f52f1434e81ae0c45759a0b15354ef9d178c3fc835c6be4408880209e41b91e5602b
 DIST ipykernel-6.29.5.tar.gz 163367 BLAKE2B ac1a48093b68a79c9b656cc3960f35ae2e28ac110b4a560b7434b853e37e505034d7822fc2d6557f03e1f82a260abba53cf53ba9dde4fc6fc468fd65fb46875a SHA512 271232ad6168ff00d6eb729bb38804f6a030b85be9bd75341b4af8ca1feb9f3c6b088eff77f4efcc503512559c93f1d78c13904089b7acb5205c4039daf0cea0
 EBUILD ipykernel-6.29.4.ebuild 2343 BLAKE2B 3ec06294d5af46f6752f5ee695e389ea19c2d595cfbf360a16bfd38e133412de1bb64cd9f5537f32e460a7d11b9d4cd1bc85d743efb2c1d13736d6e26dcdd8c5 SHA512 3f135feed7c0c520411ac6588ef410b477adb4125d00e0cf3c15b91e3ae3cbbae287adde418269e1d9747aa1f28addec0463d27e378e39d2aa10a73889e6ea58
-EBUILD ipykernel-6.29.5.ebuild 2351 BLAKE2B f0dc0aa3370ef19a53f1ec756e9bba6170b05dada87529d1e21f72c506bb664d1e7f640e46724f678a3b9468d73a78da6b88013096c98a1bb3302e36fb22ee0f SHA512 27c5babacdf79b4cfdfcb86798673b2faa35bdb663d6611f24264cd90f70f5e1287ffd210299fe35a2a613d51b72fe247e87f23db5722e61fc403b6a8bc804b5
+EBUILD ipykernel-6.29.5.ebuild 2513 BLAKE2B ca98fc4e0c7169951ceab23922bfdae6c1e1fa9496f1a2203263e6d1dab7219236f18b7093d420ce1efd2fd794ec9c136d6d4129b901107d2cdf075b63381be6 SHA512 2451d227d94dbf1b0307914a4f76f6047dd8321e362965456d1d99d5648d100eb69600550c019fe494a61467e897828d46b53b072f196ce1c19d4ee51b4ed588
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.29.5.ebuild b/dev-python/ipykernel/ipykernel-6.29.5.ebuild
index 90d6f878ac72..383567063ae2 100644
--- a/dev-python/ipykernel/ipykernel-6.29.5.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.29.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi virtualx
@@ -34,11 +34,15 @@ RDEPEND="
 "
 # RDEPEND seems specifically needed in BDEPEND, at least jupyter
 # bug #816486
+# pytest-8 runs a small subset of tests, we allow newer for 3.13
+# since a few tests are better than skipping entirely
 BDEPEND="
 	${RDEPEND}
 	test? (
 		dev-python/flaky[${PYTHON_USEDEP}]
-		<dev-python/pytest-8[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			<dev-python/pytest-8[${PYTHON_USEDEP}]
+		' 3.{10..12})
 		>=dev-python/pytest-asyncio-0.23.5[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/ipyparallel[${PYTHON_USEDEP}]
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 5ca4636d69f5..d99f73087193 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,4 +1,4 @@
 AUX ipyparallel-7.1.0-test-timeouts.patch 2067 BLAKE2B 577b33b730f110775dbd61fe02d06834fe3c4eb3c730d6df16730bbc877402e9f4756b74691bb977c3892ff981d374a4d1b439bf2b682e76c496ce8502f26583 SHA512 2d0f9fb4966be06299b40cd2ad974b4f94cfedea84fcee38b900ce4596b15cd3963068fc374aa1c0e54765b92d68c5233965fd2d3696bba5474da24917d1f009
 DIST ipyparallel-8.8.0.tar.gz 6800541 BLAKE2B ae40aa60eec2c07bb1ecce696df9f8429293e1602bced8e6220e6a93b780b44131a4fcbd01c921952cae9945fc509f6084570b96ce0c3da7ce4f0cc1d853db1b SHA512 9b0a03e1f581acbe56e3b51331d9fb97c422469e1d93348e6403d7c95a985f1f5a2a390645222fc4b60c0027ba168933679662561adb618d19ae7d680a2bb680
-EBUILD ipyparallel-8.8.0.ebuild 2499 BLAKE2B 070571e2e97b6f55b176e3fa60bd333634228ad9a73c7fdc9aa1cf92a57c576f189926d1172b832df3e20927b580be385bd5e07cdf456339de9b1f0703056161 SHA512 b7f8b807503e23f6f4da74b53276ee070491c7efbf0340308dcddbd27fac2013cbe19d4f7ed5384e826febe810efcdc38293160d661da3e8e2ba19b8b368f121
+EBUILD ipyparallel-8.8.0.ebuild 2499 BLAKE2B 9f5e023c80444f046c942493165525f54bb12ce02f832d513d2a6021214eefc8c78101312c014ed1f6a5530aced4fa5329381caf1a9f9d3c8d323da9961135ee SHA512 1078f9a37a0b0ae316f19470f3d261c3d096b02f981ad4a473b6a69eb1863066b6475458fc4423d29b7632ca43d018818a2da81a01e22fd8694388cfdc81f58f
 MISC metadata.xml 531 BLAKE2B 92dd755dd3036f653f24eda893979487b8d5bbf3c369f3f10c3fc2e69ad6aef03cb6eca295bcb8c6f89f0838780c20132bfd2a33bb38b56b227e97258447c2e0 SHA512 fcd131d18b012d1511468777dd72e07ed28a514419923911082229c0256b9003d9afe2048b6c339cb5c94307026b52bc4e9b6781d45660178d18385d71af8f21
diff --git a/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild b/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild
index f0c25c8d495a..914e39f18627 100644
--- a/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild
+++ b/dev-python/ipyparallel/ipyparallel-8.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 optfeature pypi
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index d3db0bf5d4f1..135508ed43f1 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -7,5 +7,5 @@ DIST ipython-8.26.0.tar.gz 5493422 BLAKE2B 2d05630d64d932190bf07c233e4241f5ce483
 EBUILD ipython-8.24.0-r1.ebuild 5033 BLAKE2B 411304291881059c87351861c7158db7cd0212b7d30055a5569ba4cbb0880c42062444487626b3f8bbc4edc7b964e12369c8ece6314e0db309af9818943364a0 SHA512 37f45ec0d1093cb27c2f8cb48e61ab9accc1815f4be15a193090cde1e626b238255d73d8902efbbc04b0c42fe2552f3762401d12296b4c9061f9ab871aa019c4
 EBUILD ipython-8.24.0.ebuild 4896 BLAKE2B d1bbab9880fe8d356f8d5c753c7f731ecd339272f769d025f7f6f1acc40b9776f612b6586334038ed86334fea8eb8a5f65d9245c9550644a79461f7731a71471 SHA512 aba6aa15e071dbd616f8ada72e0ba68424857b2fe58152e2697d920bfa77036804dda56155cd40bdf11a1aee6ecb29dc05cbc5f22e27d2a4af91a655e3de1e82
 EBUILD ipython-8.25.0.ebuild 4239 BLAKE2B 343f5b0e5fd144064cb113717ecb9d070ca776e919e2adf90315fcf3a21b92acd2a4ec0aadb6dd7863da6cadb73eb9695af9f3ed21d59edfc9e19b3709c8ac12 SHA512 799bac0e034193a3be817973a2d469fb37eb3ab685bcfe12761b7d324e3ae8957517cac2ff20b807dc07b337e7a94529190cde82390e6c0e8b69ba3d275c04e4
-EBUILD ipython-8.26.0.ebuild 4286 BLAKE2B 6d4084ac2868b467be8eeefc6bb2b378f5f60dc6422f94650f16e6c5855439ca3e5e0532e45e3a5aaa30ca2461f073b14ff7a23dde142aebe1e08fdc8c0f4d80 SHA512 246a6d8bb6229c7ddc9edb6eb1b4aae4fbdcf6aac9605da4813676501b98083ebe0d56cdc1551da9dab42b865c29e57a0b64661a1d3ba78219a4e35ca3708ede
+EBUILD ipython-8.26.0.ebuild 4491 BLAKE2B 9a75adc5aeeee50a1cbd6315d7b7411b6cdc93fc3802798410449390d1c7f33028d329c9e78168dfb4b3b0104e0eda8952ff9ab01661443987683ee25735cdeb SHA512 a47fa818d2f346d00a3ad6c7373e595679094f0ce2ccfa2eb0073294eeb85b057aa2d52b3fe47e5a38982db48265086c07ea7a53971fbe25f75e8093b31e4183
 MISC metadata.xml 2802 BLAKE2B 2fb6773ad4ef10d531f978e3ed40f6d99cf1586ec6d7cf2bf7e60fd5d640d082a0946651e0a066993320ffeaace3426066ca24c325926b62125ae91816707128 SHA512 965c3e36e05475d9454af8219b84e080d4c83d775f8a7e20a4951a82246d672c46fd3cb1fff5f8664d0ce8e8fcb846de6f15abc4575db3a6b7d87209194bcecc
diff --git a/dev-python/ipython/ipython-8.26.0.ebuild b/dev-python/ipython/ipython-8.26.0.ebuild
index c5cb7a5fe775..b492448b16c1 100644
--- a/dev-python/ipython/ipython-8.26.0.ebuild
+++ b/dev-python/ipython/ipython-8.26.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE='readline(+),sqlite,threads(+)'
 
 inherit distutils-r1 optfeature pypi virtualx
@@ -66,13 +66,15 @@ RDEPEND+="
 "
 PDEPEND="
 	$(python_gen_cond_dep '
+		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	' 'python*')
+	$(python_gen_cond_dep '
 		notebook? (
 			dev-python/notebook[${PYTHON_USEDEP}]
 			dev-python/ipywidgets[${PYTHON_USEDEP}]
 			dev-python/widgetsnbextension[${PYTHON_USEDEP}]
 		)
-		qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	' 'python*')
+	' 3.{10..12})
 	smp? (
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
@@ -107,6 +109,12 @@ python_test() {
 				IPython/lib/tests/test_display.py::TestAudioDataWithoutNumpy
 			)
 			;;
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# docstring mismatch?
+				IPython/core/tests/test_debugger.py::IPython.core.tests.test_debugger.test_ipdb_magics
+			)
+			;;
 	esac
 
 	# nonfatal implied by virtx
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index d0319a0604f6..b626479df898 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,7 +1,5 @@
+AUX ipywidgets-8.1.3-py313.patch 1206 BLAKE2B 3f0d7066f024c96a39fce8d7be0804e282ecae77bf9bfd4dfb79ba6cec0d2cdcb0ff649051acba0d91da24516993973337522d51ac4264ef8c810a3af83809fa SHA512 2347ad73122ad62d6318f08f5a80fabf10dbc20b168c5fa010e350c1c1b28f919ffc52b6b3ff0a88802f9225e1a82ba8911412e034c9b9145985db626d119aa9
 AUX ipywidgets-8.1.3-pytest-8.patch 2981 BLAKE2B b6a5f16805d7bc4d924974e1372c767abdff4131274161ea64cd4ebba623f46a483458bf2b69b5aa7e99562df5c3d3232868cf3b0b46cd5b11ef2b8c7273022e SHA512 822498589557c5dd05e7e8bb62e339d758627d4cf9c78eea5471729845af46c323a572657f7292ea79d813942c354002df0fa59dc296042ed06d37df3c736fdc
-DIST ipywidgets-8.1.2.tar.gz 116492 BLAKE2B 0fc8283b332447cd3659d39d4564e2e794678169c7bc156660f3478251c4df23de1719e4fcf9651b9766506edf359bdfc803b1450520a3cbce290b39bd95bd3c SHA512 59ddc92bb9b18b6cd36b1499465e700ce9b11010e2d51cdf0a820b36efecbea1facab42ced2f61de312319f4fd4e672bb27b248d40ee0088f3b58acfd102ab61
 DIST ipywidgets-8.1.3.tar.gz 116515 BLAKE2B b7a11e7078ddbd99b8713fc3aa63c78118bf00b64c376412c608a622fda1e7d0430accb0959a56a474d2eeba4b5ce531255b52bba591f2806833644e47f2a7bd SHA512 3722e3716f367c6dce88c6ec401d23240c214793672ae76a12b672f77c7c801775d3253e1202749e54832d9dc13e4bb5984ec57e21607f12c22aced8874538db
-EBUILD ipywidgets-8.1.2-r1.ebuild 1306 BLAKE2B 95225f97749e6497191c66aeb9a48ddc61b45cca15c071db6da3757a375956a3182c4be2268a09e770a65ae76c4dc62c2758ec72b03e1d103ae1d48838eafb5d SHA512 29c58ffb639815cdb9c47c08193882ba01d526a1836c3a43dbe636e31a20cbe4e626dd52079b03456bd4a8d523b8a8da5efeb433aa2d22693dcda866da278746
-EBUILD ipywidgets-8.1.2.ebuild 1383 BLAKE2B 5dbb579631c4b7fada8a97ac0e333e30b9e255374be0615064dd74153cca62f1265c430c091511aba937fdf28754781838230e4b52dd638176ff878d318f9a48 SHA512 bc55d8828f27bac1e13f5c5c6c564fcbea801d6226ba0c0fad6a3ede88462c433e4c20bb162845623c467f177065b303a3dc537e8c7183b2fe29078b8904dba1
-EBUILD ipywidgets-8.1.3.ebuild 1397 BLAKE2B c9f0d4ceeff0aacaf43abb5146beb55a6f16136d5567635ec21db2e6e9e11185ddd800f6709c0a9f52d569c118c18ece2ae515fd7178863be30ff364b29ab985 SHA512 5220800bd1d798c0902a4a10c0f7a3a488946907b1d773070c19cec712fc8388167e89243c12f7feee6c27bb84c88725fa3d9258a6b065cdb85e827b7be5bbe5
+EBUILD ipywidgets-8.1.3.ebuild 1494 BLAKE2B 514b570d9e5f398ee17789fb4ba6e0d06c512a1bf9da1c57a6224ff2ad2e2059c06ba491116c59363e0ee7741aa25adb8617c2fd9e185b2200bcf8138d6806e2 SHA512 585ed04863b0cca7d4ac51926aef088235bbfe22b73e69ed6d71967a4b787aa90ad873e90f5a483298acdb0d47d82657ac36489bbfe089275e8f66606ca12172
 MISC metadata.xml 537 BLAKE2B 1f3b91be328b958870a72b5ce438c3e5bf67efd072b59dcb5ae77a9b89334e726af4fe8771221a7b728905cef4175cf7e0a49b11c651a7c0520b5cb032085985 SHA512 cb8092ea7a06e309a26abb78f5ddfd4a91f416e15374d2b59fb5086a64cc13f3dd408e18caa6719d12b1f18f762469a72a1027b2a047db626c51d22a5f304e54
diff --git a/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch b/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch
new file mode 100644
index 000000000000..c8bd3e22a8a6
--- /dev/null
+++ b/dev-python/ipywidgets/files/ipywidgets-8.1.3-py313.patch
@@ -0,0 +1,30 @@
+From acfa9a3539648a04b11331ad07cab4393069f87f Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Tue, 18 Jun 2024 11:58:07 +0200
+Subject: [PATCH] Make tests compatible with Python 3.13
+
+Python compiler newly removes indent from docstrings
+https://github.com/python/cpython/issues/81283
+---
+ python/ipywidgets/ipywidgets/widgets/tests/test_docutils.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ipywidgets/widgets/tests/test_docutils.py b/ipywidgets/widgets/tests/test_docutils.py
+index 1f8b09aa34..462293326c 100644
+--- a/ipywidgets/widgets/tests/test_docutils.py
++++ b/ipywidgets/widgets/tests/test_docutils.py
+@@ -15,7 +15,7 @@ def test_substitution(self):
+         def f():
+             """ Docstring with value {key} """
+ 
+-        assert f.__doc__ == " Docstring with value 62 "
++        assert "Docstring with value 62" in f.__doc__
+ 
+     def test_unused_keys(self):
+         snippets = {'key': '62', 'other-key': 'unused'}
+@@ -24,4 +24,4 @@ def test_unused_keys(self):
+         def f():
+             """ Docstring with value {key} """
+ 
+-        assert f.__doc__ == " Docstring with value 62 "
++        assert "Docstring with value 62" in f.__doc__
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild
deleted file mode 100644
index 36da16af7d22..000000000000
--- a/dev-python/ipywidgets/ipywidgets-8.1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipywidgets.readthedocs.io/
-	https://github.com/jupyter-widgets/ipywidgets/
-	https://pypi.org/project/ipywidgets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-4.0.10[${PYTHON_USEDEP}]
-	>=dev-python/jupyterlab-widgets-3.0.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		<dev-python/pytest-8.1[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/ipython-6.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/pypy/pypy/issues/4892
-				ipywidgets/widgets/tests/test_interaction.py::test_interact_noinspect
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.2.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.2.ebuild
deleted file mode 100644
index 8e184bc948ff..000000000000
--- a/dev-python/ipywidgets/ipywidgets-8.1.2.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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="IPython HTML widgets for Jupyter"
-HOMEPAGE="
-	https://ipywidgets.readthedocs.io/
-	https://github.com/jupyter-widgets/ipywidgets/
-	https://pypi.org/project/ipywidgets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
-	>=dev-python/ipython_genutils-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/widgetsnbextension-4.0.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/ipython-6.1.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# upstream hack to autoconfigure ipywidgets in jupyter
-	# we don't have jupyterlab_widgets packaged
-	sed -i -e '/jupyterlab_widgets/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# https://github.com/pypy/pypy/issues/4892
-				ipywidgets/widgets/tests/test_interaction.py::test_interact_noinspect
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
index cbbddfa905e2..2d8b2a1677c2 100644
--- a/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-8.1.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.3[${PYTHON_USEDEP}]
@@ -43,6 +43,8 @@ distutils_enable_tests pytest
 PATCHES=(
 	# https://github.com/jupyter-widgets/ipywidgets/pull/3903
 	"${FILESDIR}/${P}-pytest-8.patch"
+	# https://github.com/jupyter-widgets/ipywidgets/pull/3924
+	"${FILESDIR}/${P}-py313.patch"
 )
 
 python_test() {
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 9a5968d8710b..5a819976f9f8 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1,3 +1,7 @@
 DIST irc-20.4.1.tar.gz 91229 BLAKE2B 05518a19821016e5a10173a5ee20a0d3cb6047eb87f4a153331bc8458abb365d27cde8ae02b1e7c12a86957adc7811511f61c516bdb1c6f0f03f4a5186524eb5 SHA512 e57e18c7c8111c883737cbaa176e0e895c182e43208ff784abf382bcab0b613287076ec35cfe266d78418e27b38a6443344b03bd90ea768c1c50ce0c32453d89
+DIST irc-20.4.2.tar.gz 91206 BLAKE2B 4a2b16581bc863774180e9fe67b564be50cfa3ea192999153426bbe883b5360ccaf053fab6e7a9fb47262d0a7f3f97a2dd2eab8f2a6f16223e4fd12b0f333f45 SHA512 18a767ad99cbc387b9c785da9334a96822092eb90e7fdb913af92cb7ea973fc2e54cb59942a025e33630ff3a78b6a52910a92c053daa4f25ef37d851f58a62e4
+DIST irc-20.4.3.tar.gz 91219 BLAKE2B 8a18c569489f8b4cbc6d631aad410705f3b27d764c7acfc862daeb57626cc7677e6b3f7192fc0cfc8f1d3882f2cc200d4895192282e98aa428ca82286020cf95 SHA512 233e6a57435194de4365fe619c43316c5ff588b1ccda16351af841469d5902e9217911c50a464bc12ffd6b7dd5cbc5ff77ab5650d1beb73bc59a0d39b3436725
 EBUILD irc-20.4.1.ebuild 1145 BLAKE2B 7757b53ed1afcd56763c93fcd54fb187cd1c417a20a886c4809e3e09c434c1393190a6559babe6a7281c167bc70f247eece8c5602730688e6ed9828d5a57fb5e SHA512 5caae8cbf602eb3ae4d1901043bdce7d1987782a8dff176744bc0c5d8fddab9dcf16989c12ab06d9cee970392a40b1edce7b723bbddc80634aa05f98b924281d
+EBUILD irc-20.4.2.ebuild 1040 BLAKE2B d2918af426623d9679cf98d53518eef7c41f1ef37ec6c803efb37391f589c4f2cab4f0f9ffce63358fcad005191fbb0ff763de92724318273fd3f53562f4756a SHA512 a16084a9180c9f016e7b4dd284f36b30805d2a599dc25a30a83d33c5915428216a59de223793e6d72ad029179f55b57909708650259db15f88353e8aa3bc15de
+EBUILD irc-20.4.3.ebuild 1040 BLAKE2B d2918af426623d9679cf98d53518eef7c41f1ef37ec6c803efb37391f589c4f2cab4f0f9ffce63358fcad005191fbb0ff763de92724318273fd3f53562f4756a SHA512 a16084a9180c9f016e7b4dd284f36b30805d2a599dc25a30a83d33c5915428216a59de223793e6d72ad029179f55b57909708650259db15f88353e8aa3bc15de
 MISC metadata.xml 737 BLAKE2B 403cd376ce9a723ab2052f9a2622ab29fa48350a68ff9e51dd7d73b295aa90357b110a96644ad3cf1dee8381176a2a44d2576687b5764faf873408431b0752eb SHA512 351d9c81ba9516dbe1738d5130abb6250ccf47f4a518443823e918c0105cd8873595fb9b5016d82704639b1d690cf702ed75f24cb82b4f43a1efe2f659cdbee8
diff --git a/dev-python/irc/irc-20.4.2.ebuild b/dev-python/irc/irc-20.4.2.ebuild
new file mode 100644
index 000000000000..0a2a0ab2df22
--- /dev/null
+++ b/dev-python/irc/irc-20.4.2.ebuild
@@ -0,0 +1,44 @@
+# 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="
+	https://github.com/jaraco/irc/
+	https://pypi.org/project/irc/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.10[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/irc/irc-20.4.3.ebuild b/dev-python/irc/irc-20.4.3.ebuild
new file mode 100644
index 000000000000..0a2a0ab2df22
--- /dev/null
+++ b/dev-python/irc/irc-20.4.3.ebuild
@@ -0,0 +1,44 @@
+# 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="
+	https://github.com/jaraco/irc/
+	https://pypi.org/project/irc/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/jaraco-collections[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
+	dev-python/jaraco-logging[${PYTHON_USEDEP}]
+	dev-python/jaraco-stream[${PYTHON_USEDEP}]
+	>=dev-python/jaraco-text-3.10[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/scripts"
+		dodoc -r scripts
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/itunespy/Manifest b/dev-python/itunespy/Manifest
index f02ab70b94ee..98492d261371 100644
--- a/dev-python/itunespy/Manifest
+++ b/dev-python/itunespy/Manifest
@@ -1,4 +1,6 @@
 AUX itunespy-1.6-setup.cfg-description_file.patch 206 BLAKE2B a2df4fa4391a17e823cb0e389adf33a6b9045da604663007d4d43c533bc992244306f30f282a0022963882f6237f332e547186ee4fef15bab68e45a70d8c1c19 SHA512 3cfc66283030f9a2caae086afaedee858cae4a322c001fd7716e7751a6e3228c8d059a0f68a15ff0f508d0f1b54e61d38c1fd3b4b5e58aa276b0b6a8a9a114d6
+DIST itunespy-1.6.1.gh.tar.gz 10139 BLAKE2B 41eac172835cb440016a5d835f188e9cda72f3291983e35f44e2f2c9ceed6663784789761e88784e42f4586d5dcd0471661a8bec7586ea1b429d54419277aefe SHA512 b30dac3d498fe0e108bbab7480c45245ee18247c91b3b685761b1e6df7f285e93777080a1aced2f436837d48b122c3f7b91274069529a5370ef9cf158b0fc4eb
 DIST itunespy-1.6.tar.gz 9724 BLAKE2B c46ccfd00a3dec1772499d3299dae7c20355628176db4e660aca0b2b819b81423ac78ce55319c822c15e1c4bf0641c2fc3c4d9ba94dafad1ffdeb503be4f76f9 SHA512 d91428e23a71bdbc62e6b8126b379aa48f06a365056147cf30eb4fa6132243d35c8a8d6dc536174a53f206bf7bcb4dcebb5a3697fac0fd88cbcb38205202ad81
 EBUILD itunespy-1.6-r2.ebuild 734 BLAKE2B f9e2c68e02e3f6d6acd32e6a34b710564b749347e65685f1a5da6e0ac0d4fb69abea19493ffeb72acd9fd5e8e2e8fb66ea9c36d33e1fbe7d9b4cebb69f5a43df SHA512 8974df0b22459b52b20adf277c4bd85d19db62cb46a19b1a405ce196485562213e831e6a25ab82b16b0a1db49b192e034f6cb2eacf001d075444c1ae8dc1131f
+EBUILD itunespy-1.6.1.ebuild 746 BLAKE2B e1a9f5a2351cbba1065c1bd466e150eee8a88666f625feb264f37c93f751cfa575943527e044819e729ef864ecf17394476adc60afafbc06380f7a3bf0263d6f SHA512 6c1eae387921dc64062a0bef3b940c3e29ce47a0f17b8a9ade2b8c6bf7ede6589b6a6060d736492025b8dbda1db97e104088031087410578ee7baa32299c8f6a
 MISC metadata.xml 564 BLAKE2B 29dfe4a8497f0e956f257c59693eaedb4d2b4bd5e10c339448bb810849a6b38cb0b364eb98949f2e542b67052e0107241a0507064a1e9770baa3c6f0e6e188ab SHA512 c8ccf6bd190be7ac92a216ea860cda37e931dd612869117a4570788b27dfb3d3db3e7b63c1bb37866b213ab0ccbe74bfd584028fdc0802310bf25672bb6e7a43
diff --git a/dev-python/itunespy/itunespy-1.6.1.ebuild b/dev-python/itunespy/itunespy-1.6.1.ebuild
new file mode 100644
index 000000000000..828f19fa8547
--- /dev/null
+++ b/dev-python/itunespy/itunespy-1.6.1.ebuild
@@ -0,0 +1,37 @@
+# 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..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple library to fetch data from the iTunes Store API"
+HOMEPAGE="https://github.com/sleepyfran/itunespy/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sleepyfran/${PN}.git"
+else
+	SRC_URI="https://github.com/sleepyfran/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	rm setup.cfg || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter-client/Manifest b/dev-python/jupyter-client/Manifest
index d82260b3f9cc..65d9a5175f7c 100644
--- a/dev-python/jupyter-client/Manifest
+++ b/dev-python/jupyter-client/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_client-8.6.2.tar.gz 341102 BLAKE2B d9d04b6b965aa34f6b1dd228d1389a36509415e57cb66b4aede37963b6a48f5133c48e8343bbb54bd775b3faa59db8b248f515caca9dbbe594a9d4ba93a668d7 SHA512 ce0ae60b083ce0a37ddd0249d3caef0581ece61927ae685ee80b55d9431557352f1dce6cf81894d39343087b15cc6ac3449abe88cb4119a0d03824b3642f84ff
-EBUILD jupyter-client-8.6.2.ebuild 1561 BLAKE2B 3989da8fa7be0aaa6f313582d2c23aecd337d49d93dc7943aa83d217ca9a9a17a79b08fe416d5b00cd404d275265be047fde60b348545958e97d2b91ca4d78c0 SHA512 adc99b237fe06672d79365e1a1fb89eda2478b5f77b31248ef511a3e8a2042217d5c233fc13e119d1d65860f2f5e6029e99614daf880ae87e83643cea01dc98d
+EBUILD jupyter-client-8.6.2.ebuild 1561 BLAKE2B b07b173b8cb6b95d38f618142049b2aa9f7bd79848437b07e2945e2f72472d2e88c3ddf7914dd72ed3b18c96eaa5496d46027bbc13128d5151c5cf32add8ef5d SHA512 4052905dc407df476ea949e672a206cbb6e306fe941a61d763020ef9b67b84c8d9a563f97059f3e09cb569e805774c51daad3d276312d939ac1ae7ac05e924de
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild b/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild
index a7cf70811199..f26eb205da53 100644
--- a/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild
+++ b/dev-python/jupyter-client/jupyter-client-8.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
diff --git a/dev-python/jupyter-server-terminals/Manifest b/dev-python/jupyter-server-terminals/Manifest
index b2ebb9e07073..33a96558d3f8 100644
--- a/dev-python/jupyter-server-terminals/Manifest
+++ b/dev-python/jupyter-server-terminals/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_server_terminals-0.5.3.tar.gz 31430 BLAKE2B 1633bd67b775a5d76870530705d13adea49bd5f583cf93a7cf7e713d8fa75e50012ff5c1bdd9b23ad0f3636347618cf01c04e1c546172dbe1031b507b597fb25 SHA512 dcb9d460b9f2fde1a2614dd202c25329bea5870846d0431af21659ab4fef2ea1671beea73c8f61bffb224984a39eb0b69bac12244426f940d9bc6a82202393c9
-EBUILD jupyter-server-terminals-0.5.3.ebuild 1029 BLAKE2B 07dd4df3214bed66476decfeb733d46c594af8776aa814a1cdb8de84381eab9f68f3c57cffda8431495f0abd60cd965ed25831836fb4c9d5bef88134adab7063 SHA512 09547fd4fba28702f304b8873ab16e3510b298eb5610b74565518fd60ae5e88bb2d9ab339c3498bcbbd42fc7fa75e0ec98e8375834cdee5b3f3da8e00cc8ac93
+EBUILD jupyter-server-terminals-0.5.3.ebuild 1029 BLAKE2B 6c8c6fc1908d3e6b7b30b11985726d0c01d9ddcf04529a6749de0bd8a61dfe040e829b2bdd818f1a175434550be1a2a2d50ea2cea655c23a7ea5ccbc54f03d8a SHA512 4c2eff7d22e021853604b38a8a68aca24c7c15d80392ae880c59c8226808e1dd58b07a4fbb5e295f4f8b0af573837f6bf1f01a545dcea1c5be70e31a1d70048e
 MISC metadata.xml 457 BLAKE2B 6667133607998f468774a24e818962e037f937805af2578f0b759be79421abdd389cba957d79c8d7d4039f1dc6698ca1d1e08bcada91d4aa503bac21c041df9e SHA512 9ae0f7f3ab2bba3aeab9eecaac56995cba07f4c55551351a290b25550d6a4516432a73616a850ac7e7bede45a458ed8bec7dccbde7322015239062efee4b4e40
diff --git a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.5.3.ebuild b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.5.3.ebuild
index 64ae1a8286a6..303dd9d52756 100644
--- a/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.5.3.ebuild
+++ b/dev-python/jupyter-server-terminals/jupyter-server-terminals-0.5.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 0c4f42a8ced1..6de56f9e8034 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_server-2.14.1.tar.gz 719107 BLAKE2B 2b38fbc709346bdb8c2734dd5f22cf958f0555660af0df23b08b6af8b3dee9130daa0538b7e78c5a0c63d66511a973babbb544c638d1aed267368ebba7d10c36 SHA512 1770fe0fc34c164952a74b75bf765fc737ab59cc52c04f61c0a28d5f6c747587ddee4c6cd3dcb90e2ccb72029d0f52de321569ed7a55bddbad50326e728b53fd
-EBUILD jupyter-server-2.14.1.ebuild 2424 BLAKE2B 97b61889c2057706d81c8100fa8369be0dbf06c41da2cd75691a50d6f06116e84e238ee89138443d127a6c9f3e640061930cfaf8aefeef79c29d3b3f1b467509 SHA512 16839eee76d4af727c07288f59c747bf72824cbfae12347931e9fb65be7e843723162742f1700ea4d8dd074d6232430d7ed38ec192b049771466ad18337b90a3
+DIST jupyter_server-2.14.2.tar.gz 719933 BLAKE2B 2d8a8a283b394ceaabde14b2a997fc71d7dccc80a284ef7770d948634e48c8689c8393c77992d685abd7d8766b8608cfd279a47b5cc9569b6f6c98d416f284c8 SHA512 ea8fbf93c1bafcdb77c95cc65e2e7c6e9d010add7fb8b2b1d4538f415c4b39a89cf18a58795da05dd41a838fc1057fadde3f68d9bc73d532aec76ae5cab357a7
+EBUILD jupyter-server-2.14.1.ebuild 2424 BLAKE2B 49d44873d973177ade99dbaf10b5cc799cf13af997a1072c375f00405d81c77add32364e6f0edc2b316a483ef9bc9d71d0794ee63b1113571b01eddaa78502df SHA512 5dc36169a547ab13eeba956697a040daee3d5e8aa6571c153d7904081ca7c334fffebf58daeaf3e579acaad0041d8745861bc82d4fc866b4363d776192a8daa7
+EBUILD jupyter-server-2.14.2.ebuild 2431 BLAKE2B c2d47c67fd3b95b95ec4dd4e067481dbbc0de7a0d72732737df7bf910d6ee01c7c1dddd8f37c1cba9a1c7675997952294090a8ea55e1888285d352a090ea5338 SHA512 e628e2878e50e75016b8c760f8e0e663cba45ad1cc510d9f03a4a3d2a13147babdf9b9e62a9cefa08df93b4f29df139e806f065003ee6692fcb7645bb23bf934
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
index 29564bc55704..d9c36c44ae83 100644
--- a/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.14.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild b/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
new file mode 100644
index 000000000000..f3b40005cedc
--- /dev/null
+++ b/dev-python/jupyter-server/jupyter-server-2.14.2.ebuild
@@ -0,0 +1,75 @@
+# 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..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/jupyter_server/
+	https://pypi.org/project/jupyter-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/argon2-cffi-21.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-server-terminals-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
+	>=dev-python/overrides-5.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/prometheus-client-0.9[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-1.7[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		>=dev-python/pytest-jupyter-0.7[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# This fails if your terminal is zsh (and maybe other non-bash as well?)
+		tests/test_terminal.py
+		# Fails because above is ignored
+		tests/auth/test_authorizer.py
+		# Fails with additional extensions installed
+		tests/extension/test_app.py::test_stop_extension
+	)
+
+	# FIXME: tests seem to be affected by previously installed version
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout \
+		-o tmp_path_retention_policy=all
+}
diff --git a/dev-python/jupyterlab-pygments/Manifest b/dev-python/jupyterlab-pygments/Manifest
index 5cd06e337627..5558a75a20f2 100644
--- a/dev-python/jupyterlab-pygments/Manifest
+++ b/dev-python/jupyterlab-pygments/Manifest
@@ -1,3 +1,3 @@
 DIST jupyterlab_pygments-0.3.0-py3-none-any.whl 15884 BLAKE2B 09c7190853999513a326464de056e8aa5e0bbe02713c42a4e3dc05f67153891fef78388799465293d40b4069c2d9d1b45eaea5c1a92b10e069e4bf88308247b3 SHA512 12132631d0e35c9698c60370277325ffaaeb967314c8c4cf820045b0f6138e860682699381fce4a37402ecf0854bac344c4be22d15c1d543bebdbb4cf8f43d9b
-EBUILD jupyterlab-pygments-0.3.0.ebuild 797 BLAKE2B 8c446be8baa777322bd95d4615484f0541bd29eae2d293cbcbed0b64a977aa974e07f978c0d5e4cbefb43b3a222913571177a258a24909c58ed7702eb09dab49 SHA512 36ef1c1df7e5dc90b2f755f0cb60ee75ea34fbe61b1e94b68382710ed2e9157fcb63da3a1ec8e517333fe812b57a18021c7dcc00027e69d46bb048e992766741
+EBUILD jupyterlab-pygments-0.3.0.ebuild 797 BLAKE2B e0e2c18f81b358e355063c769687331a22c1ed52a577c09620d43de2cbf227083602a0a7d1df4a3bc98fee26cc1b4d35281d1616d8409cd2ff9c88e24b47107f SHA512 c1a1c56b7d6b113ad2a1c021d691438031d898cd38a89f55d7297852721ff286440d3dfc8940abab774333672679b4fd95d89de63503ce73f8d2e4e2c332d47d
 MISC metadata.xml 395 BLAKE2B 61c5b49ef1984252b5be03231c068df3c46d4326368f3d5166d416e20fc29e6fe8356d6e6f3767f61a05154d42f86407ebab060ebf01a742fd082e62d65469b0 SHA512 9eac2fc382341fec3e344fdfc8365e022b9890739419e8f63bdee313293acc18fe75e40234c26b649396f1e164c32e1a7cd43ea26216c24b610bf495db0c5318
diff --git a/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.3.0.ebuild b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.3.0.ebuild
index f29e5a551aaa..0d4e2c1f745a 100644
--- a/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.3.0.ebuild
+++ b/dev-python/jupyterlab-pygments/jupyterlab-pygments-0.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/jupyterlab-widgets/Manifest b/dev-python/jupyterlab-widgets/Manifest
index a3d01a5b0f83..3188baa39ede 100644
--- a/dev-python/jupyterlab-widgets/Manifest
+++ b/dev-python/jupyterlab-widgets/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab_widgets-3.0.10.tar.gz 205549 BLAKE2B 7f31ffa65a6478f4007449fd9f1ea749144eda39afe21208b934fc33b2222e605a21e1cbfd61961b48c001b780eb75425444729fec931bb7fbb7f9afa290971d SHA512 a68de696b9d8c332c796242dd72d1a0cc33944373e97c826b8a971eb558565e55f4a0a59ba437e9bb9466695755193aa95ec74d69e54628931858f524c939da5
 DIST jupyterlab_widgets-3.0.11.tar.gz 203538 BLAKE2B 8208afd3dc9e8dd36a6ab77ac20d935b53a8c200401e9e423ca154e87c50379cced5ff785dc625ead7f09aaffd9af5835151a853224abce6e7c84c6ce199259e SHA512 27e8fec4817d3e37e1976c30db21f914b11dc3bb1e0aa7c584c811b3f9a54422136c7702bd32f7494851d87108182a8a9fe11686d515f4da19ee2a8f7a930755
-EBUILD jupyterlab-widgets-3.0.10.ebuild 529 BLAKE2B 30210605fa94afba6256716eb442c6249325eb1879eb46c7925a963971c82432b8311ca66152750ef21b4cad32ecac390a0c15ad994196eb53298c350e4a6f38 SHA512 69aa62b72e068b3f2ae5e6ff314709ff458019fa14b07439a3a0adfdae9ba915af7ad75ae367f71106a17919755be7f00a4485f5a72a6db1a9ba6c95c2f31ff1
-EBUILD jupyterlab-widgets-3.0.11.ebuild 556 BLAKE2B 0b5006a3c0c12858d3ede4c885118d9c8231d84547b66284bdab54c61758c9c16bb689910188a007939c9322d8f4f9575c4b1d3d4ecf0d727749ea82d7fe3508 SHA512 bbd306f0795f4bd53340256e213a25e9971b0aa8ff58fec4006f13bccf6bb6fe38143147345fb5ecf28ff5081695cb0ea79819a570228e1d983810ab59ee8726
+EBUILD jupyterlab-widgets-3.0.11.ebuild 513 BLAKE2B e3bd125d62cc61969fc4a6644f03ca5069c080e605d5f7afd4b7d71784e7c1e34e00bc9f86a337dfaa7deeb8e849712f81e7a623c213314e78848445c56b90aa SHA512 51314797ce814ba3a2e0e310d2b47c08a91f4eaf7748663ff163ed701f87e82d14bfd316d07a1347efc251399b21b233dd5076f9d2f541265123858ba3497db2
 MISC metadata.xml 545 BLAKE2B e118a018413f28e1e793c14f26b1446f756ed0a17f4b8d7f93e3271300ce02ebffdff931356378f49c846aea0f3d01ebaa1aa13fbe4b914dfb47ca9cdff61ca8 SHA512 84e8c0c8fc095dff538d2acbe47065490228b2a833e8823e5462395aded8860472bf854389faf58ceeac758cd8d2256da58c738db6c86e22e9bb0f93dfefabfe
diff --git a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.10.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.10.ebuild
deleted file mode 100644
index aba851fa4397..000000000000
--- a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter interactive widgets for JupyterLab"
-HOMEPAGE="
-	https://ipython.org/
-	https://pypi.org/project/jupyterlab-widgets/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	>=dev-python/jupyterlab-4.1.8[${PYTHON_USEDEP}]
-	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
index d46e04c63651..b67d02e57296 100644
--- a/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
+++ b/dev-python/jupyterlab-widgets/jupyterlab-widgets-3.0.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=jupyter
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
@@ -17,9 +17,8 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 
 BDEPEND="
-	>=dev-python/jupyterlab-4.1.8[${PYTHON_USEDEP}]
 	dev-python/jupyter-packaging[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 005abf9c37b2..f29d17cc9607 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,5 +1,3 @@
-DIST jupyterlab-4.2.2.tar.gz 21505687 BLAKE2B 3a55aa4cb51c3c8972b44793c1f65c9a773c284d3248c31b0e5e4b1ec26531cecd3504cd7e226a9e237a0783b823b71539f1ebb90a195271f9853267c367b64c SHA512 2e93bcdb0948d1db05e7053582e6a427c1f7133fbb96aa0a7205b6d6eb14e050dde1076807cedc1231e27fd9729acb7a88dff3e6369a8b300b73e093783efcd7
 DIST jupyterlab-4.2.3.tar.gz 21505072 BLAKE2B 8cc9aaed2fb848ecad6fb408968d66583ed69752cd8b5f62e19949b7aa5180d66950802649c137feddeab9e26f5ecb0394b7fdba751a4d784d00625d9b750fd3 SHA512 4ed3dd40ee43a05c8393531b87f568f3ffab43f20d1e8c8ad96c90bed4f67d6c83ab0a2664098cd5e39580427e03f4170eb4d91e9b8cc924b70f977db3cdc7de
-EBUILD jupyterlab-4.2.2.ebuild 2760 BLAKE2B e5f0a51d2c22bd4feece54cefe493e5d2dee0de04f768e18c056f35009abdfa01b0f1d117f4d2a5620a8e64e7238342f8bbb59f56e42429cef8d12dd6e8dbfef SHA512 b91b9d7d4fc1e19a7a2b28f9cc34f1de3a533771ef51bf396fc9134d6e6002282f75a1e6d0343558becc8867a33c797e3f92d1317de34fa5008e623d17ba54b8
-EBUILD jupyterlab-4.2.3.ebuild 2765 BLAKE2B 18508727647b6c8a027dfcbe6f4930e17d466a5e300093a58a05e571feb4b2b5b35a0ee1e42bdd5793ff7e81a1dfc74436493dbe8417279092c4a7fadce009bb SHA512 1ad2ee34bab187e5f6ae22b0032456a490ad7f22def66af2a2c50f890688921917a0e712a5063112203d35fcd06ea38f71b8b339045f7d4a5131ed6d1b526520
+EBUILD jupyterlab-4.2.3.ebuild 2760 BLAKE2B e5f0a51d2c22bd4feece54cefe493e5d2dee0de04f768e18c056f35009abdfa01b0f1d117f4d2a5620a8e64e7238342f8bbb59f56e42429cef8d12dd6e8dbfef SHA512 b91b9d7d4fc1e19a7a2b28f9cc34f1de3a533771ef51bf396fc9134d6e6002282f75a1e6d0343558becc8867a33c797e3f92d1317de34fa5008e623d17ba54b8
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild
deleted file mode 100644
index 81ef015903dd..000000000000
--- a/dev-python/jupyterlab/jupyterlab-4.2.2.ebuild
+++ /dev/null
@@ -1,81 +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 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-6.5.0[${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.27.1[${PYTHON_USEDEP}]
-	<dev-python/jupyterlab-server-3[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-40.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
-	' 3.10)
-	>=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/jupyterlab/jupyterlab-4.2.3.ebuild b/dev-python/jupyterlab/jupyterlab-4.2.3.ebuild
index 70f94aa414ed..81ef015903dd 100644
--- a/dev-python/jupyterlab/jupyterlab-4.2.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-4.2.3.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/lit/Manifest b/dev-python/lit/Manifest
index 2869ddba812a..16622d523f43 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,3 @@
-DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
 DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
@@ -8,13 +7,10 @@ DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e06541
 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340
 DIST llvm-project-18.1.8.src.tar.xz 132067260 BLAKE2B a950492f1dbfb874dff63b1ffef86468169ba2f211a9733ec2d4cf30040f7f277ef00f048bb44dee9f97d7d762f0f241f19e5a2a7b0b49217d3821ddfc8c354f SHA512 25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db
 DIST llvm-project-18.1.8.src.tar.xz.sig 566 BLAKE2B 6ab0efc5b38d4483f4e32e8b85774b2edd5d88fdf29f23b88eb0b5130a7a7f0e80549612b025f927e92de4a08ff7c292cff224dbda91a5d598244e98f7ad0fbd SHA512 ddfd1e8a06756759af6cbe488c82a6d6a62ba91f3e8a0eb4cece561321824f5d165b08ed91010588790b76e19790931d2651b24dba8567e3b151d3cb43bec25b
-DIST llvm-project-3ae6755719c6dfc07761b4e9bdac8c86bcb41734.tar.gz 213487323 BLAKE2B 12030750fca0e7db4ae07a608874877151b2393cf58388f067b469e913ce9ac3f264440ebb3df5ea33f9f97cb87928fa746c98ba26c8d296f9e26dcbf950afc2 SHA512 951b70eafc8aea5b1f7847002229d89df565ca8180deef08b25966dcf070a7603a258e5fc24f9496251d23d275040724ed5e9499432ba3e19f5984f6f1c3c645
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
 EBUILD lit-16.0.6.ebuild 921 BLAKE2B dcfe57279dff5c6d80fdf5fc115c76c8ae5af3c8c7fa5da0f1c5592a3428b5a3ecd5c5feef4635c139d4d2d7a7edba53d07a53ba6525b778767c906daf6fd252 SHA512 d5c0943678b3e65cdb148bac517e1ce9700ff8a65c63796e0d4640a28d1086c7bb95f9b6c2d6507c379521cc320108b12f7c4165b4c8c4ff10d56ade2a90a438
 EBUILD lit-17.0.6.ebuild 1022 BLAKE2B c0c1efc62ae127c2abaeb2a7ef4f436d0aca737aeb2dcdb1475eabd8eb08801b916ba7e9687b111e5bcc42ae826981a4c1bda87d935b48876f26ac265186de34 SHA512 4d287525c33b812f748a6f6ff71a26c0607f9e8707299648d7eecc090fe26d4b6c8af6fb338450455c0b2bfac2c6ba06a4008a17c3f5007ee8e473e233941a8b
 EBUILD lit-18.1.8.ebuild 1035 BLAKE2B 72c71b240c838db20d73d99d7cc77c342df723b8bcf91e04a656e6801a12747d31bffb8727693cad71be83a5ad4e1b6c9fd1c848d26078b9bcf5b031add660f3 SHA512 139b11fb31709cd7bb98862176624ff1abae6fcc2d6e6712249a3da97203cdfe6b588121ab5b1d8b589c7c70b93d0bc17e1bc7358c3b92c67a5bcd586ad293c7
 EBUILD lit-19.0.0.9999.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
-EBUILD lit-19.0.0_pre20240623.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
-EBUILD lit-19.0.0_pre20240630.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
 EBUILD lit-19.0.0_pre20240706.ebuild 961 BLAKE2B 80f2289924953263c1c30b9f4e019f707ca6deed804a8c5b980a14701478d700dc1b24944f5a964bfe94174ffb34cd9c864cee70c02cfa3b1b4c025fc8317188 SHA512 ef6e43057ac2e4a2ab482fe48cfb432ab155a23e0d64bbc0d9e451fd00da3c9f17dda4f18ccd2554ab4ac2d5eff2b0df7ce57c2b61cb5145454d9e86eb089e92
 MISC metadata.xml 340 BLAKE2B c9ca851e49b4ab48c015686e983ec988f60c34ed0af77abd7bc03d046002f79f74b9b463ecb97db89f2230c1593af7acdaf6651fc51fed4aa92a459d07aabf18 SHA512 3fe8262ce6b971364162fbdbac3b02bf02f0a64896c8a2564e2a2998bd6e6bc74463bf9104e3f4ffaa9f5c1a16c877fc864b8a4f056ca0022f741799bc00f217
diff --git a/dev-python/lit/lit-19.0.0_pre20240623.ebuild b/dev-python/lit/lit-19.0.0_pre20240623.ebuild
deleted file mode 100644
index d862b4f8cd03..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240623.ebuild
+++ /dev/null
@@ -1,45 +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..13} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-19.0.0_pre20240630.ebuild b/dev-python/lit/lit-19.0.0_pre20240630.ebuild
deleted file mode 100644
index d862b4f8cd03..000000000000
--- a/dev-python/lit/lit-19.0.0_pre20240630.ebuild
+++ /dev/null
@@ -1,45 +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..13} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	# flaky test
-	# https://github.com/llvm/llvm-project/issues/72022
-	rm tests/progress-bar.py || die
-
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index f605001203ab..70c871052dd7 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -2,6 +2,8 @@ AUX makefun-1.15.2-test.patch 2871 BLAKE2B b36b8e8e40ab126e6875625a6584ae3eb7823
 AUX makefun-1.15.3-test.patch 2142 BLAKE2B 70e7b70c0c78242d05af0929fdeec37f930663d07f6b7226267fee24cc66cb211cce3a6a1c6d590ed563971dc050ef1a82182a4ad7c1457173df6fb51c5bfc5a SHA512 01f58b4cbeb4788c590c7f8a2710ad9613adf91817106408dd975d83f89f95aa3a861a6b3709e3a3c09c37b5a81f8b92f09760fb2192da3dd2e5e331c4dc3d8a
 DIST makefun-1.15.2.tar.gz 74602 BLAKE2B 1992eebfdbff6062ed60e1f66891995a91b7155792ef7b6e701d1d3ee5939ab40d3ab976674e25a5b97030cd7de59db2c69f3c215681cef2f80f2b64523f822b SHA512 b6cb588ebf491176b06e97201846b2a5cee65f60e34b5dbcc4878d8a55e7f9fcf4b58126cb3a4ca47f5d2726422dff9ee685566c5d093dbd8fd75119ecc796b2
 DIST makefun-1.15.3.tar.gz 71799 BLAKE2B 3500be7bc5b0e86a6f75781bb8fb7156624e4c910f54dfd7498268f96cd3df84e1f4d4502f4705f9a278948043e571951137e420358e94e051ba81387b14d4ba SHA512 6d48d8e1bdd60ab440b31241a957ba60aa5ae6c77a7a4785dd0a3c6cf4cedd5389ff76d7a309d230bdf1db9be577ab85446741febb30dae0be87e9c3a2d003a0
+DIST makefun-1.15.4.tar.gz 72160 BLAKE2B 361e598bf17c3e235934d65de48e638897dae9f93285269c39d97d1202506dd7e0c688b628d1811571fc259c39dbe345e8b269809c5079bf651a9ef09b681331 SHA512 eb6ed268137726ed306c7b118307ada365832d6f17a50da2804cc55708d114ad7e630ed4fdbd15a411d92ce601c4cc10d671d1ade7e270349009c10fd82618d7
 EBUILD makefun-1.15.2.ebuild 774 BLAKE2B ac501bbadc947f37a39138bf0f27d8958e20d16346e530f944ec098ee767995daa5fd14b06590c919999bdfe7b1d7a8129dcecef5e43a8461ef6301e2b0fe014 SHA512 0749c2d29d4e5f023c9e6527a7d8fac38d5dcc0674e65470b91fad4bf5d497f854e695e9a950c8e69474740fde495e721eb9778ca6956a2e9343cd9fe5560dad
 EBUILD makefun-1.15.3.ebuild 675 BLAKE2B 2971a71dcc1d8be9415178f0d7b3c1215a48c187cd9733d493162b7ae14c949d52611bb05ca9217cac1086863ea013f85eb63ae0cfc0c2cf08249b2a434e9c55 SHA512 8a80683b18551bd0d9cf94412446504625fcd1a8ff76b3b238dc5c785c388c10d122ac3cfbe9dfd3b01e53e3627e3b93de73bb42437aed9cdeb0d548ad8fb7b6
+EBUILD makefun-1.15.4.ebuild 523 BLAKE2B 021b1f3d56c5cd43536a4511657a06f1cf2e275f47dacf4bc7222910babba93ac2062a9d53feb3ca8dbcc7214a0162fb05de930b3c743df2133a1d3ea89d9694 SHA512 eeff59e7fe29c8c8a3a79a48f6f008afce8052ca2c50a6572d4d5f61d8dd106909b3eb6057f37fdc4aa0cf315536d980ce2b9cae6c50f2e8825688b9210f06c6
 MISC metadata.xml 396 BLAKE2B 541c5e69fc3236d1aaf79505272c9bdf2a295524bb9bb04e782a4cd15c022e74651a9c4ebaa244672418e5fafaed97a48568538fcd527b135c279576f09350d2 SHA512 a500a2a8b23673ea11ffdd81cae9c96fc1368121cd6ce7955fb61bc59319cf87607b134f6b5d04aa6aa564eab9c2c1248c47d0ccc624cdd8ae58f5f12d96e279
diff --git a/dev-python/ansi2html/ansi2html-1.9.1.ebuild b/dev-python/makefun/makefun-1.15.4.ebuild
index 858bc3ae90bf..f926c1a858f8 100644
--- a/dev-python/ansi2html/ansi2html-1.9.1.ebuild
+++ b/dev-python/makefun/makefun-1.15.4.ebuild
@@ -8,18 +8,18 @@ PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
-DESCRIPTION="Convert text with ANSI color codes to HTML"
+DESCRIPTION="Small library to dynamically create Python functions"
 HOMEPAGE="
-	https://pypi.org/project/ansi2html/
-	https://github.com/pycontribs/ansi2html/
+	https://pypi.org/project/makefun/
+	https://github.com/smarie/python-makefun/
 "
 
-LICENSE="LGPL-3+"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 3346c32e2f78..f353a3f1b89c 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,3 +1,4 @@
+AUX nbclient-0.10.0-py313.patch 1379 BLAKE2B 3dc2b408b3343b0200244ac33691857347f5fbfcb4543bb25077c4d353e06ec4050439ee45ae8582b62da2805aeba1aeaf4c3dca5b0a4011c78bc30f646150d7 SHA512 08d20f2366229fc44e0fc4356c49e61b45ba075d293606d6eec4a4d1f9a6da4876f6f300d6279969432810fdae97c1491682eef8f6d96d030299e1278148d599
 DIST nbclient-0.10.0.tar.gz 62246 BLAKE2B 4fdbbceb6f37c0f96a448c343d910c8ac988ed337590c9f8068eee328fbc7f58c882b15a8b0f7fe03491a8751512ad76497d3a0e8a19783ef24001acd901bd67 SHA512 1635c8af91839b9e651fbada7aca3699ebf92c0f4f7f47d9901f9977f56f2b31113c1229d1512bdb200c6c729e1e965649031729a60229d463e6b39f75ac9dc2
-EBUILD nbclient-0.10.0.ebuild 1337 BLAKE2B c5a7cc257a516e9b752d34bfc8e3ec481e3a35cc8508257402a5b11b1661b25e91f6704177f3b2815d8c40db97ead6a6b25368f0f29e95ab2a5dfd7b07e422c7 SHA512 1e587407b71d892e0f7b94fa64aaa6ea7e925a95ea3eaebf94f8a3a14546cc66d460b4ac1e6a766b133c96bc1ebe8b2f4810b953109c327ebfec68603ea91bc8
+EBUILD nbclient-0.10.0.ebuild 1430 BLAKE2B e9bf2f3343f4b978ebea5f558e5c876f599cc1611c03604cfed93e13fb35a3e61e730561dbd78347382e31d40fb280942d51485699da8af9c6f2bd763568d820 SHA512 705bc158c9a024a2b22cf013adf9f330ac9821304e11c55928164bd8bec109ad4aa68350ae82e4b98791f6edb3234a17eeaf906456478ec41a8d1d8ca0d0e5ff
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/files/nbclient-0.10.0-py313.patch b/dev-python/nbclient/files/nbclient-0.10.0-py313.patch
new file mode 100644
index 000000000000..1403cd0e0513
--- /dev/null
+++ b/dev-python/nbclient/files/nbclient-0.10.0-py313.patch
@@ -0,0 +1,35 @@
+From 57222265bfd8bdcf8851997e1dce5cd564e1a573 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Wed, 3 Jul 2024 14:21:41 +0200
+Subject: [PATCH] Fix compatibility with Python 3.13 beta 2
+
+There are more calls in 3.13 than in previous versions
+so the tests are now more permissive.
+
+Fixes: https://github.com/jupyter/nbclient/issues/316
+---
+ tests/test_cli.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 04b9887..55ccbd6 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -60,7 +60,7 @@ def test_mult(input_names, relative, inplace, jupyterapp, client, reader, writer
+     # add suffix if needed
+     paths = [p.with_suffix(".ipynb") for p in paths]
+ 
+-    assert path_open.mock_calls[::3] == [call(p) for p in paths]
++    assert all(call(p) in path_open.mock_calls for p in paths)
+     assert reader.call_count == len(paths)
+     # assert reader.mock_calls == [call(p, as_version=4) for p in paths]
+ 
+@@ -114,7 +114,7 @@ def test_output(input_names, relative, output_base, jupyterapp, client, reader,
+     # add suffix if needed
+     paths = [p.with_suffix(".ipynb") for p in paths]
+ 
+-    assert path_open.mock_calls[::3] == [call(p) for p in paths]
++    assert all(call(p) in path_open.mock_calls for p in paths)
+     assert reader.call_count == len(paths)
+ 
+     expected = []
diff --git a/dev-python/nbclient/nbclient-0.10.0.ebuild b/dev-python/nbclient/nbclient-0.10.0.ebuild
index 927821177ce1..2ae636b41d3d 100644
--- a/dev-python/nbclient/nbclient-0.10.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.10.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -41,6 +41,11 @@ BDEPEND="
 EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
+PATCHES=(
+	# https://github.com/jupyter/nbclient/pull/317
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 python_test() {
 	local EPYTEST_DESELECT=(
 		# hangs?
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 30d137850514..4098050ad38c 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,3 @@
 DIST nbconvert-7.16.4.tar.gz 854422 BLAKE2B f04a8fbffde70e08736d13a3db3278c9248f742b27688eb56760b9ff46c58aec63aa05a4cff256e5929009c3f76d760ce71209f3c49b40af374f06b073ddd661 SHA512 f9793ce89f18530492e1e9aeba3759ac6ae8aa8e0459be52928689a58b0d816128d275bdf9061ec9f33a047e0b6c8d4d83e5a81da556700e0add48374f15fcd8
-EBUILD nbconvert-7.16.4.ebuild 2129 BLAKE2B c985ceeaa9b95b9c4404cdab39009e13d3b1873e96fcd351237a0e07642fb845900035bdfe8d1e1f7d27c51a58d5d1f74442cdf9346c47f0b3732f7c89cbe313 SHA512 8954d7e0a0a8a5a139c2b6ffb19185061db8fa51e7b77a4ac9bedb1e83326722a599f05b1cc0486a9b81af380d4ab36eb98a5c3580f771678cfacfb327b88a94
+EBUILD nbconvert-7.16.4.ebuild 2129 BLAKE2B 62595f30e8ac1b2007d521243ce9159287566abd0385056b6e2733a191ba1c44de9a8ce48b1e8744d88adfae8c9d9b56fd4daf47c259c4e71d9a01c09ec2221c SHA512 79937a03f6c7b8cc3d40ff046756552624b7d84ed552fb49645606d978b4216d838ddb8f61361bfe4bb30167f4dbc70288769d06a84e6560f72be6665b73fbb6
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.16.4.ebuild b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
index 5f2a9c069ee1..f77311345756 100644
--- a/dev-python/nbconvert/nbconvert-7.16.4.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.16.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi virtualx
 
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index 6ae25b330e53..ff6417f8527b 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,7 +1,5 @@
 DIST python-nbxmpp-4.5.4.tar.bz2 138170 BLAKE2B 00a4919032dd29828dc735695afe9c0814a8fe2ec765a534257768896d9f27bc3a395275d546ad717bdd16c97161e8f0a8acaf43cdb7bd9404e40bc72f2c3da5 SHA512 fcaedae519d8cd2d52cc65721ab1e743569ba1cf7c29f2db41ed5671ba0f2c5b47f1f6d9521e1614e89e21512a4575c6788316cdb86936f0c4886d54c3831bb3
-DIST python-nbxmpp-5.0.0.tar.bz2 142680 BLAKE2B 9e54ad931ad5145c743f07e888eca519707b9179ece95d740c2209068cc02ee56b8af41bf18cf690ddb703485fab5f532b5bcf33eb74f022b0701c9421e3cd96 SHA512 0797e20dbdfaebbeb0a274786cb615cd0e57b26ec876ce94e5d66beb077510f8b38a97e0d0b151e2e069b10d1fe10b755d6531a4c676d7292675335314e4c214
 DIST python-nbxmpp-5.0.1.tar.bz2 142702 BLAKE2B 5459da538e3c05959c382e70fe8348b566333f4f68e76775b7bc8760f294ecc3bdb999124d1124bd5d7874af209f699eb4ffa1a15ce61ad70f98f235c70e98dd SHA512 eb20df090ec61013e6f26288798aeb2f2d61eab493cb4a52d5097a85d6dab8c45f033f2064583af5bf3ed920be33107419a958b65df2cf13fcd8ea6ae3297adf
 EBUILD nbxmpp-4.5.4.ebuild 860 BLAKE2B 66011d80e092e0791d4d429de037a6cdddc1a5bafb93f46569a0229de24429cfd5167bc08f5ce03a25681a2cf0629a35e9be10fc763adc4c3dd43e5810fc06c8 SHA512 483cc19f8f725dc18b07440c33ae8086623ec4549b1b8a6fc4f27cea4b9578f42f117359a92ff23619908192eb698189ce87ddd4e4e06e29847ff8702811f2e5
-EBUILD nbxmpp-5.0.0.ebuild 860 BLAKE2B e7e3e29137399fe23f9f7e5aed956808f257690c3187dc6e310bd7082dc672b3f29a566dc684984017a5a04822785f8ae5d6296acc23191622677fd448b03c9b SHA512 21eb6cf49f93e707151162fdb07daeb6e798f7b6f6b1d5bc8372f704e765d225a4e5fbdfc081b86399066c5040098a7b8215a4fd637b3512ecf18b419a4bdd54
-EBUILD nbxmpp-5.0.1.ebuild 863 BLAKE2B e20967a16416de2b0de57a45736e19661fa62c47ecc283d85c5b7cf8b2eb298ec31130ba33d86216fc987e500d03d940c5c3ab7a371d453b0438ea9b4f9965f8 SHA512 1e00966d9557a23dc08c118f17f1e564db56d1954b0a4c7712ffbedeb40fd36e0d3ce65e1f621f2d241228793251a8f0ff532e1e17c51444dd4b9f0987ab7f58
+EBUILD nbxmpp-5.0.1.ebuild 860 BLAKE2B e7e3e29137399fe23f9f7e5aed956808f257690c3187dc6e310bd7082dc672b3f29a566dc684984017a5a04822785f8ae5d6296acc23191622677fd448b03c9b SHA512 21eb6cf49f93e707151162fdb07daeb6e798f7b6f6b1d5bc8372f704e765d225a4e5fbdfc081b86399066c5040098a7b8215a4fd637b3512ecf18b419a4bdd54
 MISC metadata.xml 345 BLAKE2B 05dc6872e0de2ce54b1c3c32bd2252f082de10b6947d106714e7d34d8c4ce532b96d4480427798cbe01e8771623813b475a0e27df65389ddd98a9a28eb1682b4 SHA512 531aae88d0de86eb9f81918292aaa4570f28db09408506464d7710daf434b4be1a6a4b3b04a3cdf2a2c01596baddc93622c127ee1e4b371cd3c126a4093a3bd2
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild
deleted file mode 100644
index b5d256e868ef..000000000000
--- a/dev-python/nbxmpp/nbxmpp-5.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild b/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild
index 0299ed984918..b5d256e868ef 100644
--- a/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-5.0.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/opentelemetry-sdk/Manifest b/dev-python/opentelemetry-sdk/Manifest
index 2d4c23e3e245..d8a54510eed0 100644
--- a/dev-python/opentelemetry-sdk/Manifest
+++ b/dev-python/opentelemetry-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST opentelemetry-python-1.24.0.gh.tar.gz 532064 BLAKE2B 3dc13658293d1651d8e441b0c43f539a4e5e9d49d633786cb3f3dbab667b016c88777e0691bac24ca43e7df5f04c8e41a67e9f6991787947d743b1b30b5953cd SHA512 dbae1db127e2aed0a90bb01db6e2865162f945a9e6713f5048c7f56660231a14c3707474f9f65db8759f2f03334c3126d0542c3c8c2e0998d0f7f98ae6e84ef8
-EBUILD opentelemetry-sdk-1.24.0.ebuild 2083 BLAKE2B e4002827cfb4e914ef50b7308150d7f621587b349ba6d1ed98bd699a1aba1af4e3fc5ca70b0423d8ab571a72edcb19e85a6b01eecaf3a159133489fc44a903c9 SHA512 f3d2ee8050ac6f69a9f8457a88bd9cf3187b8a2c871a4f26025e0148832c75c1f144d14e92d560e1200ca204ba9baa3990dbfa6da3997208b8d97c3468220904
+EBUILD opentelemetry-sdk-1.24.0.ebuild 2123 BLAKE2B 46ae37193a66630cb096037bd6d3e29a61a53211c60e7718e5ba980fa5cabc6ef7c6f81e34477bad68e03c5c45fc1403fe24963a2a0791a8df2a4764bc369caa SHA512 5ac4de44a541fe5c4b91a28b1b7a6ab6d189d8334dd2449aaf1fd785c719858b4be46e36421a73db43116383559f7cd6ef45df2ee5469c704cd93089210ea3d1
 MISC metadata.xml 643 BLAKE2B 76dfef2a0bbc6ca40385189ccbb4dc8284b807dc873c3d7a02e171dd35fde051289bdb673b5f445c0b080e3b310b8e0d99311db283a6645c4f8ff8bff856d474 SHA512 8899744243bcbed9b286104609532c281d04febbb7a9da4f7c71aad177f6dcf728f008355fa6c0c1d201701360b3430084fe223d5cffa9af09adbbbde7292595
diff --git a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.24.0.ebuild b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.24.0.ebuild
index f4dcacaef8cb..ff5a0d98b80b 100644
--- a/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.24.0.ebuild
+++ b/dev-python/opentelemetry-sdk/opentelemetry-sdk-1.24.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_P="opentelemetry-python-${PV}"
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 
 inherit distutils-r1
 
@@ -72,9 +72,10 @@ python_test() {
 		popd >/dev/null || die
 	done
 
-	local -x EPYTEST_IGNORE=(
+	local EPYTEST_IGNORE=(
 		tests/performance/benchmarks/
 	)
 
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest
 }
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 315197bd5757..b4e87b385b92 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.5.1.tar.gz 8454 BLAKE2B e909459f4c82659ef41b82624c6b4af4f6a622c198f573a9a818b512decc44353aa108f7358828b7ddd6052271feca2e12b54b3948ea896765e3c1d16534bd51 SHA512 845bb5dc15edc42509086096be6aac2411192bdbdaed8d65fb2a8c8f9a650a4d836a9761a5fbfd69b5709d8476a96139ff06592e38261f795b377e475746518a
-EBUILD pandocfilters-1.5.1.ebuild 513 BLAKE2B fae9d637512760ec6a3af82a1a6060ecba60386bd5a1ca96a9d4ee99d50c5f8f5aee7039c701b784da851d8140b7470e9af4f7a111d2fe52ea654250fab9d3fd SHA512 d4eb053fa2bf94e43a61fb652e592eccff6e38e0fa0de9fda3306383995b673f30023a02345064def7629fb4a80b1faeb1f4aabe775d6f1251004c129fe9fa74
+EBUILD pandocfilters-1.5.1.ebuild 513 BLAKE2B 4029c03197d30aaa9229b6c0e22874692c5a8579d22fe60a055311b822da5ed9b5ff2568d2cb26c97f62d694d2b4df3607c1a9a82fc93f67c77e93643256b1d2 SHA512 ab0f97e624f0c0131686eb60340e27c2505a340c1f3c7e89c1a3df17273f8f0f03f873652595910a05103ac80fd841338154cb9e4129002a906f66df274acd03
 MISC metadata.xml 531 BLAKE2B 769bc999250385f7fa2ed52c3e3641264a6dcb0b8aac82f2f3b4fcb8725699c64d6fb5c9aec69a7b04255469b8f50c0500ef746ed2d3ddff928cc304c6d6907c SHA512 6cbca8131719f4be0bca59673a9e269a16adf5cd49c997225a8a50ba75d2897e552c812e16702dd19ad3c0bfe2abffb286cb7a7c0b8d1f0d4b8d09b3598fd10f
diff --git a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
index 2701acc23592..e4affde5d84e 100644
--- a/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.5.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/pipdeptree/Manifest b/dev-python/pipdeptree/Manifest
index 38a199f472e8..aa7085b67925 100644
--- a/dev-python/pipdeptree/Manifest
+++ b/dev-python/pipdeptree/Manifest
@@ -1,15 +1,20 @@
 AUX pipdeptree-2.13.1-expect-hpy-in-pypy-7.3.3.patch 1018 BLAKE2B 18405bf1f1ba5a457c9643738258df5d1c3d5ed709954dd274560ae9cbf139f336b75b2c896d9d8bdfe24c4d2cb98ea3e0391d73ac05ba1e38766f2cfa04a431 SHA512 da732fe18cc3f49ed3994133e8a5eefe4c6f8ebf18dad3caeb057bcdbab38f5936c245271d6ff534f3cb6069255e13291a9033594148e70e486fd85d5b9e711e
 AUX pipdeptree-2.13.2-fix-pypy-7.3.14.patch 1353 BLAKE2B 5e3a6f53244de1ae185818e3e2a37a87229b46b02c390a606b65668ae1dc53fe1a6b5e6c9faaf6160f25adc7e2597cceb5fd89bb20414a609880e034c7bdc026 SHA512 e0e8e729d713d347c96ee7db5e6a14ba7a9a986aa41231731973b4ab31f8d866cd4d229b35b54411e171a446d61201675ab3df01a58079786eabf5a080de05ad
 AUX pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch 1170 BLAKE2B e214c79ba1183222d00525e0e795d2ba1f10a3abb1ff6e5c986ba3aa036251326d8244787f549d698ab6a015f79eb2397212060365b8c774e2d1218531f8704d SHA512 a2055d9c828352aa1d2d5ec844acf00bc202a579c2dcf7f27997ac29261680ebee0f674b42eca77c3e039ccbc482eac62adfbb82190e157e65b01755d4972f62
+AUX pipdeptree-2.18.1-fix-pypy-7.3.14.patch 806 BLAKE2B 0162fc2e6fbc9bb0aa64e34a871b24d374e154e2a017cb97154f01dda69a32013532c88de02d3b9e8de958788b3e25898de722eface63c83a84904f71e1f5780 SHA512 5f9621013ed8699ce63230e27fe9eb2b0e8d65bb3e09eb74be794c4a14329cacb9e09e24f4241d36a41261490ba97846162a440b2619e8d1d1f8606be964b6fe
 AUX pipdeptree-2.21.0-pypy.patch 5682 BLAKE2B f545f7dae932b98e472ec3d4d47cf2538cff50be34257c8c97761096c6e1b3e8664759d5a40a275951591b30b1546d34ccb71afb5f4006951508bfe6707bca6d SHA512 23896b56e93faa64943ebccece52ea5145236ed3670dd962e5f0c74dde4d091c41695fe4300c8f4529bfd2d669d1ce154c01c079dd5708ba8c21de0ee28098e9
 DIST pipdeptree-2.16.2.tar.gz 32151 BLAKE2B 18715b0c7835e19bd5b6846922990e321a7e06315642204e7d79375a50b692f87e2ba1ec5884c4f69ff6e8d75e863c8cf372152aca7561ab94ef265d3c1df9fb SHA512 06d72f94a9165fe52cc15b9f539e3adb6da99e4a63cae78928bf68be3499b2828a5d471f270455b94a960ba2fe2f6319f5319c20ed270029a38a81173a7cd403
 DIST pipdeptree-2.17.0.tar.gz 34677 BLAKE2B 3f92c4361978d2a6b1ae46d3a7e21aca231d504abf3a3cc8388d64a70fc3853a33edeac091a0b60cd3043d86162f6816292f973e9c8691420f906e946a5c9dac SHA512 1e7a4bc7f2f872e9d3115b413acc791eeb912a6f428fca772e30a3c8164ecfa44bba7e5246f9b65cbc4d34ffcd8050ff795ced3e3f9ad918f134ce052a8e8992
+DIST pipdeptree-2.18.1.tar.gz 35101 BLAKE2B e0a9bf6d85d0ab91049b557cd0c8a0a58e93e2342eb0a495ba5978ca734ec329ff363499ecf3182bdab8f01f0fe23653c0b683ec7a288b88b28d2120f0ad8a36 SHA512 ef0b3abb0fa591c92d7dca90ac449651a562adc4a87614dc6a18212274d10ca21fd09fd7e8989454eef2e265d7a1d89801b4a864892359c39bd9eca40885c2d2
 DIST pipdeptree-2.21.0.tar.gz 39119 BLAKE2B 15f37f997b89477a9e1815a2bf120ce5251e9cf2e4df9195dc76bd7414c0cf7f58c4b8e787649492c9826bda5d3f8df60577b5242af7354ad0e1583eabbf0589 SHA512 3d416683c70861de7b768a69fe59a31173e712ecb752c7948329f787c8e13bc54be544fa4a7d3bfdbf6b164202fa8b07898c6e993a53fe244a5f3d9fa9a00573
 DIST pipdeptree-2.22.0.tar.gz 39555 BLAKE2B 6aae7c6a22176dbfcc5184086c37b0237629f48702e1e2484457a6b3eca9442732279c85c3d806cff14edbbea9180d0ed3005c9744780016ee9949a0b530e3aa SHA512 9775d19cc353eae79e6fbe779471998a8368a932f380f34587950a6f4ef62d9185e77764c12cd122029c8690931a5a5939d57a9b1801db9556708676096c2efe
 DIST pipdeptree-2.23.0.tar.gz 39737 BLAKE2B 79fe45880f2942b2ded1d16e2767c4005aca52e0768a5723f37f764c7a60a8104a237ffe2a559f631bf760310143814b0e4afbaf1e5f3ef927828036c320da43 SHA512 9c5fdf7c6d3e519357d4aeb40f4aa2807dfec8fb387114cf40d99469becc68c5042af09f2cdebcca868dd78f3a3c1602b349dfe6cb581758c5c73efc3f6e52c6
-EBUILD pipdeptree-2.16.2.ebuild 1107 BLAKE2B 1587d84842ffc3fafe93bfaf51beb7a042d1cbd738598372366115ac16fe57788cf3df0434887358ca900cd8408da73b550f202eec0887552d21bf3904f60c80 SHA512 9c699f5a6a2a3f1861f378f42060ac5e055c7839da44b2bf515e69c917580d97e9c155cce8567199ee425985b75456f055f218c48468b318bd29839aef106773
-EBUILD pipdeptree-2.17.0.ebuild 1154 BLAKE2B a2a156605e25f6446f528ad41af50cf3e8db05c0ea1ff01dd3e4d4b9a7ab826fc5d62b016db5cfeda26021b23e94bab5b0096070bf4a7b75ace9c4b72692486d SHA512 031d9cace0407b032e372e2c76c9cc6a08e75f30a6012b0a9757e7ed3ad0cef945a1278b46b6a8f27dd2bf928f73c52ef6436f14b7c9a718419a980c1faa120c
-EBUILD pipdeptree-2.21.0.ebuild 1147 BLAKE2B ba5283c5f9a0e1b2a8f710fe77dedd016a051571ea3f8fa64e370e91fb0acaa2415733eb7877a9263f50e5455e1a81ec3b6b0cc8d08aca05a839af1a90a826c5 SHA512 cf2965fe240c7a650ded12d07074f9a7b30b3cbc2395a5f83270127d95379f5df024d5fd97bf86976afe7385555eb8d5f38babcd9e7bd2d4b10365848964835e
-EBUILD pipdeptree-2.22.0.ebuild 1053 BLAKE2B 0222aa3696e2c06d31541930a4450bfb9b358cba8c80be0e4467d574dc3aba3a798f214cd2f145aa31c3d4f51c40f94c5d0cd303b29fa2b8f1fc70eb11337b21 SHA512 56077807aff18e7fbb9ce16c93ba13d665bf36aff5ea08afda981f26d55a62e046b44d18df9fdfeb6dabfded63f27f71d8edec0b9d9645fc32f3ff78769ac791
-EBUILD pipdeptree-2.23.0.ebuild 1053 BLAKE2B 0222aa3696e2c06d31541930a4450bfb9b358cba8c80be0e4467d574dc3aba3a798f214cd2f145aa31c3d4f51c40f94c5d0cd303b29fa2b8f1fc70eb11337b21 SHA512 56077807aff18e7fbb9ce16c93ba13d665bf36aff5ea08afda981f26d55a62e046b44d18df9fdfeb6dabfded63f27f71d8edec0b9d9645fc32f3ff78769ac791
+DIST pipdeptree-2.23.1.tar.gz 39883 BLAKE2B 63b578cc466871dda284f66bacc7e262b18157e5fb98e3a884c5e3eddd6945ad3d41a95e2e24fc23d0917e902f0e9ead152259d5ddc919e77e2940c2e2933119 SHA512 bc62c9cf6ee01bb8167477a21c70a7dd4ae1141c1c0690a1e95aea49cd4cb7d7e18bf076a532b00b79014a23c069df8aa09ac1bfd2d328b57e444192f1b10e5d
+EBUILD pipdeptree-2.16.2-r1.ebuild 1274 BLAKE2B cb4e0979864fcb41c9324207e37b3b2370a6ecee49662543fde77c17cceb76b45a1bafca4c7ab38aee675788ad357ae39a2c59042a69bcf0c866fd5efa399d0a SHA512 623a7b260d0ec09b901e0a4eac31a0a5680a29a3b7138e9b6961d391616b50b9bc0314fc3fac9af811ff0710e4efa6228d128c924412594075b2b28ff18ca3ae
+EBUILD pipdeptree-2.17.0-r1.ebuild 1274 BLAKE2B e28d9b388627fe9e4cf0f7882f00fdcecfa158a160ed4f01ad47cec927528318f9da05d9a6c1b8fea20ca69feb4fef82632ebc3cb6d6729c9fb281706d10309a SHA512 5ea1417f28a16b5463702a4a3d38877bf8732a3d94fa946e054c15ea5889e78afb786271f3956417d04f7af7b153f6c285c1cc77c5594fcac85c5ed63079cc8a
+EBUILD pipdeptree-2.18.1.ebuild 1154 BLAKE2B 8dfd408252d10c406f4854d939449d4cef9045a73331ede5b554c91cfbd59391d89ae4f1bae23dc3f26e96cfafac1f39a3c2f9d6819c4a47fae192170611484b SHA512 0602f900ee3e68a635a8751634cb2c15662bdb65384564dbc13de5353c3dc49daba73f572643249e3f037989f7a104cb0ce528dc37fefd42c28ea311da09c5c5
+EBUILD pipdeptree-2.21.0-r1.ebuild 1267 BLAKE2B 55cf353976e06689c49d90397a64095f0b9631cad2855f8cd9f9422955bd992ff7ad4ccbd3ca7ed254083381a0218f44713f150f2b8e9e66b6f632c5112fabac SHA512 0d9a554ec7946910a13b28c7ece6fec5eab2b5acb7191ffb53111dabb02e79b222a528103fe0f48534ce1cc5e699b48a826469a449ad7ba4ac1f8aba3ae2761b
+EBUILD pipdeptree-2.22.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
+EBUILD pipdeptree-2.23.0-r1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
+EBUILD pipdeptree-2.23.1.ebuild 1173 BLAKE2B 111184533b19f3510499d79ae0f988cc94f196d03ae5ba7698dfcacade79de462c9b69cbbe3a997954178c47bcf841a2721a45664d365f6c4fe1372f3158dc6e SHA512 2d29ec9227e49362744fad776bdf637d3383d5a194668beb6cfc5f603c72210564c1b23835bb1a08796e1facc1d404198e5511dc803b0a95dc51cc556dd21e63
 MISC metadata.xml 545 BLAKE2B cf435473fd95ac0a5bafe2b52ddd78e09c16eb190e3a979924525607fc7ab152e249419e3a21d246cd1354a714116c6c0953ed55d1efceafae441ee282c2b1eb SHA512 ad2e8d4e7bac53b26ea0bb5c2f65e0c9dc8d30afc8c569d73bac820b2dda6a343b96e52abd0353e3f50269fb431e46bd3b51b3768d9c24f658fd2eca6cc1ce97
diff --git a/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch b/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch
new file mode 100644
index 000000000000..6179d823a021
--- /dev/null
+++ b/dev-python/pipdeptree/files/pipdeptree-2.18.1-fix-pypy-7.3.14.patch
@@ -0,0 +1,16 @@
+--- a/tests/test_non_host.py	2024-06-12 21:33:13.696206671 +0200
++++ b/tests/test_non_host.py	2024-06-12 21:46:40.146193582 +0200
+@@ -32,10 +32,10 @@
+     result = virtualenv.cli_run([str(tmp_path / "venv"), "--activators", ""])
+     py = str(result.creator.exe.relative_to(tmp_path))
+     cmd = ["", f"--python={result.creator.exe}"] if args_joined else ["", "--python", py]
+-    mocker.patch("pipdeptree._discovery.sys.argv", cmd)
++    mocker.patch("pipdeptree._discovery.sys.argv", [*cmd, "-j"])
+     main()
+     out, _ = capfd.readouterr()
+-    found = {i.split("==")[0] for i in out.splitlines()}
++    found = {i["package"]["package_name"] for i in json.loads(out)}
+     implementation = python_implementation()
+     if implementation == "CPython":
+         expected = {"pip", "setuptools", "wheel"}
+
diff --git a/dev-python/pipdeptree/pipdeptree-2.16.2.ebuild b/dev-python/pipdeptree/pipdeptree-2.16.2-r1.ebuild
index dbb4e804f288..8c04dc58e0a6 100644
--- a/dev-python/pipdeptree/pipdeptree-2.16.2.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.16.2-r1.ebuild
@@ -19,6 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv"
 
 RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
 	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
 "
 BDEPEND="
@@ -38,6 +39,13 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -p pytest_mock
diff --git a/dev-python/pipdeptree/pipdeptree-2.17.0-r1.ebuild b/dev-python/pipdeptree/pipdeptree-2.17.0-r1.ebuild
new file mode 100644
index 000000000000..ab9fab7bed89
--- /dev/null
+++ b/dev-python/pipdeptree/pipdeptree-2.17.0-r1.ebuild
@@ -0,0 +1,58 @@
+# 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 pypi optfeature
+
+DESCRIPTION="Utility for displaying installed packages in a dependency tree"
+HOMEPAGE="
+	https://github.com/tox-dev/pipdeptree/
+	https://pypi.org/project/pipdeptree/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# https://github.com/tox-dev/pipdeptree/pull/302
+	"${FILESDIR}/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch"
+	"${FILESDIR}/pipdeptree-2.13.2-fix-pypy-7.3.14.patch"
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
+
+pkg_postinst() {
+	optfeature \
+		"visualising the dependency graph with --graph-output" \
+		dev-python/graphviz
+}
diff --git a/dev-python/pipdeptree/pipdeptree-2.17.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.18.1.ebuild
index d4b8329e97ea..1c600a4fd312 100644
--- a/dev-python/pipdeptree/pipdeptree-2.17.0.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.18.1.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 PATCHES=(
 	# https://github.com/tox-dev/pipdeptree/pull/302
 	"${FILESDIR}/pipdeptree-2.17.0-expect-hpy-in-pypy-7.3.3.patch"
-	"${FILESDIR}/pipdeptree-2.13.2-fix-pypy-7.3.14.patch"
+	"${FILESDIR}/pipdeptree-2.18.1-fix-pypy-7.3.14.patch"
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/pipdeptree/pipdeptree-2.21.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.21.0-r1.ebuild
index dae7c7c1be5b..2e77548af84f 100644
--- a/dev-python/pipdeptree/pipdeptree-2.21.0.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.21.0-r1.ebuild
@@ -39,6 +39,13 @@ PATCHES=(
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -p pytest_mock -p console-scripts
diff --git a/dev-python/pipdeptree/pipdeptree-2.22.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.22.0-r1.ebuild
index bf7d74541259..0f2bc0747e89 100644
--- a/dev-python/pipdeptree/pipdeptree-2.22.0.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.22.0-r1.ebuild
@@ -34,6 +34,13 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -p pytest_mock -p console-scripts
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.0.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.0-r1.ebuild
index bf7d74541259..0f2bc0747e89 100644
--- a/dev-python/pipdeptree/pipdeptree-2.23.0.ebuild
+++ b/dev-python/pipdeptree/pipdeptree-2.23.0-r1.ebuild
@@ -34,6 +34,13 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
 python_test() {
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest -p pytest_mock -p console-scripts
diff --git a/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild b/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild
new file mode 100644
index 000000000000..0f2bc0747e89
--- /dev/null
+++ b/dev-python/pipdeptree/pipdeptree-2.23.1.ebuild
@@ -0,0 +1,53 @@
+# 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..13} )
+
+inherit distutils-r1 pypi optfeature
+
+DESCRIPTION="Utility for displaying installed packages in a dependency tree"
+HOMEPAGE="
+	https://github.com/tox-dev/pipdeptree/
+	https://pypi.org/project/pipdeptree/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/pip-23.1.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/graphviz[${PYTHON_USEDEP}]
+		>=dev-python/pytest-console-scripts-1.4.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	find -name '*.py' -exec \
+		sed -i -e 's:pip[.]_vendor[.]::' {} + || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock -p console-scripts
+}
+
+pkg_postinst() {
+	optfeature \
+		"visualising the dependency graph with --graph-output" \
+		dev-python/graphviz
+}
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
index eab525d47fa0..2f1fd9e10d33 100644
--- a/dev-python/pipenv/Manifest
+++ b/dev-python/pipenv/Manifest
@@ -1,5 +1,7 @@
 AUX pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch 1043 BLAKE2B 09a50ba813d21a82333905e098dbd99b11a6c6f07c2ae512eed4189bfee371b0ceb2e27ffff41fb414b336c8ec49014c43903f3a2f12fb9b6323dafdf13f8634 SHA512 c900dc2589b5f4b3f36b15ddf2287d74dcafb1395c96330058a400ac3698a525715b69cd32b5780cc7ec9d71d067f159c623deaf63c9e4c11876cd651c069f87
 AUX pipenv-2023.9.8-inject-system-packages.patch 1672 BLAKE2B d803b80a5c46bac67ab7c361f369fad58b1c2a933bc2f78b2d4fa5fa172a23e7e5c026edf48cf398b3232280428eaf40369cafdf4c6c019c3dc9e397e884564d SHA512 5600a8bd7bc5cdf2152d84fc7791359a04df15f38d11f8c9517b709a2793ce05c6fc5acc1d1d8b763078465012e421826699287d2e3ae97838e155a9a1694650
 DIST pipenv-2023.12.1.gh.tar.gz 10728288 BLAKE2B dc9425303e24652b797c9f9f9f6cc6f13f30e32775fe0458ee472af5d859ee245c58f3adb6040390bd53d3e1efd6493f930c7336e69956516b36e26e70ca14b7 SHA512 caadbeb32c0445abfae65d86df8d9a5875e71c1a0a281193194ae61c0b095c8f9361a5dd67f92acd5b64d8dc1d877324e959357470894d7d60ceb1a619c831db
+DIST pipenv-2024.0.1.gh.tar.gz 10805446 BLAKE2B d9fc964cc3a204bb45c299595c238e3d37368e53b39d8be0cdbcadcec3ca395adbb03bf7abaa7d5d729ed47443c40b908f74abbff475e4a99c7e6d4436f04ee8 SHA512 67acff8e4c40e18a60e824420752cd2e5633e50c138b64131ca19cce15e97a1e36b9e685b92fed7378eeccce8154d3d36701134854d60b0fbc47e341b18f945e
 EBUILD pipenv-2023.12.1-r1.ebuild 4864 BLAKE2B e07dd5a277d62f98ea16380ab3d0b9cbd43a386fecd7db4d6d51af0fe227d153877e14772c673ad3f17149860e48f887bdad01f50a3c698d2cc6ec33ab658b77 SHA512 e8e8a6d2e706b7d9c2f358d0012fc73b54d8611e15dab73cc5a67f297991796cf21aadb477d827e8f2fcd85bfa80fd006ab39f70125bd60636bb43d7fc1d5b35
+EBUILD pipenv-2024.0.1.ebuild 4939 BLAKE2B a5829b3f5796fbcfc9ecbaa1ead844ce875e3cd44fba590888a28ae3d36d2b103c42d209b13e7a780b364f8c5b5cc915e155baeede049f2cf07a92475da13a25 SHA512 772ca18009b753a052cea838939f39163cb884b79760eca216a7e0ee2d36580682ee43333a5ee915a3136916f73fab3a3c6ee6289e15fb3e5234ee05af35e471
 MISC metadata.xml 643 BLAKE2B ff3557d9ae32b553c85455436683e2ca94bc16c6ec7c6d2ceb1113a69dc841b9ac2f0e4b96eec4c6c84ca899ad6a99b0747d7bf3f9289110a8bbdfb80f2cb2eb SHA512 7a611950572c2d700fb1680e0aa307069d80d992528144da781eca9f1fee729defa6f8b28382ddd8f66e58c5f68de9a17815989a4a39473bbf830a7be42ea282
diff --git a/dev-python/pipenv/pipenv-2024.0.1.ebuild b/dev-python/pipenv/pipenv-2024.0.1.ebuild
new file mode 100644
index 000000000000..475010c333a4
--- /dev/null
+++ b/dev-python/pipenv/pipenv-2024.0.1.ebuild
@@ -0,0 +1,124 @@
+# 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 multiprocessing
+
+MY_PV=${PV/_beta/b}
+DESCRIPTION="Python Development Workflow for Humans"
+HOMEPAGE="https://github.com/pypa/pipenv https://pypi.org/project/pipenv/"
+SRC_URI="https://github.com/pypa/pipenv/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+PATCHES=(
+	"${FILESDIR}/pipenv-2023.9.8-inject-system-packages.patch"
+	"${FILESDIR}/pipenv-2023.9.8-append-always-install-to-pip-extra-args.patch"
+)
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/click-didyoumean[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	dev-python/dparse[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.8.0[${PYTHON_USEDEP}]
+	~dev-python/pipdeptree-2.18.1[${PYTHON_USEDEP}]
+	~dev-python/plette-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/ptyprocess-0.7.0[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	~dev-python/pythonfinder-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep ' dev-python/tomli[${PYTHON_USEDEP}] ' python3_{9..10})
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.21.0[${PYTHON_USEDEP}]
+	~dev-python/importlib-metadata-7.1.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+	dev-python/shellingham[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+# IMPORTANT: The following sed command patches the vendor direcotry
+# in the pipenv source. Attempts to simply bump the version of the
+# package without checking that it works is likely to fail
+# The vendored packages should eventually all be removed
+# see: https://bugs.gentoo.org/717666
+src_prepare() {
+	sed --in-place -e "s/import click, plette, tomlkit/import click\n\import tomlkit\nfrom pipenv.vendor import plette/g" pipenv/project.py || die "Failed patching pipenv/project.py"
+
+	local pkgName
+	local jobs=$(makeopts_jobs)
+	local packages=( cerberus colorama click click_didyoumean dotenv dparse markupsafe \
+					 pexpect pep517 pipdeptree plette ptyprocess pydantic pyparsing pythonfinder \
+					 requests urllib3 shellingham tomli tomlkit importlib_metadata )
+	for pkgName in ${packages[@]}; do
+		find ./ -type f -print0 | \
+			xargs --max-procs="${jobs}" --null \
+			sed --in-place \
+				-e "s/from pipenv.vendor import ${pkgName}/import ${pkgName}/g" \
+				-e "s/from pipenv.vendor.${pkgName}\(.*\) import \(\w*\)/from ${pkgName}\1 import \2/g"\
+				-e "s/import pipenv.vendor.${pkgName} as ${pkgName}/import ${pkgName}/g" \
+				-e "s/from .vendor import ${pkgName}/import ${pkgName}/g" \
+		        -e "s/from .vendor.${pkgName}/from ${pkgName}/g" || die "Failed to sed for ${pkgName}"
+	done
+
+	distutils-r1_src_prepare
+
+	# remove vendored versions
+	for pkgName in ${packages[@]}; do
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName}$" -prune -exec rm -rvf {} + || die
+		# package names can be foo-bar, their module will be however foo_bar
+		find  ./pipenv/vendor -regextype posix-extended -regex ".*${pkgName/_/-}" -prune -exec rm -rvf {} + || die
+	done
+
+	find  ./pipenv/vendor -regextype posix-extended -regex '.*cached[_-]property.*' -prune -exec rm -rvf {} + || die
+
+	find ./ -type f -print0 | \
+		xargs --max-procs="${jobs}" --null \
+		sed --in-place \
+			-e "s/from pipenv\.vendor import plette, toml, tomlkit, vistir/from pipenv\.vendor import plette, toml, vistir\\nimport tomlkit/g"
+
+	# remove python ruaml yaml
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml import YAML/from ruamel\.yaml import YAML/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruaml-yaml"
+	sed --in-place -e \
+		"s/from pipenv\.vendor\.ruamel\.yaml\.error import MarkedYAMLError/from ruamel\.yaml\.error import MarkedYAMLError/g" \
+		pipenv/patched/safety/util.py || die "Failed sed in ruamel-yaml"
+
+	rm -vR pipenv/vendor/ruamel || die "Failed removing ruamel-yaml from vendor"
+
+	for fname in Makefile README.md ruamel.*.LICENSE vendor.txt; do
+		rm -v pipenv/vendor/$fname || die "Failed removing pipenv/vendor/${fname}"
+	done
+
+	sed --in-place -e "s/pipenv.vendor.pythonfinder.utils.get_python_version/pythonfinder.utils.get_python_version/g" tests/unit/test_utils.py || die "Failed patching tests"
+
+	rm -Rfv pipenv/vendor || die "Could not vendor"
+	rm -Rfv examples || die "Could not remove examples"
+	rm -Rfv docs || die "Could not remove docs"
+}
+
+python_test() {
+	epytest -m "not cli and not needs_internet" tests/unit/
+}
diff --git a/dev-python/portalocker/Manifest b/dev-python/portalocker/Manifest
index a2a6722ad98b..8383a7e17f62 100644
--- a/dev-python/portalocker/Manifest
+++ b/dev-python/portalocker/Manifest
@@ -2,4 +2,4 @@ DIST portalocker-2.10.0.gh.tar.gz 34084 BLAKE2B 9efb130859002a4a6bb4c18b2fad293b
 DIST portalocker-2.8.2.gh.tar.gz 32382 BLAKE2B d953165d4e64d4bf5d084a9d5563b6e53515abbddeb7f9a4a49ea3358ff3bafc9631f38322e4a7ff1ab702aff4813eb52b4a7c431f411d767afd0647347d37af SHA512 3772ea6d15ee80d284c7fc7e88bdc9ab7714b460fdca39c2a288e0375c16f430bf9362da06227084dc2e56bd7342bd2d59823a94daf52ca51366e69fe6456236
 EBUILD portalocker-2.10.0.ebuild 883 BLAKE2B 985d2f209b15d56fac87f50c170b43f52a42757d89672e2f7f460fa71945bf51012ae56914fc7e88be5832ac379c0d6becc346f500079e76eb94a71947a1d9b6 SHA512 45745682294963cf3ee8525f545b3c8653e0723c3906e3063b2ef727f6da2a4aa51548ed2fbee51999ddfe9e770e19947bc5c4eacdd6bdfc3797f1753ba5c672
 EBUILD portalocker-2.8.2.ebuild 882 BLAKE2B b6b969ac4b3ca717754896deed5d20b62a735274323773a67d4aedee37d695700f34b5d61f2ddbfef44af48bca13c62897ca8ddad78d7289ccd31f3649021961 SHA512 8e10f4abf1ae8862ad5838bb22c168178a456a1c0cfe5a8b2da400ab18ddd04b91ebdd10eeb294ada6abeec888c13efbe82dcd41738ab78c85f966c8b074cdce
-MISC metadata.xml 377 BLAKE2B 34dfaf29f16229c6aaf65b0e36f9143ae4eedf6f68be5b0614be99c00f925963f1d0db92603691c314b5defbfa1d4352b2603b39ec029f198bf4b410e094c685 SHA512 92d58aa77718c83f409f54eb404906acc8ffc943798e25aa75be8735f580f13deecdfc400d711fa9c324d0b8766a48705e8e54366e55c7b8df93136ad4096012
+MISC metadata.xml 401 BLAKE2B ef938d64fbe8f075f7caa5524129d1ae3e2e0779f9821d919928021ed118bcc248bebd4f4c249a3f979b0dc3f6d21b66b2afc1fa54e93b0f587c6f043581b6c6 SHA512 123cae1d22e760a5335884567e32d7144fd3f6991f5e5642cf260630cff1b0fbc291bc9a3b2e409700cc96038c92043ae8c15ed920b68461a0d86c46a6d7f1c1
diff --git a/dev-python/portalocker/metadata.xml b/dev-python/portalocker/metadata.xml
index f2b5d16ea0b9..e04e747bac0c 100644
--- a/dev-python/portalocker/metadata.xml
+++ b/dev-python/portalocker/metadata.xml
@@ -5,6 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">WoLpH/portalocker</remote-id>
 		<remote-id type="pypi">portalocker</remote-id>
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 9ddea00118fc..146732c2df16 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,7 @@
 DIST prettytable-3.10.0.tar.gz 54830 BLAKE2B d19abefd31ebf25fd0c5ed91ce1314cebff1c519393fd0d07f82661393c46d337b6589094922f0500180265dc6515706d0d24b5127406a646f83608bed824ccb SHA512 184ab33f3ebe12b3496ff6e2dd2115b4c5f1cf51cedbb73dfa8028e371847c30e69830bb656a92ae3784e70414c4e5782a45b5b39fed87924adaf40078049059
+DIST prettytable-3.10.2.tar.gz 56415 BLAKE2B 0deb8132124f9c19ecaeea46749dda834c758378163646e16e0553b75ad6842b44fe5904ba181d6a2b0c3a822f23cd569977a8168d9245b2e9f08ed16da0089e SHA512 6a71f7d7b6fddca75e4b1bfd96ca6e26301c0c231be4703fe9c59e1c13a1482f814fbbfd661d1fc6bb37346f55a7488b794d5041016faf68711297a8cbdbe5c5
 DIST prettytable-3.9.0.tar.gz 47874 BLAKE2B 67d7eb13626d75372947a7662331dc8f4766f74c752ce918c4431cba5f974c5556c5e00566cccdb9e8715829778f3bd53b72ed124f0e19805ffb05f33ea1e219 SHA512 708094e4af6f34a631e63ea4a5655c366b8fd5c0802076d92cb8029402be86b2d528e6d866e8d865790c3d2597229b0f080deac5e843d60e19c326aa909e9eaf
 EBUILD prettytable-3.10.0.ebuild 731 BLAKE2B 97686d9f0b035fdf7332f88c5357e3515867f6a2c2cf50fadaf1571d59741ff6c0406d8e2e83e1ab30e4624e3e2b1c1efad2a58b6ca40e114496896155a3f1f8 SHA512 a1bc8359ff73b34117100b7b65f1b0d8adad1c7cb5661177a00c76ae65e37f7b4d0d695a6a4a41735c63027aead586a90c694d98e15d58300976b6e9fae4ba33
+EBUILD prettytable-3.10.2.ebuild 736 BLAKE2B 1a4d2044631c3268833b663b67a0a9bdc24b4e30c41a9833a1113a40788fb99160a13e7428d1c4ba180390e66f03339a7d0b41f19a4c7c490c5ff091af4755c3 SHA512 ba49fb35a2985e633b1b64e8b035a5c01c58d395000f426960cf4dda1ff361d4096f947ad636d38eb58de2246afd0300fc1caa5e9f8f4b927658d7e2120c5296
 EBUILD prettytable-3.9.0.ebuild 730 BLAKE2B a00258f991ffb7d12f11e5595884b589c4de26610739c28c2e7c461f0acd940b56357ce9cc79a197f58c6fdd1380a475e482523d30b7fc3e906005b5aa313122 SHA512 085afef358b1aa78ab4481120ea09de7fb24cc0c854fc5523e36fce095682ccd364f9973bebad1628220b2919928bc0d078184d6f5b91570a8754049d9fac215
 MISC metadata.xml 583 BLAKE2B b82fa13dd76ee47e012c03499081072c737cb63f2d23190dc3622dae1bc50ba054c7cf492a1feda7147c3a8710bd8ad509bc653e5b40f89b93ffd63da69c3f65 SHA512 e7d331df0ec72f98acc9abfc70424a619e67e559e4b02b357658e9e48efd080440a0d890ce5df2cb8cbffc53640b2068f39f803aa180bf2607d02a9df1acb5b3
diff --git a/dev-python/prettytable/prettytable-3.10.2.ebuild b/dev-python/prettytable/prettytable-3.10.2.ebuild
new file mode 100644
index 000000000000..21f867b499ce
--- /dev/null
+++ b/dev-python/prettytable/prettytable-3.10.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
+HOMEPAGE="
+	https://github.com/jazzband/prettytable/
+	https://pypi.org/project/prettytable/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-lazy-fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 16bc114e4840..8a02a5d7d5c4 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,3 +1,3 @@
 DIST pyatspi-2.46.1.tar.xz 323392 BLAKE2B ee55f57616d58ead8bbf14193a984e2d268b0dafd67bdb638086fe531d7d031b6060f2c757036f67ad18ba6c1f774c8ef13a4844c5fb96878604f59903b2653a SHA512 69c1c4c31bef430083a1c9af98ba6b2f1b3d9eec0a5f03982b980838bcf86933069a90d7314d2e5501d5988a453d0a803ad239eca5b98f08cc3bf7dc8d4a7c0c
-EBUILD pyatspi-2.46.1.ebuild 1327 BLAKE2B 17a3d697a0836076a3db2c04fcb32ea60223b1a89bcf71b6ecf63a3ba514b07a91f72b08fa8a08ce941354c28bea07be1f267674e9a5a40e4f1756887196971c SHA512 7705491844c624696e3161b18b2cdd140d144faa359e2a0d54b743db2bdc0546b68ca7f99c6a7d9f4d75fccd3508190af0b10103b804fc47db4c2bd28614a06c
+EBUILD pyatspi-2.46.1.ebuild 1332 BLAKE2B dfb9b9233abb65d89af73dddec16f0634a139a5745f6f2234626691353f2cc330bd2e7034ba0c999aac40cfe9eca96b0a799fde01296abea8d4741fa4817efb3 SHA512 18cf761f8e243a373e75ab7f650995f422420e0033b9184360100d7abd80687cee0296abc49dec1ceae8fa248034b98cc7016581294250f19e73cfd6379ae4e1
 MISC metadata.xml 349 BLAKE2B af48f6da9752ad965ab10c2bf3322d4321f084fc392c78e2c0fa1b48728f6b0f9e391b97ee9df9880fbba4c47ec798e0218f3800bb044ac8d9609066dc883580 SHA512 629ee6df4926ec37c3811388921ec024f7b1a50a819b74715dfac905b7830da3d7d64ae1886703b694049d06422d36e551d4296b2892cc43d60d45291d287840
diff --git a/dev-python/pyatspi/pyatspi-2.46.1.ebuild b/dev-python/pyatspi/pyatspi-2.46.1.ebuild
index dad7060eb6c6..4e7fb163fffa 100644
--- a/dev-python/pyatspi/pyatspi-2.46.1.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.46.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit gnome2 python-r1
 
@@ -24,11 +24,13 @@ DEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-2.90.1:3[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	>=sys-apps/dbus-1
 	>=app-accessibility/at-spi2-core-2.34[introspection]
 "
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+	virtual/pkgconfig
 	test? ( x11-libs/gtk+:3 )
 "
 
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index e232b0f10645..3be5370b449f 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,7 +1,4 @@
-DIST pydata-sphinx-theme-0.15.3.gh.tar.gz 2393144 BLAKE2B 69755220c6099921d57eefc926106c0fe8127fd9c9a47f74050113abb78b997fe60fe50cc01e8a6f926eb7261c34628fae4b6f624ca713031feb4dbb3ca5aa29 SHA512 bba767a92855aefb81139887a515de7917704a447ea223a43067e8e301e0f0ade008dfcf2751c0e9e147af9768bf4e25af7f767c325f07b057f7f4b353e56d1a
 DIST pydata-sphinx-theme-0.15.4.gh.tar.gz 2396654 BLAKE2B 34293e53fe17568e65118702f1c55eb6cc0bca0d17fbc168fac0b495de581f094046bf775480ae608b711f2136c131e02163b2eed84dafa080e6ebc1b4eb96a5 SHA512 5cdedfa182a75c0735773627bbe738f31b36bc812051d4848676b33acf3b2a55d2bd59b1171c4deb4e7c29e8968bcade1f1abfa901c3c4dc8caeaf9e47cbba28
-DIST pydata_sphinx_theme-0.15.3-py3-none-any.whl 4631638 BLAKE2B 261b08b159cf073e896f27fbedc3375cdd7181b2dd6f85264530d34b9cdccdaaaf175f6f7c349768014bfb373ffbaaaf1071b85de6e3805cf992e656cb04ddb5 SHA512 6bed169c5ae65027f7e5d8903062e0be910bb69409aa061cf8c17be3632d90d189a8dde49a8d760f747308a5e1891237bb36a70430cfd6f3d9207274aa8d8bf2
 DIST pydata_sphinx_theme-0.15.4-py3-none-any.whl 4640157 BLAKE2B cb4e067e1acdb8364e498c00f3f8d549a16fc90675511dca65968828002422a8048818fdf3881f9ca33e7368758501b096dd9c968498a273cf2f353ea9868d3c SHA512 0d5e22952e11f683be4e14e597f488a2716877d1d064fa9c52985fcfd6dabcd5ae7c48143a3ebfd26f6a1f933b18e69f5d938afc99a9bfb475a80f94b34c82e7
-EBUILD pydata-sphinx-theme-0.15.3.ebuild 1376 BLAKE2B 09995387898b80321b4fb428f5b7082147d300455654efad53dbd86d1a47e2f954854143e91787ef2ad32dc671e47c0367dc4b27c497ec0405aebf97011aa721 SHA512 f175287285caa54e4e7da822be0ea86f7802d174acf921b6300feb876e1cc7ded6ff0c561b75767ae47cf7bb16b2abdbec68f0e052958642102e5197e12e3074
-EBUILD pydata-sphinx-theme-0.15.4.ebuild 1384 BLAKE2B cb46a4aa0209fe7990a208e076e644b939809b9ee09d5e24dae67fd3657055aa5c363275f2de7cfed8fb37257822e0decf2ee37161c6f1f3de21a9ecfb5533a6 SHA512 3f61580cb17e5de950ab2b75c8cfc7b1afcc770b5d57c5d96234b2d587f820aa2f144653bc3048f5661e8cd3213723d21619aeebaad4b0e5e0c2d6ab7b96a620
+EBUILD pydata-sphinx-theme-0.15.4.ebuild 1376 BLAKE2B 09995387898b80321b4fb428f5b7082147d300455654efad53dbd86d1a47e2f954854143e91787ef2ad32dc671e47c0367dc4b27c497ec0405aebf97011aa721 SHA512 f175287285caa54e4e7da822be0ea86f7802d174acf921b6300feb876e1cc7ded6ff0c561b75767ae47cf7bb16b2abdbec68f0e052958642102e5197e12e3074
 MISC metadata.xml 532 BLAKE2B 397b44fab769346cc170d5627dc663adbe29b780cbabc3d7643d5bda6ff89d6fbe6e6f55da69e93b8b20ddee16856612063b442125a16e035803e50f5aae924f SHA512 9de912fb51a153d508f3a12a3eb7ef3cd926089452bd6bfb822ae4a797d8aeb9ac68973ea7bebf3095f546dd288fdf651710ca8536f19907ac69f622ca3b0550
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild
deleted file mode 100644
index b4b3ac87636b..000000000000
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-MY_P=${P/_/}
-DESCRIPTION="Bootstrap-based Sphinx theme from the PyData community"
-HOMEPAGE="
-	https://github.com/pydata/pydata-sphinx-theme/
-	https://pypi.org/project/pydata-sphinx-theme/
-"
-SRC_URI="
-	https://github.com/pydata/pydata-sphinx-theme/archive/v${PV/_/}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(pypi_wheel_url)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/accessible-pygments[${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# pygments version mismatch?
-	'tests/test_build.py::test_pygments_fallbacks[real]'
-)
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/$(pypi_wheel_name)"
-}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
index 03360786b8cc..b4b3ac87636b 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.15.4.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
index 0828c0304301..c65fdc6038fa 100644
--- a/dev-python/pydyf/Manifest
+++ b/dev-python/pydyf/Manifest
@@ -1,3 +1,5 @@
 DIST pydyf-0.10.0.tar.gz 17615 BLAKE2B e378f26ab2dc4d904762d967c0552f3a9d96248c0fd2687669f22c0ee3af5d35cf59c60f0dc0b015a4d1cd098a2de01d102cbf16e8c5d48b3f56299b36c55884 SHA512 7c35a818569dda0edb0dda5e31c595a65e2637594a7a6815ef3b41e34c10a4f2a1b3412af59f48fee2e72e8bf23c01e651b46130e1927645cbafc7d99c104574
+DIST pydyf-0.11.0.tar.gz 17769 BLAKE2B 5fa6d597592104a505267a29ad99cf0c06e84e165a407438563982d45f3d77d9c2a0c45ffda2c16fe6f8656ca406f3bff8ad7dc19f011132334130fcb0c5bc1d SHA512 f02021d1d6bb59557a5b1c1a7f71551b1efe0f8019b2d2e28a84fb126b0d4b701e884971376b8a7b654a51f1831b3fab319a0212e9cb444a392304fc244133d1
 EBUILD pydyf-0.10.0.ebuild 496 BLAKE2B ff7af65d451257c93750d90c951b29134428e36d70e6813942cd02cc484e8de8014fda1dfade570b139ebe04808c4f16895bb78d6f57c525537825a1dfb2160d SHA512 3ec64f68fd687b26c47bcc58bf15e41cf0435b272ae06bbe89b594a62dfb9f63b6ec3d5b214726b186b0c37c40d25bdf0f640e2289097bd44fa77616f8cc8858
+EBUILD pydyf-0.11.0.ebuild 497 BLAKE2B 7903851a74b8ed4366f3363a842df9cf9c8bdc3ad865367feb5260966139a8b26ccfcc51aa38845a395992623253213f918e279546dbd7539e36f023dd75c1e6 SHA512 d4a100dcb4f70d12fc59de2c299e307504635a61f68e067b687c5006353e50a2f945061ba57ce23dec7f6334c1807f31a952da34a6464367ff3a24aafed5246a
 MISC metadata.xml 346 BLAKE2B 1019f43890db1484163da244f781505c1193dc5516cbeb8921540dc298d4cf61903a9a0151e23cc22b7db7fd677f4424c74b5a051b95eb75e38f3546501096b3 SHA512 420175bcf83c3fe2fc1bcebfd88f07e3c56272b999f9693a82b76a703ea5d94d6e144683a67eca871bc6d2723ceb8f70c4d29e354df20d273587a7be6a369904
diff --git a/dev-python/pydyf/pydyf-0.11.0.ebuild b/dev-python/pydyf/pydyf-0.11.0.ebuild
new file mode 100644
index 000000000000..c726d36d516c
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.11.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index fdf35fccc3aa..8c47083b34cd 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,7 +1,9 @@
 DIST pyfakefs-5.3.5.gh.tar.gz 227359 BLAKE2B 635e41cb9892e1707555559769c01d5b575e44c5f1dd412acc05c3bed3b2dad2724ba32341b59cdecdfb658c94008e09396970349d8c1ffdcb90bf89ea82aca0 SHA512 342dc9cc0378af8cd8a9b0783fb6a1415207505ec8d4992f8fdd7e8d2bc4aada26d0803ed3b74d30b42a50dffb793c70acdeb3f28f199c0918783e1ea0a5e0d8
 DIST pyfakefs-5.5.0.gh.tar.gz 239883 BLAKE2B cf9b91fbfbb77b012ec768ac2188ea5c611a271f50ded69cc92607d955b4dda8cacf7b0560da5a2b57f7a4aa6879fafb328357e5996d8c7c025f531530a04f4d SHA512 d9f05318f26ca9c26e0cca3c4fdf19dc3cf33bd21a6a87e1e4d8871b06eba9d8ba875301b001221ec9e0bd17c14f8aba3e61d3ec5b3c72587d28b7b5263e2a2c
+DIST pyfakefs-5.6.0.gh.tar.gz 242557 BLAKE2B d29e83d5ad6c7e313d28484754d2064d820856429c0e48e3b5851ecc1ae8cdfdc632f5855548229bc362b5323a7166b8d3776f2a2ccfb7472938362695a9f6f7 SHA512 7f3d8798088c66aaf57e238ee8f4693164508d23ff59fcde4a546af26da850a8c33cf0c552cb312ccfebbbbfc463db78ac80a356ce55634afc276124064ee210
 DIST pyfakefs-9c19d6a55e6ebac98267713d571202e82b641279.gh.tar.gz 242645 BLAKE2B 175ebb18f15222152b12d0651cc378393f8a6d758d33355babca017a4fa4462610499466e0ba4ff429ac066880e1475fcb5c504cf085e067c87ceb878537ffb3 SHA512 b9c57128d057560882558b8d5ece24c98e377a6ed563e69d1e899106295f2fc43058265da092d34b9c00e886171f905acff851f78ce3e9c66ff4a9c0b1288581
 EBUILD pyfakefs-5.3.5.ebuild 1122 BLAKE2B 6aed8c356657877632fe1d9c425458374d37a8ed2e008b658b2376129a5e1bc0064da687d693abb13a68737b99dd35aeb677f77adc30520a6b1dc54993d93214 SHA512 b667dbb8c0e49e56532e3abf90133aec043e64e29db73d772c5e33b0c15981d93abfd7581bd327f4bb3f19d9ed3633d2428d1ccbe9ef58e097e2c506e4286d92
 EBUILD pyfakefs-5.5.0.ebuild 1122 BLAKE2B 6aed8c356657877632fe1d9c425458374d37a8ed2e008b658b2376129a5e1bc0064da687d693abb13a68737b99dd35aeb677f77adc30520a6b1dc54993d93214 SHA512 b667dbb8c0e49e56532e3abf90133aec043e64e29db73d772c5e33b0c15981d93abfd7581bd327f4bb3f19d9ed3633d2428d1ccbe9ef58e097e2c506e4286d92
+EBUILD pyfakefs-5.6.0.ebuild 1130 BLAKE2B 77832464c781f79d9d738b1b059a153d1b45e44ff20d89c428446988ad41e68925a105ec6c55e48994d29a2afabd5f1fc9ae3f320eb477dc63c55204b7d97820 SHA512 57442b09b0fe60caad8319b480595e664e7a7e19398281c3dc2192c8e48196d4189d11f006c59f5b06baa069cc9df2e07ada79212b06e3766dce075d040e79f5
 EBUILD pyfakefs-5.6_pre20240703.ebuild 1241 BLAKE2B 08d31407929150fc18a67d63e99364523b43c3da9d718375c976725fc67d633b2689d8826dccfd5d50ea4fbb49187dad39fbe264fcee25edc269df9e6da479e2 SHA512 245b8dbc0d2158a63de38ed2cbfcc1fbc14c7bf8d061132bc5148dc64235ee519070906c5ea4725a5ebe5f20c98024275b4a8500276fd628f936db29aad0729e
 MISC metadata.xml 395 BLAKE2B add696dab9f93cad522087325d7cea08bb0d6905a093c0dd721b8ee0cc5f06a97e8b29663920e5131fd1cfaf38a1fb1c22908daa155025713ffbf18d87a2d5ec SHA512 454f9cf42ae315bb9d4b7c9a2a8b9a690163befc8f738b1fe4a145f1f3a9a5f59693e4cd1ebd4c501005cac1ab81c8b57b2316ac50739dfa96919b6de4850b9a
diff --git a/dev-python/pyfakefs/pyfakefs-5.6.0.ebuild b/dev-python/pyfakefs/pyfakefs-5.6.0.ebuild
new file mode 100644
index 000000000000..9ebc980ca040
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-5.6.0.ebuild
@@ -0,0 +1,44 @@
+# 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..13} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A fake file system that mocks the Python file system modules"
+HOMEPAGE="
+	https://github.com/pytest-dev/pyfakefs/
+	https://pypi.org/project/pyfakefs/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# test for regression with opentimelineio package
+		pyfakefs/pytest_tests/segfault_test.py
+		# test for regression with undefined package
+		pyfakefs/pytest_tests/pytest_fixture_test.py
+	)
+
+	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
+		EPYTEST_IGNORE+=(
+			pyfakefs/pytest_tests/pytest_reload_pandas_test.py
+		)
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pyfakefs.pytest_plugin
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index f62b0f3ba24b..ac931451810f 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,5 +1,3 @@
 DIST pyftpdlib-1.5.10.tar.gz 204487 BLAKE2B 7c611498dc2d11f752bf6a0ada01d906fca5c28e93b21bbcaaa76fafc88dcfe7afe616eb06f102123e614e061db2b6b62766f5036d749f8bd2b6d5cc35fc52e8 SHA512 c8c28d7aab13f2aab222ae038bde96f17abefd461830813ca00b621a6ee3e809c59ed135149ba735e7e92a6722aecfaf7095ccbacd7b3e17a16ee69fe1668766
-DIST pyftpdlib-1.5.9.tar.gz 204755 BLAKE2B f96e670a37023489a3f70f28d7e489633031f4c8dd34e6ece04a13a36a5de60f216dc267a80650c3f315a6a83081b1afc1b470c75ca18af5a80729a7ac363b98 SHA512 3efa07f5522cee89d2bf60c93b1315dfb149da622f34e043aca0ac1c4336c0a0885d7238123068401afa6988da9cbde6adfac78f08918d3a14e84c17ebb8b32f
-EBUILD pyftpdlib-1.5.10.ebuild 1468 BLAKE2B 6d1099035c1f1a66135c68960315f44705a1ade0f11d7e0791ef20d645e8f85ee63a60e7b5648de2e46311971441332632337112a11326c704f98e4ed3e25f84 SHA512 e8f5ba7440a0d7ec1064dfa91ae8f9b70cb404822ca1ea7b32a0a23105c1a76335845ea85d963e6d5b01f15b89eddcf9fb12564c3a4b2040668ad29276d439ce
-EBUILD pyftpdlib-1.5.9.ebuild 1461 BLAKE2B 5959b6d5674617857d8f7f66e5010cc9fba123e3bb3c4d01d3b81ee1101dee1c534b56138cc58a44799ae12d903a5f81b2ae8506301ad241be484ef2371c2ea0 SHA512 80f23999152160d759eb71d52d6c646d0e3b69acc0272ad76c1e52eb96201a0256ef9c25e09bea1fce786870647f56cdf3e743515e0e1036f6da12cab1052777
+EBUILD pyftpdlib-1.5.10.ebuild 1461 BLAKE2B c5c21ffc0560378da5bdb5eb6e1b9919dd167f74e0b16f0fcafd1d0ea8cc22286a54b69c10b40cacf02dc7b6a218274fd860657bd7b1dfa430a160b505ec4300 SHA512 fe1285be1d9805b5111e0c64c85ea6e34101eda4219547c20285898e57c465753072aa9573d8c2229b6b1ae5d78f981b80e6d39a67f9e0ab044706940c5f5f5e
 MISC metadata.xml 463 BLAKE2B ad4e4d5a1717e55743061f2cb4baaa7ea8ce73f4caf0c8d62535aaf73daf12339584bf75c82c35b425223f478094bb37518b43d34694fb4bc6aef6f11033fa8e SHA512 98bb4e647da164a8676f9162d1109d1f6d1ff9279ba8d26207f2ed793537af27de11b40296bacfb478e87b6479c9d31bb24f56bc1acf2a0bc228b2d00a733e1d
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild
index dd007e5da5cb..2f00fca06628 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.10.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.9.ebuild
deleted file mode 100644
index 275a6c59bbf5..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.9.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="
-	https://github.com/giampaolo/pyftpdlib/
-	https://pypi.org/project/pyftpdlib/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	rm -rf pyftpdlib || die
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# fail because they process sys.argv and expect program args
-		# rather than pytest args, sigh
-		test/test_misc.py
-		# TODO
-		test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest --pyargs pyftpdlib
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygdbmi/Manifest b/dev-python/pygdbmi/Manifest
index 45208d7758ea..46b0f1bf80a2 100644
--- a/dev-python/pygdbmi/Manifest
+++ b/dev-python/pygdbmi/Manifest
@@ -1,3 +1,3 @@
 DIST pygdbmi-0.11.0.0.gh.tar.gz 30784 BLAKE2B a3d6bc51640dac78c072ef0162bc1d546707f1b220d8d695595d05a5bcdea8b31b5e23ad916cd2a58bbd4bec2f9fd32b6a9294f00957d890fefd0ecf457ed0de SHA512 11bbc0a9353dbb9d96cb9c71d45a68de446ac6cf1cd110b8f508143218783d2cdfa685874a9b9483933fc58fcfcbb7524a3b670d1c8a6117e8d6484586f1ced6
-EBUILD pygdbmi-0.11.0.0.ebuild 636 BLAKE2B 3bdb1c7d40722f8fcadfec11650bab78299221604c0eac2a0ccffde9918a519c3ebecfed9e9408e84766ba7f9fb90e3a5a6d4097a909ef1065d74d6954157109 SHA512 184d76b7b4e21b271e00a43db4f19a1b323a7a02b95740b0e1ba0cc7fad5f38b2c017352dc37e78594f6becc7063c99fdec9c8a5f432f3689facb10a4fac732d
+EBUILD pygdbmi-0.11.0.0.ebuild 641 BLAKE2B a90957e7e8456825bf4fd2e375c7ced4137d781fbc7fa3f0c227ff84af641041cbf5eb323076deb827499609610afe1bec00ce2232ec07604fbdcb4230ab6a87 SHA512 2f137071d7e5cd33d68024518a779306d3751cfb8735e812e6d1c18cb9c792ad161a799395368ca34aa59fac3a54c9f45b0c2a5b5464335e6b9ca1d14c99c94b
 MISC metadata.xml 610 BLAKE2B 9b0a34853bec5f20469c24916ba92d55c95ea96f37897ceebe63db3b2a005fcdf8d107d8eb46a9e8139dee13d137d6e7597f80ce6c04daf3238389758d266f53 SHA512 142807add15f2010b6bedfdb0500ca1a3afa2febf2e47339a48f4fbf70d0ba5ff0df48333a62469166773d64d034d7245771900faf004e3bfd026a601def50df
diff --git a/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild b/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild
index f28fcedfc5e6..5f0091e15607 100644
--- a/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild
+++ b/dev-python/pygdbmi/pygdbmi-0.11.0.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-debug/gdb-9.6
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 15ca2ff9c1f4..14ac467be45d 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
 DIST pyglet-2.0.14.gh.tar.gz 6420548 BLAKE2B af4d354f49b6d413c35eb9f455a580a0981156b597590a5430f2e380940e815b9a0e9067b0fe47965ad4e88ae7771158fca39d52fd83fea3539cb9252500a7fa SHA512 ffbe2ab0847cd2635970c919fca3c9c190949c8843d5c7e6b7b702e32cf6e09dd4a6f9e7f2ea55134abd7f0ec9ecff347a64aa5771e0e64e67c169d3c60944ec
 DIST pyglet-2.0.15.gh.tar.gz 6426555 BLAKE2B 8066ac7c3acd613a6fe02403ec5c88822744d6f7ab5e0043ca01443ab94249be7e542bc97f5354286bd3f5675c1c2e4d108ab474d659efe2905b9892e44ece0c SHA512 8b85264a9f13505f86cef694ebdf1e1ff707980b6ec9d205a1c1ef639b2de0c837926476f8a26b33b7ad8a0cd7d9acfefdd0707bace1734db4185a48f01305d4
+DIST pyglet-2.0.16.gh.tar.gz 6481259 BLAKE2B 3ba5ed0255cb68d15f6db16f086863acd4d64fb8041db568a5364013c755d0b289e39ceca06593bdd3d7b0a35376e27ba07875fd8551f27998a40c75ff8118e1 SHA512 5288a80ac9cfe52035df6b182561e41155564bbee6251b44e3b6708935011338bb162b478b335cc595fdcb137946f91f8b8c45ccb4e0002cd2715348f582cb68
 EBUILD pyglet-2.0.14.ebuild 1748 BLAKE2B 748734b8b40adcca8e0437baa0bab97606a9c08448a73ad46dbbef0f7e577b97f477d79fc8684788d7a38093fc4ed8e57f5b176c908fbf72f9da6fce3b86f8fb SHA512 ea5abb25dca1b23dd024479a234acebdadd5e685fbb0fe5bc2f60f8f709fc9f6391963503c0e9441ce7288f4556e4224afdf9ed8ae5273fdc86b1fdec3b31426
 EBUILD pyglet-2.0.15.ebuild 1755 BLAKE2B 8ff37342f4e7cfd4d24ea8ab16d1fee15ad98025b4911778b3bec16a3213c33b8d26a74913cabf0ae8b3eb19af650608e47eb9ccc4d5bf3119732b277b80e8b2 SHA512 ab364bd633294e175e45596df1909ae1bb20a9379850faae6d6a7a8f3d2bfeef418293e1406da3762400d7d568acad9139abaae6d3475443825d9d694c274a9c
+EBUILD pyglet-2.0.16.ebuild 1758 BLAKE2B b53d1c875a5afe2730911cc2d5b0ea5ed8953595a9d094affe973d87893a1f52f085f7d4251916b021cb9dac94708546575a9156300c7fce4381f813571e600e SHA512 f90369bb0a50d5c80c1f831be3533f454fe6c36727a24b5a54e5d8660e7d2f2ed0d3adc3a8446e106cad0ca268a865942de358efd149ebfc38f1819118022151
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-2.0.16.ebuild b/dev-python/pyglet/pyglet-2.0.16.ebuild
new file mode 100644
index 000000000000..5993f74d2714
--- /dev/null
+++ b/dev-python/pyglet/pyglet-2.0.16.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="
+	https://pyglet.org/
+	https://github.com/pyglet/pyglet/
+	https://pypi.org/project/pyglet/
+"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? (
+		|| (
+			dev-python/pillow[${PYTHON_USEDEP}]
+			x11-libs/gtk+:2
+		)
+	)
+	sound? (
+		|| (
+			media-libs/libpulse
+			media-libs/openal
+		)
+	)
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-libs/fontconfig
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	local EPYTEST_DESELECT=(
+		# lacking device/server permissions
+		tests/unit/media/test_listener.py::test_openal_listener
+		tests/unit/media/test_listener.py::test_pulse_listener
+		# fragile to system load
+		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
+		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
+	)
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-jupyter/Manifest b/dev-python/pytest-jupyter/Manifest
index a997ced2b1bb..965895ed0d1a 100644
--- a/dev-python/pytest-jupyter/Manifest
+++ b/dev-python/pytest-jupyter/Manifest
@@ -1,3 +1,3 @@
 DIST pytest_jupyter-0.10.1.tar.gz 15580 BLAKE2B 931045927f14973162d45ccdff3a28b0e1d955c276ccf73fa91cae46af8d697368edc10bb3a8042885aae8309dd901201ef147967eae13bca453bc3c144de1fc SHA512 ca380f3b4550388606053db97666d3e191e2b4c030b98fed8b88cee53aac0451faf63d1300c50af4313f20b38937558c390c7f9113ef6b9d20fa0c8f0b41e118
-EBUILD pytest-jupyter-0.10.1.ebuild 906 BLAKE2B a95c5e5cc95260707827d93c5eed00d9325a7f01094d631764d6f56359b784fb80c73f0b3cfeac676d2ac51f83b05373fe022a2be3b8ac7bf69eb2ca48f3de47 SHA512 eb05f641f1089bc1e7012c70849ecb74fc046eef0afdbcbcc26dba091d589afa8ab4863a093a2b42f9a5671e8b672103ae5f6f6919827f4a5f79f575eaa5d348
+EBUILD pytest-jupyter-0.10.1.ebuild 906 BLAKE2B 668ef76bf3c287079ccdecd0c39050b5dfa3712541e9857ca32bb214e541c645934351da067398978cfefc9616c3d5a137b3ca87ce77c7f66261a3978a4c5cc7 SHA512 f1a50753aacb35697940291fc0ecd8fcea8bd7b0faca27d134528aeaa3912239c7b3ad636a773a8b3b29469581ba6536f7cac46549f54b4f2b66186d3c6358e0
 MISC metadata.xml 544 BLAKE2B 2774989bbb5ea75c4254ec2c9f3daf04a48bdec28698d62afd2471abb4031273bea581c09151efa643fc691a3fda2e1a4211dca66882fe2c5a24d7a6bef7c1a1 SHA512 e3751515a8baf2b422cb680870adbe9393d37ecf2e8b01212bcfa7d0b62ca368c34a9140945e1af4d7c7f0c5443b996ac7cbd4394833aa13b4e937b05bfe0e6b
diff --git a/dev-python/pytest-jupyter/pytest-jupyter-0.10.1.ebuild b/dev-python/pytest-jupyter/pytest-jupyter-0.10.1.ebuild
index 9af92c022c18..83df3351df84 100644
--- a/dev-python/pytest-jupyter/pytest-jupyter-0.10.1.ebuild
+++ b/dev-python/pytest-jupyter/pytest-jupyter-0.10.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit distutils-r1 pypi
 
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index 1b02f23801ad..778461e21335 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,4 +1,4 @@
 AUX remove-tests.patch 417 BLAKE2B e3a0e4b3fdb42b395fa336461f84feea4dac252399ff266231121a48e659fbfad671d318e9a3212f77939f7e609b3df71363abf8f9f2450e087479869731720a SHA512 3b399e3e85cf12bc5ee2db3d53594b2eee5ba8809bfaa950738730194c2dab16c8b776100b009bdbb520020b0ae276c8b13291139dcb1d48e0887bec72c80679
 DIST python-augeas-1.1.0.tar.gz 93657 BLAKE2B 21d2713d8e11552cc7f0191d2b8f7805b223f5dc9478b89b39dcbd325ab354cef0bfc0314852dc2b071b3b061319b4e27904c0514eb6d6ffd4e39cf7ca33d1f9 SHA512 34e4e98219b9146ef843d94c2e854e951a9b7e81409e603e77e7defdbb8765c013a2c869a4f5db2244352ca35656e18667a0210dd24099cb3e4552a04b23aef8
-EBUILD python-augeas-1.1.0-r1.ebuild 597 BLAKE2B f68dfb13d97bdc1287222c40bacd984965dfcdae4222b11714debc77e3ffcdd2cd70a711221fd91e00dd6a916137d703898d34b1541b0f786a0bd09b700e7d29 SHA512 52e823ac00a5444a730c0d8bfc3c8b6354f749a3e8b8c8a5bd3715f590ee71fcd306aa6550d6160e1fff6cb7645210d1a65c3a4d84e828e8f5cfae84e99ee192
+EBUILD python-augeas-1.1.0-r1.ebuild 628 BLAKE2B ed2aed5ea8e015f000a734ad0f1f790a27952adae4332c43893c4fa5d9bc0a7ea959547cf8b74196fc9e7cdbcb9da7d6969731a85e38b94a7aa067c1853eafee SHA512 18e19726e20cfeaae778542fba4806729f5d7b041fea9a83844f4eddb1abdadab555f5916ec968a9a012b3115c39ef54e83d131611d164a3fd03c505b3da383f
 MISC metadata.xml 423 BLAKE2B 0caa39c52d7e83a0955531808d9bc2abb0ca3d5a1d81d0c1258d209debed472e55c96f93f6e6474beef75ce6b0691195c0b1092154eb463ffdb4190b4c59f0fc SHA512 53e90a9adbf82e9e3f7671b7de404fa4e32050aa9316b226efd782ad49628eeb3a407d6ad45a71bce698eafd60ac3bb46b6289df094fccfd2196d9d33ae290a2
diff --git a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
index 78f839353bf6..e94dfa9a2365 100644
--- a/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.1.0-r1.ebuild
@@ -5,12 +5,16 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python bindings for Augeas"
-HOMEPAGE="http://augeas.net/"
+HOMEPAGE="
+	https://augeas.net/
+	https://github.com/hercules-team/python-augeas/
+	https://pypi.org/project/python-augeas/
+"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,11 +24,12 @@ RDEPEND="
 	app-admin/augeas
 	>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+"
 
-PATCHES=( "${FILESDIR}/remove-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/remove-tests.patch"
+)
 
-python_test() {
-	cd test || die
-	"${EPYTHON}" test_augeas.py || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests unittest
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index a66d13277f34..675e0cdec036 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,3 +1,3 @@
 DIST python-dotenv-1.0.1.tar.gz 39115 BLAKE2B 31bc0598abce2ffe5da0f248f56587fc549489c11b21e87ca144654c564701d7a5f952614b21ba12afb49a7bbb6d3753714c6e628485b449e9de2ec9513657f0 SHA512 d03f28f123b19e6e4af05c239686e189e5767108049399c110b80668bfea9d2a3f9222b719863fdef016cbe726a7a77748a18ddad013f7fc21c239ccf680c1da
-EBUILD python-dotenv-1.0.1.ebuild 1002 BLAKE2B 106723cd2fde0ea763bb7b77948504e409d7eff7de693ba7d5d9900c251b7008f967362c7c4894724764e23df7d496de2add091c73e1fd7c1378b800aa951ce0 SHA512 faba2adbef37603f9669556e83fb3452638522b104e5e0f8a9910e168b07ff3d5517ce9b064ba2025d06e7cf9a7ea7729d2227e4e26fe24da76a551e15e20be6
+EBUILD python-dotenv-1.0.1.ebuild 953 BLAKE2B 542a1b5e36c3cfd21d4aaa9ed77a47e34d7a966524ffef301d68538879f837b1a20a8c39c94c5b4083c94d5f7adf98825a69de1818b0821f4317888c9b3b8434 SHA512 839ba3ecf76515c57ef7d5414716e0dfe1f41afdb63a8f3abf9f94dd0116d468eedecdf6e3c7c5a783969ed3db6948ef04559c10a110ca46a0d0539c0016034d
 MISC metadata.xml 529 BLAKE2B 1dd381879887df2d49a80084ffd386891cffa2547fedf00bb1dbee3c3abe79759620b606a916d71cab518bb3869ecee4775c735db22aac17e785bdda5c4905a5 SHA512 ad2129cb6c691f9f4622de92701f9825cbbfe61e9c2552f91bae53c90e19abe9b4f7cd2e379c516254d8b9a5989d4861f5ec05ec7949c5b533c9b7fc6416056a
diff --git a/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild b/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
index d43fd470cb89..9cd13e324c80 100644
--- a/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-1.0.1.ebuild
@@ -22,10 +22,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 BDEPEND="
 	test? (
 		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
 		>=dev-python/sh-2[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-		' python3_{10..12})
 	)
 "
 
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index bb2cded0320f..1229a8039d7c 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1,5 +1,3 @@
-DIST python-mpv-1.0.6.gh.tar.gz 212503 BLAKE2B f0b63116f90b0d9e0be7d1f7e3586390d1486a89fd2eee8362f0e569b397a9d61dd597b39307559ea4206fdb98c70bbb09e07fbcbc64d60026b21522c1396053 SHA512 f5848f62f978372b04d09e89e9d04b64ff0c437a1f9f63c4ba4751bbe4a8bd0eb20e7503a3f25c7ca64ef0ab5c91db8be68473dbc29a04d78a9246ed784bcc38
 DIST python-mpv-1.0.7.gh.tar.gz 212686 BLAKE2B 5a3de241739196a3baec6fb985422d82ae35fe0b3709ba96bdc7ae51489de02495f886b0c5ca38fbfdd110e974954dc715e9334925e558f69f8961f00487b9ed SHA512 9373259bab0857855cb08c13f9f33fb3a26f880b09c8c468ce1330433c1b2cff72a5015fc066fb830a4089eff08852ad5aa05e648bfba617b9b3d225860c20d3
-EBUILD python-mpv-1.0.6.ebuild 887 BLAKE2B b393011520c3faef4cfccfc4490c61d06b11fab8c78e8e0056b2151779018232ce54ea1d9c99b08d41b01e1901f508fcd6987d79e286877e54509bdc9fb6186b SHA512 d8a139d424371875761c3bd41da11e7160a0d14e92928c870babe2403dcf8253d9aef1905d6a78e8d1f2dbd31b39cd4d8acb4638b767f9bd142c9ec479ca693c
 EBUILD python-mpv-1.0.7.ebuild 887 BLAKE2B b393011520c3faef4cfccfc4490c61d06b11fab8c78e8e0056b2151779018232ce54ea1d9c99b08d41b01e1901f508fcd6987d79e286877e54509bdc9fb6186b SHA512 d8a139d424371875761c3bd41da11e7160a0d14e92928c870babe2403dcf8253d9aef1905d6a78e8d1f2dbd31b39cd4d8acb4638b767f9bd142c9ec479ca693c
 MISC metadata.xml 413 BLAKE2B 3e6ced6a506525bd576741fbcb1b0ce6069492dd1e90295a46b029340b833d981b351ac717e3896f4b13f3e8635065e974317298711922ab131925d98d0447a3 SHA512 9426ddc828c6b8f420c3d0241f827dd7746ca797c45182b0324b8278a24e4038a856494b420de2de572ee2643082ae271a5c21030098432736255ff2f6798db3
diff --git a/dev-python/python-mpv/python-mpv-1.0.6.ebuild b/dev-python/python-mpv/python-mpv-1.0.6.ebuild
deleted file mode 100644
index 6b9246e27c40..000000000000
--- a/dev-python/python-mpv/python-mpv-1.0.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python interface to the mpv media player"
-HOMEPAGE="
-	https://github.com/jaseg/python-mpv/
-	https://pypi.org/project/python-mpv/
-"
-SRC_URI="
-	https://github.com/jaseg/python-mpv/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	media-video/mpv[libmpv]
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# hanging tests
-		tests/test_mpv.py::TestLifecycle::test_wait_for_property_event_overflow
-		tests/test_mpv.py::TestStreams::test_custom_stream
-	)
-
-	virtx epytest
-}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index c2edbec945a7..4ae982f06e8a 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,5 +1,3 @@
-DIST python-socks-2.4.4.gh.tar.gz 31998 BLAKE2B c3aa137ff679790420ded9644987eed23695c82a5621c420350ad52ca8121215326575f4c389912fb646151fc84187bfab38674ff6dc2a2f3587c4662f51c0f6 SHA512 a357fbd16cf653555bb624103732041efa80b1ae21a6347fdcb609de3cc58227ac053d21b62124fd77b21a16b19a2786bc1a8c33cc3b50dcffb3023bd6704f57
 DIST python-socks-2.5.0.gh.tar.gz 32293 BLAKE2B 20eaa8b27d695116f9d03bfa1807496c789a43804c06f441f7961d928095d169f9b581120c29d188e0eda39d15b517012647e6f6f682a29c260179dca422b0dc SHA512 d59a3eb851c80556e08513ae417a109da6670b81858df365818ca187d14b57719ee86c6a65d9e8a8366ad3c7a2516a10cabcbf9895d8456b5f188c80dae74eee
-EBUILD python-socks-2.4.4.ebuild 1294 BLAKE2B 5a13604cc85c00260e85aa7071aff77dd9506eb71282aa6affe537a41a5049192ea0474247fec262a90910e5bff2f19bbba30d653f8094adb217befc8705b86b SHA512 b045e40cd5ab134fddaabc38c6b4ab1e8a144114f50c723e914a66af80e04c1295bbd6a309169dbd90dfe395a7d427ff3925a8c986b1aca90d0cc62cadeee656
-EBUILD python-socks-2.5.0.ebuild 1302 BLAKE2B 118b6c164a7964e80547e00366ad949c22a5606e80e689668882a54a46b33309985a43af508cac32dcab6e8915d68fcc222e5d708b6c5f60c079d6197791463f SHA512 c51989f92d15e015b697f14b537f1066ea99a5b9c8cd4ba702cf589d431e2b16211dfbe00af10642b4b9946bb8bd24cf65dcb3b5aad7b779af20b70ba996ad26
+EBUILD python-socks-2.5.0.ebuild 1294 BLAKE2B 5a13604cc85c00260e85aa7071aff77dd9506eb71282aa6affe537a41a5049192ea0474247fec262a90910e5bff2f19bbba30d653f8094adb217befc8705b86b SHA512 b045e40cd5ab134fddaabc38c6b4ab1e8a144114f50c723e914a66af80e04c1295bbd6a309169dbd90dfe395a7d427ff3925a8c986b1aca90d0cc62cadeee656
 MISC metadata.xml 380 BLAKE2B 2209abdbafd26baae585840e774843c37e0c6103fa93d75e8c1ddbc8dd1b96f269a3e76f14c39a55294d4d642d7fbe9f87c6b1a0b64152c671590a9e0a6ef959 SHA512 ccbb1a5c9fd05ae1da346f4f92efe156921f7adf9f5544635a407ba4a8154c896bda2e445e05e70a8e46c2829b8d4a38d3bf5d73804a3641c811acd2be62099a
diff --git a/dev-python/python-socks/python-socks-2.4.4.ebuild b/dev-python/python-socks/python-socks-2.4.4.ebuild
deleted file mode 100644
index 2b88d418ab9c..000000000000
--- a/dev-python/python-socks/python-socks-2.4.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
-HOMEPAGE="
-	https://github.com/romis2012/python-socks/
-	https://pypi.org/project/python-socks/
-"
-SRC_URI="
-	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-# curio is not packaged
-# asyncio is the only backend we have, so dep on its deps unconditionally
-# TODO: revisit
-RDEPEND="
-	dev-python/async-timeout[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/async-timeout-3.0.1[${PYTHON_USEDEP}]
-		>=dev-python/flask-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18.3[${PYTHON_USEDEP}]
-		>=dev-python/pytest-trio-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tiny-proxy-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.16.0[${PYTHON_USEDEP}]
-		>=dev-python/trustme-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/yarl-1.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-# Test markers exist to exclude trio etc if needed
-distutils_enable_tests pytest
diff --git a/dev-python/python-socks/python-socks-2.5.0.ebuild b/dev-python/python-socks/python-socks-2.5.0.ebuild
index 4bfe898288dd..2b88d418ab9c 100644
--- a/dev-python/python-socks/python-socks-2.5.0.ebuild
+++ b/dev-python/python-socks/python-socks-2.5.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/pythran/Manifest b/dev-python/pythran/Manifest
index 35c092aa9eef..cd677e013818 100644
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@@ -1,3 +1,3 @@
 DIST pythran-0.16.1.gh.tar.gz 3680817 BLAKE2B 2a4b928e9d0ce68248eb543c97da5afca900d81bc660377313617149c5aae7529a371bfd3604dd9feb6e38f834360fef881c8324ae72b585d8ab86e867c2f6b3 SHA512 7a89546b52bdae9bdaeba42768ac822c584a3714b8f4e32417d793454dc0b5492342dfd393d92f8ecee12c854bc39e418f5860aadd00d328afef7b17ebddec99
-EBUILD pythran-0.16.1.ebuild 3008 BLAKE2B bbf46de0ffab73ebe5f8c4a2fbb8f3377d6435174b84afd2990c0a0a79606218df6292c64d2420bd8c1b834d36981bb296f047c29882d87c5d292c8be4464070 SHA512 762b99112ff898e68893cf4c64c02701a2f8e6a9ceff28b4018b71d18518892cfb4a1c142081f615c09de5927ea685b51bc827a16eb9c9f8422bd15f0896c527
+EBUILD pythran-0.16.1.ebuild 2965 BLAKE2B 68d89521d7b4de5c6f2afacca66ae924112f0ae5cc529ae514b450e35cd412e7c1754ce7d435a4a410a22b70b2af7f3537137e311617292f69fd359e9ac9d225 SHA512 48e7d7e9f60ec9b38b10797d9a3496e01e278a3c73670472905eda0acbd013221b068fa8ec5b5c1a5359b679dca68796ab236c994e7f2f4bb88a7da7968d9df3
 MISC metadata.xml 354 BLAKE2B e7ec71fae294f6f697b0fd99b0ccef24049af7999866344e8da2ebc40bc2988a21f2cb0374b52b781a5f8b55f26ebca364dc93f4e69d957a3ff6bd3c32cd988d SHA512 9008d270ea6757557482edb55c5848aea9a29abfbbad65d93000660a1e51ad2456a2b7ccfcacb80da23b3dd38cee2c4da9645aed48a35edb4a497bbe3a80dd7f
diff --git a/dev-python/pythran/pythran-0.16.1.ebuild b/dev-python/pythran/pythran-0.16.1.ebuild
index f15b73db6283..b93681c29f4f 100644
--- a/dev-python/pythran/pythran-0.16.1.ebuild
+++ b/dev-python/pythran/pythran-0.16.1.ebuild
@@ -41,9 +41,7 @@ DEPEND="
 "
 BDEPEND="
 	test? (
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-		' 3.{10..12})
+		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/scipy[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 6972aa71e0f5..48a875449f5f 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,9 +1,5 @@
-DIST pytools-2024.1.5.tar.gz 80774 BLAKE2B 37e9e14d5a62cdad34ddbfd0eabec747c392ba1506aacc76322f090699192369915882ba948fa07cd7a45369d3391343d9b2554def851e844976bc0442ddcfb6 SHA512 af7b79f1e26a43459765627ce6e6740953c38e05e26f3ec17360ccdf588ac320eabb5540fbbf9570cde324b8aae2412878316e9930e5195f467dbf5b74ca76b8
 DIST pytools-2024.1.6.tar.gz 81344 BLAKE2B ff68e2606170bf54e3f609ee7f4cfe58e063f43dcfb2706d5ed7659ea2fde863e6315d0d81dff2e62a3378f195413561a927b0c1e7bedc06388cf4893c07b873 SHA512 a9e934f1cbaf0ace32420f9b74224a06ce8421ee291b837292133969c6788c4cc8bea01446cd4d1505aca9fa81e8ae0d3eacf60d3285186e66d67d5abe10ce3e
-DIST pytools-2024.1.7.tar.gz 82211 BLAKE2B 07da2dbd2d19ec11a481f71aac1273f64e3eb00483b1a633d42a08e36aa8d76e0cae0235538f58d0c2acf12079544b168a97d78c9aa1d3421525e6fe47f1db82 SHA512 9833cf5c3b72cb89bf25dde5f15c5970db5dd86e1eaf1dbfb8e7024ac0854fa200f6bb64f8ebd346998c4ca792ee0dca898b0de0f839445c64e2279dcc771788
 DIST pytools-2024.1.8.tar.gz 82220 BLAKE2B bc1dd2eb80be38f6ee450f2d0a780b4815b3a3349bc99ca8521a891bccbc0c4e532881db749def53e26e088238f852ca9174e0fc2a7a7a43a064c1caadec2772 SHA512 d49a6c2cd73915dbc9446f4ed2a05ac30c3235b8fd57fc26814c42cb31ab43c54ae3b06ad69354c7932f266e0f2e0fcde4b9ff91426f8744f924e3d6837f0060
-EBUILD pytools-2024.1.5.ebuild 831 BLAKE2B b0402da628468a2977e2975b84cd0ce0060604d2de7864bd21d45d88270e7819decb9ee8d78078deb352107780da13461e36e0909ac68686c526d32a9e311243 SHA512 1fa17b25019dc6487332bf36042629b08b4214b4fb68e4f54e5b032f11cdc0eab6737ae731d86f5c4188b18a1d5dfb39ce056ff1b0c77aa612429d91e36ca528
-EBUILD pytools-2024.1.6.ebuild 833 BLAKE2B d6b8a51354d5663a4017f18c0b0350bb7db9acb2a6a695384202b4a4c774ea8096333bd51c9423c348f725abfa529818d7b5ff41bfa2070fcf66bbd96e077f1a SHA512 455fdea9a18fb4f6f49e1d65fac941bc2718e671bcdc0ca32d97e8991e9104329cf984a5fab58a8166178e43acff5b81cd38337b6350a4676a9104c78a8e6da9
-EBUILD pytools-2024.1.7.ebuild 866 BLAKE2B 607b33e74a595a59eca6d47e9c191986546dedc1b2684ea31034f2e3749e700aec3df4ddfc703265e78318eb00b2ed1007fd8c8ff19454ab8b16c4810244ecc3 SHA512 4b6f77e97646af484d6bef91d11c15e22f7610bdc71e511788a078c8b7d8d1b119612bf14b847326be6dd27b6cecf437f7f3566fb90b4167c13a618919db8059
+EBUILD pytools-2024.1.6.ebuild 831 BLAKE2B b0402da628468a2977e2975b84cd0ce0060604d2de7864bd21d45d88270e7819decb9ee8d78078deb352107780da13461e36e0909ac68686c526d32a9e311243 SHA512 1fa17b25019dc6487332bf36042629b08b4214b4fb68e4f54e5b032f11cdc0eab6737ae731d86f5c4188b18a1d5dfb39ce056ff1b0c77aa612429d91e36ca528
 EBUILD pytools-2024.1.8.ebuild 866 BLAKE2B 607b33e74a595a59eca6d47e9c191986546dedc1b2684ea31034f2e3749e700aec3df4ddfc703265e78318eb00b2ed1007fd8c8ff19454ab8b16c4810244ecc3 SHA512 4b6f77e97646af484d6bef91d11c15e22f7610bdc71e511788a078c8b7d8d1b119612bf14b847326be6dd27b6cecf437f7f3566fb90b4167c13a618919db8059
 MISC metadata.xml 390 BLAKE2B 3cd3f1c6df2c112e3828b55f4a4282495c24fb5f1869ee1c105710e517de738a767e30388c808432ce7e41ad5d14be4d56fb6ee7bcd62f9990262b145413ab20 SHA512 c28d8640d0b0c7d77ba18367ae5379b11747a67ace55a6f5910c2f5a4dd5d5816bb1a256a27e78fdad909de2947e5db84c16283604e216b393b5cde5c39e6b24
diff --git a/dev-python/pytools/pytools-2024.1.5.ebuild b/dev-python/pytools/pytools-2024.1.5.ebuild
deleted file mode 100644
index c190bc38483c..000000000000
--- a/dev-python/pytools/pytools-2024.1.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-# NB: numpy is now an "extra" (optional) dep -- we can remove it from
-# RDEPEND If revdeps don't need it
-RDEPEND="
-	>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2024.1.6.ebuild b/dev-python/pytools/pytools-2024.1.6.ebuild
index 38860936dd01..c190bc38483c 100644
--- a/dev-python/pytools/pytools-2024.1.6.ebuild
+++ b/dev-python/pytools/pytools-2024.1.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 # NB: numpy is now an "extra" (optional) dep -- we can remove it from
 # RDEPEND If revdeps don't need it
diff --git a/dev-python/pytools/pytools-2024.1.7.ebuild b/dev-python/pytools/pytools-2024.1.7.ebuild
deleted file mode 100644
index a2fde559d718..000000000000
--- a/dev-python/pytools/pytools-2024.1.7.ebuild
+++ /dev/null
@@ -1,34 +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..13} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="
-	https://mathema.tician.de/software/pytools/
-	https://github.com/inducer/pytools/
-	https://pypi.org/project/pytools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-# NB: numpy is now an "extra" (optional) dep -- we can remove it from
-# RDEPEND If revdeps don't need it
-RDEPEND="
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2[${PYTHON_USEDEP}]
-	>=dev-python/siphash24-1.6[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest
index 367f53bff1f2..dae71214cc72 100644
--- a/dev-python/qiskit-aer/Manifest
+++ b/dev-python/qiskit-aer/Manifest
@@ -1,3 +1,3 @@
 DIST qiskit-aer-0.14.2.gh.tar.gz 7132159 BLAKE2B bc684f7acca071866bc6413d5fb881cf131fe212be7294922a6861dc526d77d0cfb906d9c2ea57236e42e8a99e137ee0ac5f0c1e11fd027122983ad3d8992f73 SHA512 75a2fadb413fc557f98043cc028b28f6cae65b983fd0f32f1e8b8eda6d5cbc6d9d528c38f765d14ede5909045cef914335a483f762c20c4dd85754449d63371c
-EBUILD qiskit-aer-0.14.2.ebuild 3631 BLAKE2B 4c92dd1de8c4d1b1700064ab85c758f5ac0ad193d1056a85fe2e757a4555ea02c4bb826683c5547a274b6a95d5b9ca25f68c2f74a19eef494c49300a850be137 SHA512 8a130ac1ee1c930fce69e48c21050c0129bf1a3a3039210597353a3f3b7e9ae9d81dd77159430d0b7b4ad863fbef1cbdc128edab859b9f417388f15aedb7b798
+EBUILD qiskit-aer-0.14.2.ebuild 3631 BLAKE2B 93c158c8987377975049ecd1ae9af456f0b1fc39b7aedb1692b0aaddce5a142d26b9ff832af9c2012b1c6ba7dbf97194903bada56a17d51930d43a91b5c2f04a SHA512 6add6bc8b5eb9b26ae3e98660304420a0113dae3f6fbb6e571600188dd778284206a7a5b404d8a201c9400c15e25635efdfab2e0e4fa25ef98275fdc3b366746
 MISC metadata.xml 1049 BLAKE2B e2118dc211ac8f42115959dde943a32331b4186524ef4a5a1343d8798a329e1d0de5f9a52a9c1212ec6af39392993378c6422424488782747ffbf4ab1e63d25e SHA512 bc4c9a19376938e973bedbdff0bbe95edb98c78b75d03f2a12985558a5cd5d0ceb934c43371438dd597a8d4fb8879d5483aeb8d806ac4d9b73b704d1232086b8
diff --git a/dev-python/qiskit-aer/qiskit-aer-0.14.2.ebuild b/dev-python/qiskit-aer/qiskit-aer-0.14.2.ebuild
index be250877d000..06def0bfe1d8 100644
--- a/dev-python/qiskit-aer/qiskit-aer-0.14.2.ebuild
+++ b/dev-python/qiskit-aer/qiskit-aer-0.14.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/qiskit/Manifest b/dev-python/qiskit/Manifest
index 99d7a14e5499..d3c0b7ea0047 100644
--- a/dev-python/qiskit/Manifest
+++ b/dev-python/qiskit/Manifest
@@ -103,6 +103,7 @@ DIST py_literal-0.4.0.crate 16747 BLAKE2B 824a3aeb85dc95f0b126f286d23dbe951c0e76
 DIST pyo3-0.21.2.crate 504574 BLAKE2B 1b8bf374d1b61e3e4bedce6344338126051a6d951ea87d258e5ed92d4c0e13b0202f2e7e56500277c54743dd16c9b4587f436cf2058567501c8a9ac7c6b6c17a SHA512 5f88cda423e82b62698a74ceaa31fc27e5c1f1d417928accddb2e00337d163fda622f774ae6e24c1cb73c467d6b01e9a2ba866e4454338b1fbfc892ae14ffc53
 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
+DIST pyo3-ffi-0.22.1-py313.patch 6315 BLAKE2B 55f9c5d45356e8c4b2a86da0f489788de576d7fb4c7b124a87d953e8d3a850fbeb05a1af8e6f34edf252aeda40445f711f4409a3a80df7442bd4676c1d8969f8 SHA512 f6e6e2498bbd8b60e013b4cb6e1f1eda764292e3cd91ba5800fe798521f462bb97f1e621711513d52c263f7b394821a710252425cfb0de0f1c4457882dd138ab
 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-backend-0.21.2.crate 58088 BLAKE2B 05dd49983c8aeddc47cd94f6cd58f10e41ad6f4ec57006908cde4fe3edbcf6814058d7843a88c9dbeb0824f840ad3509414c52e47fffe5ad4b730f791c9a3f19 SHA512 f8488ba0a68f1ae20d053e2323d065f03b40c24231a50b05205b100e973ae50bc7bb9c25e4d37df56f4cfa73d2001655ce9685078d1017a4a90bd7945c01b833
 DIST qiskit-1.1.0.gh.tar.gz 9734708 BLAKE2B b188fe116ff5d0fa498e2b5c829b61950043163528ff39a51701d4f497a9dc0e1ffa27c518833dec84198682477c3398e8edb737d74b4f321b70fb3971b25a57 SHA512 7830b004b32461918ae5a739ee0dc1043386877f22f5112607828f6100e8b7b8b00fd946f465a1ae160fa1f6c40c1339dc743c7811add1c03e20c67d206a29e4
@@ -182,5 +183,6 @@ DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b279
 DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 EBUILD qiskit-1.1.0.ebuild 6426 BLAKE2B 5837b7a4a2a1b499c32d481ab61e501f11dbf3c313aaee1656d2efb01741bd046b90e14f454955243386ec5900694733edb6124d85c0fb579d9725fce1791ae9 SHA512 7d20b4018d74f1ce8d3ff6b277ffa318e8acb9391f69f695830a2a14302aace98b03616961c7b0a88601dea59eac74a0ff8250c8abcb96e0d96aa1f7558de776
-EBUILD qiskit-1.1.1.ebuild 6426 BLAKE2B 5837b7a4a2a1b499c32d481ab61e501f11dbf3c313aaee1656d2efb01741bd046b90e14f454955243386ec5900694733edb6124d85c0fb579d9725fce1791ae9 SHA512 7d20b4018d74f1ce8d3ff6b277ffa318e8acb9391f69f695830a2a14302aace98b03616961c7b0a88601dea59eac74a0ff8250c8abcb96e0d96aa1f7558de776
+EBUILD qiskit-1.1.1-r1.ebuild 7135 BLAKE2B 7c98ffdea1a31b43538bdf744db1289e7ad3a571aab785b6c558ce9974301b140373aeacade21bedeed711194227ceb3427e4883458af170e6da3b442d6493ef SHA512 f45fb788c4bca9e1c1a2e68c1def367fe7a5088284ab355d246d99d462f085cd9ac4216e8b82b9e394f248b2c9d86468325e4fc076fb700edff09b193a9cba41
+EBUILD qiskit-1.1.1.ebuild 6506 BLAKE2B 2d2d6497cca3e27a5b0f2e9ce78ff273c8afd6d474c646d93231e25a22fe2f414db6a4bad04334b0aa2fcc035a55f5b6263c6cb08b89085d7b760285729cc199 SHA512 d42ec0e2e6b94feea4fa004742bc1f1ddadd90d2ae1fe8d55ab0b3fa0129998013f6ea58d63e046220ee7802bb8c3d6149a96650502e4f44e1a5e0df6eccec8f
 MISC metadata.xml 1087 BLAKE2B 3b20c74331333cfa3c08d2422ae65ba620ffbc331f9889d5e23a0a64ff169efed37d93df50131862b13dfe7a72cbca5af4c2a916315ea521fc063e57f6bdc198 SHA512 1bd62897d647ee140903ec4732831155683c131ab7c2ebb99bc1ab04b03e805b372b09d25846ec0a0d8bb0dd6a930c234db46c0bdd89f23a0ed376e9402475d2
diff --git a/dev-python/qiskit/qiskit-1.1.1-r1.ebuild b/dev-python/qiskit/qiskit-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..854b99273f90
--- /dev/null
+++ b/dev-python/qiskit/qiskit-1.1.1-r1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+CRATES="
+	ahash@0.7.8
+	ahash@0.8.11
+	allocator-api2@0.2.18
+	always-assert@0.1.3
+	approx@0.5.1
+	ariadne@0.3.0
+	autocfg@1.2.0
+	bitflags@1.3.2
+	bitflags@2.5.0
+	block-buffer@0.10.4
+	boolenum@0.1.0
+	bytemuck@1.15.0
+	bytemuck_derive@1.6.0
+	byteorder@1.5.0
+	cfg-if@1.0.0
+	coe-rs@0.1.2
+	concolor-query@0.3.3
+	concolor@0.1.1
+	countme@3.0.1
+	cov-mark@2.0.0-pre.1
+	cpufeatures@0.2.12
+	crossbeam-channel@0.5.12
+	crossbeam-deque@0.8.5
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.19
+	crunchy@0.2.2
+	crypto-common@0.1.6
+	dbgf@0.1.2
+	digest@0.10.7
+	drop_bomb@0.1.5
+	dyn-stack@0.10.0
+	either@1.11.0
+	enum-as-inner@0.6.0
+	equator-macro@0.1.9
+	equator@0.1.10
+	equivalent@1.0.1
+	faer-entity@0.18.0
+	faer-ext@0.1.0
+	faer@0.18.2
+	fixedbitset@0.4.2
+	gemm-c32@0.17.1
+	gemm-c64@0.17.1
+	gemm-common@0.17.1
+	gemm-f16@0.17.1
+	gemm-f32@0.17.1
+	gemm-f64@0.17.1
+	gemm@0.17.1
+	generic-array@0.14.7
+	getrandom@0.2.14
+	half@2.4.1
+	hashbrown@0.12.3
+	hashbrown@0.14.5
+	heck@0.4.1
+	hermit-abi@0.3.9
+	indexmap@1.9.3
+	indexmap@2.2.6
+	indoc@2.0.5
+	is-terminal@0.4.12
+	itertools@0.10.5
+	itertools@0.11.0
+	itertools@0.12.1
+	jod-thread@0.1.2
+	libc@0.2.154
+	libm@0.2.8
+	lock_api@0.4.12
+	log@0.4.21
+	matrixcompare-core@0.1.0
+	matrixcompare@0.3.0
+	matrixmultiply@0.3.8
+	memchr@2.7.2
+	memoffset@0.9.1
+	miow@0.5.0
+	ndarray@0.15.6
+	npyz@0.8.3
+	num-bigint@0.4.4
+	num-complex@0.4.5
+	num-integer@0.1.46
+	num-traits@0.2.18
+	numpy@0.21.0
+	once_cell@1.19.0
+	oq3_lexer@0.6.0
+	oq3_parser@0.6.0
+	oq3_semantics@0.6.0
+	oq3_source_file@0.6.0
+	oq3_syntax@0.6.0
+	parking_lot@0.12.2
+	parking_lot_core@0.9.10
+	paste@1.0.14
+	pest@2.7.10
+	pest_derive@2.7.10
+	pest_generator@2.7.10
+	pest_meta@2.7.10
+	petgraph@0.6.4
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	priority-queue@1.4.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.81
+	pulp-macro@0.1.1
+	pulp@0.18.10
+	py_literal@0.4.0
+	pyo3-build-config@0.21.2
+	pyo3-ffi@0.21.2
+	pyo3-macros-backend@0.21.2
+	pyo3-macros@0.21.2
+	pyo3@0.21.2
+	quote@1.0.36
+	ra_ap_limit@0.0.188
+	ra_ap_stdx@0.0.188
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	rand_distr@0.4.3
+	rand_pcg@0.3.1
+	raw-cpuid@10.7.0
+	rawpointer@0.2.1
+	rayon-cond@0.3.0
+	rayon-core@1.12.1
+	rayon@1.10.0
+	reborrow@0.5.5
+	redox_syscall@0.5.1
+	rowan@0.15.15
+	rustc-hash@1.1.0
+	rustversion@1.0.15
+	rustworkx-core@0.14.2
+	same-file@1.0.6
+	scopeguard@1.2.0
+	seq-macro@0.3.5
+	serde@1.0.200
+	serde_derive@1.0.200
+	sha2@0.10.8
+	smallvec@1.13.2
+	smol_str@0.2.1
+	syn@1.0.109
+	syn@2.0.60
+	sysctl@0.5.5
+	target-lexicon@0.12.14
+	text-size@1.1.1
+	thiserror-impl@1.0.59
+	thiserror@1.0.59
+	triomphe@0.1.11
+	typenum@1.17.0
+	ucd-trie@0.1.6
+	unicode-ident@1.0.12
+	unicode-properties@0.1.1
+	unicode-width@0.1.12
+	unicode-xid@0.2.4
+	unindent@0.2.3
+	version_check@0.9.4
+	walkdir@2.5.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.8
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	windows-sys@0.42.0
+	windows-sys@0.45.0
+	windows-sys@0.52.0
+	windows-targets@0.42.2
+	windows-targets@0.52.5
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.52.5
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.52.5
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.52.5
+	windows_i686_gnullvm@0.52.5
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.52.5
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.52.5
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.52.5
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.52.5
+	xshell-macros@0.2.6
+	xshell@0.2.6
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo distutils-r1
+
+MY_P=qiskit-${PV}
+DESCRIPTION="An open-source SDK for working with quantum computers"
+HOMEPAGE="
+	https://github.com/Qiskit/qiskit/
+	https://pypi.org/project/qiskit/
+"
+SRC_URI="
+	https://github.com/Qiskit/qiskit/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+	https://github.com/PyO3/pyo3/pull/4324.patch
+		-> pyo3-ffi-0.22.1-py313.patch
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 MIT
+	Unicode-DFS-2016
+	|| ( LGPL-3 MPL-2.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+visualization"
+
+RDEPEND="
+	>=dev-python/dill-0.3[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/python-constraint-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rustworkx-0.14.0[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/symengine-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sympy-1.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.10)
+	visualization? (
+		>=dev-python/matplotlib-3.3[${PYTHON_USEDEP}]
+		dev-python/pydot[${PYTHON_USEDEP}]
+		>=dev-python/pillow-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/pylatexenc-1.4[${PYTHON_USEDEP}]
+		>=dev-python/seaborn-0.9.0[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	>=dev-python/cython-0.27.1[${PYTHON_USEDEP}]
+	test? (
+		app-text/poppler[png]
+		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
+		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
+		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
+		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
+	)
+"
+
+# Files built without CFLAGS/LDFLAGS, acceptable for rust
+QA_FLAGS_IGNORED="
+	usr/lib.*/py.*/site-packages/qiskit/_accelerate.*.so
+	usr/lib.*/py.*/site-packages/qiskit/_qasm2.*.so
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip forcing -Werror from tests that also leaks to other packages
+	sed -i -e '/filterwarnings.*error/d' test/utils/base.py || die
+
+	cd "${ECARGO_VENDOR}"/pyo3-ffi-*/ || die
+	eapply -p2 "${DISTDIR}/pyo3-ffi-0.22.1-py313.patch"
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
+		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
+		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
+	)
+
+	local EPYTEST_IGNORE=(
+		# Breaks xdist
+		test/python/qasm2/test_parse_errors.py
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# docstring mismatches
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_meta_lines
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_multiple_entries
+				test/python/utils/test_deprecation.py::AddDeprecationDocstringTest::test_add_deprecation_docstring_no_meta_lines
+			)
+			;;
+	esac
+
+	rm -rf qiskit || die
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# Run the Python test suite rather than everything under test/ which
+	# includes the 'randomized' suite. Upstream run that in a separate CI job.
+	epytest test/python
+}
diff --git a/dev-python/qiskit/qiskit-1.1.1.ebuild b/dev-python/qiskit/qiskit-1.1.1.ebuild
index dcff5753571b..63c9785275fa 100644
--- a/dev-python/qiskit/qiskit-1.1.1.ebuild
+++ b/dev-python/qiskit/qiskit-1.1.1.ebuild
@@ -245,7 +245,6 @@ BDEPEND="
 		>=dev-python/ddt-1.4.4[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-4.24.3[${PYTHON_USEDEP}]
 		>=dev-python/networkx-2.2[${PYTHON_USEDEP}]
-		<dev-python/pytest-8.2[${PYTHON_USEDEP}]
 		>=dev-python/qiskit-aer-0.14[${PYTHON_USEDEP}]
 		>=dev-python/scikit-learn-0.20.0[${PYTHON_USEDEP}]
 	)
@@ -270,6 +269,7 @@ python_test() {
 	local EPYTEST_DESELECT=(
 		# TODO
 		test/python/circuit/test_equivalence.py::TestEquivalenceLibraryVisualization::test_equivalence_draw
+		test/python/quantum_info/operators/symplectic/test_sparse_pauli_op.py::TestSparsePauliOpConversions::test_to_matrix_zero
 		test/python/transpiler/test_unitary_synthesis_plugin.py::TestUnitarySynthesisPlugin
 		test/python/visualization/test_dag_drawer.py::TestDagDrawer::test_dag_drawer_no_register
 	)
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 9df564c8dc51..f051b593db81 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,3 +1,3 @@
 DIST qtconsole-5.5.2.tar.gz 439219 BLAKE2B f354d3e6132142a3da52a1cb6b290d0a07b13920bc9f33f7fb29eb307cc5b653beccc5d28e53f7cbe7483147adb6e34ffc584718a79b814c9ce2c37b57a768fc SHA512 f79e51903fe5a1164a90c0905c308d2bce066bef2c61fed2b5bb7e757a9cf56875cdd14665df9284317497cd73bb544ae09e0b23c63b527bbd4bc90b874009f6
-EBUILD qtconsole-5.5.2.ebuild 1684 BLAKE2B c0b33e243605505e56b9f4eb6fca79e6acfab0f0fd3b9de54b54d6d968f651492e489d448ee5123888e8d7d35c244e703dca9693f5d6b301ee8491a2899b1492 SHA512 98b4a75971cbaff17a6e1c01b33c0b979d9a1dc5c3f102c428d48e09719ebdf5d7490a06eafd2dc98bd86b6d42c6529ed630c2b9bb7a927c2d2c1a0227725069
+EBUILD qtconsole-5.5.2.ebuild 1684 BLAKE2B 9d2984a34b05203ddf430006d94e800474aeb880c2a0e16eadde409dbdc8b5c74da812abedac79e934239b5a68a527b34e6be3ffd658ea5ec37632447d792c72 SHA512 84b1a81bde38bc3f40249abc73f61ec9a8dfe7256e491b1e7265ed72c3918291a78a72935c3b902d22908192988b594c0511b5ece35635bfaf18fd77364f7358
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.5.2.ebuild b/dev-python/qtconsole/qtconsole-5.5.2.ebuild
index c2409609f635..8f08269264b9 100644
--- a/dev-python/qtconsole/qtconsole-5.5.2.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.5.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi virtualx
diff --git a/dev-python/rapidfuzz-capi/Manifest b/dev-python/rapidfuzz-capi/Manifest
deleted file mode 100644
index 0810603f3925..000000000000
--- a/dev-python/rapidfuzz-capi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rapidfuzz_capi-1.0.5.gh.tar.gz 5908 BLAKE2B a5f3c27c2292800527f0e0558e0f25525c2865a6348fbbe36da8d5a96e5524c68154bfba8dbfc3c174f759dde14a95c64e47dd6669166beb035bd1126741569b SHA512 b62c6fdd0e5d0804f7c1ef6f6b5e007afd8439720071fbdf1440232c62925e794a6ae33774a33ef745ebbd4ef956a85d2bf60934a7d568d39d1e590467f26bcf
-EBUILD rapidfuzz-capi-1.0.5.ebuild 651 BLAKE2B b23821582cef7e37f7d6964faa889db5037556099be5922c7cce638f1ad57cf2ab230db34c4eedcd62cca92dcce167458f4e4a0d80e59214a91ec15a58ab3c78 SHA512 b679e2e21802fcbd0c5430ea06875e2cbf3cc222218c6d1123076e89a1ad088ef3170b6da7073f5bd8888c6daad8f37beb5c88280005da6f53cbe9625b9cc73c
-MISC metadata.xml 408 BLAKE2B ef5cb671e756eccc17d4bbbd4aa4c3fc0ac5931994750659ee9a6746bfbcbe5e3d283764749531fa2d7e46afc8eb14acc234f15f539ad0d1b7186b56ccff0a84 SHA512 fa723a5d815999bb2f0e12369aeb64726164adda4c89f2ed8b1136985f3843a9cb62a6250f7fea811e45c1ee1a3aae3d7911954955b8f32bda3af9f976bc6650
diff --git a/dev-python/rapidfuzz-capi/metadata.xml b/dev-python/rapidfuzz-capi/metadata.xml
deleted file mode 100644
index 43ddd18c41eb..000000000000
--- a/dev-python/rapidfuzz-capi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">maxbachmann/rapidfuzz_capi</remote-id>
-		<remote-id type="pypi">rapidfuzz-capi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild b/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild
deleted file mode 100644
index 25a7cc31b8c8..000000000000
--- a/dev-python/rapidfuzz-capi/rapidfuzz-capi-1.0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022-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=rapidfuzz_capi-${PV}
-DESCRIPTION="C-API of RapidFuzz, which can be used to extend RapidFuzz"
-HOMEPAGE="
-	https://github.com/maxbachmann/rapidfuzz_capi/
-	https://pypi.org/project/rapidfuzz-capi/
-"
-SRC_URI="
-	https://github.com/maxbachmann/rapidfuzz_capi/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
diff --git a/dev-python/redis/Manifest b/dev-python/redis/Manifest
index 0735863cb6f4..e2e9ba66efac 100644
--- a/dev-python/redis/Manifest
+++ b/dev-python/redis/Manifest
@@ -1,5 +1,3 @@
-DIST redis-py-5.0.6.gh.tar.gz 4775649 BLAKE2B 7d6a7c10da592aed05fe70b1f0001697984c34244c29567755a13f0cb0d61db927f1392dd100212c88c63de52afbad2a9f17024d9af11f500db13386d080be2a SHA512 ae430e3c261bd8240bf1c736e28d066c685bb674dd6c2aabbf57bfa436027af31e59c2583777625ab3e1aa94f9b55a8e6513a94399c3aaec7e46b1128de8dd42
 DIST redis-py-5.0.7.gh.tar.gz 4775787 BLAKE2B 72060bd2101ba5b16ab5823ec6ed16fdc6714546f4be2a0c89871f9f1a3f2cc0e11075071507f9f89eb9b21a7ab4844e04c37f698d62a37e94ca93aa0ad5762a SHA512 dd46459eb1331f0ef844b12e65aed548aaf744d0c5581c9bc3f4450be4e4a5ba77130ba905a57a8ce87b5d0aa22495d34ddab01463d276797e1d277c949502a6
-EBUILD redis-5.0.6.ebuild 2717 BLAKE2B 5b30f28bfde630c04ea66476eb24aa60e87a621f9a8ec79a56ae678f94b00889cd12e72517d955e4251c3344fe14b550830cbf727b699fb54d46e00588fb92d8 SHA512 e4be9929feaf403a170837916196a46cf140ad75130c5d6ebecc62e282307f1f5c07c009d0f8df48f9344c998457f970c1641c2c2fc6c06e329575c704ae3b27
-EBUILD redis-5.0.7.ebuild 2723 BLAKE2B e4e9c34dbadf07efea78d11ebf767988315435a1590cae381de64df8d5ac58874a395d1bd20ec58116831f03b9c2636df5407e130b5d26bab9a0d60963120d11 SHA512 817b28f81e66935a77214c6a9b77f60c20a316fc5ccdda62d019ca132c17dd35ed2dc5206987299199bd0291d67357480d7ecbd1f0e9ccbf8d5359fac6400d10
+EBUILD redis-5.0.7.ebuild 2717 BLAKE2B 5b30f28bfde630c04ea66476eb24aa60e87a621f9a8ec79a56ae678f94b00889cd12e72517d955e4251c3344fe14b550830cbf727b699fb54d46e00588fb92d8 SHA512 e4be9929feaf403a170837916196a46cf140ad75130c5d6ebecc62e282307f1f5c07c009d0f8df48f9344c998457f970c1641c2c2fc6c06e329575c704ae3b27
 MISC metadata.xml 506 BLAKE2B 0e5747e826132dd365bdf6d3a63f0936ed476bc69c4c4d55126e692039046f51f69b193ead0baa181090b11f69ab2a49220d8f906f9fe3fc18331b76ff9e0b0f SHA512 725d650bfe345b132588930a18ade44182ec07f6697d2fd8806dc208ab1556939926e8899fc6d43691101d971f9c1e011fb8a5675fdde4698dbf4c230db15c75
diff --git a/dev-python/redis/redis-5.0.6.ebuild b/dev-python/redis/redis-5.0.6.ebuild
deleted file mode 100644
index 615ccc4a50d9..000000000000
--- a/dev-python/redis/redis-5.0.6.ebuild
+++ /dev/null
@@ -1,97 +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..13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=redis-py-${PV}
-DESCRIPTION="Python client for Redis key-value store"
-HOMEPAGE="
-	https://github.com/redis/redis-py/
-	https://pypi.org/project/redis/
-"
-SRC_URI="
-	https://github.com/redis/redis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Flaky test
-		tests/test_pubsub.py::TestPubSubDeadlock::test_pubsub_deadlock
-		# require extra redis modules that apparently aren't packaged
-		# on Gentoo
-		tests/{,test_asyncio/}test_bloom.py
-		tests/{,test_asyncio/}test_graph.py
-		tests/{,test_asyncio/}test_json.py
-		tests/{,test_asyncio/}test_timeseries.py
-		# apparently available only in "Redis Stack 7.2 RC3 or later"
-		tests/test_commands.py::TestRedisCommands::test_tfunction_load_delete
-		tests/test_commands.py::TestRedisCommands::test_tfunction_list
-		tests/test_commands.py::TestRedisCommands::test_tfcall
-		# TODO
-		tests/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_zrevrank_withscore
-		tests/test_asyncio/test_commands.py::TestRedisCommands::test_xinfo_consumers
-		tests/test_asyncio/test_pubsub.py::TestPubSubAutoReconnect::test_reconnect_socket_error[pool-hiredis-listen]
-	)
-
-	# TODO: try to run more servers?
-	epytest -m "not redismod and not onlycluster and not replica and not ssl"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	if has_version ">=dev-db/redis-7"; then
-		local extra_conf="
-			enable-debug-command yes
-			enable-module-command yes
-		"
-	fi
-
-	# Spawn Redis itself for testing purposes
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1 ::1
-		${extra_conf}
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/redis/redis-5.0.7.ebuild b/dev-python/redis/redis-5.0.7.ebuild
index 13bcaada0bb4..615ccc4a50d9 100644
--- a/dev-python/redis/redis-5.0.7.ebuild
+++ b/dev-python/redis/redis-5.0.7.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 961befa12a2a..5ab5750993c9 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,5 +2,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 DIST reportlab-4.2.0.tar.gz 3688649 BLAKE2B 83a35524fa82260ed6b4b6999d5b7903f54e0bdd7e008f3ed53200da8a43807c3d34920f9c7211c4277a560699e894fb12074a530c85adfba0538adaa5812294 SHA512 5dbab548dfa4b0eebb19c0702975b540244693ca30faf7a7bf88e7e596d2a9acd4047f0dddc5433da4da385282ab74f17b66a09394eefe07797c3d193ed38cb5
 DIST reportlab-4.2.2.tar.gz 3690306 BLAKE2B 1f778d25cb02f918758db13f27e380db4d0082c79c534699840e760a54ccb40c1d8bffc51b66de1f79030458ab9d48df7464a40a0a154382f1d02534696f7701 SHA512 4dc7a414ea32a741f660f523d14605fb46410d844d3be60b9f6d39642c0a7ad6162fa4b7448eba650b087a31e40e0ff7fc0bb5eb416dbbaeb104c416285a438d
 EBUILD reportlab-4.2.0.ebuild 1127 BLAKE2B 503b9ed3377c96144a1d2009dfdcae6bcfd3c29bda506eefdee43547120c1d5e44932211f4366b1b3e6916d7580cd06d6313b96e49a595528b29cbbb330cbe0b SHA512 da9103540bf34a5973dae249c147ba3d6368c6050efcd55ec17dc136c56205d470fee4e8a98ab20830af68027053fc22a777ae4a08d45172bd1aed6f9b9d4d37
-EBUILD reportlab-4.2.2.ebuild 1134 BLAKE2B 47f6e583f345f56b663cb5e3125d05b66fa0ea82f390f541fe22d18628f520e18e89dc3144fc2f31d04f584d872069c8452eb70fbf429294c4b474217a6c88da SHA512 68892c18860148e495d5fba6d90c6c705adf85c6d5c69f6e67daf34d30a0fe4bf86c0d0ba7b0f256a3b0ef8d170c8f6dd1a128d2a7649781203ae09488148a67
+EBUILD reportlab-4.2.2.ebuild 1133 BLAKE2B e23887ca6b3e09981919d2bd6203e45213fdbab4d0880d51ed26eaf4e2ce84d998d737dd7787b7f7c1035f7cd0efa91b9fad5dd6df0c79146d1b8d2d6ece10a2 SHA512 99534a9195a307f001233b6808b14c01daf6960c4fcf95fcf77bac517a011e6b2f894662d5fd894dedaebbbed376151257f3bebd4ec912caac476f6a7a2deb91
 MISC metadata.xml 1913 BLAKE2B e088a4a5ee1ca40351c04d8ee825fb783679c8c4ac5ba7c513975e546f7f90f4777a7d9b312a4bb2ce97db5695fcfcf913610b02a9780ffc86143ee1845ee281 SHA512 84422b0f54f169b4342bb5842935a57dd7721d8d6e41f4fece4ce0cf20ee70a764fa1914371e47ed9437bd40243ec22c93f20c167a48ee6ba9d9cfbf3e7c1fe8
diff --git a/dev-python/reportlab/reportlab-4.2.2.ebuild b/dev-python/reportlab/reportlab-4.2.2.ebuild
index b4156a20745e..07da78c44d84 100644
--- a/dev-python/reportlab/reportlab-4.2.2.ebuild
+++ b/dev-python/reportlab/reportlab-4.2.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/rustworkx/Manifest b/dev-python/rustworkx/Manifest
index 92e89be5be10..b06cd30c599a 100644
--- a/dev-python/rustworkx/Manifest
+++ b/dev-python/rustworkx/Manifest
@@ -85,6 +85,7 @@ DIST pyo3-build-config-0.20.2.crate 30029 BLAKE2B 846eb95d1417a658763417a2750dca
 DIST pyo3-build-config-0.21.2.crate 30581 BLAKE2B 993c1f7f15124336b70570ed3949cc0873c2b883e81dd3a350f347cf014fb9a82d487197fdaf475989b727b7ee8d9a5511a72422f76126b8788c4f40831baed8 SHA512 8b6bedb31235de3dd95bca6e19ea4eb7752227ceb9f1c928c4df2b277df5ee443e5c262e448012e4e54e3104213db4d745c9c42f79ab3029dee68f48ec3a2795
 DIST pyo3-ffi-0.20.2.crate 64601 BLAKE2B cf1141ad34a13dcb46de0d1e15dda192ca41a7441bfc92a9295861876dcc690d1d5d6d39dafa51cd70c4627353efa91563eaefee8c39f655d12818003f9524da SHA512 ee6386b6fdb80689d104f9cd5229f02e1893d00a52be710bd36882c47305abbe24ef2f3cdef8200fddc0bb97e29001fa3a2fd9d3d2673ecd9a104a070420d01e
 DIST pyo3-ffi-0.21.2.crate 66160 BLAKE2B 759622fa3a41bcdb48170983c4e194898415f8db16a7c57ace89a7945bd47374d9a14e5ecf24e80a178bde597cfa30d41f9e6617b458d365640bdbda048e6f6e SHA512 5cbc9dfb14569210776fd66341e77e61642a9920354251a65b91aa13a0fb1c373258d1a6b4f8feacdc4266d472193d8f20a6dd2cc180ccc3d43fb66237ae6d0d
+DIST pyo3-ffi-0.22.1-py313.patch 6315 BLAKE2B 55f9c5d45356e8c4b2a86da0f489788de576d7fb4c7b124a87d953e8d3a850fbeb05a1af8e6f34edf252aeda40445f711f4409a3a80df7442bd4676c1d8969f8 SHA512 f6e6e2498bbd8b60e013b4cb6e1f1eda764292e3cd91ba5800fe798521f462bb97f1e621711513d52c263f7b394821a710252425cfb0de0f1c4457882dd138ab
 DIST pyo3-macros-0.20.2.crate 7925 BLAKE2B 00fc60becfa39bf452786d8a612247785f1737cc3e627700d0d144ab2efaadfb34ce8a8f46e932382a1ea99caebfe1946fbc517b5c26fadb0822ecaa8b2e9df0 SHA512 dd9ea9acda95dfc53689a4c26d8c2139f8a90a05ab06737037f19b8bccd5e52b0da5f297a29194b958f5f8b59cbb566b5f409b3f17a863eddf855ecb755d2719
 DIST pyo3-macros-0.21.2.crate 7920 BLAKE2B 60ceb626fd1ffeca7e81ebc721bb4cfebd99bb708d48bbfdd296b250ed41471f82e8657715e1f58840423ac11d8c5a84a6107a7037affdea4e0c2cc561514ed7 SHA512 95335a55d57346107fdc7591d51e36aa0a985d6c44a875475a0ed52df25d33b21a7b922fdab0eed190da9708968e79f7cd50bc683b6d210eb068713a915ac7f4
 DIST pyo3-macros-backend-0.20.2.crate 49710 BLAKE2B 711b18984e61219555df4b62667f7f376951c6cb47e6dd947fc24618b923c4f4f790eb1aba1901abea4761632cdb58cfa81cce91f33586da3022e6c7d126bc9f SHA512 c6ca2a2cdae8630fba3f8e4122e81b60ef2ef0905ad2a3fbcfae134456d5ca9e73690b61590e391f3b9d82c24725809f18544c5dfa0b36ffdb1914844fe65d3a
@@ -153,6 +154,6 @@ DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c66
 DIST zerocopy-derive-0.7.34.crate 37907 BLAKE2B 23a698c3c892187307007cbc76c9338dbe163e4f14d4ea73969ba834f5c6732d16f5bc26e2e85c5e3df2100b28e6e72ae6473b2159f5160ee19befdef3615f98 SHA512 1bd93062b0d2c699066f8a991326b4470426aae0517d33748a8f0e52b009fc46e6b0b238abe97462a2e13c870fa3d0d070615870e6dbbf8b6991c0e3fb5c3e63
 EBUILD rustworkx-0.14.2-r1.ebuild 3289 BLAKE2B 6963861ae52f71fa6ddec20e22dfc680ec5386f449bbc14a026b5b3e7d989e5739e1096452034d705d7785f5d85ab36df61c32c69c0593a3810cb9ea4632c5f5 SHA512 b730cd6ff7d7353fcc1189cb30dc3e94e2913b914d49b912287fc465f8c6d6deaf70355f5572ab19b55eb6f59fe960f819102c0c18ca33ca9d0f8538cb238620
 EBUILD rustworkx-0.15.0.ebuild 3163 BLAKE2B b18e7fca5e9ff2e7a35dee71d11700eeb92151d74693696745eab2a03d23719dc306bae92f11733b99f4b7fe8a38f76df2d867b01f010db4e4be6e62324b5b35 SHA512 a0117dc3669ff18a0e10599452739ea8b09f9b96e491a6be32cd5c0df1a76047ec632103eb9eafe433e8fc360fa550c661857baa7d150120a5885b18f0423fac
-EBUILD rustworkx-0.15.1-r1.ebuild 3435 BLAKE2B d45f9b785b7922f086c7a8ace878341ab021d7b7cf770b91cff95cadfa3bc36a7519d61c205ec09f150c7fe0e7c36f1721c29014a144f3121706f0354ff18015 SHA512 05aa9bebf3ee2dca95fe5cf92e6084d41fdddfad1fd1db6624c88c920b6ba063397de797d6a6ee35491b10344eeb32de3ba9691ef026ce01d3168a68be4793d0
+EBUILD rustworkx-0.15.1-r2.ebuild 3396 BLAKE2B 7b96420d67efaf4a60715ccdeddf901678083c68e2027acdd14d2741ef3b72d26fc7e2d20941941af10f827889672baeb4202771c8f89940eb1986e307c54a7e SHA512 98e37ad4757e45a74c0db02dac5b21521a37dcb0d5cce2f394bd27e26da8ce377bae7a606d8f65286989682c0f94c202b4d05b122d5b44cb8536aab4ac5c122d
 EBUILD rustworkx-0.15.1.ebuild 3193 BLAKE2B 4ac62f856fa60e74717598ca40129c3a9d9ccae9c61b9f6fc5a713e9b5f2082dc3863011a76da5e959809ac353d52016380dc261115bff6ca79bf2829c6fd922 SHA512 23e45a3ccc7e0be527599d14299cbb92ee109096d65c00414805065f28de98cb7d67c524c7c69f160e982c0821737971f190034b2a36a1d2971be068c3f7e02d
 MISC metadata.xml 1286 BLAKE2B 8f121e669008927c921d7425b45ee5f103eaa6fdfdeafa9e6f96de67cad37bd28894411b68f25b8928b043774f17629b855beb4228aa4f1461394089b67510a9 SHA512 b95fe484c2e21621003f1ee70636b75eda8f941f94cb5549750cfb9234067c1e79d5dc9c85b08c8965578360fcb85d6cf726c3787cc66e3d56c0f0f9e45ac867
diff --git a/dev-python/rustworkx/rustworkx-0.15.1-r1.ebuild b/dev-python/rustworkx/rustworkx-0.15.1-r2.ebuild
index 7cc5dad7a8b2..9017dc943e07 100644
--- a/dev-python/rustworkx/rustworkx-0.15.1-r1.ebuild
+++ b/dev-python/rustworkx/rustworkx-0.15.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 CRATES="
 	ahash@0.8.11
@@ -110,6 +110,8 @@ SRC_URI="
 	https://github.com/Qiskit/rustworkx/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 	${CARGO_CRATE_URIS}
+	https://github.com/PyO3/pyo3/pull/4324.patch
+		-> pyo3-ffi-0.22.1-py313.patch
 "
 
 LICENSE="Apache-2.0"
@@ -144,12 +146,10 @@ EPYTEST_XDIST=1
 distutils_enable_tests pytest
 
 src_prepare() {
-	distutils-r1_src_prepare
+	default
 
-	# force unstable ABI to workaround stable ABI crash in py3.13
-	# https://github.com/PyO3/pyo3/issues/4311
-	sed -i -e 's:"abi3-py38",::' Cargo.toml || die
-	export UNSAFE_PYO3_SKIP_VERSION_CHECK=1
+	cd "${ECARGO_VENDOR}"/pyo3-ffi-*/ || die
+	eapply -p2 "${DISTDIR}/pyo3-ffi-0.22.1-py313.patch"
 }
 
 python_test() {
diff --git a/dev-python/scikit-build-core/Manifest b/dev-python/scikit-build-core/Manifest
index 0855f48e4f9b..a7d06196d5bc 100644
--- a/dev-python/scikit-build-core/Manifest
+++ b/dev-python/scikit-build-core/Manifest
@@ -1,5 +1,5 @@
 DIST scikit_build_core-0.9.6.tar.gz 228743 BLAKE2B da5dff989ca053c9ee1abfff739d0b755bb14f9d810020e4b44ba5caad670dfe24ef99b4cb93a18ae162dca8fe21d6d09c4d692ff1406bfa3a64ca25c24aeddb SHA512 b2b1e9b4baefc360b26dfc0bbf0edef20d7b6681140ef9a413c565666869e67ddce2cdd3027f3de6af29b7ef76bd7eeb401c08f3803524706d0ace9106b63f65
 DIST scikit_build_core-0.9.8.tar.gz 229845 BLAKE2B 419d8891dd3f95bee7f8f7dcc1addb94d2698f8ff392eef19a67e851f57b58d09b9878705d0e8d728d3c6f2b316d538c76471164781fcd1fb5d02dfbfd9d7a85 SHA512 f1206715eef1bdeccddc5987cae4f455522c4ef4dbca305ad7d3772c61f5615c5742b109c5527a5ad5e25a2348abff69ea5ae7153ac18c43cca63783872aa3d5
 EBUILD scikit-build-core-0.9.6.ebuild 1728 BLAKE2B ecd7371a8bf934991a61e567da839f7802c9e260e33708b052e2ff0272195ef6c8aca2e12c3dbbce589e3a5c2ad1ec70da975dbac1df1edf288b8ff30010f211 SHA512 2532350c22dcfef0830d4bd49423cc59aef08aea8fb8c8be6e16e6a61c6fbff882fd38b0fe12a2cef62659adf11927132307460f77b0ae5cd79672561f6bc0a8
-EBUILD scikit-build-core-0.9.8.ebuild 1733 BLAKE2B 816053f4f7851b0baed6dbf92076913f476085340eb09341d5b7e63b899c3745a7bd3cedcf1d8b65df5111981fa90f6ef9fe11229899d601580c321f9d6837d5 SHA512 4797f09d5bb20632beb0af2b52d9cefba3d50f9193d6fe417b6b91926f24cfb74dc3a5c409328429299e6f000e58c401540ee938d8a1d81b6b00c2810c44b9d8
-MISC metadata.xml 393 BLAKE2B 25bdc0bc295ed4bd7cd76a5a6952cb7fa5d5a404d3260562f2ed322d80f2466add0373a2a6b10a41c4dc2211e82e0a680735301d8844e70a54760301b4ab190f SHA512 176537f2027aedb3bc8bd16bbbcde8bfed246d621763e22a979f2942c016e1bafa5ef2d11d8d078e5d59970ea115864a8501185343bc3d4b9fd8493adbd16aab
+EBUILD scikit-build-core-0.9.8.ebuild 1732 BLAKE2B 023308237a6d6a3ded2047f926fdcc8e33772b138840a87fd02f2a4bd40c803baca55e148dafa057c26e7ead2fd49aa4463899242b5c41f885f91b6daded7aac SHA512 29c7be94d9eed588c39d25ebe2c55f90e8474c353b45ea793da9ad180cd64eb1843ec82afb2b5294f7f1a5f9b3202b9058fbf9d5eb2602ec2f9622e283f4bff5
+MISC metadata.xml 425 BLAKE2B 0cd7850045c375f40159e5515148f3863b2baaed899486a442818d77d059fce9fffa2ad2d046440c441775287aee52caf4636120025e79176e702a3682518a61 SHA512 2ecb5a3e4ae9ad6ae237ef04d0cfb354ae91cfd1ebf28096821cfb070adcdd036b15d86b645850ed5fd367274a092742de65c401f0fac57bd1136221915db207
diff --git a/dev-python/scikit-build-core/metadata.xml b/dev-python/scikit-build-core/metadata.xml
index 4636b4452315..22ba3826d7f1 100644
--- a/dev-python/scikit-build-core/metadata.xml
+++ b/dev-python/scikit-build-core/metadata.xml
@@ -4,7 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
-	<stabilize-allarches/>
+	<!-- no ALLARCHES: a build system for C extensions -->
 	<upstream>
 		<remote-id type="github">scikit-build/scikit-build-core</remote-id>
 		<remote-id type="pypi">scikit-build-core</remote-id>
diff --git a/dev-python/scikit-build-core/scikit-build-core-0.9.8.ebuild b/dev-python/scikit-build-core/scikit-build-core-0.9.8.ebuild
index 6530afddf5ff..6a71f78b670d 100644
--- a/dev-python/scikit-build-core/scikit-build-core-0.9.8.ebuild
+++ b/dev-python/scikit-build-core/scikit-build-core-0.9.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # we always want [pyproject] extra
 RDEPEND="
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index f40861a7324b..e2607c35f39a 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -15,5 +15,5 @@ EBUILD scipy-1.11.4-r1.ebuild 3660 BLAKE2B e5e7918bf5f1abfaa9d2fdec01b5c52d4e020
 EBUILD scipy-1.12.0-r1.ebuild 3620 BLAKE2B c5c8dfd752b81e16f61a25beabb20a20b3d9087b1a6c514fd7f8d3710435d68b49ad55ba2f082e468a9066f4ad1bff664036c073cfb48cf16d09fcb0b1fafb13 SHA512 e2ebf0e8d464306b0d12b4e831cd7c253b2431fa922d4276c516238d93c4b1f0b0275a3354b31428e9bc43e05eafaf67f92a6b481d9be941421693687bdb513f
 EBUILD scipy-1.13.0.ebuild 4168 BLAKE2B 69ff580f5b92bdcc72fce07810d00c4b1689f66c758ac519b2368c9e05e516e794f124632f7b598899f676e866f1aca6e98708dfd8fea94bfef04b8d69ad7aa7 SHA512 4d92a3499809ee17e06df6ccb89871c299cf1ba7878e68df10de280af52e610cef206f7f1c1ef80d3b349f2ec256d9211a44e20c35d3db349dd035a83c486e95
 EBUILD scipy-1.13.1.ebuild 4255 BLAKE2B 62d38e85bf39d7fa1983a8cd002fbb86aca65ece2462664dcc2231b6e5063b1253789056ce308190e0d567728fa8300f47e9fbd157f9f516040496a5bf4a65ed SHA512 f0c23dbab31789b7c116dc87fc0c80e5b7da240206f120e401de5d11dd05459bcbb15de6411cc4ddbd4db20f7850800e2cd4123c04158be677e33b095441a9eb
-EBUILD scipy-1.14.0.ebuild 4552 BLAKE2B 1a83ff14bed8a8f949d0629d016bc4b407102fc4577247ade6746f984cf9a7508cc0aa0cc1e90f0ad803532ec8ab0a419298dde36fa7818ba9d62df3ab3f2d8f SHA512 708f2f4fae74c20041278df688afa0daa94b1ca823725f8510fb9b35b61d85352fdaa2fcf12f47d50c56da8abed61bf0fe2f229dc7155cdd359a9acd8196c876
+EBUILD scipy-1.14.0.ebuild 4551 BLAKE2B a4b17b854f26603ca980205808f44d8703d6f8169d21024bb1ffdba72473d7e6a65f2914c9d67b6838d54a21e7d76e43c421a33b59f1bd023a4bc6970e903b65 SHA512 c54921917e50f8c87fd225c3a2e381a5d87ca78263a3716b4528476dc4e593aa82ae8229248a8ae63e85da564b4c4efd9836a2567ee6034e367c14b4f7fe9fae
 MISC metadata.xml 953 BLAKE2B a09ea1325a175e349fbc3ca77c5e7b373538ea01147e8544f44b7d4e0c55fbbc2012431fcfe9a3457e82d295e4b5630df1ed69c48ef3462ed9b157af30a1e09a SHA512 74a21c6e1a9bef95b3d74a9513c59d302f473725c04fa32a9991b6108113c0f4b78179ce4a628140e7aa870c24ca60bddf7a00063b6b73dd45110112311371d8
diff --git a/dev-python/scipy/scipy-1.14.0.ebuild b/dev-python/scipy/scipy-1.14.0.ebuild
index 8e3a14e3952c..dab0574a1b01 100644
--- a/dev-python/scipy/scipy-1.14.0.ebuild
+++ b/dev-python/scipy/scipy-1.14.0.ebuild
@@ -37,7 +37,7 @@ else
 		)"
 
 	if [[ ${PV} != *rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 	fi
 fi
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 732bc5f2eb24..982070b15f6a 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,12 +1,8 @@
 AUX sentry-sdk-1.21.0-ignore-warnings.patch 329 BLAKE2B cdb4295e600d868feb11b4a0af534bca90a1fa777344d56c945ddcfe71b3db10848df4032df06b9acf84cf574bec04dce4dc8935dd7421a6d0a2a011db337d6f SHA512 d1b5c50c78d1bb299280c4937fc8a8fdfc7d174d41061a32b57178c4dee58ab4b4b7afe8566a6b79244e53be8714b3ee7fdc9bf3401835d6d743e9fdc5a0aa05
 DIST sentry-python-1.45.0.gh.tar.gz 475425 BLAKE2B 8dc46154dfc1c7c9104a706be032b5269d407dee6845da252f1c603ea4f9486d02d1d3c6bec314064b821dee31b503d07a9c17935ca1f4dd6cc4d7b9c3165094 SHA512 dad23a3f6a8e6ef5fe78e1d38a61977d8974edf306d5688537f331801d8fa0f60743d18cc3dadf6e9a9666c55a01c98b9ff8d8808ece7d8f95ee68a69b6cb9be
-DIST sentry-python-2.6.0.gh.tar.gz 519912 BLAKE2B 065aa2a633c24f163e483fe6ace9696b3bb088caae2eedaff7bbfc09213bec593f1db5a70b41f9771db602ece77d7107f51945683799de35ad59aa2c10f0a47f SHA512 f69ccc15154ea10302610329bc9d80fb9cf249a9996b99b34268468b010a24e90ca46e62b223b3331518a2ee57c6e3e028e6d6b2d1e0c9bbac4f11176403c790
 DIST sentry-python-2.7.1.gh.tar.gz 528495 BLAKE2B 7846e726aaca3d916a5b901aa1cde6ac04e79c32f71a631955a354143fc9937ba8881ccf1e3ed387ec12afcd4e6734ea4eee0614512447bcd58d8875fe97cd35 SHA512 afe034553ddb5eeefa00db26e13cebe82d946f990eb62f8cfde670ad5d9d5c93c0ffb2d0ed5f01f55ac533dca66ab6f53553e5b8f011e08705213cb515146516
-DIST sentry-python-2.8.0.gh.tar.gz 529314 BLAKE2B b5017cd8f7cb17174e16902f8fa8c18dfeabb807a85eb9bd2e7ac0009328b3b4a3d49b7a32d81abe4315204e416599d8a518dedd3cf6abfc7761a5df30da8857 SHA512 cd67efd18fa140032da4d1cf1aecb7025b0fece980daf1c6a21c4dbeb459c3bd6ba2c29f80a8e26325dc3f211c6d5cbc9d769e5a1098871058cec6e3e9c0ef03
 DIST sentry-python-2.9.0.gh.tar.gz 531490 BLAKE2B 8b67caa6911fd44e58c2a1d1206e6ecb9dc31f81c15c66763a04f1a65fc89d4667e60f27e055016342c6b4cac5470729c802ffb046e6e0796d5bfd7044caf27d SHA512 aed112a2ee35e23a1431486ff18e67772476ecfc63eacc388d17454a723b98f6e05cfa95a6c9db2cb6be572eed73d249951a411c60184b20eb251520071a4254
 EBUILD sentry-sdk-1.45.0.ebuild 5762 BLAKE2B 293cc9193b547971c44392b9500900fabe5f8dd7da6a237e58a42a38f4f9804db47fa539df90e6246e7be6574733ca883621e17e57d035ebb32596a281b86566 SHA512 571b8fc9d0f0e4b5ea8b5ce3426af73e713220158c121ddf9bd833a097edc027708c11aef53d911f69d0362277996776c4c428c3af1a013766f190e8f9179adc
-EBUILD sentry-sdk-2.6.0.ebuild 4258 BLAKE2B 87937634da1fe484afd45c92c911b5ccc8d70fe5dfc6a49681af6c0a3ef6b8f10307c88e6d4bf00c56517d12107188c999ade4fa27388beb84eb8de61147e548 SHA512 e299b3c869118ef30a0bb9927252d05aa82b3ae0d92bef7d556b895a44348e64b254d2f5fbb3be9e51cf767d14f56352284ee0d2167d85fa1d09096529cdea45
-EBUILD sentry-sdk-2.7.1.ebuild 4475 BLAKE2B cedea2584e27e8cdf82871c4fe0d70baee4cfed66197dbb03c5ce43681ee272df8952dbdc51b96dd10ebb4fc04f50ec27b6c26bf2e1fe961a9ace099bebcc573 SHA512 f114361b6966a1a62150bfa096a7c531f4d5554ce06690b80b83e98cf15f42164862f933684742b1adfd63d3be278ef318e69152d3b0b570d134f9d88eab01ea
-EBUILD sentry-sdk-2.8.0.ebuild 4475 BLAKE2B cedea2584e27e8cdf82871c4fe0d70baee4cfed66197dbb03c5ce43681ee272df8952dbdc51b96dd10ebb4fc04f50ec27b6c26bf2e1fe961a9ace099bebcc573 SHA512 f114361b6966a1a62150bfa096a7c531f4d5554ce06690b80b83e98cf15f42164862f933684742b1adfd63d3be278ef318e69152d3b0b570d134f9d88eab01ea
+EBUILD sentry-sdk-2.7.1.ebuild 4471 BLAKE2B 685c47d53cc554ae7c25c404470aa35a7a287d6fe139d4c60b6d989ec36a762cfc5d24587842cf698732257366db5f1fbfd8e223ee652997c1077f0b68dffde4 SHA512 a87d8bd4aa4a3ab17e9d0fe9d4239e5a6c9784f8945ac99f1974579f60db0b1afab882330479d7db64159d9cae41895925d30ce620a14729ab6b2cfebc8d583c
 EBUILD sentry-sdk-2.9.0.ebuild 4475 BLAKE2B cedea2584e27e8cdf82871c4fe0d70baee4cfed66197dbb03c5ce43681ee272df8952dbdc51b96dd10ebb4fc04f50ec27b6c26bf2e1fe961a9ace099bebcc573 SHA512 f114361b6966a1a62150bfa096a7c531f4d5554ce06690b80b83e98cf15f42164862f933684742b1adfd63d3be278ef318e69152d3b0b570d134f9d88eab01ea
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.6.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.6.0.ebuild
deleted file mode 100644
index ea60963d59c0..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-2.6.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{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/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-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/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: most of them hang
-		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
-		# TODO: require opentelemetry (with py3.10)
-		tests/integrations/opentelemetry
-		# broken (incompatible rq version?)
-		tests/integrations/rq
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# broken teardown?
-		tests/test_client.py::test_uwsgi_warnings
-		# too many dependencies installed, sigh
-		tests/test_new_scopes_compat_event.py
-		# Internet
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/integrations/django
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_utils.py::test_default_release
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
-		tests/utils/test_contextvars.py::test_leaks
-		# pointless, fragile to packages being installed in parallel
-		tests/test_utils.py::test_installed_modules
-		# TODO
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
-		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
-		tests/profiler/test_transaction_profiler.py::test_profile_captured
-		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
-		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked
-}
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.7.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.7.1.ebuild
index 7a32e57aa0c8..c1ca3a0a34bf 100644
--- a/dev-python/sentry-sdk/sentry-sdk-2.7.1.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-2.7.1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-2.8.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-2.8.0.ebuild
deleted file mode 100644
index 7a32e57aa0c8..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-2.8.0.ebuild
+++ /dev/null
@@ -1,127 +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_{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/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-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/django/test_basic.py
-		tests/integrations/socket/test_socket.py
-		# wtf is it supposed to do?!
-		tests/integrations/gcp/test_gcp.py
-		# TODO
-		tests/integrations/bottle
-		# TODO: most of them hang
-		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
-		# TODO: require opentelemetry (with py3.10)
-		tests/integrations/opentelemetry
-		# broken (incompatible rq version?)
-		tests/integrations/rq
-	)
-
-	local EPYTEST_DESELECT=(
-		# hangs
-		tests/integrations/threading/test_threading.py::test_propagates_threadpool_hub
-		# broken teardown?
-		tests/test_client.py::test_uwsgi_warnings
-		# too many dependencies installed, sigh
-		tests/test_new_scopes_compat_event.py
-		# Internet
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers
-		tests/integrations/stdlib/test_httplib.py::test_outgoing_trace_headers_head_sdk
-		tests/integrations/aiohttp/test_aiohttp.py::test_span_origin
-		tests/integrations/stdlib/test_httplib.py::test_span_origin
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_span_origin
-		# TODO
-		tests/integrations/aiohttp/test_aiohttp.py::test_basic
-		tests/integrations/django
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_orm_queries
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_query_source
-		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_transactions
-		tests/integrations/stdlib/test_subprocess.py::test_subprocess_basic
-		tests/integrations/threading/test_threading.py
-		tests/integrations/wsgi/test_wsgi.py
-		tests/test_basics.py::test_auto_enabling_integrations_catches_import_error
-		tests/test_client.py::test_databag_breadth_stripping
-		tests/test_client.py::test_databag_depth_stripping
-		tests/test_client.py::test_databag_string_stripping
-		tests/test_utils.py::test_default_release
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sample_rate_enabled
-		tests/tracing/test_sampling.py::test_records_lost_event_only_if_traces_sampler_enabled
-		tests/utils/test_contextvars.py::test_leaks
-		# pointless, fragile to packages being installed in parallel
-		tests/test_utils.py::test_installed_modules
-		# TODO
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_auto_start_and_manual_stop
-		tests/profiler/test_continuous_profiler.py::test_continuous_profiler_manual_start_and_stop
-		tests/profiler/test_transaction_profiler.py::test_minimum_unique_samples_required
-		tests/profiler/test_transaction_profiler.py::test_profile_captured
-		tests/profiler/test_transaction_profiler.py::test_profiles_sample_rate
-		tests/profiler/test_transaction_profiler.py::test_profiles_sampler
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p asyncio -p aiohttp -p pytest_forked -o addopts=
-}
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index b8355382a41e..63708df02d41 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +1,6 @@
-DIST sip-6.8.3.gh.tar.gz 585528 BLAKE2B 2a58edba0f7ca9da02399df9fe71f152ef8446c38886ca2a21c00ef3ac65e0a82493a6047120d6f786e5b26f974c9cac24a329f1a52d9c47f9669afe2f0789b4 SHA512 6ff5fa59a55d71a3303553d2c53879fc9ccc01b9db34da149a7b81e252613327c7390c5a2edeaec03381dbc36ed38aa4ce44d69560c277ecc3875a57e7d75a60
-DIST sip-6.8.3.tar.gz 987656 BLAKE2B 57cc4010aae64eec7e0f338d9653463c7381b639aa8efca978a3f3296550a37b3a09b52933a2c2cd354a65155841952d7ca045b0b774945a382c29a8d597951e SHA512 8a0ff1c16ead4c2b1c53963a015fb3d149362f649eeec2523e6b243945493f28f5ecf29aabbf5cee5f7909ded40d64a1f469d2d0c1b3c33244e6213ab23ec733
 DIST sip-6.8.5.gh.tar.gz 514702 BLAKE2B 82b41f87991a9c8dd5416a948d5fd356d8d815fef007bcca7089d8b942f6287b9609d5813368afbca924f563873eea025462d83ba9b36d910004115fa81f289e SHA512 de5a5a134ef8a4a8dfeb97ca00cdd6d7c8a297e67aa046f003c883d14fe4cf1f009f6443712b78bc0f693e30b89fab3f76d5ef8ee18e9620f161c1933b2db513
 DIST sip-6.8.5.tar.gz 420177 BLAKE2B 274df04ef21298fbc7559166e5d3b8830a10db900ee0c52001bc6f328e23dd691f092df560cd93e76a3ca17bbd89de88ab3370719dd6c9346e9ba3f3b7570e5c SHA512 eeb1e51624d95bc36e72f5d1949793b647c2b97d5bd13ea80d9a2a901698b4d7336e6812421b0f346af248350061c02db5a8c13aeb33ec31d8bd6dbea967a282
-EBUILD sip-6.8.3.ebuild 855 BLAKE2B e5e4fbd847f5af0285b28877197babc57addcf6fc1a3bc823708b1e92e50bfd56490c5f5d676a685155cf20bb99e390c732ee7d580e2b91fae6d9979be4f0cb3 SHA512 57772b41d201d687a01ce2f55a871bfe62e2d122a2aecec2b895bc2bb5af8ddedf734acd7b229bd87e6d0bf24b00b09c8b73cb1e8346f617bd7a949e81c040cc
+DIST sip-6.8.6.gh.tar.gz 515751 BLAKE2B 769a1270351473f1c498e0d3cd463df3aa0992782b5501bd06455b71be05cae5a9754611bad4f966cc5b204170fec7fccbb065d9ed4c800daaa1bd6448a96352 SHA512 bfbeace21ef0bfd072548bcdb9af1f4917a33e15bcd9c5f6575aea0dc0eeaeec4aa322b2408f586c0e2713ada65c1657f81a4e0eb25cb9a3472fada234beca33
 EBUILD sip-6.8.5.ebuild 1165 BLAKE2B bb77329d822a32c01e7821139dda7cfa338b66152c51b8274b987c4c7ddb04c57cf911419f90b64890be2a22f0ddebc3684dcb6a4aad4aef1699d6c93b6058da SHA512 ed535178b31016455b01dea5e68b932aeabccc62999dd01e5961784192808cf9c25d4088d778d31aa348a8f88a9380709ca7647223bab6856e41ff529ae2e0f0
+EBUILD sip-6.8.6.ebuild 874 BLAKE2B 86975a481d211cb55c083ff0d92922f7bbd1026406cb697646e91d2a935825a2d1e3b2e59a9e58d7f9202fd3eb3ccfd4dbee733d23082d266e2cb011e0bf147a SHA512 7f94f920b418cd5f5a508b7235a33fcc914b27e01952df5875c550a88efa497ad71ff82e1849f2cd41c30c1f127b6e55824b157bc0c935f6bfb681065cdccab7
 MISC metadata.xml 524 BLAKE2B 57657d01dc5be425f66f1136356fa028a32ad6a2ca79cadf4b9ed6a940b414b0e3efa161895d1858ab3d4977241883f9dfefbe37a8cbaad10589d57f598856a1 SHA512 82208b61b297d8c2110ea47a82c046118afd9332c52fa6590f7ed11b4e70af8b75f087b006fa5ed9058dbd2f98f02104559e085f781f2fc887396b7ff9d1b859
diff --git a/dev-python/sip/sip-6.8.3.ebuild b/dev-python/sip/sip-6.8.6.ebuild
index e3cdc24f0a54..7274e84fca8f 100644
--- a/dev-python/sip/sip-6.8.3.ebuild
+++ b/dev-python/sip/sip-6.8.6.ebuild
@@ -5,27 +5,29 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 pypi
+inherit distutils-r1
 
 DESCRIPTION="Python bindings generator for C/C++ libraries"
 HOMEPAGE="https://github.com/Python-SIP/sip/"
-# gh does not include a way to generate some files, so combine with pypi
-SRC_URI+="
-	test? (
-		https://github.com/Python-SIP/sip/archive/refs/tags/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	)
+SRC_URI="
+	https://github.com/Python-SIP/sip/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
 "
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/tomli[${PYTHON_USEDEP}]' 3.10)
 "
+BDEPEND="
+	>=dev-python/setuptools-scm-8[${PYTHON_USEDEP}]
+"
 
-distutils_enable_sphinx doc --no-autodoc
+distutils_enable_sphinx docs \
+	dev-python/myst-parser \
+	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index e56917f4f151..33fd8b4acb17 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,11 +1,5 @@
-DIST stripe-10.0.0.tar.gz 1284985 BLAKE2B c2cde142b324fb622c7b7c3b967d01caf3a31c7832825b750e88ff7a4b8b41efe457c40ce329977f7df39b54ecf267812174a31682106aaecda78ebe53322467 SHA512 fa72997cde84a7fd871e9be53a560bce07041dddd9db7e37942b1c7cfaee8c2fd3a671f08f1b567b60aee017f7a6b9662dd2cfb3a06036bd9b0f3a03a395e0df
 DIST stripe-10.1.0.tar.gz 1290758 BLAKE2B 0ec51d9189b1d574eb1eb2eb7c3683b2b6b86c9879445c2de60da1a16684e0fe095abbe841cc59ea8daad6862d864550bfb5a9c9dd6a034df42a01c8ec59be4c SHA512 ecac8856ce6993ba5c339a44791b9197f2e1b8a62292d5e9e555e02004007ad90c400dff8d111df2ae1428436ba413a47b59ef9b5e9da445872495c45aa844c3
-DIST stripe-10.2.0.tar.gz 1297807 BLAKE2B 996636c7cca85295c7fbf5ec108cb6b62db11ebc26d8978329c437b55d5f15bd15936c1386a915deb9544bf4f5869440e13fc307962e1b796a7901b10d406595 SHA512 83ae38e4f53302fd16f1dce10f6e4336842ee81bbab272ebd9362e7bd0c7b03168e6de2ff14a0f2cbd332eaba9ed8dc2bf24894cfd5600d8a91cb5670c477fbe
 DIST stripe-10.3.0.tar.gz 1300786 BLAKE2B 626a3c52cbb93aeae3749f6ffedd421557aa4e8085d2b0591ca2c1c866caa64ef78bdf8f0e5c85ee814ffd588d95ee05267748a97f2a50ff89d28a9e501d4da8 SHA512 7353df871f0b83330208e1a3e0fa339d319c3bb1b2e4e90bf045dd691120b22b908e263f3cdae5127b3a1299b950be3685ec631492888884d42570947de70268
-DIST stripe-9.12.0.tar.gz 1277151 BLAKE2B a23e490ac99f3814db204cd8ad71793b5da73a82c420823cecd87dad5f17c9dbe44a7dcdfbb519b5db4cb488f286e231029827bae25657c2bf4183d1c4dd8406 SHA512 c6c4a4cfeddda4c0e4042b31addea6885819304b469e4f7f701c894fca2d1ccca867dac511abf8d9dd9fc7cc135185387a5b55d37558b9355ee4add16b6318cb
-EBUILD stripe-10.0.0.ebuild 2435 BLAKE2B 44a70137984ce5bbcb00a55c204dadbc1296af66644ce29227a9f17aba38dff54ff40799251f9d712559390b063fc0f7293225bb79065e8cebb7191937d4838a SHA512 9d751f6868c342e2a486befbfdd270d842af1fca53860731e2afc5b0a4ca2111a907a63c1785efd93cb822a3bb1ac0e3f47f8a131c2b3d3d1694ee2ac8555c93
-EBUILD stripe-10.1.0.ebuild 2435 BLAKE2B 44a70137984ce5bbcb00a55c204dadbc1296af66644ce29227a9f17aba38dff54ff40799251f9d712559390b063fc0f7293225bb79065e8cebb7191937d4838a SHA512 9d751f6868c342e2a486befbfdd270d842af1fca53860731e2afc5b0a4ca2111a907a63c1785efd93cb822a3bb1ac0e3f47f8a131c2b3d3d1694ee2ac8555c93
-EBUILD stripe-10.2.0.ebuild 2435 BLAKE2B 44a70137984ce5bbcb00a55c204dadbc1296af66644ce29227a9f17aba38dff54ff40799251f9d712559390b063fc0f7293225bb79065e8cebb7191937d4838a SHA512 9d751f6868c342e2a486befbfdd270d842af1fca53860731e2afc5b0a4ca2111a907a63c1785efd93cb822a3bb1ac0e3f47f8a131c2b3d3d1694ee2ac8555c93
+EBUILD stripe-10.1.0.ebuild 2432 BLAKE2B 0d04f99474415b090bbc6f60eede5cd90c2676b256a2f7e684c4a6c19bf4bee52cc11cfd0847afa0dbd68f9a9e47ef500541fa689b257d2180d19757134b3fad SHA512 dc1a601c212fdf2a32c4e267bb656bbfbf77f0d991b7d999c1b0ac0ea24f28430864dc9a7a5295e6c253f9cd88a4d56d72fb85acc7cf4eba5ef541869af04a3c
 EBUILD stripe-10.3.0.ebuild 2435 BLAKE2B 44a70137984ce5bbcb00a55c204dadbc1296af66644ce29227a9f17aba38dff54ff40799251f9d712559390b063fc0f7293225bb79065e8cebb7191937d4838a SHA512 9d751f6868c342e2a486befbfdd270d842af1fca53860731e2afc5b0a4ca2111a907a63c1785efd93cb822a3bb1ac0e3f47f8a131c2b3d3d1694ee2ac8555c93
-EBUILD stripe-9.12.0.ebuild 2432 BLAKE2B 0d04f99474415b090bbc6f60eede5cd90c2676b256a2f7e684c4a6c19bf4bee52cc11cfd0847afa0dbd68f9a9e47ef500541fa689b257d2180d19757134b3fad SHA512 dc1a601c212fdf2a32c4e267bb656bbfbf77f0d991b7d999c1b0ac0ea24f28430864dc9a7a5295e6c253f9cd88a4d56d72fb85acc7cf4eba5ef541869af04a3c
 MISC metadata.xml 673 BLAKE2B 6b85b1f88713d2365274fcff21648748039b48028b3c34c1192e16ca12d0f3b4d14ab13c7c2a744c381898ea0c1304bda8be52d3fadddc1a1b787f010b001398 SHA512 e3178927a69d14f59673acc5eaedda59db5a07e2145ed6fb0597363b60183cb3e7a7b0feefc1d4c9095d52ed96e0be32ef5dc23ad0c20fd6e6b33c830177c0be
diff --git a/dev-python/stripe/stripe-10.0.0.ebuild b/dev-python/stripe/stripe-10.0.0.ebuild
deleted file mode 100644
index 7925c1fc5c50..000000000000
--- a/dev-python/stripe/stripe-10.0.0.ebuild
+++ /dev/null
@@ -1,88 +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..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.186.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-10.1.0.ebuild b/dev-python/stripe/stripe-10.1.0.ebuild
index 7925c1fc5c50..47a6cb02ea58 100644
--- a/dev-python/stripe/stripe-10.1.0.ebuild
+++ b/dev-python/stripe/stripe-10.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="telemetry"
 
 RDEPEND="
diff --git a/dev-python/stripe/stripe-10.2.0.ebuild b/dev-python/stripe/stripe-10.2.0.ebuild
deleted file mode 100644
index 7925c1fc5c50..000000000000
--- a/dev-python/stripe/stripe-10.2.0.ebuild
+++ /dev/null
@@ -1,88 +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..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.186.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-9.12.0.ebuild b/dev-python/stripe/stripe-9.12.0.ebuild
deleted file mode 100644
index 47a6cb02ea58..000000000000
--- a/dev-python/stripe/stripe-9.12.0.ebuild
+++ /dev/null
@@ -1,88 +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..13} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe Python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="telemetry"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.5.0[${PYTHON_USEDEP}]
-"
-# please bump dev-util/stripe-mock dep to the latest version on every bump
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.186.0
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/httpx[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-src_prepare() {
-	if ! use telemetry; then
-		sed -i -e '/enable_telemetry/s:True:False:' stripe/__init__.py || die
-	fi
-	# https://github.com/stripe/stripe-python/pull/1297
-	sed -e 's:from mock:from unittest.mock:' \
-		-i tests/test_http_client.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests -p anyio -p pytest_mock
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ ${stripe_mock_port} -le ${stripe_mock_max_port} ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port "${stripe_mock_port}" &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=${!}
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			"http://127.0.0.1:${stripe_mock_port}/v1/customers" &> /dev/null
-		eend ${?} "Port ${stripe_mock_port} unavailable"
-		if [[ ${?} -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ ${stripe_mock_port} -gt ${stripe_mock_max_port} ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index 978751b7f018..e8cf6918ca00 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,5 @@
 DIST sympy-1.12.1.gh.tar.gz 8025309 BLAKE2B 01fe3e95716b0efcf682613fb8ba6f149f4f4dc4ad3f20eb816d85f30042af1cd5860d3d157d4c26458520cc2f8e994ae6671058a7a0d5237e7f15d0e61f9e53 SHA512 9b50d2b0e8e9628c38296f8d1e25c83b1b9fa1503166b48cc344709217393b00910ad3441a1da0e81e6faf56e5db7a33bc96926918da024cafc77fb4957f94a4
 DIST sympy-1.13.0.gh.tar.gz 8124299 BLAKE2B 0aedeb4005aa7ee32470d6fd89494cfb68667b579bce33b189016347d136c6e961b0bc226bf638ba9ee5f14fa5c239af5e27de7da2a45dbf6fb16abf2d79cae9 SHA512 1a0d794d5a48d8b46cf87635753d316d807e14eb98c8c880e815168c5ac2c479608ec3c2b0ff786611736f9e68a2941a05fa31f187e83b84e1ce10d72099a6b6
 EBUILD sympy-1.12.1.ebuild 3010 BLAKE2B 4f8d57b33febd7803ae5c406cf8e0f7a677aa5a6337354c4dbbb3612f14bcaf28bb0da00ac6c67e958a9465a0a08a9c412d83ee9a62fdfd69be0ce866a936cb1 SHA512 568ea31f7ffbff8ffd9fda2399ba70fefcd44cfa68681769f911915bfdc7afce03196fe25715f96b4fc5e4c4c3910b07d5e450114778323cd9bc53933d9a1906
-EBUILD sympy-1.13.0.ebuild 3021 BLAKE2B f9814ac060be8d70c0aeda4a87a8c01d555a7152116a81911be520bea767457764405fb7550d9a944e1a2bfcd6c8a36d1d1989cee869fd085c1d0046a2f06541 SHA512 f1e5565706f77028fb2ce2475d312254f46266fa193bef346199dbdc71871f3e8f46ef9a59c86226a1e8874bd79a40119797d876a2b8334581e5a6bda8cc1cd7
+EBUILD sympy-1.13.0.ebuild 2978 BLAKE2B a6f32e17c301306e93fdc13655173a4f70008bd684426f8961a8e5b0b8e0932fe3ebcaa8bcbef178e56f1f13d1f8fab7e62ebb947a983546d4e122a38eb8e976 SHA512 ef5a72d0fd008dda941537afe63545811d137ca5dc2530736741b9b2365eeb58485a7e1dcaea46a043733f40647d75429fa54cb92740868dabc4eee0a3943aef
 MISC metadata.xml 1639 BLAKE2B b539888e4658c640442db1cb6bd6561664ee6c50109926d69572f4e2cfcdbef230a56909e799b09b860a8688ce66455ae5c5ac86099893ba667feb0198f65abe SHA512 9ba4c310c759e9e7fa3a726850b342e79ed07e4ab369ad126a35b1741fd4d343ba75af457cfcd76c5539b3259e0eb198fb58ae965c231bb38a94c83c00f52e48
diff --git a/dev-python/sympy/sympy-1.13.0.ebuild b/dev-python/sympy/sympy-1.13.0.ebuild
index e1baa3ea9005..92c208153ac7 100644
--- a/dev-python/sympy/sympy-1.13.0.ebuild
+++ b/dev-python/sympy/sympy-1.13.0.ebuild
@@ -31,9 +31,7 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
 	ipython? (
-		$(python_gen_cond_dep '
-			dev-python/ipython[${PYTHON_USEDEP}]
-		' 3.{10..12})
+		dev-python/ipython[${PYTHON_USEDEP}]
 	)
 	latex? (
 		virtual/latex-base
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index b67e6a0110ec..f0614d94153d 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,9 +1,5 @@
-DIST tenacity-8.3.0.tar.gz 43608 BLAKE2B fcf7471110c831cfab20c81bb0bfa2c2895ce33b6cdf22c21dfd0f219eeb674dc4e7f4186e7c9a3366574636becd7391d68acb285069844ccaf358da6afa9c02 SHA512 46152ffacc0a87931cec09bd90eed3d2ad46f89101997c5da2aa510844c814b887a83805b4ec0de6a56759a7f2bcbab0cb2b2f1a4e6c11860ae53f64ff2a4c31
-DIST tenacity-8.4.1.tar.gz 45426 BLAKE2B e5cb1ed5a93a28a5733b7c25f95a5d9c4d4e341b5185c235e93bcf681590a72cd3895a1e9b24eaa31b939168f6420e8a28a5d8b982847886e9a799a983d41df8 SHA512 7abf17c5c4dbcb45aff3b660f70daa80fc673aa36e0ed95941a566d3740238d051736bc0da330110300bd4beae9a8a56082c4348d24e6bfa20a269bac771d956
 DIST tenacity-8.4.2.tar.gz 46206 BLAKE2B b7829d5eecb29e9fe8ec0e01c68bb9381182c93602d86ad3b8aa746aa4d809d733d72480d8a3a3eb793d46f5c091672202109db2eb34e05ec5204d32c32d3995 SHA512 64e56d27ade71116309327cc6a1f04a9fa54c9e1b867cdfbe294799be3707259bdf63d676259235c629ef10b9a9c2850f80bfab5863cec0a019bff779b48e892
 DIST tenacity-8.5.0.tar.gz 47309 BLAKE2B 6d3e1dbcac5facf9c838e13fa3cb0ff03c22cb490cf9ed17aea44e4486f7f256918415779adf3854e4ebb2b2496686265acf2f5e42621b01aa3b6d43910cd828 SHA512 f5568233321bbc6c6cfca0f362f627ff6eecf6094c55644ae46448b5f1d6466928a35a1435c97004b640ac95444e4e8c0bb2b21520e2bba5c619eeff36955e72
-EBUILD tenacity-8.3.0.ebuild 598 BLAKE2B 4b05acdf59ce38c8cfdc45e43522567204580f079b17b8a25b48fcd01e8a851560fd3b3cef939fc9262226dce7da6d58493e3339a1345fdf233e828e94ebf086 SHA512 13e643dba3b3aef847283c45a4f556e69c3b1b203501c0f42936cf0cb56b5592d1c58a4140b2361fe9f8de81b74dc83366ad9948fc8e2e7d5debc301abfe6c03
-EBUILD tenacity-8.4.1.ebuild 879 BLAKE2B 50868f26addbd964800f8ac725bd4c95df4ba0cf7692720bae15ca7a494bb6e8f949e36a940f9e5c1d4a671dfe66af9b0b69ab7cd39ffd6122399f194db5f4bc SHA512 859f70a9b195969eb28f5088798312171897ab44f33fdc9c45b4b7ba7317873e843b1a2537f22061ce1006419d6aa9ed29671f4cb6bb5fd01e8d865b2edbcc23
-EBUILD tenacity-8.4.2.ebuild 962 BLAKE2B ab02ec53e20ed849d1643ea8fd691f41432680a71c292374ce8a2f095977fedd53c6c24fa65c33260f4ad571dfbb71e501a49302279072e1b49fd9e79b7fc62e SHA512 c1c89bcf49cc3c4f42dd62f32c4967094c76d497af9a0c2ccdb85f1d85e048e22c13b705dd78be46b27a03f2ff4b35b9b439f0c550d89dfd9e123061c422228b
-EBUILD tenacity-8.5.0.ebuild 813 BLAKE2B f0d055f5e5be32e9eea5aeb6e3166831995fd73f5481d5d0d7f7d847f2e8fe6d1b813ea5e5c861c27819c3f79d906fe2e6dec54317985f8df610ed44cc844537 SHA512 32019383e723ef1a64b0dc4ef8e38400ff319b01f0918bcfe943613704147450866c752a537eec06b60be3edbc1cf2ab2d8495920ef6b2436abf825432974a6e
+EBUILD tenacity-8.4.2.ebuild 959 BLAKE2B 22c1d1fbd751e6a923fc9312b0392451cadb813b0776903ceb34a70b2c18b8931260b717b78ad1a06d9d64ee13cea700f2b8ea835bd3cc4875f6ebda3ca8e82f SHA512 da345a46c0cbf525262d76c4ee6f1939ed084d92bad6911fc85115ae3a03b8d18a577d820065eff6feaa19ac8be7653ff27b9ba79bb9a7cd55a0561d06d65f4a
+EBUILD tenacity-8.5.0.ebuild 825 BLAKE2B 91a0c31f3c39588d30574f04955a0729c5f97aa86e396f69fc84000cd4863b0ef316549cb30b02f8352de63d2fe908b3494b09ae4641e304b22cda6241119b47 SHA512 9feb926676310d26544a0f5cefd68c549cd877da63c551744a90f7003303e7d40f87544e2b31ac9d094b06d61b79d8ccab9b0200d0f9b81ad07d19acc3bc4b27
 MISC metadata.xml 856 BLAKE2B af0d5417912404af6b5be19c32d150db197d27b55681871cbd45f983d1caf8b8ba7c8c44936b1465ecf00b4d185552399d0023bbfc16e84451e4fbf006eefcab SHA512 1fe2c8617bfaeba198a8b5430c2b38acf60f17c29fc89599d198037310589b4a5bb1170919e2f57c3e27951288d06ab281ec5a55ae64e6a0a33296a89be17839
diff --git a/dev-python/tenacity/tenacity-8.3.0.ebuild b/dev-python/tenacity/tenacity-8.3.0.ebuild
deleted file mode 100644
index 0abf75594ad1..000000000000
--- a/dev-python/tenacity/tenacity-8.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/tornado-6.4-r1[${PYTHON_USEDEP}]
-		dev-python/typeguard[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tenacity/tenacity-8.4.1.ebuild b/dev-python/tenacity/tenacity-8.4.1.ebuild
deleted file mode 100644
index d2558578d37c..000000000000
--- a/dev-python/tenacity/tenacity-8.4.1.ebuild
+++ /dev/null
@@ -1,43 +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..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/tornado-6.4-r1[${PYTHON_USEDEP}]
-			dev-python/typeguard[${PYTHON_USEDEP}]
-		' 3.{10..12})
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-	if ! has_version ">=dev-python/tornado-6.4-r1[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_tornado.py
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.4.2.ebuild b/dev-python/tenacity/tenacity-8.4.2.ebuild
index a422a5bdbc7f..6df802e92fd3 100644
--- a/dev-python/tenacity/tenacity-8.4.2.ebuild
+++ b/dev-python/tenacity/tenacity-8.4.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/tenacity-8.5.0.ebuild b/dev-python/tenacity/tenacity-8.5.0.ebuild
index 477761a19338..ec4fc6dfa03c 100644
--- a/dev-python/tenacity/tenacity-8.5.0.ebuild
+++ b/dev-python/tenacity/tenacity-8.5.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 62291ca34779..59694cab7564 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,7 +1,3 @@
-DIST trove_classifiers-2024.5.22.tar.gz 16050 BLAKE2B e9909972067f1ec825a127801483aa5d6c47bc7c7442bfc4490eec2628003fa0d25362ad10255b20174beb93cfd382df43a948c73c9c8834307d660897d8162f SHA512 34fd1e47f41563e6e9471ae029897d96fec8119368a1bfd8b8982b26c56a1e9e0b154dcd155b401cf537cbfba574e3ca659a31865f3d0718dfa3bc1eb1ec1ea1
-DIST trove_classifiers-2024.7.1.tar.gz 16060 BLAKE2B 4b662d9f440423167d4e715beebaa5993d83dfbab575e9c5b1a549b60f85abb9e10cec09c702d403e3655cafd002b9bf67c02808bbfac6746b2c395f8a0ce102 SHA512 c3092bce086f0530ca10326d2e99ea331e73b31fe47272835ff1a1042588dc616ccf8ce5e6eda5d48b5f199bc5c1a3206d4f17be62dbf751029e498c1231bd11
 DIST trove_classifiers-2024.7.2.tar.gz 16071 BLAKE2B 6f13df1498b68e2f24838473ad8b6feb341e33da6eabc2e104c823e6db65ada348ef36c8fd96226818d89c11bf0b0ac9665c9a6ecbea5ba620d2e48c64c5b82f SHA512 af9a366425e845b1bbd098c8085ec8064dbf6864940c7dd5def1672c2046756e2c76255b282b2c989c34d14b113b7c6abd32d23eeed88317d374043040f46486
-EBUILD trove-classifiers-2024.5.22.ebuild 1122 BLAKE2B 9ea4a1a8a112202b1e7cb7617547ef09cf03310be09fede68836737b62ca76e5c5071a0a41f5318ade45e041de7d501782a48b2ebc3ac0e05a96d4ef40fed1c9 SHA512 6021b9830abfff461f6b9c34c6a422ead6bdedf909b17210cc03fe33eaae205a3ce41b7990b7f6241bbaa1a8428e47bec4c63ff87ea611e77d8f390d10429fc1
-EBUILD trove-classifiers-2024.7.1.ebuild 1130 BLAKE2B b160c4eebee65aeaf8596088057b844c622237db524535758d826cd17baa45a4860adf7ae39308f6774fffa695593889b6194073796517a7bf4e4b77d3aac92c SHA512 926d06d2d31dbe38d61c2b51a0512fde708782a5eb46630ba357ae5faf625d89b88c56a46699ae6077b4431768dbed9eb237d4bbe1b56a27dd439b9236df880c
-EBUILD trove-classifiers-2024.7.2.ebuild 1130 BLAKE2B b160c4eebee65aeaf8596088057b844c622237db524535758d826cd17baa45a4860adf7ae39308f6774fffa695593889b6194073796517a7bf4e4b77d3aac92c SHA512 926d06d2d31dbe38d61c2b51a0512fde708782a5eb46630ba357ae5faf625d89b88c56a46699ae6077b4431768dbed9eb237d4bbe1b56a27dd439b9236df880c
+EBUILD trove-classifiers-2024.7.2.ebuild 1122 BLAKE2B 9ea4a1a8a112202b1e7cb7617547ef09cf03310be09fede68836737b62ca76e5c5071a0a41f5318ade45e041de7d501782a48b2ebc3ac0e05a96d4ef40fed1c9 SHA512 6021b9830abfff461f6b9c34c6a422ead6bdedf909b17210cc03fe33eaae205a3ce41b7990b7f6241bbaa1a8428e47bec4c63ff87ea611e77d8f390d10429fc1
 MISC metadata.xml 385 BLAKE2B 0d679ace6575dab100af9918e8b6dbde2f70cbf556c23ee667d68f69c6dd07887e43a513a73e60849a7a4b88cb26d4cd85b4cb905b926ee3832161c663adc9c0 SHA512 977bc86d4fb2dfcc887fd8d4038b8ac76cb0f4783424d3ab0857256afaf5dacf4e45c0d2a9166daa854be1dc8faba4a10c4718c557b983a1c7bb0a33fcd61f41
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.5.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.5.22.ebuild
deleted file mode 100644
index 98f51b05ca12..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2024.5.22.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.7.1.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.7.1.ebuild
deleted file mode 100644
index 8fea4e4a1421..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2024.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( pypy3 python3_{10..13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease hatchling bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "trove-classifiers"
-		version = "${PV}"
-		description = "Canonical source for classifiers on PyPI (pypi.org)."
-	EOF
-}
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2024.7.2.ebuild b/dev-python/trove-classifiers/trove-classifiers-2024.7.2.ebuild
index 8fea4e4a1421..98f51b05ca12 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2024.7.2.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2024.7.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 86bbf94d973f..53f2c29e4557 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,3 @@
-DIST twine-5.1.0.gh.tar.gz 221527 BLAKE2B 45b707883e84ade7cad8bee712e7b68f24eb8ccfd018de5c0522cf98cb66895e6a4324f17e54fa87dacdf97ee092a0fdbc0b5289b30871da36828c987c518c2f SHA512 41a5b94b6929a0a018cd15dd4ede45a361420752235e9b1a8b16979609e6a056bf46cd88efa869c27fa9bae3907f4e45d0c468de8058c3f82f15b48b4274b4cd
 DIST twine-5.1.1.gh.tar.gz 221931 BLAKE2B a95d50e52bde5db64c6ce5b57097188e9cb88763c91f337c3e552ca34bae34882d87bced4b0c55a292de185fce10384edf514b55373c4456ff252471076bcb28 SHA512 95f059235e32134a5320c0835befa2eed6eff35c56685afe4848224042c2e2af484db72f20fd0cfbe979cce8d495e8bb2d2ea38aca2c53ca7af8de378816bedf
-EBUILD twine-5.1.0.ebuild 2094 BLAKE2B 2aeef10d14879faa33fe5ea60dbb35e2a995b3b514a69e19261f07cb16de98f736419f273c59169178a40da36d0ccdb9200a7e7f80c7d3a61b88f4af249de957 SHA512 8b23211247dd349263488ebd17b10779b9bef12420a96900cf808a7dc8b5edc847dd294b4030b96842316b62d518ceb845c6813c300f39c8895f763c2a010eb8
-EBUILD twine-5.1.1.ebuild 2238 BLAKE2B bafcb15816fb2873b93996ae419005dfdc7b79e13ad4cbe5f2977bd928e96d5aed3b795fa6d05be1f95bd0ead94c958ff0c204344dc6114919c1beb2861d475b SHA512 0d00821a0bce89166f421889845124e2e5eda1905b156d8ad9c91d62cb1e1f9c059b0d4ca65fa10a81950c0478e7fc6fe3ab5d3a4e38314018f4084e6953ad69
+EBUILD twine-5.1.1.ebuild 2231 BLAKE2B cdcf61d0e76059294ecec87454c92fb9c0bf64c8375c454cdd9c24106ca2338d0570ab719c8066fbfa48d732fc2428a243250ca0023435c012a4ed9e8a725d0a SHA512 66f391946a5335d5edee44a326e96f6ffdfa87a5aa8e08b92886fcd7d8a8a2d7226dda9ac9d740c3e4ace5ac7fc66ccbba49d8079059c5d2b6f65826b3c83fa1
 MISC metadata.xml 383 BLAKE2B e2a596604a2f3e40ddd0196ea79105e318f8a04d9e5a2c7e458d403d215af1371f2a526fa7d8cbc430f20747f7b65ed6c8546263fb8a54ddd8a6db487c358634 SHA512 cd5c1f1ed89dc5c314975fc5b503108d6828db37826ebba98d6edd580b72cd41867e19e65a9a022f8c07babadecd810f21febeb8a015c51eecec412b9df4f0d5
diff --git a/dev-python/twine/twine-5.1.0.ebuild b/dev-python/twine/twine-5.1.0.ebuild
deleted file mode 100644
index 70421c663a1c..000000000000
--- a/dev-python/twine/twine-5.1.0.ebuild
+++ /dev/null
@@ -1,78 +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
-
-DESCRIPTION="Collection of utilities for publishing packages on PyPI"
-HOMEPAGE="
-	https://twine.readthedocs.io/
-	https://github.com/pypa/twine/
-	https://pypi.org/project/twine/
-"
-SRC_URI="
-	https://github.com/pypa/twine/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
-	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/readme-renderer-35.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/rich-12.0.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/munch[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pypiserver[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# pytest-socket dep relevant only to test_integration, and upstream
-	# disables it anyway
-	sed -i -e '/--disable-socket/d' pytest.ini || die
-	sed -i -e '/--cov/d' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Internet
-		tests/test_integration.py
-	)
-	local EPYTEST_DESELECT=(
-		# Regression due to deps?
-		tests/test_check.py::test_fails_rst_no_content
-		# Avoid needing heavy virtualx
-		tests/test_auth.py::test_warns_for_empty_password
-	)
-
-	local -x COLUMNS=80
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/twine/twine-5.1.1.ebuild b/dev-python/twine/twine-5.1.1.ebuild
index 934d7208add9..b8a8d417ad49 100644
--- a/dev-python/twine/twine-5.1.1.ebuild
+++ b/dev-python/twine/twine-5.1.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/unasync/Manifest b/dev-python/unasync/Manifest
index 5ff888fd2b5e..0863ae8917b2 100644
--- a/dev-python/unasync/Manifest
+++ b/dev-python/unasync/Manifest
@@ -1,3 +1,3 @@
 DIST unasync-0.6.0.gh.tar.gz 18124 BLAKE2B 80e7e2ef2be10c9d1f5b0e1dd8316f4d8ab4c051f902442adb0f52cf6c78fa3432e6bdf58a42243e31b9daf43f7a3db8afbfe968c4d9128b6bc7a6e30d09cfbf SHA512 1092df25ac6fbd7517ed2157c0bf7a993342806bcc2a7bbed474d9a7659cf1116cd147a4494877f19a35b741ed7d81389daef1533c5a96ad109005c10363cac2
-EBUILD unasync-0.6.0-r1.ebuild 727 BLAKE2B 56d4c25f4c93eb7b864a505147dd69c284c4db749ab62056614e058d92c6536f572dbcf40549f911e13dc041fef75f38d38c2e1f069a26b107f25902e41203f3 SHA512 8c570b5d466402397d8d7dbd20fdbfdec6e46f779c772042b7e1cb3d2dc06b931d686a333f053d1eaac75ffcfe501e87a9b3f5d762c8447dcb1df3799df1c7cf
+EBUILD unasync-0.6.0-r1.ebuild 727 BLAKE2B 142ba0633f03efb72c89160b683be117f097ecf4553e2878239b632dc5e01a804278f092b34a506d607f8b23650a81aa33dfe8ffd0ce140e9879556617cbca0f SHA512 d832d1ab7a8e90438aa350ec2c2e28a2e0930fd8ec6fba3e1f78584af251797831e3bde90bc5b28c84c95f134359a58b63b4e035ba2e9e94dc1dd7f3f301a8d3
 MISC metadata.xml 546 BLAKE2B aa3d0b82e53c079b8cd82dfa36e37265eb0dc436493903d861e65e054b7a27de71311de96243041fc706e6741fe5a12ebd91b4cf56b9877f790e3cf4b80beda6 SHA512 f46d77a9feb9602866913e7bc65c220d63eadfb35ea62d8a6c644f977c8e986c72974697f7e4d9b2699657917526857bad6e3c033c1fdcc0cf1ba387e2ec4929
diff --git a/dev-python/unasync/unasync-0.6.0-r1.ebuild b/dev-python/unasync/unasync-0.6.0-r1.ebuild
index c3ba6565a7a8..fc2f4bf16bb5 100644
--- a/dev-python/unasync/unasync-0.6.0-r1.ebuild
+++ b/dev-python/unasync/unasync-0.6.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 66c504ea8e87..f44af0092791 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,6 +1,4 @@
 DIST hypercorn-d1719f8c1570cbd8e6a3719ffdb14a4d72880abb.gh.tar.gz 156216 BLAKE2B fcb5f49653401e6e4079e1c770d3cd407602d4d6764437b735bd4ec04191dec59cdc930822fa2aff726ee25cddd0f71fd457dedf31026bff1da121d93af8b768 SHA512 62d6787d88a2e716f0ac04fc49f6cdc586e473a660ee754ff66961922ae78bcc75d1f78b091e78557dd60f006e8e480114738c7b4ff71beac804e4fc9603240b
-DIST urllib3-2.2.1.tar.gz 291020 BLAKE2B 4bd6e26e1adfba99856db082d0bd3ea136a2367fa53c2d0c7990f6325e8145b2d080a8d59705c43acd97b26be65a309f83d1906d85bd72bfb479b7404972b042 SHA512 dfadba099db678ee1567ee95aa11a72fcea0a76df094d04dd4bd7ed5df4ea2fda6917cc122a1e2bfa4f5303916f93a7e1c881fbbf3cbb9415a25bd7eca1b14b3
 DIST urllib3-2.2.2.tar.gz 292266 BLAKE2B 50d4825ff4bd950742708bec63feb1713e211293f7720c79f2c71740f3eb3d501b476b8de5b389b8fb978c2486081023ebc2e05162c5d4fcedd811452743e07a SHA512 98695bcf37e772a1220cc05679ea799d82a09c73115717668c90dab9377690dd096f648d60ac0759a23cf65f2b1b6f363ec6826f669d4299bfa0a203a45dce0f
-EBUILD urllib3-2.2.1.ebuild 2997 BLAKE2B 456ae87f4745dcd319ee15cb3282f928897d5a76432b15cf6fc279774a676b3bcd61e2f1946312d12a1951a7fee15c93e2899d5343f4d93838ae9ac5a4f8329f SHA512 37bddb67f71eabbd0b19baeb2ae89252b7b1c8b51941b0219f3ce41a2f273ee40917fb1298b00c9a9dbffefa79bdded79e1dabe58d880fd322462122e3baa3e1
-EBUILD urllib3-2.2.2.ebuild 3000 BLAKE2B bbfcf5744024ed83ad79a93501917c47110d65dc4f1a04c4caa2f58ae88494a7c10490d46f4bf1332273414d7268a287853ca187a697e1aafefc921fc3ba8828 SHA512 e6d55e340113419a536867ce7421d69078fc73723e2bf5581432bf141444edebb332a88fadb33fa3e2b0fad4c67fbac0960759008d0bb8b1b0b91d758b80c53e
+EBUILD urllib3-2.2.2.ebuild 2992 BLAKE2B 245b704a74295b3bf4f439823409988d680087ff7cab2d71373387796e78517e557fd2ba8e29662243d0844633a9c1f104ae4c1da833246493733bfa59bc9443 SHA512 9aa40e372e8572326001cc5146ef517840e07588880b67254372dcf560a7785ddb1e99d8e83afd1afee4452b2b1f30f9898288d0ae8c27531047aabde6fed664
 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
deleted file mode 100644
index 4c4f790babe2..000000000000
--- a/dev-python/urllib3/urllib3-2.2.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_TESTED=( python3_{10..12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" python3_13 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-# The package has a test dependency on their own hypercorn fork.
-HYPERCORN_COMMIT=d1719f8c1570cbd8e6a3719ffdb14a4d72880abb
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="
-	https://github.com/urllib3/urllib3/
-	https://pypi.org/project/urllib3/
-"
-SRC_URI+="
-	test? (
-		https://github.com/urllib3/hypercorn/archive/${HYPERCORN_COMMIT}.tar.gz
-			-> hypercorn-${HYPERCORN_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="brotli http2 test zstd"
-RESTRICT="!test? ( test )"
-
-# [secure] extra is deprecated and slated for removal, we don't need it:
-# https://github.com/urllib3/urllib3/issues/2680
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( >=dev-python/brotlicffi-0.8.0[${PYTHON_USEDEP}] )
-	http2? (
-		<dev-python/h2-5[${PYTHON_USEDEP}]
-		>=dev-python/h2-4[${PYTHON_USEDEP}]
-	)
-	zstd? ( >=dev-python/zstandard-0.18.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/freezegun[\${PYTHON_USEDEP}]
-			dev-python/h2[\${PYTHON_USEDEP}]
-			dev-python/httpx[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-rerunfailures[\${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[\${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[\${PYTHON_USEDEP}]
-			dev-python/quart[\${PYTHON_USEDEP}]
-			dev-python/quart-trio[\${PYTHON_USEDEP}]
-			dev-python/trio[\${PYTHON_USEDEP}]
-			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=dev-python/zstandard-0.18.0[\${PYTHON_USEDEP}]
-		" "${PYTHON_TESTED[@]}")
-	)
-"
-
-src_prepare() {
-	# upstream considers 0.5 s to be "long" for a timeout
-	# we get tons of test failures on *fast* systems because of that
-	sed -i -e '/LONG_TIMEOUT/s:0.5:5:' test/__init__.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x PYTHONPATH=${WORKDIR}/hypercorn-${HYPERCORN_COMMIT}/src
-	local -x CI=1
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		einfo "Skipping tests on ${EPYTHON}"
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# 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
-	local EPYTEST_XDIST=1
-	epytest -p timeout -p rerunfailures --reruns=10 --reruns-delay=2
-}
diff --git a/dev-python/urllib3/urllib3-2.2.2.ebuild b/dev-python/urllib3/urllib3-2.2.2.ebuild
index 7a27b6f2d99e..5bbd1438732f 100644
--- a/dev-python/urllib3/urllib3-2.2.2.ebuild
+++ b/dev-python/urllib3/urllib3-2.2.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI+="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="brotli http2 test zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 900bd9c8fd37..a5482ce999d2 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -4,5 +4,5 @@ DIST reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe.gh.tar.gz 39176
 DIST rs-async-zip-1dcb40cfe1bf5325a6fd4bfcf9894db40241f585.gh.tar.gz 96766 BLAKE2B f9efab73c65394e33e090a6292875ebf35e6669b15c356f102eb109784a4503606ae39106cd0ebe3d7d479cb0b30806d7baaaebf22d826836a24f7ed49100934 SHA512 3b845b05d97c5ab5cea286a7c11846838b40bb1fac98a51782600849a53231be8fa205094c6bdd00f6e193c807b10b28f947698696382be99cae0a8d681dabdc
 DIST uv-0.2.23-crates.tar.xz 63724280 BLAKE2B 32f66ef8a6580d1dd0b7369656784c40da7f1f060c4543b359aa4f45ce33926f56d0d02222acf888a0923317d4cc02e96e1d27b3dab84038bf3714d316399f4b SHA512 04a31a451beb68f0d884cde3a35260a71020453217cfb616703b2ea8fd7af273b850239f66b8e77b1c73f241b2a8945ff9833fd0f445f2c6f3aa3412fee3e0e8
 DIST uv-0.2.23.gh.tar.gz 1314282 BLAKE2B 0d662a513b77a4da73945c3eedfa381cd65ad615975b22790ccde2eb467b356a70eacff20a15d37fff6f7b41b155824b0fda9f715d3a45f02c37c5f992f6fe0b SHA512 6b0c8f65e51dc8bf0654976b8866cb225784d91f44af935b243507a404ac4f297697ea22df29da43038eb335938be04e42fda39cbb292fe02715841c9f818380
-EBUILD uv-0.2.23.ebuild 2744 BLAKE2B 6fb94d108125f4ea63587daf4e9e13a2f4f6e4119f062747ec34e484e10d6603118d9c55c72d547752cc966e30bb799e4a3e8fe1bb7023770729674c23fcc863 SHA512 f98b4ea7642a83dd5548b28556b818d5bb35fe5a58cff5b9944c8ae08226cd8674a727765ef1f45881ffe9d3664e662ba21bf359cee973970566fae222aae2b2
+EBUILD uv-0.2.23.ebuild 2732 BLAKE2B 04a2e7cc7e8cddcee20be38d133ccd2facc7f1f994f84e09157f9499306374e044c89abe8f98c720bed16ac40f15ef5e5d6a65c2d3c4a7962c2dd3afaabdf9ff SHA512 34cf34422fb6180d10e4d977c398dcc437e270783ed2115689bcb9c5f9fb04e8d15b3f880cad92041da1bcfe2549cca3174c6de66ccadc7b8d25b99b5234ac3f
 MISC metadata.xml 336 BLAKE2B 4b5933e24e3e9450dde5da099185dcdf3afb5916b55cffa7c2f3f6fac77e439197cbe4ba529a87f83442d8f87d238e8abef06dc052ce9a62659060ffea9fdb47 SHA512 9910fd10ebbc395b9c330774b74798c9ffdba3bb368347658380a22e01d6dc9d1961ea50fbfb4a904c9db84b94c713c054e418a7294425b86ff41a607fd3e310
diff --git a/dev-python/uv/uv-0.2.23.ebuild b/dev-python/uv/uv-0.2.23.ebuild
index 02d0a4fb4a54..505f71788dee 100644
--- a/dev-python/uv/uv-0.2.23.ebuild
+++ b/dev-python/uv/uv-0.2.23.ebuild
@@ -85,7 +85,7 @@ src_prepare() {
 	# https://github.com/vorot93/tokio-tar/pull/23
 	# (fortunately uv already depends on portable-atomic, so we don't
 	# have to fight Cargo.lock)
-	cd "${WORKDIR}/cargo_home/gentoo/tokio-tar-0.3.1" || die
+	cd "${ECARGO_VENDOR}/tokio-tar-0.3.1" || die
 	eapply "${FILESDIR}/tokio-tar-0.3.1-ppc.patch"
 }
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index b610d6df3557..f97f1e18b316 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,8 +1,4 @@
 AUX virtualenv-20.26.3-ensurepip.patch 1231 BLAKE2B e70cb1a5f8dc8ccf6e08fce67aa3485c0f584937d8e7b693f0d0859d6ec9d9b16bf1492b9abe96d4c8c8eb12814eaa54f76ed8e318f3871ee956189ce08b3dff SHA512 86c98d7ce4a9ea073c72cd103cbce66ed720794fa4fa2b68ac19382e3c4f53303613aed80a6984a68cab513cb198d648c5c6f103308eacb3c7306b72e4321129
-DIST virtualenv-20.26.2.tar.gz 7290363 BLAKE2B 7b9ee7bd49d8fbb90de2716ea928b228b71ce3e344e9eeb2666974db41c389c9c0e14db66a77bf31cd7fe68c6f24a09686f2c0d40b9d1a0ef6974f50c8cd3d37 SHA512 49b78bb2b339a41637faa887728f195b042133506092e0793adf049b5b1523fab89222809449323a1eb771fa40d2f55df6dd97c16d765d7a78dc9299185fb864
 DIST virtualenv-20.26.3.tar.gz 9057588 BLAKE2B 74268cab291e7f1e3db6a4c56f0ede1d7995069cb5594341d9af0609196a8154e9153f920043b48100c2263b7020c819135e29532483b233f3c37bf3b780592f SHA512 0cd3b4dc082d071305b44dd2aba2b28527e630b6b4bf28b7b6c59f3e061b01c1dfcfb64293f2b1904109e9e27b70a873cc8c3f1a3cde73bfee114943cef92ca7
-EBUILD virtualenv-20.26.2.ebuild 5109 BLAKE2B cfa6a24d3135e961836ca5e90504e6d61124257bc708f15b1159b2f9d0111b223077eedda7420bb289f285562f9a261fc79a0ea3d826d81eb51dbced81328924 SHA512 656d528f0f183f525b0a4d2ad524a4499e7729b6e31703caf6e091e3f08ed6c7bc7e4ba866601c6a8a4a717dd12c22af94af3037fbfbf2a7011e71eb442dcfdf
-EBUILD virtualenv-20.26.3-r1.ebuild 2857 BLAKE2B c44af35f100b989c8926aff08b0c62001ea4b9c61399774e903cbea1a92d4ef1df217c70273ceecbea5f2fdd87d9487671dc8f83b5239f09d09172a7ae3291e5 SHA512 75b7b835e9f1e2befc1cc7273aeffe6a7bfada1f9d7e6d32108ef2f82c130af0aeaa5b87e4d776d20c04589164cf7335024892432d34902c4bd3fbd569fa660a
-EBUILD virtualenv-20.26.3-r2.ebuild 3434 BLAKE2B 7a4df00d6f72faadc29b237b41ed13f89e8bdc706f8d629c384e7524d6211ed18cfd5ecd22cd8198e04998482fdba2cadffe19009bdb1d246db671652b1030eb SHA512 9b60ae8923b116f715c242131301f4f68829ad895a2a34cdb40baeccba43cf3e31df8a6933d05213a40cf866be58f8b33176ac6ca184cbcf640f42a655545bfb
-EBUILD virtualenv-20.26.3.ebuild 5115 BLAKE2B 667e5029439b21fdceaf89837b52fec3bbd9db1271d026e603740b42bf03690d01a4a253c1814b656afb07888f6e36cef699f65d681ce506886f4f873e9acfd9 SHA512 373385554fd4159aec5a15fdbb6ea7cc987262bac947b5dc767b96ae738a2ec4a5837796ca5907503fb92288b72915fb5b4a46ab098f96f589ef5477f266c2a5
+EBUILD virtualenv-20.26.3-r2.ebuild 3426 BLAKE2B 344647e1dbf4c92fca7e3dbc5150ddfcb642bb51c62617d2efaaf06ac928ff76c21667a9868d08e7e32db2fb7aad76dd15da04f66e955d89e98ad7a1d8f26982 SHA512 911fe9a9d36f54711e1aafa535dc041ac52b9d78c8dc9d0726bf88e3949d63a81ba2d1902d5872a1d3338cac5132a836325eca456c56076670faf46a736a8b09
 MISC metadata.xml 406 BLAKE2B 97fee04c2662c5c36b6e16538284def46eb2454424770f42edf2567ed804ca15c4e969c714c57573f897b0946246577ab6e35204ed1f3f1735713d8ab5d24667 SHA512 356d42db463b63a3b3a55c1e98eb661de0a10aa6a5fde4f8b3f888ec73020c6679e86efd8dbb0b3e4a5a720af95e658612ba460fe548e081a90beec75fb9c1b2
diff --git a/dev-python/virtualenv/virtualenv-20.26.2.ebuild b/dev-python/virtualenv/virtualenv-20.26.2.ebuild
deleted file mode 100644
index 74332e037878..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-			)
-			;;
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezegun )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild
deleted file mode 100644
index d1b4351e7808..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.3-r1.ebuild
+++ /dev/null
@@ -1,97 +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..13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	# remove wheels bundled for Python 3.7 -- we don't have it anymore
-	rm src/virtualenv/seed/wheels/embed/{pip-24.0,setuptools-68.0.0,wheel-0.42.0}-py3-none-any.whl || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		# tests old wheels for py3.7 support (that we're removing)
-		tests/unit/seed/embed/test_pip_invoke.py::test_base_bootstrap_via_pip_invoke
-		tests/unit/seed/wheels/test_wheels_util.py::test_wheel_not_support
-		# hangs on a busy system, sigh
-		tests/unit/test_util.py::test_reentrant_file_lock_is_thread_safe
-	)
-	case ${EPYTHON} in
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
index ad9030250af1..55651c9b31b6 100644
--- a/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.26.3-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/virtualenv-20.26.3.ebuild b/dev-python/virtualenv/virtualenv-20.26.3.ebuild
deleted file mode 100644
index 761735493c2b..000000000000
--- a/dev-python/virtualenv/virtualenv-20.26.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
-"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
-		' pypy3)
-		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/time-machine[${PYTHON_USEDEP}]
-		' 'python3*')
-		dev-python/wheel[${PYTHON_USEDEP}]
-		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_TIMEOUT=180
-distutils_enable_tests pytest
-
-src_prepare() {
-	# workaround test failures due to warnings from setuptools-scm, sigh
-	echo '[tool.setuptools_scm]' >> pyproject.toml || die
-
-	# remove useless pins
-	sed -i -e 's:<[0-9.]*,::' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		tests/unit/activation/test_xonsh.py
-		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
-		tests/unit/create/test_creator.py::test_cross_major
-		# tests failing without python2 installed
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
-		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
-				'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
-				'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
-				'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
-			)
-			;;
-		python3.1[23])
-			EPYTEST_DESELECT+=(
-				tests/unit/create/via_global_ref/test_build_c_ext.py
-			)
-			;&
-		python3.11)
-			EPYTEST_DESELECT+=(
-				# TODO
-				tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
-			)
-			;;
-	esac
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x TZ=UTC
-	local plugins=( -p flaky -p pytest_mock )
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		plugins+=( -p freezer )
-	else
-		plugins+=( -p time_machine )
-	fi
-	epytest "${plugins[@]}" -p xdist -n "$(makeopts_jobs)" --dist=worksteal
-}
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index f92961f46251..9aa6fd58c7d2 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,3 @@
 DIST widgetsnbextension-4.0.11.tar.gz 1164354 BLAKE2B 85a96be89592ad08c8722c389d8848126da0e9fc235a126c44779aa1188aeeb1cc9e23c5e4f447562f8660dc637947da3410f7068d14949b337ef8d652705b01 SHA512 22b2bea35633212635718a49b33e219dac7688190c2e9c3b0eb560d830c984e7250d357c14e8b13102f493977863722e18cd77dc43dd7e309aa03006d63072cb
-EBUILD widgetsnbextension-4.0.11.ebuild 615 BLAKE2B 6331a551d0cd276f54318f4143500fc2a4c9f0ab9b37539145b7ab18d476eebffb4b322c71fc6258690b081860857390e370f47deaad7a57ddd5b2827d110540 SHA512 98041a0e8c8e613876cea7997dc4a71c32d21c5e89ddf5ce23ab9eaeed160326dd337b93677f430a55af0af3ffb1384286594772b4a433b9a6979e3305d43643
+EBUILD widgetsnbextension-4.0.11.ebuild 615 BLAKE2B 0c31460324457d07cdb415aa0a1a28e5c93300498d06fdfcae205870ae6d9832c8964b2303c9aee72de49cac2aa437b0376b69d0bc625593b6f7ed56edd57bf2 SHA512 0270d8f183bbf773b5608f81a111bf7dfaff3e9e5c861c06b4064e5c0f4f1402e0b55406fdbd6eace4e4960dcdc76ce84f72c9dbb392d3f936787a017f6da533
 MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
index e59b31b09a28..73af9d432021 100644
--- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
+++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 pypi
author	V3n3RiX <venerix@koprulu.sector>	2024-07-13 12:26:41 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-07-13 12:26:41 +0100
commit	482a48c0e1675b1e92663b8b5222bb7261aa7956 (patch)
tree	b81e02db1810214fc690a762e3a9c687d0f0c5ab /dev-python
parent	37bccfe5e76c5740c4ef5ba1179e9488d8404075 (diff)