Adding metadata

41 files changed, 782 insertions, 163 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c5b0b7cb0820..f2f5e0c40d1c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,3 +2,4 @@ DIST boto3-1.34.153.gh.tar.gz 847038 BLAKE2B f29aec887fd57d2bc4b6be125787384438e
 DIST boto3-1.34.158.gh.tar.gz 848930 BLAKE2B 5db04b9eee08f5418a595e736f075fbe22b92adada9219e8a8cf2299c723d09e2edf88e5ebb3d09c1613a01e5d0d5c837e9545c6ee3110c430c521da10fa2bde SHA512 03f532e78a1a2b8ec01396f0b7f7bae7059165e35440eda47f4393e99d2a8ded229470cf3269a71c746b8a66dccd8626444f1e429e561df1dc1ec0f6b8653272
 DIST boto3-1.35.0.gh.tar.gz 851637 BLAKE2B 485b17616fed53a88280aad92d2e4219d8bcbf469b42cff6113f9596c6b245fad39b403b4fb29ed99b50955baa50940091e9c0f88cc6e350b44c69c4b1df5fdc SHA512 0236748c667ef1baf7484d4808083cb517c19ceae672973ac0cf9ce509a9e4a965c15349876807dc320fc96210ba6c5d16ea66545de19eed33dace058392d85d
 DIST boto3-1.35.1.gh.tar.gz 852178 BLAKE2B c1706b6f22fec5046ec0653a87be74113ed8031c1140efa296ce8d4d8d126da65a4dd0ce62413a078a88c4c11739a7e55a86363eca16b10e96e0344d3ad63fd2 SHA512 03a121ae24ec6b5d2a5ed869a2d7ff6cf2078c45abed09bf014dca14575b3612ffecd73e784aab74051364bb211d33871bf4f212cb603e1cbe980cd85d749629
+DIST boto3-1.35.2.gh.tar.gz 852524 BLAKE2B 28a0408e2187952eb8f9f0e37de105007e6c4d0f11358c8ccc5246a8798b24f1472eaa788e3268c9e9fe9888953d6ab323e337e5d4a53179cd4bbd26c1776e89 SHA512 7b25f6ab5b29789e1b90f888f74708ade430e5c9f746346fb4ba0aa15f6ab55d892a9331d4c3e06fab5c683c2e0d7745c8adf10a6a259398f8fb88b1dafe52f1
diff --git a/dev-python/boto3/boto3-1.35.2.ebuild b/dev-python/boto3/boto3-1.35.2.ebuild
new file mode 100644
index 000000000000..509842b2699d
--- /dev/null
+++ b/dev-python/boto3/boto3-1.35.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+SRC_URI="
+	https://github.com/boto/boto3/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
+"
+
+EPYTEST_XDIST=1
+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() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7abb12fc65d7..71db3c651131 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -2,3 +2,4 @@ DIST botocore-1.34.153.gh.tar.gz 13269606 BLAKE2B 1b2ec1af3b699c18c5761fe72b8488
 DIST botocore-1.34.158.gh.tar.gz 13282704 BLAKE2B c244a36093cdaf57ac82dc11a3e9d4268d7cce36b8119674530228825f6ec4053abbc909dd664a1ea10ec48e0c418b90803275aabc89a41a99eaba6e138a5a17 SHA512 b60c743bfd1a1f3806c6ae71158a998587b8e87f43bdbe88c960cee19bcef41a4b3fd2fe5f50408abc97b22200a689990f79cbb6e952347c747e4bc8c21ae368
 DIST botocore-1.35.0.gh.tar.gz 13294975 BLAKE2B a0cbafd1b0da5cd7150ea7a2e21b1209b206b7afcb86ad3ff004ca1c96f47da34eff29a43568f0e9a2dca3443516fdb6adf7bd3778835b908fa5fb3a8d22f79a SHA512 7d0c9815703ef49a8958ed1a5159018320108ae86efe20e6dff182db24ceeb67968db7027ee75809a1ebd1c835709d0d758b0699742bca2e435888dbe5e15a97
 DIST botocore-1.35.1.gh.tar.gz 13301129 BLAKE2B 70c99036e54331a63107c5c031cd32c59150ef2aa6fd9bf90bb4fe2a8d7eaed38d0a7df96c0ac1b973a14490e061e63e04dba873382cb2d69cbe2bf8b312a765 SHA512 92e4e6081bb7ee491acdc92356a2e661af02bb4b1a73d372dcdb1de913d89adfe0a1b3b16b1d4754e79601f051b4d2fab54d7512f3ca9d972b2256811cc704f0
+DIST botocore-1.35.2.gh.tar.gz 13303549 BLAKE2B a93f708264e5d4332d4a63b11e57ea9575913e09cd5e2f0a23d050625e185f985c56bdc2652f2362bbdd037a74d2229c3998185cc96ba468bf2669f2dac4d773 SHA512 7f2309967c6c18445d122164d84951e7d602253388967dcf517e3b6bebe3a262eb0473181ce9145aefefefc2e9456aac05b321ec1b59fa08c162fced85a7dfe2
diff --git a/dev-python/botocore/botocore-1.35.2.ebuild b/dev-python/botocore/botocore-1.35.2.ebuild
new file mode 100644
index 000000000000..64a61a30c80b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.35.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+SRC_URI="
+	https://github.com/boto/botocore/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+# unbundled packages
+RDEPEND+="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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
+	)
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				# memory use tests, probably fragile
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild b/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
index 1d7389be3c00..646427c8689a 100644
--- a/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
+++ b/dev-python/conway-polynomials/conway-polynomials-0.10.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/ensurepip-setuptools/Manifest b/dev-python/ensurepip-setuptools/Manifest
index 1262c8f74162..6b468915bf61 100644
--- a/dev-python/ensurepip-setuptools/Manifest
+++ b/dev-python/ensurepip-setuptools/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-72.1.0-py3-none-any.whl 2337965 BLAKE2B 88954b396a47b4223b73313100b9ae0782a16f755660da1abed31316f056beca78401b151f1bec39a791b1c556da09479e527b2316f5d1391e6996f5433c0bc3 SHA512 ef9f855c8ca4d7f6e5eb79f3d40b44830eede4664ec5667415fc676a0b8230a64fb62fda49c1eef6a9c3f89d4724b0717e7d702be99ab61f8763d91feb9a6ea1
 DIST setuptools-72.2.0-py3-none-any.whl 2336658 BLAKE2B d46adb6be347ee6107ca90850ad1c8df60723e1cb93e402b53c02316a07b7cb71dd8d657cb3beb8c926fa23308d4e8fca7221b52e5f59fbfa744d6758b603343 SHA512 e7730427e7ff342a52f638fe1d457cdb906971f33dd87bb01a26b2d01b134f561397b7a6ffbe078ba5867306ba14bd8316995ab823f9b1c806646c2f242209c6
-DIST setuptools-73.0.0-py3-none-any.whl 2346506 BLAKE2B e01e9cb1bd9d3800379be49f4a5f0066708433f98758715e56c61bbd6ea342e18274305ed7279415f5b9dd70484dbdf1736b34f9f0482768a0d964011d3bfa88 SHA512 e4548bc7c6b1ee752ac919bf970050e1b6017548719e406ab6af59221c743ece9048ac16b0c1affc3f9da5e0444d4ee522bcd09e60f42044ceaacac2cf8c9cf4
+DIST setuptools-73.0.1-py3-none-any.whl 2346588 BLAKE2B 74c84539d1c3592aca5678ecf3c7c71c57fffa877fc5dcc42701c7b2f58613d3767ca10b190c37b30dc24ca9a6b67b76e1e70f63b188d9228f1b73b17f4a3198 SHA512 cef43928c8eebc673ca1befb1df1dc230eab8cf10fc66b06f02a0d459e78701457b8024bdc4ac33082e85e07dd5a63e031fcbf13e0b94d6bc9ccc90931060841
diff --git a/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.0.ebuild b/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.1.ebuild
index 97aca4a61872..97aca4a61872 100644
--- a/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.0.ebuild
+++ b/dev-python/ensurepip-setuptools/ensurepip-setuptools-73.0.1.ebuild
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 31506f1b0f6e..f96e5dc19f6a 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,3 +2,4 @@ DIST google_api_python_client-2.138.0.tar.gz 11595036 BLAKE2B 554abf4e58264d60a5
 DIST google_api_python_client-2.139.0.tar.gz 11606939 BLAKE2B 9ad0cd36a913235e8c7b5afe2f4334399deb662d2d6287a64d98b02d890368839b345dba5e64aad3c852d655e99a04f8eb6902498664c4efa3a693ae2a2c6aeb SHA512 b6235f866a402ebde20fc8cfce41ad5bd0b8034311ab5b4f1b4cc88cea03f52021ee23264a32e9577ee1fa5bcbbb07af1c4e6d5e3f85bc53c0e6760654543b34
 DIST google_api_python_client-2.140.0.tar.gz 11618875 BLAKE2B 0d156fa072b302c0410f8e70681556ee146d8d8951576b1890e429b40363661d263554ad61157256feebee9a45afdf3dcdbb287b7c1dc367a6b6940ec488a645 SHA512 168e75ea734edbf0182078fad27d30f8dd56b07a8c7056973c7df99fb7faff83034901b6742aab8e03c833b73a5fd31a92455105ccc6f0f5b741fadb66715f30
 DIST google_api_python_client-2.141.0.tar.gz 11652283 BLAKE2B 23209b950bb0712890f5c6b2dd0f238b8397a3084a9d61d6423b6d7275faa719d788551868037ab3c4a8ec8d0e37cff96859a1b933e395ef5feadae711c79be9 SHA512 c8d0f879ce9466e3c93e36f263ad9185bc844dae229ed1791068025dd200f21d67d0c87a5ee8ca8b6b0d71c7aad10b6a97dcfc7e7fed20017f992f5bdc7ea225
+DIST google_api_python_client-2.142.0.tar.gz 11680160 BLAKE2B 660e61509969fc6d6d5235163cdede57011150f8932bb4bfccbae19ae020367a34b9ee103b5ec788bbe22580ca60ff242bf3734ce0f81cc20a64e80d57e7628d SHA512 ede409d7f46fb06aaaf3cf2c850259cc8e7e7d2b4a8469323118f2774c31f52f9a11a8fac68d3e2ea27e9425badb5ca08c2b432321d23b6b0b460dafb0e652ce
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
new file mode 100644
index 000000000000..10fa88d021bb
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.142.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+		tests/test_discovery.py::Universe::test_client_options_universe_configured_with_mtls
+		tests/test_discovery.py::Universe::test_universe_env_var_configured_with_mtls
+	)
+
+	epytest tests
+}
diff --git a/dev-python/griffe/Manifest b/dev-python/griffe/Manifest
index 642968b24974..151a5a78399f 100644
--- a/dev-python/griffe/Manifest
+++ b/dev-python/griffe/Manifest
@@ -1,2 +1 @@
-DIST griffe-1.0.0.gh.tar.gz 378841 BLAKE2B a71007a09585b1ef0b17c867177f01e0e38984075f1450a6957a65427c3b9fb2486bbf7fa0b41f3c8ce289003e514eeaaefe0b679181d843a8b57befca39a8b4 SHA512 5a286c293f39b0df185345c00954d61e130cf3942aa8dede56180330dff5150043d77bf48ef14bc01c8b1af0af19de8651344d3f3a8fbf850ece1c4c04d17513
 DIST griffe-1.1.0.gh.tar.gz 379874 BLAKE2B 452d98f1248866ee159229aec84bc99f7f83bc9c22505c809ea0de2b9bf6342ffddae42f694c30a2b696de081a34d886e42270a1c6a68aedc5a9f544112889da SHA512 a443c3094c4044b58537b5fa781610d99e26be195df216b74a097257596f52ecc7021ba5fb504c82f7960154b8d3a00fa05cc63526e538291486e915ef44cc51
diff --git a/dev-python/griffe/griffe-1.0.0.ebuild b/dev-python/griffe/griffe-1.0.0.ebuild
deleted file mode 100644
index ef4b909e872e..000000000000
--- a/dev-python/griffe/griffe-1.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-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 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/colorama-0.4[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/backports-strenum-1.3[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		>=dev-python/jsonschema-4.17[${PYTHON_USEDEP}]
-		dev-python/mkdocstrings[${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/importlib-metadata/Manifest b/dev-python/importlib-metadata/Manifest
index caba8ac35525..7f1109bf2172 100644
--- a/dev-python/importlib-metadata/Manifest
+++ b/dev-python/importlib-metadata/Manifest
@@ -1,3 +1,4 @@
 DIST importlib_metadata-7.1.0.tar.gz 52120 BLAKE2B a43a1f0724b3197f51c055d36d31700d67b3bcae849fd648c7cd1ac158a410fdf05a27f2c7003a30e566f86ec5dcbf7cf386ebe4e0ed0a1ce2e89e280ab9e1d3 SHA512 e75db6da03c251acc690ceef6ab2b668acfcf5499032cff370a574b31a5fd7afcbf9756bc20e44e6e649767c1609c7ebb40203aa6406ec5341f27fba886d208e
 DIST importlib_metadata-8.2.0.tar.gz 53907 BLAKE2B 3864e1fcea4f0c30134c401f787b83500b8c13860a69784f769a67d1db1d4345c8a289fec2a21812f29dc3f07c522836dc1271f33eaf4592bcb709561f0adbe6 SHA512 cc0467f5ac95503b4fcbce6bf0b4211a5bf9ba8389a714c6d0cb3f35756b7c5bcb6359873cfeb1dbd068b0a41ddf57b27a564aeaad9bc17cb8a5e4d71fa12e8a
 DIST importlib_metadata-8.3.0.tar.gz 54304 BLAKE2B 1ef5692ff77aa9ba59b0cb057b077600fe0b54d990ea4b0bf1add85b1e8c1f2653237b892c321fc01c9ed7260eb27f81d0e691f7e35807020d284bb1d924804b SHA512 7bd4c8abfd7a283f72e70c37a039f96df89c07fcedf0734cdff8308ab9f4281f98986a7e44245c9e8933ed29eaa7e2fec42ca4f70bd749b44311d685b5fd3389
+DIST importlib_metadata-8.4.0.tar.gz 54320 BLAKE2B fc8912dd432e05c5ad82428f47b6265588d6b20c364321bea5ffb1653f2f9d6b2aff3d35b399d1d8237d328414bc77697bd4dcbd56611f39fd002779328c78b6 SHA512 97d904225f478bf9877a62e2d1a43dc88e2d9d74ac4488ddbdd2371066b08429d11e10a5a9bb484a93e86a01f13404b57e0350726c1c13c6cb1b2424970da2be
diff --git a/dev-python/importlib-metadata/importlib-metadata-8.4.0.ebuild b/dev-python/importlib-metadata/importlib-metadata-8.4.0.ebuild
new file mode 100644
index 000000000000..ce9e2dc50049
--- /dev/null
+++ b/dev-python/importlib-metadata/importlib-metadata-8.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="
+	https://github.com/python/importlib_metadata/
+	https://pypi.org/project/importlib-metadata/
+"
+
+LICENSE="Apache-2.0"
+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"
+
+RDEPEND="
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/jaraco-test-5.4[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "importlib_metadata"
+		version = "${PV}"
+		description = "Read metadata from Python packages"
+	EOF
+}
diff --git a/dev-python/jaraco-context/Manifest b/dev-python/jaraco-context/Manifest
index 32666e593aa6..505c90324760 100644
--- a/dev-python/jaraco-context/Manifest
+++ b/dev-python/jaraco-context/Manifest
@@ -1,2 +1,3 @@
 DIST jaraco.context-5.3.0.tar.gz 13345 BLAKE2B d2f429335ea80a6b50ea9574adc45c25c0fc78e8ebb5edde218bcbbe7a2b27ae6b5c17453e71904240d0d873ebef36f7c7aeda4424d3fea2dd9aaf01af6fb4c5 SHA512 f63bf272c45ff5c43499621651b78841259040ac98d67c9db75fadebb1c497c1156e05f23bf7c91df3e91f1e070acb9f7dc665e7b242ba7b1ac1cf99a619494d
 DIST jaraco_context-6.0.0.tar.gz 14118 BLAKE2B 96901d173426e8bad5755c0e21ba789daf4217a7ed94efb81fdb3daf2d9a13f5875a17fa20a5193bb6a7a7c772b2b77e3b85a465039bdefa6231075a45133fda SHA512 a831ee8b732fc2b40e7de81d390fb5869317a127e5999a1c4f00f3ab81e04d4021733816e813c1ddbc1370540aca6205353c7a024f60d6f0dc59545abe505fa6
+DIST jaraco_context-6.0.1.tar.gz 13912 BLAKE2B e249916d41e936c4f261e5e4330f3d6b26b159772a1284521168313f41ef296ca82930e46837ae8ea7c895f7471bc039d5b42a8d4eceb0718056ff4b82d79cba SHA512 5711f581a616a18f7b7dbac65550255c7eecfae39df04b675817b16fbc5d61b833617d853c40f0b910c0ba5d144baf4c4b2add155c9b91001209b27da594a801
diff --git a/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild b/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild
new file mode 100644
index 000000000000..cf6c4383fd4c
--- /dev/null
+++ b/dev-python/jaraco-context/jaraco-context-6.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYPI_PN=${PN/-/.}
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Context managers by jaraco"
+HOMEPAGE="
+	https://github.com/jaraco/jaraco.context/
+	https://pypi.org/project/jaraco.context/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/backports-tarfile[${PYTHON_USEDEP}]
+	' 3.10 3.11)
+"
+BDEPEND="
+	test? (
+		dev-python/portend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Internet
+	jaraco/context/__init__.py::jaraco.context.repo_context
+)
+
+src_configure() {
+	grep -q 'build-backend = "setuptools' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "jaraco.context"
+		version = "${PV}"
+		description = "Context managers by jaraco"
+	EOF
+}
+
+python_install() {
+	distutils-r1_python_install
+	# rename to workaround a bug in pkg_resources
+	# https://bugs.gentoo.org/834522
+	mv "${D}$(python_get_sitedir)"/jaraco{_,.}context-${PV}.dist-info || die
+}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index a11d7c268c91..37a64204a00a 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1 +1,3 @@
 DIST langdetect-1.0.9.tar.gz 981474 BLAKE2B ea8a9c3f16a2987c080742473bff4f2c1503f53fb3c2b40b0b1d6212bb6133ea22dce7864ffcfb8968c3a46b157d45cb3e2cf6f84bdbed0266cc716a853b032c SHA512 7558d674c47b080c79e43a00a25d2c7f77188cf60bea2cecb3bebb803d75e1aa42b43c74bd26ea1b541f4cb927421908882cbec01a91f0913984217e71ccc8db
+EBUILD langdetect-1.0.9.ebuild 494 BLAKE2B 9b3521c5721afa49a58e0c35267f7d82bb56bd7e1d6d3152be0d36cd220180a526cb20b90b1113fbf0fff4a512137570f0b3bcf864498b7b7cc00403cb61ca27 SHA512 16d311400bf84a5f04e15f3da4b68b2810e4b005009f4d03dc8a487176dfc294403c976c412c83dcfa8084a49ef7b7d5389b43fb2ba446ce107ce4595e3558c6
+MISC metadata.xml 457 BLAKE2B 630128a3e982b6d60cc7b9f74c79fcb5ee47a71a02c73a50af9da8cedb6fad8e20a7f74b881e5b25c6483b92c9edbd56552cd38b2d9cbfa8b3eb4530facea969 SHA512 674f4f5cd809c6c77bc14e0f5687fa972bef14bdfa0b3343c5d66b7163eef1906eb87d060c8288732f825de71dce291ad0b841a5f2f0dd230f957b5687e45d45
diff --git a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
deleted file mode 100644
index 637368d2f237..000000000000
--- a/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix "Package 'langdetect.profiles' is absent from the `packages` configuration."
-
---- a/setup.py
-+++ b/setup.py
-@@ -18,7 +18,7 @@ setup(
-     author_email='michal.danilak@gmail.com',
-     url='https://github.com/Mimino666/langdetect',
-     keywords='language detection library',
--    packages=['langdetect', 'langdetect.utils', 'langdetect.tests'],
-+    packages=['langdetect', 'langdetect.utils', 'langdetect.tests', 'langdetect.profiles'],
-     include_package_data=True,
-     install_requires=['six'],
-     license='MIT',
diff --git a/dev-python/langdetect/langdetect-1.0.9.ebuild b/dev-python/langdetect/langdetect-1.0.9.ebuild
index 630fe63c6f53..c09b7356f549 100644
--- a/dev-python/langdetect/langdetect-1.0.9.ebuild
+++ b/dev-python/langdetect/langdetect-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,4 @@ KEYWORDS="~amd64"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/${P}-explicit-config.patch" )
-
 distutils_enable_tests unittest
diff --git a/dev-python/langdetect/metadata.xml b/dev-python/langdetect/metadata.xml
index c0f74ac187e2..020e07f2a3dd 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -2,9 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>pastalian46@gmail.com</email>
-  <name>Takuya Wakazono</name>
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
  </maintainer>
- 
- <origin>gentoo-guru-overlay</origin>
+ <upstream>
+  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
+ </upstream>
+ <origin>slonko-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 9e56b67589b9..d9207dba98be 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,2 +1,2 @@
-DIST marshmallow-3.21.2.gh.tar.gz 183818 BLAKE2B 01e14514d836c36c9f24a6e0a527271bd17ea5ce1ce35cabb6200a886c85ef970e7d54191307d1580568f05b501ec6028c7f126475ac64c160fec75c247a4c20 SHA512 b151f7e712dc5dd5d7f592942a6a4b09d462b684f542406c8bc57237e4b2402eb287d02e4ca2ef65e10dccb1e200b9ff8ae24f69160af1c6aa02fc5dfdc9eeba
 DIST marshmallow-3.21.3.gh.tar.gz 183813 BLAKE2B c5b0165be783e87149c1f1b7f0e370c0c0b33cd5e34b0a91b1510b81e840ca1f87c34b13f00e0c22b5a34d8fec62bba4a66f889a450a4f03fda7a85a63bf71bf SHA512 522d015d4207b1258ef92901f106f94bd412e011c26ad074ca9ee3156e51a1d873063f0ebd24b613cd95f34397f29e79358bb420ee0eef51095e6e8858d61fca
+DIST marshmallow-3.22.0.gh.tar.gz 184804 BLAKE2B b877ad2b2bc1ad0c54c2a8fa9dd9eba393455dd8ce68fce574ffd11ec1e1cc0935c8296ddff9b53fb4f9e7618a8f4c2a13716e1c4a7c8bb1b1f17aa967d29009 SHA512 a4359eb2490e2bb8be6d0e31e1d8eabd2ebc19fa91d024335d2483dca77bb79848d4be13f1775fdabf97c6156a981260693234be45dd1ccd3567e9c79b981deb
diff --git a/dev-python/marshmallow/marshmallow-3.21.2.ebuild b/dev-python/marshmallow/marshmallow-3.22.0.ebuild
index e0cd0f9d1b17..e0cd0f9d1b17 100644
--- a/dev-python/marshmallow/marshmallow-3.21.2.ebuild
+++ b/dev-python/marshmallow/marshmallow-3.22.0.ebuild
diff --git a/dev-python/mkdocs-autorefs/Manifest b/dev-python/mkdocs-autorefs/Manifest
index 2be334e063bb..f2d833cac009 100644
--- a/dev-python/mkdocs-autorefs/Manifest
+++ b/dev-python/mkdocs-autorefs/Manifest
@@ -1 +1,2 @@
 DIST mkdocs_autorefs-1.0.1.tar.gz 17743 BLAKE2B 400a640bf200276744b2ad8694cfc37818526e725c9c5b551ad585c2f6dc2edc63f253228c6717a44d86c912d9dbe9625569fce716d6ca7041cd777046fd11d2 SHA512 2494cea8bee86f2d996347a71f775ec428d76f7cc2060e51b6d8df573fbabc6c848d3055636e81329236ea4aa14fa7b97070e1d3af93d5a7242118be7c02629d
+DIST mkdocs_autorefs-1.1.0.tar.gz 36989 BLAKE2B c094b0d2ff7ea9ccbdca0732bc2dd4a99f229f220117467bf22dd894098d51b56d25a5abafd0420cb3bb10028c05ec5cc5537dfdc1830d642f129999833bda7b SHA512 a75848ab0885fcd65242891a2169129243222c733d2e5978f53043a27999f913560a40868e17cfa1f580114e48392ae098cb37eb1c2e234365652d52f4ece9b4
diff --git a/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
new file mode 100644
index 000000000000..226d7cce3991
--- /dev/null
+++ b/dev-python/mkdocs-autorefs/mkdocs-autorefs-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+DISTUTILS_USE_PEP517=pdm-backend
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Automatically link across pages in MkDoc"
+HOMEPAGE="
+	https://mkdocstrings.github.io/autorefs/
+	https://github.com/mkdocstrings/autorefs/
+	https://pypi.org/project/mkdocs-autorefs/
+"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+RDEPEND="
+	>=dev-python/markdown-3.3[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pygments-2.16[${PYTHON_USEDEP}]
+		>=dev-python/pymdown-extensions-10.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
new file mode 100644
index 000000000000..5ed7217741c1
--- /dev/null
+++ b/dev-python/pygame_sdl2/Manifest
@@ -0,0 +1 @@
+DIST pygame_sdl2-2.1.0+renpy8.2.3.tar.gz 4270114 BLAKE2B ae70253fc717334e65c438d36bd2991c909ee64c6b47f9c175fd53c1567ea54d2a42ea65cda85560387e744ff792b34658d393f3018d2941e5111efba064236a SHA512 9b3ae71a648511f243d235ba5e81661dde5d0871a4517494f2789c20f95e110305e42bdb635308165cf3985d1096b296a16140c03cbd446db17997c05025b8e3
diff --git a/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
new file mode 100644
index 000000000000..2011eadfbffb
--- /dev/null
+++ b/dev-python/pygame_sdl2/files/pygame_sdl2-8.2.3-cython-3.patch
@@ -0,0 +1,204 @@
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer_music.pyx	2015-04-04 18:05:58.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer_music.pyx	2024-08-20 23:31:04.313616957 +0300
+@@ -27,7 +27,7 @@
+ cdef object queued_music = None
+ cdef int endevent = 0
+ 
+-cdef void music_finished():
++cdef void music_finished() noexcept:
+     global queued_music
+     if queued_music:
+         load(queued_music)
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/mixer.pyx	2019-04-03 08:15:40.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/mixer.pyx	2024-08-20 23:27:49.115394156 +0300
+@@ -57,7 +57,7 @@
+             Mix_PlayChannelTimed(channel, next_sound.chunk, 0, -1)
+ 
+ 
+-cdef void channel_callback(int channel) with gil:
++cdef void channel_callback(int channel) noexcept with gil:
+ 
+     cdef int etype = 0
+     cdef SDL_Event e
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/rwobject.pyx	2024-01-29 06:06:06.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/rwobject.pyx	2024-08-20 23:22:53.081539270 +0300
+@@ -63,7 +63,7 @@
+     msg = <char *> e
+     SDL_SetError("%s", msg)
+ 
+-cdef Sint64 python_size(SDL_RWops *context) with gil:
++cdef Sint64 python_size(SDL_RWops *context) noexcept with gil:
+     f = <object> context.hidden.unknown.data1
+ 
+     try:
+@@ -76,7 +76,7 @@
+ 
+     return rv
+ 
+-cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) with gil:
++cdef Sint64 python_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept with gil:
+     f = <object> context.hidden.unknown.data1
+ 
+     try:
+@@ -88,7 +88,7 @@
+ 
+     return rv
+ 
+-cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) with gil:
++cdef size_t python_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept with gil:
+     f = <object> context.hidden.unknown.data1
+ 
+     try:
+@@ -100,7 +100,7 @@
+     memcpy(ptr, <void *><char *> data, len(data))
+     return len(data)
+ 
+-cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) with gil:
++cdef size_t python_write(SDL_RWops *context, const void *ptr, size_t size, size_t maxnum) noexcept with gil:
+     f = <object> context.hidden.unknown.data1
+     data = (<char *> ptr)[:size * maxnum]
+ 
+@@ -112,7 +112,7 @@
+ 
+     return len(data)
+ 
+-cdef int python_close(SDL_RWops *context) with gil:
++cdef int python_close(SDL_RWops *context) noexcept with gil:
+     if context != NULL:
+         if context.hidden.unknown.data1 != NULL:
+             f = <object> context.hidden.unknown.data1
+@@ -135,11 +135,11 @@
+     Sint64 length
+     Sint64 tell
+ 
+-cdef Sint64 subfile_size(SDL_RWops *context) nogil:
++cdef Sint64 subfile_size(SDL_RWops *context) noexcept nogil:
+     cdef SubFile *sf = <SubFile *> context.hidden.unknown.data1
+     return sf.length
+ 
+-cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil:
++cdef Sint64 subfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil:
+     cdef SubFile *sf = <SubFile *> context.hidden.unknown.data1
+ 
+     if whence == RW_SEEK_SET:
+@@ -151,7 +151,7 @@
+ 
+     return sf.tell
+ 
+-cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil:
++cdef size_t subfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil:
+     cdef SubFile *sf = <SubFile *> context.hidden.unknown.data1
+ 
+     cdef Sint64 left = sf.length - sf.tell
+@@ -170,7 +170,7 @@
+ 
+     return rv
+ 
+-cdef int subfile_close(SDL_RWops *context) nogil:
++cdef int subfile_close(SDL_RWops *context) noexcept nogil:
+     cdef SubFile *sf
+ 
+     if context != NULL:
+@@ -191,13 +191,13 @@
+     Sint64 split
+     Sint64 tell
+ 
+-cdef Sint64 splitfile_size(SDL_RWops *context) nogil:
++cdef Sint64 splitfile_size(SDL_RWops *context) noexcept nogil:
+     cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+     cdef Sint64 rv
+ 
+     return SDL_RWsize(sf.a) + SDL_RWsize(sf.b)
+ 
+-cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) nogil:
++cdef Sint64 splitfile_seek(SDL_RWops *context, Sint64 seek, int whence) noexcept nogil:
+     cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+     cdef Sint64 rv
+ 
+@@ -220,7 +220,7 @@
+     else:
+         return sf.tell
+ 
+-cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil:
++cdef size_t splitfile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil:
+     cdef SplitFile *sf = <SplitFile *> context.hidden.unknown.data1
+     cdef Sint64 left = splitfile_size(context) - sf.tell
+     cdef size_t rv
+@@ -251,7 +251,7 @@
+ 
+     return (left_read + right_read) // size
+ 
+-cdef int splitfile_close(SDL_RWops *context) nogil:
++cdef int splitfile_close(SDL_RWops *context) noexcept nogil:
+     cdef SplitFile *sf
+ 
+     if context != NULL:
+@@ -274,12 +274,12 @@
+     Uint8 *here
+     Uint8 *stop
+ 
+-cdef Sint64 buffile_size(SDL_RWops *context) nogil:
++cdef Sint64 buffile_size(SDL_RWops *context) noexcept nogil:
+     cdef BufFile *bf = <BufFile *> context.hidden.unknown.data1
+ 
+     return bf.stop - bf.base
+ 
+-cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) nogil:
++cdef Sint64 buffile_seek(SDL_RWops *context, Sint64 offset, int whence) noexcept nogil:
+     cdef BufFile *bf = <BufFile *> context.hidden.unknown.data1
+ 
+     cdef Uint8 *newpos
+@@ -302,7 +302,7 @@
+ 
+     return bf.here - bf.base
+ 
+-cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) nogil:
++cdef size_t buffile_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum) noexcept nogil:
+     cdef BufFile *bf = <BufFile *> context.hidden.unknown.data1
+     cdef size_t total_bytes = 0
+     cdef size_t mem_available = 0
+@@ -320,7 +320,7 @@
+ 
+     return (total_bytes // size)
+ 
+-cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) nogil:
++cdef size_t buffile_write(SDL_RWops *context, const void *ptr, size_t size, size_t num) noexcept nogil:
+     cdef BufFile *bf = <BufFile *> context.hidden.unknown.data1
+ 
+     if bf.view.readonly != 0:
+@@ -333,7 +333,7 @@
+ 
+     return num
+ 
+-cdef int buffile_close(SDL_RWops *context) with gil:
++cdef int buffile_close(SDL_RWops *context) noexcept with gil:
+     cdef BufFile *bf
+ 
+     if context != NULL:
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/surface.pyx	2023-03-30 06:10:16.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/surface.pyx	2024-08-20 23:23:41.720844257 +0300
+@@ -34,7 +34,7 @@
+     int pygame_Blit (SDL_Surface * src, SDL_Rect * srcrect,
+                  SDL_Surface * dst, SDL_Rect * dstrect, int the_args);
+ 
+-cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) nogil:
++cdef void move_pixels(Uint8 *src, Uint8 *dst, int h, int span, int srcpitch, int dstpitch) noexcept nogil:
+     if src < dst:
+         src += (h - 1) * srcpitch;
+         dst += (h - 1) * dstpitch;
+diff '--color=auto' -Naurd pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx
+--- pygame_sdl2-2.1.0+renpy8.2.3.orig/src/pygame_sdl2/transform.pyx	2015-08-13 03:31:25.000000000 +0300
++++ pygame_sdl2-2.1.0+renpy8.2.3/src/pygame_sdl2/transform.pyx	2024-08-20 23:24:30.513150042 +0300
+@@ -119,7 +119,7 @@
+     p += x
+     return p[0]
+ 
+-cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) nogil:
++cdef void set_at(SDL_Surface *surf, int x, int y, uint32_t color) noexcept nogil:
+     cdef uint32_t *p = <uint32_t*>surf.pixels
+     p += y * (surf.pitch // sizeof(uint32_t))
+     p += x
diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
new file mode 100644
index 000000000000..b31b0d62e9a9
--- /dev/null
+++ b/dev-python/pygame_sdl2/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>bircoph@gentoo.org</email>
+  <name>Andrew Savchenko</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
new file mode 100644
index 000000000000..307c62ca978b
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-8.2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+inherit distutils-r1
+
+MY_P="${PN}-2.1.0+renpy${PV}"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-8.2.3-cython-3.patch" )
+
+# <wheel-0.41.0 wasn't installing headers correctly
+# https://github.com/pypa/setuptools/issues/3997
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/wheel-0.41.0
+"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# PyGame distribution for this version has some pregenerated files;
+	# we need to remove them
+	rm -r gen{,3,-static} || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pythran/pythran-0.16.1.ebuild b/dev-python/pythran/pythran-0.16.1-r1.ebuild
index 51df5f775982..64fe7db51764 100644
--- a/dev-python/pythran/pythran-0.16.1.ebuild
+++ b/dev-python/pythran/pythran-0.16.1-r1.ebuild
@@ -31,7 +31,10 @@ RDEPEND="
 	=dev-python/gast-0.5*[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	|| (
+		<dev-python/setuptools-73[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-73.0.1[${PYTHON_USEDEP}]
+	)
 "
 DEPEND="
 	test? (
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 95b0947d5b43..41cf4603d6dc 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools-72.1.0.tar.gz 2419487 BLAKE2B df05affc48f8909b6b3b9dc30ef33e31c4b3781e747fea7d23b855d0294976f563e25b268666bfd2c758be66eca00e3e850463ff3d6f26b891185a2a15c8d31c SHA512 d0a34f16dfa6bb9a6df39076cd43528cf854d343f6f801c448ea0ebab2a259aec3d03571e2a26709df6082ed2fcb6c43b86448be556fd559b6af41831b4f38e0
 DIST setuptools-72.2.0.tar.gz 2419230 BLAKE2B f04c196d13f62302e7c6f30a1021598fe22955cc8c980ddf22efa65f4d398c25273552b1a19b8719e2fee722dc44e9f1a2e339c5b6da8f4ca4ae8399cd27b2e1 SHA512 029c711be2953cc7fd88b6a0a00715e05ac04414e085e0b2387d58757c970a3316afb6e13426fa10dcc53785b98c8543ba48d49acf223a6332399a39a4924732
-DIST setuptools-73.0.0.tar.gz 2515991 BLAKE2B 20d46021f023b2e830e2c4d6e61ac5e0c51a265adf2677023b089281f2f2dfa58046a4d6b82c48c00d5140b1e001347f2a3073c01ae14c85d6c925e46ed6ab03 SHA512 affae77da00378cc5d72dbaf90ab0541ef1d7e352343d8d2c6567a927d82ab69031ad42a31d1c2a1b886f98d6257515d98b07b7a36bda7efde794850f16b9452
+DIST setuptools-73.0.1.tar.gz 2526506 BLAKE2B 766453a7f6f3e34bdc63628b8c0321730c66381cc6048d01fbf9dbf76eb9900cd5cfa6dbd7c55c95ada3e01065d43bf7cd9029793e0735cae989b3cb1b95287c SHA512 5def2d817329524e610c7981fc3a84687ea4d2e0a72799341a706a16ec61df3efc16c4622f8b88746ad4cb52f92f2493c23a99a21cf3607ed48da480dedd200b
diff --git a/dev-python/setuptools/setuptools-73.0.0.ebuild b/dev-python/setuptools/setuptools-73.0.1.ebuild
index c50001959e20..c50001959e20 100644
--- a/dev-python/setuptools/setuptools-73.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-73.0.1.ebuild
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 6c7cf0ae67b6..881d81a5fcb6 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,4 @@
 DIST trimesh-4.4.3.gh.tar.gz 13606522 BLAKE2B d59c59e11b67c301c0171dc911cf1e518b57f9b3e9d0d4410130922eb0fc5b190ec5d8088e43d35fb7b09687a2698fe41342ce492fafc7bb050431cf43624c9b SHA512 b93ed203589a5467116c942b6d02db7eb4c130b7f110ea2612a2cf4d86d9f7943b949dd62d2229762a2a14f796041aa6a4294857a8fcc3b96d470a6925b9d568
 DIST trimesh-4.4.4.gh.tar.gz 13606701 BLAKE2B 52df2a318adbc1ef263734d1ecc55121c486a8d546a5e3452d38f6e580e89dabe72eb8f437e023391bf5ae10a145d453ef1b3309af8d7a8fd37d20aa14f92832 SHA512 afeeca5532208bacca9e5539d894f72c7e93975c9f932487a852033ed75d20fe29a66880c62d3daf1ff328c198e40464ad3751c69e190994fd0ccc19da5723cf
 DIST trimesh-4.4.6.gh.tar.gz 13606676 BLAKE2B 8183a757067d531bac4a959d770e619b6b9ccfc629e39a8b7ee9cc372aec518a056c7d0c27016103b2e535174046a4387e9719d0e9b749a8c4ee32b610f82211 SHA512 33b4ae7b5c5336140be7eedff82f112e3830bbddf835042b1ea7b95e643fe7e8943c38e80518778be122c1ec76d151af870df9afbce011438b38c13f967d4e4a
+DIST trimesh-4.4.7.gh.tar.gz 13606593 BLAKE2B 1847d601711df60257a8f1248cdea66fcc6489b570606c9ab1d360db2742a9e7c1f0d6093924afa7105a5a272e80c291b1c3568b041db2ee4d144e72ab44fbd8 SHA512 b3e1a670b8dec26df3357cad4205431e94fc2b59b87af976b0754ac8e46f4f930f768322f0aa236a6205c289b9037f2343ec6aaeb0e281f021a03d3147be3d20
diff --git a/dev-python/trimesh/trimesh-4.4.7.ebuild b/dev-python/trimesh/trimesh-4.4.7.ebuild
new file mode 100644
index 000000000000..3a9c1843a308
--- /dev/null
+++ b/dev-python/trimesh/trimesh-4.4.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimesh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	dev-python/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mapbox-earcut[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=1800
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# require pyinstrument
+		tests/test_sweep.py
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox-earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
+}
diff --git a/dev-python/txtorcon/Manifest b/dev-python/txtorcon/Manifest
index a86c5713e677..6da9256048af 100644
--- a/dev-python/txtorcon/Manifest
+++ b/dev-python/txtorcon/Manifest
@@ -1 +1,2 @@
 DIST txtorcon-23.11.0.gh.tar.gz 395211 BLAKE2B 156c1c1d7e1d88939051ea19f4cd955e3a329dd1a550ea1a35d6c984db66d9b8e7fff35b2aa5caa12589273b46c1ce65d802fe89ce2a57443e0b5ce592247ee0 SHA512 815aecd8b6f3d12be1f903ba4dbb037e5f5920d925ca06c9f92a040d8258c4c1182ae5fca0be26fd2adb529c1726ad9ee080ddcada56e3e8b9922f7295731df3
+DIST txtorcon-24.8.0.gh.tar.gz 395135 BLAKE2B 14e800e64788fac8d840ee00f2032d697227d568ec671a040ae63d95849fc50d17e602bcac625251094237ef642dc1f05032735b06b52053a05fde33d41acc0d SHA512 b5e3d8f470dd2561b3291349d2d7b60bcc78b6f4eae7cc98e400cdbe57ff8dc5a5f7c59b3068a221faf60715296af1dd2587663c32d40ac70f37ddaa94cdd940
diff --git a/dev-python/txtorcon/txtorcon-24.8.0.ebuild b/dev-python/txtorcon/txtorcon-24.8.0.ebuild
new file mode 100644
index 000000000000..d72857c0fa4e
--- /dev/null
+++ b/dev-python/txtorcon/txtorcon-24.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Twisted-based Tor controller client, with state-tracking abstractions"
+HOMEPAGE="
+	https://txtorcon.readthedocs.org/
+	https://github.com/meejah/txtorcon/
+	https://pypi.org/project/txtorcon/
+"
+SRC_URI="
+	https://github.com/meejah/txtorcon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/automat[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twisted[ssl,${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		sys-process/lsof
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/unearth/Manifest b/dev-python/unearth/Manifest
index 938d632930c7..7c882ad82985 100644
--- a/dev-python/unearth/Manifest
+++ b/dev-python/unearth/Manifest
@@ -1,4 +1,2 @@
-DIST unearth-0.15.5.tar.gz 283787 BLAKE2B 2910be23141eb0a683766e83eae1cd35a074b98aaba7c25f49f06a321c261583a65bcb2cbd56c129efc1551e2f421e29dde784d3689c0dfc45d420c870a9b112 SHA512 84851788cd6bf6743307bb5a49fff1b6eeadd3f73605f4b2f7ffe1720d50713971d7cf020e17f34bbe755f523400a6149ace9add1c680bb955f6b46e8e092cba
-DIST unearth-0.16.0.tar.gz 283848 BLAKE2B e94989b643450b0e1a12c4bcd65339c1e52acd04a447616779f085297fa13bc09e25527b858383ef2b8d645304ea42f43c41415c930064e0515569a5836cd1fb SHA512 b129c546bdd8b1f364404ad4db8e43d471a1f9e3a2cbc99775a6c3aa5bce99ed127d1cbd859c69f8c2bae7f7c8b907426c2597d27323c6b6f408df047de2410e
-DIST unearth-0.16.1.tar.gz 283913 BLAKE2B 91f599fd21e6100be7e3f3d422d595e4402a652057b327ec2f6baa45f30301ea7571473e17d202017d7d7a92f7b11acdc42d1c655865499b9eeb8bfb1f7c00a3 SHA512 2819c4da65d0bb9492546531012699fa4554d309930de4b9cc8a5319edc19c1863993badaa53c8f646b152abf133043b2d3d3816f2adb9827ed7f25541e5d603
 DIST unearth-0.17.0.tar.gz 284068 BLAKE2B b37c1e9e626f3d6409fb0a22baebedc210df2c76afcb41f12730a5c9ff714bcf94cf7e78b97851676d45a73feec40d630ab5993cad44fabedcec5a771cb78c9f SHA512 2b9ba4d4262baac448b4507547a5887d5a50254e02f050576e68efeb952a57e2e38f93b440a753263abeca4ae062c07d9b702f10d29ff9252af13cfc16978c3d
+DIST unearth-0.17.1.tar.gz 284159 BLAKE2B 55b8f18f06613f0398316bbcadee6b928e6f20fdc978bdde6c0c1ce3b75a46e1cd2734d036302b8b5a98e9ec5a92aa7d00b00ff01ae815149d507cdab2f6dd5f SHA512 3e451d6f40b16520d4a6e1f4ca6f3997bc346f189330c7373089701d9203543f159b5af843aa8144c2b0ca871a84909292b34b5a666e3a0b541fdbc643340050
diff --git a/dev-python/unearth/unearth-0.16.0.ebuild b/dev-python/unearth/unearth-0.16.0.ebuild
deleted file mode 100644
index b84ab6eae8ca..000000000000
--- a/dev-python/unearth/unearth-0.16.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/httpx-1[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.27.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver -p pytest_mock
-}
diff --git a/dev-python/unearth/unearth-0.16.1.ebuild b/dev-python/unearth/unearth-0.16.1.ebuild
deleted file mode 100644
index b84ab6eae8ca..000000000000
--- a/dev-python/unearth/unearth-0.16.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=pdm-backend
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A utility to fetch and download python packages"
-HOMEPAGE="
-	https://pypi.org/project/unearth/
-	https://github.com/frostming/unearth/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	<dev-python/httpx-1[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.27.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/requests-wsgi-adapter[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p pytest_httpserver -p pytest_mock
-}
diff --git a/dev-python/unearth/unearth-0.15.5.ebuild b/dev-python/unearth/unearth-0.17.1.ebuild
index b84ab6eae8ca..b84ab6eae8ca 100644
--- a/dev-python/unearth/unearth-0.15.5.ebuild
+++ b/dev-python/unearth/unearth-0.17.1.ebuild
diff --git a/dev-python/uv/uv-0.2.36.ebuild b/dev-python/uv/uv-0.2.36.ebuild
index 742fb33a526d..3ccf2c32a218 100644
--- a/dev-python/uv/uv-0.2.36.ebuild
+++ b/dev-python/uv/uv-0.2.36.ebuild
@@ -80,7 +80,10 @@ src_prepare() {
 	default
 
 	# remove patch.* that breaks GIT_CRATES
-	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-21ceec9a5fd2e8d6f71c3ea2999078fecbd13cbe/reqwest-middleware\" }@" Cargo.toml || die
+	local reqmw=${GIT_CRATES[reqwest-middleware]}
+	reqmw=${reqmw#*;}
+	reqmw=${reqmw%;*}
+	sed -i -e "/^\[patch/,\$s@^\(reqwest-middleware = \).*@\1 { path = \"${WORKDIR}/reqwest-middleware-${reqmw}/reqwest-middleware\" }@" Cargo.toml || die
 
 	# https://github.com/vorot93/tokio-tar/pull/23
 	# (fortunately uv already depends on portable-atomic, so we don't
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 79b83abd3c89..86e73dd060b5 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,2 +1,3 @@
 DIST xdoctest-1.1.5.gh.tar.gz 230382 BLAKE2B 0bbcd09464cc48d6450c746fc341892401bfa91a18be45ab340d291a4001a71f6d5a0fca6b3a7e869c2c34ce008e992fdac62fdd898a941659017e9bf68b7ae9 SHA512 6664eef216f7e83236673542bcdd75276c14260dd94026575e4e72ff41c6b4249909659e54a46fda84c49e22954fb169d23a1baf439823d28337731232803781
 DIST xdoctest-1.1.6.gh.tar.gz 230764 BLAKE2B 9a46f5339e5e7c1904f71f80eecfa385d78775aea896cf86b26288f3fdc63045e17b3d420c48a0f53c57c8992d048d2b7610f09276d772c26e147f492a71d3ad SHA512 9d33e315cde68f1731cff8b4311c941a30aba0718a94f81ca198a2efe760c829f6d4984f0d1c273c554aef938d445d2556d78d7f06fbe4160efe5d94acea9a53
+DIST xdoctest-1.2.0.gh.tar.gz 231269 BLAKE2B 5593bfa8a2d4ff6ff13db592e83325c6bd30e6614db969aec7b4072ec788a203024a0e4066b69a34782cc99252d0601a0a3db0c2b70cf5b7f58e9f6dad2de89d SHA512 a33509e494919bbcb630307b0a71f784d7e2be1d1c6422e49c2286218f21202088faa4baabc5e33a836225ca1fd0c12937de15a9a5b90ac4a80f35c8218b0071
diff --git a/dev-python/xdoctest/xdoctest-1.2.0.ebuild b/dev-python/xdoctest/xdoctest-1.2.0.ebuild
new file mode 100644
index 000000000000..9ac6db1f0f9c
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-1.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="
+	https://github.com/Erotemic/xdoctest/
+	https://pypi.org/project/xdoctest/
+"
+SRC_URI="
+	https://github.com/Erotemic/xdoctest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+"
+# dev-python/nbformat-5.1.{0..2} did not install package data
+BDEPEND="
+	test? (
+		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+#distutils_enable_sphinx docs/source \
+#	dev-python/autoapi \
+#	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		tests/test_pytest_cli.py::test_simple_pytest_import_error_cli
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdoctest.plugin
+
+	epytest --pyargs tests xdoctest
+}