gentoo auto-resync : 05:04:2023 - 11:25:00

author: V3n3RiX <venerix@koprulu.sector> 2023-04-05 11:25:00 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-04-05 11:25:00 +0100
commit: ad77dc19e91d2c023f80e11e8974536d80e3a743 (patch)
tree: 42bb312ab0eb61fd94103e3eddb65b134f6be5a4 /dev-python
parent: 6de28447d66e6c47ee682740b840cdb67244d4b1 (diff)
243 files changed, 581 insertions, 5284 deletions
diff --git a/dev-python/Faker/Faker-18.3.4.ebuild b/dev-python/Faker/Faker-18.3.4.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-18.3.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+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 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index 100f2b856d0c..6b57d428e9b0 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -3,9 +3,11 @@ DIST Faker-18.2.0.tar.gz 1661956 BLAKE2B e8d7f9cc7cb5d5fd8fe9400311a54613557e072
 DIST Faker-18.3.0.tar.gz 1662268 BLAKE2B 072dcb435712e0aee52bf0c1fa381ddefe3cd06567f222736fde9520b0d502a91199058910bb2d4fa72b2d0863d2fc62506add4b4b1a4e2c718e6ab4c3ad2e8d SHA512 54c7e4ea1685c0ac52b26bbd1f1bf14d6dd9b2d0919133c449665be9594ea073214a8d3ecbb79fa59a0cdf30dcd911275fd8009e404e65e8bd3aaa07643a3f5a
 DIST Faker-18.3.1.tar.gz 1662197 BLAKE2B 7daad7b60e7ff3db6cd1480b2f32a26f6bf40b092ea878cdc0d1ebc8d2a5b4e8fedb17bb97f98e95721d09b8fab9975cbb07f3564726a77d3fb10e8726ad3ca6 SHA512 a0ee73140f87a13b6e9ab38b346d91016b45d07845373955ed50eb3e2f10cd3755d488d80b30409c5548845bb56478764661f809231be07afdae5d7f981a536d
 DIST Faker-18.3.2.tar.gz 1649241 BLAKE2B e4defb3df2b344effa67769a2b7a28fd3c69a0d7c5b6ace0c495fed1dcd4594989c635679152f6eb4b1f53aa0cc7aa3b5343b02901863ed97b52e128b3aeeae6 SHA512 f0cadd36b40aaa81d2108d674d6b5504918bd0a75cddaccdcd3acb8f290edb15d4797ca35a7f3f747801907dff60e5e69dfb25937fdef6c0b9c527fe9be370d1
+DIST Faker-18.3.4.tar.gz 1662937 BLAKE2B 2212c2a005fe5644a8357324ace3ece1570046231907650c115c63b392e4d607e6361cd1b92e9829572955a342208e5a238f771dd2d54f5361e3b3754ae002fe SHA512 90ac99eab6b55d3c8989266e5dc6dc20a749cf798df331132fb1f85fcf77ecc2c87538e0a80ba89b5ca6e39b8ac407372fb5e5442489d23daaacd66303defdee
 EBUILD Faker-17.6.0.ebuild 682 BLAKE2B 6e4f513383d927ae62995083ce32a75635a14844754fcaaa52313a7aaa98118e82f018a82c381a5347a2df0ddf9e7bc68f78438fbd4336b8cd51562bf335b9d8 SHA512 83e54f767935b0a45f0f50b4df871213cf7cd968fd73c9c1502895fe4fe1d0f533fb249c478aa89b78414f8198b6b2d123931c0096e1582fa5e8a76bf3767069
 EBUILD Faker-18.2.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.0.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.1.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 EBUILD Faker-18.3.2.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
+EBUILD Faker-18.3.4.ebuild 683 BLAKE2B ed6805e59f23a4bc570266b7f6e806d8861a1caedd84cf7eaffff58932fe5347469a303402748e82fcc02734d78356d076dfe1b054bc0b33c6e546e295382b18 SHA512 4ea11d603431b14a105c5b67b56ab168bb6fae6ea40760bbeb53076fdbd8e98452c7f8e53e3657911423f33af76b910c5c4bb10fbf365e9c68a3b5e571f5aa44
 MISC metadata.xml 498 BLAKE2B c9b7885dc7d34f2263068624a6b07ac6f1ec8078cc11abb6137612ba57edffefc48dae2708284aa83ecc941ebb2d3b8a87a143648e404a0683e75bb6c078f4e2 SHA512 0b385bbbfbb026803526e43c6c43965ff75f42d3ab133603708b187686aac29de508856e5e8ae7622a66b99032efa97f95c21625e10d074c858d8aff7446a312
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index b644ee6cf7ce..6cbc34f0b84f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 93953a9cb9c6..785a74054d81 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,7 +1,3 @@
-DIST apsw-3.40.1.0.gh.tar.gz 423060 BLAKE2B 7ac1a587ab93b4cd6ae20a137f2f1a2e96039209f74c8aa626ea7bf219b1698403fe4c8365662e8b896a56024b45b36a80df5f506d6a813dea920add202479cd SHA512 243d47efc7407c4f3bad92d1bf4044fe4a53d913b86e1821c7d1c3711348bf25b2a339a68d18075f99c0899766085c2f2b93a303f8298c115463224ad46f99f1
-DIST apsw-3.41.0.0.gh.tar.gz 837111 BLAKE2B f3374dae906148d7553c9c67c7e1f91acfc5124d525aa37728f81ce39c33368ae387a555dc2c50d2117a29e35c925a968968cdf22fd18477d00a877efcfef876 SHA512 f5ee663e15f54fc8f3d1fe6435be6470f9399271d2f746b8e624a98b1ae8b5fcaa0152ddae9e99d8ab2876388e42348f8e9ba8773f34e7042a72467d794c108b
 DIST apsw-3.41.2.0.gh.tar.gz 871995 BLAKE2B 3d6959133cbfe8914eaadb46543a3a65db24b97aef362eb43e90448be34467a2a9e0f651ff67a9b0ce02df2c6eefa5b5e1c599547e72713e2ddbd1ec6c4f558b SHA512 292ea5a84f406fccb3ba5bf229a38d9c35a32f342b7e1065f08b2758c1d0d9b6517d37c32ce625f9e21cc55339eb2eea35da26a0f17d79a1fc58e1d6b08a8570
-EBUILD apsw-3.40.1.0.ebuild 920 BLAKE2B d117533d5f9d4019a402ab1b45907cf181cf2a725b8e6aca716694b8053960dd2318164f891ed50cdd339283e6de606654731c1de274d16000815890504e9bc9 SHA512 9b89e245dd02ca7dcd58f40b8ad76743414866cd11090dbf6aa403c645466feed4e12a5a76de89fabf46967384f61b496271a60cf91f7a274afbc2443d6cd172
-EBUILD apsw-3.41.0.0.ebuild 922 BLAKE2B 5ccd57b3cae9c5eccde49cbd9bc36f9b80e0ea9e0fc0e4dab9db6cb6fd869ee086e2929be3123597b63491b37466bbef668d6cc5deb7a924b4c4c72330bdf5ae SHA512 2b038b78a84f93edc8bc5ce7a4e74195b6149638e20d30d5d3607d5e3411d8e4d5ad399b547ee5155dc5c0a4d1dd71954f125031f237596991eb65295f8a1a01
-EBUILD apsw-3.41.2.0.ebuild 922 BLAKE2B 5ccd57b3cae9c5eccde49cbd9bc36f9b80e0ea9e0fc0e4dab9db6cb6fd869ee086e2929be3123597b63491b37466bbef668d6cc5deb7a924b4c4c72330bdf5ae SHA512 2b038b78a84f93edc8bc5ce7a4e74195b6149638e20d30d5d3607d5e3411d8e4d5ad399b547ee5155dc5c0a4d1dd71954f125031f237596991eb65295f8a1a01
+EBUILD apsw-3.41.2.0.ebuild 920 BLAKE2B d117533d5f9d4019a402ab1b45907cf181cf2a725b8e6aca716694b8053960dd2318164f891ed50cdd339283e6de606654731c1de274d16000815890504e9bc9 SHA512 9b89e245dd02ca7dcd58f40b8ad76743414866cd11090dbf6aa403c645466feed4e12a5a76de89fabf46967384f61b496271a60cf91f7a274afbc2443d6cd172
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.40.1.0.ebuild b/dev-python/apsw/apsw-3.40.1.0.ebuild
deleted file mode 100644
index 3cfdb2b69aa9..000000000000
--- a/dev-python/apsw/apsw-3.40.1.0.ebuild
+++ /dev/null
@@ -1,50 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.41.0.0.ebuild b/dev-python/apsw/apsw-3.41.0.0.ebuild
deleted file mode 100644
index 029ab66ba97a..000000000000
--- a/dev-python/apsw/apsw-3.41.0.0.ebuild
+++ /dev/null
@@ -1,50 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="
-	https://github.com/rogerbinns/apsw/
-	https://pypi.org/project/apsw/
-"
-SRC_URI="
-	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-db/sqlite-${PV%.*}:3
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		enable=load_extension
-		use_system_sqlite_config=True
-	EOF
-}
-
-python_test() {
-	esetup.py build_test_extension
-	cd "${T}" || die
-	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/apsw/apsw-3.41.2.0.ebuild b/dev-python/apsw/apsw-3.41.2.0.ebuild
index 029ab66ba97a..3cfdb2b69aa9 100644
--- a/dev-python/apsw/apsw-3.41.2.0.ebuild
+++ b/dev-python/apsw/apsw-3.41.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 9718c87c2bdd..504830f3b9c7 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -14,5 +14,5 @@ EBUILD argcomplete-2.1.2.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bf
 EBUILD argcomplete-3.0.0.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
 EBUILD argcomplete-3.0.3.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
 EBUILD argcomplete-3.0.4.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
-EBUILD argcomplete-3.0.5.ebuild 879 BLAKE2B d4137f761a2cd59f6adf0cf2342b15d081bfd70914f443e0ea5465018fb32761cb00c6709201b81dea15e46bd584900e1942795aa40a5e2cce2ba4ee03ce6f0d SHA512 339d99564a1b8b69a4080f102cb7484184f6389c1531cbd40838a119c10137d56ba403bd05eaa783341a44a8add84853c6d499c807c9fcbaf585250864b56d5b
+EBUILD argcomplete-3.0.5.ebuild 871 BLAKE2B d308417ead62aab69184196f8411949c08fb098226b3bf63033135eb4819d4bd3e5cf6d5888534cf4d68386d7d125dc3c173c75b64327fe9378599db8bb871eb SHA512 46e3be1211aeea2fcaf682948fb35975e40f637d48a3ec542fd4c958fca0f5318941714da90e5c9e2bf2a1122183b19b8bf035346857569db38e50bcf0d244cb
 MISC metadata.xml 411 BLAKE2B 963cfdba9183fde9e97c534345164d26be569d841dcc6fd274601b18d5de2ae97fa837b0acfdc59616c5d19cc54ea368547ffd901f90239cdfb5ba08e8721607 SHA512 22db237979be34053ad7201f599d576a7756b71e6b75c40c2808d47f276cce6d3594ae46dcaec5aa5adab9e9e24e11d47bb9044a8b1a146163d66687965cf5b7
diff --git a/dev-python/argcomplete/argcomplete-3.0.5.ebuild b/dev-python/argcomplete/argcomplete-3.0.5.ebuild
index 4c9150727c75..802c9788b5f3 100644
--- a/dev-python/argcomplete/argcomplete-3.0.5.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.0.5.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index d0dd392ded4f..dc61e228da63 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,15 +1,5 @@
-DIST astroid-2.13.2.gh.tar.gz 449022 BLAKE2B c8180057edef860fae6697b40d6b023b5be9305f0726b85127035a7ed874005da25b265e49a11a985724034c7a2af177b1c5b9850afaccc5787c5db70e4cd73c SHA512 64635e251fd01ef0ac6681db5750230f9acfc2b502818b7c9c0a480dddc78a03a5e5fa920618331b5c1d84c31551f16de7c4c5ba8052dd96d4974edb25449761
-DIST astroid-2.13.5.gh.tar.gz 451241 BLAKE2B 6994c9a62911ab347be4de17b9322ca9957b274c2a42085b5c521bc4a810ab0c0079fda89203910a1d7151ebad1b07cc446c1fc8e88580051029861cfb3465ae SHA512 87920dfe5a4e3e64b77cbeefcdd1e227dd712230aeb957f78b57a50d215ef0601689df26ac97cec65d7690e89b10e1b8ab8f2976d1a9b1a3e9a971eb2142d9d2
-DIST astroid-2.14.1.gh.tar.gz 452889 BLAKE2B f6cee61825d2c86bbf02ba6cc9f48076692d3d71ac2c8a02880a778380b076692aef549ab01829d943323b5829b83ee88009b5136b308da6f81a824fa1f62047 SHA512 47dd132e66645c3da639c68011f4691409af38affa80c5b1863706a864fb8458cdfd100f86929fdaac027a514d285132d8865d2d40996c583077384696a84123
-DIST astroid-2.14.2.gh.tar.gz 453109 BLAKE2B cb4b0795bde841e98712a719ba0870a3f0c616fc777cb3afc1ebbb0f5e49b763241825072d7915df87e778649a5632fec8f48e125cfa67de0b70618e34509157 SHA512 2dad27c0a3ddad5747a021c0700b831fe9f7a557238a2f52d87722c637120d49796a0a8e9e6f27d42ab4bee1c91541b7b5b5fa93dc3ec8a47197f35569a64a3a
-DIST astroid-2.15.0.gh.tar.gz 460733 BLAKE2B cc80ffd9b5804a1a0c94598f75363088dcb971ee322b556e150799a5e18aa16d20c58d9bf7725c2697d34152daa72a20d845e7c56a524d58354913eed338010f SHA512 7ec121b3c7d60e2d48f738fbc4eeae3e32c7135a77fb778db9479d730a757818f549d8bd35facdd67d411d777d57ec620a2448de1f4da23754863cae18717bce
 DIST astroid-2.15.1.gh.tar.gz 460960 BLAKE2B ec08cc53027323a70291adc888b3621dc139783e6f72859eac05a2c6da0150cc5d19dc6a7278b6a846f985cf44c7d868df1ba11d0c6e3b7a5d3c71a38603743e SHA512 26f85aff9de08d4b413c40951f2aefd2c19304c077b502774b253e3fcced42173bc7e996fac82b3462c6915625ff48fd80dd1ab5e3425aefa103347f821f7df4
 DIST astroid-2.15.2.gh.tar.gz 461132 BLAKE2B 1e4d5fa174c7893743ebe9a17b28bdee68fefd35a69802358eb4448402a00622ec56a7ba18a8cdae8cafd9e75bbee9cd18f39bbb44fbcc061c893fc24e308376 SHA512 aea2a55780f81893d8dad4acb572883017e3d6270d48a8f0d3b4520279bc4d79e9d04192479d5aad453ab7bda6d29edf1f56c92d86c04a8ef07bd4561bf908c4
-EBUILD astroid-2.13.2.ebuild 1908 BLAKE2B 31c346d4e5b4b84588a6ffc85baeb663226ed3cbf568e83de78c687615a55ebd02ba7731b797e455b38b188b7ae816718abfe84ba3d3313306f0333161017194 SHA512 6c71c50f5729347f1d611ec7e4d9f5f16e45c46ed6299213148bb2579bab68844eb407fbd64626de6844164c0bb30b505b1b96d80bac2fe2ce4baf19a00bee50
-EBUILD astroid-2.13.5.ebuild 1956 BLAKE2B e8200aee3572ea481d9b466787c0f473bba7582bfd404931085f7e3f28f84e8c31e7cffebe838851f3ed2c67bd95c78beade85db4edfeb56dcb75cfd2b2245d9 SHA512 de7258fd3f11225d8db10ceab3c43caa5e0c394b015217e5ebdf50adb79dfc6adf8de2e68723535e774e6727d1a940ec5e52c066990b124bca5864a3bfaf0dff
-EBUILD astroid-2.14.1.ebuild 1956 BLAKE2B e8200aee3572ea481d9b466787c0f473bba7582bfd404931085f7e3f28f84e8c31e7cffebe838851f3ed2c67bd95c78beade85db4edfeb56dcb75cfd2b2245d9 SHA512 de7258fd3f11225d8db10ceab3c43caa5e0c394b015217e5ebdf50adb79dfc6adf8de2e68723535e774e6727d1a940ec5e52c066990b124bca5864a3bfaf0dff
-EBUILD astroid-2.14.2.ebuild 1948 BLAKE2B 06db3307336558201abb8fcc94149466cc47d8c9a02773228b8ae96e1b31ccc4a3cdea1d2c8ca3729e4f6cdfb3ed19a47d419f0c4ce03d2a9ee8797189203e76 SHA512 0c80565b31368de0f7823eaee43d3f5fa7aaaa8367969892e4a57b2b16e3bcb389a9996fa43ed31dc2654701c503129f372f123ddd0b96d2741f713568fceade
-EBUILD astroid-2.15.0.ebuild 1935 BLAKE2B 920af526bb63cb0247bb9e7973e20ddd30cd284938e7c059eb78f051cbba5094c09c7ec4332d938865eb6f2696e71ebb7f5fdd53fbf9820991320eedadca36c3 SHA512 827b230aad1503353b854227a7463f7cb6016ef44b2ae887cee040ff1d32cdc1dd1276bfc3d598d84866560ccf01ec6b295bcaee48a68a0285b44ba38505a5b7
-EBUILD astroid-2.15.1.ebuild 1935 BLAKE2B 920af526bb63cb0247bb9e7973e20ddd30cd284938e7c059eb78f051cbba5094c09c7ec4332d938865eb6f2696e71ebb7f5fdd53fbf9820991320eedadca36c3 SHA512 827b230aad1503353b854227a7463f7cb6016ef44b2ae887cee040ff1d32cdc1dd1276bfc3d598d84866560ccf01ec6b295bcaee48a68a0285b44ba38505a5b7
-EBUILD astroid-2.15.2.ebuild 1934 BLAKE2B 204f036874348bb2e26fe6cc73e3477be0f4e75041bf724c5b7d21f4f8784aaacd8ec763b04ca8cbab958581caca9fd04bf95d6810f00d94e9ea77ab2cbe12e3 SHA512 05cf6a80bce0069169bf3f55bc094fe27a72ed7a7b436337a84de363cfbb1c4dd9e8dbfc2d06802ebfefdbcd50ea5a3b1b226467164005b6875b870b6da23a6e
-MISC metadata.xml 1143 BLAKE2B 1f6c4e004277eebed2e29cb935ef01e5f18fb0a526f99f0e875ae3815308dce0483b5274b4e23bed076464aa62a035937a7a3817e2d4a5fb9211b9043271e04c SHA512 56b07d0f08a49772661bc3d233cf1f628aa7c241c51b91d75dfbd44995e169d8ab5bbd99863d7b9b67792486346982a7b8eebefb462e7e212cd7dff920d80840
+EBUILD astroid-2.15.1.ebuild 1927 BLAKE2B d05c87932a2c70e6840870b693710fecd3434027d08433c399fcddf8738b23b1dcfb9e3f6fd7cf96b93a4f738db5ff36fd751b7695248400cfaf7f02e0bc4102 SHA512 b7bcb425a787a1d959e555b69cbb35a266dac42fc6fb4e2d8874e4d659a31a1978518c4321db71bd47ddb50094296057d0a702f5b278215ebe051b933d635a25
+EBUILD astroid-2.15.2.ebuild 1944 BLAKE2B 02bf83a2d2aa64f1facca32d081cb52e389d504a864d3990a0fad04628e12cd7d119a30058af21950095d1824a11c2ecc3219078da270cbfd65dd8763effb736 SHA512 4f29a0352dc018b061ed2cb665e80be005390ea206989ee23f2b93c794592b8e98e8bdfa2150e256e717f8b6bb44b2d498baf53ff657e53312416ab6362f5fd5
+MISC metadata.xml 1148 BLAKE2B 29a6cfc0c292117920be154d37ed4770f1fb1679186576fe6151cc02d1d6be766045e0231e2fceb87cbd250dbed3888c99b7ca7dc0182cc700a11961d9cd6d9e SHA512 6821d13f5e82bd73ee4fd165c0b4c94f40cd6af536dee1658cccb4175e67da2611c4d1478cdef1607535f23224116ad482197e0b0eef8f0a94d596bf250b3074
diff --git a/dev-python/astroid/astroid-2.13.2.ebuild b/dev-python/astroid/astroid-2.13.2.ebuild
deleted file mode 100644
index a878ddf63ff5..000000000000
--- a/dev-python/astroid/astroid-2.13.2.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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_brain_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.13.5.ebuild b/dev-python/astroid/astroid-2.13.5.ebuild
deleted file mode 100644
index d59ff3f19aee..000000000000
--- a/dev-python/astroid/astroid-2.13.5.ebuild
+++ /dev/null
@@ -1,63 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_brain_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.14.1.ebuild b/dev-python/astroid/astroid-2.14.1.ebuild
deleted file mode 100644
index d59ff3f19aee..000000000000
--- a/dev-python/astroid/astroid-2.14.1.ebuild
+++ /dev/null
@@ -1,63 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_brain_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.14.2.ebuild b/dev-python/astroid/astroid-2.14.2.ebuild
deleted file mode 100644
index 9099293f95b0..000000000000
--- a/dev-python/astroid/astroid-2.14.2.ebuild
+++ /dev/null
@@ -1,63 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_brain_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/unittest_brain_dataclasses.py::test_pydantic_field
-		tests/unittest_brain.py::SixBrainTest::test_from_imports
-		tests/unittest_regrtest.py::NonRegressionTests::test_numpy_distutils
-		# some problem with warnings (our options?)
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/unittest_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/unittest_scoped_nodes.py::test_deprecation_of_doc_attribute
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.15.0.ebuild b/dev-python/astroid/astroid-2.15.0.ebuild
deleted file mode 100644
index e619ead6e779..000000000000
--- a/dev-python/astroid/astroid-2.15.0.ebuild
+++ /dev/null
@@ -1,63 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-# Version specified in pyproject.toml
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	<dev-python/wrapt-2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# no clue why they're broken
-		tests/test_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-		tests/test_regrtest.py::NonRegressionTests::test_numpy_distutils
-		tests/brain/test_regex.py::TestRegexBrain::test_regex_pattern_and_match_subscriptable
-		# some problem with warnings (our options?)
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_one_arg
-		tests/test_decorators.py::TestDeprecationDecorators::test_deprecated_default_argument_values_two_args
-		tests/test_scoped_nodes.py::test_deprecation_of_doc_attribute
-		# requires six bundled in urllib3, sigh
-		tests/test_modutils.py::test_file_info_from_modpath__SixMetaPathImporter
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker
-}
diff --git a/dev-python/astroid/astroid-2.15.1.ebuild b/dev-python/astroid/astroid-2.15.1.ebuild
index e619ead6e779..5ef65f6fe9e2 100644
--- a/dev-python/astroid/astroid-2.15.1.ebuild
+++ b/dev-python/astroid/astroid-2.15.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 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"
 
 # Version specified in pyproject.toml
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.15.2.ebuild b/dev-python/astroid/astroid-2.15.2.ebuild
index 9ad352280874..39fa50857923 100644
--- a/dev-python/astroid/astroid-2.15.2.ebuild
+++ b/dev-python/astroid/astroid-2.15.2.ebuild
@@ -10,11 +10,11 @@ inherit distutils-r1
 
 DESCRIPTION="Abstract Syntax Tree for logilab packages"
 HOMEPAGE="
-	https://github.com/PyCQA/astroid/
+	https://github.com/pylint-dev/astroid/
 	https://pypi.org/project/astroid/
 "
 SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+	https://github.com/pylint-dev/astroid/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
diff --git a/dev-python/astroid/metadata.xml b/dev-python/astroid/metadata.xml
index 7ec50ca3dbcb..79a7186a4935 100644
--- a/dev-python/astroid/metadata.xml
+++ b/dev-python/astroid/metadata.xml
@@ -19,6 +19,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">astroid</remote-id>
-    <remote-id type="github">PyCQA/astroid</remote-id>
+    <remote-id type="github">pylint-dev/astroid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index d9b132219c24..c12599ce24a7 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,6 +1,4 @@
-DIST autopep8-2.0.1.tar.gz 115905 BLAKE2B 9dde8d702a0b21fb1457e08120dca805e2b46e3e5284e5d98932ff93afc4c0ac8dbc60215f35b64d4a308d6748df1411c2979d8fa1f4949b1dbe213bf19de9dc SHA512 cc0e8e5b7228ba9b37adaa3b2689a5e1ad04eb84366c5300d7a220b1593a64e4f1dc332750f8ca53935dec6a3ea1d07cae5615373e44da357a980d9763bbc3f1
 DIST autopep8-2.0.2.tar.gz 116154 BLAKE2B 1b6830f9cb8a4384898273411f6b03cf3e3c0e45e2c56fa2bb134f3567cc06459a8123e660db9252f8d7cd15835d70e54c0155f146191be64ffbafaaa808244d SHA512 09471827d18ca0c691bc524e0639a416d1a4418ddda1cb88f50e5c5302e75e7014751e659e26439c22317db21588fbd956c94299cef44e2c47771df38de94be3
-EBUILD autopep8-2.0.1.ebuild 1180 BLAKE2B 78ce747c4104f4b977d68155ea8383c4c7d1dbae5aa30399461f6382345c38402474478d4c706d4eeb5eeabec66af656e4705cdd58d36309dcd7e1b20a770825 SHA512 3e3abb02b9768c95426e7166ec94af338b53532cea1984f7db3d1c899fadcebb0d5c638709a2e7178c62e5b9828a4b3f9a8460019a69cf32cdb55f3d073e90ac
-EBUILD autopep8-2.0.2.ebuild 1145 BLAKE2B 15afa6e395d085649cbfe78e6d9443e5a3559c32a7327198c61f94c36a7e3662ec1f061671b0910332df8467229360d68e68c40e40d0049669fc958bc01ddead SHA512 e1b2d7c2534b85cae674b0a4140e906fe85c6a64eb2ae246a9f5193a2db14a3c50fe66327df15078471ca504dad26cc08a5cfef1398026fba7b4f96b5049967c
+EBUILD autopep8-2.0.2.ebuild 1141 BLAKE2B 68ee3cfb6b02a8e49be685a6239b151946bb9a8ea6a1e57315582e9e90b10ac45af6d1b6312fe947b0dd21763141905b53f633dbcf779ff07c3e3318d98740bc SHA512 08f6da3eb29eea4d39e6dd569d7ea1d173cd3a38672ae289b52a0e5951a978da564b76e2d0a5d23836e23bb4efa9c781291f22f03df59cbbb36bcd99228c2b4d
 EBUILD autopep8-9999.ebuild 808 BLAKE2B 0a10876631074874bf1890aa1537e7b92a66f17a52acaa7d46f6e5038f5ce038f4fd33a50dc2caa9cd9ca88bf7aca764b416430aea1f8ee4251a65a5ca88f10c SHA512 98c8b5b784d2007de45c6817142d1c63e3d415d7d817edf57818ec6051256733abe32e32eb24e843ea1631d0a796718b74b5fb53147eafcbe0991d4e011b792c
 MISC metadata.xml 404 BLAKE2B e9442968d195e1605d55b880cf29f4a2945f67c57c0d7d0325e19c0ccf60cac0ac3e68115a0285f87068482163f537abc1d75bddfdc6ae860c8c52c375147fdc SHA512 3e0b8a6ee869086166bb670a73189ca681729276cc7897666127b7e25b3a252aa2e80da5fd4dbb43d101a439d12f146ba0ba61bebf30a87a97f1030325f1aeab
diff --git a/dev-python/autopep8/autopep8-2.0.1.ebuild b/dev-python/autopep8/autopep8-2.0.1.ebuild
deleted file mode 100644
index 807955f05f3e..000000000000
--- a/dev-python/autopep8/autopep8-2.0.1.ebuild
+++ /dev/null
@@ -1,47 +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_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
-HOMEPAGE="
-	https://github.com/hhatto/autopep8/
-	https://pypi.org/project/autopep8/
-"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pycodestyle-2.10[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# fails due to deprecation warnings
-		test/test_autopep8.py::CommandLineTests::test_in_place_no_modifications_no_writes
-		test/test_autopep8.py::CommandLineTests::test_in_place_no_modifications_no_writes_with_empty_file
-	)
-
-	epytest
-}
diff --git a/dev-python/autopep8/autopep8-2.0.2.ebuild b/dev-python/autopep8/autopep8-2.0.2.ebuild
index f3389447202d..05e242d04220 100644
--- a/dev-python/autopep8/autopep8-2.0.2.ebuild
+++ b/dev-python/autopep8/autopep8-2.0.2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	inherit pypi
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e89982d7e0f7..236adca0972c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,20 +1,8 @@
-DIST boto3-1.26.100.gh.tar.gz 627269 BLAKE2B 1481e456b73794a4f371e5ac935d3d777c5315c1da39f8565631f62e05bd218e85409d5e5e095057af2c05c4bbcd9c1c5a56b4d1b8d2ef8e97ec567bfdd959a3 SHA512 45fdbb31c7e39ac1775e89755f88d426bdd17be002a13c1c517f2ec4b7ce1fcf0df7d1ff6c6d678fab5a7a1d656f9f609a6d4b3ab779464ea14a3e52eb7e4771
-DIST boto3-1.26.101.gh.tar.gz 627662 BLAKE2B 322a6e723851464409512e9d8dd17b5f2aa9717d97b8fc349c22e95db09bd8b8554631cd3afe52d31e34f4972ae0e5642762bf2ba13e8e5c5d56a05c3013c218 SHA512 7a1b9a089946dcb609a8c446b4c40f4f8861770b6592b6a11992573f7281a8fec0e3ae9d77abee542a88c588dfa23102110312d969f8aa63b3b0ffaf968a8e86
-DIST boto3-1.26.102.gh.tar.gz 627980 BLAKE2B d9dc7d2f62496f2e78427b7fd96f4a210afabb4a4a574a8860767c5bb48e68410cc9f2f2b64aa5e0e5337721d2f59edc7993ee32ea5e1aa5543533d3f1e18d52 SHA512 0988f113a519ffbd6c8a2238dc66a21d4aa87a7dda77d99a4343088b7ea03855f6da12712251502e54cf60ee0bbe066b3fbb30ad7aeb18d67ed9ca96035eb1cf
-DIST boto3-1.26.103.gh.tar.gz 629982 BLAKE2B 1b70ecf1bc7ec297f01dfd209597719eca2e9d3a8d2a772558696c8cf4df03df5d8f9ea6d6a34beeb8d0377dd0e8ee92ebf7e3fc82b5da59f4994e84321b9e93 SHA512 094a5edde02137d739c9d017f9331671b0b2b5701db9bcc3c7bcb5d42457b407811d70b8ef9b24cfa30229dda028d58e6bb45a043c18b5c765afa3204ce77244
 DIST boto3-1.26.104.gh.tar.gz 630394 BLAKE2B 8444d5c3d0c60db0a77d7d96d518ffd6d10a62075a774173e990077b6e8a29ddc202eec997c0c7f4efbad5eb4235bc47b9a8144419a9d4d48006c1240732baea SHA512 cf456b10474e50d666582c585a350bf6abb80f4357938909444a6795206e513655d1f63178851c33a73bce428c0f5de5bd252707cf959a6c92aaa4f5130a1550
-DIST boto3-1.26.105.gh.tar.gz 631136 BLAKE2B 13dea08a41a45cd7ec5eba37e1980dc8f45592f7e8058739ed55e863c14c083cbdbf1bf9380bfd2845ffcea645570db9e0e61d4ce35315fbdd5ca1f7c14acab8 SHA512 abaeb464cf581ffcaf450ec33468d822960ffee7f5463c187d55ddb0955ae17f1fab8f2a486a9ad6425f850f067091a01aa356cebb441049ca126b0bce198a4d
-DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
-DIST boto3-1.26.94.gh.tar.gz 617861 BLAKE2B 908b40868735038810cf75c903bbc8bad00a6ea8776b2a5a236683f18f2185971f8a13db5349086b1aef2c4d51361c8ebf30f2d671cea7f4101c9882a59b6acf SHA512 036278668afa33dfdaab9cc2e02c2c3e0596ec1c1b407767f22bc6a4cd87913f883f85430ff6a120c5e0fdd2194b70c911fe7a207bc26ed5fcd415f3754cde35
+DIST boto3-1.26.106.gh.tar.gz 631950 BLAKE2B a8c9a0f1450a743953ebc26c75bef7ca1a52d588e5915c70f805efb26093c832bfae07f9a02a740b36ac1b092cecddf77306d3dd82f2f924ec42403c8b397c93 SHA512 2c0a7712abb5c5a4f541e94401ec03291c0aa15536884b793fb7fe4d328270af974ac70e7a538349969b737f86d8119f644595144d4399eb91ac7708762159a9
 DIST boto3-1.26.99.gh.tar.gz 625932 BLAKE2B 961a640995abdafbf2cd73f83ed5af0e1314cebbc5dc154771204e7c16532ad4a84aed08cbd7789af30de518bf2e8bd5204e9a540a2d3a08e75222c2eeb9a68a SHA512 ff726483a83a11a8c088905998af0a1a791e87503b39422811d82b3122275a24eb955636407422af7552908eee22d4c1369779a7798f09f958a8af5234c0c11d
-EBUILD boto3-1.26.100.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.101.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.102.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.103.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
 EBUILD boto3-1.26.104.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.105.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.26.89.ebuild 1580 BLAKE2B 6c2b0aa540898e7461c165b8cb755ceec1cf0b94ba8cf4e2183bcd3a7a242b1e78f4c9a61bcb0c01230f625735a59ce3cd437098b19620d87c76fa022327af45 SHA512 f792df64912dbb7af89eac9c95518624a26c37387e16b96f46db928912c01ce20503cf8f9685de1b314ca7120e353c5fb26c900962f8c05e2c275b3bcd297555
-EBUILD boto3-1.26.94.ebuild 1587 BLAKE2B db535a9938316c0564a32f4e05e74349251daef0db47afee54fe6907409d11ba1d660027cf059e2d4889c580ab8fe2fd6b252dd25a9c1906c878df6cb52e49d2 SHA512 8f2d0fdfbe2fa3916821a5d884cf579d55f97c21853c2f0990402e9ebbe4f1b0d21fda262f6e0ed997890b0cfe1e7ac42b1b6832a683c6b27f4aa2b6d4697469
-EBUILD boto3-1.26.99.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.106.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
+EBUILD boto3-1.26.99.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
 EBUILD boto3-9999.ebuild 1514 BLAKE2B 5d31d27ac50ed037fb8be61559bac03bd2a8c63f3220ac93ecc864c0e3cbd34763b9b70761a9f364cbc85a0edd84c6f6eeff614292f31473b4935e5bb86fae7b SHA512 26bd2959c745f0e423d683d2fedeab9a438d215fa9b28b403d0cea81caac7436f05382b2a91a183bc1095f3b205e3b2115f931cd7803e0b9838c2a507562da5c
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.100.ebuild b/dev-python/boto3/boto3-1.26.100.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.100.ebuild
+++ /dev/null
@@ -1,68 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.102.ebuild b/dev-python/boto3/boto3-1.26.102.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.102.ebuild
+++ /dev/null
@@ -1,66 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.103.ebuild b/dev-python/boto3/boto3-1.26.103.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.103.ebuild
+++ /dev/null
@@ -1,66 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.105.ebuild b/dev-python/boto3/boto3-1.26.105.ebuild
deleted file mode 100644
index 2a4a7643203e..000000000000
--- a/dev-python/boto3/boto3-1.26.105.ebuild
+++ /dev/null
@@ -1,66 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.101.ebuild b/dev-python/boto3/boto3-1.26.106.ebuild
index 2a4a7643203e..2a4a7643203e 100644
--- a/dev-python/boto3/boto3-1.26.101.ebuild
+++ b/dev-python/boto3/boto3-1.26.106.ebuild
diff --git a/dev-python/boto3/boto3-1.26.89.ebuild b/dev-python/boto3/boto3-1.26.89.ebuild
deleted file mode 100644
index d6d605bdb0c6..000000000000
--- a/dev-python/boto3/boto3-1.26.89.ebuild
+++ /dev/null
@@ -1,68 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.94.ebuild b/dev-python/boto3/boto3-1.26.94.ebuild
deleted file mode 100644
index 9523f65d5fb9..000000000000
--- a/dev-python/boto3/boto3-1.26.94.ebuild
+++ /dev/null
@@ -1,68 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/boto3/boto3-1.26.99.ebuild b/dev-python/boto3/boto3-1.26.99.ebuild
index 2a4a7643203e..736d8a002190 100644
--- a/dev-python/boto3/boto3-1.26.99.ebuild
+++ b/dev-python/boto3/boto3-1.26.99.ebuild
@@ -25,7 +25,7 @@ else
 		https://github.com/boto/boto3/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 	# botocore is x.(y+3).z
 	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 2ffab1795eb1..335695702e77 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,20 +1,8 @@
-DIST botocore-1.29.100.gh.tar.gz 11306804 BLAKE2B 8ac9d592d2ea86bd600ca29c51999577e9c223fe951753052fd8d4c9a7d9f537f663491b2f31267e3ab0f082cc3b8ad49064017b268821e6d8c990e88046e144 SHA512 436b2cd40e3f7414b025463e2322fea834c1eae1243070f500dff7682a0dd049123b047a5d8183c58b001e4a793bbc81fa4a96afffff42b2d9f06c554fd261c0
-DIST botocore-1.29.101.gh.tar.gz 11311820 BLAKE2B 51be1b936b407a8d29912f6891c786826fc5a6be9caf386da56b697961613f4fe6506356f3c0b00da07386960abbde7e84c49e22142d1d401e481c8d4747d569 SHA512 1fb519861042b662d1d624223027f7a898d1975a07c6f2ad035547211bb7dad63cb07fcd6061cce75ab641801a7693313aafae7257067358d85fd43abbb82891
-DIST botocore-1.29.102.gh.tar.gz 11312537 BLAKE2B 6e5ac46612a692c72c7b9f3587d651a37422143dfae1fd25e999e255028e82a185dbd51ecf0a5de7d66a1ee715a6296d5d9c1f9474c210286b2df4e84946a3b8 SHA512 c0f0a69f81e1f2e57b3c048bae8e297e488f3e18bd2a443a6a6e56d49b97776c6b0fd7e613353eda3a7ee1f807ed717b639cc5fb685f83708f24de9d432f20fd
-DIST botocore-1.29.103.gh.tar.gz 11356652 BLAKE2B 4b583e094c1dce78257c7a21a1b1bb5fb5705af71f6fbd5215d34bc5dc745d47d19ec2ee4e667d9430f366385aaa45e4c2b139102c1c9de129b06ecb37338bda SHA512 a430fad7d729853d0ea405e772d482e6c9db60e6f580f51ddcec87816e13aa3f7ddded9bf8ce288c84c0e28f2b4b29922b1af9a0a8934123f17bc351a267a6c7
 DIST botocore-1.29.104.gh.tar.gz 11360726 BLAKE2B f051024952f137e42a544d60cefbcf4f359a4b68bfad332060703db6e04ff448b6b501541bc1d372aa6d9f30be6931110a02b40505d3fb2de77560bddc0e0d88 SHA512 c97b01240c5502a94d9afaea061e47155efb8a9c11f86778ef3c1595f40cf24f600116a5728025df3af6ed3466115fb94a046dc2e0fb2ed47a1233ffa0def027
-DIST botocore-1.29.105.gh.tar.gz 11363053 BLAKE2B 50cdf2f1c2bc60441e3083737509415355a80604f99de8c89026c743750570af3c9571c62d9d9469ccee6934c1fbf169656510da10be69e1360f7e1456cebc68 SHA512 ea68dcf04d006c7324c412ca8f664aa76020f32483fc4e9842a2eed3be7db42f0e13dca60517b372b09f18ffbbf9ba9de78a19e3713c79a1fcd46babe10fd078
-DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
-DIST botocore-1.29.94.gh.tar.gz 11242930 BLAKE2B d6abdda0ad69bfa635c2cdccefff5c0feaa27fb1a307d5cacb140ded35c246a52ebbe5657a9317bdc1441939d2bd62d5829b2ecce01c05976f56737f92fc3f62 SHA512 23c1fb835d492f414a0a67ac03e50ea31f6343676c7e6e8649067b11e3213f84eb068562fe5bd9a49ead9e37381ab132ac820d98fa4af805b41eaf53b0f9cb1b
+DIST botocore-1.29.106.gh.tar.gz 11366047 BLAKE2B 95bacc0bfd436c86934f7287b6b8729ef0b28ba38a0ddddb0f81a7b57893f795153ba72466de377899234daaeb71921661fd4d8c9fe395b761859ccb0eb59577 SHA512 aaad7d0c863a09bef710214230835f8f3b8eb5f2142268dc30b351446c64cf499054f6297c165a0fb28bbd3db1e784a7a5234279dba711ae02359cfcbbfd8746
 DIST botocore-1.29.99.gh.tar.gz 11285143 BLAKE2B ba594544fb219cec77659cfa48fb6e3a8241b92c911d9983450648ce97652cad7654181637fed8373fe49e33524f63920128afd4ca9c00bce45603b1ab917648 SHA512 319d70412843149aa43c8d7faeff04122d96091081d30c2da0962fadb27104a24cc147fac2c95492aa407b2f8a25ebed9e7d149c29d5d38134d836581c801bdd
-EBUILD botocore-1.29.100.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.101.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.102.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.103.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
 EBUILD botocore-1.29.104.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.105.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.29.89.ebuild 1899 BLAKE2B 94938a1edb8da9279816e2302442deef5adc1edef43deb21369c8dfc62c569eb34d4198cf55dc6acdad0c718eba5ddce0040b6f269e866e6eff95bc36fd41be3 SHA512 a0d875a4dec85116eaae0a20182832dedeb84e6a8946093473b99a1746ed5ff8b49ef7e7a4ad5b70afdfbb1098fabc5ddbbc40b895c2b7e0559e3d10cd02e0bd
-EBUILD botocore-1.29.94.ebuild 1906 BLAKE2B 0502a7409355212185525e104ab8763d13886570efdb9cbdc01425e1cd36e81b0381d7eccd4de0ade28ab9ddce3d39e24760157a3544602969369e98bcf1ffcd SHA512 eee3fbf350bf335637a962a1cd061141b4b2db43d3cd19c95cc9d6e29bc44092c26477994c260f6df56ad626a537758c177567d38feadbb0b0be4626ec63276a
-EBUILD botocore-1.29.99.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.106.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
+EBUILD botocore-1.29.99.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
 EBUILD botocore-9999.ebuild 1736 BLAKE2B 6ca7ea14855f5f8db2d166ba1f29835d4c994a0a8fa38f3852406289a4465c091909562ac678f1c0bf7e640a594731b0d4319efc0f34f6bc640fbae06746c4bc SHA512 f891bf0eded88d9af3b87fc7c9ee4c6a129d263e672821f3b9654d43bb3bcac41305b834192088d15b50f3f9d36ea95374180cf13e1cb67149595ec63e4cc155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.100.ebuild b/dev-python/botocore/botocore-1.29.100.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.100.ebuild
+++ /dev/null
@@ -1,74 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.102.ebuild b/dev-python/botocore/botocore-1.29.102.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.102.ebuild
+++ /dev/null
@@ -1,72 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.103.ebuild b/dev-python/botocore/botocore-1.29.103.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.103.ebuild
+++ /dev/null
@@ -1,72 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.105.ebuild b/dev-python/botocore/botocore-1.29.105.ebuild
deleted file mode 100644
index 491b6bbc21f2..000000000000
--- a/dev-python/botocore/botocore-1.29.105.ebuild
+++ /dev/null
@@ -1,72 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.101.ebuild b/dev-python/botocore/botocore-1.29.106.ebuild
index 491b6bbc21f2..491b6bbc21f2 100644
--- a/dev-python/botocore/botocore-1.29.101.ebuild
+++ b/dev-python/botocore/botocore-1.29.106.ebuild
diff --git a/dev-python/botocore/botocore-1.29.89.ebuild b/dev-python/botocore/botocore-1.29.89.ebuild
deleted file mode 100644
index 5afa7a9459c5..000000000000
--- a/dev-python/botocore/botocore-1.29.89.ebuild
+++ /dev/null
@@ -1,74 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.94.ebuild b/dev-python/botocore/botocore-1.29.94.ebuild
deleted file mode 100644
index 0f4daaa48e81..000000000000
--- a/dev-python/botocore/botocore-1.29.94.ebuild
+++ /dev/null
@@ -1,74 +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..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-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
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/botocore/botocore-1.29.99.ebuild b/dev-python/botocore/botocore-1.29.99.ebuild
index 491b6bbc21f2..d6d0f2607297 100644
--- a/dev-python/botocore/botocore-1.29.99.ebuild
+++ b/dev-python/botocore/botocore-1.29.99.ebuild
@@ -24,7 +24,7 @@ else
 		https://github.com/boto/botocore/archive/${PV}.tar.gz
 			-> ${P}.gh.tar.gz
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 1bf96f9c3a4b..0c49ec83544e 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,6 +1,3 @@
-AUX breathe-4.34.0-sphinx-5.3.0.patch 1354 BLAKE2B 2cead0e34ec7a0c4e140f794f0212f9dc2e5e5fbc61981d1d7ca906bc462d36fec3032279874f41b893949b34dea43bbd28ef8a3f7c30663ac432330b5088ff9 SHA512 14beb1825fe1cdbc8de14cafe47cf9b855465929bd55f72b8c81239afa2115ec3d390abaa9ec0a16194f60a93776eef89cc04a8d4b246f69318b2fa923b03a26
-DIST breathe-4.34.0.gh.tar.gz 206989 BLAKE2B 1c899165ae30de373f90c0fd0b3428d7f4d74e3f66720731c2d02bc2a8bd9c6e5bbd81909b8ab186304975f877d276ed0170c611105335032bee3b689cadef73 SHA512 7f3134575f1b8c4d7c96ebc735e33f656b5c6046de3fa2aee95d5e895fb33f0a83fb4b1c64dd69b9deca20b785868b42d6b1d5e39741500ff5f9d82bf3f130b4
 DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
-EBUILD breathe-4.34.0.ebuild 945 BLAKE2B 775be55667f201880f819b3c9891ab261602a1346feb2ba2a7e1964cc78733075d4ad96f3153fa2595e19881fe3622c763a67a60bb1c33c8e484d6d8d3be3dd1 SHA512 c0fa2b7f7f6e299b3dad9290b99db735a5015e48ee10c8e50a3535d47fa66fc39a7dd5756cb6b39fbe2e6f46db4cb849af9390b04df13bd01201d150d39ee0f1
-EBUILD breathe-4.35.0.ebuild 900 BLAKE2B b3ddc56b3223fb272ebfd2763dbb32968c60c21961f8de52fe298674527f2715b7d762db3073a852da97865537cd1f41cfe19c1adae263b729c4e0ec06be5dd2 SHA512 9155eb9c23dc76e7a0e04a3db6709b698c03cb0447f2870fbea4d9b68ada9e9ba73761d89b845a1303603d22ab18e52d606985283c8de8d567d7e9001bde9cdf
+EBUILD breathe-4.35.0.ebuild 893 BLAKE2B 22f6ec314c2a57d2b0145ed972b1024b0da4333e3e11ac50e806a26dd57967a408823fe8e9b535c28e294a1f479db06a535c6cbbf80234453abe80739079faec SHA512 6b71e9fc75362493226792bd05dc7e837836ad73c4a14e38cfc89eb8ee9b35c9d1b695c4cef5398edef7b007ef22e6a09501950628ae503f088facbd55d93486
 MISC metadata.xml 821 BLAKE2B 4df48e03f2ad66f9a802bb6c238ee2459435e58153ce5cb8556b7b9feda45dd86017266bdf259faaa3e49963976bd61fbff5eccf18f2d9d95d61319995974fa1 SHA512 a14c0334a7029f762133252fcf7b8ae313be23059326876cd64d81fedaac4c37023288779450ff99524b6c3c99f62e7809befeb60476a9e838e6fa2f3169deb7
diff --git a/dev-python/breathe/breathe-4.34.0.ebuild b/dev-python/breathe/breathe-4.34.0.ebuild
deleted file mode 100644
index f5520f4e516f..000000000000
--- a/dev-python/breathe/breathe-4.34.0.ebuild
+++ /dev/null
@@ -1,41 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="
-	https://breathe.readthedocs.io/en/latest/
-	https://github.com/breathe-doc/breathe/
-	https://pypi.org/project/breathe/
-"
-SRC_URI="
-	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-5.3.0.patch
-)
diff --git a/dev-python/breathe/breathe-4.35.0.ebuild b/dev-python/breathe/breathe-4.35.0.ebuild
index ecc0d3520dc9..e5117107d3fe 100644
--- a/dev-python/breathe/breathe-4.35.0.ebuild
+++ b/dev-python/breathe/breathe-4.35.0.ebuild
@@ -21,7 +21,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="
 	app-doc/doxygen
diff --git a/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch b/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
deleted file mode 100644
index 52c65b99ec4a..000000000000
--- a/dev-python/breathe/files/breathe-4.34.0-sphinx-5.3.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 877d88e5aecd1d39978a46fe7f3df35474d7cd8d Mon Sep 17 00:00:00 2001
-From: Daniel Garcia Moreno <daniel.garcia@suse.com>
-Date: Fri, 28 Oct 2022 08:45:33 +0200
-Subject: [PATCH] Fix tests for Sphinx 5.3.0
-
-Fix https://github.com/breathe-doc/breathe/issues/863
----
- tests/test_renderer.py | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_renderer.py b/tests/test_renderer.py
-index 1688981..a858c65 100644
---- a/tests/test_renderer.py
-+++ b/tests/test_renderer.py
-@@ -109,6 +109,12 @@ class WrappedCompoundDef(compounddefTypeSub, WrappedDoxygenNode):
-         WrappedDoxygenNode.__init__(self, compounddefTypeSub, **kwargs)
- 
- 
-+class MockMemo:
-+    def __init__(self):
-+        self.title_styles = ""
-+        self.section_level = ""
-+
-+
- class MockState:
-     def __init__(self, app):
-         from breathe.project import ProjectInfoFactory
-@@ -123,7 +129,11 @@ class MockState:
-         settings.env = env
-         self.document = utils.new_document("", settings)
- 
--    def nested_parse(self, content, content_offset, contentnode):
-+        # In sphinx 5.3.0 the method state.nested_parse is not called directly
-+        # so this memo object should exists here
-+        self.memo = MockMemo()
-+
-+    def nested_parse(self, content, content_offset, contentnode, match_titles=1):
-         pass
- 
- 
--- 
-2.39.0
-
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c1826fcf9ddf..08b8a7a748ad 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -8,8 +8,8 @@ DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6
 DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAKE2B 6750855453b575eb8fcc861d5b24b144497bba62df9b9292ac586cf340e04b2b58290fe9df6d89142f29b56aa37ddeb3bd11cc3337e4dc985a4487954d1e2ffa SHA512 d8a87064ba0f92967df019e9345222b87cda81852a9599902cedc4a49ec7d9e2175c972b7fa6d19920489c1d309822f9c31c23bdce0376a8d40c71d57bcd5068
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 0452806a0baf8641d44d86c91b95958fe3bdef74fe62c32e6cb90c90ee8718c61fe9649d2f9ac17b127d65c64cba9093adee742f455be720ca2bf558131cee05 SHA512 5179df9990802cfcedcd59b8a38a6198cdfddb511fb872872c2e4cfc95531f114acb6bb43395c74659c6b46a42da32213e8312e2ed71b6e317a7270a12cfa214
 EBUILD clang-python-15.0.7.ebuild 1202 BLAKE2B b655ab7b2fa3a5334666e42d36e1e7773be8910f5a47fe8792be04fafbc0c9889cf74d5ca4671863b5244b874133bb353feb4b1ac119e52486ac18d3ff7c6760 SHA512 eb99a86e826ff46d78e1f97a7db1c867e0fc4c9d0036de31407d83dc4de1b8cf80e36ba186d6d8a825209bbb4312d7120b96cbf59d6cb5cf598a3ffb754bf75d
-EBUILD clang-python-16.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-16.0.0.ebuild 1204 BLAKE2B 7147fb79338449b0a955f7f5010e8fdba34848f9fb84b9df9ceefbcc9c1829def49d7157054ef2f707225d2bff673b67d37b82b2fb373b75355583a205db6b50 SHA512 e99332305557a698a231391bad9ba6c1677c7cf13ab64d9c79e6900029f373face1b89acc55321305b12ab6cd70b946609d6352318467c0c11ea1c5d2efff425
+EBUILD clang-python-16.0.2.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0.9999.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230314.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
 EBUILD clang-python-17.0.0_pre20230325.ebuild 1181 BLAKE2B 2628ec06a37f501d0fbe285ec294050a999816997028b0813cd68cabab97139abb229688fcdd9d496a4c045fb55907ffbe9f9861ec5cc34d41bba64f8affee89 SHA512 4df861292429fe4bdce21f387db7051172950ece21607fda3a2b11504ae93f7b301a526b2bf44c38e092d046fd6c6542a4169f641731d6197d15b45198d51089
diff --git a/dev-python/clang-python/clang-python-16.0.0.9999.ebuild b/dev-python/clang-python/clang-python-16.0.2.9999.ebuild
index 5ec556a2ca20..5ec556a2ca20 100644
--- a/dev-python/clang-python/clang-python-16.0.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-16.0.2.9999.ebuild
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 55485cc824fb..b4fa6f2d51d8 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,7 +1,5 @@
 DIST configshell-fb-1.1.29-replace-getargspec-1.patch 1398 BLAKE2B 650efe1dad551ad040001cb2f576311806d329bd430874e1dac38a5cb94c4801140f32b628e0089809214466613e8f207ba3aff1a87dd8ca29c05593b551e5d7 SHA512 59c320939d4590dc2933de7d0ad613efd7236868fd898ce1edadbc55d1ecd8667e28a5c03caa80ea12420db3dd0e4de8c36ef5528352920d98acfd881648154a
 DIST configshell-fb-1.1.29-replace-getargspec-2.patch 2981 BLAKE2B 88400de96d329c0efd2a9e9cb41f1c53e62c28507439c405874726fccc6093d5fe37e52b6e4b811bf0ccc7616c9a26b83b17e39a257aeab3c4114e1486a32575 SHA512 621b125cde9fcc68f46a3a32fd78190a46f900ec808233a60c4beb22c6109165f0743a341991e6c556dc5a76b7c6a42b703f2a6be91915110f196845a3fa111c
 DIST configshell-fb-1.1.29.gh.tar.gz 33192 BLAKE2B 6c9c2146a597572675611afe259122b0ec9614295c4b9b4056d7a16f35004700b1e6fc29e1bf868d9ba6291b781ca35eab77e8adf23c6d23e09de2fb94626f26 SHA512 1b5f573506317119d2420e415abbb856692caa65a7f407f741300eec302d1b442e29d2691f6a192b202b2a5731a7a179d1b03f6cd27780876194d97e4df5f7d0
-DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
 EBUILD configshell-fb-1.1.29-r2.ebuild 1569 BLAKE2B 91663aab642a192425d862f367bc0d307a12063dff5fb4b4a51e2f9dfe9ddf13cfffd73d05a723ce8f0c6d5a6bd54cd473d046830b7540499355835e758c454a SHA512 22b7344090c635bf138e8deb0c8a5c0c00b3b68fd213c0f0eb26674693c14962a321d8fab333af53626e098c43a3b8bf77e45b3fb7a2a651b3f6f4a6ac8fa66a
-EBUILD configshell-fb-1.1.29.ebuild 573 BLAKE2B c9183cc98b502edf3b278ddadc6cb9d6a7e7336216600c5d8a1147d17dd98b40cb4548a390f5cbba84e7ef131b59d1a69af8bdb77eb4d7a48a935aa7378c3ae2 SHA512 76c285e343031bc6930d23e21612faf912b8b7d87b0f4de1de7d3004000020ae1a7ecf42e8b3e0ab9d83689811437bbe2b2e79c231526cd038283c0730f75f14
 MISC metadata.xml 789 BLAKE2B fc1e6e767a4b869c7cfade0a030133a746acdea98b9991740eb82a74f82eb29d495807682a1d521667162ba39a68c966c78ff1e39338d1273d173915e6401a61 SHA512 76a628ddb64f2ce5e0fa09faef29cb7b643e03cee337b9b3554d3a6ac3873be64b8fc66067c93087938e71473f0e2ae3af0a50f0a3b19195b87d69680ded5cd8
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
deleted file mode 100644
index f0dda5939ec2..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.29.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index f416edbb3772..f50d60b2d5ba 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -140,5 +140,5 @@ EBUILD cryptography-38.0.4.ebuild 3217 BLAKE2B 5f4a61f98ec7f687620d52af85df469ce
 EBUILD cryptography-39.0.1.ebuild 3441 BLAKE2B dd2082951f8413a8310228199faa5e4aab3e6f965ba2219ed42fda8f4f1630999d345c0852d57b3287eaf984d7c73b83fecf6d6629fc5810e87cc1d57a799e96 SHA512 e105a7b450556e3a71ebc92a7ee06725c6496a29a2aa68563fc9a4319aa48afac096c1808470fb1e778fc7c32a6bb09c64a19ccafa7843a2a905a3fefe2ef717
 EBUILD cryptography-39.0.2.ebuild 3448 BLAKE2B f6d83f28487a9548517b9d91862a29c3fd809a74b62b5bf4c02c0af4ee49f1291f187ece392680379e8ccc31f24e79ef6b144e4819359bf39340aec79981a955 SHA512 89bfd59f86765b3eb7bd2c1f22471baa11335f8c6f7511284317ae0ec9c33f8c764abfe225a1d18b7094d4217a65b42ce2fb9642b5114fd6041a59ddd2eff81f
 EBUILD cryptography-40.0.0.ebuild 3827 BLAKE2B 249bf551925f5bbe1b48d135ab73259705ae582b75c5b46e0cd38732d40f1b5ee1b7b38463884d954f35c6449f36a0cde865efa67e84997e6b2e509ff50bb488 SHA512 69d065878d1547a960ccc28e6c23252cbe588573e2f92c739a75c0efc817d355782cbc624c4df38229dbafb5f6830d4ac6bef0744b5e25aa7f0b9eaefbef5b8d
-EBUILD cryptography-40.0.1.ebuild 3827 BLAKE2B 249bf551925f5bbe1b48d135ab73259705ae582b75c5b46e0cd38732d40f1b5ee1b7b38463884d954f35c6449f36a0cde865efa67e84997e6b2e509ff50bb488 SHA512 69d065878d1547a960ccc28e6c23252cbe588573e2f92c739a75c0efc817d355782cbc624c4df38229dbafb5f6830d4ac6bef0744b5e25aa7f0b9eaefbef5b8d
+EBUILD cryptography-40.0.1.ebuild 3823 BLAKE2B 8266fc2dd36292be705e2d8613f9d16a4360f8fa18739d472ebcd5396b5b7dfc6b0d65d0883f5e48ae7a7c816e3b14967e82043221b8ae83f494ef7be9b280b9 SHA512 4360652332e909221f2361d018e8075c79a7c082a518726e16856e0731dc68bf56325468270c17df099f57de7d33e2b65755afdbbaccb4c476c95fb9de009dd2
 MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/cryptography-40.0.1.ebuild b/dev-python/cryptography/cryptography-40.0.1.ebuild
index 669fd8f3ec2b..7449b7bfadfc 100644
--- a/dev-python/cryptography/cryptography-40.0.1.ebuild
+++ b/dev-python/cryptography/cryptography-40.0.1.ebuild
@@ -112,7 +112,7 @@ LICENSE="|| ( Apache-2.0 BSD ) PSF-2"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD-2 BSD MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 18c2560df3be..3edad4c32cac 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,9 +1,3 @@
-DIST dask-2023.2.1.gh.tar.gz 8514054 BLAKE2B 6f94172cf9f921675fc53cf59e9cbbe211f576374190eecf8e17ad9943bbd1ba15fb002e7cf81f0043b4f2450a0cde7bdb6feb42a08160d0fbaee24d4a2f483a SHA512 1af031fd2992377297daff42c4f706e4e5573cce86a9158ea1fa4f09cf0c8a51ff5fb33d7bc551c16eb0a8e5052e76b32a143b2793027becb4e2367572c46219
-DIST dask-2023.3.0.gh.tar.gz 8514069 BLAKE2B 427b975010e08d23bb55606da726c64a08bf17144d50f0b4641469f30620359052434a9108510c08a7d646fd567cbeafb99afe9162a0becc3417fceecf4604d3 SHA512 1834c98edb1fd92fd022d472ec9d05497e7845d712d0e2faae27b6a408faff3678908d3109db5ae50642348a4fa6832af995f2fb67782c7a71933126699577da
-DIST dask-2023.3.1.gh.tar.gz 8520302 BLAKE2B 5b70e355ca02163d42615d504207e8186b2b5887d2c57c517876ffbc8a1bd4a3c56ea755d79696d952f802043134c4be4b0a69ff2eb4ea6da8faa80096bebdca SHA512 e4b8306a900453b27bc19055b5a5bfd0d0ed2dc143be854d8f056ede8b1e4bdc5e91a54c674201b1b1f27cbc0c9ba908e5a82a12f52d337c3cb23cbc2e6ef199
 DIST dask-2023.3.2.gh.tar.gz 8525841 BLAKE2B 660f3687320c0d56abe437bf7edea2f40fe624a3f48761238b00756f61358d73d47a570399ed70f6f1f2188cb03b04fc10e5c9683e2a49c6b73a21c35173e1dc SHA512 ef1a961a50e69a32aea14630e9d19fc92646e9f520fa265937bb923aeba5932397840b2971bfb9a47125672ac2bd9b0b6a017b650708a183b3bf6c0c345e2af2
-EBUILD dask-2023.2.1.ebuild 2056 BLAKE2B bd3d6e54d8daa25c660d16c699cfe8ac453be5cab4879f243abdad400c0a1e3aeb8b00d7c6cde53eb5ea3872983c989449a54b5e2173826a0528748d286218e3 SHA512 5f4b97cb022d38f2276ae4880842e04d3c8076e99cb12162c37843696b0cb7d96c7d7ed14e203d7739bd881a295b0a06ed68534cf9aa6ee34147dd4903a1c1ef
-EBUILD dask-2023.3.0.ebuild 2057 BLAKE2B a55850beb755d4e2072584d0bcb348b654d52e407e30e4afefb172e13772d95941e42421e66361e3593a1cbade95fbf632db839ad04e5a8a3697cd43b6659e39 SHA512 06973f5a694562ec68bec3da843a58af0d117ec2e983b5cfbb5218b0335c1de948976e1b22facf379542d1175f2e2a47161241ebcfce3ecc70ccee6b7a72bee5
-EBUILD dask-2023.3.1.ebuild 2057 BLAKE2B a55850beb755d4e2072584d0bcb348b654d52e407e30e4afefb172e13772d95941e42421e66361e3593a1cbade95fbf632db839ad04e5a8a3697cd43b6659e39 SHA512 06973f5a694562ec68bec3da843a58af0d117ec2e983b5cfbb5218b0335c1de948976e1b22facf379542d1175f2e2a47161241ebcfce3ecc70ccee6b7a72bee5
-EBUILD dask-2023.3.2.ebuild 2115 BLAKE2B 672fac0ee3f30d3bed37cb1f78e89a6810fb98b578a69321e890457280bff1e76f3bc2e95d52a0a025bc3ac6204e312bdd856a0b14dfdfd724a0f137c7714e56 SHA512 52559ead1dc71b43691070e66e4e12c325b32e3c98065c1ddcd77107db2d0248efec6586fa3440946fb8412e579484e04ed9385e367ef0f8c3c0ef1ed312f18f
+EBUILD dask-2023.3.2.ebuild 2114 BLAKE2B c52b94bc58da75e58206d096afd0209c732b5a370521f82b4dbc325250533cff8a0f2e5cdd8620256260214d7e7059baf1c6f899990d2a222ad4215fb06fcac4 SHA512 496e8528c4a01f81752ccd8d65ac5042960c96dc22ff095f9d36a35fa815f2823decd8bcb813370ed5cde1aa34eefe58ab282945e5d12a6d5157114d647623e3
 MISC metadata.xml 724 BLAKE2B 9af7553cec2b66228a21f146372d86b8d620048d68f94c1fd09006c8ee7ddaa4e212c2a359b937a5ee37ac23df01e10af0796e8b4cf952237cb4c73a2dff7ca0 SHA512 89b83402c13b06f7adf10cd1cc08b96b90dbc2ca3b5c0c6c422b6e2394e03fd51346306479557c11fcfdbd4a81a574890f2367228ea38531b5f05c02a30b8dcb
diff --git a/dev-python/dask/dask-2023.2.1.ebuild b/dev-python/dask/dask-2023.2.1.ebuild
deleted file mode 100644
index 6ee18fe9447c..000000000000
--- a/dev-python/dask/dask-2023.2.1.ebuild
+++ /dev/null
@@ -1,70 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# more tests relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	dask/array/tests/test_random.py::test_RandomState_only_funcs
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-	# require sqlalchemy<2.0
-	dask/dataframe/io/tests/test_sql.py
-)
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2023.3.0.ebuild b/dev-python/dask/dask-2023.3.0.ebuild
deleted file mode 100644
index 718d091d9013..000000000000
--- a/dev-python/dask/dask-2023.3.0.ebuild
+++ /dev/null
@@ -1,70 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# more tests relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	dask/array/tests/test_random.py::test_RandomState_only_funcs
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-	# require sqlalchemy<2.0
-	dask/dataframe/io/tests/test_sql.py
-)
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2023.3.1.ebuild b/dev-python/dask/dask-2023.3.1.ebuild
deleted file mode 100644
index 718d091d9013..000000000000
--- a/dev-python/dask/dask-2023.3.1.ebuild
+++ /dev/null
@@ -1,70 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
-HOMEPAGE="
-	https://www.dask.org/
-	https://github.com/dask/dask/
-	https://pypi.org/project/dask/
-"
-SRC_URI="
-	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
-	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/toolz[${PYTHON_USEDEP}]
-	test? (
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/numexpr[${PYTHON_USEDEP}]
-		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# more tests relying on -Werror
-	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
-	dask/array/tests/test_random.py::test_RandomState_only_funcs
-	# TODO
-	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
-	dask/tests/test_config.py::test__get_paths
-	dask/array/tests/test_linalg.py::test_solve_assume_a
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
-	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
-	# require sqlalchemy<2.0
-	dask/dataframe/io/tests/test_sql.py
-)
-
-src_prepare() {
-	# fails with sqlalchemy-2.0, even though we don't use it x_x
-	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -p no:flaky -m "not network"
-}
diff --git a/dev-python/dask/dask-2023.3.2.ebuild b/dev-python/dask/dask-2023.3.2.ebuild
index e4882c82fd40..abe01ee1aee3 100644
--- a/dev-python/dask/dask-2023.3.2.ebuild
+++ b/dev-python/dask/dask-2023.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index cf0047c463c2..8f2b4e20a218 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,5 @@
+DIST django-configurations-2.4.1.tar.gz 42952 BLAKE2B 3ed30642b256a648ab5932edd9b2cb5b2a82e69bb1107a5c2bd20d230cbb598f21eddcf52956bf80d6fe3c6e6336c70dfadf2fc5a646dcd32782abc782fe8e32 SHA512 ab35216b326d50d779344efa915d516ffa4a1d5e627c77b27071f6d51c54ea367a0f7ec5a7b768cabd69929499dfeb3e5719ba8fbe690f6854d92ee45a04bf1d
 DIST django-configurations-2.4.gh.tar.gz 38563 BLAKE2B a454cc492354c1b969a1b0389ccb21088e99af17b5056ae514b36b5c2fd7391368437093d1a075814dfb8e15ec8ce3ec3c5269d5c867b4a03a5269a533826a31 SHA512 de9793c5fce869ef77e4396dd5ea45fc57728d702383885599d3a08b16e37e0e425258aacd671ac78592df813c8fa3a08b33ad9410843f7d7976589da33592ca
+EBUILD django-configurations-2.4.1.ebuild 1103 BLAKE2B 660b411d0a888b28b63e6585aa1b5472e1198173d49c1e2f24c684c0c677c9d5c3e81d0eda22b0c3fb8e9092f60f9cb0015f53787b3dd5d224513dfc8b796f2a SHA512 8b91cd001a7e724fcdd6db4b1e0ca4c529c4218d5ea01ad07dc3380b1b91d65fd9c0244cefdc0e7a8e88d8bf259adc64109393d9d530560c588108cc71af1e9b
 EBUILD django-configurations-2.4.ebuild 1178 BLAKE2B a9502c5df708ce138f75ad442197b68c4bf8bfc285d25b40b92699011a682513338ce522c28ec4e201eb7bd22db1eb35bde7d648941dbca15410b8e6c35f677b SHA512 57e546fce9320248379218d467ae98c681ac91473f2d2a39fd9134697646a1cab6d86d62723b48550d5172be018232bebb3109f3371b581c86b5943fbfb1dd24
 MISC metadata.xml 397 BLAKE2B 704a6d38af3df4b99f24a394dce870ce4f3e1e16c2a30b87ab25ab4b3603451651db062d2aca6669b410bf5350b0edc7b4848ef55bc60c69edc3aedeb8a7c0fc SHA512 a37389a326e763452c7ea138da3eb33dad53bbce24fbd9229e58020063d4e726e68e482500c87238bc0c53b9ee335f93f2d89f39e7ce3e2a087175a2393c66e4
diff --git a/dev-python/django-configurations/django-configurations-2.4.1.ebuild b/dev-python/django-configurations/django-configurations-2.4.1.ebuild
new file mode 100644
index 000000000000..6f18a81241c0
--- /dev/null
+++ b/dev-python/django-configurations/django-configurations-2.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A helper for organizing Django settings"
+HOMEPAGE="
+	https://pypi.org/project/django-configurations/
+	https://github.com/jazzband/django-configurations/
+	https://django-configurations.readthedocs.io/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-3.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/django-cache-url[${PYTHON_USEDEP}]
+		dev-python/dj-database-url[${PYTHON_USEDEP}]
+		dev-python/dj-email-url[${PYTHON_USEDEP}]
+		dev-python/dj-search-url[${PYTHON_USEDEP}]
+	)
+"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings.main
+	local -x DJANGO_CONFIGURATION=Test
+	PYTHONPATH=. django-cadmin test -v2 || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index bf29df71724d..2e385745fd0e 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,13 +1,3 @@
-DIST setuptools-65.6.3-py3-none-any.whl 1233963 BLAKE2B 2bad02cc00293c9b6615cdcee9f2da4d66f83c494904c0467054ec15cb5650a7b72caaa52bb8925aea84eb6becd52107ba10763c2b241216d91072a1319f5d24 SHA512 6a9bf2230840ab90b228b433552e8813a176a9ad5f6dc74b20da412fe96c4a7f1df6095aac8dc2f25bd2393aae731927875eb9e7bc05203907539fb4a3b5c8fb
-DIST setuptools-67.2.0-py3-none-any.whl 1082973 BLAKE2B 7769ebdbde59e47cfc9f364ab28fada207e0b0826e0a40ccdec4ab4c8536148f8a8e071d688f74464a74dca6fb62ca840f3f54a48ccae5c016dd476634b99d2d SHA512 3987cc21a40b55f3aaae1ec643843dc473f8a3b442461892cbc77cc78f056c7e3736aad8624b68d8061358fbbeb555faf62c498df259de63fe3feecdd0d786e4
-DIST setuptools-67.4.0-py3-none-any.whl 1088291 BLAKE2B 9306200c32a903695edbc6330e6853368fc0dfc9c8b8b79ee6650b90a30f2ed321b9478ae2fb14755718ab7fb25db349d4028405f2aacfb70e6a6e8d0d2d35cd SHA512 b70632f1f7299c107cacfe8f0bbe1e448b660321977562dc0d18144eb997692c579f88e2f25b967f5c97ec8475e9e6314002685435ba6c8d9b5e39e27f8d4862
-DIST setuptools-67.5.1-py3-none-any.whl 1089040 BLAKE2B 3a63dd1cbcbd48110cb1a146f9ce27f4b5898058d5bace6ab504654894cefe2f7883b7d1166bd225b474de07f035e259dab870f708438b4c4d5a0c87b8f6f747 SHA512 64db0154188a67a7bec4862a45585a94ddc87d6bcce9f11caa933428dc590aa90116deb81d1e2850f5372eebec0cfd162f515aaf65bbd68e874c974aaabd0b71
-DIST setuptools-67.6.0-py3-none-any.whl 1089190 BLAKE2B 0d9b9e9f17f3bef32fb0493193d2da729e1c208cb750435721b61a7ffe48a39b49c9e7a0a35992849006485aff5e252d720ac698be3a20e95fa801c3c3f0e04a SHA512 b68b3813e03935d2019689bc01970e6345363eaec78187a62bab5f21c39ee8cb84e83e5e90b54f12de5b5e31857fe6f01a2e411f9d9236f844a7812a0a3b2efa
 DIST setuptools-67.6.1-py3-none-any.whl 1089263 BLAKE2B fe1ca817d2743e5edefac47230aa2cb5f4e75945bcdb821ca2d61011a419653d8b0880d846e11e4450cb19fd22fcd45d570b6c33fce640a8515df6e65f7a1662 SHA512 ad7a81c60b2b3f190561178531123a0e2d278c4cd9615930d5b0276fc79bea390f1cc92ab37061378ebee09fc36c21440a4db00f20029093570b7006cd14b25b
-EBUILD ensurepip-setuptools-65.6.3.ebuild 619 BLAKE2B ee5b00332e47f02390ebd2878b96dac800f2fe11f5357af2dc70ce13d6acc7c878883b444cf023c44a9f6a392d6a057b37f6b617150162d28cefe5951986066d SHA512 6cc9cdd806a12658a32f6d19693251e8a3b859c7a866c3e33f444903ffe060d448ac49105f04303f07db7dd2775324ec051ffac00ef3dd668580fedd5eb844c9
-EBUILD ensurepip-setuptools-67.2.0.ebuild 538 BLAKE2B cc89036440c681a9762fe8bff4b2707cc1de45fe5defb826555c9f7251e2670c4de0439ad9744bd5264f8a900154527b8f6312efe3cad86bd08b03b46b313b6d SHA512 b475df2fda5929adf36744df45dc5c59dbbcb40c1d6ec40458c6b59ecebb7f162dc2d38b4414d819525193d47e449083f8522d8eb9a7797daae12814ecc5a47f
-EBUILD ensurepip-setuptools-67.4.0.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
-EBUILD ensurepip-setuptools-67.5.1.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
-EBUILD ensurepip-setuptools-67.6.0.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
-EBUILD ensurepip-setuptools-67.6.1.ebuild 546 BLAKE2B 82db18ad8196b8dbf7faf59be5b690baf619e50b7c3a924bb919980c3893852b16e6be007f0984c30e1f7e5ded22e5ff35bf92a69f0f5d481cd0951dcfbe8e59 SHA512 560af63b8f3ed9e8ea95a70b865690065f47dd5c5cd7e4e19ab6bd9011b1d3f0036a252ab05dabeefc615fbfd9b51c6e3f03dde1fde95d20d2d6f8e39c5cb799
+EBUILD ensurepip-setuptools-67.6.1.ebuild 538 BLAKE2B cc89036440c681a9762fe8bff4b2707cc1de45fe5defb826555c9f7251e2670c4de0439ad9744bd5264f8a900154527b8f6312efe3cad86bd08b03b46b313b6d SHA512 b475df2fda5929adf36744df45dc5c59dbbcb40c1d6ec40458c6b59ecebb7f162dc2d38b4414d819525193d47e449083f8522d8eb9a7797daae12814ecc5a47f
 MISC metadata.xml 316 BLAKE2B 17947c657b45cb01758e222aa6051a459bf0bd9a026a73c0df0ae0c3a0c901f6e2315d459ee37036ecd283481a8d97791d64688c108a0706e745a739e3f9e8f8 SHA512 af18f4ae51b253552752e14210789988c815d0dbf0e1d8ff7057e48a09303c4abc1fb240d6f7f15fc0993b33e4c8ee395c2755754b3a2cbfd4c3a3f0dad41cfe
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild
deleted file mode 100644
index 4dc09f674370..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-65.6.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN#ensurepip-}
-WHL=${MY_PN}-${PV}-py3-none-any.whl
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="
-	https://files.pythonhosted.org/packages/py3/${MY_PN::1}/${MY_PN}/${WHL}
-"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${WHL}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.2.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.2.0.ebuild
deleted file mode 100644
index 4d841a7c1f62..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.4.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.4.0.ebuild
deleted file mode 100644
index c13c3370cbbe..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
deleted file mode 100644
index c13c3370cbbe..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.0.ebuild
deleted file mode 100644
index c13c3370cbbe..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild
index c13c3370cbbe..4d841a7c1f62 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.6.1.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 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/ensurepip-wheels-100
diff --git a/dev-python/eradicate/Manifest b/dev-python/eradicate/Manifest
index 1b5d10df7531..44b884ed2bb5 100644
--- a/dev-python/eradicate/Manifest
+++ b/dev-python/eradicate/Manifest
@@ -1,5 +1,3 @@
-DIST eradicate-2.1.0.tar.gz 8706 BLAKE2B 5b5cab1c465c8295157bec1e8e39f0e33dbe31957da01ec44bbabf54a2b19c519a35cd7d2b92217d5395ce7397b3ae70175766a83b66d05e723fc5b5a019eb40 SHA512 a9b06745bceff909a1bbe34348b8e4c17d7f1e0ab3b554206633f350725c34a9b7238b3af6a40516081bc06aa86cdd593b27b90efa083ac024b0226f7cfc4df3
 DIST eradicate-2.2.0.gh.tar.gz 8808 BLAKE2B 34d1db824f6288d5da5cdc868045d899041b219e4918f5e838c066eb4e9903c2951c7cdded56c7c5455336940c212eb3e68ae61b9e090f497c3e6ef199f71e80 SHA512 80b7dd60004a5f4279a87c692b63de1b340c68d1379d975ef660130a649acbc03a5c5d6db935c782b84bbc7c2ab50b0ada2a172eafce1945113b3bccfb8055b5
-EBUILD eradicate-2.1.0.ebuild 583 BLAKE2B 6640bb4f9b04688cd5e60f2e8d81ddb42d57460ddf87a00f434c644f8d8db60d06b6d21333e2472e0cafe65a5fc39b34a01f9ff83451a744cbeea9792a8cadad SHA512 775f679bb96d401d85a7e59cb70b0caeaf0ffed53e9f6a45fa9484a23e92d1b5d1bc7396748e3c89f0685e2ad1d854718b8901af7b28d96700acc022966e17a5
-EBUILD eradicate-2.2.0.ebuild 593 BLAKE2B ac38fc59f1a1c309f5c16e0e9c268d1dcc6ac50d42ccccb74458fab8fa0b6bf65bc85e781f8d72a5e2cae5e45793c80f10f4c75a1f44c6611c25e08160146445 SHA512 74ad1f64980ffcd718fa2f95f6d5078160058ee0793067451b23affe76eb9d74ae1244e6983fff2ac280dd82e239a7bda528c1a5e025952fbe06db44ff2d4d33
-MISC metadata.xml 497 BLAKE2B 3f6b7e1b96a6c272dfdd7677361b33f356ae66b5420aa544ae960e7ab59488e6b2641bf9f63488faae4c62d5099611706c4b0454f2e26bde0f94676726e7644b SHA512 ca5c37c9a15d9b71e73f91e9175ce77f08d2df0ef345f06fbb09ab0c056e8eba1a2ee91c7ee109a278f5f4deb24e8a6f30686a7a41208b926b962d3240bb1224
+EBUILD eradicate-2.2.0.ebuild 605 BLAKE2B b4d0f85532dec86f691557d1d9ce181339db20cc672b76c6a4b505288e979a24450044e313a5121df28f63f0a77d54db84fd212cdd4e56630a83faec3623ecf9 SHA512 c0acd6a45b5375ad48f1e07ecc3641f7393a4367ae6e1c04ee2c4f43b7ea6f7f65c0d2a9fd30ce4fc2452cc675b42d1df32849a7424f80f1fa2a1b6efd1483f1
+MISC metadata.xml 507 BLAKE2B ac5f63b7a9d06ea05182687e98e13c3d0af1152da772dc1918e49d1e635cf737115c1d8a74c81471cebcbeffe0f73fd6ef54bfda7eb1fcebf616752fd30a7389 SHA512 43c491522eec1dc75f227a60af4f65186616559ac79bb1d4479b430e6acf58f123ece47eab36f26ff9182d609addd82f9069a51c9f75346618f5272e63c170d2
diff --git a/dev-python/eradicate/eradicate-2.1.0.ebuild b/dev-python/eradicate/eradicate-2.1.0.ebuild
deleted file mode 100644
index af302c3e2620..000000000000
--- a/dev-python/eradicate/eradicate-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Removes commented-out code from Python files"
-HOMEPAGE="
-	https://github.com/myint/eradicate/
-	https://pypi.org/project/eradicate/
-"
-SRC_URI="
-	https://github.com/myint/eradicate/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/eradicate/eradicate-2.2.0.ebuild b/dev-python/eradicate/eradicate-2.2.0.ebuild
index d77ad1099711..1da350d12db1 100644
--- a/dev-python/eradicate/eradicate-2.2.0.ebuild
+++ b/dev-python/eradicate/eradicate-2.2.0.ebuild
@@ -10,16 +10,16 @@ inherit distutils-r1
 
 DESCRIPTION="Removes commented-out code from Python files"
 HOMEPAGE="
-	https://github.com/myint/eradicate/
+	https://github.com/wemake-services/eradicate/
 	https://pypi.org/project/eradicate/
 "
 SRC_URI="
-	https://github.com/myint/eradicate/archive/${PV}.tar.gz
+	https://github.com/wemake-services/eradicate/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests unittest
diff --git a/dev-python/eradicate/metadata.xml b/dev-python/eradicate/metadata.xml
index 49a7c25077f0..8607e5367e1e 100644
--- a/dev-python/eradicate/metadata.xml
+++ b/dev-python/eradicate/metadata.xml
@@ -12,6 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">eradicate</remote-id>
-		<remote-id type="github">myint/eradicate</remote-id>
+		<remote-id type="github">wemake-services/eradicate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 7b18e819a0ec..e1843d4afff6 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,11 +1,5 @@
 DIST fakeredis-2.10.3.tar.gz 94025 BLAKE2B faf178d53e783c4475513bf9f485b6eaefc63bc45c5ebd95ecfa1aaed982e236877230ea19526d8d12f152f1c429c5003b04abd2cc4f7ed43dbde581b07fbdf1 SHA512 694b1b540e8b9b32a5a44e3094b8bab307c5af400335efe9eb034c5ed161c1583d4700c08ef16991a1f03502aeb835d89b327448c3385de548dd39aafdbcc2a8
-DIST fakeredis-py-2.10.0.gh.tar.gz 160050 BLAKE2B 9c97abe80ca683cd068e3e8616b068c166f08f1b1eb360b76c57da4b9d68396a5dd6fb4152e92dcd73a1407c50e259db54ba5edd61bc2dca774672de84fcf2d3 SHA512 31df18ead5e2937a7a98297f4dc08790371968dd1fa6d9dfa54eb35ab27c2a4a88e2186c252c8a630e0e70fa04e67eccb68e687f9383b6770313cf8b79f6b3bc
-DIST fakeredis-py-2.10.1.gh.tar.gz 159626 BLAKE2B 41d28b57c369273d96a985d6b47c8b162d1fc94c508daae12048e139c9d7bb9c44b39c95eb77cfb06d24cd1b44ccaa65f3d32f4976bfdda72e319d5da1cd69c4 SHA512 5659f5e3a6344448916bfe9ad88fff45b266488aa6d4e0b503f8594308ecfb8e97b1f588b658cb01a5dbe5fc06e64a1bbb6eafaa28aed0b8761b5e15638615ea
 DIST fakeredis-py-2.10.2.gh.tar.gz 159702 BLAKE2B ec385c01af9e32705435148c1c61d74c14d7b22a60b6a3466f1831f557bfe997af6ee96429cfdba00a1328db3cabe1579d65411e7c2b9972e5421963cd66815b SHA512 2a3a87dcbe136465ff0465585562a5b8b0bc73504f491d3ec9c6e959b6cffaa3edbaa1c2e5199138f7a49dfdec3c3da6a2ae338228a8fe21c670a82c062c544a
-DIST fakeredis-py-2.9.2.gh.tar.gz 165549 BLAKE2B 351e07976ed6a4d11429c83aefe3a0e2d4397a97fdb2904ab65ac4d2717d129f5ac018f071b8670012aabe127d87350f3285f6f86369bb4b7eadbd61da5774f7 SHA512 6e9ab0851f74ade2325aad88b86212b4052ca53a7510034cd888ef4080eec4129b226ab8c166ab09fa6e3d3b2c3c70fce8adafdb4081a4d3501fd4d9d5e04b84
-EBUILD fakeredis-2.10.0.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
-EBUILD fakeredis-2.10.1.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
-EBUILD fakeredis-2.10.2.ebuild 2078 BLAKE2B c6481d6fc5e3cb23da987fea9f8815178c869780aad971e74aaa9cd4d2e3618ce3efc0975f38958aeeab6b1a449f1dbff929a513dd61834ddf60ab321d676e57 SHA512 0b77127ac49f0afb4dc88f6eaa96afff9ad16ec96f99ef1330b03933eb1becfb7d574f2e99b6bfcfa08f981b1094da7aaa4509e640792dbc007440d794a7eacf
+EBUILD fakeredis-2.10.2.ebuild 2074 BLAKE2B a7b846d0c3c1fe583b23c67be351c79294f20dc5aa5f48778f4a5e41b70ae769bda7ecda91024f242fa9e69032b394d50ec97826859adadb49593fbb3c749125 SHA512 ae431a20449fd016cfad1c67cf953d62343ba9a91ed79211cf7c6c2a9157df77f0671710825da26bff3215b011e5d68a967e4ce9b80799d91cbde35c1acab2df
 EBUILD fakeredis-2.10.3.ebuild 1903 BLAKE2B 9235ec04001d8088f7257dfe8d44a62dd14f1bcf92b7fbc7c8815f395e7eabf8db8c06c95f19530b14bfb1fc14b3080937d6b0c430bb6608fc010d176be8f470 SHA512 31c30a29c8e775fe2d7b2893a28411b752fde2ddbd145959ba7e265489cf682c89dd0c5a3d560ac98da99086d5c17d18846c26c0f5f284858647ebecb3068322
-EBUILD fakeredis-2.9.2.ebuild 2006 BLAKE2B ad4067fe1ebe53ed63e9ffdf4b77a6c8674d35578a57b4850e49ebad22c0af3cbb3d2503f0ac009da77cb8c70b7d775999e6ba5bd01d7aaf566409fae27f265d SHA512 de60340d08236aa5f1818375ce6abe12a8f32d6117de8c3dbf4797377de70cda47e8dfd411ebf79d4d11ac8ca4e8690f5c46db233af85b4f9c58b30f7b157a5b
 MISC metadata.xml 373 BLAKE2B 1de33db59658e6190cd0346be58208cae6c9143a52f49dc289e68aaa0d860b5bd68dfb54f2e0b005f60a67f5caa430e2ce94fc69e64bd27e1bbebb07ad29e602 SHA512 24bfcf4919363fef45c182b6de66221e580ee0e9e99ce46e91b767655dc0b6f8a9fa6c3512ba84d1040698c43a0b6a853ad8d63c1ee5fbc00a1d192defb24db5
diff --git a/dev-python/fakeredis/fakeredis-2.10.0.ebuild b/dev-python/fakeredis/fakeredis-2.10.0.ebuild
deleted file mode 100644
index c382b83985f0..000000000000
--- a/dev-python/fakeredis/fakeredis-2.10.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/redis-5[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	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
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.10.1.ebuild b/dev-python/fakeredis/fakeredis-2.10.1.ebuild
deleted file mode 100644
index c382b83985f0..000000000000
--- a/dev-python/fakeredis/fakeredis-2.10.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/redis-5[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	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
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.10.2.ebuild b/dev-python/fakeredis/fakeredis-2.10.2.ebuild
index c382b83985f0..a0ee8168e038 100644
--- a/dev-python/fakeredis/fakeredis-2.10.2.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.10.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/redis-5[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/fakeredis-2.9.2.ebuild b/dev-python/fakeredis/fakeredis-2.9.2.ebuild
deleted file mode 100644
index ee988f98e4f7..000000000000
--- a/dev-python/fakeredis/fakeredis-2.9.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=fakeredis-py-${PV}
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-SRC_URI="
-	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	<dev-python/redis-5[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	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
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index a7a998057171..eed7ca45df8a 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,5 +1,3 @@
-DIST flatbuffers-23.1.21.gh.tar.gz 2181861 BLAKE2B 6368358c21e677feb466245a746b86cebb6d6a4058bb6d593de81bf3c32ddfb9fd475e4bb225d4529ea106253456a5ed1ee6d024b1e2521e02efef171750f428 SHA512 fa62188f773ad044644a58caf1e25bef417dfdea47c9da8a2ea7f997154b4f3976019e32e73cc533696a3d4e45ec4a8402b6df140878dfa2ff078740d61b4b0f
 DIST flatbuffers-23.3.3.gh.tar.gz 2197401 BLAKE2B be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66 SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
-EBUILD flatbuffers-23.1.21.ebuild 818 BLAKE2B da0dc359bf5f8be7b12a47bd6453d13ce1ea7027745fc2410a0c50c416a67402ab31332c3abe9b0eed861dc85c6e451ce1c775d618df4f6c3c96793a9275e3dc SHA512 c3967b36faadb4d8575b363dd03aefebb9e4e8ecb04a011ff4aa3ad9def1ed0584fcd1446d955d40bb86162088aa987479656565754ea543b947255063cacf0e
-EBUILD flatbuffers-23.3.3.ebuild 829 BLAKE2B 37b752e1545e16b646174fa0473acc163ec63ebf2120ba816193405866ad86b76318e489d07f722fff18f953c460182f4f018cbd09bbc773fc1e6db43969dcf4 SHA512 89bb7f94d295007c645a238e891c70226f9ade2f066e66964ec914bbcca4f02ac1d4bb2c64876f8b232199cd7fac6a52c4f4e521d1bc32d51bac4fbda87ed41a
+EBUILD flatbuffers-23.3.3.ebuild 825 BLAKE2B 10238427109437cbf6aeadaa337524bc9827fbca3f012f44bc2a9cef02438b46e05c10176bd908f6930428cdbfeffcb268a63d77e62f5f17a368d1e919e531d7 SHA512 eaac53936c855c797b58931c7439b4c63f71cf3bf112be26db673f8d69272788ef75dc53925e7102048a889b8f5286705a0e3cebdaadc7ff7bf2a0d45d67c3ac
 MISC metadata.xml 503 BLAKE2B 632c797040e856e87b7875cb7820b97670f994bac90a3554bca2bfad492420972309fe48b190065b203d7b5be8030bf63fc9658d39c7e24f20fc5f3d8868a7b9 SHA512 76bca368c33e84e49c2ee8e742bb5012bec27fb033915c8c3bdb2957e9d8394e8f2c7fdcabf98770297f6e3489e6909f92755f681aab00218bf3705661b42c81
diff --git a/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild b/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild
deleted file mode 100644
index ca1ff83b869e..000000000000
--- a/dev-python/flatbuffers/flatbuffers-23.1.21.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	# zeroes means without benchmarks
-	"${EPYTHON}" py_test.py 0 0 0 false || die
-	"${EPYTHON}" py_flexbuffers_test.py -v || die
-}
diff --git a/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild b/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild
index 5d38fe89b725..924c797b1e34 100644
--- a/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index b0a4868c727e..cc57ccacfd91 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,3 @@
-DIST filesystem_spec-2023.1.0.gh.tar.gz 346962 BLAKE2B debabc938d2725b0c6e0a5aabdd6033a14655799a0b4ed98f171cdb3761dea6f3f85b63c91ca5461341e75c50aef53e4d09c6ac3582020247382c5e39a8d4791 SHA512 181e5dfc05ba664d9464246b2398c70a0bad3f274dab462a2432eae24ecf3307c49af46674f8222fac87964fbf3666bb7ad9e709484dc959b0333447b9a82a2b
 DIST filesystem_spec-2023.3.0.gh.tar.gz 352352 BLAKE2B e4a4edb882aa0aa15f654d3ae63d278b03a0b1fdc99fb1e7f48baefa750134aa2c9ddc89cc53aa829155b103107cbfb0c99d6c6fdeb5bf85068af5f1fc467ae4 SHA512 7c21eb60932267fe73dea3672d2e9b2d71fb3df26aedec9d109109168b91605602903518337563c00ae8b7d82212211ca569d3a91adb840eefd41eecab33c3ec
-EBUILD fsspec-2023.1.0.ebuild 1830 BLAKE2B c55981caf2ef78407afd92eca0b0be8137bbd1b26907329fb2eb9a608c9a2a83348f3ed80445db276424d40a14f08b51dac33db8070ebd0f2afdea8e8a5886d7 SHA512 ed043f8ae70819cb98f44885b68f8d9107b11b87d7a768ea55de0c2113960d6330b0618ab9146422d3546d3b4d61f33ca4e865209d54b32ece5ffd6812e3b3b4
-EBUILD fsspec-2023.3.0.ebuild 1832 BLAKE2B c8fd65840c039cec796338b63e828615b10c2f232379accd797ccff398cb5e4859e0e5dad62afbd85af0a24b5d0ef23867f36ed3610c5dfe74f5c359a39be7e9 SHA512 b756f30109a8562a8156552c2f70f22cb87937c2d43462702a7cfa839cfe4996923c6ae48b4f38fdc899debc034b8e0060cae9f21fc61efc0dd10977802b0995
+EBUILD fsspec-2023.3.0.ebuild 1830 BLAKE2B c55981caf2ef78407afd92eca0b0be8137bbd1b26907329fb2eb9a608c9a2a83348f3ed80445db276424d40a14f08b51dac33db8070ebd0f2afdea8e8a5886d7 SHA512 ed043f8ae70819cb98f44885b68f8d9107b11b87d7a768ea55de0c2113960d6330b0618ab9146422d3546d3b4d61f33ca4e865209d54b32ece5ffd6812e3b3b4
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2023.1.0.ebuild b/dev-python/fsspec/fsspec-2023.1.0.ebuild
deleted file mode 100644
index 10b0b5f050b0..000000000000
--- a/dev-python/fsspec/fsspec-2023.1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="
-	https://github.com/fsspec/filesystem_spec/
-	https://pypi.org/project/fsspec/
-"
-SRC_URI="
-	https://github.com/fsspec/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/tqdm[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-EPYTEST_DESELECT=(
-	fsspec/tests/test_spec.py::test_find
-	# requires s3fs
-	fsspec/implementations/tests/test_local.py::test_urlpath_inference_errors
-	fsspec/tests/test_core.py::test_mismatch
-	# requires pyarrow, fastparquet
-	fsspec/implementations/tests/test_reference.py::test_df_single
-	fsspec/implementations/tests/test_reference.py::test_df_multi
-	# bad test, fails when PWD contains dots...
-	# https://github.com/fsspec/filesystem_spec/issues/1161
-	fsspec/implementations/tests/test_local.py::test_make_path_posix
-)
-
-EPYTEST_IGNORE=(
-	# sftp and smb require server started via docker
-	fsspec/implementations/tests/test_dbfs.py
-	fsspec/implementations/tests/test_sftp.py
-	fsspec/implementations/tests/test_smb.py
-	# unhappy about dev-python/fuse-python (?)
-	fsspec/tests/test_fuse.py
-)
diff --git a/dev-python/fsspec/fsspec-2023.3.0.ebuild b/dev-python/fsspec/fsspec-2023.3.0.ebuild
index d5cb7a874d91..10b0b5f050b0 100644
--- a/dev-python/fsspec/fsspec-2023.3.0.ebuild
+++ b/dev-python/fsspec/fsspec-2023.3.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index c62ebc2f67b2..62f3f872434a 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,8 +1,4 @@
-AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee267b0e5355093c872e582346130c3107e6cd109b8a266c68b79c00440f550f3a73c3c1c12d3cb3cd3c61fd22289532d5349 SHA512 7ad798620f7cfd62aad7d73568410f04001edd70ea2a3cfe26242b309f4dafb44dd78e9de399a050e12164ebbe8160ed324f594ec4d1cf44b5a7b5b70d27d9b3
-AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e82140874bd3f1434515ecd69d04236efcc8fbf24f6b261db138979d1547892bf71e1c3c5e74317ef43c3597b379c03231e SHA512 dcc64f1a83cfe5c956c65c1bf1f9ef31b3c66e393d0dcec342f9f8cd6265a41309a03ddae7d86fa85806a05dac7bb89d29a3b7ebb955d62409fbb719e7c8004a
-DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
 DIST hiredis-2.2.2.gh.tar.gz 18010 BLAKE2B 67ab7c3f0667d3cf33abea58fbe37bcc28beb569f6f3da966f191d00965faa5a835a286172179d6f33f4e0fa81743fa345829f04d9d89350ab1394cc0c168147 SHA512 8a42df63911000cd119da33e7fea25fa1a5244a86016818bcb6c6e12c042b12b00b7272633d85dcf921fd2eba67145e3258c64689be799a0f59766e541139120
-EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 431f260350264549e704c43257e0cadabdd5b0736c0fcf1e7fc1533de191b7dbd390b7f80f076b7e162b05319881ab956f7e33ac84e710d006d8e5711f050c37 SHA512 b934178ce581f3dba577e69d0dbbf368a76830179fb1f525f4661274ccb715ed590880225be992f52f991ec6edc2a13c48a241f6199a8a74f466ead5d8e6f4cf
-EBUILD hiredis-2.2.2-r1.ebuild 726 BLAKE2B 9c2c86b79dd6a318aedff5cf718e640b47cb8f31bde8e02cd8bcb36d651175123a0af187686713e07ba42bc043d2771b2dde42274a9cfb877f42b54a7e19eaae SHA512 079d5dee64da6aef64c182d54e4144fc069f8be768e85e55269a0bc1f14ef2f836d0a69153a230eb7247fea5afdd85ead9f976b057fc5302b06172647958e4ca
-MISC metadata.xml 590 BLAKE2B 546eb7e337de194c605799553964c62f4376e0b28588b7b8f7e1d22d82bb347c7dbff99d1dc947c24491c045b506aa3965e9a1bfbfcb97741d5a0c7e075576f0 SHA512 76b32faa707c7bcca41b1018c58e9782283e707865a8b99926f0f6060f915cbd4ea6b35da1a906385b5925d714ec3bd4f587f1065b01a826d8a6a3764af92a87
+EBUILD hiredis-2.2.2-r1.ebuild 722 BLAKE2B 7cfd1470a2623abec05c383f27d9d40d825b87138559875ada4f2e867883fa987deb19efc773453b1b70e9464a0f97ec2a4da12d66c858c77cc2469b3349191e SHA512 6b05c836d300b713d06d93397e99e63940d1bb257e5f55e4f0c6b8d370977feaae6c0da783f7cf3f21d5402ccf49b1f7fdff20fa1dba3345a8bb5df3a9d4bd1f
+MISC metadata.xml 493 BLAKE2B 9ea63c09baa3e95097afce5edb30a2e1f358eedcc41fbd6f66492e3701bce65fa91e83c236d69b39ddde17f3d92401ca39ec70fbe12b6bc74dcde3e6e2495490 SHA512 42cc38851c3ffaddeb32aefed35551a444fdd1e9463dfca2f320a184445567174b44de84981dbd4613029abfcef28a69208bbb2857811308667cb54102357c83
diff --git a/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch b/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch
deleted file mode 100644
index ad1bb80ac0de..000000000000
--- a/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/vendor/hiredis/alloc.c
-+++ b/vendor/hiredis/alloc.c
-@@ -68,6 +68,10 @@ void *hi_malloc(size_t size) {
- }
- 
- void *hi_calloc(size_t nmemb, size_t size) {
-+    /* Overflow check as the user can specify any arbitrary allocator */
-+    if (SIZE_MAX / size < nmemb)
-+        return NULL;
-+
-     return hiredisAllocFns.callocFn(nmemb, size);
- }
- 
-diff --git a/alloc.h b/alloc.h
-index 34a05f4..771f9fe 100644
---- a/vendor/hiredis/alloc.h
-+++ b/vendor/hiredis/alloc.h
-@@ -32,6 +32,7 @@
- #define HIREDIS_ALLOC_H
- 
- #include <stddef.h> /* for size_t */
-+#include <stdint.h>
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -59,6 +60,10 @@ static inline void *hi_malloc(size_t size) {
- }
- 
- static inline void *hi_calloc(size_t nmemb, size_t size) {
-+    /* Overflow check as the user can specify any arbitrary allocator */
-+    if (SIZE_MAX / size < nmemb)
-+        return NULL;
-+
-     return hiredisAllocFns.callocFn(nmemb, size);
- }
- 
diff --git a/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch b/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch
deleted file mode 100644
index 74f14cdc00b4..000000000000
--- a/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hiredis-2.0.0/setup.py
-+++ hiredis-2.0.0/setup.py
-@@ -11,9 +11,8 @@
-   return module.__version__
- 
- ext = Extension("hiredis.hiredis",
--  sources=sorted(glob.glob("src/*.c") +
--                 ["vendor/hiredis/%s.c" % src for src in ("alloc", "read", "sds")]),
--  include_dirs=["vendor"])
-+  sources=sorted(glob.glob("src/*.c")),
-+  libraries=["hiredis"])
- 
- setup(
-   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
deleted file mode 100644
index 5e6e08f77029..000000000000
--- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Python extension that wraps hiredis"
-HOMEPAGE="https://github.com/redis/hiredis-py/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="system-libs"
-
-DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2021-32765.patch
-)
-
-src_prepare() {
-	use system-libs && PATCHES+=(
-		"${FILESDIR}"/${P}-system-libs.patch
-	)
-	sed -i -e 's:description-file:description_file:' setup.cfg || die
-	default
-}
-
-python_test() {
-	cd test || die
-	"${EPYTHON}" -m unittest -v reader.ReaderTest || die "tests failed"
-}
diff --git a/dev-python/hiredis/hiredis-2.2.2-r1.ebuild b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild
index 504ba13a0426..08c9c7246286 100644
--- a/dev-python/hiredis/hiredis-2.2.2-r1.ebuild
+++ b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/redis/hiredis-py/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/hiredis-1.0.0:="
diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml
index 260530157e29..3f8f3a47818f 100644
--- a/dev-python/hiredis/metadata.xml
+++ b/dev-python/hiredis/metadata.xml
@@ -13,7 +13,4 @@
     <remote-id type="pypi">hiredis</remote-id>
     <remote-id type="github">redis/hiredis-py</remote-id>
   </upstream>
-  <use>
-    <flag name="system-libs">Use <pkg>dev-libs/hiredis</pkg> from system</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index c2d02f9f0aee..a12978884968 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -3,7 +3,7 @@ DIST ipykernel-6.21.2.tar.gz 150365 BLAKE2B e1bc29018459738a3358af2d422539702801
 DIST ipykernel-6.21.3.tar.gz 150659 BLAKE2B 1fd0f0994b0065c662611bf629a4a755a2285b66f9d1e60bcc46fc84a445c7af6b882e09be2c4d26e8ca524a4ccda8534d04e357ec575a8fc034f0f4a437b750 SHA512 68e7bbae60e07805590e00acb186b14ef3c21426db9c49d04b93cb38083a7c5c20b177b72743674224741d8ca946604e8ae733f26d11738b7d99fabdee642064
 DIST ipykernel-6.22.0.tar.gz 151303 BLAKE2B c3567066375099d388c65b43b5b8c8059a823f4185855b6131fd90f42624a71c08d839a3c59c41cf83bb51ec07d0c0487d7bbee573eafa7e7d049dbeff8e59a8 SHA512 e109a2b771ffa40e05416bd925f26a4492c65a44a1acd8100e65ae3e779da9a0eef7222566e79cdcbed4b0fc3224fbd0722728d3fe953b16ab1a14090d0205c2
 EBUILD ipykernel-6.20.2.ebuild 2200 BLAKE2B c19bf30bd6f63deef8ff8fc40b8dc820d54e6a4d920c601390e2594d88d7d4a9eae9d589e2ba770bfe63c183db293cadd665641dc0a13dfc4053b4d1e3bd7072 SHA512 fb6523fef893723dbba507df1de115693b4a51418e8dca28893448644c2e93f7ad34054dce0241bcce250e3ddc6656c3703cdf14f5f2736784444f6af8940f04
-EBUILD ipykernel-6.21.2.ebuild 2292 BLAKE2B af8f60ceed3e9686f3ec213b303c5ffdf59b258dbeb5a2d84f85abb96423a842754dbae89662855183530de8568f34307a05e327f2433b79bcec0c945e7af66f SHA512 9a2b354dcf866626dc55cf2c7d453468d53741ab36f4143d33b714f241f01b10fd2ba09cc9d08f924dfc1a8cb715f63c629a08b48ad04f3dd6a4868b1a63c966
-EBUILD ipykernel-6.21.3.ebuild 2297 BLAKE2B db289431a7642d9807da28b575f3a42c72ea3f528f7158fc5cdc50a8e13316086d1008dab7861dbc03c4d9a1e3abbc8529b497dd4b04909f2fe58efd19cc5883 SHA512 c47c4102254fae3c83252f314fe854a4522f37866d3de738c5b31dd6baad07d16bff1db7b16c7bf43a1fb8b9d346826d8d88a9ed8be97d292f12f62e207c36fe
-EBUILD ipykernel-6.22.0.ebuild 2305 BLAKE2B f5164df83aa162bf2fb5a869c508c8e73efa0c695efca8b1c426e39ae56be2a9fc727c7a1cf6460cfeafe9560604ab01bad52f00a2a62dbf864dc93dc18db2aa SHA512 20364a07d5098555e0fb2ef8eb656cf37b0faec1b984b94d058de4c209b9cc8ea974ce89f33833cf4b7f9d1aa06f754643fff398403e2856bd8f35082a05e7a3
+EBUILD ipykernel-6.21.2.ebuild 2292 BLAKE2B 3700506c3bcbd99cdb6b4cc3d32e41d5690d851bea39e2f24c32ebd21d18a6721abd81ca9e0b0ef2dded0ab6cbb3e60af3f274bc4e67eaa418b14da29de246ee SHA512 a44db0bb598aab8611946f92ba229faa7871485863b90ed7b95c5b54b33d76f6affde2b8bf0a4c9ea58525303d1bb7d42f30736141382cd17daba19268abf8fe
+EBUILD ipykernel-6.21.3.ebuild 2297 BLAKE2B 6cbb26a62d902d84e0b1f71bf69942102293e4ddd1a736103600d2e48237fc6b1488227a8a8f71d4b5ceb624d08698179c8ff02b7ee2fd7ea70d7ad41bf6658a SHA512 152dd93f2bbc7e58ba38589ba4a53c371cc5625dfdc4b0890686fa9ed03ffd0b3f55e931f1909c526b0e63a535bc5ebd265bdca1cb060cdd44e1424edffbb0cb
+EBUILD ipykernel-6.22.0.ebuild 2305 BLAKE2B 5dcde1643656baae8e20e2097949be97a83070d59821bb87d53ba25ff67c534a2836fc8757889463da2164e613227f8021a79af9e50d6a7cbdd90fb513cd7f2e SHA512 cb03175ea38c85cc622a89d54183b53ec015b7d2860b269eaa76f225b2cc180fa77fbfa086386566b34ff8d0509488eb44914c9946e67357094af4ba5f4ada09
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.21.2.ebuild b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
index 9967f1a4dbe1..ccf7082b4a62 100644
--- a/dev-python/ipykernel/ipykernel-6.21.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
index 4458e0bebf05..fa49750494e9 100644
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-6.22.0.ebuild b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
index 2dd7bdd27b87..9dba7e55b17b 100644
--- a/dev-python/ipykernel/ipykernel-6.22.0.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.22.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-python/debugpy-1.6.5[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-8[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.12[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.12[${PYTHON_USEDEP}]
 	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
 	dev-python/nest_asyncio[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index e6a2286cb4ef..c2fbaf92555a 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,4 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-8.10.0.tar.gz 5456256 BLAKE2B 8ca8781326396ffa1e8012bab3b539b857a68e212afd5b2b97bc2f0eac6ec1aee45c0743d745554ef24fabd24667c2d6cdb3927350ca61b747e02afa215c1519 SHA512 5cfcdd49120d9ffc11d2f18501826b2f7094a51c439ac23e507f1027989ece4104d739a1905feba41f899d22a66e1345333f46e0f55d18925f166906f4992cfe
-DIST ipython-8.11.0.tar.gz 5462176 BLAKE2B 6024c191f327d04f7a26f2f371b200e2e3f26029d84a3a53fc7421cb4751f0e29fb8741a2aa0447026b43cc1d9a7674a07e06c30578812cc33220c55df72c497 SHA512 9b07da3fed304f6739396883d0219386bb08d4860853b30f308c2e9b9017f48d1228dedb511c872b706881ee80dc7bf03f541720ffb816c35b66f6f53ac289a3
 DIST ipython-8.12.0.tar.gz 5465154 BLAKE2B 946d3e649dcf8eea3518ed68499cfcaa6caa7eac99aa21c05fcbb81338037151253ba84d8d942746600dad3883f6d0e8ba1e82e9932cdddc8e1e77a270573ebf SHA512 3e9a42a6fb34a46d32d1236eac99182a756db2ec7b57c77dbedff1e4b25bcf2ef37effe4e5575cda450a1cde77e3c0d24172dcf19d102110a1ac75b9cfe9272c
-EBUILD ipython-8.10.0.ebuild 4302 BLAKE2B 56977f20d28b41ff6a3deae19eccf31c2f6cde75cb384dc7ed31bd969cf074278b8bc34fb1b5569be893715c11195754733efd00e492e1518dd6abc8c4a8f6e4 SHA512 428e96f2aa0593a08a82e2cfff989424ba0cef8f78270d1e497161c0ede8d9a88fa659d585033fb7d87b4d9be0fb2a74abf2c219a16213c0c9ee5ea81dfc4e67
-EBUILD ipython-8.11.0.ebuild 4341 BLAKE2B c657404f0bf7fa6c9bed0772292859fa45456c702e3825651531efc1eaff7a2fb740c9ea52a2ad1fee18584670112b3cbe2e760d83bbd87b575062334c323375 SHA512 179cf02ed16f0f8a760bd1d53a92a60c3001813c89f84e78f7cc1ab4fd93a11d7997257166ec4804378d2b611cc0ba3902a9d5ad4f9fc0b3b17ec7f0fb17ec4b
-EBUILD ipython-8.12.0.ebuild 4423 BLAKE2B 82ea5dabe4579dec38cddc9e54e9ea3b403f60f5f803e2cb84c6ecd35775201a109f79481cf1863aef8bf49e3c93eb03481bacb3f15154c6d03e035467114bdf SHA512 31240e79ed752a85efec0341ebcb83f3eff0442a9b995592d6e5dd327c51861d24025bf5a990923e5f9edd2be64f8e38d3643b9dfaebf596e4bc60fc443b6da3
+EBUILD ipython-8.12.0.ebuild 4415 BLAKE2B d9b57f42d1dbc5432677372f458f113417e6a172db18a1a84385a1c359eb8c68f8beeecd4ab8b2591d34e5b9d6dfc173a3c385f44f57d222e5edd21af894d881 SHA512 a6dc7b2f0615577027cf4def0ea1332a249894a572cc3b3d953b1201827f98c77d237fada122cb3eb42d96befca0615114a0789c70c4ec39539a43460f7fff75
 MISC metadata.xml 2886 BLAKE2B 88c80f5eef5c89c8939e60c1944be4c63a5a318e55a3490b38bf864e7919debf8e3c3a32f1fa0a43766ceec6462fb20fd4d943194fe2c08208f0839783c20916 SHA512 f4ed7c1898930ade11983fb0666dc25dce7907f017145e1ad903651dcd95ead2734893d55b4548c4ae23425388485a86bffc9d885eae17d12ae1ac2c0058aac2
diff --git a/dev-python/ipython/ipython-8.10.0.ebuild b/dev-python/ipython/ipython-8.10.0.ebuild
deleted file mode 100644
index fcec7b05678a..000000000000
--- a/dev-python/ipython/ipython-8.10.0.ebuild
+++ /dev/null
@@ -1,156 +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_{9..11} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.11.0.ebuild b/dev-python/ipython/ipython-8.11.0.ebuild
deleted file mode 100644
index a85928b28699..000000000000
--- a/dev-python/ipython/ipython-8.11.0.ebuild
+++ /dev/null
@@ -1,156 +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_{9..11} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature pypi virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="
-	https://ipython.org/
-	https://github.com/ipython/ipython/
-	https://pypi.org/project/ipython/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt-toolkit-3.0.38[${PYTHON_USEDEP}]
-	<dev-python/prompt-toolkit-3.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/stack_data[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? (
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-python_prepare_all() {
-	# Remove out of date insource files
-	#rm IPython/extensions/cythonmagic.py || die
-	#rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
-	local EPYTEST_DESELECT=(
-		# TODO: looks to be a regression due to a newer dep
-		IPython/core/tests/test_oinspect.py::test_class_signature
-		IPython/core/tests/test_oinspect.py::test_render_signature_long
-		IPython/terminal/tests/test_shortcuts.py::test_modify_shortcut_with_filters
-	)
-	# nonfatal implied by virtx
-	nonfatal epytest || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "code formatting" dev-python/black
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-8.12.0.ebuild b/dev-python/ipython/ipython-8.12.0.ebuild
index 1a16373c26a0..53206df111bf 100644
--- a/dev-python/ipython/ipython-8.12.0.ebuild
+++ b/dev-python/ipython/ipython-8.12.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 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"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index c47fb733370e..6582ac551b61 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,5 +1,3 @@
-DIST jaraco.path-3.4.0.tar.gz 9574 BLAKE2B 41c7b65be0f7f8ae93b2137f1527145ac91acde2a2d4e338cd68e35f7e5233e6a8dcfe9a0c07f36ae9cd2a00946031eb6b692cfaf1a299bf7a451f25b39cc8cc SHA512 00a853bffdde4a931938b1d193898c039e253018f06ca9d102ee8e07f797b4c9dac33eb50243f714e3f3e151b6ce2fed7d47e1b82ab18d3e8715525b57040a6a
 DIST jaraco.path-3.4.1.tar.gz 10612 BLAKE2B bfef9b86a37671533d2834351ddd4b95f4eeb0eca6c581c08824f8206b8e1512ee38eb9134970be315be116b889a70ff2539d8162530ab50bc2e684c6b2a4648 SHA512 a41d592120f584943f271f01f3b80e5d06563b849605124ee28d0bfde906037f6c180b19e562f321f6b21eea8542094ef8b499875b0eb2d544fe73adef9b11c4
-EBUILD jaraco-path-3.4.0.ebuild 680 BLAKE2B d01d2feff9bff9964a9592eb7462d4b77d8ad063699b5afbf60957d4451334eb5aff6975191095276f05081b758436d250ee3a874b6f53f4ac5c1a3b9b93072c SHA512 639aa9d5f75f89451ddf6970960a459faab67b94c3af84eb95b2f0523c940fcd1ef3bdac8aedbbce052a5f0a1568244b4c215816c5f1825c86e64d5db381a01c
-EBUILD jaraco-path-3.4.1.ebuild 649 BLAKE2B 66e5bfab04aa6a332a47d6dd3ffc8031edc01517661275b2532c2053b911f3bc0d48f74b6355dc2e3f164b24777c47b6b58a472e62e5120ccc17fe1cd49e284c SHA512 1440fd1742ea47f540f29d624e7aa1f06c8b301652f01fb3805c22f78a44000c3b9cc4f16f901da6e2cb05fb11069b83badfe248166c5606d38741804279d013
+EBUILD jaraco-path-3.4.1.ebuild 641 BLAKE2B b0c90836e78c578fb87d4cc1ab682fb64eb8ecb93086dff593f7b087476e16255a70f4a938beebbf042a4d4bf2619845a5820f530176e08326e0646ad00d04b5 SHA512 a3af5dfc2d08ea38262febc6f62f086159fe4e43820f55c3b2d680615009f2788d160d5bc064d2cd5d03e4fe47c0dc5d3ff6c04e71772804018b12af43810f4a
 MISC metadata.xml 397 BLAKE2B 899056eaa6d393d9c624e20ff93a644bd93f39505f701a085f22d4216154a3c1b19bb879bcbe45f077fba7d91ad5e34617283b10f535305b322c580712df10fc SHA512 104c1a8d8a2613ed4355b6537ce0733b36e915d98ad69204d2a7763dd6e7bbdf74c2cc2e66f34000426e04e79f19a84ca1d8a57e504c62adaa4386f372d34dda
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
deleted file mode 100644
index 5b1cd39c1cd2..000000000000
--- a/dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
+++ /dev/null
@@ -1,31 +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_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Miscellaneous path functions"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.path/
-	https://pypi.org/project/jaraco.path/
-"
-SRC_URI="$(pypi_sdist_url --no-normalize "${PN/-/.}")"
-S=${WORKDIR}/${P/-/.}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests
-}
diff --git a/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
index 603bf9bb1af4..48dee04dc6dd 100644
--- a/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-core/Manifest b/dev-python/jupyter-core/Manifest
new file mode 100644
index 000000000000..629791ddf8f0
--- /dev/null
+++ b/dev-python/jupyter-core/Manifest
@@ -0,0 +1,3 @@
+DIST jupyter_core-5.3.0.tar.gz 83909 BLAKE2B c0e5418770a4d3527e825bcd63cb9371855f544f19493b82f49db892fc92e91fd257b07b45d7cf20760f9ac9205346b3ec533491baf45f225764e6d310524bb8 SHA512 2c63f59a9618ee01d200e233cf85d586d88976c8d545235be224f9c64a54eb3a70e8b47220cc29b8ad3c102cc6c8754c8ccff2a771899986f322def5f539e072
+EBUILD jupyter-core-5.3.0.ebuild 889 BLAKE2B 57882e4d559e174656e6d711f83c8f8ad1b2cf2bd2b883bfbf8554ec03b890b1cc3a36bcd2091d327ef5e12a539c32e2671d753ed68e99311f19f1bfe52d6b09 SHA512 cbee64eda3826a167f0663f122e560dfe465a8a173e8dfa636f6368713b509ae79eda308d889a6db2753d7db0570dc6f083a69c7b2d4bc377da80f6a1324b75d
+MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild b/dev-python/jupyter-core/jupyter-core-5.3.0.ebuild
index b224f1d901f3..5d6b232808dc 100644
--- a/dev-python/jupyter_core/jupyter_core-5.1.5.ebuild
+++ b/dev-python/jupyter-core/jupyter-core-5.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Core common functionality of Jupyter projects"
 HOMEPAGE="
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/jupyter/jupyter_core/
 	https://pypi.org/project/jupyter-core/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter-core/metadata.xml
index f110b0a5181c..f110b0a5181c 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter-core/metadata.xml
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 05dbd45f1f79..81207460f3f1 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,6 +1,6 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.4.0.tar.gz 693740 BLAKE2B c50a06f1ebe1479c126c2a10ac7f58f012f97f8d565f1705b5d8080ff854a387a6bbcba65785652988a1adc3575009ea0b68e48b7cda8bbd89b5208e1a6d0612 SHA512 c5ceb6caa37c6d8bb5b3026f450bdfc92c37cb5a350541fa35764eeb33007918b2aa55b41108703477efe68f7d5e4f4ba3fea51cd203f3f3c0b74ba3bed6e1c5
 DIST jupyter_server-2.5.0.tar.gz 694029 BLAKE2B bea1082709653617c812124378e1e2a639e90b1e0d7fedacd98628c415adad2daa5343b57a19a776c41820e6665c8591c8d2a652f8c791b605bc3a4b65400ef3 SHA512 7145f60a73bf3d9aceff37aaf56b3b3a54c94fd9f13f06659387909cb1727759a082d11e983df4e687cc508461d5afb6e552f3ac09e30bebb1eb5e863992ad14
-EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B 3d8e78204ccc5fc93819792d4a2a981ee582bbfa244b7ef1d8415e2ba747e939175e5081ce62e21d885caf8971420bc44fd39a90e85e4718490eb6917093a025 SHA512 3fd8a7d2c30997482bbd6fba87cc691ca1dba6007faefc916557056cab59b3b30bf237e83d6410f84cf4a85ca21531a03d00a4d1bf7e10e658f0364c32771a44
-EBUILD jupyter-server-2.5.0.ebuild 2182 BLAKE2B 570b49a4b87d6ac4e5129f729746ba6a9ab5b9caf1ff0cb82e4cf4d93f2f23e0935906853bf0058fa911a00d574bc28e3f63a6bc360427234418cb36aee1624a SHA512 2f308b5cd5d37ff5f5e53f1b9c573ed676d619679440bbf9086d92ed27a848246b7e5ae2b86d1ba438c0157212e52c13a847222405ba2c9a9f0972bdf1618371
+EBUILD jupyter-server-2.4.0.ebuild 2174 BLAKE2B a9a0930b2097be4eb98bef003d1cb6430c2866d4db32f1e8df14c510c255991b8ee9b52b19ac44389ebcfd85cb0e47e581aeba06f70c2214be5a7fa007deff6c SHA512 a7ef0c73785482cabb3bb2032ed73e5270b7b0965c4072bd289c21adc920d401491ee56ec15f77a3ab253fa22663d023377806198806f65754936d5ac54ccf40
+EBUILD jupyter-server-2.5.0.ebuild 2182 BLAKE2B 8e7943eaa65eac2adb879ffdfd5e56620bc1f27c49737b666d57baa4a519af29d403d779f3333546ad4a177ffaa6bf93dd5a0e1c212935971b637136c340d3db SHA512 794e91a70e821025ec6b7a3fd3b2923ccbee65837434882da1c12caf051d3bb768401adfa2a8f7360defe604d96a47537c961b87a6379fbf67ed7e7d012fa80e
 MISC metadata.xml 544 BLAKE2B ec5a0aea1d2ad6ce0e59972d2ef4ce62c03877d464dfdc34bcb94a7d01304c63761c6bc30ed973bba1f4100e25f70541bed4eea858deb44f359d0e373ae1ade0 SHA512 ffe7deb7349ce99890b902a225b73913185bfa860237dea8c1a508a6a5e84bbb74ca7a5c43253c9986f97fb3fd1e9f2bb63ca60f73953fcc851359df8adb5fbd
diff --git a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
index a7ad86a14eec..b9d1f63a14df 100644
--- a/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.4.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
index 69610eaf853e..9670e3fed733 100644
--- a/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
+++ b/dev-python/jupyter-server/jupyter-server-2.5.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.4.4[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_events-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index a8d2a9c99257..46b6861612af 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r4.ebuild 917 BLAKE2B 685a79beac5e5fc3543f26e1b1ce7af6ad1c035f096b8df5ebaf3d3c739b33389a87e2b7e53540b8840fac4f5228f16f237c3f97abb95910aac9c8c117fa993c SHA512 f3bdd97b16476cf932f6189039de5ff9f53e9da99c0f7fa1494980a7a54ed3657472250eabc416c605569bc7435e7d56beca9f2a1c7cf4e7e01849093e98a2c6
+EBUILD jupyter-1.0.0-r4.ebuild 917 BLAKE2B 06fbff6a3d6b22ca70bc0c528cd0c51ab592f15553d43dd449d39587dc787a93226b8f34565db703da64666360721cd51a0053e8ce923368fc95f6e5324dc515 SHA512 36cc3795fe32dc5a872781d91ba13357e65a96da3034c1e95c093ab771d8b17b175f61084308089b7ac4f162fce144376dde6109ba6b62df51b6e21ddffe7228
 MISC metadata.xml 391 BLAKE2B af2c9f38e30fca600dbd7c482a5d3c10e11463e5359e59630126d2848dc776bff78c79deeba97e1d8a4074f5aa597acc1b29a1bf5007e213657a4e428d07e36d SHA512 090a9c06ac5e0a451769e99a92db93cc6880cfe76bc485d09c60f2f6870723c4c91f898ac6d28a1c9691b7e9a0e98568368ec3b7ecf2e51decef7728fd79d40d
diff --git a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
index 9f1b69fc86c0..d0c5d7eb87aa 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r4.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/nbconvert[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipywidgets[${PYTHON_USEDEP}]"
-PDEPEND=">=dev-python/jupyter_core-4.2.0[${PYTHON_USEDEP}]"
+PDEPEND=">=dev-python/jupyter-core-4.2.0[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs/source dev-python/sphinx-rtd-theme
 
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 2bdafd935e67..f9a5eac11030 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,7 +2,7 @@ AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b8
 DIST jupyter_client-7.4.9.tar.gz 329115 BLAKE2B 8b43b237ac79bc51e40e403cf4a3ada18d03437094dc1dd9b9988adb1bcfbc56ba4b2373d3dd858df583b723723127f934c01544f3d6a576886b012364674f0f SHA512 0de91309ffddd2da50ae69bff4f7ecd741398171982f66488e6367d78388c6844b353bed1834684fa4af890364120ce09f2fa6b3ed7778c501058ae558439969
 DIST jupyter_client-8.0.3.tar.gz 334366 BLAKE2B 04ea6e8206fe0b741da1ba0d17cb559657824c20f4fcff48fd0ce4287dce7da9a151000e7a0f08cbf3fa6b1868d8d7e424d49d70a258283466350946f4ce5220 SHA512 27eca49e44c13d819624c6ab596b24b9b469f82a788920eb4db02cee43c2efdf22ea68bf282f5f4ca28d38c9238d51d70d7aa214f2c3b8f6c2a7ebcaf12d567c
 DIST jupyter_client-8.1.0.tar.gz 335241 BLAKE2B d9491f958b21ba09494bf42ff5a3bae786388a16c007f5756df8900fc53c6fdb4d67bff09b16290338d07fc3c3466483f20ab82482fb235e0e55481294eaeef1 SHA512 21317e5ca61b72408e94116f0be545753088d891742579fcf7a451be179a7783dc153d2898e0ff50ce06017f90cb48f907a5bb056090b13ec0da2af7287f6dcd
-EBUILD jupyter_client-7.4.9.ebuild 1209 BLAKE2B 8889fec0b7f86f01bae55a528e69c7b04804cf11c7b9782c9ef334c291b0c2adf2750193b47dbdd4fe0295e7ffb78e36825e06411a0f9c2a197e3d33967c7588 SHA512 de28921c90362a4109b783a16dd4a82f965c9e4debd2c6b22b39185e75833c44b15854b32b278de3b6c316458019732dbe0a462d38706061fdc87e75d07137d6
-EBUILD jupyter_client-8.0.3.ebuild 1295 BLAKE2B 5e31e0f03be81db1ce714a8029740f678d712fbaff655a420deb1d86a4700fa9e0af2363513fab7f35a3c55c81d7209378b46e759bae583cd6084d3b5da4fb73 SHA512 7267ed82cd9ec2b9b140ea6845070553bc4d83a38adfada5411518a5e3162290bcbc167e044380e551b2ecafbf423e715c1c64b4fb86b3b617e8c409857d993a
-EBUILD jupyter_client-8.1.0.ebuild 1303 BLAKE2B e46df34af22f085081469b22ce7fd33e058cf821190c7b4f51938bd6cd983ad9e716ab4e3a2561c327be0b9da36e87ebddfc96cbfe5e329f58305a6105f34dab SHA512 25d573f63bc5e14b0f35d8496555e6b7d5ee7e4e679ca66abe0b358133c3584049b317d4661e071678c13777a6071b54d1b2cc7d002a7bbff23c441a34dd57f5
+EBUILD jupyter_client-7.4.9.ebuild 1209 BLAKE2B 035dddb67ea989f55b5b76344e238737e20b668dda0c92baeb12018e4d140c02ea403d57e1226b2e2bb36f85e5c6c56b9e3eed19493a7ff690ddae41421761f5 SHA512 216be7c1d4a2b60feaffd86a82d0bccb976e722407168e08ce453195e508b540cc9534ed1251b0c9ff30e8a5721df66e181a514a0de251a2069d4b1d139b8e02
+EBUILD jupyter_client-8.0.3.ebuild 1295 BLAKE2B 11c3b7bf39626ebb65e8933ddda228a64e4f559195676ab34c34d42094fa55b4ed2be88b59809f7a0d54412716cf25496d8bc3d6a6815e3d154fb1ec79e5a2ef SHA512 c927b5cc9d3a9ae91561dac5467d2fb06ddc03dc6dea77d524a76edbd2d063e6a092ca404b6a3b418a4c9870729163e569b22458d7dfc88f95a48e76c03056a4
+EBUILD jupyter_client-8.1.0.ebuild 1303 BLAKE2B 7eb1fa187f769e9ca218d61ce76d7faa575ef5d97a125daa3a1fb7aa6e96d14bc74d7dd46a1aa862722419268aaf020d3487dd466b2fc2e9e1209582cca443a5 SHA512 c9840f9901034f2876b3c44d15499ae0d6604d15df56a50391f0aadceed752d38a725fe7b6146d5f8bb55a384c147ee655a42b0c2304956e3911b0bffdf22ed5
 MISC metadata.xml 844 BLAKE2B 8beea01f144f8e28b58b1bd4d0d2a32eda4b5e50e479c83ed940cd6894d581aa22418bc2733910465cb6980134c3a29b63a6e31f595d037b9492337285837ac6 SHA512 73f427cc561e728c6f941052a4b6f9c6ec5c9d6ba3bb601bc58313687dfc8d6ed3602e1fb2f7f0ea00aec4360c8c1200334675917d22092ed79585b117865ebd
diff --git a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild b/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
index 8afc6536f1c2..b02431ea8cf2 100644
--- a/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-7.4.9.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.9.2[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index 5542e8af9bf2..5b8619ab0d01 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
-	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
index 60df683d39a2..503ce6564a01 100644
--- a/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.1.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
-	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-23.0[${PYTHON_USEDEP}]
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index f3d2f5d56fe2..71ccea53e67e 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,3 +1,3 @@
 DIST jupyter_console-6.6.3.tar.gz 34363 BLAKE2B fd5875f608bec0528f7751b7cb146bff3f5c6caeb531a360eb5dd6164c44b3a4a84d1371756f42c256fbada7572176172894a01bc5b7cca835f12a390815ff5a SHA512 fc896dfc783648127690458712e90eced9578629dd55e3bfc9e15319ffa919c118c78d7872f0274455c3996fa9321bccdfa204b94b45a2de733b7703894c9034
-EBUILD jupyter_console-6.6.3.ebuild 972 BLAKE2B 241079ac59c10f6dee6ed1bf13606e4dfad93defa99db260fbc82f2fc9fd670904232d6a1a6aa8aa60b94406bc32f54f0bcd4935047808867ebf4c088255bc89 SHA512 534e96e56924433c24fd57f79837386df70812256d54295493b57d319fb071d828ca4f5f20f1ff4acd1c8c7359b4a7edc19b39d4d45194b481440fd8182dd5e3
+EBUILD jupyter_console-6.6.3.ebuild 972 BLAKE2B 905f0ab92690c971754690cb2f427bd544f6c2e7a0acc4f12e100d5aed50f6107f5146581e19b926ce34c38425ae2bd93a53a5035d1527d3561d65b17df920f8 SHA512 2f91c20d740fb8854701d26bc8460d14720b3f9c153c2cfa0131f5965a7a58ff3f5934ac08f3e21adef1f6006e3684b91935400c4dfb69db8d92df02ec8b5923
 MISC metadata.xml 702 BLAKE2B 38bb264e2ab7f1feca67ae6a35d2ee20c04b53188cc7d3a51bd2d1630ba6a9e89ac949013bbd9ac3443331bcf3f115f85537865787daee26949b9773aa9b9197 SHA512 c3f9fb275560a3aef2a5266d2070e3d013f53e2f3f7e1363626b15d290ccd619c65a19d6ee2b849a683a96159c8af29c55c81eff5a333759eae5cd6773736b24
diff --git a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
index f902f53e1004..3ecdeb0887df 100644
--- a/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.6.3.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/ipykernel-6.14[${PYTHON_USEDEP}]
 	dev-python/ipython[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/prompt-toolkit-3.0.30[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_core/Manifest b/dev-python/jupyter_core/Manifest
deleted file mode 100644
index 0dd55c3512a5..000000000000
--- a/dev-python/jupyter_core/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST jupyter_core-5.1.5.tar.gz 82838 BLAKE2B 33e9f569bfcf66e679611b00fd99f272b845685d7132f616141143ab0b894b54cb499c6da2112ccd760a00e5313c742830943e77ac6b40277db371b6002b6220 SHA512 2fc9150de96e7a084aa9bf334a71e342f0ab1946943e25a66a4760097fa662290a732ac30356c8ddb595fc05414edb1d9c06ac5eaf41099aaccb695d6a9357a6
-DIST jupyter_core-5.2.0.tar.gz 83861 BLAKE2B 97a96201199640963e9ebedf1b8ecffb66d6153e40a77cbe1d615ad9a5b60d3c7deb5c5965bdf7f8001db4967af30f39e576570160229201cc9a5b585c37abcf SHA512 7e4e6bbc338876fd213ae1a8028066f1f33010bb0196e26d6c6d7b872b60612d38d9d32b3d2ee4155f86dabf3b89e8282fef268d1dcd6fd740fd2fd3f0bd0bc2
-DIST jupyter_core-5.3.0.tar.gz 83909 BLAKE2B c0e5418770a4d3527e825bcd63cb9371855f544f19493b82f49db892fc92e91fd257b07b45d7cf20760f9ac9205346b3ec533491baf45f225764e6d310524bb8 SHA512 2c63f59a9618ee01d200e233cf85d586d88976c8d545235be224f9c64a54eb3a70e8b47220cc29b8ad3c102cc6c8754c8ccff2a771899986f322def5f539e072
-EBUILD jupyter_core-5.1.5.ebuild 936 BLAKE2B 5db09257fae364b81e6d13ea2acc445ba836abff8af30c4809958cf519697cf3aeeaa9700cbc7ae7b5e9702105ca44cd7891ee760969a0dedc0dd25aa133ccbd SHA512 7298269f7d721b51404e1d8fe953237ecaffc3b5b469099f39fc3910b229ff545c56d1e5abbbff44f41d559d54662a5a9bad1b5143c62a85c061bee2195bb350
-EBUILD jupyter_core-5.2.0.ebuild 897 BLAKE2B a9267149a31a3ef3d94373ac54cc21ee42fcb96595fb210c6f9641f06bac5a86ae73922a014ae0dbabd3f7e38980f755843dec8726affb15a62f4559e12edeca SHA512 4bb133a472230f56cde79333bb92f86e3ff76f64399c9ea052721aeb1b0973f359010607e55ab57dcb4fcd4612ccdc683e3c714e240a40faef01cfb177ec0797
-EBUILD jupyter_core-5.3.0.ebuild 897 BLAKE2B a9267149a31a3ef3d94373ac54cc21ee42fcb96595fb210c6f9641f06bac5a86ae73922a014ae0dbabd3f7e38980f755843dec8726affb15a62f4559e12edeca SHA512 4bb133a472230f56cde79333bb92f86e3ff76f64399c9ea052721aeb1b0973f359010607e55ab57dcb4fcd4612ccdc683e3c714e240a40faef01cfb177ec0797
-MISC metadata.xml 759 BLAKE2B 4ef6a95640943d1b082bb65ae17515300089c6d78c0aa81410f4c7e57e1447787ad15373f314f8ea5c980459f4e5f74ee54edace2eb9421991e2425793040adc SHA512 d9769460a005d11961ebabc81636065aec545166820e923ab7abd58782e0832592a58611ccb4485164ef7c1c646812e8f608fafb9639525663732dec730542f5
diff --git a/dev-python/jupyter_core/jupyter_core-5.2.0.ebuild b/dev-python/jupyter_core/jupyter_core-5.2.0.ebuild
deleted file mode 100644
index 2ad7b2b33eb2..000000000000
--- a/dev-python/jupyter_core/jupyter_core-5.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_core/
-	https://pypi.org/project/jupyter-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-spelling \
-	dev-python/traitlets
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild b/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild
deleted file mode 100644
index 2ad7b2b33eb2..000000000000
--- a/dev-python/jupyter_core/jupyter_core-5.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Core common functionality of Jupyter projects"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/jupyter_core/
-	https://pypi.org/project/jupyter-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/platformdirs-2.5[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipython-4.0.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/sphinxcontrib-spelling \
-	dev-python/traitlets
-distutils_enable_tests pytest
diff --git a/dev-python/jupyterlab/Manifest b/dev-python/jupyterlab/Manifest
index 176376e63c9f..f0181daaf901 100644
--- a/dev-python/jupyterlab/Manifest
+++ b/dev-python/jupyterlab/Manifest
@@ -1,7 +1,7 @@
 DIST jupyterlab-3.5.3.tar.gz 17114007 BLAKE2B 70d32721a2579331dd4e3481f7241f5e2c5aad6dac851f213de0ac1fc3b76667bea496bca5ea13ee562e9678d51ac45df91c5901d8d3b7dc839977d3d842e67d SHA512 fdacd34ab629da2b5c2eb23f11ba4d44d5b27872e1736850319bcabbe635d31cfa2891c1c5991b152a5c1d94221e3766a20fc91033f556d8e508374bc46d5fe2
 DIST jupyterlab-3.6.1.tar.gz 16845937 BLAKE2B 41c50a9ddefc0ec97c70843e15107d3e3cebfadea2ec148e4536407b0f1b202c2aeace794b02c7cb666c316434da614c1bfebab5e5fc7e654f62677bac6e1eb3 SHA512 9dc63162955c13721c97d620a60116cd75bf10eca9c8eab08ae35749bf2dfec84c55759a361ca1abab34c44d63eded95748cfea589aff98907045b483d778413
 DIST jupyterlab-3.6.2.tar.gz 16846937 BLAKE2B 1b443ace53a68903728aa781a0a0aa95a13193b63ce3101144945e41245dd7c00554abc6c75a48feafc677d83580705393cde1a4bffab0e09d2d5bf0d67e72e0 SHA512 8ca7956f6c78413a7aecb55cd60b3dfa8491afbe3b02d9ae5b038ba4dcc762daf78768349cb586775483e8dee39d5a062650d0fd156e12a85383543f836cfb38
-EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B c38ec4a4f0a472c59f7c01196bc189a7b68a23178af3b14beb61245d2d60dbe498888c0f7ac69946af5c97e257f0bb1040631ed1db15fda1049b87ab7d3dd599 SHA512 d00a29c17c12db753e5b03283b2262eed5bbcb0cb54d0faacb11c5a730efedcf7bf9021be56a50c9d6c65a25f9705293bb39af6f7576be86144dec48c3ecaedc
-EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 95de9bf426a62ed9601204733a28e62fb55c252f13b0a166bffa1c00d25089e171f6b03122b844066e5f78b095ea8c026778fcee381e49d42acee906fddcf897 SHA512 0a740978f5bde3edec5fd02bba04a8a160a80fdbf5f8de30d3d50d2c807fc366e42795a049af0aef3da2bcfe3e21b45533257d6eba5efdc32ee3047366f550d1
-EBUILD jupyterlab-3.6.2.ebuild 2739 BLAKE2B 2ad64f9476f16c591be51d2f3fc23eb7622ac4d1c7e871349c5b0cf8c1c486b2f97de9c80c3bb324001fc6724d7c10e431267cb6c35a5c301ef5d1779cd942cf SHA512 8eed80fadf79be66e38a72943fa7adb92f737e45b000002f4fa374ecabbdee783ee71237973878fdfe8f51fb66f7a80a3f74d0883be041420e18900df93432e3
+EBUILD jupyterlab-3.5.3.ebuild 2574 BLAKE2B 9d56d8393c51ac23d5564e935b0621e7afeffbcc510abf0cab42f971531ec4fe8a0afdb5e3d46839cb579b2e956f905d672e430570a39cf8b3f93c856921f735 SHA512 e8da2a35344d04bc458d628dac61584812fd25cec8da4915511d8014fac086443783f62c685a020bc573e086ee255521f0de6cea6bac011ab15e7280516c9acf
+EBUILD jupyterlab-3.6.1-r1.ebuild 2747 BLAKE2B 08de7f4ff39cf5539b46aa71b6d07b25d4909f2456b2603613a557fa10695f405affdce5ece032d10eaa727a2902dbdc5e5ed9f8415b921354682ec13df65c16 SHA512 2a05e3d7f29a205665320353fdb39a29584c86df003f09a0f058aafc41fc78bd4357dcaeebfe338e6994c7ecbcc6824535e1c6ad84b76f963819abfd77bf8c10
+EBUILD jupyterlab-3.6.2.ebuild 2739 BLAKE2B af86fa795f698b076d484e8355fc5750c9e6b8e618e3aa06ec1b8383b3dc32dec7ec750ef2c5bf93544ee7316232b3a4dacd402b433a4331d44aa7603c043008 SHA512 1fb15ac9a2aff618ee7ee59d35e5eda437cb72e42eea8a95e480504b35a356a4f195049e7b8590462edf8695d3f7f132557baa5ba770bc927bcd63f6da4c11a9
 MISC metadata.xml 412 BLAKE2B f0b40e19f8ba9dc116f0e4a882cabab6376f22d1eaeb3eac58ecff465ee2aff3564ddbf55e4ffb8971807a39945109a164037a954419671a274d3ac558b102ea SHA512 b6149a03585ca04bc3bf6f3ea6055e8e1fcb620a771359d150df7c22ee16bf09f57c8037df2161021fac0c194be0ac5ec79a31f0511d785e0c5b1ca96d817e42
diff --git a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
index 8da9dabc90cb..8f983a0b58e4 100644
--- a/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.5.3.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyterlab-server-2.10[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
index 2d11d085076c..07c18298ca37 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.1-r1.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	~dev-python/jupyter_ydoc-0.2.2[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
index 5d072404adab..abe9ea35dc85 100644
--- a/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
+++ b/dev-python/jupyterlab/jupyterlab-3.6.2.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	dev-python/ipython[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyterlab-server-2.19[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.16[${PYTHON_USEDEP}]
 	<dev-python/jupyter-server-3[${PYTHON_USEDEP}]
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index df6f0bace0e9..a2a4e9d9ef89 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -1,5 +1,5 @@
 AUX kiwisolver-1.4.4-pypy3-tests.patch 1001 BLAKE2B ebb5318a74bdd878c58234b0d71f4adb96e7180624588e24862005fb07cc834ce1da060d9ce543af5f5bc5408b3565f04b4bfd53eee9d1dd93cfd3c03908801a SHA512 2333bfdf39f65648a988a2abd7e3b1f02a24fea73dab3a155351035be8a3f3cad09a4bcdaaa4524ea7080b3774e1a573fd10e51107466765007c7914b02cf1bd
 DIST kiwi-1.4.4.gh.tar.gz 91343 BLAKE2B a5e345509e7294eaf89e1361c035b3ef5d672d335682dbb426196d22876762b1f729cc728300f731a42afbfdf2828591f83cc53daf28e8d4c451a1b246b4800f SHA512 9a7ed487bb28f8c430543dc21ea59156078c129fd29b1382f1578368e72f312f4e813eb4501e4c9387647b42b085b93d4bd27d0e846f1396fa4ce68fd9e9ba5f
-EBUILD kiwisolver-1.4.4-r1.ebuild 948 BLAKE2B 28dbb62b51471452c9a6ddb78fb338b1e621d0cbcc678cf15f1a7d825df410bc435d10de46a99464f80cca1f84df2e07e376fc141c87708f2a9b1ea1290f0b53 SHA512 a3b6a35eb5f87b4fea27e0f53a69934e9ff503349fd212e3a4426fb7cb32cf3615dc851b41ce2e5bad12f47684eb4c4b0feb706536877af0b34de107060ec671
+EBUILD kiwisolver-1.4.4-r1.ebuild 942 BLAKE2B 7b0182afd6cf2fd3c85b3519407dbbd2f033d5b6319733721099a34a0d329a399613ca42fd774fabbba4e1610e81fb655edda1fc099553cfbc8b332bde0d83ac SHA512 517b49fa571c815c067cf2af73b680fa3ce5f8cf868085ee214391754a094cb2b813a2ab7caeb64041fd45890cc873a0aefc08653ad64b383205310e078aade4
 EBUILD kiwisolver-1.4.4.ebuild 876 BLAKE2B 612c3ba4336439d5d063307d1df5279419bc2ebf1a50e74784777636e29d3d69075ecb9b7469a38468a93ce49c09243a3eb91d984094b4c0ee90a8510942fdc0 SHA512 4b5c6ea533206011759a0682e459396cf49cb62b769937fdd94433f02f498d1bb5e300a3433e1a4e369860f34af9003fed95dcb3da8d701a4a1ba1744652c1c6
 MISC metadata.xml 366 BLAKE2B d724248e9950219de4990e67822a16781e1a28f41d863fde04b3e1212b982a86819636a621b6e23089b76042ebbb23e0944a88ef9ab4c4abe62103f12197e5c2 SHA512 526fe3a81426edfc4c050631133799d948d1becb016319e954491090b9f3f6d410958db7027b5c2e2386b40c783f8c984b2588cda56e3ac58f3d2b1a5a8af0f0
diff --git a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
index 69b285bb9c1b..c2dd2ce196e6 100644
--- a/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-python/cppy-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 22a719407696..c0a3d3c1514e 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -8,8 +8,8 @@ DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B daba130aa5662fbf7cc2e7aa8fa6
 DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 BLAKE2B 6750855453b575eb8fcc861d5b24b144497bba62df9b9292ac586cf340e04b2b58290fe9df6d89142f29b56aa37ddeb3bd11cc3337e4dc985a4487954d1e2ffa SHA512 d8a87064ba0f92967df019e9345222b87cda81852a9599902cedc4a49ec7d9e2175c972b7fa6d19920489c1d309822f9c31c23bdce0376a8d40c71d57bcd5068
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B ff939004df0d10a698e942c99ecf3bb11fe8e0c035e3dfb0ac495f2368d83bb89cccb11de0878b3555c4047b8d0e4b969e5cec8aef8891aabf2d16a550696870 SHA512 7be9e5f983bffabf30c954e45ede8fb6b30013b84cbd50f66fa3a2185b0223b4ede7466d40376453283e9ca806da1ae80afe6e6fee001ede95b78226bcc7267d
 EBUILD lit-15.0.7.ebuild 913 BLAKE2B 38afb1ee0c64d7480ccf1c84c6c1ae0e1ff5f75a0b52272b68d50717a338f143214329245bd650e107d8091ffe1bef6b29293a4b47d147122ea6cea64b448b92 SHA512 fc58e9f0ba65f388830a4e935f448126eb61f2dcf6fa40750e6feaf8a5943fb259bd3c1db3877767e4ba9ade75f6204de8a33c14630176a34fa097e522a0a051
-EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-16.0.0.ebuild 927 BLAKE2B 2fcc513071d5701cddfeeca945e109b6ea676c4cb8f8c6aa18ed6d1d196c44a118b2c78248ced457dbdd9301c8455247f2eef8df2675fe910fd342a6755354fd SHA512 eebce40ed9c187f89439dca4216a681c8d4bfc6c1f36abcbb73dca3c1a61033ae7967b68e4d2c36ae5c8f37bd352654401eca9b47135200f090bc9d7617c6b2f
+EBUILD lit-16.0.2.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0.9999.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230314.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
 EBUILD lit-17.0.0_pre20230325.ebuild 871 BLAKE2B cfd84e2b4e947055d576f1970754ba57228622c3a77d9c599392547b8bb3fb48165a69befde4e8e451cabb92b44917627f15bff46df91aa8825c2ac2c3289daf SHA512 13a9fe1650882edc1439217e401a5b2f0ca0886e44880d7cfcd1b7efda9b29441256a21e5cf0c65af719b0417f7612db0246e76cefe6c41b2442389f7c71b9cf
diff --git a/dev-python/lit/lit-16.0.0.9999.ebuild b/dev-python/lit/lit-16.0.2.9999.ebuild
index f4b401a77373..f4b401a77373 100644
--- a/dev-python/lit/lit-16.0.0.9999.ebuild
+++ b/dev-python/lit/lit-16.0.2.9999.ebuild
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index ca5708edd3b3..f993ebb9c06e 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,5 +1,3 @@
-DIST makefun-1.15.0.tar.gz 74404 BLAKE2B b35ff14d46d50031ed42a13154c82f3fbe4105179c587dacebc0773a0d0be613e9858d57f497b8d710d7571f55230fc644592e6df67799736b37867feeb09b2e SHA512 067bd6a4176196a3aa4e96b7d460e45479cbd86d1cc611f1716fb8d1cdc17491e56f5676d7a287006ed8b80471dd28f5f48cb2eb8c1893883e3308ed9347fbae
 DIST makefun-1.15.1.tar.gz 74521 BLAKE2B e5ea20d64cebadedc63af851fd988f4b5102ea802215e87e23b5f9452bef5356f027f71853658b95caf85b6ff2c5497a8769c8e52b1d2d0c141029e1ee08bcaa SHA512 d5a43283eba61576546dbce7791825607a813658a4ef68ed6d173f8438e08f6a84027a7ce75a748e245f8dd532ca6a9eb1afa0ce795517e77b08f03c29fea034
-EBUILD makefun-1.15.0.ebuild 659 BLAKE2B e3fbf6117e95f53cb7a1677079a5d521d0ecc6e110db73b35cb62d9941cdc8359f83119760b96158032430bd23bfd51b6dfbcf1e8757bd1d09ab38e2a698c1a4 SHA512 f2447db9dce9b91b2071ddf3047ae2186b9cd7ef2f6d744645e510ce7342725466e93e3af287bbb09400abfcdbb66a45089d9110fe416fc07fea3ad9a796a6ec
-EBUILD makefun-1.15.1.ebuild 614 BLAKE2B a889c6d94a8923455a1cf788d707c22334b9d54b22fa0adb39e2be3cdec31ce66704fbe7ef471c282c7ddadfc44fa6170dda2004e6035c067b74294141567f2a SHA512 9073651b6ff39a5c448e95fddccb0059da11c7ff4e0277797f1cbc696b688eefc640cbf86c440d4b71fa3fd7ab8343eb88a4d77ea5d9ec5ced2fdef9e8c266c1
+EBUILD makefun-1.15.1.ebuild 612 BLAKE2B 1fc8ba683048655964d4647ff103ace21aed8042131ee8800caefb8b21b5deba2476f13926dfdfeef2714fc1302545025e082568130ddf613c17845d12bd2024 SHA512 95846e214f57465dd2c1e4beb51c96d26f8792ac570fdf13645339c5c043a5e0bccef5061f626347d6f8d609f89d1a6c1be5c2153146ee48cc3312456f8978da
 MISC metadata.xml 401 BLAKE2B 0657deb821edfdf648e5bb0a95255b87df0c090c6e719a5ad94a6d3f6e2e64f36d4093a2bfddb5e8592d3d38741e8d0251c8331133113766ef2fc4caa48e88ad SHA512 cda21fbaa9b62896ba3389cf281ae35bd9a59fb0d0604e61fb3b046061de47a2535d7a98d335b66f44483ae43deadf05abde0a2285902c1c3fab2762b080dbad
diff --git a/dev-python/makefun/makefun-1.15.0.ebuild b/dev-python/makefun/makefun-1.15.0.ebuild
deleted file mode 100644
index ed9bd37f0d2d..000000000000
--- a/dev-python/makefun/makefun-1.15.0.ebuild
+++ /dev/null
@@ -1,31 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Small library to dynamically create Python functions"
-HOMEPAGE="
-	https://pypi.org/project/makefun/
-	https://github.com/smarie/python-makefun/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -e '/pytest-runner/d' -i setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/makefun/makefun-1.15.1.ebuild b/dev-python/makefun/makefun-1.15.1.ebuild
index dd787a610b51..fa67c1869834 100644
--- a/dev-python/makefun/makefun-1.15.1.ebuild
+++ b/dev-python/makefun/makefun-1.15.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 5217112637a8..4233bfa43b31 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,5 +1,3 @@
-DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
 DIST markdown-it-py-2.2.0.gh.tar.gz 266808 BLAKE2B 8eae5e1924e7afbc79203a11beb7b8271c4c524f5b26cd4bed86f784e4e811d081c2c6bf573bfcdb08f5e270c323957c439c9b9744c7036c4615daece24bde35 SHA512 84d6c15084bf33bdecdcbc8419322f2898bde20de6baeaee6c66c4e6ad9e47dfb8a14e2b1fcf71b8c42e7b61a7caed119919faf0faf6765aad85c186d91fe9d5
-EBUILD markdown-it-py-2.1.0-r2.ebuild 844 BLAKE2B 5b57e53c5de56aa8252c6b568118d3693f9b411f4f4b217000babd887f067b256dfed3e93417d0ef1b2d12f7044a6c8c4f4ff3c74acbb14470c1582b37a60a1c SHA512 d90b889fd30dd5869e6d2ffe845428c74059513bb97f8d718caeb894e34789b2940cb6a2290e9f50febf7ffdb2f58cdf24ec4e35f74c08ecdf640cb2fe79365a
-EBUILD markdown-it-py-2.2.0.ebuild 861 BLAKE2B 933c7e0108b27057e319ed6a5b667c38c70d08cb2810d691778f0a3cd86da04fa87424d5ec5fd7f81acaf3ec3439f0807c5de1ec46b847591cf81e7e7bf520d7 SHA512 9ddabf291f228d9016aa4b875db9a7a71c8224510d64339ff209c1ddd175282b92de0185c060e0d4e84de1191d47d8b6234c4872baceda7ec3f89a52e2aa49f6
+EBUILD markdown-it-py-2.2.0.ebuild 853 BLAKE2B 54207498f04ea6025608935705981e60e75c63af8076b9f90f6e36e264a78daf6f51924666cee76f1860f564082dddb6bf6dce24a27fd203c1c3c08a8bc7341e SHA512 4aa14237e017661c6c3715e8f23ab7c6592c89e9c6750853c19688bef91b5450a85bac7dddf0f82b29e2b16ee9eb1bfdbe7ebcff52ad9e5c75c071c8f8428d2a
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
deleted file mode 100644
index 1a8787a9bb29..000000000000
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of markdown-it, Markdown parser"
-HOMEPAGE="
-	https://pypi.org/project/markdown-it-py/
-	https://github.com/executablebooks/markdown-it-py/
-"
-SRC_URI="
-	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/linkify-it-py[${PYTHON_USEDEP}]
-	dev-python/mdurl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# No need to benchmark
-	benchmarking/
-)
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild
index 1d2f5c71d865..a4f3b2750e9e 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/linkify-it-py-3[${PYTHON_USEDEP}]
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 6b488a448cb6..aabe78a32d72 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST mdit-py-plugins-0.3.4.gh.tar.gz 59538 BLAKE2B 7046c2b8b5b117612a71c1a4894c7e3e49a161b5375fde13ec61c4a00c2bf5824505cb5639b70a3c58d7c9629e68bf794c950b5a28470392487965cd94f3e9a9 SHA512 e36b0ee0aca95d60c27a577e1c4bde9832d633ca84fb740f16a37dd63ece0a77005f8e3d03360ed0c92de57d3f656a8f76ab76642d8da3e5ac1d65384ee18d84
 DIST mdit-py-plugins-0.3.5.gh.tar.gz 59757 BLAKE2B bad78ec811d238bafd83c9d1bbd6e0bcac3b70cd87f52b215966e836d4c2a35715804fa1c7d3671de81713c4e169ad4bb6d9dcdf741f617544772d06f8e3ae56 SHA512 6cb153d8ccff8fa3f94731606ad5dd1c06954d95519ac77b6de477e04b878f84fb059052906bdea5d798be3de49733a909cb553107255a61cde6dd1c6c72d4d2
-EBUILD mdit-py-plugins-0.3.4.ebuild 743 BLAKE2B 808462006e58a24015302df3a037075e497056d976b96cd5aeb9cb47630f6daa5b67f00dc79aceea3f0adc7dc48dfbbf9d6bc4238c22430be5791020bb4c1ccd SHA512 04d1abf207d4d145e2a90ee940a1b4b5242462df9820dc082ffc6a550173912f07a383e69be4a5d55de2943e864024c16346b3aa1cb14a98874f97a888ea9db9
-EBUILD mdit-py-plugins-0.3.5.ebuild 757 BLAKE2B d65d7d3fe6cd92c43de9bf8e9ca1e48fd52273f977602b9d08c457cad89296f213be3a337e5f5cafdaf9e7f368e29d4f8b70723bf3932a054fd625676715df30 SHA512 5d183cf379f2dad4745db0e8c9306630afb0b8edd8b9099f348a6f4aaefd8547bfa78d70a6ee76bd4e5605051662ff0e168fed074ebfdb4f04a00eca8d3632d8
+EBUILD mdit-py-plugins-0.3.5.ebuild 749 BLAKE2B fd20ff72b725da63e2f7e8aeed30a6235c38b6a2122809be3bc3adda718dd435b485275c3daebc2dfab73220e07c4a1e9ed79918eaa16688338b1ad9511c86e4 SHA512 28ab4365cfc11f7f8e398ccf25ebe9b9b2bcc6e7b9c5d6173e3ca0ac49bc7935eb81d5df345eec0e21eecbcc70228f565bf3e3e3bfb242ff1ce146b3d2569369
 MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild
deleted file mode 100644
index bd6bc670ff9c..000000000000
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of plugins for markdown-it-py"
-HOMEPAGE="
-	https://pypi.org/project/mdit-py-plugins/
-	https://github.com/executablebooks/mdit-py-plugins/
-"
-SRC_URI="
-	https://github.com/executablebooks/mdit-py-plugins/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
index 32ac6c924723..c829a4efd97f 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/markdown-it-py[${PYTHON_USEDEP}]
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index b923537dc766..689c8288fae3 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,3 +1,3 @@
 DIST metakernel-0.29.4.tar.gz 189933 BLAKE2B 0fe91318ed0fd5e356c9f0e4dfd05d72e5aff33e0bc305a3c198b4718bad1a4c3d5d7a6c82cf0c4eddb9bb5873f8b6acdbf1c61fe9a5ea8120ac6f10503fa950 SHA512 7e7458baf510383765f788fd3299d0e5dccea7b1f79c15e1621a81e029ff48aeab7c67ed01d8e2254b806115935d7428d3dfc2f083bba5ff586f2ad819f96776
-EBUILD metakernel-0.29.4.ebuild 986 BLAKE2B 3ddbf457a4c8a7fc3d2ad26a6f6d1bd2c7840e8a567a875e91e0164d4a2f61fce2ea8681508ef849d74727c456a4dcb1d47248ff7bfd1c5c5937c8cf0649062f SHA512 50ebb484b3521fca6d297240a1d15aa609be34fe22884f7cca51c4d6c92757cb2b0cf3e63e699b247e4e928c55365e4fc130385e82393020f526a4274cb92874
+EBUILD metakernel-0.29.4.ebuild 986 BLAKE2B 95b67daa3fbf3799af0065b7b51da3533d4c9e71c5856d435a083c962d76bdf4b12696c6a3018f80333de10cbe2ddf359b33b3ea0c8929a117d96c11a96c80e5 SHA512 7d0b87c1fd9f3ff3cdd5214361528fa922e84443c6d766c8b2badba8a57185a34d2dd8743615b676700703a2a599e9c3ce4d3ff288e3e17fe1813fcb74e16630
 MISC metadata.xml 635 BLAKE2B 3f108898788d2cd20d5638feaed2cb9ecc32db4350f8ee5996c7d3724b304fae040cc4c9ec20d9c7fde8041bad1ff1ab79106adbd17fe57722daa7f191eb2dbf SHA512 d84bd755109e0d4b45a2e8dec6b7ed2a5ac9dbcbe9fc8453c599969c06dc3d4e7a9001382e37d1e7c2d0fec940cf636b29ebd7e6a2ea7aa2f1420d20a4194e1e
diff --git a/dev-python/metakernel/metakernel-0.29.4.ebuild b/dev-python/metakernel/metakernel-0.29.4.ebuild
index 21cf9f850ff8..47cedb3d0aec 100644
--- a/dev-python/metakernel/metakernel-0.29.4.ebuild
+++ b/dev-python/metakernel/metakernel-0.29.4.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/ipykernel-5.5.6[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.9.2[${PYTHON_USEDEP}]
 	>=dev-python/jedi-0.18[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.8[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 7b04602d41e3..be2336951e8a 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST mkdocs-git-revision-date-localized-plugin-1.1.0.gh.tar.gz 375907 BLAKE2B d39f1d807616da95962cca6bdc5a4501163d008f0a8fcac5df2e7542bf8401d04362a38383558689f467c9249f2ad6dff636a8ebf4568aa920ea0078f90fb367 SHA512 f5f911cba9b9e3747c5628e4c947a87fa07c798f854b6ed8783b74c732cf29e4afdacb37e074a5d04672d90f96de560ab6b86cd3d826ce46226d73f48c54c27d
 DIST mkdocs-git-revision-date-localized-plugin-1.2.0.gh.tar.gz 378268 BLAKE2B ee4270e60a23b4c040de1b931c1d18f785d95b1947facd66d0b9180452dd30fee518fcdf24840b6523ee4944cf363ebbf9a27c93b09f45cc09daf277d4fd7085 SHA512 627c1b6c955f8c787ac01e9be5827648a8c9bbd1f9449c8a734f47fc83d28e3eba5faad142f69da12291c4ac3f728ae2c090e9b8e0a84b585557977a9fe04241
-EBUILD mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild 1496 BLAKE2B 446c674bc21680c68ddeb9e373adf96999bb709fcf7219afa403fcb57a12efb5a7e52dc32840f01a625fe2b401c77f84513eb643c49ce169ae9e7b940d44bc34 SHA512 8ecdbcce10ee58e29b505d05d6170369dcb063b204445d3024dcba8c3dd6a2705a7db674a5a823dec795a1ae20c0622f442e62e288072de1ce2c41e097875208
-EBUILD mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild 1538 BLAKE2B 0b8c406128c47e60843c32cbc16252d7a041efa74d0d7f8f96663b6c9438528933a2eb42d7d8c59d7926d4d2e78347bec9f677d031010bf8cf281fbee36805a1 SHA512 d99380dc4e4751be5cfd29f48893e19b4b8e82c35a3fd2a5735c12ddafc0754251e88e7b11efdf3696c37361a1d7bc61713430191fa07068674103ac7aec5699
+EBUILD mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild 1536 BLAKE2B 4a543db27d9c843c7b641595330fc24d1463344458ed84b511925bf3adcf6a1f827d4697c6bfc259b17b1c75319c0c0d3d3ae4517b26576280008a70ee77648a SHA512 974da1fb25ef1544f457189037ef07c6c548c8598709d60e09d3e713e95b5927f268b3716c82d24b06e3a29c877228ceeb6798561ccb39cb3ec4136c09d3cd0b
 MISC metadata.xml 596 BLAKE2B 9010c7fd37265b6770544a605f918524b75d7b1afea8809075c3b5afb5e56f6848aff4c7fe98367b3dcb3de16f0d21682f9a2fc80f441783f32f904dd8f9a152 SHA512 431dff95204b056afa3a4dab48eec1559d72d0c1ae9a65d89d95fb97454f858c9022578043238a34ce205ac5a16871e6f6d68a3bfe3231c20852437c4fd66254
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
deleted file mode 100644
index 1b00a2498a88..000000000000
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.1.0.ebuild
+++ /dev/null
@@ -1,59 +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_{9..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/regex
-	dev-python/mkdocs-i18n
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-	dev-python/mkdocs-git-revision-date-localized-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Display the localized date of the last git modification of a markdown file"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
-	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
-
-RDEPEND="
-	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-i18n[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-	doc? ( dev-vcs/git )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin's tests need git repo
-	if use test || use doc; then
-		git init -q || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -qm 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
index fe90f4d520d0..aaf646e94883 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-1.2.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/myst-parser/Manifest b/dev-python/myst-parser/Manifest
index bb9ea7025f60..79aeb3e3c625 100644
--- a/dev-python/myst-parser/Manifest
+++ b/dev-python/myst-parser/Manifest
@@ -1,9 +1,3 @@
-DIST MyST-Parser-0.18.1.gh.tar.gz 769288 BLAKE2B 77f21ae4277ef4ed9020caad86ef3ea92a1efca35f7ab61203fe2125e4fab31a74a740db7a1f1d6ea0a576c24706b0997beea296d782eb5a07ba4e91a0a9e52d SHA512 4bc3a89480f175779da4f093aaa99a1516f76ab4107dcf8747b6614f347e91739f8596693f95529d76aedbb0c84b4efde4262517bc445aa7027d51e05e8b48bc
-DIST MyST-Parser-0.19.0.gh.tar.gz 812180 BLAKE2B 44dd773dfcbd8c01b3089303e81b103ce3eba2432b1891b4fb35b8bbd9c0088b3245e6afe14c6378a262cdd4e7930da16ddc7ab6abb3a06779d4d0bd9e9ebd53 SHA512 3b646b78032914b42ab655d5f653f38fb58e4c51814fca0f987c8207f6fb97db6f3ba6b9951b3ecdf98430800b2a198cc2b26f17162b5b57309bfe74de3f4450
-DIST MyST-Parser-0.19.1.gh.tar.gz 812247 BLAKE2B 24a3502d2b9f81ec066c8fc5055b59448938fda63e74b47810e16cb2ce57b17fab1e219469df6e57fd1343453012855f104806e05e0831166af3506adc8589f5 SHA512 abe57048a9c19cfa08bb11c2ab988ebe462b4a104ffe3fc3b9083e2563da0bda271b5b1e278ac94e1d328bb70f5aeb20e72f81fc428fbb79dd6fb695abfd01cb
 DIST MyST-Parser-1.0.0.gh.tar.gz 813309 BLAKE2B 03bc080e0a5103b9fb239cfbea991012b1fb5f411a5a6a121b2113ad7172a1130bf8b77d20ce84a8aade4148ffba36788eb95b15ecd28c53ed321226ae8600f2 SHA512 1f0ecffd2c84b0db5d251dbc771457cdf52a8e6e540d3acde563115af24ce30d43e01223f172b3e72b2c81862052bb05ea5d7c6091f933afbda0a859d1b86e83
-EBUILD myst-parser-0.18.1-r1.ebuild 1701 BLAKE2B 77c03ca42b98dc71e32ba90aca09185b0436d0bc1ad9f4d780a0dc7594b5e88131866f08e40809a742025a51a86034af86c2969af168e98ceda4aca611f23231 SHA512 0ef1fd24fdb2e8361dcb783997dea12ae0aa8f4077028e1d2e768c705e4bdfdab4fad5f4e5cafe861d2a94d0cfb2197559e19250f97ad9ce6dc41298c7b06e35
-EBUILD myst-parser-0.19.0.ebuild 1618 BLAKE2B 7ff69e8e0080be2d717fed3ce9a0f1b40dba9523ee0bcdbcc9b210b2252d362f76395398b92f5eef776ecd465d5557b586576b78a56f211e333819dd63850417 SHA512 a67d6346d87680a672e55f3a8544d28452435a1c25d35825c776b729265efe5dbbb0444cc51d717dbfa4a72927550c20f20d8ee2e468a13b2956d629a1a768af
-EBUILD myst-parser-0.19.1.ebuild 1618 BLAKE2B 7ff69e8e0080be2d717fed3ce9a0f1b40dba9523ee0bcdbcc9b210b2252d362f76395398b92f5eef776ecd465d5557b586576b78a56f211e333819dd63850417 SHA512 a67d6346d87680a672e55f3a8544d28452435a1c25d35825c776b729265efe5dbbb0444cc51d717dbfa4a72927550c20f20d8ee2e468a13b2956d629a1a768af
-EBUILD myst-parser-1.0.0.ebuild 1624 BLAKE2B 789a749de2f16d4a5ebeed1cfa433bc1269287ddd453bb17075bcf66ea93a2c3c97d3bb63f29f4b053e5caf6dbfeffe0133e850d675d0bf708acc794e2de9cf0 SHA512 c0976431149b84174a4e8354feaa38b642e4affb6326b4ff87848ae772774f4a3ee0ff0f6ce8218d90383827c823aca1a82290bf3b702e031973188ef0b1c164
+EBUILD myst-parser-1.0.0.ebuild 1616 BLAKE2B eb361dab2711ac1e0df3f2dbca0e2d17f7d0849c926b0ba7b8a20d36623fcfcb2f7303058b5f27fe21b99e08065d62c3daf8187aad9e1b3505ec6745de2b9880 SHA512 62d1fd9c9f721c26f96183869435f514641958ceebf34094c82da96c4897246d655cf899619121eeb6d4e4edb9222c63c0efd2eff4af812b4f790283ce8df6ca
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst-parser/myst-parser-0.18.1-r1.ebuild b/dev-python/myst-parser/myst-parser-0.18.1-r1.ebuild
deleted file mode 100644
index 8fdcd12bd4cf..000000000000
--- a/dev-python/myst-parser/myst-parser-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/MyST-Parser/
-	https://pypi.org/project/myst-parser/
-"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	>=dev-python/mdit-py-plugins-0.3.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-6[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-		<dev-python/sphinx-5.2[${PYTHON_USEDEP}]
-		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Unimportant tests needing a new dep linkify
-		tests/test_renderers/test_myst_config.py::test_cmdline
-		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# bad test relying on exact exception messages
-		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
-	)
-
-	epytest
-}
diff --git a/dev-python/myst-parser/myst-parser-0.19.0.ebuild b/dev-python/myst-parser/myst-parser-0.19.0.ebuild
deleted file mode 100644
index c578ea90b4a1..000000000000
--- a/dev-python/myst-parser/myst-parser-0.19.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/MyST-Parser/
-	https://pypi.org/project/myst-parser/
-"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	>=dev-python/mdit-py-plugins-0.3.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Unimportant tests needing a new dep linkify
-		tests/test_renderers/test_myst_config.py::test_cmdline
-		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# bad test relying on exact exception messages
-		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
-	)
-
-	epytest
-}
diff --git a/dev-python/myst-parser/myst-parser-0.19.1.ebuild b/dev-python/myst-parser/myst-parser-0.19.1.ebuild
deleted file mode 100644
index c578ea90b4a1..000000000000
--- a/dev-python/myst-parser/myst-parser-0.19.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=MyST-Parser-${PV}
-DESCRIPTION="Extended commonmark compliant parser, with bridges to Sphinx"
-HOMEPAGE="
-	https://github.com/executablebooks/MyST-Parser/
-	https://pypi.org/project/myst-parser/
-"
-SRC_URI="
-	https://github.com/executablebooks/MyST-Parser/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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown-it-py[${PYTHON_USEDEP}]
-	>=dev-python/mdit-py-plugins-0.3.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	<dev-python/sphinx-7[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/pytest-regressions[${PYTHON_USEDEP}]
-		dev-python/pytest-param-files[${PYTHON_USEDEP}]
-		dev-python/sphinx-pytest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Unimportant tests needing a new dep linkify
-		tests/test_renderers/test_myst_config.py::test_cmdline
-		tests/test_sphinx/test_sphinx_builds.py::test_extended_syntaxes
-	)
-
-	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
-		# bad test relying on exact exception messages
-		"tests/test_renderers/test_include_directive.py::test_errors[9-Non-existent path:]"
-	)
-
-	epytest
-}
diff --git a/dev-python/myst-parser/myst-parser-1.0.0.ebuild b/dev-python/myst-parser/myst-parser-1.0.0.ebuild
index 50076e47c0b0..13c85c2591db 100644
--- a/dev-python/myst-parser/myst-parser-1.0.0.ebuild
+++ b/dev-python/myst-parser/myst-parser-1.0.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	<dev-python/docutils-0.20[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index f640453f7b6f..d0dee2bdbb36 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,7 +1,9 @@
 DIST nbclassic-0.5.1.tar.gz 20178622 BLAKE2B 1ff79c9af218011c697016ecef149f42e683607eebb8e199ef75957d9d3127858ce8f443aeedb60844e3277b4c8cd4959d123658a5103ab2112fec469ef01a96 SHA512 1dabc27ad115d1961e7881e7a51653449cae291c74aea222bbf92d49cb7bc9657ae1f1d9a81eafbd70bc0cafd57b75cd2c76bebf91aabc5fdd9eede534f1cec9
 DIST nbclassic-0.5.3.tar.gz 20199979 BLAKE2B aa509bbd2bab51b94f475e81b7e1c5661370e850680df8f64c86d76ff2aed7a84a0e6c00f36a695ef7f84cdc731fb7613107abc96fb13a3127ded6689d6e81a1 SHA512 07e26d4cb30e3388420ced182a31a050419f4a872256efca6684e4af0e08ec8bf7f6f14f127fe1391457ad5fc792377a1a7bafc0fa1a92eec455454c6321a9ec
 DIST nbclassic-0.5.4.tar.gz 20200456 BLAKE2B 65f571da08f7b101e369aaa7e80d969a6b1ee989d7eea17d7de2638d4908c27dd20a874ee990f65a8fd7dd4535b2d518e4392501e5badc3fec309acfc22e5ff0 SHA512 f85e0388c02a4f601b00329787152fa74862e7a5d9148b63d52a48395898b3428d3b07f0733fa9a0b5336e37d6fb441585555e45e2e265bba6bb9b82f45e7bbc
-EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B c255b1211422b66ca539c8387ad2b17608b36d125ba974f2e8dba44e5b925197d44498d4fa7e41ab3b303f8f5c5c35b59bafd8b9e78f74bc700bd73210f475b7 SHA512 8a1c4f60fc19ba1ad88ce4ab1e01d6589345d001e33bb393c6db7d096ae3ddab7bb9d36a3e4cfdaa37db7b68db10f3bddebf494e436ce263d8386cc7bd90e05e
-EBUILD nbclassic-0.5.3-r1.ebuild 2176 BLAKE2B 318dad079306f7d10d0c85576d69e72ecdb2e1cd20dfa18f23aa68a135b907fc5731b6c0a842eb9fbc95c167fe1e5d7cf2511e8b68b2bfb309e484231dbaa427 SHA512 a8ccf1a23635ad9228faa9c0a9081642b74fc1d178082d95e50f1379257cd43ab58a146ebd5b46164f51954a41c086bd2ea01cecd29e6ca88a0f69aa426853c4
-EBUILD nbclassic-0.5.4.ebuild 2176 BLAKE2B 318dad079306f7d10d0c85576d69e72ecdb2e1cd20dfa18f23aa68a135b907fc5731b6c0a842eb9fbc95c167fe1e5d7cf2511e8b68b2bfb309e484231dbaa427 SHA512 a8ccf1a23635ad9228faa9c0a9081642b74fc1d178082d95e50f1379257cd43ab58a146ebd5b46164f51954a41c086bd2ea01cecd29e6ca88a0f69aa426853c4
+DIST nbclassic-0.5.5.tar.gz 20200594 BLAKE2B 43de88221af5461e2814f7d8963d7f9f675463f116092d1fb40648a8a14065aa5888ad207b1d845884f9b5b6d6a65a8f6197e94661b7a255c84d5b34ea0c5c99 SHA512 54e22ee41a2cb497c3792b74213c13dfbcef7a8a6fb42e48a06aa6969987cec39bf0cfa835e24062e8181bd732cf6b6855f9e834a586b15c584b47df06455b34
+EBUILD nbclassic-0.5.1.ebuild 2340 BLAKE2B 8cea7ef746d71d415d70ab29162479639d8586bce9398b443ee6c3aa710d4fd1e41fbe246e9fc172e01ac26e1fdfc795b4c66abf03767070cbe097d8656ae1e0 SHA512 f1af53d1a0f864419343a533a33abd5093950c5785a237740acdcaa76ac684ce7572611042c01f4ae02fc6e00486e1895dbc29eaa4953669a883f188dccc3c43
+EBUILD nbclassic-0.5.3-r1.ebuild 2176 BLAKE2B 2a6ee406ec83c28a10c2c052bbbab597460ff8eb8bde70a9bb7ba0fa7fd84be7ce68dfd57459c84e74a6adf6479ae022e79cf708f9c6dca01bc0e815a0ef3693 SHA512 bf2b699200d294d72d6ecaef3b01db036eb2e4623163be3a382c4e6f87bc164551419452b76cded6de8b16eda2e324b448e073e05e08cf4df9ffda7e7b913dcc
+EBUILD nbclassic-0.5.4.ebuild 2176 BLAKE2B 2a6ee406ec83c28a10c2c052bbbab597460ff8eb8bde70a9bb7ba0fa7fd84be7ce68dfd57459c84e74a6adf6479ae022e79cf708f9c6dca01bc0e815a0ef3693 SHA512 bf2b699200d294d72d6ecaef3b01db036eb2e4623163be3a382c4e6f87bc164551419452b76cded6de8b16eda2e324b448e073e05e08cf4df9ffda7e7b913dcc
+EBUILD nbclassic-0.5.5.ebuild 2176 BLAKE2B 2a6ee406ec83c28a10c2c052bbbab597460ff8eb8bde70a9bb7ba0fa7fd84be7ce68dfd57459c84e74a6adf6479ae022e79cf708f9c6dca01bc0e815a0ef3693 SHA512 bf2b699200d294d72d6ecaef3b01db036eb2e4623163be3a382c4e6f87bc164551419452b76cded6de8b16eda2e324b448e073e05e08cf4df9ffda7e7b913dcc
 MISC metadata.xml 407 BLAKE2B 8be751d3f2e0e1e2952c39cd1846285ebb994d833022767dde609294ee9f98044b1189934e7d27c3134b1f06c95705687491dbf52739bdd0bc17f06cfdff53cf SHA512 6cc07376da4e55e5df153fdb0f43371ed415bed6db1bce2f67dd113d1e0f1994974dd6bee746021efb2d8c36ca2ca534109227c541d38b37b652a68b9642f2cb
diff --git a/dev-python/nbclassic/nbclassic-0.5.1.ebuild b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
index 9a1aef1269a2..8115556e865d 100644
--- a/dev-python/nbclassic/nbclassic-0.5.1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter-server-1.17.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
index 7bda1e205baf..6734a80aca44 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.4.ebuild b/dev-python/nbclassic/nbclassic-0.5.4.ebuild
index 7bda1e205baf..6734a80aca44 100644
--- a/dev-python/nbclassic/nbclassic-0.5.4.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.4.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclassic/nbclassic-0.5.5.ebuild b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
new file mode 100644
index 000000000000..6734a80aca44
--- /dev/null
+++ b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=jupyter
+
+inherit distutils-r1 pypi xdg-utils
+
+DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbclassic/
+	https://pypi.org/project/nbclassic/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
+	>=dev-python/notebook_shim-0.1.0[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+"
+PDEPEND="
+	<dev-python/notebook-7[${PYTHON_USEDEP}]
+"
+
+# dev-python/nbval is missing impls
+BDEPEND="
+	test? (
+		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		virtual/pandoc
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme \
+	dev-python/nbsphinx \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/myst-parser \
+	dev-python/ipython_genutils
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_tornasync.plugin
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move /usr/etc stuff to /etc
+	mv "${ED}/usr/etc" "${ED}/etc" || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 0eaf3758b02c..4a37df9f94ea 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,5 +1,5 @@
 DIST nbclient-0.7.2.gh.tar.gz 76883 BLAKE2B d90b9dd7b15757a44c86084b68b916aab663c0e20a5c1012bda9f86a0ec1104a01cd78d27bc6e510eceeee12f2356a312d8080e1568e4c54dd2e916af85dc304 SHA512 17f1bfbfa156688e895ab1a0d0f74903f43c62a373a40cfcc50a654d86ebbaeb5ed101562716140a3878a9667bb131c49e06caf2e3127160700baf181cd1c29b
 DIST nbclient-0.7.3.gh.tar.gz 77997 BLAKE2B 613c06596ea0cc970d57115950248cbb052babccec397a9aa543b0058cdb94f797a7c5cf554a9122927a4138f0f06827a77f535fc83a858519873bda0c389230 SHA512 bdd093cafbe6a101de779de2e51d7e2e9abce80fa8ef5b5340b4cb8fb53d0051f6f677006cadaa3a69e727634043b7ab5416777e7cf8e0507d5d1d163016f8d5
-EBUILD nbclient-0.7.2.ebuild 1537 BLAKE2B f965f30cdc05718f56aff073f684f013b9283c3609c0c439d1c8beac5e20b046bb285abdd4eaf9316c9aaaa0cb93aba7fc5ec9b23fa699966f610ed2eb52b379 SHA512 bb7a6f4b1c39ff1b3f1897db1648ce76cb964cb404f0b9d85359a4ad37cb63a93ff9a3681b221777ca7d07880c03855bffba1e086307744c3329ce79d53fdc6f
-EBUILD nbclient-0.7.3.ebuild 1582 BLAKE2B 71fb45afb9454abe16040ef5b43884354b9b8ac27fac29299893db3ca7aa40c82fbb8615e80f13615b9698c9e639cdaac451860208ff4c88a5739b9566f5e96c SHA512 959d6d1b43945cce7644fcd0a914f435dc4850631f415cfc316448ac6506c181da70e2e1f286cfb56bd5c52804cda3794cf323b44d7efafc197824dadcba574c
+EBUILD nbclient-0.7.2.ebuild 1537 BLAKE2B c082971048fa36efa587303c76c21dac0e6b20c431f7e72e2d39f43913af36a6d7717ac94c06cc84239ae209c9d4aae7d8700655c097d4160652d76998c19ec1 SHA512 bf1c615a35c0559eaf3014f5be643bc1a096b82f90f0728c6427c6264095500f84013a0331c5bb22b80b0a36708d61f8096f413e86b3b79cb0c4b15c8c0c8cb3
+EBUILD nbclient-0.7.3.ebuild 1582 BLAKE2B eff3bc64ea2e453f4e444354c05254f21654a86d29bc0c3ff0c7b399e05565ecc945a26289f6a0d85633f513793fc60db839785d2686263dd81a849f5de8e184 SHA512 c62d572271ae8c65bf27063e66a39e9e502d0c29d2061ad4a9fdb60b192e29b79b9d8350b8f4f9e077590a9a2e886cb2a13a86ab68901016d496d0f9bea91cd0
 MISC metadata.xml 405 BLAKE2B d1efa5f7bb2a959bdbc6093b1bd3930e6cdb9bffbe872c6775c15dfc1024ae24d6bcb4651c8e1fb06242b17d6a86f683de3b528bbf1a60b5656a90c1f4ac81b7 SHA512 5b0de690d37dd5928e3bfd0b380336d154cced094e342b41dfd16d0caddd2b792a2158b209404a36461cf4d1b12d836024eae2aedf15093b90f4e363382b38bf
diff --git a/dev-python/nbclient/nbclient-0.7.2.ebuild b/dev-python/nbclient/nbclient-0.7.2.ebuild
index 32fa975be6c3..2db6e12c831d 100644
--- a/dev-python/nbclient/nbclient-0.7.2.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.2.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nbclient/nbclient-0.7.3.ebuild b/dev-python/nbclient/nbclient-0.7.3.ebuild
index 2b4347e7c776..25a537fdd8d5 100644
--- a/dev-python/nbclient/nbclient-0.7.3.ebuild
+++ b/dev-python/nbclient/nbclient-0.7.3.ebuild
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc
 
 RDEPEND="
 	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index aed7404ef621..d63afbaffe3a 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,7 +1,7 @@
 DIST nbconvert-7.2.10.tar.gz 870708 BLAKE2B 837b5cf70f530b8fd3d566809d8d4faefdb3c4581b46e317d218a08bb06b80fdf59dcbd6c337b7fd62a9fdff676ea1cec941a7f6641c54ebee066a1bec19ffcd SHA512 078d6f1375f595f30db9eeebab55842353d549a294290a185c3817fc0bb2459c392120f089890409eec7cfe0fec7909752d20e4c55123249a4685d34655e0c05
 DIST nbconvert-7.2.9.tar.gz 870386 BLAKE2B aea62f29d3e696c70d77ab73cc89347a4e0c8e077e98c45331608f7117fb3c98165bf3da89e4f3bf23b9d62c618289d98c9103c5b2998ca81f65cbfda65ca536 SHA512 0053e0e88f279d2fe430e516bcc19f98191e9ce414546ab1ff214f37c8f1cdfc4fc101faa4b5f1d5955fdc65c87aad367f5a5f12ce5991c68c015c5083f2f30c
 DIST nbconvert-7.3.0.tar.gz 879918 BLAKE2B cf1414f5c6a41222f576a66ca8aa49f98d5ee4a0cd6bedcd779a6c429d46550e0435e60723255358f1ccf51b508d74e7461521889cbb7e6dfb10377175ea78a2 SHA512 a7030cced31ae749d9625f7fb7cc2bee17c10fcd90e83f36efed1c00758d02e47ed9d90aa907c2acbe979810a561d48d9fe854a3786b60418beacdd471b14b8f
-EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B d069c02a385aa2d8b9790693ca87ed0c2ef6fb22ee41c3d967858989f55074d36c6244ffbfa28c7de3c373dea930e6ff9d7270980b95c20120d4876d34261cbc SHA512 43d0bb082c8c0a4c925b44fbece61e3727b046cafa1302dd1618f777e4ce36a6def606dcc1a6e9d955c77b0523b0c5fdb46c584a27e8818f99e6193f79e06dc8
-EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B 9b7225971cad9b1d88969dd826d4e0712bdd2a7f8e84ad766f375668c03b72832c5cbfa31199a6bcc60ac0d61baf2ddd71dcf4baeda08c7ee9b70b91b0671da6 SHA512 9198cc3fcf2b48e4888d62b656de9b1915600694d18ff092ba01ec553e39184ed126af9641819286e45e36cc60e726eca1a64b5d79ec7bd0554ac72a56b557c5
-EBUILD nbconvert-7.3.0.ebuild 3045 BLAKE2B d069c02a385aa2d8b9790693ca87ed0c2ef6fb22ee41c3d967858989f55074d36c6244ffbfa28c7de3c373dea930e6ff9d7270980b95c20120d4876d34261cbc SHA512 43d0bb082c8c0a4c925b44fbece61e3727b046cafa1302dd1618f777e4ce36a6def606dcc1a6e9d955c77b0523b0c5fdb46c584a27e8818f99e6193f79e06dc8
+EBUILD nbconvert-7.2.10-r1.ebuild 3045 BLAKE2B ee3637497b8cdb094e1835351557e5cc4d812afd2477c927622675b35992ad410a04b6063726d1a2c87dd5bf3b270b1f29126337995d95ac52cc5dc6ef52c65a SHA512 9a73a478676ba76c49f34067d2463f9b8e7850ad12dfc9a90e4781cbe3fad57adc93fd861698653ecc685e787576cf3674991bfe1796c5d5f17414f5d814cb51
+EBUILD nbconvert-7.2.9.ebuild 2772 BLAKE2B c08f33eb7514987f6db8f7c44f6373db76d6e278d015edd7b161ce08b71304251365299bff55f87457bd6958b4e3549f49c66d9cd8bedd74c35999a65865d588 SHA512 354b2b3f32be7c71b9b285a205a3df8848b32a140eb9c1ebada1ca8679dd84c73556e1bcb10f74ae01e11d97639bddd2aa444f91acedd4802cb6efae966238bd
+EBUILD nbconvert-7.3.0.ebuild 3045 BLAKE2B ee3637497b8cdb094e1835351557e5cc4d812afd2477c927622675b35992ad410a04b6063726d1a2c87dd5bf3b270b1f29126337995d95ac52cc5dc6ef52c65a SHA512 9a73a478676ba76c49f34067d2463f9b8e7850ad12dfc9a90e4781cbe3fad57adc93fd861698653ecc685e787576cf3674991bfe1796c5d5f17414f5d814cb51
 MISC metadata.xml 527 BLAKE2B a915103b3eaf57236f4257c98354a1e3733771369ac825fa8bbc4f79f0d1a23272dc86e744513620fbee37792e813a15dbb955e633a7c57597c3c38657ed05d3 SHA512 b60a311ce52915dbc12addd4a882670ac96ff8b3be2aa651eaac3d0963d6e73a72eaafd53f90fb685599504857e6bcd0568071962d7696c2605462b77260ad6a
diff --git a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
index f8c9b4fd4ccd..246ad4c16554 100644
--- a/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.10-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
 	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.2.9.ebuild b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
index b46ac6b2ec49..82af77a2e7dc 100644
--- a/dev-python/nbconvert/nbconvert-7.2.9.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.2.9.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
 	' 3.8 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
 	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/nbconvert/nbconvert-7.3.0.ebuild b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
index f8c9b4fd4ccd..246ad4c16554 100644
--- a/dev-python/nbconvert/nbconvert-7.3.0.ebuild
+++ b/dev-python/nbconvert/nbconvert-7.3.0.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
 	' 3.9)
 	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.7[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
 	dev-python/jupyterlab_pygments[${PYTHON_USEDEP}]
 	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
 	>=dev-python/mistune-2.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index b1ed1f76f4bc..7fabbeb1461a 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,6 +1,6 @@
 AUX nbformat-5.7.1-no-node.patch 719 BLAKE2B d9a30c5cc917f6056e73a90f2300d15aa57d666f79d7185fed2ba092438c00f0bda307b1f0e4d2ca1429bf17a8a44475847aa98292c94fa5bcb911d868fcadab SHA512 2b52e2bf94155460f7963037119078301ed96d6b838d0f639f4775d6b10ee73ab05ebdc381eb020fdab01517f9b92d32dd2f45d7d614e783c221da937e4cb3dc
 DIST nbformat-5.7.3.tar.gz 140407 BLAKE2B 7e699939e0d13394851d6bccd02855beca041192ffc273c754770fe6c7d6135a17b32b40224d664bbfbc02e30dbb92aacb24b56cfd44a6c10b4c817a09bd11c1 SHA512 d705d959ea4d5b5294f137dff6b2b60b936ad7d2ff4aa06030429e9ee1e55cc5c9ec7d0f2196a67b67080e79177a18085c6bf75b84ab8ac5606fabb53455e4c2
 DIST nbformat-5.8.0.tar.gz 140655 BLAKE2B e45b6fcc45fa01ceed49fba0b3a3fd749df6692e355156845cf69fd9d2e176332c61c89b5474ffa89d96da4d4453b668150e96ac266cddd254efdcb1a3b742a1 SHA512 f000db59701eec2fed8adba6c1b521bdfaf942bcd0dba2d8d6d79a7d28b078f4a29df05ca3f393c1651f3ddc6b3690f536928d6fff5937982cc52dd013bc6498
-EBUILD nbformat-5.7.3.ebuild 1072 BLAKE2B 09e4c2a2931f4fca80c8c1d2cf705ed41c6ed5f89b6fdf64eae38601aee847306c74bf41c369e579837d00f627b057c55721e7a0044c9a87dab7c65cd9054932 SHA512 5e266274c3ad15f8b0bc43de091a2479e4404bdb0d58a9599649449d0081433103a20b01b45f53e72c27f96f224de13a1ecd430942da0ba20d9af8092cb3cab0
-EBUILD nbformat-5.8.0.ebuild 1080 BLAKE2B 842a133a60a940aa2d51bfdc3201bee1cb1411d27b32d1c0991faaaa01d61c7fe93f33e6198c49cdbfe5f64af7a820cd406755d1ccb137aaa10fd6f62a296f3e SHA512 9944b5d62209f4eb99e801bb500a000ee4fb4ab63dcddcc5d0a540b7408232f709d97a554fac6418093e26d7c5e65c88890646b8ac8632bf4599af1e12cee483
+EBUILD nbformat-5.7.3.ebuild 1072 BLAKE2B 66edd69158d6524217cc6b242fbe5dec4587939dc6ae1feffabd8477731fdad8c29d091a89783eac4c122d8e54154177490a9b8437e2b4a9e5103ec976f88c99 SHA512 8b72f7976b8c620474d6e34bd654fd2e164ad0a09eaadb5335aeb6f2aec9f623af9ee19d790e1165d43e87429b92151d64c71412862dbe978d11bae6307bfb5a
+EBUILD nbformat-5.8.0.ebuild 1080 BLAKE2B cf27300b9e174cc49aa49fe6159c05118ce1c48fe5f567858f3dfbaa4c72e18f515b05cb4fc3fde1b0b3260c1512e57641b485bf0ef4bbb22e031007f42e9aef SHA512 362c2c74c52979e06d18b652e3ecc15656b0a227215f046a2f382027cef77b7917314d2a626b3ae6cf34419bd39e4042c753c20894eb311daf36f699e9f58722
 MISC metadata.xml 780 BLAKE2B d44b94d8d10d01e2b8f465b6a0351308e7c219295f34713ea2f26f0cc1c9ee4c156bae3a33977a8adc0bd2cef177d468a5221d0d7a5bce946bcd3aa1a1ff0623 SHA512 0d15f8e0ef1d3f675cfabd0a9d4db7a8844be4ae1c9ff06825bc9a0771ef7e2430d1ff66a3ded9ee64df42ab4277c3eba65ed256d6a672cad20154272a0a2c96
diff --git a/dev-python/nbformat/nbformat-5.7.3.ebuild b/dev-python/nbformat/nbformat-5.7.3.ebuild
index 4948bed62214..41d6dc238f8f 100644
--- a/dev-python/nbformat/nbformat-5.7.3.ebuild
+++ b/dev-python/nbformat/nbformat-5.7.3.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/nbformat/nbformat-5.8.0.ebuild b/dev-python/nbformat/nbformat-5.8.0.ebuild
index 6782cea7545c..315da4ea406f 100644
--- a/dev-python/nbformat/nbformat-5.8.0.ebuild
+++ b/dev-python/nbformat/nbformat-5.8.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-5.1[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 2a96fb1a90ea..e3751d815e3b 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,3 +1,5 @@
 DIST networkx-3.0.tar.gz 1987075 BLAKE2B fd5de216f4934a1d5c730264b3860a91dcaf7a12462b615b1aa22df11bfd7d530a369442eebe185572e94bedf6fae3ef4a452804c84fdf3f1e79527ffab2d5c9 SHA512 73e1a9faca6ecd04f6d8da4cd5a887af31738fbeca3d06adc57a4a61fad1d81ab30e89f9c4d25274b0890519b0a517f09402eea3bf3f26b18c3e3052b837ee37
+DIST networkx-3.1.tar.gz 2021691 BLAKE2B 002bb00034e06a45298716c86fec4462efe8db8d206e8263d2e4ce0becc9c073aa2856e0c2df2e74d53237be0b02752204c7e387651aa45387781c383dd1f190 SHA512 9d75ecd25020f83c650824e9449e1c53004c13089dccf7424b65787144dfe3d2f638fd5aca1c4a792b165598b44644fda45bf54c49b3af278ddec5e1f669c38e
 EBUILD networkx-3.0.ebuild 1842 BLAKE2B 2180b3e3c20fbd4082ffc5c30c2fb761246f474a010b489aa2a85f74ad338bedda673a88ff745b7f6ea13a453c7fa744caa50ab7386264f5d5ab74af1be93061 SHA512 60356e4852c4e170cc283cf97dfc0fc25b47b09b3c387bf022bbdbfa0b8230c94c79a28546b14cc5afd8407291a59dd3bfc853a3555d3352fc31758ebbbd718b
+EBUILD networkx-3.1.ebuild 1846 BLAKE2B 63d7429bd8e2de5949a3be409466f3bf7279feeaecdedf5d18caa57a0a8d3799b9c7de2f97333360a99385170a123eda35ad7787154f8a4c0b966569426a5c98 SHA512 516297c9c21cb3a47b5c205992cac786d488d3f496527488a3beac32c699831fbeaf795911378a93d607bd2cdadba81af55629f6a40665035ff7b23c761511e6
 MISC metadata.xml 1090 BLAKE2B 9ef8ce06a4f462ac6a535217aa6bb55c9f1994ed3ab57b4cb656434a93a0c1fb401932307c43bd680576b82282b4055b1ee9ef1d49cfd5113927dc4919dc7616 SHA512 e9b291b754118d278b109f5704607f2d9b3807c9e6195b75b77388129952c79dba16e86f0a9c5f65479185c409c5191bb1f8863e282dde052b12d40bc9fb9901
diff --git a/dev-python/networkx/networkx-3.1.ebuild b/dev-python/networkx/networkx-3.1.ebuild
new file mode 100644
index 000000000000..9dbe3e14a5bd
--- /dev/null
+++ b/dev-python/networkx/networkx-3.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_FULLY_TESTED=( python3_{9..11} )
+PYTHON_COMPAT=( "${PYTHON_FULLY_TESTED[@]}" )
+
+inherit distutils-r1 multiprocessing optfeature pypi virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="
+	https://networkx.org/
+	https://github.com/networkx/networkx/
+	https://pypi.org/project/networkx/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/lxml-4.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+			>=dev-python/scipy-1.6.2[${PYTHON_USEDEP}]
+		' "${PYTHON_FULLY_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			networkx/drawing/tests/test_pylab.py::test_draw
+		)
+	fi
+	# virtx implies nonfatal
+	nonfatal epytest -p no:django -n "$(makeopts_jobs)" || die
+}
+
+src_install() {
+	distutils-r1_src_install
+	# those examples use various assets and pre-compressed files
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	optfeature "recommended dependencies" "dev-python/matplotlib dev-python/numpy dev-python/pandas dev-python/scipy"
+	optfeature "graph drawing and graph layout algorithms" "dev-python/pygraphviz dev-python/pydot"
+	optfeature "YAML format reading and writing" "dev-python/pyyaml"
+	optfeature "shapefile format reading and writing" "sci-libs/gdal[python]"
+	optfeature "GraphML XML format" "dev-python/lxml"
+}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 2684c2a16c55..6f9da54f8968 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,6 +1,6 @@
 AUX notebook-6.4.11-no-mathjax.patch 1527 BLAKE2B ccd6d1af303eccdd0eacb760d1b741b11354fa19c46b4d96c04da150793ea9e825cbf0922e152c7eac010ac4ef95d4fd16057092967a12873744fe45e6fbc4b6 SHA512 eb72afff71ab2589afafc735dff50651f9bd55aa8bda520d6d9ed8769373db8b557f79d69e4f2a0d95863e3c9f4d83e09a3a915390e6ad89d6d3bc558101a44e
 DIST notebook-6.4.12.tar.gz 14389641 BLAKE2B 1cda6a1eb1f4e7ccce964153bdce8de243588ffd4abcc5ab6687ba0ea347d68c5dd239c2af5bf93809409d850747db28df72be5c2ec03bfd06b725976ae1c599 SHA512 1314cfebe97ddada61e1013fdfd606bed08908c06b58e59f2fda6e63c43a1158eeed6a93a5cddbb609ecad0347bf80ee3a74747104fd29942629734c1ea749f0
 DIST notebook-6.5.3.tar.gz 5785846 BLAKE2B 90b028816ad906057708612c82d4c257616e28e2f335dfa26990888b04f6c2372dd1f579b28534ec0ed3c5a160e3c44c35f173b312e3d395db0fd3f01860dab6 SHA512 27177908960ca2e4c83bc5f4502250e02a885daed5f9ad67694502794f140e9e66f0cb24568a3903600c8f5cbae6d626fd7bfd362e23cc523bb42c210f5d2c70
-EBUILD notebook-6.4.12.ebuild 3180 BLAKE2B 4294a3299739de611a6843e9b434d568e01ecaf6dfeea5768695e153ca77977e2044f9ad33a0d5f55fe719090b94d2e1f2336e9c6d28bf8f72d15e4816983f95 SHA512 de87f5116675728098d2da7a970d61d646b3f3cdaf4d098ba10fa6fe66768d2779f29ff8d632d578ce60e409482f6700a0cacdb11997e4edb1bf7d7d3d500929
-EBUILD notebook-6.5.3.ebuild 2805 BLAKE2B 34b34bc4afc686400747c4b43ed5fc428607b160553a61fcd7f7d32c2d2aefa86143070469b56f5817256d8a40a7f0236ed6c5eea23bfda611756f6bd443b7c1 SHA512 bbb243cf1ef65f91a78529f45f7eadf68095473817cd2df31567fdb9b5a819fa31f5bd0dbd1f5bea5b252edb0c7cc288f1832e8bcd23a60a855ea90d8a11e031
+EBUILD notebook-6.4.12.ebuild 3180 BLAKE2B c161e33f68868e8e29fc3162646cb479a8a80a88d5c6e67e0420ffc1c064b7b38cff2eb9c8c0ff0ea6b20fe092089a5c646959e02fd9edf578065cd191c9571a SHA512 3473583b7033c667e9e0c5bf3f4539027e4227d0c6b599301323440dfeef3e69f54d96efe213a73ee785d7d9ca47098a7cdbf8401f9a9f559bae914229927a2a
+EBUILD notebook-6.5.3.ebuild 2805 BLAKE2B 64f4d6bcfa93f53eed38ae8000f03200f118343af111af0b8c6221daf9d5842ad9ca6b17c5ed8c0f454c4ae805606e4dcb132d856fd57518164c2528ee0b5aaa SHA512 d95bbe9eb80115a7c46efeabf68d1b39fea4bad817f7d7b9d72028174d0aefe4016a5f33a2b0dba72024cfb0b1010f0301e72c2875092aab736a0cccc0b25c3b
 MISC metadata.xml 525 BLAKE2B 03602bbd7c6b55aaa4c4d6011a91127090359079ed2d7e6b9e3cefe63b2b249b36cd172a40d1ce69234de2440d9248e933dd94a636b95c07f06a658ecb929227 SHA512 18f6bd5cb4b1c90cc228a5ee506cea17c4aa9d60174e00c7cb4df654d5d7158aa20ea6346bf9a0734877402a0e0916aa7f9e82f0bdce0cca78c877c5e87550e3
diff --git a/dev-python/notebook/notebook-6.4.12.ebuild b/dev-python/notebook/notebook-6.4.12.ebuild
index 685cd0c2b8e5..559e618c4cd7 100644
--- a/dev-python/notebook/notebook-6.4.12.ebuild
+++ b/dev-python/notebook/notebook-6.4.12.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	>=dev-python/tornado-6.0[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
diff --git a/dev-python/notebook/notebook-6.5.3.ebuild b/dev-python/notebook/notebook-6.5.3.ebuild
index e8251d1989a2..57319b60138b 100644
--- a/dev-python/notebook/notebook-6.5.3.ebuild
+++ b/dev-python/notebook/notebook-6.5.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/ipykernel[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
 	>=dev-python/nbclassic-0.4.7[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index da73bd5aea09..f6ad3bd8a11c 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,5 +1,3 @@
-DIST openstackdocstheme-3.0.1.tar.gz 1256111 BLAKE2B c0a1a68e8e0e423bc704503dc2214d9cb51aa236daf39ba6788ef95240c25c05d1bd8b7ce2cb3d7c7290e574f3c78b276a28afe5a92645dce6f1b3ad54109158 SHA512 3643e5fc7a6e7090e766d8e0c71f6f3dfe32ac2529b3f70a7b0e825765be92dad58a2f399d8993716c9c87f0781a117b602f090abc0f3905e0586a26c87fe449
 DIST openstackdocstheme-3.1.0.tar.gz 1256193 BLAKE2B 53bdd85094a74344154dd4a25f2d29142be12000f5b38c8d723ce800794677972215b6402d35fe9385ede246efd4111d457ccb2d04eb540fcbaea5cf92382c04 SHA512 654859f40779e1d285b08b12c040b016a066a62e0a6eacad3c5a271ee40ba1147650ca1b95ac68a4fe254a296948f3ae30803cd26f9f67f1be944683fe24445b
-EBUILD openstackdocstheme-3.0.1.ebuild 757 BLAKE2B 98b0867ad8b0f7b6ca473ae0806964ac17bf9e9621c3e10d9704c760f2fe2c8b05326ee834715cfd10472f5638db3594545c0cf3fe2b1713807bcbdcab83a799 SHA512 e5d71ed6276659adce5a29e79f6792eff8fe6f4109ba34e3885cb6877a29b619eba520f7356e918dd8dc9aab63485665437e86a75d66ccd10f8cc8170171a7ab
-EBUILD openstackdocstheme-3.1.0.ebuild 713 BLAKE2B 04dba1e7ecb960233c4445ed7a6bb033b4bbd10c6af5030621bf6e41a5792ecd302a959c2efe90083251a73191424360a50b0268a28e91d19220dbcb7d86cc8e SHA512 e2b652df3ed5d030f4bfd84b4673f5c82d37b44cf1aa1bfa7bb098f53cf399c3fec70a1c4ec7e22ce807ef9a9b55f36d89352c58f6b3caf02378d519b17a5015
+EBUILD openstackdocstheme-3.1.0.ebuild 710 BLAKE2B 3be11178a9fd4274ddb1e860cc26a536eaccb15d6127c576175c817ee3a7e207a88c834a5a6aa7a7db82a1c26aedfe3c46aa35b159794f30e9563b1a7380df62 SHA512 ae04f1f5dc2f9b59f8a856e5c12b8bd4a1ca479928b40fafec0f98ca228564a7579030a7635cec74b84b347bbfdcf892ce349ed5165b534c85075d61baf5b540
 MISC metadata.xml 747 BLAKE2B 17de68317b0cfdeea5d574db89402a0fd4bb335fa78a4050053585e7914e232a2679693a05a6ca260d84f7f82c2fff7c0af1b82183dd33e6ff96d947ed1ffab5 SHA512 3e132316c7623ae609f8f1035fa719960cea7448c3437f0b5456984cf3e60b62867ce0a8de3a7681315472984d2a8d317f5f06e68e2b0b8343c429cc55eff1d2
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild
deleted file mode 100644
index 5971059b5395..000000000000
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.0.1.ebuild
+++ /dev/null
@@ -1,30 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Theme and extension support for Sphinx documentation"
-HOMEPAGE="
-	https://docs.openstack.org/openstackdocstheme/latest/
-	https://opendev.org/openstack/openstackdocstheme/
-	https://github.com/openstack/openstackdocstheme/
-	https://pypi.org/project/openstackdocstheme/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
-
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${BDEPEND}
-	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
index b0bb11bcdcdb..b8f638211ce3 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-3.1.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~s390 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 671617b97b89..fd5acb4ea9e7 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.config-9.1.0.tar.gz 161010 BLAKE2B 58edfd3218feb51b993eb6b23fa8ea6f0464d5210f35881c1c509c672cce961f62972634d4922aed7105163d4d0f90f6a34438009016d3e2bb43dfd8c4bdbf75 SHA512 768ee64c9bbfd8b23de7a3b15d46e5065356769f2dd4bc4871ad3cb8c56febced57515c89a8c530b6ba7ae347eff826b7c4f4c12aa80daf3325b0143dad1045a
 DIST oslo.config-9.1.1.tar.gz 160964 BLAKE2B 180b76d9425b9be72dac22379618b69265ab7016044ac81ed826134036aa988d867882116a50597df62b702bfff4460ac17e7c1d435ff9a1f0028a2ff64b7a2f SHA512 820da069642a663cad0787ee4e100720dcc9870faeaa208c8aa5be5f3c6bbbf1e5e3d2cb8c5d86765fd4114744e2fd1a00902d79200ddeba5fcec2ed61405e4e
-EBUILD oslo-config-9.1.0.ebuild 1617 BLAKE2B eb12a9ba08e9dfc86285e29200ddf5798da2a4bc75be77e4dc4db9ab00d19dbe58be7228301b5fbbb273daf263d5a270af7c266c1ae4e379e199e85de3f2c211 SHA512 93123c61023cf522746796b5011b45462a667eff990ad19e26e2236978a6b051ad8a70df3319229955e48455e174a1c62b2fd2f8d9caf1a559d4403076e76446
-EBUILD oslo-config-9.1.1.ebuild 1570 BLAKE2B fbebe607f4aa4fa5701b75886a18c33f53a5c1afddba12d4ee32d5ba4e953994ef5ca41d6694981b525bb881f0d81a922f30c40aeacc87b9cb25d61eada0bc8b SHA512 4d3af00ff40df25583418cdb52a9740e42e006c99193a39aa84f20fe6e2b5652df61f3fbeec736af3c8c4a8328dcba053cf2895874c9073d3c5c90b4d73b5c96
+EBUILD oslo-config-9.1.1.ebuild 1567 BLAKE2B 41cd50a123e21849c44799d6d45fa1d5fb4ae6b3f19626c86852eb8ff5221fa825b065103803ac591c82ecc3504e605d71288e33ed3e926e66384175002c970f SHA512 79f2aeb9258e5538314f35fc14b885818b596242c3d5620bde4acec69cca36fcf97c0e5d02f68d51218a2a965260ff1c3bb54b388570c312e2e2d20d13daabc0
 MISC metadata.xml 759 BLAKE2B 88d0bbdc03286429f96554d184f664fbbdb4e067ed137f95a96a573c09b4573de90e50b2d5875d627c8b9ed03a0aec7233bdc8684b721e16085157480568c330 SHA512 a29b5a534042e949f780cfb000bd9ce9cde81ae1c5e6b429bd7854598a2d0f0c8b5358dc645135ba9016065460ff5b858e48e02cdbd12ade2b1fea9d0b407410
diff --git a/dev-python/oslo-config/oslo-config-9.1.0.ebuild b/dev-python/oslo-config/oslo-config-9.1.0.ebuild
deleted file mode 100644
index 69ad963e8f8b..000000000000
--- a/dev-python/oslo-config/oslo-config-9.1.0.ebuild
+++ /dev/null
@@ -1,60 +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_{9..11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/.}
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.config/
-	https://github.com/openstack/oslo.config/
-	https://pypi.org/project/oslo.config/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	dev-python/importlib_metadata[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# broken by some dep upgrade
-	sed -i -e '/DeprecationWarningTestsNoOsloLog/,$d' \
-		oslo_config/tests/test_cfg.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x COLUMNS=80
-	eunittest -b
-}
diff --git a/dev-python/oslo-config/oslo-config-9.1.1.ebuild b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
index 6734f483ff79..1174ed7064a5 100644
--- a/dev-python/oslo-config/oslo-config-9.1.1.ebuild
+++ b/dev-python/oslo-config/oslo-config-9.1.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index fef4c420ecdf..24ad23903fe1 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,3 @@
-DIST python-phonenumbers-8.13.6.gh.tar.gz 4906869 BLAKE2B b00fcd6085844a9465da15547f8b40ec741a350d24bb888a04dc5e7aee9b94ec1dae83a71548bc75b8cca29af3ee29cccdc5c49447c5b1bbf33a52db049835eb SHA512 7ca6b8872975fc2597b6ddb1b824feb05dd8819da1ac1f73b7ce831070210520700639dc44e1466e83d335453a5c70ed2fae6ae8100cb99f03f62961f38e6dd9
-DIST python-phonenumbers-8.13.7.gh.tar.gz 4909229 BLAKE2B c1984c774670528005231984dd12160ff2259e96a5baec61cf0b85a5444d5af1565fdbee9dd17b81994dc5f186e32faa660c11ba4c07681cc513c1595c28c4d4 SHA512 3987e31c0cc0a7c2234b6e8a04714a2a0e015623ff36e6475df7189488d54e15dd23375c65a1b8f131331b32642bd94295dcd43df994dc16c2aad0b0529fac73
 DIST python-phonenumbers-8.13.8.gh.tar.gz 4910864 BLAKE2B 33babe7aa0f487398311817fa901a56ac8a7470f2e4338700529f35c7622cf9b663bd404f6c1087600c03fd2844a1c777ed81d2e61d9cc2f0ff78e68a0276624 SHA512 6e2ee96aa9c20188b276cdeac1365fddb339feb63e8d5e9f61ae82f6aa19cc6564a5f1dbf687d6cc69c2cfa21fbb14892f880677ac7ba734a949183711faca5a
-EBUILD phonenumbers-8.13.6.ebuild 808 BLAKE2B 68bf5867fe33d7bf194dd170c9cb30dac10bc0886d9656936d691e046fc72025e8205214b14c350e95720de49876f376ee1a17965e3ae2f2aff592536a60af38 SHA512 720fe4917947d28d3c32a4ac9fb41d0c9be99bb213b9ed45e9dfff277d65a693cbe2b711f54856e7874254a742bca4ec7571c400eabbeb77f31a1af64bd93673
-EBUILD phonenumbers-8.13.7.ebuild 810 BLAKE2B 1cf55707f2e04cf211a46c748fbcd6f59ecabca31907fd7c043132ea51035a8164d1acbced3ebab8cab02ea2b72319a340cb2d4716e8a6c4bd6dacb32b4903d3 SHA512 57a7056b22c929f1f54469220b682dd6c6bad1cbe9e50c7e4593aa285641e9abab1ab9cb9780d04db739a24211bad398a7c749d4adfdbb579ca027959407c07b
-EBUILD phonenumbers-8.13.8.ebuild 810 BLAKE2B 1cf55707f2e04cf211a46c748fbcd6f59ecabca31907fd7c043132ea51035a8164d1acbced3ebab8cab02ea2b72319a340cb2d4716e8a6c4bd6dacb32b4903d3 SHA512 57a7056b22c929f1f54469220b682dd6c6bad1cbe9e50c7e4593aa285641e9abab1ab9cb9780d04db739a24211bad398a7c749d4adfdbb579ca027959407c07b
+EBUILD phonenumbers-8.13.8.ebuild 808 BLAKE2B 68bf5867fe33d7bf194dd170c9cb30dac10bc0886d9656936d691e046fc72025e8205214b14c350e95720de49876f376ee1a17965e3ae2f2aff592536a60af38 SHA512 720fe4917947d28d3c32a4ac9fb41d0c9be99bb213b9ed45e9dfff277d65a693cbe2b711f54856e7874254a742bca4ec7571c400eabbeb77f31a1af64bd93673
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.6.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.6.ebuild
deleted file mode 100644
index f02dfcaeb112..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.7.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.7.ebuild
deleted file mode 100644
index 20fb3f38daee..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="
-	https://github.com/daviddrysdale/python-phonenumbers/
-	https://pypi.org/project/phonenumbers/
-"
-SRC_URI="
-	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ../README.md )
-
-python_test() {
-	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.8.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.8.ebuild
index 20fb3f38daee..f02dfcaeb112 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.8.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index d874c621170e..bfc3b98d04aa 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,5 +1,5 @@
 DIST pooch-1.6.0.tar.gz 52318 BLAKE2B c5cdf04a27a5754accee5a4522d5e6a51c4e71b7034cd570c6a2f30bc580ba9c15e0717be792e7cdd020ca745e6813a63681ce966ad61c0ed4aaa8b84829b920 SHA512 e1b6253b8879ef172bd6370139a7807355c7e1c03a1626ac46cb083b1f7d8beb5a8adb08c0828eb34e96a7164211d2dc7da214fd0176eb0606fe4ff47911257c
 DIST pooch-1.7.0.tar.gz 57457 BLAKE2B d85fc3cc707bfa639f46bf75b89dd31714f7a4f64a90ff7a6c92b792a8209e66a5fffb62912a336cd481330c37c0037df116d27ea06808bf02f1039e2aac930b SHA512 60126b893a9a1422aad12349143fbe72e485004f79b06da752f51ae374f375efae693304210c8d62b211433d7ce75fab53a50a6f267b1952df83fdccc2de13a7
 EBUILD pooch-1.6.0.ebuild 1494 BLAKE2B 860b2350a1b6bc39f7f309df68ac345e2379f75108a9ce403bbe20cff2f9d8a1d078892255a9a2d72bfbab3175d01a3d0423d9621624d7b40d8b23d1c4620950 SHA512 8340aa94d27763d42a4eb75fb1b312b3b2c373013df547e627bb38594ed6d3f7525916ceadd9d6cf84f739f17806073f4a89f8769d60fd163d714313c8320306
-EBUILD pooch-1.7.0.ebuild 1467 BLAKE2B e0c7dd515de5c58ce3236cda1877d15675bc0024ccce45cb13ae86c158a5d5c2fc57ff4c0581c5763cba08257eb3d16b3edaf43576993fcd346ed6313be57f56 SHA512 977ccb71061bad2a53891ea0a0faca8df9242068a01f79992416d27e81e78c0fa3c72e56c675cd1a1fcc15d4b08939e74e2f87deec2cf7c4b4531a493b6166e6
+EBUILD pooch-1.7.0.ebuild 1462 BLAKE2B ffd58db457cf1c86aa7f10343ed68871fb49ad6c32bfee0d8ed68b6403a7ca0a27b34c61ba559599e66a477f09e1fe6d6de2b02119e8b9dbd28375373513ef29 SHA512 f47718db6aa23f69248056944def09cc02f75278509e011e0cc8db18973ca741155d8665b7072b3f2aa36d9d837078e534c024485a5c10ac74f831574eb48ff7
 MISC metadata.xml 684 BLAKE2B b6cd1db5a31f316800c9c5e15e11c858bebc81b7c38ced227e7f54a5a0386462fa9a92bb8f177d9df0d3fea00775dced1e2eebbb1622fededdac87ce40db21e7 SHA512 a96adfa4b8996e2685f7d5ea8ab6936fcc795a3f517da8ec14e885c08b2ae1f6d950ea9314e8aa6a4b2a4b436a23d1e98a6d56b5ae0c633bffc4fbeaca4058a4
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
index 6d0af9d99353..95ef06c7f5ea 100644
--- a/dev-python/pooch/pooch-1.7.0.ebuild
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 51cb51466557..d3045c1d02ba 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,3 @@
-DIST pyglet-1.5.27.gh.tar.gz 6532179 BLAKE2B f1dc668530a69e275860befe11f4c86003c5de2dadede706df7abac9eb6fb1729ea030c7053f0149926f3ffdd12985d9abea4afac65de3b6b7541fe871eda369 SHA512 98896dab06873cbf3cdd0d4015cb0b9e062cffb1110908bd422ecdc4f0e16943adc8a4986e7dbfdae4392e82ac115bad6f937896e166989ad2c4d73a0f45c8be
-DIST pyglet-2.0.4.gh.tar.gz 6172461 BLAKE2B aa52844336b2fa34c6d75c8ee45070b7d8b85c283e374daeffa21367d6ddefaf39c22258eb00c666dad1f5ee8d157c0b1716a5cd1329942e98538e8172ed6137 SHA512 c26c59b9f7e6f2b1bd20456917ed50d6b70169dd2af5b92cc61d0e0515dc7c989eba9b41e00a106510d53e8ea218cde185f8b5038428490f3b9b3623a2f40207
 DIST pyglet-2.0.5.gh.tar.gz 6174681 BLAKE2B 6f4f80cee2984148a7579ad02ff86e6cc1c151688ace0153cf3a518eba3004518f900b0297877a86278f4159c342f190d22702bf1ebcaa254c4bef19e1ac0844 SHA512 54bd6630a61606a02103a6ebc9deaba1b1716ff4acbc3418f33496cd238421f6c015affd925ed8f61107a70ba373fe9cc5f89ea3c1b4050f44513b56d28eb11d
-EBUILD pyglet-1.5.27.ebuild 1635 BLAKE2B fcff950052e0a2855a39c51594afba26d69153cd04844ee2b856bb23820be8f0c3b6dfcd05bb44eb69fe29aadeef2ecb93f18e5ee8d1514a7b825c5e9174fbfb SHA512 af4fd99cb92786d2e4d3e94e41d98749ab380ee3b01319e8e5a88bc8e307f51f7394946709c92a734897adea5ff8dab303a11e2f70b105a540d2b96b97cda4d5
-EBUILD pyglet-2.0.4.ebuild 1927 BLAKE2B 1b84f3885c815ac2902c2c2a679c0c1ff67e63638953b3d8edbf60aa7b87efe28060ccab38e6081318f3e95fcfa13e306fb4a1a1c685f8b90e7b4dd21e7e1146 SHA512 eaea171479952bb428abfa2921e0cbbc4f93e7980f2bfd945c6927b32aeb316028f80c75e7664a9b1018d63c35278621254a07e5c92500248603a0825c7c809d
-EBUILD pyglet-2.0.5.ebuild 1929 BLAKE2B 1b39aec89d5f5bb2b2a5e45c1a53d89ef5e8b1b5ef5d7876577d5fd9647a07161bfa3d39a012bbe016d3c9666f62645ca4f60dcce9d781550559221bed8b5943 SHA512 0a58bb972b41f6541c36f2d01eadae3908eca23d56b8918905b220f78852bc2a7ce7044f2fca646decaf5e1a50a428743ee0d25b287583e89162d689d7a0a652
+EBUILD pyglet-2.0.5.ebuild 1927 BLAKE2B 1b84f3885c815ac2902c2c2a679c0c1ff67e63638953b3d8edbf60aa7b87efe28060ccab38e6081318f3e95fcfa13e306fb4a1a1c685f8b90e7b4dd21e7e1146 SHA512 eaea171479952bb428abfa2921e0cbbc4f93e7980f2bfd945c6927b32aeb316028f80c75e7664a9b1018d63c35278621254a07e5c92500248603a0825c7c809d
 MISC metadata.xml 1092 BLAKE2B 51abba6b5545fb47d277edaca91fda755e885f08a9407f5cd3d468c8b0b86991b57d8d151e27d59755ea884ae894ed0e5c32d357b0d81e66eb9054ca6fc92055 SHA512 7e47cc4c39ebf827bf46423251df994a65c2af8ada9420b36810e36f245bbd810796bc8b02cbce182ff071bbd9dae0c9e5d9f5cb201349cd49fa311b3891dc2f
diff --git a/dev-python/pyglet/pyglet-1.5.27.ebuild b/dev-python/pyglet/pyglet-1.5.27.ebuild
deleted file mode 100644
index b13351de8283..000000000000
--- a/dev-python/pyglet/pyglet-1.5.27.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-# python3.11: https://github.com/pyglet/pyglet/issues/606
-PYTHON_COMPAT=( python3_{9..10} )
-
-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 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-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
-	)
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	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/pyglet/pyglet-2.0.4.ebuild b/dev-python/pyglet/pyglet-2.0.4.ebuild
deleted file mode 100644
index bc825ba60962..000000000000
--- a/dev-python/pyglet/pyglet-2.0.4.ebuild
+++ /dev/null
@@ -1,82 +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_{9..11} )
-
-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 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-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
-	)
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_DESELECT+=(
-			# broken test
-			# https://github.com/pyglet/pyglet/issues/606
-			tests/unit/test_events.py::test_push_handlers_instance
-		)
-	fi
-
-	# 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/pyglet/pyglet-2.0.5.ebuild b/dev-python/pyglet/pyglet-2.0.5.ebuild
index 0a8fe221c50a..bc825ba60962 100644
--- a/dev-python/pyglet/pyglet-2.0.5.ebuild
+++ b/dev-python/pyglet/pyglet-2.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index 5b24f76d2d17..89227a6757f1 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-forked-1.4.0.tar.gz 10197 BLAKE2B 7a6ec42f7ad1323eea243739a9186fb87eac3016afef844ec39a6e3fd55f7d40b1410fcc27074624f8468e6dabddffcc22ea0597bbbd898fab71c82c06e25b46 SHA512 ba402aec6dbec7a94815913192a49390b637a123d3557f48d809ae2e871e9e0cff8f9d0feb99e2bd06fe9486520b5e539f397d39475a720f8283b1bd21c751c7
 DIST pytest-forked-1.6.0.tar.gz 9977 BLAKE2B cfef0ce10c9690894de14ed503ba74244c99c235838039f800b2c26430258e62c98fcc49d9e59b240b2ceee79e467bfbf0da5c96bc4a2d59770ceadd5021a5a9 SHA512 28fedc56fd696a4e7cf528034056849eff14094d5e7f0e94c7c477a7e91e42c08988769cf6f40d25fe8823399e552253cde2198121dd6a9e475fb6a8ce358cad
-EBUILD pytest-forked-1.4.0-r1.ebuild 872 BLAKE2B c029aec49f9955befdcbd231c34e01c425581c52327eba15283a2f1850d005e451417e91f665b7d7c06b65457b9e71085bcd60370a2ea4d0681b425f2e16e1d9 SHA512 78c70fc99d9cd09eeddfe97f61a85945ed6375d8202b6796c9b4ad76d76c18d36e4839f74779e5d7866731e0e3ee6eeccf8edf4e6838fd3fc5dcc90dbd21de7e
-EBUILD pytest-forked-1.6.0.ebuild 853 BLAKE2B 84fa90bd5856abdfd89b5391636d56678de87abf61313397b28241354c9fcad848915861713da8c9708c60ba4746f37e349cb540164a9b379e33a7d48dbd7491 SHA512 d17317d723cd6e2bc4a2bf0b246f03afff032e719b3477f1d57f78e24be4a7bfd0ff917a8870eadc45dbde0dd9a3d2bbed60fee2b13961a55841181145eb8ab4
+EBUILD pytest-forked-1.6.0.ebuild 845 BLAKE2B 44676552c0458db847cbb946db6e6353d4b763f7f1805d7c5556434ceaadbfbf287c0c652e05cd374ec41919957b26f4afd1c369fd3d9bf9059789a0f01c8347 SHA512 ae72b336c03a90d9d3a595d12d5f55dd862d8102a639856c65730ee6ef2c1e701569be8cd2b84254efc0c89d5c52a53c63905e937023b482f6f1dc1ca8689261
 MISC metadata.xml 405 BLAKE2B 8cb6b3e3b440bc53f5d02a9638b00356f64bc02a8d7444ec5e295fcf91507f94c2460acd02008e6b11ca3bc2dd3d2f96ffb61c583fade0ff4ca00a182c01f903 SHA512 4a1dda1d8ada98b57881884ec6e982c308b54ab29e2cfa104f398876a1bd8ee2015dc7de4891c305f65030e30259079667d42c7a80d14d5148feeb5b7cf5904f
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
deleted file mode 100644
index 68d43942cfed..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,36 +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_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="
-	https://pypi.org/project/pytest-forked/
-	https://github.com/pytest-dev/pytest-forked/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# Please do not RDEPEND on pytest; this package won't do anything
-# without pytest installed, and there is no reason to force older
-# implementations on pytest.
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
index e0163799b944..cccc7f751ac1 100644
--- a/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-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"
 
 # Please do not RDEPEND on pytest; this package won't do anything
 # without pytest installed, and there is no reason to force older
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
index 64d5bbc48ef5..b78dd45b6f0e 100644
--- a/dev-python/pytest-param-files/Manifest
+++ b/dev-python/pytest-param-files/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-param-files-0.3.4.gh.tar.gz 6882 BLAKE2B e2e96bd2cf7b8676f92eeb7821ef76f1f82bb066210170ed4d04a16a7fb3ce346bcd63688ef9d46118c03fd74812fd821fff0414565befb8c558d03d15af2945 SHA512 2df6fe798aab743fdbf892b88ee1d09c554119429167e85bccb87e4ae9d487f8ab5a66c4157827500e8a5d2930277c7490348f6c38f23243e421d5449bde2df5
 DIST pytest-param-files-0.3.5.gh.tar.gz 7245 BLAKE2B 2a67c5ee30d6efb6b7ca7e3272c19c05dda460167cb1709693560ffe06b0ae39ae1b93fc5d6375f4e9cda21e3e02051424789afee55d201cfe070be8a05642ec SHA512 e80eddba2934fe5a6b68645cae243afa936ea3362a29d0b8a8ae4e11229ffb877f1ace9f41ac96d182d5787740fa76af8b106069feb95a7cab1ecc6f8d1088f9
-EBUILD pytest-param-files-0.3.4.ebuild 674 BLAKE2B 6c10eac3ffef597a424c9d16346ddc8c5a4861715176f8683441e805e2b3ee23eab7677a7688a1fca2b07200b25bb5217baa41e1956c45ddd0fdb11f5f8fbe56 SHA512 e2fa76b6c6b70d9d57ed8a4d30db91f4a5bb5711093526e38872dbe73f8bbe670dbc394de43a867d41c0fec94a3f4691569465fc04647bdeb75f80549079a8b0
-EBUILD pytest-param-files-0.3.5.ebuild 688 BLAKE2B 0ebeead47aa19361f681ae282d2bc19e7caf4e1df24dfa794ff3ed0c81120632b9d4e8c5510af4b9982972ceea4ef247345afc5f999ce7169464e1c9ae76dfd1 SHA512 2b059f2f67e394db17035aa5459489361a9d2926237617077bce49f2031817742c19dcdfa78dc7556c3842702a21a2f98e227fbe2c3601b27564f5dd8f464bc3
+EBUILD pytest-param-files-0.3.5.ebuild 680 BLAKE2B b742129273f828e2c8979d4db21ae21d226fcdfdcae6a4c0a0360853babeb10f41424ab1a7544c3822cc60b7dee210175cb3a77f885068f0422d41ea687a664f SHA512 6cbe992e68839946fc558123dc730f815dd6da4eca2419c991dbe67b48a68ccacfef61b8ef8521efb61684d582acff5b313ddfd18c2c9aa1e131f61cbf5f88a0
 MISC metadata.xml 417 BLAKE2B 94bde89ae7cf0181aba1215f8a406889a4473736c37cc325c57635f590f72369402e54f8e54f0b528c9757229b4fdf8608b292a15cc6fa83a997aeb53a64b4ea SHA512 f5b341a0619f750edc6e3f22fc3cfb0c5204d2ce19a756df0f5b282f97fe133f8891105c48b532711bba826ef4cca935eeed4fbb0703da5213cbc3074b7229c2
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
deleted file mode 100644
index 7df2c8ecb9ea..000000000000
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pytest parametrize decorators from external files."
-HOMEPAGE="
-	https://github.com/chrisjsewell/pytest-param-files/
-	https://pypi.org/project/pytest_param_files/
-"
-SRC_URI="
-	https://github.com/chrisjsewell/pytest-param-files/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.5.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.5.ebuild
index 6e7768649ec6..e659cafe5e0d 100644
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.5.ebuild
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 49f2b97041c3..46ef92608bc9 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,5 +1,3 @@
 DIST pytest-subtests-0.10.0.gh.tar.gz 10253 BLAKE2B dba434dfc3f27293d5576ad408665917394ff54d41aef5604f40d787c4d7d9c6fc42b99ca10a8d46707fc8ce0eb5aab8e27bb32b464f5c9350f6bda6b12df031 SHA512 2fc3f8316db879d64d4dd4ad53df7dbda30b69df9291608eb6235aa27e9e6b3ec4174023f9ffa016811eb8955f0ebd673ead7b7319d927d18d7c016e0c7ef573
-DIST pytest-subtests-0.9.0.gh.tar.gz 9840 BLAKE2B c94155c1e44b4bf81bc4d2d1963c952b721634372db9dc5c1b8a7819acba8e84815333c0c67a90d2a930abb98affbd99a721796ed09513635923f6a89e336d4a SHA512 f1bc2b99e6f04864cdc45675574d32821fd5e08c01c937bddc846ac509cd8906d21ee63b11e9e8a87c2631334541e9adc601a7dd69702572d51c3d4b72443ad2
-EBUILD pytest-subtests-0.10.0.ebuild 1101 BLAKE2B ea89762de941b94b884249f66fe1c89ea11bb6b600037157425d215eedd2eab5b43f892a0943a72ac2cae532c7cd15c38cf10f4cbd5f3a5ec6a7fdb09dbda3a6 SHA512 574b5f1516778a1d9df645f2ed5de179503c6294f75010c58648b95fe70c1bdc7b91ccea8debaa4cd4844bae8ad36b4580bb25ad4d5ea8f02a77ec9760cb0c40
-EBUILD pytest-subtests-0.9.0.ebuild 1048 BLAKE2B 1324442ce6a7b8d173bbb0a0c5cce3730576b0a661bd657cb23b6f1788ec2edee57f96f210776ceb446c3efad9a42a56bd698456dc10fed600342f9b30e12d34 SHA512 da48a80254df992f247f64a9aeb01db6cc25a8d57c9d0d7e3e6c33adc8b2481e0d1b120e9178bfbba41628f9729a843bff0649617dca30c48bb10697da0eee49
+EBUILD pytest-subtests-0.10.0.ebuild 1093 BLAKE2B cb0e716345b486db38f6e230cfda8114dcf7e23f1442c4857d8ea5c7bb44aa25f181edd10d13c38420ddd38c4a20b4333074ad06c6a8e1299c45821816730e6e SHA512 05a9548df6ef4a604f533dc2b6b1f5f6e2c770b9774358011f0ab81f9fe61e72853ddda4d9f9d23be55cd8db65dd03a3019107359c74a400a083fcb5c874de7a
 MISC metadata.xml 409 BLAKE2B ca267dc80fa124c3c8ba82f5e46356492e8cadefcf8001469c3c076b079844ae72829b5b527658bea341c3fee3f173421c9f2e7ec7042a171e234070113f4734 SHA512 57c12735a910107b53dbe54969f15ce70eafda3df096c78082d91d5bedc53b015ecae3e3d901e0a2a90841370916f6e4e94041e0b5589ffdce323144375e6c20
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
index ed32b4e2d0e6..2d1bcfccb0df 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
deleted file mode 100644
index 9147023f30d2..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.9.0.ebuild
+++ /dev/null
@@ -1,43 +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=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked,pytest_subtests
-	epytest
-}
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index 5bfef2ab0fa3..1f4fa0130485 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1,6 +1,3 @@
-AUX python-multipart-0.0.5-pyyaml.patch 987 BLAKE2B a2fe5fcc4bce4df83e86771eecbd1f81e144d3c1ff31bd61777ffaab33564904dff05f8ea741292eceaecb69208cf5b6b97e202e1cdbc9b77fee67f1235f323a SHA512 d7a4a630e38df4abc7858e892457a9d63c982d013f18554b3bec52a48c167bb14a534fccadb718600b17d8a7753b5153eed164c0fe3f8f46228847d0774dc8df
-DIST python-multipart-0.0.5.gh.tar.gz 48018 BLAKE2B cfff5c1c57ada3ba3d50da71273435781d62d3907ca1b7e6180cd319f2680258b3e1e278dff760106e7ca9c116f4c5c7adf957601d6d8465bf300e6211b83773 SHA512 c2fabeb77a25119c4bbb71c3faa6de58e27ac2f0c768298eac62b519fc51e5d95fdea05c4f3846ed47205f297802982a001577a73b2feec2d9f585c784d6c3d7
 DIST python-multipart-0.0.6.gh.tar.gz 48648 BLAKE2B 4995136e6fcda8df952a6ee868238a507f3d5ea8f8454d4c4933e89b4897440f9186bd820af427f81b3240ca3610aa8300a944e4a0436291cc414f5e97daca30 SHA512 fb996725266996aefb5284b4815ecd8d0005344359f29780f0c2817125f625f3910be14d7d937e975b3ca9fb27a2a483401ab342a0c861df0e1112d447b1f083
-EBUILD python-multipart-0.0.5.ebuild 734 BLAKE2B d0eccd8f6d36b9615b84e83665b0d11439704c829ea87faf390a9edd909829ec033adf6fc948331396b2925fa993485eb539f1807a240656a955ce016b312ace SHA512 e98ac4e6366b47a90d5e4cf560cba151279e2ab5083773f8e01f3c4ee6e2fc529d921e1ff70e73b3b7c9875aac0e8fdf0fb3aa6e61370b3125b72064c02187ab
-EBUILD python-multipart-0.0.6.ebuild 663 BLAKE2B 41c50ee6faa0d2b23179b39897e6c66d5e3050e961f8e3a36c32c93e7b87349dbec613bd801e664aab7b2fed9e2a6c810fa9fa3a38b7e5c7ff1bda5e122d02e4 SHA512 8aae8be3133af02f3ffe2e3b30549143f89c1e43fd745acd98753a01a5f961a8f9516c6cc503bc1ce204676d4d5ab0f138bf28f189cd0acc0698242cc4e8dd6c
+EBUILD python-multipart-0.0.6.ebuild 658 BLAKE2B 946017ae5b90452f2400516b3c23e67e88f122f6516092e18df9b5c050f64eebe91b591924ca49fe1f7015d6f19b77172ade8cd4c3ece9cb0a27551372562f9e SHA512 179fdc092e2f1aeecb22f5d6ba5d314b9e269f48d10e1d62dbeb2336c26341442033b619dad976da53dcfd7b270e4877cab6c2c50622ed481fa0c4cf88f7ed5f
 MISC metadata.xml 409 BLAKE2B 3cdcb724c178e87f10b24cbf61160407378e90ae47789e77fd3a87e30513dac08998da154df7836f851a8cc74e6c130dfdd772bdbed2a8403da69eca8b24d4ac SHA512 6403064cacab7dc324278a5fd22f321bd1474542a66fbb2a30b30b8080f221147700f1d12073442bb8ced624b5c18fd4b3ee77cd0db087e0f758405392a92541
diff --git a/dev-python/python-multipart/files/python-multipart-0.0.5-pyyaml.patch b/dev-python/python-multipart/files/python-multipart-0.0.5-pyyaml.patch
deleted file mode 100644
index 5d189dd5f225..000000000000
--- a/dev-python/python-multipart/files/python-multipart-0.0.5-pyyaml.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4831a3f9b5007145f2cb9e3020e83581523d4079 Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Tue, 19 Apr 2022 20:20:49 -0500
-Subject: [PATCH] Use yaml.safe_load instead of yaml.load (#46)
-
-yaml.load in PyYAML 6 requires a Loader argument.  PyYAML recommends
-using SafeLoader, which is implied if you call yaml.safe_load instead.
-
-https://github.com/yaml/pyyaml/pull/561
-https://msg.pyyaml.org/load
-
-Fixes #41
----
- multipart/tests/test_multipart.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipart/tests/test_multipart.py b/multipart/tests/test_multipart.py
-index 0e38c9c..ab33e7c 100644
---- a/multipart/tests/test_multipart.py
-+++ b/multipart/tests/test_multipart.py
-@@ -716,7 +716,7 @@ def test_not_aligned(self):
-             test_data = f.read()
- 
-         with open(yaml_file, 'rb') as f:
--            yaml_data = yaml.load(f)
-+            yaml_data = yaml.safe_load(f)
- 
-         http_tests.append({
-             'name': fname,
diff --git a/dev-python/python-multipart/python-multipart-0.0.5.ebuild b/dev-python/python-multipart/python-multipart-0.0.5.ebuild
deleted file mode 100644
index 935c1b98994b..000000000000
--- a/dev-python/python-multipart/python-multipart-0.0.5.ebuild
+++ /dev/null
@@ -1,36 +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_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A streaming multipart parser for Python"
-HOMEPAGE="
-	https://github.com/andrew-d/python-multipart/
-	https://pypi.org/project/python-multipart/
-"
-SRC_URI="
-	https://github.com/andrew-d/python-multipart/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pyyaml.patch
-)
diff --git a/dev-python/python-multipart/python-multipart-0.0.6.ebuild b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
index b26196d96512..9ce0e41f6e7c 100644
--- a/dev-python/python-multipart/python-multipart-0.0.6.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.6.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index afd4070ace3f..c779f2c99992 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -6,5 +6,5 @@ DIST pyzmq-25.0.2.gh.tar.gz 398050 BLAKE2B 501aea8b46ef5c06ca75489869047b2e6aefd
 EBUILD pyzmq-24.0.1.ebuild 1948 BLAKE2B f0051c2fb48dffe371d7284f94b66cecc8195a02c8ab2b97adf134f240c8deecf3bba5f8ad77f747c5131681ffd2ad90686df873d5a57968c92d4ff30f21e3df SHA512 1ca085f6f74c43868b43a06ee6f23d188305b316913e30e81cf1cca431eb596d6f33f081bd2539ccfe78afa83c562c89db9596cd4adec0e10c6469d00f478337
 EBUILD pyzmq-25.0.0.ebuild 2220 BLAKE2B a45cbeab261c89a64df212ca04d7aebeae037ef1e8d1f97f4406f5b7edf28c1180b12d158cc72dda1be79ac733d09a829a761eef16a6443aeaf56bccffcf2868 SHA512 83c3cd55c091408de7b3f3ec92dc13b6193547a561e64ec884510ec5d0e9b13a351a77175425165bc844b60bc1274b711f8e9d8ee8190947907e4cd0bedd728d
 EBUILD pyzmq-25.0.1.ebuild 2220 BLAKE2B a45cbeab261c89a64df212ca04d7aebeae037ef1e8d1f97f4406f5b7edf28c1180b12d158cc72dda1be79ac733d09a829a761eef16a6443aeaf56bccffcf2868 SHA512 83c3cd55c091408de7b3f3ec92dc13b6193547a561e64ec884510ec5d0e9b13a351a77175425165bc844b60bc1274b711f8e9d8ee8190947907e4cd0bedd728d
-EBUILD pyzmq-25.0.2.ebuild 2220 BLAKE2B a45cbeab261c89a64df212ca04d7aebeae037ef1e8d1f97f4406f5b7edf28c1180b12d158cc72dda1be79ac733d09a829a761eef16a6443aeaf56bccffcf2868 SHA512 83c3cd55c091408de7b3f3ec92dc13b6193547a561e64ec884510ec5d0e9b13a351a77175425165bc844b60bc1274b711f8e9d8ee8190947907e4cd0bedd728d
+EBUILD pyzmq-25.0.2.ebuild 2213 BLAKE2B 1272fce3bfc45b1ff20eb993ffc3ab02ad2842e1ca320a28a9d1a9faf3618e8a15781feddc088c07e8d06650b23571d77c8b06f45a112d8100375f2841f0b646 SHA512 f311bdaf0dab2d06515daf1d5ea49a97e64fbe0e3d2da1845b2eb4052dd93ebe3358e6cf61e8a41531712899b6680bb6445e2d3a06b3da8feef971da75c0c404
 MISC metadata.xml 602 BLAKE2B 2dcde66f620e979bf1c13ffb8becbb933e39d9737ab88e53f5534ab5474820ad28d8ee71a42685fe0ebe11499095276c6cbf0f2cda003e23c00b899934b19e36 SHA512 67bb10383483c87f479ef57af47a46b211d1036184819c3f43bc9f8d1e6310f168a6cc8853984e5a77e81a05d93858da9b246fc92d42cb5a4d08bca46085ac3c
diff --git a/dev-python/pyzmq/pyzmq-25.0.2.ebuild b/dev-python/pyzmq/pyzmq-25.0.2.ebuild
index e6e91f08cfa8..6601d8afb473 100644
--- a/dev-python/pyzmq/pyzmq-25.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-25.0.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index c37a494c2e0d..a4e8e7b93b09 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,7 +1,7 @@
 DIST qtconsole-5.4.0.tar.gz 431119 BLAKE2B 48348b400a9b594bd028d3905719f2d67f6c9281df99863f3d0d87cf83162c91ede3e65529a8efd3bff62ad3ea343cc4ee7ea028913cd5bf7e48d0c493930445 SHA512 c25a381d8494c64d63e379c1dd5a44c1945e773b87b9a27f8494905e7eca24c6381ec5b9792d9a57ac41b14137ce238795a5ff8d83d1b6ddaa62603e7d9ab165
 DIST qtconsole-5.4.1.tar.gz 436651 BLAKE2B 111aeacd324c9cec736f43468ebbf653047018fcd97602f82325dd7f3a92b25666615ac52a58730693d69841ddf18fd83d3468f778d7805713c07047235c83a9 SHA512 98ebb91cd30f1e046429615ef88bbcc047e4673145883b15d60b30c66d0115352b23f39c1109ddfd545e40bd261bc76070a249dbfe2e1751f7c2bf7a7e5d49f3
 DIST qtconsole-5.4.2.tar.gz 437031 BLAKE2B 8db9c6cebf39cda995f88796d4b8da37731212fd5464728cee32ecd537a90e07b80585d30870ef236d66a293977382372f8629739e334f641526518b3ab15a0e SHA512 9796cc917e010878acef135f54e150217646526c3d6cc2754d670990cddee14334e32e7f5fb88d0a44d6dc0099eecf3300f10a188d36ced57c6b25c982249c3f
-EBUILD qtconsole-5.4.0.ebuild 1600 BLAKE2B 6819bdfa625973c0041affd6f12d1c8f7bcd14c81dea9ecaf409d7ba75b943872c3f96e8cefc761a4fef0b6221cf21780d7c2439037f3481f17d03ed4f1804bc SHA512 eb7c9d3f622fb62a25b51498a9f35b842902ddbe4b2c9c526b6241d29e3a9a11a1738faed06e82539635e57c2b75c6551703c4acc64e60c5bbad974d3c3492c8
-EBUILD qtconsole-5.4.1.ebuild 1596 BLAKE2B 8f8b8e69ec18662b2294c40662107bdee840ed7be6e69805f30bf6d13c8ada5cd7ddd3beee0bff3f134b3c918a0fa73fa0806933e45a9f5fdad7b7d8648f3e39 SHA512 8cc198a6303d7ef6eacbd9bf6a4edf226e484de29c54ab474ccc399c6679f25caee4a43fa6bb3d3853dee651e8d178258ac53c938412aa227b376f1eb381ce15
-EBUILD qtconsole-5.4.2.ebuild 1596 BLAKE2B 8f8b8e69ec18662b2294c40662107bdee840ed7be6e69805f30bf6d13c8ada5cd7ddd3beee0bff3f134b3c918a0fa73fa0806933e45a9f5fdad7b7d8648f3e39 SHA512 8cc198a6303d7ef6eacbd9bf6a4edf226e484de29c54ab474ccc399c6679f25caee4a43fa6bb3d3853dee651e8d178258ac53c938412aa227b376f1eb381ce15
+EBUILD qtconsole-5.4.0.ebuild 1600 BLAKE2B eac73ac119ce86baa1bba437c31e067e591861409a4227de2dac3a203db1dd2507394d5f2263daff16b5b716d31a0331e8babb0b6097442a53740b54465f4d2d SHA512 a561932195965240a5bf3885aa67e5a596ae3301496f9ceaf1c3bf179838f6410bd5dabd088eac2e5352113e712297c0712e0d47b83aed3c02144a79a384e16d
+EBUILD qtconsole-5.4.1.ebuild 1596 BLAKE2B af6f3d2474fee7124f6019bb3074c6463f9e603ff6dd8fc0e812125921309dea2ac30022b0a7232d01c694cc606cf433230759dddad9c8a3c0be0aef726df6a4 SHA512 3834d41d2de991f952659452cbfa99ba5f5b572c494baae4f124e0ec6f2f64e29ded8f444bf1dd4b769265e798ed5d378a0acac7fe53eb28a39d081505833654
+EBUILD qtconsole-5.4.2.ebuild 1596 BLAKE2B af6f3d2474fee7124f6019bb3074c6463f9e603ff6dd8fc0e812125921309dea2ac30022b0a7232d01c694cc606cf433230759dddad9c8a3c0be0aef726df6a4 SHA512 3834d41d2de991f952659452cbfa99ba5f5b572c494baae4f124e0ec6f2f64e29ded8f444bf1dd4b769265e798ed5d378a0acac7fe53eb28a39d081505833654
 MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.4.0.ebuild b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
index 1cc220e5eb08..2b74c48819b2 100644
--- a/dev-python/qtconsole/qtconsole-5.4.0.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.0.ebuild
@@ -24,7 +24,7 @@ KEYWORDS="amd64 ~arm arm64 ~loong x86"
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.4.1.ebuild b/dev-python/qtconsole/qtconsole-5.4.1.ebuild
index 66ccc4b59413..95f3ad2fe259 100644
--- a/dev-python/qtconsole/qtconsole-5.4.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.1.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/qtconsole/qtconsole-5.4.2.ebuild b/dev-python/qtconsole/qtconsole-5.4.2.ebuild
index 66ccc4b59413..95f3ad2fe259 100644
--- a/dev-python/qtconsole/qtconsole-5.4.2.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.4.2.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86"
 RDEPEND="
 	>=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index fbb1baefcfac..5eaf6242f165 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,8 +1,3 @@
-AUX quantities-0.13.0-numpy.patch 2382 BLAKE2B b129afeac02154cd3e81d5c1099f637b610ec37210b5b5342cb35c3218316b7c848b5b0a78c35b7f197d76ce6d9ee1a56ee2319fa825ca3d3a953efb27d4853a SHA512 936aca8312de80f9c03ba08aa6dbb43527bb540bba18924551baacd2a861651b2d6923c5899adc21d555da6c11229d11b5ffe253d47e05023cf2e2efcc773837
-DIST python-quantities-0.13.0.gh.tar.gz 107178 BLAKE2B f5fe69ed1d82bc90620a1cabf4c68f676330a2b09e8590bedf48ee8c46e3176d57e0dc6374d1112377056cd1138553d92f0bcaf0a68e2600e3631226e2262afc SHA512 d108b0f5bd834aeb7443693175d54b2b01fa9110cc57f0356681374ce95b5f57e39253d9c8166365aabc379f2f26bba3a827689ceb6c45595345e140b4cd7ad3
-DIST python-quantities-0.14.0.gh.tar.gz 84115 BLAKE2B 549ac64583ebac9a68069e678ee82ac3d9d4462dee4ebffe631c0c20d0819996b0172ceb2cb276aae52ad4dc963e3bfad8f6082d98b90bf6f94c27f807d91565 SHA512 78696938c10e613e1fd6f98f9158d51ec4e86928f9833b73321cde776d77735c119af854aaaff5542093175cd105a33266fba16b31b9e04b51c7f14f648b1e19
 DIST python-quantities-0.14.1.gh.tar.gz 84275 BLAKE2B 7760a46f9f893a87badcbfd8aaad6a5598013b0cc835f17e0b788d3329be35702532fa17dc581ab0db4064292d6521d39d3ada7819c9a6c7b0e8a9b568d343dd SHA512 16c12110c2a705e4016d9575beb7f3322c3590cd12091a2710eca48fd6927b07b0d564ef93eb8af0b21688a0e86df1e60abb45625234abfaf1fa414e8b9fd110
-EBUILD quantities-0.13.0-r2.ebuild 723 BLAKE2B 9a84c8531737d5ae7ee4f1db414aa9deeb567db3866fbaa769d2ea6c1c9e11c128648b202441a4ba3907d1a76db93d201e79e01e9fa96b9b9f472763c4d45fd4 SHA512 1884fd5a3deec6ed8f4f04d396a98125fd9f1b9e3ee554a35874083548a53a2bd8a78ddac6fbd77d2a0bfb2abb9eb17a02f7f3efeb79a90677d9bfa0b8207e07
-EBUILD quantities-0.14.0.ebuild 782 BLAKE2B 4012a22ff8b79a0e8ea20105095a6759cf9b2b29ef83baf788150dbfd19a22772c74f7cbce0449f4117962e05f4779065baacfb29644fd9e34a70d72c524b80a SHA512 14a879c167d7f3c0d7e2008f4a19b04474de6c7e26d877b90ef9b15ae9eed9119cb18ac72994890ef825276f4058c4a9b791772939318baab50f5fc8d40ac87b
-EBUILD quantities-0.14.1.ebuild 782 BLAKE2B 4012a22ff8b79a0e8ea20105095a6759cf9b2b29ef83baf788150dbfd19a22772c74f7cbce0449f4117962e05f4779065baacfb29644fd9e34a70d72c524b80a SHA512 14a879c167d7f3c0d7e2008f4a19b04474de6c7e26d877b90ef9b15ae9eed9119cb18ac72994890ef825276f4058c4a9b791772939318baab50f5fc8d40ac87b
+EBUILD quantities-0.14.1.ebuild 780 BLAKE2B 914075c1acc5a3a6d522ea4bc6c671264b683efe9060a4180bd309a5433d3ec7493c60c93ac627fae94ebee5fd0594075f051b8c45466bb4c019d403ed0c54b9 SHA512 b0c4423004c4b124d9b42df8169b8ba943ec6a8453334ae416a14eedb001b57cae4eb0d23ed49acd61785f014fbd7b726e15801e740dc73d4e8fd5df4d15fbaf
 MISC metadata.xml 645 BLAKE2B d6965f033a9f7b6e78c5b2dcadda6a036ec1becac8cdd4bf3a7d2a7d0739cca4b51c29f874eebedc963d5a54d1906dc18a8ba628e44b4d3d12c81c91f6f97b29 SHA512 d2f88066eb81f72611dd94b323c9d42dbdb02d0953cb43a06b991bc7b134cff85d86979aabc155dee463645ab984127bdebfa7ca125ba36febaea451dad39143
diff --git a/dev-python/quantities/files/quantities-0.13.0-numpy.patch b/dev-python/quantities/files/quantities-0.13.0-numpy.patch
deleted file mode 100644
index 940bc846d687..000000000000
--- a/dev-python/quantities/files/quantities-0.13.0-numpy.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 29852b895d5d39006d1f129397cffae3578a694e Mon Sep 17 00:00:00 2001
-From: Andrew Davison <andrew.davison@cnrs.fr>
-Date: Thu, 7 Jul 2022 10:03:32 +0200
-Subject: [PATCH] fix failure to handle units with floordiv
-
-fixes #205
----
- quantities/dimensionality.py        |  2 +-
- quantities/tests/test_arithmetic.py | 16 +++++++++++++++-
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py
-index cea68ca..d54f96f 100644
---- a/quantities/dimensionality.py
-+++ b/quantities/dimensionality.py
-@@ -238,6 +238,7 @@ def _d_divide(q1, q2, out=None):
-             return q2.dimensionality**-1
- p_dict[np.divide] = _d_divide
- p_dict[np.true_divide] = _d_divide
-+p_dict[np.floor_divide] = _d_divide
- 
- def _d_check_uniform(q1, q2, out=None):
-     try:
-@@ -273,7 +274,6 @@ p_dict[np.subtract] = _d_check_uniform
- p_dict[np.mod] = _d_check_uniform
- p_dict[np.fmod] = _d_check_uniform
- p_dict[np.remainder] = _d_check_uniform
--p_dict[np.floor_divide] = _d_check_uniform
- p_dict[np.hypot] = _d_check_uniform
- p_dict[np.equal] = _d_check_uniform
- p_dict[np.not_equal] = _d_check_uniform
-diff --git a/quantities/tests/test_arithmetic.py b/quantities/tests/test_arithmetic.py
-index fe5670e..534702c 100644
---- a/quantities/tests/test_arithmetic.py
-+++ b/quantities/tests/test_arithmetic.py
-@@ -52,7 +52,7 @@ class iter_dtypes:
- 
-     def __init__(self):
-         self._i = 1
--        self._typeDict = np.typeDict.copy()
-+        self._typeDict = np.sctypeDict.copy()
-         self._typeDict[17] = int
-         self._typeDict[18] = long
-         self._typeDict[19] = float
-@@ -132,6 +132,20 @@ class TestDTypes(TestCase):
-                         self.check_rmul(x, y)
-             dtypes.pop(0)
- 
-+    def test_truediv(self):
-+        q = Quantity([44, 40, 36, 32], units=pq.ms)
-+        self.assertQuantityEqual(
-+            q/(4 * pq.ms),
-+            Quantity([11, 10, 9, 8], units=pq.dimensionless)
-+        )
-+
-+    def test_floordiv(self):
-+        q = Quantity([45, 43, 39, 32], units=pq.ms)
-+        self.assertQuantityEqual(
-+            q//(4 * pq.ms),
-+            Quantity([11, 10, 9, 8], units=pq.dimensionless)
-+        )
-+
-     def test_mixed_addition(self):
-         self.assertQuantityEqual(1*pq.ft + 1*pq.m, 4.280839895 * pq.ft)
-         self.assertQuantityEqual(1*pq.ft + pq.m, 4.280839895 * pq.ft)
--- 
-2.39.0
-
diff --git a/dev-python/quantities/quantities-0.13.0-r2.ebuild b/dev-python/quantities/quantities-0.13.0-r2.ebuild
deleted file mode 100644
index f5bb3ce8d977..000000000000
--- a/dev-python/quantities/quantities-0.13.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="
-	https://github.com/python-quantities/python-quantities/
-	https://pypi.org/project/quantities/
-"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-numpy.patch
-)
diff --git a/dev-python/quantities/quantities-0.14.0.ebuild b/dev-python/quantities/quantities-0.14.0.ebuild
deleted file mode 100644
index b6edadfcb852..000000000000
--- a/dev-python/quantities/quantities-0.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="
-	https://github.com/python-quantities/python-quantities/
-	https://pypi.org/project/quantities/
-"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.19[$PYTHON_USEDEP]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/quantities/quantities-0.14.1.ebuild b/dev-python/quantities/quantities-0.14.1.ebuild
index b6edadfcb852..66847fdf02f5 100644
--- a/dev-python/quantities/quantities-0.14.1.ebuild
+++ b/dev-python/quantities/quantities-0.14.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.19[$PYTHON_USEDEP]
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 749b580aef0f..3cacea548b6f 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,7 +1,5 @@
-DIST requests-cache-0.9.8.gh.tar.gz 1540296 BLAKE2B 8b2ab1227b28c3822cd9111375c8759f5d7099f2724680a6560e4e14cd16558a1dcb8dd98d043fdf2f9a3861d76dd0d2c2f84df059338e9fa28c1257e74e87b9 SHA512 f428a7b498d2ef2b6c23d3715bac2274c320b6f9d6f56017e69ab5fa6b8830242a2f335ed6c3758a741a51f108c6dacae1a447ff8f05ca5686303caf48a1dc59
 DIST requests-cache-1.0.0.gh.tar.gz 2914633 BLAKE2B 5402d3b6bc99bb0b72a484854b83450d8f57fd0aff39661d6f2452c69cc0ca9b140fd2ac7b02110e47bcc0bf2497c58912330d7472b9f1701b8d4e2a54f7cef7 SHA512 92d6e1b9afb158f824a4b20d83c7b30a5988476b741213b0663df6095df1753da2dcd6516372ba383864e19d346850a356e9370b2ae27554effcc3f0b6a078c8
 DIST requests-cache-1.0.1.gh.tar.gz 2914175 BLAKE2B b1c3c544a761e127204172381a66b0175f09e49040a7d0f04760cf03b253846ac7e831b7c15d4b128e47e5bc132ea3493eba2784ac442be4dc0eab262e2251b0 SHA512 ec5788e31f60fd95e575d01af1163f981757972db6557d7a62da2ca0719e84262cf66cdd9b40c73cca540b92d6b7f6beba1aa42bedba528734c61edf5013ec3d
-EBUILD requests-cache-0.9.8.ebuild 1798 BLAKE2B dec2bba9653b432876434d37c587ba5f01325ca600008ef22164973d795e3e056fdc632b8033f8516dfd1e4be0a26417453aee595adb243fa482a1c8336c598c SHA512 3441bfc66c25d93c3bc57a8e1077a4c56da32146f80dd5c0c15d9a2cc3429e0f410d53f5b9d2c0775c38e46e96ab9cf9dbb62e6bcc57c7483d07584c652dda6a
-EBUILD requests-cache-1.0.0.ebuild 1861 BLAKE2B 1fd6dae285c7642291dfa79dd454d6ecbd116016d85f8d361d11557a44d6d86ea5eb167b0d9f8813cbde52a9205c0d7be2eb8806ad98e991ebdc243c8befba98 SHA512 8302b26c67216d75c5358a6d2e8761edb6e1b1f8e80700e1e8c34dc754723928cd5d103cf4d545691f1575c51eb425b06d10dade4adb3ff767fb2e7808841f05
+EBUILD requests-cache-1.0.0.ebuild 1859 BLAKE2B 7a7db167f03ffc172ef756bf8d5bf80ed18294793a9658b930f92ea5ac2cd542906e4b4f9c6e6ef747e174ddbec30497c6373a864670aa1e0b47f9443c82b6a3 SHA512 7944c319a8e2fc4c2eb8067a18f1f6664ea5a78fea4c76c19ecb521d11cd17dce0d05e753d19ee295c91d6a1f0fe40fb009d5ea76bee4fa2eb21974eb79ce141
 EBUILD requests-cache-1.0.1.ebuild 1861 BLAKE2B 1fd6dae285c7642291dfa79dd454d6ecbd116016d85f8d361d11557a44d6d86ea5eb167b0d9f8813cbde52a9205c0d7be2eb8806ad98e991ebdc243c8befba98 SHA512 8302b26c67216d75c5358a6d2e8761edb6e1b1f8e80700e1e8c34dc754723928cd5d103cf4d545691f1575c51eb425b06d10dade4adb3ff767fb2e7808841f05
 MISC metadata.xml 541 BLAKE2B a8fd81921a36e2fe5bdec38cc1039b9e91971c992a59cbe2dc4826977f753bd6cd2533f65b5f1a076308a898972fe70e85a2c8cf480259e9801f51b10c4de8a4 SHA512 64f29b67eaf3ce892a9f918abd7eaf8f020323e9e0d986b424cffc83e3ac1ba5cb14b534f0a0ec73a8e81694ca4e0e7f98ef02968ac5b43dab104b2b12e8e0f2
diff --git a/dev-python/requests-cache/requests-cache-0.9.8.ebuild b/dev-python/requests-cache/requests-cache-0.9.8.ebuild
deleted file mode 100644
index 358a9638f092..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/requests-cache/requests-cache/
-"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	>=dev-python/cattrs-22.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-1.0.0.ebuild b/dev-python/requests-cache/requests-cache-1.0.0.ebuild
index 8c8138380cbe..f5990c646567 100644
--- a/dev-python/requests-cache/requests-cache-1.0.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-1.0.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 725b78277e51..39c38a2040f0 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,3 @@
-DIST rich-13.3.1.gh.tar.gz 15055408 BLAKE2B 79713ee232bc1c990c1432f7966cffd69b8ffef9ad8a562339d62b03fbab4620040c5ae1d735d3084d71f32581955f0ea5fad113ff992dcddb2dd0e20465484e SHA512 a3b5bef2183bbb888f0ef5a90b35fdb1ed7ef6103dfea01a5efa441ce8d1769b53d7888684e3b5cd76bcacf3768835d918d9fbb7801eab57c04d1412f129f6bb
-DIST rich-13.3.2.gh.tar.gz 15060707 BLAKE2B fbee6e01b60a18cb32a7f86fa41d621d2cb895e5602f23ed85e7338788f4fbab401fe0a8c2b2bb3a1975c40ebeaaf4d013e50a6d6e5cad6324a14acea21d48dc SHA512 9f33658d8dfa5c22fd92ca83690628ded12d428777d6cd7752afc35c36481d46df1766841eaf003917ec6da932d6f29981c779846d4c14a95e2738e74ec20b2c
 DIST rich-13.3.3.gh.tar.gz 15060927 BLAKE2B 2d4aaca6dd18b7f3dd6267b3ead09ece8e2edc2ed050c137a93618915f6cd999744957d6925da90446a5b3a46ef871561145d5c2c27ff2722afac24090cf1064 SHA512 049b5145685509f722d744e5b7e2703bf14e5449da02f24e92ac856552bddeef96777760ead4e1e0f6599cc1b13cc424dc558a20c426dcbd7d4230322226832c
-EBUILD rich-13.3.1.ebuild 1395 BLAKE2B c42544ea594e54bf6293bf52911f9f853a86794784892403847114be767c2860c4c653de1278a9f4e7bcc72619bdcac569bcbdff5bce755c66abdc5c51ceec89 SHA512 75968a1bc7f4f96e5fde2b045437c793ab1cf44df6c857dc6315c93a4931252a578edb898f4354d36d7dfab2d027b0edf8a4bb82996e5c16c4687a784b4def90
-EBUILD rich-13.3.2.ebuild 1409 BLAKE2B c61286fb5f7abe780dae8b7333935b22323fd0333eb4ee4d4524a859066548f93cd8a767d578c74ff7e533125e426115b56589d4ad0d8c4809b299508a963833 SHA512 d7a7ef1a51747775b944735ab0af8e5c7912fdb92c05dd2d286db52b1a49dd2c0f87e5cd30f7fce2ec597110200faf8dc24b8342ab28d37b08acf721cfa251e6
-EBUILD rich-13.3.3.ebuild 1409 BLAKE2B c61286fb5f7abe780dae8b7333935b22323fd0333eb4ee4d4524a859066548f93cd8a767d578c74ff7e533125e426115b56589d4ad0d8c4809b299508a963833 SHA512 d7a7ef1a51747775b944735ab0af8e5c7912fdb92c05dd2d286db52b1a49dd2c0f87e5cd30f7fce2ec597110200faf8dc24b8342ab28d37b08acf721cfa251e6
+EBUILD rich-13.3.3.ebuild 1401 BLAKE2B fda7f17a98414fad1cf7cdc13559931b996fdd876ddf7d16ab9571938ec3425f7c4925934a0b0ebbfdd074796dd5b0eb59f9a2f5f8bf1c2115dc9221b31c8e62 SHA512 71ffa65c5b51bce1b5ff79a3973ffcc2c2944e937823ea8db47ac9b4805ccb5afad40bfab2e6f8c2f7df0b28cfe434362bcdff73b100e12902902cb51e50e534
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.3.1.ebuild b/dev-python/rich/rich-13.3.1.ebuild
deleted file mode 100644
index 7b8ea901adce..000000000000
--- a/dev-python/rich/rich-13.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.3.2.ebuild b/dev-python/rich/rich-13.3.2.ebuild
deleted file mode 100644
index dcd6ae234066..000000000000
--- a/dev-python/rich/rich-13.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/markdown-it-py-3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-it-py-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.13.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
-		# pygments?
-		tests/test_syntax.py::test_python_render_simple_indent_guides
-		tests/test_syntax.py::test_python_render_line_range_indent_guides
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-13.3.3.ebuild b/dev-python/rich/rich-13.3.3.ebuild
index dcd6ae234066..574f2f1e1b9d 100644
--- a/dev-python/rich/rich-13.3.3.ebuild
+++ b/dev-python/rich/rich-13.3.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 720e54f3514c..f1bfd310b369 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,5 +1,3 @@
-DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
 DIST roman-4.0.tar.gz 9380 BLAKE2B f158a9c7ed9aae2e8c3aaf8b4db9610cd437119493af87c248f8f7d2157228f2bbeb7085eb8f02d169f3e3f5221831ebb10a773d70c5dc7133d32896d5c21dbd SHA512 5421ac46fc5f49c8913a6089d51781bc0a01f2863ea2655b57adba1d07632d4e459fcb26350d0c2dfdf4a31c64a31e9fc86b22165df212c9f8db4bf41cf2e2a1
-EBUILD roman-3.3-r1.ebuild 547 BLAKE2B 02d6f7848f9acf76e3b14f2ca2c9553687fdc8305b19d22785953ca4ef8c71195ee10ab53f6b22b12cfdcdddef60452664927f5cddf93c549d8d5298c932c1ad SHA512 0ed2747368299d24cc659a56c415acb93a2488f9cc8a550ab6f82dbb446c4ea0eb059c5c7d01802bdbb5496206556ed328c88d9981db7cc7636b6e3bad217fa0
-EBUILD roman-4.0.ebuild 546 BLAKE2B c2dd48559efee6b0dc0b1784ed4795837a258af607a36e2cab296a47b619450a43e8435aa371adf2f4a6ac414ea512d0794747c4f80a1ef564d6c44410f10192 SHA512 3fd64de1d8d0371f329a89720cf57dfac82bf53994193255a72bb31ad6626b3e3aa5cab732651337a4a4c2dc9b07e41ca2d5377470a14fd4b03e5b5311fb8ac1
+EBUILD roman-4.0.ebuild 544 BLAKE2B 1a48f2f0d69abbc49ab7ae45145f151423ee600fdd6851b535ca3377557f8af366e33efbf8bfeb44ee0675934af0ed7ae30f5a00dafa0a1b6c65f7382cd2260e SHA512 47ad854a0060ed8db22d9cf1abbe29ce7711b9dfa2340e5c8047eb6b6c79765d64aafa01bdf69f0ccc30598ceac0b1422da95de700a5150e146d8cac4681b070
 MISC metadata.xml 406 BLAKE2B 7d271b8b48457f992e45d502b52fafa61d7a850d2f4b39386eec1bac024be2ceb11ff12dccb423869921d98bb07008e13bf26aa8eb4f66f1fbf51fa616d16ae6 SHA512 31fb4e9d275578423dfa69535d81cda8d0f648906133b76a531f08dedc0835a19c521c3589350562a894ab70b259cd0d4e067ace8ef80a69e3c606a3f73a467a
diff --git a/dev-python/roman/roman-3.3-r1.ebuild b/dev-python/roman/roman-3.3-r1.ebuild
deleted file mode 100644
index 6320367ff069..000000000000
--- a/dev-python/roman/roman-3.3-r1.ebuild
+++ /dev/null
@@ -1,23 +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_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="An Integer to Roman numerals converter"
-HOMEPAGE="https://pypi.org/project/roman/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	mv "${S}/src/tests.py" . || die "moving test file failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/roman/roman-4.0.ebuild b/dev-python/roman/roman-4.0.ebuild
index 334e4e988845..a7caef1a28c4 100644
--- a/dev-python/roman/roman-4.0.ebuild
+++ b/dev-python/roman/roman-4.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 1498ea433684..55c8b7f9c23d 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,8 +1,4 @@
 AUX rpyc-5.3.0-no-gevent.patch 1241 BLAKE2B 44b0584b90aa4730998dd9c44430edbb0348f581b930ce1663b4dc7105c6fafccd1d73c2850892ec7898f678bc57de592dcec1af4615778919b97a15fc9d56ca SHA512 d057255548f94c433d2e6f064d9db33caf7909ae17a9eddaabb2f87560f31a6b9e94c0470b78fab7aca15c6c96b6a8c2cf96d92d57d9925d5616c7454f823326
-DIST rpyc-5.2.3_p1.tar.gz 1269198 BLAKE2B 288568fcd34787850968d4e3fd9ca7c2d29e506f1331b746104760e678dfef43fd30b08f68b3bdda6df84d488f88dc76cfdd23d5a5ad0a4cefeab468ac6a1b0b SHA512 4b29899a51364779185d2b56f5d5ee4c650c40b8322e5594500222fdcec85414cdbabd41437467e2ff73124a79e8c9cde23dfe89138abb935732ccaba69de2bb
-DIST rpyc-5.3.0.gh.tar.gz 1270508 BLAKE2B c7b0c06ea7151d80d84e057b7991cbc7bcb047f24544b7669d80218f9eeb9342ba58020f608bb615dea932a1380b0afb36ba9f8e216f139ba4aadd4a7efa344d SHA512 371c60dedf3fba3232c5c1d7616a04b8cf2a8295e31b945ab51d0dee5ba5d8769062aafa860db85b951f0283b8800b61972a7f2f7fa3cc69929c7563e74be1ee
 DIST rpyc-5.3.1.gh.tar.gz 1271046 BLAKE2B b7c86aa5cf774d306b2d6fdbac97441533bc5a847aaf03c11b0abf0a07587a2f7d081470d3402fde4251ea6654051d96983feefa2ba7e65a9a95d76f179edcad SHA512 a328903c336483f7110cbbff96173ba0b5ae6cf16f6306c624055bd631d914772c42dcfcf48a275b7dc53241f6b10a397ee49f17b8a3c3c8dbee8f42ac784465
-EBUILD rpyc-5.2.3_p1.ebuild 1941 BLAKE2B bf3b7774a7d13969a9374e01afc0bdfec13aa97fd44194346e5d642b54c25adfc1a9c6aad636987bd1debd53c174ece495ec76625762979c20629cc2e8745995 SHA512 992264055902d6cc93351ff500f88272c447c527bc4a35aff00c66e0047625aee2343458b3798b0d3bfd53bd2e43c426457873300ef39689a93500e8a152e726
-EBUILD rpyc-5.3.0.ebuild 2044 BLAKE2B 966a314ad2d6667837a8795534d20efbcc7cd31a7130e9b51fceea2ac2595e67aa527721c4f7dd62e790c80a35454ac99ec7289bfc689d3f890160b41f968a3b SHA512 d8423e252324df086342a16e0561dae053c197cc71b131f4efa769a9b3f78ae1af8c5d8b566064e6a70ba4902344a645a2da1c6768bea87f76c5851144c375b2
-EBUILD rpyc-5.3.1.ebuild 2044 BLAKE2B 966a314ad2d6667837a8795534d20efbcc7cd31a7130e9b51fceea2ac2595e67aa527721c4f7dd62e790c80a35454ac99ec7289bfc689d3f890160b41f968a3b SHA512 d8423e252324df086342a16e0561dae053c197cc71b131f4efa769a9b3f78ae1af8c5d8b566064e6a70ba4902344a645a2da1c6768bea87f76c5851144c375b2
+EBUILD rpyc-5.3.1.ebuild 2042 BLAKE2B d5bb595c8a79b8e2e0076dd07651ed903edeb666b9cb14a4eb76b00cfe7e54173e76d2cda93bd041bbf6cca4f67ef8c3528933eedc194ed094b6d2e5fe4f726e SHA512 1280464c02eb832fe6da1cfb7ceadb831c7e876e058e0f72f221d83817b44a34f69318ee0ae3bf706a97c5f488352f5a653d6582998a26691d4a7e49fd8c9f22
 MISC metadata.xml 654 BLAKE2B f84ea5b5fb66c2661bdcbed8566a77c872b6f1b3a6b0cb021269657b21fd414e70edf03f205ee2038d9d83a20e25d32b15760d915b98066aa7fe1a4cfeb3bd16 SHA512 6ea40af97501443c8d4ae783137bb9547c5a4cc3685c01b9d684691d110f67eb43056acfcebcc510c06fc40ff596ad9e3e30cf76cb07807f23250721e93b4954
diff --git a/dev-python/rpyc/rpyc-5.2.3_p1.ebuild b/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
deleted file mode 100644
index b3657dd924b5..000000000000
--- a/dev-python/rpyc/rpyc-5.2.3_p1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-
-CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	dev-python/plumbum[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	# This test fails with NO_CIPHERS_AVAILABLE
-	rm tests/test_ssl.py || die "rm test_ssl.py failed"
-
-	# dev-python/gevent is being removed
-	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/rpyc/rpyc-5.3.0.ebuild b/dev-python/rpyc/rpyc-5.3.0.ebuild
deleted file mode 100644
index bf999d1bb527..000000000000
--- a/dev-python/rpyc/rpyc-5.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
-	https://pypi.org/project/rpyc/
-	https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba-org/rpyc/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-# USE flags gdb, numpy are used *only* to run tests depending on these packages
-IUSE="test numpy gdb"
-RESTRICT="!test? ( test )"
-
-CDEPEND="numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
-	gdb? ( sys-devel/gdb )"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	dev-python/plumbum[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.3.0-no-gevent.patch )
-
-src_prepare() {
-	default
-
-	# Windows specific test
-	rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
-
-	# These tests require running sshd
-	rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
-
-	# This test requires internet access
-	rm tests/test_registry.py || die "rm test_registry.py failed"
-
-	# This test fails with NO_CIPHERS_AVAILABLE
-	rm tests/test_ssl.py || die "rm test_ssl.py failed"
-
-	# dev-python/gevent is being removed
-	rm tests/test_gevent_server.py || die "rm test_gevent_server.py failed"
-
-	if ! use numpy
-	then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
-	fi
-
-	if ! use gdb
-	then rm tests/test_gdb.py || die "rm test_gdb.py failed"
-	fi
-}
-
-python_test() {
-	# for some reason, when tests are run via pytest or nose, some of them hung
-	pushd tests > /dev/null || die "pushd tests failed"
-	for x in test_*.py
-	do PYTHONPATH="${WORKDIR}"/${P}-${EPYTHON/./_}/install/usr/lib/${EPYTHON}/site-packages ${EPYTHON} ${x} || die "${x} failed"
-	done
-	popd > /dev/null
-}
diff --git a/dev-python/rpyc/rpyc-5.3.1.ebuild b/dev-python/rpyc/rpyc-5.3.1.ebuild
index bf999d1bb527..59f0281697ee 100644
--- a/dev-python/rpyc/rpyc-5.3.1.ebuild
+++ b/dev-python/rpyc/rpyc-5.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/tomerfiliba-org/rpyc/archive/refs/tags/${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 # USE flags gdb, numpy are used *only* to run tests depending on these packages
 IUSE="test numpy gdb"
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f5128a166337..35e955c5b931 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,7 +1,9 @@
 DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
 DIST sentry-python-1.17.0.gh.tar.gz 332229 BLAKE2B 5c94f80d8cbe9582fe03e948c74e37024c4d6fce4f6293bdb755ada0651c5a898db23826d23ed7e31845b7426c3f6a52014e0f4226b9810f13222a700e063f91 SHA512 e3f0b9287f703e36f55bb96f31a76638b99fc66f4cf6898ddcddeb57a5ee27a3d782815c9dae9cd1177ff7f5c606e62b7807adada1f841294f3b6d7449d950e1
 DIST sentry-python-1.18.0.gh.tar.gz 338306 BLAKE2B 5af147598af6fd9d03f9931bf6d1519d3c307e16bab188a14ed3e9956060d7c6c65b386d330f5674be1cc7f2147c1e78c7901ce2ef46198887d86ebff0614f7e SHA512 250ea5f4374218672e240893c14ecb7ca22654c673f0a44cc00ca4099ea1d27b749be59c3004de68be3f79cdfbef7e614d1ec5506f3c1eb1699a440eb6387907
+DIST sentry-python-1.19.0.gh.tar.gz 345791 BLAKE2B f0cc7b4bad7f3ede98c254dac40ab49392edd92b36adbef0aac277a4ff14e4f8b27cf8ef602a6ac768ab8e6fb04fa05b3220a0b87a24ed280462fe5c0dc349bf SHA512 ced2fe549e40c189ab31a8af6bae857357aaa5ea1b0f4cccf1d5a0e6d332375cc72257fbc45e81335ac3ff37f705e9e73cfc551ad4320d7150614cedac948338
 EBUILD sentry-sdk-1.16.0.ebuild 3636 BLAKE2B 0a1659ddd0bc2f95875637270b637cda32fe557ac7471fed9b8c2518f0c51de97a542190d35d719d5fd13eebde63074fe6965d56e1100762b4cae16eddd26806 SHA512 c0de06866e1fe7b4594ff77ba3aa3291e9c8c7309aa2572a5c4dd4f799d42c85f7b7983f61fb74a0c443723bc4104482831465300b13cfa3d9af7b3ae8206ae8
 EBUILD sentry-sdk-1.17.0.ebuild 3640 BLAKE2B c3bd23007576bb9673782ef7ad4af56936c72f8b3c73e01bc86ce4436404066103532b0b358f82ae5b5058c9ec3c6e5b998eb54ca8245482a4aa819ebe2e2f0c SHA512 e0faee205c88e10a6abbf9eea5aea0d62d49031693a9a0aaed8fdbe9e5a075d719be897547fd3ac8ae296752030bb223cf8874958291a42421ab464273a9fedc
 EBUILD sentry-sdk-1.18.0.ebuild 3747 BLAKE2B 5ae8a89bee76306f56ba0d612d2a0a51a0050ea08e98601306e21ac9b994c0d6954abe522d0197d5520af3e8e3572bed2f27d4cd7e59b3c732103a3767fc9f3a SHA512 035b7f6fa29dcafe2431efaf362a7cb07044f4041b0706ac51aa0ae3dd0bd8171136d35663654e8a93fd10517401e9031942966c515b6f9712e54da9243574d3
+EBUILD sentry-sdk-1.19.0.ebuild 3789 BLAKE2B 009962f6fd74173d446f55aaa0f4bb724a98d48c0653addeb9c3773dd8b181c6e785d9e40f7a04034aa39bc6e172a713387f98aa07bcbe97d35e0dbcedfa23bd SHA512 acdcf371dbdebc6919cef5a04cb8d48f5f3b3a15076f58998f8b3c08aecc791f01ed6f6443e59195aac598f03db02f1256ac2fe04cb6490e2ccfe125b0d98e43
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.19.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.19.0.ebuild
new file mode 100644
index 000000000000..1152c2fde46c
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.19.0.ebuild
@@ -0,0 +1,109 @@
+# 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_{9..11} )
+
+inherit distutils-r1
+
+MY_P=sentry-python-${PV}
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="
+	https://sentry.io/
+	https://github.com/getsentry/sentry-python/
+	https://pypi.org/project/sentry-sdk/
+"
+SRC_URI="
+	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# tests require Internet access
+	tests/integrations/httpx/test_httpx.py
+	tests/integrations/requests/test_requests.py
+	tests/integrations/stdlib/test_httplib.py
+	tests/integrations/flask/test_flask.py
+	tests/integrations/django/test_basic.py
+	tests/integrations/socket/test_socket.py
+	# wtf is it supposed to do?!
+	tests/integrations/gcp/test_gcp.py
+	# broken by rq-1.10.1 (optional dep)
+	tests/integrations/rq/test_rq.py
+	# fastapi is not packaged
+	tests/integrations/asgi/test_fastapi.py
+	# TODO
+	tests/integrations/bottle
+	# TODO: causes breakage in other tests
+	tests/integrations/starlette
+	# TODO
+	tests/integrations/tornado
+	# requires mockupdb
+	tests/integrations/pymongo
+)
+
+EPYTEST_DESELECT=(
+	# hangs
+	'tests/test_transport.py::test_transport_works'
+	# TODO
+	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+	tests/test_client.py::test_databag_depth_stripping
+	tests/test_client.py::test_databag_string_stripping
+	tests/test_client.py::test_databag_breadth_stripping
+	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/asgi/test_asgi.py::test_websocket
+	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
+	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
+	# incompatible version?
+	tests/integrations/falcon/test_falcon.py
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
+	# test_circular_references: apparently fragile
+	'tests/integrations/threading/test_threading.py::test_circular_references'
+	# test for new feature, fails with IndexError
+	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	# TODO
+	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
+	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
+	tests/test_profiler.py::test_sample_buffer
+	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
+	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
+	tests/test_profiler.py::test_thread_scheduler_single_background_thread
+	# broken with py3.11, *shrug*
+	tests/test_profiler.py::test_extract_stack_with_max_depth
+	# TODO
+	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
+	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
+	tests/test_scrubber.py::test_span_data_scrubbing
+)
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 540bd93eb05d..fc7a292ef8c6 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,14 +1,4 @@
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-DIST setuptools-65.7.0.tar.gz 2618315 BLAKE2B a0989c3fd0ab476d69885d022eccf1a89dc670a17d0b3e73bbe4ffb530e26a838fcd1cfffc4c2720ddd19cb8ba45d42bc31441f1e3bbc32fa71850d208f37cc8 SHA512 0eb2d9de9ef2565cf012db7d68ee18359a1432dd42ecd3fb7d490f73d57b0e7ba2a67e0401f66051127e913f29c2e221e88c0cbf523b0ac9abe7f00b6ab1ded8
-DIST setuptools-67.2.0.tar.gz 2475665 BLAKE2B 1d82e21d5c5f7aea479d468ae5c29c62a86a552e811203794f2246bc715647c18c66ab6d37c9da3092fc2b402cc865c1ab85989092c9beccc440913ad7d51ccd SHA512 2d15719d7a0305535ee853e82b5196af2eaa29cbcf73c59515c2fa8e8c910c25fcf3854aac515789a51a845555b19c95e8d06fef4199cf19ba4a45dda5b7ab66
-DIST setuptools-67.4.0.tar.gz 2484170 BLAKE2B 5c72b2bb813a84337e00c30a1375a24ca997a07100ca7f83afcb76d1fbde1432b049faa76d50ce8c74b3ea753096e63a09359bdcca2cb0d1d57eea21bbe5c2c9 SHA512 d5865283e13a8f42b6b49f9c507f6c41e75a92ad2c4e4c2b4184a410003fadfe7629ed5824340110400143e2ce82cde2e50e9b2898335462376b28f440648cd5
-DIST setuptools-67.5.1.tar.gz 2485370 BLAKE2B ed063a287787e56850cd4f20a8f07cc8670138bdbbb934a0684ead355f234312e6d3cebabffbbc41fb2dd2df27c493878c6660ea073ea00e65d31cef8a6568c0 SHA512 c064415c3169ba87be76f5842266f0f92b766a4eaabacf320c708f5cdbe8d60007e14773889c00c877350dcf0ffa39174fa2e30416f4c7047787aefc26e6fff4
-DIST setuptools-67.6.0.tar.gz 2485539 BLAKE2B da6b8b4c0daa75dee6ba5df5d7728c0aff7293e2dd22d65b5656a13ef2ed351941c88bf1544b5acbfb4b37ae07699950fafcb4d9e6e0d538e5c94f2ce1fe93a5 SHA512 bf78622451e0ce5bbcef50c4dbbe72c9dad880f64b49b10b64f4938f8469d0f872854da170041ef0828738a22593928f248c8b69157a93543491e35fa5482839
 DIST setuptools-67.6.1.tar.gz 2486256 BLAKE2B 7827eec689b6a4463888137660489a29cd6aa67a14f0cf42ece78463788d74b97bd951b75c48c185c5c33d5bea29c44c8660649bf79035012bc75b915e9d0a42 SHA512 197910ad4c4058af0107e240d2e27bc2c1ff373cb3fba33af09eb3cc42614c45e4bb73a65802f253466eafd94517e08b51e98f50213817ad03d88ee0ccf9adbc
-EBUILD setuptools-65.7.0.ebuild 4450 BLAKE2B d9f45d0f97abb15440f7cdf4ebd8a19968c085e779c4b4096fee10198359b544c8a119df3eef8175c736a6c758e587641222aa85f660cfc005a98378558a02a5 SHA512 3aa5810c25ff839e7da062ff9d74c005ba9b852340e687e88e8b578c34a6608ecec88e26d9c2997bee3bc3bbefb29ee13ef6f01fa54e55b121f00db479918e34
-EBUILD setuptools-67.2.0-r1.ebuild 4433 BLAKE2B 31aa7399964c2f0784b2aa856d4161c13c967747820944aaaf2d275bc22ef3ff5d6a6ff45570dd6a06842d7cad4578c9243152abdd6a04d0a321bf2f160f7076 SHA512 e96e11deae5a702aafb038331e5d2dd78a5115005c12a122e9d88a6e5c103d19a7912484457271cb1d578f0c256d1b6e9b0a4e6b380b9cd0462d0342ed075ca9
-EBUILD setuptools-67.4.0.ebuild 4441 BLAKE2B 7334f108e9978d152278739356f532790c50f157efa5a706eecbfde1c9b05cfa494328960be4ec683853e3b86c820cf5988e59c100dcbd947a096079a6eb2ecd SHA512 b609adf51de4b8391fd101c16df5af1c983257b160636f5e6fff4641285b30f7e3dedb87aa92a92c53890056945e303df1850cc3969c7e959af926dbd1d20ea6
-EBUILD setuptools-67.5.1.ebuild 4441 BLAKE2B 7334f108e9978d152278739356f532790c50f157efa5a706eecbfde1c9b05cfa494328960be4ec683853e3b86c820cf5988e59c100dcbd947a096079a6eb2ecd SHA512 b609adf51de4b8391fd101c16df5af1c983257b160636f5e6fff4641285b30f7e3dedb87aa92a92c53890056945e303df1850cc3969c7e959af926dbd1d20ea6
-EBUILD setuptools-67.6.0.ebuild 4441 BLAKE2B 7334f108e9978d152278739356f532790c50f157efa5a706eecbfde1c9b05cfa494328960be4ec683853e3b86c820cf5988e59c100dcbd947a096079a6eb2ecd SHA512 b609adf51de4b8391fd101c16df5af1c983257b160636f5e6fff4641285b30f7e3dedb87aa92a92c53890056945e303df1850cc3969c7e959af926dbd1d20ea6
-EBUILD setuptools-67.6.1.ebuild 4441 BLAKE2B 9d61542bdfeb093210037d3b70df2a1aff3e5c492aad6419a894332ef72f9cf1291d16c7b74d40896ea9891b7ade3e8d94a5d6de78729821faf8a2745bac00ee SHA512 d42c322add3220011f886a096e827471e275e6f5ac88674cdc8a66f4e104c50e2a70183cb12047b67c214d3d13d7ee66d874ba846f3ed6015512b6b86c2dcdc3
+EBUILD setuptools-67.6.1.ebuild 4433 BLAKE2B 1575f862feccb180c567e02e542896159c9665f8dc3888d4a1ed9240cc0fd6c3c2670b66f5ad9140f0ec7068f76edddfe47fedb2298b9603fca898b4c352f98c SHA512 d0584da2b12a8fa7e35a8673e324027ec4821f0f3e6881adf0a9f4996d6cc9338797696aa21e2b899f2a8af8d2038ea20a65d3ec23101bedf3c960c9d25f2c2b
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/setuptools-65.7.0.ebuild b/dev-python/setuptools/setuptools-65.7.0.ebuild
deleted file mode 100644
index d2239800a420..000000000000
--- a/dev-python/setuptools/setuptools-65.7.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.4-r2[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	<dev-python/packaging-22[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-5.4.0-r3[${PYTHON_USEDEP}]
-	' 3.8)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild b/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
deleted file mode 100644
index c6bb1c53e701..000000000000
--- a/dev-python/setuptools/setuptools-67.2.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.4.0.ebuild b/dev-python/setuptools/setuptools-67.4.0.ebuild
deleted file mode 100644
index 8851d666e4cb..000000000000
--- a/dev-python/setuptools/setuptools-67.4.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.5.1.ebuild b/dev-python/setuptools/setuptools-67.5.1.ebuild
deleted file mode 100644
index 8851d666e4cb..000000000000
--- a/dev-python/setuptools/setuptools-67.5.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.6.0.ebuild b/dev-python/setuptools/setuptools-67.6.0.ebuild
deleted file mode 100644
index 8851d666e4cb..000000000000
--- a/dev-python/setuptools/setuptools-67.6.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{9..11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.6.1.ebuild b/dev-python/setuptools/setuptools-67.6.1.ebuild
index 203a03c30278..9638410a9e9c 100644
--- a/dev-python/setuptools/setuptools-67.6.1.ebuild
+++ b/dev-python/setuptools/setuptools-67.6.1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-autoapi/Manifest b/dev-python/sphinx-autoapi/Manifest
index 98448b0ad3fd..1bc2f7b0aee6 100644
--- a/dev-python/sphinx-autoapi/Manifest
+++ b/dev-python/sphinx-autoapi/Manifest
@@ -1,7 +1,3 @@
-DIST sphinx-autoapi-2.0.0.gh.tar.gz 86051 BLAKE2B af6c2f997e7e018304c5f19d978fc87fa853d876781930c1220e8e823a078c80c86851a141ed01d7ab94fd76d747e8dfd7462dd5ccab84127f1c95d225324a92 SHA512 7188ed167de808028b2ac603abb6a136584698a1df4882755b80609f4760dab818cec5f4684bf5d16afc2ae1be112ecb96c7f02f989fcb67937c19c045f45b81
-DIST sphinx-autoapi-2.0.1.gh.tar.gz 85974 BLAKE2B 5beea907901603a665367c244188f847fcc59f889df5da4e27dba39f36c9714347dab1e867d3bbed0fb44139eb1f77863178a0c831e06a6d373211892e8ce6ab SHA512 b7301a86fa6ebde80fd6289e92e2e9149323044f6db34e39305541ccb4bcb136a777c8e38c152f7536435290c86a0543d51c14290fbdfeb7b13805f711e00a80
 DIST sphinx-autoapi-2.1.0.gh.tar.gz 84842 BLAKE2B 0020640833039c5c15babeb2ed37bffa9a836209e51bb5d4873ccd34527f6b652516ceed95d2e823a9394e6154ea36311a78fcf0645723c3060a6eb7f31b0668 SHA512 4228c0d7c91a89933101d1c02689f1e25c453ead66814f8653f1e20b6330a20913b8d98573b3afb5459be972b73535cbe81fd267e721bedfb78a2de4673fa9e2
-EBUILD sphinx-autoapi-2.0.0.ebuild 1366 BLAKE2B aed34cef0c018222e1ef0bdd56499807b7c2ef39f9807e5f6400368114bb235642b27a4109c31c32fe0f6a0717199910594e9978c79facb6e64e4ea97060c7f9 SHA512 90e9e0220601ed8909a51465ca887f4780ab13dbcd3aa1c847d3217c493b961822a9a05bc0dc4601564e3ee076a6c8083a235eaab90d8fd021e1b2121905884a
-EBUILD sphinx-autoapi-2.0.1.ebuild 1526 BLAKE2B 7be2053cdf6deb66f7e2bad3b537f2cea637c1e35f555906e75fda366fbd551a73c99da339641291314f4c011d97d0526a4f143d0729c299886ff5ada13c01a8 SHA512 64417ad80f02bc2c4e92d48a2d2cf9182c3659ab84ad4d320e172c92789664953e596d7f7efe6d05e676e9243934c0ead7f962247dea2a6575bb272b5f43404c
-EBUILD sphinx-autoapi-2.1.0.ebuild 1565 BLAKE2B f253e910ce0dddef29f5c85521ac681d20cdd27ff9497a7f07cc0ebd48929ec3941ab9d5e947b5a8c8e87263c4daa3ca4ce26b22cf537259284208d10a954e3a SHA512 9365eba871b00a86c292f1857d06b18c8207fbcebf7794960c02ff4b7e016d2c25ba1d720f2eef46fed9c46c967f9811bde7bca8211d0069244f181f2fec9b7b
+EBUILD sphinx-autoapi-2.1.0.ebuild 1561 BLAKE2B 0434dfc0e43eae17b8410018675b7fcd34276189c4fcb9e2b72b807b2be24f54cf66ed9aced94be9c0711702a3412453116e50d6417b573a506dead7f5baa652 SHA512 835c00b89dd39f0fbe41488e7ba46f9df6f4c5aadf5d94db548c5606bc7119543dcb75f673d18e0e2d139f73868e8c8a7a9390add0315f8e0ddd40295fd923ce
 MISC metadata.xml 769 BLAKE2B 6f85e487a2d2def289bb54a6addc2338bb8af85b323ec1c95851945f9c407ec22bfadd8079ac8b6e00cfbc85caa0e2b09d82329f1f87a365fc44b69c7bcd9a20 SHA512 68f02a5f98234c2a5cb15aa04ce90077b154a7e3a7a69dc0a1d0a6b5c7b42c60624878a7e2fff1576c8b586fc15e7ef042942274d4e8473835bb3d8bfdbd8393
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
deleted file mode 100644
index f26014d3e974..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.0.ebuild
+++ /dev/null
@@ -1,52 +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=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-RDEPEND="
-	dev-python/astroid[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4.0[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-# Test requires pypi download w/ internet: https://github.com/readthedocs/sphinx-autoapi/issues/329
-EPYTEST_DESELECT=(
-	tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample-override_conf2-AutoAPI
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	# https://github.com/readthedocs/sphinx-autoapi/issues/368
-	if has_version ">=dev-python/sphinx-6.0"; then
-		EPYTEST_DESELECT+=(
-			tests/python/test_pyintegration.py::TestPositionalOnlyArgumentsModule::test_integration
-		)
-	fi
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild
deleted file mode 100644
index 9b8488762142..000000000000
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-2.0.1.ebuild
+++ /dev/null
@@ -1,54 +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=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A new approach to API documentation in Sphinx"
-HOMEPAGE="
-	https://sphinx-autoapi.readthedocs.io/
-	https://github.com/readthedocs/sphinx-autoapi/
-	https://pypi.org/project/sphinx-autoapi/
-"
-SRC_URI="
-	https://github.com/readthedocs/sphinx-autoapi/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/astroid[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-4.0[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-"
-
-DOCS=( README.rst CHANGELOG.rst )
-
-# Test requires pypi download w/ internet: https://github.com/readthedocs/sphinx-autoapi/issues/329
-EPYTEST_DESELECT=(
-	tests/test_integration.py::TestExtensionErrors::test_extension_setup_errors[dotnetexample-override_conf2-AutoAPI
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	# https://github.com/readthedocs/sphinx-autoapi/issues/368
-	if has_version "<dev-python/sphinx-6.0"; then
-		EPYTEST_DESELECT+=(
-			tests/python/test_pyintegration.py::TestPositionalOnlyArgumentsModule::test_integration
-			tests/python/test_pyintegration.py::TestPy3Module::test_annotations
-			tests/python/test_pyintegration.py::TestAnnotationCommentsModule::test_integration
-		)
-	fi
-
-	distutils-r1_python_test
-}
diff --git a/dev-python/sphinx-autoapi/sphinx-autoapi-2.1.0.ebuild b/dev-python/sphinx-autoapi/sphinx-autoapi-2.1.0.ebuild
index b05c3d17081f..d517fd2e103a 100644
--- a/dev-python/sphinx-autoapi/sphinx-autoapi-2.1.0.ebuild
+++ b/dev-python/sphinx-autoapi/sphinx-autoapi-2.1.0.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="
 	dev-python/astroid[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-basic-ng/Manifest b/dev-python/sphinx-basic-ng/Manifest
index bedf11def653..fbe6a6d8fec3 100644
--- a/dev-python/sphinx-basic-ng/Manifest
+++ b/dev-python/sphinx-basic-ng/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-basic-ng-0.0.1.a12.gh.tar.gz 23821 BLAKE2B 905186227d725d6f62c0f4c5b4df49ada8817dd44a4000b23b62e60ce5ca3bef4a4046c9543a07a7b0cc0c12dd5278dc783633324fbe113cf453ee540fa97ff7 SHA512 6df9445306b27ae4b29b338773fa4adcee631b4be04fdde674855dfcb683f7cf7ad3c40124c85353608b63523738b6bc83c6c4f4b2b212cafa41d38462ffcac4
 DIST sphinx-basic-ng-1.0.0.beta1.gh.tar.gz 24059 BLAKE2B 319f27b7326acf0ad1457fcb4d9b6257fb420eaf2bf7d4ebd6e9333f992bc5d0a5fdb518f196edc342c023f3a1c9d1258de2bac5f263d35226ac3ed62d747f23 SHA512 177da348fdb2af88bbe3a269f0d468f4d8cd5710a3102ea0fdd943505bc5251a73783a12e5397750fd7bec2df7ecce6601e82a95e777cbd40540a7833982c998
 EBUILD sphinx-basic-ng-0.0.1_alpha12.ebuild 943 BLAKE2B 36d08095a6fab6ae962872f58a1ea4672c9ab26c52d7a4fc1c38969b88ee6ce57809457db5cc5f27ba98390e2e0817cf3bafd989d1b830ee716c7c0e76f9a8ab SHA512 39373c52658233c8fd8c4eb1ba81028dcef14dde16bd32c5a5b84c1a0a1adafb0df1a739889d9de7eb364f17d8b54769354bd3e02b807c50be976d506aa9d30e
-EBUILD sphinx-basic-ng-1.0.0_beta1.ebuild 899 BLAKE2B 6f2df7b6a03a7e2a0361c568c2e6f83d5ea147e9df25571b32339345f1fe34f375f99d2883e9d15568f2730ae010ffa263543cd3b3382a7318fd3ab7e3d82842 SHA512 792a867b1157527682af6e0cac98391b29e09f8522b6ba405882da76406eb8dc040a9683655c5a2036c1e64f5be5587a0c245f62983d320fe2721c1d16159c9c
+EBUILD sphinx-basic-ng-1.0.0_beta1.ebuild 892 BLAKE2B 198c55d13c6cc30669fb46b0e2c0e12725871e8e7d1ca5b24fba1e11e953058b8d66e34221c879ccd41601850a8d4008e45d327e3260920ae880c13b3837db31 SHA512 658e1672efa49f9c40afeab07a5c33433ad09c7ee2cd2fe04b1a6540d319c7ed878ee698c2c2c80b5c41d9e448991fce5ef24818742f34a427b6ef9c4576b63e
 MISC metadata.xml 362 BLAKE2B a93dc662c8ab618397c8d0504342e8f1bd74226b131ea4ca07771cdeb75eb8947451b4353c0da16760f07f935ebb75adcdef4f189ff39e0cf707d03e8fa319e2 SHA512 fb27130b3fcff9043b3ad33e34c92f638cae46d526dcbe77cfe088abf80e6b89992edb1e0b571a5a2447bc6c8ba31ae84776d153067a33b5d6d14326149e7f46
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
index 9f659db7470a..fefb530153f5 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index 3d66ad220310..a95d9944ea1f 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-notebook-0.4.0.gh.tar.gz 3869758 BLAKE2B db809e9a2b93206ba0236e825b7d8f612efe552be5b9bbcdd60021ee143f16674e05847834bbd63a801c32e2264e5335685887aad0519033a315b3c2c0fcd3d6 SHA512 ab97429d276af815411b9a63bc04e291e5ed596bb9c551be8161e71761fc21a61b896b73ec1d93c9a2b4561ba228b93ac86f3b542a515cbfc651e9e218f6f778
-EBUILD spyder-notebook-0.4.0.ebuild 1245 BLAKE2B 54963e25383c9e3eb837a4d9f2a7ba011b5d862dd6a89fa33e2000e5233c3dbcb3fa564f38e9f2432de70ac2ccdb06cbffd41489311438830f0f0686b043f2ad SHA512 feb5212dd00e27387e01c51f5262596a0f47d3b2783f3e87cd2b08ff8a3592701dd8660dbe14a94616914c9e0ad40b902c0838f085669f94d398f48446302cb5
+EBUILD spyder-notebook-0.4.0.ebuild 1245 BLAKE2B a2644cd4788e28edaf1f379d1f52a73ca0086155a3a434cabcbc0cc61d4f3f619e6f99ca6fa67ef56f02c976df7d98044c7db581a1b5c50f8df058f0bd3f0241 SHA512 be77705aa706a9d0265e10d750a1ff63f939805e4d748272ae068bff00590babe7c93b4934877100a8072aee494507b26eea94471638bfe4f9fb78a91eac4e0f
 MISC metadata.xml 427 BLAKE2B 33a2a084ee10c6a4b0646bbd7e866e81e2cd42bbfeb8b2ca1341a19f1af31001a2a34ca8ae5d44b783b5ded83c30b5fdc9e08e626844fd9fb6170b481ab501f4 SHA512 ddd984e2536912410966b76ec42b2a466a100f68a49fe153ce249eaafff9a1feec358292c58495d88cddd588ebdab5fe78c22f4c893194e64defab5a84257fa6
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild
index 6bfac7c28690..25b504aefa1d 100644
--- a/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild
+++ b/dev-python/spyder-notebook/spyder-notebook-0.4.0.ebuild
@@ -19,7 +19,7 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter-core[${PYTHON_USEDEP}]
 	dev-python/nbformat[${PYTHON_USEDEP}]
 	>=dev-python/notebook-4.3[${PYTHON_USEDEP}]
 	dev-python/qdarkstyle[${PYTHON_USEDEP}]
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 413e5176e204..bde2e8618c09 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,7 +1,3 @@
-DIST sybil-4.0.0.gh.tar.gz 50845 BLAKE2B 5c7144ad1dd131f98c48f18cf6770782529a3c86a3f976461f032c9024ef93dc2de3c8bc327421a55a3f505982608e15cdcfe022f964c4fd871bd9de61205d68 SHA512 6cf0422ba856a85ba5dd105481cb2d06eb2ff196aee263a36e7ab44c7d45185df022bd859afc92b3b42dc418142e441f377adda82c0b5b0d1410697b563db994
-DIST sybil-4.0.1.gh.tar.gz 51137 BLAKE2B f18a84a8ee6524c8af2a54ea17d50e04dba90be54bf5345061d2b6ee161de5c19cb8e1a1849f83401ac5a175453a927f2e068129ccaa4707a48509bb0dc73015 SHA512 70db2aae9f8503af8c5ecb65c5d63e928ba81bc7324473b056a6c1cbb4dac9674c34252665e7b28a1134c37190cdb2fd00c37633a68ea4ac61104a12ea744442
 DIST sybil-5.0.0.gh.tar.gz 55213 BLAKE2B c95c051ee1a2edf5f9be0cc1dc23caf4c48a6e6b29e16c5b1e9f1ab785012d774eed8f972467132ecad530d59f992dd802474178e32df0a47fcfed36192689de SHA512 6511ad1ba6c814d0ab951f96e2ea7e4791fac3fbcae47693e8562fafe8e0c73648407e10036ebed42ac4ebb1458208677d850f46dbe238419f7ae545f8add6b6
-EBUILD sybil-4.0.0.ebuild 691 BLAKE2B 34f8a0aa568e148eb6709be3ceabfac4e4d974d9dbfc961ee4d13c8f126ce1aeb5d5453b82ee19c02b7411fffb27ba5dcfea2cfe0224d3646f180e8d8bc34815 SHA512 8b02f6a38c5b4281eabaa5a95e5376770e1629c1ee3c200770e8e7c8628f454ffbab741f343e3330eff0f3237f6a2647f798f6485581dbd50182de41eb0639bf
-EBUILD sybil-4.0.1.ebuild 694 BLAKE2B 8e3def3eb0ae205ed8a00051cd3f4131695178669eaf26e670a2f7cb0169c5e3a467d69d12a225582888e4ee87d0f70ec4015513daba4fd7f17b7b02c7f53683 SHA512 229c49576333132dfa21ca05f93adbd8bbc837c60e53c021db67eb7232a2866305fae4c40990bb33f5072eb7c61b2453a0e7d8332a5b995ede0459a6657b7839
-EBUILD sybil-5.0.0.ebuild 694 BLAKE2B 8e3def3eb0ae205ed8a00051cd3f4131695178669eaf26e670a2f7cb0169c5e3a467d69d12a225582888e4ee87d0f70ec4015513daba4fd7f17b7b02c7f53683 SHA512 229c49576333132dfa21ca05f93adbd8bbc837c60e53c021db67eb7232a2866305fae4c40990bb33f5072eb7c61b2453a0e7d8332a5b995ede0459a6657b7839
+EBUILD sybil-5.0.0.ebuild 691 BLAKE2B 34f8a0aa568e148eb6709be3ceabfac4e4d974d9dbfc961ee4d13c8f126ce1aeb5d5453b82ee19c02b7411fffb27ba5dcfea2cfe0224d3646f180e8d8bc34815 SHA512 8b02f6a38c5b4281eabaa5a95e5376770e1629c1ee3c200770e8e7c8628f454ffbab741f343e3330eff0f3237f6a2647f798f6485581dbd50182de41eb0639bf
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/sybil-4.0.0.ebuild b/dev-python/sybil/sybil-4.0.0.ebuild
deleted file mode 100644
index 16cfedcd364d..000000000000
--- a/dev-python/sybil/sybil-4.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-4.0.1.ebuild b/dev-python/sybil/sybil-4.0.1.ebuild
deleted file mode 100644
index 930ce7413c4e..000000000000
--- a/dev-python/sybil/sybil-4.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="
-	https://github.com/simplistix/sybil/
-	https://pypi.org/project/sybil/
-"
-SRC_URI="
-	https://github.com/simplistix/sybil/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/myst-parser[${PYTHON_USEDEP}]
-		dev-python/seedir[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-5.0.0.ebuild b/dev-python/sybil/sybil-5.0.0.ebuild
index 930ce7413c4e..16cfedcd364d 100644
--- a/dev-python/sybil/sybil-5.0.0.ebuild
+++ b/dev-python/sybil/sybil-5.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index 0024b23cd126..967d46345f9f 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,7 +1,3 @@
-DIST tempest-33.0.0.tar.gz 1126464 BLAKE2B 14bce9e0baf1878fc30cc5026c7849cda5abc0291706c7cd051827ffb1e15670e653a20ba6c0c898e86a7e1bee498d14139f82887606f5587b7775d18f96595f SHA512 1a34bc81a18121e3be05ab1a2b637aa8bfc41a0a8e11824294c78468762fb5f303ebf9607f5e72aed1cc5b130b26e22bf72c0574472a0de4eca083e899ff6eb0
-DIST tempest-34.0.0.tar.gz 1138466 BLAKE2B fb08579592445ad9d7bebff5c828b507ddd4d3db560d3d6548a1f26e3ee942f0fda74082eaeee8bba224f284942a4dcf1cabeab9a35821b1a03d0d9d1d126b45 SHA512 83d23d8e6cf6507eec175733372a4f8a4e95e9cb66cdb0ad716bdd4de211a8ae290ba0f56f6ebd1262ff8769619aa6b9e4cba4bc6e7e3dabf1c702167077a962
 DIST tempest-34.1.0.tar.gz 1139228 BLAKE2B 32fefb49ad5a341d297cf660387e66f69e0f3f81cba5f0530190bf5562c7a391359667390045fd746977020376e426aea351a2f50652d67693946bdb8dcfba18 SHA512 89cb682edb3d99c22e9c654a9e546e649837abf7e0b798d84c16d70bef4527d094dd6bbe1d11b8996412cd7e6f073fd1a3f80e5214d7d3a44965f3b542fa13e5
-EBUILD tempest-33.0.0.ebuild 2194 BLAKE2B b89f9a0c397fcc3af7aeb34415b0e57409488580d73fd084e72751fd5819435d65242b993283c6c1ba940d2e0b60d75f6317d2a229175d0fed0b8daa66ddf5c9 SHA512 b71f8a02f7d2d4cc33f167562db39740eb5785e69deca32392106e9139eae21c379ed453be64aa399991483766c914a4ad31419594bdc3617ba9638916d0bccf
-EBUILD tempest-34.0.0-r1.ebuild 2199 BLAKE2B 807c0e451c8c8b24dc94429e5451dec69642328e3751d97dc62f572f6fe474f76042c332212cfbb4b1243b0729d8ff21eb1fbd8795f00a4058835b58f44c3858 SHA512 0f45ab8a3b36314818963e09372288de07325a79d28c4cfae116250d1ae962bf37938deac4c280ad61100470c39f1886a10fc7ea8d72de8e5521a5fd0924c7c2
-EBUILD tempest-34.1.0.ebuild 2199 BLAKE2B 807c0e451c8c8b24dc94429e5451dec69642328e3751d97dc62f572f6fe474f76042c332212cfbb4b1243b0729d8ff21eb1fbd8795f00a4058835b58f44c3858 SHA512 0f45ab8a3b36314818963e09372288de07325a79d28c4cfae116250d1ae962bf37938deac4c280ad61100470c39f1886a10fc7ea8d72de8e5521a5fd0924c7c2
+EBUILD tempest-34.1.0.ebuild 2196 BLAKE2B 3cecc6aa4d890879813eb5d205c32a157ce4419fba6a136b141b7479ba5589d7b2b3ea45112b462754a79dc27665e21be32c82cbd940026b127881d5bdc5723a SHA512 dafd6586cec20fdf6c91011b1cfcff774bbbb85c221529c82dda8341b637ec81ba63f79fcc1e053148502d003caf09b99a33dde861c6b717056c44b1c7967c73
 MISC metadata.xml 442 BLAKE2B 30b474d10a59f53672390e029ffaf894cfe52862af42814ca09500372d4c94afc596177100b9ba69cfd12965e98809de363527d9db345c3b4cf499eaab0375f9 SHA512 d84466ecac31486c92a6c5f87089616b65a1f3cbe9447c3382021af57bec3964a80d4d4421783560528e80e70afb4f4ba604bf2a4e23ac7fcbd873ef3d789859
diff --git a/dev-python/tempest/tempest-33.0.0.ebuild b/dev-python/tempest/tempest-33.0.0.ebuild
deleted file mode 100644
index cdbd7f2b98be..000000000000
--- a/dev-python/tempest/tempest-33.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	eunittest -b -s tempest/tests -t .
-}
diff --git a/dev-python/tempest/tempest-34.0.0-r1.ebuild b/dev-python/tempest/tempest-34.0.0-r1.ebuild
deleted file mode 100644
index 9143d3959fb9..000000000000
--- a/dev-python/tempest/tempest-34.0.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="OpenStack Integration Testing"
-HOMEPAGE="
-	https://pypi.org/project/tempest/
-	https://docs.openstack.org/tempest/latest/
-	https://launchpad.net/tempest/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.16.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		dev-python/stestr[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Small subset of tests, which fail as result of not using specific
-	# testing environment. Others expect to run suite using stestr.
-	rm -r tempest/tests/lib/services/volume/v3/ || die
-	rm tempest/tests/test_list_tests.py || die
-	rm tempest/tests/lib/cmd/test_check_uuid.py || die
-
-	# remove dep on hacking
-	rm tempest/tests/test_hacking.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	mv "${BUILD_DIR}"/install/{usr/,}etc || die
-}
-
-python_test() {
-	local -x OS_LOG_CAPTURE=1 OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1
-	local -x OS_TEST_TIMEOUT=300
-	eunittest -b -s tempest/tests -t .
-}
diff --git a/dev-python/tempest/tempest-34.1.0.ebuild b/dev-python/tempest/tempest-34.1.0.ebuild
index 9143d3959fb9..f7d3f5d8ad3e 100644
--- a/dev-python/tempest/tempest-34.1.0.ebuild
+++ b/dev-python/tempest/tempest-34.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 29f6ffcf40ab..a3ffc8a17ebe 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,5 +1,3 @@
-DIST tqdm-4.64.1.tar.gz 169599 BLAKE2B 4c48f647beb46f22e3c065e2e9c1dc29755c74a2fd29cb8ad8b0dfeab529499d0fbca9296d06453012b3bbf9f9870f95da5e2f37f4c8ba29a71cbee3bd15116b SHA512 bc7ab34145722229737d25d87895c8760b82271c345e1174c83f5896cc893f92a27901d83575472ad124329acdad69bd21e7d68e79aeeefb0e66c83b11989d18
 DIST tqdm-4.65.0.tar.gz 167542 BLAKE2B b1f7b5666600dd5c476ffc9852cdc8905b8819b6b3f812e00495fa38780dda0c59e48956881d46919ce57b13da9dde519fa7e22d91ed58fe43172da8e9043653 SHA512 86315b57d8ceec69ee8970b25372b26b03d2d37f6d06e037e712bf16c7f56eac1c4049291e451c7df62273b91ba7149b400efd0186ceee90268d854e7b476c47
-EBUILD tqdm-4.64.1.ebuild 1034 BLAKE2B dedeeb0d498f82d64c539a1278d3ae068e6dda5d82eb3cd6c7025ebae898b4b4e426471ecc37f894938b6ffe1c14a4a2729940ffb633120d7e717e69ba112965 SHA512 50e7c671c44664a305f873082116e98933e34f725a01a0418ff46c2731e4240ea1a246a05dcb6ae77ea8044492eb02d0a2190f220e150d9a143fde5f646d5b3a
-EBUILD tqdm-4.65.0.ebuild 995 BLAKE2B 3d2ab16e7b5da8782395ed61123094468dd66b04a55704801bac47030b095740e2404520e98388bb3b0d644665a6f5d8ec91c154075764b9a785f837ef6f549b SHA512 a02980e496841bd4d137bdeabb1e34021d1399832914b14627fda12acc11ada54697ba2d30c1144f29516d6bc5fd6b5ac016b80283ec33a720a5ab88a4d7dc15
+EBUILD tqdm-4.65.0.ebuild 987 BLAKE2B fc1fd8f4eac2d0b07f3af3ce34981ff53f1340581a332ae2751b524679857e14465cb25c49c9c0c7d29bb593188fab5652e76663d6fd5bbea29bb5f27affcbcb SHA512 8f2149d7059991dc02672cce09c8161f3c71beb606a6c66cc5f7885e1b9615680bae5296970a1b746e68f44930bc14a0a73fedb273c72664fe4979a122e487f2
 MISC metadata.xml 605 BLAKE2B ed20e6f11f20cdc6525b98d9fd37c0b8f0781dd1c4be85e8aa4a3f5644a20fde3179bd44bb99ef4c14913168113a58963b36281ccf4807a694624a1e2df578f8 SHA512 b5f096a0256312e6ab5098bb6d9965b567bd735813d9c97fa49f08de640f2c5ebb292ba747eb284ff043dc29d4bb1cab1ac947ecaab6b4e94aa51e96a0cac636
diff --git a/dev-python/tqdm/tqdm-4.64.1.ebuild b/dev-python/tqdm/tqdm-4.64.1.ebuild
deleted file mode 100644
index d1a98a77916b..000000000000
--- a/dev-python/tqdm/tqdm-4.64.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="
-	https://github.com/tqdm/tqdm/
-	https://pypi.org/project/tqdm/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Skip unpredictable performance tests
-	tests/tests_perf.py
-)
-
-python_install_all() {
-	doman tqdm/tqdm.1
-	newbashcomp tqdm/completion.sh tqdm
-	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/tqdm/tqdm-4.65.0.ebuild b/dev-python/tqdm/tqdm-4.65.0.ebuild
index 168001703194..14b4118598fd 100644
--- a/dev-python/tqdm/tqdm-4.65.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.65.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 297219bbc958..679a25cb3f02 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -4,10 +4,12 @@ DIST trimesh-3.21.0.gh.tar.gz 12688064 BLAKE2B 5ac8c4cd3f087b63ad6e224a693380a7f
 DIST trimesh-3.21.1.gh.tar.gz 12689151 BLAKE2B e0d04a6003656f096404ec8972907381f5950f7a6ac3864963fc9a52dc015ad42d39e88ced8d125f725333ddde722358ebac9f263fda0cd21d663af42318bd50 SHA512 08716a310db8cae86a725072a6626b3703ffac3532182ce22389cf85fcdf5853ad8f17cfd8c34afde0e6dc0f2125d910d130810c3cce8e8dcb1605737074a3e0
 DIST trimesh-3.21.2.gh.tar.gz 12691646 BLAKE2B 0ec2c1e9afb607984b92d339fa07dd8b92bf0ac50c56704c98ce3f6c35449794b595640d68c67dc2ce59f236545f5df72238aef21103fbc1f432bbe285332a46 SHA512 e9e692c6dd20c787c9262e148aaaffb81c8ef3decbeb16e3c008a585701e9e71c73487e8226b159e86d550019f297bb2163b3be3006dd08c2df932d3dcd0b403
 DIST trimesh-3.21.3.gh.tar.gz 12692861 BLAKE2B 8e3f9cc28b26371bc46b31c48c1e79345cb6f27755999bf99cc793f83706ab559cffb3788101995550e112b77617c0d112c06f636f0f4c3047b966f669b419b3 SHA512 ab72b8b61643152d5fdcf5326b1c8a6f8e54c4bbc0653fe8c1dd379ecfa8510ae542c85adde8200abcb863ec80dbeb9046d6d7d4ec5f1f9aadead8871841b948
+DIST trimesh-3.21.4.gh.tar.gz 12692752 BLAKE2B 47f83c594318270c1594bad9c877de2cba71d44eccae7f755418aba785ce21c36946e482b38020a79417c4e346cd60cf3b31ee96bd489501a9dd88c2d433c68c SHA512 749f208b91f55b2a9581fa953bd984fc71a7c54bcc3d00ad1df8af2489911e966d2821dcff3d673e8ba55a83c9cce75625aaaeeddff817a16bb09b82b2bca549
 EBUILD trimesh-3.19.4.ebuild 1908 BLAKE2B fca44800b00390609a488c1d6ed4167a162c5e0f8b03d37d06c327f1f3516f2cbdcc51c5954df0dba0a8f99493bcd3ea5b8b404e6152d38105139a4c8935bfdb SHA512 5db0b712d9c1cd0bfa309c0018c0a0bb4a8b28f970e76a18308640b0a237b5e68fb8c23320ad2f0674eae050da0913942081da0ba00c18dc9f7596655abe1460
 EBUILD trimesh-3.20.2.ebuild 1909 BLAKE2B 34fe461b88e583ac9981b590db715562151e7faa2a31bd6596c0455f329f3e7f81c06ca9e994c6a20d1ca75c88003901beca7c77578aa60ef3880a35bb20183e SHA512 253b8d5652d031951198bd51f657984d7c65c8f0e7f9a2a7628905d8c88a761411f04824cd6f09014b3cdc7ba40581f2f100aec3e5dad6fc1fdcabc8c907c7cd
 EBUILD trimesh-3.21.0.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 EBUILD trimesh-3.21.1.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 EBUILD trimesh-3.21.2.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 EBUILD trimesh-3.21.3.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
+EBUILD trimesh-3.21.4.ebuild 1871 BLAKE2B 820db5de2d19e1ff038ca7f2b716f0a526d8d710dbeb6417f4179a58f65d13d072443410c06087bda2f65d62b6f054dd56f1a95ca9c01573dbc650f55cb79680 SHA512 23e4ddebf3df5da330528d05007ab5b26d2ed534851a0fa7abbb28270e64a215bc32be2584e0e86b11884980d449c62be83608bad7bd9df6ac8385880339ab94
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.21.4.ebuild b/dev-python/trimesh/trimesh-3.21.4.ebuild
new file mode 100644
index 000000000000..c876396fccaa
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.21.4.ebuild
@@ -0,0 +1,65 @@
+# 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_{9..11} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
author	V3n3RiX <venerix@koprulu.sector>	2023-04-05 11:25:00 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-04-05 11:25:00 +0100
commit	ad77dc19e91d2c023f80e11e8974536d80e3a743 (patch)
tree	42bb312ab0eb61fd94103e3eddb65b134f6be5a4 /dev-python
parent	6de28447d66e6c47ee682740b840cdb67244d4b1 (diff)