Adding metadata

69 files changed, 657 insertions, 537 deletions

diff --git a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild b/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
deleted file mode 100644
index 10e1a3e3f7fc..000000000000
--- a/dev-python/Levenshtein/Levenshtein-0.20.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
-HOMEPAGE="
-	https://pypi.org/project/Levenshtein/
-	https://github.com/maxbachmann/Levenshtein/
-"
-SRC_URI="
-	https://github.com/maxbachmann/Levenshtein/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	>=dev-cpp/rapidfuzz-cpp-1.7.0
-"
-RDEPEND="
-	<dev-python/rapidfuzz-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/Levenshtein/Manifest b/dev-python/Levenshtein/Manifest
index dfeb04c4a04b..0f02beaf7ce7 100644
--- a/dev-python/Levenshtein/Manifest
+++ b/dev-python/Levenshtein/Manifest
@@ -1,2 +1 @@
-DIST Levenshtein-0.20.9.gh.tar.gz 36617 BLAKE2B 8e995f1c1648c81bea20844f7afc3c5dddd7dc31e5b6fc99a96930130c7f85bb32c4c4c85b319149d8511f6591ede96098038ea1b502a3e33a42ca3d21db4e2a SHA512 1d5dccd33ae8bd19b234861435212c7a57ba330a5f76a45c9e5b8ac3e401bc3d5eb3c72aea20e66bf0ebaaa6b760131dfef07fb5a2cf4d7191b595e1d962d93c
 DIST Levenshtein-0.21.0.gh.tar.gz 36616 BLAKE2B 8408ba8231a8ff3f6bf9e6cc7ea763061ca1c826236d74877213caef0ce736695865dc3c02565cce960b794d07f96f6413ca144565d6693debf90a1b5718524b SHA512 bb1cf70497e89db5b427eb4ac79708d205fc9edfc9588d30c63ef6e3e77b9369c8892edc31c32cb135d54947e8eedb770d06a7d5c6f8743d44378d7d1a12d459
diff --git a/dev-python/aiopg/aiopg-1.4.0.ebuild b/dev-python/aiopg/aiopg-1.4.0.ebuild
index b2f1e03b9a4b..e3d470420141 100644
--- a/dev-python/aiopg/aiopg-1.4.0.ebuild
+++ b/dev-python/aiopg/aiopg-1.4.0.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 "
 
 DEPEND="test? (
-	dev-python/docker-py[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
 	dev-python/sqlalchemy[${PYTHON_USEDEP}]
 )"
diff --git a/dev-python/asyncmy/Manifest b/dev-python/asyncmy/Manifest
index aebae1111c12..4889241c9fe2 100644
--- a/dev-python/asyncmy/Manifest
+++ b/dev-python/asyncmy/Manifest
@@ -1,2 +1,2 @@
-DIST asyncmy-0.2.5.gh.tar.gz 136467 BLAKE2B 1d5f687a5044653f00653d1b07129fdcb8465b7739e9d9d4b7481fbe3f406f0191c0642d46329e3639c8024a89ff70b8417bd26cdeaf804e278256e0bbb03eef SHA512 6777ccb9be483e2af996e3c814cb00a8db3b5d360c5543224265fd28c851bde4dfa9b81930c7928c10714f9ebed9134b1b5cc72f07c633fbb6eb4add7a10915d
 DIST asyncmy-0.2.7.gh.tar.gz 141090 BLAKE2B a16aa12dd68d7e7af36f854b0c05e03870c09087b85cd4154df30b2353fa1e6863def03e07873211594b5dce726b0ea18ceb796503cec83e62ebda9276498a40 SHA512 570add3f83088ed970305af26b17b639aed1954872f52310a4c24a588ce705481203ad5f0e82084d9d6a24a34913bc396b279c57c4b7b715ff2ef4840bc619c9
+DIST asyncmy-0.2.8.gh.tar.gz 141544 BLAKE2B 12b18165706da58cf44a2df70e23c20084baf9f4464ca5aa419f7c824fee241963ae1d3c56d6fb098c804916fb09db6e3fda75376b42c5d83bf913f6b07e7e25 SHA512 949c643f79ce8d614bab664c563ed0a79fed1b30e4229d823a3dd2a1c6f01e37df52f7ccde5cadb663cad6474835ad4039fc8f5c314ae4196d1265e537063512
diff --git a/dev-python/asyncmy/asyncmy-0.2.5.ebuild b/dev-python/asyncmy/asyncmy-0.2.8.ebuild
index 61317bbc66a3..0bf22da218ef 100644
--- a/dev-python/asyncmy/asyncmy-0.2.5.ebuild
+++ b/dev-python/asyncmy/asyncmy-0.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,6 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="ssl"
 DISTUTILS_USE_PEP517=poetry
+DISTUTILS_EXT=1
 inherit databases distutils-r1 optfeature
 
 DESCRIPTION="A fast asyncio MySQL driver"
@@ -62,11 +63,12 @@ python_test() {
 	epytest "${TEST_S}"
 }
 
-src_install() {
-	distutils-r1_src_install
+python_install() {
+	distutils-r1_python_install
 	find "${ED}"/usr/lib -name '*.md' -delete || die
+	find "${ED}"/usr/lib -name LICENSE -delete || die
 }
 
 pkg_postinst() {
-	optfeature "sha256_password and caching_sha2_password auth methods" dev-python/cryprography
+	optfeature "sha256_password and caching_sha2_password auth methods" dev-python/cryptography
 }
diff --git a/dev-python/azure-core/Manifest b/dev-python/azure-core/Manifest
index 24e4e20d6586..7da04c7cf8d0 100644
--- a/dev-python/azure-core/Manifest
+++ b/dev-python/azure-core/Manifest
@@ -1,2 +1,2 @@
-DIST azure-core-1.26.3.zip 369524 BLAKE2B 96af5ee7f57086981f7660907ccc8422091b4e36510e45daae4151fc92f282b111b0ed487d47d0824470a0c8e79e33ae1a8c9f30f1e4a497fb6cc7bc45951aab SHA512 b332603a3e304ef256923abb22949ea5cf88bc0638c79aec716b10d6e48ff21aba2579f0395e1631929b060818bd88bbbf1d75777c2b678d1182edc6cb3355ee
 DIST azure-core-1.26.4.zip 370584 BLAKE2B ed0974ed62e5a7c66488cbdc452fb97ab018d217764064cf002db9235c580d061ea61e83b612b541ce3385d4d9c9133632833d1d43fa10c7c8de1410f4b503c3 SHA512 babc50a5db328bfae3b6be2625f9cc2ee2922674437062f03e617c08906757e942fa9015e8d1af95d0cb89b791a6d5fca3c30fdecb5542a41d7fe2cf2c8565ae
+DIST azure-core-1.27.0.zip 371285 BLAKE2B ad06f34be2d49288d1fe44de97a913ae152e5feb57c7958f4c9f3e0484b4aff01a865c4ace397de794dc4575d3f932f6c18bce24b11d2ddb78db5c9bd6f30d34 SHA512 6a33b50e8555a28aa810a054f535856a91faf568558fa22be37570ddd77224b631b57aa03ce22c5288d50b714d43f273cf2d0d3184ab369a5680b2a3ef8a412d
diff --git a/dev-python/azure-core/azure-core-1.26.3.ebuild b/dev-python/azure-core/azure-core-1.27.0.ebuild
index 71c2346b9938..71c2346b9938 100644
--- a/dev-python/azure-core/azure-core-1.26.3.ebuild
+++ b/dev-python/azure-core/azure-core-1.27.0.ebuild
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 6b6b42750191..8bfaddaf94b8 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -9,3 +9,4 @@ DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8ef
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
 DIST llvm-project-a2684acfb61d40f441e240035d7f1ba50da637c8.tar.gz 184900914 BLAKE2B fb1f836738415a640bc84283722f6a7355a06bc8ac05b544dd4ad4ac9552dcf70040b82b0493c5b4485b28610412279ec0adcf467e71915167aa7d010c08216e SHA512 c08ff8abc166399e692d3166ccf65eb4b647893cba8ffc10bcda815bc914a944855bac036d6349f6d820a6ff43d5417170e6ff8620d97a2a144a0898e95d09e3
+DIST llvm-project-f9753ef1893c3d953a0244e7935d3997499b079a.tar.gz 185505236 BLAKE2B 570a8937788027ee2cef0dad6be693c57b4a5634c0c1fc2bc1c2f534fb4ae00203f14b1bcf0a0f241e7e1e8c25120dc6ea7ede2a10bed397e1cc377318ebe7a0 SHA512 c12eade7c9790ec2a790017b1451a15f0ff7d1b60879f08a448edcb4f162703650b244fdc2fc284335dff4b2a37ef5d488e0d771abee79b49cac94b9e478f010
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230602.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230602.ebuild
new file mode 100644
index 000000000000..f37802f5c2d7
--- /dev/null
+++ b/dev-python/clang-python/clang-python-17.0.0_pre20230602.ebuild
@@ -0,0 +1,54 @@
+# 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 llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/docker-py/docker-py-5.0.3.ebuild b/dev-python/docker-py/docker-py-5.0.3.ebuild
deleted file mode 100644
index 3bc3b90a935c..000000000000
--- a/dev-python/docker-py/docker-py-5.0.3.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
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/recommonmark' \
-	'>=dev-python/sphinx-1.4.6'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# localhost has a better chance of being in /etc/hosts
-	sed -e 's:socket[.]gethostname():"localhost":' \
-		-i tests/unit/api_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest -vv tests/unit
-}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker/Manifest
index bba31aec6f14..d73f2ade9692 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker/Manifest
@@ -1,2 +1 @@
-DIST docker-py-5.0.3.gh.tar.gz 247093 BLAKE2B 607aca3f6a58b289feed018f40fa5e76e9d6cbae9eefd15a3347e393ae68d963e897e5f288ebf3a13cfbbfafd37882152da1398f61a808338424f353384f1b43 SHA512 50890e8d75eb9e4d3d98bbea5f86b86ad199a56ab0761bf2d0c0f3b7902810b2c17c2a677b0063963742a43a4660d400705bb8eb4e217c89302ae849a4ef3e08
 DIST docker-py-6.1.2.gh.tar.gz 253183 BLAKE2B 28435f5db00cbcd189cb06af77a4eac95a27944d324718c02b1d8f28c9954242c3a36ae376b0e0118ce1e03cb49f44925250b33b34b3ba5b459ef0df9ae9a6a4 SHA512 13c2711c44ae7b781187abaa7518ed86dd37192a44b6fff2c0090bfd8edb82555d15fb9d1681de9db47839f8dbcf17cc03fb88ed4e0e0052032dbcc9ed4c0078
diff --git a/dev-python/docker-py/docker-py-6.1.2.ebuild b/dev-python/docker/docker-6.1.2.ebuild
index f961c05c89b3..e1f0be3fd9cf 100644
--- a/dev-python/docker-py/docker-py-6.1.2.ebuild
+++ b/dev-python/docker/docker-6.1.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/packaging-14.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker/metadata.xml
index 810d9cd202c3..810d9cd202c3 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker/metadata.xml
diff --git a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
index daee6f0adb62..a06bcd1ae416 100644
--- a/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
+++ b/dev-python/dockerpty/dockerpty-0.4.1-r2.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 arm64"
 
 BDEPEND="
 	test? (
-		>=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}]
+		>=dev-python/docker-0.7.0_rc2[${PYTHON_USEDEP}]
 		>=dev-python/expects-0.4[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/faust-cchardet/Manifest b/dev-python/faust-cchardet/Manifest
new file mode 100644
index 000000000000..ebae15ce3143
--- /dev/null
+++ b/dev-python/faust-cchardet/Manifest
@@ -0,0 +1,2 @@
+DIST faust-cchardet-2.1.18.tar.gz 312626 BLAKE2B 33ffa2e4982218bbee72eb8028e15333563988ddb0d136f1e46acb810f005aab32ff7f58ee422d3a0a1348bdcfd2abfba549ed5467f9adc384f534b297ceb319 SHA512 0213a58e7c8104281e69a4fc8ffe90fc892efd783481d31a6b7aa812fe86534e15a209486b947b48e0063b5176f3aaebc9e702ab2e05d11151ba672a06aa3397
+DIST uchardet-bdb8a0376ddf5d3cab6397be0bad98dad106d77f.tar.gz 322644 BLAKE2B cd2bf0a7e6ad29b7641449fa7ea7eecda375ad59ebe04768df6824387d0e33cf7f543afefa972a1e369a0be8f064f87d8eddca5bc048c740d64af05f664ec30d SHA512 a7dd1e5d41484df22e1048a319b05f4dc9d917c91440eda557084049da08b0e7fc3b18f2531fc1418857cda94dfd0deea984728b2a9747e369804ed7137ed6bc
diff --git a/dev-python/faust-cchardet/faust-cchardet-2.1.18.ebuild b/dev-python/faust-cchardet/faust-cchardet-2.1.18.ebuild
new file mode 100644
index 000000000000..8852e3575f29
--- /dev/null
+++ b/dev-python/faust-cchardet/faust-cchardet-2.1.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+GIT_SUBMODULES=(
+	"PyYoshi uchardet bdb8a0376ddf5d3cab6397be0bad98dad106d77f src/ext/uchardet"
+)
+submodule_uris() {
+	local g
+	for g in "${GIT_SUBMODULES[@]}"; do
+		g=(${g})
+		echo "https://github.com/${g[0]}/${g[1]}/archive/${g[2]}.tar.gz -> ${g[1]}-${g[2]}.tar.gz"
+	done
+}
+
+DESCRIPTION="universal character encoding detector"
+HOMEPAGE="https://github.com/faust-streaming/cChardet"
+SRC_URI="
+	https://github.com/faust-streaming/cChardet/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(submodule_uris)
+"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/cChardet-${PV}"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+
+	local g
+	for g in "${GIT_SUBMODULES[@]}"; do
+		g=(${g})
+		mv "${WORKDIR}/${g[1]}-${g[2]}"/* "${S}/${g[3]}" || die "could not move submodule ${g[2]}"
+	done
+}
diff --git a/dev-python/faust-cchardet/metadata.xml b/dev-python/faust-cchardet/metadata.xml
new file mode 100644
index 000000000000..8c8101bcdb2c
--- /dev/null
+++ b/dev-python/faust-cchardet/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="project">
+  <email>core@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ 
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 6e0e2a6231c0..7bfdc5a401fa 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1,3 @@
 DIST griffe-0.27.4.gh.tar.gz 154404 BLAKE2B 40c3a67b47561eeaf846a53ee678e3473a4064ab58c1a07b823b914e2fcfda15e43de9dc6bac074eeb238838d27a9c14f4314a481590c83df1e83dcce320525f SHA512 bb927d956b289048950343d087da5be057fbef8e38feff345ce5f46ca1edfeb87a6fe94b8be18d7c76beef84c69dc97a3972177aac69429a4633f1543906b8e5
 DIST griffe-0.28.2.gh.tar.gz 157261 BLAKE2B 284e63ffcb507233b5965b6e3931036703c9577c7e34149a27f24ffbd54f48f11ed873c690b931886fc043848cfca71c6d94638f0c1073428a1df17f04a33b58 SHA512 8c79fc3a0126cb34f7b13d7407aee5f63c926564da03cf13c5a053b79e3cd736d609f88bb83142ba9baf1fac00e3c8a392ee19c72fa6b0f32a4b383183f5a828
+DIST griffe-0.29.0.gh.tar.gz 157523 BLAKE2B 2854d6e30898e7aec9b6481215311956bcd9b24eb4b7cb36c11515f36a90467cabfc2cf9320bf4dcb44f04d8dd855cde97a749f7b51529cbfe5bd5e8e4391d9c SHA512 3367e48ac9337d180621fa694babc61dec445cc86b1555a65d14547c95aabda637ef72d86d3a1eb16fc736923876cda6c2ba51fa346551e5e134b490557d1459
diff --git a/dev-python/griffe/griffe-0.29.0.ebuild b/dev-python/griffe/griffe-0.29.0.ebuild
new file mode 100644
index 000000000000..4a4d325e3e72
--- /dev/null
+++ b/dev-python/griffe/griffe-0.29.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Signature generator for Python programs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/griffe/
+	https://github.com/mkdocstrings/griffe/
+	https://pypi.org/project/griffe/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/griffe/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index bde667a3263d..f604b95479e1 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1 +1,2 @@
+DIST kombu-5.3.0.tar.gz 434097 BLAKE2B ef378014e4e52d83dc917f9dc6245111e94eddb70d9852da1add1b532ee733578db83c9ca5b4aa82771c443ecbd00e87384b7a373102e78aebcc6724ab1bf6b2 SHA512 688782cab692f0e18444289654e43f53b9a54627d5495933e9717b9676d689ddeb6de368081ea796df26727d4dfd5239ed7554736c13bfce7236e8d73f62b4a9
 DIST kombu-5.3.0b3.tar.gz 436058 BLAKE2B d8470eea43a1d5f862d93e3b3608a3240b25cad6ccb342318a7bebda17e6ce818dce2889cb7af22fd77d2f6e69d1fdfa6926c77ba715c76dd40e973f3d9920dc SHA512 c330e1dd334810ed5fdeea234c49606aa8e43f84006703ff26d900f40ec7ce4920418bef3fd43abc8c792fb750499031191394475c45bfac50f7d29a6e30f5f8
diff --git a/dev-python/kombu/kombu-5.3.0.ebuild b/dev-python/kombu/kombu-5.3.0.ebuild
new file mode 100644
index 000000000000..c226fd2e67ca
--- /dev/null
+++ b/dev-python/kombu/kombu-5.3.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="
+	https://github.com/celery/kombu/
+	https://pypi.org/project/kombu/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/py-amqp-5.1.1[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-6.0.0[${PYTHON_USEDEP}]
+	dev-python/vine[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.22.2[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.1.1[${PYTHON_USEDEP}]
+		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
+		dev-python/zstandard[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+		>=dev-python/redis-4.2.2[${PYTHON_USEDEP}]
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-celery
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		t/unit/transport/test_redis.py::test_Channel::test_connparams_health_check_interval_supported
+	)
+	local EPYTEST_IGNORE=(
+		# obsolete Pyro4
+		t/unit/transport/test_pyro.py
+		# unpackaged azure
+		t/unit/transport/test_azurestoragequeues.py
+	)
+
+	epytest
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Amazon SQS backend" "dev-python/boto3 dev-python/pycurl"
+	optfeature "Etcd backend" dev-python/python-etcd
+	optfeature "MongoDB backend" dev-python/pymongo
+	optfeature "Redis backend" dev-python/redis
+	optfeature "sqlalchemy backend" dev-python/sqlalchemy
+	optfeature "yaml backend" dev-python/pyyaml
+	optfeature "MessagePack (de)serializer for Python" dev-python/msgpack
+	optfeature "brotli compression" "app-arch/brotli[python]"
+	optfeature "zstd compression" dev-python/zstandard
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 6b6b42750191..8bfaddaf94b8 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -9,3 +9,4 @@ DIST llvm-project-16.0.4.src.tar.xz.sig 566 BLAKE2B 43cb2147f12f98f864797158e8ef
 DIST llvm-project-16.0.5.src.tar.xz 118000368 BLAKE2B 9f84e6bab450dc8d6379771afbca5cddc6fbad6c9728726f7158f290ab87d464ff657e89e1c8fc3c474362cc865ff13c5d55ef758c848ea3e660d732cb2fdefa SHA512 7008e7e9c8c2246fe98ba3f0c0fa91e41c88c4da427bf1cfdcce7ef57e5ea838efe7c58c523a7d1708e70d64a4338afe16d06fba2fc7ac5a6c19ca3d6ee41e99
 DIST llvm-project-16.0.5.src.tar.xz.sig 566 BLAKE2B 4c96f294f350e0086f8504a54c3387308c60efb573c8def40aec45b1918d43e36c44bafb0823625b6cefa5d99b3aacd7823d6c92c7a64a737653d5b51839a924 SHA512 4550c7c6a1b6ea603d1499aba5aca746f3948a00e7567604f5e7dc3b215a34357bad382a7ebea1f6cd7952841cb75a0dfbe2c278a8c6fcb630a5035b3e16e869
 DIST llvm-project-a2684acfb61d40f441e240035d7f1ba50da637c8.tar.gz 184900914 BLAKE2B fb1f836738415a640bc84283722f6a7355a06bc8ac05b544dd4ad4ac9552dcf70040b82b0493c5b4485b28610412279ec0adcf467e71915167aa7d010c08216e SHA512 c08ff8abc166399e692d3166ccf65eb4b647893cba8ffc10bcda815bc914a944855bac036d6349f6d820a6ff43d5417170e6ff8620d97a2a144a0898e95d09e3
+DIST llvm-project-f9753ef1893c3d953a0244e7935d3997499b079a.tar.gz 185505236 BLAKE2B 570a8937788027ee2cef0dad6be693c57b4a5634c0c1fc2bc1c2f534fb4ae00203f14b1bcf0a0f241e7e1e8c25120dc6ea7ede2a10bed397e1cc377318ebe7a0 SHA512 c12eade7c9790ec2a790017b1451a15f0ff7d1b60879f08a448edcb4f162703650b244fdc2fc284335dff4b2a37ef5d488e0d771abee79b49cac94b9e478f010
diff --git a/dev-python/lit/lit-17.0.0_pre20230602.ebuild b/dev-python/lit/lit-17.0.0_pre20230602.ebuild
new file mode 100644
index 000000000000..0e39fac626c6
--- /dev/null
+++ b/dev-python/lit/lit-17.0.0_pre20230602.ebuild
@@ -0,0 +1,42 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index 88b8c49fc5aa..d111c336f99f 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1 +1,2 @@
 DIST markdown-it-py-2.2.0.gh.tar.gz 266808 BLAKE2B 8eae5e1924e7afbc79203a11beb7b8271c4c524f5b26cd4bed86f784e4e811d081c2c6bf573bfcdb08f5e270c323957c439c9b9744c7036c4615daece24bde35 SHA512 84d6c15084bf33bdecdcbc8419322f2898bde20de6baeaee6c66c4e6ad9e47dfb8a14e2b1fcf71b8c42e7b61a7caed119919faf0faf6765aad85c186d91fe9d5
+DIST markdown-it-py-3.0.0.gh.tar.gz 275478 BLAKE2B ab264d6de015262e770b5da9c26a48a9fa40209119e38e12e4185aa8b5141986df62f2ff44d80c2d62732e75408b3a70bf35ae9b7ca899ae284636cc62ded710 SHA512 820265595ab650f5ac64419d5c2687d1ee361d2a0550b9d94e86ec826cfe5e89cbd69e59d6582aac41d3b95f00ce4a0b7213bf6cd590fdbd8fd9b743c7418759
diff --git a/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild
new file mode 100644
index 000000000000..3958860572b2
--- /dev/null
+++ b/dev-python/markdown-it-py/markdown-it-py-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of markdown-it, Markdown parser"
+HOMEPAGE="
+	https://pypi.org/project/markdown-it-py/
+	https://github.com/executablebooks/markdown-it-py/
+"
+SRC_URI="
+	https://github.com/executablebooks/markdown-it-py/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/linkify-it-py-3[${PYTHON_USEDEP}]
+	dev-python/mdurl[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-regressions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# No need to benchmark
+	benchmarking/
+)
diff --git a/dev-python/mkdocs-ansible/Manifest b/dev-python/mkdocs-ansible/Manifest
index 95d0a5b09378..df6176d1cb8d 100644
--- a/dev-python/mkdocs-ansible/Manifest
+++ b/dev-python/mkdocs-ansible/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-ansible-0.1.4.tar.gz 27751 BLAKE2B 33bf7edeadda869dcc620b1625deffad326d7a6296f70360a6138581ec60af8524ab8ccd7571c597b9574092dbb10a4296539eea3c9b586c0cc30c297f2a25cf SHA512 e2e3380e226c618cdcf87449ab76478be537b19b1c1da8bd93aca8791f29c98441b630997c203af3739509714eb2d7d2e1a0d8f07ef71b1c79a67c9651ad4886
 DIST mkdocs-ansible-0.1.5.tar.gz 27864 BLAKE2B b34fac1cb5f1ae960776f60ebb7405c3e8bf6c00bee3df81bfb2c77db03f2b1d7486967a7366e1702c969772ab8dba219a44f7be809563af01c867a5839b1ac6 SHA512 4d177fa532676cee76e7c861c06e920b3446d99bdd5ce062e3cf9d1a555153df197375f822df745619e9140e61a3ec590e046614509f4ec7b97e8e58c49e432a
+DIST mkdocs-ansible-0.1.6.tar.gz 27829 BLAKE2B ee1248c2301d841876abfde43e0a883d553f7848b9be367634c4332ceccff4f9aa5e22b58c38f997ffc9c861ac36a0b9e40e4ca445aff7dc040f953f83f3fab8 SHA512 96235bc91d86e52781ae190ab6bc83fc086fa5fdd2ecb21a544549bd49d94b0ea99e56956442884930a6d20c975970942ca3bc0c62cee23b17a3884989420672
diff --git a/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild
new file mode 100644
index 000000000000..7b78bd0aa665
--- /dev/null
+++ b/dev-python/mkdocs-ansible/mkdocs-ansible-0.1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Ansible theme for MkDocs"
+HOMEPAGE="
+	https://github.com/ansible/mkdocs-ansible/
+	https://pypi.org/project/mkdocs-ansible/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/mkdocs-material[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocstrings-python/Manifest b/dev-python/mkdocstrings-python/Manifest
index a0f374326544..8612ae736ffd 100644
--- a/dev-python/mkdocstrings-python/Manifest
+++ b/dev-python/mkdocstrings-python/Manifest
@@ -1 +1,2 @@
 DIST mkdocstrings-python-1.0.0.gh.tar.gz 126036 BLAKE2B aa5512d745e6da92a1fb622654d374170bf4a0d6957ed1425f6bfbc3dc96fb86125f4b04fcc7a7daf9a2e23dae3d42d3de6a94007b25fea6ca1eab234d9c07cf SHA512 0b22953d4074b46f407b9303e4b040f7c0ee47b1202a463bcda66079e371840be3775d0d2fb38b3398b6fdbe70fbb887593d6d0b0c6cd5f42ad76365582796f9
+DIST mkdocstrings-python-1.1.0.gh.tar.gz 126744 BLAKE2B 02e70d2f6f63e7f9eaafa05a9a64a5aefb9122aa80815ffbd125d0bcc02813fe7d7c160696da49cae858ac11093f98dbf3588ffcc7d15ee360cb527484a56da6 SHA512 a9c0a165bd1d0d012e1ba4b2d6198edc6be0fbb28784dff07519fd232294f3932be6bbc9268181a0d1b2a275484cabb17719ccab33e659367a702641464ca4a9
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.1.0.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.1.0.ebuild
new file mode 100644
index 000000000000..a26d2ac9d5a6
--- /dev/null
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.1.0.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=pdm-backend
+
+inherit distutils-r1
+
+DESCRIPTION="Python handler for dev-python/mkdocstrings"
+HOMEPAGE="
+	https://mkdocstrings.github.io/python/
+	https://github.com/mkdocstrings/python/
+	https://pypi.org/project/mkdocstrings-python/
+"
+# Tests need files absent from the PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/python/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/python-${PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/griffe[${PYTHON_USEDEP}]
+	dev-python/mkdocstrings[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings/Manifest b/dev-python/mkdocstrings/Manifest
index 327520f07eb7..831119bbbed0 100644
--- a/dev-python/mkdocstrings/Manifest
+++ b/dev-python/mkdocstrings/Manifest
@@ -1 +1,2 @@
 DIST mkdocstrings-0.21.2.gh.tar.gz 69412 BLAKE2B 2e941045c3f9473ec83a60b82ae85ffbb200201295a8d4405648b4b65ef282fa189b01f54107e999946ce90fbea34a798177dd3d0dbd138a5db6e507cbc0ef7d SHA512 0880163679cce78432880904c6a56eae533a2d6a167b109a21c45daf5f76abf433243b54bcbb0507b5b42c3df9d9d93367cb2bde996c2dcdcc3e55320b2be35c
+DIST mkdocstrings-0.22.0.gh.tar.gz 81345 BLAKE2B ee2bcc0084c5d17368bc1a04db2f097f997872b38fd6b3d32f7daaefe78a496bb0a23d6588458a65b827954382e11c6b6d81baa2117af4b3341e9e727c616ca0 SHA512 c6226d50aaf029a139f51bb1f7101446e11a3e1337f7cd1c9324a2e258753cf25911b2da7042a08a64ae4cf51987b0b2a6ab752af408cdb54d436bcc908d66ff
diff --git a/dev-python/mkdocstrings/mkdocstrings-0.22.0.ebuild b/dev-python/mkdocstrings/mkdocstrings-0.22.0.ebuild
new file mode 100644
index 000000000000..e51043aa7708
--- /dev/null
+++ b/dev-python/mkdocstrings/mkdocstrings-0.22.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatic documentation from sources, for MkDocs"
+HOMEPAGE="
+	https://mkdocstrings.github.io/
+	https://github.com/mkdocstrings/mkdocstrings/
+	https://pypi.org/project/mkdocs-autorefs/
+"
+# Tests require files absent from PyPI tarballs
+SRC_URI="
+	https://github.com/mkdocstrings/mkdocstrings/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-1.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-autorefs-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-6.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-python/mkdocstrings-python[${PYTHON_USEDEP}]
+	)
+"
+
+# mkdocstrings documentation generation requires several currently
+# unpackaged mkdocs extensions and plug-ins, and this test
+# makes use of mkdocs configuration
+EPYTEST_DESELECT=(
+	tests/test_plugin.py::test_disabling_plugin
+	# WTF, it tries to unlink installed files from installed package?!
+	tests/test_handlers.py::test_extended_templates
+	# TODO: package markdown-exec
+	tests/test_inventory.py::test_sphinx_load_mkdocstrings_inventory_file
+	# Internet
+	tests/test_inventory.py::test_load_inventory
+)
+
+distutils_enable_tests pytest
+
+export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/moto/moto-4.1.10.ebuild b/dev-python/moto/moto-4.1.10.ebuild
index 74bae7087e68..4992a443c760 100644
--- a/dev-python/moto/moto-4.1.10.ebuild
+++ b/dev-python/moto/moto-4.1.10.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.6.ebuild b/dev-python/moto/moto-4.1.6.ebuild
index 34dcefdb5635..7a5cef0f0fbc 100644
--- a/dev-python/moto/moto-4.1.6.ebuild
+++ b/dev-python/moto/moto-4.1.6.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.7.ebuild b/dev-python/moto/moto-4.1.7.ebuild
index b968476d1f0e..4260acf390ce 100644
--- a/dev-python/moto/moto-4.1.7.ebuild
+++ b/dev-python/moto/moto-4.1.7.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.8.ebuild b/dev-python/moto/moto-4.1.8.ebuild
index 314aef4a5738..2afd9de44c79 100644
--- a/dev-python/moto/moto-4.1.8.ebuild
+++ b/dev-python/moto/moto-4.1.8.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/moto/moto-4.1.9.ebuild b/dev-python/moto/moto-4.1.9.ebuild
index 3214abec9500..14764c54dabd 100644
--- a/dev-python/moto/moto-4.1.9.ebuild
+++ b/dev-python/moto/moto-4.1.9.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/cfn-lint-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
 	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
diff --git a/dev-python/nodeenv/nodeenv-1.8.0.ebuild b/dev-python/nodeenv/nodeenv-1.8.0.ebuild
index 69b5bddfd4f2..fd92a37e7f37 100644
--- a/dev-python/nodeenv/nodeenv-1.8.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.8.0.ebuild
@@ -26,6 +26,7 @@ KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 RESTRICT="test"
 PROPERTIES="test_network"
 
+# See https://github.com/ekalinin/nodeenv/issues/333 for which.
 RDEPEND="
 	sys-apps/which
 "
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index ea4c69ffbb7d..416e50f77449 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,3 +1 @@
-DIST pyglet-2.0.5.gh.tar.gz 6174681 BLAKE2B 6f4f80cee2984148a7579ad02ff86e6cc1c151688ace0153cf3a518eba3004518f900b0297877a86278f4159c342f190d22702bf1ebcaa254c4bef19e1ac0844 SHA512 54bd6630a61606a02103a6ebc9deaba1b1716ff4acbc3418f33496cd238421f6c015affd925ed8f61107a70ba373fe9cc5f89ea3c1b4050f44513b56d28eb11d
-DIST pyglet-2.0.6.gh.tar.gz 6187140 BLAKE2B 25402453f0f8aaa8c300d0bad201ca92f220604b4b3420f27947cd157065ece157993eebfeb142981ad187b62120b6df791a95e362bedd5cf6208fba64ab4d57 SHA512 f6382362d2c314e4a388252f0674ed9a4a976eeb4ef767946c1570948be77cc53bb1ffd9b4e5550a3c235b0e56206fce94fed48da09c06cb1a3ebced92ecbb7d
 DIST pyglet-2.0.7.gh.tar.gz 6187601 BLAKE2B 00bebe51d6e4f2971aaaead69d483234528ed676b3a2b273fe6ee3c0b997d61490b9be3218c5caf092c83fdb58fb39051fde843845e63965e8e6c3510f873a90 SHA512 e51c63e12cfb450ef5b0ef8f113b50fd9a7ccd20f9afe61ef487c47a42248d674ca3bd300d3300bf3bfd5f45a9a029017a9fbf8dd7231f8b58c4b7354a4715cb
diff --git a/dev-python/pyglet/pyglet-2.0.5.ebuild b/dev-python/pyglet/pyglet-2.0.5.ebuild
deleted file mode 100644
index a34d10c7b81c..000000000000
--- a/dev-python/pyglet/pyglet-2.0.5.ebuild
+++ /dev/null
@@ -1,82 +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 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-		# fragile to system load
-		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
-		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
-	)
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_DESELECT+=(
-			# broken test
-			# https://github.com/pyglet/pyglet/issues/606
-			tests/unit/test_events.py::test_push_handlers_instance
-		)
-	fi
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyglet/pyglet-2.0.6.ebuild b/dev-python/pyglet/pyglet-2.0.6.ebuild
deleted file mode 100644
index a9f41d72247e..000000000000
--- a/dev-python/pyglet/pyglet-2.0.6.ebuild
+++ /dev/null
@@ -1,82 +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 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="
-	https://pyglet.org/
-	https://github.com/pyglet/pyglet/
-	https://pypi.org/project/pyglet/
-"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-libs/fontconfig
-	)
-"
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	image? ( || (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		x11-libs/gtk+:2
-	) )
-	sound? ( || (
-		media-libs/openal
-		media-sound/pulseaudio
-	) )
-"
-#	ffmpeg? ( media-libs/avbin-bin )
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	xdg_environment_reset
-
-	local EPYTEST_DESELECT=(
-		# lacking device/server permissions
-		tests/unit/media/test_listener.py::test_openal_listener
-		tests/unit/media/test_listener.py::test_pulse_listener
-		# fragile to system load
-		tests/unit/media/test_player.py::PlayerTestCase::test_pause_resume
-		tests/unit/test_clock_freq.py::test_elapsed_time_between_tick
-	)
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		EPYTEST_DESELECT+=(
-			# broken test
-			# https://github.com/pyglet/pyglet/issues/606
-			tests/unit/test_events.py::test_push_handlers_instance
-		)
-	fi
-
-	# Specify path to avoid running interactive tests
-	# We could add in integration tests, but they're slow
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	nonfatal epytest tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 3788d02794fb..9e70a85d94b9 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,2 +1 @@
-DIST pyicu-v2.10.2.tar.bz2 192890 BLAKE2B b865e2777d922d7ec7ec1abab5e745670affa6e31704db7b23f906eab8ac99ac612c756f433119380a0fed2d180373dba05003722a1ba0990cafc7c4d9d3fbdd SHA512 687f48e0315cc72917b54c7431ee29d503ec79354842e5f6db564cc951a13d32cb4df97435d04c4b125a2a654f70429592ef2197e154624dd9a246b9bacfa4a9
 DIST pyicu-v2.11.tar.bz2 193939 BLAKE2B 2226d9b669242980a52c1c3e734519a581c8f80cb34ff477d3602f150d290a105c86e40ea1e2f13012a81484b89bd2c50a76975683f27fcbcce9bae2475a7175 SHA512 c50e0fad3c92ccaeedf18f7ed6c31772f74b1e5bd01f00dc94b535079ce910d9033dba5ad15dabbedf6eff2034503d69d0715e0b4938ab2701450a8b641bab34
diff --git a/dev-python/pyicu/pyicu-2.10.2.ebuild b/dev-python/pyicu/pyicu-2.10.2.ebuild
deleted file mode 100644
index 439322887be6..000000000000
--- a/dev-python/pyicu/pyicu-2.10.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/
-"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	dev-libs/icu:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 89b1a679a5ac..0adf713b5f32 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1 +1,2 @@
 DIST pyOpenSSL-23.1.1.tar.gz 183402 BLAKE2B c0339203bb1794da67a0c2fe2e20b5736b3e0628d01b13805e3c30771d60fe07df22a7c090260cf1fad80abb1e566e2efd1e8e184a142e335189fa3bd885e7ac SHA512 581f907ac9acf71c3340bbd413ecf161dafeac1cb406649c683fc770f8bcfcc1630a977defa9b3ee218631959ed14ea62d0a02cdf74af9fdce5ddec34ad1e1ea
+DIST pyOpenSSL-23.2.0.tar.gz 185132 BLAKE2B 06330623bf5934b89cf88dee508c2c4bdd170f805a111f082624b2f8c59fd56e48d5954ef7d9f98768e88aaabaa9e04594ea717784a86401e6e64433e699c9b8 SHA512 a467801bf94959a067d9d3551b47d17d4798bf0b87d253d41a89cac9cdb1731a967a98bda3e83ab8a560ed5fdc0a17f34604f3c6e0f6789bc4c920bc49f520c9
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index 155c249b45d0..b823ed037e2b 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -2,12 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
+  <email>dev@liguros.net</email>
+  <name>Development</name>
+ </maintainer>
+ <maintainer type="project">
   <email>python@gentoo.org</email>
   <name>Python</name>
  </maintainer>
  <upstream>
-  <remote-id type="launchpad">pyopenssl</remote-id>
   <remote-id type="cpe">cpe:/a:pyopenssl:pyopenssl</remote-id>
  </upstream>
- <origin>gentoo-staging</origin>
+ <origin>ports</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild
new file mode 100644
index 000000000000..7fcb9b4efe87
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-23.2.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2023 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+PYPI_NO_NORMALIZE=1
+PYPI_PN=pyOpenSSL
+
+inherit distutils-r1 toolchain-funcs pypi
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+	https://www.pyopenssl.org/
+	https://github.com/pyca/pyopenssl/
+	https://pypi.org/project/pyOpenSSL/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+
+RDEPEND="
+	>=dev-python/cryptography-38.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+src_test() {
+	local -x TZ=UTC
+	local EPYTEST_DESELECT=(
+		tests/test_ssl.py::TestContext::test_set_default_verify_paths
+	)
+
+	# test for 32-bit time_t
+	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
+		#include <sys/types.h>
+		int test[sizeof(time_t) >= 8 ? 1 : -1];
+	EOF
+
+	if [[ ${?} -eq 0 ]]; then
+		einfo "time_t is at least 64-bit long"
+	else
+		einfo "time_t is smaller than 64 bits, will skip broken tests"
+		EPYTEST_DESELECT+=(
+			tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
+		)
+	fi
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/pysnmp-mibs/metadata.xml b/dev-python/pysnmp-mibs/metadata.xml
index 6e6acb6149da..7f5728b654ce 100644
--- a/dev-python/pysnmp-mibs/metadata.xml
+++ b/dev-python/pysnmp-mibs/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <maintainer type="project">
   <email>netmon@gentoo.org</email>
   <name>Gentoo network monitoring and analysis project</name>
  </maintainer>
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index 6e6acb6149da..7f5728b654ce 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <maintainer type="project">
   <email>netmon@gentoo.org</email>
   <name>Gentoo network monitoring and analysis project</name>
  </maintainer>
diff --git a/dev-python/pysnooper/Manifest b/dev-python/pysnooper/Manifest
new file mode 100644
index 000000000000..596c81a15279
--- /dev/null
+++ b/dev-python/pysnooper/Manifest
@@ -0,0 +1 @@
+DIST PySnooper-1.1.1.tar.gz 45534 BLAKE2B d3adea166bda59a6b5691ccfd2952381b3d5e199944eaa3b1789fc4188711bcfa6040cae9f0f2d8ea35db1ed1d3d04859a606315bb3e9c771fae090de099c783 SHA512 9170b558d8ea00a359c27855e3eee3c2852bb11aaff534e40f8a8c3a95ceb79f58f2102f8d68c9b4f5c0045a65d0910bc44b0409921fff1706ee93c9b5e2c698
diff --git a/dev-python/pysnooper/metadata.xml b/dev-python/pysnooper/metadata.xml
new file mode 100644
index 000000000000..949ab242b391
--- /dev/null
+++ b/dev-python/pysnooper/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>zhuyifei1999@gmail.com</email>
+  <name>YiFei Zhu</name>
+ </maintainer>
+ <upstream>
+  <bugs-to>https://github.com/cool-RR/PySnooper/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-guru-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pysnooper/pysnooper-1.1.1.ebuild b/dev-python/pysnooper/pysnooper-1.1.1.ebuild
new file mode 100644
index 000000000000..4cecde18e255
--- /dev/null
+++ b/dev-python/pysnooper/pysnooper-1.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 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_PN="PySnooper"
+PYPI_NO_NORMALIZE=1
+inherit distutils-r1 pypi
+
+DESCRIPTION="Never use print for debugging again"
+HOMEPAGE="
+	https://pypi.org/project/pysnooper/
+	https://github.com/cool-RR/PySnooper
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
index 0901c5d663b5..f25e102ede32 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc23.ebuild
@@ -20,7 +20,7 @@ IUSE="test"
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-	dev-python/docker-py[${PYTHON_USEDEP}]
+	dev-python/docker[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
 	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
deleted file mode 100644
index 318e46f65825..000000000000
--- a/dev-python/python-ctags/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-ctags-1.5.0.gh.tar.gz 63921 BLAKE2B 1d25e7bafbdf157f1051321058b39fc9347bc479a61fae637bd11ef8540a3c67e2abd101493668977f05e464a8203b8c518fd1f4433defe5cec9939a200438b2 SHA512 414774c865af51e54c53f66dc7b3cfb5a03b64ea4eb94325658c158542615dfffdd1a5933d9ae03cedf1dbac30e1810d5914fbc3d6ab41e5f708c5d3000d161e
diff --git a/dev-python/python-ctags3/Manifest b/dev-python/python-ctags3/Manifest
new file mode 100644
index 000000000000..f15cc365e95b
--- /dev/null
+++ b/dev-python/python-ctags3/Manifest
@@ -0,0 +1,2 @@
+DIST python-ctags3-1.5.0.gh.tar.gz 63921 BLAKE2B 1d25e7bafbdf157f1051321058b39fc9347bc479a61fae637bd11ef8540a3c67e2abd101493668977f05e464a8203b8c518fd1f4433defe5cec9939a200438b2 SHA512 414774c865af51e54c53f66dc7b3cfb5a03b64ea4eb94325658c158542615dfffdd1a5933d9ae03cedf1dbac30e1810d5914fbc3d6ab41e5f708c5d3000d161e
+DIST python-ctags3-1.6.0.gh.tar.gz 70311 BLAKE2B f286aad922f8220d5f0b42f2919425d836bd27e9b2a85739333295d6e681172b20d33d010821c881583a4bed29d103939cf4b7e1d67190ba52cf1e0a1ca75290 SHA512 38df28c1055b2240e5da7699a7c72bab85908c7b1a1b4db83f19350541fe49d8499a9b7400ad14c77166b459fbb30f6b2c22d65685ac5f392ececa3eeecb6f41
diff --git a/dev-python/python-ctags/metadata.xml b/dev-python/python-ctags3/metadata.xml
index d19b68f3638d..d19b68f3638d 100644
--- a/dev-python/python-ctags/metadata.xml
+++ b/dev-python/python-ctags3/metadata.xml
diff --git a/dev-python/python-ctags/python-ctags-1.5.0-r1.ebuild b/dev-python/python-ctags3/python-ctags3-1.5.0-r1.ebuild
index 76642b05bea1..4963895c1c45 100644
--- a/dev-python/python-ctags/python-ctags-1.5.0-r1.ebuild
+++ b/dev-python/python-ctags3/python-ctags3-1.5.0-r1.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
 
 inherit distutils-r1
 
-MY_PN="${PN}3"
+MY_P="python-ctags3-${PV}"
 DESCRIPTION="Exuberant Ctags indexing python bindings"
 HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
 # PyPI tarballs don't contain pyx files
-SRC_URI="https://github.com/universal-ctags/python-ctags3/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
+SRC_URI="https://github.com/universal-ctags/python-ctags3/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/dev-python/python-ctags3/python-ctags3-1.6.0.ebuild b/dev-python/python-ctags3/python-ctags3-1.6.0.ebuild
new file mode 100644
index 000000000000..a4fadf7988e6
--- /dev/null
+++ b/dev-python/python-ctags3/python-ctags3-1.6.0.ebuild
@@ -0,0 +1,47 @@
+# 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
+
+MY_P="python-ctags3-${PV}"
+DESCRIPTION="Exuberant Ctags indexing python bindings"
+HOMEPAGE="https://github.com/universal-ctags/python-ctags3"
+# PyPI tarballs don't contain pyx files
+SRC_URI="https://github.com/universal-ctags/python-ctags3/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-util/ctags:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# We currently need to let Cython regenerate this file to make Python 3.11
+	# support work
+	rm src/_readtags.c || die
+	cython -3 src/_readtags.pyx || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# To prevent pytest from importing it and failing with:
+	# ModuleNotFoundError: No module named 'ctags._readtags'
+	rm -rf src/ctags || die
+	epytest
+}
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index 38e056b6be2e..b2322adc55a9 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,2 +1 @@
-DIST pyudev-0.24.0.tar.gz 85887 BLAKE2B 82f23a1bbcd8ce5dd9e6f0551d967e7209067541185410668944734a5f0e17a907d6143cee81decb868d64cf8a0fe642dba7dc600f5ae3f03d9487f882d0aef3 SHA512 c711053a58cd857aff9e1df116ff11cfc17426d9f5a092810403150bec36239213a87b428bc31ec862b75b64a027f2d21081e15f76d914b67a9ddf39b0b73379
 DIST pyudev-0.24.1.tar.gz 85963 BLAKE2B 86c6d04691c99671735915564f58b4ef892e45925047487500bc7005343db7145941dde270f4ce9279881bd9bbf203965082d54b34b396febff52f387a1c26ac SHA512 10e32d9a74884000fbf8b86bee60530f6e7b936b990e7ae3b76099ace71834602de404721101c1076ef57365622a9a8f4819d57f58508ced09a21b7d50326886
diff --git a/dev-python/pyudev/pyudev-0.24.0.ebuild b/dev-python/pyudev/pyudev-0.24.0.ebuild
deleted file mode 100644
index 95d0d09ecaf6..000000000000
--- a/dev-python/pyudev/pyudev-0.24.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python binding to libudev"
-HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="qt5"
-
-# Known to fail on test system that aren't exactly the same devices as on CI
-RESTRICT="test"
-
-RDEPEND="virtual/udev"
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
-		ewarn "change it to /var/tmp to ensure tests will pass."
-	fi
-
-	# tests are known to pass then fail on alternate runs
-	# tests: fix run_path
-	sed -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
-		-i tests/test_core.py || die
-
-	# disable usage of hypothesis timeouts (too short)
-	sed -e '/@settings/s/(/(deadline=None,/' -i tests{,/_device_tests}/*.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	optfeature "PyQt5 bindings" "dev-python/PyQt5"
-}
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 23c04a066d3f..7028ef15de82 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1,3 +1,2 @@
-DIST rapidfuzz-2.15.1.tar.gz 1209658 BLAKE2B 2644566c4dd9e3db2ecd2a42f4d1b7c80dd34b0ca1b2e80f2906dacf5180f702b6c7445652a3ab95fecb53d07256f35351e4e88329e2423871e26db9bc5519bb SHA512 541877af22570d9324f1d4c4f2b54fdc16ce321b28aac5d5bcd61bd915f38b7eabecafea3d65372f556e3e80be39015d674cb18714c77d8ea971fe3d2986b90d
 DIST rapidfuzz-3.0.0.tar.gz 1230857 BLAKE2B b15bcca17288cc428b485b0c6e1d322027eee5c8c0261b7f0240e4f5908ff2d53e05124855213a1923d96ec7537b75263c17f220bfaf792ab92f2f455d761027 SHA512 bafdb6045baa78154026dc0eb2498eb0031f03c36e8b17a9219d6e0c55041a9b6c164f4fcc0523480903fece0ab4e2e50a8f969a52b6934fcfbad80d8eadba25
 DIST rapidfuzz-3.1.0.tar.gz 1251075 BLAKE2B 3a9e3dd4105910ad393efe795c4b7fe603f77ba922a6fa30a7b31f2f14a708651490c1afccbc9a5f217a348a8c20f779172a600331be51298ef746b0ade819ea SHA512 ff583a7b87d64b3b00d785533af3ba76d1ffa5dbc65111f4b72c2e7d84a43fe149e2f5546c6af130617e58e35556a7b2143ff6ed24dcf199d24b81ff7b46abc0
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
deleted file mode 100644
index 7b9d1a7ea109..000000000000
--- a/dev-python/rapidfuzz/rapidfuzz-2.15.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# custom wrapper over setuptools
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
-HOMEPAGE="
-	https://github.com/maxbachmann/RapidFuzz/
-	https://pypi.org/project/rapidfuzz/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# all these are header-only libraries
-DEPEND="
-	>=dev-cpp/taskflow-3.0.0
-	>=dev-cpp/rapidfuzz-cpp-1.10.0
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
-	>=dev-python/scikit-build-0.16.2[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# sterilize build flags
-	sed -i -e '/CMAKE_INTERPROCEDURAL_OPTIMIZATION/d' CMakeLists.txt || die
-	# remove bundled libraries
-	rm -r extern || die
-
-	distutils-r1_src_prepare
-
-	export RAPIDFUZZ_BUILD_EXTENSION=1
-}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index de637798f1a4..185554b6e3a6 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,4 @@
 DIST regex-2023.3.23.tar.gz 391964 BLAKE2B 87271765ce6b3c8a96a79e86a2b2e907a9a97e55c78c38d117b05df2fb5626af3ba90ecb55ccde6cb745eba00da2528bb0b6d21dc759c3040c37f6a0cc647476 SHA512 276e16a60d77f0099d9e9a5241f60a823d8ca3056672d74aba21d38daf11ec18b317009e84135f63470a71c877c6abdfe25da0e69c5ea5ad47c97737099a5167
 DIST regex-2023.5.4.tar.gz 392105 BLAKE2B 761da3de8370b5ce8213313fe2d8a6226a33d341a5bd3538748269633eed85801085e64265fb1998fcec3a4db6d2a26fe73b5186026ab3e7561fcd957e537ca1 SHA512 3ec513b2282bad73e9e3ca3b22105907fc00c4e984bf07c9ea3c04f911d702423aa548106928c90d5805c99d36541d95f0fa0cb413ea3974420482c1ffff0a1b
 DIST regex-2023.5.5.tar.gz 392085 BLAKE2B 1eb63c85abcf37b83e2d8f03a18ea9ae0f80aed2d8d29b0141e5064ab30067d9146d9ec440b3bc043dfb569a8216349b67354c7b7b3c4faf6f447f4b910128dc SHA512 e182e0f42989fb2d9dfe8a9c3f66b08156e0617fe8b7924c16fc39d70c2dcd2c0f45f70f433256666ad93067fb66f574c9dae02ec3fb102716f941ddf87b45e8
+DIST regex-2023.6.3.tar.gz 392247 BLAKE2B c7735e19df80e919fd577723c54f6761698adf014dd4e936cda6a1ed745f26f083abd59ed2a772a70e16bec742f8d29a1e76a726b28e1395265c9941ff4e7b99 SHA512 092f316621a0237425a6e8124b289f4156256424b28cb36c590b8d89d731cfa363a97051199b16ede6520e12e99659497f230338a6f913587f578ededdedc408
diff --git a/dev-python/regex/regex-2023.6.3.ebuild b/dev-python/regex/regex-2023.6.3.ebuild
new file mode 100644
index 000000000000..8c79b72444d7
--- /dev/null
+++ b/dev-python/regex/regex-2023.6.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Alternative regular expression module to replace re"
+HOMEPAGE="
+	https://github.com/mrabarnett/mrab-regex/
+	https://pypi.org/project/regex/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="doc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
+	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
+)
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/Features.html )
+	local DOCS=( README.rst docs/*.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index f2b19d5bbbe1..251b7426a308 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,2 +1 @@
-DIST simplejson-3.18.4.tar.gz 83721 BLAKE2B fb9ea04402ba740a445751ff2be2f5f5c826e20f38289dcf9aa9c8abbaba4b59bf906c3378317818c77bcfa6ccc3fe76608651eac660683eeac61f5750099e3d SHA512 6335389eb620c96d5c537cd335e20d4f112b86c0c463ceed4d8fa36c27bab8b00386b7995e40070bda5eed1fe5883a462579c7d09bdbc828c39537282669d0e4
 DIST simplejson-3.19.1.tar.gz 85207 BLAKE2B 4c3d1d5de4292404e44977777332fe57327ece1afcd9890b605d52a248764612da351b7c5afb36d4e1cdcb530f07b99b8d971124899b86e4b2f4005a66afcbb5 SHA512 a2239a932f43abe59da84fc3ba95eeaa6a720c929da79d8f4447603b8c770403c9cba0f008a66c20c5c8aa3255891b687336eef1db071171a2c8435563bbb1bd
diff --git a/dev-python/simplejson/simplejson-3.18.4.ebuild b/dev-python/simplejson/simplejson-3.18.4.ebuild
deleted file mode 100644
index f5f8eb962cee..000000000000
--- a/dev-python/simplejson/simplejson-3.18.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
-HOMEPAGE="
-	https://github.com/simplejson/simplejson/
-	https://pypi.org/project/simplejson/
-"
-
-LICENSE="|| ( MIT AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="+native-extensions"
-
-DOCS=( README.rst CHANGES.txt )
-
-distutils_enable_tests unittest
-
-src_configure() {
-	export DISABLE_SPEEDUPS=$(usex native-extensions 0 1)
-	use native-extensions && export REQUIRE_SPEEDUPS=1
-}
-
-python_test() {
-	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
-	eunittest
-}
diff --git a/dev-python/statsmodels/statsmodels-0.13.5.ebuild b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
index 8445a51405c1..1328581c864b 100644
--- a/dev-python/statsmodels/statsmodels-0.13.5.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.13.5.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="
diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 827c60e33c79..82e1eff2921f 100644
--- a/dev-python/survey/Manifest
+++ b/dev-python/survey/Manifest
@@ -1,2 +1,2 @@
 DIST survey-3.4.3.tar.gz 21219 BLAKE2B e866addd9233409c603f2b34bbf811209f3f6c2ade1bee00258c4f25d741dc526948d16b2e9e0dc3632e6e20fa7863f573c4c27ed1f48ddaa954c7d53a8c51e3 SHA512 47ff72dd1223a32ec038ccf57709e8fe64806ecc9bb8e54daaced27afaa1c2a45e76fc1b149232a107729c462db7657ad0fd08d8b14bb314e3905aabd23fff4a
-DIST survey-4.3.0_alpha.gh.tar.gz 827020 BLAKE2B 3a9048e53c2ab1ff6509a9d9f67c366ae09c14389388d34d1a7e9114823c3935c259c2f92ea7fc1a10519c9a4018901305b0e32fb10cae09ad93bddacef47c11 SHA512 ae48cf9d98593224a3fc31904ab035e2d1b7079d63d1beee7a21bf6f35fb9b89e7d83f52dfca78d9abd037fcd86dbe6ac1d47d2037210eebc96a879a92d18925
+DIST survey-4.3.0.tar.gz 49851 BLAKE2B 734d7b7ad5c59aaecb82b1806d82a017e8bf47a314fefdedc92c71a2cedd89511ed18f0d6fdada49a45e8301f4e445cb341a649f2a2a7a6d08ef9c9c47bb9ba1 SHA512 425631f448da06a647ea6e6d3ba4e71d5a484377f09ad3eb46403806d0e8182e7ffedafd55b622c930fbc9aa3b66a6c639c5239eb8552835e89e34040ba6a177
diff --git a/dev-python/survey/survey-4.3.0_alpha.ebuild b/dev-python/survey/survey-4.3.0.ebuild
index fc808bfc652c..38dc94882a79 100644
--- a/dev-python/survey/survey-4.3.0_alpha.ebuild
+++ b/dev-python/survey/survey-4.3.0.ebuild
@@ -5,17 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-MY_PV=${PV/_/-}
+inherit distutils-r1 pypi
 
 DESCRIPTION="A simple library for creating beautiful interactive prompts"
 HOMEPAGE="
 	https://github.com/Exahilosys/survey
 	https://pypi.org/project/survey/
 "
-SRC_URI="https://github.com/Exahilosys/${PN}/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 02e800d6aba0..9423adad5833 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,2 +1 @@
-DIST python-zstandard-0.20.0.gh.tar.gz 712241 BLAKE2B 6ec393a440eb2a0527e655ee1aec16a47120578bbbb69d2f208b4367be199041887bf02d8feeb74f87992d0ab2b5e668cf8b3d8cd8967bd6dc47d4e052781ebc SHA512 bdbbd829e431a9b1ad1247b83e2e6102314a257a32c92a5c666c5ac050eb115bccd9d358240ac9ab41e975ade13bbbc155c66cb8fb583d2ee8dbd28ae323e4f8
 DIST python-zstandard-0.21.0.gh.tar.gz 711413 BLAKE2B de3c5a5b34242c20452e35ba6bac451a176f9f442dfc7028f5bae9299c8cedafa58edce85b21bbbdd440765a7eef67bf3c996ae1a81d534a18bfc203cdcc1c25 SHA512 51a7a7a6c20733858f96763738f3097f52dae1ca3a33bad3e78e31d6f339d8f2ddb0a7da2fafaa0b162b17e5054c0582ab52054f1215e8c39d8e1f8002babd7c
diff --git a/dev-python/zstandard/zstandard-0.20.0.ebuild b/dev-python/zstandard/zstandard-0.20.0.ebuild
deleted file mode 100644
index addaa505b745..000000000000
--- a/dev-python/zstandard/zstandard-0.20.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-zstandard-${PV}
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="
-	https://github.com/indygreg/python-zstandard/
-	https://pypi.org/project/zstandard/
-"
-SRC_URI="
-	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unreliable, fails on x86
-	sed -e 's:test_estimated_compression_context_size:_&:' \
-		-i tests/test_data_structures.py || die
-	# unbundle zstd
-	: > zstd/zstdlib.c || die
-	# it does random preprocessing on that, so we can't use #include
-	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
-	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
-
-	distutils-r1_src_prepare
-
-	DISTUTILS_ARGS=(
-		--no-c-backend
-	)
-}
-
-src_test() {
-	rm -r zstandard || die
-	distutils-r1_src_test
-}