Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-08-12 06:11:19 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-08-12 06:11:19 +0000
commit: f3095ffbe2ede5197a4912aef9d03c2ea284376f (patch)
tree: e56928a2c61b150195732622b76a96cd40eeb109 /dev-python
parent: 9b5301bb92ad94bdc782f8c22b794320dd9f8b5e (diff)
download: baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.tar.gz
baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.tar.xz
baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.zip
171 files changed, 549 insertions, 3281 deletions
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
deleted file mode 100644
index f5739375186d..000000000000
--- a/dev-python/Arpeggio/Arpeggio-2.0.0.ebuild
+++ /dev/null
@@ -1,32 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/textX/Arpeggio"
-SRC_URI="
-	https://github.com/textX/Arpeggio/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-DEPEND="
-	test? (
-		dev-python/memory_profiler[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e '/^setup_requires/,/^[^[:space:]]/d' setup.cfg || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild b/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild
index 5b2421dfa754..83fd89361514 100644
--- a/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild
+++ b/dev-python/Arpeggio/Arpeggio-2.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/Arpeggio/Manifest b/dev-python/Arpeggio/Manifest
index d9e14d575ac7..62e673397779 100644
--- a/dev-python/Arpeggio/Manifest
+++ b/dev-python/Arpeggio/Manifest
@@ -1,2 +1 @@
-DIST Arpeggio-2.0.0.tar.gz 767813 BLAKE2B b4eab5b0a049560e8f3d775f34e9d1beffc26d3969a11a2043d203852c77385adbbef876e212b09c6af8630f2b8de6dfb088760bf9ade332af981d4e8d8267ad SHA512 b5a75eea515b7dd0ad7dc261703300bd5b3e5a70f0946845f8828dbf7c76613aef926fed9538fe0f9a71c1666edc9f8cff31afddd551bea1d7b1b9ad7a9cc405
 DIST Arpeggio-2.0.2.tar.gz 766643 BLAKE2B 9cd3a40b10594868678b6e0e625a094a978deca22a0d251e348e25a7358afb64bdef337e1c93afcde00d1347a9b22faa694678217c3e2de49690e923f8f0ea73 SHA512 6f8ddf8ca19f968de84730ad4861585f333be8315e70b6bd320f838731cffbd28b5b6245edd869175834a95207f39b20674795f0f31b226c9387f4a0376c9adb
diff --git a/dev-python/Faker/Faker-18.11.2.ebuild b/dev-python/Faker/Faker-18.11.2.ebuild
deleted file mode 100644
index 41983d44a636..000000000000
--- a/dev-python/Faker/Faker-18.11.2.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=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,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/Faker-18.13.0.ebuild b/dev-python/Faker/Faker-18.13.0.ebuild
deleted file mode 100644
index 9fd3af59256e..000000000000
--- a/dev-python/Faker/Faker-18.13.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,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/Faker-19.0.0.ebuild b/dev-python/Faker/Faker-19.0.0.ebuild
deleted file mode 100644
index 9fd3af59256e..000000000000
--- a/dev-python/Faker/Faker-19.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,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/Faker-19.1.0.ebuild b/dev-python/Faker/Faker-19.1.0.ebuild
deleted file mode 100644
index 9fd3af59256e..000000000000
--- a/dev-python/Faker/Faker-19.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,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/Faker-19.2.0.ebuild b/dev-python/Faker/Faker-19.2.0.ebuild
deleted file mode 100644
index 9fd3af59256e..000000000000
--- a/dev-python/Faker/Faker-19.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,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/Faker-19.3.0.ebuild b/dev-python/Faker/Faker-19.3.0.ebuild
index 9fd3af59256e..41983d44a636 100644
--- a/dev-python/Faker/Faker-19.3.0.ebuild
+++ b/dev-python/Faker/Faker-19.3.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index cd6af17ae7ed..75491855233d 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,6 +1 @@
-DIST Faker-18.11.2.tar.gz 1670644 BLAKE2B 0496e9d2169932fd158b8eb62693d1c7f833c00c93fa75b35d747bec1a9e81247977b307faef6cb2526c0042716b080b160fc93cf8d9543a1e2bb3a477f815e6 SHA512 9b54485836d8e4cf66c0ebc9807770f77867a9ab634bc5a465811fe0c2d79c0ec1ab5360bb5f69e9f603026094b4c969a4ad1b98c0c6b21e7fb740d5a17af5b8
-DIST Faker-18.13.0.tar.gz 1672316 BLAKE2B c7b3a040276508c8d08c184e90dfd054d62ef635299e637476fedf0d3e01d0e311bd855c4df39dd449244c07c71a1fe216063c07a3abef69f8ec8fa967124769 SHA512 b5cd907d962f39d15001d0218993dd6b4f65ac6252fcb1c72bbb2905a585ad26d0f7c6807cef43b41ce430122fe4730d26f57f119bc3547a432d133e87d98beb
-DIST Faker-19.0.0.tar.gz 1673020 BLAKE2B f3be24f29eb870535034afdecd57d0172b8cbc4f9228796373eab9f5be3211d39134d94f9c3543a0387579a5ed7d0434b9eede12b824b93652ee4b2d964f5835 SHA512 fdc3d0618dae04fa1f4fc3ce8d10a353d8272059c557729e93891e59c85b0c03e11009febfd5d500ab5425b6ba4446c9df72f84bc1f632c0cec76a761bd8c9f2
-DIST Faker-19.1.0.tar.gz 1673101 BLAKE2B 92349e38c72fc85fcb0711555645ca3745015df485ba3e366000e71d620f14bad18b1b26fe5e456e18269ba867daf0ba42779623afbc96e5f64fb0537c842d9b SHA512 4fa11f479e78ac4835f00f17ce99aebf17d88e626548094f122dccb78f6caddde8cd058f33f2dc304725049e75e9f1c42b549ff139ed0d9d798bbb630bb1e80a
-DIST Faker-19.2.0.tar.gz 1676517 BLAKE2B f9204266add7bf042c3993196474aeb633986932ee8ab2e83985a88e5e5639219efbadcf54c2359ada4c118744fb0d4af858a4bf70a957f467599dcd2bbfac7a SHA512 96c5b1c02faef86e924ecca68d734f51e41da9e1f9e1f0ca1634b289717ff2af5596e4b713352047156d8478ae80006dc98897b48c8b20ce0e210e65c7dcb81d
 DIST Faker-19.3.0.tar.gz 1677117 BLAKE2B 855e3cc49e56d9c690add2b9bda9fc8c6e42a157543c44206803e794bc5a5da440f2a5151d959bff6aa438af465f7d4bf986e596af592251e64c80c861fdb8fb SHA512 cfbb81d8751fbe1c90260f806f36a8c95e7bcfe5f30555bb168b80e5e438a4e427482eb4220b55a6bd0f04ce4d64e9bd24b757b852b5a22de5f2b127e3f3fe25
diff --git a/dev-python/GitPython/GitPython-3.1.31.ebuild b/dev-python/GitPython/GitPython-3.1.31.ebuild
deleted file mode 100644
index d06a44df1773..000000000000
--- a/dev-python/GitPython/GitPython-3.1.31.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.10
-SMMAP_P=smmap-5.0.0_p1
-
-DESCRIPTION="Library used to interact with Git repositories"
-HOMEPAGE="
-	https://github.com/gitpython-developers/GitPython/
-	https://pypi.org/project/GitPython/
-"
-SRC_URI+="
-	test? (
-		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
-		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-vcs/git
-	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "travis@ci.com" || die
-	git config --global user.name "Travis Runner" || die
-
-	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
-	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb || die
-	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
-		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
-
-	cd "${T}"/test || die
-	git rev-parse HEAD > .git/refs/remotes/origin/master || die
-	TRAVIS=1 ./init-tests-after-clone.sh || die
-	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# performance tests are unreliable by design
-		test/performance
-		# unimpoortant and problematic
-		test/test_installation.py
-		# Internet
-		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
-		# requires which(1)
-		# https://github.com/gitpython-developers/GitPython/pull/1525
-		test/test_git.py::TestGit::test_refresh
-		# TODO
-		test/test_submodule.py::TestSubmodule::test_base_rw
-		test/test_submodule.py::TestSubmodule::test_git_submodules_and_add_sm_with_new_commit
-		test/test_submodule.py::TestSubmodule::test_list_only_valid_submodules
-		test/test_submodule.py::TestSubmodule::test_root_module
-	)
-
-	epytest -o addopts= test
-}
diff --git a/dev-python/GitPython/GitPython-3.1.32.ebuild b/dev-python/GitPython/GitPython-3.1.32.ebuild
index e0d73203602d..d06a44df1773 100644
--- a/dev-python/GitPython/GitPython-3.1.32.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.32.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 44c234506ecc..5d758f4f81ad 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,5 +1,3 @@
-DIST GitPython-3.1.31.gitbundle 9820824 BLAKE2B 47becdf80c8047c3de74f3ad2308f2003629dac970df961e97ae455719690afa8ca4fc08c85fdd01d351980cac5b79265164b92c16e993efb964e4c5d6e62810 SHA512 2b73a9bbe11bf24c1f0cfbc817b1226ae49c52a898f233d23aa8512cb7709adaba57c76afce8aa4416dcc4f16775d0d4138f0059ede51f59a6ccdd27d0f08cd3
-DIST GitPython-3.1.31.tar.gz 195822 BLAKE2B c5644a811e33da4e2983d5b41dc5e223bff23bb817027485fd24598163dc515d1823e8abc5f871a9ad4334827f097dbe7856cf618940cd3ddbe507728253ea2c SHA512 80d5f73db589e239dead268c99092b2429c4d0602e4f9a1e77cce5c68f2eade1651e3da9de68fd485021565f3a2d9b980c286b0d302c58e60011a443b4361e71
 DIST GitPython-3.1.32.gitbundle 9676140 BLAKE2B e975f7949f3f3e25f66008b1f2be80dbecb96234405b07b7ef33cb119abde1be434d46deb3c5bed2ec26f4fe35d0f5a1e605c60727812ef4aef2116029f83abd SHA512 b54d5a8e335f6c1b6dfcdd6ccb9c79562ec222cd3d83fd196dab245bed90a9e02d20b191b46c5acdc300f2dede942c686694f0aa005fa5c5c2c2d3e81470a692
 DIST GitPython-3.1.32.tar.gz 196978 BLAKE2B 914b0ceebe89b00e5d65c963055c1d64c3125699a4df80e04c5a0ca59181faac5357880767224d3b3cad9b884668299510ea055ae0c228648c1b1c2e5ec048d0 SHA512 b1a4ac7d98b9543454525819357afef4c45dde842a8a8689f5f059312cd45ee10a7a5b22e2417a0a7120b78c0a40addc4f9189789d70ca34d2bc21962fe44fb7
 DIST gitdb-4.0.10.gitbundle 1485461 BLAKE2B 5a217c609a402cd7888da1502b25d217812503cd703cda8bce3c7159732c59d7f4bcd52688a5da457f43fde1645a6db79588a6fc8cc8dff5c58e9dcbaef79b9a SHA512 98dba48f75e28eaded791f91c611e07bef73c28a7f8ac58889b05d04f4b3699a85a5be1c829ea3e2f380507a9009f35bc552bb4260564127e2863807f9b4712a
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 419b56991b4e..75a449ba13c4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1 @@
-DIST astroid-2.15.5.gh.tar.gz 461755 BLAKE2B 4af28becb14d767c3fa162be93cd1d3f99e42a476a7b1ee57225a6d5603876cbfde7a58e17412d1142baa42288cbb2cfe3ecdbaafe5195c777f04a3ad9fe4427 SHA512 9862a2f4703b36284d14a3b09f80b4b0a1e0948e306b4906ec663fc133d07966e24a711a90067b369b166ce4d53859327e1da84406a023d1a911fff7bb0ed026
 DIST astroid-2.15.6.gh.tar.gz 462156 BLAKE2B f5df204a0b635d29165da1566afd9259ff26102fef3b56685ad9e10fe1cdae35aa90b1e1f81293e591c03122e980936dfd91b521dfe7a4c8cfacb8b40bcac9d6 SHA512 20c4d316176b84d61b5f44823026926e84c7de3c3a6febaa23cf9c8c5a9507ce65168804a61cb2db0ffcc7ec0ecb687282e6c794485135203cc25d30064e0047
diff --git a/dev-python/astroid/astroid-2.15.5.ebuild b/dev-python/astroid/astroid-2.15.5.ebuild
deleted file mode 100644
index 0336d518cff9..000000000000
--- a/dev-python/astroid/astroid-2.15.5.ebuild
+++ /dev/null
@@ -1,65 +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_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/pylint-dev/astroid/
-	https://pypi.org/project/astroid/
-"
-SRC_URI="
-	https://github.com/pylint-dev/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/wrapt-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-"
-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
-		# requires pip, and looks suspicious anyway
-		tests/test_manager.py::IsolatedAstroidManagerTest::test_no_user_warning
-	)
-
-	# 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.6.ebuild b/dev-python/astroid/astroid-2.15.6.ebuild
index 3cb7b9607233..1180bfbbbc61 100644
--- a/dev-python/astroid/astroid-2.15.6.ebuild
+++ b/dev-python/astroid/astroid-2.15.6.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/boto3/Manifest b/dev-python/boto3/Manifest
index 8e484ac6e553..fb5bc34fcdac 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,5 +12,6 @@ DIST boto3-1.28.21.gh.tar.gz 685243 BLAKE2B f6f6effd9ac42fb9d8db8ec91f628cb90b39
 DIST boto3-1.28.22.gh.tar.gz 685817 BLAKE2B 53dc35d037fd3605ae8a63c85e77e5b449cc9d7f80c4e06c3d96104afea7fc07c11759e3bea5ba3fa5fa1d86608dfa7ce3ab2612c66239e7ec06603c81c2d744 SHA512 2d255b1eb02626f7b63503ef2324b97b59ebb1728d9c2be79f3a65810ceb13bfb4091b3f657f61422a324fae559c065e848ba24e3c7c1e25a4fcb200eab133e5
 DIST boto3-1.28.23.gh.tar.gz 686500 BLAKE2B 0ab169afe4d238d7a09d0b9e2c8305e1f4ebbdc64f9225af2712bffe6c71c70dfe66731eb2af4c9be505aa15bfdb091d276a72889b943afd65ae07f893b363f5 SHA512 7951f3bb229ac6365da7534ad157df461875a85730958536bed005d5dd7981bb75ce5265796c28e39806f66b46fe790e9dee9f75e3fc6fdad5f1aa3b4bb7df5d
 DIST boto3-1.28.24.gh.tar.gz 686681 BLAKE2B ce037be0934ac2fcbedfbec4c32931e4057972c3ee6a2804c6e836227d77a1df99d7f7005f3b9a6886e2a012b6b5b12d48b6a652e293c9498754e8a98176d02e SHA512 f70724927e4971ef905ecd9b0ddb3462f0ebd4b99bac54873bd246903c26e38c13d0aad0bc141e6046556ce6365c680bd9fc4c42f82033358024eb8c46eb3f35
+DIST boto3-1.28.25.gh.tar.gz 687791 BLAKE2B 641dacd5076e51e64991c0bb97fda6f5b8d705b253ab902a5598daf23eca65ad586348f38e6dce0dfd90526a49ff56320dc99972d375e61d5fab3692f5948674 SHA512 2e47027c035338a9d70027b32c93db04ac859a8cfe6c9f962df33c1139df5ba1562e9e0bb32670825a93c29fa2b231779221c6b54c5b2bb498c5e19667763306
 DIST boto3-1.28.3.gh.tar.gz 675019 BLAKE2B 93b29307fbfec4e61dc60d28e4f20392ae2a730f048a0b2e8cb99fd515a036fc4ca889ddd564e09b1f3eab4cb9499c5918b4e7430d63148dd2854d126719a468 SHA512 514d0f373f25bb691abf5f1f8b0209a07097191b2ad8fb6339739e7a0bd2b8e6d5a88f1250e928ca89b1f1aa5e27a44bf2cab38a57680c01214d370d11944ded
 DIST boto3-1.28.9.gh.tar.gz 677993 BLAKE2B a800de94cfb0d317b41091fb1d2bb0fd6449df85da434879c0689bf36998b2a52331ba077c65cae9967fcce998a15d2a6f6a758931fa12a00b95487adaf81dfa SHA512 6e1e5e74d20d2e67f29597ddcda70475cbea863978ca93ec77a0f478690477c9782111701771d5b8354f4402c21496e7f5627b1398cbd6fd87627fd978f5e360
diff --git a/dev-python/boto3/boto3-1.28.15.ebuild b/dev-python/boto3/boto3-1.28.15.ebuild
index 03c610b184f7..315bc71cf897 100644
--- a/dev-python/boto3/boto3-1.28.15.ebuild
+++ b/dev-python/boto3/boto3-1.28.15.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/boto3/boto3-1.28.25.ebuild b/dev-python/boto3/boto3-1.28.25.ebuild
new file mode 100644
index 000000000000..03c610b184f7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.25.ebuild
@@ -0,0 +1,66 @@
+# 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_{7,8,9,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/botocore/Manifest b/dev-python/botocore/Manifest
index ab4a3fc27eba..e5e8b4c2ba5f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,5 +12,6 @@ DIST botocore-1.31.21.gh.tar.gz 11852848 BLAKE2B ccdd57fdb927335ac2b5d2f56946e49
 DIST botocore-1.31.22.gh.tar.gz 11858266 BLAKE2B a4eb898f7e562b692592171ab239550995ab6bf472cd5d98d5f98b412b050f18610ec61db58367d0cfec28d77f973f0200d5b13a88ea5bf66e5d41a6a254ccdb SHA512 fe66dd19e38ed98449f76e921ee538132a1e8a2f1452b6a7e88175901a1275e467faac4f1ec825854b6f8e799f4a54d2bebe4a52256edbdce3004944b2c6bd1e
 DIST botocore-1.31.23.gh.tar.gz 11859889 BLAKE2B d183c514f61f6384bd535e284d58dd4e11df7d33948256baed19eb21908cba429a54c4e2aa2640ab550df2803ead7c33489028231695ec0effa660dd9827de2d SHA512 b6eecc7ff1390e89290c5c09a905c89a6093dc0571dbbb3b38c018f70a1ee177dd63a70900f12cadd9926a2e9d645cd3cfef78d5424a1437d123e07ccaff7c64
 DIST botocore-1.31.24.gh.tar.gz 11862679 BLAKE2B 16544365d84d6624a4422f1a200f7a7b5e76aa2e4c1abc09eee42c6c815623755d03e9c3dafef98589bb35aaaa4eacb554da0302378a629abe65c1c3b47160db SHA512 78f12f93ecc9c3607ae30602fc1525833d9a7aca95934ccbb6980f05239561810f131eafa801bb07d79546df1eaac66c13fbd7db0357eb8eb71936849ab4367f
+DIST botocore-1.31.25.gh.tar.gz 11863108 BLAKE2B 2fb9bfc01ec93e1dff3459e89f7b20984efe39572320c437af3eae8becc2a871651528fd732f26524c978c5cb032f3675b313ba9b9c6e5acf76f5c5ab07fba9e SHA512 ff360e15051c958b8f9b6e04bb27e2f728bd210c6c7bfc07525d91d54b1ba8be5738e3434c651b61c5774c0b9b4252abaac788274bd56ff10e782efea32b6dd6
 DIST botocore-1.31.3.gh.tar.gz 11769948 BLAKE2B 452c494faa430b6782685b9960cc9ea15ce3dedfe1b5343ee7bdbd7544e108bbfc7bb58d527419b5dc5f4077dd806752eec927196b82ac286903992fef339e52 SHA512 0f2853c14d7695ea4eeacea6fed93e77436df143bd0b9bec967490eb88e3d6531c916dca91c1a3bde4b57253d77acabe2413acde4d1473d01e15ef69b45621e0
 DIST botocore-1.31.9.gh.tar.gz 11785638 BLAKE2B 23f2c010f98b5ca8414c9a031524b1cb7d75366bf84d34df980ef4085a73bc62643cca5255519f891f7a9468abbf0d97adddf6684c3c0a751b0f9f390122c19d SHA512 b2bf0089a81c5389d86c9f7b2545358f23a1219d7e5bf152285f58293a171210b46c22c814ab3f8da460a2acbdd5127193fa7a2e19a021db511f9d08931037bf
diff --git a/dev-python/botocore/botocore-1.31.15.ebuild b/dev-python/botocore/botocore-1.31.15.ebuild
index 4bc7f657ecb8..fd7a3532a61c 100644
--- a/dev-python/botocore/botocore-1.31.15.ebuild
+++ b/dev-python/botocore/botocore-1.31.15.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/botocore/botocore-1.31.25.ebuild b/dev-python/botocore/botocore-1.31.25.ebuild
new file mode 100644
index 000000000000..4bc7f657ecb8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.25.ebuild
@@ -0,0 +1,72 @@
+# 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_{7,8,9,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/charset-normalizer/Manifest b/dev-python/charset-normalizer/Manifest
index 08ba3976e6dc..a19ce3ed9c3e 100644
--- a/dev-python/charset-normalizer/Manifest
+++ b/dev-python/charset-normalizer/Manifest
@@ -1,2 +1 @@
 DIST charset-normalizer-3.2.0.tar.gz 97063 BLAKE2B 2192401d74abab5f7ccd434c5493ae59b449df9a6ab90190a236b3f665e3a940e15d00803a2477a7c2996030fa1e5bf725fc15b6373040f29f27feab9df6e1e1 SHA512 0e3967b489561394ca848c1fe7dfaa72a330a3f645e9386c1d2d2dc8c2e35a34a8186e6f3377eda2aed503a3e7e626fe116d7b34c2f4a3fd8446a4c1a8fb74cc
-DIST charset_normalizer-3.1.0.gh.tar.gz 90246 BLAKE2B 2e96f7c9910091e81d05a6632f14b6ec9481f1f927551ac8d70c1b320c21b7b4be196118391ec4db3291f74819e9488c71d90dc9a489e51849d251fb97ec8f9d SHA512 77657990605ef342934c140b7a9b38cf843d9739725deb3d755a00000dd1e3a9b25d73986cf26cdb291ea0f32aee0c3f5dfb771cb22b8b19246eb909b78240ce
diff --git a/dev-python/charset-normalizer/charset-normalizer-3.1.0.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.1.0.ebuild
deleted file mode 100644
index 6caf1faee4b5..000000000000
--- a/dev-python/charset-normalizer/charset-normalizer-3.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=charset_normalizer-${PV}
-DESCRIPTION="The Real First Universal Charset Detector"
-HOMEPAGE="
-	https://pypi.org/project/charset-normalizer/
-	https://github.com/Ousret/charset_normalizer/
-"
-SRC_URI="
-	https://github.com/Ousret/charset_normalizer/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts=
-}
diff --git a/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild
index 3173a5f62899..b7e864d9cf48 100644
--- a/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild
+++ b/dev-python/charset-normalizer/charset-normalizer-3.2.0.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 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 3672b77b25c5..45a3b18b3aa3 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,4 +1 @@
-DIST click-8.1.3.gh.tar.gz 333961 BLAKE2B ed80d9be1e5740f1e4af62e97cd78488dc99d59da4a6dc9c99fb62b08c32ca2b889e3678a2841052922d102d8ac83df19e3e2d0ff41c46387e695d3718c7702d SHA512 29194ee3877e013a2fe1037870522c5b5a78136ca60da9109f29312a3e52c767867f5eec2d90ca385cd0508f77555b9d6ad8f5141dc31900ddc9307a2207a818
-DIST click-8.1.4.gh.tar.gz 340493 BLAKE2B 953e4033a1715ec631bec197f62d1015de28579e0cf3c3ee8fab1941a60797130d12e752aea5dc210cbedea1735cc6fa517eaf9f88836599a9135f42368bb603 SHA512 3095990cdbaa01a61fa5d84f6a80c03a9c645c81ac569f66a4b23ba06e37ba79a5c9fcc6f09a7b8bed1082cb17c0381743c5a160ae14634f102b7f29175e739b
-DIST click-8.1.5.gh.tar.gz 341669 BLAKE2B fb3b1f8551ee79f4f6f8719133d370947c3ee1448ca95735cd9499f36a22cc93b25a87db40aa33aebbc196209236f458040f4012d7c1ae7adaa304999a3c1675 SHA512 55171a5f16643305c6d9b038ff6c72bdfbbdeb4c39e7dbc04618fceba2345b2a4d69925d3490ea5a974be4101c8b1f4c0dd3b247d9b050506bb92a6a7d6334cb
 DIST click-8.1.6.gh.tar.gz 341538 BLAKE2B 611619665a95be2ae590c2fdad403bc834fd43665df4418ab0fa5e55b4ea90600db8a1710e5c77bda3dc1a77e6b53393a52225730a4fe4bb874076569e4b1d96 SHA512 ae31e4b5666b7ab6638a12fd12088c5b5311a4f6913e3471aefdf2392cf47d4be6e745e09070d6f2e382fa92c4068c196e0109295d86953dd066f7619dfbd4cd
diff --git a/dev-python/click/click-8.1.3.ebuild b/dev-python/click/click-8.1.3.ebuild
deleted file mode 100644
index e583dfa451bf..000000000000
--- a/dev-python/click/click-8.1.3.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-HOMEPAGE="
-	https://palletsprojects.com/p/click/
-	https://github.com/pallets/click/
-	https://pypi.org/project/click/
-"
-SRC_URI="
-	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log-cabinet \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.1.4.ebuild b/dev-python/click/click-8.1.4.ebuild
deleted file mode 100644
index 3931f45072ed..000000000000
--- a/dev-python/click/click-8.1.4.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-HOMEPAGE="
-	https://palletsprojects.com/p/click/
-	https://github.com/pallets/click/
-	https://pypi.org/project/click/
-"
-SRC_URI="
-	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log-cabinet \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.1.5.ebuild b/dev-python/click/click-8.1.5.ebuild
deleted file mode 100644
index 3931f45072ed..000000000000
--- a/dev-python/click/click-8.1.5.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for creating beautiful command line interfaces"
-HOMEPAGE="
-	https://palletsprojects.com/p/click/
-	https://github.com/pallets/click/
-	https://pypi.org/project/click/
-"
-SRC_URI="
-	https://github.com/pallets/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="examples"
-
-distutils_enable_sphinx docs \
-	'>=dev-python/docutils-0.14' \
-	dev-python/pallets-sphinx-themes \
-	dev-python/sphinxcontrib-log-cabinet \
-	dev-python/sphinx-issues \
-	dev-python/sphinx-tabs
-distutils_enable_tests pytest
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/click/click-8.1.6.ebuild b/dev-python/click/click-8.1.6.ebuild
index 3931f45072ed..e583dfa451bf 100644
--- a/dev-python/click/click-8.1.6.ebuild
+++ b/dev-python/click/click-8.1.6.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
deleted file mode 100644
index d0c5e5bb16e8..000000000000
--- a/dev-python/csscompressor/csscompressor-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A python port of YUI CSS Compressor"
-HOMEPAGE="
-	https://github.com/sprymix/csscompressor
-	https://pypi.org/project/csscompressor/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild b/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
index 5cd19bc51ea8..c5a192e6ee18 100644
--- a/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
+++ b/dev-python/csscompressor/csscompressor-0.9.5-r2.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index d2bf200b795b..8581689ab24a 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,2 +1 @@
-DIST dogpile.cache-1.2.1.tar.gz 258589 BLAKE2B c271f823f1a57f26c07078edd9af5a899aa6c3793d979f3eb86cbad7814360d51dc26cdfe06f92f6bbc9a14620362332c22379a6024c9adab18f46c1ad3583fe SHA512 407a0b5842b9ae4a8a82da933b4c7a4fec4391b877dcddb4f454c7fdf78ed0d2f6db16650c89c8047e1ec2eb6348c23bdcae99a0998aa2de58cfc00d92e2fa5a
 DIST dogpile.cache-1.2.2.tar.gz 263102 BLAKE2B ccd64492e154f30b27a9b031086acd89002c9cae402105720022370688c6343c6c7a023fc643390764a40dfa9dde083e5adaf644aa79939c0bf6573c4c518366 SHA512 23b078b79e4b1f87c8d397d35b772f0b5fee66a0e452de06e7644ecb1ef577ae1629307a0e32fa62f49d536f95fb62fe70ededeb43647fa0c2e0baf896261931
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.2.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.2.1.ebuild
deleted file mode 100644
index 6e62e209e2a7..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value"
-HOMEPAGE="
-	https://github.com/sqlalchemy/dogpile.cache/
-	https://pypi.org/project/dogpile.cache/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild
index ac31ddd24865..711d7485b7fd 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.2.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/editables/editables-0.5.ebuild b/dev-python/editables/editables-0.5.ebuild
index d86425da5a64..ce505ef4ed91 100644
--- a/dev-python/editables/editables-0.5.ebuild
+++ b/dev-python/editables/editables-0.5.ebuild
@@ -20,6 +20,6 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/execnet/Manifest b/dev-python/execnet/Manifest
index f02a8f3133c8..5f52b581b9e2 100644
--- a/dev-python/execnet/Manifest
+++ b/dev-python/execnet/Manifest
@@ -1,5 +1 @@
-DIST execnet-1.9.0-pytest-7.2.patch 11177 BLAKE2B 6d6d0c76de606305ed0ca4f0f52d5ccc0cc3ab99d795ac2f4d39d3804cd5c0191f75704ee5eafcd135dc9854eef99a59dbd9cf57a8455b6b9cd45f2612fbcdba SHA512 ae16b3127545efe77a49392836a8940a053967e530a6288660a39edba9b35b448d0061ac7ac751c3be68de2cf5410655c2db55d344519f69db7c9ed4f7ca0003
-DIST execnet-1.9.0.tar.gz 173884 BLAKE2B 622a1f47365bdea97ba53aee908faf990ef847e3641ab0590073cdd6eac3413d1517f16e8e5b73b56884f02aebb3142691ecf6113e14f9c49c9b0fef3ee3247c SHA512 d425e7b6f3708efecb5dfa2c36a837cb55f2c32cf2ec0c1dc11cd1ca6ea614d119d04908b84dd5a3593c87db35e71fee202f843665c853ac3538479f60c83d60
-DIST execnet-2.0.0.gh.tar.gz 172932 BLAKE2B ad2ef83db08457e403bf568dbcd01975dbec6c20785b970860c04ba84887db3b83ca5d234341556aa33451052d082ebf9fe7a89ac6dfeab2868f9cb76a520969 SHA512 bde07713ed4f85b8de85e42c87d5bde062c0ac90defc87b9a3ec56cb210b445f06dce8e586c6ee764c45ab1f8947f330481e43921096cca9d987449d704c9988
-DIST execnet-2.0.1.tar.gz 160812 BLAKE2B 0e354b1630696faff7bc56f925a14797119f0480b5784f37154fed1bdf5e9541c6ccf73c805556d6b317d4d9c9b9b39714e187342c8a1a06a64b3efdc665f31e SHA512 422fdaa8173b3f41763738b64045583fd887d17fbacda921316d01c7a7082ed9447cdb85d3d42ee5ce8bff5917ee8d8a588c9e3caab8bd434606890effd284b2
 DIST execnet-2.0.2.tar.gz 161098 BLAKE2B 2a0a4d3071a0436d7c6ec450f1b502047e6a367985771aa58050e149ea060e8a573844bd2380c66be914dd00e3f9491b126e84089006787c61c043116f9e5981 SHA512 9e2e7ff4e04f50b12a3dd47d3326a3ea229f64926e8598bdce6ea25bd57afb41e96249e1c9f7333927a38a2793f67cac77965c922980055ed758dee361bf2ce4
diff --git a/dev-python/execnet/execnet-1.9.0-r1.ebuild b/dev-python/execnet/execnet-1.9.0-r1.ebuild
deleted file mode 100644
index ef9f7c37008f..000000000000
--- a/dev-python/execnet/execnet-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="
-	https://codespeak.net/execnet/
-	https://pypi.org/project/execnet/
-"
-SRC_URI+="
-	https://github.com/pytest-dev/execnet/commit/c0459b92bc4a42b08281e69b8802d24c5d3415d4.patch
-		-> ${P}-pytest-7.2.patch
-"
-
-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}]
-	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${DISTDIR}"/${P}-pytest-7.2.patch
-)
-
-EPYTEST_DESELECT=(
-	# needs python2.7 with apipkg?
-	'testing/test_termination.py::test_close_initiating_remote_no_error[python2.7]'
-	# tries to run python2
-	testing/test_channel.py::TestStringCoerce::test_3to2
-	testing/test_gateway.py::TestStringCoerce::test_3to2
-	# does not like Gentoo defaults
-	testing/test_gateway.py::TestPopenGateway::test_dont_write_bytecode
-	# almost all tests call py2, not worth filtering for the rest
-	testing/test_serializer.py
-)
-
-python_prepare_all() {
-	sed -i -r 's:(,[[:space:]]*|)"eventlet":: ; s:(,[[:space:]]*|)"gevent"(,|)::' \
-		testing/conftest.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/execnet/execnet-2.0.0.ebuild b/dev-python/execnet/execnet-2.0.0.ebuild
deleted file mode 100644
index a3d8007f9640..000000000000
--- a/dev-python/execnet/execnet-2.0.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="
-	https://codespeak.net/execnet/
-	https://github.com/pytest-dev/execnet/
-	https://pypi.org/project/execnet/
-"
-SRC_URI="
-	https://github.com/pytest-dev/execnet/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 ~x64-macos"
-
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest
-}
diff --git a/dev-python/execnet/execnet-2.0.1.ebuild b/dev-python/execnet/execnet-2.0.1.ebuild
deleted file mode 100644
index 91191b4d0d5b..000000000000
--- a/dev-python/execnet/execnet-2.0.1.ebuild
+++ /dev/null
@@ -1,32 +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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid multi-Python deployment"
-HOMEPAGE="
-	https://codespeak.net/execnet/
-	https://github.com/pytest-dev/execnet/
-	https://pypi.org/project/execnet/
-"
-
-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/hatch-vcs[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	epytest testing
-}
diff --git a/dev-python/execnet/execnet-2.0.2.ebuild b/dev-python/execnet/execnet-2.0.2.ebuild
index 91191b4d0d5b..0c78e64fa9e1 100644
--- a/dev-python/execnet/execnet-2.0.2.ebuild
+++ b/dev-python/execnet/execnet-2.0.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/hatch-vcs[${PYTHON_USEDEP}]
diff --git a/dev-python/h5py/h5py-3.9.0.ebuild b/dev-python/h5py/h5py-3.9.0.ebuild
index bb09685621f2..2a87b7013d27 100644
--- a/dev-python/h5py/h5py-3.9.0.ebuild
+++ b/dev-python/h5py/h5py-3.9.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index b66ae29a2500..0f483ed03933 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1,2 +1 @@
-DIST hypercorn-0.14.3.gh.tar.gz 154930 BLAKE2B da827d586307ace6ef9ddb8ca4046ebc5c745df1d48152ed78b948751a7d472c73d5f8310e58266158af4739e14f2960a46c2e7fc7f12bf7629a3edb3821b58f SHA512 f0d69ab1883379058112907547e6f89a4a7114d7f4851b92f0c465d73def9cc15508e3981bda7e66ce3c00e896f7fb221b3dcd8bee6a51d8429572b678b7ade8
 DIST hypercorn-0.14.4.gh.tar.gz 156001 BLAKE2B 262cbaba3df674b07dd5f6c15418cac18b46c2303a8ff616c8d2e968ff233d15bf616f2d3d0dbacda03f819251453be1b00cee4b98fdfaaed49f40cdcfb43119 SHA512 461b6fab72586b3bdea25ded6c0439595a8f84d5fb0b1a264f976926d9d34cb21f52bd10c84b9180d08fb05942f9fdb842343d4c6c476dcd60a26399387a2373
diff --git a/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch b/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch
deleted file mode 100644
index a438680423a9..000000000000
--- a/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 676612c73d3c231f823f88ea0995e80522db6178 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 19 Dec 2022 15:27:41 +0100
-Subject: [PATCH] Use tomllib/tomli for .toml support
-
-Replace the unmaintained and non-conformant `toml` library with
-the built-in `tomllib` module in Python 3.11+, with fallback to `tomli`
-(featuring the same ABI) in Python 3.10 and older.
----
- pyproject.toml           |  2 +-
- src/hypercorn/config.py  | 10 +++++++---
- src/hypercorn/logging.py | 10 +++++++---
- tox.ini                  |  1 -
- 4 files changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index 71ceaff..1334fcf 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -30,7 +30,7 @@ h11 = "*"
- h2 = ">=3.1.0"
- priority = "*"
- pydata_sphinx_theme = { version = "*", optional = true }
--toml = "*"
-+tomli = { version = "*", python = "<3.11" }
- trio = { version = ">=0.11.0", optional = true }
- typing_extensions = { version = ">=3.7.4", python = "<3.8" }
- uvloop = { version = "*", markers = "platform_system != 'Windows'", optional = true }
-diff --git a/src/hypercorn/config.py b/src/hypercorn/config.py
-index f9a9d66..ecfa1bd 100644
---- a/src/hypercorn/config.py
-+++ b/src/hypercorn/config.py
-@@ -6,6 +6,7 @@ import logging
- import os
- import socket
- import stat
-+import sys
- import types
- import warnings
- from dataclasses import dataclass
-@@ -22,7 +23,10 @@ from time import time
- from typing import Any, AnyStr, Dict, List, Mapping, Optional, Tuple, Type, Union
- from wsgiref.handlers import format_date_time
- 
--import toml
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
- 
- from .logging import Logger
- 
-@@ -355,8 +359,8 @@ class Config:
-             filename: The filename which gives the path to the file.
-         """
-         file_path = os.fspath(filename)
--        with open(file_path) as file_:
--            data = toml.load(file_)
-+        with open(file_path, "rb") as file_:
-+            data = tomllib.load(file_)
-         return cls.from_mapping(data)
- 
-     @classmethod
-diff --git a/src/hypercorn/logging.py b/src/hypercorn/logging.py
-index 3c2c657..8ca6105 100644
---- a/src/hypercorn/logging.py
-+++ b/src/hypercorn/logging.py
-@@ -9,7 +9,11 @@ from http import HTTPStatus
- from logging.config import dictConfig, fileConfig
- from typing import Any, IO, Mapping, Optional, TYPE_CHECKING, Union
- 
--import toml
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
-+
- 
- if TYPE_CHECKING:
-     from .config import Config
-@@ -65,8 +69,8 @@ class Logger:
-                 with open(config.logconfig[5:]) as file_:
-                     dictConfig(json.load(file_))
-             elif config.logconfig.startswith("toml:"):
--                with open(config.logconfig[5:]) as file_:
--                    dictConfig(toml.load(file_))
-+                with open(config.logconfig[5:], "rb") as file_:
-+                    dictConfig(tomllib.load(file_))
-             else:
-                 log_config = {
-                     "__file__": config.logconfig,
-diff --git a/tox.ini b/tox.ini
-index 675992b..0f636fb 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -47,7 +47,6 @@ basepython = python3.10
- deps =
-     mypy
-     pytest
--    types-toml
- commands =
-     mypy src/hypercorn/ tests/
- 
--- 
-2.39.0
-
diff --git a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
deleted file mode 100644
index ba16f5aed0fb..000000000000
--- a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
+++ /dev/null
@@ -1,51 +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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A ASGI Server based on Hyper libraries and inspired by Gunicorn"
-HOMEPAGE="
-	https://github.com/pgjones/hypercorn/
-	https://pypi.org/project/hypercorn/
-"
-SRC_URI="
-	https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/h11[${PYTHON_USEDEP}]
-	>=dev-python/h2-3.1.0[${PYTHON_USEDEP}]
-	dev-python/priority[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-	>=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-trio[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-tomli.patch
-	)
-
-	sed -i -e 's:--no-cov-on-fail::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/hypercorn/hypercorn-0.14.4.ebuild b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
index 8e955997a4a3..a5b6613cce99 100644
--- a/dev-python/hypercorn/hypercorn-0.14.4.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 432f121d083a..56313127bca2 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,2 @@
-DIST hypothesis-6.80.1.gh.tar.gz 9376526 BLAKE2B edb7012b17f1634745d81de74934424ac6430b9668a9702ce64a6f60b7ca3239c878acf1f958327ff2b1e18b95003733ce36bc6f0ffceb65f1eab69d61ab9b54 SHA512 38962d6428d98861993a7e29627be377b2dee7ef9da5bf06553a1de645e041c5af33f8674c64104e90c1168815ef81ee82bb30e1d66315bc85ba7ad81ab28f20
-DIST hypothesis-6.81.1.gh.tar.gz 9377813 BLAKE2B 6ba0d9bd8fd12d521909151c7bb04ea729df1adb4dc401359de7accf75cf78981c3e2dbda1c22cb05ca48d550f8a97d19deea86249ac056b5fc34fca20ffb2b7 SHA512 54d13f249fe02fdd99726304a87ca1fe174f47137006fe147ed2b47875136f2d77f24be0bb77e91a04edff8db2230563627c75e9d164adf859284e5ce873369d
 DIST hypothesis-6.81.2.gh.tar.gz 9378154 BLAKE2B d4654e8de621af93fa6ab013bf45ea1c2e8b273f38cf0dddbe00853d197487acf2a9457a33e59fd59b9c5c7dca08a84867a835cdfa8e4a63181df5105889c360 SHA512 41f5e6b8382c08dd0e4285836a3f1308f6666d86387e10899c5ef8839598e097d31a5360cf7d47f2d30c287ad575787ecb44c236ad83c52202cf8895046c56a0
-DIST hypothesis-6.82.0.gh.tar.gz 9378337 BLAKE2B fb99a499c7b850c4d81f01b99969d611ee8a39a1b1d1a5306b72999b1ca20d605fb42adbc090eedbe06359056d05860e2166be9f8f8001460ea61b398a432de6 SHA512 2f8b16c1a32340a3aa742627cbbc958cb06e8966b704bd389c8677d58fc3e76e6988705315d570daeb46975839b1c725f5f6a937ff1c326cbed144659ec44d05
-DIST hypothesis-6.82.1.gh.tar.gz 9378717 BLAKE2B 2127d101f5c477fa99abe07df09928d0be475dd052f8f121ec038488eb4b5b35508b09524ae06ae8fe41712724fbb50f8db4aa72472a7315cc3ad68b9000371e SHA512 3fb983b2246aaa9860694f07eee9fafb28f560b3ba105544d3d4345ba323543f194109b710c639e86287572ad5ed141c2edf6c89c0f4a71a003505a797effddc
-DIST hypothesis-6.82.2.gh.tar.gz 9378887 BLAKE2B 8b1c65ea9080bb280a6f7b761aef0c24539c707b0875621baa2b011188839d8179dcbcac051c97fe36c870404d67ec28124857646f8d95d34b44bea081ef1658 SHA512 cd5dfa439f4f5bdbf744e25bf24b5265515c7077d142eecbb77825056e44417124ffd1f97755d6804d412424e0ef78a77e77e112cafb7972cdae1be028ab5ca6
 DIST hypothesis-6.82.3.gh.tar.gz 9378981 BLAKE2B bb73131f9982e8df71e24a5f329a2f34b7e895ffa231d55724f84a3d692608e59a4494a820ea5ee449db4c40f2521548b2dece2f1bcfa9fbd4f0ddbc4dbb9756 SHA512 02b649116630dc6be3cbd659a00c9c55d68c85a9cbf029558fc1c065909a1cadd2fb120615fa3bf7fe4a11f51d26d264cf6730ac4d3165798668d38e62c5d955
diff --git a/dev-python/hypothesis/hypothesis-6.80.1.ebuild b/dev-python/hypothesis/hypothesis-6.80.1.ebuild
deleted file mode 100644
index 2375d98ea10e..000000000000
--- a/dev-python/hypothesis/hypothesis-6.80.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.81.1.ebuild b/dev-python/hypothesis/hypothesis-6.81.1.ebuild
deleted file mode 100644
index c91fe0d7fdd3..000000000000
--- a/dev-python/hypothesis/hypothesis-6.81.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..11} )
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.81.2.ebuild b/dev-python/hypothesis/hypothesis-6.81.2.ebuild
index d1bc223f945a..b83d1a20934e 100644
--- a/dev-python/hypothesis/hypothesis-6.81.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.81.2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_P}/hypothesis-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.82.0.ebuild b/dev-python/hypothesis/hypothesis-6.82.0.ebuild
deleted file mode 100644
index 45ac15b82e26..000000000000
--- a/dev-python/hypothesis/hypothesis-6.82.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.82.1.ebuild b/dev-python/hypothesis/hypothesis-6.82.1.ebuild
deleted file mode 100644
index 45ac15b82e26..000000000000
--- a/dev-python/hypothesis/hypothesis-6.82.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.82.2.ebuild b/dev-python/hypothesis/hypothesis-6.82.2.ebuild
deleted file mode 100644
index 45ac15b82e26..000000000000
--- a/dev-python/hypothesis/hypothesis-6.82.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-CLI_COMPAT=( python3_{10..12} )
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 multiprocessing optfeature
-
-TAG=hypothesis-python-${PV}
-MY_P=hypothesis-${TAG}
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="
-	https://github.com/HypothesisWorks/hypothesis/
-	https://pypi.org/project/hypothesis/
-"
-SRC_URI="
-	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}/hypothesis-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cli"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' "${CLI_COMPAT[@]}")
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/requests-toolbelt-0.10.1
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# subtests are broken by warnings from random plugins
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
-	local -x HYPOTHESIS_NO_PLUGINS=1
-
-	# NB: paths need to be relative to pytest.ini,
-	# i.e. start with hypothesis-python/
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# failing due to warnings from numpy/cython
-				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
-			)
-			;;
-	esac
-
-	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
-		tests/cover tests/pytest tests/quality
-}
-
-python_install() {
-	distutils-r1_python_install
-	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
-		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
-	fi
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index ed6162901425..ea646c14a446 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,2 +1 @@
-DIST jaraco.classes-3.2.3.tar.gz 9416 BLAKE2B 00de6548b746d2e6136572d2bcbc8a9c3e6f6570a02ee27e679e6bab7b9f4b8a327acf2b8854045b5348df8760763a7bc52fedb0b3504629ceced3dd3b4588ad SHA512 73fe80de5c50b553efee6aa51fff98e30e72dcb4167b6056628d3cbbb897e29abde4fa9da79a2b413830d8440055a43ea97ace4daa62853d874419cb36c43fee
 DIST jaraco.classes-3.3.0.tar.gz 10729 BLAKE2B 05791a799e4d5bbce94b111e7acc922f46cf2eb409c6043f997482960ad3b4a29b0d2f9afc7f1fdc07363f0a0b6403077d685831baf909ecd93adac71611ac30 SHA512 8099c85c93ed0eff37b1f870e2577b20488dea7b10273c00a89b43c0ef759c17c9a835916eef0fd97b3944bc5cd50b32e1393ac7c80cf7c7bfd1ee0d639d16cf
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
deleted file mode 100644
index 6bc1096a50e8..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN/-/.}
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="
-	https://github.com/jaraco/jaraco.classes/
-	https://pypi.org/project/jaraco.classes/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild
index 617b874ef091..6bc1096a50e8 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 5795957e9670..316fa5dc2861 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,2 +1 @@
-DIST jsonpointer-2.3.tar.gz 9295 BLAKE2B 8a33c8ce21721b6c402a44d3d1572a767e3b7485fa1dd80baf98120c9822412841cc21e3bc2d6b7e058793ab4ade5993712c689631cb4a1237afc1d7f36e6bdf SHA512 e04da474a5ec376d1cd2c764c2d7a11ac296450df199449994cb1dedf02a49df3ae3a4e75b2963370dba1da166464602b849a79609f7a98d8246dab0b342c819
 DIST jsonpointer-2.4.tar.gz 9254 BLAKE2B 423a4ef71cd1029fe2c473940794a041df4c3422b8292d80290be7f11ac0e6b123d3074cb6f66a3d860274bdf5b0cd0716d24c9ee50b65e06139375dc93c84ad SHA512 41cc0f8b525bec4b18801aeaec1b2432c5f6475dd3f2bc0fb363cf6ceaac5c64e7993c72130a40c64427218a1eac352e93464137fe17427b9f8a34ae09699f4e
diff --git a/dev-python/jsonpointer/jsonpointer-2.3.ebuild b/dev-python/jsonpointer/jsonpointer-2.3.ebuild
deleted file mode 100644
index 2e488c16e97d..000000000000
--- a/dev-python/jsonpointer/jsonpointer-2.3.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Identify specific nodes in a JSON document (according to draft 08)"
-HOMEPAGE="
-	https://github.com/stefankoegl/python-json-pointer/
-	https://pypi.org/project/jsonpointer/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpointer/jsonpointer-2.4.ebuild b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
index e5afe4b77476..b270fb57de13 100644
--- a/dev-python/jsonpointer/jsonpointer-2.4.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/jsonschema-4.17.3.ebuild b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
index 19f4de246bad..a57004ecf820 100644
--- a/dev-python/jsonschema/jsonschema-4.17.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.17.3.ebuild
@@ -36,7 +36,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.18.0.ebuild b/dev-python/jsonschema/jsonschema-4.18.0.ebuild
index 365b2da8d977..74b151209d6d 100644
--- a/dev-python/jsonschema/jsonschema-4.18.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.18.2.ebuild b/dev-python/jsonschema/jsonschema-4.18.2.ebuild
index 365b2da8d977..74b151209d6d 100644
--- a/dev-python/jsonschema/jsonschema-4.18.2.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.2.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.18.3.ebuild b/dev-python/jsonschema/jsonschema-4.18.3.ebuild
index 365b2da8d977..74b151209d6d 100644
--- a/dev-python/jsonschema/jsonschema-4.18.3.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.3.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.18.4.ebuild b/dev-python/jsonschema/jsonschema-4.18.4.ebuild
index 9d9138a4c084..8a08d4ca1734 100644
--- a/dev-python/jsonschema/jsonschema-4.18.4.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.4.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.18.6.ebuild b/dev-python/jsonschema/jsonschema-4.18.6.ebuild
index 7141d177886c..912ecb887734 100644
--- a/dev-python/jsonschema/jsonschema-4.18.6.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.18.6.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/jsonschema/jsonschema-4.19.0.ebuild b/dev-python/jsonschema/jsonschema-4.19.0.ebuild
index 7141d177886c..912ecb887734 100644
--- a/dev-python/jsonschema/jsonschema-4.19.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-4.19.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND+="
 	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3986-validator[${PYTHON_USEDEP}]
 	dev-python/rfc3987[${PYTHON_USEDEP}]
-	dev-python/uri_template[${PYTHON_USEDEP}]
+	dev-python/uri-template[${PYTHON_USEDEP}]
 	>=dev-python/webcolors-1.11[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/pykerberos/Manifest b/dev-python/kerberos/Manifest
index 1bc6200a7b32..f513511d400a 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/kerberos/Manifest
@@ -1,2 +1 @@
-DIST PyKerberos-1.3.1.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
 DIST ccs-pykerberos-PyKerberos-1.3.1.gh.tar.gz 41954 BLAKE2B b95a3473c5803ebcb461db7f2589caa03e92f4cb3ba3a4890a31db99b687aa4c77ae4e58f09ae2339a1fd8acf6fe9ab5797e3b7178dfeb2ee7a95bb851fff402 SHA512 dcadc5c3b095d8bba947a745ac84cc558d7eebad139a0e86260891966786506a7a62600fde93fa14683971e436da8cc5cd3795817b20ba45ce7e39f8c05deb53
diff --git a/dev-python/pykerberos/files/pykerberos-1.3.1-python3.10.patch b/dev-python/kerberos/files/kerberos-1.3.1-python3.10.patch
index 7e760187de56..7e760187de56 100644
--- a/dev-python/pykerberos/files/pykerberos-1.3.1-python3.10.patch
+++ b/dev-python/kerberos/files/kerberos-1.3.1-python3.10.patch
diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r2.ebuild b/dev-python/kerberos/kerberos-1.3.1-r2.ebuild
index ad3d48073587..962294038f44 100644
--- a/dev-python/pykerberos/pykerberos-1.3.1-r2.ebuild
+++ b/dev-python/kerberos/kerberos-1.3.1-r2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
 # test environment is non-trivial to set up, so just use docker
 # (see python_test below)
 # also for alpha/beta Python releases support:
diff --git a/dev-python/pykerberos/metadata.xml b/dev-python/kerberos/metadata.xml
index 853174b8f2ab..853174b8f2ab 100644
--- a/dev-python/pykerberos/metadata.xml
+++ b/dev-python/kerberos/metadata.xml
diff --git a/dev-python/littleutils/littleutils-0.2.2-r1.ebuild b/dev-python/littleutils/littleutils-0.2.2-r1.ebuild
index 2074be59602b..45bc208fdd49 100644
--- a/dev-python/littleutils/littleutils-0.2.2-r1.ebuild
+++ b/dev-python/littleutils/littleutils-0.2.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 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"
 
 python_test() {
 	"${EPYTHON}" -m doctest -v littleutils/__init__.py ||
diff --git a/dev-python/minikanren/Manifest b/dev-python/minikanren/Manifest
index 2fe9871c337e..9910b37632c6 100644
--- a/dev-python/minikanren/Manifest
+++ b/dev-python/minikanren/Manifest
@@ -1,2 +1 @@
 DIST kanren-1.0.3.gh.tar.gz 72998 BLAKE2B fcbc852d1dfeef4dbe0b4f2daa36fa87f8e6b597d6f8dc80d3197b8d151aa0ffa1234a2677b5c430e3431cf826ff44d1c8954f043d3a8976970f73d403ccb544 SHA512 913930d98c006e355f700087f00bb002e93a68c782b6a8cba003242747a8060789a113f380199124a1499beca8d8399df73db9a003a6719a90378db86b2fc166
-DIST minikanren-1.0.3.gh.tar.gz 73008 BLAKE2B 6fdc605249ac06071a8b51e736d19f561288a293853e8b7ac8685f5b4da400aa8ae480b9a6e5eac3a5735ebe00567e52f24d4bf6afbffb7678e0d41553e1b12f SHA512 b65095b947d3b59496035f54a00fcddaa1888dec1cb8117086bbb16f5b4ed1bf59f2b79e3639f06a4347bd22b7fb4753734f5b8da149a3d470521f360fba5d2e
diff --git a/dev-python/minikanren/minikanren-1.0.3-r1.ebuild b/dev-python/minikanren/minikanren-1.0.3-r1.ebuild
index 1afa14b8f0f0..d6a7591e8782 100644
--- a/dev-python/minikanren/minikanren-1.0.3-r1.ebuild
+++ b/dev-python/minikanren/minikanren-1.0.3-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
 RDEPEND="
 	dev-python/cons[${PYTHON_USEDEP}]
diff --git a/dev-python/minikanren/minikanren-1.0.3.ebuild b/dev-python/minikanren/minikanren-1.0.3.ebuild
deleted file mode 100644
index 4919bc5613c1..000000000000
--- a/dev-python/minikanren/minikanren-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Relational programming in Python"
-HOMEPAGE="
-	https://pypi.org/project/miniKanren/
-	https://github.com/pythological/kanren/
-"
-SRC_URI="
-	https://github.com/pythological/kanren/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/kanren-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/multipledispatch[${PYTHON_USEDEP}]
-	dev-python/toolz[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index c104eafc2602..87e3897664da 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,2 +1 @@
-DIST mock-5.0.2.tar.gz 77477 BLAKE2B 1a85d7af3b6444343495980c5169be0373d09c2d91cc68674a1d221edd764642b4de42ec7b58973e8ff9748089f61795bbdec00eee1ab216df77ea42b6c47b1e SHA512 f1fecc4ade7eaeb158f3b4dcb5a9e5ce28c666727722f75946bdfff2600f3c590c2833f972cfbd928fc42bcb05b5bac11790ef9f8ff6389a80bfa121f232686d
 DIST mock-5.1.0.tar.gz 80232 BLAKE2B d260551feaf051d4be8c55920345e8fa64c33a42d4a82a2ea5dd5e0077af393ec1c1f37fb0b61e2cb6167a58c8951adeb6c9cc2dc638fc410a2984a3cbae17e1 SHA512 26b7350fddf2eca82b6dfaafc58cacbd4031fd787b1afc463ee13eff778846941120fd89755e4783bfad389f01cfbdd64f2feab5a12ac2bd4ca6407c0f2e973c
diff --git a/dev-python/mock/mock-5.0.2.ebuild b/dev-python/mock/mock-5.0.2.ebuild
deleted file mode 100644
index 89f819f18d2d..000000000000
--- a/dev-python/mock/mock-5.0.2.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
-HOMEPAGE="
-	https://github.com/testing-cabal/mock/
-	https://pypi.org/project/mock/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-distutils_enable_tests pytest
-
-DOCS=( CHANGELOG.rst README.rst )
diff --git a/dev-python/mock/mock-5.1.0.ebuild b/dev-python/mock/mock-5.1.0.ebuild
index 64aa58d1513e..89f819f18d2d 100644
--- a/dev-python/mock/mock-5.1.0.ebuild
+++ b/dev-python/mock/mock-5.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index 5103c11df179..2854d2600c5d 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1 @@
-DIST nbformat-5.9.0.tar.gz 140980 BLAKE2B e967ac0972dd2a5749694900002f9ada4171b5219249c3b6aa600fba97121aae0334516838c86b175064b0975a298fa9a1614dd2a458dd5d66ba832187731bd4 SHA512 c409feb3b6ae9b89b86d1c5e77a23a368776ccf9e62d606e2bb689927eca4d73c79a22e3f5e9e2beda78c201dc7485114e762872b305278c23c8129c7c65449b
-DIST nbformat-5.9.1.tar.gz 141100 BLAKE2B 1e9c6ed726ae534c27bf25796b23ac38d624330f219f6f5e6de6be2b80a409dee4594dd4ef8c8216aabd0ca4457417d174f83e4ee9e5f53207147dfc004219c0 SHA512 d4a36092c89e594db6d8524fa4457a1e9075d160f0a97bad767fe0f4de357d1bee76e081ddad680975803dfb7a735d2034f925555e57ac02d0436684cbcb1d8c
 DIST nbformat-5.9.2.tar.gz 141264 BLAKE2B 71f5bb447d675b10276565cb53ac193963e5161fd27e925d639e7aa63f1e69db8903974d2f924ad5456940c4b904aba33d8ab10772fdb70e7e67974a90d1f3d6 SHA512 886a03cf95b39cdca48ae46d4946cee0f3dc1f5fa0e9dac7c6184b4c3e326adb739bd9da28032868a973577aa949feb5ae95a84017755948610ef7f208ebc5db
diff --git a/dev-python/nbformat/nbformat-5.9.0.ebuild b/dev-python/nbformat/nbformat-5.9.0.ebuild
deleted file mode 100644
index accbb89b3125..000000000000
--- a/dev-python/nbformat/nbformat-5.9.0.ebuild
+++ /dev/null
@@ -1,48 +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_{7,8,9,10,11} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbformat/
-	https://pypi.org/project/nbformat/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-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}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/nbformat-5.7.1-no-node.patch"
-)
-
-EPYTEST_IGNORE=(
-	# requires pep440 package, which is not really relevant for us
-	tests/test_api.py
-)
diff --git a/dev-python/nbformat/nbformat-5.9.1.ebuild b/dev-python/nbformat/nbformat-5.9.1.ebuild
deleted file mode 100644
index 03cad4511b84..000000000000
--- a/dev-python/nbformat/nbformat-5.9.1.ebuild
+++ /dev/null
@@ -1,48 +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_{7,8,9,10,11} )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Reference implementation of the Jupyter Notebook format"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbformat/
-	https://pypi.org/project/nbformat/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-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}]
-"
-BDEPEND="
-	test? (
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/numpydoc \
-	dev-python/myst-parser \
-	dev-python/pydata-sphinx-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/nbformat-5.7.1-no-node.patch"
-)
-
-EPYTEST_IGNORE=(
-	# requires pep440 package, which is not really relevant for us
-	tests/test_api.py
-)
diff --git a/dev-python/nbformat/nbformat-5.9.2.ebuild b/dev-python/nbformat/nbformat-5.9.2.ebuild
index 03cad4511b84..accbb89b3125 100644
--- a/dev-python/nbformat/nbformat-5.9.2.ebuild
+++ b/dev-python/nbformat/nbformat-5.9.2.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"
 
 RDEPEND="
 	dev-python/fastjsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/path-and-address/metadata.xml b/dev-python/path-and-address/metadata.xml
index 1d5e26b4da15..529b1ff19284 100644
--- a/dev-python/path-and-address/metadata.xml
+++ b/dev-python/path-and-address/metadata.xml
@@ -7,4 +7,5 @@
  </maintainer>
  
  <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/path-and-address/path-and-address-2.0.1-r1.ebuild b/dev-python/path-and-address/path-and-address-2.0.1-r1.ebuild
index 459f16cc0518..de3f4579e3b9 100644
--- a/dev-python/path-and-address/path-and-address-2.0.1-r1.ebuild
+++ b/dev-python/path-and-address/path-and-address-2.0.1-r1.ebuild
@@ -15,6 +15,6 @@ LICENSE="MIT"
 SLOT="0"
 SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="app-arch/unzip"
diff --git a/dev-python/path-and-address/path-and-address-2.0.1.ebuild b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
deleted file mode 100644
index 536f536e1229..000000000000
--- a/dev-python/path-and-address/path-and-address-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Functions for server CLI applications used by humans"
-HOMEPAGE="https://github.com/joeyespo/path-and-address"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"
-
-KEYWORDS="amd64"
-
-BDEPEND="app-arch/unzip"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/path/Manifest b/dev-python/path/Manifest
index 24b66b4c66f7..69ba5b0363c3 100644
--- a/dev-python/path/Manifest
+++ b/dev-python/path/Manifest
@@ -1,2 +1 @@
-DIST path-16.6.0.tar.gz 49670 BLAKE2B 16da36676acb4e4c45c364a09c1d031f4cfc6bdabc08426bc5a8945c4b3594a7dd849f880f76dbfaba4dd2282eee00edbc0f9c7c4ed4774750e023c6a03b3939 SHA512 f1ec159c6b755f98eef90e1aac4337fb84fd9f739beddf34205c5faf9e959863baa52d237899bd33fe8f365a2666af6999c2e9388be310a6acae16b4952df022
 DIST path-16.7.1.tar.gz 48974 BLAKE2B a03eebbb391cf17033adce4d6b258217546e3b7494200a8ea97f756512177f1c7d7ea8155420e167cefe79b566a4240eec98d17b160478f9cb06d3fd839c28f2 SHA512 7d660373046845a5882a316051c350558527d6d8a5cd11735d38214f986c8e096f72b45f87cfec41bf6171e7845287a42e6e45535f87a01b46670eccd4013dbf
diff --git a/dev-python/path/path-16.6.0-r1.ebuild b/dev-python/path/path-16.6.0-r1.ebuild
deleted file mode 100644
index 9abe633a18c4..000000000000
--- a/dev-python/path/path-16.6.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A module wrapper for os.path"
-HOMEPAGE="
-	https://github.com/jaraco/path/
-	https://pypi.org/project/path/
-"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# unreliable, not really meaningful for end users
-	test_path.py::TestPerformance
-)
diff --git a/dev-python/path/path-16.7.1.ebuild b/dev-python/path/path-16.7.1.ebuild
index 88b16c46728f..9abe633a18c4 100644
--- a/dev-python/path/path-16.7.1.ebuild
+++ b/dev-python/path/path-16.7.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-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"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 7302c28cfbc6..9936d991af55 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,4 +1 @@
-DIST python-phonenumbers-8.13.15.gh.tar.gz 4912960 BLAKE2B aef5c2524f2ae122bc0b3846fed94c5d8fad219eab72ba1838baca7ce3e839510b2601b967cfdd1c26e5200f05821ef7892f7445074a09c3dde150f5ab4a8c08 SHA512 688425ee6a62b132b865580bd7615235357963c51a49333bf400d01877728374173ff674c82535f67c86c0abb39acbb4373b4760116c3161b5bb633efc6a9f32
-DIST python-phonenumbers-8.13.16.gh.tar.gz 4913171 BLAKE2B 07bf7c13669554baf6d6250e0e42ca070966d21ec61836d1ec99d5515a283d891ccdb8496c86d82e0c6f1fe1be227e523262f16e5fe0b1a08bfee13a146f6b66 SHA512 6f655621d9e0e3ac9c8b0972118c81104621e4bf45d541606a82f373e59b8a3bd519d93bfb15bb769c7ab04a0abefa1db3d6125bc59f425de49269fce611f176
-DIST python-phonenumbers-8.13.17.gh.tar.gz 4913309 BLAKE2B fdebb1d3df0c397b02499dfe52dcd31c2e900e1b3f1dce1471e709054e2a2a77b77018e297df9706722731c9c740d0f880b042175f21bf84a6c0b37ba7d6b1fb SHA512 37ed31bf8f01c9c18448deded86435ce76f2c07c30edcdc342a41937c2c173dbf2c3cbbfd3ce2e40023eaee72501421d2bb7c398847adafdbaea315528884131
 DIST python-phonenumbers-8.13.18.gh.tar.gz 4914264 BLAKE2B 1bd17f2f8f68e475fcea4f69357001bdb8230827551d33bfec8727d1a04c175c4066c094742d02ad0c610e1ba80b309c3aae17d45ae4f735e620f0abecb3a91b SHA512 1656ce7ef9834f60c386fa3ca26fb9be81d4663ad29b007ddc64104d7678ea529cb2928b75df626076fc9859e36fb210147126fb634c328051d5321f9352c15e
diff --git a/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.15.ebuild
deleted file mode 100644
index 8d4a4b9f7226..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.15.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_{7,8,9,10,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.16.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.16.ebuild
deleted file mode 100644
index 4ef52501be16..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.16.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_{7,8,9,10,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.17.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.17.ebuild
deleted file mode 100644
index 4ef52501be16..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.13.17.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_{7,8,9,10,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.18.ebuild b/dev-python/phonenumbers/phonenumbers-8.13.18.ebuild
index 4ef52501be16..8d4a4b9f7226 100644
--- a/dev-python/phonenumbers/phonenumbers-8.13.18.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.13.18.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/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 6755c176f016..f7ee21f0f6b3 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,4 +1 @@
 DIST platformdirs-3.10.0.tar.gz 19203 BLAKE2B 951568733e4c3324d5817b3d9451aa5cc1d08afcce690a574357551f4452192cc98d406c6fc5c7d65d0a1f1d6111cb39a0877994e52021652c8c054add54f258 SHA512 39c068dad3fe6ec85247a8957c0fcfb27207e78041686a0231d836eeb431bba82583e2fcb609903bb0f479cd04e4c7866b6126e52a708e7e71eed7631bd121b0
-DIST platformdirs-3.8.0.tar.gz 18451 BLAKE2B cac717c3968fd20b7bdac464443cedcdc50b04b732ae8a212fcb946170ad1553ffae82cbdca05c2cf01ebbc4383216cd0f0afe84cddc2ce6107f10fd40213542 SHA512 64937f3e9e03a9ec8dc2068777dfe553ec09cef62ce53a753608bd9a73e0afaa4489c98046e7b4b3fdbded237cf2813bfd306a6d5ad5788031b6857d8d4fa430
-DIST platformdirs-3.8.1.tar.gz 18533 BLAKE2B d1d669fe76e52637f59c32ddb93920988821a1f1720d6b91042f80abedafc1d6dbcd5f744f22f5502121dc0b12285001cbde63e923e8159f139342a9497459e2 SHA512 85d7781e4ef0755bf9a7a4d90b92ea06f497081ec4c5438780f12876a1006b2e591c1b182f6648cad19039d1bd7611cf0c2215015653bafbad2cc529f27d94e7
-DIST platformdirs-3.9.1.tar.gz 18836 BLAKE2B d673573005e97895e4d665e1539805be7c4355d8de166481625f76fab250779e8efa81d86374fc388b24d8cc8d892f61b6dda113cdbb9419fff3357006c9b7e6 SHA512 c41d8be17c9336b5eba9dc15beb2d6db4b53d2ac06c51439542490019e25c091351c266f11fc4998b8eef00eb91399c464ac59b318bcd1ef14ebbd8350ae2c50
diff --git a/dev-python/platformdirs/platformdirs-3.10.0.ebuild b/dev-python/platformdirs/platformdirs-3.10.0.ebuild
index 2c65d0f2dfcc..7b5d8dcef438 100644
--- a/dev-python/platformdirs/platformdirs-3.10.0.ebuild
+++ b/dev-python/platformdirs/platformdirs-3.10.0.ebuild
@@ -16,7 +16,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"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/platformdirs/platformdirs-3.8.0.ebuild b/dev-python/platformdirs/platformdirs-3.8.0.ebuild
deleted file mode 100644
index 7b5d8dcef438..000000000000
--- a/dev-python/platformdirs/platformdirs-3.8.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.8.1.ebuild b/dev-python/platformdirs/platformdirs-3.8.1.ebuild
deleted file mode 100644
index 2c65d0f2dfcc..000000000000
--- a/dev-python/platformdirs/platformdirs-3.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/platformdirs/platformdirs-3.9.1.ebuild b/dev-python/platformdirs/platformdirs-3.9.1.ebuild
deleted file mode 100644
index 2c65d0f2dfcc..000000000000
--- a/dev-python/platformdirs/platformdirs-3.9.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
-HOMEPAGE="
-	https://pypi.org/project/platformdirs/
-	https://github.com/platformdirs/platformdirs/
-"
-
-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"
-
-BDEPEND="
-	test? (
-		dev-python/appdirs[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	grep -q 'build-backend = "hatchling' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "${PN}"
-		version = "${PV}"
-		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
-	EOF
-	# sigh
-	cat > src/platformdirs/version.py <<-EOF || die
-		__version__ = version = '${PV}'
-		__version_tuple__ = version_tuple = (${PV//./, })
-	EOF
-}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index b85dd268eefd..b9fc19eb51f4 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1 +1,2 @@
 DIST plotly.py-5.15.0.gh.tar.gz 30801940 BLAKE2B bb95df7402a308c1a32817dc12d519a446f63cfe34f6a6c492949465734132a2d86078849790ee51d6cb99fbaf434251c48204e0b2b36af422fdf7efbc446a6a SHA512 418f05fd6eb17de3619c647ba83817144d8b9f7eec766cae492fb9987ad1e5ff169cfe045d163997916bdf0df75dafba94fb55c68a5dfb45c8aa87cb3e0e4658
+DIST plotly.py-5.16.0.gh.tar.gz 30846584 BLAKE2B 08071fbece2ac6ce69ae7466a001902867883127e7bfab397d5701eee0afc032fdc001157b4e38d4cbe9bfe361e18f7c33cc0e80b21d8deba5219821849848ab SHA512 2cbdc04a62de803d06d4085180caeaea9a7c429d525e841472a6b4a447dd53ab108e159a9b28ddcbcf86a47453ed028ad6d3d47001e3d68286aded4b10b1511b
diff --git a/dev-python/plotly/plotly-5.16.0.ebuild b/dev-python/plotly/plotly-5.16.0.ebuild
new file mode 100644
index 000000000000..b613ff8f4f70
--- /dev/null
+++ b/dev-python/plotly/plotly-5.16.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+MY_P=plotly.py-${PV}
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="
+	https://plotly.com/python/
+	https://github.com/plotly/plotly.py/
+	https://pypi.org/project/plotly/
+"
+SRC_URI="
+	https://github.com/plotly/plotly.py/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/packages/python/plotly"
+# The tests are not included in the PyPI tarball, to use the GitHub tarball
+# we have to skip npm, which means that the resulting install will
+# unfortunately lack the jupyterlab extension.
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-6.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/jupyter[${PYTHON_USEDEP}]
+		dev-python/jupyterlab[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		dev-python/xarray[${PYTHON_USEDEP}]
+		sci-libs/scikit-image[${PYTHON_USEDEP}]
+	)
+"
+
+# README ends up a broken symlink
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.0-fix-versioneer-import.patch
+)
+
+EPYTEST_IGNORE=(
+	# Needs porting to newer numpy
+	_plotly_utils/tests/validators/test_integer_validator.py
+
+	# kaleido not packaged
+	plotly/tests/test_optional/test_kaleido
+
+	# plotly-orca not packaged
+	plotly/tests/test_orca
+)
+
+EPYTEST_DESELECT=(
+	# Also needs porting to newer numpy
+	plotly/tests/test_io/test_to_from_plotly_json.py::test_object_numpy_encoding
+
+	# kaleido not packaged
+	plotly/tests/test_orca/test_to_image.py::test_bytesio
+
+	# Fails if not already installed
+	test_init/test_dependencies_not_imported.py::test_dependencies_not_imported
+	test_init/test_lazy_imports.py::test_lazy_imports
+
+	# Minor matplotlib incompatibility
+	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_path_collection
+	plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots
+	plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle
+
+	# In python 3.11 the produced error is slightly different
+	plotly/tests/test_core/test_errors/test_dict_path_errors.py::test_described_subscript_error_on_type_error
+
+	# TODO
+	plotly/tests/test_io/test_to_from_plotly_json.py
+
+	# two subtests that require 'vaex' and 'polars' respectively
+	plotly/tests/test_optional/test_px/test_px_input.py::test_build_df_from_vaex_and_polars
+)
+
+# There are sphinx docs but we are missing a bunch of dependencies.
+# distutils_enable_sphinx ../../../doc/apidoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not try to fetch stuff with npm
+	export SKIP_NPM=1
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mv "${ED}"/{usr/etc,etc} || die
+}
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
index afe4cf03384a..1190f5f33acb 100644
--- a/dev-python/prometheus-client/Manifest
+++ b/dev-python/prometheus-client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.17.0.tar.gz 90650 BLAKE2B 04bc44e930c94edc9fb0ceb5cc5be71cbec23435d271ec63acacbb10b42b192170ed7f92c767a575a08a8140d9cfc28b591c49ad9af2e6d931990daba45637ba SHA512 da9a27a514dca0ae2721eaa607c5adfa86686553eebc0c4eb4323d0866d03b520de5085b8e39560df0525ef3bbbbc7996271b64136f60a427fb14fb8851e595f
 DIST prometheus_client-0.17.1.tar.gz 90360 BLAKE2B 3927d5b6829a04cd72a99ac3b0b6a12726865b41d17f165a53f83a6a3791f18e25e03995088152ac7eae016eab7c6e29bef1e605f4c444f9963be04483ca2f02 SHA512 c8c776d646ea4a18a85fd26c858158b67979173dcf52d0a337cdb87fe907ff4081d8e0771176ba8be0ea6e244ee9b9097396c9aeb6f6db170a2c0f5a4898c771
diff --git a/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild
deleted file mode 100644
index 52f9bc7d5efb..000000000000
--- a/dev-python/prometheus-client/prometheus-client-0.17.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=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="
-	https://github.com/prometheus/client_python/
-	https://pypi.org/project/prometheus-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus-client/prometheus-client-0.17.1.ebuild b/dev-python/prometheus-client/prometheus-client-0.17.1.ebuild
index 53efc985b739..52f9bc7d5efb 100644
--- a/dev-python/prometheus-client/prometheus-client-0.17.1.ebuild
+++ b/dev-python/prometheus-client/prometheus-client-0.17.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/twisted[${PYTHON_USEDEP}]
diff --git a/dev-python/pyaml/Manifest b/dev-python/pyaml/Manifest
index 151d6bf40300..c0d8db158a8c 100644
--- a/dev-python/pyaml/Manifest
+++ b/dev-python/pyaml/Manifest
@@ -1,2 +1 @@
-DIST pyaml-23.5.9.tar.gz 20234 BLAKE2B a6ff24e82eb25aa309466c56e5c2d4543b2ed972f4eb71c12023ae71d2fb3ddcd0824d890e475ceca9360f3e5d0ea755f4733448e1f2282dca82b6f313cd0b34 SHA512 ba6a7d51208b10a2265a52c684d43052fb57a7cd1fc4a4087a141a3adfc36f54b71e943056f346c26ae1b16800b8f2c3a2c0c20454322c9a24b760993c9dd49d
 DIST pyaml-23.7.0.tar.gz 20805 BLAKE2B 797b2b5d2121f3b0f67445d4b3a55b13d0716d5eddd5dc83a08b767d293b486e9985203f4e2571a7c8d3010b9cac9093e9353517f6414cd5b89cdcfe5d39c85a SHA512 edbe58a3a7f1216a2463ac56af829c38b12b7194429691a92cb7f28ca926094e324d6e44d3fb64be40239dc8a6dc61d72946b107f5210ca83e73dec18b1428ef
diff --git a/dev-python/pyaml/pyaml-23.5.9.ebuild b/dev-python/pyaml/pyaml-23.5.9.ebuild
deleted file mode 100644
index c7f3557b9e37..000000000000
--- a/dev-python/pyaml/pyaml-23.5.9.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_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="PyYAML-based module to produce pretty and readable YAML-serialized data"
-HOMEPAGE="
-	https://github.com/mk-fg/pretty-yaml/
-	https://pypi.org/project/pyaml/
-"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/unidecode[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyaml/pyaml-23.7.0.ebuild b/dev-python/pyaml/pyaml-23.7.0.ebuild
index 092f6a41aab4..c7f3557b9e37 100644
--- a/dev-python/pyaml/pyaml-23.7.0.ebuild
+++ b/dev-python/pyaml/pyaml-23.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 0ffe45150a9e..792ce1f912d4 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1,2 +1 @@
-DIST pyfakefs-5.2.2.gh.tar.gz 219768 BLAKE2B be22ad269dcb8777c2fc6d8aed5079b84089980f5b62f1198ec2b4b3eea3688df3665bfc305a300e73917d65bc4209bc7bbf2a739d3852b1257036ca288a7846 SHA512 43ba719ad129f3e5188512a6f9b1eb8cfd7586f45a69c6623a9ae2429ca4dfa67d54cfc42032a599daaf736d46cb9e268c9f68150c16427667ed84e0917ed459
 DIST pyfakefs-5.2.3.gh.tar.gz 222076 BLAKE2B 01d24021be074058d865ac068f77de69721ad2f826f835f04776e8d17a8f4cfaeb85bce9a948d679951b8f028ef6d6b3377428d76c5d2d46afea3b78dffcee1e SHA512 5e4adeecb1e2341f3dee20d48b387de870cdab4ad27791951f98ba516f8f4cbe4f5e303c83725c2ce5a9cfaf34f771814b07c553983eb283aa7c3fd7f4e7690d
diff --git a/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild b/dev-python/pyfakefs/pyfakefs-5.2.2.ebuild
deleted file mode 100644
index be7d90da0a79..000000000000
--- a/dev-python/pyfakefs/pyfakefs-5.2.2.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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fake file system that mocks the Python file system modules"
-HOMEPAGE="
-	https://github.com/pytest-dev/pyfakefs/
-	https://pypi.org/project/pyfakefs/
-"
-SRC_URI="
-	https://github.com/pytest-dev/pyfakefs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pyfakefs.pytest_plugin
-}
diff --git a/dev-python/pyfakefs/pyfakefs-5.2.3.ebuild b/dev-python/pyfakefs/pyfakefs-5.2.3.ebuild
index f2f496f00618..be7d90da0a79 100644
--- a/dev-python/pyfakefs/pyfakefs-5.2.3.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-5.2.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
index e6721bfb7f0f..ac91d378a2f6 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.7-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples ssl"
 
 RDEPEND="
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
deleted file mode 100644
index f0b453d60997..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples ssl"
-
-RDEPEND="
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-
-	# These tests fail when passing additional options to pytest
-	# so we need to run them separately and not pass any args to pytest
-	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
-	# Some of these tests tend to fail
-	local EPYTEST_DESELECT=(
-		# Those tests are run separately
-		pyftpdlib/test/test_misc.py
-		# https://github.com/giampaolo/pyftpdlib/issues/471
-		# https://bugs.gentoo.org/636410
-		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
-		# https://github.com/giampaolo/pyftpdlib/issues/512
-		# https://bugs.gentoo.org/701146
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor
-		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_stor_ascii
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/676232
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_anon_auth
-		# https://github.com/giampaolo/pyftpdlib/issues/513
-		# https://bugs.gentoo.org/702578
-		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
-		# https://github.com/giampaolo/pyftpdlib/issues/543
-		# https://bugs.gentoo.org/758686
-		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_idle_timeout
-		pyftpdlib/test/test_functional.py::ThreadedFTPTests::test_stou_max_tries
-		# https://github.com/giampaolo/pyftpdlib/issues/550
-		# https://bugs.gentoo.org/759040
-		pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address
-		pyftpdlib/test/test_functional.py::TestConfigurableOptions::test_masquerade_address_map
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptions::test_masquerade_address_map
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address
-		pyftpdlib/test/test_functional_ssl.py::TestConfigurableOptionsTLSMixin::test_masquerade_address_map
-	)
-	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
-	local -x TZ=UTC+1
-	# Skips some shoddy tests plus increases timeouts
-	local -x TRAVIS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
deleted file mode 100644
index e786127d14a3..000000000000
--- a/dev-python/pykerberos/pykerberos-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_P=PyKerberos-${PV}
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="
-	https://www.calendarserver.org/PyKerberos.html
-	https://github.com/apple/ccs-pykerberos/
-	https://pypi.org/project/kerberos/"
-SRC_URI="
-	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/ccs-pykerberos-${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~riscv x86"
-# test environment is non-trivial to set up, so just use docker
-# (see python_test below)
-# also for alpha/beta Python releases support:
-# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
-RESTRICT="test"
-
-RDEPEND="app-crypt/mit-krb5"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.1-python3.10.patch
-)
-
-python_test() {
-	set -- docker run \
-		-v "${PWD}:/app" \
-		-w /app \
-		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
-		-e KERBEROS_USERNAME=administrator \
-		-e KERBEROS_PASSWORD=Password01 \
-		-e KERBEROS_REALM=example.com \
-		-e KERBEROS_PORT=80 \
-		ubuntu:16.04 \
-		/bin/bash .travis.sh
-	echo "${@}" >&2
-	"${@}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pymongo/pymongo-4.4.1.ebuild b/dev-python/pymongo/pymongo-4.4.1.ebuild
index cc8ba7634094..8444d8c0deb4 100644
--- a/dev-python/pymongo/pymongo-4.4.1.ebuild
+++ b/dev-python/pymongo/pymongo-4.4.1.ebuild
@@ -28,7 +28,7 @@ IUSE="doc kerberos +test-full"
 
 RDEPEND="
 	<dev-python/dnspython-3.0.0[${PYTHON_USEDEP}]
-	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+	kerberos? ( dev-python/kerberos[${PYTHON_USEDEP}] )
 "
 BDEPEND="
 	test? (
diff --git a/dev-python/pyproject-fmt/Manifest b/dev-python/pyproject-fmt/Manifest
index 27ebe5527325..bba9f34c3200 100644
--- a/dev-python/pyproject-fmt/Manifest
+++ b/dev-python/pyproject-fmt/Manifest
@@ -1 +1,2 @@
 DIST pyproject_fmt-0.13.0.tar.gz 13021 BLAKE2B 911925fb489782af9952cea68105ceeaa62fe96af130688f08892bc6fc701063f0a3b17c079323fd5358999f73fdffff59dbe910ca280cf9a963b2e45c10d22d SHA512 eb97893c9e04edd4667f961cb2232cda1be42f96ae94cd95886e70e48835b0228a0054bb4a75c439deff16990335ef56fbf60b8a0b2530d18856d075d42ff404
+DIST pyproject_fmt-0.13.1.tar.gz 13938 BLAKE2B 42a75840a45eeb96a58bc277a4e1834a4e2965a18a41d4305ff6060c1e01835474f664494f1fdde2ddd4bc945818691f72e9d1033090d321f2444dcb6c529f28 SHA512 e8465f94590557f89bfbd7e3825831420859ba291f0413444de10709ec866d6b771f6fe139acaf930b2139c638b90a58c9bddf2ae6aecfb9745b306b815a041d
diff --git a/dev-python/pyproject-fmt/pyproject-fmt-0.13.1.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.13.1.ebuild
new file mode 100644
index 000000000000..663101b82c64
--- /dev/null
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.13.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Format your pyproject.toml file"
+HOMEPAGE="
+	https://github.com/tox-dev/pyproject-fmt/
+	https://pypi.org/project/pyproject-fmt/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/natsort-8.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/tomlkit-0.11.8[${PYTHON_USEDEP}]
+"
+# tox is called as a subprocess, to get targets from tox.ini
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-mock-3.10[${PYTHON_USEDEP}]
+		dev-python/tox
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pysmi/pysmi-0.3.4-r1.ebuild b/dev-python/pysmi/pysmi-0.3.4-r1.ebuild
index eba8dbe5cee2..e35175d79aef 100644
--- a/dev-python/pysmi/pysmi-0.3.4-r1.ebuild
+++ b/dev-python/pysmi/pysmi-0.3.4-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
 
 RDEPEND="
 	dev-python/ply[${PYTHON_USEDEP}]
diff --git a/dev-python/pysmi/pysmi-0.3.4.ebuild b/dev-python/pysmi/pysmi-0.3.4.ebuild
deleted file mode 100644
index 68dfa25eb365..000000000000
--- a/dev-python/pysmi/pysmi-0.3.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2017-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Lex & Yacc"
-HOMEPAGE="https://github.com/etingof/pysmi"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-
-RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pysnmp[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs/source
diff --git a/dev-python/pytest-check/Manifest b/dev-python/pytest-check/Manifest
index b2c52d583636..f6badb000216 100644
--- a/dev-python/pytest-check/Manifest
+++ b/dev-python/pytest-check/Manifest
@@ -1,2 +1,3 @@
 DIST pytest_check-2.1.5.tar.gz 24990 BLAKE2B d7b09fe1f4b2932b4d9cfc12e0cc3a2c8082a97727cc6bec01f0db32b67af5860c8677749bf48068e496896fdf5a6beab57eb1fb39facddfb8defa995ff1ccfd SHA512 b3886f96db1ca20e4d337ea527e38e67faa1d79ace3c2cde2760ff66bc7fb5a77eeca2d3833a0abcf16e6f1f6922a82a8fddf7949ddf78e5238c9018761f2829
 DIST pytest_check-2.2.0.tar.gz 26282 BLAKE2B b6017053133e65b6e13576b06ee7b1905921f807a0b8fe5a58bd19296b6fa5ad936b533124594544ff0f81d585c7012693e2c71a6d157a5160ae8545bb24e27b SHA512 004f96895f69ed905f123c5c213aef4d40f0f31ec369e9280af4e1c8dbd2f29a4a8c5d9f564756a2dd476c57530daf4914b3bd8d0328266c4117ef5245be97f2
+DIST pytest_check-2.2.1.tar.gz 29128 BLAKE2B 758d2f04a5a500367ecca9a95afe21c03e7a52f319403d4bc0af14d27b96b335e5db42ee312217b0788eceab25048266ac135cfeb7d8214908ed5c13ded33b33 SHA512 04843219a1d49385ccac9b60707a6dd595258664b61a0bf31e666502a222d16b7130c8c0ae65ebd6431d58e2e08d90db3ad016dc4591dab7e3c3502296ceff44
diff --git a/dev-python/pytest-check/pytest-check-2.2.1.ebuild b/dev-python/pytest-check/pytest-check-2.2.1.ebuild
new file mode 100644
index 000000000000..cd8d61a2cb5a
--- /dev/null
+++ b/dev-python/pytest-check/pytest-check-2.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="pytest plugin that allows multiple failures per test"
+HOMEPAGE="
+	https://github.com/okken/pytest-check/
+	https://pypi.org/project/pytest-check/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-rerunfailures/Manifest b/dev-python/pytest-rerunfailures/Manifest
index 3625d23e8b08..0c9177f87312 100644
--- a/dev-python/pytest-rerunfailures/Manifest
+++ b/dev-python/pytest-rerunfailures/Manifest
@@ -1,2 +1 @@
-DIST pytest-rerunfailures-11.1.2.tar.gz 17234 BLAKE2B c497fee173f09de42d605d092336105e7144aafcdcfe6cdfbe3df65e09c3ab5cf0bc2d42746662f792c832ac25538f3cd81dc97d6e01201b14b480cb0e2d3a46 SHA512 309a0d180a996ddb5d6eb0833e6abd107887bc17ca3003a2b02bbaf5a4cbd63012618ee293a2a80623ca327b46ce7a5cd53bb341de75e5670a62b84e7ce5f0bc
 DIST pytest-rerunfailures-12.0.tar.gz 21154 BLAKE2B 3de39a8b92858bd90b312fca1c5f2e5ad790e12277f118bf18182b6192edf14dd160070bfe31ce981dc7ba41e0d0e2509ea80793c35c1856afdcfb5272ca55cc SHA512 2e6787ec8b420344eb1f7175b0f9e7f8a2f3cc3fd59ebf0c49128b39dc887200bd497e1d73a59311d072456e34126a1829324a4d86f86e5c01916940383c8fd4
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
deleted file mode 100644
index ee6bbbff76bb..000000000000
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-11.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="pytest plugin to re-run tests to eliminate flaky failures"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-rerunfailures/
-	https://pypi.org/project/pytest-rerunfailures/
-"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_rerunfailures
-	epytest
-}
diff --git a/dev-python/pytest-rerunfailures/pytest-rerunfailures-12.0.ebuild b/dev-python/pytest-rerunfailures/pytest-rerunfailures-12.0.ebuild
index 396e50eca738..ee6bbbff76bb 100644
--- a/dev-python/pytest-rerunfailures/pytest-rerunfailures-12.0.ebuild
+++ b/dev-python/pytest-rerunfailures/pytest-rerunfailures-12.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MPL-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/packaging-17.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index 6682834bd91a..acbc4edc5978 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,2 +1 @@
-DIST python-ironicclient-5.2.0.tar.gz 222711 BLAKE2B 4e9fe64efa1abd1a57ab6b7035ff44a9b00ef108a0ade8cdd44350713bed74384f87cd40b44d67496d46d1fa04514572042421d480ddd1080a0a872c8bd4aa33 SHA512 601e79174819c5d696f3bf053fec5b36ddf54e48cbde88e8d4b86042870db7dea21267725e682fbe64a67e55d7f7cd7ab5d504bf24822f14d0a56149f46cb3d5
 DIST python-ironicclient-5.3.0.tar.gz 224784 BLAKE2B 5b336c35e1e082970f5f62efc41dedfe21881c0fdb614177a00f98ebab4ddad9672852b92bf5c718d785c86ad3549a505fab7e69136a5a11ba563340c9a363a1 SHA512 5ac42c50042611f8f3c121b74ace904df079504f15f53e8604e719f306549b1841e485544ed20b1cccb5cfd48f1813f71ae3ac58955e060279f54b95ca6330b3
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.2.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.2.0.ebuild
deleted file mode 100644
index fe1ac5570b8c..000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-5.2.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings for the Ironic API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-ironicclient/
-	https://github.com/openstack/python-ironicclient/
-	https://pypi.org/project/python-ironicclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/python-ironicclient/python-ironicclient-5.3.0.ebuild b/dev-python/python-ironicclient/python-ironicclient-5.3.0.ebuild
index 4e99ec4ffec4..fe1ac5570b8c 100644
--- a/dev-python/python-ironicclient/python-ironicclient-5.3.0.ebuild
+++ b/dev-python/python-ironicclient/python-ironicclient-5.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild
index 6d08f60c0b69..3b36a67414c0 100644
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/python-lsp/python-lsp-jsonrpc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
deleted file mode 100644
index 445e204684e9..000000000000
--- a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="JSON RPC 2.0 server library"
-HOMEPAGE="https://github.com/python-lsp/python-lsp-jsonrpc"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=( "${FILESDIR}/${P}-fix-test-with-ujson-3-and-up.patch" )
-
-python_prepare_all() {
-	# Remove pytest-cov dep
-	sed -i -e '0,/addopts/I!d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index eafcd9e7b5ce..8f903d1da5a9 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,2 +1 @@
-DIST python-neutronclient-10.0.0.tar.gz 206707 BLAKE2B 02d270d1867484548af335ec403fafe1d50f8e7601e57ec61f804ea86af9d09064a7a72f6f6c710cfd63ce640b9250d9a0bcce4326fc7f49165d7ae099ecf785 SHA512 b80bd90822929ed7f231fccebc5984c97cf7995f428f86442d33bfd69b679def434078406e4c6f3ed557a52921f362cc39ad084ed3fed411cd00279135f7e692
 DIST python-neutronclient-11.0.0.tar.gz 206846 BLAKE2B e7ba4db5763a9310aa393e01d8561e9cfe85dfe584942de70a1b2254ccd8d5a79f6ffe5dc195fc3ef6f338c49686f8460b81111f6d4118315af38d7eea6f8c1c SHA512 3732892db34287343bc7015aa0be426e61f7a111e8a69c529f9baac0b6abbba09232d2d73e255dc82a816a1e9ff70237097c6269a287910a034787af58a730a1
diff --git a/dev-python/python-neutronclient/python-neutronclient-10.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-10.0.0.ebuild
deleted file mode 100644
index f7b47a5b7001..000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-10.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A client for the OpenStack Quantum API"
-HOMEPAGE="
-	https://opendev.org/openstack/python-neutronclient/
-	https://github.com/openstack/python-neutronclient/
-	https://pypi.org/project/python-neutronclient/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth1-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bandit[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/python-openstackclient[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-		dev-python/tempest[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# Needs osprofile
-	rm neutronclient/tests/unit/test_http.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# functional tests require cloud instance access
-	eunittest -b neutronclient.tests.unit
-}
-
-python_install() {
-	distutils-r1_python_install
-	# stupid stupid stupid
-	local SITEDIR="${D}$(python_get_sitedir)" || die
-	cd "${SITEDIR}" || die
-	local egg=( python_neutronclient*.dist-info )
-	[[ -d ${egg[0]} ]] || die "python_quantumclient*.dist-info not found"
-	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
-	ln -s neutronclient quantumclient || die
-	ln -s neutron quantumclient/quantum || die
-}
diff --git a/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
index 6260888efe05..79265064c260 100644
--- a/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-11.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pywinrm/pywinrm-0.4.3.ebuild b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
index 228970039ab7..0f9aa087ea16 100644
--- a/dev-python/pywinrm/pywinrm-0.4.3.ebuild
+++ b/dev-python/pywinrm/pywinrm-0.4.3.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/xmltodict[${PYTHON_USEDEP}]
 	kerberos? (
-		<dev-python/pykerberos-2.0.0[${PYTHON_USEDEP}]
+		<dev-python/kerberos-2.0.0[${PYTHON_USEDEP}]
 		dev-python/requests-credssp[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/rpds-py/rpds-py-0.9.2.ebuild b/dev-python/rpds-py/rpds-py-0.9.2.ebuild
index 6abadd293505..285dfa4e413d 100644
--- a/dev-python/rpds-py/rpds-py-0.9.2.ebuild
+++ b/dev-python/rpds-py/rpds-py-0.9.2.ebuild
@@ -63,7 +63,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index bedcf49b5031..3695a0dac9a6 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,6 +1 @@
-DIST sentry-python-1.26.0.gh.tar.gz 371531 BLAKE2B cdc44a8c4067405242b7aaec28999902df8ac7938d933ec8f5c050b6659bf5f920d7422dbe712813de995308fd49ce6173ca59e346d5a8912f6c3452f6063fb2 SHA512 de1d1c4af1d629c7689691d99ebd0acd3c023fc07fcfc6e706e7738b536601186ce33672b85ba08123f430923bb0c67cdbe0e56c9642d2219df55c8f1d14f07d
-DIST sentry-python-1.27.1.gh.tar.gz 376598 BLAKE2B 4ad5986af5e252cf501523fcafdaa7ada4870aae0252227907d86ce3e886b58f7154f4407cb6ae22473044589c9c2639c7de8ca92dea1a7a7835c51c28b44bb6 SHA512 1408c06b3b8a8ef0c888f26a4591d45b63fda51853e52f2ea8921e4983d0a7b05b053c6bf17d55fc59667e5b4b4ca953419303774101fa58ef6f37428d600c90
-DIST sentry-python-1.28.0.gh.tar.gz 378626 BLAKE2B 826257c5cae7d1f58753d4a84fb7aeb0fb9d52690a660615590cdd34c7d1afe1e256291d9434f904644292d6ab379fcad03cc7d8b1072e3b41b03fb5e4961db6 SHA512 83ceecbf89f197c03b0a402508c677eed4c6adb36ff826579513f79dd36c666e47267c7b6e8f4eced91fc12b18a0de3c1a24c89c6fe6e77c603ace535612542c
-DIST sentry-python-1.28.1.gh.tar.gz 379559 BLAKE2B 715f6a1756de85f7c041098f2bea94e02e61b433f55cbccca2b23455ee1c43312cae8a468443877113eb2ae2da8515f07b2aa08a29358ef1fd6b564bcc8bc329 SHA512 28ef182f4f7945c5499d7206a19a8ac90440031785bd4065259dcaefc9e7cd7ddad423ec61db954fc3936ed3fccec9e4bc136bb278407704579f3b97f4ff4aa6
-DIST sentry-python-1.29.0.gh.tar.gz 387456 BLAKE2B 5ebd9901a2e60cfd4c688c32e045e1a05d227608eaecfb3de3049cf608d631fc70aa5fb7dba9085b4ba1bc5fe648f52d1f1a549aa67a39ddbe3e7f67d4f38d73 SHA512 a08da9ed5e8107a6f364868922aa8eadebbef62acdd51407684861280053d63a766b3e7bd689a80ea8083ea28ac30140b46b3de163490edf62b50717086fc59d
 DIST sentry-python-1.29.2.gh.tar.gz 382177 BLAKE2B 1fa42e53ed1115fb50b3a5d4a49ca7f851cc487ecb638b7add2d261ed207c9c8d4ccc1ca20760516e82e5a5cd52b1582271b81e52977b87944b0df55365a9800 SHA512 56fd53f3a43acc1c2fe5bd6f44c7a5a63b4ab944919fa5a4539239230c3c64eb75e75414e26809d12bcb601a779b661d6dec73dededa07e10f120438ea3ad5c7
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild
deleted file mode 100644
index 25dd8abb3ec3..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.26.0.ebuild
+++ /dev/null
@@ -1,118 +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_{7,8,9,10,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/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.27.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.27.1.ebuild
deleted file mode 100644
index 3161d9dcc8f6..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.27.1.ebuild
+++ /dev/null
@@ -1,118 +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_{7,8,9,10,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/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.28.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.28.0.ebuild
deleted file mode 100644
index 3161d9dcc8f6..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.28.0.ebuild
+++ /dev/null
@@ -1,118 +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_{7,8,9,10,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/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.28.1.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.28.1.ebuild
deleted file mode 100644
index 3161d9dcc8f6..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.28.1.ebuild
+++ /dev/null
@@ -1,118 +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_{7,8,9,10,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/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.29.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.29.0.ebuild
deleted file mode 100644
index 3161d9dcc8f6..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.29.0.ebuild
+++ /dev/null
@@ -1,118 +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_{7,8,9,10,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/python-socks[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/sentry-sdk-1.21.0-ignore-warnings.patch"
-)
-
-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
-	tests/integrations/django/test_data_scrubbing.py::test_scrub_django_custom_session_cookies_filtered
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_large_event_not_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_engine_name_not_string
-	tests/test_scrubber.py::test_breadcrumb_extra_scrubbing
-	tests/test_scrubber.py::test_span_data_scrubbing
-	# this is not even funny
-	tests/integrations/modules/test_modules.py::test_installed_modules
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild
index 3161d9dcc8f6..25dd8abb3ec3 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.29.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
index 9da4fd02674b..9a2e7b3b9bcd 100644
--- a/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
+++ b/dev-python/sphinx-basic-ng/sphinx-basic-ng-1.0.0_beta2.ebuild
@@ -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/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index 9d996d229f0f..73654a85be88 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,2 +1 @@
 DIST sphinx-multiversion-0.2.4.gh.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
-DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild
index c568425575da..abfa9743f511 100644
--- a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild
+++ b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Holzhaus/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-python/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild b/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
deleted file mode 100644
index 9d06020a94be..000000000000
--- a/dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Add support for multiple versions to sphinx"
-HOMEPAGE="https://github.com/Holzhaus/sphinx-multiversion"
-SRC_URI="https://github.com/Holzhaus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index d86ffd4897fc..96b24e304117 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,2 +1 @@
 DIST sphinx-panels-0.6.0.gh.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
-DIST sphinx-panels-0.6.0.tar.gz 400548 BLAKE2B 685b241ffe839face392950ccaa5c00d5613ee4076a4f8d62fdff32158f2d02c444375b7f656a89d4712f8bf895b937ff9fe650cab98670f03b0c4d75e545f97 SHA512 74064538ff8cd1c7c44b5daeda272217618ed33394694883046972b4262d503e1426e7573d8b49040d4b426651377b89fd4ad2a085f1e62827e7ef51e6912e5f
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
index 24a42b25b382..9626bd68bba8 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
deleted file mode 100644
index 0a00b17f9e18..000000000000
--- a/dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A sphinx extension for creating panels in a grid layout"
-HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
-SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild
index ab424c6ee9d9..4feb503023ef 100644
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 "
 
 LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
deleted file mode 100644
index b39920809a3c..000000000000
--- a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.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
-
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="Make Sphinx better at documenting Python functions and methods"
-HOMEPAGE="
-	https://github.com/python-trio/sphinxcontrib-trio
-	https://pypi.org/project/sphinxcontrib-trio
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-
-RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-)"
-
-# AttributeError: 'Sphinx' object has no attribute 'add_stylesheet'
-#distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_test() {
-	# https://github.com/python-trio/sphinxcontrib-trio/issues/260
-	epytest --deselect tests/test_sphinxcontrib_trio.py::test_end_to_end
-}
diff --git a/dev-python/sqlglot/Manifest b/dev-python/sqlglot/Manifest
index 8fdc8b794a7c..0851171444fe 100644
--- a/dev-python/sqlglot/Manifest
+++ b/dev-python/sqlglot/Manifest
@@ -1,3 +1,4 @@
 DIST sqlglot-17.10.1.tar.gz 8394322 BLAKE2B e7d922644e3071ccc6ce666b10081ce24095cbed6d2136c70e632d241196058762167874b175e6b000dda91922d72000fd6f57d8ae775dec588915f10a51d2e8 SHA512 6cbf3c82e5fee73dcbfe677213c10325a5fb81c8f93ba594d88abe9fb7d3a6580c6c6adebc6551cbe1dc8ae51ad68ac33a0242088e68dd80ef3e7285f4479ad1
 DIST sqlglot-17.10.2.tar.gz 8399314 BLAKE2B c9695273925485f366f155f15a741074ed9b8f91ca5dfd7b233af8c43acb9dddfd48125218f12b47a4a1ad4003299e49ce532e4ff8a24a6cf6b074b6e069b484 SHA512 806b59eaca0b90f94fea9613313763276fd4def1b34e4781b7c5a05dfec446b3d6ddbfe27bf9c6f631820220013cae390f3e251ed432816d7598ed3140993d89
 DIST sqlglot-17.11.0.tar.gz 8399720 BLAKE2B 28a2da06afc70a510ad046d25432c2b145fc10374ecc41b78052e22ba771dc21d57503d5335839cf3c227fc53c12365f4cc2d6a4c9e1e1ccf02b71266e7e0cdb SHA512 026af3b24a2c62efee937238eaa69ebc47dd0ee8e2979cacd28a45c565dc36f3aa1e03f0fe46265a1f9c5e379eacc54f730c57b06bf80962ccb87d43893fc9e3
+DIST sqlglot-17.12.0.tar.gz 8402758 BLAKE2B e563aecabdac819c55eabd678a12ee2a83f7a074eaa3d58d27503b04828233527c7320d237b699cc209f849d57d3b262a164f157fd4f24d1b125206994a45782 SHA512 d2e64e3692b93138f30904fab28490a3c9598e0201627112c29588c20889981354e2bf82ee844609d7633ea44aab9855159f294a6d711bb144ab922ed5ce1078
diff --git a/dev-python/sqlglot/sqlglot-17.12.0.ebuild b/dev-python/sqlglot/sqlglot-17.12.0.ebuild
new file mode 100644
index 000000000000..0120736dda66
--- /dev/null
+++ b/dev-python/sqlglot/sqlglot-17.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi optfeature
+
+DESCRIPTION="An easily customizable SQL parser and transpiler"
+HOMEPAGE="
+	https://sqlglot.com/
+	https://github.com/tobymao/sqlglot/
+	https://pypi.org/project/sqlglot/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+EPYTEST_IGNORE=(
+	# Tests require pyspark or duckdb which aren't in the tree.
+	# Pandas would be a requirement normally, but it gets ignored by proxy.
+	"tests/dataframe/integration/test_dataframe.py"
+	"tests/dataframe/integration/test_grouped_data.py"
+	"tests/dataframe/integration/test_session.py"
+	"tests/test_executor.py"
+	"tests/test_optimizer.py"
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "simplifying timedelta expressions" dev-python/python-dateutil
+}
diff --git a/dev-python/tornado/Manifest b/dev-python/tornado/Manifest
index 1de39f1df8a3..0f44ab068c5f 100644
--- a/dev-python/tornado/Manifest
+++ b/dev-python/tornado/Manifest
@@ -1 +1,2 @@
 DIST tornado-6.3.2.tar.gz 508776 BLAKE2B 10cea881365ab72290ac9bc240dc7fa4e77511be1aa9d005e84fff1c494888d204935f5bf5101d102cc6e8f0995d41c0cc257e372d740f2aa47dc904032c434d SHA512 cd4be43672dcf0814536ad1b2b1dde045f25494a9f70facf0dbae5d3a71b112d0dbca235916948982922975d0d4c58efff880c0b432db382f58f25d65ef18c92
+DIST tornado-6.3.3.tar.gz 509872 BLAKE2B 575928b932a912515730b23ab712d6107b27ccb37c703be722768442093d47623e27ed31f60816c4031cd04354182796275619f27896d970e350dbb51a341b0a SHA512 3d4b0f933f09b8f8d5de5f93662de73d97a0ed98f5b56e0810d803d537092c74e89315dc9aaa0af85f91e18eca64cf429f6f73bce29523ce56738398fa24a597
diff --git a/dev-python/tornado/tornado-6.3.2-r1.ebuild b/dev-python/tornado/tornado-6.3.2-r1.ebuild
index fb946f79b71d..b70ca525114d 100644
--- a/dev-python/tornado/tornado-6.3.2-r1.ebuild
+++ b/dev-python/tornado/tornado-6.3.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tornado/tornado-6.3.2.ebuild b/dev-python/tornado/tornado-6.3.3.ebuild
index 2949ce6cd2eb..848aa1dac97e 100644
--- a/dev-python/tornado/tornado-6.3.2.ebuild
+++ b/dev-python/tornado/tornado-6.3.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,11 @@ src_prepare() {
 	# network-sandbox? ipv6?
 	sed -i -e 's:test_localhost:_&:' \
 		tornado/test/netutil_test.py || die
+	# regressions with py3.12, not important enough to block us
+	sed -e 's:test_chunked(:_&:' \
+		-e 's:test_gzip:_&:' \
+		-e 's:test_header_callback:_&:' \
+		-i tornado/test/{curl_,simple_,}httpclient_test.py || die
 
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index 13b189032922..2b73de3bdd2c 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,3 +1,2 @@
-DIST trove-classifiers-2023.5.24.tar.gz 15856 BLAKE2B 37184092e2ec7c068a73d47f0708124b92d54abd4015da5ccbe2b914699f7f93ffaaf1422b84745c0c76aa377adab9c4759348789c55300772c80892afc5c6da SHA512 6017d32ffb63f8ac85d616c55a9317aa8f3cecbddcdfaabffbd6ba98a60f964ceeb28424881f2cebdf891aad2b6d7d1ade78202ca6e9bec697ce446647d09897
 DIST trove-classifiers-2023.7.6.tar.gz 15844 BLAKE2B 40c6c1c16dbd50d098584ef22e5a687009317642f45bae0de03ebacb3331a9ed94ed63480ccee187565c41e3037911db56cbcfe3f150cf4663161b687e4d275f SHA512 612251e76ce5143e77c349fdc4948eff335f862db4d9138c66f8ca935c2a95c9970377d6a7df382d689728517e89868a9e59bd42d450346499d5c385ebf62841
 DIST trove-classifiers-2023.8.7.tar.gz 15856 BLAKE2B b20befe256e51704b4974ba7b3bcae88ff2ae1f1281da145f16a77963a75b3d2a58aa5914d622e8687a0e08915ae92783c4782a90390b53a0f346d829dce8cd3 SHA512 d414f5e71abf0eef3593c9509c93b4d3dbbf0b8f6ffacc85acd43be9e0f31d924757868e86bb069d9f0475731c811229ffc827568fe957fef850e71a0a5119fa
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
deleted file mode 100644
index 17221ba3698c..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Canonical source for classifiers on PyPI (pypi.org)"
-HOMEPAGE="
-	https://github.com/pypa/trove-classifiers/
-	https://pypi.org/project/trove-classifiers/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-BDEPEND="
-	dev-python/calver[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest
-	"${EPYTHON}" -m tests.lib || die
-}
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.7.6.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.7.6.ebuild
index 09579592a8fb..17221ba3698c 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2023.7.6.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.7.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
 BDEPEND="
 	dev-python/calver[${PYTHON_USEDEP}]
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 766bf48f5cdd..ec7d7832b7b2 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,2 +1 @@
-DIST trustme-1.0.0.tar.gz 29567 BLAKE2B d57049d5d72b0aca85911a39f1eed2388829ab7e6833a2f8cb7fccf6d743e99fdc7e2917382f1397787c70763bf2ea49210337021054fc549e7e95377f88dc52 SHA512 4315290b5c7341ede5037ece01608ab0e8e07427c8053e058fb5db23f59b0be63b44fda83d83d0755f44c2a0d595b193ca77050c5f908038be071c18d759756a
 DIST trustme-1.1.0.tar.gz 29611 BLAKE2B 71210845c3bb919b731ab14db72376aa701c547c4b062e4dab9ccbb6b97c3416cb48b92a998aa26c85720b38514998e62005dd310513fc80a54502432ee4000b SHA512 f0ad39ffd9f4074107c90258738412ff8ca8ed1b4138e38edc6edad9a5cb8787a53a47fa78b12eba189774902ee3728961feed54b3b5e944e4737749912627b2
diff --git a/dev-python/trustme/trustme-1.0.0.ebuild b/dev-python/trustme/trustme-1.0.0.ebuild
deleted file mode 100644
index 23189fd43644..000000000000
--- a/dev-python/trustme/trustme-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +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_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="#1 quality TLS certs while you wait, for the discerning tester"
-HOMEPAGE="
-	https://github.com/python-trio/trustme/
-	https://pypi.org/project/trustme/
-"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/service-identity[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/trustme/trustme-1.1.0.ebuild b/dev-python/trustme/trustme-1.1.0.ebuild
index 1f2ac1775666..9b0637da2052 100644
--- a/dev-python/trustme/trustme-1.1.0.ebuild
+++ b/dev-python/trustme/trustme-1.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
diff --git a/dev-python/uri_template/Manifest b/dev-python/uri-template/Manifest
index 4bcd3ea6d512..2a69d7808d7d 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri-template/Manifest
@@ -1,2 +1 @@
 DIST uri-template-v1.3.0.tar.bz2 17076 BLAKE2B e8d6c1c35190beab4b2b51cf82dacd6e7bf51397abb142f89f975ce4e7c3067dd9c59895127446deafd84420b63ef62c1484c29037dd9e3833e0d0d55950dcc4 SHA512 654eb700de68a5b992b910e1ff0a038ed699453f021d1eb844d71ddebb32e3ffb77851b5704879bf3eb894eaca33477a0173223a5d9df6a06e33fdc27f6b0f5c
-DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
diff --git a/dev-python/uri_template/metadata.xml b/dev-python/uri-template/metadata.xml
index ea8988e8af6a..ea8988e8af6a 100644
--- a/dev-python/uri_template/metadata.xml
+++ b/dev-python/uri-template/metadata.xml
diff --git a/dev-python/uri_template/uri_template-1.3.0.ebuild b/dev-python/uri-template/uri-template-1.3.0.ebuild
index 04a7c8378db1..49533fab6344 100644
--- a/dev-python/uri_template/uri_template-1.3.0.ebuild
+++ b/dev-python/uri-template/uri-template-1.3.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/uri_template/uri_template-1.2.0-r1.ebuild b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
deleted file mode 100644
index 6aab301a9bfa..000000000000
--- a/dev-python/uri_template/uri_template-1.2.0-r1.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=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
-HOMEPAGE="
-	https://gitlab.linss.com/open-source/uri_template/
-	https://pypi.org/project/uri-template/
-"
-SRC_URI="
-	https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# fix the version number
-	sed -i -e "/version/s:0\.0\.0:${PV}:" setup.py || die
-}
-
-python_test() {
-	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
-}
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 8b10d26784f0..70049c70e167 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1 +1,2 @@
 DIST validators-0.20.0.tar.gz 30665 BLAKE2B 7534c4970ab288cc02794176e0b3368ed2d4035d602d36ecadad84fb4a41407210b22a8ed1230650f4f247ba1552634aa500fea5c2f03f5e13d6e1120e62b15b SHA512 2f3d9caac9246b346e10604758168092ac483fe6e4a0c9470900e49719fbbebfd18e03aca525f8cca33cec224589aee28de3ea9bf5cd4941a49715d4216dba20
+DIST validators-0.21.2.tar.gz 40739 BLAKE2B 0420a1a56c3ceb96062d9a78c78be8151f94eba2a8cc06db7003ceebbb535eb55810289bf5787a24807d9c0556ce0621b7fc159ddd1c62fe28ae0dc61f257b58 SHA512 558630849f6c81b13f7043f5713c160f0cdcc94c7d90c9e13c97ab972c1bf74df9a9d889b50238f7239c6885a34549a8a209b3a325d62291d93073b9cad18d08
diff --git a/dev-python/validators/validators-0.21.2.ebuild b/dev-python/validators/validators-0.21.2.ebuild
new file mode 100644
index 000000000000..cf37e1f65945
--- /dev/null
+++ b/dev-python/validators/validators-0.21.2.ebuild
@@ -0,0 +1,21 @@
+# 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_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python Data Validation for Humans"
+HOMEPAGE="
+	https://github.com/python-validators/validators/
+	https://pypi.org/project/validators/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index ff8225b535e3..7b80463d9a86 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,3 +2,4 @@ DIST virtualenv-20.23.1.tar.gz 6619074 BLAKE2B 0b35a1439b7e2a9eba9c676457a39d22c
 DIST virtualenv-20.24.0.tar.gz 6315085 BLAKE2B ae80fb91ecf8ba69574f5e4373913e6f7c951d56c8091cf7066f24b7b98d6a25479acca637980117d4e7759eb35d4e2fb9a95fc211360825148cf8ae650db6ea SHA512 7c3974ebd40d855bb859e3af10e341c6e8164d63779d6038bac15d49fdb1b87c564c6f7987d06d2f01fb4009183dfe4e05fa2dadaad44b8a153b7c1cb55b687e
 DIST virtualenv-20.24.1.tar.gz 6338055 BLAKE2B b5d6ff2fa230a094699cd5ef3a289d9f79c35a843e8709009b44c7d5861dffe2072d51c62a623624c3f7b1656d126781ae454a81e3510474e2514ec66d85637f SHA512 7ac4c130df7eb4b7bf2b393505c80ed07824c9d0c09535f1d7483f3926324e0d1c54c0b8310c228e529a9b3839820e943a1d2ff2b06174782f13735c2a1ed472
 DIST virtualenv-20.24.2.tar.gz 6338501 BLAKE2B 8a23dc82dd3cf7e5b5a33427b23f0e1d580c463573145c079cb4d18bb2292c61475b0209c6b249ec8d6eff1196a7695e3bf4a4267145e9f2ebca96a25a11fd43 SHA512 776924af470969503adec4ace6da626828ed0a41d17dcc88ef5b0166bed12f98862c6482a63f79d370cd9226c2b8e118933045d89369486ddad3c4e05c0db713
+DIST virtualenv-20.24.3.tar.gz 6345661 BLAKE2B b6e9db2b59114de0aa419f558b863aa980daaca278e658f7dce55b5b2bef16e88915162d4b5ea31bb5c549582debd22d02b2a0edc7db08c168428395251448c3 SHA512 9cf6f03b50bae773cca2a01be4f74251d3054ea997a0b1236c4e6650e779f219ca51f736eff86a6e25548d5bc0c84e85a1d0cf7d3099848d773d205837c76fc3
diff --git a/dev-python/virtualenv/virtualenv-20.24.3.ebuild b/dev-python/virtualenv/virtualenv-20.24.3.ebuild
new file mode 100644
index 000000000000..0bbd33afee6a
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.24.3.ebuild
@@ -0,0 +1,107 @@
+# 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_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	<dev-python/distlib-1[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.7[${PYTHON_USEDEP}]
+	<dev-python/filelock-4[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3.12.2[${PYTHON_USEDEP}]
+	<dev-python/platformdirs-4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.9.1[${PYTHON_USEDEP}]
+"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-22.2.1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-freezer-0.4.6[${PYTHON_USEDEP}]
+		' pypy3)
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.8[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/time-machine[${PYTHON_USEDEP}]
+		' 'python3*')
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+		# tests failing without python2 installed
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[True-False]"
+		"tests/unit/create/test_creator.py::test_py_pyc_missing[False-False]"
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-venv-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+	[[ ${EPYTHON} == python3.1[12] ]] && EPYTEST_DESELECT+=(
+		# TODO
+		tests/unit/discovery/py_info/test_py_info.py::test_fallback_existent_system_executable
+	)
+	[[ ${EPYTHON} == python3.12 ]] && EPYTEST_DESELECT+=(
+		tests/unit/create/via_global_ref/test_build_c_ext.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x TZ=UTC
+	local plugins=( -p flaky -p pytest_mock )
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		plugins+=( -p freezegun )
+	else
+		plugins+=( -p time_machine )
+	fi
+	epytest "${plugins[@]}"
+}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 84a81625dcd1..826e143abe79 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,4 +1 @@
-DIST zipp-3.15.0.tar.gz 18454 BLAKE2B 759c9be6cdf6297874ed8d7cc98e8fc7c360bb765b72b345b264034f43a63831b92daa31a4d40736cc83a12b5f853d17da7fae290cb62a87ac6552edfcaca913 SHA512 74a512428fa29e284c515a7e6c45030e4d840727e12e376bca480a90b7fd1e111462deafa372ca9aebd9f53c24bc37111570e7a4a6a873c0b7dee9a0277c100d
-DIST zipp-3.16.0.tar.gz 18432 BLAKE2B b9f9f016f6f6bc87610fa4338dcbd237b09623cb5da20761e5a6f4e06bc694b6e5fd219681e12468b76b2ebf590f3ea1adfa066dfdf49caf4aecee30f73a4c19 SHA512 f83eb32a28a1f3acf49ade075e8390f89912d1a058cf514432c06efc1963d2a40d78051a6f7963fcdaee3dcf38e327a48a4eef15e5f3ac0db4a9590d6061ccdf
-DIST zipp-3.16.1.tar.gz 19194 BLAKE2B 7428764465674f356881d91216386c8f8495f613d7b0e457bbd77e662b958aae7d2fff65afb8afbfadbe31285edd26858272f1501a27f7378dea3b8b866922df SHA512 e1f8d03c8b8c49e4745e03b65e32c9b76bb4e7c87e24304af630e8875843ad4cfc12f46f5dce3f210698a9e9a5f58be251eafed83893128657d8cb23c11066d0
 DIST zipp-3.16.2.tar.gz 20002 BLAKE2B abc9b9b2c801f50856e6ad761ff2be81729a475e221716b63c8e017ae87b5f712e43547ba1a42911533f9ad88d02e805768e5bcba397b3f7355d0a8cdcbaab0a SHA512 cb7f19638b2bc2bb1c38241078836c4e484b8f1fae8232073da25967f01e449eb8a6c870d2afde285ea9ae319785a9e4b7cb0e5edc2d0f4690f3ce27c359be93
diff --git a/dev-python/zipp/zipp-3.15.0.ebuild b/dev-python/zipp/zipp-3.15.0.ebuild
deleted file mode 100644
index 48ed284cc1a5..000000000000
--- a/dev-python/zipp/zipp-3.15.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="
-	https://github.com/jaraco/zipp/
-	https://pypi.org/project/zipp/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# big_o is only used in test_complexity, that we ignore
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# performance tests are flaky by design
-	tests/test_complexity.py
-)
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.16.0.ebuild b/dev-python/zipp/zipp-3.16.0.ebuild
deleted file mode 100644
index 5f8da45fe22f..000000000000
--- a/dev-python/zipp/zipp-3.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="
-	https://github.com/jaraco/zipp/
-	https://pypi.org/project/zipp/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# big_o is only used in test_complexity, that we ignore
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# performance tests are flaky by design
-	tests/test_complexity.py
-)
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.16.1.ebuild b/dev-python/zipp/zipp-3.16.1.ebuild
deleted file mode 100644
index 5f8da45fe22f..000000000000
--- a/dev-python/zipp/zipp-3.16.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Backport of pathlib-compatible object wrapper for zip files"
-HOMEPAGE="
-	https://github.com/jaraco/zipp/
-	https://pypi.org/project/zipp/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# big_o is only used in test_complexity, that we ignore
-BDEPEND="
-	test? (
-		dev-python/jaraco-functools[${PYTHON_USEDEP}]
-		dev-python/jaraco-itertools[${PYTHON_USEDEP}]
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# performance tests are flaky by design
-	tests/test_complexity.py
-)
-
-src_configure() {
-	grep -q 'build-backend = "setuptools' pyproject.toml ||
-		die "Upstream changed build-backend, recheck"
-	# write a custom pyproject.toml to ease setuptools bootstrap
-	cat > pyproject.toml <<-EOF || die
-		[build-system]
-		requires = ["flit_core >=3.2,<4"]
-		build-backend = "flit_core.buildapi"
-
-		[project]
-		name = "zipp"
-		version = "${PV}"
-		description = "Backport of pathlib-compatible object wrapper for zip files"
-	EOF
-}
diff --git a/dev-python/zipp/zipp-3.16.2.ebuild b/dev-python/zipp/zipp-3.16.2.ebuild
index ddc660247e68..7f49c21736bf 100644
--- a/dev-python/zipp/zipp-3.16.2.ebuild
+++ b/dev-python/zipp/zipp-3.16.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # big_o is only used in test_complexity, that we ignore
 BDEPEND="
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-08-12 06:11:19 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-08-12 06:11:19 +0000
commit	f3095ffbe2ede5197a4912aef9d03c2ea284376f (patch)
tree	e56928a2c61b150195732622b76a96cd40eeb109 /dev-python
parent	9b5301bb92ad94bdc782f8c22b794320dd9f8b5e (diff)
download	baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.tar.gz baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.tar.xz baldeagleos-repo-f3095ffbe2ede5197a4912aef9d03c2ea284376f.zip