gentoo auto-resync : 30:11:2024 - 02:06:22

38 files changed, 517 insertions, 354 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e891f1ccd5ce..f23f2151ed86 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 0e8a00a9c554..4c21d5840ac5 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,11 +1,7 @@
-DIST coverage-7.6.2.tar.gz 797872 BLAKE2B dee18c9199169b74693377d937e720f26ec5c08e8036e1034d7a307e8b858c21abfa586dfaf651bb824ed9db2d97201048407920880e687151b53b46eb70eae8 SHA512 6f8a32b0ec034a24298b9c7ccebee5d9b1ef3659870ef27226cf5b8f687cb675ee2a6c94e12e8082e850af4357f44e690c717ea35360e0428bd2aaeb93866e36
-DIST coverage-7.6.3.tar.gz 798337 BLAKE2B 62190d9adff5bc752b16c799939dc6b710b5bed6e0ce3c2c14e6a074ab119482c23e33236bd1a758545eb1eccbb02b7eeb8072612ae52aaba8a7190f65b20e51 SHA512 e078989028ed8a6ec9e532314be63fb1cbe5589df56e737a96947fa09447da4adee502bb6aa26fb4455ade29ac722172b3314502709732b831484a7de6d1d489
 DIST coverage-7.6.4.tar.gz 798716 BLAKE2B 2b89e05fa71b18d94e19e9ee7acf3cea4125aa0baf32425e1bcdd695fbad4ac46f89d761cdd1593df1cc59d622dc6b63c010cb85d1b7c0d1396da4b0ac0c29c8 SHA512 ebd0f08584fbe6741f1b578bff22b3bc916b4ea352fd906a090c7a497ab7b885417e83344f108e95a22e93db306822e670578cc290af48e7a24f5a04956bceec
 DIST coverage-7.6.5.tar.gz 799549 BLAKE2B f571b32e3b7e6168e0e132bfec82a44e2897c6a7e381d3df77ad41bfb0afafea4ae32969841329b2b37a3db2bfdcd0ce9ba208fb350396db762168e1e968196b SHA512 8d7cb585d100080db239c05c2a1d09de9c9da0b2372616d9b6e7f52becc1273df347abd7568fce20dc18357badc6ba12e30255bc39876768b3bf32365f1900ad
 DIST coverage-7.6.7.tar.gz 799938 BLAKE2B f780fdefcb9a9610384646ede95acaff27d1a27a6fcefdcf092baac6134c0731914c10c195fce966282c33b06f45d4fd404b275cb797d6bbbae681ad6abbe916 SHA512 73b4cf99eb17b2615e5c70488ee219d25e18c0484dc5e53dbaba459486b6b2308c60adfc4acf9093c258e5914729dfbbf21401a871ce6ed3c01bf95912261fc0
 DIST coverage-7.6.8.tar.gz 801425 BLAKE2B a1bfb660a0e079411c13d4fca28863085c6010cb696b4e0dd7d06686313baea1bb25c91373b095630854d737fdf003fd8ced67e91e356d807e2b9b4fc903398c SHA512 1d1aea6fba8511ebd0db1a5f528dccf79d40280b8f8a0531dfca293611346df2f82dba974a351a3ea1a17e648b30ea7ea6689cb646c56de84ac33778362b4b4c
-EBUILD coverage-7.6.2.ebuild 2670 BLAKE2B a4af413c7af27de2134da8f07ab089961e1f3926d1f99d1bfbf52f343dd089c782554e9499ede1bd00f9b34c718794a75f474bc76327c79827cd0b01cafd90ac SHA512 d3b3e9e02a29cada83553a9cbd269b786d6e7ff76481c704962d9c3129f7fad59720171492d1278431813d25cc837e3c06c62b82335f0c277d1abc688215cedf
-EBUILD coverage-7.6.3.ebuild 2671 BLAKE2B d2f45b0370a99652fbb7992544753233769578ca50b62e9c9f62f6f17953ed1d5b5b58a641e10ae5217b199b3ccd405f52cd9703e15d200bc7f0608efdf87875 SHA512 64dea655b87841015dac5ee3383c8ad30c5f3d3a5f723595802ee17912ce38c6cf14d24fb1de04a6abdd43574dcfd8157c2ebf1d0feef1d6be4f5c3d8e8e8070
 EBUILD coverage-7.6.4.ebuild 2670 BLAKE2B a4af413c7af27de2134da8f07ab089961e1f3926d1f99d1bfbf52f343dd089c782554e9499ede1bd00f9b34c718794a75f474bc76327c79827cd0b01cafd90ac SHA512 d3b3e9e02a29cada83553a9cbd269b786d6e7ff76481c704962d9c3129f7fad59720171492d1278431813d25cc837e3c06c62b82335f0c277d1abc688215cedf
 EBUILD coverage-7.6.5.ebuild 2678 BLAKE2B a192b24f1c622a54a8c659dfc4cfc12d3fb5bc92482b54cda090515778048b35b03f9b4ef4307dbc5543fa9d1b8b8259c409ea34a928d565eeda3139a74b6caf SHA512 d9276a455e1a1e4301d4a896f0a031d0c667a00006399d2bfb883dc79fb5a4cc20e45c27f2e93440d4d35da083ecb6b2a2f6954266d42d741ae45f51d0a3f83f
 EBUILD coverage-7.6.7.ebuild 2678 BLAKE2B a192b24f1c622a54a8c659dfc4cfc12d3fb5bc92482b54cda090515778048b35b03f9b4ef4307dbc5543fa9d1b8b8259c409ea34a928d565eeda3139a74b6caf SHA512 d9276a455e1a1e4301d4a896f0a031d0c667a00006399d2bfb883dc79fb5a4cc20e45c27f2e93440d4d35da083ecb6b2a2f6954266d42d741ae45f51d0a3f83f
diff --git a/dev-python/coverage/coverage-7.6.2.ebuild b/dev-python/coverage/coverage-7.6.2.ebuild
deleted file mode 100644
index a00cbee03d96..000000000000
--- a/dev-python/coverage/coverage-7.6.2.ebuild
+++ /dev/null
@@ -1,102 +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_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_CORE=${1}
-	einfo "  Testing with the ${COVERAGE_CORE} core ..."
-	epytest -p flaky -p hypothesis -p xdist tests
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: fails because of additional "Terminated" print on SIGTERM
-		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
-		# broken because of pytest plugins explicity loaded
-		tests/test_debug.py::ShortStackTest::test_short_stack{,_skip}
-		# these expect specific availability of C extension matching
-		# COVERAGE_CORE (which breaks testing pytracer on CPython)
-		tests/test_cmdline.py::CmdLineStdoutTest::test_version
-		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
-		# mismatch of expected concurrency in error message
-		# TODO: report upstream?
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
-	)
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" coverage/ || die
-		test_tracer ctrace
-	fi
-
-	test_tracer pytrace
-
-	case ${EPYTHON} in
-		python3.1[01]|pypy3)
-			;;
-		*)
-			# available since Python 3.12
-			test_tracer sysmon
-			;;
-	esac
-
-	if [[ -n ${c_ext} ]]; then
-		rm coverage/*.so || die
-	fi
-}
diff --git a/dev-python/coverage/coverage-7.6.3.ebuild b/dev-python/coverage/coverage-7.6.3.ebuild
deleted file mode 100644
index e6db42604cc6..000000000000
--- a/dev-python/coverage/coverage-7.6.3.ebuild
+++ /dev/null
@@ -1,102 +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_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Code coverage measurement for Python"
-HOMEPAGE="
-	https://coverage.readthedocs.io/en/latest/
-	https://github.com/nedbat/coveragepy/
-	https://pypi.org/project/coverage/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/s:-q -n auto::' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-test_tracer() {
-	local -x COVERAGE_CORE=${1}
-	einfo "  Testing with the ${COVERAGE_CORE} core ..."
-	epytest -p flaky -p hypothesis -p xdist tests
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: fails because of additional "Terminated" print on SIGTERM
-		tests/test_concurrency.py::SigtermTest::test_sigterm_threading_saves_data
-		# broken because of pytest plugins explicity loaded
-		tests/test_debug.py::ShortStackTest::test_short_stack{,_skip}
-		# these expect specific availability of C extension matching
-		# COVERAGE_CORE (which breaks testing pytracer on CPython)
-		tests/test_cmdline.py::CmdLineStdoutTest::test_version
-		tests/test_debug.py::DebugTraceTest::test_debug_sys_ctracer
-		# mismatch of expected concurrency in error message
-		# TODO: report upstream?
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet
-		tests/test_concurrency.py::ConcurrencyTest::test_greenlet_simple_code
-	)
-	local EPYTEST_IGNORE=(
-		# pip these days insists on fetching build deps from Internet
-		tests/test_venv.py
-	)
-
-	"${EPYTHON}" igor.py zip_mods || die
-
-	local -x COVERAGE_TESTING=True
-	# TODO: figure out why they can't be imported inside test env
-	local -x COVERAGE_NO_CONTRACTS=1
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-
-	local prev_opt=$(shopt -p nullglob)
-	shopt -s nullglob
-	local c_ext=( "${BUILD_DIR}/install$(python_get_sitedir)"/coverage/*.so )
-	${prev_opt}
-
-	if [[ -n ${c_ext} ]]; then
-		cp "${c_ext}" coverage/ || die
-		test_tracer ctrace
-	fi
-
-	test_tracer pytrace
-
-	case ${EPYTHON} in
-		python3.1[01]|pypy3)
-			;;
-		*)
-			# available since Python 3.12
-			test_tracer sysmon
-			;;
-	esac
-
-	if [[ -n ${c_ext} ]]; then
-		rm coverage/*.so || die
-	fi
-}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index c98de92227b6..5663ba911172 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.11.6.tar.gz 181608 BLAKE2B 6078aa16ce879417d21d1f9260bc18e86de9c33054b46592a6af821a349973e6fe69c64a23a23b2b2278edf12180fe37cb218b83c0c0abc536928124fa5dad9a SHA512 538127e30fe71f14643acada521bbd9090999464a4ead1b95805d759d23efd55a87a8a2daf26cd8eebf6c0396850430cac2ef7328ee79921df0862c2713e5208
 DIST denonavr-1.0.0.tar.gz 182189 BLAKE2B 044f5bc2dd37ecf58c0c13c56c638c8e336b206eb6a6333364ee72af0b9dcf309b85ae0ae701a3da5e7b02211f4baa5c109f71bbda03fec5075dd27f823a25c5 SHA512 8c562dd61d1cfec6110c880e1c052f8234b2d026791aafd528c526f55decbfc7f57ecb06bf4668ed2a7abd9fc2fa1cef12991dab7bb7368847356e21517a237b
-EBUILD denonavr-0.11.6.ebuild 1001 BLAKE2B c9b703ede3a413a3708312b2ebe3462a5aacc19a532562224f11b2de627093d463209787dc921193941e55580cca323a2fd5a8ff9414f15ee8eafd1a879692f1 SHA512 3b31a257afa60ca4a703b06f25cf541e41f3fa020948383b92a2d1d6567aae4191626294534b0b60165b3db2523745f476f85a33e21d5d77904bd3667aa4b6b7
+DIST denonavr-1.0.1.tar.gz 182654 BLAKE2B 27e2cda7fedb67fcb693d1d95bbc4d19e1e23c50b34b2949c5254803632735860468c39fec128edfe2657ef4cac9b57880251345a5556866de9703d3cf3abf88 SHA512 3d8b433574bd51bba5750c12b451025082de41da95d1d2907d6e63820d244ce051a52519a1d5c061df447ae7498ff8178d0c7c58624d460a7cab8db3e3d27e29
 EBUILD denonavr-1.0.0.ebuild 1001 BLAKE2B c9b703ede3a413a3708312b2ebe3462a5aacc19a532562224f11b2de627093d463209787dc921193941e55580cca323a2fd5a8ff9414f15ee8eafd1a879692f1 SHA512 3b31a257afa60ca4a703b06f25cf541e41f3fa020948383b92a2d1d6567aae4191626294534b0b60165b3db2523745f476f85a33e21d5d77904bd3667aa4b6b7
+EBUILD denonavr-1.0.1.ebuild 1001 BLAKE2B c9b703ede3a413a3708312b2ebe3462a5aacc19a532562224f11b2de627093d463209787dc921193941e55580cca323a2fd5a8ff9414f15ee8eafd1a879692f1 SHA512 3b31a257afa60ca4a703b06f25cf541e41f3fa020948383b92a2d1d6567aae4191626294534b0b60165b3db2523745f476f85a33e21d5d77904bd3667aa4b6b7
 MISC metadata.xml 538 BLAKE2B 7f0ea063a1ebe7cfbab11a8e92b803606c6454ea9bf871bc804f048a58b35e0ab66eafbee64d8d4328e4e3cd5361a810527813c48aba212950f263da2b4454cf SHA512 3531537b37f09f4b0d27d124d1bc698d8b8eeb410a0f3504f315a8002a8443a886959706e437359796623f3462b3d12d89ad677fbde73ee6081c61ed01663ad4
diff --git a/dev-python/denonavr/denonavr-0.11.6.ebuild b/dev-python/denonavr/denonavr-1.0.1.ebuild
index 2f160c89d6eb..2f160c89d6eb 100644
--- a/dev-python/denonavr/denonavr-0.11.6.ebuild
+++ b/dev-python/denonavr/denonavr-1.0.1.ebuild
diff --git a/dev-python/hatchling/Manifest b/dev-python/hatchling/Manifest
index b933a5beb7a3..80bb7d24fd2e 100644
--- a/dev-python/hatchling/Manifest
+++ b/dev-python/hatchling/Manifest
@@ -3,5 +3,5 @@ DIST hatch-hatchling-v1.26.1.gh.tar.gz 5276205 BLAKE2B 135dff9ee6a56d15a2a801945
 DIST hatch-hatchling-v1.26.3.gh.tar.gz 5275661 BLAKE2B 2aa7ac3cfb0e07b29765749fca94bdf6f54eb4fe38b809851b4a41ab7dde28faa304c2efc0f9a1cb53868167ad1c01871723cb89aa299d0619b8fa190435bb95 SHA512 1e62384acdf6707297a2847cdba2da4d63caf48d7428544c70b106d75aa3966f4204cd172cf9ddf25e5c1fe8c029c6730cf884c705ebfdc4f93773fa6527e5a4
 EBUILD hatchling-1.25.0-r1.ebuild 2929 BLAKE2B 1bbc2c8610b4321b52d5d294f6e9d2416413f225d1da074c8186cabe04c34a4d51bd616178a721bf957fc8dbb4f2518317ec7a611fa537c4f82ea6705376bffa SHA512 39bbb54331926eeed7596c36cc202050e4cfb4c40340d6c3a1879e45fbad2ee683ac40d819de67ddf692759d4eaecc4105a87594942adf5552094569463446ef
 EBUILD hatchling-1.26.1.ebuild 2937 BLAKE2B 1f98caa7502063824bc9060244ec8160ffa673348aeb262d26ffe4e8dd015eb531e552b98a91f2986627f0f3220ef8271f2fd11440760474652c304ad46e2d7f SHA512 0f0a648793ce338d564a5b9a6baff8821a4add1187df2e457a535e31f6155ece652d700c87b4a661ef40e690aadf68ea47241f827c8bcefddec0e68ba1ac4ac6
-EBUILD hatchling-1.26.3.ebuild 2937 BLAKE2B 1f98caa7502063824bc9060244ec8160ffa673348aeb262d26ffe4e8dd015eb531e552b98a91f2986627f0f3220ef8271f2fd11440760474652c304ad46e2d7f SHA512 0f0a648793ce338d564a5b9a6baff8821a4add1187df2e457a535e31f6155ece652d700c87b4a661ef40e690aadf68ea47241f827c8bcefddec0e68ba1ac4ac6
+EBUILD hatchling-1.26.3-r1.ebuild 2740 BLAKE2B 0df1c0b08dda80a023d9fef7de1ebacab28fe6558aaf47048777a5c9215034bca897b1ab573dd4f0f443de1307713ab81e2a9e6df2dbc83d946b51f3340c49a0 SHA512 aaabfdf48e60b8244500930808106c0a0dfcccc1b49d4dae172ac38711a4f2123e75cdc49bac79075dc9e8df2f67c14af3b51d7bee01e7eb4e1b5b40ffaab1aa
 MISC metadata.xml 365 BLAKE2B 5a40a6cf6df042e6e8387830babd0171c9d8bc5d490fe2175b83d1588d827e826b49044ef29de48553515996b742fc475bb9699dcfa8ec05229162b22e0ed317 SHA512 f11bb25bc12c2bb0b0a0a4691115b9a2af525d9e44b33e0d6db98c7fcef0b49b5989fb7574ee8b27bc88f1dd2543bfdd492a6614de172e2c4edabbee8bf6161e
diff --git a/dev-python/hatchling/hatchling-1.26.3.ebuild b/dev-python/hatchling/hatchling-1.26.3-r1.ebuild
index e5f6cb572bc7..d6cb34a09c15 100644
--- a/dev-python/hatchling/hatchling-1.26.3.ebuild
+++ b/dev-python/hatchling/hatchling-1.26.3-r1.ebuild
@@ -36,12 +36,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-1.2.2[${PYTHON_USEDEP}]
 	' 3.10)
-"
-# always depend on the newest version available, at least until upstream
-# stops treating unknown classifiers as a fatal error
-# https://github.com/pypa/hatch/issues/1368
-RDEPEND+="
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
+	dev-python/trove-classifiers[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	${RDEPEND}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 53f133adc461..5f8616f3bb42 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.116.0.gh.tar.gz 9480480 BLAKE2B 350abfd8bad65a33669345a71c3df9
 DIST hypothesis-6.118.9.gh.tar.gz 9487943 BLAKE2B 3c8d17d2763877107c7342d9a9825cb733de91ce6c99c88ed7536ac0e82d728f54d762c9b26cb02d742c470afc05c2798fb20e1f3c6f52d3b9d0e2c9cea9e99a SHA512 ba4f32892088a3a4d1a3d9ca2d28b9828cd7e2f4c4878733943f34f431014d4ba4dfe07729878b4c87cc295b6d6f219094c1f774ac115acd3b375ecc3c58d580
 DIST hypothesis-6.119.4.gh.tar.gz 9490666 BLAKE2B 99a45054b90026317bca165915b2ffe3b3abfa03a98efc6181bd64f6ca851f9a90e4ba1b41ba4f3b2181de02818a91367f1c29523b78bca303da4eea31db1284 SHA512 003b01fd3e1e4ae2ea68f72b80063928dd56a069fdf8b6ffc73f6ffb3db4b048523564bd616d604d04a3ea55b19c01940ad7ba60bf1e88c54e29359ca0e397db
 DIST hypothesis-6.120.0.gh.tar.gz 9491124 BLAKE2B 56e2441f7f1daddfac37d4288513d6140c9af01764bd32e5a14b1ae91982c28038c077038cbe278a48db77029af188857561122c6b347b6ea1992f46ab77f2d0 SHA512 9bf39b114cc9fa4eda77651bc02433c49f1d6526827a65086ca911839e4d8a7bf245b4e47b07f71ae533904c3ba90498bc632a6e18d3b8ef8e632a5d1a31b0ec
+DIST hypothesis-6.121.1.gh.tar.gz 9492038 BLAKE2B 428d19c55e9b6633a8c75ad7f9e143c5701c1f1624e570df1ac060c9ee2386f1fd73467779febebf5b97310f7d2f71cd14a873080060e2e8c905f87a16beb4d8 SHA512 bd8d5bc78ca0a4f68bca69c07c0e6559d707746416793434e2c5622fc76cdb3a8b418f51df6fd1199b3bc8a2a879dfba3c5bc284dfd2b0387cbc3a0ccb44cdad
 EBUILD hypothesis-6.116.0.ebuild 2579 BLAKE2B 9d6bf7e5080cf4e503d590b3f152648bcadc5ae6926aa64b112bcb60656b0c48b70be622a17a01b451ffe8d78853e3dbdc2e12ec12fd52abfbe4e46fc361828f SHA512 6377325432166d2539b3d71e24c802d1aad13b2617d8c2f2281c8ba4a6ee101f1d1f4ed890c7cd893f96a078f67880aecfa72cc56490dfe7a429f7f92932079c
 EBUILD hypothesis-6.118.9.ebuild 2546 BLAKE2B a0d28f72abedc005d8e8cd2ada7e933f24a804b2c6ed69447971a7dda156157e9f964735da5bf6fcf75c29212d533df69a467bb4f607a28dd060540164d9aecc SHA512 91b00667808773833c2ec4671f80f665fcaa08e37ca3cbb4b12f18dd216ffb5a456caa36b9014f28950e4aaefda1d4b288fd119d2e679f9d214b9b3a694fda2f
 EBUILD hypothesis-6.119.4.ebuild 2546 BLAKE2B a0d28f72abedc005d8e8cd2ada7e933f24a804b2c6ed69447971a7dda156157e9f964735da5bf6fcf75c29212d533df69a467bb4f607a28dd060540164d9aecc SHA512 91b00667808773833c2ec4671f80f665fcaa08e37ca3cbb4b12f18dd216ffb5a456caa36b9014f28950e4aaefda1d4b288fd119d2e679f9d214b9b3a694fda2f
 EBUILD hypothesis-6.120.0.ebuild 2630 BLAKE2B 6f0903d9f3a4a67f16c4c492ab7dbbefa22675185c9236e889018360c9eea618e3705d3a44cf760d74f7aa17d50197788f4895e17c8d8bed56d1559eb05fb974 SHA512 1c52efd3ab43e01b4943d5f9b35960e224cb69091922e0df9a058f1b12dfb1199e67e261e489a6e7c90bc254e92bb38a55abca7fb73ae48e800e5206d45ec32d
+EBUILD hypothesis-6.121.1.ebuild 2630 BLAKE2B 6f0903d9f3a4a67f16c4c492ab7dbbefa22675185c9236e889018360c9eea618e3705d3a44cf760d74f7aa17d50197788f4895e17c8d8bed56d1559eb05fb974 SHA512 1c52efd3ab43e01b4943d5f9b35960e224cb69091922e0df9a058f1b12dfb1199e67e261e489a6e7c90bc254e92bb38a55abca7fb73ae48e800e5206d45ec32d
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.121.1.ebuild b/dev-python/hypothesis/hypothesis-6.121.1.ebuild
new file mode 100644
index 000000000000..dde5562c67da
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.121.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( pypy3 python3_{10..13} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -p rerunfailures --reruns=5 \
+		tests/cover tests/pytest tests/quality
+}
+
+src_install() {
+	local HAD_CLI=
+
+	distutils-r1_src_install
+
+	if [[ ! ${HAD_CLI} ]]; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use cli && has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		HAD_CLI=1
+	else
+		rm -r "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index d2d1310f70f1..fddc1b347a58 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,7 +1,7 @@
 AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
-DIST imageio-2.35.1.gh.tar.gz 415944 BLAKE2B 303cc3ab288b184fdbd8b5a1e3cb47308bd96e818793245d84f4bb3fb55f117fb61ae49df80aada8aceb128172d3b47e48fe0a47823a0734847a98983f2ec80c SHA512 7aa486c23179a798b3801a4ea7d71d2a4f81f53a02dcd0f83537bb3b3ce617b02882bb970e45bc390c106b8d7c62822a736f898ff21dac4951963f2cbc899fc4
 DIST imageio-2.36.0.gh.tar.gz 415793 BLAKE2B 2b382290ab41a8b265629695c484eac887f33900d2b1a2a1e35f5db9ebc776242f7325e4c50055ab500f98067f1a27d083cd6aee9c0cf65dfe3e18c1d62336c2 SHA512 8d59633d31211e0510e8790e0d052b0c0d8912cc49a187c7d846ab62c2210b8f1851b63c83a0daf6123fc905b351ea0b51883746f6dcb83939975f51b913f63c
+DIST imageio-2.36.1.gh.tar.gz 415873 BLAKE2B d60fda8a0cdf6f677c9395ccd2abfa9a08cca73cedfc376335f12deee7206694d905079307546f716007d138f3b7da1e390b50715aede83e1ac94b300e80a439 SHA512 05695cb1530612ecbc002de3560fe6bafd11c6ad3fcff570b0309a4a9793820109163819fce4763052b8e442daec13ae09e0e2666b2deaea6c52ca76a9ae5386
 DIST imageio-test_images-1121036015c70cdbb3015e5c5ba0aaaf7d3d6021.gh.tar.gz 195497374 BLAKE2B 0083212fd63c196dc2e721bff8f89c177b6741317b6b1c6ae9d00a8dd5fb6366efa3f01b9bffafafac7177cfdaa4d700077a2bad42ada735f5553e97f651c4ad SHA512 1bb1f36a069bfaa0d0ffe5258534e02e49237fc6ce85fe3d3648650130165abc9b3d5ff0e7e5861ee1d94add00d4258575f9c2f8556debecf597bdaa5499efe0
-EBUILD imageio-2.35.1.ebuild 2809 BLAKE2B eefd1ddee17b0066858d61ade38d9fe436c5f00d4d2fde73041c15827ac93f71390c234fa16fcf7cdb00b2e42b5b534feac0341242cbb0efbcaaac40c6bb157d SHA512 ca01c395c9f4ba0191cbf2cb32084684c14fde5b92d867f5a42785027b19a179a1d45e387641c8cb7b3d78291504dd00b4044e6926c84abe34959194b82b7663
 EBUILD imageio-2.36.0.ebuild 2859 BLAKE2B ba8460b4bd7a3e14157adb4bd63d9e27a2fade32e8010690bdc9e39381934dfdda7ced169142bfb31833a1b097b160ff2a86ba0f78c6d4f69dfa7d43cacc144a SHA512 76f6cc81d0aeb69b7ea6db5e52781673e5cf41b74e28c42f412567f128c9663c84da2afadac1618fba1b976e6c799c85018bc7f0564c341dedcf69b1a12aad27
+EBUILD imageio-2.36.1.ebuild 2859 BLAKE2B ba8460b4bd7a3e14157adb4bd63d9e27a2fade32e8010690bdc9e39381934dfdda7ced169142bfb31833a1b097b160ff2a86ba0f78c6d4f69dfa7d43cacc144a SHA512 76f6cc81d0aeb69b7ea6db5e52781673e5cf41b74e28c42f412567f128c9663c84da2afadac1618fba1b976e6c799c85018bc7f0564c341dedcf69b1a12aad27
 MISC metadata.xml 702 BLAKE2B 646c6a83e6d8e345fddb9cbc42a83c1193b9590937cd652e293d03e6e9d4b240a69e6e86399f5edc9ef05f96d1d4c3713dfa65f8b13984f4483b2ce76a239429 SHA512 5e1e4db52fed55ab837c70ddb9ec81a7ce0b062064e2d33cb5771cd81d50a1a2164e446531c32a405bb9319acd736141765dcd00e36d6db770434a656ad925e1
diff --git a/dev-python/imageio/imageio-2.35.1.ebuild b/dev-python/imageio/imageio-2.36.1.ebuild
index 9f86e40a6cdb..b87adefff348 100644
--- a/dev-python/imageio/imageio-2.35.1.ebuild
+++ b/dev-python/imageio/imageio-2.36.1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1
 
+# teh test suite always clones the newest version
 TEST_IMAGES_COMMIT=1121036015c70cdbb3015e5c5ba0aaaf7d3d6021
 DESCRIPTION="Python library for reading and writing image data"
 HOMEPAGE="
diff --git a/dev-python/jaconv/Manifest b/dev-python/jaconv/Manifest
new file mode 100644
index 000000000000..4d16102920a7
--- /dev/null
+++ b/dev-python/jaconv/Manifest
@@ -0,0 +1,4 @@
+DIST jaconv-0.4.0-nose-to-pytest.patch 9718 BLAKE2B 3c8386357c2a1359cd7885f9070138aaa743cda747869c0a4af60888def9804f0a2c57d7dc808096f3acb79bfc5ce7c7c45c3da9e9e683e597c3168c1650b1ef SHA512 4d0abc1e26f8d0652114cdd0a7bf6bd30acea5be2e8f21a956a0305ae8363d4e7734d6c082a801b5ef3d83892d53ff709737e587c5e983be76c8dfab068868ca
+DIST jaconv-0.4.0.gh.tar.gz 22876 BLAKE2B b37723afdf8516398608919ee5058dae9a99c4f0b258eb0a570b2f4f472637b6cd2e97c6f076b2d42cf74c0f1c1dce852f24a7effde79e8808b6f4e8b55020d8 SHA512 f435f1f61fef2ed36ee387138c767f88bf40dfb9d607b2b8bf9f88b1bbfd969d71c03464ce5b2adba2a65b5441eff6a0b88629cdff415366c2f1b8e6ea510bdf
+EBUILD jaconv-0.4.0.ebuild 997 BLAKE2B 0945a27a2a09ddced5aa19c70d78d79d67731dfe274bc137509a15fa7cc1266ff2da7b73db4a80b77987ac0d8114480653f21b36ef3163d05e1ab34a39297403 SHA512 e1fe1a7cbe0f1ec615e9a2422769fb5632536619e59fb8c4741dcdbc7fe8e249cd1fa783f20b69e1b312cfcc2e34e82947f5a9b6de80e9a4d9d68ee70fff67e6
+MISC metadata.xml 480 BLAKE2B e4332125eb3848844af1dbffb78c5bb83fe5e4fa62e01e22cc6ef8412d794d118496385b8140d1ee16868f2e9a7dc66caa0d1104565ee7765e13ca795d43a0e5 SHA512 c4a8f2a498bea2c1251be572db465d27c3dd5ec97c81eae8db656cce48bb439060b5cade498583a5bc211585312b2c486745ae759152047e4948e472f8b88765
diff --git a/dev-python/jaconv/jaconv-0.4.0.ebuild b/dev-python/jaconv/jaconv-0.4.0.ebuild
new file mode 100644
index 000000000000..8a9bfed0bcf4
--- /dev/null
+++ b/dev-python/jaconv/jaconv-0.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+# no tags on github, no tests on PyPI
+MY_PV=1d8aca73a72a4615b165602af9890517444e45d9
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure-Python Japanese character interconverter"
+HOMEPAGE="
+	https://pypi.org/project/jaconv/
+	https://github.com/ikegami-yukino/jaconv
+"
+SRC_URI="
+	https://github.com/ikegami-yukino/jaconv/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/eli-schwartz/jaconv/commit/4f4160d33267ee7b6ff7386cdcdc6064a315b82a.patch?full_index=1
+		-> ${P}-nose-to-pytest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/ikegami-yukino/jaconv/pull/36
+	"${DISTDIR}"/${P}-nose-to-pytest.patch
+)
+
+src_prepare() {
+	default
+	# tries to add README as data to install to sys.prefix
+	sed -i '/data_files/d' setup.py
+}
diff --git a/dev-python/jaconv/metadata.xml b/dev-python/jaconv/metadata.xml
new file mode 100644
index 000000000000..f8fee96e79ae
--- /dev/null
+++ b/dev-python/jaconv/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
+		<name>Eli Schwartz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaconv</remote-id>
+		<remote-id type="github">ikegami-yukino/jaconv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/multipart/Manifest b/dev-python/multipart/Manifest
index 39f2c9928fd6..cf0ed427e72d 100644
--- a/dev-python/multipart/Manifest
+++ b/dev-python/multipart/Manifest
@@ -1,3 +1,5 @@
 DIST multipart-1.1.0.tar.gz 34622 BLAKE2B f4973a80aa7f7979f9882c4689b83b9e557a1b5a2cc4dac3df8bde6b46979b542974762826588a641e9ecd52d6c50e4d804732042762c08c59e6c23a62bdf0b7 SHA512 308b3080b2085315b3d080c976be26df8f9028862c9bea14069ddc3a5aad3b5f60cb75fdd387b943e5f555f6aecfbc865a1e9aa457bf06b9a7f08e13aaaba449
+DIST multipart-1.2.0.tar.gz 35932 BLAKE2B d4f909dda8ffd0b5488a22baa683f0e8782ae8622fe70e657a2baed4c4f841d9161cd252f7fbd140be13184ec3d379e24b4d24fe1f61e6c633a88ccc74a1c005 SHA512 2fbe7a52f6a32f1e25f8f2036187b18b5ec549e96dd0d58a89fa48da67464a010d0a015099b87f778ce48a72fc3e28e26d07a542a5999652c8186b42f47d5c97
 EBUILD multipart-1.1.0.ebuild 448 BLAKE2B 17b4def728b50bd4fcf1ee0acb9208eeec48e3b39c0b60c0e96009d0c150228a6df7155ebe353c71b58a36477e19c0541d80cf59ff51dc5a302f3e0df2169a95 SHA512 ba57b3389f9bf0676a5680490c2c7836b26a8b8c980712e2e172d0c7cff78d559cbbc30eaeef5d9e61437d681228a1bef6ae6985647847cdaf3ef2c1d0c0908b
+EBUILD multipart-1.2.0.ebuild 448 BLAKE2B 17b4def728b50bd4fcf1ee0acb9208eeec48e3b39c0b60c0e96009d0c150228a6df7155ebe353c71b58a36477e19c0541d80cf59ff51dc5a302f3e0df2169a95 SHA512 ba57b3389f9bf0676a5680490c2c7836b26a8b8c980712e2e172d0c7cff78d559cbbc30eaeef5d9e61437d681228a1bef6ae6985647847cdaf3ef2c1d0c0908b
 MISC metadata.xml 372 BLAKE2B 3a3e9fcf03a4a9b4b2d7d6f3571d4f5a027aaecb6f9c602d3510b09c006414d7c1c64c3299ea5f651aed3e222d89b8de0ba2c0d9ed8317f771c844a164908539 SHA512 4eed94dbe74d4f60ec345b22a3599401c651bdc6630d1f21134bd814e7047505fdf4f39e6256f842689a499b0747afec5630783246158512c8d651eecd71620b
diff --git a/dev-python/multipart/multipart-1.2.0.ebuild b/dev-python/multipart/multipart-1.2.0.ebuild
new file mode 100644
index 000000000000..0cf534646bb1
--- /dev/null
+++ b/dev-python/multipart/multipart-1.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{10..13} python3_13t )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Parser for multipart/form-data"
+HOMEPAGE="
+	https://github.com/defnull/multipart/
+	https://pypi.org/project/multipart/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 7ebc46011967..d944fbf107fe 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,3 @@
-DIST pycairo-1.26.1.tar.gz 346882 BLAKE2B 52e92b3b7e6ffda89a01b293f0bc6c5da5018ba77dce92d30b221fbf1f8c1b253f5ae279d64a517810b6efe4d7d282c21dbc15e5ef8e372204095c773b12de52 SHA512 4f63fc4fb2b6bf65d8a1cbbeaf4d982c5eb2271309763522ee6f763f691428b3e420434382e8a3e1d6b841821940f44f4bc6f51724eb4474494d60b7ff1c9031
 DIST pycairo-1.27.0.tar.gz 661450 BLAKE2B cc1ef54057d02f3e25fed010c995e4fe400ccdf3a5d2f241c029ded167c5db2560a4d9c8cb09b2f0519e674b5962f2244f0570401f45743fe1ec61d5a8982227 SHA512 1b077917b1d99262da1c1d2ff85ae841dd0ff715925a5a20032162aa876576d966fc6b30c154343cc45f104cce243887de9b5f14af1e15775cb71b6c11e553a6
-EBUILD pycairo-1.26.1.ebuild 1513 BLAKE2B c784a4c05fac3468d3377b7771bd289c0426e634461936a78ee23e4c1955ca545128bcee2a6cbb034ded16bd3bbf17f10ac351932c8191110e886f0645caabe1 SHA512 c965468de3b67645ab479fc3b18642be9dd5a59cd7783f394d4bc8626d34f69d3a64c3240849b212708f2242c356cbd683432cc39f41721e141eef9a1de965c1
 EBUILD pycairo-1.27.0.ebuild 1433 BLAKE2B 0a701b43bc5289ffc8a2bb72df5c6fdac8fc1c93eca5dd7dc87050d2a26e663773adcad8d48076e5f7a50a98907b25a0ac1835cbff73d134f1da918fd3ec480b SHA512 b138ac81ef5cabc54b8889fd2187bba48e6525fecc13c784b778230fe717f800b40c9a3387cfc38094e2861d138425e4716be90ffa3b41477bc4d5c76afd6a57
 MISC metadata.xml 368 BLAKE2B 5e0f85e23bc56113927d28072c7178d27fc058b1e90851150c55e9e713edb96dd5daa79df8423f6719032538c9448d8afa9b750961bd82a5bcfae2d5e228c6b6 SHA512 c1e81ed2f535c8050f18950a57b71aa871b965c57d1e5ca8e8a4c48ecd643bc9ec326e046c1aea9f3f41124b9fe765a0b9b46a541c28f325cae7038cea66d086
diff --git a/dev-python/pycairo/pycairo-1.26.1.ebuild b/dev-python/pycairo/pycairo-1.26.1.ebuild
deleted file mode 100644
index 630fdc151c7c..000000000000
--- a/dev-python/pycairo/pycairo-1.26.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_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
-	https://www.cairographics.org/pycairo/
-	https://github.com/pygobject/pycairo/
-	https://pypi.org/project/pycairo/
-"
-SRC_URI="
-	https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
-	esetup.py build_tests
-	epytest
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# we need to pass --root via install command, sigh
-	cat > "${T}/distutils-extra.cfg" <<-EOF || die
-		[install]
-		root = ${D}
-	EOF
-	local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
-	esetup.py \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-
-	insinto /usr/include/pycairo
-	doins cairo/py3cairo.h
-}
diff --git a/dev-python/pykakasi/Manifest b/dev-python/pykakasi/Manifest
new file mode 100644
index 000000000000..285022c958a5
--- /dev/null
+++ b/dev-python/pykakasi/Manifest
@@ -0,0 +1,5 @@
+AUX 0001-fix-update-test-expectation.patch 818 BLAKE2B 8110378b928ddec309a61bbb93b0a79a353a713332208e4768a85dbee6293ac4fd10e9c691bafaff85b8423fc8b5f230003a68c5e21e459ca37d0824b0b9dbc9 SHA512 79ce631602cd5d66e21832aac9f6213b43f865d704ff57dcafe8adb55b95058b90f1b8dffcb8336daf052fb6f062789f8daf66eb09d809e7cc2e003b1740dca2
+AUX 0001-tests-make-benchmarking-optional.patch 1519 BLAKE2B bf74a440e7009e9ddffc5e7de608c9deabb3d192c3ca9d7378fd764946c831e3e97604be4ff560d4280115810e209795cc7c72d27c739b07038d1ab1b3da2c24 SHA512 07d3ef50a59db4ac73372a0e67cd743e8dd70e172c52e2dfb1e045f6dba59825814e35065ad39bdfc2692876d32187176b0a1c5eb0df2b91c26c7b3da08fde51
+DIST pykakasi-2.3.0.tar.gz 21752447 BLAKE2B 84bf946beebd6bbd156970b8f6610aacab2305dc3ace6798464a64f22a007bbe8a4fb76b43788638095ef5babbf9ac48ac9d1887e8e0a5859fc9dcb579e00281 SHA512 f1160a99b9d20d2e67aae265ca039c67d1ca3878703b10ff6cc559924094944ef01ca107ff7ad0e0c051080d337660eedbe52ac786eb12b01dfd80e06aa473b8
+EBUILD pykakasi-2.3.0.ebuild 902 BLAKE2B 7f8d74e126440206feae46d88dca6765a9094815db204ee1157b79455c0f20c740468872ea954b095a0dfdc4b1d99c419e672f15929093e8b32d463a52bc026f SHA512 df4f830a64c1657c24dc149954910662ac73decb78b6d268f60ffb036edcccc95b79a3a263735e2c55ce2e67a739a8f59dada52e9fabb1031bdc911322c0a55b
+MISC metadata.xml 479 BLAKE2B 1b8f1bc64e728e2cdb713bc7e3b15cbf3d0de5a48951a1541b1b1d877b9d88c1a2e018b0416f6c7a2b512ede1a9abeb4fc906a1a6218d815774c3767ee9b392d SHA512 d025ba4db3b1ae2c5e8e4c8cbba5754b6cd5c2c40ab446a71a38a5879774afd5d609c2560e553d7ff2c800129a98523689ca228fd4a21d61ce53e32b6ef747f1
diff --git a/dev-python/pykakasi/files/0001-fix-update-test-expectation.patch b/dev-python/pykakasi/files/0001-fix-update-test-expectation.patch
new file mode 100644
index 000000000000..8d073039a5b1
--- /dev/null
+++ b/dev-python/pykakasi/files/0001-fix-update-test-expectation.patch
@@ -0,0 +1,24 @@
+From c27fa6eb714af6e34e302e479456f1cc68529f46 Mon Sep 17 00:00:00 2001
+From: Hiroshi Miura <miurahr@linux.com>
+Date: Mon, 24 Jun 2024 19:02:45 +0900
+Subject: [PATCH] fix: update test expectation
+
+- fix punctuation
+---
+ tests/test_pykakasi_structured.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/test_pykakasi_structured.py b/tests/test_pykakasi_structured.py
+index 83b3be0..c7ba3bb 100644
+--- a/tests/test_pykakasi_structured.py
++++ b/tests/test_pykakasi_structured.py
+@@ -666,4 +666,5 @@ def test_aozora():
+     assert result[7]['kana'] == 'カラ'
+     assert result[8]['kana'] == 'タイグウ'
+     assert result[9]['kana'] == 'サレテ'
+-    assert result[10]['kana'] == 'イル。'
++    assert result[10]['kana'] == 'イル'
++    assert result[11]['kana'] == '。'
+-- 
+2.45.2
+
diff --git a/dev-python/pykakasi/files/0001-tests-make-benchmarking-optional.patch b/dev-python/pykakasi/files/0001-tests-make-benchmarking-optional.patch
new file mode 100644
index 000000000000..3b2095ccc8a0
--- /dev/null
+++ b/dev-python/pykakasi/files/0001-tests-make-benchmarking-optional.patch
@@ -0,0 +1,50 @@
+From e51d045f6bc2d70538c24a9997ca90500019d567 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Fri, 29 Nov 2024 00:42:32 -0500
+Subject: [PATCH] tests: make benchmarking optional
+
+It can be disabled by running `pytest -m 'not benchmark'`. In this case,
+we don't need pytest-benchmark or py-cpuinfo installed.
+
+To make this work, we need to tell pytest that the benchmarking hooks in
+conftest.py are optional, and only needed when a particular plugin is
+installed.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+---
+ tests/conftest.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 524b813..374899d 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -1,7 +1,6 @@
+ import os
+ import sys
+ 
+-import cpuinfo
+ import pytest
+ 
+ import kakasidict
+@@ -18,6 +17,7 @@ def dictionary_setup_fixture():
+     Configurations.data_path = dpath
+ 
+ 
++@pytest.hookimpl(optionalhook=True)
+ def pytest_benchmark_update_json(config, benchmarks, output_json):
+     """Calculate speed and add as extra_info"""
+     for benchmark in output_json["benchmarks"]:
+@@ -26,7 +26,9 @@ def pytest_benchmark_update_json(config, benchmarks, output_json):
+             benchmark["extra_info"]["rate"] = rate
+ 
+ 
++@pytest.hookimpl(optionalhook=True)
+ def pytest_benchmark_update_machine_info(config, machine_info):
++    import cpuinfo
+     cpu_info = cpuinfo.get_cpu_info()
+     brand = cpu_info.get("brand_raw", None)
+     if brand is None:
+-- 
+2.45.2
+
diff --git a/dev-python/pykakasi/metadata.xml b/dev-python/pykakasi/metadata.xml
new file mode 100644
index 000000000000..4fd6f2f1d995
--- /dev/null
+++ b/dev-python/pykakasi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>eschwartz@gentoo.org</email>
+		<name>Eli Schwartz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pykakasi</remote-id>
+		<remote-id type="codeberg">miurahr/pykakasi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pykakasi/pykakasi-2.3.0.ebuild b/dev-python/pykakasi/pykakasi-2.3.0.ebuild
new file mode 100644
index 000000000000..dc3958635fc6
--- /dev/null
+++ b/dev-python/pykakasi/pykakasi-2.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Kana kanji simple inversion library"
+HOMEPAGE="
+	https://pypi.org/project/pykakasi/
+	https://codeberg.org/miurahr/pykakasi
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/deprecated[${PYTHON_USEDEP}]
+	dev-python/jaconv[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools-scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://codeberg.org/miurahr/pykakasi/pulls/175
+	# Avoids several pointless, unpackaged test deps
+	"${FILESDIR}"/0001-tests-make-benchmarking-optional.patch
+	# released with a failing test and immediately fixed after...
+	"${FILESDIR}"/0001-fix-update-test-expectation.patch
+)
+
+python_test() {
+	epytest -m 'not benchmark'
+}
diff --git a/dev-python/python-multipart/Manifest b/dev-python/python-multipart/Manifest
index 1ad04037118f..b312b3a52c30 100644
--- a/dev-python/python-multipart/Manifest
+++ b/dev-python/python-multipart/Manifest
@@ -1,5 +1,7 @@
 DIST python-multipart-0.0.12.gh.tar.gz 92904 BLAKE2B 25076627fdcb3a4bfc9eda74218f9d6d30ea18517da00c312f50c9d3ae156894b29e83bd38d4e11d7d06732999ae9640243e660d2a037253b9f511772a6c737b SHA512 271ed29f3025be5c058a56ec56ce373348dc27b4c8130c17609bd48d73fc975b2ac8387d4989be578e1be01a618aad87c1d3ec3a37dbe73dc45813ec961842d0
 DIST python-multipart-0.0.17.gh.tar.gz 94416 BLAKE2B daf9f5e2a94d804216fbf18778295cec3270139d5912ace80ab84d57d32115d7a53563d429f81fd2f0f55b9fe30b58f62ef1d095414f7bfe6bd3951dbb9d9e89 SHA512 52b5d5b154a18a2ae34ce7931076278b5a5edb2cbca5350c6898fd675fb57755cefc97642b2edae7e7d9903d877430da85f73347b9fcaaf1c20fa09dc12799fd
+DIST python-multipart-0.0.18.gh.tar.gz 95540 BLAKE2B fb68867f6035ee463c69c89df6b792bd8506df03386a1d61f223aa0fb63c2e6604c76377e9c356e55280c39e20052eced7c48869cf9661980626586054379ae9 SHA512 d4b888d95cbbbb70a66a8d756dfa479e96bf9cb7e754f8630a89e63dbdc06a9e237dd257c5924618030bfd03737d202029bbd5b50e483f72680177d3b0775629
 EBUILD python-multipart-0.0.12.ebuild 658 BLAKE2B 4aab8ec01549b29855d383a393bf52c7dabd0b8ad9e291f1c89832653aa42b6d3abef5a6578f32c71d5aeca0b0f2ecfcd8da96749c1f7e413e6b95a8e6ef6f83 SHA512 68d1364a63b5a674d71d9142b712375f64cbbe84710c0495b5166966b9d43201b537b8a5ea0ce7b51c7320d55e26f5f35e4e74544120aeb77c4ffa8d61ba70c6
 EBUILD python-multipart-0.0.17.ebuild 908 BLAKE2B eb50291f00f8a6e2cc56dccba99cb41e329e7e66a85c970ce2a6822209a9a23e0cd458c203b4b0a26ecb4f2e2bc6042d97ba927df627d9a7bca41e813799d220 SHA512 ce3ccb1f4e8aae96bb571e9c27168c15a7f07a18473e102b81b968b7841dbce3ba483de4f28046c36c49783089ad83f1fb6987e523496cd55a30204053f8a76e
+EBUILD python-multipart-0.0.18.ebuild 908 BLAKE2B eb50291f00f8a6e2cc56dccba99cb41e329e7e66a85c970ce2a6822209a9a23e0cd458c203b4b0a26ecb4f2e2bc6042d97ba927df627d9a7bca41e813799d220 SHA512 ce3ccb1f4e8aae96bb571e9c27168c15a7f07a18473e102b81b968b7841dbce3ba483de4f28046c36c49783089ad83f1fb6987e523496cd55a30204053f8a76e
 MISC metadata.xml 407 BLAKE2B 506414856dda2ccb7c2da00c350f73dcff5a3d9ea5897b96a7acf8973462c564b217c42cb922587378ca8c0e78f8a5a6a5aabb12bd93ca202bb29e377a6ad143 SHA512 4b61836d4f1834b8abe4c5a0e1620cefbee79665ffbd14326dc9b9b43252b519e2d3cd392c40b7356f3be705e3a38da565416e7294d02fb1817cda0e8b72a115
diff --git a/dev-python/python-multipart/python-multipart-0.0.18.ebuild b/dev-python/python-multipart/python-multipart-0.0.18.ebuild
new file mode 100644
index 000000000000..5f4588cbad96
--- /dev/null
+++ b/dev-python/python-multipart/python-multipart-0.0.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="A streaming multipart parser for Python"
+HOMEPAGE="
+	https://github.com/Kludex/python-multipart/
+	https://pypi.org/project/python-multipart/
+"
+SRC_URI="
+	https://github.com/Kludex/python-multipart/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# do not install the backwards compatibility package
+	# we're patching revdeps instead
+	rm -r multipart || die
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index adf8e89841d2..60ba09a2a8f3 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,10 +1,10 @@
+AUX 0001-Allow-knowledgeable-users-to-disable-validating-trov.patch 2790 BLAKE2B 9f795eb84b903ae97fbdd7580c8912a411dae6eae2eddf5d707e12d1c00868b1b7ea55188e7b1be997aa2d102f85f20a1f36c12370ca5d036f2872d9ec3f6713 SHA512 3197ce1935c406283cd102c87389b64c66fd7179e02ffb5551ca5c33e18c2a480f39b88eef6f686e0d3d27deea7ee2ab167c6cad5b183d54b7086edfe01581a5
 AUX setuptools-62.4.0-py-compile.patch 3704 BLAKE2B 9a5e70d2556b059be0ef060abd1db71298cd0e9aa1e2795d92cea5cdbaf0c82f4433e1a0c3095f4bc41bc72a457b63142253fe46c712afa1d7855a5d43607bca SHA512 48d7c065e2d8c29ce6e498effe6d79f9caa0f37d7cf6cadd0ed02c48d196a4d8a10a73cfa26744d6f74b48c63cd28a4074b161a6aae18c6169f6d8fffb044b1e
-AUX setuptools-75.6.0-disable-trove-classifiers.patch 1383 BLAKE2B fa3bc1822badca21e102ea4f360ba4975906aced16a274622f69cfbb3a720d67cbbdb8f4d7a15e4545f3b96528f2e284e85116139ba0788c80ab6eb5cd4d3414 SHA512 9011ef7551479d9512f880a91c27ee1327fca2d19eb5e97bcbadbdf243f8de2cffd6351d4a03f5ee5a6b2442953b544d70e1c30106618582758290568d3af6e7
 DIST setuptools-74.1.3.tar.gz 1356471 BLAKE2B c59476710f10aae77f8b466ce2b072966a889b13c3e2e2a9524497ce43893bcd296412f8e0be8a3ccaa9be46b429680c11fe291095a65a185243701fa667be6c SHA512 7892d1ff0a1cd90f6cd367536392bf2933d354eb61d5177a01218b253bc254b51e74c040601adf35aff1652f1e1c6dbffca3cdce3f4fc32b8bd23c36cd885ddc
 DIST setuptools-75.5.0.tar.gz 1336032 BLAKE2B 3e06713c45212ef64b0f041089aa0621f3c12b850c9716e21181e91192378bb0596f81cfd6c484c3ec2d6f7e29ea7967fb17a7e5bbc2de996968be4fc47c2c32 SHA512 353ad99bb946d5ed07139f3a6d5f0efc9a4ca9721b060fce9095ee6fc74ac0e832fd0ebf7b2d1d68c71021db30561c5fea6abdde42174981f26002390a1e0e67
 DIST setuptools-75.6.0.tar.gz 1337429 BLAKE2B 65ba2e3de8dd0c86ab0ad59a5dc99a860ef5b59f357272eb2568347a496d853ef8e12a2d456dee3effe6f100bfb8d29e2f9f60123b58d791003ce3cddac23e8a SHA512 bdc12309165912f8de84e6f4ceaaf8f6b05dc1506a9205201784eb740346d773a7701af9b570cb13c272d81dcc0b4928e53ea1c4bb7c179debf479701c35bb6e
-EBUILD setuptools-74.1.3-r1.ebuild 4470 BLAKE2B 2d82fe6ef9827cb2e6e4be0df31ba27fc52be1f68e3e1401155048ff4941e88f17a8242baaeceef4968eb8db77a000ec91454de8ff920cacd308f860efac64aa SHA512 6d08c4a600c286ac315ba05d9949c9bda01f84017bd0226b24e2599fea090d1b926c5210ba639849dd841c4ff22f5610cba8e73e702a7e1e663f10c94e659926
-EBUILD setuptools-75.5.0.ebuild 4583 BLAKE2B 44454c89580bd4b79a2edb138a787145b783d005f00b581a0e0ce406b92d4f8f5336f830f3c14119a81b818bf240278f9f940a0199c8162ccb86a481dec44f66 SHA512 9513f25796d2135df67d93097edf7a203c91526aa5b508f4cd5deac590d4600f2dbd23fed7d9b1c50a2e5f912e3e1d355458979b5fe9fc2027a9cf969a070db9
-EBUILD setuptools-75.6.0-r1.ebuild 4712 BLAKE2B 164d92873857ef4886604fabcc95e972ea7c5dfc21aaa7ef239ae179bfebce1c87ad50f697a5434f5a222c259be3ee14146826a72ea7dbb302d6b556920f35da SHA512 a9e3c4b063685d0b2f1293d8a67dd2de9ae21b42e41eb4d25e6bad89011b1322859a124e69441b50f00cd83254ced33fb1d69c0afb5cdcaad181cab8c4430034
+EBUILD setuptools-74.1.3-r2.ebuild 4242 BLAKE2B ccd99b9f11355f29b46e851c1e0d7f183fd74844e5dfd96426b3cf3050b42d6ff71a34ae4c050750ca4c87f9ea25ad353665e54a66cd9519eb939b3d777c6445 SHA512 d42249f91700f63abe10ab1bae4a644d141a3a66208c0e23ff7cd593ccb5ec302121d41fd630afa45b7a871c1baab6ca14d27a61b73aed3a048fe62be3448796
+EBUILD setuptools-75.5.0-r1.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
+EBUILD setuptools-75.6.0-r2.ebuild 4355 BLAKE2B 1a9c982dcc8843261e43dd0a2f569b2ab196a769591f0c5d990d4dacf89ca478fce7a86a73c12bb850f067db89f004d970fd951d237b65b26e6489e0d1b35c5e SHA512 7100ee4ca15e251250f42a0c517b049f97f9cc48076503e813b74300966bc4af35c283c7ccc1513170d96f981843f4f870c5a1c1ddbe58812772668700ac3f30
 EBUILD setuptools-75.6.0.ebuild 4583 BLAKE2B 44454c89580bd4b79a2edb138a787145b783d005f00b581a0e0ce406b92d4f8f5336f830f3c14119a81b818bf240278f9f940a0199c8162ccb86a481dec44f66 SHA512 9513f25796d2135df67d93097edf7a203c91526aa5b508f4cd5deac590d4600f2dbd23fed7d9b1c50a2e5f912e3e1d355458979b5fe9fc2027a9cf969a070db9
 MISC metadata.xml 469 BLAKE2B 4a26769b09a3785586b22db850b7fc5c4818f31c3ace9cc94476d35df05e50edf6721f3c95ec615c3b2efe071ef284a54ea2d53566316ba653f7830bb48f80bf SHA512 dd682c4ad2e59a97094ebdabe4d1063e2319ed05e1fe9d8c2fafe069badb3b4cf8bb6d9f50e09d2128e2a081c1c69827407ac8aed644ebf70eb4ca1bc9a57319
diff --git a/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch b/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
new file mode 100644
index 000000000000..4ab6bbae7af4
--- /dev/null
+++ b/dev-python/setuptools/files/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
@@ -0,0 +1,65 @@
+From f694e474ab3c45af6241a3f2bf575f8188e9cbea Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Mon, 11 Nov 2024 19:51:54 -0500
+Subject: [PATCH] Allow knowledgeable users to disable validating
+ trove-classifiers
+
+Classifiers are based on a "blessed list" of search terms that are
+allowed on https://pypi.org and need to be regularly kept up to date in
+order to validate them.
+
+Many people don't care about this. Arguably, *no one* cares about this,
+since wheels that have search terms that PyPI doesn't consider popular
+enough will simply fail uploading to PyPI. But also, not everyone wants
+to download new lists of "allowed words" from the internet every time
+they check to see if e.g. pyproject.toml contains a valid format that
+won't traceback when someone tries to read the "name" field and gets an
+integer instead of a string. Or their entrypoints are malformed because
+they aren't a valid python object reference.
+
+This is also an issue because one might have an old version of the
+classifiers cached, and then a new classifier is added to
+https://pypi.org and you want to use it immediately, and the local
+validator in the form of validate_pyproject fails but actually uploading
+a wheel to https://pypi.org would work fine.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ .../config/_validate_pyproject/formats.py      | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
+index 153b1f0b2..50b8520e9 100644
+--- a/setuptools/config/_validate_pyproject/formats.py
++++ b/setuptools/config/_validate_pyproject/formats.py
+@@ -205,15 +205,19 @@ class _TroveClassifier:
+         return value in self.downloaded or value.lower().startswith("private ::")
+ 
+ 
+-try:
+-    from trove_classifiers import classifiers as _trove_classifiers
+-
++if os.getenv("GENTOO_VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):
+     def trove_classifier(value: str) -> bool:
+-        """See https://pypi.org/classifiers/"""
+-        return value in _trove_classifiers or value.lower().startswith("private ::")
++        return True
++else:
++    try:
++        from trove_classifiers import classifiers as _trove_classifiers
+ 
+-except ImportError:  # pragma: no cover
+-    trove_classifier = _TroveClassifier()
++        def trove_classifier(value: str) -> bool:
++            """See https://pypi.org/classifiers/"""
++            return value in _trove_classifiers or value.lower().startswith("private ::")
++
++    except ImportError:  # pragma: no cover
++        trove_classifier = _TroveClassifier()
+ 
+ 
+ # -------------------------------------------------------------------------------------
+-- 
+2.45.2
+
diff --git a/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch b/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
deleted file mode 100644
index c5111e985f61..000000000000
--- a/dev-python/setuptools/files/setuptools-75.6.0-disable-trove-classifiers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0d9e8bc7d6df86381ac56770dc95fc75276f49ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 21 Nov 2024 20:40:14 +0100
-Subject: [PATCH] Add an option to disable using trove-classifiers package
-
-As requested in https://github.com/pypa/setuptools/issues/4459, add
-a VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS environment variable that can
-be used to disable using trove_classifiers package even if it is
-available.  This can be used when the system features an outdated
-trove_classifiers, and therefore incorrectly triggers validation error.
-The change is designed to be absolutely minimal and non-intrusive.
----
- setuptools/config/_validate_pyproject/formats.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/setuptools/config/_validate_pyproject/formats.py b/setuptools/config/_validate_pyproject/formats.py
-index aacf4092b..0b05ab17b 100644
---- a/setuptools/config/_validate_pyproject/formats.py
-+++ b/setuptools/config/_validate_pyproject/formats.py
-@@ -210,6 +210,9 @@ try:
-         """See https://pypi.org/classifiers/"""
-         return value in _trove_classifiers or value.lower().startswith("private ::")
- 
-+    if os.getenv("VALIDATE_PYPROJECT_NO_TROVE_CLASSIFIERS"):  # pragma: no cover
-+        raise ImportError()
-+
- except ImportError:  # pragma: no cover
-     trove_classifier = _TroveClassifier()
- 
--- 
-2.47.0
-
diff --git a/dev-python/setuptools/setuptools-74.1.3-r1.ebuild b/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
index 9cc97e5921d2..62bcc9708b4a 100644
--- a/dev-python/setuptools/setuptools-74.1.3-r1.ebuild
+++ b/dev-python/setuptools/setuptools-74.1.3-r2.ebuild
@@ -64,20 +64,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/setuptools/setuptools-75.5.0.ebuild b/dev-python/setuptools/setuptools-75.5.0-r1.ebuild
index 8bd616a1e315..9e5a6fe7eb3f 100644
--- a/dev-python/setuptools/setuptools-75.5.0.ebuild
+++ b/dev-python/setuptools/setuptools-75.5.0-r1.ebuild
@@ -66,20 +66,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/setuptools/setuptools-75.6.0-r1.ebuild b/dev-python/setuptools/setuptools-75.6.0-r2.ebuild
index a9961b9303cc..9e5a6fe7eb3f 100644
--- a/dev-python/setuptools/setuptools-75.6.0-r1.ebuild
+++ b/dev-python/setuptools/setuptools-75.6.0-r2.ebuild
@@ -66,22 +66,15 @@ BDEPEND="
 "
 # setuptools-scm is here because installing plugins apparently breaks stuff at
 # runtime, so let's pull it early. See bug #663324.
-#
-# trove-classifiers are optionally used in validation, if they are
-# installed.  Since we really oughtn't block them, let's always enforce
-# the newest version for the time being to avoid errors.
-# https://github.com/pypa/setuptools/issues/4459
 PDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2024.10.16[${PYTHON_USEDEP}]
 "
 
 src_prepare() {
 	local PATCHES=(
 		# TODO: remove this when we're 100% PEP517 mode
 		"${FILESDIR}/setuptools-62.4.0-py-compile.patch"
-		# https://github.com/abravalheri/validate-pyproject/pull/221
-		"${FILESDIR}/setuptools-75.6.0-disable-trove-classifiers.patch"
+		"${FILESDIR}"/0001-Allow-knowledgeable-users-to-disable-validating-trov.patch
 	)
 
 	distutils-r1_src_prepare
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 0296e5633a92..f247dcadee13 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 AUX smartypants-2.0.1-py312.patch 3643 BLAKE2B 4338b3b1ee6aab5cf76bd9811fa219ba34f146c6eb613932f3a000472ca643f8213a744f36aa8a0b8a2b943dcf9d9ee55470093919168c83cbd5da0866c044cc SHA512 a4a8a6aa6896aee6369b35e7f0aafda0c96e1e667daa1c866be6665f56dbfa8dd63f51f0b07a8767e9e0673b8b67a678b78bbfa0155b8ec823107195148f7c24
 DIST smartypants-2.0.1.gh.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1-r1.ebuild 960 BLAKE2B 515baa4277e56f894d2fa80c3aaeff68197a8c0c2e89688dd332efd9f01065f4a2dbad8a290ac592b54af1129e4938f0f5b178675864811a2ac229ce15277b88 SHA512 6172f1803e3e968b96efbab1dfed80537cb619545135b927c367ccc864bc1c0da7fabf56431615334d6378609a4cd2febf193637fb2ee75550917569561c8c6b
+EBUILD smartypants-2.0.1-r1.ebuild 966 BLAKE2B 7fea1675d97df65d107023f32c8711f20e8ac2492f537e97c71a7c44dfab9aa814b95bf446aac182a549bcd2a7cbb5571644f5984eec606d9adcdee0b9e8459d SHA512 24289225b20383b0a67a3c585bbc348d315cd2490f2971a6684890e83fe8fec83cbe29053a4de260308a7fbffa27015215734fb4b5b7b51b1f1124332236c070
 MISC metadata.xml 606 BLAKE2B 3e46fb6e9cb3ce8f5e91fbd87c58dcdd16bdb1475277f7cd95b7fdb8d96a5d1224e32015e231ccaa83bf19f4a3f674765e2d9499cca341a4bddb9c15adcdb9a8 SHA512 4c6564875868e8b1964c342204c11d00226b1a682fc4da031a8d194e40b3b0faf151f0d5ed583b8357f7abcf511309b815df3d79092ff13235bc75e69e58e331
diff --git a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
index 7b3c6ea9e2da..889730c1ab9b 100644
--- a/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests unittest
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index 3cddb426c9fc..be642e378b01 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1,3 +1,3 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
-EBUILD typogrify-2.0.7-r1.ebuild 693 BLAKE2B 1ae6cc27053268dc3ad3b3ce4b56f31ae339e0bb73d9a46b01c68dcc00f10cd6518f7ba188d84ac936be6b9235cc9b18d7f3ecb20424f1022d840c2495dba84c SHA512 41e383fc31cf82ee6ea21358d5a6e0e96a70b03bae8b2597f7949823469b62c995ff2646a1cab717382684913f1adb054a2ea084f417eb1fc3844990ab9af848
+EBUILD typogrify-2.0.7-r1.ebuild 699 BLAKE2B b3dab12eaec4c7a6eb6ca761cc3b7ad835a7e105643cb5e1048304303e93b7e1c5859ca5b65552688debd981ba1ee9a0a7aa92dfe5d9a39d8351fca1040c3e34 SHA512 c810d4a9cf5ff842a4dca0854c6d4e2f67a34658baed394b729ba79a1d33eb5db9bf39e39d93a7758936084f9e51b143655174edf1aacc182a76c781cdc592cb
 MISC metadata.xml 464 BLAKE2B 444a374a2f105a3ca17c78e8ab53300ecf6ea64669031e493a5a211d035a40104a1b97306817f0d9d02bed770100a8cd39b73ebbc273dbfd9f8dae8922ebf92a SHA512 1016d229071882740becd626c26283fb113205c2e327d668aee7ad47a512618a9e5820fe795298bb44ac54d602fdc8b55a7062e84936d79a01e7dc3271f574f6
diff --git a/dev-python/typogrify/typogrify-2.0.7-r1.ebuild b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
index fceb3009c13e..9499b4547943 100644
--- a/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index f621377b4b45..d0c8ab74157d 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1,3 +1,5 @@
 DIST zope.interface-7.1.1.tar.gz 253129 BLAKE2B 643092ca4497cf1854be7010aa412f009fa0108e8015a7df0c0d1c00ca0cc66e44863c3e5b24ac950d87f1dbea9d7840b21e0ba9552f7b119779990e18c1d091 SHA512 92809dd7744d5d90c773a85e17b4fdad646690e4f55023ee97541553ef41419dcf733d2944ebb5be911d9b962920c7e1f9660eea1273dfe30751b7c875291fad
+DIST zope.interface-7.2.tar.gz 252960 BLAKE2B be79d583c146d4b33213286696f929ce3f753aa9c966ecffe46c5ef508f1422b521509642a2f6475c0f1ddab3b70345ec31a4a37bf4b811ff3c6760ffc506c9d SHA512 eb927395bd4c4b2567dfeabad9a88bf91cc0cc0838289e96d7452e6a7c9ea56237a1d1f492703eac71ac0957dc0d3e23f57ceec55ff82fcffbbf413e09868a9c
 EBUILD zope-interface-7.1.1.ebuild 1379 BLAKE2B 28a3a9b103008e02713de3520daf260da830db8510377079f8f2a427fab17752a61fe713633fb3e38196829c560cb334e899258b632ca6623aba601029ef2ab6 SHA512 a88b7838f54c5fae36614d6b2d9b860226a776d2069b8eece216d01bea16e14b8be13ba8a19f4397141da1d2dc6fc9c01ff406766a826cace639c36e7a8d25dd
+EBUILD zope-interface-7.2.ebuild 1387 BLAKE2B fbdb3b0e13bfbc66c6ff2d8de9a9097d1685f0f93b8dd166eaccce3cd98dccf0f22442e630cecb73997b9c8c9a0b4c404100e0695e4468102e340ca94a1b5a6a SHA512 40dc5dd6be5016a645da837e228b27752f36331037b7a17a1011e930ed48627011c7a4539d015cc22c431d539fb86025e254e1e4481583020fb5d51124886940
 MISC metadata.xml 387 BLAKE2B 1d5e2a8f2fcd2c8fcb423f8a123d2d17a0456cd4003489358abd8baf74d3ea9ddfa04af94b9ef67b329520b5ee9bc3084343e824f3fbf7420f14372d43581dbc SHA512 258f0bd291cd42f6374bd331c3b906f149ff455dd264716eefc63487710d95f8b388ecb34be5733dbd7a0e185f449cc18fce04b46521a2d19fd9766e7dc0ed82
diff --git a/dev-python/zope-interface/zope-interface-7.2.ebuild b/dev-python/zope-interface/zope-interface-7.2.ebuild
new file mode 100644
index 000000000000..00ed787d58d7
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-7.2.ebuild
@@ -0,0 +1,60 @@
+# 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/-/.}
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="
+	https://github.com/zopefoundation/zope.interface/
+	https://pypi.org/project/zope.interface/
+"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+native-extensions"
+
+BDEPEND="
+	test? (
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	# force failure if extension build fails
+	sed -i -e "/'build_ext':/d" setup.py || die
+	if ! use native-extensions; then
+		sed -i -e '/ext_modules=/d' setup.py || die
+	fi
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	local -x PURE_PYTHON=0
+	if ! use native-extensions || [[ ${EPYTHON} == pypy3 ]]; then
+		PURE_PYTHON=1
+	fi
+
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	distutils_write_namespace zope
+	eunittest
+}