Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-06-27 18:20:01 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2023-06-27 18:20:01 +0000
commit: 074bd56693f106fd6a9ed2e6e44cfa50dff79e83 (patch)
tree: 429c2efd67050b943548a721e3876b03042218fe /dev-python
parent: c1f2af78d7929d71d43cf63191638ede4ba5b853 (diff)
download: baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.tar.gz
baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.tar.xz
baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.zip
235 files changed, 1250 insertions, 4784 deletions
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index b25cccf5cc50..02f603bb0130 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,2 +1 @@
 DIST appdirs-1.4.4.gh.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
-DIST appdirs-1.4.4.tar.gz 9840 BLAKE2B cb9466f4a7f7c1d6f5b6d7ca031820ec4d3450afcaa8ba571e35387c3109ede4e2afbf2c1141a9d01d13798f55524d5efd3fa12546a9378abbda405353938d79 SHA512 4c0e1e8dcd3f91b8b2d215b3f1e2ffaa85137fe054d07d3a2d442b1419e3b44e96fdea1620bd000bd3f4744f71b71f07280094f073df0ff008fac902af614656
diff --git a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild b/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
deleted file mode 100644
index 83c21fd88627..000000000000
--- a/dev-python/appdirs/appdirs-1.4.4-r2.ebuild
+++ /dev/null
@@ -1,37 +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
-
-DESCRIPTION="Module for determining appropriate platform-specific dirs"
-HOMEPAGE="https://github.com/ActiveState/appdirs"
-SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-
-src_configure() {
-	[[ -e pyproject.toml ]] &&
-		die "Upstream added pyproject.toml, 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 = "appdirs"
-		dynamic = ["version", "description"]
-	EOF
-}
-
-python_test() {
-	"${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
index 8aadb16c8129..e32e0845786c 100644
--- a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 python_test() {
 	"${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 15ad060e964d..d686e3ce3a54 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,4 +1 @@
-DIST asgiref-3.6.0.tar.gz 32748 BLAKE2B ce3facb2d026551df31ab28a3d9c4bb22be6828664d3b341369eb5dffaec1f2a519ab84356ec89dcfe112a96430be66c70c53d7e36586a3b2f4ee1db61a9d617 SHA512 b74d71e3a5d129117293512ed93e06a9ac0f681766abfc074be6c8deec7160995dee23947da861715fa47e2b9921669b6b5bf247f8d895ffbea7007ea956b9d6
-DIST asgiref-3.7.0.tar.gz 33247 BLAKE2B 512d497d57e45b2ea8d0db1d7bd12ebd850087291698067b050988137e4795eb784796ac8ec6cfcce3a67d9cbf11fb88d4a441e5dfd4e9d177400efe979837e9 SHA512 f4672a1ec652e4f05114caf19e1036a6bc71b137af48214292d5f5348340563a450e13520424aae74d75a58c9dbae7acf4f2debf54acbf5c24310e6bf911ac3f
-DIST asgiref-3.7.1.tar.gz 33273 BLAKE2B 9c06694ea69874224d062819582689ff541356697933508c93354a3850f9c5c7668fd49a500417c7ad832511b1d647ad199928d4811abbf9d8ee31263a81e12d SHA512 9d9563e50c4e0998d169975d6477f1dd2fb953921eafb54cf42aa36fe6a62f5df6b1f7b562491ffa8587d3c3a716d79858bf314aeae7379ccd0efcf59f330d61
 DIST asgiref-3.7.2.tar.gz 33393 BLAKE2B b5927a141772a2c0bd4c9354692558c766981a2d7b821122eacb7ee6b59aad86925dc2afb179ff9a3823a65cf17faee89bda5560d68a9ae6d82f9ad1cb31d7b2 SHA512 578ccb54e25869ac9bc7bcd59819d4fc056fdb89a27ec3d7c5b74608984c9d18b41f0b281a3a67bf6b56ad85a7009e336bbdd4a76e2b4a0c8a26c0dfef2687a8
diff --git a/dev-python/asgiref/asgiref-3.6.0.ebuild b/dev-python/asgiref/asgiref-3.6.0.ebuild
deleted file mode 100644
index 1f0e15201188..000000000000
--- a/dev-python/asgiref/asgiref-3.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.7.0.ebuild b/dev-python/asgiref/asgiref-3.7.0.ebuild
deleted file mode 100644
index 5ab2e33234ef..000000000000
--- a/dev-python/asgiref/asgiref-3.7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.7.1.ebuild b/dev-python/asgiref/asgiref-3.7.1.ebuild
deleted file mode 100644
index 5ab2e33234ef..000000000000
--- a/dev-python/asgiref/asgiref-3.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.7.2.ebuild b/dev-python/asgiref/asgiref-3.7.2.ebuild
index 5ab2e33234ef..02d552c6fa5a 100644
--- a/dev-python/asgiref/asgiref-3.7.2.ebuild
+++ b/dev-python/asgiref/asgiref-3.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index e1bbe28a13a1..42b01d2f0c5b 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -2,3 +2,4 @@ DIST awx-22.0.0.gh.tar.gz 16988159 BLAKE2B 88b2e8a1f035ca34c7dfd6ddb83ca9b728241
 DIST awx-22.1.0.gh.tar.gz 16995197 BLAKE2B 4a455219a7be93c5e85fafb2108162ef6745d835a18ad6ff842fda3e82c51e789d6a512a51275a8c169a7a480e242b2043400c641e7c950a84138cab41560758 SHA512 8a1bea58d24f6240d713d95a0389e434c242efda2e8eea10b3c9baa49174e93861558e4d80983aadc3d762f5b7f8c71f7440c057e1f00d4ac33619a68ab4a51a
 DIST awx-22.2.0.gh.tar.gz 16997478 BLAKE2B 62fda5250b62c517f5374ab9d6ec6e1e5c57ba8e904626404e54b01b34dfddc006651801424092415e7d4f78f3d1d130432665cafadec5e8af1f72336bdcaf6c SHA512 d8b318d5a2e2bf0fbd4c09e09655b4960fb93f95749149be6542fe426874971ffcdc866c0ea5dc2a7a71ba57d3928aa6ff7f87982a085a3c2f8f92d04645f246
 DIST awx-22.3.0.gh.tar.gz 16620136 BLAKE2B 23a84f6ca8971325d7a0d7b072f28275158906832cdeaef15906495a1c20b03999a32776cd92b5ce09f6f14c1a83db7c2978eb4697ff5cb41214ba0b5d10fefc SHA512 65e3284abd07eb25ec013be94627ac20b0613071a00697ba380e2bd754dbc18d45089de61d7caa37f604c92f0d47cd640544b9bc69de1dfb3511678e9d80334a
+DIST awx-22.4.0.gh.tar.gz 17626680 BLAKE2B 05333c958a7e73f169b1743903a983c868bc4531e73afe6fa10de60ed7fa567520d5817ab52d0180a32fa517fbf07dab3ffb492b31245f3cdb6a6c6fd0a00898 SHA512 6c51dc77089ae23ac8c636438a5737cdfaf7d160c24d040d4a5c5a05ff781f1df64275130c23b8118cf7847ef16a434556ef91698f275a98d72ea94938f5ed7f
diff --git a/dev-python/awxkit/awxkit-22.4.0.ebuild b/dev-python/awxkit/awxkit-22.4.0.ebuild
new file mode 100644
index 000000000000..85bf390927f2
--- /dev/null
+++ b/dev-python/awxkit/awxkit-22.4.0.ebuild
@@ -0,0 +1,50 @@
+# 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
+
+MY_P=awx-${PV}
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+# no sdist, as of 22.0.0
+SRC_URI="
+	https://github.com/ansible/awx/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	printf '%s\n' "${PV}" > VERSION || die
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c4f62f1c05b5..c6287cc0303c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,3 +10,4 @@ DIST boto3-1.26.157.gh.tar.gz 666162 BLAKE2B ad80278fed9022dabb77879cca15cb7abf2
 DIST boto3-1.26.158.gh.tar.gz 667274 BLAKE2B e507fc9d404fabeb179524408c883ae5311c2273d838d7270eb60aa0c13e4f8faa3fe0ae4dc58566ba8f61764d171c3b012906e6d5ff91e1e958d5fb6ea2936e SHA512 ff70265a03fd29de37f7cc328c2ab277483390f27977f36fca5199ac2b10d978f5ef4db1504f12da4f3d1453fb7051375784cbc840ec3be7f161c6a42c44c1a4
 DIST boto3-1.26.159.gh.tar.gz 667712 BLAKE2B 6604ba81b3c52dba19d31a92b8e800958abbc5927f6513eff688c7dacb7db9f16927402336113a33a4a8d6da9440b1f91323b18957be77137eff351aae3ef550 SHA512 a5ba427bb5b5cd3e60b668cd4f9923ddf4f5e3341aa219a599c1b15b27bc22d6c6e3a07b38e75ad302cd15ecb3e2bfd42570e7bd4007929345b9f61eb3a853fe
 DIST boto3-1.26.160.gh.tar.gz 667890 BLAKE2B 2d081604ea94a6fece2c6839c0be339fa2ff3f8c4eba5b882eb45597646ef8efc0294abb58f9233e3fe1ec445131a91701ddf8771220275c13c34af9813cd8e6 SHA512 2a427e63fc61581a873a75ea2b0fe4329cc55ea61e7c99049d8d24c3cb676490a66efa9d6236b90ba6d7c41208a90a60b04dac53ff8243952d64134abff4ba82
+DIST boto3-1.26.161.gh.tar.gz 668281 BLAKE2B 3c0500449c202c385e1f4aa3c29b41e166756ebad344257beed5dbfd9c3ca6bee19b8d6c9338f4bd34242613968a4bf074158d267c74b62d3d8d5f47b8aef188 SHA512 91c8f43b47b5b2a67e58a14924dd436e2f07b6a14d2a3b9698d7e63d140db98a96af9856a3b11b95e87ea232f5b250378f303acc7d756daac9eab3ad17180c12
diff --git a/dev-python/boto3/boto3-1.26.161.ebuild b/dev-python/boto3/boto3-1.26.161.ebuild
new file mode 100644
index 000000000000..03c610b184f7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.161.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 fd86555b470b..43ab21d83f39 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,3 +10,4 @@ DIST botocore-1.29.157.gh.tar.gz 11678505 BLAKE2B f946118809c4d96000bc6cc23f650e
 DIST botocore-1.29.158.gh.tar.gz 11687611 BLAKE2B dde78cc51bde5e7f49054d5954ddaff190d2b26d5c156a3967fb10dd420ab9665bd6981c0a9ad05a358cc76ed51913bf544cd79d4a6e44cf993a81b7d3ab60dd SHA512 bf7523bfd888906f5a38b8789bbeddffc59fec9609d8bb173476e88e60b8fd036c26efdc3fa56fed1d23d69d09c1ee0f2b1e5ee946224cf3cb1435456098790c
 DIST botocore-1.29.159.gh.tar.gz 11694696 BLAKE2B 8643d3beb049b8ab153fda947801b862926f4160586d29831c0a1d6fef7e3caed2c2ff83bdffe1d61f49f81a11aa9dcc57b3c2d2419e21ccc543cc40a3532308 SHA512 782d051749f5a998cf93878e53b3f12e4fde36712708adff58f1e720e83f79f4330410725e0a8b097f5ca425cc093dfea8e746afedeceb582a3e82c7fd169477
 DIST botocore-1.29.160.gh.tar.gz 11695537 BLAKE2B e60b8ec0ea50fa13e61acd8f5cbc4f908c0d95916733e6ebdf11c2387e1a13efee611070fb72e37ca3e3058888d3acd6debdd67bfc973528c7674c760a3bd865 SHA512 42c6d02df87b12143248ecd314d5b9ebcf47900da975addc8343187c7bd35ec3c41118ba8c9482d9e152e5352a95111ccd93f425e215fdeeeee4ee991803bfa1
+DIST botocore-1.29.161.gh.tar.gz 11703652 BLAKE2B 5afe53ae3e765d5cb01a858a6ad96ab2f493c669e9d4aa0ce105e288d72760ca1bb82265e51c844a1f4875fc4efa3b7f1e662ed28b057d24afb5a94da0d99e33 SHA512 54ca99ae85354d1a582547e525ddc4d4828ddeac0ff91e29e5e73f91e113b6e3621aec9c71b7e86f7316a4d3d6424bdc0149a9649d85e7351274194d2dc65ac3
diff --git a/dev-python/botocore/botocore-1.29.161.ebuild b/dev-python/botocore/botocore-1.29.161.ebuild
new file mode 100644
index 000000000000..509d06dedf97
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.161.ebuild
@@ -0,0 +1,79 @@
+# 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
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 8abae15bae30..e575bb2585a7 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,2 +1 @@
-DIST cachetools-5.3.0.tar.gz 27935 BLAKE2B 6ef41ef383aebc1d65e2855c6ce2e62ea38163b44f9dca756482ee8f35bbee033b88a3d7d458ea970fafb062f8b202563d478ff3ccae376f424bc643c9dcbe1a SHA512 5f0be2e95b82de4866718744ba1712354b413441eb8978f0bcb3e32306b6671b8ed7fa238aa31bef4c3b97764347d12a375b058f5df51dc80b277bf2cef23e61
 DIST cachetools-5.3.1.tar.gz 27985 BLAKE2B f8fa7c4e0f18d23c319b121fd951c7929277a6e3177687c7151bcc2028b0f1dd1bda18ee996f4f3a24f7ff56527ad3e80a8f90cf15a7d943e251170fedabbda3 SHA512 7e5d92b580660c1a768a65f9dc8343bc9e57c5df5c44a30137558d08a270a2ec7b652d10c1a78c240218a865527a49fa4b6d545c0bc62fe1f79b5d74da1b58cb
diff --git a/dev-python/cachetools/cachetools-5.3.0.ebuild b/dev-python/cachetools/cachetools-5.3.0.ebuild
deleted file mode 100644
index 9aa1afaf597c..000000000000
--- a/dev-python/cachetools/cachetools-5.3.0.ebuild
+++ /dev/null
@@ -1,21 +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="Extensible memoizing collections and decorators"
-HOMEPAGE="
-	https://github.com/tkem/cachetools/
-	https://pypi.org/project/cachetools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cachetools/cachetools-5.3.1.ebuild b/dev-python/cachetools/cachetools-5.3.1.ebuild
index 904b3d2a391b..9aa1afaf597c 100644
--- a/dev-python/cachetools/cachetools-5.3.1.ebuild
+++ b/dev-python/cachetools/cachetools-5.3.1.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 2fb0532f1969..ed01572398ef 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1 +1 @@
-DIST cfgv-3.3.1.tar.gz 10395 BLAKE2B 8727a9886334a1fe59aeb0554c4c53139ae7e1f66534102c67f005d66dc1f78cff5e5534468a10b85df645f7e8a2fc72ca6ca2e448d09cb7636d08e8b3843113 SHA512 59c358bab9f2b32a1ac6eb72bba67b76e8368e0cf78c32228a6add200a0205f698aa80d9bd1b1e8701fb699b9599c88a240f76e2c91a602a0c292a67693e6857
+DIST cfgv-3.3.1.gh.tar.gz 10395 BLAKE2B 8727a9886334a1fe59aeb0554c4c53139ae7e1f66534102c67f005d66dc1f78cff5e5534468a10b85df645f7e8a2fc72ca6ca2e448d09cb7636d08e8b3843113 SHA512 59c358bab9f2b32a1ac6eb72bba67b76e8368e0cf78c32228a6add200a0205f698aa80d9bd1b1e8701fb699b9599c88a240f76e2c91a602a0c292a67693e6857
diff --git a/dev-python/cfgv/cfgv-3.3.1-r1.ebuild b/dev-python/cfgv/cfgv-3.3.1-r1.ebuild
index ec31a82a57c6..1ccce3d9a605 100644
--- a/dev-python/cfgv/cfgv-3.3.1-r1.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.1-r1.ebuild
@@ -5,17 +5,21 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Validate configuration and produce human-readable error messages"
-HOMEPAGE="https://github.com/asottile/cfgv"
+HOMEPAGE="
+	https://github.com/asottile/cfgv/
+	https://pypi.org/project/cfgv/
+"
 SRC_URI="
-	https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
+	https://github.com/asottile/cfgv/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
 "
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cfgv/cfgv-3.3.1.ebuild b/dev-python/cfgv/cfgv-3.3.1.ebuild
deleted file mode 100644
index e839c3639611..000000000000
--- a/dev-python/cfgv/cfgv-3.3.1.ebuild
+++ /dev/null
@@ -1,17 +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
-
-DESCRIPTION="Validate configuration and produce human-readable error messages"
-HOMEPAGE="https://github.com/asottile/cfgv"
-SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index bf99f1cab2a0..ccec99c932d8 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,2 +1 @@
 DIST cheroot-10.0.0.tar.gz 148461 BLAKE2B d6a07878b03529be0d7ebefc91096f89b437374f9ede1db357a286bc199403798d35e9695dc1251d5045b6febc37940986693d9b36c89968ac3147ec68a481ea SHA512 02e32e52a596463cbb9874a800dbcdc5680dd7d9dfa95ca6e73c81f9248a488087c514ae70cdba94fe9df1f5d3ab1c68efcb720561cbeb7b667109fe5962f85b
-DIST cheroot-9.0.0.tar.gz 152562 BLAKE2B 5f5dd172cfc8fdd1318b22fc27060444a34343b6b83bbda4bd40c16d7cb0568c356f5fd14b0a7cdc74895d6707077ec54fcae54fb29b0d16a7c06e2cd36b1ee7 SHA512 86ea0dd2cb4cde25f86b489b1d0bb27e3e7c1ba5449759ccecaae689cdcb349b968fd0c8fb8bc8273deff5e32a078bf40f4342f0c5a1f53bb8d2b968f44a453b
diff --git a/dev-python/cheroot/cheroot-10.0.0.ebuild b/dev-python/cheroot/cheroot-10.0.0.ebuild
index fbbbf7d65b71..5d97592711bd 100644
--- a/dev-python/cheroot/cheroot-10.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-10.0.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/cheroot/cheroot-9.0.0.ebuild b/dev-python/cheroot/cheroot-9.0.0.ebuild
deleted file mode 100644
index 27e841e978a5..000000000000
--- a/dev-python/cheroot/cheroot-9.0.0.ebuild
+++ /dev/null
@@ -1,78 +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="High-performance, pure-Python HTTP server used by CherryPy"
-HOMEPAGE="
-	https://cherrypy.dev/
-	https://pypi.org/project/cheroot/
-	https://github.com/cherrypy/cheroot/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/pyopenssl[${PYTHON_USEDEP}]
-			dev-python/trustme[${PYTHON_USEDEP}]
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -i -e '/False.*localhost/d' cheroot/test/test_ssl.py || die
-	# pypytools is py2 stuff
-	sed -i -e '/pypytools/d' cheroot/test/test_server.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires pypytools, see above
-		cheroot/test/test_server.py::test_high_number_of_file_descriptors
-	)
-
-	local EPYTEST_IGNORE=()
-	if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" ||
-		! has_version "dev-python/trustme[${PYTHON_USEDEP}]"
-	then
-		EPYTEST_IGNORE+=(
-			cheroot/test/test_ssl.py
-		)
-	fi
-
-	epytest -p no:flaky
-}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index a839af3b90b7..f0f9573cb2a8 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1 @@
-DIST coverage-7.2.5.tar.gz 759465 BLAKE2B 79670165a2516047ce3b28c331ec62c7c578fbfe14bd1179be65e52c5e57923ffb0d365f9153a78134ed5d95e4e04a8eadb6df3cbc49559659cf8cb77aa9d611 SHA512 3c4ec5aaba06170c860baa23ba61fe6f19b95a433430f045272839c13cc5bf4fb12a2a030d987ad5713202c75273646639da1257c0a618658f090c8a9fee41a7
-DIST coverage-7.2.6.tar.gz 762287 BLAKE2B 68fbd5aeecb635773b509647d3d2ae3e0a46dbc34061ff0bc22ee96b0aedd77e9d9cc772f5a10ce6dbd33035765fb61325e39674804174c10a4f8bf930e5697f SHA512 b4ef257cb2ed4297e7e3f18193bec7f0ad3e81735ce4406f96fd41b0fd2becb9f16c65f3699ccb11f145f14c1c144b9d987308353d15969e47ce0b956cd8f8fc
 DIST coverage-7.2.7.tar.gz 762575 BLAKE2B 20a800c3cd62095aacdfa4853613a3fd579abacd9051878ee2b308360db181ad45b68a0866236666826efc510d4a0328273d63c78c42fa4a7419ac98f85cf3f4 SHA512 01ed5ef8ddb600b8a7443200b568eb5d8aa7d652f408617f78a2e1251a5f091ee05188a7d383acd530f29b688b67a4bf2dc2e1241efffe8b9d0f70f44c646f33
diff --git a/dev-python/coverage/coverage-7.2.5.ebuild b/dev-python/coverage/coverage-7.2.5.ebuild
deleted file mode 100644
index 9b7dcf50b818..000000000000
--- a/dev-python/coverage/coverage-7.2.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: fails because of additional "Terminated" print on SIGTERM
-		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
-	)
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-7.2.6.ebuild b/dev-python/coverage/coverage-7.2.6.ebuild
deleted file mode 100644
index bbd159f97106..000000000000
--- a/dev-python/coverage/coverage-7.2.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.{8..10})
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_TEST_TRACER=${1}
-	einfo "  Testing with the ${COVERAGE_TEST_TRACER} tracer ..."
-	epytest tests
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: fails because of additional "Terminated" print on SIGTERM
-		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
-	)
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=_hypothesis_pytestplugin,flaky.flaky_pytest_plugin,xdist.plugin
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" \
-			coverage/ || die
-		test_tracer c
-		rm coverage/*.so || die
-	else
-		test_tracer py
-	fi
-}
diff --git a/dev-python/coverage/coverage-7.2.7.ebuild b/dev-python/coverage/coverage-7.2.7.ebuild
index bbd159f97106..9b7dcf50b818 100644
--- a/dev-python/coverage/coverage-7.2.7.ebuild
+++ b/dev-python/coverage/coverage-7.2.7.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index d024a53a3271..243f2e0c44b5 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1 @@
-DIST croniter-1.3.14.tar.gz 40026 BLAKE2B 1b6cf2b0128a9d5f9ed0fe2ec64b114e3c903c0b18014793632dcf662c0277a909fc0b1cce74f7de35a2a585382237a4e687ca2bed6381e862e677170b70039d SHA512 f958ef0b05a99653343c7c0f2838602f5a21b8bc1c043519264513cc91ac04edb574fcf4de606d9eb1ccff2562f0b03d233b45db93ca0fd72f62f375519c0fb6
-DIST croniter-1.3.15.tar.gz 41391 BLAKE2B 285af568eba62efcd8cd95051806fa3433144b99c6ab63deef8e663266fe76eeb0e3e38eb42e35679a27f3fa41ed7bc59a4351b6aeeeca39fafcc7a0d88856ff SHA512 2b6f6a2cf6575a347249df6d3b00cc5b932604d55045c77e271b2981aa6804547c4e9a48114ed4607e41088abd33aef70b47d69ec915e303b9041e708e5ffe59
 DIST croniter-1.4.1.tar.gz 42301 BLAKE2B b650dab7074e45e6d53c37c177e0672cd165ada3c53d4f940c04c562d7279974d5f3bcca897b5b498335a54556efe11959b51dd8a30391bcb00a7df0df4e3559 SHA512 36d914d6a27ef6823d1eaeeb1b5f2ce8543caaa55d3e85457f042ef7b20aa8a68b46f61e23fb44d67ed7ba9a956c9082f19b83746fe543c221c8127e88dbdb82
diff --git a/dev-python/croniter/croniter-1.3.14.ebuild b/dev-python/croniter/croniter-1.3.14.ebuild
deleted file mode 100644
index 7535e0777398..000000000000
--- a/dev-python/croniter/croniter-1.3.14.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="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.3.15.ebuild b/dev-python/croniter/croniter-1.3.15.ebuild
deleted file mode 100644
index d9866bc53829..000000000000
--- a/dev-python/croniter/croniter-1.3.15.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="Python module to provide iteration for datetime object"
-HOMEPAGE="
-	https://github.com/kiorky/croniter/
-	https://pypi.org/project/croniter/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/tzlocal[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/croniter/croniter-1.4.1.ebuild b/dev-python/croniter/croniter-1.4.1.ebuild
index d9866bc53829..7535e0777398 100644
--- a/dev-python/croniter/croniter-1.4.1.ebuild
+++ b/dev-python/croniter/croniter-1.4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild
index 8da7b8e64700..f8101885276d 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.15.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/cython/cython-0.29.35.ebuild b/dev-python/cython/cython-0.29.35.ebuild
index 1775db6d7d76..ef44fec5dfea 100644
--- a/dev-python/cython/cython-0.29.35.ebuild
+++ b/dev-python/cython/cython-0.29.35.ebuild
@@ -25,7 +25,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 ~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"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index ba70e771db0a..1bd257455845 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 DIST dask-2023.5.1.gh.tar.gz 8523514 BLAKE2B e34c9d44eaa8ab9b0d6af871503f3eefcf7167f8669d11b7348bde8e80a3c2dff99670b90c39f8746d56e5cea1126fd1cad7ace4627e9374ce763ac29c6d8bfd SHA512 603d0deb0e88cc2ae5a5fdbc4352f454e68f836b7c3a9039ec20f9493b2b4c72684bb5981d6e985de5bb32d73fc48d0faa2834c9c56a04277755ea3c8e77fb75
 DIST dask-2023.6.0.gh.tar.gz 8523493 BLAKE2B 20669d60f6d01b782eb0331735dffde988373f8a16635ca859249857c08942477955c9dcb1a8729bea5ebf4ec667a8b8d05f0bd89bc8f43dae3f53d566160eda SHA512 6cc752b61d767a701288bf037b1690ee152391c9b81348948f6711d988984acc2e59185524af85517817aeeb2d7ff4a541bafa9093ef8d3590c74deae622cd84
+DIST dask-2023.6.1.gh.tar.gz 8528028 BLAKE2B 50326b83fc60ab5d615433f1d44d504e9b05c8e6e8f662277b999394c6eb170bd7b9947402f187971c79c96b3a7cc15fcb0970cceb0c70c09341c447b79d4035 SHA512 eb4f01183429f64acf2b779b3e20c16bc0597c13516a79128eadd93176be3a65ddac7a113cbe946051fd7b6b5f1dbcc0e0dfcac8930c90ecbeffc5d1d1539be4
diff --git a/dev-python/dask/dask-2023.6.1.ebuild b/dev-python/dask/dask-2023.6.1.ebuild
new file mode 100644
index 000000000000..73d154cee0c2
--- /dev/null
+++ b/dev-python/dask/dask-2023.6.1.ebuild
@@ -0,0 +1,75 @@
+# 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="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-2021.9.0[${PYTHON_USEDEP}]
+	>=dev-python/importlib-metadata-4.13.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.10.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	>=dev-python/versioneer-0.28[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# more tests relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	dask/array/tests/test_random.py::test_RandomState_only_funcs
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+	dask/array/tests/test_image.py::test_preprocess
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' pyproject.toml || die
+	sed -i -e 's:--cov-config=pyproject.toml::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/docutils/docutils-0.20.1.ebuild b/dev-python/docutils/docutils-0.20.1.ebuild
index acd224531629..e2b0ca3ba3f4 100644
--- a/dev-python/docutils/docutils-0.20.1.ebuild
+++ b/dev-python/docutils/docutils-0.20.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD-2 GPL-3 public-domain"
 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"
 
 RDEPEND="
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/dominate/Manifest b/dev-python/dominate/Manifest
index 508ba019fffe..bfe88a494e08 100644
--- a/dev-python/dominate/Manifest
+++ b/dev-python/dominate/Manifest
@@ -1,2 +1 @@
-DIST dominate-2.7.0.tar.gz 36351 BLAKE2B aae802626a9e7f6b6f45f39a5b2cd6a6846ca42617e9a5ac5fe8e4a871e8ecfb89124e079313838c6f098ea5107a904d230808eda29cb05293e18ef4bdaa2504 SHA512 8ecca393548bd7c39b5d1800fee94634a60e4e12db44e16df316c9e0f5f04dc6c91e11fbe242d3c6dade3a5e09bec7e3becbfd4f8eaa58f9a8fc7ee15ac3bf31
 DIST dominate-2.8.0.tar.gz 37089 BLAKE2B 651ff9ee21c4f5331ef990acfead146f816fc45309740220f68714c3accf7b98661a31400fe050c6b2119525749e9a132f8764d60b72661f7abf5246ebdb5835 SHA512 91b392af8e081dcf0df9f09aabe2cb4d8147bb07a398c5f9f06443fc2664d881afa372c8d4d0583b21e9f9bf687d1d14601e96a33a8ae6e099e1e039821f97df
diff --git a/dev-python/dominate/dominate-2.7.0.ebuild b/dev-python/dominate/dominate-2.7.0.ebuild
deleted file mode 100644
index 39ce88d571e0..000000000000
--- a/dev-python/dominate/dominate-2.7.0.ebuild
+++ /dev/null
@@ -1,21 +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="Library for creating and manipulating HTML documents using an elegant DOM API"
-HOMEPAGE="
-	https://github.com/Knio/dominate/
-	https://pypi.org/project/dominate/
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dominate/dominate-2.8.0.ebuild b/dev-python/dominate/dominate-2.8.0.ebuild
index 611bbf3eff9f..39ce88d571e0 100644
--- a/dev-python/dominate/dominate-2.8.0.ebuild
+++ b/dev-python/dominate/dominate-2.8.0.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 031203876ca5..a88b5733875f 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,2 +1,3 @@
 DIST elementpath-4.1.2.tar.gz 320962 BLAKE2B 39ad80033022119159bcc89e6ea06f23de7d6c0cfca7e63f64ac01fa0e4c36a8d3091cc57efdfc7d5efb735ee058d2ed25abd15ae5297b65a8efdfe4413e4ffc SHA512 f6ab5905986fab88398e9a3774460069f610234126649299228f86020bee48f3d98be90434a4f662b371ef0051e80147df0a0f323e7095fedcab8567237c2c00
 DIST elementpath-4.1.3.tar.gz 321288 BLAKE2B 70293e5c700b8dde03ad9bcc065daf428289ba08565d5ec0e5df316cbf35b1d40a1216a651d4e41a5c576681e2955d6c298935cb22aa4ed929ffb530e8281216 SHA512 8acd421694cc44ccd70dacb385ca0b9feaac810f4eb9cd79bacc515b92c6b3c11e78c6a077eca4393965ccd112560f62b9666a02dbf79841dd1f4fc54cb04322
+DIST elementpath-4.1.4.tar.gz 321593 BLAKE2B 90b7ec9973acd300660fbe02b787eb5e6e2e2e6405b2337844f18415c48baaa5dd5c94fe90523e7c5090f9840c8cfdb333dd96afbb18e35c9adefda68dbda0ab SHA512 279ca4447b086f47f69e7cecbeb998e949ab6d5772cb5cddf231df8da2eed3a580813b0609758097bc409cbba46a884a3859d604cdf8a956c90503409ab90db2
diff --git a/dev-python/elementpath/elementpath-4.1.4.ebuild b/dev-python/elementpath/elementpath-4.1.4.ebuild
new file mode 100644
index 000000000000..7c53dda68230
--- /dev/null
+++ b/dev-python/elementpath/elementpath-4.1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="
+	https://github.com/sissaschool/elementpath/
+	https://pypi.org/project/elementpath/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fails for some reason, more fit for upstream testing anyway
+	rm tests/test_typing.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 8f81811dec2c..2ba9f76eeda5 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,2 @@
-DIST setuptools-67.7.2-py3-none-any.whl 1093536 BLAKE2B d267f3aa3006e1a50ba519d1461b168d288741158d53bcef95075a16e35145f846bf72337bade5343b0be5ffdb9794cc15a68284841a10628b4c26d49b7b4141 SHA512 ef9041fd899e3f138e6ced79de2a52e15f1bf44dcfe6566b9b6ebf071fadad5b7b94f1a07ec81607170b34dbbf2126b4e0c2337314c8597883740c6786b54230
 DIST setuptools-67.8.0-py3-none-any.whl 1093916 BLAKE2B d02bd5ccfe27c116497f8ae46603e5863c88795a489523d4cdaef3bad1bfabd5dfccf7a00f17290e58cce89a6348fbc194c00ae5ccb4c5e89a083fbb84c2cca6 SHA512 a80fc8d632ee6d1947689bb3f27ffb85206e518bf6c153ad43dd5e9f1825fa6e45d9df2baedd1fa9a8afb12a7854215bc4f56bb73d9033704745954890267c9a
 DIST setuptools-68.0.0-py3-none-any.whl 804037 BLAKE2B 743ab93b17f2e53e612c518d2d2fee73259dc4eef3de5ccb6587c84a91056072106d72def7189d2173c8bb53457da5b0010badaaca6a28c01aaff124dcb3bd10 SHA512 352b87cba8c4c9e1e0f14fb85a9f7c5bb3f874f09a8107c84df8051bba9d38b8da420babc66458bf2f51ef11b7089d1ecbbec4077a5982d73e1e63316a99c79e
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild
deleted file mode 100644
index 3e2f8423f849..000000000000
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit pypi
-
-DESCRIPTION="Shared setuptools wheel for ensurepip Python module"
-HOMEPAGE="https://pypi.org/project/setuptools/"
-SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
-S=${DISTDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
-	!<dev-python/ensurepip-wheels-100
-"
-
-src_install() {
-	insinto /usr/lib/python/ensurepip
-	doins "${A}"
-}
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild
index 8346a1bd0f6d..3e2f8423f849 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-67.8.0.ebuild
@@ -12,7 +12,7 @@ S=${DISTDIR}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
 
 RDEPEND="
 	!<dev-python/ensurepip-wheels-100
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 30f19d74366a..1a961a2e630d 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,5 +1,2 @@
-DIST fakeredis-2.12.1.tar.gz 97486 BLAKE2B 5207d9b946eb5720083b045e29b960cc2eb3ab5ed7b633f00106d0777186cfb02ecc10607d24a67d7b2eded35915e6710a4880f560e49fbca470c487ec0a2b87 SHA512 99e4e0bf7a4be9cc9dc96eecfe2fd1f106664bab2eff4f575468933809cf306c36237ebc9d86efdd9c0823e05a08d466f35a7e43359602b47c582ab16d7bb7ef
-DIST fakeredis-2.13.0.tar.gz 98084 BLAKE2B c147332f2575be7f63aef48199920480d550efbadeee9de255b17cb9c7d6791a059ee3d4bdc500ecf44dcc22de6fdd11d170daf3e19de8e910833b1de12232c6 SHA512 30335e456f7ac2498fc175f9fd154a766064a05e6eb996df9d533412525a3d4279c9359ac5e43a2b9ec9bb1d653639aa10d4e1765a4e4c1bc84f764fa1efdb42
-DIST fakeredis-2.14.0.tar.gz 101919 BLAKE2B 7582b3986bc7102a02a69a321e539dc15d425d918397e896eed9d544816697c55e938511ae69201eae3a5c1e814afe7f0c472d48a249be976178a7c0279472ae SHA512 a63b46420d9ca2348b0ed0f4ef2c0227a4dbc46efef2fae5beae2513cc77732be830669910f14d59ecb2f1fa3b698e29855658239fea4ff458c4ba62fd9fa4cb
 DIST fakeredis-2.14.1.tar.gz 101789 BLAKE2B 2e38319aa8bb23c9cd2196d8dbcf489fead785bffa3b464b7e420f28b247c911ea9f3775328f8fec7c26b1a77e32d6a21acf627fe7b603f311b0f3820fa06b54 SHA512 71b7f034ad5ccdd569052a82d2e15ec21db4b5a26bc5c660f76bb88c0b7aaa252234e899644dfd63086aaf8a9400ea13acc6439fdca08f84c8392949815f33d2
 DIST fakeredis-2.15.0.tar.gz 108160 BLAKE2B aaf135ffc395d6304c2f95b0339610f506382e865039f647a9af3fd9e3fa8cd9b9f6ea6557670fd61e949136f35de10b0fad63a1813d59f5b3697dd200195960 SHA512 59bc74a328b85cebcf0ae61d70e4ce26f3cdde3b82de6746f6b33229a6185d542db1e2ddd7c8ea600db69a6c630dbf81998ba108982da33487fe5ad2068abb29
diff --git a/dev-python/fakeredis/fakeredis-2.12.1.ebuild b/dev-python/fakeredis/fakeredis-2.12.1.ebuild
deleted file mode 100644
index 27992fc254a7..000000000000
--- a/dev-python/fakeredis/fakeredis-2.12.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.13.0.ebuild b/dev-python/fakeredis/fakeredis-2.13.0.ebuild
deleted file mode 100644
index c5a052a0d4a2..000000000000
--- a/dev-python/fakeredis/fakeredis-2.13.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.14.0.ebuild b/dev-python/fakeredis/fakeredis-2.14.0.ebuild
deleted file mode 100644
index 54db59c15a69..000000000000
--- a/dev-python/fakeredis/fakeredis-2.14.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fake implementation of redis API for testing purposes"
-HOMEPAGE="
-	https://github.com/cunla/fakeredis-py/
-	https://pypi.org/project/fakeredis/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# also lupa
-		test/test_aioredis2.py::test_failed_script_error
-		# TODO
-		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
-		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
-		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
-		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
-		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
-	)
-	local EPYTEST_IGNORE=(
-		# these tests fail a lot...
-		test/test_hypothesis.py
-	)
-	local args=(
-		# tests requiring lupa (lua support)
-		-k 'not test_eval and not test_lua and not test_script'
-	)
-	epytest "${args[@]}"
-}
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Spawning Redis"
-	einfo "NOTE: Port ${redis_port} must be free"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/fakeredis/fakeredis-2.14.1.ebuild b/dev-python/fakeredis/fakeredis-2.14.1.ebuild
index 54db59c15a69..50a5d7dbd8a1 100644
--- a/dev-python/fakeredis/fakeredis-2.14.1.ebuild
+++ b/dev-python/fakeredis/fakeredis-2.14.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index aea0051645b4..12eefad698c5 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,3 +1 @@
-DIST fastjsonschema-2.17.0.tar.gz 370871 BLAKE2B 9d5f16dba7c8519d5bb4853188ba982e06b39a2c1689963ef3aec39e2d48cccbba7ba9ab93cf1b54a06f4e8107917acdb31b076f44b7baf9e9a432256a2f2844 SHA512 ee19945c489b9d4fd23a0a348ec13f321705e93e1367c04003c41b86abd92da2ac73ca6dcd46a9eba0b8b72e8ba899a00939d8a56059fd04eac4300e20589551
 DIST fastjsonschema-2.17.1.tar.gz 370651 BLAKE2B 670e3b911200573ac129938834f9c072702e3f3d62e4ac95c7b77694d9cda54e4430601955c13998ff5abfe1db66a3d3e2bba9561292cb5c9d1df2470194eaee SHA512 482b13ee6735f5bb21528ec76a423c8c1dff2604af83121d82db45ce0cf514401b25cf6a1406c74f579671fe425ef1535d28c8b0b7fc24d32fcf50f2be1e28bf
-DIST python-fastjsonschema-2.16.3.gh.tar.gz 392011 BLAKE2B 04990592a2bf6e1309bf725361ef7c2e253c4765c5b9d60805c5e6189f14885a3b0bae98945c2fe228adc335ca8c8c0a243b283b24fa447238d6415d439288e2 SHA512 2e26f31f9c6966e77f70b8ca584e672d554219b6bbb4811e3ac8dff1c693b2638ef08b8b9011e0db6f739be02e2f41a35d15bcfc42a9cb06ddb4521e51f37d8a
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
deleted file mode 100644
index 5717fe895d06..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="
-	https://github.com/horejsek/python-fastjsonschema/
-	https://pypi.org/project/fastjsonschema/
-"
-SRC_URI="
-	https://github.com/horejsek/python-fastjsonschema/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm -r tests/benchmarks || die
-}
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild
deleted file mode 100644
index 2952f357cb72..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.17.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast JSON schema validator for Python"
-HOMEPAGE="
-	https://github.com/horejsek/python-fastjsonschema/
-	https://pypi.org/project/fastjsonschema/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/benchmarks
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-	# stray directory?
-	# https://github.com/horejsek/python-fastjsonschema/issues/173
-	rm -r tests/examples/lengths || die
-}
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.17.1.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.17.1.ebuild
index c94f480b8ee8..a675ad43a68b 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.17.1.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.17.1.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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flask-cors/Manifest b/dev-python/flask-cors/Manifest
index b4296a2b5d2d..5e32faa5a455 100644
--- a/dev-python/flask-cors/Manifest
+++ b/dev-python/flask-cors/Manifest
@@ -1 +1,2 @@
 DIST flask-cors-3.0.10.gh.tar.gz 31012 BLAKE2B 2e546518c8183dfca32308ef0f7d8f503c75ff62302d11ac0dc315f7c6760fa3e9064477216fd8c2cd290b0a280e6c45c35cf2cce3cfdffe141edab7beca1c8a SHA512 4471e94aea92700185a6fca37f01d61b9b966754f206eb6211813fb8c82fc0d219597e3df80e9d80b68663931ec561ca209fe23afa0142345fb75beacf3adc4e
+DIST flask-cors-4.0.0.gh.tar.gz 31586 BLAKE2B ac3713a08108a621fb0150039a2c40b87a3331084223ec73fb6cf76444e4a7681350a01f18f507b0ee942f01731c289e44950d99412373e7c889beaffa116513 SHA512 04f163d646d2f5fc96b397a3d52ad0e6b99ae6caaec67855e05b4330a323d1b28ab4d624000cbce9a897dba8a00317828e7056537454d1bb7febfcdddd37096d
diff --git a/dev-python/flask-cors/flask-cors-4.0.0.ebuild b/dev-python/flask-cors/flask-cors-4.0.0.ebuild
new file mode 100644
index 000000000000..8685e1dd585a
--- /dev/null
+++ b/dev-python/flask-cors/flask-cors-4.0.0.ebuild
@@ -0,0 +1,43 @@
+# 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
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/corydolphin/flask-cors.git"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/corydolphin/flask-cors/archive/v${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
+HOMEPAGE="
+	https://github.com/corydolphin/flask-cors/
+	https://pypi.org/project/Flask-Cors/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinxcontrib-httpdomain
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 939cb14a6d29..ff76ed194531 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,2 +1 @@
-DIST flatbuffers-23.3.3.gh.tar.gz 2197401 BLAKE2B be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66 SHA512 4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0
 DIST flatbuffers-23.5.26.gh.tar.gz 2257271 BLAKE2B 147425e7c018072f4ae4cdb3e034a4f434362d88d5e27b09375965993c279acfbed36064014c8f4fbe3fb81175ac0aa9b07629675e2c7ad33d59a9c85f2c3bb8 SHA512 cd0a5efad8016e1217d01a181d6b02e546f5693c6412361bfeaee820d5dfe5e2a424cee1963270e851c1a4f936ae8a0032a51c5bb16ee19313e0ecc77dc4ba31
diff --git a/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild b/dev-python/flatbuffers/flatbuffers-23.3.3.ebuild
deleted file mode 100644
index 4bbef51435e1..000000000000
--- a/dev-python/flatbuffers/flatbuffers-23.3.3.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
-
-DESCRIPTION="RFC 7049 - Concise Binary Object Representation"
-HOMEPAGE="
-	https://github.com/google/flatbuffers/
-	https://pypi.org/project/flatbuffers/
-"
-SRC_URI="
-	https://github.com/google/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S=${WORKDIR}/${P}/python
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${WORKDIR}/${P}/tests" || die
-	# zeroes means without benchmarks
-	"${EPYTHON}" py_test.py 0 0 0 false || die
-	"${EPYTHON}" py_flexbuffers_test.py -v || die
-}
diff --git a/dev-python/flatbuffers/flatbuffers-23.5.26.ebuild b/dev-python/flatbuffers/flatbuffers-23.5.26.ebuild
index f199c0261708..4bbef51435e1 100644
--- a/dev-python/flatbuffers/flatbuffers-23.5.26.ebuild
+++ b/dev-python/flatbuffers/flatbuffers-23.5.26.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P}/python
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index 69e58ab5634f..dd8dfe22a3a1 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,2 +1 @@
-DIST furo-2023.3.27-py3-none-any.whl 327605 BLAKE2B 1368aabdbd497acf181c5b059da6d4bd3ae11e66bb81ec097358e051f7c64b7cffa537d5855ed68293398b26bb7df4d35a183c3eea00d4790b786b0f4bdbc6eb SHA512 7d321f59064d64c205c9c1a207fd62685c22102bc1546f0e063be9565458c6eed887e9f52851160e2658401ac8ed791572183e3c067c2e85c9c1811411e051f6
 DIST furo-2023.5.20-py3-none-any.whl 326767 BLAKE2B cc8eb3816bf99039e1a312f9fed21538b0154ece228e351107df89f5770c382614efc7202bae742d28d2fc8fceabc8b748b2bfbe8a230aeb70f280b622d42c11 SHA512 1a97b37aa9ce55878f34e3276eebeb4b138bd9e397b6711469fed4523ab8dadcd91e77234a1eca20561276f6660410a31f48f34ae320c6772d1055699cdd7125
diff --git a/dev-python/furo/furo-2023.3.27.ebuild b/dev-python/furo/furo-2023.3.27.ebuild
deleted file mode 100644
index 620d1e358d7f..000000000000
--- a/dev-python/furo/furo-2023.3.27.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# sphinx-theme-builder is completely unusable, as it requires pinning
-# to a very-specific nodejs version number, and ofc loves fetching
-# everything from the Internet
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Clean customisable Sphinx documentation theme"
-HOMEPAGE="
-	https://pypi.org/project/furo/
-	https://github.com/pradyunsg/furo/
-"
-SRC_URI="$(pypi_wheel_url)"
-S=${WORKDIR}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/sphinx-basic-ng[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	distutils_wheel_install "${BUILD_DIR}/install" \
-		"${DISTDIR}/${P}-py3-none-any.whl"
-}
diff --git a/dev-python/furo/furo-2023.5.20.ebuild b/dev-python/furo/furo-2023.5.20.ebuild
index 0bf37a918b27..620d1e358d7f 100644
--- a/dev-python/furo/furo-2023.5.20.ebuild
+++ b/dev-python/furo/furo-2023.5.20.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}
 
 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"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index d125a5c89a75..fff2affc2df3 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,3 +1,2 @@
-DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
 DIST future-0.18.3-tests.patch.xz 2736 BLAKE2B 55f9f233fb65f006d2055adf8b5d5b3ab00b4cd9b9f5a78d09b3fa2c1e347ef2d8370569fa5374968bf3e84b4fcbc220ad8da1cc2b32da57c46d36050ba1440a SHA512 c18434bc6efe88381aed8c86ed494352a2749c5680a52f62ae043bec70e3adb0163f91a971daa04134508d59172fe2e71ebbf694a74afce060b7fa1e7c385810
 DIST future-0.18.3.tar.gz 840896 BLAKE2B 13172c639b0eee80581133a2d46b9fa3a38fb9c47ea6eecc8f0715782536be5965bbd153d6a6dda49d8fa9cfea29231c6cc60a4b3b3a6c0cc5406f02c494a425 SHA512 6de56a5aa5c5dd56a0dc5a6732c753530f9868036bd97e9d355f9ee6e1305e266a60c167de779cba93f09b5b3fae615193074caba2afe857ca7ea944532ef910
diff --git a/dev-python/future/files/future-0.18.2-cve-2022-40899.patch b/dev-python/future/files/future-0.18.2-cve-2022-40899.patch
deleted file mode 100644
index c7341e0d6fdb..000000000000
--- a/dev-python/future/files/future-0.18.2-cve-2022-40899.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c91d70b34ef0402aef3e9d04364ba98509dca76f Mon Sep 17 00:00:00 2001
-From: Will Shanks <wshaos@posteo.net>
-Date: Fri, 23 Dec 2022 13:38:26 -0500
-Subject: [PATCH] Backport fix for bpo-38804
-
-The regex http.cookiejar.LOOSE_HTTP_DATE_RE was vulnerable to regular
-expression denial of service (REDoS). The regex contained multiple
-overlapping \s* capture groups. A long sequence of spaces can trigger
-bad performance.
-
-See https://github.com/python/cpython/pull/17157 and https://pyup.io/posts/pyup-discovers-redos-vulnerabilities-in-top-python-packages/
----
- src/future/backports/http/cookiejar.py | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/src/future/backports/http/cookiejar.py b/src/future/backports/http/cookiejar.py
-index af3ef415..0ad80a02 100644
---- a/src/future/backports/http/cookiejar.py
-+++ b/src/future/backports/http/cookiejar.py
-@@ -225,10 +225,14 @@ def _str2time(day, mon, yr, hr, min, sec, tz):
-        (?::(\d\d))?    # optional seconds
-     )?                 # optional clock
-        \s*
--    ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+)? # timezone
-+    (?:
-+       ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+) # timezone
-+       \s*
-+    )?
-+    (?:
-+       \(\w+\)         # ASCII representation of timezone in parens.
-        \s*
--    (?:\(\w+\))?       # ASCII representation of timezone in parens.
--       \s*$""", re.X | re.ASCII)
-+    )?$""", re.X | re.ASCII)
- def http2time(text):
-     """Returns time in seconds since epoch of time represented by a string.
- 
-@@ -298,9 +302,11 @@ def http2time(text):
-       (?::?(\d\d(?:\.\d*)?))?  # optional seconds (and fractional)
-    )?                    # optional clock
-       \s*
--   ([-+]?\d\d?:?(:?\d\d)?
--    |Z|z)?               # timezone  (Z is "zero meridian", i.e. GMT)
--      \s*$""", re.X | re. ASCII)
-+   (?:
-+      ([-+]?\d\d?:?(:?\d\d)?
-+       |Z|z)             # timezone  (Z is "zero meridian", i.e. GMT)
-+      \s*
-+   )?$""", re.X | re. ASCII)
- def iso2time(text):
-     """
-     As for http2time, but parses the ISO 8601 formats:
diff --git a/dev-python/future/files/future-0.18.2-tests.patch b/dev-python/future/files/future-0.18.2-tests.patch
deleted file mode 100644
index 3742adb72821..000000000000
--- a/dev-python/future/files/future-0.18.2-tests.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff --git a/tests/test_future/test_backports.py b/tests/test_future/test_backports.py
-index 9eeb741..63b1afe 100644
---- a/tests/test_future/test_backports.py
-+++ b/tests/test_future/test_backports.py
-@@ -87,7 +87,8 @@ class TestChainMap(unittest.TestCase):
-         d['b'] = 20
-         d['c'] = 30
-         self.assertEqual(d.maps, [{'b':20, 'c':30}, {'a':1, 'b':2}])  # check internal state
--        self.assertEqual(d.items(), dict(a=1, b=20, c=30).items())    # check items/iter/getitem
-+        self.assertEqual(sorted(d.items()),
-+                         sorted(dict(a=1, b=20, c=30).items()))       # check items/iter/getitem
-         self.assertEqual(len(d), 3)                                   # check len
-         for key in 'abc':                                             # check contains
-             self.assertIn(key, d)
-@@ -96,7 +97,8 @@ class TestChainMap(unittest.TestCase):
- 
-         del d['b']                                                    # unmask a value
-         self.assertEqual(d.maps, [{'c':30}, {'a':1, 'b':2}])          # check internal state
--        self.assertEqual(d.items(), dict(a=1, b=2, c=30).items())     # check items/iter/getitem
-+        self.assertEqual(sorted(d.items()),
-+                         sorted(dict(a=1, b=2, c=30).items()))        # check items/iter/getitem
-         self.assertEqual(len(d), 3)                                   # check len
-         for key in 'abc':                                             # check contains
-             self.assertIn(key, d)
-diff --git a/tests/test_future/test_builtins.py b/tests/test_future/test_builtins.py
-index ca07b9e..944d97b 100644
---- a/tests/test_future/test_builtins.py
-+++ b/tests/test_future/test_builtins.py
-@@ -8,7 +8,7 @@ from future.builtins import (bytes, dict, int, range, round, str, super,
-                              ascii, chr, hex, input, next, oct, open, pow,
-                              filter, map, zip, min, max)
- 
--from future.utils import PY3, exec_, native_str, implements_iterator
-+from future.utils import PYPY, PY2, PY3, exec_, native_str, implements_iterator
- from future.tests.base import (unittest, skip26, expectedFailurePY2,
-                                expectedFailurePY26)
- 
-@@ -699,12 +699,13 @@ class BuiltinTest(unittest.TestCase):
-         self.assertEqual(eval('dir()', g, m), list('xyz'))
-         self.assertEqual(eval('globals()', g, m), g)
-         self.assertEqual(eval('locals()', g, m), m)
--        self.assertRaises(TypeError, eval, 'a', m)
-+        if not (PYPY and PY2):
-+            self.assertRaises(TypeError, eval, 'a', m)
-         class A:
-             "Non-mapping"
-             pass
-         m = A()
--        self.assertRaises(TypeError, eval, 'a', g, m)
-+        self.assertRaises((AttributeError, TypeError), eval, 'a', g, m)
- 
-         # Verify that dict subclasses work as well
-         class D(dict):
-@@ -784,8 +785,9 @@ class BuiltinTest(unittest.TestCase):
-         # self.assertRaisesRegex(NameError, "name 'print' is not defined",
-         #                        exec_, code, {'__builtins__': {}})
-         # Now:
--        self.assertRaises(NameError,
--                          exec_, code, {'__builtins__': {}})
-+        if not PYPY:
-+            self.assertRaises(NameError,
-+                              exec_, code, {'__builtins__': {}})
-         # __builtins__ must be a mapping type
-         # Was:
-         # self.assertRaises(TypeError,
-@@ -797,8 +799,9 @@ class BuiltinTest(unittest.TestCase):
-         # Was:
-         # self.assertRaisesRegex(NameError, "__build_class__ not found",
-         #                        exec_, code, {'__builtins__': {}})
--        self.assertRaises(NameError,
--                          exec_, code, {'__builtins__': {}})
-+        if not PYPY:
-+            self.assertRaises(NameError,
-+                              exec_, code, {'__builtins__': {}})
- 
-         class frozendict_error(Exception):
-             pass
-@@ -1304,8 +1307,9 @@ class BuiltinTest(unittest.TestCase):
-         self.assertAlmostEqual(pow(-1, 0.5), 1j)
-         self.assertAlmostEqual(pow(-1, 1/3), 0.5 + 0.8660254037844386j)
- 
--        # Raises TypeError in Python < v3.5, ValueError in v3.5:
--        self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
-+        if sys.hexversion < 0x03080000:
-+            # Raises TypeError in Python < v3.5, ValueError in v3.5:
-+            self.assertRaises((TypeError, ValueError), pow, -1, -2, 3)
-         self.assertRaises(ValueError, pow, 1, 2, 0)
- 
-         self.assertRaises(TypeError, pow)
-diff --git a/tests/test_future/test_futurize.py b/tests/test_future/test_futurize.py
-index 0d7c42d..4590185 100644
---- a/tests/test_future/test_futurize.py
-+++ b/tests/test_future/test_futurize.py
-@@ -13,7 +13,7 @@ from lib2to3.pygram import token
- 
- from future.tests.base import (CodeHandler, unittest, skip26, reformat_code,
-                                order_future_lines, expectedFailurePY26)
--from future.utils import PY2
-+from future.utils import PY2, PY3, PYPY
- 
- 
- class TestLibFuturize(unittest.TestCase):
-@@ -565,6 +565,7 @@ class TestFuturizeSimple(CodeHandler):
-         #     tarball.write(r2.content)
- 
-     @expectedFailurePY26
-+    @unittest.skipIf(PYPY and PY3, '')
-     def test_raw_input(self):
-         """
-         Passes in a string to the waiting input() after futurize
-diff --git a/tests/test_future/test_int.py b/tests/test_future/test_int.py
-index 573a0d5..6172e48 100644
---- a/tests/test_future/test_int.py
-+++ b/tests/test_future/test_int.py
-@@ -6,7 +6,7 @@ from __future__ import (absolute_import, division,
-                         print_function, unicode_literals)
- from future.builtins import *
- from future.tests.base import unittest, expectedFailurePY2
--from future.utils import PY26, PY2, raise_from
-+from future.utils import PY26, PY2, PY3, PYPY, raise_from
- 
- import sys
- import random
-@@ -357,7 +357,8 @@ class IntTestCases(unittest.TestCase):
-         self.assertEqual(int(Foo0()), 42)
-         self.assertEqual(int(Foo1()), 42)
-         self.assertEqual(int(Foo2()), 42)
--        self.assertEqual(int(Foo3()), 0)
-+        if not (PYPY and PY3):
-+            self.assertEqual(int(Foo3()), 0)
-         self.assertEqual(int(Foo4()), 42)
-         self.assertRaises(TypeError, int, Foo5())
- 
-diff --git a/tests/test_future/test_isinstance.py b/tests/test_future/test_isinstance.py
-index 33c0a58..ccda709 100644
---- a/tests/test_future/test_isinstance.py
-+++ b/tests/test_future/test_isinstance.py
-@@ -4,6 +4,7 @@ From the Python 3.3 test suite
- 
- from __future__ import (absolute_import, division, unicode_literals)
- from future.builtins import *
-+from future.utils import PYPY
- 
- # Tests some corner cases with isinstance() and issubclass().  While these
- # tests use new style classes and properties, they actually do whitebox
-@@ -264,11 +265,13 @@ class TestIsInstanceIsSubclass(unittest.TestCase):
-         self.assertEqual(True, issubclass(int, (int, (float, int))))
-         self.assertEqual(True, issubclass(str, (str, (Child, NewChild, str))))
- 
-+    @unittest.skipIf(PYPY, '')
-     def test_subclass_recursion_limit(self):
-         # make sure that issubclass raises RuntimeError before the C stack is
-         # blown
-         self.assertRaises(RuntimeError, blowstack, issubclass, str, str)
- 
-+    @unittest.skipIf(PYPY, '')
-     def test_isinstance_recursion_limit(self):
-         # make sure that issubclass raises RuntimeError before the C stack is
-         # blown
-diff --git a/tests/test_future/test_str.py b/tests/test_future/test_str.py
-index 5108548..eac602f 100644
---- a/tests/test_future/test_str.py
-+++ b/tests/test_future/test_str.py
-@@ -201,6 +201,7 @@ class TestStr(unittest.TestCase):
-         with self.assertRaises(TypeError):
-             s.join(byte_strings2)
- 
-+    @unittest.skipIf(utils.PYPY and utils.PY2, '')
-     def test_str_join_staticmethod(self):
-         """
-         Issue #33
-@@ -430,10 +431,11 @@ class TestStr(unittest.TestCase):
-             e = s * long(4)
-             self.assertTrue(isinstance(e, str))
-             self.assertEqual(e, u'ABCABCABCABC')
--        with self.assertRaises(TypeError):
--            s * 3.3
--        with self.assertRaises(TypeError):
--            s * (3.3 + 3j)
-+        if not (utils.PYPY and utils.PY2):
-+            with self.assertRaises(TypeError):
-+                s * 3.3
-+            with self.assertRaises(TypeError):
-+                s * (3.3 + 3j)
- 
-     def test_rmul(self):
-         s = str(u'XYZ')
-@@ -447,10 +449,11 @@ class TestStr(unittest.TestCase):
-             e = long(3) * s
-             self.assertTrue(isinstance(e, str))
-             self.assertEqual(e, u'XYZXYZXYZ')
--        with self.assertRaises(TypeError):
--            3.3 * s
--        with self.assertRaises(TypeError):
--            (3.3 + 3j) * s
-+        if not (utils.PYPY and utils.PY2):
-+            with self.assertRaises(TypeError):
-+                3.3 * s
-+            with self.assertRaises(TypeError):
-+                (3.3 + 3j) * s
- 
-     @unittest.skip('Fails on Python <= 2.7.6 due to string subclass slicing bug')
-     def test_slice(self):
-diff --git a/tests/test_future/test_urllib2.py b/tests/test_future/test_urllib2.py
-index 2d69dad..3750737 100644
---- a/tests/test_future/test_urllib2.py
-+++ b/tests/test_future/test_urllib2.py
-@@ -691,10 +691,7 @@ class HandlerTests(unittest.TestCase):
-         h = NullFTPHandler(data)
-         h.parent = MockOpener()
- 
--        # MIME guessing works in Python 3.8!
-         guessed_mime = None
--        if sys.hexversion >= 0x03080000:
--            guessed_mime = "image/gif"
-         for url, host, port, user, passwd, type_, dirs, filename, mimetype in [
-             ("ftp://localhost/foo/bar/baz.html",
-              "localhost", ftplib.FTP_PORT, "", "", "I",
-diff --git a/tests/test_past/test_builtins.py b/tests/test_past/test_builtins.py
-index d16978e..f37b26c 100644
---- a/tests/test_past/test_builtins.py
-+++ b/tests/test_past/test_builtins.py
-@@ -21,6 +21,7 @@ import random
- from os import unlink
- from operator import neg
- from future.tests.base import unittest, expectedFailurePY3, skip26
-+from future.utils import PYPY, PY2
- 
- # count the number of test runs.
- # used to skip running test_execfile() multiple times
-@@ -423,6 +424,7 @@ class BuiltinTest(unittest.TestCase):
-         self.assertRaises(TypeError, eval, ())
- 
-     @expectedFailurePY3
-+    @unittest.skipIf(PYPY and PY2, '')
-     def test_general_eval(self):
-         # Tests that general mappings can be used for the locals argument
- 
-@@ -1174,7 +1176,8 @@ class BuiltinTest(unittest.TestCase):
-             def __cmp__(self, other):
-                 raise RuntimeError
-             __hash__ = None # Invalid cmp makes this unhashable
--        self.assertRaises(RuntimeError, range, a, a + 1, badzero(1))
-+        if not (PYPY and PY2):
-+            self.assertRaises(RuntimeError, range, a, a + 1, badzero(1))
- 
-         # Reject floats.
-         self.assertRaises(TypeError, range, 1., 1., 1.)
-diff --git a/tests/test_past/test_olddict.py b/tests/test_past/test_olddict.py
-index 9f21060..539c277 100644
---- a/tests/test_past/test_olddict.py
-+++ b/tests/test_past/test_olddict.py
-@@ -7,7 +7,7 @@ from __future__ import absolute_import, unicode_literals, print_function
- import os
- import sys
- 
--from future.utils import implements_iterator, PY3
-+from future.utils import implements_iterator, PYPY, PY2, PY3
- from future.tests.base import unittest, skip26
- from past.builtins import dict
- 
-@@ -415,6 +415,7 @@ class Py2DictTest(unittest.TestCase):
-         self.assertRaises(Exc, d.setdefault, x, [])
- 
-     @skip26
-+    @unittest.skipIf(PYPY, '')
-     def test_setdefault_atomic(self):
-         # Issue #13521: setdefault() calls __hash__ and __eq__ only once.
-         class Hashed(object):
diff --git a/dev-python/future/future-0.18.2-r3.ebuild b/dev-python/future/future-0.18.2-r3.ebuild
deleted file mode 100644
index 911d3a2437c5..000000000000
--- a/dev-python/future/future-0.18.2-r3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Easy, clean, reliable Python 2/3 compatibility"
-HOMEPAGE="
-	https://python-future.org/
-	https://github.com/PythonCharmers/python-future/
-	https://pypi.org/project/future/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-bootstrap-theme
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-	"${FILESDIR}"/${P}-py39.patch
-	"${FILESDIR}"/${P}-py39-fileurl.patch
-	"${FILESDIR}"/${P}-py3.10.patch
-	"${FILESDIR}"/${P}-cve-2022-40899.patch
-)
-
-EPYTEST_DESELECT=(
-	# tests requiring network access
-	tests/test_future/test_requests.py
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_moves_urllib_request_http
-	tests/test_future/test_standard_library.py::TestStandardLibraryReorganization::test_urllib_request_http
-)
diff --git a/dev-python/future/future-0.18.3.ebuild b/dev-python/future/future-0.18.3.ebuild
index 7adccfce5254..ce84a40dd780 100644
--- a/dev-python/future/future-0.18.3.ebuild
+++ b/dev-python/future/future-0.18.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.18.3-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild
index 5063fd1413a8..d7e65119b18a 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://pypi.org/project/fuzzywuzzy/
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
deleted file mode 100644
index 8536d69341ed..000000000000
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ /dev/null
@@ -1,20 +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 pypi
-
-DESCRIPTION="Fuzzy string matching in python"
-HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="dev-python/Levenshtein[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pycodestyle[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 7e6db00a8f5b..cf27e1408eb5 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,2 @@
-DIST google-api-python-client-2.86.0.tar.gz 10767816 BLAKE2B 532b86d49dfec724237a07c6d6c4dccbdf7a4f9d8c6a1c7f96548708c55e5851bca3e1f0f28da65edbde68a6d760498af8936be177ce5c0dda3e6809db218188 SHA512 2d1aea4a6735aeffbc4aba05affaa3c4389e2f9f121185d5a5d47e818e33ae3506bebf2748d7a14b374310531c7c3a34325524c5c48df3c882c6b2a4ce579e8d
-DIST google-api-python-client-2.87.0.tar.gz 10933794 BLAKE2B 702eef338d1b976219587a24b70adc513edd47bc03e7e17dd865424542d8ca61979073ea9d474c60e765f0cd4cfdd67ae2aac7f915b2be46a8c4cfc1bd4bd975 SHA512 55c8f90e4dbd74de6570f078341cb26b90d1a0ff7f20fb5ac2b94f8100ffdc12e49a9beeea5432d0c5f5cf0d0cb7834f8c2cb398be83b1c98305e5a07e2c81f6
-DIST google-api-python-client-2.88.0.tar.gz 10943608 BLAKE2B c82dd6af36d93d6fa4c0da31ec5a2d2371a9d960efb4f5a31dc63c268578234d12553f8604478e4bde5d43dcf51a738cd622f05aae0af9a405c9fc9bcde4b156 SHA512 059f49d16a6b55ca6106f779ac08aeb47a11af73022ecdac25817922207333540ea5cea4fe61dbbaea38ae0f07317144fbc0c9a5f05ba4eb8c03bbc661b94803
 DIST google-api-python-client-2.89.0.tar.gz 10965040 BLAKE2B 819c9f0837b86acc693158830c54e48778a1c8ef1fb549a4fbbe100827d0a269b435c4c29d8683c674981ef7817a0489e1cd6639adb7c9b09951c05b8fcf3aef SHA512 e3541f7e6b151ade5feb6e50f22c26b63b85304c4254929be5776c44c6cd80a4c2660d62fc052777033705d3c6a7e8dcd1a69f7f5d3dd5dc49549237a2ce6a5f
 DIST google-api-python-client-2.90.0.tar.gz 10891311 BLAKE2B 0683e95e12e5f2faaa5ce5b3f4c82e65df00da0c884530917dd086d33dda74a66e62fd27c7edead205f9d330800d2c60929fce68ce7f82fc04f8787cae010cdf SHA512 331812b50c2816f407db25f703817bf0d20b9218de39bd91c67d40a1f113141c8b9af0210d9d10272ebf51b90485fa44f636e821de19add72eeb38fa04ffe449
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
deleted file mode 100644
index 5e94912b7a7a..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.86.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.87.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.87.0.ebuild
deleted file mode 100644
index 0c85e8ca1676..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.87.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.88.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.88.0.ebuild
deleted file mode 100644
index 0c85e8ca1676..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.88.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Google API Client for Python"
-HOMEPAGE="
-	https://github.com/googleapis/google-api-python-client/
-	https://pypi.org/project/google-api-python-client/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
-	<dev-python/httplib2-1[${PYTHON_USEDEP}]
-	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
-	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# require Internet access (and credentials)
-		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
-		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
-	)
-
-	epytest tests
-}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild
index 0c85e8ca1676..5e94912b7a7a 100644
--- a/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-2.89.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 7d797b35a71a..7873e39b39bf 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-2.18.1.tar.gz 224714 BLAKE2B 2fa63ed18d4dfa4940c93e5f3fb099a6892a16148e5161c3e52980cdee80b7b153a60c005bd3d1d856476f85678b88315d3f4b639f693d292abbf8133dee9397 SHA512 34e53a1c0cf42ab600281d815f259bb252987f163925e357dc2e636c945fd4b74c1f4168bf7d90a6e352fe1d7343767b68bf94fdbb1bc90a92c7067b0e2f2f8f
 DIST google-auth-2.19.1.tar.gz 230290 BLAKE2B c7f76e1bd936d4d76c81e19fbf6bb50dfe700666d8eb234f762253547fd670d1d26a97a7fe4457bdb719712d32e28e3c8f9adc82c475ee6830f5fd2af994bb3a SHA512 8a8106abb1a0966254caa2e568fe9a9c887601b19e5309f4d43e1b07f3e3280ad358cf8999e34719d6f23473b263d128a2d0321f0ff184c4e188b0b5cf88a6ee
 DIST google-auth-2.20.0.tar.gz 229669 BLAKE2B 547cb99cb72a4a5b224fdfff2bf156effe1cce5d7b4316b16530b1a3bbe50ab24dc54520fce3206fb2cea3fde1ca0c35f7bf5920e5128a5ed1bed13883fc75e5 SHA512 e13471f4452bd5c69c2ca9d1ff145431b160805e4ab2d3a70c35cad78c6e3e4f4bc789dfe99f55a0e60e5f335f9983529eabbfb0fc50794b62dfa7eeb70882b1
+DIST google-auth-2.21.0.tar.gz 230720 BLAKE2B a572770d17ce2e8d68c92dad2fda68dc860d232845f5fb2d6beb51d583a8cf5d8820e7ef7921895c60da3d022c1b82b50054bff6c969071a87cc059e759a82ce SHA512 d84eec3da181e02ab293af76261f4cff50afc98d044e3a9e70b023a7b9e4e0ea7c46265de273f2363494d36ab6ec1894acb82e9125f30da6133692d2b86ef8eb
diff --git a/dev-python/google-auth/google-auth-2.21.0.ebuild b/dev-python/google-auth/google-auth-2.21.0.ebuild
new file mode 100644
index 000000000000..20b132312687
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.21.0.ebuild
@@ -0,0 +1,63 @@
+# 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="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/googleapis/google-auth-library-python/pull/1290
+	"${FILESDIR}"/google-auth-2.20.0-urllib3-2.patch
+)
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hatch-fancy-pypi-readme/Manifest b/dev-python/hatch-fancy-pypi-readme/Manifest
index ec20e242e71c..ac554e420572 100644
--- a/dev-python/hatch-fancy-pypi-readme/Manifest
+++ b/dev-python/hatch-fancy-pypi-readme/Manifest
@@ -1,2 +1 @@
-DIST hatch-fancy-pypi-readme-22.8.0.gh.tar.gz 25993 BLAKE2B 9fd04c07040db2371340c18915764c7905dc2eb61ee25d65a82ad1372bf3c0e7e5d45fc6a06e13e5153c1fa65cd61bd54021d2c471ece38f2bd05884d54a4255 SHA512 84982266cbed8cb6803b9e76458e19c374492119a970219338a8ffb6e5f9bae1df3622ac574528e33f4061217938e37a943e12a7494f415d74d872b1a65a53e8
 DIST hatch-fancy-pypi-readme-23.1.0.gh.tar.gz 27878 BLAKE2B 934e7e1b8000feb554014dd3594724943173f1b5d78d1072e5612dde744d3cea925e49e46e0eddff7408211439c9f9efc24c488e6ce73fe9955bb5bf5d851b6d SHA512 a26b8205877815292c7c65380f3fff43a3222ec5044556a29fb0b570f0822b548f8f4403cb6a800044671692806b257ecee5f9ec0f3efb597e9a5780a8885424
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.8.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.8.0.ebuild
deleted file mode 100644
index 41c75a9719cd..000000000000
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-
-DESCRIPTION="Fancy PyPI READMEs with Hatch"
-HOMEPAGE="
-	https://pypi.org/project/hatch-fancy-pypi-readme/
-	https://github.com/hynek/hatch-fancy-pypi-readme/
-"
-SRC_URI="
-	https://github.com/hynek/hatch-fancy-pypi-readme/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/hatchling[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fails without Internet (via pip)
-	tests/test_end_to_end.py
-)
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
index b188da6a6d9f..b37bc0b8d014 100644
--- a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/hatchling[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ed176f12eebc..440a65ff5474 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,3 +2,4 @@ DIST hypothesis-6.76.0.gh.tar.gz 9373576 BLAKE2B ed580296f163f9808597aa3a7b2ceaf
 DIST hypothesis-6.79.0.gh.tar.gz 9377619 BLAKE2B 8e0650967f8552b3968f8627ef61119ea1532656009fcc83899d4c1e5e97e71e7cb14ffe0864008f7e6c658cff864a7a6d94d04365aba99d38383e3c1b4941a6 SHA512 d4268503425805d7ce0800434474b0f582d6114c3323b36abf6ce58e9f8530d7c11ab634671670f1d67387ac8c90d198303129c552130c8127dc0b3bbad2c766
 DIST hypothesis-6.79.1.gh.tar.gz 9377826 BLAKE2B 13bf9383df81bf8aa504e4f1314958c98612bd507a935c749411008a25c9c1502cb157f4e80ae43b707486cfa5c4706c13118ea4c62d2cf8d7c40a8a811aba98 SHA512 aa52b85162ddb1fd1da8d01de4e47a5426831791c402fe589090474070608b98e40e8fcda197c18d7b8b4d13004afd0b04fb6f65f965e1af05b41005d3b38618
 DIST hypothesis-6.79.2.gh.tar.gz 9377998 BLAKE2B 7b9aa513fa6bf535094ebf9b6aad51df0f9d3a3c0da9e1402a86c8f41b840efe76b97a8204ba746e933128b1586d4622ab784ea3f040b599a7b61c6d563e9f09 SHA512 af8573f99d128300d358362c7f1f7ad801d27a29c89be554bbaa5325ff406d7237b98090ce7ec79fb72b04819f22ce0a3bc27c28028615ac9de8fc4a58d24d27
+DIST hypothesis-6.79.3.gh.tar.gz 9378262 BLAKE2B b5feccaa2a3e5af6e0cd688f5b9c78662af9dd044e188f295c922ae6aa7a0bd9e36a461d630c4217f376982e6f47e919b0cb75b8f6bc78056fa8b146b0fc88cb SHA512 6f6b18f6313fcf0d2151ec76d7f97793e181403e8d30c51dd251439f3bc0e204a3b74134017f7e88934eb779a8756f6c541a5ac52041222f1f350f0a7172563e
diff --git a/dev-python/hypothesis/hypothesis-6.79.3.ebuild b/dev-python/hypothesis/hypothesis-6.79.3.ebuild
new file mode 100644
index 000000000000..650d615b5128
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.79.3.ebuild
@@ -0,0 +1,97 @@
+# 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_IGNORE=()
+	local EPYTEST_DESELECT=(
+		# these tests can randomly fail with RecursionError when run
+		# in parallel
+		# https://github.com/HypothesisWorks/hypothesis/issues/3671
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types
+		hypothesis-python/tests/cover/test_lookup.py::test_resolving_mutually_recursive_types_with_defaults
+	)
+	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/icalendar/Manifest b/dev-python/icalendar/Manifest
index 6507ae3337be..65e1d7749d4a 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -1,3 +1 @@
-DIST icalendar-5.0.5.tar.gz 103204 BLAKE2B 20887b535f595ab222f3aca8ac396a71b53975816663693f89277a03be41885780d0b15269cd5955e00eeda0867db46781ea2300f542bca1a18687d50e025989 SHA512 1c1e6c94e2caa07686bc12389c3a5b823478f1652695bc167af95c26f92bbd3d60fb4e540d74eb90db289c647bfd6e1c82e83ee8f89bc87b80100d8b6fe5dd90
-DIST icalendar-5.0.6.tar.gz 103352 BLAKE2B 642d5adace1358001f3691697443824a39347ab86cab2643f428e64cc47f1c231ed501b6d4fabe21a357ce357ed951467d41ccdbbce70bbe666b8aeda1c19e67 SHA512 696240e7e4efe57a194be5fa0e6158284e297277e72f7aea0bc547db5f638dae05ca8cafcadedb43673f1d9f19241f25516d90e8247a79660d8b2ef71c5da11a
 DIST icalendar-5.0.7.tar.gz 104099 BLAKE2B df45ee6b8c1ad5bfc558195e86e2456aae8f70613724ba16e74093e5454695d8d4ef2e0eb2e312dd2a94c3a12bc6e4febc21174e8380e249f2de906500a1cfc8 SHA512 c541e61d79b76123d119e51ee6d927795a7d675aded427a21bd38d0f069ea454e182a61ff86b96c7769c42560dfc20f7facb00dfe8a9cfa47da74b279d841b42
diff --git a/dev-python/icalendar/icalendar-5.0.5.ebuild b/dev-python/icalendar/icalendar-5.0.5.ebuild
deleted file mode 100644
index b74ce67d7dea..000000000000
--- a/dev-python/icalendar/icalendar-5.0.5.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 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-5.0.6.ebuild b/dev-python/icalendar/icalendar-5.0.6.ebuild
deleted file mode 100644
index 7d39ed5642e2..000000000000
--- a/dev-python/icalendar/icalendar-5.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
-HOMEPAGE="
-	https://github.com/collective/icalendar/
-	https://pypi.org/project/icalendar/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# reset conf.py to not read version from an installed instance
-	sed -e "s:pkg_resources.get_distribution('icalendar').version:'${PV}':" \
-		-i docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/icalendar/icalendar-5.0.7.ebuild b/dev-python/icalendar/icalendar-5.0.7.ebuild
index 7d39ed5642e2..b74ce67d7dea 100644
--- a/dev-python/icalendar/icalendar-5.0.7.ebuild
+++ b/dev-python/icalendar/icalendar-5.0.7.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
index 84b7e94fc05c..a8641f87a962 100644
--- a/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
+++ b/dev-python/jaraco-env/jaraco-env-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja2-cli/metadata.xml b/dev-python/jinja2-cli/metadata.xml
index 8c8101bcdb2c..736a1167c898 100644
--- a/dev-python/jinja2-cli/metadata.xml
+++ b/dev-python/jinja2-cli/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 6a045e9b9fc2..5795957e9670 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1 +1,2 @@
 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.4.ebuild b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
new file mode 100644
index 000000000000..709e50ad8a18
--- /dev/null
+++ b/dev-python/jsonpointer/jsonpointer-2.4.ebuild
@@ -0,0 +1,23 @@
+# 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/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..e9da2ac43cac 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index ddb5b0f1787e..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/license-expression/Manifest b/dev-python/license-expression/Manifest
index 71128f480552..b9033cd99705 100644
--- a/dev-python/license-expression/Manifest
+++ b/dev-python/license-expression/Manifest
@@ -1,2 +1 @@
-DIST license-expression-30.1.0.gh.tar.gz 162641 BLAKE2B 912a34bd86199f41248b2893e9e25dfcf1504231e49f6d94607ce30c07c95932a8c41814c5d2100beabfe7fe2deda499a62ea310243dce559d0a5c5ecb84f77c SHA512 eb152b53bfacddbccdc8bd4366e040c24c0e9be3561f1a602344ad756307e29350a739de5ab5f5448258db88dac745638242d971e1a2030fc4b43b88ab4015d0
 DIST license-expression-30.1.1.gh.tar.gz 165700 BLAKE2B b79dcb1966658ceb78fcc8a335c90d08c1aaf1933251a14cfa3caf97bbacea9090103727811b654c7c013b24f97ca0529c1589cef5ea096079c33df761ad2ebd SHA512 83a683b7479088f5f4b0d4c4854d17150dd07b60231ebcea5a299e0a3109a833477f86b3dbb2f7d7da932f610fc0489fd019b823ad6e0554f7cc372dfcabdbc1
diff --git a/dev-python/license-expression/license-expression-30.1.0.ebuild b/dev-python/license-expression/license-expression-30.1.0.ebuild
deleted file mode 100644
index 90d4a59b430d..000000000000
--- a/dev-python/license-expression/license-expression-30.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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Parse, compare, simplify and normalize license expressions"
-HOMEPAGE="
-	https://pypi.org/project/license-expression/
-	https://github.com/nexB/license-expression/
-"
-SRC_URI="
-	https://github.com/nexB/license-expression/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/license-expression/license-expression-30.1.1.ebuild b/dev-python/license-expression/license-expression-30.1.1.ebuild
index 9c0b82e12df3..0d283f70646e 100644
--- a/dev-python/license-expression/license-expression-30.1.1.ebuild
+++ b/dev-python/license-expression/license-expression-30.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/boolean-py-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index abeaa5f1046f..e8b852ff2a22 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -1,2 +1 @@
-DIST llfuse-1.4.2.tar.gz 834763 BLAKE2B 60bdfdd4567de4aa6ab5ea6692f48e6d68572bc13976e30fa9850c96b8a2c8a77638d3750df549b827a2bba0cc2dfa2a3f2cac3c4729278515a2703ecde446a1 SHA512 6a368af9e49f8537bbea396dfcd9fc024f8b93b161d3c6167d13c4ffb0ab20b6c8393447e71b5c147c82d4d1ee590ae08c512c93ccb28df78a06ab6833ac3705
 DIST llfuse-1.4.4.tar.gz 293728 BLAKE2B aba684a0b7b06a0cdb97fb8851639ee0c6b5dc100e3d216430e26f122a78ac7933b7d5725f271328804a592b343988d6ceb79bd8c682620464dcef1d26cc20b0 SHA512 3e61f1f82194dc915947e4f0c2edf44ce0e87c4da142e39c2b19bb7db3f387a348f9c1bb02b6d0f2507b57cbfc20ad83c11ce513c685dc276d6a382e4dd449eb
diff --git a/dev-python/llfuse/llfuse-1.4.2.ebuild b/dev-python/llfuse/llfuse-1.4.2.ebuild
deleted file mode 100644
index 5742cf2c899d..000000000000
--- a/dev-python/llfuse/llfuse-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python bindings for the low-level FUSE API"
-HOMEPAGE="
-	https://github.com/python-llfuse/python-llfuse/
-	https://pypi.org/project/llfuse/
-"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=sys-fs/fuse-2.8.0:0
-"
-DEPEND="
-	${RDEPEND}
-	sys-apps/attr
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/llfuse-1.3.5-cflags.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# force regen
-	rm src/llfuse.c || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ! -f src/llfuse.c ]]; then
-		esetup.py build_cython
-	fi
-	distutils-r1_python_compile
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/llfuse/llfuse-1.4.4.ebuild b/dev-python/llfuse/llfuse-1.4.4.ebuild
index 89390a0104f5..2ea9b9fde3a2 100644
--- a/dev-python/llfuse/llfuse-1.4.4.ebuild
+++ b/dev-python/llfuse/llfuse-1.4.4.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/mkdocs-git-authors-plugin/Manifest b/dev-python/mkdocs-git-authors-plugin/Manifest
index 0902f84bb379..752a2a427cca 100644
--- a/dev-python/mkdocs-git-authors-plugin/Manifest
+++ b/dev-python/mkdocs-git-authors-plugin/Manifest
@@ -1,3 +1 @@
-DIST mkdocs-git-authors-plugin-0.7.0.gh.tar.gz 28526 BLAKE2B 876b273b476d10f037053ac8c4892f9225b514bfedecd26a7a9dcfd067609c5458fa4c2ed741048092c88dfcda196eab035e4909d3a8184579971273401cbf7c SHA512 aa92a5b49c4f02ea1c4eb5242fc585a341f837e7ebb27a450d703a170fb5e2e9ea5b04e2c6f121747300d86ac5fc0e69a553e1d7b02786e8fd6cd4943cbec6c2
-DIST mkdocs-git-authors-plugin-0.7.1.gh.tar.gz 28974 BLAKE2B aea1a6d844aaf4ecd9b94d5cb62bfb59206838f825a96431f123e2706eb44f371cb893e45f0b5311ad2a47403b3be0e896383b3be7ab92a5a4b45d873bbc1370 SHA512 0de4ab85de1b1803ef6410bbeffb7f4ae03b6ce5aa1d9c3926004144c037193765b4e1d02560960fd6954f2f887694345c19dcdeea17cabf6a51fcb0b7120243
 DIST mkdocs-git-authors-plugin-0.7.2.gh.tar.gz 29300 BLAKE2B a93e87cde212fe15c1986bfdeeef207637b1bb10de1f864b0014b6dc0c74a64dbe152eae33c176adbb0e148cebd15717a307f874fd218e638835ce0687de14d8 SHA512 6fdaa7d06f0f0326b4123be546f0ad78ee3769a0048528e866b5c787ccaad9ba33e9c47b3597eea5b43d91f949d07b5cae9eca167b12978c7f577314e55c2721
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
deleted file mode 100644
index 7dcba0b1e078..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.0.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-# Requires self to be installed to build docs
-# TODO: Do this a bit better
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/regex
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-
-# Tests are broken outside of upstream git repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	use test && initialize_git_repo
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.1.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.1.ebuild
deleted file mode 100644
index 3f1ecfd466b9..000000000000
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.1.ebuild
+++ /dev/null
@@ -1,55 +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} )
-
-# Requires self to be installed to build docs
-# TODO: Do this a bit better
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/regex
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-authors-plugin
-"
-DOCS_INITIALIZE_GIT=1
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Mkdocs plugin to display git authors of a page"
-HOMEPAGE="
-	https://github.com/timvink/mkdocs-git-authors-plugin/
-	https://pypi.org/project/mkdocs-git-authors-plugin/
-"
-SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-
-# Tests are broken outside of upstream git repo
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-		dev-python/mkdocs-git-revision-date-localized-plugin[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-authors tests need git repo
-	use test && initialize_git_repo
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.2.ebuild b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.2.ebuild
index 3f1ecfd466b9..7dcba0b1e078 100644
--- a/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.2.ebuild
+++ b/dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.7.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/timvink/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 # Tests are broken outside of upstream git repo
 RESTRICT="test"
diff --git a/dev-python/nbclassic/Manifest b/dev-python/nbclassic/Manifest
index c40878f808ed..3012650e398e 100644
--- a/dev-python/nbclassic/Manifest
+++ b/dev-python/nbclassic/Manifest
@@ -1,3 +1 @@
-DIST nbclassic-0.5.5.tar.gz 20200594 BLAKE2B 43de88221af5461e2814f7d8963d7f9f675463f116092d1fb40648a8a14065aa5888ad207b1d845884f9b5b6d6a65a8f6197e94661b7a255c84d5b34ea0c5c99 SHA512 54e22ee41a2cb497c3792b74213c13dfbcef7a8a6fb42e48a06aa6969987cec39bf0cfa835e24062e8181bd732cf6b6855f9e834a586b15c584b47df06455b34
-DIST nbclassic-0.5.6.tar.gz 20201214 BLAKE2B 07643a35e0167af860ce382212685b988e8ec979cfe6e3436998e467f36a1f4381343c7e2513bc3a08d3cd384d6e6369cae20f77c9b0636559ce8f66b4ee2f63 SHA512 e259edb862a870c2b992c6c2c2d8ead64fc69f98298bd1830d63f1db001f8b36ab9509a693b5e425dcc2a43eb72b256f1082b1f0c66757bdbf35968175eb58c7
 DIST nbclassic-1.0.0.tar.gz 20201455 BLAKE2B 8d87668cdf2347c6d9dcc7f335d9bf346c1622217b71c18a91f7703f90ab5d2c71830f9743d6b408033ab153fe7180a9f07edc016704b9d0469bbf15c1641ef8 SHA512 fc80cd6311ab9cac9e0fdcf4d37cffc383c90327da8c27901239b84486e4afe23372665b0e1464ec78845816e829c4f3cf8672b4a0ad7e396fdb962b2f4f5a1b
diff --git a/dev-python/nbclassic/nbclassic-0.5.5.ebuild b/dev-python/nbclassic/nbclassic-0.5.5.ebuild
deleted file mode 100644
index 8dfb95cac589..000000000000
--- a/dev-python/nbclassic/nbclassic-0.5.5.ebuild
+++ /dev/null
@@ -1,85 +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} )
-DISTUTILS_USE_PEP517=jupyter
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbclassic/
-	https://pypi.org/project/nbclassic/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.1.0[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-# dev-python/nbval is missing impls
-BDEPEND="
-	test? (
-		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		virtual/pandoc
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
-	dev-python/nbsphinx \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/myst-parser \
-	dev-python/ipython_genutils
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/nbclassic/nbclassic-0.5.6.ebuild b/dev-python/nbclassic/nbclassic-0.5.6.ebuild
deleted file mode 100644
index 1b6704e2dc9a..000000000000
--- a/dev-python/nbclassic/nbclassic-0.5.6.ebuild
+++ /dev/null
@@ -1,85 +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} )
-DISTUTILS_USE_PEP517=jupyter
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="Jupyter Notebook as a Jupyter Server Extension"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbclassic/
-	https://pypi.org/project/nbclassic/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/argon2-cffi[${PYTHON_USEDEP}]
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-client-6.1.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/nbconvert-5[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/notebook-shim-0.2.3[${PYTHON_USEDEP}]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	>=dev-python/send2trash-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	<dev-python/notebook-7[${PYTHON_USEDEP}]
-"
-
-# dev-python/nbval is missing impls
-BDEPEND="
-	test? (
-		dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
-		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
-		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		virtual/pandoc
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/sphinx-rtd-theme \
-	dev-python/nbsphinx \
-	dev-python/sphinxcontrib-github-alt \
-	dev-python/myst-parser \
-	dev-python/ipython_genutils
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_tornasync.plugin
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# move /usr/etc stuff to /etc
-	mv "${ED}/usr/etc" "${ED}/etc" || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/dev-python/nbclassic/nbclassic-1.0.0.ebuild b/dev-python/nbclassic/nbclassic-1.0.0.ebuild
index 1b6704e2dc9a..b8e91cfa6bce 100644
--- a/dev-python/nbclassic/nbclassic-1.0.0.ebuild
+++ b/dev-python/nbclassic/nbclassic-1.0.0.ebuild
@@ -17,7 +17,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/argon2-cffi[${PYTHON_USEDEP}]
diff --git a/dev-python/nbclient/Manifest b/dev-python/nbclient/Manifest
index 4f6cd63bfde4..483db4d5fc40 100644
--- a/dev-python/nbclient/Manifest
+++ b/dev-python/nbclient/Manifest
@@ -1,2 +1 @@
-DIST nbclient-0.7.4.gh.tar.gz 79167 BLAKE2B 90b61c55cf25aaa2fed8fd914d799619fefb1353826f7a41320efb732ccf7a44efce944c03d472f9f441a1693bfcdce76e23d0746d62c020e996dc55de7be2b6 SHA512 24cdb1d8b9ffc4899f15490f15d5a41a3e62c52c2b57d8ee768dc93fda08bb6f1a432306a551ece3d031061f790e032c765b0d96225700b2820ca59bc71e9aeb
 DIST nbclient-0.8.0.gh.tar.gz 79287 BLAKE2B 5147195fa75ae5da620eb44b5b3d360f69275f1590d098757c6f460769bdb62d3eca576a344861e382bf430f97159adbfff46f557c3509d5fe06d269a0302cdc SHA512 f77ecba2f03a8886e8a2335e1d345fcc1d3a1726b458d151a8c78b85c621017cd96f1ef30e4532bf61b89c92aea128a364f5e9677858951f5d070c6206a01816
diff --git a/dev-python/nbclient/nbclient-0.7.4.ebuild b/dev-python/nbclient/nbclient-0.7.4.ebuild
deleted file mode 100644
index af650ed2d0e2..000000000000
--- a/dev-python/nbclient/nbclient-0.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client library for executing Jupyter notebooks"
-HOMEPAGE="
-	https://nbclient.readthedocs.io/en/latest/
-	https://github.com/jupyter/nbclient/
-	https://pypi.org/project/nbclient/
-"
-SRC_URI="
-	https://github.com/jupyter/nbclient/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/jupyter-client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/nbformat-5.0[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/nbconvert[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-		dev-python/xmltodict[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	nbclient/tests/test_client.py::test_many_parallel_notebooks
-	'nbclient/tests/test_client.py::test_run_all_notebooks[Interrupt.ipynb-opts6]'
-)
-
-python_test() {
-	# The tests run the pydevd debugger, the debugger prints a warning
-	# in python3.11 when frozen modules are being used.
-	# This warning makes the tests fail, silence it.
-	PYDEVD_DISABLE_FILE_VALIDATION=1 epytest
-}
diff --git a/dev-python/nbclient/nbclient-0.8.0.ebuild b/dev-python/nbclient/nbclient-0.8.0.ebuild
index bc1787facaf6..6c1074415b53 100644
--- a/dev-python/nbclient/nbclient-0.8.0.ebuild
+++ b/dev-python/nbclient/nbclient-0.8.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 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/jupyter-client-6.1.12[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 0ce9c4b663d3..778acd0325ed 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,5 +1 @@
-DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef SHA512 306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
-DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
-DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
-DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e SHA512 875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
 DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8 SHA512 6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
deleted file mode 100644
index bfb168b88ae2..000000000000
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,101 +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 edos2unix
-
-DESCRIPTION="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbdime/
-	https://pypi.org/project/nbdime/
-"
-SRC_URI+="
-	https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch
-		-> ${P}-jupyter_server2.patch
-	https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch
-		-> ${P}-py3.11.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/recommonmark \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${DISTDIR}"/${P}-jupyter_server2.patch
-	"${DISTDIR}"/${P}-py3.11.patch
-)
-
-EPYTEST_DESELECT=(
-	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
-	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
-	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
-	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
-	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
-	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
-	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
-	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
-	nbdime/tests/test_web.py::test_api_diff
-	nbdime/tests/test_web.py::test_api_merge
-	nbdime/tests/test_web.py::test_fetch_diff
-	nbdime/tests/test_web.py::test_fetch_merge
-	nbdime/tests/test_web.py::test_offline_mathjax
-)
-
-src_prepare() {
-	edos2unix \
-		setupbase.py \
-		nbdime/tests/conftest.py \
-		nbdime/tests/test_cli_apps.py \
-		nbdime/tests/test_web.py \
-		nbdime/webapp/nbdimeserver.py
-
-	distutils-r1_src_prepare
-}
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-
-	distutils-r1_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}"{/usr,}/etc || die
-}
diff --git a/dev-python/nbdime/nbdime-3.2.0.ebuild b/dev-python/nbdime/nbdime-3.2.0.ebuild
deleted file mode 100644
index 27fb9f3cb3a7..000000000000
--- a/dev-python/nbdime/nbdime-3.2.0.ebuild
+++ /dev/null
@@ -1,78 +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="Diff and merge of Jupyter Notebooks"
-HOMEPAGE="
-	https://jupyter.org/
-	https://github.com/jupyter/nbdime/
-	https://pypi.org/project/nbdime/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/GitPython[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jupyter-server[${PYTHON_USEDEP}]
-	dev-python/jupyter-server-mathjax[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/tabulate[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source \
-	dev-python/recommonmark \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
-	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
-	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
-	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
-	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
-	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
-	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
-	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
-	nbdime/tests/test_web.py::test_api_diff
-	nbdime/tests/test_web.py::test_api_merge
-	nbdime/tests/test_web.py::test_fetch_diff
-	nbdime/tests/test_web.py::test_fetch_merge
-	nbdime/tests/test_web.py::test_offline_mathjax
-)
-
-python_configure_all() {
-	DISTUTILS_ARGS=( --skip-npm )
-}
-
-src_test() {
-	# user.email and user.name are not configured in the sandbox
-	git config --global user.email "larry@gentoo.org" || die
-	git config --global user.name "Larry the Cow" || die
-
-	distutils-r1_src_test
-}
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}"{/usr,}/etc || die
-}
diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild b/dev-python/nbdime/nbdime-3.2.1.ebuild
index 27fb9f3cb3a7..cdb39f852525 100644
--- a/dev-python/nbdime/nbdime-3.2.1.ebuild
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 00e0536bc8ac..0c327a4f6a42 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,2 +1 @@
-DIST nbsphinx-0.9.1.tar.gz 171587 BLAKE2B 38796379102f7488b58e0a4ca720b6800edc11477935c782dbd9124d96fb8587f5cd51b01f95f60f1372bafc5177e68a61a61c9d20261078a8421001e6936196 SHA512 d18c3da6b202c22dfdbb9ddfbb5b61af97200aaf75712f0e6a0221089c155faac9bca61cb0d552c231456e095f3303c59a9f23a99405dacf4b99117b929e6196
 DIST nbsphinx-0.9.2.tar.gz 171754 BLAKE2B 6bb73034b7f24c39c2d79e9beab623c46c07d9dd583a71920b83a6561e7f2899474db3edbb7b64386f4f41e1fb7960e942ea8327387ef2e0f1d3745627a3ade4 SHA512 b5e371e3177f03e72d87059d0c06cb4787afe255926e9f2440ea0c753f5457974535f42c98bd5bb289752151400612f28de98e1b36e6865b26790e56d1f78b80
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild
deleted file mode 100644
index 29a8b34939c0..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.9.1.ebuild
+++ /dev/null
@@ -1,28 +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="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="
-	https://github.com/spatialaudio/nbsphinx/
-	https://pypi.org/project/nbsphinx/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
index cbb630c59a8e..29a8b34939c0 100644
--- a/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.9.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index 5d59a70bcf34..544055f4344e 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,4 +1,2 @@
 DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
-DIST python-nbxmpp-4.2.2.tar.bz2 133951 BLAKE2B 4ef9d7a6b2f1a548eac3d97eee322badbce5c69114441145ee525df45c5291771de3171e6591c0962dfe077fd9bc9fc83b8caeaefaeb13e0eb65b4ebcb5d37c7 SHA512 6edf469354ad1bb1eeb2545f67b4e7cf2362becfb2cc8c2caa6f050d56c0c15ac2fd29d52095d673199da7170ccfddbf7e8d8f98c47882ab75d14d19f71a81d9
-DIST python-nbxmpp-4.3.0.tar.bz2 135597 BLAKE2B e0d193bc8c99aa473c013607d341b4b0adc8a3639f8f51c2d00ac8f7d5fbd779540f791d44e685f54e46b3df140c18611fe252bdaad7cb5e650318ac8cdfd70f SHA512 da1fc22d51d7ffbe5a1df5fffd33c16c131348713f6e56b1d654d3f3c0e30e9dae9745ff6f20148e746205b74e8180dbf322e5f603475d85779ab2e075d22835
 DIST python-nbxmpp-4.3.1.tar.bz2 135981 BLAKE2B eb14bf40448fc49cd2656d4ffdafcbe66e4d91d371377f976cc1030067830f47cdd1a27b7c28f0d0a7a4292225913e55db12b6dfb7cc2e5f4ffe230f3aef0e51 SHA512 da69a54efed5c906d8c6e5a093254c0b86d21071403838c2cf969b2d969ea4647c3153fdc4231efa5ecce00eff8989a83e818e9ff7590964d25167878ae93adc
diff --git a/dev-python/nbxmpp/nbxmpp-4.2.2.ebuild b/dev-python/nbxmpp/nbxmpp-4.2.2.ebuild
deleted file mode 100644
index 5e7f80a50d27..000000000000
--- a/dev-python/nbxmpp/nbxmpp-4.2.2.ebuild
+++ /dev/null
@@ -1,35 +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-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-4.3.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.3.0.ebuild
deleted file mode 100644
index cd44bc48aeba..000000000000
--- a/dev-python/nbxmpp/nbxmpp-4.3.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=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.42[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild b/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild
index cd44bc48aeba..5e7f80a50d27 100644
--- a/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-4.3.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b3ddc0e20520..5eb0b49cbb50 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,4 +1,5 @@
 DIST numpy-1.24.0.tar.gz 10897101 BLAKE2B 59e2b913f90de76589d8fbb2f07e2d389012c7f6ce9bd641bc4837776465ce9c41c34f19f92bee55d4bae6245c1d2c84315b359ef0b089fd68d31cd7e7ec44b1 SHA512 3b4e6255b8d39e8504a50ecd3c2ba09d5b16d3f6c70b23b67e4dbf03d1fe390c55030f46090341d39a1ee8228c61ad6212fdc6e4579fcec9e26b4dbe70268661
 DIST numpy-1.24.2.tar.gz 10906862 BLAKE2B e48f65eab709f0c57ec378d813a7b65bcaca6d5960b559d6db1c60726e5cf12517f4b2e1636b0ff815a2109925edccba200270db5170fd0aff5fd635919165ac SHA512 145fd7fb3919a185f75076d51b92c54a7fb1b776b637752ca15fdee15b239d6a517ef1bb8cded7c92e059cf6cda0146c24943c042d19b791e81125bc0ad4b820
 DIST numpy-1.24.3.tar.gz 10909904 BLAKE2B 3b14f8b6a7bd484de43c3b0e57f161388d6226e05ed9bc3d1edfaafc713b9597c7574b9b9c20b4e3a6bd291d32a607d95c72d6e25fa346ffdaf97c94767bc315 SHA512 d4b5841cbe68ee6653f99018e4e0182f2e5519a1cd69c14e0a95aa180f878e6a6786ccf0a7c78bf0d511c53e7535d7144fee428572dec7a4b60b25c8a1c0c9e1
+DIST numpy-1.24.4.tar.gz 10911229 BLAKE2B 2f054b4ede249653707c3df8ccf6df31b747c0625891ae6e01134f84b02d1300e1d7a88b5741e0e0f05218673d95374f263e5bfddbf17c9510aa93bac002eafc SHA512 89eb90548ad4f38cfe0a5077eef426058eed08ca17633024887e4d0ff5bdfe98736b1ad6850fe643bc0035d55ac4cd39b5971895eea9dcf247b5ff186654ed68
 DIST numpy-1.25.0.tar.gz 10426700 BLAKE2B 9a6c9b7e1172a21ec7cc3b2a0b292308ed7a859072ba73cac3c472cd60f45acd66032f24df19bddef8aa0aee7a243e21d3fa04b68f1383efc6af834cdc04b589 SHA512 e464d82bba0487f520ec7a820492343af5172e807e0f746688bbaff636a31947da62704ef0f35c74a46fb42332f4644f3c497d544789d22e5c01ca0823f82909
diff --git a/dev-python/numpy/numpy-1.24.3-r1.ebuild b/dev-python/numpy/numpy-1.24.3-r1.ebuild
index 3ee79b8158af..533cf44d56ee 100644
--- a/dev-python/numpy/numpy-1.24.3-r1.ebuild
+++ b/dev-python/numpy/numpy-1.24.3-r1.ebuild
@@ -22,7 +22,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 ~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"
 IUSE="lapack"
 
 RDEPEND="
diff --git a/dev-python/numpy/numpy-1.24.4.ebuild b/dev-python/numpy/numpy-1.24.4.ebuild
new file mode 100644
index 000000000000..533cf44d56ee
--- /dev/null
+++ b/dev-python/numpy/numpy-1.24.4.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
+inherit toolchain-funcs
+
+DOC_PV=${PV}
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="
+	https://numpy.org/
+	https://github.com/numpy/numpy/
+	https://pypi.org/project/numpy/
+"
+
+LICENSE="BSD"
+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"
+IUSE="lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.30[${PYTHON_USEDEP}]
+	lapack? (
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/charset_normalizer[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+	"${FILESDIR}"/numpy-1.24.3-fix-c++-linkage.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Allow use with setuptools 60.x
+	# See numpy-1.22.1-revert-setuptools-upper-bound.patch for details
+	export SETUPTOOLS_USE_DISTUTILS=stdlib
+
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local -x MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# very disk- and memory-hungry
+		numpy/lib/tests/test_histograms.py::TestHistogram::test_big_arrays
+		numpy/lib/tests/test_io.py::test_large_zip
+
+		# precision problems
+		numpy/core/tests/test_umath_accuracy.py::TestAccuracy::test_validate_transcendentals
+
+		# runs the whole test suite recursively, that's just crazy
+		numpy/core/tests/test_mem_policy.py::test_new_policy
+
+		# very slow, unlikely to be practically useful
+		numpy/typing/tests/test_typing.py
+	)
+
+	if use arm && [[ $(uname -m || echo "unknown") == "armv8l" ]] ; then
+		# Degenerate case. arm32 chroot on arm64.
+		# bug #774108
+		EPYTEST_DESELECT+=(
+			numpy/core/tests/test_cpu_features.py::Test_ARM_Features::test_features
+		)
+	fi
+
+	if use x86 ; then
+		EPYTEST_DESELECT+=(
+			# https://github.com/numpy/numpy/issues/18388
+			numpy/core/tests/test_umath.py::TestRemainder::test_float_remainder_overflow
+			# https://github.com/numpy/numpy/issues/18387
+			numpy/random/tests/test_generator_mt19937.py::TestRandomDist::test_pareto
+			# more precision problems
+			numpy/core/tests/test_einsum.py::TestEinsum::test_einsum_sums_int16
+		)
+	fi
+
+	case "${ABI}" in
+		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
+			EPYTEST_DESELECT+=(
+				# too large for 32-bit platforms
+				numpy/core/tests/test_ufunc.py::TestUfunc::test_identityless_reduction_huge_array
+			)
+			;;
+		*)
+			;;
+	esac
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest -k "not _fuzz" -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/numpy-1.25.0.ebuild b/dev-python/numpy/numpy-1.25.0.ebuild
index 80d2e86dac8a..d96738000013 100644
--- a/dev-python/numpy/numpy-1.25.0.ebuild
+++ b/dev-python/numpy/numpy-1.25.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="threads(+)"
 FORTRAN_NEEDED=lapack
 
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing pypi toolchain-funcs
 
 DESCRIPTION="Fast array and numerical python library"
 HOMEPAGE="
@@ -22,7 +22,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="lapack"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 RDEPEND="
@@ -104,6 +104,16 @@ python_test() {
 		)
 	fi
 
+	if [[ $(tc-endian) == "big" ]] ; then
+		# https://github.com/numpy/numpy/issues/11831 and bug #707116
+		EPYTEST_DESELECT+=(
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[s1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[t1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f90[s1]'
+			'f2py/tests/test_return_character.py::TestFReturnCharacter::test_all_f77[t1]'
+		)
+	fi
+
 	case "${ABI}" in
 		alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86)
 			EPYTEST_DESELECT+=(
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index 7a5e059afc5b..bd537d64ed52 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,2 +1 @@
-DIST OWSLib-0.29.1.gh.tar.gz 960582 BLAKE2B e88446a843113453b116016a4488e1738472b2ff8faf7f0b1647db061e2af4b15e7ca64fb92d3298a9c4e906f8230a03fea664df65113dedba901a75c074da2e SHA512 10fc2d75b60c6a388d4729011e3843d0943e6273c94d628b288c973304c01359d77a4856a7dc74ac28358f26cbe9ffe85a67921ef5eb62475d2143dd20c46e08
 DIST OWSLib-0.29.2.gh.tar.gz 953216 BLAKE2B 3c0204cd62fdf3fe36ca2051a83a00ad165e7f7682d850c3796877c83382f7a3c68d2c02f8dfaa90016909393a9bfd6f2415499f6096de9f4333102b20ccd932 SHA512 66c0c6b4bcae08f0acbf1d4ee4a0e5d2b33996ae0d088ddd01844f050da364c581f7ea2a46d48652b969c75e8b31caf4c721f497ea079fb779d670199dd56746
diff --git a/dev-python/owslib/owslib-0.29.1.ebuild b/dev-python/owslib/owslib-0.29.1.ebuild
deleted file mode 100644
index dec4cd2e8539..000000000000
--- a/dev-python/owslib/owslib-0.29.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=OWSLib-${PV}
-DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
-HOMEPAGE="
-	https://geopython.github.io/OWSLib/
-	https://github.com/geopython/owslib/
-	https://pypi.org/project/OWSLib/
-"
-SRC_URI="
-	https://github.com/geopython/${PN}/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-PROPERTIES="test_network"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# connection errors
-	tests/test_wfs_generic.py::test_xmlfilter_wfs_110
-	tests/test_wfs_generic.py::test_xmlfilter_wfs_200
-	tests/test_ogcapi_records_pycsw.py::test_ogcapi_records_pycsw
-	tests/test_opensearch_pycsw.py::test_opensearch_creodias
-	tests/test_ows_interfaces.py::test_ows_interfaces_csw
-	tests/test_csw3_pycsw.py::test_csw_pycsw
-	tests/test_csw_pycsw.py::test_csw_pycsw
-	tests/test_csw_pycsw_skip_caps.py::test_csw_pycsw_skip_caps
-)
-
-python_test() {
-	epytest -o addopts=
-}
diff --git a/dev-python/owslib/owslib-0.29.2.ebuild b/dev-python/owslib/owslib-0.29.2.ebuild
index 8839318d1fe9..e5b828bbd492 100644
--- a/dev-python/owslib/owslib-0.29.2.ebuild
+++ b/dev-python/owslib/owslib-0.29.2.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 PROPERTIES="test_network"
 
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 02aa46e5a5df..69338a16a4bd 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,2 +1,3 @@
 DIST pdm-backend-2.1.0.gh.tar.gz 134050 BLAKE2B 941795a8e108442d8ab651cee2c87f72d01c55e16634d9028f6e6300576ae7c67eaff90cbd6bcd4e24131ddabe92626583cbaf3af1807fd03490650d85653376 SHA512 999940464a467e5a8a6cb232cb8602846461cf7e146256be5f745743e47bfeab7b2b8157dc49ba7b03cff46051d080efe2097c450cfab037e0594ffa5fc3802b
 DIST pdm-backend-2.1.1.gh.tar.gz 134089 BLAKE2B a92d29b3d5f32e0bfbf407f354ba672922feb833ad2078857244a40fac7be210c5ba93810d6db7c0edd7fe874f7c9bcb9bd902dde5aa255c2b682855c9a00eed SHA512 710a574822beffad0ff3e812afa69a13878ada8ec10092d4c2f47c37345118dc972ea12fef7b26a835e9d76c774134dfad6fb77902c1755df072ef5acc7160a4
+DIST pdm-backend-2.1.2.gh.tar.gz 134069 BLAKE2B 425a43c7a7e47209caeec8fd44fde9734c9a79af5703fc668858f655b0783dbfaf934344a3e5f6b85fa59fe3122d2212890c1da615f331a5529e2619ee45c42f SHA512 a0d61ead5761d5c4558d486bed0249ec7fdcb9f48eac00ba87a97b8c32e28bf6ebe1d2ec840b049440864b68df997285c446922d6712226f4bd458f291567d00
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.2.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.2.ebuild
new file mode 100644
index 000000000000..6f17199db7ac
--- /dev/null
+++ b/dev-python/pdm-backend/pdm-backend-2.1.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
+HOMEPAGE="
+	https://pypi.org/project/pdm-backend/
+	https://github.com/pdm-project/pdm-backend/
+"
+SRC_URI="
+	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
+	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
+
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
+	' 3.{9..10})
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
+	' 3.9)
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+# setuptools are used to build C extensions
+RDEPEND+="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	rm -r src/pdm/backend/_vendor || die
+	find -name '*.py' -exec sed \
+		-e 's:from pdm\.backend\._vendor\.:from :' \
+		-e 's:from pdm\.backend\._vendor ::' \
+		-e 's:import pdm\.backend\._vendor\.:import :' \
+		-i {} + || die
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	# this must not be set during src_test()
+	local -x PDM_BUILD_SCM_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	git config --global user.email "test@example.com" || die
+	git config --global user.name "Test User" || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pem/metadata.xml b/dev-python/pem/metadata.xml
index 8c8101bcdb2c..736a1167c898 100644
--- a/dev-python/pem/metadata.xml
+++ b/dev-python/pem/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 59920b3f9b8d..f26be5381a34 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,2 +1 @@
-DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
 DIST pexpect-4.8.0_p20230402.gh.tar.gz 169420 BLAKE2B 4780621f5876506c5ad2dbf03656d8c336d5aadef99b1ae99e841b5d0a945ab54177cb04a79b526e422cd4df7393c723000e4a28960bd5f57a5e0173b0a3bc69 SHA512 72cdf226ec5c7d60a10fbcecf81cd1ae422467652e104bb818908bf6d1a4a4bcadab9a06d58475a9609580d973956e18e2ab144ab13a0b700072474ff3087259
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch b/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
deleted file mode 100644
index 903b742f71d3..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: whitley-delamora <62795654+whitley-delamora@users.noreply.github.com>
-Date: Sat, 28 Mar 2020 13:46:47 +0100
-Subject: [PATCH] REPLWrapTestCase.test_bash_env(): export variable PS1
-
-https://github.com/pexpect/pexpect/commit/51c0b09f92f140eda10b62d234710f65ad56dee2
-
---- a/tests/test_replwrap.py
-+++ b/tests/test_replwrap.py
-@@ -45,6 +45,7 @@ def test_bash_env(self):
-         """env, which displays PS1=..., should not mess up finding the prompt.
-         """
-         bash = replwrap.bash()
-+        res = bash.run_command("export PS1")
-         res = bash.run_command("env")
-         self.assertIn('PS1', res)
-         res = bash.run_command("echo $HOME")
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-py311.patch b/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
deleted file mode 100644
index b7de17a68785..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 52af5b0ae0627139524448a3f2e83d9f40802bc2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 24 Mar 2022 15:15:33 +0100
-Subject: [PATCH] Convert @asyncio.coroutine to async def
-
-This is required for Python 3.11+ support.
-
-Fixes https://github.com/pexpect/pexpect/issues/677
----
- pexpect/_async.py | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/pexpect/_async.py b/pexpect/_async.py
-index dfbfeef5..bc83261d 100644
---- a/pexpect/_async.py
-+++ b/pexpect/_async.py
-@@ -4,8 +4,7 @@
- 
- from pexpect import EOF
- 
--@asyncio.coroutine
--def expect_async(expecter, timeout=None):
-+async def expect_async(expecter, timeout=None):
-     # First process data that was previously read - if it maches, we don't need
-     # async stuff.
-     idx = expecter.existing_data()
-@@ -14,7 +13,7 @@ def expect_async(expecter, timeout=None):
-     if not expecter.spawn.async_pw_transport:
-         pw = PatternWaiter()
-         pw.set_expecter(expecter)
--        transport, pw = yield from asyncio.get_event_loop()\
-+        transport, pw = await asyncio.get_event_loop()\
-             .connect_read_pipe(lambda: pw, expecter.spawn)
-         expecter.spawn.async_pw_transport = pw, transport
-     else:
-@@ -22,26 +21,25 @@ def expect_async(expecter, timeout=None):
-         pw.set_expecter(expecter)
-         transport.resume_reading()
-     try:
--        return (yield from asyncio.wait_for(pw.fut, timeout))
-+        return (await asyncio.wait_for(pw.fut, timeout))
-     except asyncio.TimeoutError as e:
-         transport.pause_reading()
-         return expecter.timeout(e)
- 
--@asyncio.coroutine
--def repl_run_command_async(repl, cmdlines, timeout=-1):
-+async def repl_run_command_async(repl, cmdlines, timeout=-1):
-     res = []
-     repl.child.sendline(cmdlines[0])
-     for line in cmdlines[1:]:
--        yield from repl._expect_prompt(timeout=timeout, async_=True)
-+        await repl._expect_prompt(timeout=timeout, async_=True)
-         res.append(repl.child.before)
-         repl.child.sendline(line)
- 
-     # Command was fully submitted, now wait for the next prompt
--    prompt_idx = yield from repl._expect_prompt(timeout=timeout, async_=True)
-+    prompt_idx = await repl._expect_prompt(timeout=timeout, async_=True)
-     if prompt_idx == 1:
-         # We got the continuation prompt - command was incomplete
-         repl.child.kill(signal.SIGINT)
--        yield from repl._expect_prompt(timeout=1, async_=True)
-+        await repl._expect_prompt(timeout=1, async_=True)
-         raise ValueError("Continuation prompt found - input was incomplete:")
-     return u''.join(res + [repl.child.before])
- 
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch b/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch
deleted file mode 100644
index d23055fba251..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 506bcd97fa1d20d1412d399353c38f0ff3546a1a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 13 Apr 2020 23:26:09 +0200
-Subject: [PATCH] Fix compilation of docs with Sphinx 3.0.1
-
-https://github.com/pexpect/pexpect/issues/637
----
- doc/sphinxext/github.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/sphinxext/github.py b/doc/sphinxext/github.py
-index 519e146..771dccc 100644
---- a/doc/sphinxext/github.py
-+++ b/doc/sphinxext/github.py
-@@ -146,7 +146,6 @@ def setup(app):
-     
-     :param app: Sphinx application context.
-     """
--    app.info('Initializing GitHub plugin')
-     app.add_role('ghissue', ghissue_role)
-     app.add_role('ghpull', ghissue_role)
-     app.add_role('ghuser', ghuser_role)
--- 
-2.26.0
-
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
deleted file mode 100644
index 4beb062107d3..000000000000
--- a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
-HOMEPAGE="
-	https://pexpect.readthedocs.io/
-	https://pypi.org/project/pexpect/
-	https://github.com/pexpect/pexpect/
-"
-
-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"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-3.patch
-	"${FILESDIR}"/${P}-fix-PS1.patch
-	"${FILESDIR}"/${P}-py311.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
index 0f65fded4209..1b7298f2582e 100644
--- a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index 3682836d3c08..51c4ab889d69 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,2 @@
-DIST pip-run-10.0.7.tar.gz 32869 BLAKE2B ea5dfea09def536eced9436a114f12cbefccf26c4b37376a560dc1fffdd8167d019ec52d57666d7b4d77dc9c580a5f48455d945aa9ddb4340a7dca88f0ded309 SHA512 cd8780372f579005e40c77b3c2d9e582cd1a144e871eec205fd0bd2ff64eac837918211d3479088f56bd3043dbfd883502b2d6f7b01dc24448888f65fdd6920b
-DIST pip-run-10.1.1.tar.gz 33010 BLAKE2B 5a3dcd1e119b65718b465ecbd118d80de776252ecbd438344eb78abc2e4a69073417310ed096f0b604740762aa24af2788041476c93d919ea72812e1597327f5 SHA512 ddf61aa31012567ff21e943739a1e29066875db3c39ca77abfa409fd75abc599756ca8aeaf9bd23d19af46ad2747e7dec4a7d3cf76a444f59c19e769419dc59a
 DIST pip-run-10.2.0.tar.gz 33523 BLAKE2B 7d19c089da98dbba2faec969f490fcd5ea48881f4ccbbfaa283465ef083521aee7d82b9de8b03a89ec8b08005db1232cd9577030cb98c111b4a0e0f7294cca84 SHA512 b26a00c6ebd8e9e505e6b218fea7070b23b5926de44e1d5a762abb2a4ebd62b1bdda7e19c4092012daf068b518a2e127ab08099f6d1a7ddc643b3ba5bf999ed0
-DIST pip-run-11.0.0.tar.gz 33598 BLAKE2B 3951c6cf959e137aeec2acae17eb6fd9b63a1716f1fe8cac55c964cf6cd975d5085dc8e05f11f00b3dd404d8f12d351d0e3f9cdd486cf1a883f917e60ad91103 SHA512 3b6c3aee3bf340f6a18e3f0acda56ed6da00dc21054e9a20499151c89a44ca388611bb7df57f04fa9b580dacd65a26c9cc34589bc01638f7ac1cc6f1752e2e5b
-DIST pip-run-12.0.0.tar.gz 34473 BLAKE2B e0a25cf4698979b22cd714f3326497d3381cc9b6c8be84085dbb239ada13f8a57b1b88a6ffde7d0fec4c58ec790c2287379c8f6843c6d20104450c1c9860f0b3 SHA512 efac5a3faaa48480b68b38a8a13e9407390fd96fff505228fe8482bbc9b4f12a7b2ad33b7abb9931a7fbd3d694d996fe58e87a4afa26f800c6e749b70c397d9b
+DIST pip-run-12.1.0.tar.gz 34387 BLAKE2B 306dce020589a0cdcaddc70baf75a41621c72a450af58a2f54c5128f8210b02f4ee2b4df5b8bca1e0617ef53e79ab89969765b053801dc4f9d60bddf7c40e76e SHA512 fa1c36b6b5befada7b54841723f9cd7ef6289bb723b46cbe000ccfc7a6e894181fbf58f472330830e5812aab8feb40dab8708cd82532696e510bd56ab0b70a20
diff --git a/dev-python/pip-run/pip-run-10.0.7.ebuild b/dev-python/pip-run/pip-run-10.0.7.ebuild
deleted file mode 100644
index fdc5e067dda3..000000000000
--- a/dev-python/pip-run/pip-run-10.0.7.ebuild
+++ /dev/null
@@ -1,56 +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="Install packages and run Python with them"
-HOMEPAGE="
-	https://github.com/jaraco/pip-run/
-	https://pypi.org/project/pip-run/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-path[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/nbformat[${PYTHON_USEDEP}]
-		' 'python*')
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-
-	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_scripts.py
-		)
-	fi
-
-	epytest -m "not network"
-}
diff --git a/dev-python/pip-run/pip-run-10.1.1.ebuild b/dev-python/pip-run/pip-run-10.1.1.ebuild
deleted file mode 100644
index 8746cd4a28d6..000000000000
--- a/dev-python/pip-run/pip-run-10.1.1.ebuild
+++ /dev/null
@@ -1,58 +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="Install packages and run Python with them"
-HOMEPAGE="
-	https://github.com/jaraco/pip-run/
-	https://pypi.org/project/pip-run/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-path[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/nbformat[${PYTHON_USEDEP}]
-		' python3_{10..11})
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-
-	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_scripts.py
-		)
-	fi
-
-	epytest -m "not network"
-}
diff --git a/dev-python/pip-run/pip-run-10.2.0.ebuild b/dev-python/pip-run/pip-run-10.2.0.ebuild
index 8746cd4a28d6..d7d23680f564 100644
--- a/dev-python/pip-run/pip-run-10.2.0.ebuild
+++ b/dev-python/pip-run/pip-run-10.2.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pip-run/pip-run-12.0.0.ebuild b/dev-python/pip-run/pip-run-12.0.0.ebuild
deleted file mode 100644
index af4aab2a9300..000000000000
--- a/dev-python/pip-run/pip-run-12.0.0.ebuild
+++ /dev/null
@@ -1,59 +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="Install packages and run Python with them"
-HOMEPAGE="
-	https://github.com/jaraco/pip-run/
-	https://pypi.org/project/pip-run/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/autocommand[${PYTHON_USEDEP}]
-	dev-python/jaraco-context[${PYTHON_USEDEP}]
-	dev-python/jaraco-env[${PYTHON_USEDEP}]
-	>=dev-python/jaraco-functools-3.7[${PYTHON_USEDEP}]
-	dev-python/jaraco-text[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.3[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/platformdirs[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jaraco-path[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-test-5.3[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/nbformat[${PYTHON_USEDEP}]
-		' python3_{10..11})
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_IGNORE=()
-
-	if ! has_version "dev-python/nbformat[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=(
-			tests/test_scripts.py
-		)
-	fi
-
-	epytest -m "not network"
-}
diff --git a/dev-python/pip-run/pip-run-11.0.0.ebuild b/dev-python/pip-run/pip-run-12.1.0.ebuild
index af4aab2a9300..af6942cd4e0a 100644
--- a/dev-python/pip-run/pip-run-11.0.0.ebuild
+++ b/dev-python/pip-run/pip-run-12.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/autocommand[${PYTHON_USEDEP}]
diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild
index b835d03c13cb..9303d77889c2 100644
--- a/dev-python/pooch/pooch-1.7.0.ebuild
+++ b/dev-python/pooch/pooch-1.7.0.ebuild
@@ -29,7 +29,6 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
 		dev-python/tqdm[${PYTHON_USEDEP}]
 	)
 "
@@ -39,6 +38,9 @@ EPYTEST_DESELECT=(
 	pooch/tests/test_core.py::test_check_availability_invalid_downloader
 	pooch/tests/test_core.py::test_load_registry_from_doi
 	pooch/tests/test_core.py::test_load_registry_from_doi_zenodo_with_slash
+	# dev-python/pytest-localftpserver -> dev-python/pyftpdlib has py3.12 issues
+	# https://github.com/giampaolo/pyftpdlib/issues/560#issuecomment-971377238
+	pooch/tests/test_core.py::test_check_availability_on_ftp
 	pooch/tests/test_downloaders.py::test_invalid_doi_repository
 	pooch/tests/test_downloaders.py::test_doi_url_not_found
 	pooch/tests/test_downloaders.py::test_figshare_url_file_not_found
diff --git a/dev-python/prometheus-client/Manifest b/dev-python/prometheus-client/Manifest
index 2ea9d5219fbb..dc3ec0104d92 100644
--- a/dev-python/prometheus-client/Manifest
+++ b/dev-python/prometheus-client/Manifest
@@ -1,2 +1 @@
-DIST prometheus_client-0.16.0.tar.gz 117546 BLAKE2B 6b4e6600b352f17620e432edd976c2d26ef71326018bd1fa81f6bf4842f1599b06b11036a3b71c641698ad3d1e2f4422812133b51a34ecc70ec0606e9ea2478c SHA512 12d22963a22511872fbd170e112a743fac02ab1a569934eef5d97f53a292281ef3f589e852f245d083d8555c5cda51c6210fe48e1211431c8fe00b47d571eaf4
 DIST prometheus_client-0.17.0.tar.gz 90650 BLAKE2B 04bc44e930c94edc9fb0ceb5cc5be71cbec23435d271ec63acacbb10b42b192170ed7f92c767a575a08a8140d9cfc28b591c49ad9af2e6d931990daba45637ba SHA512 da9a27a514dca0ae2721eaa607c5adfa86686553eebc0c4eb4323d0866d03b520de5085b8e39560df0525ef3bbbbc7996271b64136f60a427fb14fb8851e595f
diff --git a/dev-python/prometheus-client/prometheus-client-0.16.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.16.0.ebuild
deleted file mode 100644
index 52f9bc7d5efb..000000000000
--- a/dev-python/prometheus-client/prometheus-client-0.16.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.0.ebuild b/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild
index 53efc985b739..52f9bc7d5efb 100644
--- a/dev-python/prometheus-client/prometheus-client-0.17.0.ebuild
+++ b/dev-python/prometheus-client/prometheus-client-0.17.0.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/psycopg/psycopg-3.1.9.ebuild b/dev-python/psycopg/psycopg-3.1.9.ebuild
index 182aefe77346..676f50bc3261 100644
--- a/dev-python/psycopg/psycopg-3.1.9.ebuild
+++ b/dev-python/psycopg/psycopg-3.1.9.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${P}/psycopg
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	>=dev-db/postgresql-8.1:*
diff --git a/dev-python/pydantic-core/Manifest b/dev-python/pydantic-core/Manifest
index cd7b1fb67056..9f37f1e6e911 100644
--- a/dev-python/pydantic-core/Manifest
+++ b/dev-python/pydantic-core/Manifest
@@ -18,7 +18,6 @@ DIST libc-0.2.140.crate 669153 BLAKE2B f4269549f6b450a3da3196ecaae52afe178d5b690
 DIST libmimalloc-sys-0.1.30.crate 1146717 BLAKE2B 9d8d7198d8cf563b4ad7cecf120e5e183153a2b87e77aac2dce3dffcf30fcc0b24af9aa5aace8c6d7826f1ed302a4ac1df7eba7f70e4d5f9ae57fafcf880ac91 SHA512 8b2183d689e6c8455727fd9c9e1b232c8a043e24213722bf1fd3334fb3e579df21f7083df7ec2782bca24d7d278ba9243fc18be5a88906c6602f247e77d714dd
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
-DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST mimalloc-0.1.34.crate 5012 BLAKE2B 48d2c58637f435df7ef322e0150f03dc27a7f7c5892ea2c80b1b1ad20a3c71e77aaf8980fb36008fed58ae92e675df02a13d2ed0b94cd605f756f192019db705 SHA512 bc25f0f40baf4530c17e0ade84e84e113af0f2c4dbbb6ae531a64a66588d1d799e6486c7b6e94eeb08b5ac641e7d72a1c641f468c18fbbc95db77a5ca38154cf
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
@@ -29,17 +28,11 @@ DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ec
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
 DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
 DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
-DIST pydantic_core-0.38.0.tar.gz 303349 BLAKE2B 9d7b3c3d3bc98cb15c358ed56fd5f270f175d67bd05cc1aa84701ec0a9d6153decfd21004d02d3438ba1eb7f1b67e65808f71a2bcca61d1cd9388c82c9bbc711 SHA512 43868d9e83e710fb55f886e4276cff01e7e78f212ecd1ae2a35414cf91af4302184ec4f0ca636d6a838d4a676835ae4b5a5c36df55a5b8024034495473cf980e
 DIST pydantic_core-0.39.0.tar.gz 302824 BLAKE2B bc4df1e66113845a5458d27c2408258dc0b0377732a2920d24d3a6f00cb9c7456c4fd9a59bfffcf5774ef9fba62c93e08947daae9fca99e76d537ce9f6de4eb1 SHA512 9221ceb3b944f52c7b8b874148af2c9eeb68088bbc3af53c1b530d002481e0d05eda8d27eaaa468d52509d1ca7338162cc593dc78d9365db829d69b395bffebc
-DIST pyo3-0.18.2.crate 418755 BLAKE2B a45c27639d9c4c5a4e017b7e8d7580aba285ee11295f344809e30ac23b70e4541f2cb765dfeee20fdf4d441e1449f5cad4bd6308a52822eea3595305081d4b77 SHA512 b97ebc10939418d7fe3d6219921875cc7253f3aa7cd9d06b1486f8757c6d102377eb851b3a669c670423af2c80e389b736f0ce04a6cecb716c952413d06fe434
 DIST pyo3-0.19.0.crate 412659 BLAKE2B f8833d39c3c8318466ee5b9010cbdce1a20f844f15a257ae41c5d8c72f645e0c14e7e5ae0b50a8aebec60afd827cd23d5b5b4b70188531e6f5b89ef191066189 SHA512 9cef7f8a73cfea32661eaf8fd8d5af6ca180e3fd71ac956d9fbb96a1d194f238116e3ab31917b15359e7f6b0b3bc4587437463a4c61bca988f16657a64440919
-DIST pyo3-build-config-0.18.2.crate 29138 BLAKE2B ad37bacda5f0e5c8eaf382b3371de251b83c721dc2378a0bd3700462bb65273bcd4277589084f6af0a2959f17b370fe5e6a5699c8689107220333c57387bf0ae SHA512 01f544938d83a8283f5101f69673f8a39d2052186e7c712709be25c5ae17a11e7d68c2fd9b4bc7661fff9343ebf3ccc196c1259321061f048c59696692601ae1
 DIST pyo3-build-config-0.19.0.crate 29172 BLAKE2B 20904ad814ed9a22b801eb7b06851292d50f5716116a5b4a670e8c499878bf6d193525a4579b044ed413823c17ecd1ad0178baae1cab1fe3f431cc9a0f442576 SHA512 3105ce54bff87bef803f30b79d3ab2dbe440d68418f8cdc875f18ceb2bb0d06ed0923cf02af5f8293ca901f40b96c1b99a12a8a8e74813dcf70534d3aec2bfb7
-DIST pyo3-ffi-0.18.2.crate 62903 BLAKE2B 31e52b73705c1e5f44e419f314b1674a722a604fb52be5d5e5ff2ae9881ec9f204c1f51760570ed4c210ea530bd9295a27beaf9b5631ef02370d42d3e4c0be18 SHA512 495dcf45154ce89b8cd3a3fe193938e199465cf510df1713f7ad82e0a138ac2f8f1b73ec80f8af72f79a4ed26a9f4e4e93d52357ad4f41a213ec0c7b602734b9
 DIST pyo3-ffi-0.19.0.crate 64481 BLAKE2B 1cad9db14e9c14e2aa24eab25439f9d8f7503b5f4c3e8bc9a58370e3d63261898ea678f75d276f9d2eedd5fa90a106f30e7362262619a81bead93bf45673e144 SHA512 9e01b15153c44f13c77c28719d3ab36bb859c4a15dc936af4af3e99f44946b4b4752faf3d2320391735b205ca6c055a43e7f5ac98ce53d281fdf536ce67dfbbe
-DIST pyo3-macros-0.18.2.crate 7173 BLAKE2B dfa5792be03b3b1164471ef9ff4ee672fe8e57d0fc169ca04da1542d86262e7e526be079e303b8a4899bfa4b0680d38604f80263c71b33ead5bf0a60871f473c SHA512 a2c367b4b1556b16304ef0da4ed8961cc760d259da9fbdabf791ac910de4f1e9f193227f10ea4215a52c701bd0ee92311dc91d272b9364017e2f6ebde5698f72
 DIST pyo3-macros-0.19.0.crate 7177 BLAKE2B b677a41f83d7ef42add024a956cff36ce5546d677d1d3379d963be10d8de6ca3edd55165bd8965d2991788e6a12b2609c0bbdf90cdc7020faca436e5b1366eed SHA512 0591c822cb9e1b1756ad001356659a228276dbdc499e3a92290648835f01c33b0d64378710728877a730059777012c0ca9046daeef6a35a0d4a2bda4142ff6e9
-DIST pyo3-macros-backend-0.18.2.crate 48722 BLAKE2B 662822ae71702cb7d173c1ac7ead49cecde0dc4545bc3f5f30fd9ef7fab5537c13509bc8f18b2a8d05d7fa7f6fc8d0378a44d67b85edadfdf6ca153fc698a7d4 SHA512 433d9287bf3cdf84291c8d04ca5b24ecab2186379db554d6b2cf271e8716a890dcdc0717b2a00267e85dc637520559ef8e883bde2e2b16dd8cd580c1468c2dc3
 DIST pyo3-macros-backend-0.19.0.crate 49921 BLAKE2B fab6bcdd92a9f421117e68c77f7bcbd92dec5c2bfe33f2fada1e433bfa3c8fa0fb91c1ed7736bea77e91d60732186e2ac1dfd53dc7bf94ff9991c790f2417d9b SHA512 68c7ecd888c11631b20500f63b8bae3509dad2cbe0f8d628541e2e1e8b32e53150640dec894ac61e8e79218377346c461542946e1726ac92ba2d1fb6076a2d2a
 DIST python3-dll-a-0.2.6.crate 56866 BLAKE2B e8a83d0e02c281d8a626565fe1cde1158726c9ff718afb0888298454762832d47117d7a1bfd4e3e471e82ce684cd8c36d8d7ee036b07748cbf09aa915c2e046f SHA512 f64be4ed3b217d6905df5787afb3d403580eed1bffc17a251e2c8eab61aee6a187460894b568140c4d38369e77fb51c4d49f6df9127786f344b460951df249d5
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
diff --git a/dev-python/pydantic-core/pydantic-core-0.38.0.ebuild b/dev-python/pydantic-core/pydantic-core-0.38.0.ebuild
deleted file mode 100644
index c1e1239513ab..000000000000
--- a/dev-python/pydantic-core/pydantic-core-0.38.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-CRATES="
-	ahash@0.8.3
-	aho-corasick@0.7.20
-	autocfg@1.1.0
-	base64@0.13.1
-	bitflags@1.3.2
-	cc@1.0.79
-	cfg-if@1.0.0
-	enum_dispatch@0.3.11
-	form_urlencoded@1.1.0
-	getrandom@0.2.8
-	hashbrown@0.12.3
-	heck@0.4.1
-	idna@0.3.0
-	indexmap@1.9.3
-	indoc@1.0.9
-	itoa@1.0.6
-	libc@0.2.140
-	libmimalloc-sys@0.1.30
-	lock_api@0.4.9
-	memchr@2.5.0
-	memoffset@0.8.0
-	mimalloc@0.1.34
-	num-bigint@0.4.3
-	num-integer@0.1.45
-	num-traits@0.2.15
-	once_cell@1.17.1
-	parking_lot@0.12.1
-	parking_lot_core@0.9.7
-	percent-encoding@2.2.0
-	proc-macro2@1.0.56
-	pyo3-build-config@0.18.2
-	pyo3-ffi@0.18.2
-	pyo3-macros-backend@0.18.2
-	pyo3-macros@0.18.2
-	pyo3@0.18.2
-	python3-dll-a@0.2.6
-	quote@1.0.26
-	redox_syscall@0.2.16
-	regex-syntax@0.6.29
-	regex@1.7.3
-	rustversion@1.0.12
-	ryu@1.0.13
-	scopeguard@1.1.0
-	serde@1.0.159
-	serde_json@1.0.95
-	smallvec@1.10.0
-	speedate@0.8.1
-	strum@0.24.1
-	strum_macros@0.24.3
-	syn@1.0.109
-	target-lexicon@0.12.6
-	tinyvec@1.6.0
-	tinyvec_macros@0.1.1
-	unicode-bidi@0.3.13
-	unicode-ident@1.0.8
-	unicode-normalization@0.1.22
-	unindent@0.1.11
-	url@2.3.1
-	version_check@0.9.4
-	wasi@0.11.0+wasi-snapshot-preview1
-	windows-sys@0.45.0
-	windows-targets@0.42.2
-	windows_aarch64_gnullvm@0.42.2
-	windows_aarch64_msvc@0.42.2
-	windows_i686_gnu@0.42.2
-	windows_i686_msvc@0.42.2
-	windows_x86_64_gnu@0.42.2
-	windows_x86_64_gnullvm@0.42.2
-	windows_x86_64_msvc@0.42.2
-"
-
-inherit cargo distutils-r1 pypi
-
-DESCRIPTION="Core validation logic for pydantic written in Rust"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic-core/
-	https://pypi.org/project/pydantic-core/
-"
-SRC_URI+="
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="MIT"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.{9..10})
-"
-BDEPEND="
-	test? (
-		>=dev-python/dirty-equals-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/hypothesis-6.63.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-2.1.0[${PYTHON_USEDEP}]
-		>=dev-python/pydantic-1.10.4[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2022.7.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pydantic_core/_pydantic_core.*.so"
-
-src_prepare() {
-	sed -i -e '/--benchmark/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		tests/benchmarks
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	rm -rf pydantic_core || die
-	epytest -p pytest_mock -p timeout
-}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 14bdcc68cf9a..ac3cbbef1119 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,5 +1,2 @@
-DIST pydantic-1.10.7.gh.tar.gz 903379 BLAKE2B b2dd75a640ca54024a2bf141117a1d738a30a4630bed8f4d0169fc5a6a55ded719727d88c7e78b9a2acc3aec68482e9be8c8bf4776fef668fe4acc3e1fd775df SHA512 948a7935b374719773df50243aed708b3c6789243b9aa0ba239cf1502ddd0e0cec4d701e108f1cc78090c088f3cb1c78b840c39f5e7ad0e61739776f552f284d
-DIST pydantic-1.10.8.gh.tar.gz 765592 BLAKE2B 0b4cc273ce6fad20baa7c8bd87ef32199cb003f52b8e9aa19eda6359ca0e5c30152c7f25d2bb146ec23027011895cf44d9eb051c6ca609fb00e3d7b5f6089e4e SHA512 3ac41cdf0eb70fb71298131a043966b85387bc953ef2f463ece80728b46251d5d5f66c3f030afc3cdf4527918ae410fcd733a774cbe0c3b7ba9fc806a76378e4
 DIST pydantic-1.10.9.gh.tar.gz 765868 BLAKE2B 802c542d75b41ff2926215bf4f6bd68a906d581db7b08ed85577f9021d259717f3ef8dbacfe381723aa042aab8720ad182c57fee188f2436b33d21164e24ba23 SHA512 d376a302eac3427cdc8da0ed2fab01c0b5e7a059447777a53c394a60dac5fa0066488be8553022bb5aa89367d5a2e80e5d6e3cb39d9272843718dd07f6acd11e
-DIST pydantic-2.0b2.tar.gz 527380 BLAKE2B 214c740ecaed3cf4e7ed1e06d75ce17b37028e41c6a7abc4174b201691e31725123f89430c430a514c59973dc327d2b8fcd21c5ef0a47aaa48fafaf7e322d7a1 SHA512 49cc058c91e48638f9809ca77d9c486e3bdfc05e1546b19ca7e419f41e152998f750cfb58927ad8189913859d27fff68de0e5848599baaf816404e0f58fd6646
 DIST pydantic-2.0b3.tar.gz 543489 BLAKE2B 89faa3ca4187840ad2fa8025bfef8fba265eaf88e31a75751aa619e1235af08e33aa3b7a713da9e69119a43316da893b02e669d3e704781f77fe94598db40410 SHA512 db6690d15f91b635f0a4002f81cb9ba15e625ece4172bd355e5aef7058f6f385d0b3d1f7e2cab3e25aa6a5f48f6455965a1adaa18fc5a2ca5845c09804c9a3dd
diff --git a/dev-python/pydantic/pydantic-1.10.7.ebuild b/dev-python/pydantic/pydantic-1.10.7.ebuild
deleted file mode 100644
index cd280a020a3f..000000000000
--- a/dev-python/pydantic/pydantic-1.10.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=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.8.ebuild b/dev-python/pydantic/pydantic-1.10.8.ebuild
deleted file mode 100644
index 2fcb48a6cff1..000000000000
--- a/dev-python/pydantic/pydantic-1.10.8.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/_beta/b}
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-SRC_URI="
-	https://github.com/pydantic/pydantic/archive/v${PV/_beta/b}.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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+native-extensions"
-
-RDEPEND="
-	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	native-extensions? (
-		<dev-python/cython-3[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/email-validator-1.2.1[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/python-dotenv[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/CFLAGS/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then
-		# do not build extensions on PyPy to workaround
-		# https://github.com/cython/cython/issues/4763
-		local -x SKIP_CYTHON=1
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=pytest_mock
-
-	local EPYTEST_DESELECT=(
-		# flaky test, known upstream
-		tests/test_hypothesis_plugin.py::test_can_construct_models_with_all_fields
-		# mypy linting causes regressions with new mypy versions
-		tests/mypy
-	)
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				tests/test_private_attributes.py::test_private_attribute
-				tests/test_private_attributes.py::test_private_attribute_annotation
-				tests/test_private_attributes.py::test_private_attribute_factory
-				tests/test_private_attributes.py::test_private_attribute_multiple_inheritance
-				tests/test_private_attributes.py::test_underscore_attrs_are_private
-			)
-			;;
-		python3.12)
-			EPYTEST_DESELECT+=(
-				tests/test_abc.py::test_model_subclassing_abstract_base_classes_without_implementation_raises_exception
-				tests/test_generics.py::test_partial_specification_name
-				tests/test_generics.py::test_parse_generic_json
-				tests/test_types.py::test_secretfield
-			)
-			;;
-	esac
-	rm -rf pydantic || die
-	epytest
-}
diff --git a/dev-python/pydantic/pydantic-1.10.9.ebuild b/dev-python/pydantic/pydantic-1.10.9.ebuild
index f4ac3c801e6d..2d25b84eec2a 100644
--- a/dev-python/pydantic/pydantic-1.10.9.ebuild
+++ b/dev-python/pydantic/pydantic-1.10.9.ebuild
@@ -23,7 +23,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 ~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"
 IUSE="native-extensions"
 
 RDEPEND="
diff --git a/dev-python/pydantic/pydantic-2.0_beta2.ebuild b/dev-python/pydantic/pydantic-2.0_beta2.ebuild
deleted file mode 100644
index 4646b3f0b4b2..000000000000
--- a/dev-python/pydantic/pydantic-2.0_beta2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="
-	https://github.com/pydantic/pydantic/
-	https://pypi.org/project/pydantic/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pydantic-core-0.38.0[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/dirty-equals[${PYTHON_USEDEP}]
-		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# expect -Werror
-		tests/test_deprecated.py::test_extra_used_as_enum
-	)
-	local EPYTEST_IGNORE=(
-		# require pytest-examples
-		tests/test_docs.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_mock
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 9ace7df0ec90..81490be808a4 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,2 +1,2 @@
-DIST pygit2-1.12.0.tar.gz 737533 BLAKE2B 4989587e2f7cc7041e65e1080ec4eea4d749c7dcc8b8cac45e3753902d477dd2fb30f3bdb5ff73860baf587ed808bbb2c08afb3b6054bbd094fee2f7c573aab7 SHA512 885984d8bb990ca3f60024c3db10d5f0bc77939382e93ab469f77b676bd95e6f44238d7e5d08dd9d17094a45cb0880dda94b860b014607f64a23a85db60b0422
 DIST pygit2-1.12.1.tar.gz 738390 BLAKE2B 0d22cfb84cf62af32a1da76feb76da0c42ff30ae17bc9881c32553c662ac67a27bad57f545034dc1f42ef9844846b556f92b5b0e0faee63bb524dc57e73d4f9c SHA512 97f7cef7eeac3f165df8d82933854f53f842565efd764c351812ab27f35d574da9eb37628740f878540ad0be0447ad83a2ae0ed1544c615ba29485f08dd345c5
+DIST pygit2-1.12.2.tar.gz 738453 BLAKE2B 805472147021296b28f0d47f97e5b42355e2f8eb418cc48134a8c2a0c606e04bdf6ee9ddd5586949652b36d921631aaa16fb739d8491db01196c7ecb26f2ea13 SHA512 adf82f385b0cb8e239113171e7e4d75d4902828b18a04f2624c6931f7d11648ae0503d615ef5d89ddc477b94c5ac48354be223e2bde7d4c111a957e114b6a28d
diff --git a/dev-python/pygit2/pygit2-1.12.1.ebuild b/dev-python/pygit2/pygit2-1.12.1.ebuild
index ea1e9269fd00..db48757399af 100644
--- a/dev-python/pygit2/pygit2-1.12.1.ebuild
+++ b/dev-python/pygit2/pygit2-1.12.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.6*:=
diff --git a/dev-python/pygit2/pygit2-1.12.0.ebuild b/dev-python/pygit2/pygit2-1.12.2.ebuild
index db48757399af..ea1e9269fd00 100644
--- a/dev-python/pygit2/pygit2-1.12.0.ebuild
+++ b/dev-python/pygit2/pygit2-1.12.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 DEPEND="
 	=dev-libs/libgit2-1.6*:=
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 66aff33b5bbf..c5613d2f886d 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1 +1,2 @@
 DIST PyMySQL-1.0.3.gh.tar.gz 85371 BLAKE2B 4caaf486413b0fd78acc04c6856b044048c5af28e2b8f85125dda83738daeb31f621726babd8ce724b01fc3f297769f09c2c77b60540cb5c66d152c61fd725e8 SHA512 46d56399b02e61b4b31af82f96cfbb6c24e0c18f780c872bde53a818ad74d30dfe8ded1fdac97971433b0e237e1007631a9c0e38ef2cb17b6601c77f624faf8b
+DIST PyMySQL-1.1.0.gh.tar.gz 90416 BLAKE2B b1f5d38edc1ec93ddbf9f841b3db6bddb8db13bd7a6100de2104f08152e2ce7813f6ea2d09c4bc301a6b83fb3eeb3e4ce0c3b4faf42cec25b5c157ea71d719a1 SHA512 c5b2cc1716707013d06146f22ff6e36ae1e54deb8864226a65c5325bafd476d7c53076ceb5cb35815c1baeb8e0ba8d03230366662f4abc0a304e849d8cb40d34
diff --git a/dev-python/pymysql/pymysql-1.1.0.ebuild b/dev-python/pymysql/pymysql-1.1.0.ebuild
new file mode 100644
index 000000000000..e883c51ec76c
--- /dev/null
+++ b/dev-python/pymysql/pymysql-1.1.0.ebuild
@@ -0,0 +1,118 @@
+# 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
+
+MY_P="PyMySQL-${PV}"
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="
+	https://github.com/PyMySQL/PyMySQL/
+	https://pypi.org/project/pymysql/
+"
+SRC_URI="
+	https://github.com/PyMySQL/PyMySQL/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# TODO: support other mysql variants
+BDEPEND="
+	test? (
+		dev-db/mariadb[server]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# Auth tests don't support socket auth
+	find tests/ -name '*_auth.py' -delete || die
+
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local -x USER=$(whoami)
+	local -x PATH="${BROOT}/usr/share/mariadb/scripts:${PATH}"
+
+	einfo "Creating mysql test instance ..."
+	mkdir -p "${T}"/mysql || die
+	mysql_install_db \
+		--no-defaults \
+		--auth-root-authentication-method=normal \
+		--basedir="${EPREFIX}/usr" \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld_install.log || die
+
+	einfo "Starting mysql test instance ..."
+	# TODO: random port
+	mysqld \
+		--no-defaults \
+		--character-set-server=utf8 \
+		--bind-address=127.0.0.1 \
+		--port=43306 \
+		--pid-file="${T}"/mysqld.pid \
+		--socket="${T}"/mysqld.sock \
+		--datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+	# wait for it to start
+	local i
+	for (( i = 0; i < 10; i++ )); do
+		[[ -S ${T}/mysqld.sock ]] && break
+		sleep 1
+	done
+	[[ ! -S ${T}/mysqld.sock ]] && die "mysqld failed to start"
+
+	einfo "Configuring test mysql instance ..."
+
+	# note: ed25519 was removed since it fails -- upstream README indicates
+	# it can fail if we used a different server version
+	mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+		CREATE DATABASe test1 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+		CREATE DATABASE test2 DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+	' || die "Failed to create test databases"
+
+	cat > pymysql/tests/databases.json <<-EOF || die
+		[{
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test1",
+			"use_unicode": true,
+			"local_infile": true,
+			"unix_socket": "${T}/mysqld.sock"
+		}, {
+			"host": "localhost",
+			"user": "root",
+			"password": "",
+			"database": "test2",
+			"unix_socket": "${T}/mysqld.sock"
+		}]
+	EOF
+
+	nonfatal distutils-r1_src_test
+	local ret=${?}
+
+	einfo "Stopping mysql test instance ..."
+	pkill -F "${T}"/mysqld.pid || die
+
+	[[ ${ret} -ne 0 ]] && die
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires some dialog plugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthThreeAttemptsQuestionsInstallPlugin
+		pymysql/tests/test_connection.py::TestAuthentication::testDialogAuthTwoQuestionsInstallPlugin
+	)
+
+	epytest
+}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 2d43b44836a8..38497f7ae21e 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,2 +1 @@
-DIST pyopencl-2022.3.1.tar.gz 470441 BLAKE2B 86ec602f3d73a64e34fe77b7985e64db332a685b33231ad7832d7e864f3170e3eee0aed42742b9892f7950a0f672a736e169ccd0ca08a124b7f20738b348dbff SHA512 57944de69bb24f0f22fb2c0165cd4de5265f5329246fead8449d26e6cbe1204fd44ced70df9960aa54e7d285abe81d8f8a802ba62309de5f4865e882177025ae
 DIST pyopencl-2023.1.tar.gz 472581 BLAKE2B bfa25646b00b8d5c1a2fb7b98c18383e3013b9aa1573dc1bcbc1e056d3bd50d48fb35b7b74c4d87c079fe9334817ff325edd235bdd0de610373850c3ab057773 SHA512 3a6c61715338b31f9e9c3b9c8afe029e63d2689f9d52174c91cfe7383425643b3d08f5c125ab7e24ca776c86ff19d5adb7bfe56f1bd531ba443f99dcf9449244
diff --git a/dev-python/pyopencl/pyopencl-2022.3.1.ebuild b/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
deleted file mode 100644
index fa3b1e7677fb..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="
-	https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="examples opengl"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-COMMON=">=virtual/opencl-2"
-# libglvnd is only needed for the headers
-DEPEND="${COMMON}
-	opengl? ( media-libs/libglvnd )"
-RDEPEND="${COMMON}
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	test? ( dev-libs/pocl )"
-
-distutils_enable_tests pytest
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_test() {
-	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
-	local -x PYOPENCL_TEST="portable:pthread"
-	# Set the number of threads to match MAKEOPTS
-	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
-	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
-	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
-	pushd test >/dev/null || die
-	epytest
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2023.1.ebuild b/dev-python/pyopencl/pyopencl-2023.1.ebuild
index bcc6fbe33706..fa3b1e7677fb 100644
--- a/dev-python/pyopencl/pyopencl-2023.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2023.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/pyopengl/pyopengl-3.1.7.ebuild b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
index f62f41ff78c8..fee77b9b1ce5 100644
--- a/dev-python/pyopengl/pyopengl-3.1.7.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.7.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 66e8b48655db..ffaefcbf0395 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,2 +1 @@
-DIST pyopengl-227f9c66976d9f5dadf62b9a97e6beaec84831ca.gh.tar.gz 3296655 BLAKE2B 74aca52a9566eb667a36e4e75470da8eca0d4aaa42dce246bcfc4b28e3581235ca6119efaadafa4354c915046931d30bf0b2cd2d0fffb9d87611468a34704b24 SHA512 dad3b4377708d7c7331384e0b3aa3ca69ac943bb22e4136f93b7790092e29ee4cdc254295bd9243203981834bc22a7a02163523177b7f7c581f9384d55ee13c8
 DIST pyopengl-release-3.1.7.gh.tar.gz 3310131 BLAKE2B 37d64a0e0f3ced1965a7285ac7a0afb774b1e5ef630e42d86e40bb65176af7f0aa44accee50d3b32eb87a13c76535a3239359ea2c5bea385e20f1b1ec1a8b636 SHA512 a6cd28b15964e55e8a808477138ad03eb212501d9f4723603c405932963aedca83b91ff19e510ca181cc9800f2a22968b2913b70a975b7797f3bcad112c6c0b4
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6-r1.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6-r1.ebuild
deleted file mode 100644
index 4102bccec648..000000000000
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-EGIT_COMMIT="227f9c66976d9f5dadf62b9a97e6beaec84831ca"
-DESCRIPTION="Accelerate module for PyOpenGL"
-HOMEPAGE="
-	http://pyopengl.sourceforge.net/
-	https://github.com/mcfletch/pyopengl/
-	https://pypi.org/project/PyOpenGL-accelerate/"
-SRC_URI="
-	https://github.com/mcfletch/pyopengl/archive/${EGIT_COMMIT}.tar.gz
-		-> pyopengl-${EGIT_COMMIT}.gh.tar.gz"
-S=${WORKDIR}/pyopengl-${EGIT_COMMIT}/accelerate
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-python/pyopengl[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
-
-src_configure() {
-	rm src/*.c || die
-}
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
index badea25e1040..778fc5fce066 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.7.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}/accelerate
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pyopengl[${PYTHON_USEDEP}]
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 65a150a25c43..13e2e4835273 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,6 +1,3 @@
 DIST pypdf-3.10.0.gh.tar.gz 7558639 BLAKE2B 4c3bc668ae750e1ff78837459704fa24fbc8cdd90bb43c28e60140b3f3d2282d609460ec184d439d3121b284307236b8768ebc121679ed19e43efe43c5da5533 SHA512 e34072c21aa2caca7a3c99c754175fa3ccd42f69dbaaa92c52fbf1e1fb5e70245d3571305987d79f897769726c075d98313e07e9acf7817763a2522b16ddc424
 DIST pypdf-3.11.0.gh.tar.gz 7560736 BLAKE2B 171c242e819cb417004aaba6341a38e8b89eec1346d6bdf899320da220f6368e38fee268ae2a90e308fd142c33411acf89a82bf00aa1220c9c697c052255e7a1 SHA512 f2f8d6e1035a8b2d14d6750c64e46e14b119324e08a3f808e5cacb7144c5c3ce3db65248010d13d520bc57915ea0f5f9a4b78db72ae430b46f614b2c0d5f7359
-DIST pypdf-3.8.1.gh.tar.gz 7516880 BLAKE2B 87d8cd66c7efcf9624205da904290fe82f51eeb9b521903ec564467755cc9a824ab0660a41d0cbd4a1ada2e20b4b35e16ce3a73a9933aea9fc5e0f315e613709 SHA512 8b78ccc210b8f34b9556cf69cac8f2af207de9a42840a0b4c822c0ab2c0b2d468c5c20a14704d3f54c6b57bcc451c3f0b7ff54b8149616b539cb07be57482e58
-DIST pypdf-3.9.0.gh.tar.gz 7516907 BLAKE2B 12c0a13ee1ca897966bcd2f6a93b50ef1ead8d471ac9543544988a9c03c26a135a91c07b443d3a7b89fd38c302f5c2323994407fdadc23638832ca07eb7571fb SHA512 da9489bfd7c91c497852ce71050548d99fbca8118575c5eec85d55611fdafbe471c1cf7c4c8ef0e46165a89771e557c868f133af325d4672ba897fffffd43c02
-DIST pypdf-3.9.1.gh.tar.gz 7517143 BLAKE2B 81e5ff0d8997af2df3709163ad5c319bb5b9a598cfb0a2894850c658ecf3fe6bbeda7cd7f9ffaf23ce015f6235c39220fc244f826edf87114d84859950409fe3 SHA512 414a33ff29e9410b89d5f5939db841f25393bd2c66588aea67da7639517c2fd91f293b6120bd553a8fae4fb23c5b9828dac2a6ec1b649aaf9f7c0737a0f4a05a
 DIST pypdf-sample-files-69b31cff6b183a42f9081709ef9bee4047976f56.gh.tar.gz 9044391 BLAKE2B 9a9bcfbacabf3c80073a440f54736728cba4ea92d1a817ce98bcaf9375340d95e453f45207f53ac878ef5c13bc4ca7d0d4488b79f205f396e960ed042680ca01 SHA512 32b4572d60a0aadba02485f11c84712c1f5f0a75f7acd6fb27f1df00cb2a8ae338a1001e6519f66c248efbd129aba1a2ad568e930ce90bd542c8dc58f383386a
diff --git a/dev-python/pypdf/pypdf-3.10.0.ebuild b/dev-python/pypdf/pypdf-3.10.0.ebuild
index 55557b0da46b..acc7280507c7 100644
--- a/dev-python/pypdf/pypdf-3.10.0.ebuild
+++ b/dev-python/pypdf/pypdf-3.10.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pypdf/pypdf-3.8.1.ebuild b/dev-python/pypdf/pypdf-3.8.1.ebuild
deleted file mode 100644
index 56a18c7c7360..000000000000
--- a/dev-python/pypdf/pypdf-3.8.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=69b31cff6b183a42f9081709ef9bee4047976f56
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-S=${WORKDIR}/pypdf-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.9.0.ebuild b/dev-python/pypdf/pypdf-3.9.0.ebuild
deleted file mode 100644
index 5b9f95e81d6a..000000000000
--- a/dev-python/pypdf/pypdf-3.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=69b31cff6b183a42f9081709ef9bee4047976f56
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pypdf/pypdf-3.9.1.ebuild b/dev-python/pypdf/pypdf-3.9.1.ebuild
deleted file mode 100644
index 5b9f95e81d6a..000000000000
--- a/dev-python/pypdf/pypdf-3.9.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=69b31cff6b183a42f9081709ef9bee4047976f56
-DESCRIPTION="Python library to work with PDF files"
-HOMEPAGE="
-	https://pypi.org/project/pypdf/
-	https://github.com/py-pdf/pypdf/
-"
-SRC_URI="
-	https://github.com/py-pdf/pypdf/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
-			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
-	)
-"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# rely on -Werror
-	tests/test_utils.py::test_deprecate_no_replacement
-	tests/test_workflows.py::test_orientations
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
-
-python_test() {
-	epytest -o addopts= -m "not enable_socket"
-}
diff --git a/dev-python/pytest-console-scripts/Manifest b/dev-python/pytest-console-scripts/Manifest
index d3fc1527215e..e92adb7031ca 100644
--- a/dev-python/pytest-console-scripts/Manifest
+++ b/dev-python/pytest-console-scripts/Manifest
@@ -1,3 +1 @@
-DIST pytest-console-scripts-1.3.1.tar.gz 14238 BLAKE2B 2c00af468d19500078f48ca38d20430ed426e66b2277b7ad233356969d2a72d51cf60e90a46ae7808e6d33172fa053cc34d45b1f618d866dd14e917e6b225935 SHA512 344e9379976d9a7541f9683f7646b47f7fc25d2ab8d941351811ada7fddd77497cc24f4bc6a6d5ab9388dd5b289ed125bcbfad869009fb3b80aaaa1b951d656d
-DIST pytest-console-scripts-1.4.0.tar.gz 19718 BLAKE2B 51508bdd60c3100bd74611ab640e6346207d2310d60099af5ce5d5d056cb379e250e49e5cd78c65f276c43797405471c1478896543b89e9415577acf5c6bc6bc SHA512 ccfc9032a05934fb12b5f29052f5335fc37c90f5bbbc2a31b0bd422c3a04a1cc23fbc23fb3537415905ac1dba9d6ea916e2ae0b659330189f0184a8e70f4eff1
 DIST pytest-console-scripts-1.4.1.tar.gz 20994 BLAKE2B b29ca597735e912b63abbc0dff29333bc5ab8e2882432dcec0ff92f5637b9a93e68359de8f1ad7885e6673d44d4c5515d832cff1a80aaa7f3eaeb875394418eb SHA512 b96def518a8c2930f092f68c1ba4a0ea55757c38cfa9dd39dd0ffdc54127bca3a2333c39159d7723ad1b412047244fde08753652e1945509b80dcbfa00dacfbb
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.ebuild
deleted file mode 100644
index 26fb4aba990a..000000000000
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.3.1.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for testing console scripts"
-HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
-	cat > "${script}" <<-EOF
-		#!/usr/bin/env python
-		import pytest
-		import sys
-		sys.exit(pytest.console_main())
-	EOF
-	chmod +x "${script}" || die
-	epytest -x
-	rm "${script}" || die
-}
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.0.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.0.ebuild
deleted file mode 100644
index a200e76fc971..000000000000
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.0.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Pytest plugin for testing console scripts"
-HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local script="${BUILD_DIR}/install${EPREFIX}/usr/bin/pytest"
-	cat > "${script}" <<-EOF
-		#!/usr/bin/env python
-		import pytest
-		import sys
-		sys.exit(pytest.console_main())
-	EOF
-	chmod +x "${script}" || die
-	epytest -x
-	rm "${script}" || die
-}
diff --git a/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.1.ebuild b/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.1.ebuild
index b2966051bb28..042ce973f202 100644
--- a/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.1.ebuild
+++ b/dev-python/pytest-console-scripts/pytest-console-scripts-1.4.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/kvas-it/pytest-console-scripts"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
deleted file mode 100644
index eeaa626a525e..000000000000
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r3.ebuild
+++ /dev/null
@@ -1,43 +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="A goodie-bag of unix shell and environment tools for py.test"
-HOMEPAGE="
-	https://github.com/man-group/pytest-plugins/
-	https://pypi.org/project/pytest-shutil/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/path[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove unnecessary deps
-	# (contextlib2 is not used in py3)
-	sed -i -e '/path\.py/d' -e '/contextlib2/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild
index 3069ec5d10fe..c266213a3729 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r4.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"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 9d1f9c475b11..33abed93f3b6 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,2 +1 @@
-DIST pytest-subtests-0.10.0.gh.tar.gz 10253 BLAKE2B dba434dfc3f27293d5576ad408665917394ff54d41aef5604f40d787c4d7d9c6fc42b99ca10a8d46707fc8ce0eb5aab8e27bb32b464f5c9350f6bda6b12df031 SHA512 2fc3f8316db879d64d4dd4ad53df7dbda30b69df9291608eb6235aa27e9e6b3ec4174023f9ffa016811eb8955f0ebd673ead7b7319d927d18d7c016e0c7ef573
 DIST pytest-subtests-0.11.0.tar.gz 12763 BLAKE2B b1e1373d197798a9c27ed65569a681e9ea8dd36014cf6ea57a1d44ed888dca21bd8c5afffeb7f590a501d83d1bc0a8e1fe06b13832173e6937b722163614f21e SHA512 cab486252148e457e234e0dadacefa5ff38cf67df48d9c8bd61aa546a4a1e712b70dca0a270dffceede6be0f8a6324e8c21beaa4d1528b39f12bba72e077ef1d
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
deleted file mode 100644
index f09f7a9b61be..000000000000
--- a/dev-python/pytest-subtests/pytest-subtests-0.10.0.ebuild
+++ /dev/null
@@ -1,44 +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
-
-DESCRIPTION="unittest subTest() support and subtests fixture"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-subtests/
-	https://pypi.org/project/pytest-subtests/"
-SRC_URI="
-	https://github.com/pytest-dev/pytest-subtests/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytest-7[${PYTHON_USEDEP}]
-"
-# pytest-xdist is used to test compatibility
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked,pytest_subtests
-	epytest
-}
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild
index a431422ae1f5..453d0e0b7bc0 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.11.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-testinfra/Manifest b/dev-python/pytest-testinfra/Manifest
index aae2c6529d7a..9edeb078a9b6 100644
--- a/dev-python/pytest-testinfra/Manifest
+++ b/dev-python/pytest-testinfra/Manifest
@@ -1,3 +1 @@
-DIST pytest-testinfra-7.0.0.tar.gz 79296 BLAKE2B b0870cbf466627daff0ed6a3063c15c9b725fab4009fc24c3779b56765901e6b8d3a42fce429f1e42151b78d61f52c38955772e562c74d78c717a61a5fe74f04 SHA512 507d7a434c2eb159e2c36b1be3d447e386d3a4e614f2717ed8add456358f644c18f801db6774a4854e4ec7936643febd332aa4096ab26ae0080aceeff420c78e
-DIST pytest-testinfra-8.0.0.tar.gz 83448 BLAKE2B e1dcd7f685183ad0d1c79f3fe7542797f2c91839faf79e2b368c0e330aec22a420621859d419f7816b72df4aad9ac9d5ecc99d257804311d6b8b77c20b5b833b SHA512 ee8e8df7ba0422ea60d55149495a682b88a62646b6b601dd95a135a5d3a131d5cc57cb0f0cc0ff7166d004758619283480e52b8507cc2eedbc25c46a16da60b5
 DIST pytest-testinfra-8.1.0.tar.gz 84156 BLAKE2B 169ccd6afc4260f3dd42c8eff8112395adc7216cfd3e5f7abeb9b9d3db0cd766465dd94a5ca500d610db469f0e51298b6fc26f3c0ffd27f2fc215d859c99e52d SHA512 2f98cc15952c5607ecc1db76bae90aa9d299951cd1f4c5f8ba6085a7f4e6babac7f4ef4e44e089829f7382139164259007125f505c18129cc7135b840d709931
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
deleted file mode 100644
index 50ecc63626c2..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-7.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-testinfra/
-	https://pypi.org/project/pytest-testinfra/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-# Ansible is called via its CLI
-# which(1) is used as fallback when `command -v ...` returns 127
-# (which e.g. happens when dash is used as /bin/sh)
-# https://github.com/pytest-dev/pytest-testinfra/issues/668
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		$(python_gen_cond_dep '
-			app-admin/salt[${PYTHON_USEDEP}]
-		' python3_10)
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-		sys-apps/which
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x EPYTEST_DESELECT=()
-
-	# This is the only test which actually fails if salt cannot be imported
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_DESELECT+=(
-			test/test_backends.py::test_backend_importables
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.ebuild
deleted file mode 100644
index 3dd4c8117c10..000000000000
--- a/dev-python/pytest-testinfra/pytest-testinfra-8.0.0.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
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Write unit tests in Python to test actual state of your servers"
-HOMEPAGE="
-	https://github.com/pytest-dev/pytest-testinfra/
-	https://pypi.org/project/pytest-testinfra/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-"
-# Ansible is called via its CLI
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-admin/ansible
-		$(python_gen_cond_dep '
-			app-admin/salt[${PYTHON_USEDEP}]
-		' python3_10)
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pywinrm[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x EPYTEST_DESELECT=()
-
-	# This is the only test which actually fails if salt cannot be imported
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_DESELECT+=(
-			test/test_backends.py::test_backend_importables
-		)
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	elog "For the list of available connection back-ends and their dependencies,"
-	elog "please consult https://testinfra.readthedocs.io/en/latest/backends.html"
-}
diff --git a/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild b/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild
index 3dd4c8117c10..7d4b7c58eb5a 100644
--- a/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild
+++ b/dev-python/pytest-testinfra/pytest-testinfra-8.1.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-lsp-black/Manifest b/dev-python/python-lsp-black/Manifest
index 76bec82b40e6..3407923c9a61 100644
--- a/dev-python/python-lsp-black/Manifest
+++ b/dev-python/python-lsp-black/Manifest
@@ -1,2 +1 @@
-DIST python-lsp-black-1.2.1.gh.tar.gz 9355 BLAKE2B f9c70ff07d9dfa31e3af919143deb8a49f43269469e8c64525f514624f4db67636da8254dae5274685ba2d883c8ddfd6dd9cb99981a337d7837d4007f15af11c SHA512 289b8f3642ed806409671d25e32997fb473720d0abd642c58c07d8c894831fa00f56dbc39e7d0fc8d98cad7de9f95ebdb6a0f637b8b4bbcc2a0716690feb647e
 DIST python-lsp-black-1.3.0.gh.tar.gz 9781 BLAKE2B d079d7a95dff682b86df23825796d2fa6e89d1aa3e66da1452e576fd1e96a4c298da181f53840fe5fcdcbbc8a0ca55aa53cbc4885a0178b6402365ef41a239be SHA512 9e3d081ac022854626c120128949ab5e58c44f9e76ddd566e3b80a697fbc02a96f62994f43195b02f899e770768d55d223984267133eedd6f642b70560d46c09
diff --git a/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch b/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
deleted file mode 100644
index 8ecef0287f40..000000000000
--- a/dev-python/python-lsp-black/files/python-lsp-black-1.2.1-tomli.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 80d34ca4f35baa654e5f1fee7860214950f1ae37 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 26 Jan 2023 12:07:11 +0100
-Subject: [PATCH] Replace the obsolete toml package with tomllib/tomli
-
-Use the modern `tomllib` module (in Python 3.11+) or its drop-in
-replacement `tomli` (for older Python versions) instead of the obsolete
-`toml` module.  The latter is unmaintained and does not support TOML
-1.0.
----
- .pre-commit-config.yaml |  2 +-
- pylsp_black/plugin.py   | 12 +++++++++---
- setup.cfg               |  7 +++++--
- 3 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
-index 304770e..d5bd147 100644
---- a/.pre-commit-config.yaml
-+++ b/.pre-commit-config.yaml
-@@ -17,7 +17,7 @@ repos:
-   rev: v0.942
-   hooks:
-   - id: mypy
--    additional_dependencies: [black, types-pkg_resources, types-setuptools, types-toml]
-+    additional_dependencies: [black, types-pkg_resources, types-setuptools]
- - repo: https://github.com/pre-commit/pre-commit-hooks
-   rev: v4.1.0
-   hooks:
-diff --git a/pylsp_black/plugin.py b/pylsp_black/plugin.py
-index f013171..090b1b0 100644
---- a/pylsp_black/plugin.py
-+++ b/pylsp_black/plugin.py
-@@ -1,15 +1,20 @@
- import logging
- import os
-+import sys
- from functools import lru_cache
- from pathlib import Path
- from typing import Dict, Optional
- 
- import black
--import toml
- from pylsp import hookimpl
- from pylsp._utils import get_eol_chars
- from pylsp.config.config import Config
- 
-+if sys.version_info >= (3, 11):
-+    import tomllib
-+else:
-+    import tomli as tomllib
-+
- logger = logging.getLogger(__name__)
- 
- 
-@@ -154,8 +159,9 @@ def _load_config(filename: str, client_config: Config) -> Dict:
-             return defaults
- 
-     try:
--        pyproject_toml = toml.load(str(pyproject_filename))
--    except (toml.TomlDecodeError, OSError):
-+        with open(pyproject_filename, "rb") as f:
-+            pyproject_toml = tomllib.load(f)
-+    except (tomllib.TOMLDecodeError, OSError):
-         logger.warning(
-             "Error decoding pyproject.toml, using defaults: %r",
-             defaults,
-diff --git a/setup.cfg b/setup.cfg
-index 47510d5..257add6 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -18,7 +18,10 @@ classifiers =
- 
- [options]
- packages = find:
--install_requires = python-lsp-server>=1.4.0; black>=22.3.0; toml
-+install_requires =
-+    python-lsp-server>=1.4.0
-+    black>=22.3.0
-+    tomli; python_version<'3.11'
- python_requires = >= 3.7
- 
- [options.entry_points]
-@@ -26,7 +29,7 @@ pylsp = pylsp_black = pylsp_black.plugin
- 
- [options.extras_require]
- # add any types-* packages to .pre-commit-config.yaml mypy additional_dependencies
--dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools; types-toml
-+dev = isort>=5.0; flake8; pre-commit; pytest; mypy; pytest; types-pkg_resources; types-setuptools
- 
- [flake8]
- max-line-length = 88
--- 
-2.39.1
-
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
deleted file mode 100644
index d0d0ea4821e6..000000000000
--- a/dev-python/python-lsp-black/python-lsp-black-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python LSP Server"
-HOMEPAGE="
-	https://github.com/python-lsp/python-lsp-black/
-	https://pypi.org/project/python-lsp-black/
-"
-SRC_URI="
-	https://github.com/python-lsp/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/black-22.3.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tomli[${PYTHON_USEDEP}]
-		' 3.{8..10})
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tomli.patch
-)
diff --git a/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
index 9981aea7cb6a..a8e22bb2a5e7 100644
--- a/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
+++ b/dev-python/python-lsp-black/python-lsp-black-1.3.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/python-lsp-server-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pyzmq/pyzmq-25.1.0.ebuild b/dev-python/pyzmq/pyzmq-25.1.0.ebuild
index 0c9c1973b35b..2bcdf3da8d4c 100644
--- a/dev-python/pyzmq/pyzmq-25.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-25.1.0.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="drafts"
 
 # There are additional test failures if zeromq has the draft api enabled, but pyzmq has it disabled.
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index ea2805cf9a8c..503fc37d5503 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,2 +1 @@
-DIST roman-4.0.tar.gz 9380 BLAKE2B f158a9c7ed9aae2e8c3aaf8b4db9610cd437119493af87c248f8f7d2157228f2bbeb7085eb8f02d169f3e3f5221831ebb10a773d70c5dc7133d32896d5c21dbd SHA512 5421ac46fc5f49c8913a6089d51781bc0a01f2863ea2655b57adba1d07632d4e459fcb26350d0c2dfdf4a31c64a31e9fc86b22165df212c9f8db4bf41cf2e2a1
 DIST roman-4.1.tar.gz 7005 BLAKE2B de3e7dc4e05994f906b357d8db2f1149f3bf9f420552220cf1cf9427a8ae63ed3ba873b28b75dcbc1f675a370354efa5cae3ac9fb070f9b02126a2867bcefb07 SHA512 69214f35098e17bd106411036feec8a4e5c8450e394c74d60a8e3cc17c6884556347a1d2852fa174db4f66d969e71b26c066439afd6d278786d1a47bf925f302
diff --git a/dev-python/roman/roman-4.0.ebuild b/dev-python/roman/roman-4.0.ebuild
deleted file mode 100644
index 7fd97523bc38..000000000000
--- a/dev-python/roman/roman-4.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="An Integer to Roman numerals converter"
-HOMEPAGE="
-	https://pypi.org/project/roman/
-	https://github.com/zopefoundation/roman
-"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	mv "${S}/src/tests.py" . || die "moving test file failed"
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/roman/roman-4.1.ebuild b/dev-python/roman/roman-4.1.ebuild
index 00c6e41a736b..46ac10a79f36 100644
--- a/dev-python/roman/roman-4.1.ebuild
+++ b/dev-python/roman/roman-4.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/sabyenc/sabyenc-7.0.2.ebuild b/dev-python/sabyenc/sabyenc-7.0.2.ebuild
index e002a86bbf28..049ddb5262c1 100644
--- a/dev-python/sabyenc/sabyenc-7.0.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-7.0.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch b/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch
new file mode 100644
index 000000000000..248ee5299f2c
--- /dev/null
+++ b/dev-python/scipy/files/scipy-1.11.0-determinant-1x1-matrix.patch
@@ -0,0 +1,69 @@
+https://github.com/scipy/scipy/issues/18759
+https://github.com/scipy/scipy/pull/18763
+https://github.com/scipy/scipy/commit/61d892c9faa543ad80bd5e2d0bf69821188487e0
+
+From 61d892c9faa543ad80bd5e2d0bf69821188487e0 Mon Sep 17 00:00:00 2001
+From: Ilhan Polat <ilhanpolat@gmail.com>
+Date: Tue, 27 Jun 2023 12:00:38 +0200
+Subject: [PATCH] MAINT:linalg.det:Return scalars for singleton inputs (#18763)
+
+--- a/scipy/linalg/_basic.py
++++ b/scipy/linalg/_basic.py
+@@ -1001,7 +1001,8 @@ def det(a, overwrite_a=False, check_finite=True):
+     det : (...) float or complex
+         Determinant of `a`. For stacked arrays, a scalar is returned for each
+         (m, m) slice in the last two dimensions of the input. For example, an
+-        input of shape (p, q, m, m) will produce a result of shape (p, q).
++        input of shape (p, q, m, m) will produce a result of shape (p, q). If
++        all dimensions are 1 a scalar is returned regardless of ndim.
+ 
+     Notes
+     -----
+@@ -1066,11 +1067,17 @@ def det(a, overwrite_a=False, check_finite=True):
+ 
+     # Scalar case
+     if a1.shape[-2:] == (1, 1):
+-        if a1.dtype.char in 'dD':
+-            return np.squeeze(a1)
++        # Either ndarray with spurious singletons or a single element
++        if max(*a1.shape) > 1:
++            temp = np.squeeze(a1)
++            if a1.dtype.char in 'dD':
++                return temp
++            else:
++                return (temp.astype('d') if a1.dtype.char == 'f' else
++                        temp.astype('D'))
+         else:
+-            return (np.squeeze(a1).astype('d') if a1.dtype.char == 'f' else
+-                    np.squeeze(a1).astype('D'))
++            return (np.float64(a1.item()) if a1.dtype.char in 'fd' else
++                    np.complex128(a1.item()))
+ 
+     # Then check overwrite permission
+     if not _datacopied(a1, a):  # "a"  still alive through "a1"
+--- a/scipy/linalg/tests/test_basic.py
++++ b/scipy/linalg/tests/test_basic.py
+@@ -930,6 +930,23 @@ class TestDet:
+     def setup_method(self):
+         self.rng = np.random.default_rng(1680305949878959)
+ 
++    def test_1x1_all_singleton_dims(self):
++        a = np.array([[1]])
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[[1]]]], dtype='f')
++        deta = det(a)
++        assert deta.dtype.char == 'd'
++        assert np.isscalar(deta)
++        assert deta == 1.
++        a = np.array([[[1 + 3.j]]], dtype=np.complex64)
++        deta = det(a)
++        assert deta.dtype.char == 'D'
++        assert np.isscalar(deta)
++        assert deta == 1.+3.j
++
+     def test_1by1_stacked_input_output(self):
+         a = self.rng.random([4, 5, 1, 1], dtype=np.float32)
+         deta = det(a)
diff --git a/dev-python/scipy/scipy-1.11.0-r1.ebuild b/dev-python/scipy/scipy-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..956ea7d2cf45
--- /dev/null
+++ b/dev-python/scipy/scipy-1.11.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED=fortran
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=meson-python
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 multiprocessing
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="
+	https://scipy.org/
+	https://github.com/scipy/scipy/
+	https://pypi.org/project/scipy/
+"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	# Need submodules, so git for now.
+	EGIT_REPO_URI="https://github.com/scipy/scipy"
+	EGIT_BRANCH="maintenance/$(ver_cut 1-2).x"
+	EGIT_SUBMODULES=( '*' )
+else
+	inherit pypi
+
+	# Upstream is often behind with doc updates
+	DOC_PV=${PV}
+
+	SRC_URI+="
+		doc? (
+			https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${DOC_PV}.zip
+		)"
+
+	if [[ ${PV} != *rc* ]] ; then
+		KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+IUSE="doc +fortran test-rust"
+
+# umfpack is technically optional but it's preferred to have it available.
+DEPEND="
+	>=dev-python/numpy-1.21.6[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:=
+	sci-libs/umfpack
+	virtual/cblas
+	>=virtual/lapack-3.8
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.35[${PYTHON_USEDEP}]
+	>=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}]
+	>=dev-util/meson-1.1.0
+	dev-util/patchelf
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	test-rust? (
+		dev-python/pooch[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-determinant-1x1-matrix.patch
+)
+
+src_unpack() {
+	default
+
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=(
+		-Dblas=blas
+		-Dlapack=lapack
+		-Duse-pythran=$(usex fortran true false)
+	)
+}
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+
+	local EPYTEST_DESELECT=(
+		# Network
+		scipy/datasets/tests/test_data.py::TestDatasets::test_existence_all
+		scipy/datasets/tests/test_data.py::TestDatasets::test_ascent
+		scipy/datasets/tests/test_data.py::TestDatasets::test_face
+		scipy/datasets/tests/test_data.py::TestDatasets::test_electrocardiogram
+
+		# Precision issue with diff. blas?
+		scipy/optimize/tests/test__basinhopping.py::Test_Metropolis::test_gh7799
+	)
+	local EPYTEST_IGNORE=()
+
+	if ! has_version -b "dev-python/pooch[${PYTHON_USEDEP}]" ; then
+		EPYTEST_IGNORE+=(
+			scipy/datasets/tests/test_data.py
+		)
+	fi
+
+	epytest -n "$(makeopts_jobs)" scipy
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e8a2fb4e351a..6119f8461965 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,2 @@
-DIST setuptools-67.7.2.tar.gz 2491608 BLAKE2B bd77a85081e95813cdd8fc1f63b768c73036b2f49103defcfd09ba9df7b2c5dba84d4f1aca553e0642ab8d764ae390310f1c6bebbae31736d1b5c16802cdc0e5 SHA512 06db096193ef52111f064c327daefb12ea2bb2ebc6712436bae01f986165455fe89a1d2220cbaaa6391a182e2aee19b9cf7a709c158af8c5ab6232dfbc258bd9
 DIST setuptools-67.8.0.tar.gz 2492475 BLAKE2B 37c34605a58b41e14300e389402fe6debf9eeed20c72ddf53fa798b41484d1522d2b5313c74eb69a687eaf32c225f0931f901f452aebf6f7023b2419d127b808 SHA512 5dda7082fc563ce73d810efc9cdbccb8649fef2eac52f1a902c76ab5ec67a87ff64e36e918d0e3b168f5214d787bdc22e8ef9adeccb77d8d368dcbb48f5fb35d
 DIST setuptools-68.0.0.tar.gz 2194111 BLAKE2B 614a1c69f640ce8d0e510c444e058fecd3810421983a03cd345e43e1148799bed7e5d53ac689a4fe3ce3174d16f2bb719236bd5442b5f06ffc7659d0f4c7d15f SHA512 da6d535a0db6eaf477c8c2148efbc2100fd88a14f3adad44d20e22bf52bee3f00fe86547ea650fe653519bd6ff5f9ef033a55bb3a05fed041e88e78cdfb81d7e
diff --git a/dev-python/setuptools/setuptools-67.7.2.ebuild b/dev-python/setuptools/setuptools-67.7.2.ebuild
deleted file mode 100644
index 56878b0bc43d..000000000000
--- a/dev-python/setuptools/setuptools-67.7.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
-EAPI=8
-
-# please bump dev-python/ensurepip-setuptools along with this package!
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="
-	https://github.com/pypa/setuptools/
-	https://pypi.org/project/setuptools/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-text-3.7.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-8.12.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/nspektr-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/ordered-set-4.0.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3-r2[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.6.2-r1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib-metadata-4.11.1[${PYTHON_USEDEP}]
-	' 3.9)
-"
-BDEPEND="
-	${RDEPEND}
-	>=dev-python/wheel-0.37.1-r1[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			>=dev-python/ini2toml-0.9[${PYTHON_USEDEP}]
-			>=dev-python/filelock-3.4.0[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-envs-2.2[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/pip-run[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-timeout[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-"
-
-DOCS=( {CHANGES,README}.rst )
-
-src_prepare() {
-	local PATCHES=(
-		# TODO: remove this when we're 100% PEP517 mode
-		"${FILESDIR}"/setuptools-62.4.0-py-compile.patch
-	)
-
-	distutils-r1_src_prepare
-
-	# remove bundled dependencies, setuptools will switch to system deps
-	# automatically
-	rm -r */_vendor || die
-
-	# remove the ugly */extern hack that breaks on unvendored deps
-	rm -r */extern || die
-	find -name '*.py' -exec sed \
-		-e 's:from \w*[.]\+extern ::' -e 's:\w*[.]\+extern[.]::' \
-		-i {} + || die
-}
-
-python_test() {
-	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
-		return
-	fi
-
-	local EPYTEST_DESELECT=(
-		# network
-		# TODO: see if PRE_BUILT_SETUPTOOLS_* helps
-		setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg
-		setuptools/tests/integration/test_pip_install_sdist.py::test_install_sdist
-		setuptools/tests/test_build_meta.py::test_legacy_editable_install
-		setuptools/tests/test_distutils_adoption.py
-		setuptools/tests/test_editable_install.py
-		setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
-		setuptools/tests/test_virtualenv.py::test_clean_env_install
-		setuptools/tests/test_virtualenv.py::test_no_missing_dependencies
-		setuptools/tests/test_virtualenv.py::test_test_command_install_requirements
-		# TODO
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_basic
-		setuptools/tests/config/test_setupcfg.py::TestConfigurationReader::test_ignore_errors
-		setuptools/tests/test_extern.py::test_distribution_picklable
-		# expects bundled deps in virtualenv
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist
-		setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel
-		setuptools/tests/test_editable_install.py::test_editable_with_pyproject
-		# fails if python-xlib is installed
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# fails with importlib-metadata-6.6.0
-		setuptools/tests/test_egg_info.py::TestWriteEntries::test_invalid_entry_point
-	)
-
-	if has_version "<dev-python/packaging-22"; then
-		EPYTEST_DESELECT+=(
-			# old packaging is more lenient
-			setuptools/tests/config/test_setupcfg.py::TestOptions::test_raises_accidental_env_marker_misconfig
-		)
-	fi
-
-	epytest -n "$(makeopts_jobs)" setuptools
-}
diff --git a/dev-python/setuptools/setuptools-67.8.0.ebuild b/dev-python/setuptools/setuptools-67.8.0.ebuild
index f60f1a166f5e..c9d74fc5bc7a 100644
--- a/dev-python/setuptools/setuptools-67.8.0.ebuild
+++ b/dev-python/setuptools/setuptools-67.8.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.1.ebuild b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.1.ebuild
index b72aaa78a13b..81e47380c74a 100644
--- a/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.1.ebuild
+++ b/dev-python/sphinx-argparse-cli/sphinx-argparse-cli-1.11.1.ebuild
@@ -23,6 +23,6 @@ BDEPEND="dev-python/hatch-vcs[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 
 src_configure() {
-	distutils-r1_src-configure
+	distutils-r1_src_configure
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 8ebc993a6e27..bc6b7d68da1e 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -2,3 +2,4 @@ DIST sphinx-autodoc-typehints-1.22.gh.tar.gz 35429 BLAKE2B d871de3d3a37b2632e6b4
 DIST sphinx_autodoc_typehints-1.23.0.tar.gz 35945 BLAKE2B 4af9ddd722a1fc59d52009ef46ad7af828d826cce61e0bce260b68045d4abe3b184ffc0368b29f60eba210def8d8b3b37a5455442c156b326d4b9956c6afc32c SHA512 990db1f042913088fddf56cbc9ad5f401f7d886164c348aaf19fd1541fa1566a2d58d1c182e52d839d1dd32606ca3da1191b7062a6ed9c8f04dc6a47efaf5488
 DIST sphinx_autodoc_typehints-1.23.1.tar.gz 36243 BLAKE2B e53dc42a31e358ca1e3fbbe41a3002abd4e1f470ed259d5b0b6f8def81de91653d1cb609e44dc10409340775ca877ea394e4fba1a5f2c3a38c10ce33996e12c8 SHA512 fe10d0ae4d23a979125868fd6743b37d2f65e1297620142c13cb59b83ba242e4b45098cc580c18232be1b535f5927ba6dd401f7cd4d3a39c2aab3611a2a751ed
 DIST sphinx_autodoc_typehints-1.23.2.tar.gz 36198 BLAKE2B 15c47e89e50a1a88878f2ec5c511900ad5f0437975c041c99a33f2cc9e29de955b897bd6f853b010c0f8185cd669be9e8de351ee654e9bd640337a5771caeb62 SHA512 27e9a4179f050444dfbd3d4648212f1d56c47a938f8e33dded9121c5cd4637b4e2096eb383bbf663078223dc46973f3e0fcd02ecd162611d353ef5d702977f48
+DIST sphinx_autodoc_typehints-1.23.3.tar.gz 36290 BLAKE2B 11469aba26e8f146debe9e383d330c14bcbdde5c053fad45b189ae553a622d3ba25ac9ebc855c8dcfa7ab9ec8570db4e9fca3ecb6cab8f8396ee5ddb319d6db1 SHA512 013736d566d80027d40c381065125d429026788613c3dfd43311e8a33031c3a2f6161a0366b675259b4fac3c401658a9235c9f1c19abc2a220f27f0bead50b3f
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.3.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.3.ebuild
new file mode 100644
index 000000000000..9367b43a299c
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.23.3.ebuild
@@ -0,0 +1,38 @@
+# 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} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension"
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/sphinx-5.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nptyping-2.5[${PYTHON_USEDEP}]
+		>=dev-python/sphobjinv-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/typing-extensions-4.5[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index c1bab91286e0..f19c73e34f72 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,2 +1 @@
-DIST sympy-1.11.1.gh.tar.gz 13462495 BLAKE2B a45320d087057595d3574490c6dc07bcdf7870543e9adcbaca9abe293d84875c123bbc91a7263a87b0b71568dece4e1304b6bf76f60ae64e353520f0ca686b1f SHA512 6cc720b673cf31a2e8f56a5cae24ec15024ea43dee92196adb0a87f28561b5d2404fbbfd3d55a8414930a31d4d0f4a731d458ad528c8cbb03c37555f5c14ce4a
 DIST sympy-1.12.gh.tar.gz 7212937 BLAKE2B 1d37a019e7a6700e69e16d6ca7fdc563711165fc226ac6ec745d20fa6dc689ee9ea01a92549d851aacff763230872c2d1d0cb5bde581c4f960f5de515ffb5f06 SHA512 96a89b88f6912d70c56f5bd1903dd3c518963118ff25d033cdcb7da2f260b8ee209d3ab4a4394dd2b5dc0b4585b71ccd55d55c8e5c6e28024cccbedf07ee4360
diff --git a/dev-python/sympy/files/sympy-1.11-no-deprecated-threading-event-api.patch b/dev-python/sympy/files/sympy-1.11-no-deprecated-threading-event-api.patch
deleted file mode 100644
index eaffd3f1fbe1..000000000000
--- a/dev-python/sympy/files/sympy-1.11-no-deprecated-threading-event-api.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Patch back-ported from the sympy git repo
-url: https://github.com/sympy/sympy/commit/b89ca436cf25e2a1caf82c9d33221d06698d0ff5
-
-commit b89ca436cf25e2a1caf82c9d33221d06698d0ff5
-Author: Chris Kerr <chris.kerr@mykolab.ch>
-Date:   Thu Sep 22 19:32:27 2022 +0300
-
-    Replace deprecated .isSet() method with .is_set()
-    
-    Fixes https://github.com/sympy/sympy/issues/24074
-
-diff --git a/sympy/plotting/pygletplot/plot_mode_base.py b/sympy/plotting/pygletplot/plot_mode_base.py
-index c1c2b0a6ec..2c6503650a 100644
---- a/sympy/plotting/pygletplot/plot_mode_base.py
-+++ b/sympy/plotting/pygletplot/plot_mode_base.py
-@@ -269,7 +269,7 @@ def _calculate_all(self):
-         self._calculate_cverts()
- 
-     def _calculate_verts(self):
--        if self._calculating_verts.isSet():
-+        if self._calculating_verts.is_set():
-             return
-         self._calculating_verts.set()
-         try:
-@@ -280,9 +280,9 @@ def _calculate_verts(self):
-             self.bounds_callback()
- 
-     def _calculate_cverts(self):
--        if self._calculating_verts.isSet():
-+        if self._calculating_verts.is_set():
-             return
--        while self._calculating_cverts.isSet():
-+        while self._calculating_cverts.is_set():
-             sleep(0)  # wait for previous calculation
-         self._calculating_cverts.set()
-         try:
-@@ -291,7 +291,7 @@ def _calculate_cverts(self):
-             self._calculating_cverts.clear()
- 
-     def _get_calculating_verts(self):
--        return self._calculating_verts.isSet()
-+        return self._calculating_verts.is_set()
- 
-     def _get_calculating_verts_pos(self):
-         return self._calculating_verts_pos
-@@ -300,7 +300,7 @@ def _get_calculating_verts_len(self):
-         return self._calculating_verts_len
- 
-     def _get_calculating_cverts(self):
--        return self._calculating_cverts.isSet()
-+        return self._calculating_cverts.is_set()
- 
-     def _get_calculating_cverts_pos(self):
-         return self._calculating_cverts_pos
diff --git a/dev-python/sympy/sympy-1.11.1-r2.ebuild b/dev-python/sympy/sympy-1.11.1-r2.ebuild
deleted file mode 100644
index 6aa332f495e8..000000000000
--- a/dev-python/sympy/sympy-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://www.sympy.org/"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
-
-RDEPEND="
-	dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	aesara? ( $(python_gen_cond_dep 'dev-python/aesara[${PYTHON_USEDEP}]' python3_{9..10}) )
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-python/lxml[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11-no-deprecated-threading-event-api.patch"
-)
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.12.ebuild b/dev-python/sympy/sympy-1.12.ebuild
index 8f05349d4946..cfc5ed26fbef 100644
--- a/dev-python/sympy/sympy-1.12.ebuild
+++ b/dev-python/sympy/sympy-1.12.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
 
 RDEPEND="
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 49cdc45c391d..f19c231f2c0c 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,4 +1 @@
-DIST trimesh-3.21.6.gh.tar.gz 12691963 BLAKE2B 518d8d73268ed40f03fba48fb1e07f5ccf8801bc779dbe99261670e61f291de5f549a078de5de392da2754b08735eb7bcfe9716f541bde94296e6f48edf2e44e SHA512 65b348d334f7770f74e48bbed15f613b71fc0ba101c51a868bcd6becd315aa4a13f76722b2de84f6624b37b4d617dcc418f92ab19acb5e7f1992834bc0a5b96c
-DIST trimesh-3.21.7.gh.tar.gz 12692942 BLAKE2B 3b4b7919b8c0abc6b8fc744d09f1e15ce31f50d3654f35b88444b49d6fe38f862e36cfe62ff4e31df5aacff07e8045c5ed11110b3c656304648d06cebbc8b6e5 SHA512 671af8927617239a5a4412e68051bfc7336d3006ece827d376b3e5add48eb4fcd28cd51f5bc41e92f9c6b94616e80566197165f406cdf8ca5e7d02679c0c1bfd
-DIST trimesh-3.22.0.gh.tar.gz 12693485 BLAKE2B 86d66288dd390163c9bc585df668cd85ff16afadee3c4f308500b917dc3a445212e7ae53895376c33836f4ccdf18ed39ce2c74ac7466b9194b3969801908866b SHA512 8d9327f27615344d3752c534f0d628201b1c7a9dbf85ab5408da73005283dd9a7ef0beb325cb6b383b20a0ab140376ad0669926e00c7577b31e6ca479701a93c
 DIST trimesh-3.22.1.gh.tar.gz 12713271 BLAKE2B 2c70087aff546682cc82d5f99f981153ab0dfb3d180f13071f87d79b70ec8e97ca936af0053e865717771e1abb8469fb4a57b81f5aed860fbce35ac609470cab SHA512 27952e0d29ccd110d4087b4144e0923706bed3cd0734e7a17d7f55738c6322849c5dad04ab4ecfe0638bc16d65d1e647d08905a396dd6ebd1f78c833a8b95636
diff --git a/dev-python/trimesh/trimesh-3.21.6.ebuild b/dev-python/trimesh/trimesh-3.21.6.ebuild
deleted file mode 100644
index d4061d813454..000000000000
--- a/dev-python/trimesh/trimesh-3.21.6.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 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.21.7.ebuild b/dev-python/trimesh/trimesh-3.21.7.ebuild
deleted file mode 100644
index 50458139f318..000000000000
--- a/dev-python/trimesh/trimesh-3.21.7.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 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.22.0.ebuild b/dev-python/trimesh/trimesh-3.22.0.ebuild
deleted file mode 100644
index 50458139f318..000000000000
--- a/dev-python/trimesh/trimesh-3.22.0.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 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="
-	https://trimsh.org/
-	https://github.com/mikedh/trimesh/
-	https://pypi.org/project/trimesh/
-"
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs)"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.22.1.ebuild b/dev-python/trimesh/trimesh-3.22.1.ebuild
index 50458139f318..d4061d813454 100644
--- a/dev-python/trimesh/trimesh-3.22.1.ebuild
+++ b/dev-python/trimesh/trimesh-3.22.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/trove-classifiers/Manifest b/dev-python/trove-classifiers/Manifest
index eafb18715e0a..45705d7d16a0 100644
--- a/dev-python/trove-classifiers/Manifest
+++ b/dev-python/trove-classifiers/Manifest
@@ -1,3 +1 @@
-DIST trove-classifiers-2023.5.2.tar.gz 15835 BLAKE2B 788c6e05c498dcaa21cc51f0bfbcd5e3637b56c5cb0f481b9c9c746caa092f578ff7b8947f620518bdbca8a7fbbe67b8806b0c56c219a9b25d2f44647dbb0f60 SHA512 6f1e9e31a40ddd701048613c128b765a6b920480f5f3f2f678102277ac0b230ecd9dc135f9dda5ed115abbdacc3098ac2d75564004df0e8cae04b12335b309bb
-DIST trove-classifiers-2023.5.22.tar.gz 15853 BLAKE2B b7170a53287ffa6086aa5223128a9d66cb9cc6d7a3b76f8b47cb5cab835d9f47cb98cfd1436ba8bbe057043751e5685899dfda9fdd61c6a14e4d04f00789b227 SHA512 c665b2255afc2e9acc537a7d650648d34ab3438baaf33bb0c9a535942ee8750c0795fda89fa28d29f5232e62e957795947b0d908fc7e06bbdce2cc7dd1cc26bf
 DIST trove-classifiers-2023.5.24.tar.gz 15856 BLAKE2B 37184092e2ec7c068a73d47f0708124b92d54abd4015da5ccbe2b914699f7f93ffaaf1422b84745c0c76aa377adab9c4759348789c55300772c80892afc5c6da SHA512 6017d32ffb63f8ac85d616c55a9317aa8f3cecbddcdfaabffbd6ba98a60f964ceeb28424881f2cebdf891aad2b6d7d1ade78202ca6e9bec697ce446647d09897
diff --git a/dev-python/trove-classifiers/trove-classifiers-2023.5.2.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.2.ebuild
deleted file mode 100644
index 5ef2f6feeeeb..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.5.2.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="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.5.22.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.22.ebuild
deleted file mode 100644
index 82ea3f8b6aaf..000000000000
--- a/dev-python/trove-classifiers/trove-classifiers-2023.5.22.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="~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.5.24.ebuild b/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
index 09579592a8fb..17221ba3698c 100644
--- a/dev-python/trove-classifiers/trove-classifiers-2023.5.24.ebuild
+++ b/dev-python/trove-classifiers/trove-classifiers-2023.5.24.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/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index 18d6c273bf53..98592f53816a 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,4 +1 @@
-DIST typing_extensions-4.5.0.gh.tar.gz 52431 BLAKE2B 3d905e4f1146d23d00b695044daf653722fce9ade8f44730116bab0b8fb15c3e8d2124a6b0d395fad078878e0e4b7888e19660ca2491ccc9ec01dc11ce318fc8 SHA512 29369da83cdca57aba7d8c2089c77ad265eeb614fd34056f678e6dc9374558d1059ff2c514326115734fadbcad27ec98e1e5fcec087022a9d838cc2bfd1fe825
-DIST typing_extensions-4.6.0.gh.tar.gz 70037 BLAKE2B e5a287e839dc932b3f5777a8c575e725d414cbd5ff1444a9f67c8898866eb3863b0de4f107c5ffe73756d37e47b7a1dae4d69fead42fb887126479891bff5b17 SHA512 d78188c52ea6bf77852c5ac3e4601f9fca6fe3247974269ced8dc53e9b8c971446ff5501558200000757336a84d73db1e6e9fe89afd7cc26e025a97426475bb4
-DIST typing_extensions-4.6.1.gh.tar.gz 71263 BLAKE2B 4c4b91fd92620f9cbefd807103d035ebad46f3c384fc4a5b7f6fc9f0209ad267e2b752992628fa537f6ef2191e598223794ddd915d4a3ea89fd6a67dead346ea SHA512 c75553e7e5ade1f9e60a5432c76207452ede2c39533e9cd696e10ff36068e14bf0fe809a31a4a5d0a228228300e30d221af698c093c35dcc67338615ac77aaf7
 DIST typing_extensions-4.6.3.gh.tar.gz 75114 BLAKE2B 2c6761d26de5ce4a09c2957e93225798d282dcbc5689921f72acd2ccc338e458e21b2b73884af4a329c65f1a7eed7898e13e87fdab7fce757b4927adcdb09770 SHA512 4c8dd4e1494ed504466f3188146059203f9ce37b8f2d9f70929c1bffa7e58bee87c3ef01162cedb55ba3fd048cec0da96cc4141b25ba76dc32c7d493a69efeab
diff --git a/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.5.0.ebuild
deleted file mode 100644
index 063dcfe36a35..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.5.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=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.0.ebuild
deleted file mode 100644
index 399105ea958e..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.6.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=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.1.ebuild
deleted file mode 100644
index 399105ea958e..000000000000
--- a/dev-python/typing-extensions/typing-extensions-4.6.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=flit
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-DESCRIPTION="Backported and Experimental Type Hints for Python 3.7+"
-HOMEPAGE="
-	https://pypi.org/project/typing-extensions/
-	https://github.com/python/typing_extensions/
-"
-SRC_URI="
-	https://github.com/python/typing_extensions/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-distutils_enable_tests unittest
-
-python_test() {
-	cd src || die
-	eunittest
-}
diff --git a/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild b/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild
index 399105ea958e..063dcfe36a35 100644
--- a/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-4.6.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 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 unittest
 
diff --git a/dev-python/u-msgpack-python/Manifest b/dev-python/u-msgpack-python/Manifest
index b17c820034ee..d2047dd3ecf5 100644
--- a/dev-python/u-msgpack-python/Manifest
+++ b/dev-python/u-msgpack-python/Manifest
@@ -1,2 +1 @@
-DIST u-msgpack-python-2.7.2.tar.gz 20654 BLAKE2B 0365e4e778c9979d9154d8a267ba3bdaad9b2ef808723d2ae89e078fc0c8d76aebab234f1723985cf3b288274123e49571607599d6087ea234e3e8dc11e3a302 SHA512 e5d35bc03e5c23cfbaf9cc7f6459576e89b5dd19661ddff2a4ab5de2751e0b73c17e4685c6fead15ce2bf100b2250a3ba7cb10a7fa3f23debfa2141f4370b623
 DIST u-msgpack-python-2.8.0.tar.gz 18167 BLAKE2B 9cd0bf2a7dca8eac4c990e320a5d3c325ea31867c82a46d588c8e9bfae1feef504916f8cb75d3f2ed2adb3fa13c03c07fca91071d5d9a6d6ab47686539d704bf SHA512 61dd332c9f72db65a6a949e2acdc668ab01981b3eb1e9fd58e506d35d47f5f656b9d0abec92ae0e4d949bab063aeff75c205b92758275d99dbbe5f65f15241b9
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
deleted file mode 100644
index 9b58cf9b9af0..000000000000
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.7.2.ebuild
+++ /dev/null
@@ -1,22 +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="A portable, lightweight MessagePack serializer and deserializer"
-HOMEPAGE="
-	https://github.com/vsergeev/u-msgpack-python/
-	https://pypi.org/project/u-msgpack-python/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild b/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
index d6b55c31532b..9b58cf9b9af0 100644
--- a/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
+++ b/dev-python/u-msgpack-python/u-msgpack-python-2.8.0.ebuild
@@ -17,6 +17,6 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index bcca1e1d7901..7cb8130e51b3 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,4 +1,3 @@
-DIST vcrpy-4.2.1.gh.tar.gz 331180 BLAKE2B 345e4c148963e2109d02be4e96986083236bd29fa8049c7cc54483f12d0506cde5c116b6f2fe80e099599b22a73e2f6240f7bb91e4a7d8af7f4e8e741097160d SHA512 59231e5164cda3099b18d099f0ef97e062e6401e52e5dfc4022aa89ca02881e9e6e3c782f12c288f5281b3b3bf175dc33a267bc6d2b40791582a1221f5d7aaab
-DIST vcrpy-4.3.0.gh.tar.gz 331605 BLAKE2B 92f995d21d986c20445ca6200778e9097fce7d4e44e8812018d5bf04b5f8f93bacf922f5332af59d3e147d6f43d8e3ab4afbbd65ba1314b760479029a64d01bd SHA512 772eb9cf23336ff961fc381a878a4e3e7a1cd81bbd6282f5a945536fd1c6b6d866fecfcfa582c9305de045e953186fea857a18d9f66012be36833d3a489b52ec
 DIST vcrpy-4.3.1.gh.tar.gz 332412 BLAKE2B c2de3c9c3398bfe132b8a103566c6b1f48532d909d9c015b02349ef1283757ac75a31730f35b66ba211aaa1c015ffdf026da388a0a272deac2736e9e57d8ef32 SHA512 3ba3354ec0f1b8985890e70c6adff3416350adfa9dfec1db99051c2e1271f321bddf6e2dcd736a77ef953b71e4b5b0555cf05273443231e87a180f52b2372c9a
 DIST vcrpy-4.4.0.gh.tar.gz 335402 BLAKE2B 1b32105ec7f319ea32318ce7193a433afa0e5e3da36531aa1d9a414b669150feb34490ea575f728569b622e740c42f73e22590ffda9aa9ed33a0bee2e11ac8ec SHA512 0b322cd688a9896cfd74ffd32de9560de9109a103989e04204868382b060621910ae0f0df456e1ed53576ecd8bb1e1f0c4c5d1500f4f6d291772f505ba36deba
+DIST vcrpy-5.0.0.gh.tar.gz 336090 BLAKE2B f8460956456c332be24736153326651a319f3c25f8a38aab27f5a39ff9e312d0643ce702951cd906e735cbaa7c469cc948ce7599a37c767ef379fa10ff5ff69e SHA512 dcf1564b9e8640fe4998d13f4a74a892c6ac152bade6db2b040577e7a3b5e83b87f02a3ea93d58d3102ec6bbd6e452f5bd85c03273fb67fd6800caf87b5f3c6b
diff --git a/dev-python/vcrpy/vcrpy-4.2.1.ebuild b/dev-python/vcrpy/vcrpy-4.2.1.ebuild
deleted file mode 100644
index 841c8c350589..000000000000
--- a/dev-python/vcrpy/vcrpy-4.2.1.ebuild
+++ /dev/null
@@ -1,58 +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="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httplib2.py::test_effective_url
-		tests/integration/test_httpx.py
-		tests/integration/test_urllib2.py::test_effective_url
-		tests/integration/test_urllib3.py::test_redirects
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest
-}
diff --git a/dev-python/vcrpy/vcrpy-4.3.0.ebuild b/dev-python/vcrpy/vcrpy-4.3.0.ebuild
deleted file mode 100644
index 2d5e063a5c02..000000000000
--- a/dev-python/vcrpy/vcrpy-4.3.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
-HOMEPAGE="
-	https://github.com/kevin1024/vcrpy/
-	https://pypi.org/project/vcrpy/
-"
-SRC_URI="
-	https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-# <urllib3-2 for https://github.com/kevin1024/vcrpy/issues/688.
-RDEPEND="
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httplib2.py::test_effective_url
-		tests/integration/test_httpx.py
-                tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times
-		tests/integration/test_urllib2.py
-		tests/integration/test_urllib3.py::test_redirects
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
-	)
-
-	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest
-}
diff --git a/dev-python/vcrpy/vcrpy-4.3.1.ebuild b/dev-python/vcrpy/vcrpy-4.3.1.ebuild
index 69e077a36940..44f8516f17c4 100644
--- a/dev-python/vcrpy/vcrpy-4.3.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-4.2.1-r1.ebuild b/dev-python/vcrpy/vcrpy-5.0.0.ebuild
index e56176b8fbc5..0cafdb0e75b3 100644
--- a/dev-python/vcrpy/vcrpy-4.2.1-r1.ebuild
+++ b/dev-python/vcrpy/vcrpy-5.0.0.ebuild
@@ -22,13 +22,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
-# <urllib3-2 for https://github.com/kevin1024/vcrpy/issues/688.
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
 	dev-python/yarl[${PYTHON_USEDEP}]
 "
@@ -42,18 +41,13 @@ distutils_enable_tests pytest
 
 python_test() {
 	local EPYTEST_DESELECT=(
-		# these tests require Internet
-		tests/integration/test_aiohttp.py
-		tests/integration/test_boto.py
-		tests/integration/test_httplib2.py::test_effective_url
-		tests/integration/test_httpx.py
-		tests/integration/test_urllib2.py::test_effective_url
-		tests/integration/test_urllib3.py::test_redirects
-		tests/integration/test_wild.py::test_amazon_doctype
-		tests/integration/test_wild.py::test_flickr_should_respond_with_200
-		tests/unit/test_stubs.py::TestVCRConnection::testing_connect
+		# these tests are failing with recent dev-python/werkzeug; losely related:
+		# https://github.com/kevin1024/vcrpy/issues/645
+		tests/integration/test_record_mode.py::test_new_episodes_record_mode_two_times
+		tests/integration/test_urllib2.py::test_random_body
+		tests/integration/test_urllib2.py::test_multiple_requests
 	)
 
 	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
-	epytest
+	epytest -m 'not online'
 }
diff --git a/dev-python/wheezy-template/metadata.xml b/dev-python/wheezy-template/metadata.xml
index 8c8101bcdb2c..736a1167c898 100644
--- a/dev-python/wheezy-template/metadata.xml
+++ b/dev-python/wheezy-template/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>core@liguros.net</email>
-  <name>Development</name>
- </maintainer>
  
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 6be7f5e13390..6512b8974a11 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,3 +1,2 @@
-DIST xarray-2023.4.2.tar.gz 3692437 BLAKE2B d4fb5b184386bb7e9574ea3bdf484c3df82b9dca1fcd2380ac65b6a58da9f89da057d70efa9bd045b5cf6900c38f6aa4176fd2990cfe1369f987c452711307d6 SHA512 581b06a677b80c0f7e494a80ae52d75bd62bf613b13b7b7215458ceef727fb55a898c8da8cc6f8a6875ef6898007897eea8be55fb138f1dacad42965bbf1d956
 DIST xarray-2023.5.0.tar.gz 3707468 BLAKE2B 55ee416c41aff8edcb609adcac1c0a2e1d4ae896c25ae3d771d755930725f69f854feac42c42558db598acc5d0a852370198908d85d5af9664c485052948f4ca SHA512 ab6538b280f05acc296d8d73003e07f494d330a2a6a486d2f3dac121aee9682e2fa46c05be868b23a31584c908e0f6454757bdac7ec032d3a6f79a4500c0629f
 DIST xarray-2023.6.0.tar.gz 3711562 BLAKE2B 3b6b20cf0046aaeeafe87980c6c107486d79afd2881c4f98b42c17025f0d448763d37b5d5fd71cf17fcfcfbdc2d3337e985c7517038547300f4cf57ffe1aea98 SHA512 2b1b48bd90935a3b56f5f017085d40cc10081efbe0a84c908d1203066f29b4bf16fc89e771d961f26009bb20a84a59f4b9d99e42b5e25b2bbd8eca55a80839d6
diff --git a/dev-python/xarray/xarray-2023.4.2.ebuild b/dev-python/xarray/xarray-2023.4.2.ebuild
deleted file mode 100644
index 348dc3dfa353..000000000000
--- a/dev-python/xarray/xarray-2023.4.2.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} )
-
-inherit distutils-r1 multiprocessing pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.4[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# warning-targeted tests are fragile and not important to end users
-	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-	# TODO: segv in netcdf4-python
-	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
-	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
-	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
-	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
-	xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
-)
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p xdist.plugin -n "$(makeopts_jobs)"
-}
diff --git a/dev-python/xarray/xarray-2023.5.0.ebuild b/dev-python/xarray/xarray-2023.5.0.ebuild
index f64c9aa706f2..348dc3dfa353 100644
--- a/dev-python/xarray/xarray-2023.5.0.ebuild
+++ b/dev-python/xarray/xarray-2023.5.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/xcffib-1.4.0.ebuild b/dev-python/xcffib/xcffib-1.4.0.ebuild
index 33b94f403353..3322af8ae649 100644
--- a/dev-python/xcffib/xcffib-1.4.0.ebuild
+++ b/dev-python/xcffib/xcffib-1.4.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	x11-libs/libxcb
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 1b744c059415..78fbdcce71e8 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1 @@
-DIST XlsxWriter-RELEASE_3.1.0.gh.tar.gz 36681465 BLAKE2B 13a9a03f49714136556c24b2e20bdac6366179a242fe4190abeec95859f572e47928f50543b8b8639662d8053f49d2fcc818ed3a74106d1773ff75c363024e13 SHA512 97ecc110bb5fd8b72ed66e9415ea6488a0d52505d93722b268258ecd299c21e872b4db2228dc6581da3e8b4ae93ca5252bff448c290de4232d4e5792aa8e43c4
-DIST XlsxWriter-RELEASE_3.1.1.gh.tar.gz 36691990 BLAKE2B 5341a2699fec7015003a602fca08483cff68cfa6f782c41d49f1801b4aab1a332048cb9ddb02fba0bb69a227cdcb22279e9fccf9b6808220724066e26886c0bc SHA512 c827bdaefd962864e09673b891ec267da89306f65ea29ccab1807af8ed89f22721d6ca296b7b83d4099bdeadf4508f576e6e618828ffc8abed1d38b3c84c6076
 DIST XlsxWriter-RELEASE_3.1.2.gh.tar.gz 36697835 BLAKE2B 055d0ac2e70ce5f86167f630044136f984bf19b494cb2ea5d7b98ce2098942e4c89eb0c3c3a8eeb48b1a4dcff30b71d45c2f2528634ed2f652d27f358d4778f7 SHA512 05f70721e6c55d54acdc143681ec581d3bf16c5d07725790bc648c169507e3cd9bd600ac4fcb4ff03fa449a6efc469d0745b92fcdb89afbf27ee1e2998c09613
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.0.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.0.ebuild
deleted file mode 100644
index 40da2a81fa57..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.0.ebuild
+++ /dev/null
@@ -1,28 +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
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild
deleted file mode 100644
index 5878ec751f37..000000000000
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.1.ebuild
+++ /dev/null
@@ -1,28 +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
-
-TAG=RELEASE_${PV}
-MY_P=XlsxWriter-${TAG}
-DESCRIPTION="Python module for creating Excel XLSX files"
-HOMEPAGE="
-	https://github.com/jmcnamara/XlsxWriter/
-	https://pypi.org/project/XlsxWriter/
-"
-SRC_URI="
-	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild
index 5878ec751f37..40da2a81fa57 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.1.2.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/yaql/metadata.xml b/dev-python/yaql/metadata.xml
index d6f4aa612aed..05a03af2fc77 100644
--- a/dev-python/yaql/metadata.xml
+++ b/dev-python/yaql/metadata.xml
@@ -13,6 +13,8 @@
 		querying functions and can be extend even further with user-specified
 		functions. YAQL is written in python and is distributed via PyPI.
 	</longdescription>
- 
+ <upstream>
+  <remote-id type="launchpad">yaql</remote-id>
+ </upstream>
  <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-06-27 18:20:01 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2023-06-27 18:20:01 +0000
commit	074bd56693f106fd6a9ed2e6e44cfa50dff79e83 (patch)
tree	429c2efd67050b943548a721e3876b03042218fe /dev-python
parent	c1f2af78d7929d71d43cf63191638ede4ba5b853 (diff)
download	baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.tar.gz baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.tar.xz baldeagleos-repo-074bd56693f106fd6a9ed2e6e44cfa50dff79e83.zip