Adding metadata

44 files changed, 364 insertions, 551 deletions

diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
index 918fc1d105ba..96e85778ea78 100644
--- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
+++ b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 optfeature
 
 DESCRIPTION="A set of third-party serializers for Betamax"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 66100bd43946..795bd9a0fafb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.24.20.gh.tar.gz 512415 BLAKE2B c2196a9a518b0e4c0fb6e2382390d7d8e275
 DIST boto3-1.24.21.gh.tar.gz 513083 BLAKE2B 1de0405823b6b33efcb11316a3c400180fa3f9064a63023e2f13d6ae18fb6e60ac229ba11c8eb93901d4a6ca65aa32e9ff576b421ffbb6e75476149e93df4d2e SHA512 4f278cbe0bffd2107354aaa76ef7e725a8ea3fcf1688614203204b495be596405fcb0add790922ab09858d94798bc06076c9160f42ff20b855b8a31859c57bc4
 DIST boto3-1.24.22.gh.tar.gz 513301 BLAKE2B 1b71d128cc8f8224fd1ef521988e6b5e941562c256c2769941340f6a9e3342394f9e2cf20d658bc4b0e9f5ddaebc832ae8fdc96e35e348b73631ca01f0be33a6 SHA512 eb64a050c1b63da823fad2b10db828fefbf75a95ae1f222576eabb8efa80cbbb3e54862dfd40813a8d58f9c329f4d95595bbebc172bcf0141c241499af7d4726
 DIST boto3-1.24.23.gh.tar.gz 514077 BLAKE2B ff5b661d477e8163e83cb85045b61fa8057f9cab0b93b2d4575904b17361801e3ffc928ee86624bdf61213a0dc93be91f101e30f418869a1c5dd65e16ff9ed2a SHA512 c127f11e7cd42d0c7f2b802de425d087722ae81fc642fd6867d44cf1b1686ca94b3de76b3034abbd9b85393f8f59d18ea46cd68a57804e658d65e9fba6e6f9a6
+DIST boto3-1.24.24.gh.tar.gz 514350 BLAKE2B 6ddb182ef3fa9018d763747bcc3508bbb37a40576ac80f4fbbd25efaa2a96de411a76a2cfafdea7664926c07f7733245b2a6703d8c2d341e43450e7d7eaa4894 SHA512 2465c33529900a7d67f8cc994a0665879d940967279d33be167dcf2eed078575ddea099a40978b291c7a941e8276f3938bd52a002634e73fe64272d8843e47d2
diff --git a/dev-python/boto3/boto3-1.24.24.ebuild b/dev-python/boto3/boto3-1.24.24.ebuild
new file mode 100644
index 000000000000..e4a98e2e28f5
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.24.ebuild
@@ -0,0 +1,68 @@
+# 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} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0cbe815897be..901170c8f5e9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.27.20.tar.gz 9146126 BLAKE2B 3ec9e6480fb5bc95f72ffa1f0972b7d9e80
 DIST botocore-1.27.21.tar.gz 9149425 BLAKE2B fa7141f78128ebc4810bf51bcca93a23606ef611721fd1a32ca490a9e38aef86439385bd7a0465e82a853c5bb7596dffb0b17fc5d7015fb5039f4933ab1554f1 SHA512 59bdf83b237e3845f48685919a6330846d2a4d7ce12d15d99cdb8dd9f2d3e0dcc0d1641c52de8d6d9ef7b7202b80bc59070cb1786f1b38c20884e0fa32481432
 DIST botocore-1.27.22.tar.gz 9151155 BLAKE2B e3aa6e9814e07bca2bd67d16f6548303af71654021b28f13c43b4005ba24a32cfccffa9a145babb781a6cbff9df3eab7de4c18973c00b3861ba83264eb144537 SHA512 57e43577840c62556760ff40d820898b0ee1efeb5da39fbdfe8c7ef53e86c8184bdfed5a52eeb9d0652fa053900462bdad9820b4a34bd4b5231f361b89c710d6
 DIST botocore-1.27.23.tar.gz 9161058 BLAKE2B c4e70d4662b45b1365eb3db3f9aa39ef989bb95d962c4b31fecf16b2bc5b14db46cb5aedc7abe23e2fd6484544efa2a894141c1245c842d9c05a89cb560ad0a2 SHA512 80c70c50d5a8fa5f9bdfa5cf0762edd83c8503bf1a65db1b8680e0d9ed8356699ee23ed4db0ab60e34b69cdc5ddc12ff69f2cf3907cf8f8d5075d26a3ba4373f
+DIST botocore-1.27.24.tar.gz 9164664 BLAKE2B 3a1453e01dec7b526ac613f5a0b98151e8cc60d524e0dc11d1b1ab82ebd16bdd134190618a4469d44a14a18fe26027a51f04b351e35399ba8f1d81f82ab9a780 SHA512 5778d031e11cf3e441b844c530c0685c1a4fdb5a55f8a45b77c62028cb49852eea4f1dab09af2016a5cfcbab7dcf83cee3143f517034b03d1379be2b85e64585
diff --git a/dev-python/botocore/botocore-1.27.24.ebuild b/dev-python/botocore/botocore-1.27.24.ebuild
new file mode 100644
index 000000000000..1f52e2694e84
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.24.ebuild
@@ -0,0 +1,66 @@
+# 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} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
index e8aeb77448d9..10af43987dc5 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
-		>=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
 
 		dev-python/protobuf-python[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
index b92130213841..e168e83ad52b 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/pytest-timeout[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
-		>=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
 
 		dev-python/protobuf-python[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 6b6b2f7893f3..deeba64d3ae8 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,4 +1 @@
-DIST cython-0.29.28.gh.tar.gz 2101301 BLAKE2B 980c04545e935deb4b4b1653f167dcbc94b8e2b24bc8897b5cc996dfca977645f7475c32aa973251ffcbbb31e725e27693af61ceaf66f2332c9525b02653dc76 SHA512 52490d0b5355e13cbe586830f763173d7556cf3d79d79192ca75138b1190e7a4c1f3feeb0568349802ef3b97300c3805f54eef5ffd73a5180d68f023ac2a44cd
-DIST cython-0.29.29.gh.tar.gz 2105839 BLAKE2B ab7879ce70733cfd77b7aa42a2de717bfc1b9bf933754bfecc6548ee1d097ce4102daaee98a1902d957b50f18400b5ba58d6517edfe43c9332c5bb3ec45f9665 SHA512 db14813f6191445cc3d497d3c7d76cc8b55fbe8e6857d800f5e05052fe4b05e9c2a2e597bdc1891254a62ecef203780c1c495e8d28e831072ddd46992bfe6df4
 DIST cython-0.29.30.gh.tar.gz 2105561 BLAKE2B c995bc710d2c397b8d6e4edee0f989e43969a51efb29b83643149d8c4110ae0331a35b9cc2ec7a45a43fea19ab8d63f1ef934f92d451c62d057e0e04ec79a871 SHA512 f6b07adfa1ebe9d52dfb72857ffd40b35d8777914299de101c7b96ee2d64cdd85ac0374ed41b382881b1f3ce535a9af9419dfabee9a4781a3f818125292627d4
-DIST cython-74073417c4f7e616af0a139a55f790f1ec7fe728.gh.tar.gz 2106765 BLAKE2B c2686a1d49fd1b522dcdf89f16c52fbb34595aed72e5626c8d3697ecc9318751d108999db443cfefe08334155ab59d230fcbd8e74715e185a161399abad6ae35 SHA512 2454a364fdd33f0090ba052a0bfa0ffb464ef750253a91c20a63c4db0b513f743870e7b9fafd844b0bf1a6b66b9b639f830d3a8c2f64abac6e197e2ff2279a59
diff --git a/dev-python/cython/cython-0.29.28.ebuild b/dev-python/cython/cython-0.29.28.ebuild
deleted file mode 100644
index 4e13d67a52d8..000000000000
--- a/dev-python/cython/cython-0.29.28.ebuild
+++ /dev/null
@@ -1,85 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="
-	https://cython.org/
-	https://github.com/cython/cython/
-	https://pypi.org/project/Cython/
-"
-SRC_URI="
-	https://github.com/cython/cython/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.28_p20220503.ebuild b/dev-python/cython/cython-0.29.28_p20220503.ebuild
deleted file mode 100644
index e5edd79abc37..000000000000
--- a/dev-python/cython/cython-0.29.28_p20220503.ebuild
+++ /dev/null
@@ -1,94 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-EGIT_COMMIT="74073417c4f7e616af0a139a55f790f1ec7fe728"
-MY_P=${PN}-${EGIT_COMMIT}
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="
-	https://cython.org/
-	https://github.com/cython/cython/
-	https://pypi.org/project/Cython/
-"
-SRC_URI="
-	https://github.com/cython/cython/archive/${EGIT_COMMIT}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	if [[ ${EPYTHON} == python3.11 ]]; then
-		einfo "Skipping tests on ${EPYTHON} (xfail)"
-		return
-	fi
-
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.29.ebuild b/dev-python/cython/cython-0.29.29.ebuild
deleted file mode 100644
index 4a76e6166a38..000000000000
--- a/dev-python/cython/cython-0.29.29.ebuild
+++ /dev/null
@@ -1,90 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="
-	https://cython.org/
-	https://github.com/cython/cython/
-	https://pypi.org/project/Cython/
-"
-SRC_URI="
-	https://github.com/cython/cython/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{8..10})
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
-	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	if has "${EPYTHON}" pypy3 python3.11; then
-		einfo "Skipping tests on ${EPYTHON} (xfail)"
-		return
-	fi
-
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/preggy/Manifest b/dev-python/preggy/Manifest
deleted file mode 100644
index b11b7e1cf619..000000000000
--- a/dev-python/preggy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST preggy-1.4.4.tar.gz 23351 BLAKE2B ed656f848349c0cdb0f44151ded15db1b68b7358a4633417a6889b4be9397dc0de96dbd5f43bb26f748d9cd4f16532f1954f3978690afa9e792ce24fbe942b20 SHA512 6eb6073eb28ba8684f2795c1d9aa93c2a24e50063359a769f7f7d84da2928e25a0ca86d4ac268dce0c2462bbe1a73e76f496325b6175a1218025e15fb7ce4f4c
diff --git a/dev-python/preggy/preggy-1.4.4.ebuild b/dev-python/preggy/preggy-1.4.4.ebuild
deleted file mode 100644
index b0b3418138c9..000000000000
--- a/dev-python/preggy/preggy-1.4.4.ebuild
+++ /dev/null
@@ -1,32 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="preggy is an assertion library for Python. What were you expecting?"
-HOMEPAGE="
-	https://github.com/heynemann/preggy
-	https://pypi.org/project/preggy/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-python/yanc[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/pyVows/Manifest b/dev-python/pyVows/Manifest
deleted file mode 100644
index 360102189ad7..000000000000
--- a/dev-python/pyVows/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyVows-3.0.0-5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7.tar.gz 41052 BLAKE2B 98a373d4a98cf5416d173fd9c1889a82480a476ad7ccce0895a9a626068f7a3831ce131433ab9f38726c41cd92cb47426bd8ef1d5a4fb9aab7efd9ee7c06face SHA512 bfef76cce283a77cfb1fd4f3e4d9e73da648390f42ce79524151be44693d9c13864aa75411394a2e294eea93820118f08a160a291146fab4f7d23ef5e14de071
diff --git a/dev-python/pyVows/metadata.xml b/dev-python/pyVows/metadata.xml
deleted file mode 100644
index 89883e0bef32..000000000000
--- a/dev-python/pyVows/metadata.xml
+++ /dev/null
@@ -1,10 +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>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pyVows/pyVows-3.0.0.ebuild b/dev-python/pyVows/pyVows-3.0.0.ebuild
deleted file mode 100644
index 6d4926e07f13..000000000000
--- a/dev-python/pyVows/pyVows-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parallel running of tests, code coverage reports, test profiling, and more"
-HOMEPAGE="
-	https://github.com/heynemann/pyvows
-	https://pypi.org/project/pyVows/
-"
-SRC_URI="https://github.com/heynemann/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz" # only for 3.0.0
-S="${WORKDIR}/${PN,,}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
-	>=dev-python/preggy-1.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
index 2fb52408b362..725b7723c62f 100644
--- a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
+++ b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Python package providing assets from https://github.com/Kozea/pygal.js"
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest
new file mode 100644
index 000000000000..b0d2cad0006b
--- /dev/null
+++ b/dev-python/pygccxml/Manifest
@@ -0,0 +1 @@
+DIST pygccxml-2.2.1.tar.gz 3170283 BLAKE2B b53123c59d098f56d97841225d10ffd4156b993244e48c4ad30e2f62b6d95d69e0ae4bbfc86bb492e88e8f52d916401f29a6ec7024277d1e32b3af691a12e919 SHA512 32013617d4d632617b616d3787631c5b09da441a87bb15b88e3b287f17b85e1388308e85dd385276966ac09114536a5863edd5fbb96539547783fd2d41c6e8ce
diff --git a/dev-python/preggy/metadata.xml b/dev-python/pygccxml/metadata.xml
index 89883e0bef32..c11af44d3757 100644
--- a/dev-python/preggy/metadata.xml
+++ b/dev-python/pygccxml/metadata.xml
@@ -2,9 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
+  <email>tomjbe@gentoo.org</email>
+  <name>Thomas Beierlein</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>radio@gentoo.org</email>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pygccxml/pygccxml-2.2.1.ebuild b/dev-python/pygccxml/pygccxml-2.2.1.ebuild
new file mode 100644
index 000000000000..99afa83b6d21
--- /dev/null
+++ b/dev-python/pygccxml/pygccxml-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A specialized XML reader to navigate C++ declarations"
+HOMEPAGE="https://github.com/CastXML/pygccxml"
+SRC_URI="https://github.com/CastXML/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/castxml
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/pymp4/Manifest b/dev-python/pymp4/Manifest
deleted file mode 100644
index 883fdc25e9f1..000000000000
--- a/dev-python/pymp4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pymp4-1.2.0.tar.gz 13969 BLAKE2B ccbf3664a410162662117307add90bc7c8ab060e633c8acf0cf96607d0ad193618af28eba48a467f380af1e39a4ce3596f0da2a341c94e764c8ef9582dd47cb6 SHA512 307b0d454f56eb185abea1213640e888880c505388e3869cc92be462b2d37dd9244e4b23984c535f84791ed067873e1454e7d89b8109763d44b6d3188658aff4
diff --git a/dev-python/pymp4/metadata.xml b/dev-python/pymp4/metadata.xml
deleted file mode 100644
index 6c3a1d1c3623..000000000000
--- a/dev-python/pymp4/metadata.xml
+++ /dev/null
@@ -1,12 +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>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/beardypig/pymp4/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pymp4/pymp4-1.2.0.ebuild b/dev-python/pymp4/pymp4-1.2.0.ebuild
deleted file mode 100644
index 5cbb35cdf41d..000000000000
--- a/dev-python/pymp4/pymp4-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python MP4 Parser and toolkit"
-HOMEPAGE="
-	https://github.com/beardypig/pymp4
-	https://pypi.org/project/pymp4/
-"
-SRC_URI="https://github.com/beardypig/pymp4/archive/${PV}.tar.gz  -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/construct[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject-metadata/Manifest b/dev-python/pyproject-metadata/Manifest
index 4d0da2768631..987f905de4c9 100644
--- a/dev-python/pyproject-metadata/Manifest
+++ b/dev-python/pyproject-metadata/Manifest
@@ -1 +1,2 @@
 DIST pyproject-metadata-0.5.0.gh.tar.gz 13816 BLAKE2B 8f5613c1279539116e99b6f319b687a08160360109e1ed71d5bc6c0434ee316ef7c0b7109d6769a03452a41c1b258765c849fe416b4632b4ba25990b6b3702aa SHA512 66cd447a01d0d01ab37611415bd620517600af667d7179a2696f763ae031c013393c8145ebd33f27b43629659333effa58596a02dfc5c217935c90475250b822
+DIST pyproject-metadata-0.6.1.gh.tar.gz 14047 BLAKE2B d97be3532450541f4f464eca8d3e241259463bbd9d8277df380e3bf38908b9fd4e279d4ec88051e974a51091da9afef0691c7d723213e244c9fb5a6b6fa1e7ac SHA512 4af84f9534a5c71e192e1355e1e99f99e82b97d01411c011ed2f1dff579a7420a0f5d982eea5a032de8549c14191b64334c8e2aeea22fe767837e662e8d8b588
diff --git a/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
new file mode 100644
index 000000000000..87f001d9b970
--- /dev/null
+++ b/dev-python/pyproject-metadata/pyproject-metadata-0.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="PEP 621 metadata parsing"
+HOMEPAGE="
+	https://github.com/FFY00/python-pyproject-metadata/
+	https://pypi.org/project/pyproject-metadata/
+"
+SRC_URI="
+	https://github.com//FFY00/python-pyproject-metadata/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/python-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
index 9ceb2ca9f618..f7def3895c84 100644
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -32,6 +32,11 @@ BDEPEND="
 	)
 "
 
+EPYTEST_DESELECT=(
+	"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results.py]"
+	"pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results_indirect_and_noparam.py]"
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index a5df42638dca..295486cd5e19 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1 +1,2 @@
 DIST python-ldap-3.4.0_p20220420.tar.gz 377780 BLAKE2B 433178138587dc09bfe1e6a8e894c001baf6e07c76266ca9d7c56b279f9e9ca5a642528a5869a837a9ee5576a2cf17afdeea313b4a8bc930926397738d6a5daf SHA512 0dfe8ff4737a630a08c7cd4d94f30c78fd1e0558ffc0609439d95ef064b72aef9d4ec4cdc0d40aaf1fc46396bdc0cbbdf0bf3cf6bb5e94bf8a9e3083b9ba1bf4
+DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
diff --git a/dev-python/python-ldap/python-ldap-3.4.2.ebuild b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
new file mode 100644
index 000000000000..18bc5a0256ac
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.4.2.ebuild
@@ -0,0 +1,79 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="
+	https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap/
+"
+SRC_URI="
+	https://github.com/python-ldap/python-ldap/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris"
+IUSE="examples sasl ssl"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	net-nds/openldap:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+DEPEND="
+	net-nds/openldap:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local EPYTEST_IGNORE=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	epytest
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python_jwt/Manifest b/dev-python/python_jwt/Manifest
deleted file mode 100644
index e621bf7602ab..000000000000
--- a/dev-python/python_jwt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python_jwt-3d9747df616d209c07bffe2bcf28b42e92a7d8d4.tar.gz 239032 BLAKE2B 2221d0445898ff1fa7737369e6488cf87287b359751113df61f4677bc9a31d3c90790c77bbaa4df08789019bca93c432dca96245ff28fa931557c046bc705f83 SHA512 43896e20bb2104d43b800f86342035d9eea3a0c70175c47d7875fa9b926dbb7c0f2840a68f25bdae5689df1f80198f74a7738c6a5a19d30748d53c1ebac39cf5
diff --git a/dev-python/python_jwt/metadata.xml b/dev-python/python_jwt/metadata.xml
deleted file mode 100644
index bb8719f3b8a4..000000000000
--- a/dev-python/python_jwt/metadata.xml
+++ /dev/null
@@ -1,20 +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>
- </maintainer>
- <longdescription lang="en">
-Module for generating and verifying JSON Web Tokens.
-
-    Note: From version 2.0.1 the namespace has changed from jwt to python_jwt, in order to avoid conflict with PyJWT.
-    Note: Versions 1.0.0 and later fix a vulnerability in JSON Web Token verification so please upgrade if you're using this functionality. The API has changed so you will need to update your application. verify_jwt now requires you to specify which signature algorithms are allowed.
-    Uses jwcrypto to do the heavy lifting.
-    Supports RS256, RS384, RS512, PS256, PS384, PS512, HS256, HS384, HS512, ES256, ES384, ES512, ES256K, EdDSA and none signature algorithms.
-    Unit tests, including tests for interoperability with jose.
-    Supports Python 2,7 and 3.6+. Note: generate_jwt returns the token as a Unicode string, even on Python 2.7.
-  </longdescription>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/python_jwt/python_jwt-3.3.2.ebuild b/dev-python/python_jwt/python_jwt-3.3.2.ebuild
deleted file mode 100644
index e10dddca6834..000000000000
--- a/dev-python/python_jwt/python_jwt-3.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="3d9747df616d209c07bffe2bcf28b42e92a7d8d4"
-MYPN="${PN/_/-}"
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for generating and verifying JSON Web Tokens"
-HOMEPAGE="
-	https://github.com/davedoesdev/python-jwt
-	https://pypi.org/project/python-jwt/
-"
-SRC_URI="https://github.com/davedoesdev/${MYPN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
-S="${WORKDIR}/${MYPN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/jwcrypto-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		>=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-		>=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
-		>=dev-python/pyVows-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${EPYTHON}" test/run/run_pyvows.py -v test || die
-}
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index ca3ac0622fee..ae64c7f98057 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1 +1 @@
-DIST sortedcollections-2.1.0.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6
+DIST sortedcollections-2.1.0.gh.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6
diff --git a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
index 2f7df1a78e3c..f2a6f6b390d8 100644
--- a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Apache2 licensed Python sorted collections library"
@@ -11,8 +12,8 @@ HOMEPAGE="
 	https://pypi.org/project/sortedcollections/
 	https://github.com/grantjenks/python-sortedcollections
 "
-SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${PN}-${PV}"
+SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/sse-starlette/Manifest b/dev-python/sse-starlette/Manifest
index 6eb33aa2f65b..5c307c5b6f01 100644
--- a/dev-python/sse-starlette/Manifest
+++ b/dev-python/sse-starlette/Manifest
@@ -1 +1,2 @@
+DIST sse-starlette-0.10.3.tar.gz 513991 BLAKE2B 2d3531e1cb5142e3b6b3c843522b9c2b54a416af18a84c2bbcfdf7761b12405dd8660b53ca807cfdd6c3606d1cded762993922fcc84d15092191e6685dd346d5 SHA512 fe1643ac1624be4ef727108465396dfc5c1e298b8a99918dbad4f1e4f766e35a33f900a63fb31e0c45849a2fdc5e3b3fae9e749413f2431ec554db3db128357a
 DIST sse-starlette-0.9.0.tar.gz 511176 BLAKE2B 0ff4cffb60c585af99d70c8fa710b342323b03e1fb9a52af63d5c43b41f49fa2ef71a78355d6677d8e89ab3ecc80ce75cc0a10a4cc48c728b82deec2acab027a SHA512 bca27f1bca8ac864af24dc03f3f49765d8249940583036830ccc805289a7b87f8dcf1c159af308c4e94b85641d8af50c6236be55eaa802bca9d02c7d5cead50d
diff --git a/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild b/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild
new file mode 100644
index 000000000000..b9291e3c790f
--- /dev/null
+++ b/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Server Sent Events for Starlette"
+HOMEPAGE="
+	https://pypi.org/project/sse-starlette/
+	https://github.com/sysid/sse-starlette
+"
+SRC_URI="https://github.com/sysid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/starlette[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tomlkit/Manifest b/dev-python/tomlkit/Manifest
index cd8bfc3e071a..7ab043edb78f 100644
--- a/dev-python/tomlkit/Manifest
+++ b/dev-python/tomlkit/Manifest
@@ -1 +1,2 @@
 DIST tomlkit-0.11.0.tar.gz 185695 BLAKE2B cd2a22afb8ea445e39567cdc65f636d8d9f2aef07575a2dd989c19abf1a6f7baf2e9adb78003576af9cdefebe4e8c6031efdabcc9487e10770565589a67b0c86 SHA512 2e89748140cfdae217ac3ac999f0b718414d28218d61fb5219adc503ede2ea1f4003be9ef4453f189b0ee86df463c59520244b9fd26553bd4d8047674cba61c9
+DIST tomlkit-0.11.1.tar.gz 186422 BLAKE2B 805cf22577a2eb32f4c0183d517886706c23cb925b66a4620d11c4b7f8c6b4314f83403b01d5139695e70e3cb83125923db9e93d651d9bec598fe5fe6ea08038 SHA512 04e8c05ce6ce41a7040fdd02274bebc7ad363f54da9525af06ce39e842d4e7548395dca90a3d1f60956d29d051108719847bebfe6a9db0842a19f400e75481ac
diff --git a/dev-python/tomlkit/tomlkit-0.11.1.ebuild b/dev-python/tomlkit/tomlkit-0.11.1.ebuild
new file mode 100644
index 000000000000..e19b1e708542
--- /dev/null
+++ b/dev-python/tomlkit/tomlkit-0.11.1.ebuild
@@ -0,0 +1,37 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Style preserving TOML library"
+HOMEPAGE="
+	https://github.com/sdispater/tomlkit/
+	https://pypi.org/project/tomlkit/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	# use setup.py to avoid circular dep with poetry-core
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["setuptools"]
+		build-backend = "setuptools.build_meta"
+	EOF
+}
diff --git a/dev-python/trivup/Manifest b/dev-python/trivup/Manifest
deleted file mode 100644
index 7a8ed75c5f8c..000000000000
--- a/dev-python/trivup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST trivup-0.10.0.gh.tar.gz 194500 BLAKE2B 46e9f50e1602f270aab5720d205a3d16882a5c7fcf342913083a9172b86f97346b8a7d33267d666734c476f2c7ef7d2618a3fa234fbf1cd559ae614766e1c425 SHA512 8598280e3a38dee85c46d52e688dc2e146bc5ffcede678326af661ac9fd09f7719d6b892a7d264b94d147e0b02f117eca8472898d479bdc4a64b521c2807262a
diff --git a/dev-python/trivup/metadata.xml b/dev-python/trivup/metadata.xml
deleted file mode 100644
index 9fd7a2ce6ea2..000000000000
--- a/dev-python/trivup/metadata.xml
+++ /dev/null
@@ -1,26 +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>
- </maintainer>
- <longdescription lang="en">
-trivup is a flexible, pluggable, light-weight, partly naiivistic, framework for trivially bringing up a cluster of applications.
-
-The initial use-case is to bring up a simple Kafka cluster for easily testing librdkafka on different broker versions.
-
-Featured apps:
-
-    Apache Kafka cluster with optional KRaft (ZooKeeper-less) support
-    Apache ZooKeeper
-    Confluent's Schema-Registry
-    Kerberos 5 KDC for GSSAPI/Kerberos authentication
-    OAUTHBEARER OIDC JWK ticket server
-    SSL CA/public/private certificate generation
-
-SECURITY WARNING: trivup will run unprotected, wide-open, poorly-configured, server applications on your machine, providing an ingress vector for intrusion, theft and data-loss. DO NOT RUN ON PUBLIC NETWORKS.
-  </longdescription>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/trivup/trivup-0.10.0.ebuild b/dev-python/trivup/trivup-0.10.0.ebuild
deleted file mode 100644
index 87ea417d79d6..000000000000
--- a/dev-python/trivup/trivup-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Trivially Up a cluster of applications"
-HOMEPAGE="
-	https://github.com/edenhill/trivup
-	https://pypi.org/project/trivup/
-"
-SRC_URI="https://github.com/edenhill/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/jwcrypto[${PYTHON_USEDEP}]
-	dev-python/python_jwt[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" # tests try to download and install kafka
-
-distutils_enable_tests pytest
diff --git a/dev-python/xunitparser/xunitparser-1.3.4.ebuild b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
index 48d689a191c4..6e387b74944a 100644
--- a/dev-python/xunitparser/xunitparser-1.3.4.ebuild
+++ b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Read JUnit/XUnit XML files and map them to Python objects"
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/yanc/Manifest b/dev-python/yanc/Manifest
deleted file mode 100644
index 59ffcd368818..000000000000
--- a/dev-python/yanc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yanc-0.3.3.tar.gz 16600 BLAKE2B 3a84943f59f60a153b7e76825c047f4a20779125f83a5b20c253cd24909d99e6aeb67bc870fd36b9f853edd7c9770b9e0b687dc868464c5a569242ae0140552a SHA512 8c19f6490b44aaa3745b9c0048e0a8fdd7081691815bede0399b1a2a313fa62697bfba526bb1bcb41078f4d1375208c494c89879a3111a8749ef70928ea2bf4a
diff --git a/dev-python/yanc/metadata.xml b/dev-python/yanc/metadata.xml
deleted file mode 100644
index 89883e0bef32..000000000000
--- a/dev-python/yanc/metadata.xml
+++ /dev/null
@@ -1,10 +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>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/yanc/yanc-0.3.3.ebuild b/dev-python/yanc/yanc-0.3.3.ebuild
deleted file mode 100644
index 881050610583..000000000000
--- a/dev-python/yanc/yanc-0.3.3.ebuild
+++ /dev/null
@@ -1,24 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another nose colorer"
-HOMEPAGE="
-	https://github.com/0compute/yanc
-	https://pypi.org/project/yanc/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests nose