Adding metadata

43 files changed, 407 insertions, 154 deletions

diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 4e14e02df8fc..becf6e0a2d38 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1 +1,2 @@
 DIST gitdb-4.0.10.tar.gz 394284 BLAKE2B f5a00dd3a27a17781df4c53c268c92101838ce53efcb3796a72a79f8109540912f86d746cad169ef34af2575cfb242e90cb450b658699512d37956f6902e14ed SHA512 6cfb58db322f1b18fd25d0c6537e5b24b2eb2f7a7222c1511cdee8dff39fb1249bf12691b9cb1a5d653131b8c3c57c1de2bb42139a2c8da6014332b4f1c6c03b
+DIST gitdb-4.0.11.tar.gz 394469 BLAKE2B a79caf7def6094f1c99ff8621d7a01a9bc438e3ff54c73e5e9f598fada892e0209334edf73415476e31aef1cd0cd344fba6c8fe11c80cc157fdef5b9d2cda292 SHA512 024256481c553cd8e4b7fb0c0adc735aa6485c396e43aba73873cd4ad950ca686c3df7000a85acd1ac4f09db3f6ab613018739d24a8a69b4708150c171acf13d
diff --git a/dev-python/gitdb/gitdb-4.0.11.ebuild b/dev-python/gitdb/gitdb-4.0.11.ebuild
new file mode 100644
index 000000000000..051b40a162bd
--- /dev/null
+++ b/dev-python/gitdb/gitdb-4.0.11.ebuild
@@ -0,0 +1,65 @@
+# 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="GitDB is a pure-Python git object database"
+HOMEPAGE="
+	https://github.com/gitpython-developers/gitdb/
+	https://pypi.org/project/gitdb/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:,<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	local i
+
+	mkdir "${T}"/repo || die
+	cd "${T}"/repo || die
+
+	for (( i = 0; i < 2500; ++i )); do
+		echo "${i}" > file"${i}" || die
+	done
+
+	git init || die
+	git config user.email "you@example.com" || die
+	git config user.name "Your Name" || die
+	git add -A || die
+	git commit -q -m ".." || die
+	git clone --bare "${T}"/repo "${T}"/repo.git || die
+	cd "${S}" || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		gitdb/test/performance
+	)
+	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
+	epytest
+}
diff --git a/dev-python/httmock/httmock-1.4.0-r1.ebuild b/dev-python/httmock/httmock-1.4.0-r1.ebuild
index fa8de8fcce20..a9ed4767ac00 100644
--- a/dev-python/httmock/httmock-1.4.0-r1.ebuild
+++ b/dev-python/httmock/httmock-1.4.0-r1.ebuild
@@ -9,13 +9,21 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1
 
 DESCRIPTION="A mocking library for requests"
-HOMEPAGE="https://github.com/patrys/httmock"
-SRC_URI="https://github.com/patrys/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/patrys/httmock/
+	https://pypi.org/project/httmock/
+"
+SRC_URI="
+	https://github.com/patrys/httmock/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-python/requests-1.0.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests unittest
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index d856f0f56f12..1777f88cc352 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1,2 +1 @@
-DIST jc-1.23.3.gh.tar.gz 12913560 BLAKE2B 57a058ddd308807c91d64caae7455beba3ce8e1160aa7597ec115b40137aa0fdae008b2b91528075760234076eda832965a75bd0fce650cd0e115fbdbc464ea5 SHA512 36d8c5f455ab12385bf5aae5bf118137f42a261f2ac61e601a5752c193c72187ce9c3d31407493f15dfb552f682356fca69aad56c1cf6743fda24833235078e7
 DIST jc-1.23.4.gh.tar.gz 12920166 BLAKE2B 3980f0564121362028c03fcdab653ef449bd6706eded19276cdcad7a5a18c819ae89fb5d82157af7add190203af2a9900d185aa54b0620357e6b639934bee0bf SHA512 e757e06e8eb740c85df03a92184fc285f35806365fffd4b8459e73fe54d7fcc4e476a4886daa713cd0fe1c5712aa867478a339eb208b55ef92e88945c4ae63a9
diff --git a/dev-python/jc/jc-1.23.3.ebuild b/dev-python/jc/jc-1.23.3.ebuild
deleted file mode 100644
index 8fd1760d7307..000000000000
--- a/dev-python/jc/jc-1.23.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Converts the output of popular command-line tools and file-types to JSON"
-HOMEPAGE="
-	https://github.com/kellyjonbrazil/jc/
-	https://pypi.org/project/jc/
-"
-# no tests in sdist, as of 1.23.2
-SRC_URI="
-	https://github.com/kellyjonbrazil/jc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/jupyter-kernel-test/Manifest b/dev-python/jupyter-kernel-test/Manifest
index ede0b394c039..55071eb7764c 100644
--- a/dev-python/jupyter-kernel-test/Manifest
+++ b/dev-python/jupyter-kernel-test/Manifest
@@ -1,2 +1 @@
-DIST jupyter_kernel_test-0.5.0.tar.gz 15022 BLAKE2B ec02d8a4a1271b2aa6a9c04820c54abe312f7dddef62d5284b858ad5d63ff8b6af12714cc93a252b2594dec713f78d70d0433bac26e34055c4bf41c33f708c17 SHA512 9b440e170a70fb1f505a6cbda1642c68e9d4462dac7fbf7f103c6ef6fcd4adc5152b2cdf7538a78a6fbc02c504108d766ae8edab6d7dce421ae92648d2142b94
 DIST jupyter_kernel_test-0.6.0.tar.gz 15445 BLAKE2B 7739ad85edce96b2bd41ee2af2552f4643a301e33978438f546fb7dbe6e449e89ee1a5dc588af30b4df9786f6cc627fe46c2d43bac43cad86693f0a6d0f9bc10 SHA512 ff518d89f9a32f714a9335e4ee151f205b629399dab84217466ca018556d927a3f91c4cb8b599879946b5332b2b3367c62a6bcc10e20cf43c3f2c3b257bc0d90
diff --git a/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.5.0.ebuild b/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.5.0.ebuild
deleted file mode 100644
index 21e10ebbf4bd..000000000000
--- a/dev-python/jupyter-kernel-test/jupyter-kernel-test-0.5.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Jupyter kernel for octave"
-HOMEPAGE="
-	https://github.com/jupyter/jupyter_kernel_test/
-	https://pypi.org/project/jupyter-kernel-test/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/jupyter-client-6.1.13[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index e9da2ac43cac..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
-EBUILD langdetect-1.0.9.ebuild 493 BLAKE2B 0df8bce19bc80f79f8e76bcef5a4c2caf333365fe0cb9a3c076b7858bceded5a3e58921474f866a2709dd657b7ed330c1ec4a7f9d7bab0fcf1bc92d77cabc32d SHA512 ea2a1adcb133ac5fc951ba1aa90ef1ce3dfcc424e59727591763d4875aa044a74188be2d15fd89c6b2e83ed6ea04ec3d9851ed584ae79d2c2c127bde7d994b48
-MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index 020e07f2a3dd..736a1167c898 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/libevdev/Manifest
index 3bb0da2c4734..3bb0da2c4734 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/libevdev/Manifest
diff --git a/dev-python/python-libevdev/python-libevdev-0.11.ebuild b/dev-python/libevdev/libevdev-0.11.ebuild
index bc5ee4d9c99a..61a6a16ab6ab 100644
--- a/dev-python/python-libevdev/python-libevdev-0.11.ebuild
+++ b/dev-python/libevdev/libevdev-0.11.ebuild
@@ -8,14 +8,16 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
+MY_P=python-libevdev-${PV}
 DESCRIPTION="Python wrappers for the libevdev library"
 HOMEPAGE="
 	https://gitlab.freedesktop.org/libevdev/python-libevdev/
 	https://pypi.org/project/libevdev/
 "
 SRC_URI="
-	https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2
+	https://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/${PV}/${MY_P}.tar.bz2
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/libevdev/metadata.xml
index 79d7a3aea52a..79d7a3aea52a 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/libevdev/metadata.xml
diff --git a/dev-python/python-musicbrainzngs/Manifest b/dev-python/musicbrainzngs/Manifest
index 594037489815..594037489815 100644
--- a/dev-python/python-musicbrainzngs/Manifest
+++ b/dev-python/musicbrainzngs/Manifest
diff --git a/dev-python/python-musicbrainzngs/metadata.xml b/dev-python/musicbrainzngs/metadata.xml
index bf88a1a4b26a..bf88a1a4b26a 100644
--- a/dev-python/python-musicbrainzngs/metadata.xml
+++ b/dev-python/musicbrainzngs/metadata.xml
diff --git a/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1-r1.ebuild b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild
index db23f2bfbe2f..828ec1b2baca 100644
--- a/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1-r1.ebuild
+++ b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1-r1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1
 
+MY_P=python-musicbrainzngs-${PV}
 DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
 HOMEPAGE="
 	https://github.com/alastair/python-musicbrainzngs/
@@ -15,8 +16,9 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/alastair/python-musicbrainzngs/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
diff --git a/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1.ebuild
index 57478d59121d..4bcb1cfd26db 100644
--- a/dev-python/python-musicbrainzngs/python-musicbrainzngs-0.7.1.ebuild
+++ b/dev-python/musicbrainzngs/musicbrainzngs-0.7.1.ebuild
@@ -6,11 +6,13 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 inherit distutils-r1
 
+MY_P=python-musicbrainzngs-${PV}
 DESCRIPTION="Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices"
 HOMEPAGE="https://github.com/alastair/python-musicbrainzngs"
 SRC_URI="
 	https://github.com/alastair/python-musicbrainzngs/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2 ISC"
 SLOT="0"
diff --git a/dev-python/nnpy/nnpy-1.4.2-r1.ebuild b/dev-python/nnpy/nnpy-1.4.2-r1.ebuild
index 4f02373f70bc..916cd6fc7f2e 100644
--- a/dev-python/nnpy/nnpy-1.4.2-r1.ebuild
+++ b/dev-python/nnpy/nnpy-1.4.2-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
diff --git a/dev-python/notify2/notify2-0.3.1-r3.ebuild b/dev-python/notify2/notify2-0.3.1-r3.ebuild
index 22ab6517ed44..e931b42fac34 100644
--- a/dev-python/notify2/notify2-0.3.1-r3.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r3.ebuild
@@ -9,20 +9,27 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 virtualx pypi
 
 DESCRIPTION="Python interface to DBus notifications"
-HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+HOMEPAGE="
+	https://bitbucket.org/takluyver/pynotify2/
+	https://pypi.org/project/notify2/
+"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="examples"
 
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	sys-apps/dbus[X]
-	x11-libs/gdk-pixbuf[introspection]
-	virtual/notification-daemon
-)"
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pygobject[${PYTHON_USEDEP}]
+		sys-apps/dbus[X]
+		x11-libs/gdk-pixbuf[introspection]
+		virtual/notification-daemon
+	)
+"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index f79df3dbbbf4..fb5860e6ef32 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1 +1,2 @@
+DIST pycollada-0.7.2.gh.tar.gz 3526845 BLAKE2B 3d8b4d2478fa4937756db69afbd8716ccd2dd4e0bec8e7dc045e84f06573605c0872d31bdee3d6ccca4b800699746877530f2fa81b5790c3f5c0cb3e7583fa66 SHA512 5c21155d52d54de62d192d4da0385bc7110ddd3962fe3e0e9e5904bbcd0e66cb1a95765c9996cdc5beef0edb30ee2123ae23b904d029be1c119e902d2fc4e7fe
 DIST pycollada-0.7.2.tar.gz 3526845 BLAKE2B 3d8b4d2478fa4937756db69afbd8716ccd2dd4e0bec8e7dc045e84f06573605c0872d31bdee3d6ccca4b800699746877530f2fa81b5790c3f5c0cb3e7583fa66 SHA512 5c21155d52d54de62d192d4da0385bc7110ddd3962fe3e0e9e5904bbcd0e66cb1a95765c9996cdc5beef0edb30ee2123ae23b904d029be1c119e902d2fc4e7fe
diff --git a/dev-python/pycollada/pycollada-0.7.2-r1.ebuild b/dev-python/pycollada/pycollada-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..60fd709d4048
--- /dev/null
+++ b/dev-python/pycollada/pycollada-0.7.2-r1.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=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for reading and writing COLLADA documents"
+HOMEPAGE="
+	https://pycollada.readthedocs.io/
+	https://github.com/pycollada/pycollada/
+	https://pypi.org/project/pycollada/
+"
+SRC_URI="
+	https://github.com/pycollada/pycollada/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
+"
+
+DOCS=( AUTHORS.md COPYING README.markdown )
+
+distutils_enable_sphinx docs
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples ; then
+		insinto /usr/share/${PF}/
+		doins -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# ensure data files for tests are getting installed too
+	python_moduleinto collada/tests/
+	python_domodule collada/tests/data
+}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 6d1f3502f1cb..508a8c1584eb 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,2 +1 @@
-DIST pyocr-0.8.3.tar.gz 67625 BLAKE2B 86edfb08519eda73b29b57b57d495c0fa3bebe8b521d96ce4b644d534d2b32e92532e6275f595912c77093eaf0b1f767f08a130605e9b50142fddf77eb570c4d SHA512 aa4f4fcedd668010841d036899bb83bc0fca6499b29ce2f209e538fd3a2448dce2b52721f0b77bc402d9b3f62052af53e25e78780103172623dea1b367caeab1
 DIST pyocr-0.8.5.tar.gz 71843 BLAKE2B 14ea301a562b4e2ecc9a8b01b64a6a651facc78e54402359313b04fd20bad89e0a390ff1899f72c94db4e2d42c7c648afa5c1267ff6afe85fb14c32e15c6e19b SHA512 4b0bb576db05e3cc253bc031e158e2c018370e2c309df742b9755cf576bbd1fd5baddc851a4cde1ad96d3c2ae1c28e75e735ee7035d62ad8bf9c908546042897
diff --git a/dev-python/pyocr/pyocr-0.8.3.ebuild b/dev-python/pyocr/pyocr-0.8.3.ebuild
deleted file mode 100644
index 87f8e922eefd..000000000000
--- a/dev-python/pyocr/pyocr-0.8.3.ebuild
+++ /dev/null
@@ -1,41 +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_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An optical character recognition (OCR) tool wrapper"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuneiform +tesseract"
-REQUIRED_USE="|| ( cuneiform tesseract )"
-
-RDEPEND="
-	dev-python/pillow[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-"
-
-# (tests apparently do not require any backend installed)
-distutils_enable_tests unittest
-
-RDEPEND+="
-	cuneiform? ( app-text/cuneiform )
-	tesseract? ( app-text/tesseract )
-"
-
-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/pyparted/Manifest b/dev-python/pyparted/Manifest
index 12897ca84dcc..4fcb1360a872 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1 +1,2 @@
 DIST pyparted-3.12.0.tar.gz 106440 BLAKE2B 824223e385a6f1bfd9c01dc4c665ddeca5b73bbc2e65a9ade8086393f3dc0ebdc11528beabe7eeec8d0b8172b49db15ad8c34425efe4db47439f1b5617f9c55c SHA512 c1779c16868799bbff0905ea908db668823d1c238b9a06bcd62b24f9681fdd1e9378e904a91eb5e426a6e264cf1f2feee984a514e9098bf10147643bf58aa918
+DIST pyparted-3.13.0.gh.tar.gz 105838 BLAKE2B 37ba0004a36c6e9d417d3400bb2a91b2903050fa81e4deb0ef0f34232a1d59278f5074ce83e9ba03dc598fb9dae632a01d4d620837600543b130754dd0284463 SHA512 26819e28d73420937874f52fda03eb50ab1b136574ea9867a69d46ae4976d38c4f26a2697fa70597eed90dd78a5ea209bafcc3227a17a7a5d63cff6d107c2b11
diff --git a/dev-python/pyparted/pyparted-3.13.0.ebuild b/dev-python/pyparted/pyparted-3.13.0.ebuild
new file mode 100644
index 000000000000..c39ebbb8a1e2
--- /dev/null
+++ b/dev-python/pyparted/pyparted-3.13.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_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for sys-block/parted"
+HOMEPAGE="
+	https://github.com/dcantrell/pyparted/
+	https://pypi.org/project/pyparted/
+"
+SRC_URI="
+	https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=sys-block/parted-3.4
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index cbeea65c4c4e..d948d8d42544 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1 +1 @@
-DIST pyprof2calltree-1.4.5.tar.gz 8806 BLAKE2B 3a8a838a8b03294504c64dbe1d0caee2606a1ec53005222dfe6c3692bacd0801041ce199fedb9c38e4f6edc91e210116d9c1e034e0aa283cafebb19bf6303fed SHA512 2fcda74ae67dc3a8abb5dc153864ef59f96cc62b1c9359d02be12e83966c17738f5aa4a3d1c6e2ff81614dc963fc4b2faf375bbbb1ad15650a6817e493cdde39
+DIST pyprof2calltree-1.4.5.gh.tar.gz 8806 BLAKE2B 3a8a838a8b03294504c64dbe1d0caee2606a1ec53005222dfe6c3692bacd0801041ce199fedb9c38e4f6edc91e210116d9c1e034e0aa283cafebb19bf6303fed SHA512 2fcda74ae67dc3a8abb5dc153864ef59f96cc62b1c9359d02be12e83966c17738f5aa4a3d1c6e2ff81614dc963fc4b2faf375bbbb1ad15650a6817e493cdde39
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
index 8c8659610e02..d7d61ffee5bc 100644
--- a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
@@ -5,12 +5,19 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1
 
 DESCRIPTION="convert python profile data to kcachegrind calltree form"
-HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
+HOMEPAGE="
+	https://github.com/pwaller/pyprof2calltree/
+	https://pypi.org/project/pyprof2calltree/
+"
 # pypi tarball lacks tests
-SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="
+	https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
index accf1ae2eb9a..8d1de2fac65a 100644
--- a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1 pypi
 
 DESCRIPTION="A small Python module to parse various kinds of time expressions"
-HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/"
+HOMEPAGE="
+	https://github.com/wroberts/pytimeparse/
+	https://pypi.org/project/pytimeparse/
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/pyzbar/Manifest b/dev-python/pyzbar/Manifest
index 3f1c3a60d96a..a7889000dae9 100644
--- a/dev-python/pyzbar/Manifest
+++ b/dev-python/pyzbar/Manifest
@@ -1 +1 @@
-DIST pyzbar-0.1.9.tar.gz 45793 BLAKE2B 205c4cdabecb0c59c78bd3e901bd8348a8648c6c6b48afed5f71883c8ec438047843752269f273ca277ce87f3831e1873f859501df7bdc24834fe2b667922fed SHA512 f9fe774400ed6428bc78a428bd1b7847d5c6d557ea8637125348708f0641b36eceabe69362302c3d8658cf2186ee836c3bfc207fa800a6d03581375c251227e8
+DIST pyzbar-0.1.9.gh.tar.gz 45793 BLAKE2B 205c4cdabecb0c59c78bd3e901bd8348a8648c6c6b48afed5f71883c8ec438047843752269f273ca277ce87f3831e1873f859501df7bdc24834fe2b667922fed SHA512 f9fe774400ed6428bc78a428bd1b7847d5c6d557ea8637125348708f0641b36eceabe69362302c3d8658cf2186ee836c3bfc207fa800a6d03581375c251227e8
diff --git a/dev-python/pyzbar/pyzbar-0.1.9.ebuild b/dev-python/pyzbar/pyzbar-0.1.9.ebuild
index e72a0318f059..37b65bc221a3 100644
--- a/dev-python/pyzbar/pyzbar-0.1.9.ebuild
+++ b/dev-python/pyzbar/pyzbar-0.1.9.ebuild
@@ -9,8 +9,14 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1
 
 DESCRIPTION="Read one-dimensional barcodes and QR codes from Python"
-HOMEPAGE="https://github.com/NaturalHistoryMuseum/pyzbar/"
-SRC_URI="https://github.com/NaturalHistoryMuseum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://github.com/NaturalHistoryMuseum/pyzbar/
+	https://pypi.org/project/pyzbar/
+"
+SRC_URI="
+	https://github.com/NaturalHistoryMuseum/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
index dc024169ffa1..fe9cb08e2341 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Checks PyPI validity of reStructuredText"
-HOMEPAGE="https://pypi.org/project/restructuredtext-lint/"
+HOMEPAGE="
+	https://github.com/twolfson/restructuredtext-lint/
+	https://pypi.org/project/restructuredtext-lint/
+"
 
 LICENSE="Unlicense"
 SLOT="0"
diff --git a/dev-python/s3transfer/s3transfer-0.7.0.ebuild b/dev-python/s3transfer/s3transfer-0.7.0.ebuild
index b06b3dc7503b..4a90ae1d0b9c 100644
--- a/dev-python/s3transfer/s3transfer-0.7.0.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
diff --git a/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild b/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild
index 7bdc78b8793c..2a494be92870 100644
--- a/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild
+++ b/dev-python/snaketrace/snaketrace-0.3.1-r1.ebuild
@@ -5,11 +5,18 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
 inherit distutils-r1
 
 DESCRIPTION="An strace-like tool for Python audit events"
-HOMEPAGE="https://github.com/dcoles/snaketrace https://pypi.org/project/snaketrace/"
-SRC_URI="https://github.com/dcoles/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://github.com/dcoles/snaketrace/
+	https://pypi.org/project/snaketrace/
+"
+SRC_URI="
+	https://github.com/dcoles/snaketrace/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
index 9e12adca1843..3dbf8fabea21 100644
--- a/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
+++ b/dev-python/stapler/stapler-1.0.0_p20220330-r3.ebuild
@@ -3,28 +3,37 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
-COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
-
+EGIT_COMMIT="382f1edc62296e071093a5419811a2fca9d78d93"
+MY_P="${PN}-${EGIT_COMMIT}"
 DESCRIPTION="Suite of tools for PDF files manipulation written in Python"
-HOMEPAGE="https://github.com/hellerbarde/stapler"
-SRC_URI="https://github.com/hellerbarde/${PN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
+HOMEPAGE="
+	https://github.com/hellerbarde/stapler/
+	https://pypi.org/project/stapler/
+"
+SRC_URI="
+	https://github.com/hellerbarde/stapler/archive/${EGIT_COMMIT}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="test? ( dev-python/pypdf[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/pypdf[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pypdf[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests unittest
 
-PATCHES=( "${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests-for-PyPDF2-2.x.patch
 	"${FILESDIR}"/${P}-port-to-PyPDF2-3.0.0.patch
 	"${FILESDIR}"/${P}-use-poetry-core-backend-for-PEP517.patch
-	"${FILESDIR}"/${P}-PyPDF2-to-pypdf.patch )
+	"${FILESDIR}"/${P}-PyPDF2-to-pypdf.patch
+)
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index fdcbfa1416a5..47d4a79ec6e1 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1 +1,2 @@
 DIST testfixtures-7.2.0.tar.gz 133487 BLAKE2B f5c4ff354d1e2b06a28a947fffe8622e51ed680a29ed6fa3ff5e7e851c21e39ed432d6dc0f5f8c83c6541b0054ca3b2afce960f4a00e1e70619a29f29e03b5ae SHA512 b1b5fdd45509e60db8590ec454659efa42c87f75de9187286d820b5643388f83919ccf3763ec223018a5a5b48821041494982af2016c41e11fe30cabdb909223
+DIST testfixtures-7.2.2.tar.gz 133809 BLAKE2B 6a3701bb9c5ca476aadc144f1013268f87e10dd47a6f757e8a0aaa3feb33e1a06663a38f0789b7c54cf439b07562dfb638bd9b89efdc36831d04977f6035ecc8 SHA512 4f7a5ed659b650080deac0b1caff6d2dff0b71d23eaeb26b48b7daa4df85dc0a1f6cfef98275c9a90289eb893c0a06311c849b84f2cc35447fb766f4d0d41c89
diff --git a/dev-python/testfixtures/testfixtures-7.2.2.ebuild b/dev-python/testfixtures/testfixtures-7.2.2.ebuild
new file mode 100644
index 000000000000..151eeba3fa2e
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-7.2.2.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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="
+	https://pypi.org/project/testfixtures/
+	https://github.com/Simplistix/testfixtures/
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/furo
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+
+	local EPYTEST_DESELECT=(
+		# TODO
+		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
+		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:790,column:1
+				docs/comparing.txt::line:829,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
+}
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index 378e441ebb6f..a78ba34f06bb 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,3 +1,4 @@
 DIST unearth-0.10.0.tar.gz 270997 BLAKE2B 8b18df4616fc72025492aa187101bc1f338967b1738ef9ec33d16cbd906c1cf91c1b84e391538521b4a9d6ea40301eb0b7ed0926aa4e6c4d6ffc57401f9d78d9 SHA512 98799202939e1206b6fdd46eb61947c9f9f8068a6857f76aace8dd2c67a3fad9dd3b7a5232d7812b0dcd214c39a9e2a6fafbd18cbfeb9aa4c216571b88b3f131
 DIST unearth-0.11.0.tar.gz 271154 BLAKE2B 405c97ef152afb241cb70d9b309fd1ac454be932c96f95b606bb6038ffb2369fbc55c6afabd86f6a15949182de276dcda035fdb17d4810933286a0fa0b567e42 SHA512 70a06a32f6f2ca74c16a55f9613b543d807e437bd99c0ebb02c0d721144cf45208df78940ee41911a8168c9181ec733b9aec2176038b2556d0e2ad5e8c2cc0d4
 DIST unearth-0.11.2.tar.gz 271479 BLAKE2B c3c3f6bfb3f207eb9a7d7667d966efb84e316579ebffc833e94664c089f0c92bc4915f62a07b53b79aa9f43098080231a3644808bf35172df407cd80a7be9096 SHA512 6ec961456640fe3ca8922e0ee83ecadb6b6fa3dd7b5977a228111ad3ad2d79782eb75d76d4a7066c29f53ce023471c2a38d9f587c35f8d04bb0704bdd6406f71
+DIST unearth-0.12.0.tar.gz 280152 BLAKE2B 34890189f34ae6c2fa25c4350f6b5f74da5f77be6c7000fdd15e33759eace10f3e5a269c21d59bb7c21593ff502a2a9142a8665338940da3a28946218a27bc57 SHA512 54cad14382c8218f8d0e69738ca0302cb9102cd5255fb6a90a303030c9f5da8c33b8527bd0e43aa7cc334740de06642e24dca75b2e092c8b85f7adba1f7e2ab8
diff --git a/dev-python/unearth/unearth-0.12.0.ebuild b/dev-python/unearth/unearth-0.12.0.ebuild
new file mode 100644
index 000000000000..16c225b5a463
--- /dev/null
+++ b/dev-python/unearth/unearth-0.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A utility to fetch and download python packages"
+HOMEPAGE="
+	https://pypi.org/project/unearth/
+	https://github.com/frostming/unearth/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_httpserver
+}
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
index 4a5dd5649f2d..faf83444a5d1 100644
--- a/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
+++ b/dev-python/unittest-or-fail/unittest-or-fail-2.ebuild
@@ -22,6 +22,13 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 # Warning: do not use distutils_enable_tests to avoid a circular
 # dependency on itself!
 python_test() {
+	# unittest fails in python3.12 by default, and it is more strict
+	# than the behavior expected from unittest-or-fail.  We only add
+	# 3.12 compat to workaround a pkgcheck limitation, so no point
+	# in fixing the tests.
+	# https://github.com/pkgcore/pkgcheck/issues/584
+	[[ ${EPYTHON} == python3.12 ]] && return
+
 	"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
 		die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/python-varlink/Manifest b/dev-python/varlink/Manifest
index 1b7a34c31b1b..1b7a34c31b1b 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/varlink/Manifest
diff --git a/dev-python/python-varlink/metadata.xml b/dev-python/varlink/metadata.xml
index 6e476e9ee8d1..6e476e9ee8d1 100644
--- a/dev-python/python-varlink/metadata.xml
+++ b/dev-python/varlink/metadata.xml
diff --git a/dev-python/python-varlink/python-varlink-31.0.0.ebuild b/dev-python/varlink/varlink-31.0.0.ebuild
index 845c82525110..ab3650d91cff 100644
--- a/dev-python/python-varlink/python-varlink-31.0.0.ebuild
+++ b/dev-python/varlink/varlink-31.0.0.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
+MY_P=python-varlink-${PV}
 DESCRIPTION="Python implementation of the Varlink protocol"
 HOMEPAGE="
 	https://github.com/varlink/python/
@@ -15,7 +16,7 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/varlink/python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
 S="${WORKDIR}/python-${PV}"
 
diff --git a/dev-python/zconfig/files/zconfig-4.0-py312.patch b/dev-python/zconfig/files/zconfig-4.0-py312.patch
new file mode 100644
index 000000000000..6f8c53ed18a0
--- /dev/null
+++ b/dev-python/zconfig/files/zconfig-4.0-py312.patch
@@ -0,0 +1,37 @@
+From 390ce89cfd4bf1a60d8d67ee20106288cbfa0e51 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Fri, 23 Jun 2023 08:10:09 +0200
+Subject: [PATCH] Fix tests for Python 3.12 (#91)
+
+In the tests, remove the assertRaisesRegexp method, deprecated since
+Python 3.2, to prevent test failures following the method's removal in
+Python 3.12.
+---
+ src/ZConfig/tests/support.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/ZConfig/tests/support.py b/src/ZConfig/tests/support.py
+index 959f2b9..559c015 100644
+--- a/src/ZConfig/tests/support.py
++++ b/src/ZConfig/tests/support.py
+@@ -17,7 +17,6 @@
+ import contextlib
+ import os
+ import sys
+-import unittest
+ from io import StringIO
+ from urllib.request import pathname2url
+ 
+@@ -79,12 +78,6 @@ def f2(self):
+ class TestHelper:
+     """Utility methods which can be used with the schema support."""
+ 
+-    # Not derived from unittest.TestCase; some test runners seem to
+-    # think that means this class contains tests.
+-
+-    assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex',
+-                                unittest.TestCase.assertRaisesRegexp)
+-
+     def load_both(self, schema_url, conf_url):
+         schema = self.load_schema(schema_url)
+         conf = self.load_config(schema, conf_url)
diff --git a/dev-python/zconfig/zconfig-4.0.ebuild b/dev-python/zconfig/zconfig-4.0.ebuild
index 55fc44df830e..598cd96f2f0a 100644
--- a/dev-python/zconfig/zconfig-4.0.ebuild
+++ b/dev-python/zconfig/zconfig-4.0.ebuild
@@ -11,7 +11,10 @@ PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 inherit distutils-r1 pypi
 
 DESCRIPTION="Configuration library supporting a hierarchical schema-driven model"
-HOMEPAGE="https://pypi.org/project/ZConfig/"
+HOMEPAGE="
+	https://github.com/zopefoundation/ZConfig/
+	https://pypi.org/project/ZConfig/
+"
 
 LICENSE="ZPL"
 SLOT="0"
@@ -32,6 +35,11 @@ distutils_enable_tests unittest
 distutils_enable_sphinx docs \
 	dev-python/sphinxcontrib-programoutput
 
+PATCHES=(
+	# https://github.com/zopefoundation/ZConfig/commit/390ce89cfd4bf1a60d8d67ee20106288cbfa0e51
+	"${FILESDIR}/${P}-py312.patch"
+)
+
 python_test() {
 	eunittest -s src/ZConfig/tests
 }