Adding metadata

52 files changed, 686 insertions, 297 deletions

diff --git a/dev-python/blessed/blessed-1.20.0.ebuild b/dev-python/blessed/blessed-1.20.0.ebuild
index 493e64d397d0..b4b5a670d254 100644
--- a/dev-python/blessed/blessed-1.20.0.ebuild
+++ b/dev-python/blessed/blessed-1.20.0.ebuild
@@ -6,14 +6,13 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Library for making terminal apps using colors, keyboard input and positioning"
 HOMEPAGE="
 	https://github.com/jquast/blessed/
 	https://pypi.org/project/blessed/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest
index 3db6ef8cb3f6..9906099637a5 100644
--- a/dev-python/caldav/Manifest
+++ b/dev-python/caldav/Manifest
@@ -1,3 +1,4 @@
 DIST caldav-1.0.1.gh.tar.gz 133071 BLAKE2B d7b9eb8015782bed5d32b7c34508cfcc1334d33cdfed99003cf45893b0a894d5a3187a2c98f886f97ffe8a64140a5a3826e1b3f57b58228a61d1ad4f9bf9f72a SHA512 ac816afd74f6fe34d82345a8b3a934fbe2c37af6a75cc8ef91cd87c8b8d147962ff05e701cd91480c1963d57967898129f923655d366820b689959b00f55659f
 DIST caldav-1.1.1.gh.tar.gz 136513 BLAKE2B a825b19023cadfd2b59e747c5d1b00065530d6773435a9f363d54cea7621f56eb6207b7a2888994fe5c42b873d6b82ba285abbc2ee5d18f72aafd90271cc5e87 SHA512 a1d991d468f093e6d54262f657e6e43ea9bf9e55dbe1f2fcb7189fb1e6a742805faee2a99807838f5db3406c1a9cd72a14054a30efe13e8d5ad7f113aaa88e2a
 DIST caldav-1.1.3.gh.tar.gz 136529 BLAKE2B 275c56d74a5118697672deae9611054ef08638ebd476d0108286cb116dc1b102ed5ae36dcb85ebcc21eb36d02aeb02d47e5acdda510c568f8dd9ae85895518c8 SHA512 ec281ac41d14938a5c10a08ef8134a16987e14218e2a1b092a6c10d09b619fc8372d3be3c1fb139bdb2c1f183af0832d486f70554e4007a0dc145173fc4564fb
+DIST caldav-1.2.0.gh.tar.gz 122290 BLAKE2B 62e60695737298dae299aed6e73ed3570c51f5fd05d15f25fb34852e2ca97d6a3e700148f69b5a67f1fad0db8233426d0908f58d513602e8be171ebbb5fef1bb SHA512 56b329d1fcc9ef750e30721485825e067706280b48131816357df023b53e6631b6749e154d0db4815328588359cc98e996c35a0e93395f1cd58d4c36615f96e6
diff --git a/dev-python/caldav/caldav-1.2.0.ebuild b/dev-python/caldav/caldav-1.2.0.ebuild
new file mode 100644
index 000000000000..5ef3f94e0efe
--- /dev/null
+++ b/dev-python/caldav/caldav-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="CalDAV (RFC4791) client library for Python"
+HOMEPAGE="
+	https://github.com/python-caldav/caldav/
+	https://pypi.org/project/caldav/
+"
+SRC_URI="
+	https://github.com/python-caldav/caldav/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="|| ( GPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/vobject[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/icalendar[${PYTHON_USEDEP}]
+		dev-python/recurring-ical-events[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		www-apps/radicale[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index 13fc21a18c1e..be1b38506a9b 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1 +1,4 @@
+DIST configshell-fb-1.1.29-replace-getargspec-1.patch 1398 BLAKE2B 650efe1dad551ad040001cb2f576311806d329bd430874e1dac38a5cb94c4801140f32b628e0089809214466613e8f207ba3aff1a87dd8ca29c05593b551e5d7 SHA512 59c320939d4590dc2933de7d0ad613efd7236868fd898ce1edadbc55d1ecd8667e28a5c03caa80ea12420db3dd0e4de8c36ef5528352920d98acfd881648154a
+DIST configshell-fb-1.1.29-replace-getargspec-2.patch 2981 BLAKE2B 88400de96d329c0efd2a9e9cb41f1c53e62c28507439c405874726fccc6093d5fe37e52b6e4b811bf0ccc7616c9a26b83b17e39a257aeab3c4114e1486a32575 SHA512 621b125cde9fcc68f46a3a32fd78190a46f900ec808233a60c4beb22c6109165f0743a341991e6c556dc5a76b7c6a42b703f2a6be91915110f196845a3fa111c
+DIST configshell-fb-1.1.29.gh.tar.gz 33192 BLAKE2B 6c9c2146a597572675611afe259122b0ec9614295c4b9b4056d7a16f35004700b1e6fc29e1bf868d9ba6291b781ca35eab77e8adf23c6d23e09de2fb94626f26 SHA512 1b5f573506317119d2420e415abbb856692caa65a7f407f741300eec302d1b442e29d2691f6a192b202b2a5731a7a179d1b03f6cd27780876194d97e4df5f7d0
 DIST configshell-fb-1.1.29.tar.gz 55036 BLAKE2B 4a9a8f2573b43a9c8ddbda837e831c96b221f4499acb1aeeb990a7b1050c5572e9b745857ac9d1de4089d1758dd1284d0555da524def80e0a1caac18bb43a921 SHA512 0d7663cf58431c8b0be5618e5ef454838489e11a3074e5bd63145c3ea965065e37f1a41b5775363a35498a4d5dd86ad5453feb58dd74853cd77ae196b44c658e
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
new file mode 100644
index 000000000000..23e24466800d
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.29-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="
+	https://github.com/open-iscsi/configshell-fb/
+	https://pypi.org/project/configshell-fb/
+"
+SRC_URI="
+	https://github.com/open-iscsi/configshell-fb/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/open-iscsi/configshell-fb/commit/f3ac914861bd605e3d634aeeb5e706abdbd39259.patch
+		-> ${P}-replace-getargspec-1.patch
+	https://github.com/open-iscsi/configshell-fb/commit/50d5ffe9f213a53588cec88c9919c816b3fa7736.patch
+		-> ${P}-replace-getargspec-2.patch
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# Python3.11 fixes of deprecated getargspec function taken from upstream:
+	# - https://github.com/open-iscsi/configshell-fb/pull/64
+	"${DISTDIR}/${P}-replace-getargspec-1.patch"
+	# - https://github.com/open-iscsi/configshell-fb/pull/65
+	"${DISTDIR}/${P}-replace-getargspec-2.patch"
+)
+
+python_test() {
+	"${EPYTHON}" examples/myshell || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
index 2c507661c3a1..face9cecc117 100644
--- a/dev-python/configshell-fb/metadata.xml
+++ b/dev-python/configshell-fb/metadata.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <longdescription lang="en">
-	configshell-fb is a Python library that provides a framework
-	for building simple but nice CLI-based applications.
-</longdescription>
+		configshell-fb is a Python library that provides a framework
+		for building simple but nice CLI-based applications.
+	</longdescription>
  <upstream>
   <maintainer status="active">
    <email>mlombard@redhat.com</email>
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index f1ed3d0513de..51319692f837 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,3 +1,4 @@
 DIST coverage-7.0.5.tar.gz 796171 BLAKE2B 87ecffd87c2465607bf1fd330296e84e174953d7696ee0ef3046f6555f54634cfc643ada2a03971685021a5cf59191d75a0bddbc83f736e11a2516c684b0f0d9 SHA512 d199d710cdfac5c6cde79224b4a27d6b88a0e0c504eff7ad5700e9fb1f5cc8e1e9359dcc12f6c447a7ee6cd680feeb89f70ad68574a739c55a6d09b22017df06
 DIST coverage-7.1.0.tar.gz 809785 BLAKE2B 3720aee79ecfdd6aa652b5198bad4d6b5827a85f1d58986eec51bab1e72800dac28eb0ebbeb15d547ef03694ca1397bec47c37a9233dc34b2d3d2a6a22a48274 SHA512 80920b337391e47f1e631ba8a892792b6d2c72e753ddf403222c6ad527637699889f29cfee40721949e5eeb6e7977f319635c44d79f58e7e19676d1165dfdde2
 DIST coverage-7.2.0.tar.gz 812120 BLAKE2B 17851996635a1621643e64025ba43f11d7e844fb8757c5bfd6794dbff85cf2c218dc61119c8604f19f951c83264eb13f9c8f0cf7f070f6b213603b25b756a59c SHA512 a913c257702a77b115b6519c0feaf9336973330c9264cb376453555c30f305db2b924d5dd8ff7b58bb89d9f1765b069512929d1ccc9c1c234bdd08d6fc82213b
+DIST coverage-7.2.1.tar.gz 812219 BLAKE2B bb6b482990b0620d7e264244a9e31ee44b37fe83436c1d7d016d20e36d9ecbea85a614a4142683757bb1284bfbe2a157fc4748b01c76b5495c5eca5834e9a848 SHA512 40a7f1d25c7100b8f2f4ba1f877c241f65e1f560cdad861dab05254a4e177de37615888441d47a6c2ebc525ad2b52b476da7111efe5583708f094dd3a1b39984
diff --git a/dev-python/coverage/coverage-7.1.0.ebuild b/dev-python/coverage/coverage-7.1.0.ebuild
index 04fabe4d9721..a3aeff9f402d 100644
--- a/dev-python/coverage/coverage-7.1.0.ebuild
+++ b/dev-python/coverage/coverage-7.1.0.ebuild
@@ -19,7 +19,7 @@ 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"
+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/coverage/coverage-7.2.1.ebuild b/dev-python/coverage/coverage-7.2.1.ebuild
new file mode 100644
index 000000000000..8c640e8c1553
--- /dev/null
+++ b/dev-python/coverage/coverage-7.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+),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/cython/Manifest b/dev-python/cython/Manifest
index 5590141cc0f9..9d548ddb867b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,2 +1,3 @@
 DIST cython-0.29.32.gh.tar.gz 2110417 BLAKE2B 008ffe325c87d165bf45afb2ff92db5286f611bbe425d0e9f18b530202135ca21f5f5ab564a4d0c6251ec2479ea0fd19207274a255fb1faf8863d3b067d17ae9 SHA512 55462792fa70d8edf60aa470627ab494918d7297fd7d282a7a54da76ee5a180233108404a1c8f3d79f6408f19b6e4f46b36e59fd47c38ede24f061f374437b6f
 DIST cython-0.29.33.gh.tar.gz 2113910 BLAKE2B 9212edfa36680a3243632d28c4f5616a7336e82ee1f96df7d5e29711056619639c9a8fe9bbf9aea0a86aed39e836dc6eaa112ad35080f530add6309ccd09c53c SHA512 85f5ba7159d8793dbda980140b26086727f356a71d78f8522419657841d07b865d09c2f0a0f77d398669d071c1d261060235321a19eb7808e35d24f8ac71560d
+DIST cython-3.0.0b1.gh.tar.gz 2659132 BLAKE2B 7ed252d90f71521f24817e064f1b55f671185053cdd46214fb14f2b6e16dbfbc46e87659681ead40a32bb0506150ae6b8cdbaceae7667811aa81f97a39b5efcc SHA512 a7b2e9c22d19eab9e4ad551895e5c8882a7098a52865e341fd84d902124b4599d193d202333d9f1ffd5354fff62637c65d124820e6721905edaed46b5881b14c
diff --git a/dev-python/cython/cython-3.0.0_beta1.ebuild b/dev-python/cython/cython-3.0.0_beta1.ebuild
new file mode 100644
index 000000000000..8c6cf0f02109
--- /dev/null
+++ b/dev-python/cython/cython-3.0.0_beta1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+MY_P=${P/_beta/b}
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="
+	https://cython.org/
+	https://github.com/cython/cython/
+	https://pypi.org/project/Cython/
+"
+SRC_URI="
+	https://github.com/cython/cython/archive/${PV/_beta/b}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+		' python3_{8..10})
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs \
+	dev-python/jinja \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-tabs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	if has "${EPYTHON}" pypy3 python3.11; then
+		einfo "Skipping tests on ${EPYTHON} (xfail)"
+		return
+	fi
+
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/fido2/fido2-0.9.3-r1.ebuild b/dev-python/fido2/fido2-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..482d6b98dd7a
--- /dev/null
+++ b/dev-python/fido2/fido2-0.9.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Python based FIDO 2.0 library"
+HOMEPAGE="https://github.com/Yubico/python-fido2"
+SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
+SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	examples? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyfakefs-3.4[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${S}"/examples/.
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
index e08272ea9dfb..1101044e19e7 100644
--- a/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
+++ b/dev-python/httpx-socks/httpx-socks-0.7.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
index 5d4e3e01f6ab..22cfb797cd6a 100644
--- a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index f202d205d878..f7e12bde34b4 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,4 +1,5 @@
 DIST imageio-2.25.0.gh.tar.gz 401690 BLAKE2B 3c7faa7aae06b098a171ad168cd28d14abbc32d519a373ab77c4bec30913faa7baafc2f0b4721a80ee72a6e7b479c12fe27e707c4a90bcaaf2ebceb2b4b39577 SHA512 e887d8572f4698b6cd6fad832054cbce2550a4165e65704c2f990b500234cc938c68b9840bc8961a7258cf4cfa91c3ac909c7965de689b00b04195ab1120850c
 DIST imageio-2.25.1.gh.tar.gz 402105 BLAKE2B 8d7f5881fecf2b5bd5fa0534f4f979db252a1541fce518a4c5acdf7592c8e752dc49e0025d7319fc27588cb457c4f5b05e9a91f510039b95371ac31bee9fd241 SHA512 0473eb10c00e4ceff858394d3bde3b7c42fc7f2c6692ab3f7a1e20c67ab84fed3129948eff5aef0c43bf750906c3b3b8acca75fcbba855b6b9f725258df4241f
+DIST imageio-2.26.0.gh.tar.gz 403652 BLAKE2B 2f1948b1cee03ef4fdd71489923a1ea5b0c364fb5f000d79e1d309042184a6bb267a323bd19fce85bf47857245eb4be5283f0b3df65857d7cac57c24930ea409 SHA512 6ad8ce0395033571c0d918dbe03ffeab0e43b29d402bc91a229d3ffd689eae3d01aa09dec386d03fe028f6138887883cfda4e0a769f523ba9f6c3e3041a0cb7f
 DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
 DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
diff --git a/dev-python/imageio/imageio-2.26.0.ebuild b/dev-python/imageio/imageio-2.26.0.ebuild
new file mode 100644
index 000000000000..30875e33909b
--- /dev/null
+++ b/dev-python/imageio/imageio-2.26.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
+DESCRIPTION="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+			-> ${PN}-chelsea.png
+		https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+			-> ${PN}-cockatoo.mp4
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		# block silently downloading vulnerable libraries from the Internet
+		"${FILESDIR}"/imageio-2.22.0-block-download.patch
+	)
+
+	if use test; then
+		mkdir -p "${HOME}"/.imageio/images || die
+		local i
+		for i in chelsea.png cockatoo.mp4; do
+			cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+		done
+	fi
+
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+	# blocked by our patch
+	tests/test_core.py::test_fetching
+	tests/test_core.py::test_request
+	# known broken
+	# https://github.com/imageio/imageio/issues/890
+	tests/test_freeimage.py::test_exr_write
+)
diff --git a/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
index 68abb1460645..f3f4bc44dd9a 100644
--- a/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-8.9.0.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
 		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 2f3294adfa68..6fc1a46de4ea 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -2,3 +2,4 @@ DIST mkdocs-material-9.0.10.gh.tar.gz 10933071 BLAKE2B 702db94a8c91a856ffcf30402
 DIST mkdocs-material-9.0.12.gh.tar.gz 10929135 BLAKE2B 2b8468790c38e40a35b7fd4ff324cde485c1a7f7bc5c748b52b21b34deaca62f397ec056717107dc50024315b9740dc0b9dcce9921fd84c0cda5f9de55068553 SHA512 fd52632e2eb2225d32ac13a48eb0bab8f694644e8369a90ee85902549405b13b2308102ffe6bcb631d4847c7f1b345637d5b86470454eea52487a7b92dd14ab1
 DIST mkdocs-material-9.0.13.gh.tar.gz 10930459 BLAKE2B d3d4b25e2e2b524caa70a47c2cd51cd2c06921beccecb8f76c67f177a72568698056151fb20ee5141df0d6cdeee75192d7a7fc4dc85511501f4d2c8dfe5a3e1c SHA512 cc2abaab0727376ff3b3f3d3099c57f601243520c644dcc48b0c6d671ae543a8b65e8161fa8e4d1199671652a54e14969a7c2470985b0570e63763cf88d63704
 DIST mkdocs-material-9.0.14.gh.tar.gz 10932657 BLAKE2B a43fe024bd4c285801c10a3a45b0e601bc5c338fde51408db8c23cdf84455b606461fffda86d8bcb53374102a32a5efe315467305842a5e9fc5859db26b06b0e SHA512 9821fc1ce6e1b74b920b7c928c9ceb00d8f7489939c58d12c9a7c238ca75b619a23bffe0eccb7653d5303eaf6281e2fbd81392b19ff8f4c1431754544a432297
+DIST mkdocs-material-9.0.15.gh.tar.gz 10923424 BLAKE2B d2980f058001f0246be4ad34496a066b962e9fed8239415dd54dff0287211d97a640a2aca808aea1daec2f445b548153f6efd229bba515c968d50bd609936b4d SHA512 39b4a6d5d50ea27c7cdd2d23cf2d41a79d6dc0e1949346bd8d7c0e9a0792f7a9a9ae15594ff83017211d858d94240a09b0314a6294f268cf43e7337868ba5e69
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
new file mode 100644
index 000000000000..4de43bd469bc
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+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 ~arm ~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/pkgcraft/pkgcraft-0.0.5.ebuild b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
index be43bfffaec1..7b1de554a840 100644
--- a/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-0.0.5.ebuild
@@ -18,14 +18,15 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
 	inherit git-r3
 
-	PKGCRAFT_VERSION_MIN="9999"
 	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MIN="9999"
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
 	S="${WORKDIR}"/${P/-python}
 
 	KEYWORDS="~amd64"
 
+	PKGCRAFT_VERSION_MAX="9999"
 	PKGCRAFT_VERSION_MIN="0.0.6"
 fi
 
@@ -34,6 +35,7 @@ SLOT="0"
 IUSE="+examples"
 
 RDEPEND="
+	<sys-libs/pkgcraft-${PKGCRAFT_VERSION_MAX}
 	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pkgcraft/pkgcraft-9999.ebuild b/dev-python/pkgcraft/pkgcraft-9999.ebuild
index be43bfffaec1..3016e20be3d3 100644
--- a/dev-python/pkgcraft/pkgcraft-9999.ebuild
+++ b/dev-python/pkgcraft/pkgcraft-9999.ebuild
@@ -18,14 +18,15 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft-python"
 	inherit git-r3
 
-	PKGCRAFT_VERSION_MIN="9999"
 	PKGCRAFT_VERSION_MAX="9999"
+	PKGCRAFT_VERSION_MIN="9999"
 else
 	SRC_URI="https://github.com/pkgcraft/pkgcraft-python/releases/download/v${PV}/${P/-python}.tar.gz"
 	S="${WORKDIR}"/${P/-python}
 
 	KEYWORDS="~amd64"
 
+	PKGCRAFT_VERSION_MAX="9999"
 	PKGCRAFT_VERSION_MIN="0.0.6"
 fi
 
@@ -34,11 +35,12 @@ SLOT="0"
 IUSE="+examples"
 
 RDEPEND="
+	<sys-libs/pkgcraft-${PKGCRAFT_VERSION_MAX}
 	>=sys-libs/pkgcraft-${PKGCRAFT_VERSION_MIN}:=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-python/cython
+	>=dev-python/cython-3.0.0_beta1
 	dev-python/setuptools_scm
 	virtual/pkgconfig
 "
diff --git a/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild b/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..50ea24e1f6fc
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/pulsectl/pulsectl-22.3.2.ebuild b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
index ddb964f3089d..7323056ec779 100644
--- a/dev-python/pulsectl/pulsectl-22.3.2.ebuild
+++ b/dev-python/pulsectl/pulsectl-22.3.2.ebuild
@@ -18,6 +18,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-sound/pulseaudio"
+RDEPEND="
+	media-sound/pulseaudio
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch b/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
new file mode 100644
index 000000000000..d24999e7273a
--- /dev/null
+++ b/dev-python/pycparser/files/pycparser-2.21-lextab-cache.patch
@@ -0,0 +1,66 @@
+From 35a279ecb9af41a6f95ddbc6a0f1beaa2472d165 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 26 Feb 2023 01:04:34 +0100
+Subject: [PATCH] _build_tables: Invalidate cache before importing generated
+ modules (#494)
+
+Make sure to invalidate finder caches before trying to import generated
+modules.  This is necessary according to the Python documentation:
+https://docs.python.org/3/library/importlib.html#importlib.invalidate_caches
+
+This fixes a hard-to-reproduce bug that Python would be unable to find
+just-generated `lextab.py` if mtime of the current directory did not
+change from the moment the script was started.  This could
+e.g. be the case if one has second-precision timestamps and removes
+the generated file just before starting the build, e.g.:
+
+    $ rm pycparser/lextab.py; python -m build -nw
+
+It could also be reproduced easier by doing something like:
+
+    $ cd pycparser
+    $ touch .; python -B _build_tables.py
+    Traceback (most recent call last):
+      File "/var/tmp/pycparser/pycparser/_build_tables.py", line 38, in <module>
+        import lextab
+    ModuleNotFoundError: No module named 'lextab'
+
+This is because the first command (`rm` or `touch`) updates the mtime
+of the directory to the current time.  If the script is run fast enough,
+it manages to scan the directory and then write the new `lextab.py`
+within the same second.  As a result, mtime of the directory after
+writing the new file is the same as when the script was started, finder
+does not invalidate the cache and assumes that `lextab.py` does not
+exist since it did not exist when the directory was scanned earlier.
+
+This potentially fixes #493.
+
+It was originally reported on https://bugs.gentoo.org/701878.
+Thanks to Gary E. Miller for patience in reproducing the problem
+and proxy-debugging it for me, as well as testing the final patch before
+submission.
+---
+ pycparser/_build_tables.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pycparser/_build_tables.py b/pycparser/_build_tables.py
+index 958381ad..4f371079 100644
+--- a/pycparser/_build_tables.py
++++ b/pycparser/_build_tables.py
+@@ -13,6 +13,7 @@
+ # Insert '.' and '..' as first entries to the search path for modules.
+ # Restricted environments like embeddable python do not include the
+ # current working directory on startup.
++import importlib
+ import sys
+ sys.path[0:0] = ['.', '..']
+ 
+@@ -32,6 +33,8 @@
+ 
+ # Load to compile into .pyc
+ #
++importlib.invalidate_caches()
++
+ import lextab
+ import yacctab
+ import c_ast
diff --git a/dev-python/pycparser/pycparser-2.21-r1.ebuild b/dev-python/pycparser/pycparser-2.21-r1.ebuild
index b74fccf2bf5b..594a37e1653b 100644
--- a/dev-python/pycparser/pycparser-2.21-r1.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r1.ebuild
@@ -30,6 +30,11 @@ BDEPEND="
 distutils_enable_tests unittest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/eliben/pycparser/pull/494
+		"${FILESDIR}"/${P}-lextab-cache.patch
+	)
+
 	# remove the original files to guarantee their regen
 	rm pycparser/{c_ast,lextab,yacctab}.py || die
 
diff --git a/dev-python/pycparser/pycparser-2.21-r2.ebuild b/dev-python/pycparser/pycparser-2.21-r2.ebuild
index dd0b0d9a0f4b..5ca3bc4e5775 100644
--- a/dev-python/pycparser/pycparser-2.21-r2.ebuild
+++ b/dev-python/pycparser/pycparser-2.21-r2.ebuild
@@ -29,6 +29,11 @@ BDEPEND="
 distutils_enable_tests unittest
 
 python_prepare_all() {
+	local PATCHES=(
+		# https://github.com/eliben/pycparser/pull/494
+		"${FILESDIR}"/${P}-lextab-cache.patch
+	)
+
 	# remove the original files to guarantee their regen
 	rm pycparser/{c_ast,lextab,yacctab}.py || die
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 876ac8788f96..12303b7d4f75 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,2 +1 @@
-DIST pycurl-7.45.1.tar.gz 233879 BLAKE2B 8a6fe72f00cfd172b4f5e257f4526c4115047aa911d7fb3802d3bf105ac70dc866b27fa4878aae9f92229a5dd5108a2b5e1c9acfe93e1a94dac60d9405c5d5e6 SHA512 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
 DIST pycurl-7.45.2.tar.gz 234245 BLAKE2B 16257a967d2867de08d83478f602d00b54316d37b6a544804e606a814f61507530fb7e1ef3247be824dfa22b9487a69bbfc9b1038b2b776ebc556b18ed2d93ca SHA512 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac
diff --git a/dev-python/pycurl/files/7.44-fix-tests.patch b/dev-python/pycurl/files/7.44-fix-tests.patch
deleted file mode 100644
index d5d900100086..000000000000
--- a/dev-python/pycurl/files/7.44-fix-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/pycurl/pycurl/commit/d47c68b1364f8a1a45ab8c584c291d44b762f7b1
-From: Samuel Henrique <samueloph@debian.org>
-Date: Sat, 30 Apr 2022 23:02:34 +0100
-Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
-
-curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
-https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
-
-This commit adds support for the new curl release while also supporting the previous ones.
---- a/tests/error_test.py
-+++ b/tests/error_test.py
-@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
-             err, msg = exc.args
-             self.assertEqual(pycurl.E_URL_MALFORMAT, err)
-             # possibly fragile
--            self.assertEqual('No URL set!', msg)
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(msg, ['No URL set!', 'No URL set'])
-         else:
-             self.fail('Expected pycurl.error to be raised')
-     
-@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
-             self.curl.perform()
-         except pycurl.error:
-             # might be fragile
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            # curl < 7.83.0 has an exclamation mark in this error message
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # repeated checks do not clear value
--            self.assertEqual('No URL set!', self.curl.errstr())
-+            self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
-             # check the type - on all python versions
-             self.assertEqual(str, type(self.curl.errstr()))
-         else:
diff --git a/dev-python/pycurl/pycurl-7.45.1.ebuild b/dev-python/pycurl/pycurl-7.45.1.ebuild
deleted file mode 100644
index 45845ee32fdd..000000000000
--- a/dev-python/pycurl/pycurl-7.45.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for curl/libcurl"
-HOMEPAGE="
-	http://pycurl.io/
-	https://github.com/pycurl/pycurl/
-	https://pypi.org/project/pycurl/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
-
-# Depend on a curl with curl_ssl_* USE flags.
-# libcurl must not be using an ssl backend we do not support.
-# If the libcurl ssl backend changes pycurl should be recompiled.
-# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
-# does not need to initialize gcrypt threading and we do not need to
-# explicitly link to libgcrypt.
-DEPEND="
-	>=net-misc/curl-7.25.0-r1:=[ssl=]
-	ssl? (
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
-		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
-		curl_ssl_openssl? ( dev-libs/openssl:= )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	test? (
-		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/7.44-fix-tests.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# docs installed into the wrong directory
-	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
-	# TODO
-	sed -e 's:test_socks5_gssapi_nec_setopt:_&:' \
-		-i tests/option_constants_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# Override faulty detection in setup.py, bug #510974.
-	export PYCURL_SSL_LIBRARY=${CURL_SSL}
-}
-
-src_test() {
-	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local EPYTEST_DESELECT=(
-		# refcounting tests are unreliable
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_readdata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writedata_refcounting
-		tests/memory_mgmt_test.py::MemoryMgmtTest::test_writeheader_refcounting
-	)
-
-	epytest -p flaky tests
-}
-
-python_install_all() {
-	local HTML_DOCS=( doc/. )
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycurl/pycurl-7.45.2.ebuild b/dev-python/pycurl/pycurl-7.45.2.ebuild
index c0f1b99fee42..bc7443d7f70f 100644
--- a/dev-python/pycurl/pycurl-7.45.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.45.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1 toolchain-funcs
+inherit distutils-r1 pypi toolchain-funcs
 
 DESCRIPTION="Python bindings for curl/libcurl"
 HOMEPAGE="
@@ -14,11 +14,10 @@ HOMEPAGE="
 	https://github.com/pycurl/pycurl/
 	https://pypi.org/project/pycurl/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
index 76d089482501..ff4d6f67ac7f 100644
--- a/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-6.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,13 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A wrapper around the mediainfo library"
-HOMEPAGE="https://github.com/sbraz/pymediainfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/sbraz/pymediainfo/
+	https://pypi.org/project/pymediainfo/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild
index eed0b3d8b195..875bac3c75f0 100644
--- a/dev-python/pyocr/pyocr-0.8.3.ebuild
+++ b/dev-python/pyocr/pyocr-0.8.3.ebuild
@@ -6,11 +6,10 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="An optical character recognition (OCR) tool wrapper"
 HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -34,4 +33,9 @@ RDEPEND+="
 	tesseract? ( app-text/tesseract )
 "
 
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+src_prepare() {
+	# workaround setuptools failing due to version being None
+	# https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/issues/127
+	sed -i -e '/version=version/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pypdf/Manifest b/dev-python/pypdf/Manifest
index 656ac40ed128..0c4ead2a4c43 100644
--- a/dev-python/pypdf/Manifest
+++ b/dev-python/pypdf/Manifest
@@ -1,4 +1,5 @@
 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-sample-files-0fe84b30ed33ff3daa9293e44349b8618f135699.gh.tar.gz 9027166 BLAKE2B 912bb9fbd632bd0ad2cc2e865a1e6870ad7064aa2cf4d6f96217f63ac685e9a511f0bb20c22d48ae970a2eb171b27a0fa680fa42892425531f69735840cf741b SHA512 07a71a3566dabcea5dc8a549949d0f0c0f9483d5d9f85851d6e4e702dd374b348469a80e5300d18983e560ee9a44d0639b55eb338023b9ebbdb26c6f8c455e07
diff --git a/dev-python/pypdf/pypdf-3.5.0.ebuild b/dev-python/pypdf/pypdf-3.5.0.ebuild
new file mode 100644
index 000000000000..d621f2e6f144
--- /dev/null
+++ b/dev-python/pypdf/pypdf-3.5.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=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/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 26740ccbcbc7..2f5442783337 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,2 +1 @@
-DIST pyrsistent-0.19.2.tar.gz 102438 BLAKE2B aa231a7c300d2f1501abdf2fc74dfa9672ad8000d87e3fa9beaa51aff4816dad4f142e9a2e609dee402352cf5a0477b6d4dc31460a71e7d98a592604fcaa97d6 SHA512 fdaadb65e72db4f90ecb1526fd68eb2b60b278071978d4b5a1b1379be83c60d30fd653dd7e6527c217d4e50f05c7d641290172aa5d5e4741dfe5e08f0b0c282b
 DIST pyrsistent-0.19.3.tar.gz 102640 BLAKE2B 60c5ef9d3f26c4529d05804df13453c75b6ff70e12fbbbbe22312686da929766fc903b18ca77d626192e1f3fc9fbdfdbbbd4eef102f1504b38feeeedf00450d5 SHA512 6bb70b6fd65b5cd9f961a3199c2d90725aaa66fb869e4eba2143735e2f3a7e4ecdc782b3498acc2d92e263c3bed14cec8cc77324f4ebd08c300ba6735db5ecf7
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
deleted file mode 100644
index 8c3a57acc66f..000000000000
--- a/dev-python/pyrsistent/pyrsistent-0.19.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Persistent/Functional/Immutable data structures"
-HOMEPAGE="
-	https://github.com/tobgu/pyrsistent/
-	https://pypi.org/project/pyrsistent/
-"
-SRC_URI="mirror://pypi/${P: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"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
index 73523fdbf07a..528929c4fe79 100644
--- a/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.19.3.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Persistent/Functional/Immutable data structures"
 HOMEPAGE="
 	https://github.com/tobgu/pyrsistent/
 	https://pypi.org/project/pyrsistent/
 "
-SRC_URI="mirror://pypi/${P: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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-daemon/python-daemon-2.3.2.ebuild b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
index 923d14a0bde3..ed6c42c769d9 100644
--- a/dev-python/python-daemon/python-daemon-2.3.2.ebuild
+++ b/dev-python/python-daemon/python-daemon-2.3.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # build system and tests use GPL-3.0+ but none of these files are installed
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/lockfile[${PYTHON_USEDEP}]
diff --git a/dev-python/python-multipart/python-multipart-0.0.5.ebuild b/dev-python/python-multipart/python-multipart-0.0.5.ebuild
index 14788dbad5c1..cffa1a19207a 100644
--- a/dev-python/python-multipart/python-multipart-0.0.5.ebuild
+++ b/dev-python/python-multipart/python-multipart-0.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/python-socks/python-socks-2.1.1.ebuild b/dev-python/python-socks/python-socks-2.1.1.ebuild
index 52ba888859f1..a9c437698569 100644
--- a/dev-python/python-socks/python-socks-2.1.1.ebuild
+++ b/dev-python/python-socks/python-socks-2.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 # curio is not packaged
 # asyncio is the only backend we have, so dep on its deps unconditionally
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
index cc668ccf7563..523edadd5e54 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
@@ -5,12 +5,12 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYPI_NO_NORMALIZE=1
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Testing utility classes and functions for Sphinx extensions"
 HOMEPAGE="https://github.com/sphinx-doc/sphinx-testing"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-python/starlette/starlette-0.25.0.ebuild b/dev-python/starlette/starlette-0.25.0.ebuild
index 575fce68a9e3..32ca3b716463 100644
--- a/dev-python/starlette/starlette-0.25.0.ebuild
+++ b/dev-python/starlette/starlette-0.25.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
index a7eda8187d66..0d3b87b3b597 100644
--- a/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
+++ b/dev-python/tiny-proxy/tiny-proxy-0.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/anyio-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index c33120385faf..4e0db6d8a1cc 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,2 @@
-DIST websocket-client-1.4.2.tar.gz 49113 BLAKE2B d1d25d7066512ae5a8fa189b22ad320331b3d34e6ae953a29b7b5644065a9d60ffd6743bae6e769f356b7294374690fba103ee42ed59f5f9b213dfeda7f038af SHA512 4003a6b387096a738e9b9f76129b954bbc208b8b75c6ba9d6f0dade82078645109f985164ce25c1a600e630833f7187d51d6236997d6c72315d206e91f1aae7a
 DIST websocket-client-1.5.0.tar.gz 49931 BLAKE2B 03911ba7c147e19dab2fe3198ead34f1dc7d7ac970f33d20cb1eaa9ade0924be873c8ccc585326a8feb9ccf86443b1f5ee1482191cb14a50dddae5b5275b1f9e SHA512 678ab14a8c036e341134e6ae19d422a8888e64ec781983c2eff9d7897298a3b1899b65813351bb566319c931918c034cf0a730aa07c06e48ebac3ddb409a8dee
 DIST websocket-client-1.5.1.tar.gz 49942 BLAKE2B 7996798a5ff8c2eb1322fc7a9fa61d5cff99c71413293ce5b05f9af3581cff472350e79813ce3b393ce4fa4b7d19de956f0ad9ff6232c426be3c8adb8c91fb40 SHA512 9fce0c8de64e051b151c40a295a7f722ed7f95d19bd92ffd5cd9c64962821024e79b70d18ca7e30ca8b8707ba86be041134f13d7e2cf7bc4a4539eb22ba60895
diff --git a/dev-python/websocket-client/websocket-client-1.4.2.ebuild b/dev-python/websocket-client/websocket-client-1.4.2.ebuild
deleted file mode 100644
index f760ea88078e..000000000000
--- a/dev-python/websocket-client/websocket-client-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="WebSocket client for python with hybi13 support"
-HOMEPAGE="
-	https://github.com/websocket-client/websocket-client/
-	https://pypi.org/project/websocket-client/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		dev-python/python-socks[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/websocket-client/websocket-client-1.5.0.ebuild b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
index 9938e54994bd..f760ea88078e 100644
--- a/dev-python/websocket-client/websocket-client-1.5.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.5.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/websocket-client/websocket-client-1.5.1.ebuild b/dev-python/websocket-client/websocket-client-1.5.1.ebuild
index 9938e54994bd..410b15670261 100644
--- a/dev-python/websocket-client/websocket-client-1.5.1.ebuild
+++ b/dev-python/websocket-client/websocket-client-1.5.1.ebuild
@@ -4,16 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="WebSocket client for python with hybi13 support"
 HOMEPAGE="
 	https://github.com/websocket-client/websocket-client/
 	https://pypi.org/project/websocket-client/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 5144e4372843..c8d81271307f 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,2 +1 @@
-DIST werkzeug-2.2.2.gh.tar.gz 844463 BLAKE2B 84da3dd89375d6925e7e7018701339ddfd2b608acf6b3f126bd56c2020056511de6ab157de9024069d1342f9bce4b481ba91a06089fff1a3b31f4a851af7f935 SHA512 cded6c7e0b00871366b70a41de45e31323c0fc09300413d0efca98f5a2f8207026fd77c7e5670fde727da377fd02b9b636f390a2524d2b5778e9e3bdbdfe3e3a
 DIST werkzeug-2.2.3.gh.tar.gz 847768 BLAKE2B 7d0b891a2b15e4fc469c3d331cfb2565f452ae77f772f7ab8e6254aedd172f9115cd3ebd9c82e951ea7505c0e58d6b6f07fb643a8e87af505e04686cccf56cd4 SHA512 3968e663f67e41da5148a4aa1d8e047ffd88416fa8df665e359bbe87992e4e723e1c915eed59ae86b53dd18817e41cdcef059483bce7aa8ed7b388dd4add1482
diff --git a/dev-python/werkzeug/werkzeug-2.2.2.ebuild b/dev-python/werkzeug/werkzeug-2.2.2.ebuild
deleted file mode 100644
index 7c8a85e2c687..000000000000
--- a/dev-python/werkzeug/werkzeug-2.2.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="
-	https://palletsprojects.com/p/werkzeug/
-	https://pypi.org/project/Werkzeug/
-	https://github.com/pallets/werkzeug/
-"
-SRC_URI="
-	https://github.com/pallets/werkzeug/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"
-IUSE="test-rust"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
-"
-# NOTE: remove the loong mask after greenlet gains support for loong
-# see https://github.com/python-greenlet/greenlet/pull/257
-BDEPEND="
-	test? (
-		dev-python/ephemeral-port-reserve[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/watchdog[${PYTHON_USEDEP}]
-		test-rust? (
-			dev-python/cryptography[${PYTHON_USEDEP}]
-		)
-		!hppa? ( !ia64? ( !loong? (
-			$(python_gen_cond_dep '
-				dev-python/greenlet[${PYTHON_USEDEP}]
-			' python3_{8..10})
-		) ) )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			"tests/test_serving.py::test_server[https]"
-			tests/test_serving.py::test_ssl_dev_cert
-			tests/test_serving.py::test_ssl_object
-		)
-	fi
-
-	# the default portage tempdir is too long for AF_UNIX sockets
-	local -x TMPDIR=/tmp
-	epytest -p no:django -p no:httpbin tests
-}
diff --git a/dev-python/werkzeug/werkzeug-2.2.3.ebuild b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
index d9d4c7c46e9d..7c8a85e2c687 100644
--- a/dev-python/werkzeug/werkzeug-2.2.3.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.2.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index e3c349abfe4a..139040ecc8fd 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-python/wrapt/wrapt-1.15.0.ebuild b/dev-python/wrapt/wrapt-1.15.0.ebuild
new file mode 100644
index 000000000000..35db4fabd47a
--- /dev/null
+++ b/dev-python/wrapt/wrapt-1.15.0.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_{7,8,9,10,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
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}