Adding metadata

43 files changed, 774 insertions, 263 deletions

diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index e02d5488759c..1c21146fc50e 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1 +1,2 @@
 DIST dill-0.3.6.gh.tar.gz 171608 BLAKE2B 3b0c6f20218230685c91c10edb4d9bfdbb913464903ce03c92c85ad607ab3973c61c39f9a9807d55c1d3aa3736f5de4575e5beb0784f2b17f0af850210bebd61 SHA512 921bd5122b9b90fd3426a7af5fc8ba70d09b92d740951f5db5d481abb280915d722410f174ab028134acff9a3659899c8f315242caa7a44d8e4b38dd02bb1fa3
+DIST dill-0.3.7.gh.tar.gz 176315 BLAKE2B 8c98c40458035e42c078c79df14e474c35a2a6ff4f61d3cfca8f4dfa5a7756512b7d5af6276becd88315c01d88c8562de02b6f9dff06d0161df3e6f6694c7cc8 SHA512 33ec55dc32c9ddf275ce6e502187949bbc7ecc6d24560e132a7bed23e93254b771d38e59c4b6313bbfc25313305c43c6cba2fe07763a93238e1ba66c4bbd8cd4
diff --git a/dev-python/dill/dill-0.3.7.ebuild b/dev-python/dill/dill-0.3.7.ebuild
new file mode 100644
index 000000000000..f9a2b1e7b0c4
--- /dev/null
+++ b/dev-python/dill/dill-0.3.7.ebuild
@@ -0,0 +1,28 @@
+# 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="Serialize all of Python (almost)"
+HOMEPAGE="
+	https://github.com/uqfoundation/dill/
+	https://pypi.org/project/dill/
+"
+SRC_URI="
+	https://github.com/uqfoundation/dill/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" -m dill.tests || die
+}
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 7f1b97901740..950f4a934be6 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,2 +1,3 @@
 DIST django-auth-ldap-4.2.0.gh.tar.gz 49572 BLAKE2B e33241897a2ad6ec3cefe4d8bc6cfea322f478b3db7c2e8b7726b55f9e030f10ae25ee049842322f11939523df06af81a57122d4d3c8115416a253672c43dd39 SHA512 a37500c850b3cf49d6bc7324d721c05279570972547ebd69521033e4cd6aa340948829edb3ae94d3280a8142a42d88ce77f85bf4a8c9f32753a860881b3c5d90
 DIST django-auth-ldap-4.3.0.tar.gz 53474 BLAKE2B b3f74739fd195b7a2e2cc785fa6493feaef8917b8473fad386da1569a158f13d7c765a32bd0d83ba02d20d7b50e845d3a5cda8b5fbbf5524576c62b84690705b SHA512 6a7826af60087a25970c6ae96b9bce40212cdfbe5e2d2ee0d903ff53f02edcd361eb56a0c5db9406e8525ee6be86e18d5c13db7e4ae6f2dd5d0adc7c593a8117
+DIST django-auth-ldap-4.4.0.tar.gz 53117 BLAKE2B 46ae8f9788c3ed12d8b3576b4335390d3bc902a3627dd5af9028c2bd49dc64eef2f31995bcf51a6d20c55400bbd3dd5f4882ecc01e8d92564a6664db743809ca SHA512 d01f40f64e0d6cd47a0efaaf3b5e6a30a399b0a3b9a6b4c6f683a8237b84076294821970bbb265f66e06b0fbec58417287188e5f09631b21f204137d003ecfd7
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-4.4.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-4.4.0.ebuild
new file mode 100644
index 000000000000..67c5e95d93ba
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-4.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="
+	https://github.com/django-auth-ldap/django-auth-ldap/
+	https://pypi.org/project/django-auth-ldap/
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		net-nds/openldap[-minimal]
+	)
+"
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# for slapd and slapdtest
+	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
+	"${EPYTHON}" -m django test -v 2 --settings tests.settings ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django/django-4.2.3-r1.ebuild b/dev-python/django/django-4.2.3-r1.ebuild
new file mode 100644
index 000000000000..70728ec29799
--- /dev/null
+++ b/dev-python/django/django-4.2.3-r1.ebuild
@@ -0,0 +1,98 @@
+# 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} )
+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 ~loong ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.3.1[${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
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20230606 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/django-4.0-bashcomp.patch
+	"${FILESDIR}"/django-4.2.3-py312.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_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
+}
diff --git a/dev-python/django/files/django-4.2.3-py312.patch b/dev-python/django/files/django-4.2.3-py312.patch
new file mode 100644
index 000000000000..7989f8e7cbcc
--- /dev/null
+++ b/dev-python/django/files/django-4.2.3-py312.patch
@@ -0,0 +1,25 @@
+This is a hack to get the tests to pass prior to:
+
+[e83a88566a71a2353cebc35992c110be0f8628af] Fixed #32172 -- Adapted signals to allow async handlers.
+
+diff --git a/django/test/signals.py b/django/test/signals.py
+index 94a5161e82..1358101b98 100644
+--- a/django/test/signals.py
++++ b/django/test/signals.py
+@@ -14,6 +14,7 @@ from django.utils import timezone
+ from django.utils.formats import FORMAT_SETTINGS, reset_format_cache
+ from django.utils.functional import empty
+ from django.utils.module_loading import import_string
++from django.utils.version import PY312
+ 
+ template_rendered = Signal()
+ 
+@@ -183,7 +184,7 @@ def complex_setting_changed(*, enter, setting, **kwargs):
+         # this stacklevel shows the line containing the override_settings call.
+         warnings.warn(
+             f"Overriding setting {setting} can lead to unexpected behavior.",
+-            stacklevel=6,
++            stacklevel=5 if PY312 else 6,
+         )
+ 
+ 
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 060ca08b6c1a..dcee7b0100f4 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1 +1 @@
-DIST easyprocess-1.1.tar.gz 13755 BLAKE2B 1d1c0d66e34fbb3ea58736cf4750b5fa48dc6e97d07a568086129fc58ca910d26a383e032dd0030da78235695269da6b7886871e6ef0f0ce7a482275ff2aa0e6 SHA512 fd5d0453cab79bb93806ac0dcef97ba207171c087bc5232f30d6fa210fa479e0dff83bdd7bb5c59d71f65582dcb3dfbf5f25ea2e2ee162d8d5feb8ca8d223a68
+DIST easyprocess-1.1.gh.tar.gz 13755 BLAKE2B 1d1c0d66e34fbb3ea58736cf4750b5fa48dc6e97d07a568086129fc58ca910d26a383e032dd0030da78235695269da6b7886871e6ef0f0ce7a482275ff2aa0e6 SHA512 fd5d0453cab79bb93806ac0dcef97ba207171c087bc5232f30d6fa210fa479e0dff83bdd7bb5c59d71f65582dcb3dfbf5f25ea2e2ee162d8d5feb8ca8d223a68
diff --git a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
index f13915a40586..99f097fd5f5d 100644
--- a/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
+++ b/dev-python/easyprocess/easyprocess-1.1-r1.ebuild
@@ -5,11 +5,18 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
+
 inherit distutils-r1
 
 DESCRIPTION="Easy to use Python subprocess interface"
-HOMEPAGE="https://github.com/ponty/EasyProcess"
-SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/ponty/EasyProcess/
+	https://pypi.org/project/EasyProcess/
+"
+SRC_URI="
+	https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 S="${WORKDIR}/EasyProcess-${PV}"
 
 LICENSE="BSD-2"
@@ -22,7 +29,8 @@ BDEPEND="
 		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		x11-base/xorg-server[xvfb]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/ensurepip-pip/Manifest b/dev-python/ensurepip-pip/Manifest
index 579a03fc281e..003753339e3d 100644
--- a/dev-python/ensurepip-pip/Manifest
+++ b/dev-python/ensurepip-pip/Manifest
@@ -1,2 +1,3 @@
 DIST pip-23.1.2-py3-none-any.whl 2064688 BLAKE2B 85c19cc80a59404867e7212c442e60ed6735da35d544bd23ee4cf5a1bffad4c0fab1f34a652417a181cbcb4afc9baf94682b0ec6e1fd9457eb77bc971d29e459 SHA512 a5a8feab25f01a96c2d8c4e15a001cb38c4a0a9d88563da6653239f3966324fdbe86ae0c5172cbdb1d03b863b37a37358b80e8bb9c8112bd7809fd16fb2ec776
 DIST pip-23.2-py3-none-any.whl 2085968 BLAKE2B 320f19b21253d0160d09d51e677a81fa30515a1faee07c4ed87b36a4134820d5bafcd524c099d5892b41bd7bb738a0ccc0b906d619d7e5690a8404cb78f4469a SHA512 bdd211e74fb77117f389f0789c35b163834d9a900e7615d7a1d90a9c6a62613e69552af79cc88f594890afd9189e53c55b55a50cc31d4cd18118352ecab9cf40
+DIST pip-23.2.1-py3-none-any.whl 2086091 BLAKE2B 0a35bf4ba589f07e3c800d8f835e4bcdcd433976db83f91c86e12a2316b0b1c7de7120b248d70fe8b5587c28bb3c6e7bc633c64cdfb65a1f18f87a9e7a423181 SHA512 016a8cbd09384f1a9a44cb0e8274df75a8bcb2f3966bb5d708c62145289efaa5db98f75256c97e4f8046735ce2e529fbb076f284a46cdb716e89a75660200ad9
diff --git a/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
new file mode 100644
index 000000000000..474a502c1273
--- /dev/null
+++ b/dev-python/ensurepip-pip/ensurepip-pip-23.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pypi
+
+DESCRIPTION="Shared pip wheel for ensurepip Python module"
+HOMEPAGE="https://pypi.org/project/pip/"
+SRC_URI="$(pypi_wheel_url "${PN#ensurepip-}")"
+S=${DISTDIR}
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT MPL-2.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	!<dev-python/ensurepip-wheels-100
+"
+
+src_install() {
+	insinto /usr/lib/python/ensurepip
+	doins "${A}"
+}
diff --git a/dev-python/entrypoint2/entrypoint2-1.1.ebuild b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
index 45ae35c2feea..482404fd5caf 100644
--- a/dev-python/entrypoint2/entrypoint2-1.1.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-1.1.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Easy to use command-line interface for python modules"
-HOMEPAGE="https://github.com/ponty/entrypoint2"
+HOMEPAGE="
+	https://github.com/ponty/entrypoint2/
+	https://pypi.org/project/entrypoint2/
+"
 SRC_URI="
 	https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
diff --git a/dev-python/fastjsonschema/Manifest b/dev-python/fastjsonschema/Manifest
index 12eefad698c5..a3c65d5e1444 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1 +1,2 @@
 DIST fastjsonschema-2.17.1.tar.gz 370651 BLAKE2B 670e3b911200573ac129938834f9c072702e3f3d62e4ac95c7b77694d9cda54e4430601955c13998ff5abfe1db66a3d3e2bba9561292cb5c9d1df2470194eaee SHA512 482b13ee6735f5bb21528ec76a423c8c1dff2604af83121d82db45ce0cf514401b25cf6a1406c74f579671fe425ef1535d28c8b0b7fc24d32fcf50f2be1e28bf
+DIST fastjsonschema-2.18.0.tar.gz 371063 BLAKE2B d2b79eb442351487ffebc59ff48af1e8f07fb5e2ca97059cc98cc8f02eda3523fcf60b2aa6b46edc1d3d019ed04d65d2fc5c3eee58471ea9b2a0bd0bf7bf40ed SHA512 848ea4587edb9d694d4f42cee35c8a6a785f601b3e84daae5a5b155ca61c0c7de1b9164e86c0a48166d429a4a737799480dfdeaad7e81eab28f68f71dd46988f
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.18.0.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.18.0.ebuild
new file mode 100644
index 000000000000..c94f480b8ee8
--- /dev/null
+++ b/dev-python/fastjsonschema/fastjsonschema-2.18.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Fast JSON schema validator for Python"
+HOMEPAGE="
+	https://github.com/horejsek/python-fastjsonschema/
+	https://pypi.org/project/fastjsonschema/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	tests/benchmarks
+)
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 4ca0c432444a..ee961ff64c12 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,2 +1,3 @@
 DIST flufl.lock-7.1.1.tar.gz 33017 BLAKE2B 813b4b77fe2b7c9d7125e9d4a5530a77aa4205e1eb0a90852419f29669db97c683fe1d73d221bc7490a7a827da24e23bfac38002c1e6a179289b56b59e2d4dfa SHA512 eb9d8a80013ca07cc3eaab30ced596c0362cfc59d5a1f7cf17aacbf4068d9989b443df7e2d5f5e09d6f60e0ebc784ab1897ca7379fde7eeb57246cb6b5dfef3f
 DIST flufl_lock-8.0.1.tar.gz 34442 BLAKE2B 07a837ec1965ae9c9f61a7601de0727bbab25b625744358e1c7e4c3112e26cd02db00fefe31d4900a2631d436eff8150aaddf6e80f8adb5e799bc9440ccea681 SHA512 059a0ed742d941f936a5a06f6fb0b72aa218fc4cd4c03788fcec6ddcef9fcc2bda767ff89a7d380ad79e07a2eec4840b32efc0921c0ff277d00a9fb8cbe80e4e
+DIST flufl_lock-8.0.2.tar.gz 34369 BLAKE2B e16af81933141628664bfcbece3ede038b150df468af00b840b9b7ad4aaa7e0e10c8a0ce415c685e2aa1e556198b2ac4f8339bdfa3e41c004c32592f0bd025bf SHA512 2ef382cf22be72ceace89ad01646db31186fa7f505d72306025b90e47dad46fa0831d951f515fc321b873acc4a339e2ae1ed1a4861c355bc9961e0a3ab209d7c
diff --git a/dev-python/flufl-lock/flufl-lock-8.0.2.ebuild b/dev-python/flufl-lock/flufl-lock-8.0.2.ebuild
new file mode 100644
index 000000000000..bc45e09f721f
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-8.0.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=pdm-backend
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="
+	https://gitlab.com/warsaw/flufl.lock/
+	https://pypi.org/project/flufl.lock/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/sybil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
deleted file mode 100644
index a801d0c992fc..000000000000
--- a/dev-python/hcloud-python/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST hcloud-python-1.20.0.gh.tar.gz 100107 BLAKE2B 584e1399ddb1c5d1e5ad0beaf795609bb63d37457afe33c663cf303f8b20e2c6f6b3ff294007e9f4ae2d9aa833794e59516ad167f1dd51d14e692f6eab887881 SHA512 b17abc716ae6f7c78803096f2fd887e47ee746fccbe299cc434b7f445abdd7818e445d186f5adacc715971e2ebe2e92551cdb08aa1891ed58d8f443ea3be61fb
-DIST hcloud-python-1.21.0.gh.tar.gz 102150 BLAKE2B 4ec6fb813f61f3c487d632e12a71f9105af5d45a307567fd2b22ff716e30c645bffebc5cd768846fc7d7892ab753d3e4487a1b72edfee62fb99dfefe188be41d SHA512 8226a79324f0097d576cc1336e813a28a562fb9c3f50dcac1debb3c32bb52f4f5e563e920e2bbb6ce8be407a65de321b734d30156fd066d74ed95f6e6bd94a35
-DIST hcloud-python-1.22.0.gh.tar.gz 103301 BLAKE2B 0280567bf75dfe1e684cc9a630cd9c517a9039add7b8937d6293fdddf55e593afa68c4ee7ffc73c186b3444d47fb5dcd385229bace3cf058a37497790d2abf46 SHA512 fca41cc61033c050981588633f9a9801a444db5782eafa35933dec5011f24542a103b1c900b9a830ea426418070d060e4ec407941d54cb9579291a7b467e6a22
-DIST hcloud-python-1.23.0.gh.tar.gz 101752 BLAKE2B 5a8746d7ea58e3ba89271efe541183c72792480b81307433a899278e0e6037e3b5d59519a9d1af4ffeaf391b20643cec33fdd8b82019faf29ed865c4563ff96b SHA512 94463080d0b0605efbbc5bc193c602ae207d45ca7accd5a370b8ba7663d867bf065f5cf154f51095f6ae8b4fb2470202512ba3f61df36d2f6e04bf7ad2a606a5
-DIST hcloud-python-1.23.1.gh.tar.gz 102214 BLAKE2B e8e16a9a4435b579ee7e72738c296b1ee55c15d3868da39c58fcf9489479451e7adfe046696ffd9728a529f60003a4ebe26b0c07f322296ef1e3fe468fe0e9ed SHA512 cf5497b4906cb2abece9afd64fad0aad4deedecafb50f6977c29f0a38951287be07f9f75a18e1ce4cbcedf38261c146236526be7581d8362c6d6ecf7c38992b9
-DIST hcloud-python-1.24.0.gh.tar.gz 101860 BLAKE2B f64c0024047b11a060b3766a5692d74c038483ccd25943227931d6ca695be4e7ded7857ccf5d1a8361644b838cee5cd1e5c3ddaaf714ca97b3c0e33f5c3863f2 SHA512 efeb511373009af49b280fa09b152a648d33136c75d12fa69290e2193d5162fb07dea3d457171e0b27c7256f0be63b5c6fb84526cf1e9f32d8c38e350c47686a
-DIST hcloud-python-1.25.0.gh.tar.gz 101940 BLAKE2B afc467df0b56b6cea5d413465dcbf12df408a215eee1bf3040abdd062d7548fb6c1c4eb8df4ec381b5969294bb94afc957bba4cf866eaaa6570bc8fd2b45bf68 SHA512 13815d7a61010974f4ecb259ddff8b7ab526114df25bb530e1db38e557499c7bae9a9ecb69c9e625b5bebe8be5c00de166fc421508888f720774288b210db1b4
diff --git a/dev-python/hcloud-python/hcloud-python-1.20.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.20.0.ebuild
deleted file mode 100644
index 6efed9ed2aae..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.20.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.21.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.21.0.ebuild
deleted file mode 100644
index c40799262a84..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.21.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.22.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.22.0.ebuild
deleted file mode 100644
index 8649d9830163..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.22.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.23.0.ebuild b/dev-python/hcloud-python/hcloud-python-1.23.0.ebuild
deleted file mode 100644
index db79af5f3e78..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.23.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud-python/hcloud-python-1.23.1.ebuild b/dev-python/hcloud-python/hcloud-python-1.23.1.ebuild
deleted file mode 100644
index db79af5f3e78..000000000000
--- a/dev-python/hcloud-python/hcloud-python-1.23.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=hcloud-python-${PV}
-DESCRIPTION="Official Hetzner Cloud python library"
-HOMEPAGE="
-	https://github.com/hetznercloud/hcloud-python/
-	https://pypi.org/project/hcloud/
-"
-# sdist is missing doc assets as of 1.19.0
-# https://github.com/hetznercloud/hcloud-python/pull/183
-SRC_URI="
-	https://github.com/hetznercloud/hcloud-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/myst-parser \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# Integration tests need docker:
-	# https://github.com/hetznercloud/hcloud-python/blob/master/.travis.yml#L16
-	tests/integration
-)
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/hcloud/Manifest b/dev-python/hcloud/Manifest
new file mode 100644
index 000000000000..9984d377c92a
--- /dev/null
+++ b/dev-python/hcloud/Manifest
@@ -0,0 +1,2 @@
+DIST hcloud-python-1.24.0.gh.tar.gz 101860 BLAKE2B f64c0024047b11a060b3766a5692d74c038483ccd25943227931d6ca695be4e7ded7857ccf5d1a8361644b838cee5cd1e5c3ddaaf714ca97b3c0e33f5c3863f2 SHA512 efeb511373009af49b280fa09b152a648d33136c75d12fa69290e2193d5162fb07dea3d457171e0b27c7256f0be63b5c6fb84526cf1e9f32d8c38e350c47686a
+DIST hcloud-python-1.26.0.gh.tar.gz 102253 BLAKE2B e5e629218c187e3ffb4f6e30b8963288dbdbfd5f60e20ba60083a5eedc8dc7e94aa917c6b3539a4aaf600d065b771747c7ed8dad7ff41490c9dd7452a0a242f3 SHA512 b2bf656a223c3a8e65b2f641d3a633543a7c5a2bcf0ce31ad9a735115d870affcaa8d0c82758c312b80e130f87259839ce35b918f5762c11a27ecbb1578446d0
diff --git a/dev-python/hcloud-python/hcloud-python-1.25.0.ebuild b/dev-python/hcloud/hcloud-1.24.0.ebuild
index 6f3d320e3977..a36b321ed167 100644
--- a/dev-python/hcloud-python/hcloud-python-1.25.0.ebuild
+++ b/dev-python/hcloud/hcloud-1.24.0.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/hcloud-python/hcloud-python-1.24.0.ebuild b/dev-python/hcloud/hcloud-1.26.0.ebuild
index 6f3d320e3977..6f3d320e3977 100644
--- a/dev-python/hcloud-python/hcloud-python-1.24.0.ebuild
+++ b/dev-python/hcloud/hcloud-1.26.0.ebuild
diff --git a/dev-python/hcloud-python/metadata.xml b/dev-python/hcloud/metadata.xml
index 76b445db2854..76b445db2854 100644
--- a/dev-python/hcloud-python/metadata.xml
+++ b/dev-python/hcloud/metadata.xml
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index 915317269a58..50c0d1e6e437 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,2 +1,3 @@
 DIST identify-2.5.24.gh.tar.gz 101544 BLAKE2B afcfed2a48d59a263dac4df836251be00b911e78eabd8612fc06610df5efc0052bf6542c955e8a9fd7fd0513e04b1d009fe511bb591f880bff1347e02ae35c67 SHA512 40c0163aba0fa9be266a746bd58cc64b740be3ece49a22996ae1c5dd334c76a28544fd195d1da8a042f82816b2f0c440a3406160749fe192b6af00780ed5eb28
 DIST identify-2.5.25.gh.tar.gz 101544 BLAKE2B 4e7403d9d4abc44945a697ca8f2362a707e47ce92c59e4302283d23486510f1b215a08752ed1b737b428d4048fd750997469dbc433a4e78b074aa723f27e7150 SHA512 4d7845d4941f67a58c3d8e49a4067d852a3a8c4f060b32c9e58c7b400cc7e595ca4dd6268392a7a17f9768f97bc1719d7611c4b029fb91eefbc2a62537df3815
+DIST identify-2.5.26.gh.tar.gz 101549 BLAKE2B 383c6467436107cf98a667f1db3ab63f42aadff8f51d2f6bedf715dd45590eeb5fe7b3d6572b7704a7ae613d079a22a2d84c86581b7a63b7578807e06034aa70 SHA512 4c17c7f40b14fd45649e0a6b6885e2d96a1ce3cf91fbc1092fdb9b92d7bf2ac35b0c04a24bb3e77f3188a3c8d00f57dbe19ca660e1e08b60cdb60385f340c4bd
diff --git a/dev-python/identify/identify-2.5.26.ebuild b/dev-python/identify/identify-2.5.26.ebuild
new file mode 100644
index 000000000000..89ae7e1ee670
--- /dev/null
+++ b/dev-python/identify/identify-2.5.26.ebuild
@@ -0,0 +1,29 @@
+# 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="File identification library for Python"
+HOMEPAGE="
+	https://github.com/pre-commit/identify/
+	https://pypi.org/project/identify/
+"
+SRC_URI="
+	https://github.com/pre-commit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	dev-python/ukkonen[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jsonmerge/Manifest b/dev-python/jsonmerge/Manifest
index d0d0cc0aded3..2fba8fc7d49b 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1 +1,2 @@
 DIST jsonmerge-1.9.0.tar.gz 32995 BLAKE2B 33615feb31114042e941bf69b9a3b2b26aaff9251b3683d77da53efd449c58fb0cf13ae4f60c441282e1e81896a8d58f1a91b51ae1ba18acb793bc99e4898c8d SHA512 c271c7bcc10d574c60bcf77f47a24c56b9df086bc87b8da4db0b2b356abba22010492664b56df7d0babd2c8a33fd0ecbc0cbaddbc5eed07c19f2a6874ed6c1e1
+DIST jsonmerge-1.9.2.tar.gz 34717 BLAKE2B 651e6c745c651882b54c4bd46bd658de20fd0cdd90b2e05af8396a55c68efffc2fe5d4758891151db8df79cdfb118b94a6af11c7d0648fbfcbde510283585556 SHA512 cba0c2b0f3d5ff70f7680768a036a10a1d7464da9a4693a5a836fbcb9f7dba080ec041c34b351f843a4c38fb2e45c4c845a3c5453df35e1b51e1a65b245071f8
diff --git a/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild b/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
new file mode 100644
index 000000000000..69092ca8a4e1
--- /dev/null
+++ b/dev-python/jsonmerge/jsonmerge-1.9.2.ebuild
@@ -0,0 +1,25 @@
+# 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="Merge a series of JSON documents"
+HOMEPAGE="
+	https://github.com/avian2/jsonmerge/
+	https://pypi.org/project/jsonmerge/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/logfury/logfury-1.0.1-r1.ebuild b/dev-python/logfury/logfury-1.0.1-r1.ebuild
index cad1d1b9c431..1d57a57ef71f 100644
--- a/dev-python/logfury/logfury-1.0.1-r1.ebuild
+++ b/dev-python/logfury/logfury-1.0.1-r1.ebuild
@@ -5,24 +5,29 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Boilerplate library for logging method calls"
 HOMEPAGE="
 	https://github.com/reef-technologies/logfury
-	https://pypi.org/project/logfury/"
+	https://pypi.org/project/logfury/
+"
 SRC_URI="
 	https://github.com/reef-technologies/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/testfixtures[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/multiprocess/Manifest b/dev-python/multiprocess/Manifest
index 06e43436a81b..b2937463f739 100644
--- a/dev-python/multiprocess/Manifest
+++ b/dev-python/multiprocess/Manifest
@@ -1 +1,2 @@
 DIST multiprocess-0.70.14.tar.gz 1498053 BLAKE2B 0377d293b3e160f6a6c61c148ee0d852b39f859530ef738ae143312b62833779a7e0ea745d468628fbc96a22e97326ce886b46ef9a0791fd58d3682bdc54e6af SHA512 22202b81c33601d75ca3222a6485bae596d7807d54757280ac06f2fd7247c927f978b4f5c62bd81739b95462a96dc629e5559630d9310343f86b46ee37841b6b
+DIST multiprocess-0.70.15.tar.gz 1894495 BLAKE2B 3ed3c6e530f0a9e32a04b591f874b0fd7c116704f69116d1ed3addba6010ac33a4cc3d5214e6cce18478d5a05bfffb75840ca520f2d3604a06006aa5d6725ae9 SHA512 095c15e942bebe2dffa5054ce46f30f69b3f0fcbfbd87b6742546dcacdb6a5d0d3274002f5f58f73345761adaa19866573ae20d420f8ca4cc00ca5270f8acb84
diff --git a/dev-python/multiprocess/multiprocess-0.70.15.ebuild b/dev-python/multiprocess/multiprocess-0.70.15.ebuild
new file mode 100644
index 000000000000..862442fd9df9
--- /dev/null
+++ b/dev-python/multiprocess/multiprocess-0.70.15.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Better multiprocessing and multithreading in Python"
+HOMEPAGE="
+	https://github.com/uqfoundation/multiprocess/
+	https://pypi.org/project/multiprocess/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/dill[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	"${EPYTHON}" py${EPYTHON#python}/multiprocess/tests/__main__.py -v || die
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 6903019fcecc..07d31b3cf822 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,2 +1,3 @@
 DIST pip-23.1.2.gh.tar.gz 9345911 BLAKE2B 511ac1a9405e377ccb2525e89676f4a63f138aa526d40e76f4d9681139d94db1f92772beab1a647654c17abc6bee09f52cf4c4f4484716874194565fda07d056 SHA512 b33070cb59a1258904a60b48ec8abfd9e316c5f87681fea13d89ddf6d516afac10965ae1db54fea299a0a72f98602ce02e8b3be46f239e857db84866045730e1
+DIST pip-23.2.1.gh.tar.gz 9370625 BLAKE2B 9e7855aae371a773a070c24b50f985dac6ff7c2412d51e268368b911b92d0d0b52a839f9d761d5f6aaff33f1e7570d5f930e5063e8af98aa99f50d2f1c1b5ed2 SHA512 a6c629976c332cffe5dff0ec1e201d694c7a42fa8def202ebf1db251a6dbd90091eaac89c36a354a0cf0c60cdb267b4e0ec9ff6a88b0ac61cfaafdf159e34fc8
 DIST pip-23.2.gh.tar.gz 9370682 BLAKE2B dbce43e29ed453e32e13a6d2f18ba2d8095021de0073d13de18cb55b5410415d0feeb2610e31ae8a0025864e6d05eb41aab3dd8adeaecf990fa31e7284e71fa5 SHA512 fe915a8f85b21d59b416a5b1fad6e6ce2874b27e055c86ad71efe31c492f117a468734da239882c3d7f4678f91389daf0e8d13abc6429ddca5bfef87cb29dae0
diff --git a/dev-python/pip/pip-23.2.1.ebuild b/dev-python/pip/pip-23.2.1.ebuild
new file mode 100644
index 000000000000..1bb27fa76f53
--- /dev/null
+++ b/dev-python/pip/pip-23.2.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# please bump dev-python/ensurepip-pip along with this package!
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10,11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+DESCRIPTION="The PyPA recommended tool for installing Python packages"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/
+"
+SRC_URI="
+	https://github.com/pypa/pip/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+# bundled deps
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MPL-2.0 PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/ensurepip-setuptools
+			dev-python/ensurepip-wheel
+			dev-python/freezegun[${PYTHON_USEDEP}]
+			dev-python/pretend[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/scripttest[${PYTHON_USEDEP}]
+			dev-python/tomli-w[${PYTHON_USEDEP}]
+			dev-python/virtualenv[${PYTHON_USEDEP}]
+			dev-python/werkzeug[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			test-rust? (
+				dev-python/cryptography[${PYTHON_USEDEP}]
+			)
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/pip-23.1-no-coverage.patch"
+	)
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		local wheels=(
+			"${BROOT}"/usr/lib/python/ensurepip/{setuptools,wheel}-*.whl
+		)
+		mkdir tests/data/common_wheels/ || die
+		cp "${wheels[@]}" tests/data/common_wheels/ || die
+	fi
+}
+
+python_compile_all() {
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; __file__ = ""; from pip._internal.cli.main import main; sys.exit(main())'
+	"${EPYTHON}" -c "${pipcmd}" completion --bash > completion.bash || die
+	"${EPYTHON}" -c "${pipcmd}" completion --zsh > completion.zsh || die
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return 0
+	fi
+
+	local EPYTEST_DESELECT=(
+		tests/functional/test_inspect.py::test_inspect_basic
+		tests/functional/test_install.py::test_double_install_fail
+		# Internet
+		tests/functional/test_install.py::test_install_dry_run
+		tests/functional/test_install.py::test_editable_install__local_dir_setup_requires_with_pyproject
+		tests/functional/test_install.py::test_install_8559_wheel_package_present
+		tests/functional/test_config_settings.py::test_backend_sees_config_via_sdist
+		tests/functional/test_install.py::test_link_hash_in_dep_fails_require_hashes
+		# TODO
+		tests/unit/test_network_auth.py::test_keyring_cli_get_password
+		tests/unit/test_network_auth.py::test_keyring_cli_set_password
+		# wants to install keyring from Internet, sigh
+		tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		# probably a too strict assert
+		# https://github.com/pypa/pip/issues/12152
+		tests/unit/test_req.py::TestRequirementSet::test_download_info_archive_cache_with_invalid_origin
+	)
+
+	if ! has_version "dev-python/cryptography[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/functional/test_install.py::test_install_sends_client_cert
+			tests/functional/test_install_config.py::test_do_not_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_authentication
+			tests/functional/test_install_config.py::test_prompt_for_keyring_if_needed
+		)
+	fi
+
+	local -x SETUPTOOLS_USE_DISTUTILS=stdlib
+	local -x PIP_DISABLE_PIP_VERSION_CHECK=1
+	epytest -m "not network" -n "$(makeopts_jobs)"
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	newbashcomp completion.bash pip
+
+	insinto /usr/share/zsh/site-functions
+	newins completion.zsh _pip
+}
diff --git a/dev-python/pygame/pygame-2.5.0-r2.ebuild b/dev-python/pygame/pygame-2.5.0-r2.ebuild
new file mode 100644
index 000000000000..c455684400c3
--- /dev/null
+++ b/dev-python/pygame/pygame-2.5.0-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for SDL multimedia library"
+HOMEPAGE="
+	https://www.pygame.org/
+	https://github.com/pygame/pygame/
+	https://pypi.org/project/pygame/
+"
+SRC_URI="
+	https://github.com/pygame/pygame/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples opengl test X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	media-libs/portmidi
+	media-libs/sdl2-image
+	media-libs/sdl2-mixer
+	media-libs/sdl2-ttf
+	X? ( media-libs/libsdl2[opengl?,threads,video,X] )
+	!X? ( media-libs/libsdl2[threads] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		media-libs/sdl2-image[gif,jpeg,png,tiff,webp]
+		media-libs/sdl2-mixer[mp3,vorbis,wav]
+	)
+"
+# fontconfig used for fc-list
+RDEPEND+="
+	media-libs/fontconfig
+"
+# util-linux provides script
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		media-libs/fontconfig
+		sys-apps/util-linux
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cython-3.patch
+)
+
+python_configure() {
+	PORTMIDI_INC_PORTTIME=1 LOCALBASE="${EPREFIX}/usr" \
+		"${EPYTHON}" "${S}"/buildconfig/config.py || die
+}
+
+python_configure_all() {
+	find src_c/cython -name '*.pyx' -exec touch {} + || die
+	"${EPYTHON}" setup.py cython_only || die
+}
+
+python_test() {
+	local -x PYTHONPATH=${BUILD_DIR}/install/lib
+	local -x SDL_VIDEODRIVER=dummy
+	local -x SDL_AUDIODRIVER=disk
+	script -eqc "${EPYTHON} -m pygame.tests -v" || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Bug #497720
+	rm -fr "${D}$(python_get_sitedir)"/pygame/{docs,examples,tests}/ || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
index 65e70cf3120d..d7f2139a5ddb 100644
--- a/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
+++ b/dev-python/pykwalify/pykwalify-1.8.0-r3.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Python lib/cli for JSON/YAML schema validation"
-HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+HOMEPAGE="
+	https://github.com/Grokzen/pykwalify/
+	https://pypi.org/project/pykwalify/
+"
 
 SLOT="0"
 LICENSE="MIT"
diff --git a/dev-python/pytest-django/pytest-django-4.5.2-r1.ebuild b/dev-python/pytest-django/pytest-django-4.5.2-r1.ebuild
new file mode 100644
index 000000000000..0291e4686ce3
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.5.2-r1.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=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.io/
+	https://github.com/pytest-dev/pytest-django/
+"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	dev-python/django[${PYTHON_USEDEP}]
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-1.11.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-pytest-7.patch
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# something else may be loading it
+		tests/test_django_settings_module.py::test_django_not_loaded_without_settings
+	)
+
+	local -x DJANGO_SETTINGS_MODULE
+	local -x PYTHONPATH=${PWD}
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_django.plugin,xdist.plugin
+	for DJANGO_SETTINGS_MODULE in pytest_django_test.settings_sqlite{,_file}; do
+		einfo "Testing ${DJANGO_SETTINGS_MODULE}"
+		epytest tests
+	done
+}
diff --git a/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild b/dev-python/pytest-golden/pytest-golden-0.2.2-r1.ebuild
index 8f6cf09f4136..eb6488e1c890 100644
--- a/dev-python/pytest-golden/pytest-golden-0.2.2.ebuild
+++ b/dev-python/pytest-golden/pytest-golden-0.2.2-r1.ebuild
@@ -10,11 +10,14 @@ inherit distutils-r1
 
 DESCRIPTION="Plugin for pytest that offloads expected outputs to data files"
 HOMEPAGE="
-	https://github.com/oprypin/pytest-golden
+	https://github.com/oprypin/pytest-golden/
 	https://pypi.org/project/pytest-golden/
 "
 # No tests in PyPI tarballs
-SRC_URI="https://github.com/oprypin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="
+	https://github.com/oprypin/pytest-golden/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -29,3 +32,15 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
+
+src_prepare() {
+	# poetry, sigh
+	sed -i -e 's:\^:>=:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_golden.plugin
+	epytest -x
+}
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
index 01a081bd3dbf..c1f46604ea17 100644
--- a/dev-python/python-mpv/Manifest
+++ b/dev-python/python-mpv/Manifest
@@ -1 +1,2 @@
 DIST python-mpv-1.0.3.gh.tar.gz 211529 BLAKE2B 0701147415c920be4ec65151ed7844bb36c275bcc64ae07d4ece9a515a96ba09097a8f2282eb7bbb74e8dc143d14f9a0aebdfadad53e0e9e4d62fcde734c7d17 SHA512 30ed5751c5732eeda9150a1e0dc425d2846c1a5dcfd53b9568bca169e570401fc8b3d224c59a1a1f54c574a056ccb0f540a0dc389e47e0811b0a9a3de4fb7092
+DIST python-mpv-1.0.4.gh.tar.gz 211628 BLAKE2B cb3b9042648ffd0472093f84116084f255893ab7068379a01011e8153da9c60c525c9b701e8f0be29ebbfaca9da9b4fd0024741e7b243b13c3b9e69f597dede8 SHA512 d8bab1373961ef52645f0886f317e8a1328a9d737c1a7de77d0f348a31822daa3120b79d9fd8e969c971b1de9c30fdd40aa120c8775ad3110f5a11ab9992ae7c
diff --git a/dev-python/python-mpv/python-mpv-1.0.4.ebuild b/dev-python/python-mpv/python-mpv-1.0.4.ebuild
new file mode 100644
index 000000000000..140c3785b0e2
--- /dev/null
+++ b/dev-python/python-mpv/python-mpv-1.0.4.ebuild
@@ -0,0 +1,45 @@
+# 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 virtualx
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="
+	https://github.com/jaseg/python-mpv/
+	https://pypi.org/project/python-mpv/
+"
+SRC_URI="
+	https://github.com/jaseg/python-mpv/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pyvirtualdisplay[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# hangs
+		tests/test_mpv.py::TestLifecycle::test_wait_for_property_event_overflow
+	)
+
+	virtx epytest
+}
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 5bf127b59df2..0516d44761ae 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1 +1 @@
-DIST PyVirtualDisplay-3.0.tar.gz 41134 BLAKE2B f80faa66b6b55ac1c48a2e249e48e52f63327a1acac2020d157d0e6b1e8ff3d46ebe027ff59a3356321688a2c815e2e34552aa9de2355e9e427cd82032eb348a SHA512 2ccce9ca6f36dddb15a992f2d4961f203d755ac4df1944f67bfab906061ae30c78db5d1cb050feddb45e28bbe874b250ce7ef1886cc52239fc0a784dc3be1198
+DIST PyVirtualDisplay-3.0.gh.tar.gz 41134 BLAKE2B f80faa66b6b55ac1c48a2e249e48e52f63327a1acac2020d157d0e6b1e8ff3d46ebe027ff59a3356321688a2c815e2e34552aa9de2355e9e427cd82032eb348a SHA512 2ccce9ca6f36dddb15a992f2d4961f203d755ac4df1944f67bfab906061ae30c78db5d1cb050feddb45e28bbe874b250ce7ef1886cc52239fc0a784dc3be1198
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
index 536b9037cd91..c358401d7cdd 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-3.0.ebuild
@@ -10,11 +10,15 @@ inherit distutils-r1
 
 MY_P=PyVirtualDisplay-${PV}
 DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
+HOMEPAGE="
+	https://github.com/ponty/PyVirtualDisplay/
+	https://pypi.org/project/PyVirtualDisplay/
+"
 SRC_URI="
 	https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -28,10 +32,14 @@ BDEPEND="
 		dev-python/pillow[xcb,${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyscreenshot[${PYTHON_USEDEP}]
-		~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
 		x11-apps/xmessage
 		x11-base/xorg-server[xvfb,xephyr]
-		x11-misc/x11vnc
-	)"
+	)
+"
 
 distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# require old vncdotool
+	tests/test_xvnc.py
+)
diff --git a/dev-python/testfixtures/testfixtures-7.1.0.ebuild b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
index 1bdfecad4772..c5a10fc881df 100644
--- a/dev-python/testfixtures/testfixtures-7.1.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
@@ -43,5 +43,18 @@ python_test() {
 		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
 	)
 
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				# https://github.com/simplistix/testfixtures/issues/183
+				docs/comparing.txt::line:642,column:1
+				docs/comparing.txt::line:784,column:1
+				docs/comparing.txt::line:823,column:1
+				testfixtures/tests/test_tempdirectory.py::TempDirectoryTests::test_as_path_relative_sequence
+				testfixtures/tests/test_tempdirectory.py::TempDirectoryTests::test_as_path_relative_string
+			)
+			;;
+	esac
+
 	epytest
 }