Adding metadata

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-07-06 21:36:11 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2024-07-06 21:36:11 +0000
commit: b96e1c10114b0bbfe80e5b660fdc15f30b20e986 (patch)
tree: 0d03a2ef863e08807580bc53ade14e37895e99b1 /dev-python
parent: 00cc746cb29fda18e142951ff748a87781347813 (diff)
download: baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.tar.gz
baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.tar.xz
baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.zip
95 files changed, 455 insertions, 2012 deletions
diff --git a/dev-python/astroid/astroid-3.2.2.ebuild b/dev-python/astroid/astroid-3.2.2.ebuild
index 755ae225c2ec..4040ed2796f5 100644
--- a/dev-python/astroid/astroid-3.2.2.ebuild
+++ b/dev-python/astroid/astroid-3.2.2.ebuild
@@ -33,7 +33,6 @@ BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/attrs[${PYTHON_USEDEP}]
-		<dev-python/numpy-2[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '
@@ -59,6 +58,14 @@ python_test() {
 		tests/test_nodes.py::AsStringTest::test_recursion_error_trapped
 		# TODO
 		tests/test_builder.py::BuilderTest::test_data_build_error_filename
+		# numpy-2
+		tests/brain/numpy/test_core_einsumfunc.py::test_numpy_function_calls_inferred_as_ndarray
+		tests/brain/numpy/test_core_fromnumeric.py::BrainNumpyCoreFromNumericTest::test_numpy_function_calls_inferred_as_ndarray
+		tests/brain/numpy/test_core_multiarray.py::BrainNumpyCoreMultiarrayTest::test_numpy_function_calls_inferred_as_ndarray
+		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_datetime_astype_return
+		tests/brain/numpy/test_core_numerictypes.py::NumpyBrainCoreNumericTypesTest::test_generic_types_are_subscriptables
+		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type
+		tests/brain/numpy/test_core_umath.py::NumpyBrainCoreUmathTest::test_numpy_core_umath_functions_return_type_tuple
 	)
 
 	case ${EPYTHON} in
diff --git a/dev-python/bashate/bashate-2.1.1.ebuild b/dev-python/bashate/bashate-2.1.1.ebuild
index f9200f9db732..3918d5de63ec 100644
--- a/dev-python/bashate/bashate-2.1.1.ebuild
+++ b/dev-python/bashate/bashate-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2396b2f04ad7..c484393579a6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,7 +1,3 @@
-DIST boto3-1.34.127.gh.tar.gz 820740 BLAKE2B ddfb7802440a01af27059daed4bc7cd3797eb192004a0e7b78e1e56a8ff479206b4835a79bcac1db273c2936fb8dfde0ba16bebe8cbe1befeb188070bf46b2c7 SHA512 b139ad68a4ce29e84e0fa1618b97c4aea13b668521921712df74256ad61c21d2077ea216dfb4102d8f9910a8119b24509aa10a504d746bdb410fee1cecc0461c
 DIST boto3-1.34.131.gh.tar.gz 822851 BLAKE2B cc4b06ca1785e62314308efb7d9ffa6e10a40fe48bdd3e31f9f12490a57843ad528685d04ea9ec40cf2203acc0ee0a9fb58ee272837c9a637f44c2716f60de7a SHA512 79cd8718c6d84cdcdcadfcde80368addc095770624806eb8cfa981852c2a8ebcc8074533ec8f8e24b01a3aed241afccb6f49fdce250ae07f630d8596931778e3
 DIST boto3-1.34.136.gh.tar.gz 826543 BLAKE2B 307705ba777d155772a2dafad775e55d94e17a9e4c2986e48bd8a691c3bc4e433f212e1a59053222927bda42584b2d1d266bc2489f94fd3e4463416c56531d54 SHA512 f2307db517b393164028c17a8073c5baf7f7e3be36c988a90d455cad98a55b7a7e1a6e44584038141047237e81cb495bffaf70747de421ce316bb457e2d168e8
-DIST boto3-1.34.137.gh.tar.gz 827294 BLAKE2B ba4f008114e02f40c5e4ac095241c7dac2b919e1dbe7ffaacc9ab40b3d2a97a12ace2b27359190b20cf2f2c1dcc66044188f15ed12177b002a54537a692b0203 SHA512 7303b32359080f360a95e0fb068ca1e7b83fe54a5f553f6681df3382bd110c70927138e435afc8eb8e93760c9bd685afa7355e661243e6b7f91cd8e8063d401c
-DIST boto3-1.34.138.gh.tar.gz 827512 BLAKE2B d8022cb470f2f68bf16dd179fb348b3419a4fc7dd2095816916619dc314809db6a2385e86b83ff552609a4cb6285369d806debac20887cefa69b113cd0385552 SHA512 9e12dd97ffd1f15cdb527219184bef8dff012bd9b11214f566fd98a82b37e6ee9699b05de62eb48393ff551089d683143373cbef167ca7e35e64851894fb3fe1
-DIST boto3-1.34.139.gh.tar.gz 828069 BLAKE2B 71abb24a57f173a4136e8334fa2db9f2b5d92d2e154141da122575869e0b40bbe1f8ee893a8b8735ce8f6d2c7457334c5e08ead983a01516d591d594528c4cdb SHA512 bc3ca92551ffa9d2400341982b670b70ccbd539539fd86d6ec88091606504ad74247103ef9677d45023f4e2f9d737878c55313c28f08299d24b06701eb221ced
 DIST boto3-1.34.140.gh.tar.gz 828290 BLAKE2B 129c0f791ddc07f90d2b9ae2972839a0bcaa393e3a8f843a9bca9ebf699f36290b95d17c3f906f49ae5c9ee8cd15c5de7f9de96572573f12d40c7ada778c7679 SHA512 b052ac336e68577140017b5a45f1787eec985e42d86e25cdafc15c6eadf8652b75bb006cf86ce0a3e0d9f3b657ae2afee41a75f624fb5e277a49f1653a83f64f
diff --git a/dev-python/boto3/boto3-1.34.127.ebuild b/dev-python/boto3/boto3-1.34.127.ebuild
deleted file mode 100644
index 1ad6d3c11774..000000000000
--- a/dev-python/boto3/boto3-1.34.127.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/boto3/boto3-1.34.137.ebuild b/dev-python/boto3/boto3-1.34.137.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.137.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/boto3/boto3-1.34.138.ebuild b/dev-python/boto3/boto3-1.34.138.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.138.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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/boto3/boto3-1.34.139.ebuild b/dev-python/boto3/boto3-1.34.139.ebuild
deleted file mode 100644
index 509842b2699d..000000000000
--- a/dev-python/boto3/boto3-1.34.139.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 6bb8463c7bc2..9cc647408609 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,3 @@
-DIST botocore-1.34.127.gh.tar.gz 13112261 BLAKE2B e883f0a1e29178667678132195aea9666a124456e731e1b158eed895c125fd614e5671639766f7ad46c2e6b16c4156ff5e42594bc04e49bf25380c91cfcbe264 SHA512 48ca2179c24bb219202e5029dd62350a6fc5c64707762f0f33282e542dbc2227bb146376afa9e6b9eb1e45e3c801208a142bef4827d5036eb4724299c826d534
 DIST botocore-1.34.131.gh.tar.gz 13129943 BLAKE2B 916360c6a9526edcfd338718f80556e59d54692aac13f38490e49457edd59016d264a5acbfeb6298af494f09f9c385e16347a9bf7f144c5a11afda2df188aeed SHA512 9bb788ac8e8a2ec7be999acafef88ccbb4e693ccb315efe5655b80cf3f6629eebccbdac6f201550d2f75e476d83c5a800f1add6c71e2fe5b3d503da313f6d3d3
 DIST botocore-1.34.136.gh.tar.gz 13151618 BLAKE2B 800b800ff2481335f0defb79c10a4216c8bb107a3369e6a45a9c0a6d8f703209a9e44560ebf859f7fc616498c68e9b0de331478a8b5e2d3b36788bdedb597a0b SHA512 e9a31f6e8e241964fa34df65c8a9f8acaa1e33865eeb8257bf6da16982a3704b8ab66b6f424952ff100944471bb8f40cbdbcc26f72120da2d6033319948de81e
-DIST botocore-1.34.137.gh.tar.gz 13153450 BLAKE2B 4049e5f7b12a4df94fa4a819f11732b86897ae838cc1fc9443f343037915e69134c0e3f335796976002ca63305dd12a8272252bed9370b6d64dc83186826467f SHA512 f3ba697813ec4a68978f27be12e44df02336210e47b5347f3868c4630d899eccf4cb0e0cc679122e4e5ae55ba002efc7067e6e13ea5a286707b958cae14b4186
-DIST botocore-1.34.138.gh.tar.gz 13153609 BLAKE2B d2f16e1c49b51dbe35e21774bac766b88ad83cad18c6ee972de7f83086d1d00eb70826dbc0ffaff2b4bdb916fa22a849c1c0b8a4980206d9fb8c8288a047d803 SHA512 a43deaa3a5e95dbaa3a018907b8b44b822c399542f91291963e31708efbe06ca566f5f1290ba9c13359ebcac3566586d5b1c4ba391778ca11ed2d09ef1335162
-DIST botocore-1.34.139.gh.tar.gz 13155941 BLAKE2B 8c916972478f947f75cc9e864904da5f9304d8ae1e454ff2777d943ffc7fec6959c34ade893ce74d7b63cc15133317dab4b3610ec0ad8f7e73255d37411a2cf0 SHA512 6cd86c0bbebf9251060dd2b16962dbc514bb487c33fb13301a7d8e4e036d56f9c20a252e89be94209962ff83d253eba4e568babbf8c6b93987274050c48a6e3c
 DIST botocore-1.34.140.gh.tar.gz 13156596 BLAKE2B 4a264fe767c35dcc65ddbe1eb29529d2576553e4d6f9a3d6c28f249aaa0eab5a0fd150fdbdc1dbd1b83cc1fb6fce8f58c68de43f5dc338cb3feb5b9f76c8f973 SHA512 36c90da9670639ccc10e65ced501a2b16e50b664f11be2686f6fcfc56fa81271f160b27b7ffac513446afe09ef6ed4768818ad8b8ca540571737c47fdf980443
diff --git a/dev-python/botocore/botocore-1.34.127.ebuild b/dev-python/botocore/botocore-1.34.127.ebuild
deleted file mode 100644
index beb1bdc6a919..000000000000
--- a/dev-python/botocore/botocore-1.34.127.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.137.ebuild b/dev-python/botocore/botocore-1.34.137.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.137.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.138.ebuild b/dev-python/botocore/botocore-1.34.138.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.138.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.139.ebuild b/dev-python/botocore/botocore-1.34.139.ebuild
deleted file mode 100644
index 857224b496b7..000000000000
--- a/dev-python/botocore/botocore-1.34.139.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.34.140.ebuild b/dev-python/botocore/botocore-1.34.140.ebuild
index 857224b496b7..dc25df1879f6 100644
--- a/dev-python/botocore/botocore-1.34.140.ebuild
+++ b/dev-python/botocore/botocore-1.34.140.ebuild
@@ -62,6 +62,16 @@ python_test() {
 		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::test_create_single_paginator_memory_constant
+				tests/functional/leak/test_resource_leaks.py::TestDoesNotLeakMemory::test_create_single_waiter_memory_constant
+			)
+			;;
+	esac
+
 	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 7450c87d3457..8ce948a5e14e 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1 @@
-DIST Bottleneck-1.3.8.tar.gz 103252 BLAKE2B 1e520e33eaa86b7328d469a8de2f0cacedb401f9dab3686cad40132caa23e77055b71e630fadda9305f3d416e8958e9762053e6d46afba4cf15489db77418b67 SHA512 951a927ce368643e2ccb5154c05381ce9ff17bc703c0bcd85eab547e345601ad82eb1dc85fa16d667753bf3dc9d0296025984dae463a0153944a85a085331a8e
 DIST bottleneck-1.4.0.tar.gz 103490 BLAKE2B c72b53bd1f4325fa53d7824e335ec50a37da7650c097bdda22548637c1e5a95bfa219dad1361dfb2eecdcf0fa1445a5c6cfb94b7472290fa6317524dc474f46c SHA512 07c1224d63a34e12488dce1f72152fdc493db904130cef46092f7f9c3218a04032e90d64dbf385069072c5d56c7ea09db15897d5c77b9d53db2e3da9414f84cc
-DIST bottleneck-1.4.0rc5.tar.gz 103528 BLAKE2B 760c0958507b5472525694f7b5a11bdb999aa7fb14ab1465d49a81ef8725a007cf070e8393a807a703af7aad1419aafb19859d62bf8871be0348d60b4913d62c SHA512 68394c00567456af54096005d1f971abe872ee1f6d8776aac46d7e183bbb20dbee730e6845fd2c94cdc4dcdb4b8da2e154610784227d5058153c078c61bd9311
diff --git a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild b/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
deleted file mode 100644
index 1336cf5e0bd1..000000000000
--- a/dev-python/bottleneck/bottleneck-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-DEPEND="
-	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://github.com/pydata/bottleneck/pull/450
-	"${FILESDIR}/${P}-numpy-2.patch"
-)
-
-src_prepare() {
-	# don't overwrites user's optimization level
-	sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# GC assumptions?
-				tests/memory_test.py::test_memory_leak
-			)
-			;;
-	esac
-
-	rm -rf bottleneck || die
-	epytest --pyargs bottleneck
-}
diff --git a/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild b/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild
deleted file mode 100644
index 126ce47f5820..000000000000
--- a/dev-python/bottleneck/bottleneck-1.4.0_rc5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Fast NumPy array functions written in C"
-HOMEPAGE="
-	https://github.com/pydata/bottleneck/
-	https://pypi.org/project/Bottleneck/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-
-DEPEND="
-	>=dev-python/numpy-1.9.1:=[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# don't overwrites user's optimization level
-	sed -e '/extra_compile_args=\["-O2"\]/d' -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	case ${EPYTHON} in
-		pypy3)
-			EPYTEST_DESELECT+=(
-				# GC assumptions?
-				tests/memory_test.py::test_memory_leak
-			)
-			;;
-	esac
-
-	rm -rf bottleneck || die
-	epytest --pyargs bottleneck
-}
diff --git a/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch b/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
deleted file mode 100644
index 153b984f1fe7..000000000000
--- a/dev-python/bottleneck/files/bottleneck-1.3.8-numpy-2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 787d6daa292ef013efb2ce93f100079457330363 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Thu, 9 May 2024 20:27:16 +0200
-Subject: [PATCH 3/3] Replace np.array(a, copy=False) with np.asarray(a)
-
-See https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
----
- bottleneck/slow/move.py           | 8 ++++----
- bottleneck/slow/nonreduce_axis.py | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/bottleneck/slow/move.py b/bottleneck/slow/move.py
-index 0aa06f141..76a54a24e 100644
---- a/bottleneck/slow/move.py
-+++ b/bottleneck/slow/move.py
-@@ -52,7 +52,7 @@ def move_argmin(a, window, min_count=None, axis=-1):
-     "Slow move_argmin for unaccelerated dtype"
- 
-     def argmin(a, axis):
--        a = np.array(a, copy=False)
-+        a = np.asarray(a)
-         flip = [slice(None)] * a.ndim
-         flip[axis] = slice(None, None, -1)
-         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
-@@ -78,7 +78,7 @@ def move_argmax(a, window, min_count=None, axis=-1):
-     "Slow move_argmax for unaccelerated dtype"
- 
-     def argmax(a, axis):
--        a = np.array(a, copy=False)
-+        a = np.asarray(a)
-         flip = [slice(None)] * a.ndim
-         flip[axis] = slice(None, None, -1)
-         a = a[tuple(flip)]  # if tie, pick index of rightmost tie
-@@ -115,7 +115,7 @@ def move_rank(a, window, min_count=None, axis=-1):
- 
- def move_func(func, a, window, min_count=None, axis=-1, **kwargs):
-     "Generic moving window function implemented with a python loop."
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     if min_count is None:
-         mc = window
-     else:
-@@ -226,7 +226,7 @@ def lastrank(a, axis=-1):
-     -0.5
- 
-     """
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     ndim = a.ndim
-     if a.size == 0:
-         # At least one dimension has length 0
-diff --git a/bottleneck/slow/nonreduce_axis.py b/bottleneck/slow/nonreduce_axis.py
-index f09dfa739..1dd67529a 100644
---- a/bottleneck/slow/nonreduce_axis.py
-+++ b/bottleneck/slow/nonreduce_axis.py
-@@ -15,7 +15,7 @@ def nanrankdata(a, axis=None):
- 
- 
- def _rank(func1d, a, axis):
--    a = np.array(a, copy=False)
-+    a = np.asarray(a)
-     if axis is None:
-         a = a.ravel()
-         axis = 0
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 607cd0b7f5f3..4818bc34be61 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,2 +1 @@
-DIST cairocffi-1.7.0.tar.gz 87840 BLAKE2B f31a07c865e16fb5448451bb2a57c2f33017165d2c374a4ea60222a28dc7a9bfd9839a6014594c5e90cc8880773e85cbb29e5bcc5c32d0150b07274f25f81b94 SHA512 bfc0f388a6ea1885523d99ad0ccfd59fec89848ef053c240ea9e3e8aab3f3aed5dc343b74de5cc72fb8512d460e55c70ef99a4ae4705fb1dd92d654a4197d7a9
 DIST cairocffi-1.7.1.tar.gz 88096 BLAKE2B 5bb9dfe0617b838c386d4da6536758fb4f10520e9ccf7e8d1610e5f67f6393ba101c6466f78a3916de518955b6c8cc5d907debbf595776bca8313b13e0ddc5f3 SHA512 1d0c069c0af4ba552312e7fc003461bf321725212888938cafee168574f8927ce7d6860c016ba972343e67cb59a588fc98c198c75ce3ee3d75aa77874364e190
diff --git a/dev-python/cairocffi/cairocffi-1.7.0.ebuild b/dev-python/cairocffi/cairocffi-1.7.0.ebuild
deleted file mode 100644
index 58f3089e44ca..000000000000
--- a/dev-python/cairocffi/cairocffi-1.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="
-	https://github.com/Kozea/cairocffi/
-	https://pypi.org/project/cairocffi/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-DEPEND="
-	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
-	x11-libs/cairo:0=[X,xcb(+)]
-	x11-libs/gdk-pixbuf[jpeg]
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	' 'python*')
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pikepdf[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.0-tests.patch
-)
-
-src_test() {
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cheetah3/Manifest b/dev-python/cheetah3/Manifest
index 5605fe979ce8..a95572b816d3 100644
--- a/dev-python/cheetah3/Manifest
+++ b/dev-python/cheetah3/Manifest
@@ -1,2 +1 @@
-DIST cheetah3-3.3.1.gh.tar.gz 315007 BLAKE2B 627cb435db1cf274861a29b993f49457c1ba4147b6e1514b5d5961a2fd565c39ff9cae3bcd9665379c5206dc2cef98a6bf159781e664d75d87fa8c4244ec4e43 SHA512 057d3772390076157a0e09e6b5e60ad0ec3b1669aa62741bcfd314f846bba091884d361382d6399e73bce06aaf49366ee3cbeb040c6f5b3e00423eefd440c300
 DIST cheetah3-3.3.3.gh.tar.gz 315249 BLAKE2B f5dc748c49adbddffb0339069f800583739bffce8085c3abb80080d14d051a334e6b7d1b8ced218218334cae6cc000877570f3ab7c1ef0d760de36bf956f9c2e SHA512 638ee6ca0d37b86cfa93f8fc0da4c259da639c3b107c8810201e4bed30ca4674b5e546abc1d8f716d1bba7d1c72d51f559894a90580fa02f1409f7a73a246001
diff --git a/dev-python/cheetah3/cheetah3-3.3.1.ebuild b/dev-python/cheetah3/cheetah3-3.3.1.ebuild
deleted file mode 100644
index f2e5ecec13d8..000000000000
--- a/dev-python/cheetah3/cheetah3-3.3.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 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_{8,9,10,11,12} )
-
-inherit distutils-r1
-
-MY_P=${P/_p/.post}
-DESCRIPTION="Python-powered template engine and code generator"
-HOMEPAGE="
-	https://cheetahtemplate.org/
-	https://github.com/CheetahTemplate3/Cheetah3/
-	https://pypi.org/project/Cheetah3/
-"
-SRC_URI="
-	https://github.com/CheetahTemplate3/Cheetah3/archive/${PV/_p/.post}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
-
-RDEPEND="
-	dev-python/markdown[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	${RDEPEND}
-"
-
-DOCS=( ANNOUNCE.rst README.rst TODO )
-
-python_test() {
-	# the package can't handle TMPDIR with hyphens
-	# https://github.com/CheetahTemplate3/cheetah3/issues/53
-	local -x TMPDIR=/tmp
-
-	"${EPYTHON}" Cheetah/Tests/Test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cheetah3/cheetah3-3.3.3.ebuild b/dev-python/cheetah3/cheetah3-3.3.3.ebuild
index 9eb80e6f19e7..25e52d43e860 100644
--- a/dev-python/cheetah3/cheetah3-3.3.3.ebuild
+++ b/dev-python/cheetah3/cheetah3-3.3.3.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=setuptools
-# py3.13: https://github.com/CheetahTemplate3/cheetah3/issues/60
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
@@ -36,6 +35,11 @@ BDEPEND="
 
 DOCS=( ANNOUNCE.rst README.rst TODO )
 
+PATCHES=(
+	# https://github.com/CheetahTemplate3/cheetah3/commit/ee2739b73bafbcb9a8cc5511d5e03e6b0d9bced1
+	"${FILESDIR}/${P}-py313.patch"
+)
+
 python_test() {
 	# the package can't handle TMPDIR with hyphens
 	# https://github.com/CheetahTemplate3/cheetah3/issues/53
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 190a94518940..d8983bfac4e7 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
+DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
diff --git a/dev-python/clang-python/clang-python-19.0.0_pre20240706.ebuild b/dev-python/clang-python/clang-python-19.0.0_pre20240706.ebuild
new file mode 100644
index 000000000000..82c18f7c0f95
--- /dev/null
+++ b/dev-python/clang-python/clang-python-19.0.0_pre20240706.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-devel/clang:${LLVM_MAJOR}
+	)
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	# tests rely on results from a specific clang version, so override
+	# the search path
+	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
+	local -x CLANG_NO_DEFAULT_CONFIG=1
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index fbd04b987fa4..d67f57961d8d 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/cysignals/cysignals-1.11.4-r1.ebuild b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
new file mode 100644
index 000000000000..a257827a76f3
--- /dev/null
+++ b/dev-python/cysignals/cysignals-1.11.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 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_{8,9,10,11,12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Interrupt and signal handling for Cython"
+HOMEPAGE="
+	https://github.com/sagemath/cysignals/
+	https://pypi.org/project/cysignals/
+"
+
+# setup.py has "or later"
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+
+DEPEND="
+	sci-mathematics/pari:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# https://github.com/sagemath/cysignals/pull/204
+	"${FILESDIR}/${P}-helper.patch"
+)
+
+python_test(){
+	local -x PATH="${BUILD_DIR}/scripts:${PATH}"
+	"${EPYTHON}" -B rundoctests.py src/cysignals/*.pyx || die
+}
diff --git a/dev-python/cysignals/cysignals-1.11.4.ebuild b/dev-python/cysignals/cysignals-1.11.4.ebuild
deleted file mode 100644
index 2c518ca6e16e..000000000000
--- a/dev-python/cysignals/cysignals-1.11.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_EXT=1
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Interrupt and signal handling for Cython"
-HOMEPAGE="https://pypi.org/project/cysignals/
-	https://github.com/sagemath/cysignals"
-
-# setup.py has "or later"
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sci-mathematics/pari:="
-RDEPEND="${DEPEND}"
-BDEPEND=">=dev-python/cython-3.0.0[${PYTHON_USEDEP}]"
-
-python_test(){
-	PATH="${BUILD_DIR}/scripts:${PATH}" \
-		"${EPYTHON}" -B "${S}"/rundoctests.py \
-		"${S}"/src/cysignals/*.pyx || die
-}
diff --git a/dev-python/cysignals/files/cysignals-1.11.4-helper.patch b/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
new file mode 100644
index 000000000000..0c09f236eccb
--- /dev/null
+++ b/dev-python/cysignals/files/cysignals-1.11.4-helper.patch
@@ -0,0 +1,85 @@
+From 2abd7ef94775b3320b6f1954b55168e06da0e6b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 6 Jul 2024 13:06:49 +0200
+Subject: [PATCH] Install cysignals-CSI-helper as package data for better
+ portability
+
+Rather than installing `cysignals-CSI-helper.py` into a `share`
+directory and then trying to figure out the correct path to it, install
+it as Python package data and use the standard `importlib.resources`
+API to access it.  For Python versions older than 3.9,
+the `importlib_resources` backport is used instead.
+
+Fixes #200
+---
+ setup.py                                      |  4 +++-
+ .../cysignals-CSI-helper.py                   |  0
+ src/scripts/cysignals-CSI                     | 20 ++++++++++---------
+ 3 files changed, 14 insertions(+), 10 deletions(-)
+ rename src/{scripts => cysignals}/cysignals-CSI-helper.py (100%)
+
+diff --git a/setup.py b/setup.py
+index 7953170..7154a4a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -215,7 +215,6 @@ setup(
+     packages=["cysignals"],
+     package_dir={"": "src"},
+     package_data={"cysignals": ["*.pxd", "*.h"]},
+-    data_files=[(opj("share", "cysignals"), [opj("src", "scripts", "cysignals-CSI-helper.py")])],
+     scripts=glob(opj("src", "scripts", "cysignals-CSI")),
+     cmdclass=dict(
+         configure=configure,
+@@ -223,4 +222,7 @@ setup(
+         build_ext=build_ext,
+         bdist_egg=no_egg
+     ),
++    install_requires=[
++        "importlib_resources; python_version < '3.9'",
++    ],
+ )
+diff --git a/src/scripts/cysignals-CSI-helper.py b/src/cysignals/cysignals-CSI-helper.py
+similarity index 100%
+rename from src/scripts/cysignals-CSI-helper.py
+rename to src/cysignals/cysignals-CSI-helper.py
+diff --git a/src/scripts/cysignals-CSI b/src/scripts/cysignals-CSI
+index dd8b4e6..3896dca 100755
+--- a/src/scripts/cysignals-CSI
++++ b/src/scripts/cysignals-CSI
+@@ -41,6 +41,11 @@ from argparse import ArgumentParser
+ from datetime import datetime
+ from distutils.spawn import find_executable
+ 
++if sys.version_info >= (3, 9):
++    import importlib.resources as importlib_resources
++else:
++    import importlib_resources
++
+ 
+ def pid_exists(pid):
+     """
+@@ -65,15 +70,12 @@ def gdb_commands(pid, color):
+     cmds += b'import sys; sys.stdout.flush()\n'
+     cmds += b'end\n'
+     cmds += b'bt full\n'
+-    cysignals_share = os.path.join(os.path.dirname(sys.argv[0]), '..',
+-                                   'share', 'cysignals')
+-    script = os.path.join(cysignals_share, 'cysignals-CSI-helper.py')
+-    with open(script, 'rb') as f:
+-        cmds += b'python\n'
+-        cmds += b'color = %r; ' % color
+-        cmds += b'sys_path = %r; ' % sys.path
+-        cmds += f.read()
+-        cmds += b'end\n'
++    script = importlib_resources.files('cysignals') / 'cysignals-CSI-helper.py'
++    cmds += b'python\n'
++    cmds += b'color = %r; ' % color
++    cmds += b'sys_path = %r; ' % sys.path
++    cmds += script.read_bytes()
++    cmds += b'end\n'
+     cmds += b'detach inferior 1\n'
+     cmds += b'quit\n'
+     return cmds
+-- 
+2.45.2
+
diff --git a/dev-python/cysignals/metadata.xml b/dev-python/cysignals/metadata.xml
index f7867cffab25..e7cc15ba4b9c 100644
--- a/dev-python/cysignals/metadata.xml
+++ b/dev-python/cysignals/metadata.xml
@@ -16,6 +16,10 @@
   <email>sci-mathematics@gentoo.org</email>
   <name>Gentoo Mathematics Project</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <longdescription lang="en">
     When writing Cython code, special care must be taken to ensure that
     the code can be interrupted with CTRL-C. Since Cython optimizes for
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.17.0.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.17.0.ebuild
index 992e611f2819..b752d5761355 100644
--- a/dev-python/dns-lexicon/dns-lexicon-3.17.0.ebuild
+++ b/dev-python/dns-lexicon/dns-lexicon-3.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/docopt/docopt-0.6.2-r5.ebuild b/dev-python/docopt/docopt-0.6.2-r5.ebuild
index 52f60625ebe2..55f91d3e699b 100644
--- a/dev-python/docopt/docopt-0.6.2-r5.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.2-pytest_node_from_parent.patch
diff --git a/dev-python/elasticsearch/Manifest b/dev-python/elasticsearch/Manifest
index 47c50222ffe9..cef5d3153047 100644
--- a/dev-python/elasticsearch/Manifest
+++ b/dev-python/elasticsearch/Manifest
@@ -1,2 +1 @@
-DIST elasticsearch-py-8.13.2.gh.tar.gz 1075234 BLAKE2B a13126b41f297db196b0ad22ff1da419e3472d42314984133380f0826d25a2e5ba5e0dcd0a9d571e8e27382eb53ceeadd32a4b6de312e63a3b192fd27829495d SHA512 c5f59eee672da292ca7f40e894a88c62bee3aabf35eb241c48f8f9a52c81e2348747e7d09d3b3323575407c8a072f510dffca2dce2caf9e420a9b40d5e4582fc
 DIST elasticsearch-py-8.14.0.gh.tar.gz 1092912 BLAKE2B 4ee556bc475d63e33cec318936b2dbf8b280236bcdfe28bc90a4beb7e1d024b8d63180c29e42096cb32bf3da7c771532c57190d763651118603779f816e95656 SHA512 9e9821102659b4c877959e25c33e1b1942f6eabe62bb6de73cda4875c248b0f9285d948e535e9426ca42552f7aa3e75c459f991bfa574c1d8400d78486ee5493
diff --git a/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild b/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild
deleted file mode 100644
index 5285efa00601..000000000000
--- a/dev-python/elasticsearch/elasticsearch-8.13.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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
-
-MY_P="elasticsearch-py-${PV}"
-DESCRIPTION="Official Elasticsearch client library for Python"
-HOMEPAGE="
-	https://ela.st/es-python
-	https://github.com/elastic/elasticsearch-py/
-	https://pypi.org/project/elasticsearch/
-"
-SRC_URI="
-	https://github.com/elastic/elasticsearch-py/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~x86"
-
-RDEPEND="
-	<dev-python/aiohttp-4[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3[${PYTHON_USEDEP}]
-	<dev-python/elastic-transport-9[${PYTHON_USEDEP}]
-	>=dev-python/elastic-transport-8.13[${PYTHON_USEDEP}]
-	>=dev-python/orjson-3[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mapbox-vector-tile[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-api[${PYTHON_USEDEP}]
-		dev-python/opentelemetry-sdk[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-		dev-python/unasync[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/sphinx \
-	dev-python/sphinx-autodoc-typehints \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-src_prepare() {
-	# https://github.com/elastic/elasticsearch-py/pull/2552/
-	sed -i -e '/float_/d' elasticsearch/serializer.py \
-		test_elasticsearch/test_serializer.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# REST api tests are a black hole for effort. It downloads the tests
-		# so its an ever moving target. It also requires effort to blacklist
-		# tests for apis which are license restricted.
-		"test_elasticsearch/test_server/test_rest_api_spec.py"
-		# Counting deprecation warnings from python is bound to fail even
-		# if all are fixed in this package. Not worth it.
-		"test_elasticsearch/test_client/test_deprecated_options.py"
-		# Running daemon for tests is finicky and upstream CI fails at it
-		# as well.
-		"test_elasticsearch/test_server/"
-		"test_elasticsearch/test_async/test_server/"
-	)
-
-	local -x TEST_WITH_OTEL=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -o addopts= -p asyncio
-}
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index 9e9269dc4785..32a8fc55cd43 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,3 +1 @@
-DIST Genshi-0.7.7.tar.gz 267206 BLAKE2B 0bad4b26fbfda27572e78f87af6093c87d738ad6fdf2beea5e8b0b21b3f5245a4e239bbfbad63e71e73f6588e7cae97f2b3bc7295fa30ad7a203a7ceff7074c9 SHA512 b0a3dee68523292f0672a180c5f2cfbdf48205d82286359b9fac9f668cbc2806c649d1e158d6fb8ead5b1cc5cd44eefe9d1cd79077f96925b8d24dd8e746b40f
 DIST Genshi-0.7.9.tar.gz 269399 BLAKE2B 0603f2b7d8829eb09939c003485e1a9ef9c20ef5dce6452bbb1d667d4b42f4d3d24f10225de9a0d848b760cab30decae6b71768628540d7ae65a14df9c0fca19 SHA512 2e813e4374970e764ce1d7f3cbe6fd3557fb0bd178393f18c62ebe65b6acad0b03b0eaa16b218d337776808b7f25c2499984834ca2e3cd96009998675580862b
-DIST python-genshi-use-default-test-loader.patch 13491 BLAKE2B 1651cdb3130fb3fb4c7ba9ce9ea150710c7a60f9d31ab00a0a4cc7376fd833cff28b30530e0ca7ade5d036279d88c7e94130b8ff7facf826a27421a0568b483c SHA512 1bc94efc1721faae870f9201781bb3d380ed03144bb4a2d7ea058cb15ee1c0b948989597c9e665b085ebe9ef1cd116b2a2233d2ab19706a87fd42f25ba208560
diff --git a/dev-python/genshi/genshi-0.7.7.ebuild b/dev-python/genshi/genshi-0.7.7.ebuild
deleted file mode 100644
index 338a50dc5bb8..000000000000
--- a/dev-python/genshi/genshi-0.7.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN=${PN^}
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="
-	https://genshi.edgewall.org/
-	https://github.com/edgewall/genshi/
-	https://pypi.org/project/Genshi/
-"
-SRC_URI+="
-	https://src.fedoraproject.org/rpms/python-genshi/raw/rawhide/f/python-genshi-use-default-test-loader.patch
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-	)
-"
-
-PATCHES=(
-	# https://github.com/edgewall/genshi/issues/72
-	"${DISTDIR}/python-genshi-use-default-test-loader.patch"
-)
-
-python_test() {
-	"${EPYTHON}" -m unittest -v genshi.tests.suite || die
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
index 41a440af3a3e..0ba89d712225 100644
--- a/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
+++ b/dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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=setuptools
 PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Copy your docs directly to the gh-pages branch"
-HOMEPAGE="https://github.com/c-w/ghp-import"
+HOMEPAGE="
+	https://github.com/c-w/ghp-import/
+	https://pypi.org/project/ghp-import/
+"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 95d127a401f0..84f739a366f9 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,4 +1,2 @@
-DIST google-api-python-client-2.132.0.tar.gz 11256536 BLAKE2B 4a046c03a50b3922b94e6a07bfce974851752542a69300d544b7c8439c4ad54fc9fd2d5fdf84656801ebe9bf5ad35588d39dc3603537d67db93ea995b50651ff SHA512 ecd6be9009f979447ee7d29dc05af2b25c500ca17a8d88ae6660ac0a72f6bb8237f3224dda63b22378a38c6cf7fab914bc6372351d95e691c3b16f248be04a64
 DIST google-api-python-client-2.134.0.tar.gz 11393129 BLAKE2B f5339dfa42f621dbdd145295a2c2710ef9e6e2af543ff5b9643bea884f9e0678065999d60cbf150a56e7b0d8c283588c53461c86eeb491a6ba2ad0c553a48344 SHA512 09a137ee3e3d8f38129fc02d8ffed8934daf6cfcd13904692f44038332da026b30d952048148c8c4fe5c4fed3347196574a860f58e1943312d19f6f03a01ab36
-DIST google-api-python-client-2.135.0.tar.gz 11420200 BLAKE2B abf9681b4aab9f001a790732d839e530894e531bca77a0cb0e850572c5a4d387ed4eb0134ede75dde5acfcf9944874c517c1624a7b7d56f65e9f43030282659b SHA512 9a4d344a0dc07e5570e35c85481e6ec2d7c5cd36608753e33b2be671562f3dc37462d1dd5ff850a883641a1d040960ac7929bd47e2678b1ce3691849eb181e6c
 DIST google-api-python-client-2.136.0.tar.gz 11443821 BLAKE2B ee313274ec25e1262ad54b800cf524e58400886876d9133b7c6e1d9668e81bce7b73f96511679bcc2a0f565ca9b89c7d6bc7087213e53575542c5e0b5e566ff9 SHA512 e5e8302c71953f0971d3b3159d7689cd76520efa4cee9ca541e78a5fcb14387506963cb20da06ac5760af814ece5ded0bc3942381aa9e96fd6c620eb8933a6ed
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
deleted file mode 100644
index 0d95bd55107c..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.132.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{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/google-api-python-client/google-api-python-client-2.135.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.135.0.ebuild
deleted file mode 100644
index 2b0d333aae0a..000000000000
--- a/dev-python/google-api-python-client/google-api-python-client-2.135.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{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/google-pasta/google-pasta-0.2.0-r2.ebuild b/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
index bbfa9229b73a..310e554b752f 100644
--- a/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
+++ b/dev-python/google-pasta/google-pasta-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/hishel/Manifest b/dev-python/hishel/Manifest
index bb41fbeadb34..2eafa5faf58a 100644
--- a/dev-python/hishel/Manifest
+++ b/dev-python/hishel/Manifest
@@ -1,2 +1 @@
-DIST hishel-0.0.27.gh.tar.gz 828343 BLAKE2B 57c42988bb64ef0a36bfe15527fae4a06cf1945609458266c29c0ba9423002c8c7c3beb0b1276dd4aa7d8b3a4f4575f5c8d570d7d66b97ea757988f3e673b651 SHA512 c348bc7ef236a9379f4c45f3cfa3eb74ea1c11be3b3dc533e7864c788d029137720de7612210873971d8ccd6768379ee26a4782c6c7fdf87ce4e4028489b6012
 DIST hishel-0.0.29.gh.tar.gz 828680 BLAKE2B 2869f53e04e92d5c6ccaeb3234a299a075db8429b3b8f77ac9671764b65a4a7d360451e934651789caf2e654b3e5b18819b741b52abe89867157599b921d5a40 SHA512 a16b2c198ea93c2445e0f572e5432c1f44b12ed0e301e52ed46c2c849a5a324457f88ca50c5e98283ceb9aaddf1e1ea4a11644cf61dd0ca4a25f956950c6da23
diff --git a/dev-python/hishel/hishel-0.0.27.ebuild b/dev-python/hishel/hishel-0.0.27.ebuild
deleted file mode 100644
index 2867dfd6af0d..000000000000
--- a/dev-python/hishel/hishel-0.0.27.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-inherit distutils-r1
-
-DESCRIPTION="An elegant HTTP Cache implementation for HTTPX and HTTP Core"
-HOMEPAGE="
-	https://github.com/karpetrosyan/hishel
-	https://pypi.org/project/hishel/
-"
-SRC_URI="https://github.com/karpetrosyan/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
-	dev-python/httpx[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
-	test? (
-		dev-db/redis
-		dev-python/anyio[${PYTHON_USEDEP}]
-		dev-python/boto3[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/redis[${PYTHON_USEDEP}]
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e 's:mock_s3:mock_aws:g' \
-		-e '/import anysqlite/ d' \
-		-i tests/_async/test_storages.py \
-		tests/_sync/test_storages.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	local EPYTEST_DESELECT=(
-		# tests that need anysqlite
-		tests/_async/test_storages.py::test_sqlitestorage
-		tests/_async/test_storages.py::test_sqlite_expired
-		tests/_async/test_storages.py::test_sqlite_ttl_after_hits
-	)
-
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-
-	einfo "Starting Redis"
-	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF
-		daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1 ::1
-	EOF
-
-	# Run the tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
diff --git a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
index 3303ff3f00e3..ebbae0c5ef48 100644
--- a/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -39,11 +39,9 @@ BDEPEND+="
 		test-rust? (
 			dev-python/pyopenssl[${PYTHON_USEDEP}]
 		)
-		$(python_gen_cond_dep '
-			>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
-			dev-python/httplib2[${PYTHON_USEDEP}]
-			>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
-		' python3_{7..10})
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
 	)
 "
 
@@ -62,6 +60,11 @@ python_test() {
 		# eventlet is masked for removal
 		tests/bugfixes/nosetests/test_eventlet.py
 	)
+	local EPYTEST_DESELECT=(
+		# regressions with newer dev-python/requests
+		tests/functional/test_requests.py::test_httpretty_should_allow_registering_regexes_with_streaming_responses
+		tests/functional/test_requests.py::test_httpretty_should_handle_paths_starting_with_two_slashes
+	)
 
 	local ignore_by_dep=(
 		dev-python/boto3:tests/bugfixes/nosetests/test_416_boto3.py
diff --git a/dev-python/imapclient/imapclient-3.0.1.ebuild b/dev-python/imapclient/imapclient-3.0.1.ebuild
index e676b25c5ae1..4b83ecbb63e1 100644
--- a/dev-python/imapclient/imapclient-3.0.1.ebuild
+++ b/dev-python/imapclient/imapclient-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 5b0f16c3858e..ad17d8f010d8 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1 @@
-DIST jsonpickle-3.0.4.gh.tar.gz 260847 BLAKE2B ba990a59276463b66401cc9fdad2c91dfd18a172fa1cb2f0b89cbeb1a280360f6e1d5bf7cc3ec94069b1d05e4eb11d3fc52a594542f31ead220622aa01e0df99 SHA512 e6ad7ae30cc4d56323b612fcf599109828fcf76acfba266a1bed850a633603edc8829f29d8981659460a9941531d6735375a03775c9d7bd51c210edbf7414b1c
-DIST jsonpickle-3.2.1.gh.tar.gz 319730 BLAKE2B 5309e5d22253844119ce97eecbea3070a69ea20cfdf56fe9021fca470603cddd0ba2e7af1e86bd4830f33b59cf3ab4dd426ae4d0b1dee30af51f8219de68698e SHA512 b3e53b88b5d26178cc0bf6c4da2688c3187adcfb1800bc6a19bfc4ca86eb6f0fd1a0ab899598bf3e75adf20ef930d555756e57de7bf41a2c0c446facf18d1523
 DIST jsonpickle-3.2.2.gh.tar.gz 321994 BLAKE2B 1e126e0f1f336e5b64631a874c379b39665b324ccbc4c87d7becba302568f61df2d576732ea9165514791e6b2dd122e7008d43090d634d4d30fdde5c7d0600f9 SHA512 20e28885e637f8dba5965e22dc9960acb7c10fb25d78f2ba9bf6fb94d55a968e2245d577dbe19a32153e12af2ffa7dad6ae3e1897c426c25fa544796606736a6
diff --git a/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch b/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch
deleted file mode 100644
index 6fdc989d990e..000000000000
--- a/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 0ab3cf0ffcdb364a8a75e71acfb267e5aaabc0a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 10 Jun 2024 03:55:47 +0200
-Subject: [PATCH 1/2] Fix data types in tests for NumPy 2
-
-Fix a number of test compatibility issues with NumPy 2.  That is:
-
-- replace `np.float_` with `np.float64`,
-- replace `np.complex_` with `np.complex128`,
-- remove `np.unicode_` as equivalent to `np.str_`.
-
-The LHS types are also aliases to the RHS types in NumPy 1.x, so this
-is NFC on NumPy 1.x.  These aliases were removed in 2.x, so the code
-needs to be updated for tests to pass on NumPy 2.x.
----
- tests/numpy_test.py  |  7 ++-----
- tests/pandas_test.py | 13 +++++--------
- 2 files changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/tests/numpy_test.py b/tests/numpy_test.py
-index e271725..dd50d5e 100644
---- a/tests/numpy_test.py
-+++ b/tests/numpy_test.py
-@@ -32,9 +32,7 @@ def test_dtype_roundtrip():
-     dtypes = [
-         np.int_,
-         np.int32,
--        np.float_,
-         np.float64,
--        np.complex_,
-         np.complex128,
-         np.str_,
-         np.object_,
-@@ -86,15 +84,14 @@ def test_generic_roundtrip():
-     values = [
-         np.int_(1),
-         np.int32(-2),
--        np.float_(2.5),
-+        np.float64(2.5),
-         np.nan,
-         -np.inf,
-         np.inf,
-         np.datetime64('2014-01-01'),
-         np.str_('foo'),
--        np.unicode_('bar'),
-         np.object_({'a': 'b'}),
--        np.complex_(1 - 2j),
-+        np.complex128(1 - 2j),
-     ]
-     for value in values:
-         decoded = roundtrip(value)
-diff --git a/tests/pandas_test.py b/tests/pandas_test.py
-index 532563f..414bd65 100644
---- a/tests/pandas_test.py
-+++ b/tests/pandas_test.py
-@@ -34,14 +34,13 @@ def test_series_roundtrip():
-     ser = pd.Series(
-         {
-             'an_int': np.int_(1),
--            'a_float': np.float_(2.5),
-+            'a_float': np.float64(2.5),
-             'a_nan': np.nan,
-             'a_minus_inf': -np.inf,
-             'an_inf': np.inf,
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-             'date': np.datetime64('2014-01-01'),
--            'complex': np.complex_(1 - 2j),
-+            'complex': np.complex128(1 - 2j),
-             # TODO: the following dtypes are not currently supported.
-             # 'object': np.object_({'a': 'b'}),
-         }
-@@ -54,14 +53,13 @@ def test_dataframe_roundtrip():
-     df = pd.DataFrame(
-         {
-             'an_int': np.int_([1, 2, 3]),
--            'a_float': np.float_([2.5, 3.5, 4.5]),
-+            'a_float': np.float64([2.5, 3.5, 4.5]),
-             'a_nan': np.array([np.nan] * 3),
-             'a_minus_inf': np.array([-np.inf] * 3),
-             'an_inf': np.array([np.inf] * 3),
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-             'date': np.array([np.datetime64('2014-01-01')] * 3, dtype="datetime64[s]"),
--            'complex': np.complex_([1 - 2j, 2 - 1.2j, 3 - 1.3j]),
-+            'complex': np.complex128([1 - 2j, 2 - 1.2j, 3 - 1.3j]),
-             # TODO: the following dtypes are not currently supported.
-             # 'object': np.object_([{'a': 'b'}]*3),
-         }
-@@ -76,12 +74,11 @@ def test_multindex_dataframe_roundtrip():
-             'idx_lvl0': ['a', 'b', 'c'],
-             'idx_lvl1': np.int_([1, 1, 2]),
-             'an_int': np.int_([1, 2, 3]),
--            'a_float': np.float_([2.5, 3.5, 4.5]),
-+            'a_float': np.float64([2.5, 3.5, 4.5]),
-             'a_nan': np.array([np.nan] * 3),
-             'a_minus_inf': np.array([-np.inf] * 3),
-             'an_inf': np.array([np.inf] * 3),
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-         }
-     )
-     df = df.set_index(['idx_lvl0', 'idx_lvl1'])
-
-From 8bc2bdd42bc111d90edbcef8005640d5a51627bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 10 Jun 2024 04:02:17 +0200
-Subject: [PATCH 2/2] Fix `newbyteorder()` use for NumPy 2.x
-
-Replace the `arr.newbyteorder()` use with:
-
-    arr.view(arr.dtype.newbyteorder())
-
-as suggested in the exception that's raised when the tests are run
-in NumPy 2.x.  With this change, the code works both with NumPy 1.x
-and NumPy 2.x.
----
- tests/numpy_test.py | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/tests/numpy_test.py b/tests/numpy_test.py
-index dd50d5e..2e6725b 100644
---- a/tests/numpy_test.py
-+++ b/tests/numpy_test.py
-@@ -306,18 +306,22 @@ def test_immutable():
- def test_byteorder():
-     """Test the byteorder for text and binary encodings"""
-     # small arr is stored as text
--    a = np.arange(10).newbyteorder()
--    b = a[:].newbyteorder()
--    _a, _b = roundtrip([a, b])
--    npt.assert_array_equal(a, _a)
--    npt.assert_array_equal(b, _b)
-+    a = np.arange(10)
-+    av = a.view(a.dtype.newbyteorder())
-+    b = a[:]
-+    bv = b.view(b.dtype.newbyteorder())
-+    _av, _bv = roundtrip([av, bv])
-+    npt.assert_array_equal(av, _av)
-+    npt.assert_array_equal(bv, _bv)
- 
-     # bigger arr is stored as binary
--    a = np.arange(100).newbyteorder()
--    b = a[:].newbyteorder()
--    _a, _b = roundtrip([a, b])
--    npt.assert_array_equal(a, _a)
--    npt.assert_array_equal(b, _b)
-+    a = np.arange(100)
-+    av = a.view(a.dtype.newbyteorder())
-+    b = a[:]
-+    bv = b.view(b.dtype.newbyteorder())
-+    _av, _bv = roundtrip([av, bv])
-+    npt.assert_array_equal(av, _av)
-+    npt.assert_array_equal(bv, _bv)
- 
- 
- def test_zero_dimensional_array():
diff --git a/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild
deleted file mode 100644
index 75e1e22a2897..000000000000
--- a/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild b/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild
deleted file mode 100644
index 724106ceb896..000000000000
--- a/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/jsonpickle/jsonpickle/pull/512
-		"${FILESDIR}/${P}-numpy-2.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e 's:--cov::' pytest.ini || die
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}
diff --git a/dev-python/langdetect/Manifest b/dev-python/langdetect/Manifest
index 37a64204a00a..a11d7c268c91 100644
--- a/dev-python/langdetect/Manifest
+++ b/dev-python/langdetect/Manifest
@@ -1,3 +1 @@
 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
new file mode 100644
index 000000000000..637368d2f237
--- /dev/null
+++ b/dev-python/langdetect/files/langdetect-1.0.9-explicit-config.patch
@@ -0,0 +1,13 @@
+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 c09b7356f549..630fe63c6f53 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 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,4 +19,6 @@ 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 020e07f2a3dd..736a1167c898 100644
--- a/dev-python/langdetect/metadata.xml
+++ b/dev-python/langdetect/metadata.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>marcin.deranek@slonko.net</email>
-  <name>Marcin Deranek</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Mimino666/langdetect/issues</bugs-to>
- </upstream>
- <origin>slonko-overlay</origin>
+ 
+ <origin>gentoo-guru-overlay</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index c27d210ececa..46d0916cf595 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,2 +1 @@
-DIST latexcodec-2.0.1.tar.gz 30131 BLAKE2B 8af9cf81a1e0a8b72bf4eb1be206d2f2029598372872f1c43d8abe5e69efeba957d610102f44a5da552325f5525e1668e52ba2cc6c9a2d3f4b7c59c375f040e0 SHA512 e7f23b91904e0bd4a3f052f5f201b125e84c1f94a247b869e14c8f45ee8bc2c478e8887a792efa8c9b6d2b7fefed43fc66e797206b6e40aedaedc68ce7865cab
 DIST latexcodec-3.0.0.tar.gz 31023 BLAKE2B 3612275cec0d5d20c838dd8edd2799d34da59c5593362a86eb002fde287e3195f7167351f516c4333877798d94e767e7babde144dbf2161dcf82998c67460403 SHA512 f715e61620237267b69f178b620100ac37011093a64e2663fd64b476194e2e0d29ca0ee3169ce3edb11955ef61c64109c8e1b549a800bf4d52e8a75630baaa58
diff --git a/dev-python/latexcodec/latexcodec-2.0.1-r1.ebuild b/dev-python/latexcodec/latexcodec-2.0.1-r1.ebuild
deleted file mode 100644
index 8525ed1695f7..000000000000
--- a/dev-python/latexcodec/latexcodec-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Lexer and codec to work with LaTeX code in Python"
-HOMEPAGE="
-	https://github.com/mcmtroffaes/latexcodec/
-	https://pypi.org/project/latexcodec/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/latexcodec/metadata.xml b/dev-python/latexcodec/metadata.xml
index c0642636746d..c9a50896f0db 100644
--- a/dev-python/latexcodec/metadata.xml
+++ b/dev-python/latexcodec/metadata.xml
@@ -9,6 +9,10 @@
   <email>proxy-maint@gentoo.org</email>
   <name>Proxy maintainers</name>
  </maintainer>
+ <maintainer type="project">
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+ </maintainer>
  <longdescription>
     Latexcodec provides a convenient way of going between text written in LaTeX and unicode. Since it is not a LaTeX compiler, it is more appropriate for short chunks of text, such as a paragraph or the values of a BibTeX entry, and it is not appropriate for a full LaTeX document. In particular, its behavior on the LaTeX commands that do not simply select characters is intended to allow the unicode representation to be understandable by a human reader, but is not canonical and may require hand tuning to produce the desired effect.
   </longdescription>
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 190a94518940..d8983bfac4e7 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,4 +1,5 @@
 DIST llvm-project-022d15c0039fc1cfaa3cc2eb1a45b71bbb21fadd.tar.gz 215902891 BLAKE2B ecd87b84a4e5f87c91b6df0a2d6849f385bdb7b26b14a2836f1e1fc5a69f9f5b441e47b9251174019f62eabe39a243092cd1a175b5da7d7576cdcfd63083cff0 SHA512 7726e253179bfd9e0b93236e3ce1133b421329b0b3496b10c0a0eecde372fb5e55cce737b6b78db13f2d0833bbc92023d95efa54cb2918b12ce9af166bd90ff4
+DIST llvm-project-0b9f2847da79298ed09c29493245113f02b32d9f.tar.gz 216399453 BLAKE2B ed13e6639d40bdda6dbd09eba0cc8e4f82f4f53ce3cff9742e902af1c306c60dcb6d5fb008057829d46bbbde391697726cba2096c52cf1592c00faf1e37430e4 SHA512 a5b0bf59fa228a41f0c904a42b4b96740fc5e5caa63248c546eb4a810e86d5d8d1d8df663051ed4444cc0389ffa6ec12ee5dbf7d94d6211a253319550d7fac1c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db365965f1c00bfea6c2d653b3996bd2acef8a2b37e37f6fc8a9d2b65711ad72657e0ef52c42f733053cf65051e7822f27396c30406d SHA512 89a67ebfbbc764cc456e8825ecfa90707741f8835b1b2adffae0b227ab1fe5ca9cce75b0efaffc9ca8431cae528dc54fd838867a56a2b645344d9e82d19ab1b7
diff --git a/dev-python/lit/lit-19.0.0_pre20240706.ebuild b/dev-python/lit/lit-19.0.0_pre20240706.ebuild
new file mode 100644
index 000000000000..5ed5b5bd096e
--- /dev/null
+++ b/dev-python/lit/lit-19.0.0_pre20240706.ebuild
@@ -0,0 +1,45 @@
+# 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	# flaky test
+	# https://github.com/llvm/llvm-project/issues/72022
+	rm tests/progress-bar.py || die
+
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 1ae860948ae7..d3817492ccb5 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,2 @@
-DIST miniupnpc-2.2.7.tar.gz 104258 BLAKE2B 5681c1747c8e330442a0ad46d673e1739283bfc23571cb2225abf82326caa7da979911b3182cab2e3eea49140b90619f4e00bb5b1e2f0cd6067c28017cf87016 SHA512 d24e653c2f7bfed4485342c5ec8d18b4dd4c3430975b5fae392d3534f38bb3fb59e6638e76d57847f49045e22f3afd6cac128d7d9d10ef05bd6ad24ef38303b6
-DIST miniupnpc-2.2.7.tar.gz.sig 543 BLAKE2B 6649e5866afd13034b05a9d771c25c419e85631ca17ed7457e5811aee0ba8c38b0ad34033caa5b611cde21a63251e902e3f24cc4748e52a4a379ef075bf59dc5 SHA512 188837275b20c61c05babac916bff86178774030dbc191ecd0e5314c6e9b6dbb627680b512c554a8b27a020bd7503b141be26a134e0ed7e2cc56c7e2c01d9e81
 DIST miniupnpc-2.2.8.tar.gz 104603 BLAKE2B eae4d97bdf8c494ea6744edfeb870f9d92df8468d23f974e0e44e735fc7c8925189ea58f60a71c37315aebff1269ae69e9413cdf80dc292c4b90df5f12bf58a4 SHA512 526c9df1485302d4c9c78062fb058cfd433463f6e7a9f4025a9f5228aef41ee61a4b9e7a76b6cfa8779b91cc3c663846a997dc1470902d7108b129155e6a3360
 DIST miniupnpc-2.2.8.tar.gz.sig 543 BLAKE2B b4d056972fc7e46c1e41a658d301db8e9a0d3b99af2220c264d06267b4e8ae45847e2bf2cd6583fded67f12c2e0a3c833ba7e38d9c05b5a0cc363e0c1fc8feae SHA512 b5eec0d24a84183021cd16bfd6ecedda587dee0bbb017fe6d107e8c2815ef90cf5f904c6fb9aa32e2e4d5f0b63de8566814c9a0d921b338b26b60ea35c23ecae
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.7.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.7.ebuild
deleted file mode 100644
index fe9163a7eb35..000000000000
--- a/dev-python/miniupnpc/miniupnpc-2.2.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 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_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 verify-sig
-
-MY_P=${P/python-}
-DESCRIPTION="Python bindings for UPnP client library"
-HOMEPAGE="
-	http://miniupnp.free.fr/
-	https://miniupnp.tuxfamily.org/
-	https://github.com/miniupnp/miniupnp/
-"
-SRC_URI="
-	https://miniupnp.tuxfamily.org/files/${MY_P}.tar.gz
-	verify-sig? (
-		https://miniupnp.tuxfamily.org/files/${MY_P}.tar.gz.sig
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DEPEND="
-	>=net-libs/miniupnpc-${PV}:0=
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
-
-PATCHES=(
-	"${FILESDIR}"/miniupnpc-2.2.3-shared-lib.patch
-)
-
-# DOCS are installed by net-libs/miniupnpc.
-DOCS=()
-
-# Example test command:
-# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild b/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
index afd9f8d2224d..c9068e9c4e6e 100644
--- a/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
+++ b/dev-python/mkdocs-gen-files/mkdocs-gen-files-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv"
 
-RDEPEND=">=dev-python/mkdocs-1.0.3[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pytest-golden[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/mkdocs-1.0.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-golden[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.3.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.3.1.ebuild
index cf462009e25e..335bd6735961 100644
--- a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.3.1.ebuild
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.8.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.8.0.ebuild
index 55ed61559428..32e8b459259d 100644
--- a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.8.0.ebuild
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.8.0.ebuild
@@ -22,6 +22,8 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
+# https://bugs.gentoo.org/931325
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-python/csscompressor-0.9.5[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1-r1.ebuild
index 823a604b5946..c808b14563c5 100644
--- a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1.ebuild
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.1-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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=setuptools
+PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
+
 inherit distutils-r1
 
 DESCRIPTION="Plugin for Mkdocs page redirects"
@@ -25,7 +26,6 @@ RDEPEND="
 	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
 	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/twine[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/mkdocstrings-python/Manifest b/dev-python/mkdocstrings-python/Manifest
index a9b29ac3562d..a3ae67968897 100644
--- a/dev-python/mkdocstrings-python/Manifest
+++ b/dev-python/mkdocstrings-python/Manifest
@@ -1,3 +1 @@
-DIST mkdocstrings-python-1.10.3.gh.tar.gz 157856 BLAKE2B 74d1c9b57e439195494aef03f82606971084800ec23fdd21a17b743830860f73f3c5d421d3202a51b3146c09c547b7719ceeb11e3ff8347027941fafcbde3250 SHA512 7ddb34e7847fe58f69ba97f4f4a2974ef79cb826d9017b09e11fecdef43a3f71ad06ef93ecfcdba715fbd0524e6af6702b162bb5109f5a2055eb424e54811c3b
-DIST mkdocstrings-python-1.10.4.gh.tar.gz 157012 BLAKE2B d51032f35baff3ab7260b773e24eab3f4bcba8fe0341cb3b8415a27540d73e80120aac9975aa6ef8b92a51408ffb6a9790d929c0d9b61b05264999141c62ec2d SHA512 f6576e6326043ab6db48334517a8cb4d157cd290e665dcf5d054150babaa874c37f29b467e8a6249d4c2005d0fe5eb5fc1543a388e70cacb3c57c5540215969a
 DIST mkdocstrings-python-1.10.5.gh.tar.gz 157091 BLAKE2B 1f0685fc8b04ea4e5f33e3e4ca9637d590bd45b5be85d856ea0f6693d3be2a7d215751b68f811ca73afec078ffa5cc1acf88ab1907bd9842c6e390eb14fd71c0 SHA512 0bc3b103a99add6d38621243d2a21339efd837fb3476feb13bc55afabcee481d45ea7b410f8d16312583f308ee9f36f387762cdd1ef1e9758ecdb5b1be9dcb9e
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.3.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.3.ebuild
deleted file mode 100644
index fd3680096503..000000000000
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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=pdm-backend
-
-inherit distutils-r1
-
-DESCRIPTION="Python handler for dev-python/mkdocstrings"
-HOMEPAGE="
-	https://mkdocstrings.github.io/python/
-	https://github.com/mkdocstrings/python/
-	https://pypi.org/project/mkdocstrings-python/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/griffe-0.44[${PYTHON_USEDEP}]
-	>=dev-python/mkdocstrings-0.25.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.4.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.4.ebuild
deleted file mode 100644
index fd3680096503..000000000000
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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=pdm-backend
-
-inherit distutils-r1
-
-DESCRIPTION="Python handler for dev-python/mkdocstrings"
-HOMEPAGE="
-	https://mkdocstrings.github.io/python/
-	https://github.com/mkdocstrings/python/
-	https://pypi.org/project/mkdocstrings-python/
-"
-# Tests need files absent from the PyPI tarballs
-SRC_URI="
-	https://github.com/mkdocstrings/python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/python-${PV}"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-
-RDEPEND="
-	>=dev-python/griffe-0.44[${PYTHON_USEDEP}]
-	>=dev-python/mkdocstrings-0.25.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mkdocs-material[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export PDM_BUILD_SCM_VERSION=${PV}
diff --git a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild
index a2a983dca124..06fe4e0e1270 100644
--- a/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild
+++ b/dev-python/mkdocstrings-python/mkdocstrings-python-1.10.5.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=pdm-backend
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 
 inherit distutils-r1
 
diff --git a/dev-python/numexpr/numexpr-2.10.1.ebuild b/dev-python/numexpr/numexpr-2.10.1.ebuild
index ae81b1e40e7f..650d5285541c 100644
--- a/dev-python/numexpr/numexpr-2.10.1.ebuild
+++ b/dev-python/numexpr/numexpr-2.10.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 
 DEPEND="
 	>=dev-python/numpy-2.0.0_rc:=[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 467de4126317..a6f20fc95c06 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1 @@
-DIST openapi_core-0.19.1.tar.gz 107802 BLAKE2B c8cd318ab6a88272e45fbff16df7e0cef7d8bab6c7cef8d965443fa0ad7439182bd9639f8a912ad913eb3d7727c4aeb49d576a8721aac1d0ba9423dd344da44d SHA512 861e3793303ec89265be3a0846ad702e321ebc8536497d146ef10a4c9ab54900ad35ee9e90ef42e1f0856da8c0e746471e9820b0ac3e149adaa0b951a66b382f
 DIST openapi_core-0.19.2.tar.gz 108121 BLAKE2B 0873ba33c0270babb3c3e626e942fd22fc066f8ef408c6f1cadab8140fdb6284d21a1cb5ed767c7f0f370112a1bb263ac50b340cccfe1cba6da1a0f15a73bbde SHA512 cab2343c61bbb8de048b5e3a53c2d753468f6707f3b4b40ddfee7c3ea6eb0f3beff0aebcad632200a5a4b08e93c620aceda659297756d4f587d11039ede0eefa
diff --git a/dev-python/openapi-core/openapi-core-0.19.1.ebuild b/dev-python/openapi-core/openapi-core-0.19.1.ebuild
deleted file mode 100644
index 689b6ee8a188..000000000000
--- a/dev-python/openapi-core/openapi-core-0.19.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8,9,10,11,12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
-HOMEPAGE="
-	https://github.com/python-openapi/openapi-core/
-	https://pypi.org/project/openapi-core/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/asgiref-4[${PYTHON_USEDEP}]
-	>=dev-python/asgiref-3.6.0[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-path-0.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-path-0.3.1[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/parse[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.7[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/openapi-spec-validator-0.8[${PYTHON_USEDEP}]
-	>=dev-python/openapi-spec-validator-0.7.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
-		>=dev-python/aioitertools-0.11.0[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		>=dev-python/httpx-0.24.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-aiohttp-1.0.4[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.26.1[${PYTHON_USEDEP}]
-		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
-		dev-python/webob[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# missing dependendencies
-	tests/integration/contrib/falcon
-	tests/integration/contrib/fastapi
-
-	# TODO: these tests fail to collect
-	tests/integration/validation/test_security_override.py
-	tests/integration/validation/test_read_only_write_only.py
-
-	# unhappy about modern django
-	tests/integration/contrib/django/test_django_project.py
-	tests/unit/contrib/django/test_django.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 9551a6e40ee4..2c217f98689e 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1 +1,2 @@
 DIST peewee-3.17.5.gh.tar.gz 927674 BLAKE2B 45d23ebec38363a83441c916def460d76c7fe54175497df53de5a904d57b3d2cdbe077f757028b85f6a5eba0e65f1eab9ee99ceea11a00a9b111fce842ccd010 SHA512 b9878450a0759740f28cb6425ba0f14aa92e037bc4c888c13ae24bc38993787e64bff6342edcdf5364b5aac97c405e1c8e53e1140016e6bdbeba6d57d7f339ec
+DIST peewee-3.17.6.gh.tar.gz 929364 BLAKE2B f7add872316dae1210a4dec4a71cf0b5122010e3da854019887143111cca5ed7f53b48bdf68aaa215097bde8003878e4aae0ddf827fb3fd0ab635345815a0d7a SHA512 7250b931ebaab6f5e1fbc9461cb737e30eef794bbc6a15f6f1ba59e358bd9101c17d31112906d314a12f0a05b4c2112435f90053a866f3b91d0e5a1dc4aba2f8
diff --git a/dev-python/peewee/peewee-3.17.6.ebuild b/dev-python/peewee/peewee-3.17.6.ebuild
new file mode 100644
index 000000000000..1e02588fa109
--- /dev/null
+++ b/dev-python/peewee/peewee-3.17.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 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_{8,9,10,11,12} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="
+	https://github.com/coleifer/peewee/
+	https://pypi.org/project/peewee/
+"
+SRC_URI="
+	https://github.com/coleifer/peewee/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="examples +native-extensions test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	native-extensions? ( dev-db/sqlite:3= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-db/postgresql
+		dev-python/psycopg:0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme
+
+src_prepare() {
+	# disable test failing on postgres 16
+	sed -e 's/test_timeout/_&/' -i tests/sqliteq.py || die
+
+	default
+}
+
+src_compile() {
+	if ! use native-extensions; then
+		local -x NO_SQLITE=1
+	fi
+
+	distutils-r1_src_compile
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	pg_ctl -w -D "${T}"/pgsql start -o "-h '' -k '${T}'" || die
+	createdb -h "${T}" peewee_test || die
+
+	local -x PEEWEE_PSQL_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v 2 || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/proto-plus/Manifest b/dev-python/proto-plus/Manifest
index c4db154638f8..8e64f520293d 100644
--- a/dev-python/proto-plus/Manifest
+++ b/dev-python/proto-plus/Manifest
@@ -1,2 +1 @@
-DIST proto-plus-python-1.23.0.gh.tar.gz 96752 BLAKE2B a971ef18b3513dcda0f2ea7a1eec8a1b76cc0094fdb73e7df1b258d0db7c16d2ef07152eff28c71e10456e2b9d2532da748901734d35a0245f99af7cf558866c SHA512 9e1566f6e3d2f99a37e7c5c9d3203a0073648f423112413d7d4fd61ebe38f175f30e1c4d2d24257acb7d09a685722b63960f9f686ede9ddb98a4c4463d5c0402
 DIST proto-plus-python-1.24.0.gh.tar.gz 100401 BLAKE2B 29094738e9c84559b8b51b078ecb059e7475c5c6e9392f23925c6df264efebd22c191c5b593fc659aabb20ce9cb0d93cde9df28b0b40aac4bbc80e075a95ec24 SHA512 3995df0a7df60a9a5c9325c29456f73d8482ae3d765f9553e5633b8d0ae0869c6fe3cd60e780f8fcd49d04470205abf621bc56c20d64252b76d51c19ff283372
diff --git a/dev-python/proto-plus/proto-plus-1.23.0.ebuild b/dev-python/proto-plus/proto-plus-1.23.0.ebuild
deleted file mode 100644
index 19d21fe2333e..000000000000
--- a/dev-python/proto-plus/proto-plus-1.23.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021-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
-
-MY_P=${PN}-python-${PV}
-DESCRIPTION="Beautiful, Pythonic protocol buffers"
-HOMEPAGE="
-	https://github.com/googleapis/proto-plus-python/
-	https://pypi.org/project/proto-plus/
-"
-SRC_URI="
-	https://github.com/googleapis/proto-plus-python/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/google-api-core-1.31.5[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
diff --git a/dev-python/proto-plus/proto-plus-1.24.0.ebuild b/dev-python/proto-plus/proto-plus-1.24.0.ebuild
index f333a68968c1..19d21fe2333e 100644
--- a/dev-python/proto-plus/proto-plus-1.24.0.ebuild
+++ b/dev-python/proto-plus/proto-plus-1.24.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
diff --git a/dev-python/puremagic/Manifest b/dev-python/puremagic/Manifest
index 9bfcc2c0ee3d..af931f99d430 100644
--- a/dev-python/puremagic/Manifest
+++ b/dev-python/puremagic/Manifest
@@ -1,3 +1 @@
-DIST puremagic-1.23.gh.tar.gz 306804 BLAKE2B b9da78fc20ee77dac85065f85a8770273ece5f97c372c42e274d272c3c389cca2ed1433774f96d1b55dff01ff542c63ad5093befa5c3530b052de32ffa142a77 SHA512 9bdb6ae0158ecf5d87e82de112ce9d988ac2b4a29d06dd06cba9c4675fe11d270c7cab611f8cb8ffb5ccd622be66fe43b441f203d27e9c4c9feb55bb81036fce
-DIST puremagic-1.24.gh.tar.gz 309763 BLAKE2B 7d2920d2028bb8db9f87f569ae57a00436289e2e6661a07da39d2cdf96975d56c5fbe6569a2909127fef1a1e8c51514ae5f1730df85e620a8cd84abfa8d0dd03 SHA512 06ef1008788c2941df9b3237d41df9908bf172e22f66e478470ab66d3cefd0c8d598f8a95df285bfde58477a98d4da557c0fef7a691b30bcf3d82d76067c518d
 DIST puremagic-1.25.gh.tar.gz 309788 BLAKE2B cc24e10ef59ce6299e7fb90b12b4d379d320d5795d475f9509301a050591c3404499227a64d6ed8395c8ab7f424561895966a3fe5dd1f90154fdb8be50fcab51 SHA512 7b9a8af827537ed9af38b80422744c7ee8b48b95f3344a79b6641cc7d55082160f20884659846a608d04d040acb06b0273fb8b51e5b92db14f92ff6d576c0e0d
diff --git a/dev-python/puremagic/puremagic-1.23.ebuild b/dev-python/puremagic/puremagic-1.23.ebuild
deleted file mode 100644
index 42b9f8f2bd7b..000000000000
--- a/dev-python/puremagic/puremagic-1.23.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/puremagic/puremagic-1.24.ebuild b/dev-python/puremagic/puremagic-1.24.ebuild
deleted file mode 100644
index 51b9731459c1..000000000000
--- a/dev-python/puremagic/puremagic-1.24.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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="Pure python implementation of magic file detection"
-HOMEPAGE="
-	https://github.com/cdgriffith/puremagic/
-	https://pypi.org/project/puremagic/
-"
-SRC_URI="
-	https://github.com/cdgriffith/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( CHANGELOG.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.3.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.3.ebuild
index 2962a623c3d3..6e760da442e3 100644
--- a/dev-python/pybtex-docutils/pybtex-docutils-1.0.3.ebuild
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/pybtex/pybtex-0.24.0-r1.ebuild b/dev-python/pybtex/pybtex-0.24.0-r1.ebuild
index f653a3abcd87..339dc253dfd3 100644
--- a/dev-python/pybtex/pybtex-0.24.0-r1.ebuild
+++ b/dev-python/pybtex/pybtex-0.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,4 +26,6 @@ RDEPEND="
 
 distutils_enable_tests pytest
 
-PATCHES=( "${FILESDIR}/${PN}-0.22.2-fix-test-installation.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.22.2-fix-test-installation.patch"
+)
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.10.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.10.ebuild
index 592c530522f8..5a67bd230b91 100644
--- a/dev-python/pytest-httpserver/pytest-httpserver-1.0.10.ebuild
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.10.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/werkzeug[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/responses-0.25.3.ebuild b/dev-python/responses/responses-0.25.3.ebuild
index 066078f8f453..ce58228205ad 100644
--- a/dev-python/responses/responses-0.25.3.ebuild
+++ b/dev-python/responses/responses-0.25.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # tomli backend is optional now, with pyyaml being the new default.
 # However, keeping it unconditional here for backwards compatibility.
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 5bf29a9a913b..8c751457d45d 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,2 @@
-DIST selenium-4.21.0.tar.gz 9238881 BLAKE2B 6aadfb383aabb730dd9a39dc526a7b109d640997b1ba5e486687c4e3f056a6dee624c88ed437b40c6e63689a533a5990e14e0d57afe2ed927bf9f3e4a1573266 SHA512 e5486a411aeaffb26be2f50a874c622bcd6d004cb821444c580ef5fc3e74fbc0575d00ced5f4e57b3bf75e0920eb835a423e6e8d8cf354c729d3036bfb170dec
 DIST selenium-4.22.0.tar.gz 9242392 BLAKE2B 15197221a53c597b412f805eed7f29f4c34a9d0596a069ea5a6df540b93c013815a59fe1730e8493f5ae854cbc03d5a6647eb57d825ecc68ad0b31949448acaa SHA512 a25c892495ed613c2cd96ab971f46cc101416a4928cffceaa9891c759a41d51df392999495d442a21b459d83a1b287c64c2cd5405b82e16464b56fcc75b2c595
-DIST selenium-selenium-4.21.0.gh.tar.gz 77070811 BLAKE2B b9aacaf5f6091f49c4f0a6c7dca3fb5791297af8e1a8b6fa6b8e6d77fa5249d9b3c74d6c73a5aa9f443fefc3a613e0b6a12ced1f400d93c99a43b5614a6edda8 SHA512 15f25efc893fd57ef0ca21e3598c1ae976043fd8000275ff9bed117ff0c9e9c402ed1bc3fff119a511336b0e26343c6e36450b3ef49cad2dda3b1cea039ec6a7
 DIST selenium-selenium-4.22.0.gh.tar.gz 77094998 BLAKE2B 1d74be914debec94e3b9fe41ce40e7432426c7f30a848c63ad82e616fc3dd7dce8e544c33a90e28ca268988b9035aabe41805277085095cc1c65bd38e09117e5 SHA512 f71721b614fa3e346a75ca2391fb03067520d746e1433a75ba896eb6bbe621064bcab7d50337989ccb60d13c493e2df2b3b1bd73cc8dcaf3b62dc4f4ebfaa086
diff --git a/dev-python/selenium/selenium-4.21.0.ebuild b/dev-python/selenium/selenium-4.21.0.ebuild
deleted file mode 100644
index 4661c74dda73..000000000000
--- a/dev-python/selenium/selenium-4.21.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{8,9,10,11,12} pypy3 )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1 pypi
-
-# upstream sometimes tags it as ${P}, sometimes as ${P}-python, sigh
-TEST_TAG=${P}
-TEST_P=selenium-${TEST_TAG}
-
-DESCRIPTION="Python language binding for Selenium Remote Control"
-HOMEPAGE="
-	https://www.seleniumhq.org/
-	https://github.com/SeleniumHQ/selenium/tree/trunk/py/
-	https://pypi.org/project/selenium/
-"
-SRC_URI+="
-	test? (
-		https://github.com/SeleniumHQ/selenium/archive/${TEST_TAG}.tar.gz
-			-> ${TEST_P}.gh.tar.gz
-	)
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/certifi-2021.10.8[${PYTHON_USEDEP}]
-	<dev-python/trio-1[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.17[${PYTHON_USEDEP}]
-	<dev-python/trio-websocket-1[${PYTHON_USEDEP}]
-	>=dev-python/trio-websocket-0.9[${PYTHON_USEDEP}]
-	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
-	>=dev-python/typing-extensions-4.9[${PYTHON_USEDEP}]
-	<dev-python/urllib3-3[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: we may need extra setup or deps
-		test/selenium
-
-		# expects vanilla certifi
-		test/unit/selenium/webdriver/remote/remote_connection_tests.py::test_get_connection_manager_for_certs_and_timeout
-	)
-
-	cd "${WORKDIR}/${TEST_P}/py" || die
-	rm -rf selenium || die
-	# https://github.com/SeleniumHQ/selenium/blob/selenium-4.8.2-python/py/test/runner/run_pytest.py#L20-L24
-	# seriously?
-	epytest -o "python_files=*_tests.py test_*.py"
-}
diff --git a/dev-python/subprocess-tee/Manifest b/dev-python/subprocess-tee/Manifest
index 2b9e1875172d..19c5841e2bbe 100644
--- a/dev-python/subprocess-tee/Manifest
+++ b/dev-python/subprocess-tee/Manifest
@@ -1,2 +1 @@
-DIST subprocess-tee-0.4.1.tar.gz 13599 BLAKE2B 779a8b5381155e8d524b6715ab9cc37f8e55565dd378a2d256648d56f018dc71860b0db2a50572a5e03fab7d2de5cd691be53c49c1aa79e756b4eb8a8d5878a5 SHA512 683813096c4bb78a4263075ba8590a926134ec92db5e2e72ed98ab1db9e231768adc15bb4273ba138f9a1b2a14ae4050d0b6acc76d483d0f3530f376ce8d9eee
 DIST subprocess_tee-0.4.2.tar.gz 14951 BLAKE2B b94a8adc779bfbfd17046c4c85c9fb4020a0ca4de11735ec672a90e3be93d09d5f2ec60184e12bce86864b6ef22fedd0927dbb26267cb763d197c54bb4f342ed SHA512 acb0103b8a9ba6288e42148062e82b37b625f5c518e195c4d6e32efd2d5d9841ac6f2c2b240d223e7cdecc643daaa3d86c63a6bc34ca7b48e187cbf968e5dae5
diff --git a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild b/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
deleted file mode 100644
index 11b75984d299..000000000000
--- a/dev-python/subprocess-tee/subprocess-tee-0.4.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="subprocess.run replacement with tee(1)-like output"
-HOMEPAGE="
-	https://github.com/pycontribs/subprocess-tee/
-	https://pypi.org/project/subprocess-tee/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv"
-IUSE="test-full"
-REQUIRED_USE="test-full? ( test )"
-
-# ansible-molecule is invoked as an executable so no need for PYTHON_USEDEP
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/enrich[${PYTHON_USEDEP}]
-		test-full? ( app-admin/ansible-molecule )
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! use test-full; then
-		EPYTEST_DESELECT+=(
-			test/test_func.py::test_molecule
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tabulate/tabulate-0.9.0-r1.ebuild b/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
index 02012d36a6eb..b2976b95fd9e 100644
--- a/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/thrift/thrift-0.20.0.ebuild b/dev-python/thrift/thrift-0.20.0.ebuild
index 1d3bc58631aa..c1eb21534c1c 100644
--- a/dev-python/thrift/thrift-0.20.0.ebuild
+++ b/dev-python/thrift/thrift-0.20.0.ebuild
@@ -26,3 +26,10 @@ distutils_enable_tests unittest
 python_test() {
 	eunittest test
 }
+
+src_install() {
+	distutils-r1_src_install
+	# avoid file collision with dev-libs/thrift (bug #933272)
+	mv "${D}"/usr/share/doc/${P}/README.md \
+		"${D}"/usr/share/doc/${P}/ReadMe.md || die
+}
diff --git a/dev-python/tlsh/Manifest b/dev-python/tlsh/Manifest
index 7f54384d66a4..6fc86ca17aeb 100644
--- a/dev-python/tlsh/Manifest
+++ b/dev-python/tlsh/Manifest
@@ -1,2 +1 @@
 DIST tlsh-4.8.2.gh.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
diff --git a/dev-python/tlsh/tlsh-4.8.2.ebuild b/dev-python/tlsh/tlsh-4.8.2.ebuild
deleted file mode 100644
index e19707567516..000000000000
--- a/dev-python/tlsh/tlsh-4.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2022-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} )
-DISTUTILS_EXT=1
-inherit distutils-r1
-
-DESCRIPTION="Fuzzy matching library - C++ extension for Python"
-HOMEPAGE="https://pypi.org/project/python-tlsh/"
-SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P}/py_ext
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
-
-DEPEND="dev-libs/tlsh"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-setup-sources.patch
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e 's:#include "tlsh.h":#include <tlsh/tlsh.h>:' tlshmodule.cpp || die
-}
-
-python_test() {
-	../Testing/python_test.sh "${EPYTHON}" || die
-}
diff --git a/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch b/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
deleted file mode 100644
index 3eb9d103a0e0..000000000000
--- a/dev-python/tree-sitter/files/tree-sitter-0.19.0_p20210506-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2528827..bb2a817 100644
---- a/setup.py
-+++ b/setup.py
-@@ -33,11 +33,11 @@ setup(
-     ext_modules=[
-         Extension(
-             "tree_sitter.binding",
--            ["tree_sitter/core/lib/src/lib.c", "tree_sitter/binding.c"],
--            include_dirs=["tree_sitter/core/lib/include", "tree_sitter/core/lib/src"],
-+            ["tree_sitter/binding.c"],
-             extra_compile_args=(
-                 ["-std=c99", "-Wno-unused-variable"] if system() != "Windows" else None
-             ),
-+            libraries=["tree-sitter"],
-         )
-     ],
-     project_urls={"Source": "https://github.com/tree-sitter/py-tree-sitter"},
diff --git a/dev-python/unittest-or-fail/unittest-or-fail-2-r1.ebuild b/dev-python/unittest-or-fail/unittest-or-fail-2-r1.ebuild
new file mode 100644
index 000000000000..522d10ee8ad3
--- /dev/null
+++ b/dev-python/unittest-or-fail/unittest-or-fail-2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+# in py3.12+ unittest already fails when no tests are found
+# we're adding these impls to PYTHON_COMPAT to clean up upgrade graphs
+# but we're not installing anything
+PYTHON_USED=( pypy3 python3_{10..11} )
+PYTHON_COMPAT=( "${PYTHON_USED[@]}" python3_{12..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Run unittests or fail if no tests were found"
+HOMEPAGE="https://github.com/projg2/unittest-or-fail/"
+SRC_URI="
+	https://github.com/projg2/unittest-or-fail/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD-2"
+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"
+
+python_compile() {
+	if has "${EPYTHON/./_}" "${PYTHON_USED[@]}"; then
+		distutils-r1_python_compile
+	fi
+}
+
+# Warning: do not use distutils_enable_tests to avoid a circular
+# dependency on itself!
+python_test() {
+	if has "${EPYTHON/./_}" "${PYTHON_USED[@]}"; then
+		"${EPYTHON}" -m unittest -v test/test_unittest_or_fail.py ||
+			die "Tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install() {
+	if has "${EPYTHON/./_}" "${PYTHON_USED[@]}"; then
+		distutils-r1_python_install
+	fi
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index 4291f32939e7..76db9b8fcb2d 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,2 +1 @@
-DIST weasyprint-62.2.tar.gz 477895 BLAKE2B 918852d2eb9fd1b1e29101927e6251d827dbb7add8efa448dd7888c42bbe4079a514ff6d3d764ebb0cd96c0a1890f343b72575b1cc4e86959293a95054766d69 SHA512 d5254a39f6b5554e83fb2f8b88077a36d6f5a44f6d731b5f07c952429994f32a79c4d6c1187ed8ea9bdccada320c4347693bd4a21c61c6ad76f866161adfea81
 DIST weasyprint-62.3.tar.gz 477181 BLAKE2B 144b531e36c0e66fb715d2b1db20affb489e90dc7545435e2d2d5e5e89a0b77e03b5f08166a5ac6f488ed5e2ff5d268408d94edaf66a3327895f719e9329ff60 SHA512 c563019aac075d0f55a153483719a5ea1dd4dced8bf281aeb1c5ccb65b8591e883ea09ca86757073b10a4dd9dc2d718df83ff5913cd5b9ed703fb5cf71bf7fbf
diff --git a/dev-python/weasyprint/weasyprint-62.2.ebuild b/dev-python/weasyprint/weasyprint-62.2.ebuild
deleted file mode 100644
index 819b3a396878..000000000000
--- a/dev-python/weasyprint/weasyprint-62.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
-HOMEPAGE="
-	https://weasyprint.org/
-	https://github.com/Kozea/WeasyPrint/
-	https://pypi.org/project/weasyprint/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
-	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/html5lib-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-4.0.0[jpeg,jpeg2k,${PYTHON_USEDEP}]
-	>=dev-python/pydyf-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/tinycss2-1.3.0[${PYTHON_USEDEP}]
-	media-fonts/dejavu
-	x11-libs/pango
-"
-
-BDEPEND="
-	test? (
-		>=app-text/ghostscript-gpl-9.56.1-r3
-		media-fonts/ahem
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/yattag/yattag-1.15.2.ebuild b/dev-python/yattag/yattag-1.15.2.ebuild
index 02b5baa1eef3..efa88e01867c 100644
--- a/dev-python/yattag/yattag-1.15.2.ebuild
+++ b/dev-python/yattag/yattag-1.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-07-06 21:36:11 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2024-07-06 21:36:11 +0000
commit	b96e1c10114b0bbfe80e5b660fdc15f30b20e986 (patch)
tree	0d03a2ef863e08807580bc53ade14e37895e99b1 /dev-python
parent	00cc746cb29fda18e142951ff748a87781347813 (diff)
download	baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.tar.gz baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.tar.xz baldeagleos-repo-b96e1c10114b0bbfe80e5b660fdc15f30b20e986.zip