Adding metadata

52 files changed, 719 insertions, 499 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 76fe27499f06..a1bd9b53ae89 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,3 +10,4 @@ DIST boto3-1.28.0.gh.tar.gz 672952 BLAKE2B f648cb49defe36b40138dfe3c125e15bc6480
 DIST boto3-1.28.1.gh.tar.gz 673678 BLAKE2B a4f92be4cb7256d37483796a71297bfc01c32c33fe50c54d32398d8227b466b1c6a4ef74c4a26a58a4abcccaeccd64a7faa0d85526d9dd2b33f0befdf48593c8 SHA512 5f7f2c3cc282046bb9660bfac7f176622ea239bc724c8c47c981f92b023598fca564db586d8733a46f3a6037ba85b0cc1f9a8b7b79797e6c3d46f0ce368861e2
 DIST boto3-1.28.2.gh.tar.gz 673872 BLAKE2B 9f8a3e299cb6df278756ddafee0956b99ac9db63ff8eb2ad7bf6810e3c4140f6512a7de9963e6a7ddb065affb171d92f1f05226cba7a1e4037464e530d7e536a SHA512 062b5c70079acd5a9b3a0e4f23d44fe9f05f27e621951484e557a852d797c25c590a0ed545c2772326cd0d255cdb56250db2a2544c938f75dccc81a5f6e1d678
 DIST boto3-1.28.3.gh.tar.gz 675019 BLAKE2B 93b29307fbfec4e61dc60d28e4f20392ae2a730f048a0b2e8cb99fd515a036fc4ca889ddd564e09b1f3eab4cb9499c5918b4e7430d63148dd2854d126719a468 SHA512 514d0f373f25bb691abf5f1f8b0209a07097191b2ad8fb6339739e7a0bd2b8e6d5a88f1250e928ca89b1f1aa5e27a44bf2cab38a57680c01214d370d11944ded
+DIST boto3-1.28.4.gh.tar.gz 675638 BLAKE2B e5d4cd28b61a79c54c28355003a097f7b40c5c4246c0f755886053214a50fb118c23999e86ae6afe4effdacd0c6ab6847c295d0420ab69986e84a5167278dc41 SHA512 44e89c1455c51032dae1c6745654edea2e44adf9874d726f35ed9edd1de7bc9a571d3fcfa2477b2178b7b028c33e9044745be0d66239eaeee9065cbce112aa54
diff --git a/dev-python/boto3/boto3-1.28.4.ebuild b/dev-python/boto3/boto3-1.28.4.ebuild
new file mode 100644
index 000000000000..03c610b184f7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.28.4.ebuild
@@ -0,0 +1,66 @@
+# 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 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_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 e330ef550c4d..b1aac583ad4f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,3 +10,4 @@ DIST botocore-1.31.0.gh.tar.gz 11756795 BLAKE2B 8a9299570aa5da4d9195e52bb2b3772f
 DIST botocore-1.31.1.gh.tar.gz 11766144 BLAKE2B b55fc719e47e38523b8c674fd709697a42ee661354deec8c3d1a9c16c536b640775794c310a1274354ef5d3d494bbb42cd01f82c05a2e7244415e474a19e3146 SHA512 a02a888453c7fff24f8e33d201d2b7fa745b60c3a7a327ffeb213f963ded10848e8fbfe3de0bd6e3926c23fed10a72cc1ef4ee54f6d3ece0752ae84a22cb061e
 DIST botocore-1.31.2.gh.tar.gz 11766251 BLAKE2B aac8fef9001e5e1d1820492bf5dac95504b3a296fab619796009402238a2f168b3637f514e009bbf5f5808e000eb87c28afb0d492aa6fafa8854fce727b636af SHA512 809eacaff010b6b122f8cac411dd0b146161b8b7a8afb11c3ea92b2313816f43f55f9df88f3d71a7dbdaca39eb35df80821612c0434cc81d7548eeb1ed91a401
 DIST botocore-1.31.3.gh.tar.gz 11769948 BLAKE2B 452c494faa430b6782685b9960cc9ea15ce3dedfe1b5343ee7bdbd7544e108bbfc7bb58d527419b5dc5f4077dd806752eec927196b82ac286903992fef339e52 SHA512 0f2853c14d7695ea4eeacea6fed93e77436df143bd0b9bec967490eb88e3d6531c916dca91c1a3bde4b57253d77acabe2413acde4d1473d01e15ef69b45621e0
+DIST botocore-1.31.4.gh.tar.gz 11774619 BLAKE2B aa6abcb1ecc71d22d426b734574b445aa92d646cc8ce489257582b45ee02a86c96b8f348f3cb413dfb58b75035b27893b22d677e3cfecb78be07e2196b6c1fbe SHA512 920cf3efc70fd281ea244c71ffe6f2c1628f5511e5f367d64e26f9f2ac89cb97dd41c4cbf62861df1e71a8f23dcdf8b090fd9281cd48a67f9b73c150d64eb645
diff --git a/dev-python/botocore/botocore-1.31.4.ebuild b/dev-python/botocore/botocore-1.31.4.ebuild
new file mode 100644
index 000000000000..509d06dedf97
--- /dev/null
+++ b/dev-python/botocore/botocore-1.31.4.ebuild
@@ -0,0 +1,79 @@
+# 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 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="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.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_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
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+		# urllib3-2 compatibility, mock relies on implementation details
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_no_response_from_server
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_returned
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_continue_sends_307
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_expect_100_sends_connection_header
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_handles_expect_100_with_different_reason_phrase
+		tests/unit/test_awsrequest.py::TestAWSHTTPConnection::test_state_reset_on_connection_close
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/distlib/Manifest b/dev-python/distlib/Manifest
index 8b5f107343c5..49c37a1cf363 100644
--- a/dev-python/distlib/Manifest
+++ b/dev-python/distlib/Manifest
@@ -1 +1,2 @@
 DIST distlib-0.3.6.gh.tar.gz 1234082 BLAKE2B 384b736d9fb9e63d1b9a9375caf972ddfccb36c99903928505e684fe09b30190f873cf7b109beb6c32a1e4b1e11a1d9947adea74f9dceef3398fcc1963a2044a SHA512 39948539764ff5d45f14dc602ebd47d523b71b587ee081d7a267669aef4e4b1013d3995cb992038136bc4c01826ea633c6e4ffd050f1511705b296bf76f3bbf9
+DIST distlib-0.3.7.gh.tar.gz 1240451 BLAKE2B 2050133ae1f57a2b37013e0e49a22903a816377d111e6a35c57084e2dd7877b41e9625e3cccbc9e67c35239814b835b064f94eec8bcd41dedd7d329f9d5be2ec SHA512 33806fd953c4b185eaa69c7d0f0cdad9ea71be73d26f0585cefd4a332edbcc3c6287b3bce024858d5d15626311f2567474b19b6366f80b2336d9b39691c6fe31
diff --git a/dev-python/distlib/distlib-0.3.7.ebuild b/dev-python/distlib/distlib-0.3.7.ebuild
new file mode 100644
index 000000000000..3e6869e29bdd
--- /dev/null
+++ b/dev-python/distlib/distlib-0.3.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level components of distutils2/packaging"
+HOMEPAGE="
+	https://pypi.org/project/distlib/
+	https://github.com/pypa/distlib
+"
+SRC_URI="
+	https://github.com/pypa/distlib/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pypiserver is called as external executable
+BDEPEND="
+	test? (
+		dev-python/pypiserver
+	)
+"
+
+src_prepare() {
+	local PATCHES=(
+		# use system pypiserver instead of bundled one
+		"${FILESDIR}"/distlib-0.3.2-system-pypiserver.py
+		# fix pypy3
+		# https://github.com/pypa/distlib/issues/204
+		"${FILESDIR}"/${P}-pypy3.patch
+	)
+
+	# make sure they're not used
+	rm tests/pypi-server-standalone.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x SKIP_ONLINE=1
+	local -x PYTHONHASHSEED=0
+
+	# disable system-site-packages -- distlib has no deps, and is very
+	# fragile to packages actually installed on the system
+	sed -i -e '/system-site-packages/s:true:false:' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/bin/pyvenv.cfg" || die
+
+	"${EPYTHON}" tests/test_all.py -v -x ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/distlib/files/distlib-0.3.7-pypy3.patch b/dev-python/distlib/files/distlib-0.3.7-pypy3.patch
new file mode 100644
index 000000000000..eeb1a924069e
--- /dev/null
+++ b/dev-python/distlib/files/distlib-0.3.7-pypy3.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_scripts.py b/tests/test_scripts.py
+index 9ec1d43..2fc18ae 100644
+--- a/tests/test_scripts.py
++++ b/tests/test_scripts.py
+@@ -112,7 +112,7 @@ class ScriptTestCase(DistlibTestCase):
+             bindir = os.path.join(dstdir, 'bin')
+             maker = ScriptMaker(self.maker.source_dir, bindir,
+                                 add_launchers=False)
+-            venv.create(dstdir)
++            venv.create(dstdir, symlinks=True)
+             maker.executable = os.path.join(bindir, 'python')
+             filenames = maker.make('script8.py')
+             p = subprocess.Popen(filenames[0], shell=True,
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index c9da05211d2f..78ac0d442f8c 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,8 +1,2 @@
-DIST griffe-0.29.0.gh.tar.gz 157523 BLAKE2B 2854d6e30898e7aec9b6481215311956bcd9b24eb4b7cb36c11515f36a90467cabfc2cf9320bf4dcb44f04d8dd855cde97a749f7b51529cbfe5bd5e8e4391d9c SHA512 3367e48ac9337d180621fa694babc61dec445cc86b1555a65d14547c95aabda637ef72d86d3a1eb16fc736923876cda6c2ba51fa346551e5e134b490557d1459
-DIST griffe-0.29.1.gh.tar.gz 159747 BLAKE2B b998c2014a883ddb5c845b620ceba7a6edcaf7fbd7178ad356961cd1f0866927008d7ac16c1a0f13e886812ae706b3d117f8cd8e26e5f46999da44d843f0cd43 SHA512 f8405b2ace1dac83e451fa344d395f8e1733362409853b7952cbe10321eb13b7524cb96ba899559a08ebdbc57f997b7ee38ba8951730b288e4f87127e87b100b
-DIST griffe-0.30.0.gh.tar.gz 165537 BLAKE2B aa6b54e6b15dfc48c1caaa7b440fdaf486cd9e838a047248140e32f4a8ae1ba05aed36643f1c2681abe58e0858789df8228eb346bede5909d9016e0d2f9fd9be SHA512 0741ad533243628a08c25e9b9ce91a463653851429bc469f635d740ad3974e1545c3e70e3ce6213b684bd9bfdd283fcaf3721255df0de83b79193ac25617e175
-DIST griffe-0.30.1.gh.tar.gz 166243 BLAKE2B 7ae9820b63788d27b0078723a81443a45a52c59a1abc09ae283708e4bb3fab862878a63ac3c841568ac092b6d08b3c2b0fd6970e9dfe3b493347a6d58944b4c8 SHA512 7f96f3c899f39f32f220a810af30b4145c000dcf240e3a4e1345ff590e4f433770282caac3d94f4f99d950723eec9ae04d98d4326696e65e61e588460cb009c4
-DIST griffe-0.31.0.gh.tar.gz 165043 BLAKE2B 66db057df761f7ce6e68abbb48cbb793ffcafd437b4549c3e666c3fa1013f3d109367da437c755c487d52187a9b0618ded7dd099233f15827b8bb12b52027e77 SHA512 b644c9f9d7826fac52a9a2c84f67de61a597ad392854574c71ef548ef769625ff14003b40f8b5eff8ecd7dff9f3badadff2bc9805da238228c820d23b0625e80
-DIST griffe-0.32.0.gh.tar.gz 177568 BLAKE2B 6b9b7530d619676d3d1f7921b5133a966b1adcaaf2807f94288d80de885ae5badef248e801af16ca796052213c878ef802dbdab7dcbefcb2bdb558755f1a2884 SHA512 b70b1b3f24a1f29cb49b6ecf23dd70cf836c371965108e5e3f1db043913a51b258bd839f9c6c90682e29c092b2ec09f364f416c480cf84651022472e62224b14
-DIST griffe-0.32.1.gh.tar.gz 176567 BLAKE2B 20c044e7dd0b92db0b9b92c3dfb4e623438106cf17da210302c66f3adf43a16d6d88039dea6db193cda59897d08646d4059c837f228ca3aec04309a94325e182 SHA512 8385d1f035e1a884f8cbc7c167931c7ecdb74b44da50cc6a1e8b7398921aab3bfd2fb230f37df5aa18598d04b62185155bca49f85cee0f9c07569ae929ff8883
 DIST griffe-0.32.2.gh.tar.gz 176746 BLAKE2B 1ca95c62e1e5e3507d292c5bd6e837b8c41acf21f50472c7ebcbc3839ad43008c747d6942da60cc4f5de84115f5f76ad919c3c26e776c25eaf818084033b31c2 SHA512 04132681e16d64cf912a395b090f4ae61f2cad54c9be15f1d1a020675f945646a0895f76a828126da994b4e7cdf83f02b519e87992fd43bb50e7f3492d870247
+DIST griffe-0.32.3.gh.tar.gz 176939 BLAKE2B 291878054cac7d2fd4daea922c0439dd839611af7c425e838414d01fab76b4799adeff5fe14ed078172a38180d49c93ea4238b3256f1668d4daa2c74f68007a8 SHA512 cf163c9f873eff04d5c932a197a4768c14813d8e4aa5e0c5223544f7eb8c34b0b5eb3838c669a034c71b25c909b2857d88ddf40431b5604f86613c6b3c871aa5
diff --git a/dev-python/griffe/griffe-0.29.0.ebuild b/dev-python/griffe/griffe-0.29.0.ebuild
deleted file mode 100644
index 4a4d325e3e72..000000000000
--- a/dev-python/griffe/griffe-0.29.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/griffe/griffe-0.29.1.ebuild b/dev-python/griffe/griffe-0.29.1.ebuild
deleted file mode 100644
index 4a4d325e3e72..000000000000
--- a/dev-python/griffe/griffe-0.29.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/griffe/griffe-0.30.1.ebuild b/dev-python/griffe/griffe-0.30.1.ebuild
deleted file mode 100644
index e171a586e519..000000000000
--- a/dev-python/griffe/griffe-0.30.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-0.31.0.ebuild b/dev-python/griffe/griffe-0.31.0.ebuild
deleted file mode 100644
index e171a586e519..000000000000
--- a/dev-python/griffe/griffe-0.31.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-0.32.0.ebuild b/dev-python/griffe/griffe-0.32.0.ebuild
deleted file mode 100644
index e171a586e519..000000000000
--- a/dev-python/griffe/griffe-0.32.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-0.32.1.ebuild b/dev-python/griffe/griffe-0.32.1.ebuild
deleted file mode 100644
index e171a586e519..000000000000
--- a/dev-python/griffe/griffe-0.32.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=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}
-
-EPYTEST_DESELECT=(
-	# fragile to installed packages
-	# (failed on PySide2 for me)
-	tests/test_stdlib.py::test_fuzzing_on_stdlib
-)
diff --git a/dev-python/griffe/griffe-0.30.0.ebuild b/dev-python/griffe/griffe-0.32.3.ebuild
index e171a586e519..e171a586e519 100644
--- a/dev-python/griffe/griffe-0.30.0.ebuild
+++ b/dev-python/griffe/griffe-0.32.3.ebuild
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 9378952f5e56..82194a759691 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1 +1,2 @@
 DIST lark-1.1.5.tar.gz 246737 BLAKE2B 2111bb6c2f6eaa05b803daf11f0f55641c9b3943a97f943fd27b5dd33f8b511e3b0fc4fb335edbb3926ad19da6cb2696b7f87003b7def068cae1d805b3feb8d9 SHA512 8103e050745c83c99b077667aa8b1d4dfad28f5554d2381534b3518d8d3e8adb70f0304fdc7e1c762d3ea26089181d9632dea155b6cd97237078b89330a6711e
+DIST lark-1.1.6.tar.gz 251270 BLAKE2B 2f2b81eef82ba2cb774e3aab448a092256a714e7118da08e1e25297c1573d0b833231e6b6158dc88fb19c80af370b1e72946dc929f6379408a9aea6c596f3605 SHA512 347ba7423f15fe38c97446991b4d2d0d6edd50bc656aa9a67c8b6d94b8cdbf2b006f3391c6c06fe000fc4b2657480e6a66a9580ebb0440eeef2b5a6a5418567b
diff --git a/dev-python/lark/lark-1.1.6.ebuild b/dev-python/lark/lark-1.1.6.ebuild
new file mode 100644
index 000000000000..53dcc9008482
--- /dev/null
+++ b/dev-python/lark/lark-1.1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="
+	https://github.com/lark-parser/lark/
+	https://pypi.org/project/lark/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/atomicwrites[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# require dev-python/js2py which is a really bad quality package
+		tests/test_nearley/test_nearley.py
+	)
+
+	if has "${EPYTHON}" pypy3 python3.{8,9}; then
+		EPYTEST_IGNORE+=(
+			# test using Python 3.10+ syntax
+			tests/test_pattern_matching.py
+		)
+	fi
+
+	epytest
+}
diff --git a/dev-python/mkdocs-swagger-ui-tag/Manifest b/dev-python/mkdocs-swagger-ui-tag/Manifest
deleted file mode 100644
index 3f0d485906f2..000000000000
--- a/dev-python/mkdocs-swagger-ui-tag/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mkdocs-swagger-ui-tag-0.6.0.gh.tar.gz 3832872 BLAKE2B 6a5ecc6f011dc32c10b4953888c031d63deb4a7ec2c11f588815b23409f67e4c2dabe48bb0edd9ee2f73b0d62d57d9d2f768ca73d7a5f90426c530e62528f9c8 SHA512 f66c1a3e551afaf38928cf89f8e6ed7c210c8b8b8323b7e9fd63e95389335f3f92abd5678b0c0394d94b8898a52a41a38083f20a2eac131853a82def8b2bf502
-DIST mkdocs-swagger-ui-tag-0.6.1.gh.tar.gz 3839214 BLAKE2B 0aeef41cb9729a76da84ac616586fbbbbd0d264698a0f3f4475350987ac984fc6c257aac3a062ca200eabc451b4a807c600ec4357ee092b1328c545020aaccc9 SHA512 97a435d130232202af1382428d1f7fdc8b6dff5cec3fac1b39ac40afeb25f22ec698761e2f26a04f690e45fa3c0506a5fa87b782c6a1637eebe3f98ed6a7e4a5
diff --git a/dev-python/mkdocs-swagger-ui-tag/metadata.xml b/dev-python/mkdocs-swagger-ui-tag/metadata.xml
deleted file mode 100644
index ddb5b0f1787e..000000000000
--- a/dev-python/mkdocs-swagger-ui-tag/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>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.0.ebuild b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.0.ebuild
deleted file mode 100644
index e4e8b68d826f..000000000000
--- a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-
-DESCRIPTION="MkDocs Swagger UI Tag"
-HOMEPAGE="
-	https://blueswen.github.io/mkdocs-swagger-ui-tag/
-	https://pypi.org/project/mkdocs-swagger-ui-tag/
-	https://github.com/Blueswen/mkdocs-swagger-ui-tag
-"
-SRC_URI="https://github.com/Blueswen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-HTML_DOCS=( docs/. )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm docs/sitemap.xml.gz || die
-}
diff --git a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild b/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild
deleted file mode 100644
index e4e8b68d826f..000000000000
--- a/dev-python/mkdocs-swagger-ui-tag/mkdocs-swagger-ui-tag-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-
-DESCRIPTION="MkDocs Swagger UI Tag"
-HOMEPAGE="
-	https://blueswen.github.io/mkdocs-swagger-ui-tag/
-	https://pypi.org/project/mkdocs-swagger-ui-tag/
-	https://github.com/Blueswen/mkdocs-swagger-ui-tag
-"
-SRC_URI="https://github.com/Blueswen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-HTML_DOCS=( docs/. )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	rm docs/sitemap.xml.gz || die
-}
diff --git a/dev-python/mss/mss-9.0.1.ebuild b/dev-python/mss/mss-9.0.1.ebuild
index e989a48908ba..17a30e111325 100644
--- a/dev-python/mss/mss-9.0.1.ebuild
+++ b/dev-python/mss/mss-9.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index 04badac044a3..89f466514e78 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,3 +1,4 @@
 DIST nbconvert-7.3.1.tar.gz 880064 BLAKE2B 0bde4a65f27a880fdbf694dc6501ad1d0f78bf72e6010377faf89d8b16d5b24f82fcba93c51d9421a88e5c554bc0fb6d002f913886bd2d2f1a7f17a834755d02 SHA512 24d8d0ff35cf09d095d01122386439cf0c40eb9af7c88604f3108e5831a270509e1302370dc40eabc8bcb28fb86603d9d7a4a104346122deb8471aab7471e62d
 DIST nbconvert-7.4.0.tar.gz 882064 BLAKE2B d7e7d7dca63d84dc1e189b4922e31777f29a3796c93a47c886afb9bb11bfdead29bfb209d1ebb17c82dfad91dcf145cee1ca4db9b780d676daabc28001bb87a7 SHA512 6421bde4c6b6bbbb54673a0bbe3e7902c825da8b0aab113ea285b9c2d2a59447616d6f3ce9ac15b4814a2776e03fab2ca6135d38aac694ef366b32cf3dd6d988
 DIST nbconvert-7.6.0.tar.gz 886726 BLAKE2B 9623b10adf08f06921c7b162018a747ef02e47a99c9663261247af2ee895ca66d310c42bcfb8717009b8fd9e8da4a088c5d8369f0ebe5a570a1439d3ea0db37e SHA512 70870b875c0045796004ada5ea3ec5402339392419919c11f2713f07cb0f35605f8902a1e965706c13b972fa4d7785d4941834bd9565e3b3c8afde2a9d2868c9
+DIST nbconvert-7.7.1.tar.gz 849365 BLAKE2B 48bc01b5778cf61638c527cb9858c4f78112397379902a4cb93535315893e9ab8a5d94558792b9f171658484f8032f3a93175d2971581267e5c234960d51caa6 SHA512 08e53fdf736ffcc5bcc95ef8ecd35600af2eea1e7bac820a469bfa29d60407874500838720494b32dc1821fa2a88ef95f369c1803a7d2eab3176d1aaa5ee87a8
diff --git a/dev-python/nbconvert/nbconvert-7.7.1.ebuild b/dev-python/nbconvert/nbconvert-7.7.1.ebuild
new file mode 100644
index 000000000000..c9ca03f0c834
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-7.7.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 multiprocessing pypi virtualx
+
+DESCRIPTION="Converting Jupyter Notebooks"
+HOMEPAGE="
+	https://nbconvert.readthedocs.io/
+	https://github.com/jupyter/nbconvert/
+	https://pypi.org/project/nbconvert/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib-metadata-3.6[${PYTHON_USEDEP}]
+	' 3.9)
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-4.7[${PYTHON_USEDEP}]
+	dev-python/jupyterlab-pygments[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0[${PYTHON_USEDEP}]
+	<dev-python/mistune-4[${PYTHON_USEDEP}]
+	>=dev-python/nbclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.7[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4.1[${PYTHON_USEDEP}]
+	dev-python/tinycss2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		>=dev-python/ipywidgets-7[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	mkdir -p share/templates/classic/static || die
+	# tries to refetch stuff even if it's already present
+	sed -e 's:css = .*:raise PermissionError("You shall not fetch!"):' \
+		-i hatch_build.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# Missing pyppeteer for now
+		# TODO: Doesn't skip?
+		nbconvert/exporters/tests/test_webpdf.py
+		# Needs pyppeteer too
+		'nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_webpdf_with_chromium'
+		# TODO
+		nbconvert/exporters/tests/test_qtpng.py::TestQtPNGExporter::test_export
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_convert_full_qualified_name
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_post_processor
+		# latex failing, might be too new pandoc
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_filename_spaces
+		nbconvert/tests/test_nbconvertapp.py::TestNbConvertApp::test_pdf
+		# too new pandoc but we don't have old anymore
+		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_minimal_version
+		nbconvert/utils/tests/test_pandoc.py::TestPandoc::test_pandoc_available
+		# crazy qtweb* stuff, perhaps permissions
+		nbconvert/exporters/tests/test_qtpdf.py::TestQtPDFExporter::test_export
+	)
+
+	# virtx implies nonfatal, make it explicit to avoid confusion
+	nonfatal epytest -n "$(makeopts_jobs)" --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version virtual/pandoc; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc or app-text/pandoc-bin."
+	fi
+}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 1c327cf38041..eef588c8e9bb 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1 +1,2 @@
 DIST pybind11-2.10.4.gh.tar.gz 740622 BLAKE2B 7b2d86e8262581b2cc6dd720b83336206e242ef8ca99b257b01a11141ed8b127d7f35d7d573bc763dd36f2fe8c8ac91766089deb63a76e9c10029c34eec2d6d3 SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7
+DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
diff --git a/dev-python/pybind11/pybind11-2.11.1.ebuild b/dev-python/pybind11/pybind11-2.11.1.ebuild
new file mode 100644
index 000000000000..59d3fe0a4d5a
--- /dev/null
+++ b/dev-python/pybind11/pybind11-2.11.1.ebuild
@@ -0,0 +1,68 @@
+# 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 cmake distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="
+	https://pybind11.readthedocs.io/en/stable/
+	https://github.com/pybind/pybind11/
+	https://pypi.org/project/pybind11/
+"
+SRC_URI="
+	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+
+RDEPEND="
+	dev-cpp/eigen:3
+"
+BDEPEND="
+	test? (
+		>=dev-cpp/catch-2.13.5
+		dev-libs/boost
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export PYBIND11_USE_CMAKE=1
+	cmake_src_prepare
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local mycmakeargs=(
+		# disable forced lto
+		-DPYBIND11_LTO_CXX_FLAGS=
+		-DPYBIND11_INSTALL=ON
+		-DPYBIND11_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Compilation only does anything for tests
+	use test && cmake_src_compile
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	cmake_build check
+}
+
+python_install() {
+	distutils-r1_python_install
+	cmake_src_install
+}
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 6b1504666f3c..2d286b086200 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1 +1 @@
-DIST pysaml2-7.1.2.gh.tar.gz 6017150 BLAKE2B e14bff119e5f6e477244820887ed76531acad5d7207cfc6ca398eaeaa0f5649e168bd6322d50e29560e8ad78e8da66d47b9d293ffcedee4358e288640931df96 SHA512 cf13ef0f74785bac357b2871f1ab521e60720cb236881fbc6c93d0eaca5323d198952392fa8a13850060a54757b1ff06a959e723bc7aeb5db9c8b2522b3c859b
+DIST pysaml2-7.4.2.gh.tar.gz 6059879 BLAKE2B 46e319b288f792c2bf352dfaca507b24a1d23e1f4e7d1cc85685cc82a38103d113a6ec6d5d31608a226873cc5dab774689625f0437146befc43a33cafe641e78 SHA512 4a125cf08e7eb4856aea87eb7cad0539b1e520d44cf7a6a6fcb52185ab2acf05efe773165614f9b633c85f46ca4b189ee6038aaa51fe8343d75ab3bf0e06d43e
diff --git a/dev-python/pysaml2/pysaml2-7.1.2-r1.ebuild b/dev-python/pysaml2/pysaml2-7.1.2-r1.ebuild
deleted file mode 100644
index cda64b999434..000000000000
--- a/dev-python/pysaml2/pysaml2-7.1.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="https://github.com/IdentityPython/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/xmlschema[${PYTHON_USEDEP}]
-	dev-python/xmlsec[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-3[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# No module named 'pymongo.mongo_replica_set_client' because pymongo should be <4 but we only have >=4
-	rm tests/test_{75_mongodb,76_metadata_in_mdb}.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pysaml2/pysaml2-7.4.2.ebuild b/dev-python/pysaml2/pysaml2-7.4.2.ebuild
new file mode 100644
index 000000000000..ec1f7a7cdeed
--- /dev/null
+++ b/dev-python/pysaml2/pysaml2-7.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of SAML Version 2 Standard"
+HOMEPAGE="
+	https://pypi.org/project/pysaml2/
+	https://github.com/rohe/pysaml2
+"
+SRC_URI="https://github.com/IdentityPython/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/xmlsec[openssl]
+	>=dev-python/cryptography-3.1[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/xmlschema-1.2.1[${PYTHON_USEDEP}]
+"
+# TODO: package 'repoze-who' for s2repoze tests
+BDEPEND="
+	test? (
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		<dev-python/pymongo-5[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+	dev-python/alabaster
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index a415685ef288..6c5246976908 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1 +1,2 @@
+DIST pyyaml-6.0.1.gh.tar.gz 120376 BLAKE2B c34f2169f6eb6aa718aeb53dbfaf02590e11e504d16cc85a802e1a1191f296ef9aa2501db683e1a48173ce6adeaeca09f2ab989581dcf1c1ba4004831bb4cf47 SHA512 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0
 DIST pyyaml-6.0.gh.tar.gz 119855 BLAKE2B 286678ac81f2e6c252d285d2f98dab98894787e3aa164a29a697986f56200c7b71b0a768edf6d50e61065efcd054078673270872162a4975409928d7dd67aacc SHA512 cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad
diff --git a/dev-python/pyyaml/pyyaml-6.0.1.ebuild b/dev-python/pyyaml/pyyaml-6.0.1.ebuild
new file mode 100644
index 000000000000..9de8bc8c5fbf
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-6.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="
+	https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml/
+"
+SRC_URI="
+	https://github.com/yaml/pyyaml/archive/${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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples"
+
+DEPEND="
+	dev-libs/libyaml:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	<dev-python/cython-3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
+
+src_configure() {
+	export PYYAML_FORCE_CYTHON=1
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/rpds-py/Manifest b/dev-python/rpds-py/Manifest
index 713489108e76..a7b0fa9ebeb4 100644
--- a/dev-python/rpds-py/Manifest
+++ b/dev-python/rpds-py/Manifest
@@ -4,13 +4,18 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST indoc-1.0.9.crate 13475 BLAKE2B a9696788574e56dd125c3371169fd59d6947d188f76e2669b21c0304692efd6709cd048920f7822e92c6a5620fb178e0e85c7776118cef8ccee0f58398e14abf SHA512 db8aef4a7bb606452dc8ed45aa29a255c7a135357a0bd586fb4429c5f56a1aa2ca9400d6fac39956aeb486a15d25cf5d1b9524967867f2c651d9d563e3e85be8
 DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c SHA512 47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
 DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
+DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST proc-macro2-1.0.51.crate 41804 BLAKE2B 579e5a157da81cd8350a6407603e5f8102bb9b6618ea8e81ced1692a6a6f4b57bec35aeb965b643f2542f65a3b9965fbbcf7e0ade35cf159270583d34665a628 SHA512 10ad77a5d05437c1b2c40a8f82389d081e64993171aa6259e8dca98d9afb04f5fb870f2037ad626a280d59c1a89fd4482bead701d744d6fb7c893bd9e78dfc1f
+DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
 DIST pyo3-0.18.1.crate 415128 BLAKE2B c77b956c4c96c4f0356abf5df14f89ef7fbd4d779169c2acccfc827a3a5d2d7980e5e8a467c1f6e73bb00a4500293995bc81014f110853c33b8e30d0698d0a21 SHA512 37e82b2b212de59335f8b5e4129dfc53872ceda156238f4aaee8cf358a8daf2d64cb716aa63d343c4f602fc61344b94bcd3cc8e02bee80256f5b49033a5c5825
 DIST pyo3-0.19.1.crate 418297 BLAKE2B 19ad6aa4fba175961b7fe97ae0bc45050f930859972b1b25cf0139bb3436c050ba76b63894f0df26174f141a52ac6abf10fd84c03c056af5a0665e723ae24195 SHA512 b27500cf49f1c6f217d21344d24ac96c07b82c157dd36fa4550b94059da5715ba7d0e085ec07dd5f8a8ac9de4d7e9239c1cceac4337294eb0dc9f6102049d5ff
 DIST pyo3-build-config-0.18.1.crate 29134 BLAKE2B 288519ea8b17bf81564ea7e91fa548ca5b966cb08939eccd80356935372aa7bbac1c9f1f8780b49010f4f66d1724d698a6197a740b232d62c75df341194c8ac5 SHA512 6277726d3f0faf70453f61f90c547db01ce5d50823ca9ba731d57309edbb33729bcfa3299415716cf6154ec2cb3a4c1e7eabc8ea18e400e746b37324bfca2ec9
@@ -22,24 +27,38 @@ DIST pyo3-macros-0.19.1.crate 7173 BLAKE2B b8d53ed51e2454abb77528c9e08315f288718
 DIST pyo3-macros-backend-0.18.1.crate 48618 BLAKE2B 8db09610fd6fc95d1979a4065f89611c507ff7e7f72d9cd64590f85f6d8543ee6d234e772c55db88e3624808ad135389f5ff0edfd2eca6ecf1a29ece332c1c2e SHA512 20aed4aa485d6ffc02b0d08aa4c5fc086e73482aedb5ebce155c3f973d0e058902ef806740d483368eb80caac4ccc163516eaf56a027910d71cedc5bc0ee665c
 DIST pyo3-macros-backend-0.19.1.crate 49916 BLAKE2B 930774ee7ec936bbefc4ea81e2496cd15438dc82954ec7b85c0bc42b290b41c60869f8b31e109ba16a373d3ebf1e0058c0c7ef7d4911ae40feb99fb61d66a745 SHA512 7c7949588a15ef57b12f11e903c1110228bb653212761c97ff50399aa39be97108b471a2cdf47afb307f6c86bfb24b3e9ab32fd08e0550ee27e8808f2acd5145
 DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
+DIST quote-1.0.31.crate 27881 BLAKE2B 47c8ac1051f7fa03d002420ade3cb18bf2aedc6ba922d13b117c016ee89c3326bea5cad32ec2f0e5ac1afcce68982f20b3f973914c205e6d6f426487989c6ec4 SHA512 8b2ec131937ce53f3fa01e68fb9261ed6442222e513cbe86f62b6da3cf3051cda0d134dc8028bc6c992fa63735ef3507490a169f8b4af1d6fc17058c6d2faaab
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST rpds-0.13.0.crate 67994 BLAKE2B 91b4aec7a25b81566288c5fefe5f89a0f8b9eae83caf05cf7a9796394df70ae79b721b64804f72c582bfc41ff59647a9bc0980ba7dc9438412f6445e4a916b5b SHA512 6567eabae407fb2c5eea49395d6901c540dc0b4dbd585d5f93fed1b4a71885a784fb8652f46cca5148acd35957040c4a61ce1d95e871cf494b41db846fd38698
 DIST rpds_py-0.7.1.tar.gz 15355 BLAKE2B 801cdd11b09a49d6769ffeac2340d203351d4b6f85cac1fa06b306e50021d4956601c3e6ca645091157dac70a2619cc00bdd277e57cf7bc3762bff04781a3c76 SHA512 60245d4ef4a1d1b49fdca93c530f5f66ccc7b601bd29ddd04de05a2030914bc55157262f2cda2d4dfe5e735f6f29d99a7edf74e6058eab96668e88540ad0b84c
 DIST rpds_py-0.8.10.tar.gz 16400 BLAKE2B 821f88119bf13819bbc30dc7ed7c5bd5fefc6f8931c1df14ac6249f0e707464818e4b89745ec93ea78251ecc440a0f2f178a43945a55edfb75681e24e4cc2657 SHA512 4bec55c6cd4025d6af1b78bc5b4187631d33470648c5ccf16be6296fd62c14493fbaa08f37b66963eb46f379915bfb55639222ee3bee4ecdd0f1dc2d237982aa
+DIST rpds_py-0.8.11.tar.gz 16337 BLAKE2B 19cbccc61b3e4721edcc70a942b9da3bfde2c83d0fcd1cabb278939b1f4b63a1e8acaf43a5f4e34e4b1841f0fb5a146808a57281b81cb101d49000c495d58a41 SHA512 b7b6d5419b1164a90dfda4884a2cea36d7760a0e63d50fcc048da3d4f6f675e1f9b9d517352c9fc145fc38b374dc9c06d98637ce1ee2c64b734ede1bbd160c70
 DIST rpds_py-0.8.8.tar.gz 16383 BLAKE2B dd45d7ce214266ce533f4aed8d4eaf33da08c9414bd7a1783c2e909ee63079f5687ac8497a940f027b2bda7adf4ef5bd8612ebf3706a4c3b3bcb129e6721a903 SHA512 68cda5ba4b72fc419a0c59fa2cc0655734cff9b452b11da26bb38acf221c2b4f503d3b7742032e467ee91f9fdd3de94b3aa43e5df1bf353ede07761ca759c86b
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
+DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST target-lexicon-0.12.6.crate 24357 BLAKE2B 5d9aef958155bdc1b546b9940083cf81ba4c638525e2d46340e50c4274764b39ac19a12214f3ff64a6830524a2ecea9d555db3f07d5d7dbccd7dd809255c4499 SHA512 63ccc047d10ebff55c3b9be400e2deafcaba7beb28ee67bae6d5df58e7c08362b2c4e0004f6daa582928850701969015ad43714c7ad46df665474667ff4db58f
+DIST target-lexicon-0.12.9.crate 24532 BLAKE2B 7f09be1827a5f9563b842c38aff659432ec61b66b814ebf4cc8a963daf6c93e7dc453a6966aa02d3a886007506d2b993e16ceb047bd34f6d206de76a39d08dfe SHA512 62033617d4587fb9d4b3159c78dbb628041d7ba6c5849c27a5755f173a7279aa4a03e56d31e03f87adfae50cef49eb6f0bc5eea1f6a131b87c618330d19d61d5
+DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unindent-0.1.11.crate 7700 BLAKE2B d4d1dde410c4194acb51f74f374cf11fa872e49fad8f5f24b596d72476403e5e312fedf7b0bcb1027384d53c8de565368d63c30eaf70a6e6cd958b82e5288ca3 SHA512 f800d6c37fe72477908c91457a738a73d2b8085bb5ae303d6d954405d6ccd98833b5da16a12c3ad1ab75d32a68dedc706dfaacc0fcbb95571dd829cdc03a356a
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
 DIST windows-targets-0.42.1.crate 5524 BLAKE2B 755cb6184733417763bb650fb0bd84bc757503aacbf0d91b811d42e9e8efda05434bbe5518006a88937a82a2a607605a9b609df4f34eb58674d09564667d95f3 SHA512 940c85f6214aa4da17787d3bbfe8d6107a9a7fe4f2e2fcf2b1634facf4619620ac2a7a835ebdd0f57970c992c459ba0a780e64e89945005b240c92563c42711a
+DIST windows-targets-0.48.1.crate 6902 BLAKE2B 8e6cd47dea52131c66983cbf4982e88f7bd30416dfae4e380f7afb39f67ee0ac88d40769668dd5aba40d4415f9f00cbc2ac98d598506fed26029f5ec4df3a2c5 SHA512 e48179620cce528292167f1d5ee2deea0659569c996dc90eb4ab62b9ea8baee6c0bea3ab739e06d8793c9690bfc895545ed0039cb633ca39293de79c42ea9de2
 DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4 SHA512 51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73
+DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711
 DIST windows_aarch64_msvc-0.42.1.crate 664655 BLAKE2B f4a060b802016a6d77a8ea6ac44c35dfec384acef9c45f932e2b6aca9d3ac48ae031f99e5b58f270d6020b8796e9dd06f7e8ffa7cc5610ea3f69181c2be7adc8 SHA512 f6412bae4b041201ef94e5a159ce90fd6b09816350204d4f573c1afdfb0a6d62d7887fbc2e416b40ec1d4478db521be492edf4703d87482d6d0006a51b827538
+DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df
 DIST windows_i686_gnu-0.42.1.crate 733428 BLAKE2B c1ca24973aca06b255d9317735cca7a13f7f69293da52dad41df43a5cdf48aac3d40d8b6765cf564905fb71cb548308d757f01167efe7a61da7bd2e2a7080f0a SHA512 61c3271b07df1d4585c875d27cf1686c8f595dcbb79626e8d15ff47228f7b7a4556d3d994566ccceee0d6795a4c76767f85f4579282fc9eed731e04c7e193a57
+DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68
 DIST windows_i686_msvc-0.42.1.crate 722583 BLAKE2B e03978daa0ac95d7bd9f594b28360dab647a1fe525f0ae4b44e6842d93c5674d9f202e8bbca99a0d30ecf7d138af0c48eec8e69e08bf285db51e32bcf83a2c54 SHA512 8afa4f92cb7bd96d4fdbefbd8e7bcaa37dee52224d5d8b950c5a537d3bb805bf9781097b8bd44d96e8b62b1290e3a3020557502fa3b357a53df6fea36b318932
+DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b
 DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54eb6473070c5722c9ec791dc4077efe2d774d51f8b3d06b3321f8f21cc49764f44d54b3432ee7a0d9376925b422b197f5d557e SHA512 f4c16b587fe407dee1f39df029c52302a0fbd5f519816a8d974fe9c2f928043b14037c701c0f3c9cf2e5c765e82430fd4b71615fe63a66a88159f7b15506f892
+DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
+DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
+DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
diff --git a/dev-python/rpds-py/rpds-py-0.8.11.ebuild b/dev-python/rpds-py/rpds-py-0.8.11.ebuild
new file mode 100644
index 000000000000..9d1cdfe7c87b
--- /dev/null
+++ b/dev-python/rpds-py/rpds-py-0.8.11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=maturin
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+CRATES="
+	archery@0.5.0
+	autocfg@1.1.0
+	bitflags@1.3.2
+	cfg-if@1.0.0
+	indoc@1.0.9
+	libc@0.2.147
+	lock_api@0.4.10
+	memoffset@0.9.0
+	once_cell@1.18.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.8
+	proc-macro2@1.0.66
+	pyo3-build-config@0.19.1
+	pyo3-ffi@0.19.1
+	pyo3-macros-backend@0.19.1
+	pyo3-macros@0.19.1
+	pyo3@0.19.1
+	quote@1.0.31
+	redox_syscall@0.3.5
+	rpds@0.13.0
+	scopeguard@1.1.0
+	smallvec@1.11.0
+	static_assertions@1.1.0
+	syn@1.0.109
+	target-lexicon@0.12.9
+	unicode-ident@1.0.11
+	unindent@0.1.11
+	windows-targets@0.48.1
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.48.0
+"
+
+inherit cargo distutils-r1 pypi
+
+DESCRIPTION="Python bindings to Rust's persistent data structures (rpds)"
+HOMEPAGE="
+	https://github.com/crate-py/rpds/
+	https://pypi.org/project/rpds-py/
+"
+SRC_URI+="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0
+	Unicode-DFS-2016
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/rpds/rpds.*.so"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
index 0a298dd24973..e5fae065d7b5 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.48.ebuild
@@ -92,7 +92,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
index 4297d181c95e..263ff26bbaa9 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.49.ebuild
@@ -92,7 +92,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild
index c73aa11745a2..823524eb6fa1 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.15.ebuild
@@ -113,7 +113,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.16.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.16.ebuild
index 365901c782f4..fbb254d662c2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.16.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.16.ebuild
@@ -113,7 +113,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.17.ebuild
index 365901c782f4..fbb254d662c2 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.17.ebuild
@@ -113,7 +113,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
index b58932b57df5..409418a356ea 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.18.ebuild
@@ -114,7 +114,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
index b58932b57df5..409418a356ea 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.19.ebuild
@@ -114,7 +114,6 @@ pkg_postinst() {
 	optfeature "asyncio support" dev-python/greenlet
 	optfeature "MySQL support" \
 		dev-python/mysqlclient \
-		dev-python/pymysql \
-		dev-python/mysql-connector-python
+		dev-python/pymysql
 	optfeature "postgresql support" dev-python/psycopg:2
 }
diff --git a/dev-python/survey/Manifest b/dev-python/survey/Manifest
index 4d09434b91f2..3bdc9a3546c9 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.5.1.tar.gz 830756 BLAKE2B 11fd1e2fd0da550178a043bc698c09b39cd2b6f84ee562a8476cb204802927f22d9a21110fd9134828c593b888a1052b48105d04458fe7630faadd5b079e0669 SHA512 14f4026ecb845c3ad252c485fed049a10ee854cdd3940f3fae3a0bd4cd077c55f2bc11b9480e8e6d1e6572c63654228b7a56b36c37c90f63cf5c2c0c65263e6f
+DIST survey-4.5.2.tar.gz 830754 BLAKE2B 32fdcdede0113d4ef05492cddc047925d93f385db309eed6c7a1cb1279c6c92a2ecc69c5ecf7361545eb3ccf4e4685f4e8d0344d2c2cf4392a8c7c635f714f27 SHA512 f011df6a75d074f2543311eee332a0d43436bbd6b29ed491028510a5df9d70502e8f96f18afebe513446bc26623bed292bfcecf1b52e93f3d4838b1f70ff705d
diff --git a/dev-python/survey/survey-4.5.1.ebuild b/dev-python/survey/survey-4.5.2.ebuild
index 5a4213f60dd7..5a4213f60dd7 100644
--- a/dev-python/survey/survey-4.5.1.ebuild
+++ b/dev-python/survey/survey-4.5.2.ebuild
diff --git a/dev-python/ufmt/Manifest b/dev-python/ufmt/Manifest
deleted file mode 100644
index ef1843a36cbf..000000000000
--- a/dev-python/ufmt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ufmt-1.3.3.tar.gz 57526 BLAKE2B 067a89409ca7af7ad8d3c67553d4ba7cb97877710195fdcc4611b634e72e58f732e1a3772174b2fd7dd4b26c862e484d9de8f09aeb05feae20daf5ff64fb3bbd SHA512 d5d352a5076ac3875ceff3b87a5d7fa43efbf0e8239c30136d419947f06dd479f8b7fc33b1ef15408934a7e24cb4ce9b18e7bfaa38d9d946a1bb6bfe7ef936b6
diff --git a/dev-python/ufmt/metadata.xml b/dev-python/ufmt/metadata.xml
deleted file mode 100644
index 6e8ec06634fd..000000000000
--- a/dev-python/ufmt/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>telans@posteo.de</email>
-  <name>James Beddek</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/ufmt/ufmt-1.3.3.ebuild b/dev-python/ufmt/ufmt-1.3.3.ebuild
deleted file mode 100644
index 8c80340e218b..000000000000
--- a/dev-python/ufmt/ufmt-1.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 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} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Safe, atomic formatting with black and usort"
-HOMEPAGE="https://github.com/omnilib/ufmt/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/black-20.8.0[${PYTHON_USEDEP}]
-	>=dev-python/moreorless-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/trailrunner-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
-	>=dev-python/usort-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/userpath/Manifest b/dev-python/userpath/Manifest
index 7cdb509a5054..f0c5927e2128 100644
--- a/dev-python/userpath/Manifest
+++ b/dev-python/userpath/Manifest
@@ -1 +1,2 @@
 DIST userpath-1.8.0.gh.tar.gz 11045 BLAKE2B ebf1077469210dfb66c63a859764becb5cac5734bc0060db691e50e3576241360b4644f141449f033f64f4dbdbf10d2b5a032493ce3c4745a2c981149105c7c9 SHA512 d2f082909fad22cf5b33f175afdeebe14a44ebd245c84506395f01a288eccf9c376ac28dcc4b618cc2464e1a23e740b41f4f4ad0e780a42e1185c5283ccc7330
+DIST userpath-1.9.0.gh.tar.gz 11090 BLAKE2B 70eac3d629c71604047d9dfa4eaf2eeb90011d0b943367aacc0e4e1efb7d45de0efb8075404510e791bd8da3609423d29503101943edc108aa012e8018e53b63 SHA512 a5683a7423465426debda02d58b2f5ef8d17d38d2fac2378cdf3075a2a6f0b7d75210bb1eac30966d323ec5f25073cc9286ae1b37acaa1bf7785da02a4c40805
diff --git a/dev-python/userpath/userpath-1.9.0.ebuild b/dev-python/userpath/userpath-1.9.0.ebuild
new file mode 100644
index 000000000000..72deba691218
--- /dev/null
+++ b/dev-python/userpath/userpath-1.9.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cross-platform tool for adding locations to the user PATH"
+HOMEPAGE="
+	https://github.com/ofek/userpath/
+	https://pypi.org/project/userpath/
+"
+SRC_URI="
+	https://github.com/ofek/userpath/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/usort/Manifest b/dev-python/usort/Manifest
deleted file mode 100644
index 9d4dfbab01f7..000000000000
--- a/dev-python/usort/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST usort-1.0.2.tar.gz 78068 BLAKE2B f53b7e70d707a569e8c9bb954022ea50ca133e04a6ef3674dadc0e6d78298e005035ee7e63ec349a567493802ec662026b366ebdb508d84da1862adfa9cefc2c SHA512 e950db4c61a14af55a0a39b8a799a2980cc0b2e731dd27b59ee0b345af6102db870d57118dfec94f6a89fbdbf0cdf5df5eb870d0cad657f99487fb21341dc4aa
diff --git a/dev-python/usort/metadata.xml b/dev-python/usort/metadata.xml
deleted file mode 100644
index 6e8ec06634fd..000000000000
--- a/dev-python/usort/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>telans@posteo.de</email>
-  <name>James Beddek</name>
- </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/usort/usort-1.0.2.ebuild b/dev-python/usort/usort-1.0.2.ebuild
deleted file mode 100644
index 6aa8711994a1..000000000000
--- a/dev-python/usort/usort-1.0.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} ) # python3_11 depends on dev-python/libcst
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Safe, minimal import sorting for Python projects"
-HOMEPAGE="https://github.com/facebookexperimental/usort/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/libcst[${PYTHON_USEDEP}]
-	dev-python/stdlibs[${PYTHON_USEDEP}]
-	dev-python/moreorless[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	dev-python/trailrunner[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-python/volatile[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 6512b8974a11..18dd39b61cfa 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1,3 @@
 DIST xarray-2023.5.0.tar.gz 3707468 BLAKE2B 55ee416c41aff8edcb609adcac1c0a2e1d4ae896c25ae3d771d755930725f69f854feac42c42558db598acc5d0a852370198908d85d5af9664c485052948f4ca SHA512 ab6538b280f05acc296d8d73003e07f494d330a2a6a486d2f3dac121aee9682e2fa46c05be868b23a31584c908e0f6454757bdac7ec032d3a6f79a4500c0629f
 DIST xarray-2023.6.0.tar.gz 3711562 BLAKE2B 3b6b20cf0046aaeeafe87980c6c107486d79afd2881c4f98b42c17025f0d448763d37b5d5fd71cf17fcfcfbdc2d3337e985c7517038547300f4cf57ffe1aea98 SHA512 2b1b48bd90935a3b56f5f017085d40cc10081efbe0a84c908d1203066f29b4bf16fc89e771d961f26009bb20a84a59f4b9d99e42b5e25b2bbd8eca55a80839d6
+DIST xarray-2023.7.0.tar.gz 3725483 BLAKE2B 814af19a4c24eb0179441d07bcd6165dee2ed5430a6fd94f4014387b7b7fd4ae250b64124bdda8ca411124ab2276075af65bde2a3ed3dc6d081dd466a485007e SHA512 88863770b22978ba681a2d970453ae087a234fcfb68f047b6020b39841a91207e8d92e01486d58bbeadac8d14608aa0c744ee9b6d54890f52fe3537b28292239
diff --git a/dev-python/xarray/xarray-2023.7.0.ebuild b/dev-python/xarray/xarray-2023.7.0.ebuild
new file mode 100644
index 000000000000..3d546cc5302f
--- /dev/null
+++ b/dev-python/xarray/xarray-2023.7.0.ebuild
@@ -0,0 +1,58 @@
+# 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 multiprocessing pypi
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="
+	https://xarray.pydata.org/
+	https://github.com/pydata/xarray/
+	https://pypi.org/project/xarray/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.22[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.4[${PYTHON_USEDEP}]
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+"
+# note: most of the test dependencies are optional
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# warning-targeted tests are fragile and not important to end users
+	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+	# TODO: segv in netcdf4-python
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-5-None]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-5]'
+	'xarray/tests/test_backends.py::test_open_mfdataset_manyfiles[netcdf4-20-True-None-None]'
+	xarray/tests/test_backends.py::TestDask::test_save_mfdataset_compute_false_roundtrip
+	# hangs
+	xarray/tests/test_backends.py::TestDask::test_dask_roundtrip
+)
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p xdist.plugin -n "$(makeopts_jobs)" --dist=worksteal
+}