68 files changed, 416 insertions, 1232 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5bb7f3516be1..9708ed3dc8c8 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 3d473ee3e4df..9b3b52413f3d 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,3 @@
-DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
-DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
 DIST coverage-7.2.2.tar.gz 812407 BLAKE2B 901ed01eb8411e01c3386dcecccf975f4ac0e46c14fd2c6086bcf83647ff7e26deccb3926f173a207ef2851c0f8c5f99874659a1ba2e16f85b6eb9a1ac23142c SHA512 7d2ba6540ca42c3a72b65343348a64c58156bac915434249fd8740a6727ebf034590f62a5557f6b2f76e67ed1adc2a153ce61eee71f3bc903538c440e080e3e7
-EBUILD coverage-7.1.0.ebuild 1879 BLAKE2B b23b76f71ed197fada5e15ea5987f5e352f016ef1744e664b76acf52b9424721d0ef30291ded16faf1bb41b19011edd3649210ff383579eae9baeeaa263fbdb8 SHA512 0c80cc5065ed1b2d1881a522bfc9690ecf86b3c2121cb5bd0307a78341b7974fdd737d576f2aac98488ae7c67641a255c3017f5ed655867101be28a07e78c6e8
-EBUILD coverage-7.2.1.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
-EBUILD coverage-7.2.2.ebuild 1840 BLAKE2B f07c3f549bed3742ea7e32db73a74937a58721a70602d437089b523134e4174cb65d52f3e6261aa531d55271da979422933e358b96208ef36786773998ed4966 SHA512 f6656da1a9bf31d979174c8e69afdea17fe1eb545809829943037b778999f82dc5a2bac23f81977b230e3430111c79aec2324577bdd494f788388b0330670157
+EBUILD coverage-7.2.2.ebuild 1832 BLAKE2B 5a4540dc4b17fe66765bca0408a099d0ca734b625757c70049af7cc2f30d4092b0fc70e161270d6644b776b7c622ee21878bad0d91b96603fab1f8b96b586e7d SHA512 b84e6b6b431d2b3f48ccb28ad2fca97f46eb9f7c5e1427a58d1184c3a185bb1fe92aded01eb7b4180b3726e6a6855d7d595e00ed6f7b058c72b6858cee96fd6d
 MISC metadata.xml 771 BLAKE2B 38e9680d0851f70050aad987714a9dd2f95178b0bc3d794dc08726c0618d1ea98be32a413ac397f4b222e8a5d8fdc747b7f1677bcfe842bac4080537e85a03a9 SHA512 8c44c40348fe5d416d8b4016fe22cc9ae0b94fbaf181deb79aa737f87271992521b710c1208d0eeb7ef92d96fc8a7daac1ec6feb1ae081a80f13327b5b094064
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
deleted file mode 100644
index f45105fbf16b..000000000000
--- a/dev-python/coverage/coverage-7.1.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_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-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::' setup.cfg || 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_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.1.ebuild b/dev-python/coverage/coverage-7.2.1.ebuild
deleted file mode 100644
index b83e4bdd6609..000000000000
--- a/dev-python/coverage/coverage-7.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+),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::' setup.cfg || 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_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.2.ebuild b/dev-python/coverage/coverage-7.2.2.ebuild
index b83e4bdd6609..d46c144045b8 100644
--- a/dev-python/coverage/coverage-7.2.2.ebuild
+++ b/dev-python/coverage/coverage-7.2.2.ebuild
@@ -18,7 +18,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/django/Manifest b/dev-python/django/Manifest
index bd9c27d54fee..4701846fede4 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,5 @@
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
+AUX django-3.2.18-py311.patch 6716 BLAKE2B 6937c7dad0b4435906923cf08c47198d1d2046efbdc98dbcd914e66a6d72ea1d80393df71632e97f4f8aa3fdbc0e9cd63f4036dfc21833d9ce62de49986f76b9 SHA512 fb8c57bc1bcac563a6572ba54c2cb8ee98e6290ac44d75a380c841c048021e464aa85e60a41652d58094e21ec5b4ec4d677bbf9ce686fcbf1ea3e0999fe92c13
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
 AUX django-4.0.5-py311.patch 9279 BLAKE2B 3082f4f9da3f127807402a55655b059019787143dd8c2cb14b1a27d2fbf66464179c2f08381284340fccb4e6bc1c25a1e36291a0dd8cbd83c754ee1f78d220b8 SHA512 d48f29fa5fe9e434a4220825d1592a03a0667d956db4e6c4119e74f91524b8d02b295a5a600516a993adc2dd3e1f5ca4bde83acd8a6a8e0838382116d2703a28
 DIST Django-3.2.18.checksum.txt 2563 BLAKE2B 8deb25cdc9f3a859b68925b7c8615bf3bf955f0c5db7558818fc9177c2a5d5f588b848bb15094d5f2d1f9a92693204ddc753ef25411d328e8c7f755f93184b54 SHA512 b5fb24a525c10bbb1f82074b9637e4ddd68ec8bd80c3676f326f4be41a81643cb539c13123447895f6a3639d8938f70f009de31752eb5753ca1dc3dd162d9f92
@@ -7,6 +8,7 @@ DIST Django-4.0.10.checksum.txt 2563 BLAKE2B 1ec93751204e80d75f5f4f15086cfd9aabe
 DIST Django-4.0.10.tar.gz 10430363 BLAKE2B d36aefd5d00023e5c4e34dda2b283e9a82d9e3b82576ce00cef7d9b75837ffdbf56327ad21ccefb02b79e8db93f12cf850541f4cb1d01b3dd28bdea0c73cb9d6 SHA512 04d1b207af21067c22c120486ff57ea602b3436adf1871f691735825afb30c3ed62f1cbc98d92fa70e9a818bcf50db70d949ab0c460f48f6027b75df9eba56c7
 DIST Django-4.1.7.checksum.txt 2554 BLAKE2B 5a82eca5edb5b5d90c629c6d42414725b32ed55fc137cfb3fc9c5bfd392dc0fcc3f6b99eea64a16a88002a521bf910464a6fe11d9079d68e056acded3432be38 SHA512 4244abf4e81aec1f8daa7815f57483963e94cf67571f0c2f6ab67507515c7f6f72f86412a17c8e1e73170e1ed7d3d4503c5adba36c66d0b8f015350c81348116
 DIST Django-4.1.7.tar.gz 10520415 BLAKE2B 88b66fea737f6fb1661a6987b9d6cecb84d58d675655a0ea5bed60ee28252edd11d8025498b7bc854b9c0c4814148bdc3bcdf59014dd040b5c424c3cd1711e46 SHA512 e34b0b05209297164d6cb84e7edf4740a2d638496c3107c06c0e773db292e9b02e6abbd8c3da347addaf17d9c9a56ef4873eb9edc5f1164e3d13d7f3ef083844
+EBUILD django-3.2.18-r1.ebuild 3109 BLAKE2B 8967ad33dff40ddd1612b05961e6645209ccd32d54ccabc54b742e2d3fa433b75c4db8be2f5a45ad2871ff3b9e5a6456ff04ba3c4dd5c48273bf7638bf03e4ea SHA512 2d4ceadad34853196663694f33afd6ec317892f55247d5c448a53e37ecbabe02094d1041d64b4814ead805646c12477a1cb4bc9634344bbda38e5d225bc37af0
 EBUILD django-3.2.18.ebuild 3064 BLAKE2B 9870d944334ad12adc96f2701d6e72edcd684312f6dea6eeb10bc7e5f78278f819fd053e7ba5de8cf35998e962b2a05f4529b6177818336afc7825b9cd393a0b SHA512 0ca7d17d5b52120f9589a0b9e9802749603b2cdcf58a5697c55341e63a626bf95810daaf2e4ac4821113d39fbd4a0cba9657969f5d740d91080a2fe4d1aeff05
 EBUILD django-4.0.10.ebuild 3028 BLAKE2B 062bd71385c3ea131706367b812f5102e1e8f82dcbd0b51f07b4a4ebf900cdb5c77451ea22ef79703831276f2f6b4dd71aac6817c59b78e90aae2c362fd0efce SHA512 02870c3cb88491fabd91553acf07f95afd3a2d133603de01320c5607337ed5466ab6efa3459ef2cae3d9d7736e39f70d1a449ebf7d9eaafcdd499f36c30f9ad4
 EBUILD django-4.1.7.ebuild 2881 BLAKE2B 27dcb7fcad3b27c80714598b17dbc1b32f1ec13494f070cd44922ce72739ade4b2345594bae780eec5dc97dd8e2c58755ebe582aa4b5145e5556ffd6ce2df903 SHA512 1e0a4eacd93b27b2812ab210911b2f94d3e21f7f0ae987c107e56deb1df9ed4caefc071a5a10bf5f39e66550e70ac8bfc1ee5024cbf1653b0954a9fbb1c6d51d
diff --git a/dev-python/django/django-3.2.18-r1.ebuild b/dev-python/django/django-3.2.18-r1.ebuild
new file mode 100644
index 000000000000..bc404dde5670
--- /dev/null
+++ b/dev-python/django/django-3.2.18-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${P^}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${P^}.checksum.txt )
+"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	"${FILESDIR}"/django-3.2.18-py311.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${P^}.checksum.txt" sha256 "${P^}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py || die
+	# TODO: this suddenly started failing
+	sed -i -e 's:test_custom_fields:_&:' tests/inspectdb/tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-3.2.18-py311.patch b/dev-python/django/files/django-3.2.18-py311.patch
new file mode 100644
index 000000000000..2cebb8cc817b
--- /dev/null
+++ b/dev-python/django/files/django-3.2.18-py311.patch
@@ -0,0 +1,153 @@
+From 2882cf6f184c7578219e2b5266623e82c0e9b8a2 Mon Sep 17 00:00:00 2001
+From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
+Date: Thu, 7 Apr 2022 07:02:21 +0200
+Subject: [PATCH] Refs #33173 -- Fixed test_runner/test_utils tests on Python
+ 3.11+.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Python 3.11 uses fully qualified test name in unittest output. See
+https://github.com/python/cpython/commit/755be9b1505af591b9f2ee424a6525b6c2b65ce9
+
+(rebased by Michał Górny)
+---
+ django/utils/version.py             |  1 +
+ tests/test_runner/test_debug_sql.py | 30 ++++++++++++++++++-----------
+ tests/test_runner/test_parallel.py  | 11 ++++++++---
+ tests/test_utils/tests.py           |  9 +++++++--
+ 4 files changed, 35 insertions(+), 16 deletions(-)
+
+diff --git a/django/utils/version.py b/django/utils/version.py
+index 74c327525e..0c2bfc626e 100644
+--- a/django/utils/version.py
++++ b/django/utils/version.py
+@@ -15,6 +15,7 @@ PY37 = sys.version_info >= (3, 7)
+ PY38 = sys.version_info >= (3, 8)
+ PY39 = sys.version_info >= (3, 9)
+ PY310 = sys.version_info >= (3, 10)
++PY311 = sys.version_info >= (3, 11)
+ 
+ 
+ def get_version(version=None):
+diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py
+index 0e8e4207d6..2b5fed7a76 100644
+--- a/tests/test_runner/test_debug_sql.py
++++ b/tests/test_runner/test_debug_sql.py
+@@ -4,6 +4,7 @@ from io import StringIO
+ from django.db import connection
+ from django.test import TestCase
+ from django.test.runner import DiscoverRunner
++from django.utils.version import PY311
+ 
+ from .models import Person
+ 
+@@ -100,20 +101,27 @@ class TestDebugSQL(unittest.TestCase):
+             '''"test_runner_person"."first_name" = 'subtest-fail';'''),
+     ]
+ 
++    # Python 3.11 uses fully qualified test name in the output.
++    method_name = ".runTest" if PY311 else ""
++    test_class_path = "test_runner.test_debug_sql.TestDebugSQL"
+     verbose_expected_outputs = [
+-        'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingTest) ... FAIL',
+-        'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorTest) ... ERROR',
+-        'runTest (test_runner.test_debug_sql.TestDebugSQL.PassingTest) ... ok',
++        f"runTest ({test_class_path}.FailingTest{method_name}) ... FAIL",
++        f"runTest ({test_class_path}.ErrorTest{method_name}) ... ERROR",
++        f"runTest ({test_class_path}.PassingTest{method_name}) ... ok",
+         # If there are errors/failures in subtests but not in test itself,
+         # the status is not written. That behavior comes from Python.
+-        'runTest (test_runner.test_debug_sql.TestDebugSQL.FailingSubTest) ...',
+-        'runTest (test_runner.test_debug_sql.TestDebugSQL.ErrorSubTest) ...',
+-        ('''SELECT COUNT(*) AS "__count" '''
+-            '''FROM "test_runner_person" WHERE '''
+-            '''"test_runner_person"."first_name" = 'pass';'''),
+-        ('''SELECT COUNT(*) AS "__count" '''
+-            '''FROM "test_runner_person" WHERE '''
+-            '''"test_runner_person"."first_name" = 'subtest-pass';'''),
++        f"runTest ({test_class_path}.FailingSubTest{method_name}) ...",
++        f"runTest ({test_class_path}.ErrorSubTest{method_name}) ...",
++        (
++            """SELECT COUNT(*) AS "__count" """
++            """FROM "test_runner_person" WHERE """
++            """"test_runner_person"."first_name" = 'pass';"""
++        ),
++        (
++            """SELECT COUNT(*) AS "__count" """
++            """FROM "test_runner_person" WHERE """
++            """"test_runner_person"."first_name" = 'subtest-pass';"""
++        ),
+     ]
+ 
+     def test_setupclass_exception(self):
+diff --git a/tests/test_runner/test_parallel.py b/tests/test_runner/test_parallel.py
+index c1a89bd0f0..0f1adcf208 100644
+--- a/tests/test_runner/test_parallel.py
++++ b/tests/test_runner/test_parallel.py
+@@ -2,7 +2,7 @@ import unittest
+ 
+ from django.test import SimpleTestCase
+ from django.test.runner import RemoteTestResult
+-from django.utils.version import PY37
++from django.utils.version import PY37, PY311
+ 
+ try:
+     import tblib
+@@ -78,8 +78,13 @@ class RemoteTestResultTest(SimpleTestCase):
+         self.assertEqual(len(events), 4)
+ 
+         event = events[1]
+-        self.assertEqual(event[0], 'addSubTest')
+-        self.assertEqual(str(event[2]), 'dummy_test (test_runner.test_parallel.SampleFailingSubtest) (index=0)')
++        self.assertEqual(event[0], "addSubTest")
++        self.assertEqual(
++            str(event[2]),
++            "dummy_test (test_runner.test_parallel.SampleFailingSubtest%s) (index=0)"
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".dummy_test" if PY311 else ""),
++        )
+         trailing_comma = '' if PY37 else ','
+         self.assertEqual(repr(event[3][1]), "AssertionError('0 != 1'%s)" % trailing_comma)
+ 
+diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
+index 9255315e98..8f72057afe 100644
+--- a/tests/test_utils/tests.py
++++ b/tests/test_utils/tests.py
+@@ -26,6 +26,7 @@ from django.test.utils import (
+ )
+ from django.urls import NoReverseMatch, path, reverse, reverse_lazy
+ from django.utils.deprecation import RemovedInDjango41Warning
++from django.utils.version import PY311
+ 
+ from .models import Car, Person, PossessedCar
+ from .views import empty_response
+@@ -78,9 +79,11 @@ class SkippingTestCase(SimpleTestCase):
+             SkipTestCase('test_foo').test_foo,
+             ValueError,
+             "skipUnlessDBFeature cannot be used on test_foo (test_utils.tests."
+-            "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase) "
++            "SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase%s) "
+             "as SkippingTestCase.test_skip_unless_db_feature.<locals>.SkipTestCase "
+             "doesn't allow queries against the 'default' database."
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".test_foo" if PY311 else ""),
+         )
+ 
+     def test_skip_if_db_feature(self):
+@@ -122,9 +125,11 @@ class SkippingTestCase(SimpleTestCase):
+             SkipTestCase('test_foo').test_foo,
+             ValueError,
+             "skipIfDBFeature cannot be used on test_foo (test_utils.tests."
+-            "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase) "
++            "SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase%s) "
+             "as SkippingTestCase.test_skip_if_db_feature.<locals>.SkipTestCase "
+             "doesn't allow queries against the 'default' database."
++            # Python 3.11 uses fully qualified test name in the output.
++            % (".test_foo" if PY311 else ""),
+         )
+ 
+ 
+-- 
+2.40.0
+
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 732429c1e51b..b91cfaaf928a 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,7 +1,3 @@
-DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
-DIST dkimpy-1.1.0.tar.gz 66326 BLAKE2B 3af2ab63351c117b7fa0fd2c7a2f2a98b2177511af61734d171fb69e25c5a3d629d95f8ba2832b66f57607ff447a4093ab8ebd58c931975e9ca0c1bab9469590 SHA512 d8c656d1adabbf8ef2121a36a848818ee9ce5ac9fe42c4b16ef50588870478989159f4ff3aa422ba0556a82763a9e78fde5e19195fe0b95176f2f4ff1d60c70e
 DIST dkimpy-1.1.1.tar.gz 66368 BLAKE2B 6b9107129a0857a384d90b9c7d3970177aa32edaaeb41d62dd4edc6fdf7e8c16e3160162aaed074f865d476dc3f7f20ad299f7034858c0fc59ef88c651552ae4 SHA512 46db739f48f5b3aa1605f12822bef61286767b8770685d5056fcebf8475f9cbc78265c792a0371226ffaa97a55703acc6f6ae63c44944cf29a392c8bf51d49b9
-EBUILD dkimpy-1.0.5-r1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
-EBUILD dkimpy-1.1.0.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
-EBUILD dkimpy-1.1.1.ebuild 767 BLAKE2B 8960217a56f673459968760888226b9b4f6f98db17d268ce589e578661fa4ac2612fa1acb617d2c44f33bdaea5c2305392decb213fa1dab7281814c6020bf7c5 SHA512 ce8c5728bf2076458fbcc7270de55a43695899c5db046d3984e707c5da687a54a5fdfaeed394adbefa02ac26b51dc31015fc3c9071e8153faffcdf1125c681db
+EBUILD dkimpy-1.1.1.ebuild 764 BLAKE2B 685f28d69261fddddc280e1cfd415006b4922c0a5d98693db4da248c875af4786aad094cbfad8268d732004b4eff003efadc654b871e5bcc572a54c33d0a09d2 SHA512 c612ba54b0e88755784ccfeaa77a1dddd07a4c97aaa7987133ff42ea482c53a9ee22fea0dbf6c62316df29b7dbcaf819cd15f36dffe252dda67089ac7e4daecf
 MISC metadata.xml 538 BLAKE2B c0b9cb73f84e5f3e6cb6653b0983a0ef5002ad9c1a201b36f6ccbfb150d15990820562b18eef385e571f024b4e44f8572b30eaea57e93df44bbb6105df7abd11 SHA512 1c650532a9c9152eef0803c1c29781095390aca93c036cc097dcf6b16ad0d5ff9938ed48cb12ab092d0df777fbb6f7ca6626be7dc10935ac2563332869e6d511
diff --git a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild b/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
deleted file mode 100644
index 02377b6d1896..000000000000
--- a/dev-python/dkimpy/dkimpy-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="DKIM and ARC email signing and verification library"
-HOMEPAGE="
-	https://launchpad.net/dkimpy/
-	https://pypi.org/project/dkimpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/authres[${PYTHON_USEDEP}]
-		dev-python/pynacl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "ARC support" dev-python/authres
-	optfeature "ed25519 capability" dev-python/pynacl
-	optfeature "asyncio support" dev-python/aiodns
-}
diff --git a/dev-python/dkimpy/dkimpy-1.1.0.ebuild b/dev-python/dkimpy/dkimpy-1.1.0.ebuild
deleted file mode 100644
index 7a71236ad9dd..000000000000
--- a/dev-python/dkimpy/dkimpy-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="DKIM and ARC email signing and verification library"
-HOMEPAGE="
-	https://launchpad.net/dkimpy/
-	https://pypi.org/project/dkimpy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/authres[${PYTHON_USEDEP}]
-		dev-python/pynacl[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-pkg_postinst() {
-	optfeature "ARC support" dev-python/authres
-	optfeature "ed25519 capability" dev-python/pynacl
-	optfeature "asyncio support" dev-python/aiodns
-}
diff --git a/dev-python/dkimpy/dkimpy-1.1.1.ebuild b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
index 7a71236ad9dd..02377b6d1896 100644
--- a/dev-python/dkimpy/dkimpy-1.1.1.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 23763b28dadc..4f4ae3b2d1dd 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,5 +1,3 @@
-DIST python-fastjsonschema-2.16.2.gh.tar.gz 391619 BLAKE2B ea8da31d16ec7c9a897de0b2a91832ce26798d2dc048e70e862ce7a4e75787cd25ee4b9e14fac9f85599e050338b6306a2549a0a8bab9abcbfbd12c246d10697 SHA512 17fce033e6d334e82813af7366006ade29433efe291a1567ae494c2273b9ab87b8fa4ccf1bae0b7062f9f70fe492449c87a5d07075d79037ac2c755ed9278a23
 DIST python-fastjsonschema-2.16.3.gh.tar.gz 392011 BLAKE2B 04990592a2bf6e1309bf725361ef7c2e253c4765c5b9d60805c5e6189f14885a3b0bae98945c2fe228adc335ca8c8c0a243b283b24fa447238d6415d439288e2 SHA512 2e26f31f9c6966e77f70b8ca584e672d554219b6bbb4811e3ac8dff1c693b2638ef08b8b9011e0db6f739be02e2f41a35d15bcfc42a9cb06ddb4521e51f37d8a
-EBUILD fastjsonschema-2.16.2.ebuild 735 BLAKE2B 94bcee2f1a4811ab16315197b74e60bcc5232848006a58e442f4105441c1e1552a8d4b8904b605762e32e22717cdb0620b53ea5ab3d1cc13734324dbd8de0d55 SHA512 1eb0f21c326f933c4a61fa576036e81b0ee8b37c2a81eaaba59b282bf3aada26f11e1b16a814bcd195631ad65117b780404e249c4698359e039a54a0298b912f
-EBUILD fastjsonschema-2.16.3.ebuild 743 BLAKE2B 577283d575d6632fea86d4d12e4ee72633d21958a104d9cdff35bed327512d5720c6b400a2b6c395b2c73a377624153e0f49fd573a94458e6ce08dc44df16c92 SHA512 b7378494fa66d7168967e2087ad4c3b5baa729d26e53eb4d46ecdadb4a7f752e5a8740a40fadd2ae11410edd3f6ea99d6aa3c6790579662d9ea702fc4d4416a8
+EBUILD fastjsonschema-2.16.3.ebuild 735 BLAKE2B 94bcee2f1a4811ab16315197b74e60bcc5232848006a58e442f4105441c1e1552a8d4b8904b605762e32e22717cdb0620b53ea5ab3d1cc13734324dbd8de0d55 SHA512 1eb0f21c326f933c4a61fa576036e81b0ee8b37c2a81eaaba59b282bf3aada26f11e1b16a814bcd195631ad65117b780404e249c4698359e039a54a0298b912f
 MISC metadata.xml 390 BLAKE2B d29071ddcb0aea8db343c2924de51e8fdbf9295898c687ca0f474e007007407c9a402cd2fa74f0f2142dfb2f14a2cfd0c51c05f5fad6891734328a003283821f SHA512 db3339aaba0218ebea0ea4cd5b950dbf74572b18341f595fbbbe1f67c0c9c23413f4a98aeec5b49b036533cfea46e8f2a74f5f999c3b4c472a66297346139b05
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild
deleted file mode 100644
index 3f001b904f00..000000000000
--- a/dev-python/fastjsonschema/fastjsonschema-2.16.2.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_{9..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.16.3.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
index 453a2cbc2332..3f001b904f00 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.16.3.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 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/genson/Manifest b/dev-python/genson/Manifest
index 75bfc3ac93c7..c902d94ccdee 100644
--- a/dev-python/genson/Manifest
+++ b/dev-python/genson/Manifest
@@ -1,3 +1,7 @@
+AUX genson-1.2.2-test.patch 1022 BLAKE2B 9ee212400676b1b836384cf427ad28690efdb96c49e830e281b7990b86c8b3ffc78df3bd3e159872f1c40dd49d63d49341a1415b6f56a73f7e5cebc223d73311 SHA512 4b47824c054112627b8309b6b28f11adff43664af73ab0a9d09f9a4ae80cbdf3fe0b4f716eea5c5628b716b4ea75bafb5377ab4fbf67552b58b846b6aff0a1b2
 DIST genson-1.1.0.tar.gz 26662 BLAKE2B 726b0467edca9ca503d73c914d35392f0784ae8be01a8287b84da3cd5ae4b4cd6e12a46b1a7baf73db40377b915ddb3c4b53f4a135e3923fa775af5b51a5261c SHA512 54264dcc51cd5ece9bd428079fcd5cf833f32ef36afbb7987de9982d33253834c5c8c35d18b21ad4003fc2ffac4da02965a00844457b7d8ca6c6bf3d3facb8d6
-EBUILD genson-1.1.0.ebuild 485 BLAKE2B a4b17b18c7ee9644d8ba18be2b87f6310b1977e61b63562104dadb291499cd38a0845fdcd58dc4cd23dae31acbcdd41a1c329357d21e6b40bd71608ba4f4e7f5 SHA512 44cb05439beda04e13c15baa0a50b1563cb2400f17d8ac354f7e9ea01e997ab0f9e8f60f5e81b4a1deb1817582d8a9659edeecc06dfc26120fd688e20768c858
-MISC metadata.xml 375 BLAKE2B 0e93c042675a4c689c7672e9a581196869d9a087eb181aab7ae4bc0cfb9ac805c5643b593e0cb51813ab622e9d5445f406635b4a853bd646848db18bc5c70b27 SHA512 be2b0a5b866f9081c440d43f715b0057b2fa5e86e1f19ce6c00552c8abe6cbe77726e0a70fca196ea60ed6d794142d62cd374699c2b5f2f8cad81ab02384d17d
+DIST genson-1.2.2.tar.gz 34387 BLAKE2B 2e3c3b0fd96d93fe1e7244c11828dfb42d8e9bd97058a1b76d983e02094b2e62560e00b08e2ce1d21abf7e858f481a9e2a5678d51b27162fde1d60535031f54e SHA512 9caf1936518db5ffb412c6b1f1d28b33e9aef2e6f9b2fe50bcc2932a75522dcbc57bf7bc6b3df41244ee470060295a92fb6ba0be9f6fcf512950a81615f85f87
+EBUILD genson-1.1.0-r1.ebuild 682 BLAKE2B f190ed82975a9e33094c5cd972d75ed8d5c3ea95a24a67ec15be28a9111c0fdbb98c0e0ebbdd18839e19b2d7d542064261861992d09f9cd32b7effe73311b42d SHA512 2a2eb1b8ad3aec8cc09dc01216ed80e11d4547c015f16c6090729a74fbde872969e1a174a013cc044326fdabf38d74b9d1495033120b2ff4b6fda44991354668
+EBUILD genson-1.1.0.ebuild 639 BLAKE2B 0cfdfad15ead5623f96f1d8fc715771a351f5ad64f0bc5db9173cc63b7e972cc04453de969b0580770651f5579976586855afc0ec8b3b3d185dac7293c2f62fd SHA512 718d6d7acf04dd68095ab6a33a9b44abba4d9b044476efb6f23bc398c8577b7930bf1c823e5051a942c4bb740d36ee223c1fa52f41e23240c603b2590ede7901
+EBUILD genson-1.2.2.ebuild 794 BLAKE2B 48e06e939b2d2ca05eb49c2296724517171d609caa003484304a633c721cf8e592b19bf14ba2c15a6aadd211a091694666c9a3d932189e3eb6f03f2164b0f21d SHA512 1e44a6b45a3c02c6b01a0a7b73da3073fc30e949dd98633a492593f7ad00265ab0a736334323e117d21559534eb324af02b482fdbc6eb553da61b21802bb5081
+MISC metadata.xml 500 BLAKE2B 027d4e156ceba078374f8669b9cd4f731c7e9f477a786adffc117f830244eaffe74d40a65f18fc0ed31ea1a0952070b52fc81522e439621baa599d0f12f06318 SHA512 40e78f3e97288b17e6b960bdbbb54245d4d934032ba3ca3e954654eda3d8ef9cf92eebf6025e198e5c5cddbfa5a6b8e05126030e8e423a2583961c7bbd56d31d
diff --git a/dev-python/genson/files/genson-1.2.2-test.patch b/dev-python/genson/files/genson-1.2.2-test.patch
new file mode 100644
index 000000000000..1fb14ea900b0
--- /dev/null
+++ b/dev-python/genson/files/genson-1.2.2-test.patch
@@ -0,0 +1,28 @@
+From 48cb6895f1a4b3320d9ae210debd0befe06bec43 Mon Sep 17 00:00:00 2001
+From: Jon Wolverton <jonwolverton@google.com>
+Date: Mon, 19 Apr 2021 14:27:42 -0400
+Subject: [PATCH] use python -m genson for test_bin
+
+---
+ test/test_bin.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_bin.py b/test/test_bin.py
+index cd16d38..acee10f 100644
+--- a/test/test_bin.py
++++ b/test/test_bin.py
+@@ -25,8 +25,9 @@ def run(args=[], stdin_data=None):
+     Run the ``genson`` executable as a subprocess and return
+     (stdout, stderr).
+     """
+-    genson_process = Popen(['genson'] + args, stdout=PIPE, stderr=PIPE,
+-                           stdin=PIPE if stdin_data is not None else None)
++    genson_process = Popen(
++        ['python', '-m', 'genson'] + args, stdout=PIPE, stderr=PIPE,
++        stdin=PIPE if stdin_data is not None else None)
+     if stdin_data is not None:
+         stdin_data = stdin_data.encode('utf-8')
+     (stdout, stderr) = genson_process.communicate(stdin_data)
+-- 
+2.40.0
+
diff --git a/dev-python/genson/genson-1.1.0-r1.ebuild b/dev-python/genson/genson-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..efd955f3b71a
--- /dev/null
+++ b/dev-python/genson/genson-1.1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
+HOMEPAGE="
+	https://github.com/wolverdude/GenSON/
+	https://pypi.org/project/genson/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# https://github.com/wolverdude/GenSON/pull/70
+	sed -i -e 's@TEST_URI@test://@' test/test_builder.py || die
+}
diff --git a/dev-python/genson/genson-1.1.0.ebuild b/dev-python/genson/genson-1.1.0.ebuild
index cabd95c29347..f8cbb896733f 100644
--- a/dev-python/genson/genson-1.1.0.ebuild
+++ b/dev-python/genson/genson-1.1.0.ebuild
@@ -16,3 +16,9 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="test? ( dev-python/jsonschema[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# https://github.com/wolverdude/GenSON/pull/70
+	sed -i -e 's@TEST_URI@test://@' test/test_builder.py || die
+}
diff --git a/dev-python/genson/genson-1.2.2.ebuild b/dev-python/genson/genson-1.2.2.ebuild
new file mode 100644
index 000000000000..0e3e174a3bed
--- /dev/null
+++ b/dev-python/genson/genson-1.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="GenSON is a powerful, user-friendly JSON Schema generator built in Python"
+HOMEPAGE="
+	https://github.com/wolverdude/GenSON/
+	https://pypi.org/project/genson/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# https://github.com/wolverdude/GenSON/pull/70
+	sed -i -e 's@TEST_URI@test://@' test/test_builder.py || die
+	# known broken in this release
+	[[ ${PV} != 1.2.2 ]] && die "Restore test_bin.py!"
+	rm test/test_bin.py || die
+}
diff --git a/dev-python/genson/metadata.xml b/dev-python/genson/metadata.xml
index 13b9c793c1ee..862a6445d343 100644
--- a/dev-python/genson/metadata.xml
+++ b/dev-python/genson/metadata.xml
@@ -5,6 +5,11 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">genson</remote-id>
 		<remote-id type="github">wolverdude/GenSON</remote-id>
diff --git a/dev-python/leechcorepyc/Manifest b/dev-python/leechcorepyc/Manifest
index e01e2074ac92..94aef739d257 100644
--- a/dev-python/leechcorepyc/Manifest
+++ b/dev-python/leechcorepyc/Manifest
@@ -1,8 +1,5 @@
-AUX leechcorepyc-2.12.0-respect-CC.patch 1649 BLAKE2B 8a29af78a677fd3fef24192620c01057c72de7950897b51ee9735f3f078df60fee1bb51dbf96a9e131437bb0d2552f429118ac188caa9a9580399300e1fcf7ef SHA512 29e792fdb87f05f7e625f7214b9fa50745acf66dd4c210e517c21f40b3824fce5b322ba8b5acb106fc1355a562cf613e5e3d94bc3042c32982b3cf6d7b1985ec
 AUX leechcorepyc-2.14.0-cflags.patch 748 BLAKE2B 1151e6dbda48ed5e842b1960048bd10a38467b2bfda7478f54590f22a46aa4909720bc5d3d5ba46bed333ebf1cd8002df418581f17dcfbbe8c989a752b34402e SHA512 b3a81db5375f89f028639517150d0bc0a835fda31d5560070e001a855fd4f188ca3cbbf7855f5ca2a9d821b92e3ae0d57017ee2b2cc41a93c2687da0b0321eb0
 AUX leechcorepyc-2.14.0-respect-CC.patch 1518 BLAKE2B 67446ded63f4a9b7e0f267cb0fe7b19e987f3077354d5ce293a60619313d7f9c6ab3e01a400217526c6ad204c5a8b0abaef0ad636fa2bda81aa11338eb621047 SHA512 63e13954e2e248a2dc980e122884063eba63b910159eb0e57135d3a4a5eedfbc01ee75c114ded22c320d94ac335c70482d572c1f82254ae07882480434ecc795
-DIST leechcorepyc-2.13.0.tar.gz 123152 BLAKE2B 8a3ae5b0f0d52296ef71bbbea5140f9dec6abd379ae2a1b0e3a418090a11e5196731b1c4cba5320d4058c562911366cc9dd84f3a30f58ddc7c66362a9b39af8f SHA512 1420f635bebafe1e07cb5f0ade3e6b141433d4a72ec165713f959dc19e05f42a86440c5c99dd5d759aee221ee478e91e7161541cebe11be6dfa286fad79843ae
 DIST leechcorepyc-2.14.0.tar.gz 124463 BLAKE2B 26b7581da76ab3f8981e956ab2f64de2094cc906788455e38784fb50dbad31b8b14de2f510cb49b9c1e842e2a66effd44a2db94cb6ef9e7ec9f11c3af0d9434c SHA512 c7d1d50727023f6b34bbc9682dba9bc70ae69962dcd5c326612a0dcd48a2a90ecfe674391559271d65d7720d755edde02342fb999e53ad54f8095c589060b901
-EBUILD leechcorepyc-2.13.0.ebuild 819 BLAKE2B 789d253948cb2962e0913d07bf33b49c826960622b7a70656633ab72a63c4c516d15284dea68cb3d6d81630791b93ef79ce2a764d325a6e723ce16ac2996e8c1 SHA512 3a01fd6ada1707ec61b4aa3bddb949d6291f07a368787af1e4c82eb8ca043cd7853e8fadaf63552aaabc06730451e2a23cce37ff201f6f14f69cd755f7f7735c
-EBUILD leechcorepyc-2.14.0.ebuild 815 BLAKE2B 5315de3e7f78b4ed52a76a2e1e3d7393bfccbb770039b104f73374db5a3f30c417a9dff852c665c8a56b39ea0e478ba43563c8123a158f9b7d980625ec1e85cc SHA512 b787d0fe2da962988dbd969c39e7e7d2dc8d1bbc76a52b3a2715ed6bcba8c8195f4864e0d89c40e62ba75cf20e9b889178a5d3652a854b9d53dce8b20c0322fb
+EBUILD leechcorepyc-2.14.0.ebuild 813 BLAKE2B 78175e203aa801eb7f553acf8027e0d60e4845f89a76fcf7179e2166649f297ceac7a4415081bdcf2463e47be4f5e3ef46dc0bab619049b28d62de501ad0360d SHA512 0b526cce6ab640849a6e20b1e46f2d30bf35c815381bb1d6584ee0c223bb26c4039eb227a73a78b4af89497d2ad14eb73870ba36641142824a2f7d997fd89b3d
 MISC metadata.xml 683 BLAKE2B e85f13b83acf28fc6d59876fad2576afe741065c754680650adcb7acd1068410469de969ab4ee28ef5d9e7ff448c615293cf3f4713b4211c22dbb1b13d7f5947 SHA512 cff010f9f6dafcb3379a0de5ae0c98b974e605cf4e3a0131657832da2f0609e62cf07d3da84327b8c1272eb4cad64218e6c3f0231ec2402b3801e2453a10e76c
diff --git a/dev-python/leechcorepyc/files/leechcorepyc-2.12.0-respect-CC.patch b/dev-python/leechcorepyc/files/leechcorepyc-2.12.0-respect-CC.patch
deleted file mode 100644
index 6bf48b0c6bcd..000000000000
--- a/dev-python/leechcorepyc/files/leechcorepyc-2.12.0-respect-CC.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/leechcore/Makefile
-+++ b/leechcore/Makefile
-@@ -1,7 +1,8 @@
--CC=gcc

--CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `pkg-config libusb-1.0 --libs --cflags`

-+CC?=gcc

-+PKG_CONFIG ?= pkg-config

-+CFLAGS  += -I. -D LINUX -D _GNU_SOURCE -shared -fPIC -fvisibility=hidden -pthread `$(PKG_CONFIG) libusb-1.0 --libs --cflags`

- #CFLAGS  += -g -O0 -Wextra -Wno-unused-parameter

--CFLAGS  += -fPIE -fPIC -pie -fstack-protector -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,noexecstack

-+CFLAGS  += -fPIE -fPIC -pie -D_FORTIFY_SOURCE=2 -Wl,-z,noexecstack

- CFLAGS  += -Wall -Wno-unused-result -Wno-unused-variable -Wno-unused-value -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast

- LDFLAGS += -g -ldl -shared

- DEPS = leechcore.h

---- a/leechcore_device_rawtcp/Makefile
-+++ b/leechcore_device_rawtcp/Makefile
-@@ -1,4 +1,4 @@
--CC=gcc
-+CC?=gcc
- CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
- LDFLAGS += -g -shared
- DEPS = 
---- a/leechcore_device_sp605tcp/Makefile
-+++ b/leechcore_device_sp605tcp/Makefile
-@@ -1,4 +1,4 @@
--CC=gcc
-+CC?=gcc
- CFLAGS  += -I. -I../includes -D LINUX -shared -fPIC -fvisibility=hidden
- LDFLAGS += -g -shared
- DEPS = 
---- a/leechcore_ft601_driver_linux/Makefile
-+++ b/leechcore_ft601_driver_linux/Makefile
-@@ -1,5 +1,6 @@
--CC=gcc
--CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `pkg-config libusb-1.0 --libs --cflags`
-+CC?=gcc
-+PKG_CONFIG ?= pkg-config
-+CFLAGS  += -I. -D LINUX -shared -fPIC -fvisibility=hidden `$(PKG_CONFIG) libusb-1.0 --libs --cflags`
- LDFLAGS += -g -shared
- DEPS = leechcore_ft601_driver_linux.h
- OBJ = fpga_libusb.o leechcore_ft601_driver_linux.o
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.13.0.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.13.0.ebuild
deleted file mode 100644
index dfca07f07633..000000000000
--- a/dev-python/leechcorepyc/leechcorepyc-2.13.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python binding for LeechCore Physical Memory Acquisition Library"
-HOMEPAGE="https://github.com/ufrisk/LeechCore"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# leechcorepyc ships with a bundled version of the LeechCore library. So we
-# don't depend on the library here. But we must be aware this module doesn't
-# use the system library.
-DEPEND="virtual/libusb:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.12.0-respect-CC.patch
-)
-
-src_configure() {
-	tc-export CC
-
-	distutils-r1_src_configure
-}
diff --git a/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
index 8425d591ca7d..e79613f7df0d 100644
--- a/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
+++ b/dev-python/leechcorepyc/leechcorepyc-2.14.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/ufrisk/LeechCore"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # leechcorepyc ships with a bundled version of the LeechCore library. So we
 # don't depend on the library here. But we must be aware this module doesn't
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 30d20733cdca..02ed7ef413d2 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,12 +1,10 @@
 AUX mkdocs-material-8.5.7-simplify-build.patch 529 BLAKE2B 60a246940983ca713b370b454fff74a36dedf1aec175e72455255b35164f75f7eb79144cff67df4b1ec143a4e19b043042c9bce562456133c917c27018c4862a SHA512 51b18f3faa4a3adfc9cf8ad1fa5fd63f787a3b2b9c9769b5889a2abab621ff6e14e034487f5573418405b26bc11155e44f7c6d50acea8baf9f45164fb3ec7984
-DIST mkdocs-material-9.0.10.gh.tar.gz 10933071 BLAKE2B 702db94a8c91a856ffcf30402fe9a913ebb9f76ab1cf92afd83ee75733a233366e039ab08d376b543112b892dd7641c164f87b641938c6974a9205e80d249b7b SHA512 33c11dec5e90055ce773686b3301313f2744bb190078019973bde84a7530aeb3dd8de08946f0aa1a64aa7b100055a99aaa716f96d4a862638a7134ffa120d56e
 DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
 DIST mkdocs-material-9.1.1.gh.tar.gz 10874113 BLAKE2B 24da8a9c93b46afaf7d2faf3becc3735c72e831b8ed5f3153f493178feffd9ee720b9a394814d8a151a337343065f664c0978fc8b02d357523d62c94c80a1f52 SHA512 e7c023027c9d970fde94a9bbd20e9b22a4f9666f3778660b759937ad855514720b710d8d32fa71802e3455bb1d3545b0451c055edd428098916acb980f465a7f
 DIST mkdocs-material-9.1.2.gh.tar.gz 10883294 BLAKE2B bc84f9af96fcdd8a6704723d8c004bd3f201e906e7b1a46ab48253f7d7468e5219f14258713183c6e64c43f073cf499e3f1c03a76e6be77bf732acc832fe86ed SHA512 7f711792beaefe87a5843df6f8f67b6f2aaf92de36ac9c9b6d2c05aca3bd5760c5e306b5d6f7c57e1414bd77e2453800970e37af46cd78eb8095c6e2b19072bc
 DIST mkdocs-material-9.1.3.gh.tar.gz 10884530 BLAKE2B 1a7c257a0f1ce6fe9b5fa394cb9a8011f7d9252c5cd0cd7b935acd57aa2eb518cf4c945c164d64eca4c30c50f7e224b5bd6f122fa2cfbcf425ac6d5e59c40db2 SHA512 300410ff503bd4f751dc45aae9e3d88cb3589d0d3343208c6592a0d68f01c2c1ae5a4e0aeb80afabd0e04af3c51886356319ad00a6e8f801dbfe6b500db4eaaf
 DIST mkdocs-material-9.1.4.gh.tar.gz 10870732 BLAKE2B 3936fe1396631ac0aa2857da9b197347719ab8b49cf2afda136f16e706d685e7deaa198c18f99ff599d233ac2ea08bfbba397d2024b1fb164c96e91c19e3512c SHA512 1b62785bb0a30f5e84188cb42ade7f64ba3cab652b2eea13ee64a29767807c05f71db610e4915eadcdf301e6e12259e1905e2a1c23681f16ba63db7be6fe284a
-EBUILD mkdocs-material-9.0.10.ebuild 1271 BLAKE2B c8860ec31923f275d1ddeeba10aed7d651ebdb4a6131d701dbf43aea3dc99064e48e0c0ddbd38b75eedd5257964da0428b5736e919c70d44ee8228791810876e SHA512 74efdd9f73927fc38bb2ba3181fd8bbd595129292a03c3fc4e8b75694c92d7c46e8ca99f715d8a9a9445cf0815bcf1e2fdf88f317480acf27b3eb61f617089a8
-EBUILD mkdocs-material-9.0.15.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
+EBUILD mkdocs-material-9.0.15.ebuild 1276 BLAKE2B b73a9a920b2341c2a76b8c53c14f3957a6f2014180caee8d5879c2d1d0a8eb073adf27eaea6df548a3f9a9c84046480646ab543d0187d3bdd73550ac25467763 SHA512 c6f5844f78d11cbe7090826c7f1360d476ba1541c59b5bae08c312f103d3f727256b5ba2930ffb296e516d48e75e9d438f16191e7b906d78fb73224ab474fa52
 EBUILD mkdocs-material-9.1.1.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 EBUILD mkdocs-material-9.1.2.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
 EBUILD mkdocs-material-9.1.3.ebuild 1278 BLAKE2B 306edbe42d3b1ad120007bdd9bf7f78fb18d3f755e93f33069be39537a1a124d7e5b29663b953e4cebae9698a325cce9d056cb2239576e373c597ee58d981cea SHA512 38389c354fb22a066a8e15ee6f9ed96612d7e28934a77ed33dd22ed7e809b465a3f41be0fd1446a8ed151982f6e088a3a4f32f0e81f8246606656cecd012ef36
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.10.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.10.ebuild
deleted file mode 100644
index 45a803b27c63..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-9.0.10.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{9..11} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-material-extensions
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material/
-	https://pypi.org/project/mkdocs-material/
-"
-SRC_URI="
-	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
-"
-
-# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
-PDEPEND="
-	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	# simplify pyproject to remove extra deps for metadata
-	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
-)
-
-src_prepare() {
-	echo "__version__ = '${PV}'" > gentoo_version.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
index eedc60f73616..aaf33a92c6a0 100644
--- a/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index c465e3b0b50e..1968a4fb2ea5 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-9.0.0.tar.gz 104237 BLAKE2B 523fe14889862edc2f05da79156914e12984d62168df46630fbe3169ebbe48ba66e018a65bd17dfad54676e5334335dbcda5c442556970442ccc2a792940bcc4 SHA512 a1e73a7a3e4530d070d639baa01c08d91ca11cdab6fec36131764001c2b78f1649e19ddf78ee3c1295f2f9d9951ea7483a4fd1f7c12d5655c3b696db7de35c1e
 DIST more-itertools-9.1.0.tar.gz 107389 BLAKE2B e2f5ba6daf5ee2dbb01a9f2c07f8595418285e8472960054681a551a42e39200e40a2799c644d37a0d8654307c9119b05364e47d590c933e6082fa5be390579c SHA512 635a97caa457ede1b7ea12fd1ee75bd8722e97a089a2d35f143dc77bcbaa2e3793338513af87408476a8a1443367b270ec0d239d652fc8f96f102308e1f3e937
-EBUILD more-itertools-9.0.0.ebuild 811 BLAKE2B e682f4dab8e19104091ef28b7e3adf143d20a2104b741ba2e6be5976ca13324a884f9b3e2839171a3ba3ccdf89350db6505e53bb427d52e3841cbc11a259d112 SHA512 dc4bbc8bd74f3588f0a49f97365f17125d9a95e52da20d9af978a668094ef3bfcedd87fab1540b36b9fb8467722b9e310a51269da25890171c23f06207c1f1ab
-EBUILD more-itertools-9.1.0.ebuild 732 BLAKE2B cc58b3a919733d57ba4fc09246edca041da2b21aefc0c00c410f8df8a6d46910d8e8402c59eba9718d991f49f20d619c2ee361bedad0e2d8a4c4c4686b1a57a6 SHA512 f52cf49e7318d44186084df70f8299d8f9ec73b16f1290285c0f2e18af6eb81d7026169d0a586024c3b7e9cea54b27f3d7605f981e2fe34caaf0250bc7b66f11
+EBUILD more-itertools-9.1.0.ebuild 724 BLAKE2B 4218972942ee2609640cae320e41ee5f7e784d6b154445984169e21152e5dc9a01868cbae7f1fe61c85b2b8998bc128d57d7a24403cd5f5614d09930e6bde2e9 SHA512 1bc6d78ffc45ed2412cd76f2763351b4f55be66e7082bf812dbb887ed9309787e80be0dbfd3a9e4fec0cc91ea953357da07238d5a64098d5d92b1611767dfa68
 MISC metadata.xml 488 BLAKE2B b2b63c92548ad22348cd8801eacf52c7cb9e7eae7f3db303986891d6aa0e69c28aadf815aab089a199d6238b00da43f609a5e1f0b730bbce6cce7f76bd57e6a6 SHA512 d8ee6881bd90416c5e3aaa68a3158675d3e65fd786f70287d12a2bc6d79e7e5e8e16f291d0c6d673f8c1d182953ccbee0fb4fd80faf9fca6176a16679f334070
diff --git a/dev-python/more-itertools/more-itertools-9.0.0.ebuild b/dev-python/more-itertools/more-itertools-9.0.0.ebuild
deleted file mode 100644
index 397b25126327..000000000000
--- a/dev-python/more-itertools/more-itertools-9.0.0.ebuild
+++ /dev/null
@@ -1,25 +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_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="
-	https://github.com/more-itertools/more-itertools/
-	https://pypi.org/project/more-itertools/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-9.1.0.ebuild b/dev-python/more-itertools/more-itertools-9.1.0.ebuild
index 459bd64ffe97..4479be7009a6 100644
--- a/dev-python/more-itertools/more-itertools-9.1.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-9.1.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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index bde699bfc7e8..40a78d64afd4 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,7 +1,3 @@
-DIST natsort-8.2.0.tar.gz 145643 BLAKE2B d101ae2fa1cb009892e9712ece87d3825f3fca7970475e46176e5acbc29481ac79d491f1bae0721d85d3e67ecf39e5f54e2a984f0398356f32a5f0ec18a3e98d SHA512 d7e35c48ee36e69812c26b2cd333c57f1ec70c54017c4f51ed06dbb7619afc11cd1d589035faee700e1adf1e6b759b43ee497685fc88518be62c41957e15884e
-DIST natsort-8.3.0.tar.gz 123448 BLAKE2B 7fd480c8bfaceaca7431716e7721acac89d4a5c87a951ecf2754d80062437776eee823d7b94c58e2b9bc6864d9c0f595ee8667c538609c296694a548c126ab58 SHA512 63a65a99c9475e8ae96d722ae4c093cc73034c0dfdd254b24ae02904dd81cc8be36038c8a3fc514080f436d4124847f0f331d06a87c435f0b7b7d1d72313ae0d
 DIST natsort-8.3.1.tar.gz 123736 BLAKE2B 3ad4d8884b463fa792f7930f6d92dda146c96cd929a58a1d418c59f8b3c5fc06329e2cf0341963c820fb8d2fc67b287ce69083a2cba9f20bd8abc06c0fca6a44 SHA512 98ee9bfed9307487b9ae9ced5ce723b6840c6f882d06702f205986430572b767f3ac0930ffdf0663d99256f6feed704394b2b7e11f4b01f4f0241cd8639df622
-EBUILD natsort-8.2.0.ebuild 756 BLAKE2B 6ce476eae7f325ee40e33a983978686137dda8eaf4815f04335638951ab45aaf06578b7561d1584664cdd589b6d485307f11b0a2a93271c51beafe2572e46b19 SHA512 613e2c3c53a6d966e350621c1b838a8bf4bfbbca7c20d3914d504d4a6694907f46722c88c62444c1935140ce3a8c60980aa629f6b37dacad21837433de74771e
-EBUILD natsort-8.3.0.ebuild 717 BLAKE2B b4a491e385d5caeba1b91ebcbf65ff351c719ef46362aceebc80203a43a38a6d3cb4f4e845aa63900d026de0c6fca4dc96b89d86ab6ebbbb7a5ba5a1debdac5d SHA512 8529c3ba92237ca15e55d978412e1cee66ee90939d3077d92e03904180d70cea3cde33c3ab7e7c36b75e730c8699e6ca0f964967b3a259177099bee394901297
-EBUILD natsort-8.3.1.ebuild 717 BLAKE2B b4a491e385d5caeba1b91ebcbf65ff351c719ef46362aceebc80203a43a38a6d3cb4f4e845aa63900d026de0c6fca4dc96b89d86ab6ebbbb7a5ba5a1debdac5d SHA512 8529c3ba92237ca15e55d978412e1cee66ee90939d3077d92e03904180d70cea3cde33c3ab7e7c36b75e730c8699e6ca0f964967b3a259177099bee394901297
+EBUILD natsort-8.3.1.ebuild 709 BLAKE2B 73572c5ec45987dbb1cfa085786de171a1b235b49f560be0e9f9b46ef5a4967d505f961948f7f8d627a048ecb4d4368fdb0fabfc8eb84ecdd7e928b9393f7c33 SHA512 662582d6c12c6bb372259fdccbbeb406be6ab4a3bb505a0b39e066a18d9eeffb4656ed3e97b6ae4a5fbb680e1ad233714d217c1b840683ea423fd75409a8c627
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-8.2.0.ebuild b/dev-python/natsort/natsort-8.2.0.ebuild
deleted file mode 100644
index b84e0859468b..000000000000
--- a/dev-python/natsort/natsort-8.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="
-	https://github.com/SethMMorton/natsort/
-	https://pypi.org/project/natsort/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
-}
diff --git a/dev-python/natsort/natsort-8.3.0.ebuild b/dev-python/natsort/natsort-8.3.0.ebuild
deleted file mode 100644
index 5b947e1cf1a3..000000000000
--- a/dev-python/natsort/natsort-8.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="
-	https://github.com/SethMMorton/natsort/
-	https://pypi.org/project/natsort/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "sorting results that match most file browsers" "dev-python/pyicu"
-}
diff --git a/dev-python/natsort/natsort-8.3.1.ebuild b/dev-python/natsort/natsort-8.3.1.ebuild
index 5b947e1cf1a3..e9c0c4b0c8ae 100644
--- a/dev-python/natsort/natsort-8.3.1.ebuild
+++ b/dev-python/natsort/natsort-8.3.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index a410473dddc2..9d26904bde47 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,5 +1,3 @@
-DIST peewee-3.15.4.gh.tar.gz 908759 BLAKE2B 5bb53598f44c75f4b819d7aa032a2bc812f1e6de415b4cc01e22e521e4881dd409ceaf26435ddfcf08167c5193594917f23b15ae91f037fa4216d78752e77247 SHA512 9042e1c4fffac0c395500597981ab4732383c273e2b7f2b129b2b7702d9762772a219bb848a1f0aff802c468f38327f629df1c49028858451578115cf0811a13
 DIST peewee-3.16.0.gh.tar.gz 1085430 BLAKE2B 3acfbbc9d8cce7e4bd1c0027905f4ca44431f376a243adffbfadd4d3f15b4e729c4736076e8ec72c40261ca269c66d811afb6c25b9d075d5913a13869da4f4dd SHA512 f77a040831bd3189135196ede9748c92af9db21127839dfacd7712586273bdd22c688ca22bfa373805fa1b64f770b7cea850cba53e73f324f25ced1305830409
-EBUILD peewee-3.15.4-r1.ebuild 842 BLAKE2B a41b4404d296d80db3493196fca07b26649be969c3a4433d0cd6317d74e5d549bf88b8b7bd64a5a9f21a8c68eb133f5848e3005f0034f3731d59f1d023810735 SHA512 271075fa89d8f5f8f0f2a644917fc70329773bb3f8d6e8fec7401689ecc831b65e9d825debe1d6cf1085ef4f2f46de99066b9b60e727637feeed4da4e997a0fb
-EBUILD peewee-3.16.0-r1.ebuild 844 BLAKE2B 5738298f4afa2d4a3eda34e81afb83601289c434cb005b2e0bee42cf87e544fe80bbf059aa1433d929b12db4cf6e512fb1cb0d3cee14faf19288c0373c808bec SHA512 8dcf72bdc8ed0123c9af6bed2d55daf7412444b301074d8880a637c1700e754a3807e4d4f7ebb23a05807b0f5225628cc12e3d336726b800b40a60e6667e5c8c
+EBUILD peewee-3.16.0-r1.ebuild 842 BLAKE2B a41b4404d296d80db3493196fca07b26649be969c3a4433d0cd6317d74e5d549bf88b8b7bd64a5a9f21a8c68eb133f5848e3005f0034f3731d59f1d023810735 SHA512 271075fa89d8f5f8f0f2a644917fc70329773bb3f8d6e8fec7401689ecc831b65e9d825debe1d6cf1085ef4f2f46de99066b9b60e727637feeed4da4e997a0fb
 MISC metadata.xml 365 BLAKE2B 144b870f5470e3de971f47316313980f95a3453c684fb7c326da025bef8a4e29dc0731808eefdecbb059a49ad77dd4166b3595554ac42d0578bda75c17fc06bf SHA512 9445bc6cf059e5c95c1e9ce5eebad887a43133ea0fad3fb7b70f60395e79bf30a42d893aa65d4c328e7c304b24a86fbdf3939b9ecccad318db01e95c3b4521f3
diff --git a/dev-python/peewee/peewee-3.15.4-r1.ebuild b/dev-python/peewee/peewee-3.15.4-r1.ebuild
deleted file mode 100644
index 3fb7641cfcd8..000000000000
--- a/dev-python/peewee/peewee-3.15.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Small Python ORM"
-HOMEPAGE="
-	https://github.com/coleifer/peewee/
-	https://pypi.org/project/peewee/
-"
-SRC_URI="
-	https://github.com/coleifer/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-db/sqlite
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && DOCS=( examples/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/peewee/peewee-3.16.0-r1.ebuild b/dev-python/peewee/peewee-3.16.0-r1.ebuild
index b2e1e7d16ff7..3fb7641cfcd8 100644
--- a/dev-python/peewee/peewee-3.16.0-r1.ebuild
+++ b/dev-python/peewee/peewee-3.16.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index e7b5b1b4870d..1671df218b5c 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -3,6 +3,6 @@ DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d34
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd
 EBUILD pygame-2.1.3.ebuild 1975 BLAKE2B 9d8d7ebb593c89452536e91989833bae2d208a151450f331033e08c9389ad41221f064371d9dd71732f46d059f797185bf94b473164d9525baf6c425e5465674 SHA512 1380ffd43c772136ebf8216ffcf16febdd3d12065792021052f35b2d282130c7fde6dcc09906ccb97eb2247c519c4517b1bf726c5d26cc9d54ae396039fc100c
-EBUILD pygame-2.2.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
+EBUILD pygame-2.2.0.ebuild 1913 BLAKE2B b2837e26d5174194d93d04485cb9f2e994e3a17a69ae0be6734507f15e1794aeaa1243b6ef30e8fd2cb47dec94514ea0fad61fb25312c6a13071ae85bb4b389e SHA512 043387160473496b49b68842d8ef0f8056f8d09bb7f05c7b15a2df6d585d823984205898bfc95cff260fac058d0f3f5e71e09cdfcb5a4e0b7690a384d2418a95
 EBUILD pygame-2.3.0.ebuild 1916 BLAKE2B be3df976b5bff81721344d9e25613cc44ffc940ac4695329de90dcbf6aaf1e4ff0f89c2be3526dd96243cd0301f27b74df05f534e563ae68c4515349089cd490 SHA512 0519c416542e271dabc59be0491ab5995cfc4adec586ed143fd276abb032674821ec31c45848b741138fd3aced2a3c6e04f4447d55ac16515027e865563388dd
 MISC metadata.xml 363 BLAKE2B a942b91aded22ec850a7b075703ce4037af9f0a61155717ac455f7d2b7779cb6f5f953b2ad8d61d7cc5254307951a20dd3edb9853e21d907e1999f7570a6b821 SHA512 15403754c9b13f9b2d8c5e7615ae0ca9359b5079e22eb5a7049424e414ebbdd8a06f6324c31594636324414e35ca34bec977b7dded9f9ea14027497b5097b060
diff --git a/dev-python/pygame/pygame-2.2.0.ebuild b/dev-python/pygame/pygame-2.2.0.ebuild
index 98583ae7b73f..56142cb8661f 100644
--- a/dev-python/pygame/pygame-2.2.0.ebuild
+++ b/dev-python/pygame/pygame-2.2.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="examples opengl test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index f16f1c745a18..9d5e8ce47594 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,19 +1,6 @@
-DIST pypdf-3.3.0.gh.tar.gz 6803536 BLAKE2B ff70995882581c816fbf7410232c68e9649632161b4927543924a11b1a0a816f1178be399079e32078fe8d89a2aa9cd0eb1562409dc8e7bd388cad3afde37198 SHA512 5db25d6c4b41a1d19b45fa907f53e0106e01c93eb4152079dc4ffbd7bf28fbf8915bf0e3bf1af4a371e805657884fe2c42de4856944085ca7bc07a477f3ba588
-DIST pypdf-3.4.0.gh.tar.gz 6931831 BLAKE2B 037ac998cc1e3d078281b64183197678a80345731f6d4691b00f9e546eb61eaa34c4d7f4b704191c887975517da73359983f1b7405776e99257f79b1604dafc0 SHA512 9bee70a039c42533b600f1e95e28a4889d7df212bae18deca7d88501008d3a3e2b4d7fe36134e947cb14b0acc650126688c358ce2b662917a4c6df46241db1ab
-DIST pypdf-3.4.1.gh.tar.gz 6930245 BLAKE2B 9e8a5a1ebe95b64c9274ce6b0ea252d65f41d4b6791d6c6acf87f810794892337aed13ddc9b77f05a404fe94b3d9c2444f2a06c4feea9661204e71684bbbbfd5 SHA512 e2e3fa74bc6e96afc5999429e7603dd3ab8e6443b6259e456bc6d90cb2d7a15a484b226e218478c1e92cfd7fe23c93247f212568c6fcd51d80afde32b83460ba
-DIST pypdf-3.5.0.gh.tar.gz 7181507 BLAKE2B 8f5c129613ed12a9eaa90cf0e6fa189b0fc5bf109f26b8cc35ff1550e916b0635715359b2ece9c3c0243095c2e802474e99fe4c59d16b0f75b4375fb2ce07e5d SHA512 a8a0fad3fd08d88738088a06df4f1cbf419571e9e817c6097ce8bdcf7b1dd32f478ac712879cabceb7034f4e9a421f887ff117a1812782eadb670c8043aff86c
-DIST pypdf-3.5.1.gh.tar.gz 7183874 BLAKE2B 29ce7d052f0c466e72974ec051e149c2383136cc0097e2e104c4c1e5c37836f7908b25bfaa32e5fd85082f860b06ad88adbfbb5bbff95bc7a735e127b26d7964 SHA512 4f28cc0822f472087f096b4b2ee553b87e458009b29c43d41bbba53de9862292c78f4b31a860d4c783a6af4f92fdf32612bab7a42190373d9d9ceae39080bb35
-DIST pypdf-3.5.2.gh.tar.gz 7185283 BLAKE2B b92af14da7fed1cecda4cb0088efaa7031e9a44daa7c81ee0450bbb0f7630129b6e09e4044b3592e4333c466c73f16d033ee32f428c2866d163fc250a15516e9 SHA512 f257f05ddbd0a0195e0ec075b88fd4077bf0c44490311eee6fe1f4d3715c6d29abc681df53d22c2e7a08c2a545f5151d48f1bec2e436031c3b8e599204eb0f5a
 DIST pypdf-3.6.0.gh.tar.gz 7174931 BLAKE2B 2d9260ecccc03e6039d288d1fb16f8d1deffcd8daf83e4bb25ff7f2c49b3c6c979ebca2f04458964999d29fb5979b21a0087b02ac66c0bf387cce2be50a308be SHA512 43286f7c9c68048d763a87b02eb932ba597a7aa778153e8abd96d7d496da0d910199dab1e985d21c625daae225dde69936fff56accd52102353e6a03e30db4c7
 DIST pypdf-3.7.0.gh.tar.gz 7505675 BLAKE2B 68491e9d144717a5f92a00c01ae0cbdd1713c94f65ad44bb9ad1de556a80caac674c164d7c7a2d9738f68afdfb36ad3cde7791016856d0e8ddc1ff2c2d7335b3 SHA512 4d1d7d47ca20970174bf938af19813f5e2738ea6658fe3023b64e93575e3e73eef84327def6eb8868f4bbba01030a24252032a16cd89c6b79e3390b9ee9ecbb8
-DIST pypdf-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
 DIST pypdf-sample-files-fb7a080b35b3553bd10221282beeda7847959e83.gh.tar.gz 9027029 BLAKE2B 8f8797263b86f08efd9708d5812000efd08708abf66a0e95f50f5a147102e555dd7f8c465ae73cae842d86efdb52cabba5f8962626f56cb1b98409bfa108e150 SHA512 3a9cdab964a14cf6b14d80d917441a4e5effe2b7647163b666781ecabd189624dbbe5039111f6b1d753ff73e013665a1b86d87ca7806580fda58ec5810f88e94
-EBUILD pypdf-3.3.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
-EBUILD pypdf-3.4.0.ebuild 1369 BLAKE2B 6cb454e1d1c8c46c3f5ab952f09819b41a3564306fcbfb9d2f43f15a464021cea5d72422d76625b14334e8c1368116969ff1d3a91a1135ffd833012349d0b72a SHA512 a6bce2001c1aefe1c49a73459e4289b5f9682338a11e1c50e3b00a0e64a964db408b0392f3297c5566f372ad6f196024bb95e1e0dac71045158ff1f5ba533d5f
-EBUILD pypdf-3.4.1.ebuild 1274 BLAKE2B cd78bfefeb5ee1c77321d62cd80cbbf98857ec177423e23b8540f0d19ea2654f67745babf51119ed396ea6ca98af6dc8c81b45e3e1df68aa453a236c55f5d556 SHA512 c4aa84c4a0044c5916c4da01c5ab0b3b5e5e66c331444bb941207fc40052377bf89b279fc5c5952ed597d78ad198e654c82ba9334bf5715d9eece56b6c5c1673
-EBUILD pypdf-3.5.0.ebuild 1276 BLAKE2B 4ba64bc15030ca8099cbbae6e4c070268e7e29e26612ccfada878686afe42b91cf47e9ff198d49d0d17f84c1d878b921dfb62960eedb74bfa3316f73b0af3a34 SHA512 f9bcf246b1179f1a1094e84d239da335166560dd120735cc2d2171987c9dbf6fc4d0d74146cfc4307069d1e250a09f2acfd9d2f1ad4feeabd9e750c8077151d2
-EBUILD pypdf-3.5.1.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
-EBUILD pypdf-3.5.2.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
-EBUILD pypdf-3.6.0.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
+EBUILD pypdf-3.6.0.ebuild 1244 BLAKE2B 1bf96d9a0a542242320be90159c51304c5e270f02bb3f33e89feccad38c32013aa37c6165902f503a133f59ca32bfab5150362c998c591fc8be62f2d59717b5d SHA512 c95e5d99fb0a2e565fc0e2b311d50d0573c3f234918444e3618335f35ca0cefd0f8bb68baf6748a17ff7f890660c5401f39ccaaf2a96ff387291cd0143f271c4
 EBUILD pypdf-3.7.0.ebuild 1246 BLAKE2B da8bd7f5e9007468d3fc3e723c20964d9be8b4de54df656eaed47a6ba4ea196e5f131f5c04b564eb1dac28696b361c317e267140857cf5c97cda5ef65c6bd03d SHA512 09c4749006ad9e14378e399266fb9a7d3d6aa285110cc2aa24f1a168217df17c21b7e74acd7f7eb372c3753a763333d6ac21484a609d5dafc32fdfd67e807caf
 MISC metadata.xml 373 BLAKE2B a829b7048eb3a95caeb1be83b6172603df6a031d40995294f2687bf3c3cb70e66fafb9ba8339d9979fc85f5936b9552963a8fcd072a20661fa78f3aa3c4b89c0 SHA512 775ac2de487f11fba1ea8d283b42b9ef56e42cd95ea11f50a06b099420e69c0567f65c506b14891ac641da90ea05ca70da4f8a3e4a028cf41bdbc823021dccfe
diff --git a/dev-python/pypdf/pypdf-3.3.0.ebuild b/dev-python/pypdf/pypdf-3.3.0.ebuild
deleted file mode 100644
index 646a669f191b..000000000000
--- a/dev-python/pypdf/pypdf-3.3.0.ebuild
+++ /dev/null
@@ -1,62 +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_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
-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"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-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
-	# dead URL
-	# https://github.com/py-pdf/pypdf/issues/1526
-	tests/test_xmp.py::test_issue585
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/pypdf/pypdf-3.4.0.ebuild b/dev-python/pypdf/pypdf-3.4.0.ebuild
deleted file mode 100644
index 646a669f191b..000000000000
--- a/dev-python/pypdf/pypdf-3.4.0.ebuild
+++ /dev/null
@@ -1,62 +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_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
-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"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-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
-	# dead URL
-	# https://github.com/py-pdf/pypdf/issues/1526
-	tests/test_xmp.py::test_issue585
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "sample-files-${SAMPLE_COMMIT}"/* "${S}"/sample-files/ || die
-	fi
-}
diff --git a/dev-python/pypdf/pypdf-3.4.1.ebuild b/dev-python/pypdf/pypdf-3.4.1.ebuild
deleted file mode 100644
index be676896a096..000000000000
--- a/dev-python/pypdf/pypdf-3.4.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=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
-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"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-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
-}
diff --git a/dev-python/pypdf/pypdf-3.5.0.ebuild b/dev-python/pypdf/pypdf-3.5.0.ebuild
deleted file mode 100644
index e9581fbc5b9a..000000000000
--- a/dev-python/pypdf/pypdf-3.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=0fe84b30ed33ff3daa9293e44349b8618f135699
-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"
-RESTRICT="test"
-# 150+ tests require network, too many to deselect
-PROPERTIES="test_network"
-
-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
-}
diff --git a/dev-python/pypdf/pypdf-3.5.1.ebuild b/dev-python/pypdf/pypdf-3.5.1.ebuild
deleted file mode 100644
index 246ddfc145ee..000000000000
--- a/dev-python/pypdf/pypdf-3.5.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_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=fb7a080b35b3553bd10221282beeda7847959e83
-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.5.2.ebuild b/dev-python/pypdf/pypdf-3.5.2.ebuild
deleted file mode 100644
index 246ddfc145ee..000000000000
--- a/dev-python/pypdf/pypdf-3.5.2.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_{9..11} )
-
-inherit distutils-r1
-
-SAMPLE_COMMIT=fb7a080b35b3553bd10221282beeda7847959e83
-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.6.0.ebuild b/dev-python/pypdf/pypdf-3.6.0.ebuild
index 246ddfc145ee..3affab3f0d02 100644
--- a/dev-python/pypdf/pypdf-3.6.0.ebuild
+++ b/dev-python/pypdf/pypdf-3.6.0.ebuild
@@ -26,7 +26,7 @@ S=${WORKDIR}/pypdf-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index 9eefa9f591ed..d6694ad1e46a 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -1,5 +1,3 @@
-DIST pyspelling-2.8.1.gh.tar.gz 150813 BLAKE2B 53df7ae453180007af08fe3928274f9a468f7d24cc5f00b85efbda0febe9532f7b57805b54c2e28c3580e34de383a249bb293b1f89905d2b09c1a70853d12fd3 SHA512 24e9b03b3f5c911e2cd32a5594813fad5fce3fe5cc8c570fdaf4a025aebe8d02d2b77542d6e940cb03350df3203f1a9961a3f446fd60d66250a3cff7c54534de
 DIST pyspelling-2.8.2.gh.tar.gz 150733 BLAKE2B 1bb96679ce54d48967ee57a7dde00131884e2801a8a4f4e016f9a552b92d435650314ae66a356c90e3e4c585d2701bfc5e63f19b92347c8fada4de64e9a982b6 SHA512 0bb4fbacbc72935d4fb2fa0608d675fd0eec85f178c0994d341bc8635b53f39a4c82a1d50e43446cd39873a877e75b1530eafc36450f37d8f08cc174ba39e440
-EBUILD pyspelling-2.8.1.ebuild 1402 BLAKE2B 14ed291d7faab047a4da9967ad075f865aa069a23fa5b1630ed3b5e2f9fd0edcb035020974c80032aa5ae55eb330d55daa49100f1836a00810f81e3e5edfc545 SHA512 e6fd8b1401c7792d92b1b2054f2e0e51cca0a2902c65cfe9dcf3e0d7a63b5c08033a609c6ffb27618c22305652b7b31967fc7eef6debb3b412041f535810d815
-EBUILD pyspelling-2.8.2.ebuild 1414 BLAKE2B dfc70afe2e726ff0a94fb835355a532bfb6e1c121297406bb9ba707ffe1033fab318a9c85c976549cefed3fb9c557802be45035109f0117f1a11139bf5bf4f09 SHA512 fb21bb645c49d669c90729433a4c5dbcfd32460911443fa4eebf6351d37429b4c51547114898788f5bc8a7cc539e63a5b00135eae0a232c9195183a8e21f6b11
+EBUILD pyspelling-2.8.2.ebuild 1412 BLAKE2B 27fb6fe003cf11d3e99da6e7fccd869dd0bc25e1dc6e9fc1f8bc9f80a6f4c1f6fb49fdf5d55461dc393183b8a60c80ae3305eac508ac5a89a27170b812553939 SHA512 ef89ba087148a4bdd9a91c264cc3138622d3c480474b68f8d629ca3ad8b94893eb6bae6158682b9932f6f9dd4f4549ffc1b5134873986b592dbe49cb38475b28
 MISC metadata.xml 2024 BLAKE2B ba187994d3fba90c24276f96371a70a47c652c85ce20d4a11b2a74707e6345b202db00af9771cdc41518267a5a6b0c1ea85d7b68401ff8cb421cfee1fbba98c6 SHA512 53d11553f7e4fbb5057809e0eef8bc33564226bb92c0900f7cc40e8fcbffd20aef04b4635bc2ff2d0c778475fc564a4de02afd1293099710ea81490a435b3f18
diff --git a/dev-python/pyspelling/pyspelling-2.8.1.ebuild b/dev-python/pyspelling/pyspelling-2.8.1.ebuild
deleted file mode 100644
index 0e4fb80a6ac3..000000000000
--- a/dev-python/pyspelling/pyspelling-2.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=hatchling
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	>=dev-python/mkdocs_pymdownx_material_extras-2.1
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Spell checker automation tool"
-HOMEPAGE="
-	https://github.com/facelessuser/pyspelling/
-	https://pypi.org/project/pyspelling/
-"
-SRC_URI="
-	https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~riscv x86"
-
-RDEPEND="
-	|| ( app-text/aspell app-text/hunspell )
-
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyspelling/pyspelling-2.8.2.ebuild b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
index e6e5fc522f8f..39b4dd5d22e9 100644
--- a/dev-python/pyspelling/pyspelling-2.8.2.ebuild
+++ b/dev-python/pyspelling/pyspelling-2.8.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~riscv x86"
 
 RDEPEND="
 	|| ( app-text/aspell app-text/hunspell )
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index e3b26bc3c56b..7254b506aa69 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,9 +1,9 @@
-AUX pytz-2023.2-system-tzinfo.patch 1743 BLAKE2B 4ee31a0bf91dd8ddb5fe8d27f5cd7a276fb0fae0aee9b5344ff3b1db475647f2665a510cdf065a67fd909041d2180ce0bd8f5f6abb2622cc518a4393aea442e5 SHA512 1ca832cb516aabfa6dec4c9ba4bbd25926af7ecdb5b5e5c78d9e2c3cd35361ac7fcde2190ec39ca8fbef1da49d4a7c7d83e20133b86dee60be0de52e26e03daf
+AUX pytz-2023.2-system-tzinfo.patch 1787 BLAKE2B 52026a74040573aa97a86ee6e8c5afb56114297182116a375b9b9fc5e8840edba4e4e5eeeadf386a9f9d84302d71ec4ab55098b4b9d3d67db73043d7c0a52f79 SHA512 23fce20b8d91bdd1436efb611c5593340984ad27ed5a5fbcebb7472b189e7e66a391c6e6925f3f4a33cae49f527453fdc1075c162ef6976614d1b398d5abe625
 DIST pytz-2022.7.1.tar.gz 313522 BLAKE2B f0e787438f56bb33e0681f28392ddcb8dde41e51437caf34de8c9891af468a1b60f845d393d300c408af598aa93463f2a66848a8d20754bd7980d44cac0f4216 SHA512 c70b9ef9c6e6a7dd50fc80a58bf068af33dbcdc83c3f2f44b0726e696927e17d843f2f0438392b6f34738a63aa51c5025e6aa4bcbb9e43400b9d68334ff05c18
 DIST pytz-2023.2.tar.gz 316321 BLAKE2B 62f1896100f78d30953e40239b43cd9a53f365506bd56d0ed2ca21a31f1d5510e492e8751acfc44cb0a41e0db9125b454b9512f2b39be5fadfd366683738b893 SHA512 f0b7884bdad4ac367e1a812ff0402ad343592b062d6067d41133802972faf290a602e037686b28fc62574da49c4365b8a9213b3b02ad251835ceca692809355d
 DIST pytz-2023.3.tar.gz 317095 BLAKE2B dd2fe27471f641382667ddac77216f9e0e22dd0059b78ecb14be5490dd568cc4865a5624f8e89534a868fde5ea9c51fd3620a3cc1ed30ab32fc5b39445abeb14 SHA512 3a39e9ec22bf1468e7415f60f10bf4a4e5b0b12bea2aeec45c5e63a916136c747fa0abd1b0612a99da962e743f28f24ebc43c1d73d96f0e98f7fb0ae6b62e319
 EBUILD pytz-2022.7.1.ebuild 779 BLAKE2B 385bd8561698a862d2c897b0efb2b1217e9966ec7b07cc8c8757fed57e033326534b54cc5dd182c989cd4c18ee908c053e95179379643c56c73644c6a6411987 SHA512 f274dc7caabb2aaeca437931b3100bf1d2b8824ef9e94d1bf2bc27eddf3078b99c4cb2d97a45eeb4794107322bd2b15a0ebb58162fea2c16c1ddd3ddfe6d04f6
-EBUILD pytz-2023.2-r1.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
+EBUILD pytz-2023.2-r2.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
 EBUILD pytz-2023.2.ebuild 787 BLAKE2B 5bb9d1edc4b62b13a44008a63456e84ff83c00b1eb40139e4cb59f8315f84e6f7fe15ec0ca17c66e86862d2c69724258f3f86feb85ced5648768702d0180c539 SHA512 8d551fe07bb7e33c2fb301c2d37ddc70904c58821cfe548ed64cf673db5648ce8bc1b06b16063b5a06b1cc8fbbd2d026367ca36f46be09948c8f3c22bb957738
-EBUILD pytz-2023.3.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
+EBUILD pytz-2023.3-r1.ebuild 1181 BLAKE2B bf265f98c94ec1e736985ca43093ea7165d4c2244a80e9fa041b9f3cd3488319467af0f971054509aff00434bfb95ddb6229ed80a1e01a1d4cf3c7ffb35d95d1 SHA512 1b55ce4c86663dbd18e3f4f16dd4276d823309d54acc752f7642e7049e67a8f0bbd38d3aca217c71c7da6112c4da288c0ecfec0834e23d24fead2372c49dc2d1
 MISC metadata.xml 820 BLAKE2B 224acaf3f2b85e717829a59108a4053e9a60bc710c330b12dc3f181685d5c8ab1b090105796f092004b1a70781882438b0c0a27bc96ef0116b33fe7051cc6ad5 SHA512 c9a677d89a9f831f3a9833b02e6cec36adbb27688e117b66caad32d3be10fca19787dd85eb14e21eb95d6ed8ba6ff02122ad9f54aa175252834dc4c219b7c219
diff --git a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
index 1e64f1bd2fa4..85b639f0e615 100644
--- a/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
+++ b/dev-python/pytz/files/pytz-2023.2-system-tzinfo.patch
@@ -7,7 +7,7 @@ diff --git a/pytz/__init__.py b/pytz/__init__.py
 index f89d0eb..d00f3bb 100644
 --- a/pytz/__init__.py
 +++ b/pytz/__init__.py
-@@ -75,6 +75,20 @@ else:  # Python 2.x
+@@ -75,6 +75,21 @@ else:  # Python 2.x
          return s.encode('ASCII')
  
  
@@ -15,8 +15,9 @@ index f89d0eb..d00f3bb 100644
 +    for dirpath, dirnames, filenames in os.walk(_PYTZ_TZDATADIR):
 +        for f in filenames:
 +            p = os.path.join(dirpath, f)
-+            if open(p, 'rb').read(4) == b'TZif':
-+                yield os.path.relpath(p, _PYTZ_TZDATADIR)
++            with open(p, 'rb') as tzfile:
++                if tzfile.read(4) == b'TZif':
++                    yield os.path.relpath(p, _PYTZ_TZDATADIR)
 +
 +
 +_PYTZ_TZDATADIR = os.environ.get('PYTZ_TZDATADIR', '/usr/share/zoneinfo')
diff --git a/dev-python/pytz/pytz-2023.2-r1.ebuild b/dev-python/pytz/pytz-2023.2-r2.ebuild
index eea96064ba6e..eea96064ba6e 100644
--- a/dev-python/pytz/pytz-2023.2-r1.ebuild
+++ b/dev-python/pytz/pytz-2023.2-r2.ebuild
diff --git a/dev-python/pytz/pytz-2023.3.ebuild b/dev-python/pytz/pytz-2023.3-r1.ebuild
index eea96064ba6e..eea96064ba6e 100644
--- a/dev-python/pytz/pytz-2023.3.ebuild
+++ b/dev-python/pytz/pytz-2023.3-r1.ebuild
diff --git a/dev-python/seaborn/Manifest b/dev-python/seaborn/Manifest
index 52956333da99..544dd6805296 100644
--- a/dev-python/seaborn/Manifest
+++ b/dev-python/seaborn/Manifest
@@ -1,6 +1,4 @@
 AUX seaborn-0.12.2-matplotlib-3.7.patch 753 BLAKE2B c4015d94eb336b8dadb29a1e56d3b1ba6e5f2134774b2bd99ed09a00025394adaa52093373578e27c4db08f28a62f4eac0a8b89b73dc7cdf818155c037b682ee SHA512 3dd36909ab7c933e4dbaee0f73a1b1e29b1b57057e59ade7fccadf4324b307c90578f018ce56b9a1294c067f367298819e4d397fdcb794f1e40cd2eb7b2057b1
-DIST seaborn-0.12.0.tar.gz 1407601 BLAKE2B 3da8db0a0c08a40a3969a2ffce248f5521b4c7c93ecf0f014850093ef48331326454572ceea6ee1133805bf92540b0d2acecdfb7cb789d238f743b30e6a28947 SHA512 b2b06a22d48f19ace2448f465ca5e700f3486971d9fb86e85a1a8c9e2956b904e5f4c2c8075f848299b182cf8f69b2fac22366fedbd8012b9c44adc0bcb7e060
 DIST seaborn-0.12.2.tar.gz 1439798 BLAKE2B cf6903b1a2d27516bcafe46cabc81ea9fac80666394a6a82516630f9ac60afc7e9d31817e029cda9a08da04c0a37ce0244ad23acda16bca3283532ddb0fbdb71 SHA512 988a9922ee301b655911efa38905674b7dd15e7f7b157ad67f5befaeb02db492553f8bd6133b54d2dd7970b8dbbfd92d81d1faea3fa618247ebcaeb98620a060
-EBUILD seaborn-0.12.0.ebuild 766 BLAKE2B 04950be78b6406e0d37cdb27b965be44d6e12d10f14271832bccc3fb8ec047fbda4ab641c22e296bcfb9498458afb3fb42c4413debffaca1f1aea98fbc7f5677 SHA512 a9b8be3f4f46cd07811e8e93c3f63a558c9c32d34af1d15c4953a2e0536b2cc0b2275519f3c979ae0e28a05cc9ae10ab2dbc4f5a665854c8033c8c033548da61
-EBUILD seaborn-0.12.2.ebuild 906 BLAKE2B 41e5ad03f0ef99a1e4960402e96c4507269ac7a9820b620bb4a35aa7ce216d554a6ee125174d9dbcbdcb5110ee5ff74ccbc3acad5c0161ac2d361609feb6f1d3 SHA512 887af46521d2f043385314ce95648bd1b1dca56ec62c9488624ab5672873a3c777362395fe838b5394fd80987901e902ddc240c078694229018742d87d55a069
+EBUILD seaborn-0.12.2.ebuild 905 BLAKE2B cdcffdb6285be669c07f2140fb071f4f1306f9d8e58acccfc436acd874c60f8b1cb34d80280f592cbec350f1b80340dbd6f6fe28a3208b0ba1c7bd38ab124d36 SHA512 ff5aa6126a4f78b668e2bd0694a809bb9e9e294faf5613d507705da606a485235a28aa2a20a0ec05448b09dbfd652eb25a131762df851b2789fb63421bdb1ef4
 MISC metadata.xml 1510 BLAKE2B 897785b5160185a2e2566495abb52d7a9136def9ea267601ea3719e0c5246c48ef09c4485674fa7c50202def865fe032df42a61396d95a097aafa82bfdeec05d SHA512 54374e04284143b80c0e97968ca9f31dc763ff4e14800a3ced4ed852722144cf89ebe5867b044597c8566a47d4e5e63359b7976bf6681cd4cf67aabcee7cf8a4
diff --git a/dev-python/seaborn/seaborn-0.12.0.ebuild b/dev-python/seaborn/seaborn-0.12.0.ebuild
deleted file mode 100644
index 802ff5fdd18c..000000000000
--- a/dev-python/seaborn/seaborn-0.12.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Statistical data visualization"
-HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/statsmodels[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	cat > matplotlibrc <<- EOF || die
-		backend : Agg
-	EOF
-	distutils-r1_src_test
-}
diff --git a/dev-python/seaborn/seaborn-0.12.2.ebuild b/dev-python/seaborn/seaborn-0.12.2.ebuild
index 276eda23158c..f6dc1cf23fc6 100644
--- a/dev-python/seaborn/seaborn-0.12.2.ebuild
+++ b/dev-python/seaborn/seaborn-0.12.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://seaborn.pydata.org https://github.com/mwaskom/seaborn"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/unasync/Manifest b/dev-python/unasync/Manifest
index a4936ee1dd4d..b52ea8aa1244 100644
--- a/dev-python/unasync/Manifest
+++ b/dev-python/unasync/Manifest
@@ -1,5 +1,3 @@
 DIST unasync-0.5.0.gh.tar.gz 19060 BLAKE2B aa7a955aed98ab33cc1a12aa88a02ab38ef90f9494f04c3e032b66e56e033404e9b59a89834a1e07b224fb865af5d139c27ff91ae5fec8ad01b1e407d9c5c181 SHA512 5b68e9a70f487b2b0fcaf9a5c4240b366428154fda99d53120315382dc29d2cffbbed72e277cee1764f7b91158db3d8b394d4f4969cec1fd7e49f27f01c39440
-DIST unasync-0.5.0.tar.gz 19060 BLAKE2B aa7a955aed98ab33cc1a12aa88a02ab38ef90f9494f04c3e032b66e56e033404e9b59a89834a1e07b224fb865af5d139c27ff91ae5fec8ad01b1e407d9c5c181 SHA512 5b68e9a70f487b2b0fcaf9a5c4240b366428154fda99d53120315382dc29d2cffbbed72e277cee1764f7b91158db3d8b394d4f4969cec1fd7e49f27f01c39440
-EBUILD unasync-0.5.0-r1.ebuild 630 BLAKE2B 720841f4804c732dd33afdd877dc218de90aa6abc06524dfe2d1872e602efeeb9c5460f0ab9a54eee9b46d629edc4da856cbebe73dab0e01412164fef1087c1f SHA512 83f4dacfdd14e35fea9843bd094455d05cc5418727ca1aed73d321141f6a548e07f640ec394440329ddb7d249fe2b94793d0544edf3d2f639f9f37d2fe3a183e
-EBUILD unasync-0.5.0.ebuild 707 BLAKE2B 6878f38139e170cd3bb78f3fb55a9e697d87fe38808be628e7e8c0158045bb33b365f30e9121370c0310ea29436be3f1619b1377b6e3bc25a3d7efcd89a4c37f SHA512 182553c3536773042fe8b8fc9465c2a07494c0e9b301074fc94833dc10f065f0f0ca73251278ba7883f05495b4ef2e7df18479b7a68b2f46d31575fb3b930d0e
+EBUILD unasync-0.5.0-r1.ebuild 628 BLAKE2B 69f6b94f1937136dc05ca177c23979a6c3c3eff9486a1af4d004f026c94d985a80a1a4f23ca46a6665e5f544517c075a954f54b047f51ecb176d3a14d38780de SHA512 91eeb6721bde833bc87d08e56ffe61966e98cf86fffa6497d05a63d53c0ac307c9bd8be655b1f02a5bd43b527b004564ca432ab60e81854f3fef50f5f61da3e2
 MISC metadata.xml 546 BLAKE2B aa3d0b82e53c079b8cd82dfa36e37265eb0dc436493903d861e65e054b7a27de71311de96243041fc706e6741fe5a12ebd91b4cf56b9877f790e3cf4b80beda6 SHA512 f46d77a9feb9602866913e7bc65c220d63eadfb35ea62d8a6c644f977c8e986c72974697f7e4d9b2699657917526857bad6e3c033c1fdcc0cf1ba387e2ec4929
diff --git a/dev-python/unasync/unasync-0.5.0-r1.ebuild b/dev-python/unasync/unasync-0.5.0-r1.ebuild
index ec4f70158a15..afca061a1fee 100644
--- a/dev-python/unasync/unasync-0.5.0-r1.ebuild
+++ b/dev-python/unasync/unasync-0.5.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/python-trio/unasync/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_sphinx docs/source \
 	dev-python/sphinxcontrib-trio \
diff --git a/dev-python/unasync/unasync-0.5.0.ebuild b/dev-python/unasync/unasync-0.5.0.ebuild
deleted file mode 100644
index a74eaf3b7b66..000000000000
--- a/dev-python/unasync/unasync-0.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="The async transformation code"
-HOMEPAGE="https://github.com/python-trio/unasync"
-SRC_URI="https://github.com/python-trio/unasync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_prepare() {
-	# Stop test from breaking itself
-	sed -i '/env\["PYTHONPATH"\]/d' "${S}/tests/test_unasync.py" || die
-	default_src_prepare
-}
-
-distutils_enable_sphinx docs/source \
-	dev-python/sphinxcontrib-trio \
-	dev-python/sphinx-rtd-theme
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 5ba45416f645..1c1e71167d94 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,9 +1,5 @@
-DIST watchdog-2.2.1.gh.tar.gz 101485 BLAKE2B 4ec0a2c14d0dcb8d39ed4dea48c1318474768298b4eade4f7c08f811282ffdbf5871c7d55d71681863c38d1f0603c46aaadda73bf38a20ef263fa3b4cf76c354 SHA512 bbd6e3e3fdc7ee5df21b78241922c0050aeb0c01e394fa7d025465f04f3307d190af4cf6e822826975a3b095fb479dfd103be0675f12782e8899f556797baed4
-DIST watchdog-2.3.0.gh.tar.gz 103265 BLAKE2B 0817b64e6fc4b31b922f2f73091cc39f702605fa31041a75312635e5500dfeeeab749f0bfd95f3e27900be8f017c4a1b0c07aab40989a9000d1970a2b1e06c1f SHA512 733d408e74a81ce834075472d7488e8d767f80ef92a2a13cc986c1f5d879b0353f0cb85c1996168ae6b8b82d135bcb26c6c18b51a01a8d75915bdec94acd607d
 DIST watchdog-2.3.1.tar.gz 123140 BLAKE2B a49307b890b9f69eda760c6285d325fddc7281347740b36d7c840a5e28ef496498420c21424f1553bf1dc0d47a928194720ef1ae542e7c0f6f58085760c2e8f5 SHA512 a492c818fcc8b21ca4052fecafdf6b4d00f441034d73b10464fc9c09a89d539acd8304e591ded96e5d992e2c9455be018373ba4f06a33b047e606c083f9061e8
 DIST watchdog-3.0.0.tar.gz 124593 BLAKE2B bc8135dcbe9b1000fb7befc85ebf62518222b0470676cf94aabbe8f871bb05064a46ae4d11ce34f8030d35268c073fe82757b911e3983a8b683ffbd09227395c SHA512 fa1421b01af99d7fa676c9077b2330ead17c004d9bb9e9edd78d4bbf87cf41624ecd669ca48613d99be2109373bbab4e004b69665d2ca42e082573e4740c13d0
-EBUILD watchdog-2.2.1.ebuild 1094 BLAKE2B c6b0299e9f82284b5baf1319046a21f8887683b97a234897a90424e1c7d5d69676a00b5781d1bc0fb5dd744e223819e8ae5f873b9a92fe6345244e83750ec1cc SHA512 fcd84240f27468fd63fa6f187cf6d45eb5fbd1515b94942073540cc412c25c8382dacfeec8046915ba1fa9ccfd2073ffae809c87e5da07087671812c5655b70c
-EBUILD watchdog-2.3.0.ebuild 1102 BLAKE2B a0736eca26c3af4949387b94d9d03206c4bdef58865343ecd94cc90236590d109eec2671098148a6d638b2175565229d3db1e4daf5defa5ec7e0b4b8169a71bb SHA512 a8281d35542ed64b1141597213e117f6a564a48552d56015295fcb7016a2fa359c8bbd99100a04a190530f8d3719eb81d8139a2dd401dc66df26806e9b83c2e7
-EBUILD watchdog-2.3.1.ebuild 1060 BLAKE2B 58916b38effbbc2b36c6cdc3b9df2c373d859f55493c07ff29982149386bb4899516182f2875035b68ac584262d0fdeead789b68234561616055e2f106caa7d4 SHA512 232d8f0918095ef3ec56fe407c918eface7c97e20acaeadb3b00f878f0af3f2d319f1baa1b4736305747ca10b427b8f77be92b5ae991596e0a049c6e93f2f89d
+EBUILD watchdog-2.3.1.ebuild 1058 BLAKE2B f8b3604c4702ecd9da7f6eb8ad3c26430939f27c052da39cae3dacac7c2f71fa11cd8e8d1cb7a706e61b940ed4fcd295ed5ed293acebce7d630d1bae8442c804 SHA512 56ceb3e077685b271b245c7634f69311fe0b55c2bddb51f4999f9c2a3f9b312f897c3763dcb4aa5deec5fccf8101b03be5e31f087486182ec91cede25e018293
 EBUILD watchdog-3.0.0.ebuild 1066 BLAKE2B 4487faaafced2194b1e2ee76c484ceed6207bb58788fa4682ac6043c3b1fb176455bdb7c2712705494ec126579eb6fd88f86e4623ee29d4eb00517103ebf9356 SHA512 46377d6fad074b644711cb4fd01b6fb5b225bf2d32b812c808ef07359384c64c75bc432d1e5d2bcc399f5c923fada5674866996d5d55e0d7dc1f1782866312a3
 MISC metadata.xml 463 BLAKE2B d4f4a77cbba45384d34ac533c223e6640f75460ebfa46ae029a57297ab1a8711f8c10bcd0c11926651bd61d5a2ae98e316ebe40c6011de06f8ee46ad5fcab5b2 SHA512 5eaf8c60e47afa3933115e23cec07340d8cb708c9c9568cf943030db2ed7e05771f51369d6d7d8e21ab598dc872af275784939a243a37abb1e3661b41f479721
diff --git a/dev-python/watchdog/watchdog-2.2.1.ebuild b/dev-python/watchdog/watchdog-2.2.1.ebuild
deleted file mode 100644
index 667e26c7ae30..000000000000
--- a/dev-python/watchdog/watchdog-2.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.3.0.ebuild b/dev-python/watchdog/watchdog-2.3.0.ebuild
deleted file mode 100644
index 10eca6827871..000000000000
--- a/dev-python/watchdog/watchdog-2.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="
-	https://github.com/gorakhargosh/watchdog/
-	https://pypi.org/project/watchdog/
-"
-SRC_URI="
-	https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/--cov/d' setup.cfg || die
-	default
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# requires root powers via sudo (yes, seriously)
-		tests/test_inotify_buffer.py::test_unmount_watched_directory_filesystem
-	)
-
-	epytest -p no:django
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-2.3.1.ebuild b/dev-python/watchdog/watchdog-2.3.1.ebuild
index 39f7685b89ba..14e70cce80f3 100644
--- a/dev-python/watchdog/watchdog-2.3.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.3.1.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"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 6b1827795158..746816c6199f 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1,5 +1,3 @@
-DIST wrapt-1.14.1.gh.tar.gz 133767 BLAKE2B 407a9531f581b034be7fe4392dcbf94803aa9c3a82d7c392750dfef62a5cbb84582e292819bf749356fad2b6e98cc89777df0f3b0f4ca70422e75b72ad256711 SHA512 c67e99eb29afeefb2512fb545cd180b8e96f69235d6281edebe62ea5e411188a904a7e683afdda2d6a86cf8b7fd74f79a3c3bec04e19a7c5ef347729bb43f94c
 DIST wrapt-1.15.0.gh.tar.gz 137402 BLAKE2B 8c4764251a89f7795fef71dd71d9c36611d896d2e2791a5e7ce4f665f7b477e683f21aa05251a6ceb96644221a7ff9b01dfe98a7f4d278987dedc17ead39b343 SHA512 6be3fc6380e6bb11a26e35fb093ca54d2e851ab384682f6b1201599980c0429c1e2f23089540b66dd80985baaaf3fb93ce29034758e062e2cfb2f52e3b362779
-EBUILD wrapt-1.14.1.ebuild 793 BLAKE2B c58f6d1970cd527dd32d594e188fdc344ce7329c1948ee816e1798ef45407b72cc0c86c66b1201b4a9783be6e97da4a380f4d6f48ff6c40cad79daeead239b11 SHA512 908d17dc9bbb12bbc50241a03d282cddb2d2e5db893ac929cbbd6ad38851fb30f179746c3f8e48be9977d218088b296593fdd1cc248f4114bd36e311a53eb67b
-EBUILD wrapt-1.15.0.ebuild 872 BLAKE2B bec55b13ce4ff253196032151f431d85b3eeac91262ace1dacd5c8b452e86966950ca3b5e1b2be6aedab6d70420ae7261a191019db3d615f82ee288561d6df89 SHA512 586217a4f41c765731ec6a3359bfe4926021e3218d277a59b63d6b330fa02dc7a48c0bb91f8f7a6395080ff595714cc3a8aa1b4d2afedd232b50a597900633a5
+EBUILD wrapt-1.15.0.ebuild 864 BLAKE2B 1e67c5d32c75235b6be3eb6e67abd6e35823af5790a0e0fed2746ca823d0fda46a836a206959ac3e630196f92da1d9b4b34e80060613bbaf39d2b6547f20f12c SHA512 4e059cfd6138d9faa0fb999882d5d6ab976b8b76d076f27c26accba18f581e30774724de2719a53c39b0602f2621baf3558531253e3980fd20e7c390f8321b2b
 MISC metadata.xml 370 BLAKE2B 251d8c90cd2a0a1b9fbc714b624c7113e9791f268130211160655f4e4e32aadaddaf98a95bb6d9fff5a5df128da9d551b1281a28e4bd7fa6e3c9db7d35b10829 SHA512 31b369317f4a44d593d9fb72bcb9fcb792809323862866da7c3464ca2282e29a65cd353909c05782b85b162cff363b0ad8ea4750d89c942d442034b9a6eb7dba
diff --git a/dev-python/wrapt/wrapt-1.14.1.ebuild b/dev-python/wrapt/wrapt-1.14.1.ebuild
deleted file mode 100644
index 04a1ba3174d4..000000000000
--- a/dev-python/wrapt/wrapt-1.14.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for decorators, wrappers and monkey patching"
-HOMEPAGE="
-	https://github.com/GrahamDumpleton/wrapt/
-	https://pypi.org/project/wrapt/
-"
-SRC_URI="
-	https://github.com/GrahamDumpleton/wrapt/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
-
-python_compile() {
-	local -x WRAPT_INSTALL_EXTENSIONS=true
-	distutils-r1_python_compile
-}
diff --git a/dev-python/wrapt/wrapt-1.15.0.ebuild b/dev-python/wrapt/wrapt-1.15.0.ebuild
index 1b7cfe7b88b0..d54d14059770 100644
--- a/dev-python/wrapt/wrapt-1.15.0.ebuild
+++ b/dev-python/wrapt/wrapt-1.15.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs dev-python/sphinx-rtd-theme