Adding metadata

67 files changed, 1017 insertions, 343 deletions

diff --git a/dev-python/base58/base58-2.1.1-r1.ebuild b/dev-python/base58/base58-2.1.1-r1.ebuild
index ae40d10902f1..5afffda0e301 100644
--- a/dev-python/base58/base58-2.1.1-r1.ebuild
+++ b/dev-python/base58/base58-2.1.1-r1.ebuild
@@ -18,10 +18,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 BDEPEND="
-	test? (
-		dev-python/pyhamcrest[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/pyhamcrest[${PYTHON_USEDEP}] )
 "
 
+EPYTEST_DESELECT=(
+	# need pytest-benchmark
+	test_base58.py::test_encode_random
+	test_base58.py::test_decode_random
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/bidict/Manifest b/dev-python/bidict/Manifest
index 9b32625ac492..eaefb5239512 100644
--- a/dev-python/bidict/Manifest
+++ b/dev-python/bidict/Manifest
@@ -1,2 +1 @@
-DIST bidict-0.22.0.tar.gz 197969 BLAKE2B 511bea446922c959c7ab2c42fadfe63dc486f9b8f4d060779048195ed02344c36819be917716be6773e2173aa9dbd9e5452e747ee325db6ee92057644789653e SHA512 28384e1f63413023c00c199558eb49298c146602a676226d995aa01ccb0f9a6958750f4e34637d0823d659a092e74bb0ce4d75969d105312f73f5e692d9f82af
 DIST bidict-0.22.1.gh.tar.gz 181134 BLAKE2B aa8606d2d48da1f8a4756bcaf450527c867f67fe284a95299df54b3c711d28d60b869a41d4494f16580c37f197263918bdd9e3d2c6bc347497caa85b4b4dd425 SHA512 c85355125fa0a56c8e763e9c2662be52ca753827d06276adcbe60d87265095e7e59669ec1e4bf3361301a3ae942a9aa47b084f8c3a4a066041d54e353e7b2ea8
diff --git a/dev-python/bidict/bidict-0.22.0.ebuild b/dev-python/bidict/bidict-0.22.0.ebuild
deleted file mode 100644
index 07b7c1ad0cd9..000000000000
--- a/dev-python/bidict/bidict-0.22.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 pypi
-
-DESCRIPTION="The bidirectional mapping library for Python"
-HOMEPAGE="https://github.com/jab/bidict https://pypi.org/project/bidict/"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="test? (
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	dev-python/sortedcollections[${PYTHON_USEDEP}]
-)"
-
-DOCS=( CHANGELOG.rst README.rst SECURITY.rst )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/bidict/bidict-0.22.1.ebuild b/dev-python/bidict/bidict-0.22.1.ebuild
index fe0355c04de2..402953592886 100644
--- a/dev-python/bidict/bidict-0.22.1.ebuild
+++ b/dev-python/bidict/bidict-0.22.1.ebuild
@@ -36,7 +36,7 @@ distutils_enable_sphinx docs \
 	dev-python/furo
 
 src_prepare() {
-	default
+	distutils-r1_src_prepare
 
 	sed -i pytest.ini \
 		-e "/--numprocesses/d" \
diff --git a/dev-python/booleanOperations/Manifest b/dev-python/booleanOperations/Manifest
new file mode 100644
index 000000000000..c7bc9a5730b3
--- /dev/null
+++ b/dev-python/booleanOperations/Manifest
@@ -0,0 +1 @@
+DIST booleanOperations-0.9.0.zip 202950 BLAKE2B 52f25b2328dd1bc2ab6d4e0fc116c55f2913c82d5f033494c3b6855e3cba455c9f3da0a864c7bc7caa483cd3afc238e9fe9aa41086b2dc01bf2c1a6f482bcf5a SHA512 f06d2d3143399f5f6325456a2368d608ad8b7b18a5f63bdaf4c48ddd9a9a2aebf4f67da5cadad2aa0d9d9caaa4839f314ed016cb8572805ef3a01f74e469e56b
diff --git a/dev-python/booleanOperations/booleanOperations-0.9.0-r2.ebuild b/dev-python/booleanOperations/booleanOperations-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..e5c95d2b5cef
--- /dev/null
+++ b/dev-python/booleanOperations/booleanOperations-0.9.0-r2.ebuild
@@ -0,0 +1,32 @@
+# 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
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Boolean operations on paths"
+HOMEPAGE="
+	https://pypi.org/project/booleanoperations/
+	https://github.com/typemytype/booleanOperations
+"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/fonttools-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pyclipper-1.1.0_p1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? ( dev-python/fontPens[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/booleanOperations/metadata.xml b/dev-python/booleanOperations/metadata.xml
new file mode 100644
index 000000000000..ddb5b0f1787e
--- /dev/null
+++ b/dev-python/booleanOperations/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/cachelib/cachelib-0.10.2-r1.ebuild b/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
index 05a46b96a1e9..1afb6a3a7e96 100644
--- a/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
+++ b/dev-python/cachelib/cachelib-0.10.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cachelib/cachelib-0.10.2.ebuild b/dev-python/cachelib/cachelib-0.10.2.ebuild
deleted file mode 100644
index 1afb6a3a7e96..000000000000
--- a/dev-python/cachelib/cachelib-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
-HOMEPAGE="
-	https://pypi.org/project/cachelib/
-	https://github.com/pallets-eco/cachelib/
-"
-SRC_URI="
-	https://github.com/pallets-eco/cachelib/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/pylibmc[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-		net-misc/memcached
-		www-servers/uwsgi[python,${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# bug #818523
-	tests/test_redis_cache.py
-	# requires some test server running
-	# (these tests require dev-python/boto3)
-	tests/test_dynamodb_cache.py
-)
diff --git a/dev-python/celery/celery-5.3.0_beta1-r1.ebuild b/dev-python/celery/celery-5.3.0_beta1-r1.ebuild
index 163a053edf72..af7f7bba52dc 100644
--- a/dev-python/celery/celery-5.3.0_beta1-r1.ebuild
+++ b/dev-python/celery/celery-5.3.0_beta1-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-celery-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-click-2.5.0[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
diff --git a/dev-python/celery/celery-5.3.0_beta2.ebuild b/dev-python/celery/celery-5.3.0_beta2.ebuild
index f4da3e35c424..cc684aa4ce97 100644
--- a/dev-python/celery/celery-5.3.0_beta2.ebuild
+++ b/dev-python/celery/celery-5.3.0_beta2.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
 	)
 	doc? (
 		dev-python/docutils[${PYTHON_USEDEP}]
-		>=dev-python/sphinx_celery-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-celery-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-click-2.5.0[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/sqlalchemy[${PYTHON_USEDEP}]
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index ad6b8c34a7a9..58d47bde0c97 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
new file mode 100644
index 000000000000..dffa4872b61b
--- /dev/null
+++ b/dev-python/defcon/Manifest
@@ -0,0 +1 @@
+DIST defcon-0.10.2.zip 519741 BLAKE2B 6b31d88904bf3ae5e8b1774de1c3d61f8993eb91e54c08b5498fdef1b7143084423dbac20b0a3d17981065db98a93bd82753a67c38a2b4b239632c67d4ae1667 SHA512 9ec1550783c2618644dfc1da8bf4c1270dc0eb9737f3d17cead766f94856e5abf4d976876726180e9a4a9fa8f0c8b9747375acfae7967bc9e651b29476903b82
diff --git a/dev-python/defcon/defcon-0.10.2.ebuild b/dev-python/defcon/defcon-0.10.2.ebuild
new file mode 100644
index 000000000000..cb57b638c93c
--- /dev/null
+++ b/dev-python/defcon/defcon-0.10.2.ebuild
@@ -0,0 +1,32 @@
+# 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="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="$(pypi_sdist_url ${PN} ${PV} .zip)"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/fonttools-4.34.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	distutils-r1_src_configure
+}
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
new file mode 100644
index 000000000000..ddb5b0f1787e
--- /dev/null
+++ b/dev-python/defcon/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/diff-match-patch/Manifest b/dev-python/diff-match-patch/Manifest
index cd1c017d4faf..427fa1a80a42 100644
--- a/dev-python/diff-match-patch/Manifest
+++ b/dev-python/diff-match-patch/Manifest
@@ -1 +1,2 @@
 DIST diff-match-patch-20200713.tar.gz 60711 BLAKE2B 9108557050d0aced61e8073e0bfa1969e780e4350dba86e3cb159760d180b09ff2502e8b0a664370e0586bb0ca280f29cfebb983cddf051f10204e3cd1026d8f SHA512 f161efed3d87dd0693c98ee81aedb3868787f040f8f9f31015f9f1de04d50046be75b2351a65a4c26ae1d194b983dbc1420799cf70e7c25737ee4eb3cc78a183
+DIST diff-match-patch-20230430.tar.gz 43324 BLAKE2B c13beb380d68cf96af41c124eb23f890c71664624de20780ea586f71b4c52a55ee06ac3427c61c233ebead309fcca02cb75f3447f17b7306c2728ebc5b06f6f8 SHA512 a62d15327de659999e3381215249fb088a9e40368008b91201de3db3d02f22892bbf6d2ac40dc4ea4986d24470dd396eaf69583fabbe9078a5cb1f97bae94000
diff --git a/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild b/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
new file mode 100644
index 000000000000..8dab2198f1d4
--- /dev/null
+++ b/dev-python/diff-match-patch/diff-match-patch-20230430.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff, match and patch algorithms for plain text"
+HOMEPAGE="
+	https://github.com/diff-match-patch-python/diff-match-patch/
+	https://pypi.org/project/diff-match-patch/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index b9e117c7e7bb..943dd1f776fa 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,2 +1,3 @@
 DIST dkimpy-1.1.1.tar.gz 66368 BLAKE2B 6b9107129a0857a384d90b9c7d3970177aa32edaaeb41d62dd4edc6fdf7e8c16e3160162aaed074f865d476dc3f7f20ad299f7034858c0fc59ef88c651552ae4 SHA512 46db739f48f5b3aa1605f12822bef61286767b8770685d5056fcebf8475f9cbc78265c792a0371226ffaa97a55703acc6f6ae63c44944cf29a392c8bf51d49b9
 DIST dkimpy-1.1.2.tar.gz 66466 BLAKE2B a202acba76b83bc6c9e82d02e45ae77a09aa016c77285efd8c1c291ca9633f1cb02335b86b6da232a291e6f9a9ae3b344f217a1539bc9bfd7b0cefcbff81ab4f SHA512 92d8427ffd58269d91d0ebc20b082cf110431aa73a1b49fb4565d69e84b6f99404eb7cd91a3c81683461e6ff6361084f41a147b35b36ae4824cffe756b78a9cb
+DIST dkimpy-1.1.3.tar.gz 66793 BLAKE2B 179bd811725f17a89c6ef62b9295d5e0c97df9fc6257e62025262466eae79562ccb3e8088e2388ec481558c88647a646ebeb9b36afbf5d59919e14ac6f1ce0af SHA512 6c845e80183b9c0384163f9353b4cf065736684ec4b32f4d71ae9b92eff51105358d7c203f38d427921c00722656dbe1971247dd69e7a1442d6d0ed89874b2d5
diff --git a/dev-python/dkimpy/dkimpy-1.1.3.ebuild b/dev-python/dkimpy/dkimpy-1.1.3.ebuild
new file mode 100644
index 000000000000..d79133359238
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.3.ebuild
@@ -0,0 +1,37 @@
+# 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 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 2445a10683a2..d060456d73b6 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/fido2/fido2-0.9.3-r1.ebuild b/dev-python/fido2/fido2-0.9.3-r1.ebuild
index 482d6b98dd7a..5c8870e829b0 100644
--- a/dev-python/fido2/fido2-0.9.3-r1.ebuild
+++ b/dev-python/fido2/fido2-0.9.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/fontParts/fontParts-0.10.6-r1.ebuild b/dev-python/fontParts/fontParts-0.10.6-r1.ebuild
new file mode 100644
index 000000000000..fa57a4411db6
--- /dev/null
+++ b/dev-python/fontParts/fontParts-0.10.6-r1.ebuild
@@ -0,0 +1,42 @@
+# 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="An API for interacting with the parts of fonts"
+HOMEPAGE="
+	https://pypi.org/project/fontParts/
+	https://github.com/robotools/fontParts
+"
+SRC_URI="https://github.com/robotools/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/fontMath-0.4.8[${PYTHON_USEDEP}]
+	>=dev-python/fontPens-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
+	>=dev-python/fs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.9.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'>=dev-python/unicodedata2-14.0.0[${PYTHON_USEDEP}]' \
+		python3_{9..10})
+"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx documentation/source
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	distutils-r1_src_configure
+}
diff --git a/dev-python/fontParts/fontParts-0.10.6.ebuild b/dev-python/fontParts/fontParts-0.10.6.ebuild
deleted file mode 100644
index 09358f593d2c..000000000000
--- a/dev-python/fontParts/fontParts-0.10.6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="An API for interacting with the parts of fonts"
-HOMEPAGE="https://github.com/robotools/fontParts"
-SRC_URI="https://github.com/robotools/fontParts/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/booleanOperations-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/fontMath-0.4.8[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/fontPens[${PYTHON_USEDEP}] )"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
-
-python_test() {
-	"${EPYTHON}" Lib/fontParts/fontshell/test.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/fontPens/Manifest b/dev-python/fontPens/Manifest
index 7debcc413fa8..cc50868c0a1b 100644
--- a/dev-python/fontPens/Manifest
+++ b/dev-python/fontPens/Manifest
@@ -1 +1 @@
-DIST fontPens-0.2.4.gh.tar.gz 17680 BLAKE2B 82577a022f020e255a75bb8317a2f804467626095374103fbf091ba96773d287dcc7af1ef641e200ae8abef2d07cbe7b1f1868ca8b9934d9c77c83e51ba70870 SHA512 cbef24fbf421f4b09e1d9b474500e748f424ef1df2d9871424761e6bc0ac68a5b13484cf933f6fdac390f0f5e66573a1bcfc321b04de3e19e8ae9923da6768bb
+DIST fontPens-0.2.4.zip 22445 BLAKE2B bdb2550d7a3a4a161b77f9920640f140b4655cfc0c4e62e21de36425b59bac9769a86eeeb25511a3d587c6d0090d994442153e8cc8034f6b36d80933ce17c59e SHA512 0155ab6d43d00ae14e325b93e4e40f3d240cd9ea13945e724a91054b5a6edd1a4a74f1244100b18aa8905029651080c930b3341aa881be970a2459f2a374e009
diff --git a/dev-python/fontPens/fontPens-0.2.4-r1.ebuild b/dev-python/fontPens/fontPens-0.2.4-r2.ebuild
index 8e4b63c7418f..ce6195d08cee 100644
--- a/dev-python/fontPens/fontPens-0.2.4-r1.ebuild
+++ b/dev-python/fontPens/fontPens-0.2.4-r2.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A collection of classes implementing the pen protocol for manipulating glyphs"
-HOMEPAGE="https://github.com/robotools/fontPens"
-SRC_URI="https://github.com/robotools/fontPens/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+HOMEPAGE="
+	https://pypi.org/project/fontPens/
+	https://github.com/robotools/fontPens
+"
+SRC_URI=$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 LICENSE="BSD"
 SLOT="0"
 
 RDEPEND=">=dev-python/fonttools-3.32[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
 BDEPEND="
+	app-arch/unzip
 	test? (
-		dev-python/fontParts[${PYTHON_USEDEP}]
+		>=dev-python/fontParts-0.8.1[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest
index 898383797133..d13798eac47e 100644
--- a/dev-python/graphene/Manifest
+++ b/dev-python/graphene/Manifest
@@ -1,2 +1,4 @@
 DIST graphene-3.0.0.tar.gz 116388 BLAKE2B 8e0c5732a8c267e1f492c4d07b070a40777e2ac7b41badc0c4b06471c4268e58bab47d170cf3e74940755f0de3d4be246c1a67eae44654bcfbf531fa1eeefb6d SHA512 dbd651ad509248e66c739acc16778753817b040e573514820a221647e1cf4fb96d22f499d1479eb39d921f17c696fcfe9acce3bb2b89b23ffd9e43f949dc4262
+DIST graphene-3.2.2.gh.tar.gz 126807 BLAKE2B 6079c75b0dc571698126fb60ee944647fd1e4d5a03462c6d97466a4a1b3aa1ef0ae03061ff0ee3c1fdf5a5ca636d3ed2ab6eaacedcbecbb1954ffef80e9749d7 SHA512 c1a88a148403d89deea7bfd3db4ce29e1a8898b8cabbbe1f8535bea30d5f37642b7a0e7e66662a9f5f2c164b1eb3a729b4552acde2c7194e52615d282e38a8ba
 DIST sphinx-graphene-3.0.0.zip 22270 BLAKE2B 7cc467f12e7857cedb0336c7d0708f9429b9ccaa7f65077e6453a3e4ce0af92cbdb6d4dd3bec5801bd3e5fb233b4994dbce52fabe690da196ee25b5eec7fb63f SHA512 00cdaee50a7c16729d9d820de7d6c0f61215e3b906777b0705f2de0d2029f2ffb1f86134b1d673d00675d77729be47765999537fc42aeefafb026248b9b0b3b0
+DIST sphinx-graphene-3.2.2.zip 22270 BLAKE2B 7cc467f12e7857cedb0336c7d0708f9429b9ccaa7f65077e6453a3e4ce0af92cbdb6d4dd3bec5801bd3e5fb233b4994dbce52fabe690da196ee25b5eec7fb63f SHA512 00cdaee50a7c16729d9d820de7d6c0f61215e3b906777b0705f2de0d2029f2ffb1f86134b1d673d00675d77729be47765999537fc42aeefafb026248b9b0b3b0
diff --git a/dev-python/graphene/graphene-3.2.2.ebuild b/dev-python/graphene/graphene-3.2.2.ebuild
new file mode 100644
index 000000000000..cac7dfff7682
--- /dev/null
+++ b/dev-python/graphene/graphene-3.2.2.ebuild
@@ -0,0 +1,67 @@
+# 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="GraphQL Framework for Python"
+HOMEPAGE="
+	https://graphene-python.org
+	https://pypi.org/project/graphene/
+	https://github.com/graphql-python/graphene
+"
+SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	doc? ( https://graphene-python.org/sphinx_graphene_theme.zip -> sphinx-${P}.zip )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/aniso8601-8[${PYTHON_USEDEP}]
+	>=dev-python/graphql-core-3.1[${PYTHON_USEDEP}]
+	>=dev-python/graphql-relay-3.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/snapshottest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs
+
+EPYTEST_DESELECT=(
+	# need pytest-benchmark
+	graphene/types/tests/test_objecttype.py::test_objecttype_container_benchmark
+	graphene/types/tests/test_query.py::test_big_list_query_benchmark
+	graphene/types/tests/test_query.py::test_big_list_query_compiled_query_benchmark
+	graphene/types/tests/test_query.py::test_big_list_of_containers_query_benchmark
+	graphene/types/tests/test_query.py::test_big_list_of_containers_multiple_fields_query_benchmark
+	graphene/types/tests/test_query.py::test_big_list_of_containers_multiple_fields_custom_resolvers_query_benchmark
+)
+
+src_unpack() {
+	unpack ${P}.gh.tar.gz
+
+	if use doc; then
+		cd "${S}"/docs || die
+		unpack sphinx-${P}.zip
+	fi
+}
+
+python_compile_all() {
+	local -x PYTHONPATH="${S}/docs:${PYTHONPATH}"
+	sphinx_compile_all
+}
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
index 9ba5e6cbcb00..76f244507d61 100644
--- a/dev-python/graphql-core/Manifest
+++ b/dev-python/graphql-core/Manifest
@@ -1,2 +1 @@
-DIST graphql-core-3.1.6.tar.gz 499188 BLAKE2B c47d95854601de6f524b266de84384d334c99f05aa9c1a226a55413b9a55111dc2eb87813d2650253c502e2bd9904aa1eeaef5373b830ffa1ab8efdf0bec80e7 SHA512 fe7068fb9100e57f2198f653166136d81e98c863f56f3ac1a6b04c65f31ef73d8d1aff5e70870e13c01f333542b442a772157111db58992a4a0b36a17e0e7120
 DIST graphql-core-3.2.3.tar.gz 529552 BLAKE2B 5931579fe860ffd8f0166e703ba3d055eb39660ac3bcd5335c42811da1a692382ab0e968bacfc7b3cb9fae72c74bec160516c74ab56775e3ed6e3756c67ee23a SHA512 6a43b802ae71de7229daa3c9bc8266a17955b163d6b342107034168bc71fb026ad2f8de1ab5fc40dfb6ebbd5c47030ad978d54a825f6aca1c318190e325b405e
diff --git a/dev-python/graphql-core/graphql-core-3.2.3.ebuild b/dev-python/graphql-core/graphql-core-3.2.3.ebuild
index ed27532b4fc4..50c403c725a9 100644
--- a/dev-python/graphql-core/graphql-core-3.2.3.ebuild
+++ b/dev-python/graphql-core/graphql-core-3.2.3.ebuild
@@ -37,6 +37,12 @@ distutils_enable_tests pytest
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed "/addopts =/d" -i setup.cfg pyproject.toml || die
+}
+
 python_test() {
 	if [[ ${EPYTHON} == "python3.11" ]]; then
 		local EPYTEST_DESELECT=(
diff --git a/dev-python/graphql-relay/Manifest b/dev-python/graphql-relay/Manifest
index 94cd47b487b7..c1307855f371 100644
--- a/dev-python/graphql-relay/Manifest
+++ b/dev-python/graphql-relay/Manifest
@@ -1 +1,2 @@
 DIST graphql-relay-3.1.0.tar.gz 47738 BLAKE2B 84a13dee3371345ca7af7ff87b4210a787e261c8446ab6d54b7c1ee196f0bd8faef15be438be424d78ab0fa7cc9df6641020da85052d9abe21d17ed2cb89b28c SHA512 7006da1ebd0a7fde2a88b6c03d2355d1cc26b14e86f51387cd91c922b498f2fcbe120af730b9634b57af0b638244fb464808e7af16e2dfdae9fa71f404bb5d65
+DIST graphql-relay-3.2.0.tar.gz 50027 BLAKE2B 48f543822674821ad299cfba89f208f0870c50a0dcf4f8ac069faabdd3a67216a719047bc19279d1de7c0b5b132dcbdcc239b0011f90adaaf59e7c83f85d2e7f SHA512 fe64373ccec2e954fd375c07c0706b69535ed061fb76c2b1d0153c5767f9f37f406239fbca018234c3fd0c9ce0a306afd5cf6255173a7e03896ea286eeb7c206
diff --git a/dev-python/graphql-core/graphql-core-3.1.6.ebuild b/dev-python/graphql-relay/graphql-relay-3.2.0.ebuild
index ea026e4ed530..2a20af97c429 100644
--- a/dev-python/graphql-core/graphql-core-3.1.6.ebuild
+++ b/dev-python/graphql-relay/graphql-relay-3.2.0.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
+DISTUTILS_USE_PEP517=poetry
+PYPI_NO_NORMALIZE=1
 inherit distutils-r1 pypi
 
-DESCRIPTION="GraphQL for Python"
-HOMEPAGE="https://github.com/graphql-python/graphql-core"
+DESCRIPTION="Relay library for graphql-core"
+HOMEPAGE="
+	https://pypi.org/project/graphql-relay/
+	https://github.com/graphql-python/graphql-relay-py
+"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+RDEPEND="dev-python/graphql-core[${PYTHON_USEDEP}]"
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 		dev-python/pytest-describe[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	)
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme
diff --git a/dev-python/hunter/hunter-3.6.0.ebuild b/dev-python/hunter/hunter-3.6.0.ebuild
index 0177f7e00035..8d6e10b5bba5 100644
--- a/dev-python/hunter/hunter-3.6.0.ebuild
+++ b/dev-python/hunter/hunter-3.6.0.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/ipdb[${PYTHON_USEDEP}]
 		dev-python/manhole[${PYTHON_USEDEP}]
 		dev-python/process-tests[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		sys-devel/gdb
 	)
@@ -43,6 +42,12 @@ EPYTEST_DESELECT=(
 	#tests/test_tracer.py::test_source_cython
 	tests/test_tracer.py::test_fullsource_cython
 
+	# need pytest-benchmark
+	tests/test_cookbook.py::test_probe
+	tests/test_tracer.py::test_perf_actions
+	tests/test_tracer.py::test_perf_filter
+	tests/test_tracer.py::test_perf_stdlib
+
 	# flaky
 	tests/test_remote.py
 )
@@ -62,8 +67,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
 	find . -name '*.c' -delete || die "removing csources failed"
+	distutils-r1_src_prepare
 }
 
 python_compile() {
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f36ba9cc8260..fb82dabbbd05 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,3 +4,4 @@ DIST hypothesis-6.72.2.gh.tar.gz 9358396 BLAKE2B 0f93935523f0f56ec570f1434d33ac7
 DIST hypothesis-6.72.4.gh.tar.gz 9358883 BLAKE2B c877e98140d767b7ac5c9c968f21f1ae26fc7405a740fcdeafb3191a7608da17791b49ef769f0373efeb39a1ef16a519335072dff2a6b88a71b300eea4266dad SHA512 e94b7c70f775337084f43cfd8088a43919383a66f4e8896e1a9bc27e282a718083b3a38c49c25e57eb22688a7fbd8f76fb8809a42cd0d7c4dbc69a415cbe952a
 DIST hypothesis-6.74.1.gh.tar.gz 9364092 BLAKE2B 917b98aa86319c902aff8dd7603b02e94722a4d4b22428bd981f130d2dfac3c85eb5a15c98486ea709ce9f4f6ef2f882a6c3263b650128349a2fb0737b134728 SHA512 ad6e53579434c15ae843d827590275955848575e8f10899178289f19ae7b5c23a60bb2ac329ed782e2018635ac5c62fc08336c3454ebe1987fdf64d4ec4cb5a6
 DIST hypothesis-6.75.0.gh.tar.gz 9368603 BLAKE2B 8f98fc5b2cf24feb8ea9e417d7d75930ba7cc1ea889222ead0b1a4992ac6e7968542263d2da595598f3dd22a8c60803d10d2657c46df5784a901f382f3f8c4c7 SHA512 d4214511da6e6a628c7fe81a756d2462448d01b0c45fc7816156859ed28cc405c9b64aa2c38aa55602d6d977a6366a3423bbe8dbd00f9e5970091ccfc63dfddb
+DIST hypothesis-6.75.1.gh.tar.gz 9368674 BLAKE2B 4a25c1537a5aecf0cd06850fdc8d034621a1f0a1593fb957bb671a4cd463d6ae0013b1e1b3906505f7eba7597ffda2bf698ecf594e1de6e37eaef57201a83094 SHA512 3f3b48ec93f26756c760859af489783ad2df3c93e76b9110d40fec74ffd23de07ba76f897262950f0d97b36daff7ac1f2e319f9f75b6132a9113932e3982ec5f
diff --git a/dev-python/hypothesis/hypothesis-6.75.1.ebuild b/dev-python/hypothesis/hypothesis-6.75.1.ebuild
new file mode 100644
index 000000000000..941ac3080747
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.75.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	if [[ ${EPYTHON} == pypy3 ]]; then
+		EPYTEST_DESELECT+=(
+			# failing due to warnings from numpy/cython
+			hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+		)
+	fi
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/jc/Manifest b/dev-python/jc/Manifest
index def66d6b542d..0073046d8337 100644
--- a/dev-python/jc/Manifest
+++ b/dev-python/jc/Manifest
@@ -1 +1,2 @@
 DIST jc-1.23.1.gh.tar.gz 12853550 BLAKE2B b10c3688025c35b4f71345756b6efd93af1e8abe2a343ca66e9f658d986f7ce60c04526d65a27286425f1f24c188de3e2ba923e4304a8e669139006db1d53766 SHA512 6f2936b6c42136909ff04233cbabbf0a5827552d83f29131c42cbc4de20a3b7fee2263a5cdec9c596d39fb3edc26dbc56863631e992d124c038c53490ba37ebf
+DIST jc-1.23.2.gh.tar.gz 12866729 BLAKE2B 8c37611e75952533fbbb1ac2a4dbf9fc95d6764452bc619da2fb4a0e5b870f3314061276eb5ce0f98f69fd26ae5b0f083443c7840a1254f5934d9b210d7fe4a2 SHA512 bf3b846e359fdece1445d9ca70e7752db05894f97d4c1ca162ef397ffea9e3e719dbb71d496cd0565649ebe47f977d7ef7689e360470b29639523f24b45fcdec
diff --git a/dev-python/jc/jc-1.23.2.ebuild b/dev-python/jc/jc-1.23.2.ebuild
new file mode 100644
index 000000000000..d6091a575a0d
--- /dev/null
+++ b/dev-python/jc/jc-1.23.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+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_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index e20b85e8e949..eb4955d0f2cb 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/jupyter-server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index 2655bceed014..0ce9c4b663d3 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -2,3 +2,4 @@ DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f40
 DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
 DIST nbdime-3.2.0.tar.gz 7513703 BLAKE2B adfbb22e4591112b19079fed6fd7ac4db9e9169a5122cb1e9ad282ef9d07af9f3e69b84b32558af539abd5c7c010eb42182c29b4eba486159961b35cb709044e SHA512 875ecd64f55b26bdb239e489022ee33ed28dd3bd459c9f8ef0c40d86011d4b024e42442cc347ab193a1ae6bec0a0a385894a381f317f74676e7e43edd3fdbea1
+DIST nbdime-3.2.1.tar.gz 7642926 BLAKE2B 245a2b0ca112574a9622855acc8db43595cd7f29f6fe2c1a1f70254984edb395817f65246613b5f41f513464fd37264f2c520237bf44570814bfa6131fdf22a8 SHA512 6ead97a88d587dab00df22d59adb2b80b7f81f47929a6be94b5e848a5c72f7420fac49e1a6a3b87138db75e6c1f46eef67a57a58d6e9d568b69f4e555bb7ed60
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
index f2d2f94009f7..6d46e4868a39 100644
--- a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -23,7 +23,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/colorama[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/nbdime-3.2.1.ebuild b/dev-python/nbdime/nbdime-3.2.1.ebuild
new file mode 100644
index 000000000000..19b967c51bd4
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbdime/
+	https://pypi.org/project/nbdime/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter-server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+	nbdime/tests/test_web.py::test_api_diff
+	nbdime/tests/test_web.py::test_api_merge
+	nbdime/tests/test_web.py::test_fetch_diff
+	nbdime/tests/test_web.py::test_fetch_merge
+	nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}"{/usr,}/etc || die
+}
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 00c987a9a367..e3d388b857e2 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/computationalmodelling/nbval"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/notofonttools/Manifest b/dev-python/notofonttools/Manifest
new file mode 100644
index 000000000000..8a2f1f21963b
--- /dev/null
+++ b/dev-python/notofonttools/Manifest
@@ -0,0 +1 @@
+DIST notofonttools-0.2.17.tar.gz 9743805 BLAKE2B ba601b4c9c4df7fc264dd88c60e50c1db08c21bc07f3ab408f91f445a801bd96ed193e5f9cb320378f6411027b1be004d718233d531bb2ec600badfaffd2d876 SHA512 a5b733c47ce61f6cb18f9772e8fee04f8ee2a3d834afa3f71a5f1c8110124224b9d325db75976104dd880b7c0538568574b2e497faa8f4d5541451e9c3e40cd3
diff --git a/dev-python/notofonttools/metadata.xml b/dev-python/notofonttools/metadata.xml
new file mode 100644
index 000000000000..ddb5b0f1787e
--- /dev/null
+++ b/dev-python/notofonttools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>cyber+gentoo@sysrq.in</email>
+  <name>Anna</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/notofonttools/notofonttools-0.2.17-r1.ebuild b/dev-python/notofonttools/notofonttools-0.2.17-r1.ebuild
new file mode 100644
index 000000000000..5c4d4789fe5e
--- /dev/null
+++ b/dev-python/notofonttools/notofonttools-0.2.17-r1.ebuild
@@ -0,0 +1,29 @@
+# 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 optfeature pypi
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="
+	https://pypi.org/project/notofonttools/
+	https://github.com/googlefonts/nototools
+"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-python/fonttools-4.11.0[${PYTHON_USEDEP}]"
+
+# TODO: Some dependencies are unpackaged
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "nototools.shape_diff module" "dev-python/booleanOperations dev-python/defcon dev-python/pillow"
+}
diff --git a/dev-python/olm/olm-3.2.14-r4.ebuild b/dev-python/olm/olm-3.2.14-r5.ebuild
index 85ceb3739fd5..94850b0e83c8 100644
--- a/dev-python/olm/olm-3.2.14-r4.ebuild
+++ b/dev-python/olm/olm-3.2.14-r5.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for dev-libs/olm"
@@ -20,21 +19,25 @@ KEYWORDS="~amd64"
 DEPEND="dev-libs/olm"
 RDEPEND="
 	${DEPEND}
-	dev-python/cffi[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
+	virtual/python-cffi[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	test? (
-		dev-python/aspectlib[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-	)
+	test? ( dev-python/aspectlib[${PYTHON_USEDEP}] )
 "
 
 DOCS=( README-python.md )
 
 distutils_enable_tests pytest
 
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+	dev-python/alabaster
+
+EPYTEST_DESELECT=(
+	# need pytest-benchmark
+	tests/group_session_test.py::TestClass::test_encrypt
+	tests/group_session_test.py::TestClass::test_decrypt
+)
 
 src_prepare() {
 	distutils-r1_src_prepare
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
deleted file mode 100644
index da6ee1f1faba..000000000000
--- a/dev-python/oslo-policy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oslo.policy-3.10.1.tar.gz 113864 BLAKE2B 87a506ce39a4540dc315eb910b777edc58834dcedfa1ff4bc9202f574ddd50805f54b7da630e428188251b736df6ca1f006341aa2a6915c6ab237f22dd400c96 SHA512 88d44c1114368d485aebe38df0eb5e14232fe5a7e112f188be3055c3534ccc3c730b0bfdb570b87e43b455d4c2d2d038baf9fd4b9ed56b67b008858c8eb20b1a
diff --git a/dev-python/oslo-policy/metadata.xml b/dev-python/oslo-policy/metadata.xml
deleted file mode 100644
index c6c956594214..000000000000
--- a/dev-python/oslo-policy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
-  <description>co-maintainers welcome</description>
- </maintainer>
- <upstream>
-  <bugs-to>https://bugs.launchpad.net/oslo.policy</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild b/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild
deleted file mode 100644
index 69d1523503e8..000000000000
--- a/dev-python/oslo-policy/oslo-policy-3.10.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="
-	https://opendev.org/openstack/oslo.policy
-	https://pypi.org/project/oslo.policy/
-	https://github.com/openstack/oslo.policy
-"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pg8000/Manifest b/dev-python/pg8000/Manifest
index 674e97bca6c1..4ec0976bfe5d 100644
--- a/dev-python/pg8000/Manifest
+++ b/dev-python/pg8000/Manifest
@@ -1,2 +1,2 @@
-DIST pg8000-1.29.1.tar.gz 92221 BLAKE2B a1e43f445848283472b0aee84f05d3e1c0f8f2d6b8c619789f9e1d961dae240c9ebfb8a1fb22af55f4635bb89f036f8dd1ece477b3b68bff5c1b68ccac32b0b4 SHA512 27ced0ae82e522fabdf3a69b07927223695a7c5658f56f75dbfa43f6923b7a914ec54143421324839c07850e10f5f61ca9bc31155af3e4e600429a1889aedea7
 DIST pg8000-1.29.2.tar.gz 92786 BLAKE2B de39587bb34f21b5c9c4477dd5380d3f790091970867a342c87fac91383e68e8b06e883f25130eefbb88d929d869018881558750f735c81615fbcdc96f9c796b SHA512 3e40d254800c7354097372cc58abbd633316e9e9340d02cc20f21a2dc6c87b559a157c9719b6f15cf2d96c393e0c904c6d1310ea9d6367bb808c3c13114ec431
+DIST pg8000-1.29.4.tar.gz 126629 BLAKE2B 7d71e64c3ac37d9271b3dad20e80ed208c3f062149f7877a964c3ad72b1b245d0210b2e53ee0747f6318de7a81bfa4d03f16312263557b62e751fe89595eab23 SHA512 b96c5a4c42354f74bde3ee3af1688164cd74280c432c458d2d71563329162b7551e48f08c31ca8b1d3c1ff068aeccfd0b385265d2f64da34f1d2c59daca0c5dc
diff --git a/dev-python/pg8000/pg8000-1.29.1.ebuild b/dev-python/pg8000/pg8000-1.29.1.ebuild
deleted file mode 100644
index 4beebb4ac554..000000000000
--- a/dev-python/pg8000/pg8000-1.29.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 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 Pure-Python PostgreSQL Driver"
-HOMEPAGE="
-	https://github.com/tlocke/pg8000
-	https://pypi.org/project/pg8000/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/scramp-1.4.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-db/postgresql
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="test" # tests require a running postgresql
-
-distutils_enable_tests pytest
diff --git a/dev-python/pg8000/pg8000-1.29.4.ebuild b/dev-python/pg8000/pg8000-1.29.4.ebuild
new file mode 100644
index 000000000000..411270ffd0cd
--- /dev/null
+++ b/dev-python/pg8000/pg8000-1.29.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 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 databases distutils-r1 edo pypi
+
+DESCRIPTION="PostgreSQL interface library"
+HOMEPAGE="
+	https://github.com/tlocke/pg8000
+	https://pypi.org/project/pg8000/
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/scramp-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/versioningit[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep "ssl")
+		$(epostgres --get-depend "xml")
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)
+"
+
+SSL_TESTS=(
+	test/dbapi/auth/test_md5_ssl.py
+	test/dbapi/auth/test_scram-sha-256_ssl.p
+	test/legacy/auth/test_md5_ssl.py
+	test/legacy/auth/test_scram-sha-256_ssl.py
+	test/native/auth/test_md5_ssl.py
+	test/native/auth/test_scram-sha-256_ssl.py
+)
+
+EPYTEST_DESELECT=(
+	# TODO: ssl tests (need certificates and stuff)
+	"${SSL_TESTS[@]}"
+
+	# "could not determine data type of parameter $1" and other errors
+	test/test_readme.py
+
+	# "database doesn't exist" errors
+	test/dbapi/auth/test_gss.py
+	test/legacy/auth/test_gss.py
+	test/native/auth/test_gss.py
+
+	# too flaky
+	test/native/test_typeconversion.py::test_roundtrip_oid
+)
+
+EPYTEST_IGNORE=(
+	# need pytest-benchmark
+	test/dbapi/test_benchmarks.py
+	test/legacy/test_benchmarks.py
+	test/native/test_benchmarks.py
+)
+
+distutils_enable_tests pytest
+
+python_test_ssl() {
+	epytest "${SSL_TESTS[@]}"
+}
+
+src_test() {
+	epsql() {
+		edo psql -q -h "${sockdir}" -U postgres "${@}"
+	}
+
+	local -x PGPORT="65432"
+	local -x PGPASSWORD="cpsnow"
+	local sockdir=$(epostgres --get-sockdir)
+
+	epostgres --start ${PGPORT}
+	epsql -c "ALTER ROLE postgres WITH PASSWORD '${PGPASSWORD}';"
+	epsql -c "CREATE EXTENSION hstore;"
+	epsql -c "SELECT pg_reload_conf();"
+
+	distutils-r1_src_test
+	epostgres --stop
+}
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index 0e08cc3cb687..8de1bb89c314 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -1,3 +1,4 @@
 DIST pygame-2.1.3.gh.tar.gz 6517003 BLAKE2B 9f2062b24ef2e97995207fbf7572a8aa4d3475356e8646356758ad72b0b744fcf911adaa78bb730ed43c95fa23b8ed733a5573882bd83e112ae5e7e6ef099de9 SHA512 28f46826f58f73607b28c1411c6f2b71796cd4f98103df2dd47db842f578fe7f26dac01cb60d1cb00ac9dacfa62c6c3b913a244379ce70bd03265424e29052e6
 DIST pygame-2.2.0.gh.tar.gz 6530469 BLAKE2B 301b8decd7afe7ad44d97b086ad27209a084884993122f0c8d6973e718cb811587aa2e2c34b5e9fc5859410ced4c298b24127b4bf166dbeaa225b5c731c66cb6 SHA512 212e0f6390fa84f4fbcb3051ecb83c324a59d7591fd216a0f17946a581cf01540116162357b41004a387fbd3395e030a5a6d5f804496d84558125f512c9c2617
 DIST pygame-2.3.0.gh.tar.gz 6547956 BLAKE2B 3189dc5dda7e5fc12fe2091af304816d905a24a33f6f43070040b90bd1bac1191fe6fe1a738ccfda49b5d9b472a704962c3b6aa7d8b99bc67e15317a9df06a2b SHA512 ed93cf5f0fac67b8a03f25f514ac71bf9b9a97f4df30efca9e3225396769e7616d3ce1063e6cc6ee3f4e6f1327154a9e0ec4e81b179578118af3a140bb1543bd
+DIST pygame-2.4.0.gh.tar.gz 6602242 BLAKE2B 27335b2bff6ed20cedc07bd76d50b8cc36c3e8b5c295785b675963fd8730ada8711903db5ef167e24909d274888cfa9dda026df31a7ef5c71e90b76f446e4729 SHA512 4e8500753a1f4314c57c82b6fc43d5666d0602d7a1d7aba6ba8e7b208b0350fa0dcf3a6614cb75202b18931050a6bbd2d51ec08c04c8afb9b13bf27947bcd3ea
diff --git a/dev-python/pygame/pygame-2.4.0.ebuild b/dev-python/pygame/pygame-2.4.0.ebuild
new file mode 100644
index 000000000000..303edb79d795
--- /dev/null
+++ b/dev-python/pygame/pygame-2.4.0.ebuild
@@ -0,0 +1,87 @@
+# 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="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 ~hppa ~ia64 ~ppc ~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
+	)
+"
+
+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/pymilter/Manifest b/dev-python/pymilter/Manifest
index 920a22aef5ac..723798ad62bd 100644
--- a/dev-python/pymilter/Manifest
+++ b/dev-python/pymilter/Manifest
@@ -1,2 +1 @@
-DIST pymilter-1.0.4.gh.tar.gz 1023222 BLAKE2B 1e5ce42af76ae1ac2f7cda87d40bdce404ed7e9fce9e88909572ec065f05e2c9effc8bc62d4fad113753ff7dc7e87c790515a9116615191745097cb2c3390042 SHA512 b356a10ffc0ba0172cdb228e4e15034e67c0fd82b4b8bbe1193e54e45e518626fd647033d824f2cd5a9d456154c528027726977d3ad2f2c2fe0e0155ad50d294
 DIST pymilter-1.0.5.gh.tar.gz 1030610 BLAKE2B 7af714ca771ad9c90a0b20b386f0d46d25fc5cd213c43f7c1c6edc1a9300f7bda987f46fa9a9b8add68f020c33783648f9187c3b05a34a4c13ad8a4ae7206f39 SHA512 d6cd291f3be5402d6e4ab824deba940c6500d970b30c8d73b2fb1952eede4ac784033a7ae0b9a7307f18a3bfd52fc3f40fb0a9cce6cb94e724fce5cc3e8eb25e
diff --git a/dev-python/pymilter/pymilter-1.0.4-r3.ebuild b/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
deleted file mode 100644
index ac462d26b21e..000000000000
--- a/dev-python/pymilter/pymilter-1.0.4-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to sendmail milter API"
-HOMEPAGE="https://github.com/sdgathman/pymilter"
-SRC_URI="https://github.com/sdgathman/${PN}/archive/${P}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND="mail-filter/libmilter:="
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pymilter/pymilter-1.0.5.ebuild b/dev-python/pymilter/pymilter-1.0.5.ebuild
index 66613efde0b2..87cffdcb2c53 100644
--- a/dev-python/pymilter/pymilter-1.0.5.ebuild
+++ b/dev-python/pymilter/pymilter-1.0.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/bsddb3[${PYTHON_USEDEP}]
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 05181e24886c..f558f174a775 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,6 +1,8 @@
 DIST SQLAlchemy-1.4.47.tar.gz 8559530 BLAKE2B 051e6f0114162f5525e756d8762281464020a3c4e1751df8432f76ce3281ea1004fbf842e92bdd310e3a736fc87d25db12a1566720c76bde7960d51c22a483da SHA512 702cbae848bc662b686db43b2d2dbd18b503b3aacac6f5960bcd260cc5bd7058536ff2207f1780cb8425c228a82796490088c3ec32f24637edd2cf1cdac7a8bb
+DIST SQLAlchemy-1.4.48.tar.gz 8448993 BLAKE2B 02c5457e099a0f0bb0e5427a95d3ea35d504d0b5f1d10003b59c8dc76f92ea7b4720512d934fae64b12d95c5de5230139f3af9f5bd6e372fc07228b432995bd9 SHA512 f948e79c92889f2462b117ca49ccb8e82d5f8da0027c65488a3f6c64a802dc0bca96cc84c4e77bb3b8d434dfd66b621ef4d69c5d417ad781d1dc7136bcf6dea1
 DIST SQLAlchemy-2.0.10.tar.gz 9364115 BLAKE2B 0a058eb179e08fa04083eb75aeffff7a50b6e379ea9b5b31d568a88c8ceaa208c0df613d5b3054d477af25e65566b8d413a3be694744e96609f74ab5ac102365 SHA512 f672eec34851e85f1ba41778104a379a37f833804e549ed12cd5b2d5e3cdfb5578e05aa61a61264aee1985d03af19c81b950977ae2b458161dfc8320db371b69
 DIST SQLAlchemy-2.0.11.tar.gz 9260972 BLAKE2B a23f65e9014884d8edaa9285a9749bc02ba412e33fc648da2eff611829931a951107f941a77b00352226be5b3e62f4e6b99434a5657793ca462d1094b6a34788 SHA512 8ca9b3dd1a825b8adb788e0110fe65cf14808de8554fb9b733e27e83f77da148a36f4ebb845a81d9260d464827b5deece657d58cd34bc08262808d7964b2b11e
+DIST SQLAlchemy-2.0.12.tar.gz 9264506 BLAKE2B 83a3aa719e2809b5b48ef5332cf6cbc0e973089dad142dbbe952d14b2e4f3e5a1cf67c7a7240017fbddfafe1c57d6acb974d9c61e72970d8a8c49b7a57f52a91 SHA512 0e4bbc7d4729b2667ca1e8a0c88293e44698346415e3742ad3c686495c9855b5714dab161590605d5ee60523a2544f590f67ac7d01f7f2756ddc7156688db902
 DIST SQLAlchemy-2.0.4.tar.gz 9250723 BLAKE2B c3cec648a527e7beb349b2bbb6924a4e794a1fe4d1563ba7573afdc28ed24fce149c5b3c08fa419e85713b68080b2a805e1999e312f59ed7fae55f9aee6a966e SHA512 098004c594ff00a47a66850b0661f673e4d7a6f168fce72ca37a65ecfe04b3d291b9a6fb9393f7671c9a7c5c128ab6ba2035d18cef28736df1207e689cd8c412
 DIST SQLAlchemy-2.0.7.tar.gz 9298301 BLAKE2B abedb2805cad489e68fdec383eaf1bc65ef92777230317911a9351fce7c9159f746629197f7443a37495c23cd8d3cdd1015d8417f00227f28b8af1468a8327ef SHA512 94f5c4262741986456a9de435a81d9df8d5eed16417cc8c07321cb28030c99ea347c33a2054f2961e3b794bd5f75da19b0879675e2c1106fc5030382895caf75
 DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e0890262efb162a94bd36713f3f3d2f1ddffa95b4d1d8ab140f865c2788d1a913f6c104f21809a695faa132686d77cf3c SHA512 66408768ff702b16ad1365931b254d72976313a3369a74e5a81326d83540ee274805b01d449010ea8e8750312e26dc91aad3b724c4cbdf037e7314b204f6908a
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
new file mode 100644
index 000000000000..14b77a3a036d
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# hardcode call counts specific to Python versions
+	test/aaa_profiling
+)
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		# https://github.com/sqlalchemy/sqlalchemy/issues/8762
+		test/orm/test_query.py::YieldTest_sqlite+pysqlite_${sqlite_version//./_}::test_yield_per_close_on_interrupted_iteration_legacy
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
new file mode 100644
index 000000000000..a2e11781df55
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.12.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 optfeature pypi
+
+MY_PN="SQLAlchemy"
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="
+	https://www.sqlalchemy.org/
+	https://pypi.org/project/SQLAlchemy/
+	https://github.com/sqlalchemy/sqlalchemy/
+"
+SRC_URI="$(pypi_sdist_url --no-normalize "${MY_PN}")"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	>=dev-python/typing-extensions-4.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/greenlet/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		test/ext/mypy/test_mypy_plugin_py3k.py
+		# hardcode call counts specific to Python versions
+		test/aaa_profiling
+	)
+	local EPYTEST_DESELECT=(
+		# warning tests are unreliable
+		test/base/test_warnings.py
+		# TODO
+		test/orm/test_versioning.py::ServerVersioningTest_sqlite+pysqlite_3_40_1::test_sql_expr_w_mods_bump
+		test/sql/test_resultset.py::CursorResultTest_sqlite+pysqlite_3_41_0::test_pickle_rows_other_process
+	)
+	local sqlite_version=$(sqlite3 --version | cut -d' ' -f1)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		test/ext/test_associationproxy.py::ProxyHybridTest::test_msg_fails_on_cls_access
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_multi_elem_varg
+		test/ext/test_associationproxy.py::DictOfTupleUpdateTest::test_update_one_elem_varg
+		test/engine/test_pool.py::QueuePoolTest::test_recycle_pool_no_race
+		test/engine/test_processors.py::PyDateProcessorTest::test_date_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_datetime_invalid_string
+		test/engine/test_processors.py::PyDateProcessorTest::test_time_invalid_string
+		"test/dialect/test_sqlite.py::TestTypes_sqlite+pysqlite_${sqlite_version//./_}::test_cant_parse_datetime_message"
+		"test/dialect/test_suite.py::ReturningGuardsTest_sqlite+pysqlite_${sqlite_version//./_}"::test_{delete,insert,update}_single
+		test/base/test_utils.py::ImmutableDictTest::test_pep584
+	)
+	if ! has_version "dev-python/greenlet[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_execution
+			test/ext/asyncio/test_engine_py3k.py::TextSyncDBAPI::test_sync_driver_run_sync
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[False-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[True-True]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::PoolEventsTest::test_checkin_event_gc[not_has_terminate-is_asyncio]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True-_exclusions0]"
+			"test/engine/test_pool.py::QueuePoolTest::test_userspace_disconnectionerror_weakref_finalizer[True]"
+		)
+	fi
+
+	# upstream's test suite is horribly hacky; it relies on disabling
+	# the warnings plugin and turning warnings into errors;  this also
+	# means that any DeprecationWarnings from third-party plugins cause
+	# everything to explode
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=
+	# upstream automagically depends on xdist when it is importable
+	# note that we can't use xdist because it causes nodes to randomly
+	# crash on init
+	if has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]"; then
+		PYTEST_PLUGINS+=xdist.plugin
+	fi
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "asyncio support" dev-python/greenlet
+	optfeature "MySQL support" \
+		dev-python/mysqlclient \
+		dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index f20149a69a18..2bad790bb27c 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/ufoProcessor/Manifest b/dev-python/ufoProcessor/Manifest
index 2df4d44e27b6..d4624bfb440e 100644
--- a/dev-python/ufoProcessor/Manifest
+++ b/dev-python/ufoProcessor/Manifest
@@ -1 +1 @@
-DIST ufoProcessor-1.9.0.gh.tar.gz 34299 BLAKE2B 06570e3e3ade479e470460fcec0e8af9e786d03d95b27f8a65b6b89519b281da0931f7fc4171fe212120881efcfce489c2d0c634467402981670d392cc6113bc SHA512 8e98777eebe0e4d470cb1d6765826ea8752fb3bdcf539581c7b28cede7907b53d68371406f0ee19e718b1de585a4f1d191ef07583fb9c3badc45fb4f3ceb576c
+DIST ufoProcessor-1.9.0.zip 70066 BLAKE2B 498e98043c0b65638a8edd3f64071aff02a84d017358e9a04e563790b9d6c92078343e16109d4feaabc8c1163b679be751b3f3cc0431bb1501f6d5caa63373b3 SHA512 6a7089fc92334c6b206a336d23f63f5cc838b3bc205eceb8e9f8cc2039ae5e4e2a3da487fc3d4b11a4072a729878c8068fbadc5ca07b785ac0a20a24efb747f4
diff --git a/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
deleted file mode 100644
index 37cd513b3acc..000000000000
--- a/dev-python/ufoProcessor/ufoProcessor-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python package for processing and generating UFO files"
-HOMEPAGE="https://github.com/LettError/ufoProcessor"
-SRC_URI="https://github.com/LettError/ufoProcessor/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/fontMath-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/fontParts-0.8.2[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
-	>=dev-python/MutatorMath-2.1.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/unicodedata2[${PYTHON_USEDEP}] )
-"
-BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
-
-python_test() {
-	"${EPYTHON}" Tests/tests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/ufoProcessor/ufoProcessor-1.9.0-r2.ebuild b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..32c2b8d65986
--- /dev/null
+++ b/dev-python/ufoProcessor/ufoProcessor-1.9.0-r2.ebuild
@@ -0,0 +1,40 @@
+# 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
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read, write and generate UFOs with designspace data"
+HOMEPAGE="
+	https://pypi.org/project/ufoProcessor/
+	https://github.com/LettError/ufoProcessor
+"
+SRC_URI="$(pypi_sdist_url --no-normalize ${PN} ${PV} .zip)"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/MutatorMath-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/fontMath-0.4.9[${PYTHON_USEDEP}]
+	>=dev-python/fontParts-0.8.2[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.32.0[${PYTHON_USEDEP}]
+	>=dev-python/fs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+	test? ( dev-python/unicodedata2[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+python_test() {
+	${EPYTHON} Tests/tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/webpy/Manifest b/dev-python/webpy/Manifest
index b793bd44738e..6666bae53c92 100644
--- a/dev-python/webpy/Manifest
+++ b/dev-python/webpy/Manifest
@@ -1 +1 @@
-DIST webpy-0.62.tar.gz 104552 BLAKE2B bd94dc9ca9aaf2c4ba9be2d14e66c176031818617f6b505c85e849d299b0fd7f4b77d008d23e78c922584cbd46938206fb5f0f4c19f082811d800d259014b79a SHA512 2b91977bb78e9387c78ed893b098d665a5189e7b9cb1eacbaf903564285524dabc960107b0e1ba4a85c3aedf73ef63ae05338cc71ccacad47a310970afb77cd9
+DIST webpy-0.62.gh.tar.gz 104552 BLAKE2B bd94dc9ca9aaf2c4ba9be2d14e66c176031818617f6b505c85e849d299b0fd7f4b77d008d23e78c922584cbd46938206fb5f0f4c19f082811d800d259014b79a SHA512 2b91977bb78e9387c78ed893b098d665a5189e7b9cb1eacbaf903564285524dabc960107b0e1ba4a85c3aedf73ef63ae05338cc71ccacad47a310970afb77cd9
diff --git a/dev-python/webpy/webpy-0.62.ebuild b/dev-python/webpy/webpy-0.62.ebuild
index 9d3d77e66adf..0027cf1199af 100644
--- a/dev-python/webpy/webpy-0.62.ebuild
+++ b/dev-python/webpy/webpy-0.62.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/webpy/webpy
 	https://pypi.org/project/web.py/
 "
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -21,20 +21,18 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-python/cheroot[${PYTHON_USEDEP}]"
 
-distutils_enable_tests pytest
-distutils_enable_sphinx docs
-
-src_prepare() {
-	#tests require postgresql and mysql running
+EPYTEST_IGNORE=(
+	# TODO: tests require postgresql and mysql running
 	rm tests/test_db.py
-	default
-}
+)
+
+EPYTEST_DESELECT=(
+	# https://github.com/webpy/webpy/issues/712
+	# https://github.com/webpy/webpy/issues/713
+	tests/test_application.py::ApplicationTest::test_routing
+	tests/test_session.py::DiskStoreTest::testStoreConcurrent
+)
 
-python_test() {
-	#https://github.com/webpy/webpy/issues/712
-	#https://github.com/webpy/webpy/issues/713
-	epytest -vv \
-		--deselect tests/test_application.py::ApplicationTest::test_routing \
-		--deselect tests/test_session.py::DiskStoreTest::testStoreConcurrent \
-		|| die
-}
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs
diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild
index 9f937bf3a80e..4d500cd6aa69 100644
--- a/dev-python/wxpython/wxpython-4.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-4.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://www.wxpython.org/"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 # Nearly there as of 4.2.0 but still quite flaky (inconsistent set of failures)
diff --git a/dev-python/yams/yams-0.7.3.ebuild b/dev-python/yams/yams-0.7.3.ebuild
index 0b665f21aade..d8b1be001fd1 100644
--- a/dev-python/yams/yams-0.7.3.ebuild
+++ b/dev-python/yams/yams-0.7.3.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/python-mpd[${PYTHON_USEDEP}]
+	dev-python/python-mpd2[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	media-sound/mpd
 "